summaryrefslogtreecommitdiff
path: root/src/battle/anim/strike.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/strike.c
parentfa6429eaf842ea1db6122bc049de0c4efdd645a5 (diff)
parent00be991c66d37d090792db8bc1e4c1b9f9e88536 (diff)
Merge pull request #715 from shinny456/master
gAnimBankAttacker/Target to gBattleAnimAttacker/Target
Diffstat (limited to 'src/battle/anim/strike.c')
-rw-r--r--src/battle/anim/strike.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/anim/strike.c b/src/battle/anim/strike.c
index 0eba290a9..303a39d29 100644
--- a/src/battle/anim/strike.c
+++ b/src/battle/anim/strike.c
@@ -5,8 +5,8 @@
#include "sound.h"
extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
void sub_80CE670(struct Sprite* sprite);
static void sub_80CE798(struct Sprite* sprite);
@@ -64,8 +64,8 @@ void sub_80CE670(struct Sprite* sprite)
sprite->data[0] = 0;
sprite->data[1] = gBattleAnimArgs[2];
- sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[0];
- sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[1];
+ sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[0];
+ sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[1];
sprite->data[6] = sprite->pos1.x;
sprite->data[7] = sprite->pos1.y;
if (IsContest() != 0)
@@ -78,7 +78,7 @@ void sub_80CE670(struct Sprite* sprite)
sprite->data[4] = sprite->pos1.y << 7;
sprite->data[5] = -0xA00 / sprite->data[1];
}
- else if (GetBattlerSide(gAnimBankAttacker) == 0)
+ else if (GetBattlerSide(gBattleAnimAttacker) == 0)
{
sprite->pos1.x -= 40;
sprite->pos1.y += 20;