diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-27 09:33:58 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-27 09:33:58 -0600 |
| commit | 86a36767dba19e84297047addf1d1d776e2efdec (patch) | |
| tree | f2aaa9e93f8b8671491eda458963aee1027924c2 /src/battle/battle_3.c | |
| parent | e3078400bbdb3e8416806127290b9a2d68cfb3b8 (diff) | |
| parent | d34de50d34d18ee64c95232202751532534c2ed9 (diff) | |
Merge pull request #501 from huderlem/event_macros
New map event macros
Diffstat (limited to 'src/battle/battle_3.c')
| -rw-r--r-- | src/battle/battle_3.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/battle/battle_3.c b/src/battle/battle_3.c index f627e50f0..b21ec1572 100644 --- a/src/battle/battle_3.c +++ b/src/battle/battle_3.c @@ -7,6 +7,7 @@ #include "event_data.h" #include "constants/hold_effects.h" #include "constants/species.h" +#include "constants/weather.h" #include "pokemon.h" #include "data2.h" #include "random.h" @@ -1500,9 +1501,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) //_08018586 switch (weather_get_current()) { - 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); @@ -1511,7 +1512,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) effect++; } break; - case 8: + case WEATHER_SANDSTORM: if (!(gBattleWeather & WEATHER_SANDSTORM_ANY)) { gBattleWeather = (WEATHER_SANDSTORM_PERMANENT | WEATHER_SANDSTORM_TEMPORARY); @@ -1520,7 +1521,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) effect++; } break; - case 12: + case WEATHER_DROUGHT: if (!(gBattleWeather & WEATHER_SUN_ANY)) { gBattleWeather = (WEATHER_SUN_PERMANENT | WEATHER_SUN_TEMPORARY); |