diff options
Diffstat (limited to 'src/battle/anim/glitter.c')
-rwxr-xr-x | src/battle/anim/glitter.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/battle/anim/glitter.c b/src/battle/anim/glitter.c index 548397932..e4577f1e1 100755 --- a/src/battle/anim/glitter.c +++ b/src/battle/anim/glitter.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // glitter (the sparkling effect seen on Pokemon, usually after healing or a beneficial effect.) // Used by Heal Bell, Cosmic Power, and Aromatherapy. @@ -21,7 +21,7 @@ void sub_80CD140(struct Sprite* sprite) sprite->data[0] = gBattleAnimArgs[5]; sprite->data[1] = gBattleAnimArgs[3]; sprite->data[2] = gBattleAnimArgs[4]; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sprite->callback = sub_8078394; } @@ -29,9 +29,9 @@ void sub_80CD190(struct Sprite* sprite) { u8 bank; if (!gBattleAnimArgs[2]) - bank = gBattleAnimBankAttacker; + bank = gAnimBankAttacker; else - bank = gBattleAnimBankTarget; + bank = gAnimBankTarget; if (IsDoubleBattle() && IsAnimBankSpriteVisible(bank ^ 2)) { @@ -43,13 +43,13 @@ void sub_80CD190(struct Sprite* sprite) { if (!gBattleAnimArgs[6]) { - sprite->pos1.x = sub_8077ABC(bank, 0); - sprite->pos1.y = sub_8077ABC(bank, 1) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBankPosition(bank, 0); + sprite->pos1.y = GetBankPosition(bank, 1) + gBattleAnimArgs[1]; } else { - sprite->pos1.x = sub_8077ABC(bank, 2); - sprite->pos1.y = sub_8077ABC(bank, 3) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBankPosition(bank, 2); + sprite->pos1.y = GetBankPosition(bank, 3) + gBattleAnimArgs[1]; } sub_807867C(sprite, gBattleAnimArgs[0]); @@ -58,6 +58,6 @@ void sub_80CD190(struct Sprite* sprite) sprite->data[0] = gBattleAnimArgs[5]; sprite->data[1] = gBattleAnimArgs[3]; sprite->data[2] = gBattleAnimArgs[4]; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sprite->callback = sub_8078394; } |