summaryrefslogtreecommitdiff
path: root/src/battle/anim/bubble.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-04-06 16:24:35 -0700
committerMarcus Huderle <huderlem@gmail.com>2018-04-06 16:24:35 -0700
commitc36715e3b692ac116a5f8d32b5c2bde7d5ce8f8e (patch)
tree23e6352ca5c60b10723b152aa08cdae799393767 /src/battle/anim/bubble.c
parent818801cf5ab0c696f2460922753f921726aac6bb (diff)
Use 'battler' instead of 'bank'
Diffstat (limited to 'src/battle/anim/bubble.c')
-rw-r--r--src/battle/anim/bubble.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle/anim/bubble.c b/src/battle/anim/bubble.c
index b118b5f90..27791eedf 100644
--- a/src/battle/anim/bubble.c
+++ b/src/battle/anim/bubble.c
@@ -21,13 +21,13 @@ void sub_80D31C8(struct Sprite* sprite)
if (GetBattlerSide(gAnimBankAttacker) != 0)
{
- sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) - gBattleAnimArgs[0];
- sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[1];
+ sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) - gBattleAnimArgs[0];
+ sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[1];
}
else
{
- sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[0];
- sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[1];
+ sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[0];
+ sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[1];
}
sprite->animPaused = 1;
@@ -39,9 +39,9 @@ void sub_80D31C8(struct Sprite* sprite)
sprite->data[0] = gBattleAnimArgs[6];
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);
InitAnimSpriteTranslationDeltas(sprite);