1 files changed, 26 insertions, 26 deletions

diff --git a/src/battle/pokeball.c b/src/battle/pokeball.c
index 6f27469ce..20c6d8676 100644
--- a/src/battle/pokeball.c
+++ b/src/battle/pokeball.c
@@ -21,7 +21,7 @@ extern u16 gBattleTypeFlags;
 extern u8 gBankTarget;
 extern u8 gActiveBank;
 extern u16 gBattlePartyID[];
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
 extern u8 gDoingBattleAnim;
 extern u8 gHealthboxIDs[];
 
@@ -297,8 +297,8 @@ 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 void InitAnimSpriteTranslationOverDuration();
+extern bool8 TranslateAnimSpriteLinearAndSine(struct Sprite *);
 extern u8 sub_814086C(u8, u8, int, int, u8);
 extern u8 sub_8141314(u8, u8, int, u8);
 
@@ -397,7 +397,7 @@ static void sub_8046464(u8 taskId)
     gSprites[spriteId].data[2] = GetBankPosition(gBankTarget, 0);
     gSprites[spriteId].data[4] = GetBankPosition(gBankTarget, 1) - 16;
     gSprites[spriteId].data[5] = -40;
-    sub_80786EC(&gSprites[spriteId]);
+    InitAnimSpriteTranslationOverDuration(&gSprites[spriteId]);
     gSprites[spriteId].oam.affineParam = taskId;
     gTasks[taskId].data[4] = gBankTarget;
     gTasks[taskId].func = TaskDummy;
@@ -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];
@@ -442,9 +442,9 @@ static void sub_80466F4(struct Sprite *sprite)
     {
         sprite->data[5] = 0;
         sprite->callback = sub_8046760;
-        StartSpriteAffineAnim(&gSprites[gObjectBankIDs[sprite->data[6]]], 2);
-        AnimateSprite(&gSprites[gObjectBankIDs[sprite->data[6]]]);
-        gSprites[gObjectBankIDs[sprite->data[6]]].data[1] = 0;
+        StartSpriteAffineAnim(&gSprites[gBankSpriteIds[sprite->data[6]]], 2);
+        AnimateSprite(&gSprites[gBankSpriteIds[sprite->data[6]]]);
+        gSprites[gBankSpriteIds[sprite->data[6]]].data[1] = 0;
     }
 }
 
@@ -453,17 +453,17 @@ static void sub_8046760(struct Sprite *sprite)
     sprite->data[5]++;
     if (sprite->data[5] == 11)
         PlaySE(SE_SUIKOMU);
-    if (gSprites[gObjectBankIDs[sprite->data[6]]].affineAnimEnded)
+    if (gSprites[gBankSpriteIds[sprite->data[6]]].affineAnimEnded)
     {
         StartSpriteAnim(sprite, 2);
-        gSprites[gObjectBankIDs[sprite->data[6]]].invisible = TRUE;
+        gSprites[gBankSpriteIds[sprite->data[6]]].invisible = TRUE;
         sprite->data[5] = 0;
         sprite->callback = sub_80467F8;
     }
     else
     {
-        gSprites[gObjectBankIDs[sprite->data[6]]].data[1] += 0x60;
-        gSprites[gObjectBankIDs[sprite->data[6]]].pos2.y = -gSprites[gObjectBankIDs[sprite->data[6]]].data[1] >> 8;
+        gSprites[gBankSpriteIds[sprite->data[6]]].data[1] += 0x60;
+        gSprites[gBankSpriteIds[sprite->data[6]]].pos2.y = -gSprites[gBankSpriteIds[sprite->data[6]]].data[1] >> 8;
     }
 }
 
@@ -747,9 +747,9 @@ static void sub_8046C78(struct Sprite *sprite)
         gTasks[taskId].data[2] = r4_2;
         gTasks[taskId].data[15] = 0;
     }
-    StartSpriteAffineAnim(&gSprites[gObjectBankIDs[sprite->data[6]]], 1);
-    AnimateSprite(&gSprites[gObjectBankIDs[sprite->data[6]]]);
-    gSprites[gObjectBankIDs[sprite->data[6]]].data[1] = 0x1000;
+    StartSpriteAffineAnim(&gSprites[gBankSpriteIds[sprite->data[6]]], 1);
+    AnimateSprite(&gSprites[gBankSpriteIds[sprite->data[6]]]);
+    gSprites[gBankSpriteIds[sprite->data[6]]].data[1] = 0x1000;
 }
 
 static void sub_8046E7C(struct Sprite *sprite)
@@ -766,25 +766,25 @@ static void sub_8046E9C(struct Sprite *sprite)
     bool8 r7 = FALSE;
     u8 r4 = sprite->data[6];
 
-    gSprites[gObjectBankIDs[r4]].invisible = FALSE;
+    gSprites[gBankSpriteIds[r4]].invisible = FALSE;
     if (sprite->animEnded)
         sprite->invisible = TRUE;
-    if (gSprites[gObjectBankIDs[r4]].affineAnimEnded)
+    if (gSprites[gBankSpriteIds[r4]].affineAnimEnded)
     {
-        StartSpriteAffineAnim(&gSprites[gObjectBankIDs[r4]], 0);
+        StartSpriteAffineAnim(&gSprites[gBankSpriteIds[r4]], 0);
         r7 = TRUE;
     }
     else
     {
-        gSprites[gObjectBankIDs[r4]].data[1] -= 288;
-        gSprites[gObjectBankIDs[r4]].pos2.y = gSprites[gObjectBankIDs[r4]].data[1] >> 8;
+        gSprites[gBankSpriteIds[r4]].data[1] -= 288;
+        gSprites[gBankSpriteIds[r4]].pos2.y = gSprites[gBankSpriteIds[r4]].data[1] >> 8;
     }
     if (sprite->animEnded && r7)
     {
         s32 i;
         u32 r3;
 
-        gSprites[gObjectBankIDs[r4]].pos2.y = 0;
+        gSprites[gBankSpriteIds[r4]].pos2.y = 0;
         gDoingBattleAnim = 0;
         ewram17810[r4].unk0_3 = 0;
         FreeSpriteOamMatrix(sprite);
@@ -819,8 +819,8 @@ static void sub_8046FBC(struct Sprite *sprite)
     }
     else if (sprite->data[4] == 315)
     {
-        FreeOamMatrix(gSprites[gObjectBankIDs[sprite->data[6]]].oam.matrixNum);
-        DestroySprite(&gSprites[gObjectBankIDs[sprite->data[6]]]);
+        FreeOamMatrix(gSprites[gBankSpriteIds[sprite->data[6]]].oam.matrixNum);
+        DestroySprite(&gSprites[gBankSpriteIds[sprite->data[6]]]);
         DestroySpriteAndFreeResources(sprite);
         if (gMain.inBattle)
             ewram17810[r7].unk0_3 = 0;
@@ -834,7 +834,7 @@ static void sub_8047074(struct Sprite *sprite)
     sprite->data[4] = GetBankPosition(sprite->data[6], 3) + 24;
     sprite->data[5] = -30;
     sprite->oam.affineParam = sprite->data[6];
-    sub_80786EC(sprite);
+    InitAnimSpriteTranslationOverDuration(sprite);
     sprite->callback = sub_80470C4;
 }
 
@@ -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;