summaryrefslogtreecommitdiff
path: root/battle/objects/functions.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2016-01-27 12:25:12 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2016-01-27 12:25:12 -0500
commitb272c0c3754012f83129c23c2c546013cd1e80ef (patch)
tree6d9911898f8d6947ef59f71d08a78276cab6a631 /battle/objects/functions.asm
parentd02c9e39dd5138aa2d5e11178fcef7e2a58d4230 (diff)
Fix marts using hard-coded bank number
Diffstat (limited to 'battle/objects/functions.asm')
-rwxr-xr-xbattle/objects/functions.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/battle/objects/functions.asm b/battle/objects/functions.asm
index 7c1aa3764..474b332ef 100755
--- a/battle/objects/functions.asm
+++ b/battle/objects/functions.asm
@@ -274,7 +274,7 @@ BattleAnimFunction_12: ; cd15c (33:515c)
dw .ten
dw .eleven
.zero
- call GetBallAnimFunction
+ call GetBallAnimPal
call BattleAnim_IncAnonJumptableIndex
ret
@@ -342,7 +342,7 @@ BattleAnimFunction_12: ; cd15c (33:515c)
ret
.seven
- call GetBallAnimFunction
+ call GetBallAnimPal
ld a, $a
call ReinitBattleAnimFrameset
call BattleAnim_IncAnonJumptableIndex
@@ -382,7 +382,7 @@ BattleAnimFunction_13: ; cd212 (33:5212)
dw .one
dw .two
.zero
- call GetBallAnimFunction
+ call GetBallAnimPal
call BattleAnim_IncAnonJumptableIndex
ret
@@ -415,7 +415,7 @@ BattleAnimFunction_13: ; cd212 (33:5212)
call DeinitBattleAnimation
ret
-GetBallAnimFunction: ; cd249 (33:5249)
+GetBallAnimPal: ; cd249 (33:5249)
ld hl, .balls
ld a, [rSVBK]
push af