summaryrefslogtreecommitdiff
path: root/src/battle/anim/homing.c
diff options
context:
space:
mode:
authorgarak <garakmon@gmail.com>2018-12-17 23:34:16 -0500
committerGitHub <noreply@github.com>2018-12-17 23:34:16 -0500
commit2fb6c5bb7f81c285d973d602dbbe4bbf8fc8aba1 (patch)
tree003c2daccebd740c288e537216afed0265bfbc59 /src/battle/anim/homing.c
parent32c7ec313deaccb4e3dcef5f9da7d9062d09fc27 (diff)
parent5f202c744b92dcde829c1d24ad323d824c769fec (diff)
Merge branch 'master' into createsprite
Diffstat (limited to 'src/battle/anim/homing.c')
-rw-r--r--src/battle/anim/homing.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle/anim/homing.c b/src/battle/anim/homing.c
index 4b2365542..874b9ea4e 100644
--- a/src/battle/anim/homing.c
+++ b/src/battle/anim/homing.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_80CC6CC(struct Sprite* sprite);
static void sub_80CC7D4(struct Sprite* sprite);
@@ -41,13 +41,13 @@ void sub_80CC6CC(struct Sprite* sprite)
{
if (gBattleAnimArgs[0] == 0)
{
- a = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
- b = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+ a = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+ b = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
}
else
{
- a = GetBattlerSpriteCoord(gAnimBankTarget, 2);
- b = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+ a = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+ b = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
}
sprite->data[0] = gBattleAnimArgs[4];