summaryrefslogtreecommitdiff
path: root/src/battle/anim/copy_orb.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-04-06 18:18:35 -0700
committerGitHub <noreply@github.com>2018-04-06 18:18:35 -0700
commitbe66a5cfefe578a0efb42d47fe8ed1a08e7fe30a (patch)
tree137e905d499c0b3cabae75db88df52233604adc0 /src/battle/anim/copy_orb.c
parent18a6fb5c3fcdc852a8ee805ba02b2807938e1de8 (diff)
parent3571cb1d142090b59a9161a6bada11f0caf53b8c (diff)
Merge pull request #590 from huderlem/battle_9
Decompile battle_9
Diffstat (limited to 'src/battle/anim/copy_orb.c')
-rw-r--r--src/battle/anim/copy_orb.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/anim/copy_orb.c b/src/battle/anim/copy_orb.c
index 4fa8ea163..ac60d2c2b 100644
--- a/src/battle/anim/copy_orb.c
+++ b/src/battle/anim/copy_orb.c
@@ -16,14 +16,14 @@ void sub_80CB4CC(struct Sprite* sprite)
{
case 0:
{
- if (GetBankSide(gAnimBankTarget) == 0)
+ if (GetBattlerSide(gAnimBankTarget) == 0)
{
s16 a = gBattleAnimArgs[0];
gBattleAnimArgs[0] = -a;
}
- sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0) + gBattleAnimArgs[0];
- sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1) + gBattleAnimArgs[1];
+ sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[0];
+ sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[1];
sprite->invisible = 1;
sprite->data[0]++;
break;
@@ -35,8 +35,8 @@ void sub_80CB4CC(struct Sprite* sprite)
{
ChangeSpriteAffineAnim(sprite, 1);
sprite->data[0] = 25;
- sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2);
- sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3);
+ sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
+ sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
sprite->callback = sub_8078CC0;
StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
break;