summaryrefslogtreecommitdiff
path: root/src/battle/anim/orbit_scatter.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle/anim/orbit_scatter.c')
-rwxr-xr-xsrc/battle/anim/orbit_scatter.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/anim/orbit_scatter.c b/src/battle/anim/orbit_scatter.c
index 6cebc9375..54c157839 100755
--- a/src/battle/anim/orbit_scatter.c
+++ b/src/battle/anim/orbit_scatter.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_80D2834(struct Sprite* sprite);
@@ -15,8 +15,8 @@ static void sub_80D2834(struct Sprite* sprite);
void sub_80D27E0(struct Sprite* sprite)
{
- sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2);
- sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3);
+ sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
+ sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
sprite->data[0] = Sin(gBattleAnimArgs[0], 10);
sprite->data[1] = Cos(gBattleAnimArgs[0], 7);
sprite->callback = sub_80D2834;
@@ -27,5 +27,5 @@ void sub_80D2834(struct Sprite* sprite)
sprite->pos2.x += sprite->data[0];
sprite->pos2.y += sprite->data[1];
if (sprite->pos1.x + sprite->pos2.x + 16 > 0x110u || sprite->pos1.y + sprite->pos2.y > 0xA0 || sprite->pos1.y + sprite->pos2.y < -16)
- move_anim_8072740(sprite);
+ DestroyAnimSprite(sprite);
}