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/CinnabarGym.asm | |
| parent | 8d2afb7c1324adf6f6b70637a8300073c0a2cb81 (diff) | |
Deobfuscate gyms consistently
Diffstat (limited to 'scripts/CinnabarGym.asm')
| -rwxr-xr-x | scripts/CinnabarGym.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/CinnabarGym.asm b/scripts/CinnabarGym.asm index 295bd63d..f8be5823 100755 --- a/scripts/CinnabarGym.asm +++ b/scripts/CinnabarGym.asm @@ -151,12 +151,12 @@ CinnabarGymScript3_75857: ld [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM38 - jr .asm_75880 + jr .gymVictory .BagFull ld a, $c ld [hSpriteIndexOrTextID], a call DisplayTextID -.asm_75880 +.gymVictory ld hl, wObtainedBadges set 6, [hl] ld hl, wBeatGymFlags @@ -207,17 +207,17 @@ CinnabarGymScript_758b7: CinnabarGymText1: TX_ASM CheckEvent EVENT_BEAT_BLAINE - jr z, .asm_d9332 + jr z, .beginBattle CheckEventReuseA EVENT_GOT_TM38 - jr nz, .asm_3012f + jr nz, .afterVictory call z, CinnabarGymScript3_75857 call DisableWaitingAfterTextDisplay jp TextScriptEnd -.asm_3012f +.afterVictory ld hl, BlaineFireBlastText call PrintText jp TextScriptEnd -.asm_d9332 +.beginBattle ld hl, BlaineBattleText call PrintText ld hl, BlaineEndBattleText |