From 533578e602ad2a9deee5d3c74201c342c9895a7f Mon Sep 17 00:00:00 2001 From: Amber Brault Date: Fri, 11 Oct 2019 11:39:35 -0400 Subject: Add deobfuscation from pokered commits Remove excess linebreaks from surfing_minigame.asm This commit removes the extra line breaks added accidentally from the last commit. Add deobfuscation from pokered commits --- scripts/pewtergym.asm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'scripts/pewtergym.asm') diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index 6014cf33..f9fc4ed2 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -54,13 +54,13 @@ PewterGymScript_5c3df: ld [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM34 - jr .asm_5c408 + jr .gymVictory .BagFull ld a, $6 ld [hSpriteIndexOrTextID], a call DisplayTextID -.asm_5c408 +.gymVictory ld hl, wObtainedBadges set 0, [hl] ld hl, wBeatGymFlags @@ -103,17 +103,17 @@ PewterGymTrainerHeader0: PewterGymText1: TX_ASM CheckEvent EVENT_BEAT_BROCK - jr z, .asm_5c46a + jr z, .beginBattle CheckEventReuseA EVENT_GOT_TM34 - jr nz, .asm_5c462 + jr nz, .afterVictory call z, PewterGymScript_5c3df call DisableWaitingAfterTextDisplay - jr .asm_5c49b -.asm_5c462 + jr .done +.afterVictory ld hl, PewterGymText_5c4a3 call PrintText - jr .asm_5c49b -.asm_5c46a + jr .done +.beginBattle ld hl, PewterGymText_5c49e call PrintText ld hl, wd72d @@ -133,7 +133,7 @@ PewterGymText1: ld a, $3 ld [wPewterGymCurScript], a ld [wCurMapScript], a -.asm_5c49b +.done jp TextScriptEnd PewterGymText_5c49e: -- cgit v1.3.1-sl0p