aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/CinnabarGym.asm
diff options
context:
space:
mode:
authorRangi42 <remy.oukaour+rangi42@gmail.com>2023-11-18 19:44:03 -0500
committerRangi42 <remy.oukaour+rangi42@gmail.com>2023-11-18 19:44:03 -0500
commit26a342b104e48bede16b9e2324c2f8f57df5bd50 (patch)
tree47dc8ca18fa2bbc8aee0f52c99d710d50ef45bd6 /scripts/CinnabarGym.asm
parent.calculateHPBarCoords incorrectly referenced OAM (diff)
downloadpokeyellow-26a342b104e48bede16b9e2324c2f8f57df5bd50.tar.gz
pokeyellow-26a342b104e48bede16b9e2324c2f8f57df5bd50.tar.xz
pokeyellow-26a342b104e48bede16b9e2324c2f8f57df5bd50.zip
Identify more map script labels
Diffstat (limited to 'scripts/CinnabarGym.asm')
-rw-r--r--scripts/CinnabarGym.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/CinnabarGym.asm b/scripts/CinnabarGym.asm
index af7646be..a962aa2f 100644
--- a/scripts/CinnabarGym.asm
+++ b/scripts/CinnabarGym.asm
@@ -93,7 +93,7 @@ CinnabarGymGetOpponentTextScript:
CinnabarGymFlagAction:
predef_jump FlagActionPredef
-
+ ; fallthrough
CinnabarGymOpenGateScript:
ld a, [wIsInBattle]
cp $ff
@@ -107,12 +107,12 @@ CinnabarGymOpenGateScript:
call CinnabarGymFlagAction
ld a, c
and a
- jr nz, .asm_7581b
+ jr nz, .no_sound
call WaitForSoundToFinish
ld a, SFX_GO_INSIDE
call PlaySound
call WaitForSoundToFinish
-.asm_7581b
+.no_sound
ld a, [wTrainerHeaderFlagBit]
ldh [hGymGateIndex], a
AdjustEventBit EVENT_BEAT_CINNABAR_GYM_TRAINER_0, 2