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/fuchsiagym.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/fuchsiagym.asm')
| -rwxr-xr-x | scripts/fuchsiagym.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/fuchsiagym.asm b/scripts/fuchsiagym.asm index 8268930d..364fca37 100755 --- a/scripts/fuchsiagym.asm +++ b/scripts/fuchsiagym.asm @@ -54,12 +54,12 @@ FuchsiaGymScript3_75497: ld [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM06 - jr .asm_754c0 + jr .gymVictory .BagFull ld a, $b ld [hSpriteIndexOrTextID], a call DisplayTextID -.asm_754c0 +.gymVictory ld hl, wObtainedBadges set 4, [hl] ld hl, wBeatGymFlags @@ -143,17 +143,17 @@ FuchsiaGymTrainerHeader6: FuchsiaGymText1: TX_ASM CheckEvent EVENT_BEAT_KOGA - jr z, .asm_181b6 + jr z, .beginBattle CheckEventReuseA EVENT_GOT_TM06 - jr nz, .asm_adc3b + jr nz, .afterVictory call z, FuchsiaGymScript3_75497 call DisableWaitingAfterTextDisplay - jr .asm_e84c6 -.asm_adc3b + jr .done +.afterVictory ld hl, KogaExplainToxicText call PrintText - jr .asm_e84c6 -.asm_181b6 + jr .done +.beginBattle ld hl, KogaBeforeBattleText call PrintText ld hl, wd72d @@ -172,7 +172,7 @@ FuchsiaGymText1: ld [hJoyHeld], a ld a, $3 ld [wFuchsiaGymCurScript], a -.asm_e84c6 +.done jp TextScriptEnd KogaBeforeBattleText: |