summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-10-26 20:00:48 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-10-26 20:00:48 -0400
commit2ea331ebb341505df1cd8429b140c52e345a5af4 (patch)
tree5f6835bddbcf17656f31f4e71ef73cf608a1fabf /main.asm
parent2b7cb8a1d821108b8ee1551892a36371527c4ab9 (diff)
Revert "Revert "data/facing.asm, titlescreen functions, oam/sprite related functions, other misc functions""
This reverts commit c8ddbe7566120d74a5078d5a9031a6c5befde00d.
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