aboutsummaryrefslogtreecommitdiffstats
path: root/engine/battle/16.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2015-02-13 14:50:56 -0800
committeryenatch <yenatch@gmail.com>2015-02-13 14:50:56 -0800
commitb65c6e815643a1cbce8c7c3cd48fc9881bb56d01 (patch)
tree151a1d0eda1b28d497f4ee8340141bd6f94c1fef /engine/battle/16.asm
parentrename hJoyHeldLast -> hJoyLast (diff)
parentRename some labels (diff)
downloadpokeyellow-b65c6e815643a1cbce8c7c3cd48fc9881bb56d01.tar.gz
pokeyellow-b65c6e815643a1cbce8c7c3cd48fc9881bb56d01.tar.xz
pokeyellow-b65c6e815643a1cbce8c7c3cd48fc9881bb56d01.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'engine/battle/16.asm')
-rwxr-xr-xengine/battle/16.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/battle/16.asm b/engine/battle/16.asm
index d1cecbbe..9a00bd98 100755
--- a/engine/battle/16.asm
+++ b/engine/battle/16.asm
@@ -55,7 +55,7 @@ PrintBeginningBattleText: ; 58d99 (16:4d99)
ld hl, UnveiledGhostText
call PrintText
callab LoadEnemyMonData
- callab Func_708ca
+ callab MarowakAnim
ld hl, WildMonAppearedText
call PrintText