diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-04 19:43:28 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-04 20:10:39 -0400 |
| commit | 306c85750e0686f9af104249ca3000e717aee0e2 (patch) | |
| tree | 0b277bda2ba1a0f0d2ba37fb256396a77b09b6a8 /engine/battle | |
| parent | 5a546068a84d57454c7f95395250346ac14da81e (diff) | |
Identify some more unnamed labels
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 5b43c9b75..ab1c6a6c9 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, .charging ld a, [wBattleAnimParam] push af @@ -11,7 +11,7 @@ BattleCommand_Metronome: pop af ld [wBattleAnimParam], a -.asm_3742b +.charging call LoadMoveAnim .GetMove: diff --git a/engine/battle/move_effects/protect.asm b/engine/battle/move_effects/protect.asm index e66bce443..bcfdacdfc 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, .got_count ld de, wEnemyProtectCount -.asm_37637 +.got_count call CheckOpponentWentFirst jr nz, .failed diff --git a/engine/battle/move_effects/spikes.asm b/engine/battle/move_effects/spikes.asm index 96163a680..69752c8f6 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, .got_screens ld hl, wPlayerScreens -.asm_3768e +.got_screens ; Fails if spikes are already down! |