From 99ec579debc63991f16e08ef906111ad556edad5 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 14 Mar 2021 16:29:33 -0400
Subject: Name symbols in battle_anim_special.c

---
 src/battle_anim.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/battle_anim.c')

diff --git a/src/battle_anim.c b/src/battle_anim.c
index 41f44a42c..f9b620025 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -2259,7 +2259,7 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2)
 
         RequestDma3Fill(0, (void*)(BG_SCREEN_ADDR(8)), 0x2000, DMA3_32BIT);
         RequestDma3Fill(0, (void*)(BG_SCREEN_ADDR(28)), 0x1000, DMA3_32BIT);
-        sub_80752A0(&animBg);
+        GetBattleAnimBg1Data(&animBg);
         CpuFill16(toBG_2, animBg.bgTiles, 0x1000);
         CpuFill16(toBG_2, animBg.bgTilemap, 0x800);
 
@@ -2326,10 +2326,10 @@ void sub_80730C0(u16 a, u16 *b, s32 c, u8 d)
     }
 }
 
-void sub_8073128(bool8 to_BG2)
+void ResetBattleAnimBg(bool8 to_BG2)
 {
     struct BattleAnimBgData animBg;
-    sub_80752A0(&animBg);
+    GetBattleAnimBg1Data(&animBg);
 
     if (!to_BG2)
     {
@@ -2353,7 +2353,7 @@ static void task_pA_ma0A_obj_to_bg_pal(u8 taskId)
 
     spriteId = gTasks[taskId].data[0];
     palIndex = gTasks[taskId].data[6];
-    sub_80752A0(&animBg);
+    GetBattleAnimBg1Data(&animBg);
     x = gTasks[taskId].data[1] - (gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x);
     y = gTasks[taskId].data[2] - (gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y);
 
@@ -2429,13 +2429,13 @@ static void sub_807331C(u8 taskId)
 
         if (sMonAnimTaskIdArray[0] != 0xFF)
         {
-            sub_8073128(toBG_2);
+            ResetBattleAnimBg(toBG_2);
             DestroyTask(sMonAnimTaskIdArray[0]);
             sMonAnimTaskIdArray[0] = 0xFF;
         }
         if (gTasks[taskId].data[0] > 1)
         {
-            sub_8073128(toBG_2 ^ 1);
+            ResetBattleAnimBg(toBG_2 ^ 1);
             DestroyTask(sMonAnimTaskIdArray[1]);
             sMonAnimTaskIdArray[1] = 0xFF;
         }
@@ -2541,10 +2541,10 @@ static void sub_8073558(u8 taskId)
             toBG_2 = TRUE;
 
         if (IsBattlerSpriteVisible(battlerId))
-            sub_8073128(toBG_2);
+            ResetBattleAnimBg(toBG_2);
         
         if (gTasks[taskId].data[0] > 1 && IsBattlerSpriteVisible(battlerId ^ BIT_FLANK))
-            sub_8073128(toBG_2 ^ 1);
+            ResetBattleAnimBg(toBG_2 ^ 1);
 
         DestroyTask(taskId);
     }
@@ -3303,9 +3303,9 @@ static void ScriptCmd_doublebattle_2D(void)
                 gSprites[spriteId].oam.priority = 3;
 
             if (priority == 1)
-                sub_8073128(FALSE);
+                ResetBattleAnimBg(FALSE);
             else
-                sub_8073128(TRUE);
+                ResetBattleAnimBg(TRUE);
         }
     }
 }
-- 
cgit v1.2.3


From d86c9b097628577e91a6ab5b0609fa61790945a2 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 18 Mar 2021 08:49:31 -0400
Subject: Document battle_anim_mons, 1

---
 src/battle_anim.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/battle_anim.c')

diff --git a/src/battle_anim.c b/src/battle_anim.c
index f9b620025..0b011b0f3 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -2278,13 +2278,14 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2)
         LoadPalette(&gPlttBufferUnfaded[0x100 + battlerId * 16], animBg.paletteId * 16, 0x20);
         CpuCopy32(&gPlttBufferUnfaded[0x100 + battlerId * 16], (void*)(BG_PLTT + animBg.paletteId * 32), 0x20);
 
-        sub_80BCEF4(1, 0, 0, GetBattlerPosition(battlerId), animBg.paletteId, animBg.bgTiles, animBg.bgTilemap, animBg.tilesOffset);
+        CopyBattlerSpriteToBg(1, 0, 0, GetBattlerPosition(battlerId), animBg.paletteId, animBg.bgTiles,
+                              animBg.bgTilemap, animBg.tilesOffset);
     }
     else
     {
         RequestDma3Fill(0, (void*)(BG_SCREEN_ADDR(12)), 0x2000, DMA3_32BIT);
         RequestDma3Fill(0, (void*)(BG_SCREEN_ADDR(30)), 0x1000, DMA3_32BIT);
-        sub_80752C8(&animBg, 2);
+        GetBattleAnimBgData(&animBg, 2);
         CpuFill16(0, animBg.bgTiles + 0x1000, 0x1000);
         CpuFill16(0, animBg.bgTilemap + 0x400, 0x800);
         SetAnimBgAttribute(2, BG_ANIM_PRIORITY, 2);
@@ -2302,7 +2303,8 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2)
         LoadPalette(&gPlttBufferUnfaded[0x100 + battlerId * 16], 0x90, 0x20);
         CpuCopy32(&gPlttBufferUnfaded[0x100 + battlerId * 16], (void*)(BG_PLTT + 0x120), 0x20);
 
-        sub_80BCEF4(2, 0, 0, GetBattlerPosition(battlerId), animBg.paletteId, animBg.bgTiles + 0x1000, animBg.bgTilemap + 0x400, animBg.tilesOffset);
+        CopyBattlerSpriteToBg(2, 0, 0, GetBattlerPosition(battlerId), animBg.paletteId, animBg.bgTiles + 0x1000,
+                              animBg.bgTilemap + 0x400, animBg.tilesOffset);
     }
 }
 
@@ -2333,13 +2335,13 @@ void ResetBattleAnimBg(bool8 to_BG2)
 
     if (!to_BG2)
     {
-        sub_8075358(1);
+        InitBattleAnimBg(1);
         gBattle_BG1_X = 0;
         gBattle_BG1_Y = 0;
     }
     else
     {
-        sub_8075358(2);
+        InitBattleAnimBg(2);
         gBattle_BG2_X = 0;
         gBattle_BG2_Y = 0;
     }
-- 
cgit v1.2.3