summaryrefslogtreecommitdiff
path: root/src/battle/anim/strike.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-04-06 21:31:08 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2018-04-06 21:31:08 -0400
commit07b800e593a3ac8dd1a9bcfb6cb2366cc5c27377 (patch)
treec77edf7fdacf36172bd3b6af790ad86111aef1fe /src/battle/anim/strike.c
parent4d3098e89b5aebf080547a99e68640138dc74599 (diff)
parentbe66a5cfefe578a0efb42d47fe8ed1a08e7fe30a (diff)
Merge branch 'master' into unk_debug_menu_3
Diffstat (limited to 'src/battle/anim/strike.c')
-rw-r--r--src/battle/anim/strike.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/anim/strike.c b/src/battle/anim/strike.c
index bfa1dc4f7..775485a79 100644
--- a/src/battle/anim/strike.c
+++ b/src/battle/anim/strike.c
@@ -23,8 +23,8 @@ void sub_80CE670(struct Sprite* sprite)
sprite->data[0] = 0;
sprite->data[1] = gBattleAnimArgs[2];
- sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[0];
- sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[1];
+ sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[0];
+ sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[1];
sprite->data[6] = sprite->pos1.x;
sprite->data[7] = sprite->pos1.y;
if (IsContest() != 0)
@@ -37,7 +37,7 @@ void sub_80CE670(struct Sprite* sprite)
sprite->data[4] = sprite->pos1.y << 7;
sprite->data[5] = -0xA00 / sprite->data[1];
}
- else if (GetBankSide(gAnimBankAttacker) == 0)
+ else if (GetBattlerSide(gAnimBankAttacker) == 0)
{
sprite->pos1.x -= 40;
sprite->pos1.y += 20;