summaryrefslogtreecommitdiff
path: root/src/battle/anim/tile.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-12-17 22:22:27 -0600
committerGitHub <noreply@github.com>2018-12-17 22:22:27 -0600
commit747a3b4b3e76db3a8f94bafcbe8d38e740850d59 (patch)
tree2e9f0cad82e7b8d8968db0d7fa750636eee470ed /src/battle/anim/tile.c
parentfa6429eaf842ea1db6122bc049de0c4efdd645a5 (diff)
parent00be991c66d37d090792db8bc1e4c1b9f9e88536 (diff)
Merge pull request #715 from shinny456/master
gAnimBankAttacker/Target to gBattleAnimAttacker/Target
Diffstat (limited to 'src/battle/anim/tile.c')
-rw-r--r--src/battle/anim/tile.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle/anim/tile.c b/src/battle/anim/tile.c
index de89b80a7..34695ecf4 100644
--- a/src/battle/anim/tile.c
+++ b/src/battle/anim/tile.c
@@ -6,8 +6,8 @@
#include "sound.h"
extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
extern u8 gBattlersCount;
extern u8 gHealthboxIDs[];
@@ -120,8 +120,8 @@ void sub_80CE09C(struct Sprite* sprite)
{
if (sprite->data[0] == 0)
{
- sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[0];
- sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[1];
+ sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[0];
+ sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[1];
if (IsContest())
sprite->pos1.y += 10;
sprite->data[0]++;
@@ -173,8 +173,8 @@ static void sub_80CE1AC(struct Sprite* sprite)
{
sprite->animPaused = 0;
sprite->data[0] = 30;
- sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
- sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+ sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+ sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
sprite->callback = StartAnimLinearTranslation;
StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
}