summaryrefslogtreecommitdiff
path: root/src/battle/anim/wisp_orb.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/wisp_orb.c
parent4d3098e89b5aebf080547a99e68640138dc74599 (diff)
parentbe66a5cfefe578a0efb42d47fe8ed1a08e7fe30a (diff)
Merge branch 'master' into unk_debug_menu_3
Diffstat (limited to 'src/battle/anim/wisp_orb.c')
-rw-r--r--src/battle/anim/wisp_orb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/anim/wisp_orb.c b/src/battle/anim/wisp_orb.c
index 7c22b7f13..90b90acb7 100644
--- a/src/battle/anim/wisp_orb.c
+++ b/src/battle/anim/wisp_orb.c
@@ -25,7 +25,7 @@ void sub_80D5B0C(struct Sprite *sprite)
StartSpriteAnim(sprite, gBattleAnimArgs[2]);
sprite->data[7] = gBattleAnimArgs[2];
- if (GetBankSide(gAnimBankAttacker) != 0)
+ if (GetBattlerSide(gAnimBankAttacker) != 0)
{
sprite->data[4] = 4;
}
@@ -39,7 +39,7 @@ void sub_80D5B0C(struct Sprite *sprite)
break;
case 1:
sprite->data[1] += 192;
- if (GetBankSide(gAnimBankAttacker) != 0)
+ if (GetBattlerSide(gAnimBankAttacker) != 0)
{
sprite->pos2.y = -(sprite->data[1] >> 8);
}
@@ -70,9 +70,9 @@ void sub_80D5B0C(struct Sprite *sprite)
sprite->data[0] = 256;
sprite->data[1] = sprite->pos1.x;
- sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
+ sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
sprite->data[3] = sprite->pos1.y;
- sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
+ sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
sub_8078BD4(sprite);
sprite->callback = sub_80D5C5C;