Merge branch 'master' of https://github.com/pret/pokeruby into visual_studio

50 files changed, 454 insertions, 379 deletions

diff --git a/src/battle/anim/aurora.c b/src/battle/anim/aurora.c
index 90fa5c879..b24809264 100644
--- a/src/battle/anim/aurora.c
+++ b/src/battle/anim/aurora.c
@@ -16,7 +16,7 @@ void sub_80D33B4(struct Sprite *sprite)
 {
     s16 r6;
 
-    sub_80787B0(sprite, 1);
+    InitAnimSpritePos(sprite, 1);
     if (GetBankSide(gAnimBankAttacker) != 0)
         r6 = -gBattleAnimArgs[2];
     else
@@ -26,7 +26,7 @@ void sub_80D33B4(struct Sprite *sprite)
     sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + r6;
     sprite->data[3] = sprite->pos1.y;
     sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
-    obj_translate_based_on_private_1_2_3_4(sprite);
+    InitAnimSpriteTranslationDeltas(sprite);
     sprite->callback = sub_80D344C;
     sprite->affineAnimPaused = TRUE;
     sprite->callback(sprite);
@@ -39,7 +39,7 @@ static void sub_80D344C(struct Sprite *sprite)
         StartSpriteAnim(sprite, 1);
         sprite->affineAnimPaused = FALSE;
     }
-    if (sub_8078B5C(sprite) != 0)
+    if (TranslateAnimSpriteByDeltas(sprite) != 0)
         DestroyAnimSprite(sprite);
 }
 
diff --git a/src/battle/anim/blow_kiss.c b/src/battle/anim/blow_kiss.c
index e7b49471d..f585b74bc 100644
--- a/src/battle/anim/blow_kiss.c
+++ b/src/battle/anim/blow_kiss.c
@@ -15,19 +15,19 @@ static void sub_80D1FA4(struct Sprite* sprite);
 
 void sub_80D1F58(struct Sprite* sprite)
 {
-    sub_80787B0(sprite, 1);
+    InitAnimSpritePos(sprite, 1);
     sprite->data[0] = 0x5F;
     sprite->data[1] = sprite->pos1.x;
     sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
     sprite->data[3] = sprite->pos1.y;
     sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
-    obj_translate_based_on_private_1_2_3_4(sprite);
+    InitAnimSpriteTranslationDeltas(sprite);
     sprite->callback = sub_80D1FA4;
 }
 
 void sub_80D1FA4(struct Sprite* sprite)
 {
-    if (sub_8078B5C(sprite) == 0)
+    if (TranslateAnimSpriteByDeltas(sprite) == 0)
     {
         sprite->pos2.y += Sin(sprite->data[5], 14);
         sprite->data[5] = (sprite->data[5] + 4) & 0xFF;
diff --git a/src/battle/anim/bubble.c b/src/battle/anim/bubble.c
index 403003ce3..1252c1315 100644
--- a/src/battle/anim/bubble.c
+++ b/src/battle/anim/bubble.c
@@ -43,7 +43,7 @@ void sub_80D31C8(struct Sprite* sprite)
     sprite->data[3] = sprite->pos1.y;
     sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
 
-    obj_translate_based_on_private_1_2_3_4(sprite);
+    InitAnimSpriteTranslationDeltas(sprite);
 
     newSpriteId = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy);
     sprite->data[5] = newSpriteId;
@@ -69,7 +69,7 @@ static void sub_80D32E8(struct Sprite *sprite)
     u16 index = gSprites[spriteId].data[3];
 
     sprite->data[0] = 1;
-    sub_8078B5C(sprite);
+    TranslateAnimSpriteByDeltas(sprite);
 
     sprite->pos2.x += Sin(index / 256, gSprites[spriteId].data[0]);
     sprite->pos2.y += Cos(index / 256, gSprites[spriteId].data[1]);
diff --git a/src/battle/anim/bug.c b/src/battle/anim/bug.c
index dbc0f75a5..e12f55a8b 100644
--- a/src/battle/anim/bug.c
+++ b/src/battle/anim/bug.c
@@ -40,7 +40,7 @@ void sub_80DC824(struct Sprite *sprite)
     sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
     sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
 
-    sprite->callback = sub_8078B34;
+    sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
@@ -65,7 +65,7 @@ void sub_80DC8F4(struct Sprite *sprite)
     sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
     sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
 
-    sprite->callback = sub_8078B34;
+    sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
@@ -76,7 +76,7 @@ void sub_80DC9A0(struct Sprite *sprite)
     if (IsContest())
         gBattleAnimArgs[2] /= 2;
 
-    sub_80787B0(sprite, 1);
+    InitAnimSpritePos(sprite, 1);
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = sprite->pos1.x;
     sprite->data[3] = sprite->pos1.y;
@@ -88,7 +88,7 @@ void sub_80DC9A0(struct Sprite *sprite)
     }
     else
     {
-        sub_807A3FC(gAnimBankTarget, 1, &sprite->data[2], &sprite->data[4]);
+        SetAverageBattlerPositions(gAnimBankTarget, 1, &sprite->data[2], &sprite->data[4]);
     }
 
     sub_8078BD4(sprite);
@@ -98,7 +98,7 @@ void sub_80DC9A0(struct Sprite *sprite)
 
 static void sub_80DCA38(struct Sprite *sprite)
 {
-    if (sub_8078B5C(sprite))
+    if (TranslateAnimSpriteByDeltas(sprite))
     {
         DestroyAnimSprite(sprite);
         return;
@@ -111,7 +111,7 @@ static void sub_80DCA38(struct Sprite *sprite)
 // used in Move_STRING_SHOT
 void sub_80DCA70(struct Sprite *sprite)
 {
-    sub_807A3FC(gAnimBankTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
+    SetAverageBattlerPositions(gAnimBankTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
     if (GetBankSide(gAnimBankAttacker))
         sprite->pos1.x -= gBattleAnimArgs[0];
     else
@@ -212,7 +212,7 @@ void sub_80DCBCC(struct Sprite *sprite)
         }
     }
 
-    sub_80787B0(sprite, 1);
+    InitAnimSpritePos(sprite, 1);
 
     lVarX = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
     lVarY = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
@@ -224,7 +224,7 @@ void sub_80DCBCC(struct Sprite *sprite)
     sprite->data[2] = lVarX;
     sprite->data[4] = lVarY;
 
-    sprite->callback = sub_8078B34;
+    sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
@@ -232,7 +232,7 @@ void sub_80DCBCC(struct Sprite *sprite)
 //         Move_PIN_MISSILE, Move_ICICLE_SPEAR
 void sub_80DCCFC(struct Sprite *sprite)
 {
-    sub_80787B0(sprite, 1);
+    InitAnimSpritePos(sprite, 1);
 
     if (GetBankSide(gAnimBankAttacker))
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
@@ -251,7 +251,7 @@ void sub_80DCD78(struct Sprite *sprite)
 {
     sprite->invisible = FALSE;
 
-    if (sub_8078718(sprite))
+    if (TranslateAnimSpriteLinearAndSine(sprite))
     {
         DestroyAnimSprite(sprite);
     }
@@ -271,7 +271,7 @@ void sub_80DCD78(struct Sprite *sprite)
         x2 += x1;
         y2 += y1;
 
-        if (!sub_8078718(sprite))
+        if (!TranslateAnimSpriteLinearAndSine(sprite))
         {
             u16 rot = sub_80790F0(sprite->pos1.x + sprite->pos2.x - x2,
                                   sprite->pos1.y + sprite->pos2.y - y2);
diff --git a/src/battle/anim/bullet.c b/src/battle/anim/bullet.c
index 90b2021f1..1dca0b886 100644
--- a/src/battle/anim/bullet.c
+++ b/src/battle/anim/bullet.c
@@ -17,11 +17,11 @@ static void sub_80D00B4(struct Sprite* sprite);
 
 void sub_80CFFD8(struct Sprite* sprite)
 {
-    sub_80787B0(sprite, 1);
+    InitAnimSpritePos(sprite, 1);
     sprite->data[0] = 20;
     sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
     sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
-    sprite->callback = sub_8078B34;
+    sprite->callback = StartTranslateAnimSpriteByDeltas;
     sprite->affineAnimPaused = 1;
     StoreSpriteCallbackInData(sprite, sub_80D0030);
 }
diff --git a/src/battle/anim/cutter.c b/src/battle/anim/cutter.c
index 2234ebacb..0f23fed82 100644
--- a/src/battle/anim/cutter.c
+++ b/src/battle/anim/cutter.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "battle.h"
 #include "rom_8077ABC.h"
 #include "trig.h"
 #include "battle_anim.h"
@@ -7,29 +8,36 @@ extern s16 gBattleAnimArgs[];
 extern u8 gAnimBankAttacker;
 extern u8 gAnimBankTarget;
 
-static void sub_80CB09C(struct Sprite* sprite);
-static void sub_80CB1A4(struct Sprite* sprite);
+static void AnimTranslateLinearSingleSineWaveStep(struct Sprite* sprite);
+static void AnimMoveTwisterParticleStep(struct Sprite* sprite);
 
-// cutter (the cresent shaped leaf used in throwing projectiles for the listed moves.)
+// Animates a sprite that moves linearly from one location to another, with a
+// single-cycle sine wave added to the y position along the way.
 // Used by Razor Leaf and Magical Leaf.
-
-void sub_80CAFD0(struct Sprite* sprite)
+// arg 0: initial x offset
+// arg 1: initial y offset
+// arg 2: target x offset
+// arg 3: target y offset
+// arg 4: translation duration
+// arg 5: wave amplitude
+// arg 6: target between double battle opponents (boolean)
+void AnimTranslateLinearSingleSineWave(struct Sprite* sprite)
 {
-    sub_80787B0(sprite, 1);
-    if (GetBankSide(gAnimBankAttacker))
+    InitAnimSpritePos(sprite, 1);
+    if (GetBankSide(gAnimBankAttacker) != SIDE_PLAYER)
     {
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
     }
 
     sprite->data[0] = gBattleAnimArgs[4];
-    if (!(gBattleAnimArgs[6]))
+    if (!gBattleAnimArgs[6])
     {
         sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
         sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
     }
     else
     {
-        sub_807A3FC(gAnimBankTarget, 1, &sprite->data[2], &sprite->data[4]);
+        SetAverageBattlerPositions(gAnimBankTarget, 1, &sprite->data[2], &sprite->data[4]);
         sprite->data[2] += gBattleAnimArgs[2];
         sprite->data[4] += gBattleAnimArgs[3];
     }
@@ -45,18 +53,18 @@ void sub_80CAFD0(struct Sprite* sprite)
         sprite->data[0] = 0;
     }
 
-    sprite->callback = sub_80CB09C;
+    sprite->callback = AnimTranslateLinearSingleSineWaveStep;
 }
 
-void sub_80CB09C(struct Sprite* sprite)
+static void AnimTranslateLinearSingleSineWaveStep(struct Sprite* sprite)
 {
-    bool8 c = FALSE;
+    bool8 destroy = FALSE;
     s16 a = sprite->data[0];
     s16 b = sprite->data[7];
     s16 r0;
     
     sprite->data[0] = 1;
-    sub_8078718(sprite);
+    TranslateAnimSpriteLinearAndSine(sprite);
     r0 = sprite->data[7];
     sprite->data[0] = a;
     if (b > 0xC8 && r0 <= 0x37 && sprite->oam.affineParam == 0)
@@ -67,24 +75,30 @@ void sub_80CB09C(struct Sprite* sprite)
         sprite->invisible ^= 1;
         sprite->oam.affineParam++;
         if (sprite->oam.affineParam == 0x1E)
-            c = TRUE;
+            destroy = TRUE;
     }
     
-    if (sprite->pos1.x + sprite->pos2.x > 0x100
+    if (sprite->pos1.x + sprite->pos2.x > 256
      || sprite->pos1.x + sprite->pos2.x < -16
-     || sprite->pos1.y + sprite->pos2.y > 0xA0
+     || sprite->pos1.y + sprite->pos2.y > 160
      || sprite->pos1.y + sprite->pos2.y < -16)
-        c = TRUE;
+        destroy = TRUE;
 
-    if (c)
+    if (destroy)
         DestroyAnimSprite(sprite);
 }
 
-void sub_80CB144(struct Sprite* sprite)
+// Animates particles in the Twister move animation.
+// arg 0: duration
+// arg 1: total y delta (the particles rise upward)
+// arg 2: wave period (higher means faster wave)
+// arg 3: wave amplitude
+// arg 4: speedup frame (particles move faster at the end of the animation)
+void AnimMoveTwisterParticle(struct Sprite* sprite)
 {
     if (!IsContest() && IsDoubleBattle() == TRUE)
     {
-        sub_807A3FC(gAnimBankTarget, 1, &sprite->pos1.x, &sprite->pos1.y);
+        SetAverageBattlerPositions(gAnimBankTarget, 1, &sprite->pos1.x, &sprite->pos1.y);
     }
 
     sprite->pos1.y += 32;
@@ -93,10 +107,10 @@ void sub_80CB144(struct Sprite* sprite)
     sprite->data[2] = gBattleAnimArgs[2];
     sprite->data[3] = gBattleAnimArgs[3];
     sprite->data[4] = gBattleAnimArgs[4];
-    sprite->callback = sub_80CB1A4;
+    sprite->callback = AnimMoveTwisterParticleStep;
 }
 
-void sub_80CB1A4(struct Sprite* sprite)
+static void AnimMoveTwisterParticleStep(struct Sprite* sprite)
 {
     if (sprite->data[1] == 0xFF)
     {
diff --git a/src/battle/anim/cyclone.c b/src/battle/anim/cyclone.c
index 0f83df211..b1210bc54 100644
--- a/src/battle/anim/cyclone.c
+++ b/src/battle/anim/cyclone.c
@@ -13,7 +13,7 @@ extern u8 gAnimBankTarget;
 
 void sub_80D0118(struct Sprite* sprite)
 {
-    sub_80787B0(sprite, 0);
+    InitAnimSpritePos(sprite, 0);
     if (GetBankSide(gAnimBankAttacker) == 0)
         sprite->pos1.y += 16;
 
diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c
index 674ae5188..aaf8507c6 100644
--- a/src/battle/anim/dark.c
+++ b/src/battle/anim/dark.c
@@ -128,7 +128,7 @@ void sub_80DFE14(struct Sprite *sprite)
     sprite->data[3] = GetBankPosition(gAnimBankTarget, 3);
     sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3);
     sprite->data[0] = 0x7E;
-    sub_8078A5C(sprite);
+    InitSpriteDataForLinearTranslation(sprite);
     sprite->data[3] = -sprite->data[1];
     sprite->data[4] = -sprite->data[2];
     sprite->data[6] = 0xFFD8;
@@ -244,7 +244,7 @@ void sub_80DFFD0(struct Sprite *sprite)
 
 static void sub_80E00D0(struct Sprite *sprite)
 {
-    if (sub_8078718(sprite))
+    if (TranslateAnimSpriteLinearAndSine(sprite))
         move_anim_8074EE0(sprite);
 }
 
diff --git a/src/battle/anim/dragon.c b/src/battle/anim/dragon.c
index 4f25cf1a5..dc2c0bc50 100644
--- a/src/battle/anim/dragon.c
+++ b/src/battle/anim/dragon.c
@@ -68,7 +68,7 @@ void sub_80DF63C(struct Sprite *sprite)
         StartSpriteAnim(sprite, 1);
     }
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->callback = sub_8078B34;
+    sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
 }
 
diff --git a/src/battle/anim/egg.c b/src/battle/anim/egg.c
index 8004b3bf5..b3de1dbb1 100644
--- a/src/battle/anim/egg.c
+++ b/src/battle/anim/egg.c
@@ -22,7 +22,7 @@ static void sub_80D158C(struct Sprite* sprite);
 void sub_80D1368(struct Sprite* sprite)
 {
     s16 r1;
-    sub_80787B0(sprite, 0);
+    InitAnimSpritePos(sprite, 0);
     r1 = (GetBankSide(gAnimBankAttacker)) ? -0xA0 : 0xA0;
     sprite->data[0] = 0x380;
     sprite->data[1] = r1;
diff --git a/src/battle/anim/energy_wave.c b/src/battle/anim/energy_wave.c
index 15045f5bd..8111f70a3 100644
--- a/src/battle/anim/energy_wave.c
+++ b/src/battle/anim/energy_wave.c
@@ -20,7 +20,7 @@ static void sub_80D370C(struct Sprite *);
 
 void sub_80D3554(struct Sprite *sprite)
 {
-    sub_80787B0(sprite, 1);
+    InitAnimSpritePos(sprite, 1);
 
     sprite->data[0] = 30;
     sprite->data[1] = sprite->pos1.x;
@@ -28,7 +28,7 @@ void sub_80D3554(struct Sprite *sprite)
     sprite->data[3] = sprite->pos1.y;
     sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
 
-    obj_translate_based_on_private_1_2_3_4(sprite);
+    InitAnimSpriteTranslationDeltas(sprite);
 
     sprite->data[5] = 0xD200 / sprite->data[0];
     sprite->data[7] = gBattleAnimArgs[3];
@@ -49,7 +49,7 @@ void sub_80D3554(struct Sprite *sprite)
 
 static void sub_80D35DC(struct Sprite *sprite)
 {
-    if (sub_8078B5C(sprite))
+    if (TranslateAnimSpriteByDeltas(sprite))
     {
         DestroyAnimSprite(sprite);
     }
@@ -147,7 +147,7 @@ void sub_80D3728(struct Sprite *sprite)
     else
         var2 = 1;
 
-    sub_80787B0(sprite, var1);
+    InitAnimSpritePos(sprite, var1);
 
     if (GetBankSide(gAnimBankAttacker) != 0)
     {
@@ -157,6 +157,6 @@ void sub_80D3728(struct Sprite *sprite)
     sprite->data[0] = gBattleAnimArgs[4];
     sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
     sprite->data[4] = GetBankPosition(gAnimBankTarget, var2) + gBattleAnimArgs[3];
-    sprite->callback = sub_8078B34;
+    sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
diff --git a/src/battle/anim/fight.c b/src/battle/anim/fight.c
index 160b51274..a7c25de49 100644
--- a/src/battle/anim/fight.c
+++ b/src/battle/anim/fight.c
@@ -77,7 +77,7 @@ void sub_80D90A4(struct Sprite *sprite)
     StartSpriteAnim(sprite, gBattleAnimArgs[4]);
 
     if (gBattleAnimArgs[3] == 0)
-        sub_80787B0(sprite, 1);
+        InitAnimSpritePos(sprite, 1);
     else
         sub_8078764(sprite, 1);
 
@@ -166,7 +166,7 @@ void sub_80D92D0(struct Sprite *sprite)
     }
 
     sprite->data[4] = sprite->pos1.y - 20;
-    sprite->callback = sub_8078B34;
+    sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, sub_80D9328);
 }
 
@@ -182,7 +182,7 @@ static void sub_80D9328(struct Sprite *sprite)
         sprite->pos2.y = 0;
         sprite->pos2.x = 0;
 
-        sprite->callback = sub_8078B34;
+        sprite->callback = StartTranslateAnimSpriteByDeltas;
         StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
     }
 }
@@ -203,7 +203,7 @@ void sub_80D9378(struct Sprite *sprite)
     sprite->data[3] = sprite->pos1.y;
     sprite->data[4] = sprite->pos1.y;
 
-    obj_translate_based_on_private_1_2_3_4(sprite);
+    InitAnimSpriteTranslationDeltas(sprite);
 
     sprite->data[5] = gBattleAnimArgs[5];
     sprite->data[6] = gBattleAnimArgs[4];
@@ -214,7 +214,7 @@ void sub_80D9378(struct Sprite *sprite)
 
 static void sub_80D9404(struct Sprite *sprite)
 {
-    if (!sub_8078B5C(sprite))
+    if (!TranslateAnimSpriteByDeltas(sprite))
     {
         sprite->pos2.y += Sin(sprite->data[7] >> 8, sprite->data[5]);
         sprite->data[7] += sprite->data[6];
@@ -261,7 +261,7 @@ static void sub_80D94CC(struct Sprite *sprite)
         sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
         sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
 
-        sprite->callback = sub_8078B34;
+        sprite->callback = StartTranslateAnimSpriteByDeltas;
         StoreSpriteCallbackInData(sprite, sub_80D9524);
     }
 }
@@ -435,9 +435,9 @@ static void sub_80D986C(struct Sprite *sprite)
         sprite->data[3] = sprite->pos1.y;
         sprite->data[4] = GetBankPosition(sprite->data[7], 3);
 
-        obj_translate_based_on_private_1_2_3_4(sprite);
+        InitAnimSpriteTranslationDeltas(sprite);
         StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
-        sprite->callback = sub_8078BB8;
+        sprite->callback = TranslateAnimSpriteByDeltasUntil;
     }
 }
 
@@ -530,9 +530,9 @@ void sub_80D9A38(struct Sprite *sprite)
     sprite->data[3] = sprite->pos1.y;
     sprite->data[4] = GetBankPosition(bank, 3);
 
-    obj_translate_based_on_private_1_2_3_4(sprite);
+    InitAnimSpriteTranslationDeltas(sprite);
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
-    sprite->callback = sub_8078BB8;
+    sprite->callback = TranslateAnimSpriteByDeltasUntil;
 }
 
 static void sub_80D9B24(struct Sprite *sprite)
@@ -573,7 +573,7 @@ void sub_80D9B48(struct Sprite *sprite)
 void sub_80D9BD4(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[2] == 0)
-        sub_80787B0(sprite, 0);
+        InitAnimSpritePos(sprite, 0);
     else
         sub_8078764(sprite, 0);
 
diff --git a/src/battle/anim/fire_2.c b/src/battle/anim/fire_2.c
index 4d577a765..fe63fcff1 100644
--- a/src/battle/anim/fire_2.c
+++ b/src/battle/anim/fire_2.c
@@ -42,7 +42,7 @@ struct Sprite *sub_80D5210(struct Sprite *sprite)
 
 void sub_80D522C(struct Sprite *sprite)
 {
-    sub_80787B0(sprite, 1);
+    InitAnimSpritePos(sprite, 1);
 
     sprite->data[7] = gBattleAnimArgs[2];
     sprite->data[0] = 0;
@@ -62,7 +62,7 @@ void sub_80D5254(struct Sprite *sprite)
         sprite->data[3] = sprite->pos1.y;
         sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
 
-        obj_translate_based_on_private_1_2_3_4(sprite);
+        InitAnimSpriteTranslationDeltas(sprite);
 
         sprite->callback = sub_80D52AC;
     }
@@ -70,7 +70,7 @@ void sub_80D5254(struct Sprite *sprite)
 
 void sub_80D52AC(struct Sprite *sprite)
 {
-    if (sub_8078B5C(sprite))
+    if (TranslateAnimSpriteByDeltas(sprite))
     {
         sprite->data[0] = 0;
 
@@ -123,7 +123,7 @@ void sub_80D5374(struct Sprite *sprite)
 
 void sub_80D53B4(struct Sprite *sprite)
 {
-    sub_80787B0(sprite, 1);
+    InitAnimSpritePos(sprite, 1);
 
     sprite->data[1] = gBattleAnimArgs[2];
     sprite->data[0] = gBattleAnimArgs[3];
diff --git a/src/battle/anim/flying_path.c b/src/battle/anim/flying_path.c
index 441ac0e6d..559f617c6 100644
--- a/src/battle/anim/flying_path.c
+++ b/src/battle/anim/flying_path.c
@@ -53,7 +53,7 @@ void sub_80CBF5C(u8 taskId)
     {
     case 4:
         sub_80CC358(task, taskId);
-        if (sub_8078718(sprite) == 0)
+        if (TranslateAnimSpriteLinearAndSine(sprite) == 0)
         {
             break;
         }
@@ -65,7 +65,7 @@ void sub_80CBF5C(u8 taskId)
         break;
     case 8:
         sub_80CC358(task, taskId);
-        if (sub_8078718(sprite) == 0)
+        if (TranslateAnimSpriteLinearAndSine(sprite) == 0)
         {
             break;
         }
@@ -77,7 +77,7 @@ void sub_80CBF5C(u8 taskId)
         break;
     case 0:
         sub_80CC358(task, taskId);
-        if (sub_8078718(sprite) == 0)
+        if (TranslateAnimSpriteLinearAndSine(sprite) == 0)
             break;
 
         task->data[15] = 1;
@@ -103,7 +103,7 @@ void sub_80CBF5C(u8 taskId)
         break;
     case 2:
         sub_80CC358(task, taskId);
-        if (sub_8078718(sprite) == 0)
+        if (TranslateAnimSpriteLinearAndSine(sprite) == 0)
             break;
 
         task->data[15] = 3;
@@ -146,7 +146,7 @@ void sub_80CBF5C(u8 taskId)
         break;
     case 6:
         sub_80CC358(task, taskId);
-        if (sub_8078718(sprite) == 0)
+        if (TranslateAnimSpriteLinearAndSine(sprite) == 0)
             break;
 
         task->data[15] = 7;
@@ -189,7 +189,7 @@ void sub_80CBF5C(u8 taskId)
         break;
     case 10:
         sub_80CC358(task, taskId);
-        if (sub_8078718(sprite) == 0)
+        if (TranslateAnimSpriteLinearAndSine(sprite) == 0)
         {
             break;
         }
@@ -221,7 +221,7 @@ void sub_80CBF5C(u8 taskId)
     }
     case 12:
         sub_80CC358(task, taskId);
-        if (sub_8078718(sprite) != 0)
+        if (TranslateAnimSpriteLinearAndSine(sprite) != 0)
         {
             DestroySprite(sprite);
             task->data[0]++;
diff --git a/src/battle/anim/glitter.c b/src/battle/anim/glitter.c
index e4577f1e1..e6c101de3 100644
--- a/src/battle/anim/glitter.c
+++ b/src/battle/anim/glitter.c
@@ -35,7 +35,7 @@ void sub_80CD190(struct Sprite* sprite)
 
     if (IsDoubleBattle() && IsAnimBankSpriteVisible(bank ^ 2))
     {
-        sub_807A3FC(bank, gBattleAnimArgs[6], &sprite->pos1.x, &sprite->pos1.y);
+        SetAverageBattlerPositions(bank, gBattleAnimArgs[6], &sprite->pos1.x, &sprite->pos1.y);
         sub_807867C(sprite, gBattleAnimArgs[0]);
         sprite->pos1.y += gBattleAnimArgs[1];
     }
diff --git a/src/battle/anim/grip.c b/src/battle/anim/grip.c
index c4d7b1cef..dbf7a1562 100644
--- a/src/battle/anim/grip.c
+++ b/src/battle/anim/grip.c
@@ -33,7 +33,7 @@ void sub_80D0178(struct Sprite* sprite)
     sprite->data[0] = 6;
     sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + r8;
     sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + r6;
-    sprite->callback = sub_8078B34;
+    sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, sub_80D020C);
 }
 
diff --git a/src/battle/anim/guard.c b/src/battle/anim/guard.c
index 254160109..211e0e841 100644
--- a/src/battle/anim/guard.c
+++ b/src/battle/anim/guard.c
@@ -15,7 +15,7 @@ void sub_80D3014(struct Sprite *sprite)
 {
     if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
     {
-        sub_807A3FC(gAnimBankAttacker, 0, &sprite->pos1.x, &sprite->pos1.y);
+        SetAverageBattlerPositions(gAnimBankAttacker, 0, &sprite->pos1.x, &sprite->pos1.y);
         sprite->pos1.y += 40;
 
         StartSpriteAffineAnim(sprite, 1);
@@ -30,6 +30,6 @@ void sub_80D3014(struct Sprite *sprite)
     sprite->data[2] = sprite->pos1.x;
     sprite->data[4] = sprite->pos1.y - 72;
 
-    sprite->callback = sub_8078B34;
+    sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
diff --git a/src/battle/anim/guillotine.c b/src/battle/anim/guillotine.c
index b3d842cdf..15279d5e2 100644
--- a/src/battle/anim/guillotine.c
+++ b/src/battle/anim/guillotine.c
@@ -37,7 +37,7 @@ void sub_80D0228(struct Sprite* sprite)
     sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + r9;
     sprite->data[3] = sprite->pos1.y;
     sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + r6;
-    obj_translate_based_on_private_1_2_3_4(sprite);
+    InitAnimSpriteTranslationDeltas(sprite);
     sprite->data[5] = gBattleAnimArgs[0];
     sprite->data[6] = sprite->data[0];
     sprite->callback = sub_80D02D0;
@@ -45,7 +45,7 @@ void sub_80D0228(struct Sprite* sprite)
 
 void sub_80D02D0(struct Sprite* sprite)
 {
-    if (sub_8078B5C(sprite) && sprite->animEnded == 1)
+    if (TranslateAnimSpriteByDeltas(sprite) && sprite->animEnded == 1)
     {
         SeekSpriteAnim(sprite, 0);
         sprite->animPaused = 1;
@@ -85,6 +85,6 @@ void sub_80D0344(struct Sprite* sprite)
 
 void sub_80D03A8(struct Sprite* sprite)
 {
-    if (sub_8078B5C(sprite) != 0)
+    if (TranslateAnimSpriteByDeltas(sprite) != 0)
         DestroyAnimSprite(sprite);
 }
diff --git a/src/battle/anim/heart_1.c b/src/battle/anim/heart_1.c
index 5df89f929..857169e62 100644
--- a/src/battle/anim/heart_1.c
+++ b/src/battle/anim/heart_1.c
@@ -14,7 +14,7 @@ extern u8 gAnimBankTarget;
 void sub_80D1C80(struct Sprite* sprite)
 {
     if (++sprite->data[0] == 1)
-        sub_80787B0(sprite, 0);
+        InitAnimSpritePos(sprite, 0);
 
     sprite->pos2.x = Sin(sprite->data[1], 8);
     sprite->pos2.y = sprite->data[2] >> 8;
diff --git a/src/battle/anim/hop.c b/src/battle/anim/hop.c
index 4006e2d43..0697e83a0 100644
--- a/src/battle/anim/hop.c
+++ b/src/battle/anim/hop.c
@@ -91,7 +91,7 @@ void sub_80CB94C(struct Sprite* sprite)
 {
     s16 e1;
     s16 e2;
-    sub_80787B0(sprite, 0);
+    InitAnimSpritePos(sprite, 0);
     e1 = GetBankPosition(gAnimBankTarget, 0);
     e2 = GetBankPosition(gAnimBankTarget, 1);
     if ((gAnimBankAttacker ^ 2) == gAnimBankTarget)
diff --git a/src/battle/anim/lunge_1.c b/src/battle/anim/lunge_1.c
index a2adfba13..a3b5f19c5 100644
--- a/src/battle/anim/lunge_1.c
+++ b/src/battle/anim/lunge_1.c
@@ -48,7 +48,7 @@ void sub_80CD7CC(struct Sprite* sprite)
     sprite->data[2] = 0;
     sprite->data[3] = gBankSpriteIds[gAnimBankAttacker];
     StoreSpriteCallbackInData(sprite, sub_80CD81C);
-    sprite->callback = sub_8078458;
+    sprite->callback = TranslateMonBGUntil;
 }
 
 void sub_80CD81C(struct Sprite* sprite)
@@ -78,7 +78,7 @@ void sub_80CD8A8(struct Sprite* sprite)
     sprite->data[2] = 0;
     sprite->data[3] = gBankSpriteIds[gAnimBankAttacker];
     StoreSpriteCallbackInData(sprite, sub_80CD9B8);
-    sprite->callback = sub_8078458;
+    sprite->callback = TranslateMonBGUntil;
 }
 
 void sub_80CD8F8(struct Sprite* sprite)
diff --git a/src/battle/anim/money.c b/src/battle/anim/money.c
index 8358d23db..0ee381e13 100644
--- a/src/battle/anim/money.c
+++ b/src/battle/anim/money.c
@@ -19,7 +19,7 @@ void sub_80CFE9C(struct Sprite* sprite)
     s16 r7;
     u16 var;
 
-    sub_80787B0(sprite, 1);
+    InitAnimSpritePos(sprite, 1);
     r6 = GetBankPosition(gAnimBankTarget, 2);
     r7 = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
     if (GetBankSide(gAnimBankAttacker) != 0)
diff --git a/src/battle/anim/note_rain.c b/src/battle/anim/note_rain.c
index 715462d73..44817b0a0 100644
--- a/src/battle/anim/note_rain.c
+++ b/src/battle/anim/note_rain.c
@@ -24,14 +24,14 @@ void sub_80D1BA8(struct Sprite* sprite, u8 a, u8 b)
 
 void sub_80D1C08(struct Sprite* sprite)
 {
-    sub_80787B0(sprite, 0);
+    InitAnimSpritePos(sprite, 0);
     if (GetBankSide(gAnimBankAttacker) != 0)
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
 
     sprite->data[0] = gBattleAnimArgs[4];
     sprite->data[2] = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[2];
     sprite->data[4] = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[3];
-    sprite->callback = sub_8078B34;
+    sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
     sub_80D1BA8(sprite, gBattleAnimArgs[5], gBattleAnimArgs[6]);
 }
diff --git a/src/battle/anim/note_scatter_2.c b/src/battle/anim/note_scatter_2.c
index 524c51c08..262afb8bf 100644
--- a/src/battle/anim/note_scatter_2.c
+++ b/src/battle/anim/note_scatter_2.c
@@ -32,14 +32,14 @@ void sub_80CEE60(struct Sprite* sprite)
     sprite->data[2] = a + sprite->data[1];
     sprite->data[3] = sprite->pos1.y;
     sprite->data[4] = sprite->data[3] - 40;
-    obj_translate_based_on_private_1_2_3_4(sprite);
+    InitAnimSpriteTranslationDeltas(sprite);
     sprite->data[5] = gBattleAnimArgs[3];
     sprite->callback = sub_80CEEE8;
 }
 
 void sub_80CEEE8(struct Sprite* sprite)
 {
-    if (sub_8078B5C(sprite) == 0)
+    if (TranslateAnimSpriteByDeltas(sprite) == 0)
     {
         s16 a;
         a = Sin(sprite->data[5], 8);
diff --git a/src/battle/anim/orbit.c b/src/battle/anim/orbit.c
index c8cf339d2..e7dd0df49 100644
--- a/src/battle/anim/orbit.c
+++ b/src/battle/anim/orbit.c
@@ -79,13 +79,13 @@ void sub_80CACEC(u8 taskId)
 
 void sub_80CAD54(struct Sprite* sprite)
 {
-    sub_80787B0(sprite, 0);
+    InitAnimSpritePos(sprite, 0);
     sprite->data[0] = gBattleAnimArgs[3];
     sprite->data[1] = sprite->pos1.x;
     sprite->data[2] = sprite->pos1.x;
     sprite->data[3] = sprite->pos1.y;
     sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
-    obj_translate_based_on_private_1_2_3_4(sprite);
+    InitAnimSpriteTranslationDeltas(sprite);
     sprite->data[5] = 0x40;
     sprite->callback = sub_80CADA8;
     sub_80CADA8(sprite);
@@ -93,7 +93,7 @@ void sub_80CAD54(struct Sprite* sprite)
 
 void sub_80CADA8(struct Sprite* sprite)
 {
-    if (!sub_8078B5C(sprite))
+    if (!TranslateAnimSpriteByDeltas(sprite))
     {
         sprite->pos2.x += Sin(sprite->data[5], 32);
         sprite->pos2.y += Cos(sprite->data[5], -5);
@@ -116,13 +116,13 @@ void sub_80CADA8(struct Sprite* sprite)
 
 void sub_80CAE20(struct Sprite* sprite)
 {
-    sub_80787B0(sprite, 1);
+    InitAnimSpritePos(sprite, 1);
     sprite->data[0] = gBattleAnimArgs[3];
     sprite->data[1] = sprite->pos1.x;
     sprite->data[2] = sprite->pos1.x;
     sprite->data[3] = sprite->pos1.y;
     sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
-    obj_translate_based_on_private_1_2_3_4(sprite);
+    InitAnimSpriteTranslationDeltas(sprite);
     sprite->data[5] = 0x40;
     sprite->callback = sub_80CAE74;
     sub_80CAE74(sprite);
@@ -130,7 +130,7 @@ void sub_80CAE20(struct Sprite* sprite)
 
 void sub_80CAE74(struct Sprite* sprite)
 {
-    if (!sub_8078B5C(sprite))
+    if (!TranslateAnimSpriteByDeltas(sprite))
     {
         sprite->pos2.x += Sin(sprite->data[5], 8);
         if ((u16)(sprite->data[5] - 0x3B) < 5 || (u16)(sprite->data[5] - 0xBB) < 5)
diff --git a/src/battle/anim/orbs.c b/src/battle/anim/orbs.c
index 6ca2fa71c..b965cacb8 100644
--- a/src/battle/anim/orbs.c
+++ b/src/battle/anim/orbs.c
@@ -19,34 +19,34 @@ extern struct SpriteTemplate gSpriteTemplate_83D631C;
 
 void sub_80CA7B0(struct Sprite* sprite)
 {
-    sub_80787B0(sprite, 1);
+    InitAnimSpritePos(sprite, 1);
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2);
     sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3);
-    sprite->callback = sub_8078B34;
+    sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
 }
 
 void sub_80CA800(struct Sprite* sprite)
 {
-    sub_80787B0(sprite, 1);
+    InitAnimSpritePos(sprite, 1);
     StartSpriteAnim(sprite, gBattleAnimArgs[3]);
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
     sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
-    sprite->callback = sub_8078B34;
+    sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
 void sub_80CA858(struct Sprite* sprite)
 {
-    sub_80787B0(sprite, 1);
+    InitAnimSpritePos(sprite, 1);
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = sprite->pos1.x;
     sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
     sprite->data[3] = sprite->pos1.y;
     sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
-    obj_translate_based_on_private_1_2_3_4(sprite);
+    InitAnimSpriteTranslationDeltas(sprite);
     sprite->data[5] = gBattleAnimArgs[3];
     sprite->callback = sub_80CA8B4;
     sub_80CA8B4(sprite);
@@ -54,7 +54,7 @@ void sub_80CA858(struct Sprite* sprite)
 
 void sub_80CA8B4(struct Sprite* sprite)
 {
-    if (sub_8078B5C(sprite))
+    if (TranslateAnimSpriteByDeltas(sprite))
     {
         DestroySprite(sprite);
     }
@@ -105,7 +105,7 @@ void sub_80CA9A8(struct Sprite* sprite)
 
 void sub_80CA9F8(struct Sprite* sprite)
 {
-    if (sub_8078718(sprite))
+    if (TranslateAnimSpriteLinearAndSine(sprite))
         DestroyAnimSprite(sprite);
 }
 
diff --git a/src/battle/anim/perceive.c b/src/battle/anim/perceive.c
index 3b3153428..14db096c6 100644
--- a/src/battle/anim/perceive.c
+++ b/src/battle/anim/perceive.c
@@ -19,6 +19,6 @@ void sub_80D2904(struct Sprite* sprite)
 
 void sub_80D2920(struct Sprite* sprite)
 {
-    sub_80787B0(sprite, 1);
+    InitAnimSpritePos(sprite, 1);
     sprite->callback = sub_80D2904;
 }
diff --git a/src/battle/anim/poison.c b/src/battle/anim/poison.c
index f31c441fb..272d99e84 100644
--- a/src/battle/anim/poison.c
+++ b/src/battle/anim/poison.c
@@ -17,7 +17,7 @@ void sub_80D9D70(struct Sprite *sprite)
     if (!gBattleAnimArgs[3])
         StartSpriteAnim(sprite, 2);
 
-    sub_80787B0(sprite, 1);
+    InitAnimSpritePos(sprite, 1);
 
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
@@ -31,7 +31,7 @@ void sub_80D9D70(struct Sprite *sprite)
 
 void sub_80D9DD4(struct Sprite *sprite) // same as sub_80D9E78
 {
-    if (sub_8078718(sprite))
+    if (TranslateAnimSpriteLinearAndSine(sprite))
         DestroyAnimSprite(sprite);
 }
 
@@ -41,8 +41,8 @@ void sub_80D9DF0(struct Sprite *sprite)
     if (!gBattleAnimArgs[3])
         StartSpriteAnim(sprite, 2);
 
-    sub_80787B0(sprite, 1);
-    sub_807A3FC(gAnimBankTarget, 1, &l1, &l2);
+    InitAnimSpritePos(sprite, 1);
+    SetAverageBattlerPositions(gAnimBankTarget, 1, &l1, &l2);
 
     if (GetBankSide(gAnimBankAttacker))
         gBattleAnimArgs[4] = -gBattleAnimArgs[4];
@@ -59,7 +59,7 @@ void sub_80D9DF0(struct Sprite *sprite)
 
 void sub_80D9E78(struct Sprite *sprite) // same as sub_80D9DD4
 {
-    if (sub_8078718(sprite))
+    if (TranslateAnimSpriteLinearAndSine(sprite))
         DestroyAnimSprite(sprite);
 }
 
@@ -71,7 +71,7 @@ void sub_80D9E94(struct Sprite *sprite)
     sprite->data[3] = sprite->pos1.y;
     sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[1];
 
-    sub_8078A5C(sprite);
+    InitSpriteDataForLinearTranslation(sprite);
 
     sprite->data[5] = sprite->data[1] / gBattleAnimArgs[2];
     sprite->data[6] = sprite->data[2] / gBattleAnimArgs[2];
@@ -92,7 +92,7 @@ void sub_80D9EE8(struct Sprite *sprite)
 
 void sub_80D9F14(struct Sprite *sprite)
 {
-    sub_807A3FC(gAnimBankTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y);
+    SetAverageBattlerPositions(gAnimBankTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y);
 
     if (GetBankSide(gAnimBankAttacker))
         gBattleAnimArgs[0] = -gBattleAnimArgs[0];
@@ -104,7 +104,7 @@ void sub_80D9F14(struct Sprite *sprite)
     sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2];
     sprite->data[4] = sprite->pos1.y + sprite->data[0];
 
-    sprite->callback = sub_8078B34;
+    sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
@@ -116,7 +116,7 @@ void sub_80D9F88(struct Sprite *sprite)
     }
     else
     {
-        sub_807A3FC(gAnimBankTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y);
+        SetAverageBattlerPositions(gAnimBankTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y);
 
         if (GetBankSide(gAnimBankAttacker))
             gBattleAnimArgs[0] = -gBattleAnimArgs[0];
diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c
index 37c527183..b108c496a 100644
--- a/src/battle/anim/psychic.c
+++ b/src/battle/anim/psychic.c
@@ -192,7 +192,7 @@ void sub_80DBA4C(struct Sprite *sprite)
         else
         {
             if (gBattleAnimArgs[2] == 0)
-                sub_80787B0(sprite, var0);
+                InitAnimSpritePos(sprite, var0);
             else
                 sub_8078764(sprite, var0);
         }
@@ -539,7 +539,7 @@ static void sub_80DC1FC(u8 taskId)
 
 void sub_80DC2B0(struct Sprite *sprite)
 {
-    if (sub_8078718(sprite))
+    if (TranslateAnimSpriteLinearAndSine(sprite))
     {
         FreeOamMatrix(sprite->oam.matrixNum);
         DestroySprite(sprite);
diff --git a/src/battle/anim/ring.c b/src/battle/anim/ring.c
index 759652f0c..86b2c4659 100644
--- a/src/battle/anim/ring.c
+++ b/src/battle/anim/ring.c
@@ -32,7 +32,7 @@ void sub_80D0FD8(struct Sprite* sprite)
     r4 = gBattleAnimArgs[3] ^ 1;
     if (IsDoubleBattle() && IsAnimBankSpriteVisible(bank ^ 2))
     {
-        sub_807A3FC(bank, r4, &sp0, &sp1);
+        SetAverageBattlerPositions(bank, r4, &sp0, &sp1);
         if (r4 == 0)
             r4 = GetBankPosition(bank, 0);
         else
@@ -50,7 +50,7 @@ void sub_80D0FD8(struct Sprite* sprite)
 
 void sub_80D1098(struct Sprite* sprite)
 {
-    if (sub_8078B5C(sprite))
+    if (TranslateAnimSpriteByDeltas(sprite))
     {
         FreeSpriteOamMatrix(sprite);
         DestroyAnimSprite(sprite);
@@ -118,7 +118,7 @@ void sub_80D10B8(struct Sprite* sprite)
     r6 = GetBankPosition(bankr7, sp4) + gBattleAnimArgs[1];
     if (gMain.inBattle && IsAnimBankSpriteVisible(bankr8 ^ 2))
     {
-        sub_807A3FC(bankr8, gBattleAnimArgs[6], &sp0, &sp1);
+        SetAverageBattlerPositions(bankr8, gBattleAnimArgs[6], &sp0, &sp1);
     }
     else
     {
@@ -137,7 +137,7 @@ void sub_80D10B8(struct Sprite* sprite)
     sprite->data[2] = sp0;
     sprite->data[4] = sp1;
     sprite->data[0] = gBattleAnimArgs[0];
-    obj_translate_based_on_private_1_2_3_4(sprite);
+    InitAnimSpriteTranslationDeltas(sprite);
     sprite->callback = sub_80D1098;
     sub_80D1098(sprite);
 }
diff --git a/src/battle/anim/rock.c b/src/battle/anim/rock.c
index b113ce040..1d1772b1b 100644
--- a/src/battle/anim/rock.c
+++ b/src/battle/anim/rock.c
@@ -38,7 +38,7 @@ static void sub_80DD9FC(struct Sprite *sprite);
 void sub_80DCE9C(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[3] != 0)
-        sub_807A3FC(gAnimBankTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
+        SetAverageBattlerPositions(gAnimBankTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
 
     sprite->pos1.x += gBattleAnimArgs[0];
     sprite->pos1.y += 14;
@@ -91,7 +91,7 @@ void sub_80DCF60(struct Sprite *sprite)
     sprite->data[3] = sprite->pos1.y;
     sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[3];
 
-    sub_8078A5C(sprite);
+    InitSpriteDataForLinearTranslation(sprite);
     sprite->data[3] = 0;
     sprite->data[4] = 0;
 
@@ -102,7 +102,7 @@ void sub_80DCF60(struct Sprite *sprite)
 void sub_80DCFE4(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[6] == 0)
-        sub_80787B0(sprite, 0);
+        InitAnimSpritePos(sprite, 0);
     else
         sub_8078764(sprite, 0);
 
@@ -275,13 +275,13 @@ void sub_80DD3AC(struct Sprite *sprite)
 void sub_80DD490(struct Sprite *sprite)
 {
     StartSpriteAnim(sprite, gBattleAnimArgs[4]);
-    sub_80787B0(sprite, 0);
+    InitAnimSpritePos(sprite, 0);
 
     sprite->data[0] = gBattleAnimArgs[3];
     sprite->data[2] = sprite->pos1.x;
     sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[2];
 
-    sprite->callback = sub_8078B34;
+    sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
@@ -455,7 +455,7 @@ static void sub_80DD774(struct Task *task)
 
 void sub_80DD87C(struct Sprite *sprite)
 {
-    if (sub_8078718(sprite))
+    if (TranslateAnimSpriteLinearAndSine(sprite))
     {
         u8 taskId = FindTaskIdByFunc(sub_80DD604);
         if (taskId != 0xFF)
@@ -517,7 +517,7 @@ void sub_80DD978(struct Sprite *sprite)
     if (GetBankSide(gAnimBankAttacker) == SIDE_OPPONENT)
         StartSpriteAffineAnim(sprite, 1);
 
-    sub_807941C(sprite);
+    TranslateAnimSpriteToTargetMonLocation(sprite);
 }
 
 void sub_80DD9A4(struct Sprite *sprite)
diff --git a/src/battle/anim/scan.c b/src/battle/anim/scan.c
index 22bb26973..e6b85dd5f 100644
--- a/src/battle/anim/scan.c
+++ b/src/battle/anim/scan.c
@@ -47,7 +47,7 @@ void sub_80CD408(struct Sprite* sprite)
         sprite->data[0] = 8;
         sprite->data[2] = sprite->pos1.x + gUnknown_083D6DDC[sprite->data[5] >> 8][0];
         sprite->data[4] = sprite->pos1.y + gUnknown_083D6DDC[sprite->data[5] >> 8][1];
-        sprite->callback = sub_8078B34;
+        sprite->callback = StartTranslateAnimSpriteByDeltas;
         StoreSpriteCallbackInData(sprite, sub_80CD4B8);
         sprite->data[5] += 0x100;
         PlaySE12WithPanning(0xD2, BattleAnimAdjustPanning(0x3F));
@@ -112,7 +112,7 @@ void sub_80CD4EC(struct Sprite* sprite)
         sprite->data[0] = 6;
         sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + a;
         sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + b;
-        sprite->callback = sub_8078B34;
+        sprite->callback = StartTranslateAnimSpriteByDeltas;
         StoreSpriteCallbackInData(sprite, sub_80CD654);
     }
 }
diff --git a/src/battle/anim/seed.c b/src/battle/anim/seed.c
index be8613a74..e3d4bd3fb 100644
--- a/src/battle/anim/seed.c
+++ b/src/battle/anim/seed.c
@@ -15,7 +15,7 @@ static void sub_80CABC0(struct Sprite* sprite);
 
 void sub_80CAB18(struct Sprite* sprite)
 {
-    sub_80787B0(sprite, 1);
+    InitAnimSpritePos(sprite, 1);
     if (GetBankSide(gAnimBankAttacker))
     {
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
@@ -31,7 +31,7 @@ void sub_80CAB18(struct Sprite* sprite)
 
 void sub_80CAB88(struct Sprite* sprite)
 {
-    if (sub_8078718(sprite))
+    if (TranslateAnimSpriteLinearAndSine(sprite))
     {
         sprite->invisible = 1;
         sprite->data[0] = 10;
diff --git a/src/battle/anim/sonic.c b/src/battle/anim/sonic.c
index 0897ec6e3..2808c86c2 100644
--- a/src/battle/anim/sonic.c
+++ b/src/battle/anim/sonic.c
@@ -29,7 +29,7 @@ void sub_80CF6DC(struct Sprite* sprite)
         gBattleAnimArgs[3] = -gBattleAnimArgs[3];
     }
 
-    sub_80787B0(sprite, 1);
+    InitAnimSpritePos(sprite, 1);
     a = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
     b = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
     c = sub_80790F0(a - sprite->pos1.x, b - sprite->pos1.y);
@@ -41,7 +41,7 @@ void sub_80CF6DC(struct Sprite* sprite)
     sprite->data[0] = gBattleAnimArgs[4];
     sprite->data[2] = a;
     sprite->data[4] = b;
-    sprite->callback = sub_8078B34;
+    sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
diff --git a/src/battle/anim/sonic_task.c b/src/battle/anim/sonic_task.c
index 924b1b568..260ae544c 100644
--- a/src/battle/anim/sonic_task.c
+++ b/src/battle/anim/sonic_task.c
@@ -87,7 +87,7 @@ void sub_80CFB04(u8 taskId)
     if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
         && IsAnimBankSpriteVisible(gAnimBankTarget ^ 2))
     {
-        sub_807A3FC(gAnimBankTarget, 0, &sp1, &sp2);
+        SetAverageBattlerPositions(gAnimBankTarget, 0, &sp1, &sp2);
     }
     else
     {
diff --git a/src/battle/anim/sunlight.c b/src/battle/anim/sunlight.c
index e6fd49a11..88112c74a 100644
--- a/src/battle/anim/sunlight.c
+++ b/src/battle/anim/sunlight.c
@@ -12,6 +12,6 @@ void sub_80D517C(struct Sprite *sprite)
     sprite->data[0] = 60;
     sprite->data[2] = 140;
     sprite->data[4] = 80;
-    sprite->callback = sub_8078B34;
+    sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
diff --git a/src/battle/anim/sword.c b/src/battle/anim/sword.c
index b46fe6759..3367cca07 100644
--- a/src/battle/anim/sword.c
+++ b/src/battle/anim/sword.c
@@ -15,7 +15,7 @@ static void sub_80CF6B4(struct Sprite* sprite);
 
 void sub_80CF690(struct Sprite* sprite)
 {
-    sub_80787B0(sprite, 0);
+    InitAnimSpritePos(sprite, 0);
     sprite->callback = sub_80785E4;
     StoreSpriteCallbackInData(sprite, sub_80CF6B4);
 }
@@ -25,6 +25,6 @@ void sub_80CF6B4(struct Sprite* sprite)
     sprite->data[0] = 6;
     sprite->data[2] = sprite->pos1.x;
     sprite->data[4] = sprite->pos1.y - 32;
-    sprite->callback = sub_8078B34;
+    sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
diff --git a/src/battle/anim/tile_out.c b/src/battle/anim/tile_out.c
index 50468a440..39d4ff01f 100644
--- a/src/battle/anim/tile_out.c
+++ b/src/battle/anim/tile_out.c
@@ -37,7 +37,7 @@ void sub_80CE1AC(struct Sprite* sprite)
         sprite->data[0] = 30;
         sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2);
         sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3);
-        sprite->callback = sub_8078B34;
+        sprite->callback = StartTranslateAnimSpriteByDeltas;
         StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
     }
 }
diff --git a/src/battle/anim/unused_8.c b/src/battle/anim/unused_8.c
index 03772f951..b5e150dd8 100644
--- a/src/battle/anim/unused_8.c
+++ b/src/battle/anim/unused_8.c
@@ -15,7 +15,7 @@ static void sub_80CF4B8(struct Sprite* sprite);
 
 void sub_80CF458(struct Sprite* sprite)
 {
-    sub_80787B0(sprite, 1);
+    InitAnimSpritePos(sprite, 1);
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = gBattleAnimArgs[3];
     sprite->data[5] = gBattleAnimArgs[4];
@@ -28,7 +28,7 @@ void sub_80CF490(struct Sprite* sprite)
     sprite->data[0] = sprite->data[1];
     sprite->data[2] = sprite->pos1.x;
     sprite->data[4] = sprite->pos1.y + 15;
-    sprite->callback = sub_8078B34;
+    sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, sub_80CF4B8);
 }
 
diff --git a/src/battle/anim/unused_9.c b/src/battle/anim/unused_9.c
index 0efd40c02..6e0d0321b 100644
--- a/src/battle/anim/unused_9.c
+++ b/src/battle/anim/unused_9.c
@@ -18,7 +18,7 @@ static void sub_80CFE2C(struct Sprite* sprite);
 
 void sub_80CFDFC(struct Sprite* sprite)
 {
-    sub_80787B0(sprite, 0);
+    InitAnimSpritePos(sprite, 0);
     sprite->data[0] = 0x100 + (IndexOfSpritePaletteTag(gSpriteTemplate_83D75AC.paletteTag) << 4);
     sprite->callback = sub_80CFE2C;
 }
diff --git a/src/battle/anim/water.c b/src/battle/anim/water.c
index 4068cbe78..e6945f9b2 100644
--- a/src/battle/anim/water.c
+++ b/src/battle/anim/water.c
@@ -18,7 +18,7 @@ void sub_80D37FC(struct Sprite *sprite)
     sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2];
     sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[4];
 
-    sprite->callback = sub_8078B34;
+    sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
@@ -30,7 +30,7 @@ void sub_80D3838(struct Sprite *sprite)
     }
     else
     {
-        sub_80787B0(sprite, 1);
+        InitAnimSpritePos(sprite, 1);
     }
 
     sprite->data[7] = gBattleAnimArgs[2];
diff --git a/src/battle/anim/wisp_orb.c b/src/battle/anim/wisp_orb.c
index 0cbe6eed7..7c22b7f13 100644
--- a/src/battle/anim/wisp_orb.c
+++ b/src/battle/anim/wisp_orb.c
@@ -21,7 +21,7 @@ void sub_80D5B0C(struct Sprite *sprite)
     switch (sprite->data[0])
     {
     case 0:
-        sub_80787B0(sprite, 0);
+        InitAnimSpritePos(sprite, 0);
         StartSpriteAnim(sprite, gBattleAnimArgs[2]);
         sprite->data[7] = gBattleAnimArgs[2];
 
@@ -86,7 +86,7 @@ static void sub_80D5C5C(struct Sprite *sprite)
     s16 initialData5;
     s16 newData5;
 
-    if (!sub_8078B5C(sprite))
+    if (!TranslateAnimSpriteByDeltas(sprite))
     {
         sprite->pos2.x += Sin(sprite->data[5], 16);
         initialData5 = sprite->data[5];
diff --git a/src/battle/battle_anim_80A7E7C.c b/src/battle/battle_anim_80A7E7C.c
index 2f10b07ae..f339a1206 100644
--- a/src/battle/battle_anim_80A7E7C.c
+++ b/src/battle/battle_anim_80A7E7C.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "battle.h"
 #include "battle_anim.h"
 #include "rom_8077ABC.h"
 #include "sprite.h"
@@ -16,27 +17,27 @@ extern u8 gAnimBankAttacker;
 extern u8 gAnimBankTarget;
 
 static void AnimTask_ShakeMonStep(u8 taskId);
-static void sub_80A808C(u8 taskId);
-static void sub_80A81D8(u8 taskId);
-static void sub_80A8374(u8 taskId);
+static void AnimTask_ShakeMon2Step(u8 taskId);
+static void AnimTask_ShakeMonInPlaceStep(u8 taskId);
+static void AnimTask_ShakeAndSinkMonStep(u8 taskId);
 static void sub_80A8488(u8 taskId);
-static void sub_80A8530(struct Sprite *sprite);
-static void sub_80A85A4(struct Sprite *sprite);
-static void sub_80A85C8(struct Sprite *sprite);
-static void sub_80A8614(struct Sprite* sprite);
-static void sub_80A8638(struct Sprite *sprite);
-static void sub_80A86F4(struct Sprite *sprite);
-static void sub_80A8764(struct Sprite *sprite);
+static void DoHorizontalLunge(struct Sprite *sprite);
+static void ReverseHorizontalLungeDirection(struct Sprite *sprite);
+static void DoVerticalDip(struct Sprite *sprite);
+static void ReverseVerticalDipDirection(struct Sprite* sprite);
+static void SlideMonToOriginalPos(struct Sprite *sprite);
+static void SlideMonToOriginalPosStep(struct Sprite *sprite);
+static void SlideMonToOffset(struct Sprite *sprite);
 static void sub_80A8818(struct Sprite *sprite);
 static void sub_80A88F0(struct Sprite *sprite);
 static void sub_80A89B4(u8 taskId);
 static void sub_80A8A18(u8 taskId);
-static void sub_80A8C0C(u8 taskId);
+static void AnimTask_SwayMonStep(u8 taskId);
 static void sub_80A8D8C(u8 taskId);
 static void sub_80A8FD8(u8 taskId);
 static void sub_80A913C(u8 taskId);
 
-const struct SpriteTemplate gBattleAnimSpriteTemplate_83C1FB0 =
+const struct SpriteTemplate gHorizontalLungeSpriteTemplate =
 {
     .tileTag = 0,
     .paletteTag = 0,
@@ -44,10 +45,10 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83C1FB0 =
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_80A8530,
+    .callback = DoHorizontalLunge,
 };
 
-const struct SpriteTemplate gBattleAnimSpriteTemplate_83C1FC8 =
+const struct SpriteTemplate gVerticalDipSpriteTemplate =
 {
     .tileTag = 0,
     .paletteTag = 0,
@@ -55,10 +56,10 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83C1FC8 =
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_80A85C8,
+    .callback = DoVerticalDip,
 };
 
-const struct SpriteTemplate gBattleAnimSpriteTemplate_83C1FE0 =
+const struct SpriteTemplate gSlideMonToOriginalPosSpriteTemplate =
 {
     .tileTag = 0,
     .paletteTag = 0,
@@ -66,10 +67,10 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83C1FE0 =
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_80A8638,
+    .callback = SlideMonToOriginalPos,
 };
 
-const struct SpriteTemplate gBattleAnimSpriteTemplate_83C1FF8 =
+const struct SpriteTemplate gSlideMonToOffsetSpriteTemplate =
 {
     .tileTag = 0,
     .paletteTag = 0,
@@ -77,7 +78,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83C1FF8 =
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_80A8764,
+    .callback = SlideMonToOffset,
 };
 
 const struct SpriteTemplate gBattleAnimSpriteTemplate_83C2010 =
@@ -154,13 +155,19 @@ static void AnimTask_ShakeMonStep(u8 taskId)
     }
 }
 
-
-void sub_80A7FA0(u8 taskId)
+// Task to facilitate simple shaking of a pokemon's picture in battle.
+// The shaking alternates between the positive and negative versions of the specified pixel offsets.
+// arg 0: anim battler
+// arg 1: x pixel offset
+// arg 2: y pixel offset
+// arg 3: num times to shake
+// arg 4: frame delay
+void AnimTask_ShakeMon2(u8 taskId)
 {
     u8 sprite;
-    bool8 r6;
+    bool8 destroy;
     u8 side;
-    r6 = 0;
+    destroy = FALSE;
     if (gBattleAnimArgs[0] < 4)
     {
         sprite = GetAnimBankSpriteId(gBattleAnimArgs[0]);
@@ -188,21 +195,23 @@ void sub_80A7FA0(u8 taskId)
             side = GetBankByIdentity(3);
             break;
         }
+
         if (IsAnimBankSpriteVisible(side) == FALSE)
-        {
-            r6 = 1;
-        }
+            destroy = TRUE;
+
         sprite = gBankSpriteIds[side];
     }
     else
     {
         sprite = gBankSpriteIds[gAnimBankAttacker];
     }
-    if (r6)
+
+    if (destroy)
     {
         DestroyAnimVisualTask(taskId);
         return;
     }
+
     gSprites[sprite].pos2.x = gBattleAnimArgs[1];
     gSprites[sprite].pos2.y = gBattleAnimArgs[2];
     TASK.data[0] = sprite;
@@ -211,30 +220,24 @@ void sub_80A7FA0(u8 taskId)
     TASK.data[3] = gBattleAnimArgs[4];
     TASK.data[4] = gBattleAnimArgs[1];
     TASK.data[5] = gBattleAnimArgs[2];
-    TASK.func = sub_80A808C;
-    sub_80A808C(taskId);
+    TASK.func = AnimTask_ShakeMon2Step;
+    TASK.func(taskId);
 }
 
-static void sub_80A808C(u8 taskId)
+static void AnimTask_ShakeMon2Step(u8 taskId)
 {
     if (TASK.data[3] == 0)
     {
         if (SPRITE.pos2.x == TASK.data[4])
-        {
             SPRITE.pos2.x = -TASK.data[4];
-        }
         else
-        {
             SPRITE.pos2.x = TASK.data[4];
-        }
+
         if (SPRITE.pos2.y == TASK.data[5])
-        {
             SPRITE.pos2.y = -TASK.data[5];
-        }
         else
-        {
             SPRITE.pos2.y = TASK.data[5];
-        }
+
         TASK.data[3] = TASK.data[2];
         if (--TASK.data[1] == 0)
         {
@@ -250,29 +253,37 @@ static void sub_80A808C(u8 taskId)
     }
 }
 
-void sub_80A8154(u8 taskId)
+// Task to facilitate simple shaking of a pokemon's picture in battle.
+// The shaking alternates between the positive and negative versions of the specified pixel offsets
+// with respect to the current location of the mon's picture.
+// arg 0: battler
+// arg 1: x offset
+// arg 2: y offset
+// arg 3: num shakes
+// arg 4: delay
+void AnimTask_ShakeMonInPlace(u8 taskId)
 {
-    u8 sprite;
-    sprite = GetAnimBankSpriteId(gBattleAnimArgs[0]);
-    if (sprite == 0xff)
+    u8 spriteId = GetAnimBankSpriteId(gBattleAnimArgs[0]);
+    if (spriteId == 0xff)
     {
         DestroyAnimVisualTask(taskId);
         return;
     }
-    gSprites[sprite].pos2.x += gBattleAnimArgs[1];
-    gSprites[sprite].pos2.y += gBattleAnimArgs[2];
-    TASK.data[0] = sprite;
+
+    gSprites[spriteId].pos2.x += gBattleAnimArgs[1];
+    gSprites[spriteId].pos2.y += gBattleAnimArgs[2];
+    TASK.data[0] = spriteId;
     TASK.data[1] = 0;
     TASK.data[2] = gBattleAnimArgs[3];
     TASK.data[3] = 0;
     TASK.data[4] = gBattleAnimArgs[4];
     TASK.data[5] = gBattleAnimArgs[1] * 2;
     TASK.data[6] = gBattleAnimArgs[2] * 2;
-    TASK.func = sub_80A81D8;
-    sub_80A81D8(taskId);
+    TASK.func = AnimTask_ShakeMonInPlaceStep;
+    TASK.func(taskId);
 }
 
-static void sub_80A81D8(u8 taskId)
+static void AnimTask_ShakeMonInPlaceStep(u8 taskId)
 {
     if (TASK.data[3] == 0)
     {
@@ -309,7 +320,13 @@ static void sub_80A81D8(u8 taskId)
     }
 }
 
-void sub_80A8314(u8 taskId)
+// Shakes a mon bg horizontally and moves it downward linearly.
+// arg 0: battler
+// arg 1: x offset
+// arg 2: frame delay between each movement
+// arg 3: downward speed (subpixel)
+// arg 4: duration
+void AnimTask_ShakeAndSinkMon(u8 taskId)
 {
     u8 sprite = GetAnimBankSpriteId(gBattleAnimArgs[0]);
     gSprites[sprite].pos2.x = gBattleAnimArgs[1];
@@ -318,11 +335,11 @@ void sub_80A8314(u8 taskId)
     TASK.data[2] = gBattleAnimArgs[2];
     TASK.data[3] = gBattleAnimArgs[3];
     TASK.data[4] = gBattleAnimArgs[4];
-    TASK.func = sub_80A8374;
-    sub_80A8374(taskId);
+    TASK.func = AnimTask_ShakeAndSinkMonStep;
+    TASK.func(taskId);
 }
 
-static void sub_80A8374(u8 taskId)
+static void AnimTask_ShakeAndSinkMonStep(u8 taskId)
 {
     s16 x;
     u8 sprite;
@@ -332,11 +349,11 @@ static void sub_80A8374(u8 taskId)
     {
         TASK.data[8] = 0;
         if (gSprites[sprite].pos2.x == x)
-        {
             x = -x;
-        }
+
         gSprites[sprite].pos2.x += x;
     }
+
     TASK.data[1] = x;
     TASK.data[9] += TASK.data[3];
     gSprites[sprite].pos2.y = TASK.data[9] >> 8;
@@ -347,89 +364,109 @@ static void sub_80A8374(u8 taskId)
     }
 }
 
-void sub_80A8408(u8 taskId)
+// Moves a mon bg picture along an elliptical path that begins
+// and ends at the mon's origin location.
+// arg 0: battler
+// arg 1: ellipse width
+// arg 2: ellipse height
+// arg 3: num loops
+// arg 4: speed (valid values are 0-5)
+void AnimTask_TranslateMonElliptical(u8 taskId)
 {
     u8 i;
-    u8 sprite;
-    u8 v1;
-    v1 = 1;
-    sprite = GetAnimBankSpriteId(gBattleAnimArgs[0]);
+    u8 spriteId;
+    u8 wavePeriod;
+
+    wavePeriod = 1;
+    spriteId = GetAnimBankSpriteId(gBattleAnimArgs[0]);
     if (gBattleAnimArgs[4] > 5)
-    {
         gBattleAnimArgs[4] = 5;
-    }
+
     for (i = 0; i < gBattleAnimArgs[4]; i++)
     {
-        v1 <<= 1;
+        wavePeriod <<= 1;
     }
-    TASK.data[0] = sprite;
+
+    TASK.data[0] = spriteId;
     TASK.data[1] = gBattleAnimArgs[1];
     TASK.data[2] = gBattleAnimArgs[2];
     TASK.data[3] = gBattleAnimArgs[3];
-    TASK.data[4] = v1;
+    TASK.data[4] = wavePeriod;
     TASK.func = sub_80A8488;
-    sub_80A8488(taskId);
+    TASK.func(taskId);
 }
 
 static void sub_80A8488(u8 taskId)
 {
-    u8 sprite;
-    sprite = TASK.data[0];
-    gSprites[sprite].pos2.x = Sin(TASK.data[5], TASK.data[1]);
-    gSprites[sprite].pos2.y = -Cos(TASK.data[5], TASK.data[2]);
-    gSprites[sprite].pos2.y += TASK.data[2];
+    u8 spriteId = TASK.data[0];
+    gSprites[spriteId].pos2.x = Sin(TASK.data[5], TASK.data[1]);
+    gSprites[spriteId].pos2.y = -Cos(TASK.data[5], TASK.data[2]);
+    gSprites[spriteId].pos2.y += TASK.data[2];
     TASK.data[5] += TASK.data[4];
     TASK.data[5] &= 0xff;
+
     if (TASK.data[5] == 0)
-    {
         TASK.data[3]--;
-    }
+
     if (TASK.data[3] == 0)
     {
-        gSprites[sprite].pos2.x = 0;
-        gSprites[sprite].pos2.y = 0;
+        gSprites[spriteId].pos2.x = 0;
+        gSprites[spriteId].pos2.y = 0;
         DestroyAnimVisualTask(taskId);
         return;
     }
 }
 
-void sub_80A8500(u8 taskId)
+// Moves a mon bg picture along an elliptical path that begins
+// and ends at the mon's origin location. Reverses the direction
+// of the path if it's not on the player's side of the battle.
+// arg 0: battler
+// arg 1: ellipse width
+// arg 2: ellipse height
+// arg 3: num loops
+// arg 4: speed (valid values are 0-5)
+void AnimTask_TranslateMonEllipticalRespectSide(u8 taskId)
 {
-    if (GetBankSide(gAnimBankAttacker))
-    {
+    if (GetBankSide(gAnimBankAttacker) != SIDE_PLAYER)
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
-    }
-    sub_80A8408(taskId);
+
+    AnimTask_TranslateMonElliptical(taskId);
 }
 
-static void sub_80A8530(struct Sprite *sprite)
+// Performs a simple horizontal lunge, where the mon moves
+// horizontally, and then moves back in the opposite direction.
+// arg 0: duration of single lunge direction
+// arg 1: x pixel delta that is applied each frame
+static void DoHorizontalLunge(struct Sprite *sprite)
 {
     sprite->invisible = TRUE;
-    if (GetBankSide(gAnimBankAttacker))
-    {
+    if (GetBankSide(gAnimBankAttacker) != SIDE_PLAYER)
         sprite->data[1] = -gBattleAnimArgs[1];
-    }
     else
-    {
         sprite->data[1] = gBattleAnimArgs[1];
-    }
+
     sprite->data[0] = gBattleAnimArgs[0];
     sprite->data[2] = 0;
     sprite->data[3] = gBankSpriteIds[gAnimBankAttacker];
     sprite->data[4] = gBattleAnimArgs[0];
-    StoreSpriteCallbackInData(sprite, sub_80A85A4);
-    sprite->callback = sub_8078458;
+    StoreSpriteCallbackInData(sprite, ReverseHorizontalLungeDirection);
+    sprite->callback = TranslateMonBGUntil;
 }
 
-static void sub_80A85A4(struct Sprite *sprite)
+static void ReverseHorizontalLungeDirection(struct Sprite *sprite)
 {
     sprite->data[0] = sprite->data[4];
     sprite->data[1] = -sprite->data[1];
-    sprite->callback = sub_8078458;
+    sprite->callback = TranslateMonBGUntil;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
-static void sub_80A85C8(struct Sprite *sprite)
+// Performs a simple vertical dipping motion, where moves vertically, and then
+// moves back in the opposite direction.
+// arg 0: duration of single dip direction
+// arg 1: y pixel delta that is applied each frame
+// arg 2: battler
+static void DoVerticalDip(struct Sprite *sprite)
 {
     u8 spriteId;
     sprite->invisible = TRUE;
@@ -439,73 +476,72 @@ static void sub_80A85C8(struct Sprite *sprite)
     sprite->data[2] = gBattleAnimArgs[1];
     sprite->data[3] = spriteId;
     sprite->data[4] = gBattleAnimArgs[0];
-    StoreSpriteCallbackInData(sprite, sub_80A8614);
-    sprite->callback = sub_8078458;
+    StoreSpriteCallbackInData(sprite, ReverseVerticalDipDirection);
+    sprite->callback = TranslateMonBGUntil;
 }
 
-static void sub_80A8614(struct Sprite *sprite)
+static void ReverseVerticalDipDirection(struct Sprite *sprite)
 {
     sprite->data[0] = sprite->data[4];
     sprite->data[2] = -sprite->data[2];
-    sprite->callback = sub_8078458;
+    sprite->callback = TranslateMonBGUntil;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
-static void sub_80A8638(struct Sprite *sprite)
+// Linearly slides a mon's bg picture back to its original sprite position.
+// The sprite parameter is a dummy sprite used for facilitating the movement with its callback.
+// arg 0: 1 = target or 0 = attacker
+// arg 1: direction (0 = horizontal and vertical, 1 = horizontal only, 2 = vertical only)
+// arg 2: duration
+static void SlideMonToOriginalPos(struct Sprite *sprite)
 {
     int something;
-    int spriteId;
+    int monSpriteId;
     if (!gBattleAnimArgs[0])
-    {
-        spriteId = gBankSpriteIds[gAnimBankAttacker];
-    }
+        monSpriteId = gBankSpriteIds[gAnimBankAttacker];
     else
-    {
-        spriteId = gBankSpriteIds[gAnimBankTarget];
-    }
+        monSpriteId = gBankSpriteIds[gAnimBankTarget];
+
     sprite->data[0] = gBattleAnimArgs[2];
-    sprite->data[1] = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x;
-    sprite->data[2] = gSprites[spriteId].pos1.x;
-    sprite->data[3] = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y;
-    sprite->data[4] = gSprites[spriteId].pos1.y;
+    sprite->data[1] = gSprites[monSpriteId].pos1.x + gSprites[monSpriteId].pos2.x;
+    sprite->data[2] = gSprites[monSpriteId].pos1.x;
+    sprite->data[3] = gSprites[monSpriteId].pos1.y + gSprites[monSpriteId].pos2.y;
+    sprite->data[4] = gSprites[monSpriteId].pos1.y;
     something = 0;
-    sub_8078A5C(sprite);
+    InitSpriteDataForLinearTranslation(sprite);
     sprite->data[3] = something;
     sprite->data[4] = something;
-    sprite->data[5] = gSprites[spriteId].pos2.x;
-    sprite->data[6] = gSprites[spriteId].pos2.y;
+    sprite->data[5] = gSprites[monSpriteId].pos2.x;
+    sprite->data[6] = gSprites[monSpriteId].pos2.y;
     sprite->invisible = TRUE;
+
     if (gBattleAnimArgs[1] == 1)
-    {
         sprite->data[2] = something;
-    }
     else if (gBattleAnimArgs[1] == 2)
-    {
         sprite->data[1] = something;
-    }
+
     sprite->data[7] = gBattleAnimArgs[1];
-    sprite->data[7] |= spriteId << 8;
-    sprite->callback = sub_80A86F4;
+    sprite->data[7] |= monSpriteId << 8;
+    sprite->callback = SlideMonToOriginalPosStep;
 }
 
-static void sub_80A86F4(struct Sprite *sprite)
+static void SlideMonToOriginalPosStep(struct Sprite *sprite)
 {
-    s8 spriteId;
+    s8 monSpriteId;
     u8 lo;
-    struct Sprite *sprite2;
+    struct Sprite *monSprite;
+
     lo = sprite->data[7] & 0xff;
-    spriteId = sprite->data[7] >> 8;
-    sprite2 = &gSprites[spriteId];
+    monSpriteId = sprite->data[7] >> 8;
+    monSprite = &gSprites[monSpriteId];
     if (sprite->data[0] == 0)
     {
         if (lo < 2)
-        {
-            sprite2->pos2.x = 0;
-        }
+            monSprite->pos2.x = 0;
+
         if (lo == 2 || lo == 0)
-        {
-            sprite2->pos2.y = 0;
-        }
+            monSprite->pos2.y = 0;
+
         DestroyAnimSprite(sprite);
     }
     else
@@ -513,25 +549,30 @@ static void sub_80A86F4(struct Sprite *sprite)
         sprite->data[0]--;
         sprite->data[3] += sprite->data[1];
         sprite->data[4] += sprite->data[2];
-        sprite2->pos2.x = (s8)(sprite->data[3] >> 8) + sprite->data[5];
-        sprite2->pos2.y = (s8)(sprite->data[4] >> 8) + sprite->data[6];
+        monSprite->pos2.x = (s8)(sprite->data[3] >> 8) + sprite->data[5];
+        monSprite->pos2.y = (s8)(sprite->data[4] >> 8) + sprite->data[6];
     }
 }
 
-static void sub_80A8764(struct Sprite *sprite)
+// Linearly translates a mon to a target offset. The horizontal offset
+// is mirrored for the opponent's pokemon, and the vertical offset
+// is only mirrored if arg 3 is set to 1.
+// arg 0: 0 = attacker, 1 = target
+// arg 1: target x pixel offset
+// arg 2: target y pixel offset
+// arg 3: mirror vertical translation for opposite battle side
+// arg 4: duration
+static void SlideMonToOffset(struct Sprite *sprite)
 {
-    u8 v1;
-    u8 spriteId;
+    u8 battler;
+    u8 monSpriteId;
     if (!gBattleAnimArgs[0])
-    {
-        v1 = gAnimBankAttacker;
-    }
+        battler = gAnimBankAttacker;
     else
-    {
-        v1 = gAnimBankTarget;
-    }
-    spriteId = gBankSpriteIds[v1];
-    if (GetBankSide(v1))
+        battler = gAnimBankTarget;
+
+    monSpriteId = gBankSpriteIds[battler];
+    if (GetBankSide(battler) != SIDE_PLAYER)
     {
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
         if (gBattleAnimArgs[3] == 1)
@@ -539,18 +580,19 @@ static void sub_80A8764(struct Sprite *sprite)
             gBattleAnimArgs[2] = -gBattleAnimArgs[2];
         }
     }
+
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[1] = gSprites[spriteId].pos1.x;
-    sprite->data[2] = gSprites[spriteId].pos1.x + gBattleAnimArgs[1];
-    sprite->data[3] = gSprites[spriteId].pos1.y;
-    sprite->data[4] = gSprites[spriteId].pos1.y + gBattleAnimArgs[2];
-    sub_8078A5C(sprite);
+    sprite->data[1] = gSprites[monSpriteId].pos1.x;
+    sprite->data[2] = gSprites[monSpriteId].pos1.x + gBattleAnimArgs[1];
+    sprite->data[3] = gSprites[monSpriteId].pos1.y;
+    sprite->data[4] = gSprites[monSpriteId].pos1.y + gBattleAnimArgs[2];
+    InitSpriteDataForLinearTranslation(sprite);
     sprite->data[3] = 0;
     sprite->data[4] = 0;
-    sprite->data[5] = spriteId;
+    sprite->data[5] = monSpriteId;
     sprite->invisible = TRUE;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
-    sprite->callback = sub_80784A8;
+    sprite->callback = TranslateMonBGSubPixelUntil;
 }
 
 static void sub_80A8818(struct Sprite *sprite)
@@ -580,7 +622,7 @@ static void sub_80A8818(struct Sprite *sprite)
     sprite->data[2] = sprite->data[1] + gBattleAnimArgs[1];
     sprite->data[3] = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y;
     sprite->data[4] = sprite->data[3] + gBattleAnimArgs[2];
-    sub_8078A5C(sprite);
+    InitSpriteDataForLinearTranslation(sprite);
     sprite->data[3] = gSprites[spriteId].pos2.x << 8;
     sprite->data[4] = gSprites[spriteId].pos2.y << 8;
     sprite->data[5] = spriteId;
@@ -593,7 +635,7 @@ static void sub_80A8818(struct Sprite *sprite)
     {
         StoreSpriteCallbackInData(sprite, sub_80A88F0);
     }
-    sprite->callback = sub_80784A8;
+    sprite->callback = TranslateMonBGSubPixelUntil;
 }
 
 
@@ -712,59 +754,67 @@ static void sub_80A8B3C(u8 taskId)
     }
 }
 
-void sub_80A8B88(u8 taskId)
+// Task that facilitates translating the mon bg picture back and forth
+// in a swaying motion (uses Sine wave). It can sway either horizontally
+// or vertically, but not both.
+// arg 0: direction (0 = horizontal, 1 = vertical)
+// arg 1: wave amplitude
+// arg 2: wave period
+// arg 3: num sways
+// arg 4: which mon (0 = attacker, 1`= target)
+void AnimTask_SwayMon(u8 taskId)
 {
     u8 spriteId;
-    if (GetBankSide(gAnimBankAttacker))
-    {
+    if (GetBankSide(gAnimBankAttacker) != SIDE_PLAYER)
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
-    }
+
     spriteId = GetAnimBankSpriteId(gBattleAnimArgs[4]);
     TASK.data[0] = gBattleAnimArgs[0];
     TASK.data[1] = gBattleAnimArgs[1];
     TASK.data[2] = gBattleAnimArgs[2];
     TASK.data[3] = gBattleAnimArgs[3];
     TASK.data[4] = spriteId;
+
     if (gBattleAnimArgs[4] == 0)
-    {
         TASK.data[5] = gAnimBankAttacker;
-    }
     else
-    {
         TASK.data[5] = gAnimBankTarget;
-    }
+
     TASK.data[12] = 1;
-    TASK.func = sub_80A8C0C;
+    TASK.func = AnimTask_SwayMonStep;
 }
 
-static void sub_80A8C0C(u8 taskId)
+static void AnimTask_SwayMonStep(u8 taskId)
 {
-    s16 y;
+    s16 sineValue;
     u8 spriteId;
-    int index;
-    u16 val;
+    int waveIndex;
+    u16 sineIndex;
+
     spriteId = TASK.data[4];
-    val = TASK.data[10] + TASK.data[2];
-    TASK.data[10] = val;
-    index = val >> 8;
-    y = Sin(index, TASK.data[1]);
+    sineIndex = TASK.data[10] + TASK.data[2];
+    TASK.data[10] = sineIndex;
+    waveIndex = sineIndex >> 8;
+    sineValue = Sin(waveIndex, TASK.data[1]);
+
     if (TASK.data[0] == 0)
     {
-        gSprites[spriteId].pos2.x = y;
+        gSprites[spriteId].pos2.x = sineValue;
     }
     else
     {
-        if (GetBankSide(TASK.data[5]) == 0)
+        if (GetBankSide(TASK.data[5]) == SIDE_PLAYER)
         {
-            gSprites[spriteId].pos2.y = (y >= 0) ? y : -y;
+            gSprites[spriteId].pos2.y = (sineValue >= 0) ? sineValue : -sineValue;
         }
         else
         {
-            gSprites[spriteId].pos2.y = (y >= 0) ? -y : y;
+            gSprites[spriteId].pos2.y = (sineValue >= 0) ? -sineValue : sineValue;
         }
     }
-    if (((index >= 0x80u) && (TASK.data[11] == 0) && (TASK.data[12] == 1))
-        || ((index < 0x7fu) && (TASK.data[11] == 1) && (TASK.data[12] == 0)))
+
+    if (((waveIndex >= 0x80u) && (TASK.data[11] == 0) && (TASK.data[12] == 1))
+        || ((waveIndex < 0x7fu) && (TASK.data[11] == 1) && (TASK.data[12] == 0)))
     {
         TASK.data[11] ^= 1;
         TASK.data[12] ^= 1;
diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c
index 604c21e6d..21ac62401 100644
--- a/src/battle/battle_controller_linkopponent.c
+++ b/src/battle/battle_controller_linkopponent.c
@@ -73,7 +73,7 @@ extern void sub_80313A0(struct Sprite *);
 extern void sub_803757C(void);
 extern void oamt_add_pos2_onto_pos1();
 extern void StoreSpriteCallbackInData();
-extern void sub_8078B34(struct Sprite *);
+extern void StartTranslateAnimSpriteByDeltas(struct Sprite *);
 extern void sub_80375B4(void);
 extern void sub_8010384(struct Sprite *);
 extern void sub_8037B78(void);
@@ -1282,7 +1282,7 @@ void LinkOpponentHandleTrainerSlideBack(void)
     gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
     gSprites[gBankSpriteIds[gActiveBank]].data[2] = 280;
     gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8078B34;
+    gSprites[gBankSpriteIds[gActiveBank]].callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
     gBattleBankFunc[gActiveBank] = sub_80375B4;
 }
@@ -1633,7 +1633,7 @@ void LinkOpponentHandleTrainerBallThrow(void)
     gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
     gSprites[gBankSpriteIds[gActiveBank]].data[2] = 280;
     gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8078B34;
+    gSprites[gBankSpriteIds[gActiveBank]].callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], sub_803A3A8);
     taskId = CreateTask(sub_803A2C4, 5);
     gTasks[taskId].data[0] = gActiveBank;
diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c
index e1f93ba08..1d42f56c3 100644
--- a/src/battle/battle_controller_linkpartner.c
+++ b/src/battle/battle_controller_linkpartner.c
@@ -76,7 +76,7 @@ extern u8 sub_8031720();
 extern u8 mplay_80342A4();
 extern void oamt_add_pos2_onto_pos1();
 extern void StoreSpriteCallbackInData();
-extern void sub_8078B34(struct Sprite *);
+extern void StartTranslateAnimSpriteByDeltas(struct Sprite *);
 extern void sub_80105EC(struct Sprite *);
 extern s32 sub_803FC34(u16);
 extern void LoadPlayerTrainerBankSprite();
@@ -1227,7 +1227,7 @@ void LinkPartnerHandleTrainerSlideBack(void)
     gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
     gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
     gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8078B34;
+    gSprites[gBankSpriteIds[gActiveBank]].callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
     gBattleBankFunc[gActiveBank] = sub_811DB1C;
 }
@@ -1579,7 +1579,7 @@ void LinkPartnerHandleTrainerBallThrow(void)
     gSprites[gBankSpriteIds[gActiveBank]].data[0] = 50;
     gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
     gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8078B34;
+    gSprites[gBankSpriteIds[gActiveBank]].callback = StartTranslateAnimSpriteByDeltas;
     gSprites[gBankSpriteIds[gActiveBank]].data[5] = gActiveBank;
     StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], sub_8030E38);
     StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 1);
diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c
index 5fb642e0c..8e8743dbc 100644
--- a/src/battle/battle_controller_opponent.c
+++ b/src/battle/battle_controller_opponent.c
@@ -84,7 +84,7 @@ extern void sub_80313A0(struct Sprite *);
 extern void sub_8032B4C(void);
 extern void sub_8031A6C(u16, u8);
 extern void sub_8032B84(void);
-extern void sub_8078B34(struct Sprite *);
+extern void StartTranslateAnimSpriteByDeltas(struct Sprite *);
 extern void sub_8032BBC(void);
 extern void oamt_add_pos2_onto_pos1();
 extern void StoreSpriteCallbackInData();
@@ -1286,7 +1286,7 @@ void OpponentHandleTrainerSlideBack(void)
     gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
     gSprites[gBankSpriteIds[gActiveBank]].data[2] = 280;
     gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8078B34;
+    gSprites[gBankSpriteIds[gActiveBank]].callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
     gBattleBankFunc[gActiveBank] = sub_8032BBC;
 }
@@ -2225,7 +2225,7 @@ void OpponentHandleTrainerBallThrow(void)
     gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
     gSprites[gBankSpriteIds[gActiveBank]].data[2] = 280;
     gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8078B34;
+    gSprites[gBankSpriteIds[gActiveBank]].callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], sub_8035C10);
     taskId = CreateTask(sub_8035C44, 5);
     gTasks[taskId].data[0] = gActiveBank;
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index 33a29c064..e28c058a3 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -102,7 +102,7 @@ extern void sub_8047858();
 extern u8 GetBankSide(u8);
 extern void StartBattleIntroAnim();
 extern void oamt_add_pos2_onto_pos1();
-extern void sub_8078B34(struct Sprite *);
+extern void StartTranslateAnimSpriteByDeltas(struct Sprite *);
 extern void StoreSpriteCallbackInData();
 extern void BattleLoadPlayerMonSprite();
 extern bool8 IsDoubleBattle(void);
@@ -3145,7 +3145,7 @@ void PlayerHandleTrainerSlideBack(void)
     gSprites[gBankSpriteIds[gActiveBank]].data[0] = 50;
     gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
     gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8078B34;
+    gSprites[gBankSpriteIds[gActiveBank]].callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
     StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 1);
     gBattleBankFunc[gActiveBank] = sub_802D274;
@@ -3600,7 +3600,7 @@ void PlayerHandleTrainerBallThrow(void)
     gSprites[gBankSpriteIds[gActiveBank]].data[0] = 50;
     gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
     gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8078B34;
+    gSprites[gBankSpriteIds[gActiveBank]].callback = StartTranslateAnimSpriteByDeltas;
     gSprites[gBankSpriteIds[gActiveBank]].data[5] = gActiveBank;
     StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], sub_8030E38);
     StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 1);
diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c
index 3eacaa085..c590b487c 100644
--- a/src/battle/battle_controller_wally.c
+++ b/src/battle/battle_controller_wally.c
@@ -87,7 +87,7 @@ extern void sub_80304A8(void);
 extern void sub_8047858();
 extern void StartBattleIntroAnim();
 extern void oamt_add_pos2_onto_pos1();
-extern void sub_8078B34(struct Sprite *);
+extern void StartTranslateAnimSpriteByDeltas(struct Sprite *);
 extern void sub_8030E38(struct Sprite *);
 extern void StoreSpriteCallbackInData();
 extern u8 sub_8046400();
@@ -1484,7 +1484,7 @@ void WallyHandleTrainerBallThrow(void)
     gSprites[gBankSpriteIds[gActiveBank]].data[0] = 50;
     gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
     gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8078B34;
+    gSprites[gBankSpriteIds[gActiveBank]].callback = StartTranslateAnimSpriteByDeltas;
     gSprites[gBankSpriteIds[gActiveBank]].data[5] = gActiveBank;
     StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], sub_8030E38);
     StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 1);
diff --git a/src/battle/pokeball.c b/src/battle/pokeball.c
index f5b8e1c5d..3a47e0204 100644
--- a/src/battle/pokeball.c
+++ b/src/battle/pokeball.c
@@ -298,7 +298,7 @@ const struct SpriteTemplate gBallSpriteTemplates[] =
 
 extern u32 ball_number_to_ball_processing_index(u16);  // not sure of return type
 extern void sub_80786EC();
-extern bool8 sub_8078718(struct Sprite *);
+extern bool8 TranslateAnimSpriteLinearAndSine(struct Sprite *);
 extern u8 sub_814086C(u8, u8, int, int, u8);
 extern u8 sub_8141314(u8, u8, int, u8);
 
@@ -406,7 +406,7 @@ static void sub_8046464(u8 taskId)
 
 static void objc_0804ABD4(struct Sprite *sprite)
 {
-    if (sub_8078718(sprite))
+    if (TranslateAnimSpriteLinearAndSine(sprite))
     {
         u8 taskId = sprite->oam.affineParam;
         u8 r5 = gTasks[taskId].data[4];
@@ -858,7 +858,7 @@ static void sub_80470C4(struct Sprite *sprite)
             StartSpriteAffineAnim(sprite, 4);
         }
         r4 = sprite->data[0];
-        sub_8078B5C(sprite);
+        TranslateAnimSpriteByDeltas(sprite);
         sprite->data[7] += sprite->data[6] / 3;
         sprite->pos2.y += Sin(HIBYTE(sprite->data[7]), sprite->data[5]);
         sprite->oam.affineParam += 0x100;
@@ -876,7 +876,7 @@ static void sub_80470C4(struct Sprite *sprite)
     }
     else
     {
-        if (sub_8078718(sprite))
+        if (TranslateAnimSpriteLinearAndSine(sprite))
         {
             sprite->pos1.x += sprite->pos2.x;
             sprite->pos1.y += sprite->pos2.y;
diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c
index a60fc1078..395736d03 100644
--- a/src/rom_8077ABC.c
+++ b/src/rom_8077ABC.c
@@ -636,7 +636,7 @@ void unref_sub_8078414(struct Sprite *sprite)
     sprite->callback = sub_80782F8;
 }
 
-void sub_8078458(struct Sprite *sprite)
+void TranslateMonBGUntil(struct Sprite *sprite)
 {
     if (sprite->data[0] > 0)
     {
@@ -650,7 +650,9 @@ void sub_8078458(struct Sprite *sprite)
     }
 }
 
-void sub_80784A8(struct Sprite *sprite)
+// Same as TranslateMonBGUntil, but it operates on sub-pixel values
+// to handle slower translations.
+void TranslateMonBGSubPixelUntil(struct Sprite *sprite)
 {
     if (sprite->data[0] > 0)
     {
@@ -766,14 +768,14 @@ void sub_80786EC(struct Sprite *sprite)
 {
     sprite->data[1] = sprite->pos1.x;
     sprite->data[3] = sprite->pos1.y;
-    obj_translate_based_on_private_1_2_3_4(sprite);
+    InitAnimSpriteTranslationDeltas(sprite);
     sprite->data[6] = 0x8000 / sprite->data[0];
     sprite->data[7] = 0;
 }
 
-bool8 sub_8078718(struct Sprite *sprite)
+bool8 TranslateAnimSpriteLinearAndSine(struct Sprite *sprite)
 {
-    if (sub_8078B5C(sprite))
+    if (TranslateAnimSpriteByDeltas(sprite))
         return TRUE;
     sprite->data[7] += sprite->data[6];
     sprite->pos2.y += Sin((u8)(sprite->data[7] >> 8), sprite->data[5]);
@@ -799,7 +801,7 @@ void sub_8078764(struct Sprite *sprite, bool8 a2)
     sprite->pos1.y += gBattleAnimArgs[1];
 }
 
-void sub_80787B0(struct Sprite *sprite, u8 a2)
+void InitAnimSpritePos(struct Sprite *sprite, u8 a2)
 {
     if (!a2)
     {
@@ -938,12 +940,12 @@ void sub_8078A34(struct Sprite *sprite)
 {
     sprite->data[1] = sprite->pos1.x;
     sprite->data[3] = sprite->pos1.y;
-    sub_8078A5C(sprite);
+    InitSpriteDataForLinearTranslation(sprite);
     sprite->callback = sub_80783D0;
     sprite->callback(sprite);
 }
 
-void sub_8078A5C(struct Sprite *sprite)
+void InitSpriteDataForLinearTranslation(struct Sprite *sprite)
 {
     s16 x = (sprite->data[2] - sprite->data[1]) << 8;
     s16 y = (sprite->data[4] - sprite->data[3]) << 8;
@@ -953,44 +955,44 @@ void sub_8078A5C(struct Sprite *sprite)
     sprite->data[3] = 0;
 }
 
-void obj_translate_based_on_private_1_2_3_4(struct Sprite *sprite)
+void InitAnimSpriteTranslationDeltas(struct Sprite *sprite)
 {
     int x = sprite->data[2] - sprite->data[1];
     int y = sprite->data[4] - sprite->data[3];
-    bool8 r8 = x < 0;
-    bool8 r9 = y < 0;
-    u16 x2 = abs(x) << 8;
-    u16 y2 = abs(y) << 8;
+    bool8 movingLeft = x < 0;
+    bool8 movingUp = y < 0;
+    u16 xDelta = abs(x) << 8;
+    u16 yDelta = abs(y) << 8;
 
-    x2 = x2 / sprite->data[0];
-    y2 = y2 / sprite->data[0];
+    xDelta = xDelta / sprite->data[0];
+    yDelta = yDelta / sprite->data[0];
 
-    if (r8)
-        x2 |= 1;
+    if (movingLeft)
+        xDelta |= 1;
     else
-        x2 &= ~1;
+        xDelta &= ~1;
 
-    if (r9)
-        y2 |= 1;
+    if (movingUp)
+        yDelta |= 1;
     else
-        y2 &= ~1;
+        yDelta &= ~1;
 
-    sprite->data[1] = x2;
-    sprite->data[2] = y2;
+    sprite->data[1] = xDelta;
+    sprite->data[2] = yDelta;
     sprite->data[4] = 0;
     sprite->data[3] = 0;
 }
 
-void sub_8078B34(struct Sprite *sprite)
+void StartTranslateAnimSpriteByDeltas(struct Sprite *sprite)
 {
     sprite->data[1] = sprite->pos1.x;
     sprite->data[3] = sprite->pos1.y;
-    obj_translate_based_on_private_1_2_3_4(sprite);
-    sprite->callback = sub_8078BB8;
+    InitAnimSpriteTranslationDeltas(sprite);
+    sprite->callback = TranslateAnimSpriteByDeltasUntil;
     sprite->callback(sprite);
 }
 
-bool8 sub_8078B5C(struct Sprite *sprite)
+bool8 TranslateAnimSpriteByDeltas(struct Sprite *sprite)
 {
     u16 v1, v2, x, y;
 
@@ -1020,9 +1022,9 @@ bool8 sub_8078B5C(struct Sprite *sprite)
     return FALSE;
 }
 
-void sub_8078BB8(struct Sprite *sprite)
+void TranslateAnimSpriteByDeltasUntil(struct Sprite *sprite)
 {
-    if (sub_8078B5C(sprite))
+    if (TranslateAnimSpriteByDeltas(sprite))
         SetCallbackToStoredInData(sprite);
 }
 
@@ -1030,7 +1032,7 @@ void sub_8078BD4(struct Sprite *sprite)
 {
     int v1 = abs(sprite->data[2] - sprite->data[1]) << 8;
     sprite->data[0] = v1 / sprite->data[0];
-    obj_translate_based_on_private_1_2_3_4(sprite);
+    InitAnimSpriteTranslationDeltas(sprite);
 }
 
 void sub_8078C00(struct Sprite *sprite)
@@ -1038,7 +1040,7 @@ void sub_8078C00(struct Sprite *sprite)
     sprite->data[1] = sprite->pos1.x;
     sprite->data[3] = sprite->pos1.y;
     sub_8078BD4(sprite);
-    sprite->callback = sub_8078BB8;
+    sprite->callback = TranslateAnimSpriteByDeltasUntil;
     sprite->callback(sprite);
 }
 
@@ -1380,7 +1382,7 @@ void sub_80793C4(struct Sprite *sprite)
         else
             var = FALSE;
         if (!gBattleAnimArgs[2])
-            sub_80787B0(sprite, var);
+            InitAnimSpritePos(sprite, var);
         else
             sub_8078764(sprite, var);
         sprite->data[0]++;
@@ -1392,7 +1394,15 @@ void sub_80793C4(struct Sprite *sprite)
     }
 }
 
-void sub_807941C(struct Sprite *sprite)
+// Linearly translates a sprite to a target position on the
+// other mon's sprite.
+// arg 0: initial x offset
+// arg 1: initial y offset
+// arg 2: target x offset
+// arg 3: target y offset
+// arg 4: duration
+// arg 5: lower 8 bits = location on attacking mon, upper 8 bits = location on target mon pick to target
+void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite)
 {
     bool8 v1;
     u8 v2;
@@ -1407,19 +1417,20 @@ void sub_807941C(struct Sprite *sprite)
     else
         v2 = 1;
 
-    sub_80787B0(sprite, v1);
-    if (GetBankSide(gAnimBankAttacker))
+    InitAnimSpritePos(sprite, v1);
+    if (GetBankSide(gAnimBankAttacker) != SIDE_PLAYER)
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
+
     sprite->data[0] = gBattleAnimArgs[4];
     sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
     sprite->data[4] = GetBankPosition(gAnimBankTarget, v2) + gBattleAnimArgs[3];
-    sprite->callback = sub_8078B34;
+    sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
 void sub_80794A8(struct Sprite *sprite)
 {
-    sub_80787B0(sprite, 1);
+    InitAnimSpritePos(sprite, 1);
     if (GetBankSide(gAnimBankAttacker))
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
     sprite->data[0] = gBattleAnimArgs[4];
@@ -1432,7 +1443,7 @@ void sub_80794A8(struct Sprite *sprite)
 
 void sub_8079518(struct Sprite *sprite)
 {
-    if (sub_8078718(sprite))
+    if (TranslateAnimSpriteLinearAndSine(sprite))
         DestroyAnimSprite(sprite);
 }
 
@@ -1452,7 +1463,7 @@ void sub_8079534(struct Sprite *sprite)
     }
     if (!gBattleAnimArgs[5])
     {
-        sub_80787B0(sprite, r4);
+        InitAnimSpritePos(sprite, r4);
         slot = gAnimBankAttacker;
     }
     else
@@ -1466,7 +1477,7 @@ void sub_8079534(struct Sprite *sprite)
     sprite->data[0] = gBattleAnimArgs[4];
     sprite->data[2] = GetBankPosition(slot, 2) + gBattleAnimArgs[2];
     sprite->data[4] = GetBankPosition(slot, r7) + gBattleAnimArgs[3];
-    sprite->callback = sub_8078B34;
+    sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
@@ -2107,7 +2118,7 @@ s16 sub_807A100(u8 slot, u8 a2)
     }
 }
 
-void sub_807A3FC(u8 slot, bool8 a2, s16 *a3, s16 *a4)
+void SetAverageBattlerPositions(u8 slot, bool8 a2, s16 *x, s16 *y)
 {
     u8 v1, v2;
     s16 v3, v4;
@@ -2135,8 +2146,8 @@ void sub_807A3FC(u8 slot, bool8 a2, s16 *a3, s16 *a4)
         v5 = v3;
         v6 = v4;
     }
-    *a3 = (v3 + v5) / 2;
-    *a4 = (v4 + v6) / 2;
+    *x = (v3 + v5) / 2;
+    *y = (v4 + v6) / 2;
 }
 
 u8 sub_807A4A0(int bank, u8 sprite, int species)
@@ -2338,6 +2349,6 @@ void sub_807A9BC(struct Sprite *sprite)
         sprite->pos1.x += x;
         sprite->pos1.y = gBattleAnimArgs[5] - 80;
     }
-    sprite->callback = sub_8078B34;
+    sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }