aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/beach_house.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2016-06-05 16:39:42 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2016-06-05 16:39:42 -0400
commit08fb4c22ef11f7ea99abe9c6ff0e73bbcd8fb239 (patch)
tree7b5d7d54ed3ce4cebd9b3e2809c5ce54e8eaddfd /scripts/beach_house.asm
parentMerge pull request #10 from PikalaxALT/master (diff)
parentThis looks like Gen 2's object animation engine (diff)
downloadpokeyellow-08fb4c22ef11f7ea99abe9c6ff0e73bbcd8fb239.tar.gz
pokeyellow-08fb4c22ef11f7ea99abe9c6ff0e73bbcd8fb239.tar.xz
pokeyellow-08fb4c22ef11f7ea99abe9c6ff0e73bbcd8fb239.zip
Merge pull request #11 from PikalaxALT/master
MILESTONE: Finish disassembly
Diffstat (limited to 'scripts/beach_house.asm')
-rw-r--r--scripts/beach_house.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/beach_house.asm b/scripts/beach_house.asm
index 6d53b7ce..fb0d78f2 100644
--- a/scripts/beach_house.asm
+++ b/scripts/beach_house.asm
@@ -35,7 +35,7 @@ SurfinDudeText:
jr nz, .asm_f226b
ld a, 1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
- callba Func_f8000
+ callba SurfingPikachuMinigame
ld hl, wPreventBlackout
set 1, [hl]
jr .done