diff options
Diffstat (limited to 'engine/battle/effect_commands.asm')
| -rw-r--r-- | engine/battle/effect_commands.asm | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 94d8d7615..16c6b441a 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -122,7 +122,7 @@ BattleCommand_CheckTurn: xor a ld [wAttackMissed], a ld [wEffectFailed], a - ld [wKickCounter], a + ld [wBattleAnimParam], a ld [wAlreadyDisobeyed], a ld [wAlreadyFailed], a ld [wSomeoneIsRampaging], a @@ -1933,7 +1933,7 @@ BattleCommand_LowerSub: ld [wNumHits], a ld [wFXAnimID + 1], a inc a - ld [wKickCounter], a + ld [wBattleAnimParam], a ld a, SUBSTITUTE jp LoadAnim @@ -1994,7 +1994,7 @@ BattleCommand_MoveAnimNoSub: cp EFFECT_TRIPLE_KICK jr z, .triplekick xor a - ld [wKickCounter], a + ld [wBattleAnimParam], a .triplekick ld a, BATTLE_VARS_MOVE_ANIM @@ -2013,10 +2013,10 @@ BattleCommand_MoveAnimNoSub: jp AppearUserLowerSub .alternate_anim - ld a, [wKickCounter] + ld a, [wBattleAnimParam] and 1 xor 1 - ld [wKickCounter], a + ld [wBattleAnimParam], a ld a, [de] cp 1 push af @@ -2054,7 +2054,7 @@ BattleCommand_StatDownAnim: BattleCommand_StatUpDownAnim: ld [wNumHits], a xor a - ld [wKickCounter], a + ld [wBattleAnimParam], a ld a, BATTLE_VARS_MOVE_ANIM call GetBattleVar ld e, a @@ -2084,7 +2084,7 @@ BattleCommand_RaiseSub: ld [wNumHits], a ld [wFXAnimID + 1], a ld a, $2 - ld [wKickCounter], a + ld [wBattleAnimParam], a ld a, SUBSTITUTE jp LoadAnim @@ -2272,7 +2272,7 @@ endr ld hl, CrashedText call StdBattleTextbox ld a, $1 - ld [wKickCounter], a + ld [wBattleAnimParam], a call LoadMoveAnim ld c, TRUE ldh a, [hBattleTurn] @@ -2429,7 +2429,7 @@ BattleCommand_CheckFaint: ld [wNumHits], a ld [wFXAnimID + 1], a inc a - ld [wKickCounter], a + ld [wBattleAnimParam], a ld a, DESTINY_BOND call LoadAnim call BattleCommand_SwitchTurn @@ -5112,7 +5112,7 @@ BattleCommand_ForceSwitch: jr z, .switch_fail call UpdateEnemyMonInParty ld a, $1 - ld [wKickCounter], a + ld [wBattleAnimParam], a call AnimateCurrentMove ld c, $14 call DelayFrames @@ -5207,7 +5207,7 @@ BattleCommand_ForceSwitch: call UpdateBattleMonInParty ld a, $1 - ld [wKickCounter], a + ld [wBattleAnimParam], a call AnimateCurrentMove ld c, 20 call DelayFrames @@ -5260,7 +5260,7 @@ BattleCommand_ForceSwitch: push af call SetBattleDraw ld a, $1 - ld [wKickCounter], a + ld [wBattleAnimParam], a call AnimateCurrentMove ld c, 20 call DelayFrames @@ -5607,7 +5607,7 @@ BattleCommand_Charge: xor a ld [wNumHits], a inc a - ld [wKickCounter], a + ld [wBattleAnimParam], a call LoadMoveAnim ld a, BATTLE_VARS_MOVE_ANIM call GetBattleVar @@ -6739,11 +6739,11 @@ AnimateCurrentMoveEitherSide: push hl push de push bc - ld a, [wKickCounter] + ld a, [wBattleAnimParam] push af call BattleCommand_LowerSub pop af - ld [wKickCounter], a + ld [wBattleAnimParam], a call PlayDamageAnim call BattleCommand_RaiseSub pop bc @@ -6755,11 +6755,11 @@ AnimateCurrentMove: push hl push de push bc - ld a, [wKickCounter] + ld a, [wBattleAnimParam] push af call BattleCommand_LowerSub pop af - ld [wKickCounter], a + ld [wBattleAnimParam], a call LoadMoveAnim call BattleCommand_RaiseSub pop bc |