summaryrefslogtreecommitdiff
path: root/engine/battle/core.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-06-11 16:16:56 -0500
committerdannye <corrnondacqb@yahoo.com>2016-06-11 16:16:56 -0500
commitc979b3bb03b121dd03a800df74144cd69a74601a (patch)
tree0d6bb48125efe6f6215347967383ba4c3b7da391 /engine/battle/core.asm
parent269f2c3ba72776e975f5b00d9a1361cadbda42a7 (diff)
parent6e8c3883e430b567f7aa8f9230e366e03610bd5a (diff)
Merge branch 'master' of https://github.com/pret/pokeyellow
Diffstat (limited to 'engine/battle/core.asm')
-rwxr-xr-xengine/battle/core.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 665d79f7..24b3863b 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -1898,7 +1898,7 @@ SendOutMon: ; 3ccfb (f:4cfb)
ld [H_WHOSETURN], a
ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a
- callab Func_f429f
+ callab StarterPikachuBattleEntranceAnimation
callab IsPlayerPikachuAsleepInParty
ld e, $24
jr c, .asm_3cd81