diff options
author | Marco Willems (M17.1) <progreon@gmail.com> | 2017-12-31 13:16:44 +0100 |
---|---|---|
committer | Marco Willems (M17.1) <progreon@gmail.com> | 2017-12-31 13:16:44 +0100 |
commit | d0ae8995292ce6483dc3fb656090425c4638bd4f (patch) | |
tree | 91015855cd1bc71bdf03b2806effae82ded2e0a3 /src/battle/anim/unused_4.c | |
parent | ba5e6c8a32c617f0d70e62968bf13023d1e1ff5e (diff) | |
parent | 153ddde3b90c893b47d5c844b2a58c707038e6b4 (diff) |
merged
Diffstat (limited to 'src/battle/anim/unused_4.c')
-rwxr-xr-x | src/battle/anim/unused_4.c | 10 |
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; } |