diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-07-22 19:10:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-22 19:10:50 -0500 |
| commit | 566392f441a66da41fc827b6d2e8cbeaf1cf4825 (patch) | |
| tree | 6ba3e09d866676ac7c131c2f3e30c6485638bcb5 /src/battle_ai.c | |
| parent | 5891cedc1bf4c9c95d60e5118c2809895d6191a5 (diff) | |
| parent | 32977818e7ea7e14fd3dee331483ef6b06b3a00a (diff) | |
Merge pull request #384 from camthesaxman/battle_4
battle_4 fixes
Diffstat (limited to 'src/battle_ai.c')
| -rw-r--r-- | src/battle_ai.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/battle_ai.c b/src/battle_ai.c index 4206e8f83..a1cb805d9 100644 --- a/src/battle_ai.c +++ b/src/battle_ai.c @@ -31,6 +31,14 @@ extern u8 gCritMultiplier; extern u16 gTrainerBattleOpponent; extern u8 *BattleAIs[]; +enum +{ + WEATHER_TYPE_SUN, + WEATHER_TYPE_RAIN, + WEATHER_TYPE_SANDSTORM, + WEATHER_TYPE_HAIL, +}; + /* gAIScriptPtr is a pointer to the next battle AI cmd command to read. when a command finishes processing, gAIScriptPtr is incremented by @@ -1562,14 +1570,14 @@ static void BattleAICmd_if_status_not_in_party(void) static void BattleAICmd_get_weather(void) { - if (gBattleWeather & WEATHER_RAINY) - AI_THINKING_STRUCT->funcResult = WEATHER_RAIN; - if (gBattleWeather & WEATHER_SANDSTORMY) - AI_THINKING_STRUCT->funcResult = WEATHER_SANDSTORM; - if (gBattleWeather & WEATHER_SUNNY) - AI_THINKING_STRUCT->funcResult = WEATHER_SUN; - if (gBattleWeather & weather_hail) - AI_THINKING_STRUCT->funcResult = WEATHER_HAIL; + if (gBattleWeather & WEATHER_RAIN_ANY) + 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_HAIL) + AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_HAIL; gAIScriptPtr += 1; } |