document battle anim script commands

22 files changed, 119 insertions, 55 deletions

diff --git a/src/battle/anim/current.c b/src/battle/anim/current.c
index 41b7dda42..94d74b96e 100644
--- a/src/battle/anim/current.c
+++ b/src/battle/anim/current.c
@@ -1298,7 +1298,7 @@ void sub_80D759C(u8 taskId)
         }
 
         task->data[13] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-        task->data[12] = sub_8079E90(gAnimBankTarget) - 2;
+        task->data[12] = GetBattlerSubpriority(gAnimBankTarget) - 2;
         task->data[0]++;
         break;
     case 1:
diff --git a/src/battle/anim/devil.c b/src/battle/anim/devil.c
index ebec1f58e..8e1010d2b 100644
--- a/src/battle/anim/devil.c
+++ b/src/battle/anim/devil.c
@@ -45,7 +45,7 @@ void sub_80D2ABC(struct Sprite *sprite)
         sprite->pos1.x += gBattleAnimArgs[0];
         sprite->pos1.y += gBattleAnimArgs[1];
         StartSpriteAnim(sprite, 0);
-        sprite->subpriority = sub_8079E90(gAnimBankTarget) - 1;
+        sprite->subpriority = GetBattlerSubpriority(gAnimBankTarget) - 1;
         sprite->data[2] = 1;
     }
     sprite->data[0] += sprite->data[2];
diff --git a/src/battle/anim/energy_wave.c b/src/battle/anim/energy_wave.c
index 7118b5acc..cdf3e3ced 100644
--- a/src/battle/anim/energy_wave.c
+++ b/src/battle/anim/energy_wave.c
@@ -232,7 +232,7 @@ void sub_80D3698(struct Sprite *sprite)
     sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
     sprite->pos2.y = -10;
 
-    subpriority = sub_8079E90(gAnimBankAttacker);
+    subpriority = GetBattlerSubpriority(gAnimBankAttacker);
 
     if (!IsContest())
     {
diff --git a/src/battle/anim/flying_path.c b/src/battle/anim/flying_path.c
index d2f85ad35..c9c506919 100644
--- a/src/battle/anim/flying_path.c
+++ b/src/battle/anim/flying_path.c
@@ -84,7 +84,7 @@ void sub_80CBDF4(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
 
-    task->data[4] = sub_8079E90(gAnimBankTarget) - 1;
+    task->data[4] = GetBattlerSubpriority(gAnimBankTarget) - 1;
     task->data[6] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
     task->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
     task->data[10] = sub_807A100(gAnimBankTarget, 1);
diff --git a/src/battle/anim/ghost.c b/src/battle/anim/ghost.c
index cd2b4eb0c..130e7ff92 100644
--- a/src/battle/anim/ghost.c
+++ b/src/battle/anim/ghost.c
@@ -1219,7 +1219,7 @@ void sub_80DF1A4(u8 taskId)
     task->data[11] = (sub_807A100(gAnimBankAttacker, 1) / 2) + 8;
     task->data[7] = 0;
     task->data[5] = sub_8079ED4(gAnimBankAttacker);
-    task->data[6] = sub_8079E90(gAnimBankAttacker) - 2;
+    task->data[6] = GetBattlerSubpriority(gAnimBankAttacker) - 2;
     task->data[3] = 0;
     task->data[4] = 16;
     REG_BLDCNT = 0x3F40;
diff --git a/src/battle/anim/hidden_power_orbit.c b/src/battle/anim/hidden_power_orbit.c
index 2fce2da37..3d1cd74c0 100644
--- a/src/battle/anim/hidden_power_orbit.c
+++ b/src/battle/anim/hidden_power_orbit.c
@@ -58,7 +58,7 @@ void AnimOrbitFast(struct Sprite* sprite)
     sprite->affineAnimPaused = 1;
     sprite->data[0] = gBattleAnimArgs[0];
     sprite->data[1] = gBattleAnimArgs[1];
-    sprite->data[7] = sub_8079E90(gAnimBankAttacker);
+    sprite->data[7] = GetBattlerSubpriority(gAnimBankAttacker);
     sprite->callback = AnimOrbitFastStep;
     sprite->callback(sprite);
 }
diff --git a/src/battle/anim/orbit.c b/src/battle/anim/orbit.c
index 1c5ba144d..d59adde08 100644
--- a/src/battle/anim/orbit.c
+++ b/src/battle/anim/orbit.c
@@ -172,11 +172,11 @@ static void sub_80CADA8(struct Sprite* sprite)
         sprite->pos2.y += Cos(sprite->data[5], -5);
         if ((u16)(sprite->data[5] - 0x40) < 0x80)
         {
-            sprite->subpriority = sub_8079E90(gAnimBankAttacker) - 1;
+            sprite->subpriority = GetBattlerSubpriority(gAnimBankAttacker) - 1;
         }
         else
         {
-            sprite->subpriority = sub_8079E90(gAnimBankAttacker) + 1;
+            sprite->subpriority = GetBattlerSubpriority(gAnimBankAttacker) + 1;
         }
 
         sprite->data[5] = (sprite->data[5] + 5) & 0xFF;
diff --git a/src/battle/anim/orbs.c b/src/battle/anim/orbs.c
index e78d8f974..3301990ec 100644
--- a/src/battle/anim/orbs.c
+++ b/src/battle/anim/orbs.c
@@ -235,11 +235,11 @@ static void sub_80CA8B4(struct Sprite* sprite)
     {
         if (sprite->data[5] > 0x7F)
         {
-            sprite->subpriority = sub_8079E90(gAnimBankTarget) + 1;
+            sprite->subpriority = GetBattlerSubpriority(gAnimBankTarget) + 1;
         }
         else
         {
-            sprite->subpriority = sub_8079E90(gAnimBankTarget) + 6;
+            sprite->subpriority = GetBattlerSubpriority(gAnimBankTarget) + 6;
         }
         sprite->pos2.x += Sin(sprite->data[5], 5);
         sprite->pos2.y += Cos(sprite->data[5], 14);
@@ -258,7 +258,7 @@ void sub_80CA928(u8 taskId)
         gBattleAnimArgs[1] = 0;
         gBattleAnimArgs[2] = 80;
         gBattleAnimArgs[3] = 0;
-        CreateSpriteAndAnimate(&gSpriteTemplate_83D631C, 0, 0, sub_8079E90(gAnimBankTarget) + 1);
+        CreateSpriteAndAnimate(&gSpriteTemplate_83D631C, 0, 0, GetBattlerSubpriority(gAnimBankTarget) + 1);
     }
 
     if (gTasks[taskId].data[1] == 15)
diff --git a/src/battle/anim/shadow_minimize.c b/src/battle/anim/shadow_minimize.c
index 1a04fd58a..224896d86 100644
--- a/src/battle/anim/shadow_minimize.c
+++ b/src/battle/anim/shadow_minimize.c
@@ -27,7 +27,7 @@ void sub_80D0488(u8 taskId)
     task->data[4] = 0x100;
     task->data[5] = 0;
     task->data[6] = 0;
-    task->data[7] = sub_8079E90(gAnimBankAttacker);
+    task->data[7] = GetBattlerSubpriority(gAnimBankAttacker);
     task->func = sub_80D04E0;
 }
 
diff --git a/src/battle/anim/sonic.c b/src/battle/anim/sonic.c
index d1e7f2e6b..1de546780 100644
--- a/src/battle/anim/sonic.c
+++ b/src/battle/anim/sonic.c
@@ -347,12 +347,12 @@ void sub_80CFB04(u8 taskId)
         gBattleAnimArgs[4] ^= 0x80;
         if (gBattleAnimArgs[4] >= 64)
         {
-            u16 var = sub_8079E90(gAnimBankTarget) + (gBattleAnimArgs[4] - 64);
+            u16 var = GetBattlerSubpriority(gAnimBankTarget) + (gBattleAnimArgs[4] - 64);
             gTasks[taskId].data[2] = var;
         }
         else
         {
-            u16 var = sub_8079E90(gAnimBankTarget) - gBattleAnimArgs[4];
+            u16 var = GetBattlerSubpriority(gAnimBankTarget) - gBattleAnimArgs[4];
             gTasks[taskId].data[2] = var;
         }
     }
@@ -360,12 +360,12 @@ void sub_80CFB04(u8 taskId)
     {
         if (gBattleAnimArgs[4] >= 64)
         {
-            u16 var = sub_8079E90(gAnimBankTarget) + (gBattleAnimArgs[4] - 64);
+            u16 var = GetBattlerSubpriority(gAnimBankTarget) + (gBattleAnimArgs[4] - 64);
             gTasks[taskId].data[2] = var;
         }
         else
         {
-            u16 var = sub_8079E90(gAnimBankTarget) - gBattleAnimArgs[4];
+            u16 var = GetBattlerSubpriority(gAnimBankTarget) - gBattleAnimArgs[4];
             gTasks[taskId].data[2] = var;
         }
     }
diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c
index 1df920e2a..a613a237e 100644
--- a/src/battle/battle_anim.c
+++ b/src/battle/battle_anim.c
@@ -1285,6 +1285,8 @@ extern u16 gBattlerPartyIndexes[4];
 extern u8 gBankSpriteIds[];
 extern u8 gBankAttacker;
 extern u8 gBankTarget;
+
+// sBattleAnimScriptPtr is a pointer to the next set of battle script commands.
 EWRAM_DATA const u8 *sBattleAnimScriptPtr = NULL;
 EWRAM_DATA const u8 *gBattleAnimScriptRetAddr = NULL;
 EWRAM_DATA void (*gAnimScriptCallback)(void) = NULL;
@@ -1472,7 +1474,7 @@ void LaunchBattleAnimation(const u8 *const moveAnims[], u16 move, u8 isMoveAnim)
 
     if (!IsContest())
     {
-        sub_8079E24();
+        UpdateBattlerSpritePriorities();
         UpdateOamPriorityInAllHealthboxes(0);
         for (i = 0; i < 4; i++)
         {
@@ -1593,6 +1595,8 @@ static void RunAnimScriptCommand(void)
     } while (gAnimFramesToWait == 0 && gAnimScriptActive);
 }
 
+// Loads sprite graphics used in a move into memory.
+// arg 0: gfx ANIM_TAG
 static void ScriptCmd_loadspritegfx(void)
 {
     u16 tag;
@@ -1607,6 +1611,8 @@ static void ScriptCmd_loadspritegfx(void)
     gAnimScriptCallback = WaitAnimFrameCount;
 }
 
+// Frees sprite graphics from memory when move animation no longer needs them.
+// arg0: gfx ANIM_TAG
 static void ScriptCmd_unloadspritegfx(void)
 {
     u16 tag;
@@ -1619,6 +1625,9 @@ static void ScriptCmd_unloadspritegfx(void)
     ClearSpriteIndex(GET_TRUE_SPRITE_INDEX(tag));
 }
 
+// Creates a sprite from the given sprite template.
+// arg0: SpriteTemplate
+// arg1: s16[] gBattleAnimArgs
 static void ScriptCmd_createsprite(void)
 {
     s32 i;
@@ -1650,7 +1659,7 @@ static void ScriptCmd_createsprite(void)
         else
             argVar *= -1;
 
-        subpriority = sub_8079E90(gAnimBankTarget) + (s8)(argVar);
+        subpriority = GetBattlerSubpriority(gAnimBankTarget) + (s8)(argVar);
     }
     else
     {
@@ -1659,7 +1668,7 @@ static void ScriptCmd_createsprite(void)
         else
             argVar *= -1;
 
-        subpriority = sub_8079E90(gAnimBankAttacker) + (s8)(argVar);
+        subpriority = GetBattlerSubpriority(gAnimBankAttacker) + (s8)(argVar);
     }
 
     if (subpriority < 3)
@@ -1669,6 +1678,9 @@ static void ScriptCmd_createsprite(void)
     gAnimVisualTaskCount++;
 }
 
+// Initializes an animation task.
+// arg0: AnimTask function
+// arg1: s16[] arguments
 static void ScriptCmd_createvisualtask(void)
 {
     TaskFunc taskFunc;
@@ -1699,6 +1711,8 @@ static void ScriptCmd_createvisualtask(void)
     gAnimVisualTaskCount++;
 }
 
+// Creates a visual delay.
+// arg0: number of frames to wait.
 static void ScriptCmd_delay(void)
 {
     sBattleAnimScriptPtr++;
@@ -1709,7 +1723,7 @@ static void ScriptCmd_delay(void)
     gAnimScriptCallback = WaitAnimFrameCount;
 }
 
-// wait for visual tasks to finish.
+// Wait for visual tasks to finish.
 static void ScriptCmd_waitforvisualfinish(void)
 {
     if (gAnimVisualTaskCount == 0)
@@ -1731,6 +1745,8 @@ static void ScriptCmd_hang2(void)
 {
 }
 
+// Marks the end of an animation. Finishes the anims, tasks, and sound effects.
+// started during an animaiton.
 static void ScriptCmd_end(void)
 {
     s32 i;
@@ -1778,13 +1794,15 @@ static void ScriptCmd_end(void)
         m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256);
         if (IsContest() == 0)
         {
-            sub_8079E24();
+            UpdateBattlerSpritePriorities();
             UpdateOamPriorityInAllHealthboxes(1);
         }
         gAnimScriptActive = FALSE;
     }
 }
 
+// Plays a sound effect.
+// arg0: sound effect ID
 static void ScriptCmd_playse(void)
 {
     sBattleAnimScriptPtr++;
@@ -1792,6 +1810,8 @@ static void ScriptCmd_playse(void)
     sBattleAnimScriptPtr += 2;
 }
 
+// 
+// arg0: battler
 static void ScriptCmd_monbg(void)
 {
     u8 animBank;
@@ -2231,6 +2251,9 @@ static void sub_80769A4(u8 taskId)
     }
 }
 
+// Sets transparency of sprite.
+// arg0: sprite alpha value
+// arg1: background alpha value
 static void ScriptCmd_setalpha(void)
 {
     u16 spriteAlpha, bgAlpha;
@@ -2252,6 +2275,7 @@ static void ScriptCmd_setbldcnt(void)
     REG_BLDCNT = half1 | half2;
 }
 
+// Turns off alpha blending / semi transparency.
 static void ScriptCmd_blendoff(void)
 {
     sBattleAnimScriptPtr++;
@@ -2259,6 +2283,8 @@ static void ScriptCmd_blendoff(void)
     REG_BLDALPHA = 0;
 }
 
+// Calls another animation by resetting sBattleAnimScriptPtr.
+// arg0: Function
 static void ScriptCmd_call(void)
 {
     sBattleAnimScriptPtr++;
@@ -2266,11 +2292,15 @@ static void ScriptCmd_call(void)
     sBattleAnimScriptPtr = T2_READ_PTR(sBattleAnimScriptPtr);
 }
 
+// Returns to the function that called this.
 static void ScriptCmd_return(void)
 {
     sBattleAnimScriptPtr = gBattleAnimScriptRetAddr;
 }
 
+// Sets a value into gBattleAnimArgs[8]
+// arg0: index / arg number
+// arg1: value to set
 static void ScriptCmd_setarg(void)
 {
     const u8 *addr = sBattleAnimScriptPtr;
@@ -2285,6 +2315,9 @@ static void ScriptCmd_setarg(void)
     gBattleAnimArgs[argId] = value;
 }
 
+// Flips between the first and second step of a move with two turns.
+// arg0: first turn animation
+// arg1: second turn animation
 static void ScriptCmd_choosetwoturnanim(void)
 {
     sBattleAnimScriptPtr++;
@@ -2293,6 +2326,9 @@ static void ScriptCmd_choosetwoturnanim(void)
     sBattleAnimScriptPtr = T2_READ_PTR(sBattleAnimScriptPtr);
 }
 
+// Jump to specified step of multi turn moves.
+// arg0: move turn
+// arg1: turn animation
 static void ScriptCmd_jumpifmoveturn(void)
 {
     u8 toCheck;
@@ -2311,6 +2347,8 @@ static void ScriptCmd_jumpifmoveturn(void)
     }
 }
 
+// Jump to another animation.
+// arg0: new animation
 static void ScriptCmd_jump(void)
 {
     sBattleAnimScriptPtr++;
@@ -2328,6 +2366,8 @@ bool8 IsContest(void)
 #define tBackgroundId   data[0]
 #define tState          data[10]
 
+// Fades the screen and sets new background image.
+// arg0: background ID
 static void ScriptCmd_fadetobg(void)
 {
     u8 backgroundId;
@@ -2341,6 +2381,10 @@ static void ScriptCmd_fadetobg(void)
     sAnimBackgroundFadeState = 1;
 }
 
+// Fades to background image based on context of move (contest, battle)
+// arg0: opponent background image ID
+// arg1: player background image ID
+// arg2: contest background image ID
 static void ScriptCmd_fadetobgfromset(void)
 {
     u8 bg1, bg2, bg3;
@@ -2428,6 +2472,7 @@ static void LoadDefaultBg(void)
         DrawMainBattleBackground();
 }
 
+// Restores default background image.
 static void ScriptCmd_restorebg(void)
 {
     u8 taskId;
@@ -2441,6 +2486,7 @@ static void ScriptCmd_restorebg(void)
 #undef tBackgroundId
 #undef tState
 
+// Wait for background image fade out to compete.
 static void ScriptCmd_waitbgfadeout(void)
 {
     if (sAnimBackgroundFadeState == 2)
@@ -2454,6 +2500,7 @@ static void ScriptCmd_waitbgfadeout(void)
     }
 }
 
+// Wait for background image fade in to compete.
 static void ScriptCmd_waitbgfadein(void)
 {
     if (sAnimBackgroundFadeState == 0)
@@ -2467,6 +2514,8 @@ static void ScriptCmd_waitbgfadein(void)
     }
 }
 
+// Change background.
+// arg0: background image ID
 static void ScriptCmd_changebg(void)
 {
     sBattleAnimScriptPtr++;
@@ -2951,6 +3000,9 @@ static void Task_WaitAndPlaySE(u8 taskId)
 #undef tPanning
 #undef tFramesToWait
 
+// Creates a sound task.
+// arg0: sound task function
+// arg1: s16[] gBattleAnimArgs
 static void ScriptCmd_createsoundtask(void)
 {
     TaskFunc func;
@@ -2972,6 +3024,7 @@ static void ScriptCmd_createsoundtask(void)
     gAnimSoundTaskCount++;
 }
 
+// Wait for sound effect to end.
 static void ScriptCmd_waitsound(void)
 {
     if (gAnimSoundTaskCount != 0)
@@ -3000,6 +3053,10 @@ static void ScriptCmd_waitsound(void)
     }
 }
 
+// Jump to animation based on gBattleAnimArgs[index] value.
+// arg0: gBattleAnimArgs[] argument index
+// arg1: value
+// arg2: animation script
 static void ScriptCmd_jumpargeq(void)
 {
     u8 argId;
@@ -3015,6 +3072,8 @@ static void ScriptCmd_jumpargeq(void)
         sBattleAnimScriptPtr += 7;
 }
 
+// If using move in contest, go to specific animation script.
+// arg0: animation script
 static void ScriptCmd_jumpifcontest(void)
 {
     sBattleAnimScriptPtr++;
@@ -3079,6 +3138,8 @@ static void ScriptCmd_monbgprio_2A(void)
     }
 }
 
+// Sets sprite to be invisible.
+// arg0: battler sprite ID
 static void ScriptCmd_invisible(void)
 {
     u8 spriteId;
@@ -3090,6 +3151,8 @@ static void ScriptCmd_invisible(void)
     sBattleAnimScriptPtr += 2;
 }
 
+// Sets aprite to be visible.
+// arg0: battler sprite ID
 static void ScriptCmd_visible(void)
 {
     u8 spriteId;
@@ -3163,6 +3226,7 @@ static void ScriptCmd_doublebattle_2E(void)
     }
 }
 
+// Cease playing sounds.
 static void ScriptCmd_stopsound(void)
 {
     m4aMPlayStop(&gMPlay_SE1);
diff --git a/src/battle/battle_anim_812C144.c b/src/battle/battle_anim_812C144.c
index af7397c23..1cf0287b0 100644
--- a/src/battle/battle_anim_812C144.c
+++ b/src/battle/battle_anim_812C144.c
@@ -3146,9 +3146,9 @@ static void sub_812EEEC(struct Sprite *sprite)
     sprite->data[1] = (sprite->data[1] + 9) & 0xFF;
 
     if ((u16)sprite->data[1] < 64 || sprite->data[1] > 195)
-        sprite->subpriority = sub_8079E90(gAnimBankAttacker) - 1;
+        sprite->subpriority = GetBattlerSubpriority(gAnimBankAttacker) - 1;
     else
-        sprite->subpriority = sub_8079E90(gAnimBankAttacker) + 1;
+        sprite->subpriority = GetBattlerSubpriority(gAnimBankAttacker) + 1;
 
     if (sprite->data[5] == 0)
     {
@@ -4013,7 +4013,7 @@ void sub_812FD7C(u8 taskId)
 
     task->data[4] = GetBattlerSpriteCoord(battler, 0);
     task->data[5] = GetBattlerSpriteCoord(battler, 1);
-    task->data[6] = sub_8079E90(battler);
+    task->data[6] = GetBattlerSubpriority(battler);
     task->data[15] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
     sub_80798F4(task, task->data[15], &gUnknown_084028AC);
     task->func = sub_812FE20;
@@ -4342,7 +4342,7 @@ void sub_8130554(u8 taskId)
     task->data[12] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
     task->data[13] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
     task->data[14] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + sub_807A100(gAnimBankTarget, 0) / 4;
-    task->data[15] = CreateSprite(&gSpriteTemplate_84029AC, task->data[11], task->data[12], sub_8079E90(gAnimBankTarget) - 5);
+    task->data[15] = CreateSprite(&gSpriteTemplate_84029AC, task->data[11], task->data[12], GetBattlerSubpriority(gAnimBankTarget) - 5);
     if (task->data[15] != MAX_SPRITES)
     {
         gSprites[task->data[15]].data[0] = 16;
@@ -5034,12 +5034,12 @@ static void sub_8131564(struct Sprite *sprite)
 
     if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER)
     {
-        sprite->subpriority = sub_8079E90(gAnimBankTarget) - 2;
+        sprite->subpriority = GetBattlerSubpriority(gAnimBankTarget) - 2;
         y2 = -144;
     }
     else
     {
-        sprite->subpriority = sub_8079E90(gAnimBankTarget) + 2;
+        sprite->subpriority = GetBattlerSubpriority(gAnimBankTarget) + 2;
         y2 = -96;
     }
 
diff --git a/src/battle/battle_anim_813F0F4.c b/src/battle/battle_anim_813F0F4.c
index 2ad17c3b2..7bcae382f 100755
--- a/src/battle/battle_anim_813F0F4.c
+++ b/src/battle/battle_anim_813F0F4.c
@@ -721,7 +721,7 @@ void sub_813FBB8(u8 taskId)
     }
 
     ballIndex = ball_number_to_ball_processing_index(gLastUsedItem);
-    subpriority = sub_8079E90(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)) + 1;
+    subpriority = GetBattlerSubpriority(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)) + 1;
     spriteId = CreateSprite(&gBallSpriteTemplates[ballIndex], x + 32, y | 80, subpriority);
     gSprites[spriteId].data[0] = 34;
     gSprites[spriteId].data[1] = GetBattlerSpriteCoord(gAnimBankTarget, 0);
diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c
index f9c8fe7d1..117aeb932 100644
--- a/src/battle/battle_controller_linkopponent.c
+++ b/src/battle/battle_controller_linkopponent.c
@@ -55,7 +55,7 @@ extern MainCallback gPreBattleCallback1;
 extern struct MusicPlayerInfo gMPlay_BGM;
 
 extern u8 sub_8077F68();
-extern u8 sub_8079E90();
+extern u8 GetBattlerSubpriority();
 extern u8 GetBattlerPosition(u8);
 extern void BattleLoadOpponentMonSprite(struct Pokemon *, u8);
 extern void sub_8037A74(void);
@@ -1157,7 +1157,7 @@ void LinkOpponentHandleLoadPokeSprite(void)
       &gUnknown_02024E8C,
       GetBattlerSpriteCoord(gActiveBattler, 2),
       sub_8077F68(gActiveBattler),
-      sub_8079E90(gActiveBattler));
+      GetBattlerSubpriority(gActiveBattler));
     gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
     gSprites[gBankSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
     gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
@@ -1187,7 +1187,7 @@ void sub_8039430(u8 a, u8 b)
       &gUnknown_02024E8C,
       GetBattlerSpriteCoord(a, 2),
       sub_8077F68(a),
-      sub_8079E90(a));
+      GetBattlerSubpriority(a));
     gSprites[gUnknown_0300434C[a]].data[1] = gBankSpriteIds[a];
     gSprites[gBankSpriteIds[a]].data[0] = a;
     gSprites[gBankSpriteIds[a]].data[2] = species;
@@ -1258,7 +1258,7 @@ void LinkOpponentHandleTrainerThrow(void)
     gBankSpriteIds[gActiveBattler] = CreateSprite(
       &gUnknown_02024E8C,
       176 + xOffset, 40 + 4 * (8 - gTrainerFrontPicCoords[gender].coords),
-      sub_8079E90(gActiveBattler));
+      GetBattlerSubpriority(gActiveBattler));
     gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
     gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 2;
     gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[gender].tag);
diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c
index 38514bfb5..0db2f54b4 100644
--- a/src/battle/battle_controller_linkpartner.c
+++ b/src/battle/battle_controller_linkpartner.c
@@ -85,7 +85,7 @@ extern u8 CreateInvisibleSpriteWithCallback();
 extern void BattleLoadPlayerMonSprite();
 extern u8 GetBattlerSpriteCoord();
 extern u8 sub_8077F68();
-extern u8 sub_8079E90();
+extern u8 GetBattlerSubpriority();
 extern void nullsub_10();
 extern void sub_8045A5C();
 extern void sub_804777C();
@@ -1105,7 +1105,7 @@ void LinkPartnerHandleLoadPokeSprite(void)
       &gUnknown_02024E8C,
       GetBattlerSpriteCoord(gActiveBattler, 2),
       sub_8077F68(gActiveBattler),
-      sub_8079E90(gActiveBattler));
+      GetBattlerSubpriority(gActiveBattler));
     gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
     gSprites[gBankSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
     gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
@@ -1135,7 +1135,7 @@ void sub_811F864(u8 a, u8 b)
       &gUnknown_02024E8C,
       GetBattlerSpriteCoord(a, 2),
       sub_8077F68(a),
-      sub_8079E90(a));
+      GetBattlerSubpriority(a));
     gSprites[gUnknown_0300434C[a]].data[1] = gBankSpriteIds[a];
     gSprites[gBankSpriteIds[a]].data[0] = a;
     gSprites[gBankSpriteIds[a]].data[2] = species;
@@ -1205,7 +1205,7 @@ void LinkPartnerHandleTrainerThrow(void)
     gBankSpriteIds[gActiveBattler] = CreateSprite(
       &gUnknown_02024E8C,
       80 + xOffset, 80 + 4 * (8 - gTrainerBackPicCoords[gender].coords),
-      sub_8079E90(gActiveBattler));
+      GetBattlerSubpriority(gActiveBattler));
     gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
     gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240;
     gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c
index a7e99900b..cf1fd6274 100644
--- a/src/battle/battle_controller_opponent.c
+++ b/src/battle/battle_controller_opponent.c
@@ -67,7 +67,7 @@ extern u32 gBattleExecBuffer;
 
 extern u8 GetBattlerSpriteCoord();
 extern u8 sub_8077F68();
-extern u8 sub_8079E90();
+extern u8 GetBattlerSubpriority();
 extern void sub_8033018(void);
 extern void BattleLoadOpponentMonSprite();
 extern u8 GetBattlerPosition(u8);
@@ -1128,7 +1128,7 @@ void OpponentHandleLoadPokeSprite(void)
       &gUnknown_02024E8C,
       GetBattlerSpriteCoord(gActiveBattler, 2),
       sub_8077F68(gActiveBattler),
-      sub_8079E90(gActiveBattler));
+      GetBattlerSubpriority(gActiveBattler));
     gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
     gSprites[gBankSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
     gSprites[gBankSpriteIds[gActiveBattler]].data[2] = species;
@@ -1160,7 +1160,7 @@ void sub_803495C(u8 a, u8 b)
       &gUnknown_02024E8C,
       GetBattlerSpriteCoord(a, 2),
       sub_8077F68(a),
-      sub_8079E90(a));
+      GetBattlerSubpriority(a));
     gSprites[gBankSpriteIds[a]].data[0] = a;
     gSprites[gBankSpriteIds[a]].data[2] = species;
     gSprites[gUnknown_0300434C[a]].data[1] = gBankSpriteIds[a];
@@ -1236,7 +1236,7 @@ void OpponentHandleTrainerThrow(void)
       &gUnknown_02024E8C,
       0xB0,
       40 + 4 * (8 - gTrainerFrontPicCoords[trainerPicIndex].coords),
-      sub_8079E90(gActiveBattler));
+      GetBattlerSubpriority(gActiveBattler));
     gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
     gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 2;
     gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicIndex].tag);
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index de8b1579b..5d7a8955c 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -121,7 +121,7 @@ extern u8 GetBattlerPosition(u8);
 extern void LoadPlayerTrainerBankSprite();
 extern void sub_80313A0(struct Sprite *);
 extern void sub_802D204(void);
-extern u8 sub_8079E90();
+extern u8 GetBattlerSubpriority();
 extern void sub_802DEAC(void);
 extern void sub_80312F0(struct Sprite *);
 extern u8 GetBattlerSpriteCoord();
@@ -2515,7 +2515,7 @@ void sub_802F934(u8 bank, u8 b)
       &gUnknown_02024E8C,
       GetBattlerSpriteCoord(bank, 2),
       sub_8077F68(bank),
-      sub_8079E90(bank));
+      GetBattlerSubpriority(bank));
     gSprites[gUnknown_0300434C[bank]].data[1] = gBankSpriteIds[bank];
     gSprites[gBankSpriteIds[bank]].data[0] = bank;
     gSprites[gBankSpriteIds[bank]].data[2] = species;
@@ -2582,7 +2582,7 @@ void PlayerHandleTrainerThrow(void)
       &gUnknown_02024E8C,
       r7 + 80,
       (8 - gTrainerBackPicCoords[gSaveBlock2.playerGender].coords) * 4 + 80,
-      sub_8079E90(gActiveBattler));
+      GetBattlerSubpriority(gActiveBattler));
     gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
     gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240;
     gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c
index 72054ee6b..e547c4a3c 100644
--- a/src/battle/battle_controller_safari.c
+++ b/src/battle/battle_controller_safari.c
@@ -42,7 +42,7 @@ extern u8 GetBattlerSide(u8);
 extern u8 GetBattlerAtPosition(u8);
 extern u8 GetBattlerPosition(u8);
 extern void LoadPlayerTrainerBankSprite();
-extern u8 sub_8079E90();
+extern u8 GetBattlerSubpriority();
 extern void sub_80313A0(struct Sprite *);
 extern void sub_810BADC(void);
 extern void sub_8045A5C();
diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c
index a7ce7d27d..fa8b2a63b 100644
--- a/src/battle/battle_controller_wally.c
+++ b/src/battle/battle_controller_wally.c
@@ -91,7 +91,7 @@ extern void StoreSpriteCallbackInData();
 extern u8 StartSendOutMonAnimation();
 extern u8 GetBattlerSpriteCoord();
 extern u8 sub_8077F68();
-extern u8 sub_8079E90();
+extern u8 GetBattlerSubpriority();
 extern void sub_80312F0(struct Sprite *);
 extern bool8 move_anim_start_t3();
 
@@ -1510,7 +1510,7 @@ void sub_81398BC(u8 bank)
       &gUnknown_02024E8C,
       GetBattlerSpriteCoord(bank, 2),
       sub_8077F68(bank),
-      sub_8079E90(bank));
+      GetBattlerSubpriority(bank));
     gSprites[gUnknown_0300434C[bank]].data[1] = gBankSpriteIds[bank];
     gSprites[gBankSpriteIds[bank]].data[0] = bank;
     gSprites[gBankSpriteIds[bank]].data[2] = species;
diff --git a/src/battle/reshow_battle_screen.c b/src/battle/reshow_battle_screen.c
index bc4d394f0..712ec3ea8 100644
--- a/src/battle/reshow_battle_screen.c
+++ b/src/battle/reshow_battle_screen.c
@@ -235,7 +235,7 @@ static void sub_807B184(u8 bank)
             if (GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_HP) == 0)
                 return;
             GetMonSpriteTemplate_803C56C(GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES), GetBattlerPosition(bank));
-            gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, GetBattlerSpriteCoord(bank, 2), posY, sub_8079E90(bank));
+            gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, GetBattlerSpriteCoord(bank, 2), posY, GetBattlerSubpriority(bank));
             gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
             gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
             gSprites[gBankSpriteIds[bank]].data[0] = bank;
@@ -247,7 +247,7 @@ static void sub_807B184(u8 bank)
             GetMonSpriteTemplate_803C5A0(gSaveBlock2.playerGender, GetBattlerPosition(0));
             gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, 0x50,
                                                 (8 - gTrainerBackPicCoords[gSaveBlock2.playerGender].coords) * 4 + 80,
-                                                 sub_8079E90(0));
+                                                 GetBattlerSubpriority(0));
             gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
             gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
             gSprites[gBankSpriteIds[bank]].data[0] = bank;
@@ -257,7 +257,7 @@ static void sub_807B184(u8 bank)
             GetMonSpriteTemplate_803C5A0(2, GetBattlerPosition(0));
             gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, 0x50,
                                                 (8 - gTrainerBackPicCoords[2].coords) * 4 + 80,
-                                                 sub_8079E90(0));
+                                                 GetBattlerSubpriority(0));
             gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
             gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
             gSprites[gBankSpriteIds[bank]].data[0] = bank;
@@ -267,7 +267,7 @@ static void sub_807B184(u8 bank)
             if (GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_HP) == 0)
                 return;
             GetMonSpriteTemplate_803C56C(GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES), GetBattlerPosition(bank));
-            gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, GetBattlerSpriteCoord(bank, 2), posY, sub_8079E90(bank));
+            gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, GetBattlerSpriteCoord(bank, 2), posY, GetBattlerSubpriority(bank));
             gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
             gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
             gSprites[gBankSpriteIds[bank]].data[0] = bank;
diff --git a/src/contest.c b/src/contest.c
index 78e2da3c0..076d08759 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -2495,7 +2495,7 @@ u8 sub_80AE9FC(u16 species, u32 otId, u32 personality)
     spriteId = CreateSprite(&gUnknown_02024E8C, 112, sub_8077E44(2, species, 0), 30);
     gSprites[spriteId].oam.paletteNum = 2;
     gSprites[spriteId].oam.priority = 2;
-    gSprites[spriteId].subpriority = sub_8079E90(2);
+    gSprites[spriteId].subpriority = GetBattlerSubpriority(2);
     gSprites[spriteId].callback = SpriteCallbackDummy;
     gSprites[spriteId].data[0] = gSprites[spriteId].oam.paletteNum;
     gSprites[spriteId].data[2] = species;
diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c
index 8e8e6ef8a..20ca6c592 100644
--- a/src/rom_8077ABC.c
+++ b/src/rom_8077ABC.c
@@ -1862,7 +1862,7 @@ void unref_sub_8079D20(u8 priority)
         gSprites[gBattleMonSprites[gAnimBankAttacker ^ 2]].oam.priority = priority;
 }
 
-void sub_8079E24()
+void UpdateBattlerSpritePriorities()
 {
     int i;
 
@@ -1870,13 +1870,13 @@ void sub_8079E24()
     {
         if (IsAnimBankSpriteVisible(i))
         {
-            gSprites[gBattleMonSprites[i]].subpriority = sub_8079E90(i);
+            gSprites[gBattleMonSprites[i]].subpriority = GetBattlerSubpriority(i);
             gSprites[gBattleMonSprites[i]].oam.priority = 2;
         }
     }
 }
 
-u8 sub_8079E90(u8 bank)
+u8 GetBattlerSubpriority(u8 bank)
 {
     u8 identity;
     u8 ret;
@@ -2241,7 +2241,7 @@ void sub_807A69C(u8 taskId)
 
     dest = (task->data[4] + 0x10) * 0x10;
     src = (gSprites[task->data[0]].oam.paletteNum + 0x10) * 0x10;
-    task->data[6] = sub_8079E90(gAnimBankAttacker);
+    task->data[6] = GetBattlerSubpriority(gAnimBankAttacker);
     if (task->data[6] == 20 || task->data[6] == 40)
         task->data[6] = 2;
     else