summaryrefslogtreecommitdiff
path: root/src/battle/anim/devil.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/devil.c
parent32c7ec313deaccb4e3dcef5f9da7d9062d09fc27 (diff)
parent5f202c744b92dcde829c1d24ad323d824c769fec (diff)
Merge branch 'master' into createsprite
Diffstat (limited to 'src/battle/anim/devil.c')
-rw-r--r--src/battle/anim/devil.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/anim/devil.c b/src/battle/anim/devil.c
index 8e1010d2b..cc96cc455 100644
--- a/src/battle/anim/devil.c
+++ b/src/battle/anim/devil.c
@@ -5,7 +5,7 @@
#include "trig.h"
extern s16 gBattleAnimArgs[8];
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimTarget;
void sub_80D2ABC(struct Sprite *sprite);
@@ -45,7 +45,7 @@ void sub_80D2ABC(struct Sprite *sprite)
sprite->pos1.x += gBattleAnimArgs[0];
sprite->pos1.y += gBattleAnimArgs[1];
StartSpriteAnim(sprite, 0);
- sprite->subpriority = GetBattlerSubpriority(gAnimBankTarget) - 1;
+ sprite->subpriority = GetBattlerSubpriority(gBattleAnimTarget) - 1;
sprite->data[2] = 1;
}
sprite->data[0] += sprite->data[2];