summaryrefslogtreecommitdiff
path: root/engine/battle/move_effects
diff options
context:
space:
mode:
Diffstat (limited to 'engine/battle/move_effects')
-rw-r--r--engine/battle/move_effects/metronome.asm4
-rw-r--r--engine/battle/move_effects/protect.asm4
-rw-r--r--engine/battle/move_effects/spikes.asm4
3 files changed, 6 insertions, 6 deletions
diff --git a/engine/battle/move_effects/metronome.asm b/engine/battle/move_effects/metronome.asm
index 25197d7c..02766c16 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_3742b
+ jr nz, .asm_3752a
ld a, [wKickCounter]
push af
@@ -11,7 +11,7 @@ BattleCommand_Metronome:
pop af
ld [wKickCounter], a
-.asm_3742b
+.asm_3752a
call LoadMoveAnim
.GetMove:
diff --git a/engine/battle/move_effects/protect.asm b/engine/battle/move_effects/protect.asm
index e66bce44..9f3899a9 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_37637
+ jr z, .asm_37736
ld de, wEnemyProtectCount
-.asm_37637
+.asm_37736
call CheckOpponentWentFirst
jr nz, .failed
diff --git a/engine/battle/move_effects/spikes.asm b/engine/battle/move_effects/spikes.asm
index 96163a68..06aa35e8 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_3768e
+ jr z, .asm_3778d
ld hl, wPlayerScreens
-.asm_3768e
+.asm_3778d
; Fails if spikes are already down!