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/ceruleangym.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/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 448ce744..78ed1fed 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/ceruleangym.asm @@ -54,13 +54,13 @@ 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 @@ -104,17 +104,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 @@ -133,7 +133,7 @@ CeruleanGymText1: ld [hJoyHeld], a ld a, $3 ld [wCeruleanGymCurScript], a -.asm_5c7bb +.done jp TextScriptEnd CeruleanGymText_5c7be: |