diff options
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/move_effects/metronome.asm | 4 | ||||
| -rw-r--r-- | engine/battle/move_effects/protect.asm | 4 | ||||
| -rw-r--r-- | engine/battle/move_effects/spikes.asm | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engine/battle/move_effects/metronome.asm b/engine/battle/move_effects/metronome.asm index 966133ee..ab1c6a6c 100644 --- a/engine/battle/move_effects/metronome.asm +++ b/engine/battle/move_effects/metronome.asm @@ -3,7 +3,7 @@ BattleCommand_Metronome: call ClearLastMove call CheckUserIsCharging - jr nz, .asm_3752a + jr nz, .charging ld a, [wBattleAnimParam] push af @@ -11,7 +11,7 @@ BattleCommand_Metronome: pop af ld [wBattleAnimParam], a -.asm_3752a +.charging call LoadMoveAnim .GetMove: diff --git a/engine/battle/move_effects/protect.asm b/engine/battle/move_effects/protect.asm index 9f3899a9..bcfdacdf 100644 --- a/engine/battle/move_effects/protect.asm +++ b/engine/battle/move_effects/protect.asm @@ -16,9 +16,9 @@ ProtectChance: ld de, wPlayerProtectCount ldh a, [hBattleTurn] and a - jr z, .asm_37736 + jr z, .got_count ld de, wEnemyProtectCount -.asm_37736 +.got_count call CheckOpponentWentFirst jr nz, .failed diff --git a/engine/battle/move_effects/spikes.asm b/engine/battle/move_effects/spikes.asm index 06aa35e8..69752c8f 100644 --- a/engine/battle/move_effects/spikes.asm +++ b/engine/battle/move_effects/spikes.asm @@ -4,9 +4,9 @@ BattleCommand_Spikes: ld hl, wEnemyScreens ldh a, [hBattleTurn] and a - jr z, .asm_3778d + jr z, .got_screens ld hl, wPlayerScreens -.asm_3778d +.got_screens ; Fails if spikes are already down! |