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_4.c | |
parent | 86a36767dba19e84297047addf1d1d776e2efdec (diff) |
Port battle_anim changes from pokeemerald
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; } |