From 16e0d8089194a8d098da47c7a7b07fbc4dcc0292 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 27 Dec 2017 13:15:01 -0600 Subject: Port battle_anim changes from pokeemerald --- src/battle/anim/cyclone.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/battle/anim/cyclone.c') diff --git a/src/battle/anim/cyclone.c b/src/battle/anim/cyclone.c index b19304f17..0f83df211 100755 --- a/src/battle/anim/cyclone.c +++ b/src/battle/anim/cyclone.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // cyclone (creates a circling motion like a cyclone, usually a wind sprite.) // Used in Razor Wind. @@ -14,7 +14,7 @@ extern u8 gBattleAnimBankTarget; void sub_80D0118(struct Sprite* sprite) { sub_80787B0(sprite, 0); - if (GetBankSide(gBattleAnimBankAttacker) == 0) + if (GetBankSide(gAnimBankAttacker) == 0) sprite->pos1.y += 16; sprite->data[0] = gBattleAnimArgs[4]; @@ -23,6 +23,6 @@ void sub_80D0118(struct Sprite* sprite) sprite->data[3] = gBattleAnimArgs[6]; sprite->data[4] = gBattleAnimArgs[3]; sprite->callback = sub_8078114; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sprite->callback(sprite); } -- cgit v1.2.3