diff options
Diffstat (limited to 'src/battle/anim/whip.c')
-rwxr-xr-x | src/battle/anim/whip.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle/anim/whip.c b/src/battle/anim/whip.c index 3aa0758a9..cb3ce327e 100755 --- a/src/battle/anim/whip.c +++ b/src/battle/anim/whip.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // whip (does a hitting animation that uses a rotating sprite to invoke the sprite getting hit.) // Used by Slam and Vine Whip. @@ -14,13 +14,13 @@ extern u8 gBattleAnimBankTarget; void sub_80CC810(struct Sprite* sprite) { if (sprite->animEnded) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } // unused, beta effect for diagonal sprite movement? void sub_80CC82C(struct Sprite* sprite) { - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) { sprite->pos1.x -= gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; @@ -32,12 +32,12 @@ void sub_80CC82C(struct Sprite* sprite) } sprite->callback = sub_8078600; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } void sub_80CC884(struct Sprite* sprite) { - if (GetBankSide(gBattleAnimBankAttacker) == 0) + if (GetBankSide(gAnimBankAttacker) == 0) StartSpriteAnim(sprite, 1); sprite->callback = sub_80CC810; |