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_2.c | |
parent | ba5e6c8a32c617f0d70e62968bf13023d1e1ff5e (diff) | |
parent | 153ddde3b90c893b47d5c844b2a58c707038e6b4 (diff) |
merged
Diffstat (limited to 'src/battle/anim/unused_2.c')
-rwxr-xr-x | src/battle/anim/unused_2.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/anim/unused_2.c b/src/battle/anim/unused_2.c index f7f5be88d..122f39e02 100755 --- a/src/battle/anim/unused_2.c +++ b/src/battle/anim/unused_2.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_80CCCB4(struct Sprite* sprite); @@ -42,14 +42,14 @@ void unref_sub_80CCB6C(struct Sprite* sprite) { DestroySprite(&gSprites[sprite->data[0]]); DestroySprite(&gSprites[sprite->data[1]]); - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } void sub_80CCC50(struct Sprite* sprite) { sprite->data[0] = gBattleAnimArgs[2]; - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) sprite->pos1.x -= gBattleAnimArgs[0]; else sprite->pos1.x += gBattleAnimArgs[0]; @@ -76,5 +76,5 @@ void sub_80CCCB4(struct Sprite* sprite) sprite->pos2.y += sprite->data[5] >> 8; sprite->data[2]++; if (sprite->data[2] == sprite->data[3]) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } |