Decompile/port rest of battle_anim plus fix 1 NONMATCHING.

40 files changed, 140 insertions, 140 deletions

diff --git a/src/battle/anim/anger.c b/src/battle/anim/anger.c
index 6ed40ad3c..041d35803 100644
--- a/src/battle/anim/anger.c
+++ b/src/battle/anim/anger.c
@@ -54,6 +54,6 @@ void sub_80D09C0(struct Sprite* sprite)
     if (sprite->pos1.y <= 7)
         sprite->pos1.y = 8;
 
-    StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
+    StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix);
     sprite->callback = sub_80785E4;
 }
diff --git a/src/battle/anim/beta_beat_up.c b/src/battle/anim/beta_beat_up.c
index 5671755b8..be712e87a 100644
--- a/src/battle/anim/beta_beat_up.c
+++ b/src/battle/anim/beta_beat_up.c
@@ -54,6 +54,6 @@ static void sub_80D6278(struct Sprite *sprite)
 {
     if (sprite->affineAnimEnded)
     {
-        move_anim_8074EE0(sprite);
+        DestroySpriteAndMatrix(sprite);
     }
 }
diff --git a/src/battle/anim/bubble.c b/src/battle/anim/bubble.c
index 1870b786d..168a65d88 100644
--- a/src/battle/anim/bubble.c
+++ b/src/battle/anim/bubble.c
@@ -135,5 +135,5 @@ static void sub_80D3398(struct Sprite *sprite)
 {
     sprite->data[0] = 10;
     sprite->callback = WaitAnimForDuration;
-    StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
+    StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix);
 }
diff --git a/src/battle/anim/bug.c b/src/battle/anim/bug.c
index 65b45b6cc..e693541bc 100644
--- a/src/battle/anim/bug.c
+++ b/src/battle/anim/bug.c
@@ -494,6 +494,6 @@ void sub_80DCE40(struct Sprite *sprite)
         sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + 18;
     }
 
-    StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
+    StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix);
     sprite->callback = sub_80785E4;
 }
diff --git a/src/battle/anim/current.c b/src/battle/anim/current.c
index 8621ca523..9b447ce5a 100644
--- a/src/battle/anim/current.c
+++ b/src/battle/anim/current.c
@@ -913,7 +913,7 @@ void sub_80D6D18(struct Sprite *sprite)
         sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     }
 
-    StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
+    StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix);
     sprite->callback = sub_80785E4;
 }
 
@@ -963,7 +963,7 @@ static void sub_80D6E38(struct Sprite *sprite)
         gSprites[sprite->data[6]].pos2.x += sprite->data[7];
         if ((u16)(sprite->pos1.x + 80) > 400)
         {
-            move_anim_8074EE0(sprite);
+            DestroySpriteAndMatrix(sprite);
         }
         break;
     }
@@ -1154,7 +1154,7 @@ void sub_80D727C(struct Sprite *sprite)
         break;
     case 1:
         if (sprite->affineAnimEnded)
-            move_anim_8074EE0(sprite);
+            DestroySpriteAndMatrix(sprite);
         break;
     }
 }
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;
diff --git a/src/battle/anim/dragon.c b/src/battle/anim/dragon.c
index cfb7576d6..b59e8aff4 100644
--- a/src/battle/anim/dragon.c
+++ b/src/battle/anim/dragon.c
@@ -215,7 +215,7 @@ void sub_80DF5A0(struct Sprite *sprite)
     sprite->data[3] = gBattleAnimArgs[4];
     sprite->data[5] = gBattleAnimArgs[5];
     sprite->invisible = 1;
-    StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
+    StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix);
     sprite->callback = sub_8078504;
 }
 
@@ -243,7 +243,7 @@ void sub_80DF63C(struct Sprite *sprite)
     }
     sprite->data[0] = gBattleAnimArgs[4];
     sprite->callback = StartAnimLinearTranslation;
-    StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
+    StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix);
 }
 
 // Dragon Rage
@@ -263,7 +263,7 @@ void sub_80DF6F0(struct Sprite *sprite)
     sub_807867C(sprite, gBattleAnimArgs[1]);
     sprite->pos1.y += gBattleAnimArgs[2];
     sprite->callback = sub_8078600;
-    StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
+    StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix);
 }
 
 // Dragon Breath init
@@ -286,8 +286,8 @@ void sub_80DF78C(struct Sprite *sprite)
     sprite->data[4] = 0;
     sprite->data[5] = 1;
     sprite->data[6] = gBattleAnimArgs[0];
-    r5 = sub_807A100(gBankAttacker, 0);
-    r0 = sub_807A100(gBankAttacker, 1);
+    r5 = GetBattlerSpriteCoordAttr(gBankAttacker, 0);
+    r0 = GetBattlerSpriteCoordAttr(gBankAttacker, 1);
     if (r5 > r0)
         sprite->data[7] = r5 / 2;
     else
diff --git a/src/battle/anim/draw.c b/src/battle/anim/draw.c
index 90a27eae6..34f661f6a 100644
--- a/src/battle/anim/draw.c
+++ b/src/battle/anim/draw.c
@@ -42,7 +42,7 @@ void sub_80D0C88(u8 taskId)
     task->data[3] = 0;
     task->data[4] = 0;
     task->data[5] = 0;
-    task->data[15] = sub_807A100(gBattleAnimTarget, 0);
+    task->data[15] = GetBattlerSpriteCoordAttr(gBattleAnimTarget, 0);
 
     if (GetBattlerPosition_permutated(gBattleAnimTarget) == 1)
     {
@@ -127,7 +127,7 @@ void sub_80D0E30(struct Sprite* sprite)
     sprite->data[2] = 0;
     sprite->data[3] = 16;
     sprite->data[4] = 0;
-    sprite->data[5] = sub_807A100(gBattleAnimTarget, 0) + 2;
+    sprite->data[5] = GetBattlerSpriteCoordAttr(gBattleAnimTarget, 0) + 2;
     sprite->data[6] = BattleAnimAdjustPanning(SOUND_PAN_TARGET);
     sprite->callback = sub_80D0E8C;
 }
diff --git a/src/battle/anim/espeed.c b/src/battle/anim/espeed.c
index 143510f3f..cd3b70542 100644
--- a/src/battle/anim/espeed.c
+++ b/src/battle/anim/espeed.c
@@ -63,14 +63,14 @@ void sub_80D15A4(u8 taskId)
     struct Task* task = &gTasks[taskId];
     u8 spriteId = GetAnimBattlerSpriteId(0);
     task->data[0] = spriteId;
-    sub_80798F4(task, spriteId, &gSpriteAffineAnim_83D79BC);
+    PrepareAffineAnimInTaskData(task, spriteId, &gSpriteAffineAnim_83D79BC);
     task->func = sub_80D15E0;
 }
 
 void sub_80D15E0(u8 taskId)
 {
     struct Task* task = &gTasks[taskId];
-    if (sub_807992C(task) == 0)
+    if (RunAffineAnimFromTaskData(task) == 0)
     {
         gSprites[task->data[0]].pos2.y = 0;
         gSprites[task->data[0]].invisible = 1;
diff --git a/src/battle/anim/fight.c b/src/battle/anim/fight.c
index 499cb0c98..f51a5c56c 100644
--- a/src/battle/anim/fight.c
+++ b/src/battle/anim/fight.c
@@ -505,8 +505,8 @@ void sub_80D90F4(struct Sprite *sprite)
     sprite->pos1.x = GetBattlerSpriteCoord(bank, 2);
     sprite->pos1.y = GetBattlerSpriteCoord(bank, 3);
 
-    xMod = sub_807A100(bank, 1) / 2;
-    yMod = sub_807A100(bank, 0) / 4;
+    xMod = GetBattlerSpriteCoordAttr(bank, 1) / 2;
+    yMod = GetBattlerSpriteCoordAttr(bank, 0) / 4;
 
     x = Random() % xMod;
     y = Random() % yMod;
@@ -819,12 +819,12 @@ void sub_80D97CC(struct Sprite *sprite)
     {
         sprite->pos1.x = GetBattlerSpriteCoord(gBankAttacker, 2);
         sprite->pos1.y = GetBattlerSpriteCoord(gBankAttacker, 3);
-        sprite->oam.priority = sub_8079ED4(gBattleAnimAttacker);
+        sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker);
         sprite->data[7] = gBattleAnimTarget;
     }
     else
     {
-        sprite->oam.priority = sub_8079ED4(gBattleAnimTarget);
+        sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget);
         sprite->data[7] = gBattleAnimAttacker;
     }
 
@@ -847,7 +847,7 @@ static void sub_80D986C(struct Sprite *sprite)
         sprite->data[4] = GetBattlerSpriteCoord(sprite->data[7], 3);
 
         InitAnimLinearTranslation(sprite);
-        StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
+        StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix);
         sprite->callback = TranslateAnimLinearUntil;
     }
 }
@@ -922,12 +922,12 @@ void sub_80D9A38(struct Sprite *sprite)
         sprite->pos1.x = GetBattlerSpriteCoord(gBankAttacker, 2);
         sprite->pos1.y = GetBattlerSpriteCoord(gBankAttacker, 3);
         bank = gBattleAnimTarget;
-        sprite->oam.priority = sub_8079ED4(gBattleAnimAttacker);
+        sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker);
     }
     else
     {
         bank = gBattleAnimAttacker;
-        sprite->oam.priority = sub_8079ED4(gBattleAnimTarget);
+        sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget);
     }
 
     if (IsContest())
diff --git a/src/battle/anim/finger.c b/src/battle/anim/finger.c
index 46e493de0..95e33ece5 100644
--- a/src/battle/anim/finger.c
+++ b/src/battle/anim/finger.c
@@ -153,7 +153,7 @@ static void sub_80CF088(struct Sprite* sprite)
     if (++sprite->data[0] > 16)
     {
         StartSpriteAffineAnim(sprite, 1);
-        StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
+        StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix);
         sprite->callback = sub_80785E4;
     }
 }
@@ -167,7 +167,7 @@ void sub_80CF0BC(struct Sprite* sprite)
         bank = gBattleAnimTarget;
 
     sprite->pos1.x = GetBattlerSpriteCoord(bank, 0);
-    sprite->pos1.y = sub_807A100(bank, 2);
+    sprite->pos1.y = GetBattlerSpriteCoordAttr(bank, 2);
     if (sprite->pos1.y <= 9)
         sprite->pos1.y = 10;
 
diff --git a/src/battle/anim/fire.c b/src/battle/anim/fire.c
index 09e83813b..795f68d8d 100644
--- a/src/battle/anim/fire.c
+++ b/src/battle/anim/fire.c
@@ -253,7 +253,7 @@ static void sub_80D5038(struct Sprite *sprite)
     }
 
     if (sprite->data[0] == sprite->data[1])
-        move_anim_8074EE0(sprite);
+        DestroySpriteAndMatrix(sprite);
 }
 
 void sub_80D5074(struct Sprite *sprite)
@@ -303,6 +303,6 @@ static void sub_80D50E8(struct Sprite *sprite)
     }
     else
     {
-        move_anim_8074EE0(sprite);
+        DestroySpriteAndMatrix(sprite);
     }
 }
diff --git a/src/battle/anim/flying.c b/src/battle/anim/flying.c
index f9f328283..1f36c933a 100644
--- a/src/battle/anim/flying.c
+++ b/src/battle/anim/flying.c
@@ -627,11 +627,11 @@ void sub_80DA4D8(struct Sprite *sprite)
     {
         if (gMain.inBattle)
         {
-            sprite->oam.priority = sub_8079ED4(slot) + 1;
+            sprite->oam.priority = GetBattlerSpriteBGPriority(slot) + 1;
         }
         else
         {
-            sprite->oam.priority = sub_8079ED4(slot);
+            sprite->oam.priority = GetBattlerSpriteBGPriority(slot);
         }
 
         ((u8 *) data)[14] = data[7] & -2;
@@ -647,7 +647,7 @@ void sub_80DA4D8(struct Sprite *sprite)
     }
     else
     {
-        sprite->oam.priority = sub_8079ED4(slot);
+        sprite->oam.priority = GetBattlerSpriteBGPriority(slot);
         ((u8 *) data)[14] |= 1;
 
         if (data[2] & 0x8000)
@@ -1881,7 +1881,7 @@ _080DAD2C: .4byte sub_80DA48C\n");
 
 void sub_80DAD30(struct Sprite *sprite)
 {
-    sprite->oam.priority = sub_8079ED4(gBattleAnimTarget);
+    sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget);
     sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
     sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->callback = TranslateAnimSpriteToTargetMonLocation;
@@ -1911,12 +1911,12 @@ void sub_80DAD84(struct Sprite * sprite)
 
         if (gBattleAnimArgs[4])
         {
-            sprite->oam.priority = sub_8079ED4(gBattleAnimTarget) + 1;
+            sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget) + 1;
             // 080dae24
         }
         else
         {
-            sprite->oam.priority = sub_8079ED4(gBattleAnimTarget);
+            sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget);
         }
     }
     else
@@ -2655,7 +2655,7 @@ void sub_80DB6A0(struct Sprite *sprite)
 
     if ((u16) (sprite->pos1.x + 0x2d) > 0x14a || sprite->pos1.y > 0x9d || sprite->pos1.y < -0x2d)
     {
-        move_anim_8074EE0(sprite);
+        DestroySpriteAndMatrix(sprite);
     }
 }
 
diff --git a/src/battle/anim/flying_path.c b/src/battle/anim/flying_path.c
index 6e7dd03f1..989cb598c 100644
--- a/src/battle/anim/flying_path.c
+++ b/src/battle/anim/flying_path.c
@@ -87,8 +87,8 @@ void sub_80CBDF4(u8 taskId)
     task->data[4] = GetBattlerSubpriority(gBattleAnimTarget) - 1;
     task->data[6] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
     task->data[7] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
-    task->data[10] = sub_807A100(gBattleAnimTarget, 1);
-    task->data[11] = sub_807A100(gBattleAnimTarget, 0);
+    task->data[10] = GetBattlerSpriteCoordAttr(gBattleAnimTarget, 1);
+    task->data[11] = GetBattlerSpriteCoordAttr(gBattleAnimTarget, 0);
     task->data[5] = (GetBattlerSide(gBattleAnimTarget) == 1) ? 1 : -1;
     task->data[9] = 0x38 - (task->data[5] * 64);
     task->data[8] = task->data[7] - task->data[9] + task->data[6];
diff --git a/src/battle/anim/flying_petals.c b/src/battle/anim/flying_petals.c
index 4d06b994e..7c70cc158 100644
--- a/src/battle/anim/flying_petals.c
+++ b/src/battle/anim/flying_petals.c
@@ -139,20 +139,20 @@ void sub_80CC474(struct Sprite* sprite)
     {
     case 0:
         sprite->pos1.y = gBattleAnimArgs[0];
-        sprite->oam.priority = sub_8079ED4(bank);
+        sprite->oam.priority = GetBattlerSpriteBGPriority(bank);
         break;
     case 1:
         sprite->pos1.y = gBattleAnimArgs[0];
-        sprite->oam.priority = sub_8079ED4(bank) + 1;
+        sprite->oam.priority = GetBattlerSpriteBGPriority(bank) + 1;
         break;
     case 2:
         sprite->pos1.y = GetBattlerSpriteCoord(bank, 3) + gBattleAnimArgs[0];
-        sprite->oam.priority = sub_8079ED4(bank);
+        sprite->oam.priority = GetBattlerSpriteBGPriority(bank);
         break;
     case 3:
         sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[0];
         GetAnimBattlerSpriteId(1);
-        sprite->oam.priority = sub_8079ED4(bank) + 1;
+        sprite->oam.priority = GetBattlerSpriteBGPriority(bank) + 1;
         break;
     }
 
@@ -177,5 +177,5 @@ static void sub_80CC580(struct Sprite* sprite)
             return;
     }
 
-    move_anim_8074EE0(sprite);
+    DestroySpriteAndMatrix(sprite);
 }
diff --git a/src/battle/anim/ghost.c b/src/battle/anim/ghost.c
index 6ff44ed15..0fc4f1dfe 100644
--- a/src/battle/anim/ghost.c
+++ b/src/battle/anim/ghost.c
@@ -461,7 +461,7 @@ static void AnimShadowBallStep(struct Sprite *sprite)
         sprite->data[0] += 1;
         break;
     case 3:
-        move_anim_8074EE0(sprite);
+        DestroySpriteAndMatrix(sprite);
         break;
     }
 }
@@ -852,7 +852,7 @@ void sub_80DE918(u8 taskId)
     task->data[10] = gBattleAnimArgs[0];
 
     baseX = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
-    baseY = sub_807A100(gBattleAnimAttacker, 3);
+    baseY = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, 3);
     if (!IsContest())
     {
         for (battler = 0; battler < 4; battler++)
@@ -865,7 +865,7 @@ void sub_80DE918(u8 taskId)
                 if (spriteId != MAX_SPRITES)
                 {
                     x = GetBattlerSpriteCoord(battler, 2);
-                    y = sub_807A100(battler, 3);
+                    y = GetBattlerSpriteCoordAttr(battler, 3);
                     gSprites[spriteId].data[0] = baseX << 4;
                     gSprites[spriteId].data[1] = baseY << 4;
                     gSprites[spriteId].data[2] = ((x - baseX) << 4) / gBattleAnimArgs[1];
@@ -1216,9 +1216,9 @@ void sub_80DF1A4(u8 taskId)
     task->data[1] = 16;
     task->data[9] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
     task->data[10] = sub_8077FC0(gBattleAnimAttacker);
-    task->data[11] = (sub_807A100(gBattleAnimAttacker, 1) / 2) + 8;
+    task->data[11] = (GetBattlerSpriteCoordAttr(gBattleAnimAttacker, 1) / 2) + 8;
     task->data[7] = 0;
-    task->data[5] = sub_8079ED4(gBattleAnimAttacker);
+    task->data[5] = GetBattlerSpriteBGPriority(gBattleAnimAttacker);
     task->data[6] = GetBattlerSubpriority(gBattleAnimAttacker) - 2;
     task->data[3] = 0;
     task->data[4] = 16;
@@ -1370,6 +1370,6 @@ static void sub_80DF4F4(struct Sprite *sprite)
         gSprites[sprite->data[5]].pos2.x = 0;
         gSprites[sprite->data[5]].pos2.y = 0;
         gSprites[sprite->data[5]].pos1.y -= 8;
-        sprite->callback = move_anim_8074EE0;
+        sprite->callback = DestroySpriteAndMatrix;
     }
 }
diff --git a/src/battle/anim/ground.c b/src/battle/anim/ground.c
index 8c8e1d2a7..2828be7be 100644
--- a/src/battle/anim/ground.c
+++ b/src/battle/anim/ground.c
@@ -234,7 +234,7 @@ static void AnimDirtScatter(struct Sprite *sprite)
     sprite->data[2] = targetXPos + xOffset;
     sprite->data[4] = targetYPos + yOffset;
     sprite->callback = StartAnimLinearTranslation;
-    StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
+    StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix);
 }
 
 // Moves a particle of dirt in the Mud Sport animation.
diff --git a/src/battle/anim/grow.c b/src/battle/anim/grow.c
index aeaeb2c30..65a1ce745 100644
--- a/src/battle/anim/grow.c
+++ b/src/battle/anim/grow.c
@@ -25,13 +25,13 @@ void sub_80D08C8(u8 taskId)
 {
     struct Task* task = &gTasks[taskId];
     u8 spriteId = GetAnimBattlerSpriteId(0);
-    sub_80798F4(task, spriteId, &gSpriteAffineAnim_83D7714);
+    PrepareAffineAnimInTaskData(task, spriteId, &gSpriteAffineAnim_83D7714);
     task->func = sub_80D0904;
 }
 
 static void sub_80D0904(u8 taskId)
 {
     struct Task* task = &gTasks[taskId];
-    if (!sub_807992C(task))
+    if (!RunAffineAnimFromTaskData(task))
         DestroyAnimVisualTask(taskId);
 }
diff --git a/src/battle/anim/homing.c b/src/battle/anim/homing.c
index 874b9ea4e..1b71ebd7a 100644
--- a/src/battle/anim/homing.c
+++ b/src/battle/anim/homing.c
@@ -93,6 +93,6 @@ static void sub_80CC7D4(struct Sprite* sprite)
     }
     else
     {
-        move_anim_8074EE0(sprite);
+        DestroySpriteAndMatrix(sprite);
     }
 }
diff --git a/src/battle/anim/ice.c b/src/battle/anim/ice.c
index b9f8f2f2c..fed21ebe9 100644
--- a/src/battle/anim/ice.c
+++ b/src/battle/anim/ice.c
@@ -872,7 +872,7 @@ static void AnimFlickerIceEffectParticle(struct Sprite *sprite)
     sprite->invisible ^= 1;
     sprite->data[0] += 1;
     if (sprite->data[0] == 20)
-        move_anim_8074EE0(sprite);
+        DestroySpriteAndMatrix(sprite);
 }
 
 // Animates the small snowballs that swirl around the target in Blizzard and Icy Wind.
@@ -1192,9 +1192,9 @@ static void AnimSwirlingFogAnim(struct Sprite *sprite)
         sprite->pos2.y += Cos(sprite->data[5], -6);
 
         if ((u16)(sprite->data[5] - 64) <= 0x7F)
-            sprite->oam.priority = sub_8079ED4(sprite->data[7]); 
+            sprite->oam.priority = GetBattlerSpriteBGPriority(sprite->data[7]); 
         else
-            sprite->oam.priority = sub_8079ED4(sprite->data[7]) + 1;
+            sprite->oam.priority = GetBattlerSpriteBGPriority(sprite->data[7]) + 1;
 
         sprite->data[5] = (sprite->data[5] + 3) & 0xFF;
     }
@@ -1438,7 +1438,7 @@ static void InitPoisonGasCloudAnim(struct Sprite *sprite)
         sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[3];
         sprite->data[3] = sprite->pos1.y + gBattleAnimArgs[2];
         sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[4];
-        sprite->data[7] |= sub_8079ED4(gBattleAnimTarget) << 8;
+        sprite->data[7] |= GetBattlerSpriteBGPriority(gBattleAnimTarget) << 8;
     }
     else
     {
@@ -1446,7 +1446,7 @@ static void InitPoisonGasCloudAnim(struct Sprite *sprite)
         sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[3];
         sprite->data[3] = sprite->pos1.y + gBattleAnimArgs[2];
         sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[4];
-        sprite->data[7] |= sub_8079ED4(gBattleAnimTarget) << 8;
+        sprite->data[7] |= GetBattlerSpriteBGPriority(gBattleAnimTarget) << 8;
     } 
 
     if (IsContest())
@@ -1968,13 +1968,13 @@ bool8 sub_80D8BA8(u8 a1, u8 a2, u8 a3, u8 a4)//(u8 spriteId, u8 taskId, u8 a3)//
         {
         case 0:
             //
-            r7 -= sub_807A100(GetBattlerAtPosition(gUnknown_083D9DC4[a1][2]), 1) / 6;
-            r6 -= sub_807A100(GetBattlerAtPosition(gUnknown_083D9DC4[a1][2]), 0) / 6;
+            r7 -= GetBattlerSpriteCoordAttr(GetBattlerAtPosition(gUnknown_083D9DC4[a1][2]), 1) / 6;
+            r6 -= GetBattlerSpriteCoordAttr(GetBattlerAtPosition(gUnknown_083D9DC4[a1][2]), 0) / 6;
             break;
         case 1:
             //
-            r7 += sub_807A100(GetBattlerAtPosition(gUnknown_083D9DC4[a1][2]), 1) / 6;
-            r6 += sub_807A100(GetBattlerAtPosition(gUnknown_083D9DC4[a1][2]), 0) / 6;
+            r7 += GetBattlerSpriteCoordAttr(GetBattlerAtPosition(gUnknown_083D9DC4[a1][2]), 1) / 6;
+            r6 += GetBattlerSpriteCoordAttr(GetBattlerAtPosition(gUnknown_083D9DC4[a1][2]), 0) / 6;
         }
     }
 
@@ -2072,7 +2072,7 @@ NAKED bool8 sub_80D8BA8(u8 a1, u8 a2, u8 a3, u8 a4)
                 "_080D8C24:\n"
                 "\tadds r0, r5, 0\n"
                 "\tmovs r1, 0x1\n"
-                "\tbl sub_807A100\n"
+                "\tbl GetBattlerSpriteCoordAttr\n"
                 "\tlsls r0, 16\n"
                 "\tasrs r0, 16\n"
                 "\tmovs r1, 0x6\n"
@@ -2084,7 +2084,7 @@ NAKED bool8 sub_80D8BA8(u8 a1, u8 a2, u8 a3, u8 a4)
                 "\tlsrs r7, r1, 16\n"
                 "\tadds r0, r5, 0\n"
                 "\tmovs r1, 0\n"
-                "\tbl sub_807A100\n"
+                "\tbl GetBattlerSpriteCoordAttr\n"
                 "\tlsls r0, 16\n"
                 "\tasrs r0, 16\n"
                 "\tmovs r1, 0x6\n"
@@ -2096,7 +2096,7 @@ NAKED bool8 sub_80D8BA8(u8 a1, u8 a2, u8 a3, u8 a4)
                 "_080D8C5A:\n"
                 "\tadds r0, r5, 0\n"
                 "\tmovs r1, 0x1\n"
-                "\tbl sub_807A100\n"
+                "\tbl GetBattlerSpriteCoordAttr\n"
                 "\tlsls r0, 16\n"
                 "\tasrs r0, 16\n"
                 "\tmovs r1, 0x6\n"
@@ -2108,7 +2108,7 @@ NAKED bool8 sub_80D8BA8(u8 a1, u8 a2, u8 a3, u8 a4)
                 "\tlsrs r7, r1, 16\n"
                 "\tadds r0, r5, 0\n"
                 "\tmovs r1, 0\n"
-                "\tbl sub_807A100\n"
+                "\tbl GetBattlerSpriteCoordAttr\n"
                 "\tlsls r0, 16\n"
                 "\tasrs r0, 16\n"
                 "\tmovs r1, 0x6\n"
diff --git a/src/battle/anim/leaf.c b/src/battle/anim/leaf.c
index 5f7f9d288..5b4c75080 100644
--- a/src/battle/anim/leaf.c
+++ b/src/battle/anim/leaf.c
@@ -295,11 +295,11 @@ static void AnimMoveTwisterParticleStep(struct Sprite* sprite)
     sprite->pos2.y = Sin(sprite->data[5], 5);
     if (sprite->data[5] <= 0x7F)
     {
-        sprite->oam.priority = sub_8079ED4(gBattleAnimTarget) - 1;
+        sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget) - 1;
     }
     else
     {
-        sprite->oam.priority = sub_8079ED4(gBattleAnimTarget) + 1;
+        sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget) + 1;
     }
 
     sprite->data[0]--;
diff --git a/src/battle/anim/musical.c b/src/battle/anim/musical.c
index 5e4e3e97b..1e559d975 100644
--- a/src/battle/anim/musical.c
+++ b/src/battle/anim/musical.c
@@ -265,7 +265,7 @@ static void sub_80CEC1C(struct Sprite* sprite)
 
     if ((u32)((c + 16) << 16) > (0x110) << 16 || a < -16 || a > 0x80)
     {
-        move_anim_8074EE0(sprite);
+        DestroySpriteAndMatrix(sprite);
     }
     else
     {
@@ -322,7 +322,7 @@ static void sub_80CED78(struct Sprite* sprite)
     }
 
     if (++sprite->data[0] == 0x30)
-        move_anim_8074EE0(sprite);
+        DestroySpriteAndMatrix(sprite);
 }
 
 // drum (using hands to slap the Pokemon's belly in a rhythm.)
diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c
index d42549fc7..4ac8737ad 100644
--- a/src/battle/anim/normal.c
+++ b/src/battle/anim/normal.c
@@ -457,7 +457,7 @@ static void sub_80E1F3C(struct Sprite *sprite)
     sprite->data[3] = 40;
     sprite->data[4] = 112;
     sprite->data[5] = 0;
-    StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
+    StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix);
     sprite->callback = sub_8078174;
     sprite->callback(sprite);
 }
@@ -895,7 +895,7 @@ static void sub_80E2870(struct Sprite *sprite)
     sprite->pos2.x += (Random() % 48) - 24;
     sprite->pos2.y += (Random() % 24) - 12;
 
-    StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
+    StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix);
     sprite->callback = sub_80785E4;
 }
 
@@ -907,7 +907,7 @@ static void sub_80E2908(struct Sprite *sprite)
     sprite->pos2.x = gBattleAnimArgs[1];
     sprite->pos2.y = gBattleAnimArgs[2];
     StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]);
-    StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
+    StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix);
     sprite->callback = sub_80785E4;
 }
 
diff --git a/src/battle/anim/orbit.c b/src/battle/anim/orbit.c
index 4d937a114..3f72d9246 100644
--- a/src/battle/anim/orbit.c
+++ b/src/battle/anim/orbit.c
@@ -110,11 +110,11 @@ static void sub_80CAC44(struct Sprite* sprite)
     sprite->pos2.y = Cos(sprite->data[1], -3) + ((sprite->data[2] += 24) >> 8);
     if ((u16)(sprite->data[1] - 0x40) < 0x80)
     {
-        sprite->oam.priority = (sub_8079ED4(gBattleAnimTarget) & 3);
+        sprite->oam.priority = (GetBattlerSpriteBGPriority(gBattleAnimTarget) & 3);
     }
     else
     {
-        var1 = sub_8079ED4(gBattleAnimTarget) + 1;
+        var1 = GetBattlerSpriteBGPriority(gBattleAnimTarget) + 1;
         if (var1 > 3)
         {
             var1 = 3;
diff --git a/src/battle/anim/orbs.c b/src/battle/anim/orbs.c
index 80cf97a5c..d0a5d26dc 100644
--- a/src/battle/anim/orbs.c
+++ b/src/battle/anim/orbs.c
@@ -197,7 +197,7 @@ void sub_80CA7B0(struct Sprite* sprite)
     sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
     sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->callback = StartAnimLinearTranslation;
-    StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
+    StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix);
 }
 
 void sub_80CA800(struct Sprite* sprite)
diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c
index 42a2ce387..84673097e 100644
--- a/src/battle/anim/psychic.c
+++ b/src/battle/anim/psychic.c
@@ -592,7 +592,7 @@ void sub_80DBA4C(struct Sprite *sprite)
     else
     {
         if (sprite->animEnded || sprite->affineAnimEnded)
-            move_anim_8074EE0(sprite);
+            DestroySpriteAndMatrix(sprite);
     }
 }
 
@@ -621,8 +621,8 @@ void sub_80DBAF4(struct Sprite *sprite)
 
 void sub_80DBB70(struct Sprite *sprite)
 {
-    s16 x = sub_807A100(gBattleAnimAttacker, 1) /  2;
-    s16 y = sub_807A100(gBattleAnimAttacker, 0) / -2;
+    s16 x = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, 1) /  2;
+    s16 y = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, 0) / -2;
 
     if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
     {
@@ -677,13 +677,13 @@ void sub_80DBC94(u8 taskId)
     struct Task *task = &gTasks[taskId];
     u8 spriteId = GetAnimBattlerSpriteId(0);
     task->data[0] = spriteId;
-    sub_80798F4(task, spriteId, &gSpriteAffineAnim_083DA8A4);
+    PrepareAffineAnimInTaskData(task, spriteId, &gSpriteAffineAnim_083DA8A4);
     task->func = sub_80DBCD0;
 }
 
 static void sub_80DBCD0(u8 taskId)
 {
-    if (!sub_807992C(&gTasks[taskId]))
+    if (!RunAffineAnimFromTaskData(&gTasks[taskId]))
     {
         DestroyAnimVisualTask(taskId);
     }
@@ -698,7 +698,7 @@ void sub_80DBCFC(u8 taskId)
     task->data[2] = 0;
     task->data[3] = GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER ? 4 : 8;
 
-    sub_80798F4(task, task->data[0], &gSpriteAffineAnim_083DA8C4);
+    PrepareAffineAnimInTaskData(task, task->data[0], &gSpriteAffineAnim_083DA8C4);
     task->func = sub_80DBD58;
 }
 
@@ -709,7 +709,7 @@ static void sub_80DBD58(u8 taskId)
     switch (task->data[1])
     {
     case 0:
-        sub_807992C(task);
+        RunAffineAnimFromTaskData(task);
         if (++task->data[2] > 19)
             task->data[1]++;
         break;
@@ -741,8 +741,8 @@ void sub_80DBE00(u8 taskId)
     task->data[13] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
     task->data[14] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
 
-    var0 = sub_807A100(gBattleAnimAttacker, 1) / 3;
-    var1 = sub_807A100(gBattleAnimAttacker, 0) / 3;
+    var0 = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, 1) / 3;
+    var1 = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, 0) / 3;
     task->data[12] = var0 > var1 ? var0 : var1;
 
     REG_BLDCNT = 0x3F40;
@@ -855,18 +855,18 @@ void sub_80DC0B0(u8 taskId)
         if (gBattleAnimArgs[0] == 1)
         {
             task->data[10] = -10;
-            task->data[11] = sub_807A100(gBattleAnimTarget, 5) - 8;
-            task->data[12] = sub_807A100(gBattleAnimTarget, 2) + 8;
-            task->data[13] = sub_807A100(gBattleAnimAttacker, 5) - 8;
-            task->data[14] = sub_807A100(gBattleAnimAttacker, 2) + 8;
+            task->data[11] = GetBattlerSpriteCoordAttr(gBattleAnimTarget, 5) - 8;
+            task->data[12] = GetBattlerSpriteCoordAttr(gBattleAnimTarget, 2) + 8;
+            task->data[13] = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, 5) - 8;
+            task->data[14] = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, 2) + 8;
         }
         else
         {
             task->data[10] = 10;
-            task->data[11] = sub_807A100(gBattleAnimAttacker, 4) + 8;
-            task->data[12] = sub_807A100(gBattleAnimAttacker, 3) - 8;
-            task->data[13] = sub_807A100(gBattleAnimTarget, 4) + 8;
-            task->data[14] = sub_807A100(gBattleAnimTarget, 3) - 8;
+            task->data[11] = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, 4) + 8;
+            task->data[12] = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, 3) - 8;
+            task->data[13] = GetBattlerSpriteCoordAttr(gBattleAnimTarget, 4) + 8;
+            task->data[14] = GetBattlerSpriteCoordAttr(gBattleAnimTarget, 3) - 8;
         }
     }
     else
@@ -874,18 +874,18 @@ void sub_80DC0B0(u8 taskId)
         if (gBattleAnimArgs[0] == 1)
         {
             task->data[10] = -10;
-            task->data[11] = sub_807A100(gBattleAnimTarget, 4) + 8;
-            task->data[12] = sub_807A100(gBattleAnimTarget, 2) + 8;
-            task->data[13] = sub_807A100(gBattleAnimAttacker, 4) + 8;
-            task->data[14] = sub_807A100(gBattleAnimAttacker, 2) + 8;
+            task->data[11] = GetBattlerSpriteCoordAttr(gBattleAnimTarget, 4) + 8;
+            task->data[12] = GetBattlerSpriteCoordAttr(gBattleAnimTarget, 2) + 8;
+            task->data[13] = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, 4) + 8;
+            task->data[14] = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, 2) + 8;
         }
         else
         {
             task->data[10] = 10;
-            task->data[11] = sub_807A100(gBattleAnimAttacker, 5) - 8;
-            task->data[12] = sub_807A100(gBattleAnimAttacker, 3) - 8;
-            task->data[13] = sub_807A100(gBattleAnimTarget, 5) - 8;
-            task->data[14] = sub_807A100(gBattleAnimTarget, 3) - 8;
+            task->data[11] = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, 5) - 8;
+            task->data[12] = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, 3) - 8;
+            task->data[13] = GetBattlerSpriteCoordAttr(gBattleAnimTarget, 5) - 8;
+            task->data[14] = GetBattlerSpriteCoordAttr(gBattleAnimTarget, 3) - 8;
         }
     }
 
diff --git a/src/battle/anim/rock.c b/src/battle/anim/rock.c
index 386ddfac7..d97076e89 100644
--- a/src/battle/anim/rock.c
+++ b/src/battle/anim/rock.c
@@ -351,7 +351,7 @@ static void sub_80DCF1C(struct Sprite *sprite)
     sprite->data[3] = 32;
     sprite->data[4] = -24;
 
-    StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
+    StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix);
     sprite->callback = sub_8078278;
     sprite->callback(sprite);
 }
@@ -379,7 +379,7 @@ void sub_80DCF60(struct Sprite *sprite)
     sprite->data[4] = 0;
 
     sprite->callback = sub_8078394;
-    StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
+    StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix);
 }
 
 void sub_80DCFE4(struct Sprite *sprite)
diff --git a/src/battle/anim/shield.c b/src/battle/anim/shield.c
index 9500d66c9..6e601efa3 100644
--- a/src/battle/anim/shield.c
+++ b/src/battle/anim/shield.c
@@ -36,9 +36,9 @@ void sub_80CCD24(struct Sprite* sprite)
     sprite->pos1.x = sub_8077EE4(gBattleAnimAttacker, 0) + gBattleAnimArgs[0];
     sprite->pos1.y = sub_8077EE4(gBattleAnimAttacker, 1) + gBattleAnimArgs[1];
     if (GetBattlerSide(gBattleAnimAttacker) == 0 || IsContest())
-        sprite->oam.priority = sub_8079ED4(gBattleAnimAttacker) + 1;
+        sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker) + 1;
     else
-        sprite->oam.priority = sub_8079ED4(gBattleAnimAttacker);
+        sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker);
 
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[2] = (IndexOfSpritePaletteTag(0x2828) << 4) + 0x100;
diff --git a/src/battle/anim/shock.c b/src/battle/anim/shock.c
index 4459e43b8..c6dfd09cc 100644
--- a/src/battle/anim/shock.c
+++ b/src/battle/anim/shock.c
@@ -85,7 +85,7 @@ void sub_80D6294(struct Sprite *sprite)
     sprite->data[2] = gBattleAnimArgs[3];
     sprite->data[3] = gBattleAnimArgs[4];
 
-    StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
+    StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix);
     sprite->callback = sub_8078114;
 }
 
@@ -142,7 +142,7 @@ void sub_80D6328(struct Sprite *sprite)
 
     if (gBattleAnimArgs[6] & 1)
     {
-        sprite->oam.priority = sub_8079ED4(slot) + 1;
+        sprite->oam.priority = GetBattlerSpriteBGPriority(slot) + 1;
     }
 
     matrixNum = sprite->oam.matrixNum;
diff --git a/src/battle/anim/sleep.c b/src/battle/anim/sleep.c
index 82822c931..7e202b8bb 100644
--- a/src/battle/anim/sleep.c
+++ b/src/battle/anim/sleep.c
@@ -97,5 +97,5 @@ static void sub_80CD394(struct Sprite* sprite)
     sprite->data[4] += sprite->data[3] * 2;
     sprite->data[0] += sprite->data[1];
     if (++sprite->data[1] > 0x3C)
-        move_anim_8074EE0(sprite);
+        DestroySpriteAndMatrix(sprite);
 }
diff --git a/src/battle/anim/splash.c b/src/battle/anim/splash.c
index 6bf59bc54..ad0fddd3f 100644
--- a/src/battle/anim/splash.c
+++ b/src/battle/anim/splash.c
@@ -39,7 +39,7 @@ void AnimTask_Splash(u8 taskId)
         task->data[2] = gBattleAnimArgs[1];
         task->data[3] = 0;
         task->data[4] = 0;
-        sub_80798F4(task, spriteId, &gSpriteAffineAnim_83D76F4);
+        PrepareAffineAnimInTaskData(task, spriteId, &gSpriteAffineAnim_83D76F4);
         task->func = AnimTask_SplashStep;
     }
 }
@@ -50,7 +50,7 @@ void AnimTask_SplashStep(u8 taskId)
     switch (task->data[1])
     {
     case 0:
-        sub_807992C(task);
+        RunAffineAnimFromTaskData(task);
         task->data[4] += 3;
         gSprites[task->data[0]].pos2.y += task->data[4];
         if (++task->data[3] > 7)
@@ -60,7 +60,7 @@ void AnimTask_SplashStep(u8 taskId)
         }
         break;
     case 1:
-        sub_807992C(task);
+        RunAffineAnimFromTaskData(task);
         gSprites[task->data[0]].pos2.y += task->data[4];
         if (++task->data[3] > 7)
         {
@@ -78,7 +78,7 @@ void AnimTask_SplashStep(u8 taskId)
             task->data[1]++;
         break;
     case 3:
-        if (!sub_807992C(task))
+        if (!RunAffineAnimFromTaskData(task))
         {
             if (--task->data[2] == 0)
             {
@@ -87,7 +87,7 @@ void AnimTask_SplashStep(u8 taskId)
             }
             else
             {
-                sub_80798F4(task, task->data[0], &gSpriteAffineAnim_83D76F4);
+                PrepareAffineAnimInTaskData(task, task->data[0], &gSpriteAffineAnim_83D76F4);
                 task->data[1] = 0;
             }
         }
diff --git a/src/battle/anim/startle.c b/src/battle/anim/startle.c
index fb1e0f375..c9a692318 100644
--- a/src/battle/anim/startle.c
+++ b/src/battle/anim/startle.c
@@ -24,13 +24,13 @@ void sub_80D1E38(u8 taskId)
     u8 spriteId = GetAnimBattlerSpriteId(1);
     if (++gTasks[taskId].data[0] == 1)
     {
-        sub_80798F4(&gTasks[taskId], GetAnimBattlerSpriteId(1), &gSpriteAffineAnim_83D7A98);
+        PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(1), &gSpriteAffineAnim_83D7A98);
         gSprites[spriteId].pos2.x = 4;
     }
     else
     {
         gSprites[spriteId].pos2.x = -gSprites[spriteId].pos2.x;
-        if (sub_807992C(&gTasks[taskId]) == 0)
+        if (RunAffineAnimFromTaskData(&gTasks[taskId]) == 0)
         {
             gSprites[spriteId].pos2.x = 0;
             gSprites[spriteId].pos2.y = 0;
@@ -45,13 +45,13 @@ void sub_80D1EC8(u8 taskId)
     u8 spriteId = GetAnimBattlerSpriteId(0);
     if (++gTasks[taskId].data[0] == 1)
     {
-        sub_80798F4(&gTasks[taskId], GetAnimBattlerSpriteId(0), &gSpriteAffineAnim_83D7A98);
+        PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(0), &gSpriteAffineAnim_83D7A98);
         gSprites[spriteId].pos2.x = 4;
     }
     else
     {
         gSprites[spriteId].pos2.x = -gSprites[spriteId].pos2.x;
-        if (sub_807992C(&gTasks[taskId]) == 0)
+        if (RunAffineAnimFromTaskData(&gTasks[taskId]) == 0)
         {
             gSprites[spriteId].pos2.x = 0;
             gSprites[spriteId].pos2.y = 0;
diff --git a/src/battle/anim/thought.c b/src/battle/anim/thought.c
index ee387040f..ff5b62181 100644
--- a/src/battle/anim/thought.c
+++ b/src/battle/anim/thought.c
@@ -72,11 +72,11 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7220 =
 void sub_80CEF44(u8 bank, struct Sprite* sprite)
 {
     if (GetBattlerSide(bank) == 0)
-        sprite->pos1.x = sub_807A100(bank, 5) + 8;
+        sprite->pos1.x = GetBattlerSpriteCoordAttr(bank, 5) + 8;
     else
-        sprite->pos1.x = sub_807A100(bank, 4) - 8;
+        sprite->pos1.x = GetBattlerSpriteCoordAttr(bank, 4) - 8;
 
-    sprite->pos1.y = GetBattlerSpriteCoord(bank, 3) - (s16)sub_807A100(bank, 0) / 4;
+    sprite->pos1.y = GetBattlerSpriteCoord(bank, 3) - (s16)GetBattlerSpriteCoordAttr(bank, 0) / 4;
 }
 
 void sub_80CEF9C(struct Sprite* sprite)
diff --git a/src/battle/anim/thrashing.c b/src/battle/anim/thrashing.c
index 2f00b1acc..f73c7e9bf 100644
--- a/src/battle/anim/thrashing.c
+++ b/src/battle/anim/thrashing.c
@@ -31,14 +31,14 @@ void sub_80D0A4C(u8 taskId)
     u8 spriteId = GetAnimBattlerSpriteId(0);
     task->data[0] = spriteId;
     task->data[1] = 0;
-    sub_80798F4(task, spriteId, &gSpriteAffineAnim_83D77B0);
+    PrepareAffineAnimInTaskData(task, spriteId, &gSpriteAffineAnim_83D77B0);
     task->func = sub_80D0A8C;
 }
 
 static void sub_80D0A8C(u8 taskId)
 {
     struct Task* task = &gTasks[taskId];
-    if (!sub_807992C(task))
+    if (!RunAffineAnimFromTaskData(task))
         DestroyAnimVisualTask(taskId);
 }
 
diff --git a/src/battle/anim/unused_1.c b/src/battle/anim/unused_1.c
index c9712de8f..b4af9fc00 100644
--- a/src/battle/anim/unused_1.c
+++ b/src/battle/anim/unused_1.c
@@ -84,6 +84,6 @@ void sub_80CC8C8(struct Sprite* sprite)
     sprite->data[3] = gBattleAnimArgs[4];
     sprite->data[5] = gBattleAnimArgs[5];
     StartSpriteAffineAnim(sprite, gBattleAnimArgs[6]);
-    StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
+    StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix);
     sprite->callback = sub_8078504;
 }
diff --git a/src/battle/anim/unused_5.c b/src/battle/anim/unused_5.c
index 98cd62bd0..9f7ce35ff 100644
--- a/src/battle/anim/unused_5.c
+++ b/src/battle/anim/unused_5.c
@@ -32,7 +32,7 @@ void sub_80CF280(struct Sprite* sprite)
     sprite->data[2] = gBattleAnimArgs[4];
     sprite->data[3] = gBattleAnimArgs[5];
     sprite->data[4] = gBattleAnimArgs[3];
-    StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
+    StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix);
     sprite->callback = sub_8078278;
     sub_8078278(sprite);
 }
diff --git a/src/battle/anim/unused_7.c b/src/battle/anim/unused_7.c
index d2ce1f0a8..f4acbbf7e 100644
--- a/src/battle/anim/unused_7.c
+++ b/src/battle/anim/unused_7.c
@@ -34,7 +34,7 @@ static void sub_80CF374(struct Sprite* sprite)
     if (sprite->data[0] == 0)
     {
         gSprites[sprite->data[2]].pos2.x = 0;
-        move_anim_8074EE0(sprite);
+        DestroySpriteAndMatrix(sprite);
     }
 
     sprite->data[0]--;
diff --git a/src/battle/anim/uproar.c b/src/battle/anim/uproar.c
index c78f89fef..b074cd729 100644
--- a/src/battle/anim/uproar.c
+++ b/src/battle/anim/uproar.c
@@ -20,12 +20,12 @@ void sub_80D2CF8(u8 taskId)
 {
     u8 spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
 
-    sub_80798F4(&gTasks[taskId], spriteId, gSpriteAffineAnim_83D7CA8);
+    PrepareAffineAnimInTaskData(&gTasks[taskId], spriteId, gSpriteAffineAnim_83D7CA8);
     gTasks[taskId].func = sub_80D2D3C;
 }
 
 static void sub_80D2D3C(u8 taskId)
 {
-    if (!sub_807992C(&gTasks[taskId]))
+    if (!RunAffineAnimFromTaskData(&gTasks[taskId]))
         DestroyAnimVisualTask(taskId);
 }
diff --git a/src/battle/anim/wisp_fire.c b/src/battle/anim/wisp_fire.c
index 714f59d71..f089c799a 100644
--- a/src/battle/anim/wisp_fire.c
+++ b/src/battle/anim/wisp_fire.c
@@ -68,9 +68,9 @@ void sub_80D5CC0(struct Sprite *sprite)
     if (gMain.inBattle)
     {
         if (sprite->data[1] < 64 || sprite->data[1] > 195)
-            sprite->oam.priority = sub_8079ED4(gBattleAnimTarget);
+            sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget);
         else
-            sprite->oam.priority = sub_8079ED4(gBattleAnimTarget) + 1;
+            sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget) + 1;
     }
     else
     {
diff --git a/src/battle/anim/wisp_orb.c b/src/battle/anim/wisp_orb.c
index dd04e258c..d1f25c09d 100644
--- a/src/battle/anim/wisp_orb.c
+++ b/src/battle/anim/wisp_orb.c
@@ -81,7 +81,7 @@ void sub_80D5B0C(struct Sprite *sprite)
             sprite->data[4] = -4;
         }
 
-        sprite->oam.priority = sub_8079ED4(gBattleAnimTarget);
+        sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget);
         sprite->data[0]++;
         break;
     case 1: