dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #57 from SatoMew/master

Browse Source 
Add weather labels and missing constants
This commit is contained in:
PikalaxALT
2019-05-19 12:10:26 -04:00
committed by GitHub
parent 6c2d5ea50d 333d2f37a8
commit 4661be7836
436 changed files with 901 additions and 895 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_ai_script_commands.c
+3 -3
View File
@@ -1623,7 +1623,7 @@ static void BattleAICmd_if_status_not_in_party(void)
enum
{
WEATHER_TYPE_SUN,
WEATHER_TYPE_SUNNY,
WEATHER_TYPE_RAIN,
WEATHER_TYPE_SANDSTORM,
WEATHER_TYPE_HAIL,
@@ -1637,8 +1637,8 @@ static void BattleAICmd_get_weather(void)
AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_RAIN;
if (gBattleWeather & WEATHER_SANDSTORM_ANY)
AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_SANDSTORM;
if (gBattleWeather & WEATHER_SUN_ANY)
AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_SUN;
if (gBattleWeather & WEATHER_SUNNY_ANY)
AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_SUNNY;
if (gBattleWeather & WEATHER_HAIL)
AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_HAIL;
src/pokemon.c
+1 -1
View File
@@ -1001,7 +1001,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
damage /= 2;
// sunny
if (gBattleWeather & WEATHER_SUN_ANY)
if (gBattleWeather & WEATHER_SUNNY_ANY)
{
switch (type)
{