summaryrefslogtreecommitdiff
path: root/src/battle/anim/sleep.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-01-05 18:53:19 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2018-01-05 18:53:19 -0500
commitf6527d12428c8a8bd2561c3da50ebb36968e061c (patch)
tree1882d862a18e61ddddf94dee1f9b4dae43336538 /src/battle/anim/sleep.c
parentcbd3aa95d12bab05042025bd143a2a7cacf0b86d (diff)
parentf5fbe5b66226f4e7e38fe5d4638831d1ce19b36b (diff)
Merge branch 'master' into cable_car
Diffstat (limited to 'src/battle/anim/sleep.c')
-rwxr-xr-xsrc/battle/anim/sleep.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/anim/sleep.c b/src/battle/anim/sleep.c
index 58ecc702f..0f0e54f80 100755
--- a/src/battle/anim/sleep.c
+++ b/src/battle/anim/sleep.c
@@ -5,8 +5,8 @@
#include "sound.h"
extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
static void sub_80CD394(struct Sprite* sprite);
@@ -16,7 +16,7 @@ static void sub_80CD394(struct Sprite* sprite);
void sub_80CD328(struct Sprite* sprite)
{
sub_8078650(sprite);
- if (GetBankSide(gBattleAnimBankAttacker) == 0)
+ if (GetBankSide(gAnimBankAttacker) == 0)
{
sprite->pos1.x += gBattleAnimArgs[0];
sprite->pos1.y += gBattleAnimArgs[1];