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/fire.c | |
| parent | ba5e6c8a32c617f0d70e62968bf13023d1e1ff5e (diff) | |
| parent | 153ddde3b90c893b47d5c844b2a58c707038e6b4 (diff) | |
merged
Diffstat (limited to 'src/battle/anim/fire.c')
| -rw-r--r-- | src/battle/anim/fire.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle/anim/fire.c b/src/battle/anim/fire.c index 3cf633ab6..41a4a9592 100644 --- a/src/battle/anim/fire.c +++ b/src/battle/anim/fire.c @@ -4,7 +4,7 @@ #include "trig.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; +extern u8 gAnimBankAttacker; void sub_80D5038(struct Sprite *); void sub_80D50E8(struct Sprite *); @@ -15,7 +15,7 @@ void sub_80D4ED8(struct Sprite *sprite) { sprite->data[2] = 9; sprite->data[3] = 30; sprite->data[4] = 65024; - StoreSpriteCallbackInData(sprite, move_anim_8072740); // DestroyAnimSprite + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sprite->callback = sub_8078174; sub_8078174(sprite); } @@ -27,12 +27,12 @@ void sub_80D4F18(struct Sprite *sprite) { sprite->data[1] = gBattleAnimArgs[2]; sprite->data[2] = gBattleAnimArgs[3]; sprite->callback = sub_8078394; - StoreSpriteCallbackInData(sprite, move_anim_8072740); // DestroyAnimSprite + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } void sub_80D4F5C(struct Sprite *sprite) { sub_8078650(sprite); - if (GetBankSide(gBattleAnimBankAttacker) << 24) { // g.. = gAnimBankAttacker + if (GetBankSide(gAnimBankAttacker) << 24) { sprite->pos1.x = sprite->pos1.x - gBattleAnimArgs[0]; sprite->pos1.y = sprite->pos1.y + gBattleAnimArgs[1]; sprite->data[2] = -gBattleAnimArgs[4]; @@ -48,7 +48,7 @@ void sub_80D4F5C(struct Sprite *sprite) { } void sub_80D4FCC(struct Sprite *sprite) { - if (GetBankSide(gBattleAnimBankAttacker) << 24) { // g.. = gAnimBankAttacker + if (GetBankSide(gAnimBankAttacker) << 24) { sprite->pos1.x = sprite->pos1.x - gBattleAnimArgs[0]; sprite->pos1.y = sprite->pos1.y + gBattleAnimArgs[1]; sprite->data[2] = gBattleAnimArgs[4]; @@ -76,7 +76,7 @@ void sub_80D5038(struct Sprite *sprite) { void sub_80D5074(struct Sprite *sprite) { sub_8078650(sprite); - if (GetBankSide(gBattleAnimBankAttacker) << 24) { // g.. = gAnimBankAttacker + if (GetBankSide(gAnimBankAttacker) << 24) { sprite->pos1.x = sprite->pos1.x - gBattleAnimArgs[0]; } else { sprite->pos1.x = sprite->pos1.x + gBattleAnimArgs[0]; |