summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-10-24 17:35:57 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-10-24 17:35:57 -0400
commit3a5d7ec05db9ce1156863983a0427396d6f6f49b (patch)
treeb85979ed890027d54edcd4deca8be46dbf10cbf7 /main.asm
parentbb97b63af1fbeca208cb30a41f8195b4408821dc (diff)
data/facing.asm, titlescreen functions, oam/sprite related functions, other misc functions
Also rename pcm-related functions.
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/main.asm b/main.asm
index 1b29f91c..37bc0fd8 100755
--- a/main.asm
+++ b/main.asm
@@ -2540,7 +2540,7 @@ ApplyOutOfBattlePoisonDamage: ; c3de (3:43de)
callab IsThisPartymonOurPikachu
jr nc, .curMonNotPlayerPikachu
ld e, $3
- callab Func_f0000
+ callab PlayPikachuSoundClip
callab_ModifyPikachuHappiness_ld_d PIKAHAPPY_PSNFNT
.curMonNotPlayerPikachu
pop de