diff options
author | Marco Willems (M17.1) <progreon@gmail.com> | 2017-12-31 13:16:44 +0100 |
---|---|---|
committer | Marco Willems (M17.1) <progreon@gmail.com> | 2017-12-31 13:16:44 +0100 |
commit | d0ae8995292ce6483dc3fb656090425c4638bd4f (patch) | |
tree | 91015855cd1bc71bdf03b2806effae82ded2e0a3 /src/battle/anim/breath.c | |
parent | ba5e6c8a32c617f0d70e62968bf13023d1e1ff5e (diff) | |
parent | 153ddde3b90c893b47d5c844b2a58c707038e6b4 (diff) |
merged
Diffstat (limited to 'src/battle/anim/breath.c')
-rwxr-xr-x | src/battle/anim/breath.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/battle/anim/breath.c b/src/battle/anim/breath.c index 0fcc7fa08..831b222ad 100755 --- a/src/battle/anim/breath.c +++ b/src/battle/anim/breath.c @@ -5,32 +5,32 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // breath (a puff of smoke, usually from the mouth or nose of the Pokemon.) // Used in Swagger and Bulk Up. void sub_80D0930(struct Sprite* sprite) { - if (GetBankSide(gBattleAnimBankAttacker) == 0) + if (GetBankSide(gAnimBankAttacker) == 0) { StartSpriteAnim(sprite, 0); - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + 32; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + 32; sprite->data[1] = 0x40; } else { StartSpriteAnim(sprite, 1); - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) - 32; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) - 32; sprite->data[1] = -0x40; } - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); sprite->data[0] = 0x34; sprite->data[2] = 0; sprite->data[3] = 0; sprite->data[4] = 0; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sprite->callback = sub_8078394; } |