diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-27 13:15:01 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-12-27 13:15:01 -0600 |
| commit | 16e0d8089194a8d098da47c7a7b07fbc4dcc0292 (patch) | |
| tree | b92766b1ed1710c7d8ea0492c160e0a39a3dc539 /src/battle/anim/thunder.c | |
| parent | 86a36767dba19e84297047addf1d1d776e2efdec (diff) | |
Port battle_anim changes from pokeemerald
Diffstat (limited to 'src/battle/anim/thunder.c')
| -rw-r--r-- | src/battle/anim/thunder.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/anim/thunder.c b/src/battle/anim/thunder.c index 5064148ef..2ed073221 100644 --- a/src/battle/anim/thunder.c +++ b/src/battle/anim/thunder.c @@ -3,8 +3,8 @@ #include "rom_8077ABC.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u16 gBattleTypeFlags; static void sub_80D6218(struct Sprite *); @@ -14,7 +14,7 @@ static void sub_80D6218(struct Sprite *); void sub_80D61C8(struct Sprite *sprite) { - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) { sprite->pos1.x -= gBattleAnimArgs[0]; } @@ -31,6 +31,6 @@ static void sub_80D6218(struct Sprite *sprite) { if (sprite->animEnded) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } |