1 files changed, 12 insertions, 12 deletions

diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c
index 45ef7b831..47f86b744 100644
--- a/src/battle/anim/dark.c
+++ b/src/battle/anim/dark.c
@@ -357,7 +357,7 @@ static void sub_80DFF98(struct Sprite *sprite)
     sprite->pos2.y = sprite->data[5] >> 8;
 
     if (--sprite->data[3] == 0)
-        move_anim_8074EE0(sprite);
+        DestroySpriteAndMatrix(sprite);
 }
 
 void sub_80DFFD0(struct Sprite *sprite)
@@ -376,22 +376,22 @@ void sub_80DFFD0(struct Sprite *sprite)
     switch (gBattleAnimArgs[1])
     {
     case 0:
-        sprite->pos1.x = sub_807A100(bank, 5) - 8;
-        sprite->pos1.y = sub_807A100(bank, 2) + 8;
+        sprite->pos1.x = GetBattlerSpriteCoordAttr(bank, 5) - 8;
+        sprite->pos1.y = GetBattlerSpriteCoordAttr(bank, 2) + 8;
         break;
     case 1:
-        sprite->pos1.x = sub_807A100(bank, 5) - 14;
-        sprite->pos1.y = sub_807A100(bank, 2) + 16;
+        sprite->pos1.x = GetBattlerSpriteCoordAttr(bank, 5) - 14;
+        sprite->pos1.y = GetBattlerSpriteCoordAttr(bank, 2) + 16;
         break;
     case 2:
-        sprite->pos1.x = sub_807A100(bank, 4) + 8;
-        sprite->pos1.y = sub_807A100(bank, 2) + 8;
+        sprite->pos1.x = GetBattlerSpriteCoordAttr(bank, 4) + 8;
+        sprite->pos1.y = GetBattlerSpriteCoordAttr(bank, 2) + 8;
         StartSpriteAffineAnim(sprite, 1);
         xOffset = -20;
         break;
     case 3:
-        sprite->pos1.x = sub_807A100(bank, 4) + 14;
-        sprite->pos1.y = sub_807A100(bank, 2) + 16;
+        sprite->pos1.x = GetBattlerSpriteCoordAttr(bank, 4) + 14;
+        sprite->pos1.y = GetBattlerSpriteCoordAttr(bank, 2) + 16;
         StartSpriteAffineAnim(sprite, 1);
         xOffset = -20;
         break;
@@ -409,7 +409,7 @@ void sub_80DFFD0(struct Sprite *sprite)
 static void sub_80E00D0(struct Sprite *sprite)
 {
     if (TranslateAnimArc(sprite))
-        move_anim_8074EE0(sprite);
+        DestroySpriteAndMatrix(sprite);
 }
 
 void sub_80E00EC(u8 taskId)
@@ -422,7 +422,7 @@ void sub_80E00EC(u8 taskId)
     struct Task *task = &gTasks[taskId];
 
     task->data[7] = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 31;
-    task->data[6] = sub_807A100(gBattleAnimAttacker, 2) - 7;
+    task->data[6] = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, 2) - 7;
     task->data[5] = task->data[7];
     task->data[4] = task->data[6];
     task->data[13] = (task->data[7] - task->data[6]) << 8;
@@ -600,7 +600,7 @@ void sub_80E03BC(u8 taskId)
         break;
     case 2:
         task->data[7] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 31;
-        task->data[6] = sub_807A100(gBattleAnimTarget, 2) - 7;
+        task->data[6] = GetBattlerSpriteCoordAttr(gBattleAnimTarget, 2) - 7;
         task->data[13] = (task->data[7] - task->data[6]) << 8;
         pos = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
         task->data[14] = pos - 4;