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/CeladonGym.asm | |
| parent | 8d2afb7c1324adf6f6b70637a8300073c0a2cb81 (diff) | |
Deobfuscate gyms consistently
Diffstat (limited to 'scripts/CeladonGym.asm')
| -rwxr-xr-x | scripts/CeladonGym.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/CeladonGym.asm b/scripts/CeladonGym.asm index 8ceb36ee..50c02196 100755 --- a/scripts/CeladonGym.asm +++ b/scripts/CeladonGym.asm @@ -54,12 +54,12 @@ CeladonGymText_48963: ld [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM21 - jr .asm_4898c + jr .gymVictory .BagFull ld a, $b ld [hSpriteIndexOrTextID], a call DisplayTextID -.asm_4898c +.gymVictory ld hl, wObtainedBadges set 3, [hl] ld hl, wBeatGymFlags @@ -151,17 +151,17 @@ CeladonGymTrainerHeader6: CeladonGymText1: TX_ASM CheckEvent EVENT_BEAT_ERIKA - jr z, .asm_48a2d + jr z, .beginBattle CheckEventReuseA EVENT_GOT_TM21 - jr nz, .asm_48a25 + jr nz, .afterVictory call z, CeladonGymText_48963 call DisableWaitingAfterTextDisplay - jr .asm_48a5b -.asm_48a25 + jr .done +.afterVictory ld hl, CeladonGymText_48a68 call PrintText - jr .asm_48a5b -.asm_48a2d + jr .done +.beginBattle ld hl, CeladonGymText_48a5e call PrintText ld hl, wd72d @@ -179,7 +179,7 @@ CeladonGymText1: ld a, $3 ld [wCeladonGymCurScript], a ld [wCurMapScript], a -.asm_48a5b +.done jp TextScriptEnd CeladonGymText_48a5e: |