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/cinnabargym.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/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 1ebf943a..e2de3f6d 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/cinnabargym.asm @@ -211,12 +211,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 @@ -267,17 +267,17 @@ CinnabarGymScript_750c3: 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 |