diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-08 19:43:21 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-08 19:43:21 +0100 |
| commit | 5caca7a4d628dec45a5a9326db024aa1c4ffd98f (patch) | |
| tree | 4e4f1851c3cdbd5d101faaafd778be9d23a2d944 /src/battle_util.c | |
| parent | 4c23adb5f53a61d0e7426376aba9a04de5c8f2b3 (diff) | |
Clean up field weather
Diffstat (limited to 'src/battle_util.c')
| -rw-r--r-- | src/battle_util.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/battle_util.c b/src/battle_util.c index 94aaea66c..2ddd4f550 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -17,13 +17,13 @@ #include "string_util.h" #include "battle_message.h" #include "constants/battle_string_ids.h" +#include "constants/weather.h" #include "battle_ai_script_commands.h" #include "battle_controllers.h" #include "event_data.h" #include "link.h" #include "berry.h" - -extern u8 GetCurrentWeather(void); +#include "field_weather.h" // rom const data static const u16 sSoundMovesTable[] = @@ -1829,9 +1829,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA { switch (GetCurrentWeather()) { - case 3: - case 5: - case 13: + case WEATHER_RAIN_LIGHT: + case WEATHER_RAIN_MED: + case WEATHER_RAIN_HEAVY: if (!(gBattleWeather & WEATHER_RAIN_ANY)) { gBattleWeather = (WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_PERMANENT); @@ -1840,7 +1840,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA effect++; } break; - case 8: + case WEATHER_SANDSTORM: if (!(gBattleWeather & WEATHER_SANDSTORM_ANY)) { gBattleWeather = (WEATHER_SANDSTORM_PERMANENT | WEATHER_SANDSTORM_TEMPORARY); @@ -1849,7 +1849,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA effect++; } break; - case 12: + case WEATHER_DROUGHT: if (!(gBattleWeather & WEATHER_SUN_ANY)) { gBattleWeather = (WEATHER_SUN_PERMANENT | WEATHER_SUN_TEMPORARY); |