diff options
Diffstat (limited to 'scripts/saffrongym.asm')
| -rwxr-xr-x | scripts/saffrongym.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm index 146d31f9..f82b5ccd 100755 --- a/scripts/saffrongym.asm +++ b/scripts/saffrongym.asm @@ -54,12 +54,12 @@ SaffronGymText_5d068: ld [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM46 - jr .asm_5d091 + jr .gymVictory .BagFull ld a, $c ld [hSpriteIndexOrTextID], a call DisplayTextID -.asm_5d091 +.gymVictory ld hl, wObtainedBadges set 5, [hl] ld hl, wBeatGymFlags @@ -153,17 +153,17 @@ SaffronGymTrainerHeader6: SaffronGymText1: TX_ASM CheckEvent EVENT_BEAT_SABRINA - jr z, .asm_5d134 + jr z, .beginBattle CheckEventReuseA EVENT_GOT_TM46 - jr nz, .asm_5d12c + jr nz, .afterVictory call z, SaffronGymText_5d068 call DisableWaitingAfterTextDisplay - jr .asm_5d15f -.asm_5d12c + jr .done +.afterVictory ld hl, SaffronGymText_5d16e call PrintText - jr .asm_5d15f -.asm_5d134 + jr .done +.beginBattle ld hl, SaffronGymText_5d162 call PrintText ld hl, wd72d @@ -180,7 +180,7 @@ SaffronGymText1: ld [wGymLeaderNo], a ld a, $3 ld [wSaffronGymCurScript], a -.asm_5d15f +.done jp TextScriptEnd SaffronGymText_5d162: |