diff options
author | Marcus Huderle <huderlem@gmail.com> | 2017-12-27 13:15:01 -0600 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2017-12-27 13:15:01 -0600 |
commit | 16e0d8089194a8d098da47c7a7b07fbc4dcc0292 (patch) | |
tree | b92766b1ed1710c7d8ea0492c160e0a39a3dc539 /src/battle/anim/unused_2.c | |
parent | 86a36767dba19e84297047addf1d1d776e2efdec (diff) |
Port battle_anim changes from pokeemerald
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); } |