summaryrefslogtreecommitdiff
path: root/src/battle/anim/grip.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/grip.c
parent32c7ec313deaccb4e3dcef5f9da7d9062d09fc27 (diff)
parent5f202c744b92dcde829c1d24ad323d824c769fec (diff)
Merge branch 'master' into createsprite
Diffstat (limited to 'src/battle/anim/grip.c')
-rw-r--r--src/battle/anim/grip.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/anim/grip.c b/src/battle/anim/grip.c
index 8cf4e4bf9..60d0a46ad 100644
--- a/src/battle/anim/grip.c
+++ b/src/battle/anim/grip.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_80D0178(struct Sprite* sprite);
static void sub_80D020C(struct Sprite* sprite);
@@ -65,8 +65,8 @@ void sub_80D0178(struct Sprite* sprite)
sprite->pos1.x += r7;
sprite->pos1.y += r4;
sprite->data[0] = 6;
- sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + r8;
- sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + r6;
+ sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + r8;
+ sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + r6;
sprite->callback = StartAnimLinearTranslation;
StoreSpriteCallbackInData(sprite, sub_80D020C);
}