diff options
Diffstat (limited to 'engine/battle/move_effects')
| -rw-r--r-- | engine/battle/move_effects/bide.asm | 2 | ||||
| -rw-r--r-- | engine/battle/move_effects/curse.asm | 2 | ||||
| -rw-r--r-- | engine/battle/move_effects/metronome.asm | 4 | ||||
| -rw-r--r-- | engine/battle/move_effects/mirror_move.asm | 4 | ||||
| -rw-r--r-- | engine/battle/move_effects/present.asm | 4 | ||||
| -rw-r--r-- | engine/battle/move_effects/selfdestruct.asm | 2 | ||||
| -rw-r--r-- | engine/battle/move_effects/sleep_talk.asm | 4 | ||||
| -rw-r--r-- | engine/battle/move_effects/substitute.asm | 2 | ||||
| -rw-r--r-- | engine/battle/move_effects/teleport.asm | 2 | ||||
| -rw-r--r-- | engine/battle/move_effects/transform.asm | 4 | ||||
| -rw-r--r-- | engine/battle/move_effects/triple_kick.asm | 4 |
11 files changed, 17 insertions, 17 deletions
diff --git a/engine/battle/move_effects/bide.asm b/engine/battle/move_effects/bide.asm index 74f7c9cf..300ff8c7 100644 --- a/engine/battle/move_effects/bide.asm +++ b/engine/battle/move_effects/bide.asm @@ -95,6 +95,6 @@ BattleCommand_UnleashEnergy: inc a ld [bc], a ld a, 1 - ld [wKickCounter], a + ld [wBattleAnimParam], a call AnimateCurrentMove jp EndMoveEffect diff --git a/engine/battle/move_effects/curse.asm b/engine/battle/move_effects/curse.asm index 3507c668..049e79e5 100644 --- a/engine/battle/move_effects/curse.asm +++ b/engine/battle/move_effects/curse.asm @@ -39,7 +39,7 @@ BattleCommand_Curse: ; Raise Attack and Defense, and lower Speed. ld a, $1 - ld [wKickCounter], a + ld [wBattleAnimParam], a call AnimateCurrentMove ld a, SPEED call LowerStat diff --git a/engine/battle/move_effects/metronome.asm b/engine/battle/move_effects/metronome.asm index 02766c16..966133ee 100644 --- a/engine/battle/move_effects/metronome.asm +++ b/engine/battle/move_effects/metronome.asm @@ -5,11 +5,11 @@ BattleCommand_Metronome: call CheckUserIsCharging jr nz, .asm_3752a - ld a, [wKickCounter] + ld a, [wBattleAnimParam] push af call BattleCommand_LowerSub pop af - ld [wKickCounter], a + ld [wBattleAnimParam], a .asm_3752a call LoadMoveAnim diff --git a/engine/battle/move_effects/mirror_move.asm b/engine/battle/move_effects/mirror_move.asm index 98e8aacc..86259d11 100644 --- a/engine/battle/move_effects/mirror_move.asm +++ b/engine/battle/move_effects/mirror_move.asm @@ -40,11 +40,11 @@ BattleCommand_MirrorMove: call CheckUserIsCharging jr nz, .done - ld a, [wKickCounter] + ld a, [wBattleAnimParam] push af call BattleCommand_LowerSub pop af - ld [wKickCounter], a + ld [wBattleAnimParam], a .done call BattleCommand_MoveDelay diff --git a/engine/battle/move_effects/present.asm b/engine/battle/move_effects/present.asm index 360a4172..33e172fb 100644 --- a/engine/battle/move_effects/present.asm +++ b/engine/battle/move_effects/present.asm @@ -26,7 +26,7 @@ BattleCommand_Present: .got_power ld a, c - ld [wPresentPower], a + ld [wBattleAnimParam], a call AnimateCurrentMoveEitherSide ld d, [hl] pop bc @@ -35,7 +35,7 @@ BattleCommand_Present: .heal_effect pop bc ld a, 3 - ld [wPresentPower], a + ld [wBattleAnimParam], a call AnimateCurrentMove call BattleCommand_SwitchTurn ld hl, AICheckPlayerMaxHP diff --git a/engine/battle/move_effects/selfdestruct.asm b/engine/battle/move_effects/selfdestruct.asm index b4967b03..61bf9665 100644 --- a/engine/battle/move_effects/selfdestruct.asm +++ b/engine/battle/move_effects/selfdestruct.asm @@ -11,7 +11,7 @@ BattleCommand_Selfdestruct: ld [hli], a ld [hl], a ld a, $1 - ld [wKickCounter], a + ld [wBattleAnimParam], a call BattleCommand_LowerSub call LoadMoveAnim ld a, BATTLE_VARS_SUBSTATUS4 diff --git a/engine/battle/move_effects/sleep_talk.asm b/engine/battle/move_effects/sleep_talk.asm index 92bff260..96522af2 100644 --- a/engine/battle/move_effects/sleep_talk.asm +++ b/engine/battle/move_effects/sleep_talk.asm @@ -52,11 +52,11 @@ BattleCommand_SleepTalk: ld [hl], a call CheckUserIsCharging jr nz, .charging - ld a, [wKickCounter] + ld a, [wBattleAnimParam] push af call BattleCommand_LowerSub pop af - ld [wKickCounter], a + ld [wBattleAnimParam], a .charging call LoadMoveAnim call UpdateMoveData diff --git a/engine/battle/move_effects/substitute.asm b/engine/battle/move_effects/substitute.asm index c5ab8741..fef082a9 100644 --- a/engine/battle/move_effects/substitute.asm +++ b/engine/battle/move_effects/substitute.asm @@ -64,7 +64,7 @@ BattleCommand_Substitute: xor a ld [wNumHits], a ld [wFXAnimID + 1], a - ld [wKickCounter], a + ld [wBattleAnimParam], a ld a, SUBSTITUTE call LoadAnim jr .finish diff --git a/engine/battle/move_effects/teleport.asm b/engine/battle/move_effects/teleport.asm index 7d866ccf..406eea51 100644 --- a/engine/battle/move_effects/teleport.asm +++ b/engine/battle/move_effects/teleport.asm @@ -75,7 +75,7 @@ BattleCommand_Teleport: inc a ld [wBattleResult], a ld a, 1 - ld [wKickCounter], a + ld [wBattleAnimParam], a call BattleCommand_LowerSub call LoadMoveAnim ld c, 20 diff --git a/engine/battle/move_effects/transform.asm b/engine/battle/move_effects/transform.asm index 0247d8bb..8b3226f3 100644 --- a/engine/battle/move_effects/transform.asm +++ b/engine/battle/move_effects/transform.asm @@ -12,7 +12,7 @@ BattleCommand_Transform: ld [wNumHits], a ld [wFXAnimID + 1], a ld a, $1 - ld [wKickCounter], a + ld [wBattleAnimParam], a ld a, BATTLE_VARS_SUBSTATUS4 call GetBattleVarAddr bit SUBSTATUS_SUBSTITUTE, [hl] @@ -132,7 +132,7 @@ BattleCommand_Transform: ld [wNumHits], a ld [wFXAnimID + 1], a ld a, $2 - ld [wKickCounter], a + ld [wBattleAnimParam], a pop af ld a, SUBSTITUTE call nz, LoadAnim diff --git a/engine/battle/move_effects/triple_kick.asm b/engine/battle/move_effects/triple_kick.asm index e41044c9..a192ddaa 100644 --- a/engine/battle/move_effects/triple_kick.asm +++ b/engine/battle/move_effects/triple_kick.asm @@ -1,7 +1,7 @@ BattleCommand_TripleKick: ; triplekick - ld a, [wKickCounter] + ld a, [wBattleAnimParam] ld b, a inc b ld hl, wCurDamage + 1 @@ -29,6 +29,6 @@ BattleCommand_TripleKick: BattleCommand_KickCounter: ; kickcounter - ld hl, wKickCounter + ld hl, wBattleAnimParam inc [hl] ret |