diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-03 16:45:53 -0700 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-03 16:45:53 -0700 |
commit | 4df728666e55b47480467fbea86f48dadcb81c97 (patch) | |
tree | 6a8413c90ec9d68c54389e1a54f6de9f12bb686c /src/battle/anim/sword.c | |
parent | 9b2ebe671fe77298d0b1adcb5d87cbb2bd01cd3e (diff) | |
parent | 397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (diff) |
Merge branch 'master' into slot_machine
Diffstat (limited to 'src/battle/anim/sword.c')
-rwxr-xr-x | src/battle/anim/sword.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/anim/sword.c b/src/battle/anim/sword.c index 536f89b26..b46fe6759 100755 --- a/src/battle/anim/sword.c +++ b/src/battle/anim/sword.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CF6B4(struct Sprite* sprite); @@ -26,5 +26,5 @@ void sub_80CF6B4(struct Sprite* sprite) sprite->data[2] = sprite->pos1.x; sprite->data[4] = sprite->pos1.y - 32; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } |