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_anim_effects_3.c | |
| parent | e270ee1a74429adfc4991a379fe54d4043524480 (diff) | |
| parent | 38a4dea402aee2d038d81fa5bde60687caf9cfb6 (diff) | |
Merge pull request #1508 from Pokestia/master
Use compact weather macros
Diffstat (limited to 'src/battle_anim_effects_3.c')
| -rwxr-xr-x | src/battle_anim_effects_3.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index f5c2c7ee6..c827aaaa6 100755 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -5421,13 +5421,13 @@ static void AnimRecycle_Step(struct Sprite *sprite) void AnimTask_GetWeather(u8 taskId) { gBattleAnimArgs[ARG_RET_ID] = ANIM_WEATHER_NONE; - if (gWeatherMoveAnim & WEATHER_SUN_ANY) + if (gWeatherMoveAnim & B_WEATHER_SUN) gBattleAnimArgs[ARG_RET_ID] = ANIM_WEATHER_SUN; - else if (gWeatherMoveAnim & WEATHER_RAIN_ANY) + else if (gWeatherMoveAnim & B_WEATHER_RAIN) gBattleAnimArgs[ARG_RET_ID] = ANIM_WEATHER_RAIN; - else if (gWeatherMoveAnim & WEATHER_SANDSTORM_ANY) + else if (gWeatherMoveAnim & B_WEATHER_SANDSTORM) gBattleAnimArgs[ARG_RET_ID] = ANIM_WEATHER_SANDSTORM; - else if (gWeatherMoveAnim & WEATHER_HAIL_ANY) + else if (gWeatherMoveAnim & B_WEATHER_HAIL) gBattleAnimArgs[ARG_RET_ID] = ANIM_WEATHER_HAIL; DestroyAnimVisualTask(taskId); |