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/devil.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/battle/anim/devil.c') diff --git a/src/battle/anim/devil.c b/src/battle/anim/devil.c index 345ee53ea..c628abfc0 100644 --- a/src/battle/anim/devil.c +++ b/src/battle/anim/devil.c @@ -5,7 +5,7 @@ #include "trig.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankTarget; void sub_80D2ABC(struct Sprite *sprite) { @@ -14,7 +14,7 @@ void sub_80D2ABC(struct Sprite *sprite) sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; StartSpriteAnim(sprite, 0); - sprite->subpriority = sub_8079E90(gBattleAnimBankTarget) - 1; + sprite->subpriority = sub_8079E90(gAnimBankTarget) - 1; sprite->data[2] = 1; } sprite->data[0] += sprite->data[2]; @@ -33,5 +33,5 @@ void sub_80D2ABC(struct Sprite *sprite) else sprite->invisible = FALSE; if (sprite->data[3] > 0x5A) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } -- cgit v1.2.3