summaryrefslogtreecommitdiff
path: root/src/battle/anim/flying_petals.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle/anim/flying_petals.c')
-rwxr-xr-xsrc/battle/anim/flying_petals.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle/anim/flying_petals.c b/src/battle/anim/flying_petals.c
index ed6497b7a..4eeaa5215 100755
--- a/src/battle/anim/flying_petals.c
+++ b/src/battle/anim/flying_petals.c
@@ -5,8 +5,8 @@
#include "sound.h"
extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
static void sub_80CC580(struct Sprite* sprite);
@@ -17,9 +17,9 @@ void sub_80CC474(struct Sprite* sprite)
{
u8 bank;
if (!gBattleAnimArgs[6])
- bank = gBattleAnimBankAttacker;
+ bank = gAnimBankAttacker;
else
- bank = gBattleAnimBankTarget;
+ bank = gAnimBankTarget;
if (GetBankSide(bank) != 0)
{
@@ -48,11 +48,11 @@ void sub_80CC474(struct Sprite* sprite)
sprite->oam.priority = sub_8079ED4(bank) + 1;
break;
case 2:
- sprite->pos1.y = sub_8077ABC(bank, 3) + gBattleAnimArgs[0];
+ sprite->pos1.y = GetBankPosition(bank, 3) + gBattleAnimArgs[0];
sprite->oam.priority = sub_8079ED4(bank);
break;
case 3:
- sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[0];
+ sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[0];
GetAnimBankSpriteId(1);
sprite->oam.priority = sub_8079ED4(bank) + 1;
break;