summaryrefslogtreecommitdiff
path: root/src/battle/anim/bullet.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/bullet.c
parentfa6429eaf842ea1db6122bc049de0c4efdd645a5 (diff)
parent00be991c66d37d090792db8bc1e4c1b9f9e88536 (diff)
Merge pull request #715 from shinny456/master
gAnimBankAttacker/Target to gBattleAnimAttacker/Target
Diffstat (limited to 'src/battle/anim/bullet.c')
-rw-r--r--src/battle/anim/bullet.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/anim/bullet.c b/src/battle/anim/bullet.c
index a47cfeccc..043e70563 100644
--- a/src/battle/anim/bullet.c
+++ b/src/battle/anim/bullet.c
@@ -6,8 +6,8 @@
#include "random.h"
extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
void sub_80CFFD8(struct Sprite* sprite);
static void sub_80D0030(struct Sprite* sprite);
@@ -42,8 +42,8 @@ void sub_80CFFD8(struct Sprite* sprite)
{
InitAnimSpritePos(sprite, 1);
sprite->data[0] = 20;
- sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
- sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+ sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+ sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
sprite->callback = StartAnimLinearTranslation;
sprite->affineAnimPaused = 1;
StoreSpriteCallbackInData(sprite, sub_80D0030);