summaryrefslogtreecommitdiff
path: root/src/battle/anim/energy_wave.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle/anim/energy_wave.c')
-rw-r--r--src/battle/anim/energy_wave.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/battle/anim/energy_wave.c b/src/battle/anim/energy_wave.c
index cdf3e3ced..b165a7f28 100644
--- a/src/battle/anim/energy_wave.c
+++ b/src/battle/anim/energy_wave.c
@@ -6,8 +6,8 @@
#include "trig.h"
extern s16 gBattleAnimArgs[8];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
extern const union AffineAnimCmd *const gSpriteAffineAnimTable_83D752C[];
void sub_80D3554(struct Sprite *sprite);
@@ -166,9 +166,9 @@ void sub_80D3554(struct Sprite *sprite)
sprite->data[0] = 30;
sprite->data[1] = sprite->pos1.x;
- sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+ sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
sprite->data[3] = sprite->pos1.y;
- sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+ sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
InitAnimLinearTranslation(sprite);
@@ -228,15 +228,15 @@ void sub_80D3698(struct Sprite *sprite)
{
u8 subpriority;
- sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
- sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
+ sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+ sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
sprite->pos2.y = -10;
- subpriority = GetBattlerSubpriority(gAnimBankAttacker);
+ subpriority = GetBattlerSubpriority(gBattleAnimAttacker);
if (!IsContest())
{
- if (GetBattlerSide(gAnimBankAttacker) == 0)
+ if (GetBattlerSide(gBattleAnimAttacker) == 0)
{
sprite->pos2.x = 10;
sprite->subpriority = subpriority + 2;
@@ -268,11 +268,11 @@ void sub_80D3728(struct Sprite *sprite)
{
int var1, var2;
- if (GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget))
+ if (GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget))
{
gBattleAnimArgs[0] *= -1;
- if (GetBattlerPosition(gAnimBankAttacker) == 0 || GetBattlerPosition(gAnimBankAttacker) == 1)
+ if (GetBattlerPosition(gBattleAnimAttacker) == 0 || GetBattlerPosition(gBattleAnimAttacker) == 1)
{
gBattleAnimArgs[0] *= -1;
}
@@ -291,14 +291,14 @@ void sub_80D3728(struct Sprite *sprite)
InitAnimSpritePos(sprite, var1);
- if (GetBattlerSide(gAnimBankAttacker) != 0)
+ if (GetBattlerSide(gBattleAnimAttacker) != 0)
{
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
}
sprite->data[0] = gBattleAnimArgs[4];
- sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
- sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, var2) + gBattleAnimArgs[3];
+ sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2];
+ sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, var2) + gBattleAnimArgs[3];
sprite->callback = StartAnimLinearTranslation;
StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
}