summaryrefslogtreecommitdiff
path: root/src/battle/anim/unused_3.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-12-27 13:15:01 -0600
committerMarcus Huderle <huderlem@gmail.com>2017-12-27 13:15:01 -0600
commit16e0d8089194a8d098da47c7a7b07fbc4dcc0292 (patch)
treeb92766b1ed1710c7d8ea0492c160e0a39a3dc539 /src/battle/anim/unused_3.c
parent86a36767dba19e84297047addf1d1d776e2efdec (diff)
Port battle_anim changes from pokeemerald
Diffstat (limited to 'src/battle/anim/unused_3.c')
-rwxr-xr-xsrc/battle/anim/unused_3.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/anim/unused_3.c b/src/battle/anim/unused_3.c
index 049e0ca1b..6dbcbfefe 100755
--- a/src/battle/anim/unused_3.c
+++ b/src/battle/anim/unused_3.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_80CD2D4(struct Sprite* sprite);
@@ -16,7 +16,7 @@ static void sub_80CD2D4(struct Sprite* sprite);
void sub_80CD274(struct Sprite* sprite)
{
sub_8078650(sprite);
- if (GetBankSide(gBattleAnimBankAttacker) == 0)
+ if (GetBankSide(gAnimBankAttacker) == 0)
{
sprite->pos1.x += gBattleAnimArgs[0];
sprite->pos1.y += gBattleAnimArgs[1];
@@ -41,5 +41,5 @@ void sub_80CD2D4(struct Sprite* sprite)
}
if (sprite->animEnded)
- move_anim_8072740(sprite);
+ DestroyAnimSprite(sprite);
}