diff options
| author | deak311andris <deak311andris@gmail.com> | 2019-10-07 07:23:57 +0200 |
|---|---|---|
| committer | deak311andris <deak311andris@gmail.com> | 2019-10-07 07:23:57 +0200 |
| commit | 2e45c2946a3cf7ba18de6b9d6fc4549165666864 (patch) | |
| tree | 5f49f623a6dbd03975e12620b35fe08b40054b87 /scripts/CeruleanGym.asm | |
| parent | 8d2afb7c1324adf6f6b70637a8300073c0a2cb81 (diff) | |
Deobfuscate gyms consistently
Diffstat (limited to 'scripts/CeruleanGym.asm')
| -rwxr-xr-x | scripts/CeruleanGym.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/CeruleanGym.asm b/scripts/CeruleanGym.asm index 7d152b4f..c4aaf7de 100755 --- a/scripts/CeruleanGym.asm +++ b/scripts/CeruleanGym.asm @@ -54,12 +54,12 @@ CeruleanGymScript_5c70d: ld [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM11 - jr .asm_5c736 + jr .gymVictory .BagFull ld a, $7 ld [hSpriteIndexOrTextID], a call DisplayTextID -.asm_5c736 +.gymVictory ld hl, wObtainedBadges set 1, [hl] ld hl, wBeatGymFlags @@ -102,17 +102,17 @@ CeruleanGymTrainerHeader1: CeruleanGymText1: TX_ASM CheckEvent EVENT_BEAT_MISTY - jr z, .asm_5c78d + jr z, .beginBattle CheckEventReuseA EVENT_GOT_TM11 - jr nz, .asm_5c785 + jr nz, .afterVictory call z, CeruleanGymScript_5c70d call DisableWaitingAfterTextDisplay - jr .asm_5c7bb -.asm_5c785 + jr .done +.afterVictory ld hl, CeruleanGymText_5c7c3 call PrintText - jr .asm_5c7bb -.asm_5c78d + jr .done +.beginBattle ld hl, CeruleanGymText_5c7be call PrintText ld hl, wd72d @@ -131,7 +131,7 @@ CeruleanGymText1: ld [hJoyHeld], a ld a, $3 ld [wCeruleanGymCurScript], a -.asm_5c7bb +.done jp TextScriptEnd CeruleanGymText_5c7be: |