diff options
| author | Amber Brault <celestialamber1@gmail.com> | 2019-10-11 11:39:35 -0400 |
|---|---|---|
| committer | Amber Brault <celestialamber1@gmail.com> | 2019-10-17 12:38:25 -0400 |
| commit | 533578e602ad2a9deee5d3c74201c342c9895a7f (patch) | |
| tree | ac380ca494da7d326b0f9276072563b4330d0a10 /scripts/viridiangym.asm | |
| parent | 41bc3a65c4c3dc8bdb25a19acdce55f05a3895e3 (diff) | |
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
Diffstat (limited to 'scripts/viridiangym.asm')
| -rwxr-xr-x | scripts/viridiangym.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm index 1557f68a..75814e49 100755 --- a/scripts/viridiangym.asm +++ b/scripts/viridiangym.asm @@ -148,12 +148,12 @@ ViridianGymScript3_74995: ld [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM27 - jr .asm_749be + jr .gymVictory .BagFull ld a, $e ld [hSpriteIndexOrTextID], a call DisplayTextID -.asm_749be +.gymVictory ld hl, wObtainedBadges set 7, [hl] ld hl, wBeatGymFlags @@ -262,13 +262,13 @@ ViridianGymTrainerHeader7: ViridianGymText1: TX_ASM CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI - jr z, .asm_6de66 + jr z, .beginBattle CheckEventReuseA EVENT_GOT_TM27 - jr nz, .asm_9fc95 + jr nz, .afterVictory call z, ViridianGymScript3_74995 call DisableWaitingAfterTextDisplay - jr .asm_6dff7 -.asm_9fc95 + jr .done +.afterVictory ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, ViridianGymText_74ad9 @@ -280,8 +280,8 @@ ViridianGymText1: call UpdateSprites call Delay3 call GBFadeInFromBlack - jr .asm_6dff7 -.asm_6de66 + jr .done +.beginBattle ld hl, ViridianGymText_74ace call PrintText ld hl, wd72d @@ -298,7 +298,7 @@ ViridianGymText1: ld [wGymLeaderNo], a ld a, $3 ld [wViridianGymCurScript], a -.asm_6dff7 +.done jp TextScriptEnd ViridianGymText_74ace: |