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/pokemon.c | |
| parent | e270ee1a74429adfc4991a379fe54d4043524480 (diff) | |
| parent | 38a4dea402aee2d038d81fa5bde60687caf9cfb6 (diff) | |
Merge pull request #1508 from Pokestia/master
Use compact weather macros
Diffstat (limited to 'src/pokemon.c')
| -rw-r--r-- | src/pokemon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index 9e1e84aee..aca68d53c 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -3268,7 +3268,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de // are effects of weather negated with cloud nine or air lock if (WEATHER_HAS_EFFECT2) { - if (gBattleWeather & WEATHER_RAIN_TEMPORARY) + if (gBattleWeather & B_WEATHER_RAIN_TEMPORARY) { switch (type) { @@ -3282,11 +3282,11 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de } // any weather except sun weakens solar beam - if ((gBattleWeather & (WEATHER_RAIN_ANY | WEATHER_SANDSTORM_ANY | WEATHER_HAIL_ANY)) && gCurrentMove == MOVE_SOLAR_BEAM) + if ((gBattleWeather & (B_WEATHER_RAIN | B_WEATHER_SANDSTORM | B_WEATHER_HAIL)) && gCurrentMove == MOVE_SOLAR_BEAM) damage /= 2; // sunny - if (gBattleWeather & WEATHER_SUN_ANY) + if (gBattleWeather & B_WEATHER_SUN) { switch (type) { |