diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-09-30 11:23:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-30 11:23:13 -0400 |
| commit | 27d69ea8e6ed7722affd6ec121443e72d2cdf377 (patch) | |
| tree | e36a8c0a66553632809e340208b1713471e184e3 /src/battle_main.c | |
| parent | e270ee1a74429adfc4991a379fe54d4043524480 (diff) | |
| parent | 38a4dea402aee2d038d81fa5bde60687caf9cfb6 (diff) | |
Merge pull request #1508 from Pokestia/master
Use compact weather macros
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index f4e1c4d3d..9fda5acbc 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -4525,14 +4525,14 @@ u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves) if (WEATHER_HAS_EFFECT) { - if ((gBattleMons[battler1].ability == ABILITY_SWIFT_SWIM && gBattleWeather & WEATHER_RAIN_ANY) - || (gBattleMons[battler1].ability == ABILITY_CHLOROPHYLL && gBattleWeather & WEATHER_SUN_ANY)) + if ((gBattleMons[battler1].ability == ABILITY_SWIFT_SWIM && gBattleWeather & B_WEATHER_RAIN) + || (gBattleMons[battler1].ability == ABILITY_CHLOROPHYLL && gBattleWeather & B_WEATHER_SUN)) speedMultiplierBattler1 = 2; else speedMultiplierBattler1 = 1; - if ((gBattleMons[battler2].ability == ABILITY_SWIFT_SWIM && gBattleWeather & WEATHER_RAIN_ANY) - || (gBattleMons[battler2].ability == ABILITY_CHLOROPHYLL && gBattleWeather & WEATHER_SUN_ANY)) + if ((gBattleMons[battler2].ability == ABILITY_SWIFT_SWIM && gBattleWeather & B_WEATHER_RAIN) + || (gBattleMons[battler2].ability == ABILITY_CHLOROPHYLL && gBattleWeather & B_WEATHER_SUN)) speedMultiplierBattler2 = 2; else speedMultiplierBattler2 = 1; |