summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-25 19:18:16 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-25 19:18:16 -0400
commit76225997a6e18ccf9fbb5a2c710a546c7d8b098b (patch)
tree3894569b7684e0cf912a879f4060a3b86dfbaf64 /main.asm
parent9b4b0f179048915bb013e95a2342c574b0a9a5bf (diff)
Move stuff around and disassemble a random function
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm13
1 files changed, 12 insertions, 1 deletions
diff --git a/main.asm b/main.asm
index 06283594..5aea6d9b 100755
--- a/main.asm
+++ b/main.asm
@@ -948,7 +948,18 @@ INCLUDE "engine/bank3d.asm"
SECTION "bank3E",ROMX,BANK[$3E]
Func_f8000: ; f8000
- dr $f8000,$f982d
+ dr $f8000,$f8bcb
+
+Func_f8bcb: ; f8bcb
+ push de
+ callab IsSurfingPikachuInThePlayersParty
+ pop de
+ ret nc
+ callab PlayPikachuSoundClip
+ ret
+
+Func_f8bdf: ; f8bdf
+ dr $f8bdf,$f982d
PlayIntroScene: ; f982d (3e:582d)
dr $f982d,$fa35a