diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-11-20 16:23:51 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-20 16:23:51 -0800 |
| commit | 3ac76ce81a3dc000bdfec684192c9423af4619a6 (patch) | |
| tree | 91aa27f9e0dece2e811dd08bc6917029a2e33195 /src/battle/battle_3.c | |
| parent | 0f42ef11742cfc141b720846777e43d96a64ffc3 (diff) | |
| parent | 9d36bf245b25376b678e7f1d9a2c82a7b47464c9 (diff) | |
Merge pull request #464 from sceptillion/label_battle_anims
label battle anims
Diffstat (limited to 'src/battle/battle_3.c')
| -rw-r--r-- | src/battle/battle_3.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/battle_3.c b/src/battle/battle_3.c index f37111af5..958ee0b55 100644 --- a/src/battle/battle_3.c +++ b/src/battle/battle_3.c @@ -546,7 +546,7 @@ u8 UpdateTurnCounters(void) else gBattlescriptCurrInstr = gUnknown_081D8F7D; - BATTLE_STRUCT->animArg1 = 0xC; + BATTLE_STRUCT->animArg1 = B_ANIM_SANDSTORM_CONTINUES; gBattleCommunication[MULTISTRING_CHOOSER] = 0; b_call_bc_move_exec(gBattlescriptCurrInstr); effect++; @@ -580,7 +580,7 @@ u8 UpdateTurnCounters(void) else gBattlescriptCurrInstr = gUnknown_081D8F7D; - BATTLE_STRUCT->animArg1 = 0xD; + BATTLE_STRUCT->animArg1 = B_ANIM_HAIL_CONTINUES; gBattleCommunication[MULTISTRING_CHOOSER] = 1; b_call_bc_move_exec(gBattlescriptCurrInstr); effect++; @@ -1505,7 +1505,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) if (!(gBattleWeather & WEATHER_RAIN_ANY)) { gBattleWeather = (WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_PERMANENT); - BATTLE_STRUCT->animArg1 = 0xA; + BATTLE_STRUCT->animArg1 = B_ANIM_RAIN_CONTINUES; BATTLE_STRUCT->scriptingActive = bank; effect++; } @@ -1514,7 +1514,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) if (!(gBattleWeather & WEATHER_SANDSTORM_ANY)) { gBattleWeather = (WEATHER_SANDSTORM_PERMANENT | WEATHER_SANDSTORM_TEMPORARY); - BATTLE_STRUCT->animArg1 = 0xC; + BATTLE_STRUCT->animArg1 = B_ANIM_SANDSTORM_CONTINUES; BATTLE_STRUCT->scriptingActive = bank; effect++; } @@ -1523,7 +1523,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) if (!(gBattleWeather & WEATHER_SUN_ANY)) { gBattleWeather = (WEATHER_SUN_PERMANENT | WEATHER_SUN_TEMPORARY); - BATTLE_STRUCT->animArg1 = 0xB; + BATTLE_STRUCT->animArg1 = B_ANIM_SUN_CONTINUES; BATTLE_STRUCT->scriptingActive = bank; effect++; } |