summaryrefslogtreecommitdiff
path: root/src/battle/anim/roots.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/roots.c
parent4d3098e89b5aebf080547a99e68640138dc74599 (diff)
parentbe66a5cfefe578a0efb42d47fe8ed1a08e7fe30a (diff)
Merge branch 'master' into unk_debug_menu_3
Diffstat (limited to 'src/battle/anim/roots.c')
-rw-r--r--src/battle/anim/roots.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle/anim/roots.c b/src/battle/anim/roots.c
index 68f8a3e2f..30c2d9652 100644
--- a/src/battle/anim/roots.c
+++ b/src/battle/anim/roots.c
@@ -18,8 +18,8 @@ void sub_80CB59C(struct Sprite* sprite)
{
if (!sprite->data[0])
{
- sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
- sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1);
+ sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
+ sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
sprite->pos2.x = gBattleAnimArgs[0];
sprite->pos2.y = gBattleAnimArgs[1];
sprite->subpriority = gBattleAnimArgs[2] + 30;
@@ -36,10 +36,10 @@ void sub_80CB59C(struct Sprite* sprite)
void sub_80CB620(struct Sprite *sprite)
{
- s16 p1 = GetBankPosition(gAnimBankAttacker, 2);
- s16 p2 = GetBankPosition(gAnimBankAttacker, 3);
- s16 e1 = GetBankPosition(gAnimBankTarget, 2);
- s16 e2 = GetBankPosition(gAnimBankTarget, 3);
+ s16 p1 = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
+ s16 p2 = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+ s16 e1 = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+ s16 e2 = GetBattlerSpriteCoord(gAnimBankTarget, 3);
e1 -= p1;
e2 -= p2;