summaryrefslogtreecommitdiff
path: root/src/battle/anim/unused_4.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-01-04 18:50:53 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2018-01-04 18:50:53 -0500
commiteff6795887cc27f2c5139df9a6da70f4f02338b4 (patch)
treef91be2b0b7194b4ddff13f4935a0edafc4284a43 /src/battle/anim/unused_4.c
parent3ea9cff2c67b3db195c3326afc56fa0662c2327a (diff)
parentb1a7733c1cead8ed3d4a58c42d638afd0ead8ab0 (diff)
Merge branch 'master' into unk_text_8095904
Diffstat (limited to 'src/battle/anim/unused_4.c')
-rwxr-xr-xsrc/battle/anim/unused_4.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/anim/unused_4.c b/src/battle/anim/unused_4.c
index 72ecde05c..bda476a0a 100755
--- a/src/battle/anim/unused_4.c
+++ b/src/battle/anim/unused_4.c
@@ -5,8 +5,8 @@
#include "sound.h"
extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
extern u8 gObjectBankIDs[];
@@ -27,8 +27,8 @@ void sub_80CD9D4(struct Sprite* sprite)
{
case 0:
sprite->data[1] = 0;
- sprite->data[2] = gObjectBankIDs[gBattleAnimBankAttacker];
- sprite->data[3] = GetBankSide(gBattleAnimBankAttacker);
+ sprite->data[2] = gObjectBankIDs[gAnimBankAttacker];
+ sprite->data[3] = GetBankSide(gAnimBankAttacker);
sprite->data[4] = (sprite->data[3] != 0) ? 0x200 : -0x200;
sprite->data[5] = 0;
sub_8078E70(sprite->data[2], 0);
@@ -51,7 +51,7 @@ void sub_80CD9D4(struct Sprite* sprite)
if (++sprite->data[1] > 3)
{
sub_8078F40(sprite->data[2]);
- move_anim_8072740(sprite);
+ DestroyAnimSprite(sprite);
}
break;
}