summaryrefslogtreecommitdiff
path: root/src/battle/anim/note_spin.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-01-03 16:45:53 -0700
committerPikalaxALT <pikalaxalt@gmail.com>2018-01-03 16:45:53 -0700
commit4df728666e55b47480467fbea86f48dadcb81c97 (patch)
tree6a8413c90ec9d68c54389e1a54f6de9f12bb686c /src/battle/anim/note_spin.c
parent9b2ebe671fe77298d0b1adcb5d87cbb2bd01cd3e (diff)
parent397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (diff)
Merge branch 'master' into slot_machine
Diffstat (limited to 'src/battle/anim/note_spin.c')
-rw-r--r--src/battle/anim/note_spin.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/anim/note_spin.c b/src/battle/anim/note_spin.c
index bdc0f4615..026ee1856 100644
--- a/src/battle/anim/note_spin.c
+++ b/src/battle/anim/note_spin.c
@@ -4,8 +4,8 @@
#include "trig.h"
extern s16 gBattleAnimArgs[8];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
static void sub_80D2F80(struct Sprite *);
static void sub_80D2FA4(struct Sprite *);
@@ -28,7 +28,7 @@ void sub_80D2E68(struct Sprite *sprite)
if (sprite->data[0] == sprite->data[1] + 80)
{
- move_anim_8072740(sprite);
+ DestroyAnimSprite(sprite);
}
}
@@ -100,11 +100,11 @@ static void sub_80D2FA4(struct Sprite *sprite)
{
int var1 = sprite->data[2];
sprite->invisible = var1 - (((s32)(var1 + ((u32)var1 >> 31)) >> 1) << 1);
- move_anim_8072740(sprite);
+ DestroyAnimSprite(sprite);
}
if (sprite->data[4] == 4)
{
- move_anim_8072740(sprite);
+ DestroyAnimSprite(sprite);
}
}