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_6.c | |
parent | 86a36767dba19e84297047addf1d1d776e2efdec (diff) |
Port battle_anim changes from pokeemerald
Diffstat (limited to 'src/battle/anim/unused_6.c')
-rwxr-xr-x | src/battle/anim/unused_6.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/anim/unused_6.c b/src/battle/anim/unused_6.c index f7c87647f..37e2031b0 100755 --- a/src/battle/anim/unused_6.c +++ b/src/battle/anim/unused_6.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern void sub_80CEF44(u8 bank, struct Sprite* sprite); static void sub_80CF310(struct Sprite* sprite); @@ -17,9 +17,9 @@ void sub_80CF2D0(struct Sprite* sprite) { u8 bank; if (gBattleAnimArgs[0] == 0) - bank = gBattleAnimBankAttacker; + bank = gAnimBankAttacker; else - bank = gBattleAnimBankTarget; + bank = gAnimBankTarget; sub_80CEF44(bank, sprite); sprite->data[0] = 0; @@ -43,7 +43,7 @@ void sub_80CF310(struct Sprite* sprite) break; case 2: if (++sprite->data[1] == 0x40) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); break; } } |