summaryrefslogtreecommitdiff
path: root/src/battle/anim/unused_6.c
diff options
context:
space:
mode:
authorMarco Willems (M17.1) <progreon@gmail.com>2017-12-31 13:16:44 +0100
committerMarco Willems (M17.1) <progreon@gmail.com>2017-12-31 13:16:44 +0100
commitd0ae8995292ce6483dc3fb656090425c4638bd4f (patch)
tree91015855cd1bc71bdf03b2806effae82ded2e0a3 /src/battle/anim/unused_6.c
parentba5e6c8a32c617f0d70e62968bf13023d1e1ff5e (diff)
parent153ddde3b90c893b47d5c844b2a58c707038e6b4 (diff)
merged
Diffstat (limited to 'src/battle/anim/unused_6.c')
-rwxr-xr-xsrc/battle/anim/unused_6.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/anim/unused_6.c b/src/battle/anim/unused_6.c
index f7c87647f..37e2031b0 100755
--- a/src/battle/anim/unused_6.c
+++ b/src/battle/anim/unused_6.c
@@ -5,8 +5,8 @@
#include "sound.h"
extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
extern void sub_80CEF44(u8 bank, struct Sprite* sprite);
static void sub_80CF310(struct Sprite* sprite);
@@ -17,9 +17,9 @@ void sub_80CF2D0(struct Sprite* sprite)
{
u8 bank;
if (gBattleAnimArgs[0] == 0)
- bank = gBattleAnimBankAttacker;
+ bank = gAnimBankAttacker;
else
- bank = gBattleAnimBankTarget;
+ bank = gAnimBankTarget;
sub_80CEF44(bank, sprite);
sprite->data[0] = 0;
@@ -43,7 +43,7 @@ void sub_80CF310(struct Sprite* sprite)
break;
case 2:
if (++sprite->data[1] == 0x40)
- move_anim_8072740(sprite);
+ DestroyAnimSprite(sprite);
break;
}
}