Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest

142 files changed, 13227 insertions, 12370 deletions

diff --git a/src/AgbRfu_LinkManager.c b/src/AgbRfu_LinkManager.c
index e4127ee09..f6ebcc726 100644
--- a/src/AgbRfu_LinkManager.c
+++ b/src/AgbRfu_LinkManager.c
@@ -918,7 +918,7 @@ static void rfu_LMAN_REQ_callback(u16 reqCommandId, u16 reqResult)
         {
             lman.reserveDisconnectSlot_flag = 0;
             lman.acceptCount = 0;
-            lman.acceptSlot_flag = 0;;
+            lman.acceptSlot_flag = 0;
             lman.parent_child = MODE_NEUTRAL;
             rfu_LMAN_managerChangeAgbClockMaster();
             if (reqCommandId == ID_STOP_MODE_REQ)
diff --git a/src/agb_flash.c b/src/agb_flash.c
index a9cf13d5f..eeccf1116 100644
--- a/src/agb_flash.c
+++ b/src/agb_flash.c
@@ -41,7 +41,7 @@ u16 ReadFlashId(void)
     u8 (*readFlash1)(u8 *);
 
     SetReadFlash1(readFlash1Buffer);
-    readFlash1 = (u8 (*)(u8 *))((s32)readFlash1Buffer + 1);
+    readFlash1 = (u8 (*)(u8 *))((uintptr_t)readFlash1Buffer + 1);
 
     // Enter ID mode.
     FLASH_WRITE(0x5555, 0xAA);
@@ -113,12 +113,12 @@ void SetReadFlash1(u16 *dest)
     u16 *src;
     u16 i;
 
-    PollFlashStatus = (u8 (*)(u8 *))((s32)dest + 1);
+    PollFlashStatus = (u8 (*)(u8 *))((uintptr_t)dest + 1);
 
     src = (u16 *)ReadFlash1;
-    src = (u16 *)((s32)src ^ 1);
+    src = (u16 *)((uintptr_t)src ^ 1);
 
-    i = ((s32)SetReadFlash1 - (s32)ReadFlash1) >> 1;
+    i = ((uintptr_t)SetReadFlash1 - (uintptr_t)ReadFlash1) >> 1;
 
     while (i != 0)
     {
@@ -127,7 +127,8 @@ void SetReadFlash1(u16 *dest)
     }
 }
 
-void ReadFlash_Core(u8 *src, u8 *dest, u32 size)
+// Using volatile here to make sure the flash memory will ONLY be read as bytes, to prevent any compiler optimizations.
+void ReadFlash_Core(vu8 *src, u8 *dest, u32 size)
 {
     while (size-- != 0)
     {
@@ -142,7 +143,7 @@ void ReadFlash(u16 sectorNum, u32 offset, u8 *dest, u32 size)
     u16 readFlash_Core_Buffer[0x40];
     u16 *funcSrc;
     u16 *funcDest;
-    void (*readFlash_Core)(u8 *, u8 *, u32);
+    void (*readFlash_Core)(vu8 *, u8 *, u32);
 
     REG_WAITCNT = (REG_WAITCNT & ~WAITCNT_SRAM_MASK) | WAITCNT_SRAM_8;
 
@@ -153,10 +154,10 @@ void ReadFlash(u16 sectorNum, u32 offset, u8 *dest, u32 size)
     }
 
     funcSrc = (u16 *)ReadFlash_Core;
-    funcSrc = (u16 *)((s32)funcSrc ^ 1);
+    funcSrc = (u16 *)((uintptr_t)funcSrc ^ 1);
     funcDest = readFlash_Core_Buffer;
 
-    i = ((s32)ReadFlash - (s32)ReadFlash_Core) >> 1;
+    i = ((uintptr_t)ReadFlash - (uintptr_t)ReadFlash_Core) >> 1;
 
     while (i != 0)
     {
@@ -164,7 +165,7 @@ void ReadFlash(u16 sectorNum, u32 offset, u8 *dest, u32 size)
         i--;
     }
 
-    readFlash_Core = (void (*)(u8 *, u8 *, u32))((s32)readFlash_Core_Buffer + 1);
+    readFlash_Core = (void (*)(vu8 *, u8 *, u32))((uintptr_t)readFlash_Core_Buffer + 1);
 
     src = FLASH_BASE + (sectorNum << gFlash->sector.shift) + offset;
 
@@ -201,10 +202,10 @@ u32 VerifyFlashSector(u16 sectorNum, u8 *src)
     }
 
     funcSrc = (u16 *)VerifyFlashSector_Core;
-    funcSrc = (u16 *)((s32)funcSrc ^ 1);
+    funcSrc = (u16 *)((uintptr_t)funcSrc ^ 1);
     funcDest = verifyFlashSector_Core_Buffer;
 
-    i = ((s32)VerifyFlashSector - (s32)VerifyFlashSector_Core) >> 1;
+    i = (u16)(((uintptr_t)VerifyFlashSector - (uintptr_t)VerifyFlashSector_Core) >> 1);
 
     while (i != 0)
     {
@@ -212,7 +213,7 @@ u32 VerifyFlashSector(u16 sectorNum, u8 *src)
         i--;
     }
 
-    verifyFlashSector_Core = (u32 (*)(u8 *, u8 *, u32))((s32)verifyFlashSector_Core_Buffer + 1);
+    verifyFlashSector_Core = (u32 (*)(u8 *, u8 *, u32))((uintptr_t)verifyFlashSector_Core_Buffer + 1);
 
     tgt = FLASH_BASE + (sectorNum << gFlash->sector.shift);
     size = gFlash->sector.size;
@@ -238,10 +239,10 @@ u32 VerifyFlashSectorNBytes(u16 sectorNum, u8 *src, u32 n)
     REG_WAITCNT = (REG_WAITCNT & ~WAITCNT_SRAM_MASK) | WAITCNT_SRAM_8;
 
     funcSrc = (u16 *)VerifyFlashSector_Core;
-    funcSrc = (u16 *)((s32)funcSrc ^ 1);
+    funcSrc = (u16 *)((uintptr_t)funcSrc ^ 1);
     funcDest = verifyFlashSector_Core_Buffer;
 
-    i = ((s32)VerifyFlashSector - (s32)VerifyFlashSector_Core) >> 1;
+    i = ((uintptr_t)VerifyFlashSector - (uintptr_t)VerifyFlashSector_Core) >> 1;
 
     while (i != 0)
     {
@@ -249,7 +250,7 @@ u32 VerifyFlashSectorNBytes(u16 sectorNum, u8 *src, u32 n)
         i--;
     }
 
-    verifyFlashSector_Core = (u32 (*)(u8 *, u8 *, u32))((s32)verifyFlashSector_Core_Buffer + 1);
+    verifyFlashSector_Core = (u32 (*)(u8 *, u8 *, u32))((uintptr_t)verifyFlashSector_Core_Buffer + 1);
 
     tgt = FLASH_BASE + (sectorNum << gFlash->sector.shift);
 
@@ -292,4 +293,4 @@ u32 ProgramFlashSectorAndVerifyNBytes(u16 sectorNum, u8 *src, u32 n)
     }
 
     return result;
-}
+}
\ No newline at end of file
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index c9a6a6606..748e4729a 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -471,9 +471,9 @@ static u8 ChooseMoveOrAction_Doubles(void)
         else
         {
             if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
-                BattleAI_SetupAIData(gBattleStruct->field_92 >> 4);
+                BattleAI_SetupAIData(gBattleStruct->palaceFlags >> 4);
             else
-                BattleAI_SetupAIData(0xF);
+                BattleAI_SetupAIData((1 << MAX_MON_MOVES) - 1);
 
             gBattlerTarget = i;
 
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
index 32f9620b7..2a5a83e0d 100644
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@@ -314,8 +314,8 @@ static bool8 AreStatsRaised(void)
 
     for (i = 0; i < NUM_BATTLE_STATS; i++)
     {
-        if (gBattleMons[gActiveBattler].statStages[i] > 6)
-            buffedStatsValue += gBattleMons[gActiveBattler].statStages[i] - 6;
+        if (gBattleMons[gActiveBattler].statStages[i] > DEFAULT_STAT_STAGE)
+            buffedStatsValue += gBattleMons[gActiveBattler].statStages[i] - DEFAULT_STAT_STAGE;
     }
 
     return (buffedStatsValue > 3);
diff --git a/src/battle_anim_bug.c b/src/battle_anim_bug.c
index ea3df8098..5e8a8b2a7 100644
--- a/src/battle_anim_bug.c
+++ b/src/battle_anim_bug.c
@@ -372,14 +372,11 @@ static void AnimTranslateStinger(struct Sprite *sprite)
     {
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
     }
-    else
+    else if (GetBattlerSide(gBattleAnimAttacker))
     {
-        if (GetBattlerSide(gBattleAnimAttacker))
-        {
-            gBattleAnimArgs[2] = -gBattleAnimArgs[2];
-            gBattleAnimArgs[1] = -gBattleAnimArgs[1];
-            gBattleAnimArgs[3] = -gBattleAnimArgs[3];
-        }
+        gBattleAnimArgs[2] = -gBattleAnimArgs[2];
+        gBattleAnimArgs[1] = -gBattleAnimArgs[1];
+        gBattleAnimArgs[3] = -gBattleAnimArgs[3];
     }
 
     if (!IsContest() && GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget))
@@ -387,13 +384,8 @@ static void AnimTranslateStinger(struct Sprite *sprite)
         if (GetBattlerPosition(gBattleAnimTarget) == B_POSITION_PLAYER_LEFT
          || GetBattlerPosition(gBattleAnimTarget) == B_POSITION_OPPONENT_LEFT)
         {
-            s16 temp1, temp2;
-
-            temp1 = gBattleAnimArgs[2];
-            gBattleAnimArgs[2] = -temp1;
-
-            temp2 = gBattleAnimArgs[0];
-            gBattleAnimArgs[0] = -temp2;
+            gBattleAnimArgs[2] *= -1;
+            gBattleAnimArgs[0] *= -1;
         }
     }
 
@@ -448,28 +440,24 @@ static void AnimMissileArc_Step(struct Sprite *sprite)
     else
     {
         s16 tempData[8];
-        u16 *data = sprite->data;
-        u16 x1 = sprite->pos1.x;
-        s16 x2 = sprite->pos2.x;
-        u16 y1 = sprite->pos1.y;
-        s16 y2 = sprite->pos2.y;
+        s16 xpos, ypos;
         int i;
 
         for (i = 0; i < 8; i++)
-            tempData[i] = data[i];
+            tempData[i] = sprite->data[i];
 
-        x2 += x1;
-        y2 += y1;
+        xpos = sprite->pos1.x + sprite->pos2.x;
+        ypos = sprite->pos1.y + sprite->pos2.y;
 
         if (!TranslateAnimHorizontalArc(sprite))
         {
-            u16 rotation = ArcTan2Neg(sprite->pos1.x + sprite->pos2.x - x2,
-                                  sprite->pos1.y + sprite->pos2.y - y2);
+            u16 rotation = ArcTan2Neg(sprite->pos1.x + sprite->pos2.x - xpos, //Isn't this zero lol
+                                  sprite->pos1.y + sprite->pos2.y - ypos);
             rotation += 0xC000;
             TrySetSpriteRotScale(sprite, FALSE, 0x100, 0x100, rotation);
 
             for (i = 0; i < 8; i++)
-                data[i] = tempData[i];
+                sprite->data[i] = tempData[i];
         }
     }
 }
diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c
index 516c58e55..f4769145d 100644
--- a/src/battle_anim_effects_1.c
+++ b/src/battle_anim_effects_1.c
@@ -3967,24 +3967,25 @@ static void AnimProtect(struct Sprite* sprite)
 
 static void AnimProtect_Step(struct Sprite *sprite)
 {
-    int a;
-    int i;
+    int i, savedPal;
     sprite->data[5] += 96;
     sprite->pos2.x = -(sprite->data[5] >> 8);
     if (++sprite->data[1] > 1)
     {
+        int id;
         sprite->data[1] = 0;
-        a = gPlttBufferFaded[sprite->data[2] + 1];
+        savedPal = gPlttBufferFaded[sprite->data[2] + 1];
         i = 0;
         do
         {
-            gPlttBufferFaded[sprite->data[2] + ++i] = gPlttBufferFaded[sprite->data[2] + i + 1];
+            id = sprite->data[2] + ++i;
+            gPlttBufferFaded[id] = gPlttBufferFaded[id + 1];
         } while (i < 6);
 
-        gPlttBufferFaded[sprite->data[2] + 7] = a;
+        gPlttBufferFaded[sprite->data[2] + 7] = savedPal;
     }
 
-    if (sprite->data[7] > 6 && sprite->data[0] >0 && ++sprite->data[6] > 1)
+    if (sprite->data[7] > 6 && sprite->data[0] > 0 && ++sprite->data[6] > 1)
     {
         sprite->data[6] = 0;
         sprite->data[7] -= 1;
diff --git a/src/battle_anim_flying.c b/src/battle_anim_flying.c
index 5179c1364..3fc4f20f2 100644
--- a/src/battle_anim_flying.c
+++ b/src/battle_anim_flying.c
@@ -380,21 +380,18 @@ static void AnimTask_AnimateGustTornadoPalette_Step(u8 taskId)
 {
     u8 data2;
     u16 temp;
-    int i, base;
 
     if (gTasks[taskId].data[10]++ == gTasks[taskId].data[1])
     {
+        int i, base;
         gTasks[taskId].data[10] = 0;
         data2 = gTasks[taskId].data[2];
         temp = gPlttBufferFaded[16 * data2 + 0x108];
         i = 7;
         base = data2 * 16;
 
-        do
-        {
+        for (; i > 0; --i)
             gPlttBufferFaded[base + 0x101 + i] = gPlttBufferFaded[base + 0x100 + i];
-            i--;
-        } while (i > 0);
 
         gPlttBufferFaded[base + 0x101] = temp;
     }
@@ -536,17 +533,16 @@ static void AnimFlyBallAttack_Step(struct Sprite *sprite)
 
 void DestroyAnimSpriteAfterTimer(struct Sprite *sprite)
 {
-    if (sprite->data[0]-- <= 0)
+    if (sprite->data[0]-- > 0)
+        return;
+    if (sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK)
     {
-        if (sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK)
-        {
-            FreeOamMatrix(sprite->oam.matrixNum);
-            sprite->oam.affineMode = ST_OAM_AFFINE_OFF;
-        }
-
-        DestroySprite(sprite);
-        gAnimVisualTaskCount--;
+        FreeOamMatrix(sprite->oam.matrixNum);
+        sprite->oam.affineMode = ST_OAM_AFFINE_OFF;
     }
+
+    DestroySprite(sprite);
+    gAnimVisualTaskCount--;
 }
 
 struct FeatherDanceData
@@ -570,30 +566,27 @@ struct FeatherDanceData
 static void AnimFallingFeather(struct Sprite *sprite)
 {
     u8 battler, matrixNum, sinIndex;
-    s16 spriteCoord, sinVal;
+    s16 sinVal;
 
     struct FeatherDanceData *data = (struct FeatherDanceData *)sprite->data;
 
-    if (gBattleAnimArgs[7] & 0x100)
-        battler = gBattleAnimAttacker;
-    else
-        battler = gBattleAnimTarget;
+    battler =  (gBattleAnimArgs[7] & 0x100) ? gBattleAnimAttacker : gBattleAnimTarget;
 
     if (GetBattlerSide(battler) == B_SIDE_PLAYER)
         gBattleAnimArgs[0] = -gBattleAnimArgs[0];
 
     sprite->pos1.x = GetBattlerSpriteCoord(battler, BATTLER_COORD_ATTR_HEIGHT) + gBattleAnimArgs[0];
-    spriteCoord = GetBattlerSpriteCoord(battler, BATTLER_COORD_ATTR_WIDTH);
-    sprite->pos1.y = spriteCoord + gBattleAnimArgs[1];
+    sinVal = GetBattlerSpriteCoord(battler, BATTLER_COORD_ATTR_WIDTH);
+    sprite->pos1.y = sinVal + gBattleAnimArgs[1];
 
-    data->unk8 = sprite->pos1.y << 8;
-    data->unkE_1 = spriteCoord + gBattleAnimArgs[6];
+    data->unk8 = (u16)(sprite->pos1.y) << 8;
+    data->unkE_1 = (u16)(sinVal + gBattleAnimArgs[6]);
     data->unk0_0c = 1;
-    data->unk2 = gBattleAnimArgs[2] & 0xFF;
-    data->unkA = (gBattleAnimArgs[2] >> 8) & 0xFF;
+    data->unk2 = (u16)(gBattleAnimArgs[2] & 0xFF);
+    data->unkA = (u16)((gBattleAnimArgs[2] >> 8) & 0xFF) ;
     data->unk4 = gBattleAnimArgs[3];
-    data->unk6 = gBattleAnimArgs[4];
-    *(u16*)(data->unkC) = gBattleAnimArgs[5];
+    data->unk6 = (u16)gBattleAnimArgs[4];
+    *(u16*)(data->unkC) = (u16)gBattleAnimArgs[5];
 
     if (data->unk2 >= 64 && data->unk2 <= 191)
     {
@@ -628,27 +621,16 @@ static void AnimFallingFeather(struct Sprite *sprite)
         }
     }
 
-    data->unk0_1 = data->unk2 >> 6;
-    sprite->pos2.x = (gSineTable[data->unk2] * data->unkC[0]) >> 8;
+    data->unk0_1 = data->unk2/64;
+    sprite->pos2.x = (gSineTable[data->unk2] * (s32)data->unkC[0]) >> 8;
     matrixNum = sprite->oam.matrixNum;
 
     sinIndex = (-sprite->pos2.x >> 1) + data->unkA;
     sinVal = gSineTable[sinIndex];
 
     gOamMatrices[matrixNum].a = gOamMatrices[matrixNum].d = gSineTable[sinIndex + 64];
-    // The comparison below is completely pointless. 'sprite' is sure to be a valid pointer and
-    // both the 'if' and 'else' parts are exactly the same.
-    // The only reason for this is making sure the compiler generates the exact ASM.
-    if (sprite)
-    {
-        gOamMatrices[matrixNum].b = sinVal;
-        gOamMatrices[matrixNum].c = -sinVal;
-    }
-    else
-    {
-        gOamMatrices[matrixNum].b = sinVal;
-        gOamMatrices[matrixNum].c = -sinVal;
-    }
+    gOamMatrices[matrixNum].b = sinVal;
+    gOamMatrices[matrixNum].c = -sinVal;
 
     sprite->callback = sub_810E520;
 }
@@ -665,242 +647,238 @@ static void sub_810E520(struct Sprite *sprite)
             data->unk0_0a = 0;
             data->unk1 = 0;
         }
+        return;
     }
-    else
+
+    switch (data->unk2 / 64)
     {
-        switch (data->unk2 / 64)
+    case 0:
+        if ((u8)data->unk0_1 == 1) // this must be cast to u8
         {
-        case 0: 
-            if (data->unk0_1 << 24 >> 24 == 1) // the shifts have to be here
-            {
-                data->unk0_0d = 1;
-                data->unk0_0a = 1;
-                data->unk1 = 0;
-            }
-            else if (data->unk0_1 << 24 >> 24 == 3)
-            {
-                data->unk0_0b ^= 1;
-                data->unk0_0a = 1;
-                data->unk1 = 0;
-            }
-            else if (data->unk0_0d)
+            data->unk0_0d = 1;
+            data->unk0_0a = 1;
+            data->unk1 = 0;
+        }
+        else if ((u8)data->unk0_1 == 3)
+        {
+            data->unk0_0b ^= 1;
+            data->unk0_0a = 1;
+            data->unk1 = 0;
+        }
+        else if (data->unk0_0d)
+        {
+            sprite->hFlip ^= 1;
+            sprite->animNum = sprite->hFlip;
+            sprite->animBeginning = TRUE;
+            sprite->animEnded = FALSE;
+            if (data->unk0_0c)
             {
-                sprite->hFlip ^= 1;
-                sprite->animNum = sprite->hFlip;
-                sprite->animBeginning = TRUE;
-                sprite->animEnded = FALSE;
-                if (data->unk0_0c)
+                if (!IsContest())
                 {
-                    if (!IsContest())
+                    if (!data->unkE_0)
                     {
-                        if (!data->unkE_0)
-                        {
-                            sprite->oam.priority--;
-                            data->unkE_0 ^= 1;
-                        }
-                        else
-                        {
-                            sprite->oam.priority++;
-                            data->unkE_0 ^= 1;
-                        }
+                        sprite->oam.priority--;
+                        data->unkE_0 ^= 1;
                     }
                     else
                     {
-                        if (!data->unkE_0)
-                        {
-                            sprite->subpriority -= 12;
-                            data->unkE_0 ^= 1;
-                        }
-                        else
-                        {
-                            sprite->subpriority += 12;
-                            data->unkE_0 ^= 1;
-                        }
+                        sprite->oam.priority++;
+                        data->unkE_0 ^= 1;
                     }
                 }
-                data->unk0_0d = 0;
-                data->unk2;
-            }
-            data->unk0_1 = 0;
-            break;
-        case 1:
-            if (data->unk0_1 << 24 >> 24 == 0)
-            {
-                data->unk0_0d = 1;
-                data->unk0_0a = 1;
-                data->unk1 = 0;
-            }
-            else if (data->unk0_1 << 24 >> 24 == 2)
-            {
-                data->unk0_0a = 1;
-                data->unk1 = 0;
-            }
-            else if (data->unk0_0d)
-            {
-                sprite->hFlip ^= 1;
-                sprite->animNum = sprite->hFlip;
-                sprite->animBeginning = TRUE;
-                sprite->animEnded = FALSE;
-                if (data->unk0_0c)
+                else
                 {
-                    if (!IsContest())
+                    if (!data->unkE_0)
                     {
-                        if (!data->unkE_0)
-                        {
-                            sprite->oam.priority--;
-                            data->unkE_0 ^= 1;
-                        }
-                        else
-                        {
-                            sprite->oam.priority++;
-                            data->unkE_0 ^= 1;
-                        }
+                        sprite->subpriority -= 12;
+                        data->unkE_0 ^= 1;
                     }
                     else
                     {
-                        if (!data->unkE_0)
-                        {
-                            sprite->subpriority -= 12;
-                            data->unkE_0 ^= 1;
-                        }
-                        else
-                        {
-                            sprite->subpriority += 12;
-                            data->unkE_0 ^= 1;
-                        }
+                        sprite->subpriority += 12;
+                        data->unkE_0 ^= 1;
                     }
                 }
-                data->unk0_0d = 0;
-            }
-            data->unk0_1 = 1;
-            break;
-        case 2:
-            if (data->unk0_1 << 24 >> 24 == 3)
-            {
-                data->unk0_0d = 1;
-                data->unk0_0a = 1;
-                data->unk1 = 0;
-            }
-            else if (data->unk0_1 << 24 >> 24 == 1)
-            {
-                data->unk0_0a = 1;
-                data->unk1 = 0;
             }
-            else if (data->unk0_0d)
+            data->unk0_0d = 0;
+        }
+        data->unk0_1 = 0;
+        break;
+    case 1:
+        if ((u8)data->unk0_1 == 0)
+        {
+            data->unk0_0d = 1;
+            data->unk0_0a = 1;
+            data->unk1 = 0;
+        }
+        else if ((u8)data->unk0_1 == 2)
+        {
+            data->unk0_0a = 1;
+            data->unk1 = 0;
+        }
+        else if (data->unk0_0d)
+        {
+            sprite->hFlip ^= 1;
+            sprite->animNum = sprite->hFlip;
+            sprite->animBeginning = TRUE;
+            sprite->animEnded = FALSE;
+            if (data->unk0_0c)
             {
-                sprite->hFlip ^= 1;
-                sprite->animNum = sprite->hFlip;
-                sprite->animBeginning = TRUE;
-                sprite->animEnded = FALSE;
-                if (data->unk0_0c)
+                if (!IsContest())
                 {
-                    if (!IsContest())
+                    if (!data->unkE_0)
                     {
-                        if (!data->unkE_0)
-                        {
-                            sprite->oam.priority--;
-                            data->unkE_0 ^= 1;
-                        }
-                        else
-                        {
-                            sprite->oam.priority++;
-                            data->unkE_0 ^= 1;
-                        }
+                        sprite->oam.priority--;
+                        data->unkE_0 ^= 1;
                     }
                     else
                     {
-                        if (!data->unkE_0)
-                        {
-                            sprite->subpriority -= 12;
-                            data->unkE_0 ^= 1;
-                        }
-                        else
-                        {
-                            sprite->subpriority += 12;
-                            data->unkE_0 ^= 1;
-                        }
+                        sprite->oam.priority++;
+                        data->unkE_0 ^= 1;
+                    }
+                }
+                else
+                {
+                    if (!data->unkE_0)
+                    {
+                        sprite->subpriority -= 12;
+                        data->unkE_0 ^= 1;
+                    }
+                    else
+                    {
+                        sprite->subpriority += 12;
+                        data->unkE_0 ^= 1;
                     }
                 }
-                data->unk0_0d = 0;
-            }
-            data->unk0_1 = 2;
-            break;
-        case 3:
-            if (data->unk0_1 << 24 >> 24 == 2)
-            {
-                data->unk0_0d = 1;
             }
-            else if (data->unk0_1 << 24 >> 24 == 0)
+            data->unk0_0d = 0;
+        }
+        data->unk0_1 = 1;
+        break;
+    case 2:
+        if ((u8)data->unk0_1 == 3)
+        {
+            data->unk0_0d = 1;
+            data->unk0_0a = 1;
+            data->unk1 = 0;
+        }
+        else if ((u8)data->unk0_1 == 1)
+        {
+            data->unk0_0a = 1;
+            data->unk1 = 0;
+        }
+        else if (data->unk0_0d)
+        {
+            sprite->hFlip ^= 1;
+            sprite->animNum = sprite->hFlip;
+            sprite->animBeginning = TRUE;
+            sprite->animEnded = FALSE;
+            if (data->unk0_0c)
             {
-                data->unk0_0b ^= 1;
-                data->unk0_0a = 1;
-                data->unk1 = 0;
+                if (!IsContest())
+                {
+                    if (!data->unkE_0)
+                    {
+                        sprite->oam.priority--;
+                        data->unkE_0 ^= 1;
+                    }
+                    else
+                    {
+                        sprite->oam.priority++;
+                        data->unkE_0 ^= 1;
+                    }
+                }
+                else
+                {
+                    if (!data->unkE_0)
+                    {
+                        sprite->subpriority -= 12;
+                        data->unkE_0 ^= 1;
+                    }
+                    else
+                    {
+                        sprite->subpriority += 12;
+                        data->unkE_0 ^= 1;
+                    }
+                }
             }
-            else if (data->unk0_0d)
+            data->unk0_0d = 0;
+        }
+        data->unk0_1 = 2;
+        break;
+    case 3:
+        if ((u8)data->unk0_1 == 2)
+        {
+            data->unk0_0d = 1;
+        }
+        else if ((u8)data->unk0_1 == 0)
+        {
+            data->unk0_0b ^= 1;
+            data->unk0_0a = 1;
+            data->unk1 = 0;
+        }
+        else if (data->unk0_0d)
+        {
+            sprite->hFlip ^= 1;
+            sprite->animNum = sprite->hFlip;
+            sprite->animBeginning = TRUE;
+            sprite->animEnded = FALSE;
+            if (data->unk0_0c)
             {
-                sprite->hFlip ^= 1;
-                sprite->animNum = sprite->hFlip;
-                sprite->animBeginning = TRUE;
-                sprite->animEnded = FALSE;
-                if (data->unk0_0c)
+                if (!IsContest())
+                {
+                    if (!data->unkE_0)
+                    {
+                        sprite->oam.priority--;
+                        data->unkE_0 ^= 1;
+                    }
+                    else
+                    {
+                        sprite->oam.priority++;
+                        data->unkE_0 ^= 1;
+                    }
+                }
+                else
                 {
-                    if (!IsContest())
+                    if (!data->unkE_0)
                     {
-                        if (!data->unkE_0)
-                        {
-                            sprite->oam.priority--;
-                            data->unkE_0 ^= 1;
-                        }
-                        else
-                        {
-                            sprite->oam.priority++;
-                            data->unkE_0 ^= 1;
-                        }
+                        sprite->subpriority -= 12;
+                        data->unkE_0 ^= 1;
                     }
                     else
                     {
-                        if (!data->unkE_0)
-                        {
-                            sprite->subpriority -= 12;
-                            data->unkE_0 ^= 1;
-                        }
-                        else
-                        {
-                            sprite->subpriority += 12;
-                            data->unkE_0 ^= 1;
-                        }
+                        sprite->subpriority += 12;
+                        data->unkE_0 ^= 1;
                     }
                 }
-                data->unk0_0d = 0;
             }
-            data->unk0_1 = 3;
-            break;
+            data->unk0_0d = 0;
         }
-        #ifndef NONMATCHING
-            asm("":::"r8");
-        #endif
-        sprite->pos2.x = (data->unkC[data->unk0_0b] * gSineTable[data->unk2]) >> 8;
-        matrixNum = sprite->oam.matrixNum;
+        data->unk0_1 = 3;
+        break;
+    }
 
-        sinIndex = (-sprite->pos2.x >> 1) + data->unkA;
-        sinVal = gSineTable[sinIndex];
+    sprite->pos2.x = ((s32)(data->unkC[data->unk0_0b]) * gSineTable[data->unk2]) >> 8;
+    matrixNum = sprite->oam.matrixNum;
 
-        gOamMatrices[matrixNum].a = gOamMatrices[matrixNum].d = gSineTable[sinIndex + 64];
-        gOamMatrices[matrixNum].b = sinVal;
-        gOamMatrices[matrixNum].c = -sinVal;
+    sinIndex = ((-sprite->pos2.x >> 1) + data->unkA);
+    sinVal = gSineTable[sinIndex];
 
-        data->unk8 += data->unk6;
-        sprite->pos1.y = data->unk8 >> 8;
-        if (data->unk4 & 0x8000)
-            data->unk2 = (data->unk2 - (data->unk4 & 0x7FFF)) & 0xFF;
-        else
-            data->unk2 = (data->unk2 + (data->unk4 & 0x7FFF)) & 0xFF;
+    gOamMatrices[matrixNum].a = gOamMatrices[matrixNum].d = gSineTable[sinIndex + 64];
+    gOamMatrices[matrixNum].b = sinVal;
+    gOamMatrices[matrixNum].c = -sinVal;
 
-        if (sprite->pos1.y + sprite->pos2.y >= data->unkE_1)
-        {
-            sprite->data[0] = 0;
-            sprite->callback = DestroyAnimSpriteAfterTimer;
-        }
+    data->unk8 += data->unk6;
+    sprite->pos1.y = (s16)(data->unk8 >> 8);
+    if (data->unk4 & 0x8000)
+        data->unk2 = (data->unk2 - (data->unk4 & 0x7FFF)) & 0xFF;
+    else
+        data->unk2 = (data->unk2 + (data->unk4 & 0x7FFF)) & 0xFF;
+
+    if (sprite->pos1.y + sprite->pos2.y >= data->unkE_1)
+    {
+        sprite->data[0] = 0;
+        sprite->callback = DestroyAnimSpriteAfterTimer;
     }
 }
 
@@ -944,20 +922,20 @@ static void sub_810EB40(struct Sprite *sprite)
 {
     sprite->pos2.x += sprite->data[1] >> 8;
 
-    if (++sprite->data[0] == 6)
+    if (sprite->data[0]++ == 5)
     {
         sprite->data[0] = 0;
         sprite->pos2.x = 0;
         StartSpriteAnim(sprite, 0);
     }
 
-    if (--sprite->data[7] == -1)
+    if (sprite->data[7]-- == 0)
         DestroyAnimSprite(sprite);
 }
 
 void AnimTask_DrillPeckHitSplats(u8 task)
 {
-    if (!(gTasks[task].data[0] % 32))
+    if ((gTasks[task].data[0] % 32) == 0)
     {
         gAnimVisualTaskCount++;
 
@@ -1060,8 +1038,8 @@ static void AnimDiveBall_Step2(struct Sprite *sprite)
 
 static void AnimDiveWaterSplash(struct Sprite *sprite)
 {
-    u32 matrixNum;
-    int t1, t2;
+    u8 matrixNum;
+    s32 t1, t2;
 
     switch (sprite->data[0])
     {
@@ -1083,7 +1061,7 @@ static void AnimDiveWaterSplash(struct Sprite *sprite)
         sprite->data[0]++;
         break;
     case 1:
-        if (sprite->data[2] <= 11)
+        if (sprite->data[2] < 12)
             sprite->data[1] -= 40;
         else
             sprite->data[1] += 40;
@@ -1091,7 +1069,7 @@ static void AnimDiveWaterSplash(struct Sprite *sprite)
         sprite->data[2]++;
 
         TrySetSpriteRotScale(sprite, 0, 256, sprite->data[1], 0);
-
+        
         matrixNum = sprite->oam.matrixNum;
 
         t1 = 15616;
@@ -1115,8 +1093,8 @@ static void AnimDiveWaterSplash(struct Sprite *sprite)
 // Launches a water droplet away from the specified battler. Used by Astonish and Dive
 static void AnimSprayWaterDroplet(struct Sprite *sprite)
 {
-    int v1 = 0x1ff & Random2();
-    int v2 = 0x7f & Random2();
+    const u16 v1 = Random2() & 0x1ff;
+    const u16 v2 = Random2() & 0x07f;
 
     if (v1 % 2)
         sprite->data[0] = 736 + v1;
@@ -1160,13 +1138,13 @@ static void AnimSprayWaterDroplet_Step(struct Sprite *sprite)
         sprite->pos2.y -= sprite->data[1] >> 8;
     }
 
-    sprite->data[0] = sprite->data[0];
+    sprite->data[0] -= 0; // Needed to Match
     sprite->data[1] -= 32;
 
     if (sprite->data[0] < 0)
         sprite->data[0] = 0;
 
-    if (++sprite->data[3] == 31)
+    if (sprite->data[3]++ == 30)
         DestroyAnimSprite(sprite);
 }
 
@@ -1212,7 +1190,7 @@ static void AnimSkyAttackBird(struct Sprite *sprite)
     sprite->data[7] = ((posy - sprite->pos1.y) << 4) / 12;
 
     rotation = ArcTan2Neg(posx - sprite->pos1.x, posy - sprite->pos1.y);
-    rotation += 49152;
+    rotation -= 16384;
 
     TrySetSpriteRotScale(sprite, 1, 0x100, 0x100, rotation);
 
@@ -1236,12 +1214,12 @@ void unref_sub_810F184(u8 taskId)
 {
     if (gBattleAnimArgs[0] == 0)
     {
-        u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
+        const u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
         gSprites[spriteId].invisible = TRUE;
     }
     else
     {
-        u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
+        const u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
         gSprites[spriteId].invisible = FALSE;
     }
     DestroyAnimVisualTask(taskId);
diff --git a/src/battle_anim_psychic.c b/src/battle_anim_psychic.c
index 7918698fc..25340f9c6 100644
--- a/src/battle_anim_psychic.c
+++ b/src/battle_anim_psychic.c
@@ -1101,7 +1101,7 @@ static void AnimTask_TransparentCloneGrowAndShrink_Step(u8 taskId)
         break;
     case 1:
         task->data[1] -= 4;
-        task->data[2] = 256 - (gSineTable[task->data[1]] >> 1);;
+        task->data[2] = 256 - (gSineTable[task->data[1]] >> 1);
         SetSpriteRotScale(task->data[15], task->data[2], task->data[2], 0);
         SetBattlerSpriteYOffsetFromOtherYScale(task->data[15], task->data[13]);
         if (task->data[1] == 0)
diff --git a/src/battle_anim_smokescreen.c b/src/battle_anim_smokescreen.c
index a8c043e67..4120dda72 100644
--- a/src/battle_anim_smokescreen.c
+++ b/src/battle_anim_smokescreen.c
@@ -6,39 +6,40 @@
 #include "sprite.h"
 #include "util.h"
 #include "constants/pokemon.h"
+#include "constants/battle_palace.h"
 
 static void SmokescreenImpact_Callback(struct Sprite *);
 static void SpriteCB_DestroySprite(struct Sprite *sprite);
 
 // The below data for smokescreen starts and ends with some data that belongs to battle_gfx_sfx_util.c
 
-const u8 gUnknown_0831C604[] = 
-{
-    [NATURE_HARDY]   = 0, 
-    [NATURE_LONELY]  = 0, 
-    [NATURE_BRAVE]   = 1, 
-    [NATURE_ADAMANT] = 0, 
-    [NATURE_NAUGHTY] = 1, 
-    [NATURE_BOLD]    = 1, 
-    [NATURE_DOCILE]  = 2, 
-    [NATURE_RELAXED] = 0,
-    [NATURE_IMPISH]  = 0, 
-    [NATURE_LAX]     = 0, 
-    [NATURE_TIMID]   = 1, 
-    [NATURE_HASTY]   = 1, 
-    [NATURE_SERIOUS] = 1, 
-    [NATURE_JOLLY]   = 0, 
-    [NATURE_NAIVE]   = 2, 
-    [NATURE_MODEST]  = 1,
-    [NATURE_MILD]    = 0, 
-    [NATURE_QUIET]   = 1, 
-    [NATURE_BASHFUL] = 1, 
-    [NATURE_RASH]    = 0, 
-    [NATURE_CALM]    = 0, 
-    [NATURE_GENTLE]  = 0, 
-    [NATURE_SASSY]   = 1, 
-    [NATURE_CAREFUL] = 1,
-    [NATURE_QUIRKY]  = 0, 
+const u8 gBattlePalaceNatureToMoveTarget[NUM_NATURES] = 
+{
+    [NATURE_HARDY]   = PALACE_TARGET_STRONGER,
+    [NATURE_LONELY]  = PALACE_TARGET_STRONGER,
+    [NATURE_BRAVE]   = PALACE_TARGET_WEAKER,
+    [NATURE_ADAMANT] = PALACE_TARGET_STRONGER,
+    [NATURE_NAUGHTY] = PALACE_TARGET_WEAKER,
+    [NATURE_BOLD]    = PALACE_TARGET_WEAKER,
+    [NATURE_DOCILE]  = PALACE_TARGET_RANDOM, 
+    [NATURE_RELAXED] = PALACE_TARGET_STRONGER,
+    [NATURE_IMPISH]  = PALACE_TARGET_STRONGER,
+    [NATURE_LAX]     = PALACE_TARGET_STRONGER,
+    [NATURE_TIMID]   = PALACE_TARGET_WEAKER,
+    [NATURE_HASTY]   = PALACE_TARGET_WEAKER,
+    [NATURE_SERIOUS] = PALACE_TARGET_WEAKER,
+    [NATURE_JOLLY]   = PALACE_TARGET_STRONGER,
+    [NATURE_NAIVE]   = PALACE_TARGET_RANDOM, 
+    [NATURE_MODEST]  = PALACE_TARGET_WEAKER,
+    [NATURE_MILD]    = PALACE_TARGET_STRONGER,
+    [NATURE_QUIET]   = PALACE_TARGET_WEAKER,
+    [NATURE_BASHFUL] = PALACE_TARGET_WEAKER,
+    [NATURE_RASH]    = PALACE_TARGET_STRONGER,
+    [NATURE_CALM]    = PALACE_TARGET_STRONGER,
+    [NATURE_GENTLE]  = PALACE_TARGET_STRONGER,
+    [NATURE_SASSY]   = PALACE_TARGET_WEAKER,
+    [NATURE_CAREFUL] = PALACE_TARGET_WEAKER,
+    [NATURE_QUIRKY]  = PALACE_TARGET_STRONGER,
 };
 
 static const struct CompressedSpriteSheet sSmokescreenImpactSpriteSheet =
diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c
index 0e6d0bebd..ab2f42264 100644
--- a/src/battle_anim_utility_funcs.c
+++ b/src/battle_anim_utility_funcs.c
@@ -569,7 +569,7 @@ static void sub_81172EC(u8 taskId)
             if (gTasks[taskId].data[12] == 0)
             {
                 sub_80A477C(0);
-                gTasks[taskId].data[15]++;;
+                gTasks[taskId].data[15]++;
             }
         }
         break;
diff --git a/src/battle_anim_water.c b/src/battle_anim_water.c
index 5810b6bdc..12f37dbba 100644
--- a/src/battle_anim_water.c
+++ b/src/battle_anim_water.c
@@ -52,7 +52,7 @@ static void CreateWaterSpoutLaunchDroplets(struct Task*, u8);
 static void CreateWaterSpoutRainDroplet(struct Task*, u8);
 static void AnimTask_WaterSport_Step(u8);
 static void CreateWaterSportDroplet(struct Task*);
-static void CreateWaterPulseRingBubbles(struct Sprite*, int, int);
+static void CreateWaterPulseRingBubbles(struct Sprite*, s32, s32);
 
 // Both unused
 const u8 gUnknown_8593C80[] = INCBIN_U8("graphics/unknown/unknown_593C80.4bpp");
@@ -624,98 +624,24 @@ void AnimTask_RotateAuroraRingColors(u8 taskId)
     gTasks[taskId].func = AnimTask_RotateAuroraRingColors_Step;
 }
 
-#ifdef NONMATCHING
 static void AnimTask_RotateAuroraRingColors_Step(u8 taskId)
 {
     int i;
     u16 palIndex;
-    u16 *palPtr1;
-    u16 *palPtr2;
-    u16 rgbBuffer;
 
     if (++gTasks[taskId].data[10] == 3)
     {
+        u16 tempPlt;
         gTasks[taskId].data[10] = 0;
         palIndex = gTasks[taskId].data[2] + 1;
-        palPtr1 = &gPlttBufferFaded[palIndex];
-        rgbBuffer = *palPtr1;
-        palPtr2 = &palPtr1[1];
-        for (i = 0; i < 7; i++)
-            palPtr1[i] = palPtr2[i];
-        gPlttBufferFaded[palIndex + 7] = rgbBuffer;
+        tempPlt = gPlttBufferFaded[palIndex];
+        for (i = 1; i < 8; i++)
+            gPlttBufferFaded[palIndex + i - 1] = gPlttBufferFaded[palIndex + i];
+        gPlttBufferFaded[palIndex + 7] = tempPlt;
     }
     if (++gTasks[taskId].data[11] == gTasks[taskId].data[0])
         DestroyAnimVisualTask(taskId);
 }
-#else
-NAKED
-static void AnimTask_RotateAuroraRingColors_Step(u8 taskId)
-{
-    asm_unified("push {r4-r7,lr}\n\
-	lsls r0, 24\n\
-	lsrs r4, r0, 24\n\
-	ldr r1, =gTasks\n\
-	lsls r0, r4, 2\n\
-	adds r0, r4\n\
-	lsls r0, 3\n\
-	adds r2, r0, r1\n\
-	ldrh r0, [r2, 0x1C]\n\
-	adds r0, 0x1\n\
-	strh r0, [r2, 0x1C]\n\
-	lsls r0, 16\n\
-	asrs r0, 16\n\
-	mov r12, r1\n\
-	cmp r0, 0x3\n\
-	bne _081075BE\n\
-	movs r0, 0\n\
-	strh r0, [r2, 0x1C]\n\
-	ldrh r0, [r2, 0xC]\n\
-	adds r0, 0x1\n\
-	lsls r0, 16\n\
-	lsrs r5, r0, 16\n\
-	ldr r1, =gPlttBufferFaded\n\
-	lsls r0, r5, 1\n\
-	adds r0, r1\n\
-	ldrh r6, [r0]\n\
-	adds r7, r1, 0\n\
-	adds r3, r0, 0x2\n\
-	movs r1, 0x6\n\
-	adds r2, r0, 0\n\
-_081075A8:\n\
-	ldrh r0, [r3]\n\
-	strh r0, [r2]\n\
-	adds r3, 0x2\n\
-	adds r2, 0x2\n\
-	subs r1, 0x1\n\
-	cmp r1, 0\n\
-	bge _081075A8\n\
-	adds r0, r5, 0x7\n\
-	lsls r0, 1\n\
-	adds r0, r7\n\
-	strh r6, [r0]\n\
-_081075BE:\n\
-	lsls r0, r4, 2\n\
-	adds r0, r4\n\
-	lsls r0, 3\n\
-	add r0, r12\n\
-	ldrh r1, [r0, 0x1E]\n\
-	adds r1, 0x1\n\
-	strh r1, [r0, 0x1E]\n\
-	lsls r1, 16\n\
-	asrs r1, 16\n\
-	movs r2, 0x8\n\
-	ldrsh r0, [r0, r2]\n\
-	cmp r1, r0\n\
-	bne _081075DE\n\
-	adds r0, r4, 0\n\
-	bl DestroyAnimVisualTask\n\
-_081075DE:\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.pool\n");
-}
-#endif
 
 // For animating undulating beam attacks (e.g. Flamethrower, Hydro Pump, Signal Beam)
 static void AnimToTargetInSinWave(struct Sprite *sprite)
@@ -822,6 +748,7 @@ static void AnimHydroCannonBeam(struct Sprite *sprite)
         if (GetBattlerPosition(gBattleAnimAttacker) == B_POSITION_PLAYER_LEFT || GetBattlerPosition(gBattleAnimAttacker) == B_POSITION_OPPONENT_LEFT)
             gBattleAnimArgs[0] *= -1;
     }
+
     if ((gBattleAnimArgs[5] & 0xFF00) == 0)
         animType = TRUE;
     else
@@ -867,21 +794,25 @@ static void AnimSmallBubblePair_Step(struct Sprite *sprite)
     sprite->pos2.x = Sin(sprite->data[0], 4);
     sprite->data[1] += 48;
     sprite->pos2.y = -(sprite->data[1] >> 8);
-    if (--sprite->data[7] == -1)
+    if (sprite->data[7]-- == 0)
         DestroyAnimSprite(sprite);
 }
 
-#ifdef NONMATCHING
 void AnimTask_CreateSurfWave(u8 taskId)
 {
     struct BattleAnimBgData animBg;
     u8 taskId2;
+    u16 *x, *y; //These pointers are needed to match
+
+    x = &gBattle_BG1_X;
+    y = &gBattle_BG1_Y;
 
-    SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL);
-    SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16));
+    SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL | BLDCNT_TGT1_BG1);
+    SetGpuReg(REG_OFFSET_BLDALPHA, (16 << 8));
     SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1);
     SetAnimBgAttribute(1, BG_ANIM_SCREEN_SIZE, 1);
     sub_80A6B30(&animBg);
+    
     if (!IsContest())
     {
         SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 1);
@@ -906,30 +837,30 @@ void AnimTask_CreateSurfWave(u8 taskId)
     gTasks[taskId2].data[2] = 0x1000;
     if (IsContest())
     {
-        gBattle_BG1_X = -80;
-        gBattle_BG1_Y = -48;
+        *x = -80;
+        *y = -48;
         gTasks[taskId].data[0] = 2;
         gTasks[taskId].data[1] = 1;
         gTasks[taskId2].data[3] = 0;
     }
     else if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
     {
-        gBattle_BG1_X = -224;
-        gBattle_BG1_Y = 256;
+        *x = -224;
+        *y = 256;
         gTasks[taskId].data[0] = 2;
         gTasks[taskId].data[1] = -1;
         gTasks[taskId2].data[3] = 1;
     }
     else
     {
-        gBattle_BG1_X = 0;
-        gBattle_BG1_Y = -48;
+        *x = 0;
+        *y = -48;
         gTasks[taskId].data[0] = -2;
         gTasks[taskId].data[1] = 1;
         gTasks[taskId2].data[3] = 0;
     }
-    SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X);
-    SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y);
+    SetGpuReg(REG_OFFSET_BG1HOFS, *x);
+    SetGpuReg(REG_OFFSET_BG1VOFS, *y);
     if (gTasks[taskId2].data[3] == 0)
     {
         gTasks[taskId2].data[4] = 48;
@@ -943,245 +874,16 @@ void AnimTask_CreateSurfWave(u8 taskId)
     gTasks[taskId].data[6] = 1;
     gTasks[taskId].func = AnimTask_CreateSurfWave_Step1;
 }
-#else
-NAKED
-void AnimTask_CreateSurfWave(u8 taskId)
-{
-    asm_unified("push {r4-r7,lr}\n\
-	mov r7, r10\n\
-	mov r6, r9\n\
-	mov r5, r8\n\
-	push {r5-r7}\n\
-	sub sp, 0x10\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	mov r10, r0\n\
-	ldr r1, =0x00003f42\n\
-	movs r0, 0x50\n\
-	bl SetGpuReg\n\
-	movs r1, 0x80\n\
-	lsls r1, 5\n\
-	movs r0, 0x52\n\
-	bl SetGpuReg\n\
-	movs r0, 0x1\n\
-	movs r1, 0x4\n\
-	movs r2, 0x1\n\
-	bl SetAnimBgAttribute\n\
-	movs r0, 0x1\n\
-	movs r1, 0\n\
-	movs r2, 0x1\n\
-	bl SetAnimBgAttribute\n\
-	mov r0, sp\n\
-	bl sub_80A6B30\n\
-	bl IsContest\n\
-	lsls r0, 24\n\
-	cmp r0, 0\n\
-	bne _081079E0\n\
-	movs r0, 0x1\n\
-	movs r1, 0x3\n\
-	movs r2, 0x1\n\
-	bl SetAnimBgAttribute\n\
-	ldr r0, =gBattleAnimAttacker\n\
-	ldrb r0, [r0]\n\
-	bl GetBattlerSide\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	cmp r0, 0x1\n\
-	bne _081079D0\n\
-	mov r0, sp\n\
-	ldrb r0, [r0, 0x9]\n\
-	ldr r1, =gBattleAnimBgTilemap_SurfOpponent\n\
-	bl AnimLoadCompressedBgTilemap\n\
-	b _081079EA\n\
-	.pool\n\
-_081079D0:\n\
-	mov r0, sp\n\
-	ldrb r0, [r0, 0x9]\n\
-	ldr r1, =gBattleAnimBgTilemap_SurfPlayer\n\
-	bl AnimLoadCompressedBgTilemap\n\
-	b _081079EA\n\
-	.pool\n\
-_081079E0:\n\
-	ldr r1, =gBattleAnimBgTilemap_SurfContest\n\
-	mov r0, sp\n\
-	movs r2, 0x1\n\
-	bl AnimLoadCompressedBgTilemapHandleContest\n\
-_081079EA:\n\
-	mov r0, sp\n\
-	ldrb r0, [r0, 0x9]\n\
-	ldr r1, =gBattleAnimBgImage_Surf\n\
-	mov r2, sp\n\
-	ldrh r2, [r2, 0xA]\n\
-	bl AnimLoadCompressedBgGfx\n\
-	ldr r0, =gBattleAnimArgs\n\
-	movs r1, 0\n\
-	ldrsh r0, [r0, r1]\n\
-	cmp r0, 0\n\
-	bne _08107A24\n\
-	ldr r0, =gBattleAnimBgPalette_Surf\n\
-	mov r1, sp\n\
-	ldrb r1, [r1, 0x8]\n\
-	lsls r1, 4\n\
-	movs r2, 0x20\n\
-	bl LoadCompressedPalette\n\
-	b _08107A32\n\
-	.pool\n\
-_08107A24:\n\
-	ldr r0, =gBattleAnimBackgroundImageMuddyWater_Pal\n\
-	mov r1, sp\n\
-	ldrb r1, [r1, 0x8]\n\
-	lsls r1, 4\n\
-	movs r2, 0x20\n\
-	bl LoadCompressedPalette\n\
-_08107A32:\n\
-	ldr r0, =AnimTask_SurfWaveScanlineEffect\n\
-	ldr r4, =gTasks\n\
-	mov r2, r10\n\
-	lsls r5, r2, 2\n\
-	adds r1, r5, r2\n\
-	lsls r1, 3\n\
-	adds r6, r1, r4\n\
-	ldrb r1, [r6, 0x7]\n\
-	adds r1, 0x1\n\
-	lsls r1, 24\n\
-	lsrs r1, 24\n\
-	bl CreateTask\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	mov r8, r0\n\
-	movs r0, 0\n\
-	mov r9, r0\n\
-	mov r1, r8\n\
-	strh r1, [r6, 0x26]\n\
-	mov r2, r8\n\
-	lsls r0, r2, 2\n\
-	add r0, r8\n\
-	lsls r0, 3\n\
-	adds r7, r0, r4\n\
-	mov r0, r9\n\
-	strh r0, [r7, 0x8]\n\
-	movs r0, 0x80\n\
-	lsls r0, 5\n\
-	strh r0, [r7, 0xA]\n\
-	strh r0, [r7, 0xC]\n\
-	bl IsContest\n\
-	lsls r0, 24\n\
-	lsrs r4, r0, 24\n\
-	cmp r4, 0\n\
-	beq _08107AB4\n\
-	ldr r1, =0x0000ffb0\n\
-	adds r0, r1, 0\n\
-	ldr r2, =gBattle_BG1_X\n\
-	strh r0, [r2]\n\
-	adds r1, 0x20\n\
-	adds r0, r1, 0\n\
-	ldr r2, =gBattle_BG1_Y\n\
-	strh r0, [r2]\n\
-	movs r0, 0x2\n\
-	strh r0, [r6, 0x8]\n\
-	movs r0, 0x1\n\
-	strh r0, [r6, 0xA]\n\
-	mov r0, r9\n\
-	strh r0, [r7, 0xE]\n\
-	b _08107B0E\n\
-	.pool\n\
-_08107AB4:\n\
-	ldr r0, =gBattleAnimAttacker\n\
-	ldrb r0, [r0]\n\
-	bl GetBattlerSide\n\
-	lsls r0, 24\n\
-	lsrs r1, r0, 24\n\
-	cmp r1, 0x1\n\
-	bne _08107AF8\n\
-	ldr r2, =0x0000ff20\n\
-	adds r0, r2, 0\n\
-	ldr r2, =gBattle_BG1_X\n\
-	strh r0, [r2]\n\
-	movs r2, 0x80\n\
-	lsls r2, 1\n\
-	adds r0, r2, 0\n\
-	ldr r2, =gBattle_BG1_Y\n\
-	strh r0, [r2]\n\
-	movs r0, 0x2\n\
-	strh r0, [r6, 0x8]\n\
-	ldr r0, =0x0000ffff\n\
-	strh r0, [r6, 0xA]\n\
-	strh r1, [r7, 0xE]\n\
-	b _08107B0E\n\
-	.pool\n\
-_08107AF8:\n\
-	ldr r0, =gBattle_BG1_X\n\
-	strh r4, [r0]\n\
-	ldr r1, =0x0000ffd0\n\
-	adds r0, r1, 0\n\
-	ldr r2, =gBattle_BG1_Y\n\
-	strh r0, [r2]\n\
-	ldr r0, =0x0000fffe\n\
-	strh r0, [r6, 0x8]\n\
-	movs r0, 0x1\n\
-	strh r0, [r6, 0xA]\n\
-	strh r4, [r7, 0xE]\n\
-_08107B0E:\n\
-	ldr r0, =gBattle_BG1_X\n\
-	ldrh r1, [r0]\n\
-	movs r0, 0x14\n\
-	bl SetGpuReg\n\
-	ldr r2, =gBattle_BG1_Y\n\
-	ldrh r1, [r2]\n\
-	movs r0, 0x16\n\
-	bl SetGpuReg\n\
-	ldr r1, =gTasks\n\
-	mov r2, r8\n\
-	lsls r0, r2, 2\n\
-	add r0, r8\n\
-	lsls r0, 3\n\
-	adds r1, r0, r1\n\
-	movs r2, 0xE\n\
-	ldrsh r0, [r1, r2]\n\
-	cmp r0, 0\n\
-	bne _08107B54\n\
-	movs r0, 0x30\n\
-	strh r0, [r1, 0x10]\n\
-	movs r0, 0x70\n\
-	b _08107B58\n\
-	.pool\n\
-_08107B54:\n\
-	movs r0, 0\n\
-	strh r0, [r1, 0x10]\n\
-_08107B58:\n\
-	strh r0, [r1, 0x12]\n\
-	ldr r1, =gTasks\n\
-	mov r2, r10\n\
-	adds r0, r5, r2\n\
-	lsls r0, 3\n\
-	adds r0, r1\n\
-	movs r1, 0x1\n\
-	strh r1, [r0, 0x14]\n\
-	ldr r1, =AnimTask_CreateSurfWave_Step1\n\
-	str r1, [r0]\n\
-	add sp, 0x10\n\
-	pop {r3-r5}\n\
-	mov r8, r3\n\
-	mov r9, r4\n\
-	mov r10, r5\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.pool\n");
-}
-#endif
 
-#ifdef NONMATCHING
 static void AnimTask_CreateSurfWave_Step1(u8 taskId)
 {
-    struct BattleAnimBgData animBg;
-    u8 i;
     u16 rgbBuffer;
-    u16 *BGptrX = &gBattle_BG1_X;
-    u16 *BGptrY = &gBattle_BG1_Y;
-    s16 unkUse;
-    u32 palOffset;
-    u16 palNum;
+    u8 i;
+    u16 *BGptrX, *BGptrY;
+    struct BattleAnimBgData animBg;
+
+    BGptrX = &gBattle_BG1_X;
+    BGptrY = &gBattle_BG1_Y;
 
     *BGptrX += gTasks[taskId].data[0];
     *BGptrY += gTasks[taskId].data[1];
@@ -1189,29 +891,26 @@ static void AnimTask_CreateSurfWave_Step1(u8 taskId)
     gTasks[taskId].data[2] += gTasks[taskId].data[1];
     if (++gTasks[taskId].data[5] == 4)
     {
-        rgbBuffer = gPlttBufferFaded[animBg.paletteId * 16 + 7];
-        for (i = 6; i != 0; i--)
+        rgbBuffer = gPlttBufferFaded[16 * animBg.paletteId + 7];
+        for (i = 6; i != 0; i--) // i > 0 generates the exact same code in this context
         {
-            palNum = animBg.paletteId * 16;
-            palOffset = 1 + i;
-            gPlttBufferFaded[palNum + palOffset] = gPlttBufferFaded[palNum + palOffset - 1];
+            gPlttBufferFaded[16 * animBg.paletteId + 1 + i] = gPlttBufferFaded[16 * animBg.paletteId + 1 + i - 1]; // 1 + i - 1 is needed to match for some bizarre reason
         }
-        gPlttBufferFaded[animBg.paletteId * 16 + 1] = rgbBuffer;
+        gPlttBufferFaded[16 * animBg.paletteId + 1] = rgbBuffer;
         gTasks[taskId].data[5] = 0;
     }
     if (++gTasks[taskId].data[6] > 1)
     {
         gTasks[taskId].data[6] = 0;
-        unkUse = ++gTasks[taskId].data[3];
-        if (unkUse <= 13)
+        if (++gTasks[taskId].data[3] < 14)
         {
-            gTasks[gTasks[taskId].data[15]].data[1] = unkUse | ((16 - unkUse) * 256);
+            gTasks[gTasks[taskId].data[15]].data[1] = (s16)((gTasks[taskId].data[3]) | ((16 - gTasks[taskId].data[3]) << 8));
             gTasks[taskId].data[4]++;
         }
         if (gTasks[taskId].data[3] > 54)
         {
-            unkUse = --gTasks[taskId].data[4];
-            gTasks[gTasks[taskId].data[15]].data[1] = unkUse | ((16 - unkUse) * 256);
+            gTasks[taskId].data[4]--;
+            gTasks[gTasks[taskId].data[15]].data[1] = (s16)((gTasks[taskId].data[4]) | ((16 - gTasks[taskId].data[4]) << 8));
         }
     }
     if (!(gTasks[gTasks[taskId].data[15]].data[1] & 0x1F))
@@ -1220,167 +919,7 @@ static void AnimTask_CreateSurfWave_Step1(u8 taskId)
         gTasks[taskId].func = AnimTask_CreateSurfWave_Step2;
     }
 }
-#else
-NAKED
-static void AnimTask_CreateSurfWave_Step1(u8 taskId)
-{
-    asm_unified("push {r4-r7,lr}\n\
-	sub sp, 0x10\n\
-	lsls r0, 24\n\
-	lsrs r5, r0, 24\n\
-	ldr r1, =gBattle_BG1_X\n\
-	ldr r2, =gBattle_BG1_Y\n\
-	ldr r0, =gTasks\n\
-	lsls r4, r5, 2\n\
-	adds r4, r5\n\
-	lsls r4, 3\n\
-	adds r4, r0\n\
-	ldrh r0, [r4, 0x8]\n\
-	ldrh r3, [r1]\n\
-	adds r0, r3\n\
-	strh r0, [r1]\n\
-	ldrh r0, [r4, 0xA]\n\
-	ldrh r1, [r2]\n\
-	adds r0, r1\n\
-	strh r0, [r2]\n\
-	mov r0, sp\n\
-	bl sub_80A6B30\n\
-	ldrh r0, [r4, 0xA]\n\
-	ldrh r3, [r4, 0xC]\n\
-	adds r0, r3\n\
-	strh r0, [r4, 0xC]\n\
-	ldrh r0, [r4, 0x12]\n\
-	adds r0, 0x1\n\
-	strh r0, [r4, 0x12]\n\
-	lsls r0, 16\n\
-	asrs r0, 16\n\
-	cmp r0, 0x4\n\
-	bne _08107C18\n\
-	ldr r1, =gPlttBufferFaded\n\
-	mov r0, sp\n\
-	ldrb r0, [r0, 0x8]\n\
-	lsls r0, 4\n\
-	adds r0, 0x7\n\
-	lsls r0, 1\n\
-	adds r0, r1\n\
-	ldrh r6, [r0]\n\
-	movs r2, 0x6\n\
-	adds r7, r1, 0\n\
-	adds r3, r7, 0\n\
-	mov r4, sp\n\
-_08107BDE:\n\
-	ldrb r0, [r4, 0x8]\n\
-	lsls r0, 4\n\
-	adds r1, r2, 0x1\n\
-	adds r0, r1\n\
-	lsls r1, r0, 1\n\
-	adds r1, r3\n\
-	subs r0, 0x1\n\
-	lsls r0, 1\n\
-	adds r0, r3\n\
-	ldrh r0, [r0]\n\
-	strh r0, [r1]\n\
-	subs r0, r2, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r2, r0, 24\n\
-	cmp r2, 0\n\
-	bne _08107BDE\n\
-	mov r0, sp\n\
-	ldrb r0, [r0, 0x8]\n\
-	lsls r0, 4\n\
-	adds r0, 0x1\n\
-	lsls r0, 1\n\
-	adds r0, r7\n\
-	strh r6, [r0]\n\
-	ldr r1, =gTasks\n\
-	lsls r0, r5, 2\n\
-	adds r0, r5\n\
-	lsls r0, 3\n\
-	adds r0, r1\n\
-	strh r2, [r0, 0x12]\n\
-_08107C18:\n\
-	ldr r1, =gTasks\n\
-	lsls r2, r5, 2\n\
-	adds r0, r2, r5\n\
-	lsls r0, 3\n\
-	adds r3, r0, r1\n\
-	ldrh r0, [r3, 0x14]\n\
-	adds r0, 0x1\n\
-	strh r0, [r3, 0x14]\n\
-	lsls r0, 16\n\
-	asrs r0, 16\n\
-	adds r4, r1, 0\n\
-	adds r6, r2, 0\n\
-	cmp r0, 0x1\n\
-	ble _08107C86\n\
-	movs r0, 0\n\
-	strh r0, [r3, 0x14]\n\
-	ldrh r0, [r3, 0xE]\n\
-	adds r2, r0, 0x1\n\
-	strh r2, [r3, 0xE]\n\
-	lsls r0, r2, 16\n\
-	asrs r0, 16\n\
-	cmp r0, 0xD\n\
-	bgt _08107C62\n\
-	movs r1, 0x26\n\
-	ldrsh r0, [r3, r1]\n\
-	lsls r1, r0, 2\n\
-	adds r1, r0\n\
-	lsls r1, 3\n\
-	adds r1, r4\n\
-	movs r0, 0x10\n\
-	subs r0, r2\n\
-	lsls r0, 8\n\
-	orrs r2, r0\n\
-	strh r2, [r1, 0xA]\n\
-	ldrh r0, [r3, 0x10]\n\
-	adds r0, 0x1\n\
-	strh r0, [r3, 0x10]\n\
-_08107C62:\n\
-	movs r1, 0xE\n\
-	ldrsh r0, [r3, r1]\n\
-	cmp r0, 0x36\n\
-	ble _08107C86\n\
-	ldrh r2, [r3, 0x10]\n\
-	subs r2, 0x1\n\
-	strh r2, [r3, 0x10]\n\
-	movs r1, 0x26\n\
-	ldrsh r0, [r3, r1]\n\
-	lsls r1, r0, 2\n\
-	adds r1, r0\n\
-	lsls r1, 3\n\
-	adds r1, r4\n\
-	movs r0, 0x10\n\
-	subs r0, r2\n\
-	lsls r0, 8\n\
-	orrs r2, r0\n\
-	strh r2, [r1, 0xA]\n\
-_08107C86:\n\
-	adds r0, r6, r5\n\
-	lsls r0, 3\n\
-	adds r2, r0, r4\n\
-	movs r3, 0x26\n\
-	ldrsh r1, [r2, r3]\n\
-	lsls r0, r1, 2\n\
-	adds r0, r1\n\
-	lsls r0, 3\n\
-	adds r0, r4\n\
-	ldrh r0, [r0, 0xA]\n\
-	movs r3, 0x1F\n\
-	ands r3, r0\n\
-	cmp r3, 0\n\
-	bne _08107CA8\n\
-	strh r3, [r2, 0x8]\n\
-	ldr r0, =AnimTask_CreateSurfWave_Step2\n\
-	str r0, [r2]\n\
-_08107CA8:\n\
-	add sp, 0x10\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.pool\n");
-}
-#endif
+
 
 static void AnimTask_CreateSurfWave_Step2(u8 taskId)
 {
@@ -2004,216 +1543,50 @@ static void AnimWaterPulseRing_Step(struct Sprite *sprite)
     sprite->data[0]++;
 }
 
-#ifdef NONMATCHING
-static void CreateWaterPulseRingBubbles(struct Sprite *sprite, int xDiff, int yDiff)
+static void CreateWaterPulseRingBubbles(struct Sprite *sprite, s32 xDiff, s32 yDiff)
 {
-    s16 something = sprite->data[0] / 2;
-    s16 combinedX = sprite->pos1.x + sprite->pos2.x;
-    s16 combinedY = sprite->pos1.y + sprite->pos2.y;
-    s16 randomSomethingY = yDiff + (Random2() % 10) - 5;
-    s16 randomSomethingX = -xDiff + (Random2() % 10) - 5;
-    s16 i;
+    s16 combinedX, combinedY;
+    s16 i, something;
+    s16 unusedVar = 1; //unusedVar is needed to match
+    s16 somethingRandomX, somethingRandomY;
     u8 spriteId;
 
-    for (i = 0; i <= 0; i++)
+    something = sprite->data[0] / 2;
+    combinedX = sprite->pos1.x + sprite->pos2.x;
+    combinedY = sprite->pos1.y + sprite->pos2.y;
+    if (yDiff < 0)
+        unusedVar *= -1; //Needed to Match
+    somethingRandomY = yDiff + (Random2() % 10) - 5;
+    somethingRandomX = -xDiff + (Random2() % 10) - 5;
+
+    for (i = 0; i < 1; i++)
     {
         spriteId = CreateSprite(&gWaterPulseRingBubbleSpriteTemplate, combinedX, combinedY + something, 130);
         gSprites[spriteId].data[0] = 20;
-        gSprites[spriteId].data[1] = randomSomethingY;
+        gSprites[spriteId].data[1] = somethingRandomY;
         gSprites[spriteId].subpriority = GetBattlerSpriteSubpriority(gBattleAnimAttacker) - 1;
-        if (randomSomethingX < 0)
-            gSprites[spriteId].data[2] = -randomSomethingX;
+        if (somethingRandomX < 0)
+        {
+            gSprites[spriteId].data[2] = -somethingRandomX;
+        }
         else
-            gSprites[spriteId].data[2] = randomSomethingX;
+        {
+            gSprites[spriteId].data[2] = somethingRandomX;
+        }
     }
-    for (i = 0; i <= 0; i++)
+    for (i = 0; i < 1; i++)
     {
         spriteId = CreateSprite(&gWaterPulseRingBubbleSpriteTemplate, combinedX, combinedY - something, 130);
         gSprites[spriteId].data[0] = 20;
-        gSprites[spriteId].data[1] = randomSomethingY;
+        gSprites[spriteId].data[1] = somethingRandomY;
         gSprites[spriteId].subpriority = GetBattlerSpriteSubpriority(gBattleAnimAttacker) - 1;
-        if (randomSomethingX > 0)
-            gSprites[spriteId].data[2] = -randomSomethingX;
+        if (somethingRandomX > 0)
+        {
+            gSprites[spriteId].data[2] = -somethingRandomX;
+        }
         else
-            gSprites[spriteId].data[2] = randomSomethingX;
+        {
+            gSprites[spriteId].data[2] = somethingRandomX;
+        }
     }
 }
-#else
-NAKED
-static void CreateWaterPulseRingBubbles(struct Sprite *sprite, int xDiff, int yDiff)
-{
-    asm_unified("push {r4-r7,lr}\n\
-	mov r7, r10\n\
-	mov r6, r9\n\
-	mov r5, r8\n\
-	push {r5-r7}\n\
-	sub sp, 0x18\n\
-	adds r4, r1, 0\n\
-	adds r5, r2, 0\n\
-	movs r2, 0x2E\n\
-	ldrsh r1, [r0, r2]\n\
-	lsrs r2, r1, 31\n\
-	adds r1, r2\n\
-	lsls r1, 15\n\
-	lsrs r1, 16\n\
-	str r1, [sp]\n\
-	ldrh r1, [r0, 0x24]\n\
-	ldrh r3, [r0, 0x20]\n\
-	adds r1, r3\n\
-	lsls r1, 16\n\
-	lsrs r1, 16\n\
-	mov r8, r1\n\
-	ldrh r1, [r0, 0x26]\n\
-	ldrh r0, [r0, 0x22]\n\
-	adds r1, r0\n\
-	lsls r1, 16\n\
-	lsrs r1, 16\n\
-	mov r10, r1\n\
-	bl Random2\n\
-	lsls r0, 16\n\
-	lsrs r0, 16\n\
-	movs r1, 0xA\n\
-	bl __umodsi3\n\
-	adds r0, r5, r0\n\
-	subs r0, 0x5\n\
-	lsls r0, 16\n\
-	lsrs r0, 16\n\
-	mov r9, r0\n\
-	bl Random2\n\
-	negs r4, r4\n\
-	lsls r0, 16\n\
-	lsrs r0, 16\n\
-	movs r1, 0xA\n\
-	bl __umodsi3\n\
-	adds r4, r0\n\
-	subs r4, 0x5\n\
-	lsls r4, 16\n\
-	lsrs r7, r4, 16\n\
-	movs r6, 0\n\
-	mov r0, r8\n\
-	lsls r0, 16\n\
-	mov r8, r0\n\
-	mov r1, r10\n\
-	lsls r1, 16\n\
-	str r1, [sp, 0xC]\n\
-	ldr r2, [sp]\n\
-	lsls r2, 16\n\
-	str r2, [sp, 0x10]\n\
-	asrs r1, 16\n\
-	lsls r0, r7, 16\n\
-	asrs r5, r0, 16\n\
-	str r0, [sp, 0x14]\n\
-	negs r3, r5\n\
-	str r3, [sp, 0x4]\n\
-	asrs r0, r2, 16\n\
-	adds r1, r0\n\
-	lsls r1, 16\n\
-	mov r10, r1\n\
-_08108DE2:\n\
-	ldr r0, =gWaterPulseRingBubbleSpriteTemplate\n\
-	mov r2, r8\n\
-	asrs r1, r2, 16\n\
-	mov r3, r10\n\
-	asrs r2, r3, 16\n\
-	movs r3, 0x82\n\
-	bl CreateSprite\n\
-	lsls r0, 24\n\
-	lsrs r2, r0, 24\n\
-	ldr r1, =gSprites\n\
-	lsls r0, r2, 4\n\
-	adds r0, r2\n\
-	lsls r0, 2\n\
-	adds r4, r0, r1\n\
-	movs r0, 0x14\n\
-	strh r0, [r4, 0x2E]\n\
-	mov r0, r9\n\
-	strh r0, [r4, 0x30]\n\
-	ldr r0, =gBattleAnimAttacker\n\
-	ldrb r0, [r0]\n\
-	bl GetBattlerSpriteSubpriority\n\
-	subs r0, 0x1\n\
-	adds r1, r4, 0\n\
-	adds r1, 0x43\n\
-	strb r0, [r1]\n\
-	cmp r5, 0\n\
-	bge _08108E30\n\
-	mov r1, sp\n\
-	ldrh r1, [r1, 0x4]\n\
-	strh r1, [r4, 0x32]\n\
-	b _08108E32\n\
-	.pool\n\
-_08108E30:\n\
-	strh r7, [r4, 0x32]\n\
-_08108E32:\n\
-	lsls r0, r6, 16\n\
-	movs r2, 0x80\n\
-	lsls r2, 9\n\
-	adds r0, r2\n\
-	lsrs r6, r0, 16\n\
-	cmp r0, 0\n\
-	ble _08108DE2\n\
-	movs r6, 0\n\
-	ldr r3, [sp, 0xC]\n\
-	asrs r1, r3, 16\n\
-	ldr r0, [sp, 0x14]\n\
-	asrs r5, r0, 16\n\
-	negs r2, r5\n\
-	str r2, [sp, 0x8]\n\
-	ldr r3, [sp, 0x10]\n\
-	asrs r0, r3, 16\n\
-	subs r1, r0\n\
-	lsls r1, 16\n\
-	mov r10, r1\n\
-_08108E58:\n\
-	ldr r0, =gWaterPulseRingBubbleSpriteTemplate\n\
-	mov r2, r8\n\
-	asrs r1, r2, 16\n\
-	mov r3, r10\n\
-	asrs r2, r3, 16\n\
-	movs r3, 0x82\n\
-	bl CreateSprite\n\
-	lsls r0, 24\n\
-	lsrs r2, r0, 24\n\
-	ldr r1, =gSprites\n\
-	lsls r0, r2, 4\n\
-	adds r0, r2\n\
-	lsls r0, 2\n\
-	adds r4, r0, r1\n\
-	movs r0, 0x14\n\
-	strh r0, [r4, 0x2E]\n\
-	mov r0, r9\n\
-	strh r0, [r4, 0x30]\n\
-	ldr r0, =gBattleAnimAttacker\n\
-	ldrb r0, [r0]\n\
-	bl GetBattlerSpriteSubpriority\n\
-	subs r0, 0x1\n\
-	adds r1, r4, 0\n\
-	adds r1, 0x43\n\
-	strb r0, [r1]\n\
-	cmp r5, 0\n\
-	ble _08108EA8\n\
-	mov r1, sp\n\
-	ldrh r1, [r1, 0x8]\n\
-	strh r1, [r4, 0x32]\n\
-	b _08108EAA\n\
-	.pool\n\
-_08108EA8:\n\
-	strh r7, [r4, 0x32]\n\
-_08108EAA:\n\
-	lsls r0, r6, 16\n\
-	movs r2, 0x80\n\
-	lsls r2, 9\n\
-	adds r0, r2\n\
-	lsrs r6, r0, 16\n\
-	cmp r0, 0\n\
-	ble _08108E58\n\
-	add sp, 0x18\n\
-	pop {r3-r5}\n\
-	mov r8, r3\n\
-	mov r9, r4\n\
-	mov r10, r5\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n");
-}
-#endif
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 1dc81f1a9..08ce9f09c 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -316,7 +316,7 @@ static void HandleInputChooseAction(void)
             if (gBattleBufferA[gActiveBattler][1] == B_ACTION_USE_ITEM)
             {
                 // Add item to bag if it is a ball
-                if (itemId <= ITEM_PREMIER_BALL)
+                if (itemId <= LAST_BALL)
                     AddBagItem(itemId, 1);
                 else
                     return;
@@ -359,7 +359,7 @@ static void HandleInputChooseTarget(void)
         } while (i < gBattlersCount);
     }
 
-    if (gMain.heldKeys & DPAD_ANY && gSaveBlock2Ptr->optionsButtonMode == 2)
+    if (gMain.heldKeys & DPAD_ANY && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_L_EQUALS_A)
         gPlayerDpadHoldFrames++;
     else
         gPlayerDpadHoldFrames = 0;
@@ -367,7 +367,7 @@ static void HandleInputChooseTarget(void)
     if (gMain.newKeys & A_BUTTON)
     {
         PlaySE(SE_SELECT);
-        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039B2C;
+        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_HideAsMoveTarget;
         BtlController_EmitTwoReturnValues(1, 10, gMoveSelectionCursor[gActiveBattler] | (gMultiUsePlayerCursor << 8));
         EndBounceEffect(gMultiUsePlayerCursor, BOUNCE_HEALTHBOX);
         PlayerBufferExecCompleted();
@@ -375,7 +375,7 @@ static void HandleInputChooseTarget(void)
     else if (gMain.newKeys & B_BUTTON || gPlayerDpadHoldFrames > 59)
     {
         PlaySE(SE_SELECT);
-        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039B2C;
+        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_HideAsMoveTarget;
         gBattlerControllerFuncs[gActiveBattler] = HandleInputChooseMove;
         DoBounceEffect(gActiveBattler, BOUNCE_HEALTHBOX, 7, 1);
         DoBounceEffect(gActiveBattler, BOUNCE_MON, 7, 1);
@@ -384,7 +384,7 @@ static void HandleInputChooseTarget(void)
     else if (gMain.newKeys & (DPAD_LEFT | DPAD_UP))
     {
         PlaySE(SE_SELECT);
-        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039B2C;
+        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_HideAsMoveTarget;
 
         do
         {
@@ -421,12 +421,12 @@ static void HandleInputChooseTarget(void)
             if (gAbsentBattlerFlags & gBitTable[gMultiUsePlayerCursor])
                 i = 0;
         } while (i == 0);
-        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039AD8;
+        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_ShowAsMoveTarget;
     }
     else if (gMain.newKeys & (DPAD_RIGHT | DPAD_DOWN))
     {
         PlaySE(SE_SELECT);
-        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039B2C;
+        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_HideAsMoveTarget;
 
         do
         {
@@ -463,7 +463,7 @@ static void HandleInputChooseTarget(void)
             if (gAbsentBattlerFlags & gBitTable[gMultiUsePlayerCursor])
                 i = 0;
         } while (i == 0);
-        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039AD8;
+        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_ShowAsMoveTarget;
     }
 }
 
@@ -536,7 +536,7 @@ static void HandleInputChooseMove(void)
             else
                 gMultiUsePlayerCursor = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
 
-            gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039AD8;
+            gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_ShowAsMoveTarget;
         }
     }
     else if (gMain.newKeys & B_BUTTON || gPlayerDpadHoldFrames > 59)
@@ -1468,8 +1468,7 @@ static void MoveSelectionDisplayPpNumber(void)
     SetPpNumbersPaletteInMoveSelection();
     moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBattler][4]);
     txtPtr = ConvertIntToDecimalStringN(gDisplayedStringBattle, moveInfo->currentPp[gMoveSelectionCursor[gActiveBattler]], STR_CONV_MODE_RIGHT_ALIGN, 2);
-    txtPtr[0] = CHAR_SLASH;
-    txtPtr++;
+    *(txtPtr)++ = CHAR_SLASH;
     ConvertIntToDecimalStringN(txtPtr, moveInfo->maxPp[gMoveSelectionCursor[gActiveBattler]], STR_CONV_MODE_RIGHT_ALIGN, 2);
 
     BattlePutTextOnWindow(gDisplayedStringBattle, 9);
@@ -1481,12 +1480,9 @@ static void MoveSelectionDisplayMoveType(void)
     struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBattler][4]);
 
     txtPtr = StringCopy(gDisplayedStringBattle, gText_MoveInterfaceType);
-    txtPtr[0] = EXT_CTRL_CODE_BEGIN;
-    txtPtr++;
-    txtPtr[0] = 6;
-    txtPtr++;
-    txtPtr[0] = 1;
-    txtPtr++;
+    *(txtPtr)++ = EXT_CTRL_CODE_BEGIN;
+    *(txtPtr)++ = EXT_CTRL_CODE_SIZE;
+    *(txtPtr)++ = 1;
 
     StringCopy(txtPtr, gTypeNames[gBattleMoves[moveInfo->moves[gMoveSelectionCursor[gActiveBattler]]].type]);
     BattlePutTextOnWindow(gDisplayedStringBattle, 10);
diff --git a/src/battle_dome.c b/src/battle_dome.c
index 9e687f131..3654d2ccf 100644
--- a/src/battle_dome.c
+++ b/src/battle_dome.c
@@ -4692,7 +4692,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId)
             allocatedArray[NUM_STATS] += allocatedArray[STAT_HP];
 
             // Add the EVs with the nature modifier for this mon and and track number of negative natures
-            for (j = 0; j < NUM_EV_STATS; j++)
+            for (j = 0; j < NUM_NATURE_STATS; j++)
             {
                 if (trainerId == TRAINER_FRONTIER_BRAIN)
                     nature = GetFrontierBrainMonNature(i);
@@ -4706,7 +4706,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId)
                 else if (gNatureStatTable[nature][j] < 0)
                 {
                     allocatedArray[j + NUM_STATS + 1] += (allocatedArray[j + 1] * 90) / 100;
-                    allocatedArray[j + NUM_STATS + NUM_EV_STATS + 2]++;
+                    allocatedArray[j + NUM_STATS + NUM_NATURE_STATS + 2]++;
                 }
                 else
                 {
@@ -4742,7 +4742,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId)
             }
 
             allocatedArray[NUM_STATS] += allocatedArray[STAT_HP];
-            for (j = 0; j < NUM_EV_STATS; j++)
+            for (j = 0; j < NUM_NATURE_STATS; j++)
             {
                 nature = gFacilityTrainerMons[DOME_MONS[trainerTourneyId][i]].nature;
                 if (gNatureStatTable[nature][j] > 0)
@@ -4752,7 +4752,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId)
                 else if (gNatureStatTable[nature][j] < 0)
                 {
                     allocatedArray[j + NUM_STATS + 1] += (allocatedArray[j + 1] * 90) / 100;
-                    allocatedArray[j + NUM_STATS + NUM_EV_STATS + 2]++;
+                    allocatedArray[j + NUM_STATS + NUM_NATURE_STATS + 2]++;
                 }
                 else
                 {
diff --git a/src/battle_factory.c b/src/battle_factory.c
index 913b1b1a0..940e71f7d 100644
--- a/src/battle_factory.c
+++ b/src/battle_factory.c
@@ -39,7 +39,7 @@ static void GenerateInitialRentalMons(void);
 static void GetOpponentMostCommonMonType(void);
 static void GetOpponentBattleStyle(void);
 static void RestorePlayerPartyHeldItems(void);
-static u16 GetMonSetId(u8 lvlMode, u8 challengeNum, bool8 arg2);
+static u16 GetFactoryMonId(u8 lvlMode, u8 challengeNum, bool8 arg2);
 static u8 GetMoveBattleStyle(u16 move);
 
 // Const rom data.
@@ -159,24 +159,27 @@ static const u8 sFixedIVTable[][2] =
     {31, 31},
 };
 
-static const u16 sMonsToChooseFrom[][2] =
-{
-    {0x006e, 0x00c7},
-    {0x00a2, 0x010a},
-    {0x010b, 0x0173},
-    {0x0174, 0x01d3},
-    {0x01d4, 0x0233},
-    {0x0234, 0x0293},
-    {0x0294, 0x02f3},
-    {0x0174, 0x0351},
-    {0x0174, 0x01d3},
-    {0x01d4, 0x0233},
-    {0x0234, 0x0293},
-    {0x0294, 0x02f3},
-    {0x0174, 0x0371},
-    {0x0174, 0x0371},
-    {0x0174, 0x0371},
-    {0x0174, 0x0371},
+static const u16 sInitialRentalMonRanges[][2] =
+{
+    // Level 50
+    {FRONTIER_MON_GRIMER,     FRONTIER_MON_FURRET_1},   // 110 - 199
+    {FRONTIER_MON_DELCATTY_1, FRONTIER_MON_CLOYSTER_1}, // 162 - 266
+    {FRONTIER_MON_DELCATTY_2, FRONTIER_MON_CLOYSTER_2}, // 267 - 371
+    {FRONTIER_MON_DUGTRIO_1,  FRONTIER_MON_SLAKING_1},  // 372 - 467
+    {FRONTIER_MON_DUGTRIO_2,  FRONTIER_MON_SLAKING_2},  // 468 - 563
+    {FRONTIER_MON_DUGTRIO_3,  FRONTIER_MON_SLAKING_3},  // 564 - 659
+    {FRONTIER_MON_DUGTRIO_4,  FRONTIER_MON_SLAKING_4},  // 660 - 755
+    {FRONTIER_MON_DUGTRIO_1,  FRONTIER_MONS_HIGH_TIER}, // 372 - 849
+
+    // Open level
+    {FRONTIER_MON_DUGTRIO_1, FRONTIER_MON_SLAKING_1}, // 372 - 467
+    {FRONTIER_MON_DUGTRIO_2, FRONTIER_MON_SLAKING_2}, // 468 - 563
+    {FRONTIER_MON_DUGTRIO_3, FRONTIER_MON_SLAKING_3}, // 564 - 659
+    {FRONTIER_MON_DUGTRIO_4, FRONTIER_MON_SLAKING_4}, // 660 - 755
+    {FRONTIER_MON_DUGTRIO_1, NUM_FRONTIER_MONS - 1},  // 372 - 881
+    {FRONTIER_MON_DUGTRIO_1, NUM_FRONTIER_MONS - 1},  // 372 - 881
+    {FRONTIER_MON_DUGTRIO_1, NUM_FRONTIER_MONS - 1},  // 372 - 881
+    {FRONTIER_MON_DUGTRIO_1, NUM_FRONTIER_MONS - 1},  // 372 - 881
 };
 
 // code
@@ -320,24 +323,24 @@ static void GenerateOpponentMons(void)
     i = 0;
     while (i != FRONTIER_PARTY_SIZE)
     {
-        u16 monSetId = GetMonSetId(lvlMode, challengeNum, FALSE);
-        if (gFacilityTrainerMons[monSetId].species == SPECIES_UNOWN)
+        u16 monId = GetFactoryMonId(lvlMode, challengeNum, FALSE);
+        if (gFacilityTrainerMons[monId].species == SPECIES_UNOWN)
             continue;
 
         for (j = 0; j < 6; j++)
         {
-            if (gFacilityTrainerMons[monSetId].species == gFacilityTrainerMons[gSaveBlock2Ptr->frontier.rentalMons[j].monId].species)
+            if (gFacilityTrainerMons[monId].species == gFacilityTrainerMons[gSaveBlock2Ptr->frontier.rentalMons[j].monId].species)
                 break;
         }
         if (j != 6)
             continue;
 
-        if (lvlMode == FRONTIER_LVL_50 && monSetId > FRONTIER_MONS_HIGH_TIER)
+        if (lvlMode == FRONTIER_LVL_50 && monId > FRONTIER_MONS_HIGH_TIER)
             continue;
 
         for (k = firstMonId; k < firstMonId + i; k++)
         {
-            if (species[k] == gFacilityTrainerMons[monSetId].species)
+            if (species[k] == gFacilityTrainerMons[monId].species)
                 break;
         }
         if (k != firstMonId + i)
@@ -345,15 +348,15 @@ static void GenerateOpponentMons(void)
 
         for (k = firstMonId; k < firstMonId + i; k++)
         {
-            if (heldItems[k] != 0 && heldItems[k] == gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId])
+            if (heldItems[k] != 0 && heldItems[k] == gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId])
                 break;
         }
         if (k != firstMonId + i)
             continue;
 
-        species[i] = gFacilityTrainerMons[monSetId].species;
-        heldItems[i] = gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId];
-        gUnknown_03006298[i] = monSetId;
+        species[i] = gFacilityTrainerMons[monId].species;
+        heldItems[i] = gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId];
+        gUnknown_03006298[i] = monId;
         i++;
     }
 }
@@ -388,7 +391,7 @@ static void SetPlayerAndOpponentParties(void)
     int count = 0;
     u8 bits = 0;
     u8 monLevel;
-    u16 monSetId;
+    u16 monId;
     u16 evs;
     u8 ivs;
     u8 friendship;
@@ -412,17 +415,17 @@ static void SetPlayerAndOpponentParties(void)
         ZeroPlayerPartyMons();
         for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
         {
-            monSetId = gSaveBlock2Ptr->frontier.rentalMons[i].monId;
+            monId = gSaveBlock2Ptr->frontier.rentalMons[i].monId;
             ivs = gSaveBlock2Ptr->frontier.rentalMons[i].ivs;
             CreateMon(&gPlayerParty[i],
-                      gFacilityTrainerMons[monSetId].species,
+                      gFacilityTrainerMons[monId].species,
                       monLevel,
                       ivs,
                       TRUE, gSaveBlock2Ptr->frontier.rentalMons[i].personality,
                       OT_ID_PLAYER_ID, 0);
 
             count = 0;
-            bits = gFacilityTrainerMons[monSetId].evSpread;
+            bits = gFacilityTrainerMons[monId].evSpread;
             for (j = 0; j < NUM_STATS; bits >>= 1, j++)
             {
                 if (bits & 1)
@@ -433,16 +436,16 @@ static void SetPlayerAndOpponentParties(void)
             bits = 1;
             for (j = 0; j < NUM_STATS; bits <<= 1, j++)
             {
-                if (gFacilityTrainerMons[monSetId].evSpread & bits)
+                if (gFacilityTrainerMons[monId].evSpread & bits)
                     SetMonData(&gPlayerParty[i], MON_DATA_HP_EV + j, &evs);
             }
 
             CalculateMonStats(&gPlayerParty[i]);
             friendship = 0;
             for (k = 0; k < MAX_MON_MOVES; k++)
-                SetMonMoveAvoidReturn(&gPlayerParty[i], gFacilityTrainerMons[monSetId].moves[k], k);
+                SetMonMoveAvoidReturn(&gPlayerParty[i], gFacilityTrainerMons[monId].moves[k], k);
             SetMonData(&gPlayerParty[i], MON_DATA_FRIENDSHIP, &friendship);
-            SetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]);
+            SetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId]);
             SetMonData(&gPlayerParty[i], MON_DATA_ABILITY_NUM, &gSaveBlock2Ptr->frontier.rentalMons[i].abilityNum);
         }
     }
@@ -453,17 +456,17 @@ static void SetPlayerAndOpponentParties(void)
     case 2:
         for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
         {
-            monSetId = gSaveBlock2Ptr->frontier.rentalMons[i + 3].monId;
+            monId = gSaveBlock2Ptr->frontier.rentalMons[i + 3].monId;
             ivs = gSaveBlock2Ptr->frontier.rentalMons[i + 3].ivs;
             CreateMon(&gEnemyParty[i],
-                      gFacilityTrainerMons[monSetId].species,
+                      gFacilityTrainerMons[monId].species,
                       monLevel,
                       ivs,
                       TRUE, gSaveBlock2Ptr->frontier.rentalMons[i + 3].personality,
                       OT_ID_PLAYER_ID, 0);
 
             count = 0;
-            bits = gFacilityTrainerMons[monSetId].evSpread;
+            bits = gFacilityTrainerMons[monId].evSpread;
             for (j = 0; j < NUM_STATS; bits >>= 1, j++)
             {
                 if (bits & 1)
@@ -474,14 +477,14 @@ static void SetPlayerAndOpponentParties(void)
             bits = 1;
             for (j = 0; j < NUM_STATS; bits <<= 1, j++)
             {
-                if (gFacilityTrainerMons[monSetId].evSpread & bits)
+                if (gFacilityTrainerMons[monId].evSpread & bits)
                     SetMonData(&gEnemyParty[i], MON_DATA_HP_EV + j, &evs);
             }
 
             CalculateMonStats(&gEnemyParty[i]);
             for (k = 0; k < MAX_MON_MOVES; k++)
-                SetMonMoveAvoidReturn(&gEnemyParty[i], gFacilityTrainerMons[monSetId].moves[k], k);
-            SetMonData(&gEnemyParty[i], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]);
+                SetMonMoveAvoidReturn(&gEnemyParty[i], gFacilityTrainerMons[monId].moves[k], k);
+            SetMonData(&gEnemyParty[i], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId]);
             SetMonData(&gEnemyParty[i], MON_DATA_ABILITY_NUM, &gSaveBlock2Ptr->frontier.rentalMons[i + 3].abilityNum);
         }
         break;
@@ -497,8 +500,8 @@ static void GenerateInitialRentalMons(void)
     u8 challengeNum;
     u8 factoryLvlMode;
     u8 factoryBattleMode;
-    u8 var_40;
-    u16 monSetId;
+    u8 rentalRank;
+    u16 monId;
     u16 currSpecies;
     u16 species[PARTY_SIZE];
     u16 monIds[PARTY_SIZE];
@@ -530,30 +533,30 @@ static void GenerateInitialRentalMons(void)
         factoryLvlMode = FRONTIER_LVL_50;
         firstMonId = 0;
     }
-    var_40 = GetNumPastRentalsRank(factoryBattleMode, factoryLvlMode);
+    rentalRank = GetNumPastRentalsRank(factoryBattleMode, factoryLvlMode);
 
     currSpecies = SPECIES_NONE;
     i = 0;
     while (i != PARTY_SIZE)
     {
-        if (i < var_40)
-            monSetId = GetMonSetId(factoryLvlMode, challengeNum, TRUE);
+        if (i < rentalRank) // The more times the player has rented, the more initial rentals are generated from a better set of pokemon
+            monId = GetFactoryMonId(factoryLvlMode, challengeNum, TRUE);
         else
-            monSetId = GetMonSetId(factoryLvlMode, challengeNum, FALSE);
+            monId = GetFactoryMonId(factoryLvlMode, challengeNum, FALSE);
 
-        if (gFacilityTrainerMons[monSetId].species == SPECIES_UNOWN)
+        if (gFacilityTrainerMons[monId].species == SPECIES_UNOWN)
             continue;
 
         // Cannot have two pokemon of the same species.
         for (j = firstMonId; j < firstMonId + i; j++)
         {
-            u16 monId = monIds[j];
-            if (monId == monSetId)
+            u16 existingMonId = monIds[j];
+            if (existingMonId == monId)
                 break;
-            if (species[j] == gFacilityTrainerMons[monSetId].species)
+            if (species[j] == gFacilityTrainerMons[monId].species)
             {
                 if (currSpecies == SPECIES_NONE)
-                    currSpecies = gFacilityTrainerMons[monSetId].species;
+                    currSpecies = gFacilityTrainerMons[monId].species;
                 else
                     break;
             }
@@ -564,9 +567,9 @@ static void GenerateInitialRentalMons(void)
         // Cannot have two same held items.
         for (j = firstMonId; j < firstMonId + i; j++)
         {
-            if (heldItems[j] != 0 && heldItems[j] == gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId])
+            if (heldItems[j] != 0 && heldItems[j] == gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId])
             {
-                if (gFacilityTrainerMons[monSetId].species == currSpecies)
+                if (gFacilityTrainerMons[monId].species == currSpecies)
                     currSpecies = SPECIES_NONE;
                 break;
             }
@@ -574,10 +577,10 @@ static void GenerateInitialRentalMons(void)
         if (j != firstMonId + i)
             continue;
 
-        gSaveBlock2Ptr->frontier.rentalMons[i].monId = monSetId;
-        species[i] = gFacilityTrainerMons[monSetId].species;
-        heldItems[i] = gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId];
-        monIds[i] = monSetId;
+        gSaveBlock2Ptr->frontier.rentalMons[i].monId = monId;
+        species[i] = gFacilityTrainerMons[monId].species;
+        heldItems[i] = gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId];
+        monIds[i] = monId;
         i++;
     }
 }
@@ -629,10 +632,10 @@ static void GetOpponentBattleStyle(void)
 
     for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
     {
-        u16 monSetId = gUnknown_03006298[i];
+        u16 monId = gUnknown_03006298[i];
         for (j = 0; j < MAX_MON_MOVES; j++)
         {
-            u8 battleStyle = GetMoveBattleStyle(gFacilityTrainerMons[monSetId].moves[j]);
+            u8 battleStyle = GetMoveBattleStyle(gFacilityTrainerMons[monId].moves[j]);
             stylePoints[battleStyle]++;
         }
     }
@@ -724,16 +727,16 @@ void FillFactoryBrainParty(void)
 
     while (i != FRONTIER_PARTY_SIZE)
     {
-        u16 monSetId = GetMonSetId(lvlMode, challengeNum, FALSE);
+        u16 monId = GetFactoryMonId(lvlMode, challengeNum, FALSE);
 
-        if (gFacilityTrainerMons[monSetId].species == SPECIES_UNOWN)
+        if (gFacilityTrainerMons[monId].species == SPECIES_UNOWN)
             continue;
-        if (monLevel == 50 && monSetId > FRONTIER_MONS_HIGH_TIER)
+        if (monLevel == 50 && monId > FRONTIER_MONS_HIGH_TIER)
             continue;
 
         for (j = 0; j < 6; j++)
         {
-            if (monSetId == gSaveBlock2Ptr->frontier.rentalMons[j].monId)
+            if (monId == gSaveBlock2Ptr->frontier.rentalMons[j].monId)
                 break;
         }
         if (j != 6)
@@ -741,7 +744,7 @@ void FillFactoryBrainParty(void)
 
         for (k = 0; k < i; k++)
         {
-            if (species[k] == gFacilityTrainerMons[monSetId].species)
+            if (species[k] == gFacilityTrainerMons[monId].species)
                 break;
         }
         if (k != i)
@@ -749,35 +752,35 @@ void FillFactoryBrainParty(void)
 
         for (k = 0; k < i; k++)
         {
-            if (heldItems[k] != 0 && heldItems[k] == gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId])
+            if (heldItems[k] != 0 && heldItems[k] == gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId])
                 break;
         }
         if (k != i)
             continue;
 
-        species[i] = gFacilityTrainerMons[monSetId].species;
-        heldItems[i] = gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId];
+        species[i] = gFacilityTrainerMons[monId].species;
+        heldItems[i] = gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId];
         CreateMonWithEVSpreadNatureOTID(&gEnemyParty[i],
-                                             gFacilityTrainerMons[monSetId].species,
+                                             gFacilityTrainerMons[monId].species,
                                              monLevel,
-                                             gFacilityTrainerMons[monSetId].nature,
+                                             gFacilityTrainerMons[monId].nature,
                                              fixedIV,
-                                             gFacilityTrainerMons[monSetId].evSpread,
+                                             gFacilityTrainerMons[monId].evSpread,
                                              otId);
 
         friendship = 0;
         for (k = 0; k < MAX_MON_MOVES; k++)
-            SetMonMoveAvoidReturn(&gEnemyParty[i], gFacilityTrainerMons[monSetId].moves[k], k);
+            SetMonMoveAvoidReturn(&gEnemyParty[i], gFacilityTrainerMons[monId].moves[k], k);
         SetMonData(&gEnemyParty[i], MON_DATA_FRIENDSHIP, &friendship);
-        SetMonData(&gEnemyParty[i], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]);
+        SetMonData(&gEnemyParty[i], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId]);
         i++;
     }
 }
 
-static u16 GetMonSetId(u8 lvlMode, u8 challengeNum, bool8 arg2)
+static u16 GetFactoryMonId(u8 lvlMode, u8 challengeNum, bool8 useBetterRange)
 {
-    u16 range, monSetId;
-    u16 adder;
+    u16 numMons, monId;
+    u16 adder; // Used to skip past early mons for open level
 
     if (lvlMode == FRONTIER_LVL_50)
         adder = 0;
@@ -786,30 +789,31 @@ static u16 GetMonSetId(u8 lvlMode, u8 challengeNum, bool8 arg2)
 
     if (challengeNum < 7)
     {
-        if (arg2)
+        if (useBetterRange)
         {
-            range = (sMonsToChooseFrom[adder + challengeNum + 1][1] - sMonsToChooseFrom[adder + challengeNum + 1][0]) + 1;
-            monSetId = Random() % range;
-            monSetId += sMonsToChooseFrom[adder + challengeNum + 1][0];
+            numMons = (sInitialRentalMonRanges[adder + challengeNum + 1][1] - sInitialRentalMonRanges[adder + challengeNum + 1][0]) + 1;
+            monId = Random() % numMons;
+            monId += sInitialRentalMonRanges[adder + challengeNum + 1][0];
         }
         else
         {
-            range = (sMonsToChooseFrom[adder + challengeNum][1] - sMonsToChooseFrom[adder + challengeNum][0]) + 1;
-            monSetId = Random() % range;
-            monSetId += sMonsToChooseFrom[adder + challengeNum][0];
+            numMons = (sInitialRentalMonRanges[adder + challengeNum][1] - sInitialRentalMonRanges[adder + challengeNum][0]) + 1;
+            monId = Random() % numMons;
+            monId += sInitialRentalMonRanges[adder + challengeNum][0];
         }
     }
     else
     {
-        u16 num = challengeNum;
-        if (num != 7)
-            num = 7;
-        range = (sMonsToChooseFrom[adder + num][1] - sMonsToChooseFrom[adder + num][0]) + 1;
-        monSetId = Random() % range;
-        monSetId += sMonsToChooseFrom[adder + num][0];
+        u16 challenge = challengeNum;
+        if (challenge != 7)
+            challenge = 7; // why bother assigning it above at all
+
+        numMons = (sInitialRentalMonRanges[adder + challenge][1] - sInitialRentalMonRanges[adder + challenge][0]) + 1;
+        monId = Random() % numMons;
+        monId += sInitialRentalMonRanges[adder + challenge][0];
     }
 
-    return monSetId;
+    return monId;
 }
 
 u8 GetNumPastRentalsRank(u8 battleMode, u8 lvlMode)
diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c
index de2f3a10c..388881a1c 100644
--- a/src/battle_factory_screen.c
+++ b/src/battle_factory_screen.c
@@ -24,6 +24,7 @@
 #include "pokedex.h"
 #include "util.h"
 #include "trainer_pokemon_sprites.h"
+#include "starter_choose.h"
 #include "constants/battle_frontier.h"
 #include "constants/songs.h"
 #include "constants/rgb.h"
@@ -57,7 +58,7 @@
 
 struct FactorySelecteableMon
 {
-    u16 monSetId;
+    u16 monId;
     u16 spriteId;
     u8 selectedId; // 0 - not selected, 1 - first pokemon, 2 - second pokemon, 3 - third pokemon
     struct Pokemon monData;
@@ -132,8 +133,6 @@ struct FactorySwapMonsStruct
     bool8 unk30;
 };
 
-extern const u32 gUnknown_085B18AC[];
-
 // This file's functions.
 static void sub_819A44C(struct Sprite *sprite);
 static void CB2_InitSelectScreen(void);
@@ -168,7 +167,7 @@ static u8 sub_819BC9C(void);
 static u8 Select_OptionSummary(void);
 static u8 Select_OptionOthers(void);
 static u8 Select_OptionRentDeselect(void);
-static bool32 Select_AreSpeciesValid(u16 monSetId);
+static bool32 Select_AreSpeciesValid(u16 monId);
 static void Swap_DestroyAllSprites(void);
 static void Swap_ShowYesNoOptions(void);
 static void sub_819E8EC(void);
@@ -263,7 +262,7 @@ static const struct SpriteSheet gUnknown_086103BC[] =
 
 static const struct CompressedSpriteSheet gUnknown_086103E4[] =
 {
-    {gUnknown_085B18AC, 0x800, TAG_TILE_64},
+    {gPokeballSelection_Gfx, 0x800, TAG_TILE_64},
     {},
 };
 
@@ -616,7 +615,7 @@ static const struct SpriteSheet gUnknown_08610650[] =
 
 static const struct CompressedSpriteSheet gUnknown_086106A0[] =
 {
-    {gUnknown_085B18AC, 0x800, TAG_TILE_64},
+    {gPokeballSelection_Gfx, 0x800, TAG_TILE_64},
     {},
 };
 
@@ -1665,7 +1664,7 @@ static void CreateFrontierFactorySelectableMons(u8 firstMonId)
     u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
     u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
     u8 challengeNum = gSaveBlock2Ptr->frontier.factoryWinStreaks[battleMode][lvlMode] / 7;
-    u8 var_28 = 0;
+    u8 rentalRank = 0;
 
     gFacilityTrainerMons = gBattleFrontierMons;
     if (gSaveBlock2Ptr->frontier.lvlMode != FRONTIER_LVL_50)
@@ -1673,29 +1672,29 @@ static void CreateFrontierFactorySelectableMons(u8 firstMonId)
     else
         level = 50;
 
-    var_28 = GetNumPastRentalsRank(battleMode, lvlMode);
+    rentalRank = GetNumPastRentalsRank(battleMode, lvlMode);
     otId = T1_READ_32(gSaveBlock2Ptr->playerTrainerId);
 
     for (i = 0; i < SELECTABLE_MONS_COUNT; i++)
     {
-        u16 monSetId = gSaveBlock2Ptr->frontier.rentalMons[i].monId;
-        sFactorySelectScreen->mons[i + firstMonId].monSetId = monSetId;
-        if (i < var_28)
+        u16 monId = gSaveBlock2Ptr->frontier.rentalMons[i].monId;
+        sFactorySelectScreen->mons[i + firstMonId].monId = monId;
+        if (i < rentalRank)
             ivs = GetFactoryMonFixedIV(challengeNum + 1, 0);
         else
             ivs = GetFactoryMonFixedIV(challengeNum, 0);
         CreateMonWithEVSpreadNatureOTID(&sFactorySelectScreen->mons[i + firstMonId].monData,
-                                             gFacilityTrainerMons[monSetId].species,
+                                             gFacilityTrainerMons[monId].species,
                                              level,
-                                             gFacilityTrainerMons[monSetId].nature,
+                                             gFacilityTrainerMons[monId].nature,
                                              ivs,
-                                             gFacilityTrainerMons[monSetId].evSpread,
+                                             gFacilityTrainerMons[monId].evSpread,
                                              otId);
         happiness = 0;
         for (j = 0; j < MAX_MON_MOVES; j++)
-            SetMonMoveAvoidReturn(&sFactorySelectScreen->mons[i + firstMonId].monData, gFacilityTrainerMons[monSetId].moves[j], j);
+            SetMonMoveAvoidReturn(&sFactorySelectScreen->mons[i + firstMonId].monData, gFacilityTrainerMons[monId].moves[j], j);
         SetMonData(&sFactorySelectScreen->mons[i + firstMonId].monData, MON_DATA_FRIENDSHIP, &happiness);
-        SetMonData(&sFactorySelectScreen->mons[i + firstMonId].monData, MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]);
+        SetMonData(&sFactorySelectScreen->mons[i + firstMonId].monData, MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId]);
     }
 }
 
@@ -1712,20 +1711,20 @@ static void CreateTentFactorySelectableMons(u8 firstMonId)
 
     for (i = 0; i < SELECTABLE_MONS_COUNT; i++)
     {
-        u16 monSetId = gSaveBlock2Ptr->frontier.rentalMons[i].monId;
-        sFactorySelectScreen->mons[i + firstMonId].monSetId = monSetId;
+        u16 monId = gSaveBlock2Ptr->frontier.rentalMons[i].monId;
+        sFactorySelectScreen->mons[i + firstMonId].monId = monId;
         CreateMonWithEVSpreadNatureOTID(&sFactorySelectScreen->mons[i + firstMonId].monData,
-                                             gFacilityTrainerMons[monSetId].species,
+                                             gFacilityTrainerMons[monId].species,
                                              level,
-                                             gFacilityTrainerMons[monSetId].nature,
+                                             gFacilityTrainerMons[monId].nature,
                                              ivs,
-                                             gFacilityTrainerMons[monSetId].evSpread,
+                                             gFacilityTrainerMons[monId].evSpread,
                                              otId);
         happiness = 0;
         for (j = 0; j < MAX_MON_MOVES; j++)
-            SetMonMoveAvoidReturn(&sFactorySelectScreen->mons[i + firstMonId].monData, gFacilityTrainerMons[monSetId].moves[j], j);
+            SetMonMoveAvoidReturn(&sFactorySelectScreen->mons[i + firstMonId].monData, gFacilityTrainerMons[monId].moves[j], j);
         SetMonData(&sFactorySelectScreen->mons[i + firstMonId].monData, MON_DATA_FRIENDSHIP, &happiness);
-        SetMonData(&sFactorySelectScreen->mons[i + firstMonId].monData, MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]);
+        SetMonData(&sFactorySelectScreen->mons[i + firstMonId].monData, MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId]);
     }
 }
 
@@ -1740,7 +1739,7 @@ static void Select_CopyMonsToPlayerParty(void)
             if (sFactorySelectScreen->mons[j].selectedId == i + 1)
             {
                 gPlayerParty[i] = sFactorySelectScreen->mons[j].monData;
-                gSaveBlock2Ptr->frontier.rentalMons[i].monId = sFactorySelectScreen->mons[j].monSetId;
+                gSaveBlock2Ptr->frontier.rentalMons[i].monId = sFactorySelectScreen->mons[j].monId;
                 gSaveBlock2Ptr->frontier.rentalMons[i].personality = GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY, NULL);
                 gSaveBlock2Ptr->frontier.rentalMons[i].abilityNum = GetBoxMonData(&gPlayerParty[i].box, MON_DATA_ABILITY_NUM, NULL);
                 gSaveBlock2Ptr->frontier.rentalMons[i].ivs = GetBoxMonData(&gPlayerParty[i].box, MON_DATA_ATK_IV, NULL);
@@ -1871,8 +1870,8 @@ static u8 Select_RunMenuOptionFunc(void)
 static u8 Select_OptionRentDeselect(void)
 {
     u8 selectedId = sFactorySelectScreen->mons[sFactorySelectScreen->cursorPos].selectedId;
-    u16 monSetId  = sFactorySelectScreen->mons[sFactorySelectScreen->cursorPos].monSetId;
-    if (selectedId == 0 && !Select_AreSpeciesValid(monSetId))
+    u16 monId  = sFactorySelectScreen->mons[sFactorySelectScreen->cursorPos].monId;
+    if (selectedId == 0 && !Select_AreSpeciesValid(monId))
     {
         Select_PrintCantSelectSameMon();
         sub_819B958(3);
@@ -2160,10 +2159,10 @@ static void Select_SetWinRegs(s16 mWin0H, s16 nWin0H, s16 mWin0V, s16 nWin0V)
     SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG0 | WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2 | WINOUT_WIN01_CLR | WINOUT_WIN01_OBJ);
 }
 
-static bool32 Select_AreSpeciesValid(u16 monSetId)
+static bool32 Select_AreSpeciesValid(u16 monId)
 {
     u8 i, j;
-    u32 species = gFacilityTrainerMons[monSetId].species;
+    u32 species = gFacilityTrainerMons[monId].species;
     u8 selectState = sFactorySelectScreen->selectingMonsState;
 
     for (i = 1; i < selectState; i++)
@@ -2172,7 +2171,7 @@ static bool32 Select_AreSpeciesValid(u16 monSetId)
         {
             if (sFactorySelectScreen->mons[j].selectedId == i)
             {
-                if (gFacilityTrainerMons[sFactorySelectScreen->mons[j].monSetId].species == species)
+                if (gFacilityTrainerMons[sFactorySelectScreen->mons[j].monId].species == species)
                     return FALSE;
 
                 break;
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index e0530407c..50a5f8ad5 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -24,20 +24,21 @@
 #include "contest.h"
 #include "constants/songs.h"
 #include "constants/rgb.h"
+#include "constants/battle_palace.h"
 
 extern struct MusicPlayerInfo gMPlayInfo_SE1;
 extern struct MusicPlayerInfo gMPlayInfo_SE2;
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
-extern const u8 gUnknown_0831C604[];
+extern const u8 gBattlePalaceNatureToMoveTarget[];
 extern const u8 * const gBattleAnims_General[];
 extern const u8 * const gBattleAnims_Special[];
 extern const struct CompressedSpriteSheet gSpriteSheet_EnemyShadow;
 extern const struct SpriteTemplate gSpriteTemplate_EnemyShadow;
 
 // this file's functions
-static u8 sub_805D4A8(u16 move);
-static u16 BattlePalaceGetTargetRetValue(void);
+static u8 GetBattlePalaceMoveGroup(u16 move);
+static u16 GetBattlePalaceTarget(void);
 static void sub_805D7EC(struct Sprite *sprite);
 static bool8 ShouldAnimBeDoneRegardlessOfSubsitute(u8 animId);
 static void Task_ClearBitWhenBattleTableAnimDone(u8 taskId);
@@ -108,6 +109,7 @@ void FreeBattleSpritesData(void)
     FREE_AND_SET_NULL(gBattleSpritesDataPtr);
 }
 
+// Pokemon chooses move to use in Battle Palace rather than player
 u16 ChooseMoveAndTargetInBattlePalace(void)
 {
     s32 i, var1, var2;
@@ -116,60 +118,88 @@ u16 ChooseMoveAndTargetInBattlePalace(void)
     u8 unusableMovesBits = CheckMoveLimitations(gActiveBattler, 0, 0xFF);
     s32 percent = Random() % 100;
 
-    i = (gBattleStruct->field_92 & gBitTable[gActiveBattler]) ? 2 : 0;
-    var2 = i;
-    var1 = i + 2;
-
-    for (; i < var1; i++)
+    // Heavy variable re-use here makes this hard to read without defines
+    // Possibly just optimization? might still match with additional vars
+    #define maxGroupNum var1
+    #define minGroupNum var2
+    #define selectedGroup percent
+    #define selectedMoves var2
+    #define moveTarget var1
+    #define validMoveFlags var1
+    #define numValidMoveGroups var2
+    #define validMoveGroup var2
+
+    // If battler is < 50% HP and not asleep, use second set of move group likelihoods
+    // otherwise use first set
+    i = (gBattleStruct->palaceFlags & gBitTable[gActiveBattler]) ? 2 : 0;
+    minGroupNum = i;
+
+    maxGroupNum = i + 2; // + 2 because there are two percentages per set of likelihoods
+
+    // Each nature has a different percent chance to select a move from one of 3 move groups
+    // If percent is less than 1st check, use move from "Attack" group
+    // If percent is less than 2nd check, use move from "Defense" group
+    // Otherwise use move from "Support" group 
+    for (; i < maxGroupNum; i++)
     {
-        if (gUnknown_0831C494[GetNatureFromPersonality(gBattleMons[gActiveBattler].personality)][i] > percent)
+        if (gBattlePalaceNatureToMoveGroupLikelihood[GetNatureFromPersonality(gBattleMons[gActiveBattler].personality)][i] > percent)
             break;
     }
+    selectedGroup = i - minGroupNum;
+    if (i == maxGroupNum)
+        selectedGroup = PALACE_MOVE_GROUP_SUPPORT;
 
-    percent = i - var2;
-    if (i == var1)
-        percent = 2;
-
-    for (var2 = 0, i = 0; i < MAX_MON_MOVES; i++)
+    // Flag moves that match selected group, to be passed to AI
+    for (selectedMoves = 0, i = 0; i < MAX_MON_MOVES; i++)
     {
         if (moveInfo->moves[i] == MOVE_NONE)
             break;
-        if (percent == sub_805D4A8(moveInfo->moves[i]) && moveInfo->currentPp[i] != 0)
-            var2 |= gBitTable[i];
+        if (selectedGroup == GetBattlePalaceMoveGroup(moveInfo->moves[i]) && moveInfo->currentPp[i] != 0)
+            selectedMoves |= gBitTable[i];
     }
 
-    if (var2 != 0)
+    // Pass selected moves to AI, pick one
+    if (selectedMoves != 0)
     {
-        gBattleStruct->field_92 &= 0xF;
-        gBattleStruct->field_92 |= (var2 << 4);
-        BattleAI_SetupAIData(var2);
+        gBattleStruct->palaceFlags &= 0xF;
+        gBattleStruct->palaceFlags |= (selectedMoves << 4);
+        BattleAI_SetupAIData(selectedMoves);
         chosenMoveId = BattleAI_ChooseMoveOrAction();
     }
 
+    // If no moves matched the selected group, pick a new move from groups the pokemon has
+    // In this case the AI is not checked again, so the choice may be worse
+    // If a move is chosen this way, there's a 50% chance that it will be unable to use it anyway
     if (chosenMoveId == -1)
     {
         if (unusableMovesBits != 0xF)
         {
-            var1 = 0, var2 = 0;
+            validMoveFlags = 0, numValidMoveGroups = 0;
 
             for (i = 0; i < MAX_MON_MOVES; i++)
             {
-                if (sub_805D4A8(moveInfo->moves[i]) == 0 && !(gBitTable[i] & unusableMovesBits))
-                    var1 += 0x1;
-                if (sub_805D4A8(moveInfo->moves[i]) == 1 && !(gBitTable[i] & unusableMovesBits))
-                    var1 += 0x10;
-                if (sub_805D4A8(moveInfo->moves[i]) == 2 && !(gBitTable[i] & unusableMovesBits))
-                    var1 += 0x100;
+                // validMoveFlags is used here as a bitfield for which moves can be used for each move group type
+                // first 4 bits are for attack (1 for each move), then 4 bits for defense, and 4 for support
+                if (GetBattlePalaceMoveGroup(moveInfo->moves[i]) == PALACE_MOVE_GROUP_ATTACK && !(gBitTable[i] & unusableMovesBits))
+                    validMoveFlags += (1 << 0);
+                if (GetBattlePalaceMoveGroup(moveInfo->moves[i]) == PALACE_MOVE_GROUP_DEFENSE && !(gBitTable[i] & unusableMovesBits))
+                    validMoveFlags += (1 << 4);
+                if (GetBattlePalaceMoveGroup(moveInfo->moves[i]) == PALACE_MOVE_GROUP_SUPPORT && !(gBitTable[i] & unusableMovesBits))
+                    validMoveFlags += (1 << 8);
             }
 
-            if ((var1 & 0xF) > 1)
-                var2++;
-            if ((var1 & 0xF0) > 0x1F)
-                var2++;
-            if ((var1 & 0xF0) > 0x1FF)
-                var2++;
-
-            if (var2 > 1 || var2 == 0)
+            // Count the move groups the pokemon has
+            if ((validMoveFlags & 0xF) > 1)
+                numValidMoveGroups++;
+            if ((validMoveFlags & 0xF0) > 0x1F)
+                numValidMoveGroups++;
+            if ((validMoveFlags & 0xF0) > 0x1FF)
+                numValidMoveGroups++;
+
+            
+            // If more than 1 possible move group, or no possible move groups
+            // then choose move randomly
+            if (numValidMoveGroups > 1 || numValidMoveGroups == 0)
             {
                 do
                 {
@@ -178,32 +208,35 @@ u16 ChooseMoveAndTargetInBattlePalace(void)
                         chosenMoveId = i;
                 } while (chosenMoveId == -1);
             }
+            // Otherwise randomly choose move of only available move group
             else
             {
-                if ((var1 & 0xF) > 1)
-                    var2 = 0;
-                if ((var1 & 0xF0) > 0x1F)
-                    var2 = 1;
-                if ((var1 & 0xF0) > 0x1FF)
-                    var2 = 2;
+                if ((validMoveFlags & 0xF) > 1)
+                    validMoveGroup = PALACE_MOVE_GROUP_ATTACK;
+                if ((validMoveFlags & 0xF0) > 0x1F)
+                    validMoveGroup = PALACE_MOVE_GROUP_DEFENSE;
+                if ((validMoveFlags & 0xF0) > 0x1FF)
+                    validMoveGroup = PALACE_MOVE_GROUP_SUPPORT;
 
                 do
                 {
                     i = Random() % MAX_MON_MOVES;
-                    if (!(gBitTable[i] & unusableMovesBits) && var2 == sub_805D4A8(moveInfo->moves[i]))
+                    if (!(gBitTable[i] & unusableMovesBits) && validMoveGroup == GetBattlePalaceMoveGroup(moveInfo->moves[i]))
                         chosenMoveId = i;
                 } while (chosenMoveId == -1);
             }
 
+            // If a move was selected (and in this case was not from the Nature-chosen group)
+            // then there's a 50% chance it won't be used anyway
             if (Random() % 100 > 49)
             {
-                gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1;
+                gProtectStructs[gActiveBattler].palaceUnableToUseMove = TRUE;
                 return 0;
             }
         }
         else
         {
-            gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1;
+            gProtectStructs[gActiveBattler].palaceUnableToUseMove = TRUE;
             return 0;
         }
     }
@@ -211,26 +244,35 @@ u16 ChooseMoveAndTargetInBattlePalace(void)
     if (moveInfo->moves[chosenMoveId] == MOVE_CURSE)
     {
         if (moveInfo->monType1 != TYPE_GHOST && moveInfo->monType2 != TYPE_GHOST)
-            var1 = MOVE_TARGET_USER;
+            moveTarget = MOVE_TARGET_USER;
         else
-            var1 = MOVE_TARGET_SELECTED;
+            moveTarget = MOVE_TARGET_SELECTED;
     }
     else
     {
-        var1 = gBattleMoves[moveInfo->moves[chosenMoveId]].target;
+        moveTarget = gBattleMoves[moveInfo->moves[chosenMoveId]].target;
     }
 
-    if (var1 & MOVE_TARGET_USER)
+    if (moveTarget & MOVE_TARGET_USER)
         chosenMoveId |= (gActiveBattler << 8);
-    else if (var1 == MOVE_TARGET_SELECTED)
-        chosenMoveId |= (BattlePalaceGetTargetRetValue());
+    else if (moveTarget == MOVE_TARGET_SELECTED)
+        chosenMoveId |= GetBattlePalaceTarget();
     else
         chosenMoveId |= (GetBattlerAtPosition((GetBattlerPosition(gActiveBattler) & BIT_SIDE) ^ BIT_SIDE) << 8);
 
     return chosenMoveId;
 }
 
-static u8 sub_805D4A8(u16 move)
+#undef maxGroupNum
+#undef minGroupNum
+#undef selectedGroup
+#undef selectedMoves
+#undef moveTarget
+#undef validMoveFlags
+#undef numValidMoveGroups
+#undef validMoveGroup
+
+static u8 GetBattlePalaceMoveGroup(u16 move)
 {
     switch (gBattleMoves[move].target)
     {
@@ -240,21 +282,21 @@ static u8 sub_805D4A8(u16 move)
     case MOVE_TARGET_BOTH:
     case MOVE_TARGET_FOES_AND_ALLY:
         if (gBattleMoves[move].power == 0)
-            return 2;
+            return PALACE_MOVE_GROUP_SUPPORT;
         else
-            return 0;
+            return PALACE_MOVE_GROUP_ATTACK;
         break;
     case MOVE_TARGET_DEPENDS:
     case MOVE_TARGET_OPPONENTS_FIELD:
-        return 2;
+        return PALACE_MOVE_GROUP_SUPPORT;
     case MOVE_TARGET_USER:
-        return 1;
+        return PALACE_MOVE_GROUP_DEFENSE;
     default:
-        return 0;
+        return PALACE_MOVE_GROUP_ATTACK;
     }
 }
 
-static u16 BattlePalaceGetTargetRetValue(void)
+static u16 GetBattlePalaceTarget(void)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
@@ -274,19 +316,19 @@ static u16 BattlePalaceGetTargetRetValue(void)
         if (gBattleMons[opposing1].hp == gBattleMons[opposing2].hp)
             return (((gActiveBattler & BIT_SIDE) ^ BIT_SIDE) + (Random() & 2)) << 8;
 
-        switch (gUnknown_0831C604[GetNatureFromPersonality(gBattleMons[gActiveBattler].personality)])
+        switch (gBattlePalaceNatureToMoveTarget[GetNatureFromPersonality(gBattleMons[gActiveBattler].personality)])
         {
-        case 0:
+        case PALACE_TARGET_STRONGER:
             if (gBattleMons[opposing1].hp > gBattleMons[opposing2].hp)
                 return opposing1 << 8;
             else
                 return opposing2 << 8;
-        case 1:
+        case PALACE_TARGET_WEAKER:
             if (gBattleMons[opposing1].hp < gBattleMons[opposing2].hp)
                 return opposing1 << 8;
             else
                 return opposing2 << 8;
-        case 2:
+        case PALACE_TARGET_RANDOM:
             return (((gActiveBattler & BIT_SIDE) ^ BIT_SIDE) + (Random() & 2)) << 8;
         }
     }
diff --git a/src/battle_main.c b/src/battle_main.c
index 72890d6da..0ea19dfaa 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -96,7 +96,7 @@ static void SpriteCb_WildMonShowHealthbox(struct Sprite *sprite);
 static void SpriteCb_WildMonAnimate(struct Sprite *sprite);
 static void sub_80398D0(struct Sprite *sprite);
 static void SpriteCB_AnimFaintOpponent(struct Sprite *sprite);
-static void sub_8039AF4(struct Sprite *sprite);
+static void SpriteCb_BlinkVisible(struct Sprite *sprite);
 static void SpriteCallbackDummy_3(struct Sprite *sprite);
 static void oac_poke_ally_(struct Sprite *sprite);
 static void SpecialStatusesClear(void);
@@ -2798,31 +2798,31 @@ static void SpriteCB_AnimFaintOpponent(struct Sprite *sprite)
     }
 }
 
-void sub_8039AD8(struct Sprite *sprite)
+// Used when selecting a move, which can hit multiple targets, in double battles.
+void SpriteCb_ShowAsMoveTarget(struct Sprite *sprite)
 {
     sprite->data[3] = 8;
     sprite->data[4] = sprite->invisible;
-    sprite->callback = sub_8039AF4;
+    sprite->callback = SpriteCb_BlinkVisible;
 }
 
-static void sub_8039AF4(struct Sprite *sprite)
+static void SpriteCb_BlinkVisible(struct Sprite *sprite)
 {
-    sprite->data[3]--;
-    if (sprite->data[3] == 0)
+    if (--sprite->data[3] == 0)
     {
         sprite->invisible ^= 1;
         sprite->data[3] = 8;
     }
 }
 
-void sub_8039B2C(struct Sprite *sprite)
+void SpriteCb_HideAsMoveTarget(struct Sprite *sprite)
 {
     sprite->invisible = sprite->data[4];
     sprite->data[4] = FALSE;
     sprite->callback = SpriteCallbackDummy_2;
 }
 
-void sub_8039B58(struct Sprite *sprite)
+void SpriteCb_OpponentMonFromBall(struct Sprite *sprite)
 {
     if (sprite->affineAnimEnded)
     {
@@ -2965,7 +2965,7 @@ static void SpriteCB_BounceEffect(struct Sprite *sprite)
 #undef sBouncerSpriteId
 #undef sWhich
 
-void sub_8039E44(struct Sprite *sprite)
+void SpriteCb_PlayerMonFromBall(struct Sprite *sprite)
 {
     if (sprite->affineAnimEnded)
         BattleAnimateBackSprite(sprite, sprite->sSpeciesId);
@@ -3112,7 +3112,7 @@ static void BattleStartClearSetData(void)
     }
 
     gBattleStruct->givenExpMons = 0;
-    gBattleStruct->field_92 = 0;
+    gBattleStruct->palaceFlags = 0;
 
     gRandomTurnNumber = Random();
 
@@ -3135,7 +3135,7 @@ void SwitchInClearSetData(void)
     if (gBattleMoves[gCurrentMove].effect != EFFECT_BATON_PASS)
     {
         for (i = 0; i < NUM_BATTLE_STATS; i++)
-            gBattleMons[gActiveBattler].statStages[i] = 6;
+            gBattleMons[gActiveBattler].statStages[i] = DEFAULT_STAT_STAGE;
         for (i = 0; i < gBattlersCount; i++)
         {
             if ((gBattleMons[i].status2 & STATUS2_ESCAPE_PREVENTION) && gDisableStructs[i].battlerPreventingEscape == gActiveBattler)
@@ -3159,7 +3159,7 @@ void SwitchInClearSetData(void)
              && (gDisableStructs[i].battlerWithSureHit == gActiveBattler))
             {
                 gStatuses3[i] &= ~(STATUS3_ALWAYS_HITS);
-                gStatuses3[i] |= 0x10;
+                gStatuses3[i] |= STATUS3_ALWAYS_HITS_TURN(2);
             }
         }
     }
@@ -3214,7 +3214,7 @@ void SwitchInClearSetData(void)
     *(3 * 2 + gActiveBattler * 8 + (u8*)(gBattleStruct->lastTakenMoveFrom) + 0) = 0;
     *(3 * 2 + gActiveBattler * 8 + (u8*)(gBattleStruct->lastTakenMoveFrom) + 1) = 0;
 
-    gBattleStruct->field_92 &= ~(gBitTable[gActiveBattler]);
+    gBattleStruct->palaceFlags &= ~(gBitTable[gActiveBattler]);
 
     for (i = 0; i < gBattlersCount; i++)
     {
@@ -3244,7 +3244,7 @@ void FaintClearSetData(void)
     u8 *ptr;
 
     for (i = 0; i < NUM_BATTLE_STATS; i++)
-        gBattleMons[gActiveBattler].statStages[i] = 6;
+        gBattleMons[gActiveBattler].statStages[i] = DEFAULT_STAT_STAGE;
 
     gBattleMons[gActiveBattler].status2 = 0;
     gStatuses3[gActiveBattler] = 0;
@@ -3309,7 +3309,7 @@ void FaintClearSetData(void)
     *(3 * 2 + gActiveBattler * 8 + (u8*)(gBattleStruct->lastTakenMoveFrom) + 0) = 0;
     *(3 * 2 + gActiveBattler * 8 + (u8*)(gBattleStruct->lastTakenMoveFrom) + 1) = 0;
 
-    gBattleStruct->field_92 &= ~(gBitTable[gActiveBattler]);
+    gBattleStruct->palaceFlags &= ~(gBitTable[gActiveBattler]);
 
     for (i = 0; i < gBattlersCount; i++)
     {
@@ -3398,7 +3398,7 @@ static void BattleIntroDrawTrainersOrMonsSprites(void)
             hpOnSwitchout = &gBattleStruct->hpOnSwitchout[GetBattlerSide(gActiveBattler)];
             *hpOnSwitchout = gBattleMons[gActiveBattler].hp;
             for (i = 0; i < NUM_BATTLE_STATS; i++)
-                gBattleMons[gActiveBattler].statStages[i] = 6;
+                gBattleMons[gActiveBattler].statStages[i] = DEFAULT_STAT_STAGE;
             gBattleMons[gActiveBattler].status2 = 0;
         }
 
@@ -4052,7 +4052,7 @@ void BattleTurnPassed(void)
     gRandomTurnNumber = Random();
 
     if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
-        BattleScriptExecute(BattleScript_82DB881);
+        BattleScriptExecute(BattleScript_PalacePrintFlavorText);
     else if (gBattleTypeFlags & BATTLE_TYPE_ARENA && gBattleStruct->arenaTurnCounter == 0)
         BattleScriptExecute(BattleScript_ArenaTurnBeginning);
 }
@@ -5547,7 +5547,7 @@ static void HandleAction_UseItem(void)
     ClearFuryCutterDestinyBondGrudge(gBattlerAttacker);
     gLastUsedItem = gBattleBufferB[gBattlerAttacker][1] | (gBattleBufferB[gBattlerAttacker][2] << 8);
 
-    if (gLastUsedItem <= ITEM_PREMIER_BALL) // is ball
+    if (gLastUsedItem <= LAST_BALL) // is ball
     {
         gBattlescriptCurrInstr = gBattlescriptsForBallThrow[gLastUsedItem];
     }
diff --git a/src/battle_message.c b/src/battle_message.c
index 693058e2f..14eba28ab 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -19,12 +19,15 @@
 #include "text.h"
 #include "trainer_hill.h"
 #include "window.h"
+#include "constants/battle_dome.h"
 #include "constants/battle_string_ids.h"
+#include "constants/berry.h"
 #include "constants/frontier_util.h"
 #include "constants/items.h"
 #include "constants/moves.h"
 #include "constants/trainers.h"
 #include "constants/trainer_hill.h"
+#include "constants/weather.h"
 
 struct BattleWindowText
 {
@@ -312,23 +315,23 @@ static const u8 sText_StatsWontIncrease2[] = _("{B_ATK_NAME_WITH_PREFIX}'s stats
 static const u8 sText_StatsWontDecrease2[] = _("{B_DEF_NAME_WITH_PREFIX}'s stats won't\ngo any lower!");
 static const u8 sText_CriticalHit[] = _("A critical hit!");
 static const u8 sText_OneHitKO[] = _("It's a one-hit KO!");
-static const u8 sText_123Poof[] = _("{PAUSE 32}1, {PAUSE 15}2, and{PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE 0x0038}Poof!\p");
+static const u8 sText_123Poof[] = _("{PAUSE 32}1, {PAUSE 15}2, and{PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE SE_KON}Poof!\p");
 static const u8 sText_AndEllipsis[] = _("And…\p");
 static const u8 sText_HMMovesCantBeForgotten[] = _("HM moves can't be\nforgotten now.\p");
 static const u8 sText_NotVeryEffective[] = _("It's not very effective…");
 static const u8 sText_SuperEffective[] = _("It's super effective!");
-static const u8 sText_GotAwaySafely[] = _("{PLAY_SE 0x0011}Got away safely!\p");
-static const u8 sText_PkmnFledUsingIts[] = _("{PLAY_SE 0x0011}{B_ATK_NAME_WITH_PREFIX} fled\nusing its {B_LAST_ITEM}!\p");
-static const u8 sText_PkmnFledUsing[] = _("{PLAY_SE 0x0011}{B_ATK_NAME_WITH_PREFIX} fled\nusing {B_ATK_ABILITY}!\p");
-static const u8 sText_WildPkmnFled[] = _("{PLAY_SE 0x0011}Wild {B_BUFF1} fled!");
+static const u8 sText_GotAwaySafely[] = _("{PLAY_SE SE_NIGERU}Got away safely!\p");
+static const u8 sText_PkmnFledUsingIts[] = _("{PLAY_SE SE_NIGERU}{B_ATK_NAME_WITH_PREFIX} fled\nusing its {B_LAST_ITEM}!\p");
+static const u8 sText_PkmnFledUsing[] = _("{PLAY_SE SE_NIGERU}{B_ATK_NAME_WITH_PREFIX} fled\nusing {B_ATK_ABILITY}!\p");
+static const u8 sText_WildPkmnFled[] = _("{PLAY_SE SE_NIGERU}Wild {B_BUFF1} fled!");
 static const u8 sText_PlayerDefeatedLinkTrainer[] = _("Player defeated\n{B_LINK_OPPONENT1_NAME}!");
 static const u8 sText_TwoLinkTrainersDefeated[] = _("Player beat {B_LINK_OPPONENT1_NAME}\nand {B_LINK_OPPONENT2_NAME}!");
 static const u8 sText_PlayerLostAgainstLinkTrainer[] = _("Player lost against\n{B_LINK_OPPONENT1_NAME}!");
 static const u8 sText_PlayerLostToTwo[] = _("Player lost to {B_LINK_OPPONENT1_NAME}\nand {B_LINK_OPPONENT2_NAME}!");
 static const u8 sText_PlayerBattledToDrawLinkTrainer[] = _("Player battled to a draw against\n{B_LINK_OPPONENT1_NAME}!");
 static const u8 sText_PlayerBattledToDrawVsTwo[] = _("Player battled to a draw against\n{B_LINK_OPPONENT1_NAME} and {B_LINK_OPPONENT2_NAME}!");
-static const u8 sText_WildFled[] = _("{PLAY_SE 0x0011}{B_LINK_OPPONENT1_NAME} fled!");
-static const u8 sText_TwoWildFled[] = _("{PLAY_SE 0x0011}{B_LINK_OPPONENT1_NAME} and\n{B_LINK_OPPONENT2_NAME} fled!");
+static const u8 sText_WildFled[] = _("{PLAY_SE SE_NIGERU}{B_LINK_OPPONENT1_NAME} fled!");
+static const u8 sText_TwoWildFled[] = _("{PLAY_SE SE_NIGERU}{B_LINK_OPPONENT1_NAME} and\n{B_LINK_OPPONENT2_NAME} fled!");
 static const u8 sText_NoRunningFromTrainers[] = _("No! There's no running\nfrom a TRAINER battle!\p");
 static const u8 sText_CantEscape[] = _("Can't escape!\p");
 static const u8 sText_DontLeaveBirch[] = _("PROF. BIRCH: Don't leave me like this!\p");
@@ -378,7 +381,7 @@ static const u8 sText_PkmnCuriousAboutX[] = _("{B_OPPONENT_MON1_NAME} is curious
 static const u8 sText_PkmnEnthralledByX[] = _("{B_OPPONENT_MON1_NAME} is enthralled by\nthe {B_BUFF1}!");
 static const u8 sText_PkmnIgnoredX[] = _("{B_OPPONENT_MON1_NAME} completely ignored\nthe {B_BUFF1}!");
 static const u8 sText_ThrewPokeblockAtPkmn[] = _("{B_PLAYER_NAME} threw a {POKEBLOCK}\nat the {B_OPPONENT_MON1_NAME}!");
-static const u8 sText_OutOfSafariBalls[] = _("{PLAY_SE 0x0049}ANNOUNCER: You're out of\nSAFARI BALLS! Game over!\p");
+static const u8 sText_OutOfSafariBalls[] = _("{PLAY_SE SE_PINPON}ANNOUNCER: You're out of\nSAFARI BALLS! Game over!\p");
 static const u8 sText_OpponentMon1Appeared[] = _("{B_OPPONENT_MON1_NAME} appeared!\p");
 static const u8 sText_WildPkmnAppeared[] = _("Wild {B_OPPONENT_MON1_NAME} appeared!\p");
 static const u8 sText_WildPkmnAppeared2[] = _("Wild {B_OPPONENT_MON1_NAME} appeared!\p");
@@ -433,11 +436,16 @@ static const u8 sText_SpDef2[] = _("SP. DEF");
 static const u8 sText_Accuracy[] = _("accuracy");
 static const u8 sText_Evasiveness[] = _("evasiveness");
 
-const u8 * const gStatNamesTable[] =
+const u8 * const gStatNamesTable[NUM_BATTLE_STATS] =
 {
-    sText_HP2, sText_Attack2, sText_Defense2,
-    sText_Speed, sText_SpAtk2, sText_SpDef2,
-    sText_Accuracy, sText_Evasiveness
+    [STAT_HP]      = sText_HP2,
+    [STAT_ATK]     = sText_Attack2,
+    [STAT_DEF]     = sText_Defense2,
+    [STAT_SPEED]   = sText_Speed,
+    [STAT_SPATK]   = sText_SpAtk2,
+    [STAT_SPDEF]   = sText_SpDef2,
+    [STAT_ACC]     = sText_Accuracy,
+    [STAT_EVASION] = sText_Evasiveness,
 };
 
 static const u8 sText_PokeblockWasTooSpicy[] = _("was too spicy!");
@@ -446,11 +454,13 @@ static const u8 sText_PokeblockWasTooSweet[] = _("was too sweet!");
 static const u8 sText_PokeblockWasTooBitter[] = _("was too bitter!");
 static const u8 sText_PokeblockWasTooSour[] = _("was too sour!");
 
-const u8 * const gPokeblockWasTooXStringTable[] =
+const u8 * const gPokeblockWasTooXStringTable[FLAVOR_COUNT] =
 {
-    sText_PokeblockWasTooSpicy, sText_PokeblockWasTooDry,
-    sText_PokeblockWasTooSweet, sText_PokeblockWasTooBitter,
-    sText_PokeblockWasTooSour
+    [FLAVOR_SPICY]  = sText_PokeblockWasTooSpicy,
+    [FLAVOR_DRY]    = sText_PokeblockWasTooDry,
+    [FLAVOR_SWEET]  = sText_PokeblockWasTooSweet,
+    [FLAVOR_BITTER] = sText_PokeblockWasTooBitter,
+    [FLAVOR_SOUR]   = sText_PokeblockWasTooSour
 };
 
 static const u8 sText_PlayerUsedItem[] = _("{B_PLAYER_NAME} used\n{B_LAST_ITEM}!");
@@ -979,16 +989,28 @@ const u16 gStatDownStringIds[] =
     STRINGID_PKMNSSTATCHANGED3, STRINGID_PKMNSSTATCHANGED4, STRINGID_STATSWONTDECREASE, STRINGID_EMPTYSTRING3
 };
 
+// Index read from sTWOTURN_STRINGID
 const u16 gFirstTurnOfTwoStringIds[] =
 {
-    STRINGID_PKMNWHIPPEDWHIRLWIND, STRINGID_PKMNTOOKSUNLIGHT, STRINGID_PKMNLOWEREDHEAD, STRINGID_PKMNISGLOWING,
-    STRINGID_PKMNFLEWHIGH, STRINGID_PKMNDUGHOLE, STRINGID_PKMNHIDUNDERWATER, STRINGID_PKMNSPRANGUP
+    STRINGID_PKMNWHIPPEDWHIRLWIND, // MOVE_RAZOR_WIND
+    STRINGID_PKMNTOOKSUNLIGHT,     // MOVE_SOLAR_BEAM
+    STRINGID_PKMNLOWEREDHEAD,      // MOVE_SKULL_BASH
+    STRINGID_PKMNISGLOWING,        // MOVE_SKY_ATTACK
+    STRINGID_PKMNFLEWHIGH,         // MOVE_FLY
+    STRINGID_PKMNDUGHOLE,          // MOVE_DIG
+    STRINGID_PKMNHIDUNDERWATER,    // MOVE_DIVE
+    STRINGID_PKMNSPRANGUP          // MOVE_BOUNCE
 };
 
+// Index copied from move's index in gTrappingMoves
 const u16 gWrappedStringIds[] =
 {
-    STRINGID_PKMNSQUEEZEDBYBIND, STRINGID_PKMNWRAPPEDBY, STRINGID_PKMNTRAPPEDINVORTEX,
-    STRINGID_PKMNCLAMPED, STRINGID_PKMNTRAPPEDINVORTEX, STRINGID_PKMNTRAPPEDBYSANDTOMB
+    STRINGID_PKMNSQUEEZEDBYBIND,   // MOVE_BIND
+    STRINGID_PKMNWRAPPEDBY,        // MOVE_WRAP
+    STRINGID_PKMNTRAPPEDINVORTEX,  // MOVE_FIRE_SPIN
+    STRINGID_PKMNCLAMPED,          // MOVE_CLAMP
+    STRINGID_PKMNTRAPPEDINVORTEX,  // MOVE_WHIRLPOOL
+    STRINGID_PKMNTRAPPEDBYSANDTOMB // MOVE_SAND_TOMB
 };
 
 const u16 gMistUsedStringIds[] =
@@ -1078,13 +1100,25 @@ const u16 gBallEscapeStringIds[] =
     STRINGID_PKMNBROKEFREE, STRINGID_ITAPPEAREDCAUGHT, STRINGID_AARGHALMOSTHADIT, STRINGID_SHOOTSOCLOSE
 };
 
-const u16 gWeatherContinuesStringIds[] =
-{
-    STRINGID_ITISRAINING, STRINGID_ITISRAINING, STRINGID_ITISRAINING,
-    STRINGID_ITISRAINING, STRINGID_ITISRAINING, STRINGID_ITISRAINING,
-    STRINGID_ITISRAINING, STRINGID_ITISRAINING, STRINGID_SANDSTORMISRAGING,
-    STRINGID_ITISRAINING, STRINGID_ITISRAINING, STRINGID_ITISRAINING,
-    STRINGID_SUNLIGHTSTRONG, STRINGID_ITISRAINING, STRINGID_ITISRAINING, STRINGID_ITISRAINING
+// Overworld weathers that don't have an associated battle weather default to "It is raining."
+const u16 gWeatherStartsStringIds[] =
+{
+    [WEATHER_NONE]               = STRINGID_ITISRAINING,
+    [WEATHER_SUNNY_CLOUDS]       = STRINGID_ITISRAINING,
+    [WEATHER_SUNNY]              = STRINGID_ITISRAINING,
+    [WEATHER_RAIN]               = STRINGID_ITISRAINING,
+    [WEATHER_SNOW]               = STRINGID_ITISRAINING,
+    [WEATHER_RAIN_THUNDERSTORM]  = STRINGID_ITISRAINING,
+    [WEATHER_FOG_HORIZONTAL]     = STRINGID_ITISRAINING,
+    [WEATHER_VOLCANIC_ASH]       = STRINGID_ITISRAINING,
+    [WEATHER_SANDSTORM]          = STRINGID_SANDSTORMISRAGING,
+    [WEATHER_FOG_DIAGONAL]       = STRINGID_ITISRAINING,
+    [WEATHER_UNDERWATER]         = STRINGID_ITISRAINING,
+    [WEATHER_SHADE]              = STRINGID_ITISRAINING,
+    [WEATHER_DROUGHT]            = STRINGID_SUNLIGHTSTRONG,
+    [WEATHER_DOWNPOUR]           = STRINGID_ITISRAINING,
+    [WEATHER_UNDERWATER_BUBBLES] = STRINGID_ITISRAINING,
+    [WEATHER_ABNORMAL]           = STRINGID_ITISRAINING
 };
 
 const u16 gInobedientStringIds[] =
@@ -1146,7 +1180,13 @@ const u16 gCaughtMonStringIds[] =
 
 const u16 gTrappingMoves[] =
 {
-    MOVE_BIND, MOVE_WRAP, MOVE_FIRE_SPIN, MOVE_CLAMP, MOVE_WHIRLPOOL, MOVE_SAND_TOMB, 0xFFFF
+    MOVE_BIND,
+    MOVE_WRAP,
+    MOVE_FIRE_SPIN,
+    MOVE_CLAMP,
+    MOVE_WHIRLPOOL,
+    MOVE_SAND_TOMB,
+    0xFFFF
 };
 
 const u8 gText_PkmnIsEvolving[] = _("What?\n{STR_VAR_1} is evolving!");
@@ -1207,26 +1247,27 @@ const u8 gText_Draw[] = _("{HIGHLIGHT TRANSPARENT}Draw");
 static const u8 sText_SpaceIs[] = _(" is");
 static const u8 sText_ApostropheS[] = _("'s");
 
-static const u8 sATypeMove_Table[][17] =
-{
-    _("a NORMAL move"),
-    _("a FIGHTING move"),
-    _("a FLYING move"),
-    _("a POISON move"),
-    _("a GROUND move"),
-    _("a ROCK move"),
-    _("a BUG move"),
-    _("a GHOST move"),
-    _("a STEEL move"),
-    _("a ??? move"),
-    _("a FIRE move"),
-    _("a WATER move"),
-    _("a GRASS move"),
-    _("an ELECTRIC move"),
-    _("a PSYCHIC move"),
-    _("an ICE move"),
-    _("a DRAGON move"),
-    _("a DARK move")
+// For displaying names of invalid moves
+static const u8 sATypeMove_Table[][NUMBER_OF_MON_TYPES - 1] =
+{
+    [TYPE_NORMAL]   = _("a NORMAL move"),
+    [TYPE_FIGHTING] = _("a FIGHTING move"),
+    [TYPE_FLYING]   = _("a FLYING move"),
+    [TYPE_POISON]   = _("a POISON move"),
+    [TYPE_GROUND]   = _("a GROUND move"),
+    [TYPE_ROCK]     = _("a ROCK move"),
+    [TYPE_BUG]      = _("a BUG move"),
+    [TYPE_GHOST]    = _("a GHOST move"),
+    [TYPE_STEEL]    = _("a STEEL move"),
+    [TYPE_MYSTERY]  = _("a ??? move"),
+    [TYPE_FIRE]     = _("a FIRE move"),
+    [TYPE_WATER]    = _("a WATER move"),
+    [TYPE_GRASS]    = _("a GRASS move"),
+    [TYPE_ELECTRIC] = _("an ELECTRIC move"),
+    [TYPE_PSYCHIC]  = _("a PSYCHIC move"),
+    [TYPE_ICE]      = _("an ICE move"),
+    [TYPE_DRAGON]   = _("a DRAGON move"),
+    [TYPE_DARK]     = _("a DARK move")
 };
 
 const u8 gText_BattleTourney[] = _("BATTLE TOURNEY");
@@ -1235,12 +1276,12 @@ static const u8 sText_Round2[] = _("Round 2");
 static const u8 sText_Semifinal[] = _("Semifinal");
 static const u8 sText_Final[] = _("Final");
 
-const u8 *const gRoundsStringTable[] =
+const u8 *const gRoundsStringTable[DOME_ROUNDS_COUNT] =
 {
-    sText_Round1,
-    sText_Round2,
-    sText_Semifinal,
-    sText_Final
+    [DOME_ROUND1]    = sText_Round1,
+    [DOME_ROUND2]    = sText_Round2,
+    [DOME_SEMIFINAL] = sText_Semifinal,
+    [DOME_FINAL]     = sText_Final
 };
 
 const u8 gText_TheGreatNewHope[] = _("The great new hope!\p");
@@ -1267,10 +1308,12 @@ static const u8 sText_PkmnGettingIntoPosition[] = _("{B_SCR_ACTIVE_NAME_WITH_PRE
 static const u8 sText_PkmnBeganGrowlingDeeply[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} began growling deeply!");
 static const u8 sText_PkmnEagerForMore[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} is eager for more!");
 
-const u16 gStringIds_85CCF0A[] =
+const u16 gBattlePalaceFlavorTextTable[] =
 {
-    STRINGID_GLINTAPPEARSINEYE, STRINGID_PKMNGETTINGINTOPOSITION,
-    STRINGID_PKMNBEGANGROWLINGDEEPLY, STRINGID_PKMNEAGERFORMORE
+    STRINGID_GLINTAPPEARSINEYE, 
+    STRINGID_PKMNGETTINGINTOPOSITION,
+    STRINGID_PKMNBEGANGROWLINGDEEPLY, 
+    STRINGID_PKMNEAGERFORMORE
 };
 
 static const u8 sText_RefIfNothingIsDecided[] = _("REFEREE: If nothing is decided in\n3 turns, we will go to judging!");
@@ -1303,7 +1346,7 @@ static const u8 sText_QuestionForfeitMatch[] = _("Would you like to forfeit the
 static const u8 sText_ForfeitedMatch[] = _("{B_PLAYER_NAME} forfeited the match!");
 static const u8 sText_Trainer1WinText[] = _("{B_TRAINER1_WIN_TEXT}");
 static const u8 sText_Trainer2WinText[] = _("{B_TRAINER2_WIN_TEXT}");
-static const u8 sText_Trainer1Fled[] = _( "{PLAY_SE 0x0011}{B_TRAINER1_CLASS} {B_TRAINER1_NAME} fled!");
+static const u8 sText_Trainer1Fled[] = _( "{PLAY_SE SE_NIGERU}{B_TRAINER1_CLASS} {B_TRAINER1_NAME} fled!");
 static const u8 sText_PlayerLostAgainstTrainer1[] = _("Player lost against\n{B_TRAINER1_CLASS} {B_TRAINER1_NAME}!");
 static const u8 sText_PlayerBattledToDrawTrainer1[] = _("Player battled to a draw against\n{B_TRAINER1_CLASS} {B_TRAINER1_NAME}!");
 const u8 gText_RecordBattleToPass[] = _("Would you like to record your battle\non your FRONTIER PASS?");
@@ -2713,7 +2756,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst)
             {
                 dst[dstID] = EXT_CTRL_CODE_BEGIN;
                 dstID++;
-                dst[dstID] = 9;
+                dst[dstID] = EXT_CTRL_CODE_PAUSE_UNTIL_PRESS;
                 dstID++;
             }
         }
diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c
index 5626dd7bc..33daed80c 100644
--- a/src/battle_pyramid_bag.c
+++ b/src/battle_pyramid_bag.c
@@ -402,7 +402,7 @@ static void sub_81C501C(void)
     RunTasks();
     AnimateSprites();
     BuildOamBuffer();
-    do_scheduled_bg_tilemap_copies_to_vram();
+    DoScheduledBgTilemapCopiesToVram();
     UpdatePaletteFade();
 }
 
@@ -424,7 +424,7 @@ static bool8 sub_81C5078(void)
     {
         case 0:
             SetVBlankHBlankCallbacksToNull();
-            clear_scheduled_bg_copies_to_vram();
+            ClearScheduledBgCopiesToVram();
             gMain.state++;
             break;
         case 1:
diff --git a/src/battle_records.c b/src/battle_records.c
index ccd16e219..c6363a6ed 100644
--- a/src/battle_records.c
+++ b/src/battle_records.c
@@ -494,7 +494,7 @@ static void CB2_ShowTrainerHillRecords(void)
         break;
     case 3:
         LoadTrainerHillRecordsWindowGfx(3);
-        LoadPalette(stdpal_get(0), 0xF0, 0x20);
+        LoadPalette(GetTextWindowPalette(0), 0xF0, 0x20);
         gMain.state++;
         break;
     case 4:
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 84f2b1f4d..5c1b1e370 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -606,111 +606,66 @@ static const struct StatFractions sAccuracyStageRatios[] =
 // The chance is 1/N for each stage.
 static const u16 sCriticalHitChance[] = {16, 8, 4, 3, 2};
 
-static const u32 sStatusFlagsForMoveEffects[] =
-{
-    0x00000000,
-    STATUS1_SLEEP,
-    STATUS1_POISON,
-    STATUS1_BURN,
-    STATUS1_FREEZE,
-    STATUS1_PARALYSIS,
-    STATUS1_TOXIC_POISON,
-    STATUS2_CONFUSION,
-    STATUS2_FLINCHED,
-    0x00000000,
-    STATUS2_UPROAR,
-    0x00000000,
-    STATUS2_MULTIPLETURNS,
-    STATUS2_WRAPPED,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    STATUS2_RECHARGE,
-    0x00000000,
-    0x00000000,
-    STATUS2_ESCAPE_PREVENTION,
-    STATUS2_NIGHTMARE,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    STATUS2_LOCK_CONFUSE,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000
+static const u32 sStatusFlagsForMoveEffects[NUM_MOVE_EFFECTS] =
+{
+    [MOVE_EFFECT_SLEEP]          = STATUS1_SLEEP,
+    [MOVE_EFFECT_POISON]         = STATUS1_POISON,
+    [MOVE_EFFECT_BURN]           = STATUS1_BURN,
+    [MOVE_EFFECT_FREEZE]         = STATUS1_FREEZE,
+    [MOVE_EFFECT_PARALYSIS]      = STATUS1_PARALYSIS,
+    [MOVE_EFFECT_TOXIC]          = STATUS1_TOXIC_POISON,
+    [MOVE_EFFECT_CONFUSION]      = STATUS2_CONFUSION,
+    [MOVE_EFFECT_FLINCH]         = STATUS2_FLINCHED,
+    [MOVE_EFFECT_UPROAR]         = STATUS2_UPROAR,
+    [MOVE_EFFECT_CHARGING]       = STATUS2_MULTIPLETURNS,
+    [MOVE_EFFECT_WRAP]           = STATUS2_WRAPPED,
+    [MOVE_EFFECT_RECHARGE]       = STATUS2_RECHARGE,
+    [MOVE_EFFECT_PREVENT_ESCAPE] = STATUS2_ESCAPE_PREVENTION,
+    [MOVE_EFFECT_NIGHTMARE]      = STATUS2_NIGHTMARE,
+    [MOVE_EFFECT_THRASH]         = STATUS2_LOCK_CONFUSE,
 };
 
 static const u8* const sMoveEffectBS_Ptrs[] =
 {
-    [0] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_SLEEP] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_POISON] = BattleScript_MoveEffectPoison,
-    [MOVE_EFFECT_BURN] = BattleScript_MoveEffectBurn,
-    [MOVE_EFFECT_FREEZE] = BattleScript_MoveEffectFreeze,
-    [MOVE_EFFECT_PARALYSIS] = BattleScript_MoveEffectParalysis,
-    [MOVE_EFFECT_TOXIC] = BattleScript_MoveEffectToxic,
-    [MOVE_EFFECT_CONFUSION] = BattleScript_MoveEffectConfusion,
-    [MOVE_EFFECT_FLINCH] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_TRI_ATTACK] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_UPROAR] = BattleScript_MoveEffectUproar,
-    [MOVE_EFFECT_PAYDAY] = BattleScript_MoveEffectPayDay,
-    [MOVE_EFFECT_CHARGING] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_WRAP] = BattleScript_MoveEffectWrap,
-    [MOVE_EFFECT_RECOIL_25] = BattleScript_MoveEffectRecoil,
-    [MOVE_EFFECT_ATK_PLUS_1] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_DEF_PLUS_1] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_SPD_PLUS_1] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_SP_ATK_PLUS_1] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_SP_DEF_PLUS_1] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_ACC_PLUS_1] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_EVS_PLUS_1] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_ATK_MINUS_1] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_DEF_MINUS_1] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_SPD_MINUS_1] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_SP_ATK_MINUS_1] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_SP_DEF_MINUS_1] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_ACC_MINUS_1] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_EVS_MINUS_1] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_RECHARGE] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_RAGE] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_STEAL_ITEM] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_PREVENT_ESCAPE] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_NIGHTMARE] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_ALL_STATS_UP] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_RAPIDSPIN] = BattleScript_MoveEffectSleep,
+    [0]                            = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_SLEEP]            = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_POISON]           = BattleScript_MoveEffectPoison,
+    [MOVE_EFFECT_BURN]             = BattleScript_MoveEffectBurn,
+    [MOVE_EFFECT_FREEZE]           = BattleScript_MoveEffectFreeze,
+    [MOVE_EFFECT_PARALYSIS]        = BattleScript_MoveEffectParalysis,
+    [MOVE_EFFECT_TOXIC]            = BattleScript_MoveEffectToxic,
+    [MOVE_EFFECT_CONFUSION]        = BattleScript_MoveEffectConfusion,
+    [MOVE_EFFECT_FLINCH]           = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_TRI_ATTACK]       = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_UPROAR]           = BattleScript_MoveEffectUproar,
+    [MOVE_EFFECT_PAYDAY]           = BattleScript_MoveEffectPayDay,
+    [MOVE_EFFECT_CHARGING]         = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_WRAP]             = BattleScript_MoveEffectWrap,
+    [MOVE_EFFECT_RECOIL_25]        = BattleScript_MoveEffectRecoil,
+    [MOVE_EFFECT_ATK_PLUS_1]       = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_DEF_PLUS_1]       = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_SPD_PLUS_1]       = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_SP_ATK_PLUS_1]    = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_SP_DEF_PLUS_1]    = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_ACC_PLUS_1]       = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_EVS_PLUS_1]       = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_ATK_MINUS_1]      = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_DEF_MINUS_1]      = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_SPD_MINUS_1]      = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_SP_ATK_MINUS_1]   = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_SP_DEF_MINUS_1]   = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_ACC_MINUS_1]      = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_EVS_MINUS_1]      = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_RECHARGE]         = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_RAGE]             = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_STEAL_ITEM]       = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_PREVENT_ESCAPE]   = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_NIGHTMARE]        = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_ALL_STATS_UP]     = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_RAPIDSPIN]        = BattleScript_MoveEffectSleep,
     [MOVE_EFFECT_REMOVE_PARALYSIS] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_ATK_DEF_DOWN] = BattleScript_MoveEffectSleep,
-    [MOVE_EFFECT_RECOIL_33] = BattleScript_MoveEffectRecoil,
+    [MOVE_EFFECT_ATK_DEF_DOWN]     = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_RECOIL_33]        = BattleScript_MoveEffectRecoil,
 };
 
 static const struct WindowTemplate sUnusedWinTemplate = {0, 1, 3, 7, 0xF, 0x1F, 0x3F};
@@ -797,16 +752,16 @@ static const u8 sFlailHpScaleToPowerTable[] =
 
 static const u16 sNaturePowerMoves[] =
 {
-    MOVE_STUN_SPORE,
-    MOVE_RAZOR_LEAF,
-    MOVE_EARTHQUAKE,
-    MOVE_HYDRO_PUMP,
-    MOVE_SURF,
-    MOVE_BUBBLE_BEAM,
-    MOVE_ROCK_SLIDE,
-    MOVE_SHADOW_BALL,
-    MOVE_SWIFT,
-    MOVE_SWIFT
+    [BATTLE_TERRAIN_GRASS]      = MOVE_STUN_SPORE,
+    [BATTLE_TERRAIN_LONG_GRASS] = MOVE_RAZOR_LEAF,
+    [BATTLE_TERRAIN_SAND]       = MOVE_EARTHQUAKE,
+    [BATTLE_TERRAIN_UNDERWATER] = MOVE_HYDRO_PUMP,
+    [BATTLE_TERRAIN_WATER]      = MOVE_SURF,
+    [BATTLE_TERRAIN_POND]       = MOVE_BUBBLE_BEAM,
+    [BATTLE_TERRAIN_MOUNTAIN]   = MOVE_ROCK_SLIDE,
+    [BATTLE_TERRAIN_CAVE]       = MOVE_SHADOW_BALL,
+    [BATTLE_TERRAIN_BUILDING]   = MOVE_SWIFT,
+    [BATTLE_TERRAIN_PLAIN]      = MOVE_SWIFT
 };
 
 // format: min. weight (hectograms), base power
@@ -864,58 +819,92 @@ static const u8 sPickupProbabilities[] =
 
 static const u8 sTerrainToType[] =
 {
-    TYPE_GRASS, // tall grass
-    TYPE_GRASS, // long grass
-    TYPE_GROUND, // sand
-    TYPE_WATER, // underwater
-    TYPE_WATER, // water
-    TYPE_WATER, // pond water
-    TYPE_ROCK, // rock
-    TYPE_ROCK, // cave
-    TYPE_NORMAL, // building
-    TYPE_NORMAL, // plain
+    [BATTLE_TERRAIN_GRASS]      = TYPE_GRASS,
+    [BATTLE_TERRAIN_LONG_GRASS] = TYPE_GRASS,
+    [BATTLE_TERRAIN_SAND]       = TYPE_GROUND,
+    [BATTLE_TERRAIN_UNDERWATER] = TYPE_WATER,
+    [BATTLE_TERRAIN_WATER]      = TYPE_WATER,
+    [BATTLE_TERRAIN_POND]       = TYPE_WATER,
+    [BATTLE_TERRAIN_MOUNTAIN]   = TYPE_ROCK,
+    [BATTLE_TERRAIN_CAVE]       = TYPE_ROCK,
+    [BATTLE_TERRAIN_BUILDING]   = TYPE_NORMAL,
+    [BATTLE_TERRAIN_PLAIN]      = TYPE_NORMAL,
 };
 
+// - ITEM_ULTRA_BALL skips Master Ball and ITEM_NONE
 static const u8 sBallCatchBonuses[] =
 {
-    20, 15, 10, 15 // Ultra, Great, Poke, Safari
+    [ITEM_ULTRA_BALL - ITEM_ULTRA_BALL]  = 20, 
+    [ITEM_GREAT_BALL - ITEM_ULTRA_BALL]  = 15, 
+    [ITEM_POKE_BALL - ITEM_ULTRA_BALL]   = 10, 
+    [ITEM_SAFARI_BALL - ITEM_ULTRA_BALL] = 15
 };
 
-const ALIGNED(4) u8 gUnknown_0831C494[][4] =
-{
-    {0x3d, 0x44, 0x3d, 0x44},
-    {0x14, 0x2d, 0x54, 0x5c},
-    {0x46, 0x55, 0x20, 0x5c},
-    {0x26, 0x45, 0x46, 0x55},
-    {0x14, 0x5a, 0x46, 0x5c},
-    {0x1e, 0x32, 0x20, 0x5a},
-    {0x38, 0x4e, 0x38, 0x4e},
-    {0x19, 0x28, 0x4b, 0x5a},
-    {0x45, 0x4b, 0x1c, 0x53},
-    {0x23, 0x2d, 0x1d, 0x23},
-    {0x3e, 0x48, 0x1e, 0x32},
-    {0x3a, 0x5f, 0x58, 0x5e},
-    {0x22, 0x2d, 0x1d, 0x28},
-    {0x23, 0x28, 0x23, 0x5f},
-    {0x38, 0x4e, 0x38, 0x4e},
-    {0x23, 0x50, 0x22, 0x5e},
-    {0x2c, 0x5e, 0x22, 0x28},
-    {0x38, 0x4e, 0x38, 0x4e},
-    {0x1e, 0x58, 0x1e, 0x58},
-    {0x1e, 0x2b, 0x1b, 0x21},
-    {0x28, 0x5a, 0x19, 0x57},
-    {0x12, 0x58, 0x5a, 0x5f},
-    {0x58, 0x5e, 0x16, 0x2a},
-    {0x2a, 0x5c, 0x2a, 0x2f},
-    {0x38, 0x4e, 0x38, 0x4e}
+// In Battle Palace, moves are chosen based on the pokemons nature rather than by the player
+// Moves are grouped into "Attack", "Defense", or "Support" (see PALACE_MOVE_GROUP_*)
+// Each nature has a certain percent chance of selecting a move from a particular group
+// and a separate percent chance for each group when below 50% HP
+// The table below doesn't list percentages for Support because you can subtract the other two
+// Support percentages are listed in comments off to the side instead
+#define PALACE_STYLE(atk, def, atkLow, defLow) {atk, atk + def, atkLow, atkLow + defLow}
+
+const ALIGNED(4) u8 gBattlePalaceNatureToMoveGroupLikelihood[NUM_NATURES][4] =
+{
+    [NATURE_HARDY]   = PALACE_STYLE(61,  7, 61,  7), // 32% support >= 50% HP, 32% support < 50% HP
+    [NATURE_LONELY]  = PALACE_STYLE(20, 25, 84,  8), // 55%,  8%
+    [NATURE_BRAVE]   = PALACE_STYLE(70, 15, 32, 60), // 15%,  8%
+    [NATURE_ADAMANT] = PALACE_STYLE(38, 31, 70, 15), // 31%, 15%
+    [NATURE_NAUGHTY] = PALACE_STYLE(20, 70, 70, 22), // 10%,  8%
+    [NATURE_BOLD]    = PALACE_STYLE(30, 20, 32, 58), // 50%, 10%
+    [NATURE_DOCILE]  = PALACE_STYLE(56, 22, 56, 22), // 22%, 22%
+    [NATURE_RELAXED] = PALACE_STYLE(25, 15, 75, 15), // 60%, 10%
+    [NATURE_IMPISH]  = PALACE_STYLE(69,  6, 28, 55), // 25%, 17%
+    [NATURE_LAX]     = PALACE_STYLE(35, 10, 29,  6), // 55%, 65%
+    [NATURE_TIMID]   = PALACE_STYLE(62, 10, 30, 20), // 28%, 50%
+    [NATURE_HASTY]   = PALACE_STYLE(58, 37, 88,  6), //  5%,  6%
+    [NATURE_SERIOUS] = PALACE_STYLE(34, 11, 29, 11), // 55%, 60%
+    [NATURE_JOLLY]   = PALACE_STYLE(35,  5, 35, 60), // 60%,  5%
+    [NATURE_NAIVE]   = PALACE_STYLE(56, 22, 56, 22), // 22%, 22%
+    [NATURE_MODEST]  = PALACE_STYLE(35, 45, 34, 60), // 20%,  6%
+    [NATURE_MILD]    = PALACE_STYLE(44, 50, 34,  6), //  6%, 60%
+    [NATURE_QUIET]   = PALACE_STYLE(56, 22, 56, 22), // 22%, 22%
+    [NATURE_BASHFUL] = PALACE_STYLE(30, 58, 30, 58), // 12%, 12%
+    [NATURE_RASH]    = PALACE_STYLE(30, 13, 27,  6), // 57%, 67%
+    [NATURE_CALM]    = PALACE_STYLE(40, 50, 25, 62), // 10%, 13%
+    [NATURE_GENTLE]  = PALACE_STYLE(18, 70, 90,  5), // 12%,  5%
+    [NATURE_SASSY]   = PALACE_STYLE(88,  6, 22, 20), //  6%, 58%
+    [NATURE_CAREFUL] = PALACE_STYLE(42, 50, 42,  5), //  8%, 53%
+    [NATURE_QUIRKY]  = PALACE_STYLE(56, 22, 56, 22)  // 22%, 22%
 };
 
-static const u8 sUnknown_0831C4F8[] =
-{
-    0x03, 0x00, 0x01, 0x00, 0x00, 0x01, 0x03, 0x00,
-    0x01, 0x02, 0x02, 0x00, 0x03, 0x01, 0x03, 0x01,
-    0x02, 0x03, 0x03, 0x02, 0x01, 0x00, 0x02, 0x02,
-    0x03, 0x00, 0x00, 0x00
+// Indices into gBattlePalaceFlavorTextTable
+static const u8 sBattlePalaceNatureToFlavorTextId[NUM_NATURES] =
+{
+    [NATURE_HARDY]   = 3,
+    [NATURE_LONELY]  = 0,
+    [NATURE_BRAVE]   = 1,
+    [NATURE_ADAMANT] = 0,
+    [NATURE_NAUGHTY] = 0,
+    [NATURE_BOLD]    = 1,
+    [NATURE_DOCILE]  = 3,
+    [NATURE_RELAXED] = 0,
+    [NATURE_IMPISH]  = 1,
+    [NATURE_LAX]     = 2,
+    [NATURE_TIMID]   = 2,
+    [NATURE_HASTY]   = 0,
+    [NATURE_SERIOUS] = 3,
+    [NATURE_JOLLY]   = 1,
+    [NATURE_NAIVE]   = 3,
+    [NATURE_MODEST]  = 1,
+    [NATURE_MILD]    = 2,
+    [NATURE_QUIET]   = 3,
+    [NATURE_BASHFUL] = 3,
+    [NATURE_RASH]    = 2,
+    [NATURE_CALM]    = 1,
+    [NATURE_GENTLE]  = 0,
+    [NATURE_SASSY]   = 2,
+    [NATURE_CAREFUL] = 2,
+    [NATURE_QUIRKY]  = 3,
 };
 
 static void Cmd_attackcanceler(void)
@@ -1139,13 +1128,13 @@ static void Cmd_accuracycheck(void)
         else
         {
             u8 acc = gBattleMons[gBattlerAttacker].statStages[STAT_ACC];
-            buff = acc + 6 - gBattleMons[gBattlerTarget].statStages[STAT_EVASION];
+            buff = acc + DEFAULT_STAT_STAGE - gBattleMons[gBattlerTarget].statStages[STAT_EVASION];
         }
 
-        if (buff < 0)
-            buff = 0;
-        if (buff > 0xC)
-            buff = 0xC;
+        if (buff < MIN_STAT_STAGE)
+            buff = MIN_STAT_STAGE;
+        if (buff > MAX_STAT_STAGE)
+            buff = MAX_STAT_STAGE;
 
         moveAcc = gBattleMoves[move].accuracy;
         // check Thunder on sunny weather
@@ -2245,7 +2234,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
     if (gBattleMons[gEffectBattler].status2 & STATUS2_SUBSTITUTE && affectsUser != MOVE_EFFECT_AFFECTS_USER)
         INCREMENT_RESET_RETURN
 
-    if (gBattleCommunication[MOVE_EFFECT_BYTE] <= 6) // status change
+    if (gBattleCommunication[MOVE_EFFECT_BYTE] <= PRIMARY_STATUS_MOVE_EFFECT)
     {
         switch (sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]])
         {
@@ -2453,7 +2442,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
             BattleScriptPush(gBattlescriptCurrInstr + 1);
 
             if (sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]] == STATUS1_SLEEP)
-                gBattleMons[gEffectBattler].status1 |= ((Random() & 3) + 2);
+                gBattleMons[gEffectBattler].status1 |= STATUS1_SLEEP_TURN((Random() & 3) + 2); // 2-5 turns
             else
                 gBattleMons[gEffectBattler].status1 |= sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]];
 
@@ -2513,7 +2502,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 }
                 else
                 {
-                    gBattleMons[gEffectBattler].status2 |= (((Random()) % 0x4)) + 2;
+                    gBattleMons[gEffectBattler].status2 |= STATUS2_CONFUSION_TURN(((Random()) % 4) + 2); // 2-5 turns
 
                     BattleScriptPush(gBattlescriptCurrInstr + 1);
                     gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]];
@@ -2546,7 +2535,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
 
                     gBattleMons[gEffectBattler].status2 |= STATUS2_MULTIPLETURNS;
                     gLockedMoves[gEffectBattler] = gCurrentMove;
-                    gBattleMons[gEffectBattler].status2 |= ((Random() & 3) + 2) << 4;
+                    gBattleMons[gEffectBattler].status2 |= STATUS2_UPROAR_TURN((Random() & 3) + 2); // 2-5 turns
 
                     BattleScriptPush(gBattlescriptCurrInstr + 1);
                     gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]];
@@ -2591,7 +2580,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 }
                 else
                 {
-                    gBattleMons[gEffectBattler].status2 |= ((Random() & 3) + 3) << 0xD;
+                    gBattleMons[gEffectBattler].status2 |= STATUS2_WRAPPED_TURN((Random() & 3) + 3); // 3-6 turns
 
                     *(gBattleStruct->wrappedMove + gEffectBattler * 2 + 0) = gCurrentMove;
                     *(gBattleStruct->wrappedMove + gEffectBattler * 2 + 1) = gCurrentMove >> 8;
@@ -2834,7 +2823,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 {
                     gBattleMons[gEffectBattler].status2 |= STATUS2_MULTIPLETURNS;
                     gLockedMoves[gEffectBattler] = gCurrentMove;
-                    gBattleMons[gEffectBattler].status2 |= (((Random() & 1) + 2) << 0xA);
+                    gBattleMons[gEffectBattler].status2 |= STATUS2_LOCK_CONFUSE_TURN((Random() & 1) + 2); // thrash for 2-3 turns
                 }
                 break;
             case MOVE_EFFECT_KNOCK_OFF:
@@ -2929,7 +2918,7 @@ static void Cmd_clearstatusfromeffect(void)
 {
     gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
-    if (gBattleCommunication[MOVE_EFFECT_BYTE] <= MOVE_EFFECT_TOXIC)
+    if (gBattleCommunication[MOVE_EFFECT_BYTE] <= PRIMARY_STATUS_MOVE_EFFECT)
         gBattleMons[gActiveBattler].status1 &= (~sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]);
     else
         gBattleMons[gActiveBattler].status2 &= (~sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]);
@@ -3482,7 +3471,7 @@ static void Cmd_getexp(void)
         else
         {
             gBattleStruct->expGetterMonId++;
-            if (gBattleStruct->expGetterMonId <= 5)
+            if (gBattleStruct->expGetterMonId < PARTY_SIZE)
                 gBattleScripting.getexpState = 2; // loop again
             else
                 gBattleScripting.getexpState = 6; // we're done
@@ -3511,7 +3500,7 @@ static void Cmd_unknown_24(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId == TRAINER_STEVEN_PARTNER)
     {
-        for (i = 0; i < 3; i++)
+        for (i = 0; i < MULTI_PARTY_SIZE; i++)
         {
             if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) && !GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG))
                 HP_count += GetMonData(&gPlayerParty[i], MON_DATA_HP);
@@ -3552,13 +3541,13 @@ static void Cmd_unknown_24(void)
         // Impossible to decompile loops.
         for (foundPlayer = 0, i = 0; i < gBattlersCount; i += 2)
         {
-            if (HITMARKER_UNK(i) & gHitMarker && !gSpecialStatuses[i].flag40)
+            if (HITMARKER_FAINTED2(i) & gHitMarker && !gSpecialStatuses[i].flag40)
                 foundPlayer++;
         }
 
         for (foundOpponent = 0, i = 1; i < gBattlersCount; i += 2)
         {
-            if (HITMARKER_UNK(i) & gHitMarker && !gSpecialStatuses[i].flag40)
+            if (HITMARKER_FAINTED2(i) & gHitMarker && !gSpecialStatuses[i].flag40)
                 foundOpponent++;
         }
 
@@ -4396,7 +4385,7 @@ static void Cmd_playstatchangeanimation(void)
             {
                 if (gBattlescriptCurrInstr[3] & STAT_CHANGE_CANT_PREVENT)
                 {
-                    if (gBattleMons[gActiveBattler].statStages[currStat] > 0)
+                    if (gBattleMons[gActiveBattler].statStages[currStat] > MIN_STAT_STAGE)
                     {
                         statAnimId = startingStatAnimId + currStat;
                         changeableStatsCount++;
@@ -4408,7 +4397,7 @@ static void Cmd_playstatchangeanimation(void)
                         && !(gBattleMons[gActiveBattler].ability == ABILITY_KEEN_EYE && currStat == STAT_ACC)
                         && !(gBattleMons[gActiveBattler].ability == ABILITY_HYPER_CUTTER && currStat == STAT_ATK))
                 {
-                    if (gBattleMons[gActiveBattler].statStages[currStat] > 0)
+                    if (gBattleMons[gActiveBattler].statStages[currStat] > MIN_STAT_STAGE)
                     {
                         statAnimId = startingStatAnimId + currStat;
                         changeableStatsCount++;
@@ -4436,7 +4425,7 @@ static void Cmd_playstatchangeanimation(void)
 
         while (statsToCheck != 0)
         {
-            if (statsToCheck & 1 && gBattleMons[gActiveBattler].statStages[currStat] < 0xC)
+            if (statsToCheck & 1 && gBattleMons[gActiveBattler].statStages[currStat] < MAX_STAT_STAGE)
             {
                 statAnimId = startingStatAnimId + currStat;
                 changeableStatsCount++;
@@ -4506,7 +4495,7 @@ static void Cmd_moveend(void)
                 && gBattleMons[gBattlerTarget].hp != 0 && gBattlerAttacker != gBattlerTarget
                 && GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget)
                 && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && TARGET_TURN_DAMAGED
-                && gBattleMoves[gCurrentMove].power && gBattleMons[gBattlerTarget].statStages[STAT_ATK] <= 0xB)
+                && gBattleMoves[gCurrentMove].power && gBattleMons[gBattlerTarget].statStages[STAT_ATK] < MAX_STAT_STAGE)
             {
                 gBattleMons[gBattlerTarget].statStages[STAT_ATK]++;
                 BattleScriptPushCursor();
@@ -4914,10 +4903,12 @@ static void Cmd_switchindataupdate(void)
 
     SwitchInClearSetData();
 
-    if (gBattleTypeFlags & BATTLE_TYPE_PALACE && gBattleMons[gActiveBattler].maxHP / 2 >= gBattleMons[gActiveBattler].hp
-        && gBattleMons[gActiveBattler].hp != 0 && !(gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP))
+    if (gBattleTypeFlags & BATTLE_TYPE_PALACE 
+        && gBattleMons[gActiveBattler].maxHP / 2 >= gBattleMons[gActiveBattler].hp
+        && gBattleMons[gActiveBattler].hp != 0 
+        && !(gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP))
     {
-        gBattleStruct->field_92 |= gBitTable[gActiveBattler];
+        gBattleStruct->palaceFlags |= gBitTable[gActiveBattler];
     }
 
     gBattleScripting.battler = gActiveBattler;
@@ -5101,7 +5092,7 @@ static void Cmd_jumpifcantswitch(void)
                 break;
         }
 
-        if (i == 6)
+        if (i == PARTY_SIZE)
             gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 2);
         else
             gBattlescriptCurrInstr += 6;
@@ -5480,7 +5471,7 @@ static void Cmd_switchineffects(void)
     s32 i;
 
     gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
-    sub_803FA70(gActiveBattler);
+    UpdateSentPokesToOpponentValue(gActiveBattler);
 
     gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
     gSpecialStatuses[gActiveBattler].flag40 = 0;
@@ -6349,15 +6340,13 @@ static void PutLevelAndGenderOnLvlUpBox(void)
     AddTextPrinter(&printerTemplate, 0xFF, NULL);
 
     txtPtr = gStringVar4;
-    gStringVar4[0] = CHAR_SPECIAL_F9;
-    txtPtr++;
-    txtPtr[0] = CHAR_LV_2;
-    txtPtr++;
+    *(txtPtr)++ = CHAR_EXTRA_SYMBOL;
+    *(txtPtr)++ = CHAR_LV_2;
 
     var = (u32)(txtPtr);
     txtPtr = ConvertIntToDecimalStringN(txtPtr, monLevel, STR_CONV_MODE_LEFT_ALIGN, 3);
     var = (u32)(txtPtr) - var;
-    txtPtr = StringFill(txtPtr, 0x77, 4 - var);
+    txtPtr = StringFill(txtPtr, CHAR_UNK_SPACER, 4 - var);
 
     if (monGender != MON_GENDERLESS)
     {
@@ -6588,11 +6577,11 @@ static void Cmd_various(void)
     case VARIOUS_GET_MOVE_TARGET:
         gBattlerTarget = GetMoveTarget(gCurrentMove, 0);
         break;
-    case 4:
+    case VARIOUS_GET_BATTLER_FAINTED:
         if (gHitMarker & HITMARKER_FAINTED(gActiveBattler))
-            gBattleCommunication[0] = 1;
+            gBattleCommunication[0] = TRUE;
         else
-            gBattleCommunication[0] = 0;
+            gBattleCommunication[0] = FALSE;
         break;
     case VARIOUS_RESET_INTIMIDATE_TRACE_BITS:
         gSpecialStatuses[gActiveBattler].intimidatedMon = 0;
@@ -6628,17 +6617,19 @@ static void Cmd_various(void)
             gHitMarker &= ~(HITMARKER_x400000);
         }
         break;
-    case 8:
-        gBattleCommunication[0] = 0;
+    case VARIOUS_PALACE_FLAVOR_TEXT:
+        // Try and print end-of-turn Battle Palace flavor text (e.g. "A glint appears in mon's eyes")
+        gBattleCommunication[0] = FALSE; // whether or not msg should be printed
         gBattleScripting.battler = gActiveBattler = gBattleCommunication[1];
-        if (!(gBattleStruct->field_92 & gBitTable[gActiveBattler])
+
+        if (!(gBattleStruct->palaceFlags & gBitTable[gActiveBattler])
             && gBattleMons[gActiveBattler].maxHP / 2 >= gBattleMons[gActiveBattler].hp
             && gBattleMons[gActiveBattler].hp != 0
             && !(gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP))
         {
-            gBattleStruct->field_92 |= gBitTable[gActiveBattler];
-            gBattleCommunication[0] = 1;
-            gBattleCommunication[MULTISTRING_CHOOSER] = sUnknown_0831C4F8[GetNatureFromPersonality(gBattleMons[gActiveBattler].personality)];
+            gBattleStruct->palaceFlags |= gBitTable[gActiveBattler];
+            gBattleCommunication[0] = TRUE;
+            gBattleCommunication[MULTISTRING_CHOOSER] = sBattlePalaceNatureToFlavorTextId[GetNatureFromPersonality(gBattleMons[gActiveBattler].personality)];
         }
         break;
     case VARIOUS_ARENA_JUDGMENT_WINDOW:
@@ -7295,7 +7286,7 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
             index++;
             gBattleTextBuff2[index] = B_BUFF_EOS;
 
-            if (gBattleMons[gActiveBattler].statStages[statId] == 0)
+            if (gBattleMons[gActiveBattler].statStages[statId] == MIN_STAT_STAGE)
                 gBattleCommunication[MULTISTRING_CHOOSER] = 2;
             else
                 gBattleCommunication[MULTISTRING_CHOOSER] = (gBattlerTarget == gActiveBattler);
@@ -7322,17 +7313,17 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
         index++;
         gBattleTextBuff2[index] = B_BUFF_EOS;
 
-        if (gBattleMons[gActiveBattler].statStages[statId] == 0xC)
+        if (gBattleMons[gActiveBattler].statStages[statId] == MAX_STAT_STAGE)
             gBattleCommunication[MULTISTRING_CHOOSER] = 2;
         else
             gBattleCommunication[MULTISTRING_CHOOSER] = (gBattlerTarget == gActiveBattler);
     }
 
     gBattleMons[gActiveBattler].statStages[statId] += statValue;
-    if (gBattleMons[gActiveBattler].statStages[statId] < 0)
-        gBattleMons[gActiveBattler].statStages[statId] = 0;
-    if (gBattleMons[gActiveBattler].statStages[statId] > 0xC)
-        gBattleMons[gActiveBattler].statStages[statId] = 0xC;
+    if (gBattleMons[gActiveBattler].statStages[statId] < MIN_STAT_STAGE)
+        gBattleMons[gActiveBattler].statStages[statId] = MIN_STAT_STAGE;
+    if (gBattleMons[gActiveBattler].statStages[statId] > MAX_STAT_STAGE)
+        gBattleMons[gActiveBattler].statStages[statId] = MAX_STAT_STAGE;
 
     if (gBattleCommunication[MULTISTRING_CHOOSER] == 2 && flags & STAT_BUFF_ALLOW_PTR)
         gMoveResultFlags |= MOVE_RESULT_MISSED;
@@ -7357,7 +7348,7 @@ static void Cmd_normalisebuffs(void) // haze
     for (i = 0; i < gBattlersCount; i++)
     {
         for (j = 0; j < NUM_BATTLE_STATS; j++)
-            gBattleMons[i].statStages[j] = 6;
+            gBattleMons[i].statStages[j] = DEFAULT_STAT_STAGE;
     }
 
     gBattlescriptCurrInstr++;
@@ -7368,7 +7359,7 @@ static void Cmd_setbide(void)
     gBattleMons[gBattlerAttacker].status2 |= STATUS2_MULTIPLETURNS;
     gLockedMoves[gBattlerAttacker] = gCurrentMove;
     gTakenDmg[gBattlerAttacker] = 0;
-    gBattleMons[gBattlerAttacker].status2 |= (STATUS2_BIDE - 0x100); // 2 turns
+    gBattleMons[gBattlerAttacker].status2 |= STATUS2_BIDE_TURN(2);
 
     gBattlescriptCurrInstr++;
 }
@@ -8326,7 +8317,7 @@ static void Cmd_settypetorandomresistance(void) // conversion 2
 static void Cmd_setalwayshitflag(void)
 {
     gStatuses3[gBattlerTarget] &= ~(STATUS3_ALWAYS_HITS);
-    gStatuses3[gBattlerTarget] |= 0x10;
+    gStatuses3[gBattlerTarget] |= STATUS3_ALWAYS_HITS_TURN(2);
     gDisableStructs[gBattlerTarget].battlerWithSureHit = gBattlerAttacker;
     gBattlescriptCurrInstr++;
 }
@@ -8757,7 +8748,7 @@ static void Cmd_rolloutdamagecalculation(void)
 static void Cmd_jumpifconfusedandstatmaxed(void)
 {
     if (gBattleMons[gBattlerTarget].status2 & STATUS2_CONFUSION
-        && gBattleMons[gBattlerTarget].statStages[gBattlescriptCurrInstr[1]] == 0xC)
+        && gBattleMons[gBattlerTarget].statStages[gBattlescriptCurrInstr[1]] == MAX_STAT_STAGE)
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 2);
     else
         gBattlescriptCurrInstr += 6;
@@ -8964,10 +8955,10 @@ static void Cmd_maxattackhalvehp(void) // belly drum
     if (!(gBattleMons[gBattlerAttacker].maxHP / 2))
         halfHp = 1;
 
-    if (gBattleMons[gBattlerAttacker].statStages[STAT_ATK] < 12
+    if (gBattleMons[gBattlerAttacker].statStages[STAT_ATK] < MAX_STAT_STAGE
         && gBattleMons[gBattlerAttacker].hp > halfHp)
     {
-        gBattleMons[gBattlerAttacker].statStages[STAT_ATK] = 12;
+        gBattleMons[gBattlerAttacker].statStages[STAT_ATK] = MAX_STAT_STAGE;
         gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 2;
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
@@ -9145,7 +9136,7 @@ static void Cmd_trydobeatup(void)
     else
     {
         u8 beforeLoop = gBattleCommunication[0];
-        for (;gBattleCommunication[0] < 6; gBattleCommunication[0]++)
+        for (;gBattleCommunication[0] < PARTY_SIZE; gBattleCommunication[0]++)
         {
             if (GetMonData(&party[gBattleCommunication[0]], MON_DATA_HP)
                 && GetMonData(&party[gBattleCommunication[0]], MON_DATA_SPECIES2)
@@ -9153,7 +9144,7 @@ static void Cmd_trydobeatup(void)
                 && !GetMonData(&party[gBattleCommunication[0]], MON_DATA_STATUS))
                     break;
         }
-        if (gBattleCommunication[0] < 6)
+        if (gBattleCommunication[0] < PARTY_SIZE)
         {
             PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattlerAttacker, gBattleCommunication[0])
 
@@ -9241,8 +9232,8 @@ static void Cmd_sethail(void)
 
 static void Cmd_jumpifattackandspecialattackcannotfall(void) // memento
 {
-    if (gBattleMons[gBattlerTarget].statStages[STAT_ATK] == 0
-        && gBattleMons[gBattlerTarget].statStages[STAT_SPATK] == 0
+    if (gBattleMons[gBattlerTarget].statStages[STAT_ATK] == MIN_STAT_STAGE
+        && gBattleMons[gBattlerTarget].statStages[STAT_SPATK] == MIN_STAT_STAGE
         && gBattleCommunication[6] != 1)
     {
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
@@ -9520,7 +9511,7 @@ static void Cmd_setyawn(void)
     }
     else
     {
-        gStatuses3[gBattlerTarget] |= 0x1000;
+        gStatuses3[gBattlerTarget] |= STATUS3_YAWN_TURN(2);
         gBattlescriptCurrInstr += 5;
     }
 }
@@ -9654,7 +9645,7 @@ static void Cmd_assistattackselect(void)
     else
         party = gPlayerParty;
 
-    for (monId = 0; monId < 6; monId++)
+    for (monId = 0; monId < PARTY_SIZE; monId++)
     {
         if (monId == gBattlerPartyIndexes[gBattlerAttacker])
             continue;
@@ -9865,7 +9856,7 @@ static void Cmd_pickup(void)
                 if (lvlDivBy10 > 9)
                     lvlDivBy10 = 9;
 
-                for (j = 0; j < 9; j++)
+                for (j = 0; j < (int)ARRAY_COUNT(sPickupProbabilities); j++)
                 {
                     if (sPickupProbabilities[j] > rand)
                     {
@@ -10134,7 +10125,7 @@ static void Cmd_handleballthrow(void)
             }
         }
         else
-            ballMultiplier = sBallCatchBonuses[gLastUsedItem - 2];
+            ballMultiplier = sBallCatchBonuses[gLastUsedItem - ITEM_ULTRA_BALL];
 
         odds = (catchRate * ballMultiplier / 10)
             * (gBattleMons[gBattlerTarget].maxHP * 3 - gBattleMons[gBattlerTarget].hp * 2)
@@ -10436,7 +10427,7 @@ static void Cmd_trygivecaughtmonnick(void)
         }
         break;
     case 4:
-        if (CalculatePlayerPartyCount() == 6)
+        if (CalculatePlayerPartyCount() == PARTY_SIZE)
             gBattlescriptCurrInstr += 5;
         else
             gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
diff --git a/src/battle_setup.c b/src/battle_setup.c
index b6b97ea90..0c0ef72d3 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -124,28 +124,43 @@ static const u8 sBattleTransitionTable_Trainer[][2] =
     {B_TRANSITION_SWIRL,           B_TRANSITION_RIPPLE},        // Water
 };
 
-static const u8 sUnknown_0854FE98[] =
-{
-    B_TRANSITION_29, B_TRANSITION_30, B_TRANSITION_31, B_TRANSITION_32,
-    B_TRANSITION_34, B_TRANSITION_35, B_TRANSITION_36, B_TRANSITION_37,
-    B_TRANSITION_38, B_TRANSITION_39, B_TRANSITION_40, B_TRANSITION_41
+// Battle Frontier (excluding Pyramid and Dome, which have their own tables below)
+static const u8 sBattleTransitionTable_BattleFrontier[] =
+{
+    B_TRANSITION_FRONTIER_LOGO_WIGGLE, 
+    B_TRANSITION_FRONTIER_LOGO_WAVE, 
+    B_TRANSITION_FRONTIER_SQUARES, 
+    B_TRANSITION_FRONTIER_SQUARES_SCROLL,
+    B_TRANSITION_FRONTIER_CIRCLES_MEET, 
+    B_TRANSITION_FRONTIER_CIRCLES_CROSS, 
+    B_TRANSITION_FRONTIER_CIRCLES_ASYMMETRIC_SPIRAL, 
+    B_TRANSITION_FRONTIER_CIRCLES_SYMMETRIC_SPIRAL,
+    B_TRANSITION_FRONTIER_CIRCLES_MEET_IN_SEQ, 
+    B_TRANSITION_FRONTIER_CIRCLES_CROSS_IN_SEQ, 
+    B_TRANSITION_FRONTIER_CIRCLES_ASYMMETRIC_SPIRAL_IN_SEQ, 
+    B_TRANSITION_FRONTIER_CIRCLES_SYMMETRIC_SPIRAL_IN_SEQ
 };
 
-static const u8 sUnknown_0854FEA4[] =
+static const u8 sBattleTransitionTable_BattlePyramid[] =
 {
-    B_TRANSITION_31, B_TRANSITION_32, B_TRANSITION_33
+    B_TRANSITION_FRONTIER_SQUARES, 
+    B_TRANSITION_FRONTIER_SQUARES_SCROLL, 
+    B_TRANSITION_FRONTIER_SQUARES_SPIRAL
 };
 
-static const u8 sUnknown_0854FEA7[] =
+static const u8 sBattleTransitionTable_BattleDome[] =
 {
-    B_TRANSITION_29, B_TRANSITION_31, B_TRANSITION_32, B_TRANSITION_33
+    B_TRANSITION_FRONTIER_LOGO_WIGGLE, 
+    B_TRANSITION_FRONTIER_SQUARES, 
+    B_TRANSITION_FRONTIER_SQUARES_SCROLL, 
+    B_TRANSITION_FRONTIER_SQUARES_SPIRAL
 };
 
 static const struct TrainerBattleParameter sOrdinaryBattleParams[] =
 {
     {&sTrainerBattleMode,           TRAINER_PARAM_LOAD_VAL_8BIT},
     {&gTrainerBattleOpponent_A,     TRAINER_PARAM_LOAD_VAL_16BIT},
-    {&sTrainerObjectEventLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerObjectEventLocalId,   TRAINER_PARAM_LOAD_VAL_16BIT},
     {&sTrainerAIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerADefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerVictorySpeech,        TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -158,7 +173,7 @@ static const struct TrainerBattleParameter sContinueScriptBattleParams[] =
 {
     {&sTrainerBattleMode,           TRAINER_PARAM_LOAD_VAL_8BIT},
     {&gTrainerBattleOpponent_A,     TRAINER_PARAM_LOAD_VAL_16BIT},
-    {&sTrainerObjectEventLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerObjectEventLocalId,   TRAINER_PARAM_LOAD_VAL_16BIT},
     {&sTrainerAIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerADefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerVictorySpeech,        TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -171,7 +186,7 @@ static const struct TrainerBattleParameter sDoubleBattleParams[] =
 {
     {&sTrainerBattleMode,           TRAINER_PARAM_LOAD_VAL_8BIT},
     {&gTrainerBattleOpponent_A,     TRAINER_PARAM_LOAD_VAL_16BIT},
-    {&sTrainerObjectEventLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerObjectEventLocalId,   TRAINER_PARAM_LOAD_VAL_16BIT},
     {&sTrainerAIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerADefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerVictorySpeech,        TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -184,7 +199,7 @@ static const struct TrainerBattleParameter sOrdinaryNoIntroBattleParams[] =
 {
     {&sTrainerBattleMode,           TRAINER_PARAM_LOAD_VAL_8BIT},
     {&gTrainerBattleOpponent_A,     TRAINER_PARAM_LOAD_VAL_16BIT},
-    {&sTrainerObjectEventLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerObjectEventLocalId,   TRAINER_PARAM_LOAD_VAL_16BIT},
     {&sTrainerAIntroSpeech,         TRAINER_PARAM_CLEAR_VAL_32BIT},
     {&sTrainerADefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerVictorySpeech,        TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -197,7 +212,7 @@ static const struct TrainerBattleParameter sContinueScriptDoubleBattleParams[] =
 {
     {&sTrainerBattleMode,           TRAINER_PARAM_LOAD_VAL_8BIT},
     {&gTrainerBattleOpponent_A,     TRAINER_PARAM_LOAD_VAL_16BIT},
-    {&sTrainerObjectEventLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerObjectEventLocalId,   TRAINER_PARAM_LOAD_VAL_16BIT},
     {&sTrainerAIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerADefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerVictorySpeech,        TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -210,7 +225,7 @@ static const struct TrainerBattleParameter sTrainerBOrdinaryBattleParams[] =
 {
     {&sTrainerBattleMode,           TRAINER_PARAM_LOAD_VAL_8BIT},
     {&gTrainerBattleOpponent_B,     TRAINER_PARAM_LOAD_VAL_16BIT},
-    {&sTrainerObjectEventLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerObjectEventLocalId,   TRAINER_PARAM_LOAD_VAL_16BIT},
     {&sTrainerBIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerBDefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerVictorySpeech,        TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -223,7 +238,7 @@ static const struct TrainerBattleParameter sTrainerBContinueScriptBattleParams[]
 {
     {&sTrainerBattleMode,           TRAINER_PARAM_LOAD_VAL_8BIT},
     {&gTrainerBattleOpponent_B,     TRAINER_PARAM_LOAD_VAL_16BIT},
-    {&sTrainerObjectEventLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerObjectEventLocalId,   TRAINER_PARAM_LOAD_VAL_16BIT},
     {&sTrainerBIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerBDefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerVictorySpeech,        TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -234,7 +249,7 @@ static const struct TrainerBattleParameter sTrainerBContinueScriptBattleParams[]
 
 #define REMATCH(trainer1, trainer2, trainer3, trainer4, trainer5, map)  \
 {                                                                       \
-    .trainerIds = {trainer1, trainer2, trainer3, trainer4, trainer5},    \
+    .trainerIds = {trainer1, trainer2, trainer3, trainer4, trainer5},   \
     .mapGroup = MAP_GROUP(map),                                         \
     .mapNum = MAP_NUM(map),                                             \
 }
@@ -449,9 +464,9 @@ static void DoTrainerBattle(void)
 static void sub_80B0828(void)
 {
     if (InBattlePyramid())
-        CreateBattleStartTask(sub_80B100C(10), 0);
+        CreateBattleStartTask(GetSpecialBattleTransition(10), 0);
     else
-        CreateBattleStartTask(sub_80B100C(11), 0);
+        CreateBattleStartTask(GetSpecialBattleTransition(11), 0);
 
     IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
     IncrementGameStat(GAME_STAT_TRAINER_BATTLES);
@@ -839,7 +854,17 @@ static u8 GetTrainerBattleTransition(void)
         return sBattleTransitionTable_Trainer[transitionType][1];
 }
 
-u8 sub_80B100C(s32 arg0)
+// 0: Battle Tower
+// 3: Battle Dome
+// 4: Battle Palace
+// 5: Battle Arena
+// 6: Battle Factory
+// 7: Battle Pike
+// 10: Battle Pyramid
+// 11: Trainer Hill
+// 12: Secret Base
+// 13: E-Reader
+u8 GetSpecialBattleTransition(s32 id)
 {
     u16 var;
     u8 enemyLevel = GetMonData(&gEnemyParty[0], MON_DATA_LEVEL);
@@ -847,43 +872,43 @@ u8 sub_80B100C(s32 arg0)
 
     if (enemyLevel < playerLevel)
     {
-        switch (arg0)
+        switch (id)
         {
         case 11:
         case 12:
         case 13:
             return B_TRANSITION_POKEBALLS_TRAIL;
         case 10:
-            return sUnknown_0854FEA4[Random() % ARRAY_COUNT(sUnknown_0854FEA4)];
+            return sBattleTransitionTable_BattlePyramid[Random() % ARRAY_COUNT(sBattleTransitionTable_BattlePyramid)];
         case 3:
-            return sUnknown_0854FEA7[Random() % ARRAY_COUNT(sUnknown_0854FEA7)];
+            return sBattleTransitionTable_BattleDome[Random() % ARRAY_COUNT(sBattleTransitionTable_BattleDome)];
         }
 
         if (VarGet(VAR_FRONTIER_BATTLE_MODE) != FRONTIER_MODE_LINK_MULTIS)
-            return sUnknown_0854FE98[Random() % ARRAY_COUNT(sUnknown_0854FE98)];
+            return sBattleTransitionTable_BattleFrontier[Random() % ARRAY_COUNT(sBattleTransitionTable_BattleFrontier)];
     }
     else
     {
-        switch (arg0)
+        switch (id)
         {
         case 11:
         case 12:
         case 13:
             return B_TRANSITION_BIG_POKEBALL;
         case 10:
-            return sUnknown_0854FEA4[Random() % ARRAY_COUNT(sUnknown_0854FEA4)];
+            return sBattleTransitionTable_BattlePyramid[Random() % ARRAY_COUNT(sBattleTransitionTable_BattlePyramid)];
         case 3:
-            return sUnknown_0854FEA7[Random() % ARRAY_COUNT(sUnknown_0854FEA7)];
+            return sBattleTransitionTable_BattleDome[Random() % ARRAY_COUNT(sBattleTransitionTable_BattleDome)];
         }
 
         if (VarGet(VAR_FRONTIER_BATTLE_MODE) != FRONTIER_MODE_LINK_MULTIS)
-            return sUnknown_0854FE98[Random() % ARRAY_COUNT(sUnknown_0854FE98)];
+            return sBattleTransitionTable_BattleFrontier[Random() % ARRAY_COUNT(sBattleTransitionTable_BattleFrontier)];
     }
 
     var = gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum * 2 + 0]
         + gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum * 2 + 1];
 
-    return sUnknown_0854FE98[var % ARRAY_COUNT(sUnknown_0854FE98)];
+    return sBattleTransitionTable_BattleFrontier[var % ARRAY_COUNT(sBattleTransitionTable_BattleFrontier)];
 }
 
 void ChooseStarter(void)
diff --git a/src/battle_tower.c b/src/battle_tower.c
index 7377a6798..09c9f0416 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -2028,7 +2028,7 @@ void DoSpecialTrainerBattle(void)
         }
         CreateTask(Task_StartBattleAfterTransition, 1);
         PlayMapChosenOrBattleBGM(0);
-        BattleTransition_StartOnField(sub_80B100C(0));
+        BattleTransition_StartOnField(GetSpecialBattleTransition(0));
         break;
     case SPECIAL_BATTLE_SECRET_BASE:
         for (i = 0; i < PARTY_SIZE; i++)
@@ -2038,7 +2038,7 @@ void DoSpecialTrainerBattle(void)
         }
         CreateTask(Task_StartBattleAfterTransition, 1);
         PlayMapChosenOrBattleBGM(0);
-        BattleTransition_StartOnField(sub_80B100C(12));
+        BattleTransition_StartOnField(GetSpecialBattleTransition(12));
         break;
     case SPECIAL_BATTLE_EREADER:
         ZeroEnemyPartyMons();
@@ -2048,7 +2048,7 @@ void DoSpecialTrainerBattle(void)
         gTrainerBattleOpponent_A = 0;
         CreateTask(Task_StartBattleAfterTransition, 1);
         PlayMapChosenOrBattleBGM(0);
-        BattleTransition_StartOnField(sub_80B100C(13));
+        BattleTransition_StartOnField(GetSpecialBattleTransition(13));
         break;
     case SPECIAL_BATTLE_DOME:
         gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_DOME;
@@ -2058,7 +2058,7 @@ void DoSpecialTrainerBattle(void)
             FillFrontierTrainerParty(DOME_BATTLE_PARTY_SIZE);
         CreateTask(Task_StartBattleAfterTransition, 1);
         sub_806E694(0);
-        BattleTransition_StartOnField(sub_80B100C(3));
+        BattleTransition_StartOnField(GetSpecialBattleTransition(3));
         break;
     case SPECIAL_BATTLE_PALACE:
         gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_PALACE;
@@ -2070,7 +2070,7 @@ void DoSpecialTrainerBattle(void)
             FillTentTrainerParty(FRONTIER_PARTY_SIZE);
         CreateTask(Task_StartBattleAfterTransition, 1);
         PlayMapChosenOrBattleBGM(0);
-        BattleTransition_StartOnField(sub_80B100C(4));
+        BattleTransition_StartOnField(GetSpecialBattleTransition(4));
         break;
     case SPECIAL_BATTLE_ARENA:
         gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_ARENA;
@@ -2080,7 +2080,7 @@ void DoSpecialTrainerBattle(void)
             FillTentTrainerParty(FRONTIER_PARTY_SIZE);
         CreateTask(Task_StartBattleAfterTransition, 1);
         PlayMapChosenOrBattleBGM(0);
-        BattleTransition_StartOnField(sub_80B100C(5));
+        BattleTransition_StartOnField(GetSpecialBattleTransition(5));
         break;
     case SPECIAL_BATTLE_FACTORY:
         gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_FACTORY;
@@ -2089,28 +2089,28 @@ void DoSpecialTrainerBattle(void)
         FillFactoryTrainerParty();
         CreateTask(Task_StartBattleAfterTransition, 1);
         PlayMapChosenOrBattleBGM(0);
-        BattleTransition_StartOnField(sub_80B100C(6));
+        BattleTransition_StartOnField(GetSpecialBattleTransition(6));
         break;
     case SPECIAL_BATTLE_PIKE_SINGLE:
         gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_BATTLE_TOWER;
         FillFrontierTrainerParty(FRONTIER_PARTY_SIZE);
         CreateTask(Task_StartBattleAfterTransition, 1);
         PlayMapChosenOrBattleBGM(0);
-        BattleTransition_StartOnField(sub_80B100C(7));
+        BattleTransition_StartOnField(GetSpecialBattleTransition(7));
         break;
     case SPECIAL_BATTLE_PYRAMID:
         gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_PYRAMID;
         FillFrontierTrainerParty(FRONTIER_PARTY_SIZE);
         CreateTask(Task_StartBattleAfterTransition, 1);
         PlayMapChosenOrBattleBGM(0);
-        BattleTransition_StartOnField(sub_80B100C(10));
+        BattleTransition_StartOnField(GetSpecialBattleTransition(10));
         break;
     case SPECIAL_BATTLE_PIKE_DOUBLE:
         gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOUBLE | BATTLE_TYPE_TWO_OPPONENTS;
         FillFrontierTrainersParties(1);
         CreateTask(Task_StartBattleAfterTransition, 1);
         PlayMapChosenOrBattleBGM(0);
-        BattleTransition_StartOnField(sub_80B100C(7));
+        BattleTransition_StartOnField(GetSpecialBattleTransition(7));
         break;
     case SPECIAL_BATTLE_STEVEN:
         gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_DOUBLE | BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_MULTI | BATTLE_TYPE_INGAME_PARTNER;
diff --git a/src/battle_transition.c b/src/battle_transition.c
index e76a3a34c..2ffa28645 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "battle.h"
 #include "battle_transition.h"
+#include "battle_transition_frontier.h"
 #include "bg.h"
 #include "decompress.h"
 #include "event_object_movement.h"
@@ -18,7 +19,6 @@
 #include "sprite.h"
 #include "task.h"
 #include "trig.h"
-#include "unk_transition.h"
 #include "util.h"
 #include "constants/field_effects.h"
 #include "constants/songs.h"
@@ -93,11 +93,11 @@ static void Phase2Task_ShredSplit(u8 taskId);
 static void Phase2Task_Blackhole1(u8 taskId);
 static void Phase2Task_Blackhole2(u8 taskId);
 static void Phase2Task_RectangularSpiral(u8 taskId);
-static void Phase2Task_29(u8 taskId);
-static void Phase2Task_30(u8 taskId);
-static void Phase2Task_31(u8 taskId);
-static void Phase2Task_32(u8 taskId);
-static void Phase2Task_33(u8 taskId);
+static void Phase2Task_FrontierLogoWiggle(u8 taskId);
+static void Phase2Task_FrontierLogoWave(u8 taskId);
+static void Phase2Task_FrontierSquares(u8 taskId);
+static void Phase2Task_FrontierSquaresScroll(u8 taskId);
+static void Phase2Task_FrontierSquaresSpiral(u8 taskId);
 static void VBlankCB_BattleTransition(void);
 static void VBlankCB_Phase2_Swirl(void);
 static void HBlankCB_Phase2_Swirl(void);
@@ -192,12 +192,12 @@ static bool8 Phase2_Blackhole2_Func2(struct Task *task);
 static bool8 Phase2_RectangularSpiral_Func1(struct Task *task);
 static bool8 Phase2_RectangularSpiral_Func2(struct Task *task);
 static bool8 Phase2_RectangularSpiral_Func3(struct Task *task);
-static bool8 Phase2_29_Func1(struct Task *task);
-static bool8 Phase2_29_Func2(struct Task *task);
-static bool8 Phase2_30_Func1(struct Task *task);
-static bool8 Phase2_30_Func2(struct Task *task);
-static bool8 Phase2_30_Func3(struct Task *task);
-static bool8 Phase2_30_Func4(struct Task *task);
+static bool8 Phase2_FrontierLogoWiggle_Func1(struct Task *task);
+static bool8 Phase2_FrontierLogoWiggle_Func2(struct Task *task);
+static bool8 Phase2_FrontierLogoWave_Func1(struct Task *task);
+static bool8 Phase2_FrontierLogoWave_Func2(struct Task *task);
+static bool8 Phase2_FrontierLogoWave_Func3(struct Task *task);
+static bool8 Phase2_FrontierLogoWave_Func4(struct Task *task);
 static bool8 Phase2_Rayquaza_Func3(struct Task *task);
 static bool8 Phase2_Rayquaza_Func4(struct Task *task);
 static bool8 Phase2_Rayquaza_Func5(struct Task *task);
@@ -205,19 +205,19 @@ static bool8 Phase2_Rayquaza_Func6(struct Task *task);
 static bool8 Phase2_Rayquaza_Func7(struct Task *task);
 static bool8 Phase2_Rayquaza_Func8(struct Task *task);
 static bool8 Phase2_Rayquaza_Func9(struct Task *task);
-static bool8 Phase2_31_Func1(struct Task *task);
-static bool8 Phase2_31_Func2(struct Task *task);
-static bool8 Phase2_31_Func3(struct Task *task);
-static bool8 Phase2_31_33_Func5(struct Task *task);
-static bool8 Phase2_33_Func1(struct Task *task);
-static bool8 Phase2_33_Func2(struct Task *task);
-static bool8 Phase2_33_Func3(struct Task *task);
-static bool8 Phase2_33_Func4(struct Task *task);
-static bool8 Phase2_32_Func1(struct Task *task);
-static bool8 Phase2_32_Func2(struct Task *task);
-static bool8 Phase2_32_Func3(struct Task *task);
-static bool8 Phase2_32_Func4(struct Task *task);
-static bool8 Phase2_32_Func5(struct Task *task);
+static bool8 Phase2_FrontierSquares_Func1(struct Task *task);
+static bool8 Phase2_FrontierSquares_Func2(struct Task *task);
+static bool8 Phase2_FrontierSquares_Func3(struct Task *task);
+static bool8 Phase2_FrontierSquares_End(struct Task *task);
+static bool8 Phase2_FrontierSquaresSpiral_Func1(struct Task *task);
+static bool8 Phase2_FrontierSquaresSpiral_Func2(struct Task *task);
+static bool8 Phase2_FrontierSquaresSpiral_Func3(struct Task *task);
+static bool8 Phase2_FrontierSquaresSpiral_Func4(struct Task *task);
+static bool8 Phase2_FrontierSquaresScroll_Func1(struct Task *task);
+static bool8 Phase2_FrontierSquaresScroll_Func2(struct Task *task);
+static bool8 Phase2_FrontierSquaresScroll_Func3(struct Task *task);
+static bool8 Phase2_FrontierSquaresScroll_Func4(struct Task *task);
+static bool8 Phase2_FrontierSquaresScroll_Func5(struct Task *task);
 static bool8 Phase2_Mugshot_Func1(struct Task *task);
 static bool8 Phase2_Mugshot_Func2(struct Task *task);
 static bool8 Phase2_Mugshot_Func3(struct Task *task);
@@ -302,15 +302,15 @@ static const u16 sGroudon2_Palette[] = INCBIN_U16("graphics/battle_transitions/g
 static const u16 sRayquaza_Palette[] = INCBIN_U16("graphics/battle_transitions/rayquaza.gbapal");
 static const u32 sRayquaza_Tileset[] = INCBIN_U32("graphics/battle_transitions/rayquaza.4bpp");
 static const u32 sRayquaza_Tilemap[] = INCBIN_U32("graphics/battle_transitions/rayquaza.bin");
-static const u16 gUnknown_085C7BE0[] = INCBIN_U16("graphics/battle_transitions/frontier_brain.gbapal");
-static const u32 gUnknown_085C7C00[] = INCBIN_U32("graphics/battle_transitions/frontier_brain.4bpp.lz");
-static const u32 gUnknown_085C828C[] = INCBIN_U32("graphics/battle_transitions/frontier_brain.bin.lz");
-static const u16 gUnknown_085C8578[] = INCBIN_U16("graphics/battle_transitions/frontier_squares_blanktiles.gbapal");
-static const u32 gUnknown_085C8598[] = INCBIN_U32("graphics/battle_transitions/frontier_square_1.4bpp.lz");
-static const u32 gUnknown_085C86F4[] = INCBIN_U32("graphics/battle_transitions/frontier_square_2.4bpp.lz");
-static const u32 gUnknown_085C87F4[] = INCBIN_U32("graphics/battle_transitions/frontier_square_3.4bpp.lz");
-static const u32 gUnknown_085C88A4[] = INCBIN_U32("graphics/battle_transitions/frontier_square_4.4bpp.lz");
-static const u32 gUnknown_085C8928[] = INCBIN_U32("graphics/battle_transitions/frontier_squares.bin");
+static const u16 sFrontierLogo_Palette[] = INCBIN_U16("graphics/battle_transitions/frontier_logo.gbapal");
+static const u32 sFrontierLogo_Tileset[] = INCBIN_U32("graphics/battle_transitions/frontier_logo.4bpp.lz");
+static const u32 sFrontierLogo_Tilemap[] = INCBIN_U32("graphics/battle_transitions/frontier_logo.bin.lz");
+static const u16 sFrontierSquares_Palette[] = INCBIN_U16("graphics/battle_transitions/frontier_squares_blanktiles.gbapal");
+static const u32 sFrontierSquares_FilledBg_Tileset[] = INCBIN_U32("graphics/battle_transitions/frontier_square_1.4bpp.lz");
+static const u32 sFrontierSquares_EmptyBg_Tileset[] = INCBIN_U32("graphics/battle_transitions/frontier_square_2.4bpp.lz");
+static const u32 sFrontierSquares_Shrink1_Tileset[] = INCBIN_U32("graphics/battle_transitions/frontier_square_3.4bpp.lz");
+static const u32 sFrontierSquares_Shrink2_Tileset[] = INCBIN_U32("graphics/battle_transitions/frontier_square_4.4bpp.lz");
+static const u32 sFrontierSquares_Tilemap[] = INCBIN_U32("graphics/battle_transitions/frontier_squares.bin");
 
 static const TaskFunc sPhase1_Tasks[B_TRANSITION_COUNT] =
 {
@@ -348,19 +348,19 @@ static const TaskFunc sPhase2_Tasks[B_TRANSITION_COUNT] =
     [B_TRANSITION_BLACKHOLE1] = Phase2Task_Blackhole1,
     [B_TRANSITION_BLACKHOLE2] = Phase2Task_Blackhole2,
     [B_TRANSITION_RECTANGULAR_SPIRAL] = Phase2Task_RectangularSpiral,
-    [B_TRANSITION_29] = Phase2Task_29,
-    [B_TRANSITION_30] = Phase2Task_30,
-    [B_TRANSITION_31] = Phase2Task_31,
-    [B_TRANSITION_32] = Phase2Task_32,
-    [B_TRANSITION_33] = Phase2Task_33,
-    [B_TRANSITION_34] = Phase2Task_34,
-    [B_TRANSITION_35] = Phase2Task_35,
-    [B_TRANSITION_36] = Phase2Task_36,
-    [B_TRANSITION_37] = Phase2Task_37,
-    [B_TRANSITION_38] = Phase2Task_38,
-    [B_TRANSITION_39] = Phase2Task_39,
-    [B_TRANSITION_40] = Phase2Task_40,
-    [B_TRANSITION_41] = Phase2Task_41,
+    [B_TRANSITION_FRONTIER_LOGO_WIGGLE] = Phase2Task_FrontierLogoWiggle,
+    [B_TRANSITION_FRONTIER_LOGO_WAVE] = Phase2Task_FrontierLogoWave,
+    [B_TRANSITION_FRONTIER_SQUARES] = Phase2Task_FrontierSquares,
+    [B_TRANSITION_FRONTIER_SQUARES_SCROLL] = Phase2Task_FrontierSquaresScroll,
+    [B_TRANSITION_FRONTIER_SQUARES_SPIRAL] = Phase2Task_FrontierSquaresSpiral,
+    [B_TRANSITION_FRONTIER_CIRCLES_MEET] = Phase2Task_FrontierCirclesMeet,
+    [B_TRANSITION_FRONTIER_CIRCLES_CROSS] = Phase2Task_FrontierCirclesCross,
+    [B_TRANSITION_FRONTIER_CIRCLES_ASYMMETRIC_SPIRAL] = Phase2Task_FrontierCirclesAsymmetricSpiral,
+    [B_TRANSITION_FRONTIER_CIRCLES_SYMMETRIC_SPIRAL] = Phase2Task_FrontierCirclesSymmetricSpiral,
+    [B_TRANSITION_FRONTIER_CIRCLES_MEET_IN_SEQ] = Phase2Task_FrontierCirclesMeetInSeq,
+    [B_TRANSITION_FRONTIER_CIRCLES_CROSS_IN_SEQ] = Phase2Task_FrontierCirclesCrossInSeq,
+    [B_TRANSITION_FRONTIER_CIRCLES_ASYMMETRIC_SPIRAL_IN_SEQ] = Phase2Task_FrontierCirclesAsymmetricSpiralInSeq,
+    [B_TRANSITION_FRONTIER_CIRCLES_SYMMETRIC_SPIRAL_IN_SEQ] = Phase2Task_FrontierCirclesSymmetricSpiralInSeq,
 };
 
 static const TransitionStateFunc sMainTransitionPhases[] =
@@ -749,7 +749,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_Pokeball[] =
 static const struct SpriteTemplate sSpriteTemplate_Pokeball =
 {
     .tileTag = 0xFFFF,
-    .paletteTag = 4105,
+    .paletteTag = FLDEFF_PAL_TAG_POKEBALL,
     .oam = &gObjectEventBaseOam_32x32,
     .anims = sSpriteAnimTable_Pokeball,
     .images = sSpriteImage_Pokeball,
@@ -798,7 +798,7 @@ static const union AnimCmd *const sSpriteAnimTable_UnusedBrendanLass[] =
 static const struct SpriteTemplate sSpriteTemplate_UnusedBrendan =
 {
     .tileTag = 0xFFFF,
-    .paletteTag = 4106,
+    .paletteTag = 0x100A,
     .oam = &sOam_UnusedBrendanLass,
     .anims = sSpriteAnimTable_UnusedBrendanLass,
     .images = sImageTable_UnusedBrendan,
@@ -809,7 +809,7 @@ static const struct SpriteTemplate sSpriteTemplate_UnusedBrendan =
 static const struct SpriteTemplate sSpriteTemplate_UnusedLass =
 {
     .tileTag = 0xFFFF,
-    .paletteTag = 4106,
+    .paletteTag = 0x100A,
     .oam = &sOam_UnusedBrendanLass,
     .anims = sSpriteAnimTable_UnusedBrendanLass,
     .images = sImageTable_UnusedLass,
@@ -817,12 +817,9 @@ static const struct SpriteTemplate sSpriteTemplate_UnusedLass =
     .callback = SpriteCb_TrainerPic
 };
 
-static const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/field_effects/palettes/10.gbapal");
+static const u16 sFieldEffectPal_Pokeball[] = INCBIN_U16("graphics/field_effects/palettes/pokeball.gbapal");
 
-const struct SpritePalette gFieldEffectObjectPaletteInfo10 =
-{
-    gFieldEffectObjectPalette10, 0x1009
-};
+const struct SpritePalette gSpritePalette_Pokeball = {sFieldEffectPal_Pokeball, FLDEFF_PAL_TAG_POKEBALL};
 
 static const u16 sMugshotPal_Sidney[] = INCBIN_U16("graphics/battle_transitions/sidney_bg.gbapal");
 static const u16 sMugshotPal_Phoebe[] = INCBIN_U16("graphics/battle_transitions/phoebe_bg.gbapal");
@@ -848,56 +845,53 @@ static const u16 *const sPlayerMugshotsPals[GENDER_COUNT] =
 };
 
 static const u16 sUnusedTrainerPalette[] = INCBIN_U16("graphics/battle_transitions/unused_trainer.gbapal");
-static const struct SpritePalette sSpritePalette_UnusedTrainer =
-{
-    sUnusedTrainerPalette, 0x100A
-};
+static const struct SpritePalette sSpritePalette_UnusedTrainer = {sUnusedTrainerPalette, 0x100A};
 
 static const u16 sBigPokeball_Tilemap[] = INCBIN_U16("graphics/battle_transitions/big_pokeball_map.bin");
 static const u16 sMugshotsTilemap[] = INCBIN_U16("graphics/battle_transitions/elite_four_bg_map.bin");
 
-static const TransitionStateFunc sPhase2_29_Funcs[] =
+static const TransitionStateFunc sPhase2_FrontierLogoWiggle_Funcs[] =
 {
-    Phase2_29_Func1,
-    Phase2_29_Func2,
+    Phase2_FrontierLogoWiggle_Func1,
+    Phase2_FrontierLogoWiggle_Func2,
     Phase2_BigPokeball_Func3,
     Phase2_BigPokeball_Func4,
     Phase2_BigPokeball_Func5,
     Phase2_BigPokeball_Func6
 };
 
-static const TransitionStateFunc sPhase2_30_Funcs[] =
+static const TransitionStateFunc sPhase2_FrontierLogoWave_Funcs[] =
 {
-    Phase2_30_Func1,
-    Phase2_30_Func2,
-    Phase2_30_Func3,
-    Phase2_30_Func4
+    Phase2_FrontierLogoWave_Func1,
+    Phase2_FrontierLogoWave_Func2,
+    Phase2_FrontierLogoWave_Func3,
+    Phase2_FrontierLogoWave_Func4
 };
 
-static const TransitionStateFunc sPhase2_31_Funcs[] =
+static const TransitionStateFunc sPhase2_FrontierSquares_Funcs[] =
 {
-    Phase2_31_Func1,
-    Phase2_31_Func2,
-    Phase2_31_Func3,
-    Phase2_31_33_Func5
+    Phase2_FrontierSquares_Func1,
+    Phase2_FrontierSquares_Func2,
+    Phase2_FrontierSquares_Func3,
+    Phase2_FrontierSquares_End
 };
 
-static const TransitionStateFunc sPhase2_33_Funcs[] =
+static const TransitionStateFunc sPhase2_FrontierSquaresSpiral_Funcs[] =
 {
-    Phase2_33_Func1,
-    Phase2_33_Func2,
-    Phase2_33_Func3,
-    Phase2_33_Func4,
-    Phase2_31_33_Func5
+    Phase2_FrontierSquaresSpiral_Func1,
+    Phase2_FrontierSquaresSpiral_Func2,
+    Phase2_FrontierSquaresSpiral_Func3,
+    Phase2_FrontierSquaresSpiral_Func4,
+    Phase2_FrontierSquares_End
 };
 
-static const TransitionStateFunc sPhase2_32_Funcs[] =
+static const TransitionStateFunc sPhase2_FrontierSquaresScroll_Funcs[] =
 {
-    Phase2_32_Func1,
-    Phase2_32_Func2,
-    Phase2_32_Func3,
-    Phase2_32_Func4,
-    Phase2_32_Func5
+    Phase2_FrontierSquaresScroll_Func1,
+    Phase2_FrontierSquaresScroll_Func2,
+    Phase2_FrontierSquaresScroll_Func3,
+    Phase2_FrontierSquaresScroll_Func4,
+    Phase2_FrontierSquaresScroll_Func5
 };
 
 static const u8 gUnknown_085C9A30[] = {0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x1b, 0x14, 0x0d, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x07, 0x0e, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x13, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x0f, 0x10, 0x11, 0x12};
@@ -1323,7 +1317,7 @@ static bool8 Phase2_BigPokeball_Func1(struct Task *task)
     GetBg0TilesDst(&tilemap, &tileset);
     CpuFill16(0, tilemap, 0x800);
     CpuCopy16(sBigPokeball_Tileset, tileset, 0x580);
-    LoadPalette(gFieldEffectObjectPalette10, 0xF0, 0x20);
+    LoadPalette(sFieldEffectPal_Pokeball, 0xF0, 0x20);
 
     task->tState++;
     return FALSE;
@@ -1629,7 +1623,7 @@ static bool8 Phase2_PokeballsTrail_Func1(struct Task *task)
     GetBg0TilesDst(&tilemap, &tileset);
     CpuSet(sPokeballTrail_Tileset, tileset, 0x20);
     CpuFill32(0, tilemap, 0x800);
-    LoadPalette(gFieldEffectObjectPalette10, 0xF0, 0x20);
+    LoadPalette(sFieldEffectPal_Pokeball, 0xF0, 0x20);
 
     task->tState++;
     return FALSE;
@@ -2919,7 +2913,7 @@ static bool8 Phase2_RectangularSpiral_Func1(struct Task *task)
     CpuCopy16(sShrinkingBoxTileset, tileset, 0x20);
     CpuCopy16(sShrinkingBoxTileset + 0x70, tileset + 0x20, 0x20);
     CpuFill16(0xF000, tilemap, 0x800);
-    LoadPalette(gFieldEffectObjectPalette10, 0xF0, 0x20);
+    LoadPalette(sFieldEffectPal_Pokeball, 0xF0, 0x20);
 
     task->tData3 = 1;
     task->tState++;
@@ -3428,7 +3422,7 @@ static bool8 Phase2_GridSquares_Func1(struct Task *task)
     GetBg0TilesDst(&tilemap, &tileset);
     CpuSet(sShrinkingBoxTileset, tileset, 0x10);
     CpuFill16(0xF000, tilemap, 0x800);
-    LoadPalette(gFieldEffectObjectPalette10, 0xF0, 0x20);
+    LoadPalette(sFieldEffectPal_Pokeball, 0xF0, 0x20);
 
     task->tState++;
     return FALSE;
@@ -3856,43 +3850,43 @@ static bool8 sub_814A228(s16 *data, bool8 a1, bool8 a2)
 #define tData6      data[6]
 #define tData7      data[7]
 
-static bool8 Phase2_29_Func1(struct Task *task)
+static bool8 Phase2_FrontierLogoWiggle_Func1(struct Task *task)
 {
     u16 *tilemap, *tileset;
 
     sub_814669C(task);
     GetBg0TilesDst(&tilemap, &tileset);
     CpuFill16(0, tilemap, 0x800);
-    LZ77UnCompVram(gUnknown_085C7C00, tileset);
-    LoadPalette(gUnknown_085C7BE0, 0xF0, 0x20);
+    LZ77UnCompVram(sFrontierLogo_Tileset, tileset);
+    LoadPalette(sFrontierLogo_Palette, 0xF0, 0x20);
 
     task->tState++;
     return FALSE;
 }
 
-static bool8 Phase2_29_Func2(struct Task *task)
+static bool8 Phase2_FrontierLogoWiggle_Func2(struct Task *task)
 {
     u16 *tilemap, *tileset;
 
     GetBg0TilesDst(&tilemap, &tileset);
-    LZ77UnCompVram(gUnknown_085C828C, tilemap);
+    LZ77UnCompVram(sFrontierLogo_Tilemap, tilemap);
     sub_8149F98(gScanlineEffectRegBuffers[0], 0, task->tData4, 0x84, task->tData5, 160);
 
     task->tState++;
     return TRUE;
 }
 
-static void Phase2Task_29(u8 taskId)
+static void Phase2Task_FrontierLogoWiggle(u8 taskId)
 {
-    while (sPhase2_29_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+    while (sPhase2_FrontierLogoWiggle_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-static void Phase2Task_30(u8 taskId)
+static void Phase2Task_FrontierLogoWave(u8 taskId)
 {
-    while (sPhase2_30_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+    while (sPhase2_FrontierLogoWave_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-static bool8 Phase2_30_Func1(struct Task *task)
+static bool8 Phase2_FrontierLogoWave_Func1(struct Task *task)
 {
     u16 *tilemap, *tileset;
 
@@ -3910,26 +3904,26 @@ static bool8 Phase2_30_Func1(struct Task *task)
     REG_BLDALPHA = sTransitionStructPtr->BLDALPHA;
     GetBg0TilesDst(&tilemap, &tileset);
     CpuFill16(0, tilemap, 0x800);
-    LZ77UnCompVram(gUnknown_085C7C00, tileset);
-    LoadPalette(gUnknown_085C7BE0, 0xF0, 0x20);
+    LZ77UnCompVram(sFrontierLogo_Tileset, tileset);
+    LoadPalette(sFrontierLogo_Palette, 0xF0, 0x20);
     sTransitionStructPtr->field_16 = 0;
 
     task->tState++;
     return FALSE;
 }
 
-static bool8 Phase2_30_Func2(struct Task *task)
+static bool8 Phase2_FrontierLogoWave_Func2(struct Task *task)
 {
     u16 *tilemap, *tileset;
 
     GetBg0TilesDst(&tilemap, &tileset);
-    LZ77UnCompVram(gUnknown_085C828C, tilemap);
+    LZ77UnCompVram(sFrontierLogo_Tilemap, tilemap);
 
     task->tState++;
     return TRUE;
 }
 
-static bool8 Phase2_30_Func3(struct Task *task)
+static bool8 Phase2_FrontierLogoWave_Func3(struct Task *task)
 {
     u8 i;
 
@@ -3946,7 +3940,7 @@ static bool8 Phase2_30_Func3(struct Task *task)
     return TRUE;
 }
 
-static bool8 Phase2_30_Func4(struct Task *task)
+static bool8 Phase2_FrontierLogoWave_Func4(struct Task *task)
 {
     u8 i;
     u16 var6, amplitude, var8;
@@ -3991,7 +3985,7 @@ static bool8 Phase2_30_Func4(struct Task *task)
     }
 
     if (task->tData4 != 0 && !gPaletteFade.active)
-        DestroyTask(FindTaskIdByFunc(Phase2Task_30));
+        DestroyTask(FindTaskIdByFunc(Phase2Task_FrontierLogoWave));
 
     task->tData7 -= 17;
     sTransitionStructPtr->VBlank_DMA++;
@@ -4014,33 +4008,33 @@ static void HBlankCB_Phase2_30(void)
     REG_BG0VOFS = var;
 }
 
-static void Phase2Task_31(u8 taskId)
+static void Phase2Task_FrontierSquares(u8 taskId)
 {
-    while (sPhase2_31_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+    while (sPhase2_FrontierSquares_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-static void Phase2Task_33(u8 taskId)
+static void Phase2Task_FrontierSquaresSpiral(u8 taskId)
 {
-    while (sPhase2_33_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+    while (sPhase2_FrontierSquaresSpiral_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-static void Phase2Task_32(u8 taskId)
+static void Phase2Task_FrontierSquaresScroll(u8 taskId)
 {
-    while (sPhase2_32_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+    while (sPhase2_FrontierSquaresScroll_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-static bool8 Phase2_31_Func1(struct Task *task)
+static bool8 Phase2_FrontierSquares_Func1(struct Task *task)
 {
     u16 *tilemap, *tileset;
 
     GetBg0TilesDst(&tilemap, &tileset);
-    LZ77UnCompVram(gUnknown_085C8598, tileset);
+    LZ77UnCompVram(sFrontierSquares_FilledBg_Tileset, tileset);
 
     FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20);
     FillBgTilemapBufferRect(0, 1, 0, 0, 1, 0x20, 0xF);
     FillBgTilemapBufferRect(0, 1, 0x1D, 0, 1, 0x20, 0xF);
     CopyBgTilemapBufferToVram(0);
-    LoadPalette(gUnknown_085C8578, 0xF0, 0x20);
+    LoadPalette(sFrontierSquares_Palette, 0xF0, 0x20);
 
     task->tData2 = 1;
     task->tData3 = 0;
@@ -4051,9 +4045,9 @@ static bool8 Phase2_31_Func1(struct Task *task)
     return FALSE;
 }
 
-static bool8 Phase2_31_Func2(struct Task *task)
+static bool8 Phase2_FrontierSquares_Func2(struct Task *task)
 {
-    CopyRectToBgTilemapBufferRect(0, gUnknown_085C8928, 0, 0, 4, 4, task->tData2, task->tData3, 4, 4, 0xF, 0, 0);
+    CopyRectToBgTilemapBufferRect(0, sFrontierSquares_Tilemap, 0, 0, 4, 4, task->tData2, task->tData3, 4, 4, 0xF, 0, 0);
     CopyBgTilemapBufferToVram(0);
 
     task->tData2 += 4;
@@ -4069,7 +4063,7 @@ static bool8 Phase2_31_Func2(struct Task *task)
     return FALSE;
 }
 
-static bool8 Phase2_31_Func3(struct Task *task)
+static bool8 Phase2_FrontierSquares_Func3(struct Task *task)
 {
     u8 i;
     u16 *tilemap, *tileset;
@@ -4088,13 +4082,13 @@ static bool8 Phase2_31_Func3(struct Task *task)
             break;
         case 1:
             BlendPalettes(0xFFFF7FFF, 0x10, 0);
-            LZ77UnCompVram(gUnknown_085C86F4, tileset);
+            LZ77UnCompVram(sFrontierSquares_EmptyBg_Tileset, tileset);
             break;
         case 2:
-            LZ77UnCompVram(gUnknown_085C87F4, tileset);
+            LZ77UnCompVram(sFrontierSquares_Shrink1_Tileset, tileset);
             break;
         case 3:
-            LZ77UnCompVram(gUnknown_085C88A4, tileset);
+            LZ77UnCompVram(sFrontierSquares_Shrink2_Tileset, tileset);
             break;
         default:
             FillBgTilemapBufferRect_Palette0(0, 1, 0, 0, 0x20, 0x20);
@@ -4110,19 +4104,19 @@ static bool8 Phase2_31_Func3(struct Task *task)
     return FALSE;
 }
 
-static bool8 Phase2_33_Func1(struct Task *task)
+static bool8 Phase2_FrontierSquaresSpiral_Func1(struct Task *task)
 {
     u16 *tilemap, *tileset;
 
     GetBg0TilesDst(&tilemap, &tileset);
-    LZ77UnCompVram(gUnknown_085C8598, tileset);
+    LZ77UnCompVram(sFrontierSquares_FilledBg_Tileset, tileset);
 
     FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20);
     FillBgTilemapBufferRect(0, 1, 0, 0, 1, 0x20, 0xF);
     FillBgTilemapBufferRect(0, 1, 0x1D, 0, 1, 0x20, 0xF);
     CopyBgTilemapBufferToVram(0);
-    LoadPalette(gUnknown_085C8578, 0xE0, 0x20);
-    LoadPalette(gUnknown_085C8578, 0xF0, 0x20);
+    LoadPalette(sFrontierSquares_Palette, 0xE0, 0x20);
+    LoadPalette(sFrontierSquares_Palette, 0xF0, 0x20);
     BlendPalette(0xE0, 0x10, 8, 0);
 
     task->tData2 = 34;
@@ -4132,12 +4126,12 @@ static bool8 Phase2_33_Func1(struct Task *task)
     return FALSE;
 }
 
-static bool8 Phase2_33_Func2(struct Task *task)
+static bool8 Phase2_FrontierSquaresSpiral_Func2(struct Task *task)
 {
     u8 var = gUnknown_085C9A30[task->tData2];
     u8 varMod = var % 7;
     u8 varDiv = var / 7;
-    CopyRectToBgTilemapBufferRect(0, &gUnknown_085C8928, 0, 0, 4, 4, 4 * varMod + 1, 4 * varDiv, 4, 4, 0xF, 0, 0);
+    CopyRectToBgTilemapBufferRect(0, &sFrontierSquares_Tilemap, 0, 0, 4, 4, 4 * varMod + 1, 4 * varDiv, 4, 4, 0xF, 0, 0);
     CopyBgTilemapBufferToVram(0);
 
     if (--task->tData2 < 0)
@@ -4145,7 +4139,7 @@ static bool8 Phase2_33_Func2(struct Task *task)
     return FALSE;
 }
 
-static bool8 Phase2_33_Func3(struct Task *task)
+static bool8 Phase2_FrontierSquaresSpiral_Func3(struct Task *task)
 {
     BlendPalette(0xE0, 0x10, 3, 0);
     BlendPalettes(0xFFFF3FFF, 0x10, 0);
@@ -4157,13 +4151,13 @@ static bool8 Phase2_33_Func3(struct Task *task)
     return FALSE;
 }
 
-static bool8 Phase2_33_Func4(struct Task *task)
+static bool8 Phase2_FrontierSquaresSpiral_Func4(struct Task *task)
 {
     if ((task->tData3 ^= 1))
     {
         CopyRectToBgTilemapBufferRect(
         0,
-        gUnknown_085C8928,
+        sFrontierSquares_Tilemap,
         0,
         0,
         4,
@@ -4200,7 +4194,7 @@ static bool8 Phase2_33_Func4(struct Task *task)
     return FALSE;
 }
 
-static bool8 Phase2_31_33_Func5(struct Task *task)
+static bool8 Phase2_FrontierSquares_End(struct Task *task)
 {
     FillBgTilemapBufferRect_Palette0(0, 1, 0, 0, 0x20, 0x20);
     CopyBgTilemapBufferToVram(0);
@@ -4225,16 +4219,16 @@ static void sub_814ABE4(u8 taskId)
     }
 }
 
-static bool8 Phase2_32_Func1(struct Task *task)
+static bool8 Phase2_FrontierSquaresScroll_Func1(struct Task *task)
 {
     u8 taskId = 0;
     u16 *tilemap, *tileset;
 
     GetBg0TilesDst(&tilemap, &tileset);
-    LZ77UnCompVram(gUnknown_085C8598, tileset);
+    LZ77UnCompVram(sFrontierSquares_FilledBg_Tileset, tileset);
     FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20);
     CopyBgTilemapBufferToVram(0);
-    LoadPalette(gUnknown_085C8578, 0xF0, 0x20);
+    LoadPalette(sFrontierSquares_Palette, 0xF0, 0x20);
 
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
@@ -4267,7 +4261,7 @@ static bool8 Phase2_32_Func1(struct Task *task)
     return FALSE;
 }
 
-static bool8 Phase2_32_Func2(struct Task *task)
+static bool8 Phase2_FrontierSquaresScroll_Func2(struct Task *task)
 {
     u8 var = gUnknown_085C9A53[task->tData2];
     u8 varDiv = var / 8;
@@ -4275,7 +4269,7 @@ static bool8 Phase2_32_Func2(struct Task *task)
 
     CopyRectToBgTilemapBufferRect(
     0,
-    &gUnknown_085C8928,
+    &sFrontierSquares_Tilemap,
     0,
     0,
     4,
@@ -4294,7 +4288,7 @@ static bool8 Phase2_32_Func2(struct Task *task)
     return 0;
 }
 
-static bool8 Phase2_32_Func3(struct Task *task)
+static bool8 Phase2_FrontierSquaresScroll_Func3(struct Task *task)
 {
     BlendPalettes(0xFFFF7FFF, 0x10, 0);
 
@@ -4304,7 +4298,7 @@ static bool8 Phase2_32_Func3(struct Task *task)
     return FALSE;
 }
 
-static bool8 Phase2_32_Func4(struct Task *task)
+static bool8 Phase2_FrontierSquaresScroll_Func4(struct Task *task)
 {
     u8 var = gUnknown_085C9A53[task->tData2];
     u8 varDiv = var / 8;
@@ -4326,7 +4320,7 @@ static bool8 Phase2_32_Func4(struct Task *task)
 #undef tSub32_Y_delta
 #undef tSub32_Bool
 
-static bool8 Phase2_32_Func5(struct Task *task)
+static bool8 Phase2_FrontierSquaresScroll_Func5(struct Task *task)
 {
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
diff --git a/src/battle_transition_frontier.c b/src/battle_transition_frontier.c
new file mode 100644
index 000000000..931de5e44
--- /dev/null
+++ b/src/battle_transition_frontier.c
@@ -0,0 +1,650 @@
+#include "global.h"
+#include "sprite.h"
+#include "decompress.h"
+#include "battle_transition_frontier.h"
+#include "battle_transition.h"
+#include "task.h"
+#include "palette.h"
+#include "trig.h"
+#include "bg.h"
+#include "gpu_regs.h"
+#include "constants/rgb.h"
+
+/*
+    There are 3 "categories" of Battle Frontier transition
+    1. The full logo is used (B_TRANSITION_FRONTIER_LOGO_*)
+    2. Small squares with the logo on it are used (B_TRANSITION_FRONTIER_SQUARES_*)
+    3. The balls that make up the logo come together to form the full logo (B_TRANSITION_FRONTIER_CIRCLES_*)
+
+    This file handles category 3. Functions for the other two are handled in battle_transition.c
+*/
+
+typedef bool8 (*TransitionStateFunc)(struct Task *task);
+
+// this file's functions
+static void SpriteCB_LogoCircleSlide(struct Sprite *sprite);
+static void SpriteCB_LogoCircleSpiral(struct Sprite *sprite);
+static bool8 WaitForLogoCirclesAnim(struct Task *task);
+static bool8 FadeInCenterLogoCircle(struct Task *task);
+static bool8 Circles_Init(struct Task *task);
+static bool8 CirclesMeet_CreateSprites(struct Task *task);
+static bool8 CirclesMeet_End(struct Task *task);
+static bool8 CirclesCross_CreateSprites(struct Task *task);
+static bool8 CirclesCross_End(struct Task *task);
+static bool8 CirclesAsymmetricSpiral_CreateSprites(struct Task *task);
+static bool8 CirclesAsymmetricSpiral_End(struct Task *task);
+static bool8 CirclesSymmetricSpiral_CreateSprites(struct Task *task);
+static bool8 CirclesSymmetricSpiral_End(struct Task *task);
+static bool8 CirclesMeetInSeq_CreateSprites(struct Task *task);
+static bool8 CirclesMeetInSeq_End(struct Task *task);
+static bool8 CirclesCrossInSeq_CreateSprites(struct Task *task);
+static bool8 CirclesCrossInSeq_End(struct Task *task);
+static bool8 CirclesAsymmetricSpiralInSeq_CreateSprites(struct Task *task);
+static bool8 CirclesAsymmetricSpiralInSeq_End(struct Task *task);
+static bool8 CirclesSymmetricSpiralInSeq_CreateSprites(struct Task *task);
+static bool8 CirclesSymmetricSpiralInSeq_End(struct Task *task);
+
+#define PALTAG_LOGO_CIRCLES 0x2E90
+
+// const rom data
+static const u32 sLogoCenter_Gfx[] = INCBIN_U32("graphics/battle_transitions/frontier_logo_center.4bpp.lz");
+static const u32 sLogoCenter_Tilemap[] = INCBIN_U32("graphics/battle_transitions/frontier_logo_center.bin");
+static const u32 sLogoCircles_Gfx[] = INCBIN_U32("graphics/battle_transitions/frontier_logo_circles.4bpp.lz");
+static const u16 sLogo_Pal[] = INCBIN_U16("graphics/battle_transitions/frontier_logo_circles.gbapal");
+
+// Unused Empty data.
+static const u8 sFiller[0x1C0] = {0};
+
+static const struct OamData sOamData_LogoCircles =
+{
+    .y = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .mosaic = 0,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(64x64),
+    .x = 0,
+    .matrixNum = 0,
+    .size = SPRITE_SIZE(64x64),
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+static const struct CompressedSpriteSheet sSpriteSheet_LogoCircles =
+{
+    .data = sLogoCircles_Gfx,
+    .size = 0x1800,
+    .tag = PALTAG_LOGO_CIRCLES
+};
+
+static const struct SpritePalette sSpritePalette_LogoCircles =
+{
+    .data = sLogo_Pal,
+    .tag = PALTAG_LOGO_CIRCLES
+};
+
+static const union AnimCmd sAnim_LogoCircle_Top[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sAnim_LogoCircle_Left[] =
+{
+    ANIMCMD_FRAME(64, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sAnim_LogoCircle_Right[] =
+{
+    ANIMCMD_FRAME(128, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sAnimTable_LogoCircles[] =
+{
+    sAnim_LogoCircle_Top,
+    sAnim_LogoCircle_Left,
+    sAnim_LogoCircle_Right
+};
+
+static const struct SpriteTemplate sSpriteTemplate_LogoCircles =
+{
+    .tileTag = PALTAG_LOGO_CIRCLES,
+    .paletteTag = PALTAG_LOGO_CIRCLES,
+    .oam = &sOamData_LogoCircles,
+    .anims = sAnimTable_LogoCircles,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+static const TransitionStateFunc sPhase2_FrontierCirclesMeet_Funcs[] =
+{
+    Circles_Init,
+    CirclesMeet_CreateSprites,
+    WaitForLogoCirclesAnim,
+    FadeInCenterLogoCircle,
+    CirclesMeet_End
+};
+
+static const TransitionStateFunc sPhase2_FrontierCirclesCross_Funcs[] =
+{
+    Circles_Init,
+    CirclesCross_CreateSprites,
+    WaitForLogoCirclesAnim,
+    FadeInCenterLogoCircle,
+    CirclesCross_End
+};
+
+static const TransitionStateFunc sPhase2_FrontierCirclesAsymmetricSpiral_Funcs[] =
+{
+    Circles_Init,
+    CirclesAsymmetricSpiral_CreateSprites,
+    WaitForLogoCirclesAnim,
+    FadeInCenterLogoCircle,
+    CirclesAsymmetricSpiral_End
+};
+
+static const TransitionStateFunc sPhase2_FrontierCirclesSymmetricSpiral_Funcs[] =
+{
+    Circles_Init,
+    CirclesSymmetricSpiral_CreateSprites,
+    WaitForLogoCirclesAnim,
+    FadeInCenterLogoCircle,
+    CirclesSymmetricSpiral_End
+};
+
+static const TransitionStateFunc sPhase2_FrontierCirclesMeetInSeq_Funcs[] =
+{
+    Circles_Init,
+    CirclesMeetInSeq_CreateSprites,
+    WaitForLogoCirclesAnim,
+    FadeInCenterLogoCircle,
+    CirclesMeetInSeq_End
+};
+
+static const TransitionStateFunc sPhase2_FrontierCirclesCrossInSeq_Funcs[] =
+{
+    Circles_Init,
+    CirclesCrossInSeq_CreateSprites,
+    WaitForLogoCirclesAnim,
+    FadeInCenterLogoCircle,
+    CirclesCrossInSeq_End
+};
+
+static const TransitionStateFunc sPhase2_FrontierCirclesAsymmetricSpiralInSeq_Funcs[] =
+{
+    Circles_Init,
+    CirclesAsymmetricSpiralInSeq_CreateSprites,
+    WaitForLogoCirclesAnim,
+    FadeInCenterLogoCircle,
+    CirclesAsymmetricSpiralInSeq_End
+};
+
+static const TransitionStateFunc sPhase2_FrontierCirclesSymmetricSpiralInSeq_Funcs[] =
+{
+    Circles_Init,
+    CirclesSymmetricSpiralInSeq_CreateSprites,
+    WaitForLogoCirclesAnim,
+    FadeInCenterLogoCircle,
+    CirclesSymmetricSpiralInSeq_End
+};
+
+// code
+static void LoadLogoGfx(void)
+{
+    u16 *dst1, *dst2;
+
+    GetBg0TilesDst(&dst1, &dst2);
+    LZ77UnCompVram(sLogoCenter_Gfx, dst2);
+    LZ77UnCompVram(sLogoCenter_Tilemap, dst1);
+    LoadPalette(sLogo_Pal, 0xF0, 0x20);
+    LoadCompressedSpriteSheet(&sSpriteSheet_LogoCircles);
+    LoadSpritePalette(&sSpritePalette_LogoCircles);
+}
+
+static u8 CreateSlidingLogoCircleSprite(s16 x, s16 y, u8 arg2, u8 arg3, s8 arg4, s8 arg5, u8 spriteAnimNum)
+{
+    u8 spriteId = CreateSprite(&sSpriteTemplate_LogoCircles, x, y, 0);
+
+    switch (spriteAnimNum)
+    {
+    case 0:
+        gSprites[spriteId].data[0] = 120;
+        gSprites[spriteId].data[1] = 45;
+        break;
+    case 1:
+        gSprites[spriteId].data[0] = 89;
+        gSprites[spriteId].data[1] = 97;
+        break;
+    case 2:
+        gSprites[spriteId].data[0] = 151;
+        gSprites[spriteId].data[1] = 97;
+        break;
+    }
+
+    gSprites[spriteId].data[2] = arg4;
+    gSprites[spriteId].data[3] = arg5;
+    gSprites[spriteId].data[6] = arg2;
+    gSprites[spriteId].data[7] = arg3;
+    gSprites[spriteId].data[4] = 0;
+    gSprites[spriteId].data[5] = 0;
+
+    StartSpriteAnim(&gSprites[spriteId], spriteAnimNum);
+    gSprites[spriteId].callback = SpriteCB_LogoCircleSlide;
+
+    return spriteId;
+}
+
+static void SpriteCB_LogoCircleSlide(struct Sprite *sprite)
+{
+    s16 *data = sprite->data;
+
+    if (sprite->pos1.x == data[0] && sprite->pos1.y == data[1])
+    {
+        sprite->callback = SpriteCallbackDummy;
+    }
+    else
+    {
+        if (data[4] == data[6])
+        {
+            sprite->pos1.x += data[2];
+            data[4] = 0;
+        }
+        else
+        {
+            data[4]++;
+        }
+
+        if (data[5] == data[7])
+        {
+            sprite->pos1.y += data[3];
+            data[5] = 0;
+        }
+        else
+        {
+            data[5]++;
+        }
+    }
+}
+
+static u8 CreateSpiralingLogoCircleSprite(s16 x, s16 y, s16 arg2, s16 arg3, s16 arg4, s16 arg5, s16 arg6, u8 spriteAnimNum)
+{
+    u8 spriteId = CreateSprite(&sSpriteTemplate_LogoCircles, x, y, 0);
+
+    switch (spriteAnimNum)
+    {
+    case 0:
+        gSprites[spriteId].data[0] = 120;
+        gSprites[spriteId].data[1] = 45;
+        break;
+    case 1:
+        gSprites[spriteId].data[0] = 89;
+        gSprites[spriteId].data[1] = 97;
+        break;
+    case 2:
+        gSprites[spriteId].data[0] = 151;
+        gSprites[spriteId].data[1] = 97;
+        break;
+    }
+
+    gSprites[spriteId].data[2] = arg2;
+    gSprites[spriteId].data[3] = arg3;
+    gSprites[spriteId].data[4] = arg4;
+    gSprites[spriteId].data[5] = arg5;
+    gSprites[spriteId].data[6] = arg6;
+
+    StartSpriteAnim(&gSprites[spriteId], spriteAnimNum);
+    gSprites[spriteId].callback = SpriteCB_LogoCircleSpiral;
+
+    return spriteId;
+}
+
+static void SpriteCB_LogoCircleSpiral(struct Sprite *sprite)
+{
+    sprite->pos2.x = (Sin2(sprite->data[2]) * sprite->data[4]) >> 12; // div by 4096
+    sprite->pos2.y = (Cos2(sprite->data[2]) * sprite->data[4]) >> 12; // div by 4096
+
+    sprite->data[2] = (sprite->data[2] + sprite->data[3]) % 360;
+
+    if (sprite->data[4] != sprite->data[5])
+        sprite->data[4] += sprite->data[6];
+    else
+        sprite->callback = SpriteCallbackDummy;
+}
+
+#define tState          data[0]
+
+static void DestroyLogoCirclesGfx(struct Task *task)
+{
+    FreeSpriteTilesByTag(PALTAG_LOGO_CIRCLES);
+    FreeSpritePaletteByTag(PALTAG_LOGO_CIRCLES);
+
+    DestroySprite(&gSprites[task->data[4]]);
+    DestroySprite(&gSprites[task->data[5]]);
+    DestroySprite(&gSprites[task->data[6]]);
+}
+
+static bool8 IsLogoCirclesAnimFinished(struct Task *task)
+{
+    if (gSprites[task->data[4]].callback == SpriteCallbackDummy
+        && gSprites[task->data[5]].callback == SpriteCallbackDummy
+        && gSprites[task->data[6]].callback == SpriteCallbackDummy)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+static bool8 Circles_Init(struct Task *task)
+{
+    if (task->data[1] == 0)
+    {
+        ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON);
+        ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN1_ON);
+        ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG0_ON);
+
+        task->data[1]++;
+        return FALSE;
+    }
+    else
+    {
+        LoadLogoGfx();
+        SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL);
+        SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16));
+        ChangeBgX(0, 0, 0);
+        ChangeBgY(0, 0, 0);
+        ChangeBgY(0, 0x500, 2);
+
+        task->data[1] = 0;
+        task->tState++;
+        return TRUE;
+    }
+}
+
+static bool8 FadeInCenterLogoCircle(struct Task *task)
+{
+    if (task->data[2] == 0)
+        SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG0_ON);
+
+    if (task->data[2] == 16)
+    {
+        if (task->data[3] == 31)
+        {
+            BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 0x10, RGB_BLACK);
+            task->tState++;
+        }
+        else
+        {
+            task->data[3]++;
+        }
+    }
+    else
+    {
+        u16 blnd;
+
+        task->data[2]++;
+        blnd = task->data[2];
+        SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(blnd, 16 - blnd));
+    }
+
+    return FALSE;
+}
+
+static bool8 WaitForLogoCirclesAnim(struct Task *task)
+{
+    if (IsLogoCirclesAnimFinished(task) == TRUE)
+        task->tState++;
+
+    return FALSE;
+}
+
+void Phase2Task_FrontierCirclesMeet(u8 taskId)
+{
+    while (sPhase2_FrontierCirclesMeet_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+static bool8 CirclesMeet_CreateSprites(struct Task *task)
+{
+    task->data[4] = CreateSlidingLogoCircleSprite(120, -51, 0, 0, 0,   2, 0);
+    task->data[5] = CreateSlidingLogoCircleSprite(-7,  193, 0, 0, 2,  -2, 1);
+    task->data[6] = CreateSlidingLogoCircleSprite(247, 193, 0, 0, -2, -2, 2);
+
+    task->tState++;
+    return FALSE;
+}
+
+static bool8 CirclesMeet_End(struct Task *task)
+{
+    if (!gPaletteFade.active)
+    {
+        DestroyLogoCirclesGfx(task);
+        DestroyTask(FindTaskIdByFunc(Phase2Task_FrontierCirclesMeet));
+    }
+
+    return FALSE;
+}
+
+void Phase2Task_FrontierCirclesCross(u8 taskId)
+{
+    while (sPhase2_FrontierCirclesCross_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+static bool8 CirclesCross_CreateSprites(struct Task *task)
+{
+    task->data[4] = CreateSlidingLogoCircleSprite(120, 197, 0, 0, 0, -4, 0);
+    task->data[5] = CreateSlidingLogoCircleSprite(241, 59,  0, 1, -4, 2, 1);
+    task->data[6] = CreateSlidingLogoCircleSprite(-1,  59,  0, 1, 4,  2, 2);
+
+    task->tState++;
+    return FALSE;
+}
+
+static bool8 CirclesCross_End(struct Task *task)
+{
+    if (!gPaletteFade.active)
+    {
+        DestroyLogoCirclesGfx(task);
+        DestroyTask(FindTaskIdByFunc(Phase2Task_FrontierCirclesCross));
+    }
+
+    return FALSE;
+}
+
+void Phase2Task_FrontierCirclesAsymmetricSpiral(u8 taskId)
+{
+    while (sPhase2_FrontierCirclesAsymmetricSpiral_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+static bool8 CirclesAsymmetricSpiral_CreateSprites(struct Task *task)
+{
+    task->data[4] = CreateSpiralingLogoCircleSprite(120, 45, 12,  4, 128, 0, -4, 0);
+    task->data[5] = CreateSpiralingLogoCircleSprite(89,  97, 252, 4, 128, 0, -4, 1);
+    task->data[6] = CreateSpiralingLogoCircleSprite(151, 97, 132, 4, 128, 0, -4, 2);
+
+    task->tState++;
+    return FALSE;
+}
+
+static bool8 CirclesAsymmetricSpiral_End(struct Task *task)
+{
+    if (!gPaletteFade.active)
+    {
+        DestroyLogoCirclesGfx(task);
+        DestroyTask(FindTaskIdByFunc(Phase2Task_FrontierCirclesAsymmetricSpiral));
+    }
+
+    return FALSE;
+}
+
+void Phase2Task_FrontierCirclesSymmetricSpiral(u8 taskId)
+{
+    while (sPhase2_FrontierCirclesSymmetricSpiral_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+static bool8 CirclesSymmetricSpiral_CreateSprites(struct Task *task)
+{
+    task->data[4] = CreateSpiralingLogoCircleSprite(120, 80, 284, 8, 131, 35, -3, 0);
+    task->data[5] = CreateSpiralingLogoCircleSprite(120, 80, 44,  8, 131, 35, -3, 1);
+    task->data[6] = CreateSpiralingLogoCircleSprite(121, 80, 164, 8, 131, 35, -3, 2);
+
+    task->tState++;
+    return FALSE;
+}
+
+static bool8 CirclesSymmetricSpiral_End(struct Task *task)
+{
+    if (!gPaletteFade.active)
+    {
+        DestroyLogoCirclesGfx(task);
+        DestroyTask(FindTaskIdByFunc(Phase2Task_FrontierCirclesSymmetricSpiral));
+    }
+
+    return FALSE;
+}
+
+void Phase2Task_FrontierCirclesMeetInSeq(u8 taskId)
+{
+    while (sPhase2_FrontierCirclesMeetInSeq_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+static bool8 CirclesMeetInSeq_CreateSprites(struct Task *task)
+{
+    if (task->data[1] == 0)
+    {
+        task->data[4] = CreateSlidingLogoCircleSprite(120, -51, 0, 0, 0, 4,  0);
+    }
+    else if (task->data[1] == 16)
+    {
+        task->data[5] = CreateSlidingLogoCircleSprite(-7,  193, 0, 0, 4, -4, 1);
+    }
+    else if (task->data[1] == 32)
+    {
+        task->data[6] = CreateSlidingLogoCircleSprite(247, 193, 0, 0, -4, -4, 2);
+        task->tState++;
+    }
+
+    task->data[1]++;
+    return FALSE;
+}
+
+static bool8 CirclesMeetInSeq_End(struct Task *task)
+{
+    if (!gPaletteFade.active)
+    {
+        DestroyLogoCirclesGfx(task);
+        DestroyTask(FindTaskIdByFunc(Phase2Task_FrontierCirclesMeetInSeq));
+    }
+
+    return FALSE;
+}
+
+void Phase2Task_FrontierCirclesCrossInSeq(u8 taskId)
+{
+    while (sPhase2_FrontierCirclesCrossInSeq_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+static bool8 CirclesCrossInSeq_CreateSprites(struct Task *task)
+{
+    if (task->data[1] == 0)
+    {
+        task->data[4] = CreateSlidingLogoCircleSprite(120, 197, 0, 0, 0, -8,  0);
+    }
+    else if (task->data[1] == 16)
+    {
+        task->data[5] = CreateSlidingLogoCircleSprite(241, 78,  0, 0, -8, 1,  1);
+    }
+    else if (task->data[1] == 32)
+    {
+        task->data[6] = CreateSlidingLogoCircleSprite(-1,  78,  0, 0, 8,  1,  2);
+        task->tState++;
+    }
+
+    task->data[1]++;
+    return FALSE;
+}
+
+static bool8 CirclesCrossInSeq_End(struct Task *task)
+{
+    if (!gPaletteFade.active)
+    {
+        DestroyLogoCirclesGfx(task);
+        DestroyTask(FindTaskIdByFunc(Phase2Task_FrontierCirclesCrossInSeq));
+    }
+
+    return FALSE;
+}
+
+void Phase2Task_FrontierCirclesAsymmetricSpiralInSeq(u8 taskId)
+{
+    while (sPhase2_FrontierCirclesAsymmetricSpiralInSeq_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+static bool8 CirclesAsymmetricSpiralInSeq_CreateSprites(struct Task *task)
+{
+    if (task->data[1] == 0)
+    {
+        task->data[4] = CreateSpiralingLogoCircleSprite(120, 45, 12,  4, 128, 0, -4, 0);
+    }
+    else if (task->data[1] == 16)
+    {
+        task->data[5] = CreateSpiralingLogoCircleSprite(89,  97, 252, 4, 128, 0, -4, 1);
+    }
+    else if (task->data[1] == 32)
+    {
+        task->data[6] = CreateSpiralingLogoCircleSprite(151, 97, 132, 4, 128, 0, -4, 2);
+        task->tState++;
+    }
+
+    task->data[1]++;
+    return FALSE;
+}
+
+static bool8 CirclesAsymmetricSpiralInSeq_End(struct Task *task)
+{
+    if (!gPaletteFade.active)
+    {
+        DestroyLogoCirclesGfx(task);
+        DestroyTask(FindTaskIdByFunc(Phase2Task_FrontierCirclesAsymmetricSpiralInSeq));
+    }
+
+    return FALSE;
+}
+
+void Phase2Task_FrontierCirclesSymmetricSpiralInSeq(u8 taskId)
+{
+    while (sPhase2_FrontierCirclesSymmetricSpiralInSeq_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+static bool8 CirclesSymmetricSpiralInSeq_CreateSprites(struct Task *task)
+{
+    if (task->data[1] == 0)
+    {
+        task->data[4] = CreateSpiralingLogoCircleSprite(120, 80, 284, 8, 131, 35, -3, 0);
+    }
+    else if (task->data[1] == 16)
+    {
+        task->data[5] = CreateSpiralingLogoCircleSprite(120, 80, 44,  8, 131, 35, -3, 1);
+    }
+    else if (task->data[1] == 32)
+    {
+        task->data[6] = CreateSpiralingLogoCircleSprite(121, 80, 164, 8, 131, 35, -3, 2);
+        task->tState++;
+    }
+
+    task->data[1]++;
+    return FALSE;
+}
+
+static bool8 CirclesSymmetricSpiralInSeq_End(struct Task *task)
+{
+    if (!gPaletteFade.active)
+    {
+        DestroyLogoCirclesGfx(task);
+        DestroyTask(FindTaskIdByFunc(Phase2Task_FrontierCirclesSymmetricSpiralInSeq));
+    }
+
+    return FALSE;
+}
diff --git a/src/battle_tv.c b/src/battle_tv.c
index 26df08786..c84ae827b 100644
--- a/src/battle_tv.c
+++ b/src/battle_tv.c
@@ -1398,9 +1398,9 @@ static void TrySetBattleSeminarShow(void)
         return;
     else if (GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT)
         return;
-    else if (gBattleMons[gBattlerAttacker].statStages[STAT_ACC] <= 5)
+    else if (gBattleMons[gBattlerAttacker].statStages[STAT_ACC] < DEFAULT_STAT_STAGE)
         return;
-    else if (gBattleMons[gBattlerTarget].statStages[STAT_EVASION] > 6)
+    else if (gBattleMons[gBattlerTarget].statStages[STAT_EVASION] > DEFAULT_STAT_STAGE)
         return;
     else if (gCurrentMove == MOVE_HIDDEN_POWER || gCurrentMove == MOVE_WEATHER_BALL)
         return;
diff --git a/src/battle_util.c b/src/battle_util.c
index da3d50648..699fd05bc 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -259,7 +259,7 @@ void ResetSentPokesToOpponentValue(void)
         gSentPokesToOpponent[(i & BIT_FLANK) >> 1] = bits;
 }
 
-void sub_803F9EC(u8 battler)
+void OpponentSwitchInResetSentPokesToOpponentValue(u8 battler)
 {
     s32 i = 0;
     u32 bits = 0;
@@ -279,11 +279,11 @@ void sub_803F9EC(u8 battler)
     }
 }
 
-void sub_803FA70(u8 battler)
+void UpdateSentPokesToOpponentValue(u8 battler)
 {
     if (GetBattlerSide(battler) == B_SIDE_OPPONENT)
     {
-        sub_803F9EC(battler);
+        OpponentSwitchInResetSentPokesToOpponentValue(battler);
     }
     else
     {
@@ -864,9 +864,9 @@ u8 DoBattlerEndTurnEffects(void)
                     gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 16;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
-                    if ((gBattleMons[gActiveBattler].status1 & 0xF00) != 0xF00) // not 16 turns
-                        gBattleMons[gActiveBattler].status1 += 0x100;
-                    gBattleMoveDamage *= (gBattleMons[gActiveBattler].status1 & 0xF00) >> 8;
+                    if ((gBattleMons[gActiveBattler].status1 & STATUS1_TOXIC_COUNTER) != STATUS1_TOXIC_TURN(15)) // not 16 turns
+                        gBattleMons[gActiveBattler].status1 += STATUS1_TOXIC_TURN(1);
+                    gBattleMoveDamage *= (gBattleMons[gActiveBattler].status1 & STATUS1_TOXIC_COUNTER) >> 8;
                     BattleScriptExecute(BattleScript_PoisonTurnDmg);
                     effect++;
                 }
@@ -917,7 +917,7 @@ u8 DoBattlerEndTurnEffects(void)
             case ENDTURN_WRAP:  // wrap
                 if ((gBattleMons[gActiveBattler].status2 & STATUS2_WRAPPED) && gBattleMons[gActiveBattler].hp != 0)
                 {
-                    gBattleMons[gActiveBattler].status2 -= 0x2000;
+                    gBattleMons[gActiveBattler].status2 -= STATUS2_WRAPPED_TURN(1);
                     if (gBattleMons[gActiveBattler].status2 & STATUS2_WRAPPED)  // damaged by wrap
                     {
                         // This is the only way I could get this array access to match.
@@ -973,7 +973,7 @@ u8 DoBattlerEndTurnEffects(void)
                     else
                     {
                         gBattlerAttacker = gActiveBattler;
-                        gBattleMons[gActiveBattler].status2 -= 0x10;  // uproar timer goes down
+                        gBattleMons[gActiveBattler].status2 -= STATUS2_UPROAR_TURN(1);
                         if (WasUnableToUseMove(gActiveBattler))
                         {
                             CancelMultiTurnMoves(gActiveBattler);
@@ -999,7 +999,7 @@ u8 DoBattlerEndTurnEffects(void)
             case ENDTURN_THRASH:  // thrash
                 if (gBattleMons[gActiveBattler].status2 & STATUS2_LOCK_CONFUSE)
                 {
-                    gBattleMons[gActiveBattler].status2 -= 0x400;
+                    gBattleMons[gActiveBattler].status2 -= STATUS2_LOCK_CONFUSE_TURN(1);
                     if (WasUnableToUseMove(gActiveBattler))
                         CancelMultiTurnMoves(gActiveBattler);
                     else if (!(gBattleMons[gActiveBattler].status2 & STATUS2_LOCK_CONFUSE)
@@ -1062,7 +1062,7 @@ u8 DoBattlerEndTurnEffects(void)
                 break;
             case ENDTURN_LOCK_ON:  // lock-on decrement
                 if (gStatuses3[gActiveBattler] & STATUS3_ALWAYS_HITS)
-                    gStatuses3[gActiveBattler] -= 0x8;
+                    gStatuses3[gActiveBattler] -= STATUS3_ALWAYS_HITS_TURN(1);
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case ENDTURN_CHARGE:  // charge
@@ -1078,13 +1078,13 @@ u8 DoBattlerEndTurnEffects(void)
             case ENDTURN_YAWN:  // yawn
                 if (gStatuses3[gActiveBattler] & STATUS3_YAWN)
                 {
-                    gStatuses3[gActiveBattler] -= 0x800;
+                    gStatuses3[gActiveBattler] -= STATUS3_YAWN_TURN(1);
                     if (!(gStatuses3[gActiveBattler] & STATUS3_YAWN) && !(gBattleMons[gActiveBattler].status1 & STATUS1_ANY)
                      && gBattleMons[gActiveBattler].ability != ABILITY_VITAL_SPIRIT
                      && gBattleMons[gActiveBattler].ability != ABILITY_INSOMNIA && !UproarWakeUpCheck(gActiveBattler))
                     {
                         CancelMultiTurnMoves(gActiveBattler);
-                        gBattleMons[gActiveBattler].status1 |= (Random() & 3) + 2;
+                        gBattleMons[gActiveBattler].status1 |= STATUS1_SLEEP_TURN((Random() & 3) + 2); // 2-5 turns of sleep
                         BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
                         MarkBattlerForControllerExec(gActiveBattler);
                         gEffectBattler = gActiveBattler;
@@ -1250,7 +1250,7 @@ bool8 HandleFaintedMonActions(void)
             gBattleStruct->faintedActionsState = 3;
             break;
         case 2:
-            sub_803F9EC(gBattlerFainted);
+            OpponentSwitchInResetSentPokesToOpponentValue(gBattlerFainted);
             if (++gBattleStruct->faintedActionsBattlerId == gBattlersCount)
                 gBattleStruct->faintedActionsState = 3;
             else
@@ -1478,7 +1478,7 @@ u8 AtkCanceller_UnableToUseMove(void)
         case CANCELLER_CONFUSED: // confusion
             if (gBattleMons[gBattlerAttacker].status2 & STATUS2_CONFUSION)
             {
-                gBattleMons[gBattlerAttacker].status2--;
+                gBattleMons[gBattlerAttacker].status2 -= STATUS2_CONFUSION_TURN(1);
                 if (gBattleMons[gBattlerAttacker].status2 & STATUS2_CONFUSION)
                 {
                     if (Random() & 1)
@@ -1540,7 +1540,7 @@ u8 AtkCanceller_UnableToUseMove(void)
         case CANCELLER_BIDE: // bide
             if (gBattleMons[gBattlerAttacker].status2 & STATUS2_BIDE)
             {
-                gBattleMons[gBattlerAttacker].status2 -= 0x100;
+                gBattleMons[gBattlerAttacker].status2 -= STATUS2_BIDE_TURN(1);
                 if (gBattleMons[gBattlerAttacker].status2 & STATUS2_BIDE)
                 {
                     gBattlescriptCurrInstr = BattleScript_BideStoringEnergy;
@@ -1978,7 +1978,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                     }
                     break;
                 case ABILITY_SPEED_BOOST:
-                    if (gBattleMons[battler].statStages[STAT_SPEED] < 0xC && gDisableStructs[battler].isFirstTurn != 2)
+                    if (gBattleMons[battler].statStages[STAT_SPEED] < MAX_STAT_STAGE && gDisableStructs[battler].isFirstTurn != 2)
                     {
                         gBattleMons[battler].statStages[STAT_SPEED]++;
                         gBattleScripting.animArg1 = 0x11;
@@ -2619,9 +2619,9 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
         case HOLD_EFFECT_RESTORE_STATS:
             for (i = 0; i < NUM_BATTLE_STATS; i++)
             {
-                if (gBattleMons[battlerId].statStages[i] < 6)
+                if (gBattleMons[battlerId].statStages[i] < DEFAULT_STAT_STAGE)
                 {
-                    gBattleMons[battlerId].statStages[i] = 6;
+                    gBattleMons[battlerId].statStages[i] = DEFAULT_STAT_STAGE;
                     effect = ITEM_STATS_CHANGE;
                 }
             }
@@ -2690,9 +2690,9 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
             case HOLD_EFFECT_RESTORE_STATS:
                 for (i = 0; i < NUM_BATTLE_STATS; i++)
                 {
-                    if (gBattleMons[battlerId].statStages[i] < 6)
+                    if (gBattleMons[battlerId].statStages[i] < DEFAULT_STAT_STAGE)
                     {
-                        gBattleMons[battlerId].statStages[i] = 6;
+                        gBattleMons[battlerId].statStages[i] = DEFAULT_STAT_STAGE;
                         effect = ITEM_STATS_CHANGE;
                     }
                 }
@@ -2811,7 +2811,8 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
                 break;
             // copy/paste again, smh
             case HOLD_EFFECT_ATTACK_UP:
-                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn && gBattleMons[battlerId].statStages[STAT_ATK] < 0xC)
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam 
+                    && !moveTurn && gBattleMons[battlerId].statStages[STAT_ATK] < MAX_STAT_STAGE)
                 {
                     PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_ATK);
                     PREPARE_STRING_BUFFER(gBattleTextBuff2, STRINGID_STATROSE);
@@ -2825,7 +2826,8 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_DEFENSE_UP:
-                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn && gBattleMons[battlerId].statStages[STAT_DEF] < 0xC)
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn 
+                    && gBattleMons[battlerId].statStages[STAT_DEF] < MAX_STAT_STAGE)
                 {
                     PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_DEF);
 
@@ -2838,7 +2840,8 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_SPEED_UP:
-                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPEED] < 0xC)
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn 
+                    && gBattleMons[battlerId].statStages[STAT_SPEED] < MAX_STAT_STAGE)
                 {
                     PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_SPEED);
 
@@ -2851,7 +2854,8 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_SP_ATTACK_UP:
-                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPATK] < 0xC)
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn 
+                    && gBattleMons[battlerId].statStages[STAT_SPATK] < MAX_STAT_STAGE)
                 {
                     PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_SPATK);
 
@@ -2864,7 +2868,8 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_SP_DEFENSE_UP:
-                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPDEF] < 0xC)
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn 
+                    && gBattleMons[battlerId].statStages[STAT_SPDEF] < MAX_STAT_STAGE)
                 {
                     PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_SPDEF);
 
@@ -2877,7 +2882,8 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_CRITICAL_UP:
-                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn && !(gBattleMons[battlerId].status2 & STATUS2_FOCUS_ENERGY))
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn 
+                    && !(gBattleMons[battlerId].status2 & STATUS2_FOCUS_ENERGY))
                 {
                     gBattleMons[battlerId].status2 |= STATUS2_FOCUS_ENERGY;
                     BattleScriptExecute(BattleScript_BerryFocusEnergyEnd2);
@@ -2889,7 +2895,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
                 {
                     for (i = 0; i < 5; i++)
                     {
-                        if (gBattleMons[battlerId].statStages[STAT_ATK + i] < 0xC)
+                        if (gBattleMons[battlerId].statStages[STAT_ATK + i] < MAX_STAT_STAGE)
                             break;
                     }
                     if (i != 5)
@@ -2897,7 +2903,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
                         do
                         {
                             i = Random() % 5;
-                        } while (gBattleMons[battlerId].statStages[STAT_ATK + i] == 0xC);
+                        } while (gBattleMons[battlerId].statStages[STAT_ATK + i] == MAX_STAT_STAGE);
 
                         PREPARE_STAT_BUFFER(gBattleTextBuff1, i + 1);
 
@@ -3166,9 +3172,9 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
             case HOLD_EFFECT_RESTORE_STATS:
                 for (i = 0; i < NUM_BATTLE_STATS; i++)
                 {
-                    if (gBattleMons[battlerId].statStages[i] < 6)
+                    if (gBattleMons[battlerId].statStages[i] < DEFAULT_STAT_STAGE)
                     {
-                        gBattleMons[battlerId].statStages[i] = 6;
+                        gBattleMons[battlerId].statStages[i] = DEFAULT_STAT_STAGE;
                         effect = ITEM_STATS_CHANGE;
                     }
                 }
diff --git a/src/berry.c b/src/berry.c
index 98264f37b..d70e8c353 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -1331,7 +1331,7 @@ void ResetBerryTreeSparkleFlags(void)
     s16 bottom;
     int i;
 
-    GetCameraCoords(&cam_left, &cam_top);
+    GetCameraCoords((u16*)&cam_left, (u16*)&cam_top);
     left = cam_left;
     top = cam_top + 3;
     right = cam_left + 14;
diff --git a/src/berry_blender.c b/src/berry_blender.c
index 14a1ffff8..8d6f3a8fd 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -116,8 +116,8 @@ struct BerryBlenderData
     u16 field_116;
     u16 field_118;
     u16 field_11A;
-    u16 bg_X;
-    u16 bg_Y;
+    s16 bg_X;
+    s16 bg_Y;
     u8 field_120[3];
     u8 field_123;
     u16 scores[BLENDER_MAX_PLAYERS][BLENDER_SCORES_NO];
@@ -3166,13 +3166,13 @@ static void sub_80832E8(s16* a0)
 
 static void sub_808330C(void)
 {
-    sub_80832E8(&sBerryBlenderData->bg_X);
-    sub_80832E8(&sBerryBlenderData->bg_Y);
+    sub_80832E8((s16 *)&sBerryBlenderData->bg_X);
+    sub_80832E8((s16 *)&sBerryBlenderData->bg_Y);
 }
 
 static void sub_8083334(s16* a0, u16 a1)
 {
-    s32 var;
+    u8 var;
 
     if (a1 < 10)
         var = 16;
diff --git a/src/berry_crush.c b/src/berry_crush.c
index 42199e757..654a3b4e3 100755
--- a/src/berry_crush.c
+++ b/src/berry_crush.c
@@ -1076,7 +1076,7 @@ int sub_802104C(void)
             return 0;
 
         InitStandardTextBoxWindows();
-        sub_8197200();
+        InitTextBoxGfxAndPrinters();
         sub_8022588(var0);
         sub_8022600(var0);
         gPaletteFade.bufferTransferDisabled = TRUE;
@@ -3271,7 +3271,7 @@ static void BerryCrush_SetPaletteFadeParams(u8 *params, bool8 communicateAfter,
 
 void sub_8024644(u8 *r0, u32 r1, u32 r2, u32 r3, u32 r5)
 {
-    u8 sp[4];
+    u8 sp[2];
 
     0[(u16 *)sp] = r3;
     r0[0] = r1;
diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c
index 38c2832ee..e5c89bdb7 100644
--- a/src/berry_tag_screen.c
+++ b/src/berry_tag_screen.c
@@ -186,7 +186,7 @@ static void CB2_BerryTagScreen(void)
     RunTasks();
     AnimateSprites();
     BuildOamBuffer();
-    do_scheduled_bg_tilemap_copies_to_vram();
+    DoScheduledBgTilemapCopiesToVram();
     UpdatePaletteFade();
 }
 
@@ -217,7 +217,7 @@ static bool8 InitBerryTagScreen(void)
     case 0:
         SetVBlankHBlankCallbacksToNull();
         ResetVramOamAndBgCntRegs();
-        clear_scheduled_bg_copies_to_vram();
+        ClearScheduledBgCopiesToVram();
         gMain.state++;
         break;
     case 1:
diff --git a/src/bike.c b/src/bike.c
index cd24d2487..5cdf066a9 100644
--- a/src/bike.c
+++ b/src/bike.c
@@ -7,7 +7,6 @@
 #include "metatile_behavior.h"
 #include "overworld.h"
 #include "sound.h"
-#include "constants/flags.h"
 #include "constants/map_types.h"
 #include "constants/songs.h"
 
@@ -836,7 +835,7 @@ static void Bike_UpdateDirTimerHistory(u8 dir)
 
     gPlayerAvatar.directionHistory = (gPlayerAvatar.directionHistory << 4) | (dir & 0xF);
 
-    for (i = 7; i != 0; i--)
+    for (i = ARRAY_COUNT(gPlayerAvatar.dirTimerHistory) - 1; i != 0; i--)
         gPlayerAvatar.dirTimerHistory[i] = gPlayerAvatar.dirTimerHistory[i - 1];
     gPlayerAvatar.dirTimerHistory[0] = 1;
 }
@@ -847,7 +846,7 @@ static void Bike_UpdateABStartSelectHistory(u8 input)
 
     gPlayerAvatar.abStartSelectHistory = (gPlayerAvatar.abStartSelectHistory << 4) | (input & 0xF);
 
-    for (i = 7; i != 0; i--)
+    for (i = ARRAY_COUNT(gPlayerAvatar.abStartSelectTimerHistory) - 1; i != 0; i--)
         gPlayerAvatar.abStartSelectTimerHistory[i] = gPlayerAvatar.abStartSelectTimerHistory[i - 1];
     gPlayerAvatar.abStartSelectTimerHistory[0] = 1;
 }
@@ -1001,10 +1000,10 @@ void BikeClearState(int newDirHistory, int newAbStartHistory)
     gPlayerAvatar.directionHistory = newDirHistory;
     gPlayerAvatar.abStartSelectHistory = newAbStartHistory;
 
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < ARRAY_COUNT(gPlayerAvatar.dirTimerHistory); i++)
         gPlayerAvatar.dirTimerHistory[i] = 0;
 
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < ARRAY_COUNT(gPlayerAvatar.abStartSelectTimerHistory); i++)
         gPlayerAvatar.abStartSelectTimerHistory[i] = 0;
 }
 
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index c00be82ad..5dee9dd4b 100644
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -6,7 +6,6 @@
 #include "sound.h"
 #include "task.h"
 #include "constants/field_effects.h"
-#include "constants/flags.h"
 #include "constants/maps.h"
 #include "constants/songs.h"
 #include "constants/species.h"
@@ -87,12 +86,12 @@ bool8 ShouldDoBrailleDigEffect(void)
 
 void DoBrailleDigEffect(void)
 {
-    MapGridSetMetatileIdAt(16, 8, METATILE_ID(Cave, SealedChamberEntrance_TopLeft));
-    MapGridSetMetatileIdAt(17, 8, METATILE_ID(Cave, SealedChamberEntrance_TopMid));
-    MapGridSetMetatileIdAt(18, 8, METATILE_ID(Cave, SealedChamberEntrance_TopRight));
-    MapGridSetMetatileIdAt(16, 9, METATILE_ID(Cave, SealedChamberEntrance_BottomLeft) | METATILE_COLLISION_MASK);
-    MapGridSetMetatileIdAt(17, 9, METATILE_ID(Cave, SealedChamberEntrance_BottomMid));
-    MapGridSetMetatileIdAt(18, 9, METATILE_ID(Cave, SealedChamberEntrance_BottomRight) | METATILE_COLLISION_MASK);
+    MapGridSetMetatileIdAt(16, 8, METATILE_Cave_SealedChamberEntrance_TopLeft);
+    MapGridSetMetatileIdAt(17, 8, METATILE_Cave_SealedChamberEntrance_TopMid);
+    MapGridSetMetatileIdAt(18, 8, METATILE_Cave_SealedChamberEntrance_TopRight);
+    MapGridSetMetatileIdAt(16, 9, METATILE_Cave_SealedChamberEntrance_BottomLeft | METATILE_COLLISION_MASK);
+    MapGridSetMetatileIdAt(17, 9, METATILE_Cave_SealedChamberEntrance_BottomMid);
+    MapGridSetMetatileIdAt(18, 9, METATILE_Cave_SealedChamberEntrance_BottomRight | METATILE_COLLISION_MASK);
     DrawWholeMapView();
     PlaySE(SE_BAN);
     FlagSet(FLAG_SYS_BRAILLE_DIG);
@@ -165,7 +164,7 @@ void DoBrailleRegisteelEffect(void)
 
 bool8 FldEff_UseFlyAncientTomb(void)
 {
-    u8 taskId = oei_task_add();
+    u8 taskId = CreateFieldMoveTask();
 
     gTasks[taskId].data[8] = (u32)UseRegisteelHm_Callback >> 16;
     gTasks[taskId].data[9] = (u32)UseRegisteelHm_Callback;
@@ -280,12 +279,12 @@ void UseRegirockHm_Callback(void)
 
 void DoBrailleRegirockEffect(void)
 {
-    MapGridSetMetatileIdAt(14, 26, METATILE_ID(Cave, SealedChamberEntrance_TopLeft));
-    MapGridSetMetatileIdAt(15, 26, METATILE_ID(Cave, SealedChamberEntrance_TopMid));
-    MapGridSetMetatileIdAt(16, 26, METATILE_ID(Cave, SealedChamberEntrance_TopRight));
-    MapGridSetMetatileIdAt(14, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomLeft) | METATILE_COLLISION_MASK);
-    MapGridSetMetatileIdAt(15, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomMid));
-    MapGridSetMetatileIdAt(16, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomRight) | METATILE_COLLISION_MASK);
+    MapGridSetMetatileIdAt(14, 26, METATILE_Cave_SealedChamberEntrance_TopLeft);
+    MapGridSetMetatileIdAt(15, 26, METATILE_Cave_SealedChamberEntrance_TopMid);
+    MapGridSetMetatileIdAt(16, 26, METATILE_Cave_SealedChamberEntrance_TopRight);
+    MapGridSetMetatileIdAt(14, 27, METATILE_Cave_SealedChamberEntrance_BottomLeft | METATILE_COLLISION_MASK);
+    MapGridSetMetatileIdAt(15, 27, METATILE_Cave_SealedChamberEntrance_BottomMid);
+    MapGridSetMetatileIdAt(16, 27, METATILE_Cave_SealedChamberEntrance_BottomRight | METATILE_COLLISION_MASK);
     DrawWholeMapView();
     PlaySE(SE_BAN);
     FlagSet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETED);
@@ -319,12 +318,12 @@ void UseRegisteelHm_Callback(void)
 
 void DoBrailleRegisteelEffect(void)
 {
-    MapGridSetMetatileIdAt(14, 26, METATILE_ID(Cave, SealedChamberEntrance_TopLeft));
-    MapGridSetMetatileIdAt(15, 26, METATILE_ID(Cave, SealedChamberEntrance_TopMid));
-    MapGridSetMetatileIdAt(16, 26, METATILE_ID(Cave, SealedChamberEntrance_TopRight));
-    MapGridSetMetatileIdAt(14, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomLeft) | METATILE_COLLISION_MASK);
-    MapGridSetMetatileIdAt(15, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomMid));
-    MapGridSetMetatileIdAt(16, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomRight) | METATILE_COLLISION_MASK);
+    MapGridSetMetatileIdAt(14, 26, METATILE_Cave_SealedChamberEntrance_TopLeft);
+    MapGridSetMetatileIdAt(15, 26, METATILE_Cave_SealedChamberEntrance_TopMid);
+    MapGridSetMetatileIdAt(16, 26, METATILE_Cave_SealedChamberEntrance_TopRight);
+    MapGridSetMetatileIdAt(14, 27, METATILE_Cave_SealedChamberEntrance_BottomLeft | METATILE_COLLISION_MASK);
+    MapGridSetMetatileIdAt(15, 27, METATILE_Cave_SealedChamberEntrance_BottomMid);
+    MapGridSetMetatileIdAt(16, 27, METATILE_Cave_SealedChamberEntrance_BottomRight | METATILE_COLLISION_MASK);
     DrawWholeMapView();
     PlaySE(SE_BAN);
     FlagSet(FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED);
@@ -411,7 +410,7 @@ bool32 BrailleWait_CheckButtonPress(void)
 // this used to be FldEff_UseFlyAncientTomb . why did GF merge the 2 functions?
 bool8 FldEff_UsePuzzleEffect(void)
 {
-    u8 taskId = oei_task_add();
+    u8 taskId = CreateFieldMoveTask();
 
     if (sBraillePuzzleCallbackFlag == REGISTEEL_PUZZLE)
     {
diff --git a/src/coins.c b/src/coins.c
index 302817f8d..52c7dd3ec 100644
--- a/src/coins.c
+++ b/src/coins.c
@@ -14,7 +14,7 @@ void PrintCoinsString(u32 coinAmount)
 {
     u32 xAlign;
 
-    ConvertIntToDecimalStringN(gStringVar1, coinAmount, STR_CONV_MODE_RIGHT_ALIGN, 4);
+    ConvertIntToDecimalStringN(gStringVar1, coinAmount, STR_CONV_MODE_RIGHT_ALIGN, MAX_COIN_DIGITS);
     StringExpandPlaceholders(gStringVar4, gText_Coins);
 
     xAlign = GetStringRightAlignXOffset(1, gStringVar4, 0x40);
diff --git a/src/contest.c b/src/contest.c
index 97d9cfda7..de0001831 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -38,7 +38,6 @@
 #include "data.h"
 #include "contest_ai.h"
 #include "constants/event_objects.h"
-#include "constants/flags.h"
 #include "constants/items.h"
 #include "constants/moves.h"
 #include "constants/rgb.h"
diff --git a/src/contest_link.c b/src/contest_link.c
index 1716d6a21..ae6975268 100644
--- a/src/contest_link.c
+++ b/src/contest_link.c
@@ -7,7 +7,6 @@
 #include "random.h"
 #include "task.h"
 #include "contest_link.h"
-#include "constants/flags.h"
 
 static void Task_LinkContest_StartInitFlags(u8);
 static void Task_LinkContest_InitFlags(u8);
diff --git a/src/contest_util.c b/src/contest_util.c
index d8ca6e50d..00254248f 100644
--- a/src/contest_util.c
+++ b/src/contest_util.c
@@ -45,7 +45,6 @@
 #include "constants/rgb.h"
 #include "constants/songs.h"
 #include "constants/tv.h"
-#include "constants/vars.h"
 #include "contest.h"
 
 enum {
diff --git a/src/credits.c b/src/credits.c
index dd1166d82..8fc8a1f88 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -20,7 +20,6 @@
 #include "trig.h"
 #include "graphics.h"
 #include "pokedex.h"
-#include "constants/vars.h"
 #include "event_data.h"
 #include "random.h"
 #include "constants/species.h"
diff --git a/src/crt0.s b/src/crt0.s
index 3ab711713..cb7c93a6b 100644
--- a/src/crt0.s
+++ b/src/crt0.s
@@ -82,10 +82,10 @@ GPIOPortReadEnable: @ 80000C8
 	.align 2, 0
 	.global Init
 Init: @ 8000204
-	mov r0, PSR_IRQ_MODE
+	mov r0, #PSR_IRQ_MODE
 	msr cpsr_cf, r0
 	ldr sp, sp_irq
-	mov r0, PSR_SYS_MODE
+	mov r0, #PSR_SYS_MODE
 	msr cpsr_cf, r0
 	ldr sp, sp_sys
 	ldr r1, =INTR_VECTOR
@@ -106,91 +106,91 @@ sp_irq: .word IWRAM_END - 0x60
 	.align 2, 0
 	.global IntrMain
 IntrMain: @ 8000248
-	mov r3, REG_BASE
-	add r3, r3, 0x200
-	ldr r2, [r3, OFFSET_REG_IE - 0x200]
-	ldrh r1, [r3, OFFSET_REG_IME - 0x200]
+	mov r3, #REG_BASE
+	add r3, r3, #OFFSET_REG_IE
+	ldr r2, [r3]
+	ldrh r1, [r3, #OFFSET_REG_IME - 0x200]
 	mrs r0, spsr
-	stmdb sp!, {r0-r3,lr}
-	mov r0, 0
-	strh r0, [r3, OFFSET_REG_IME - 0x200]
-	and r1, r2, r2, lsr 16
-	mov r12, 0
-	ands r0, r1, INTR_FLAG_VCOUNT
+	stmfd sp!, {r0-r3,lr}
+	mov r0, #0
+	strh r0, [r3, #OFFSET_REG_IME - 0x200]
+	and r1, r2, r2, lsr #16
+	mov r12, #0
+	ands r0, r1, #INTR_FLAG_VCOUNT
 	bne IntrMain_FoundIntr
 	add r12, r12, 0x4
 	mov r0, 0x1
-	strh r0, [r3, OFFSET_REG_IME - 0x200]
-	ands r0, r1, INTR_FLAG_SERIAL
+	strh r0, [r3, #OFFSET_REG_IME - 0x200]
+	ands r0, r1, #INTR_FLAG_SERIAL
 	bne IntrMain_FoundIntr
 	add r12, r12, 0x4
-	ands r0, r1, INTR_FLAG_TIMER3
+	ands r0, r1, #INTR_FLAG_TIMER3
 	bne IntrMain_FoundIntr
 	add r12, r12, 0x4
-	ands r0, r1, INTR_FLAG_HBLANK
+	ands r0, r1, #INTR_FLAG_HBLANK
 	bne IntrMain_FoundIntr
 	add r12, r12, 0x4
-	ands r0, r1, INTR_FLAG_VBLANK
+	ands r0, r1, #INTR_FLAG_VBLANK
 	bne IntrMain_FoundIntr
 	add r12, r12, 0x4
-	ands r0, r1, INTR_FLAG_TIMER0
+	ands r0, r1, #INTR_FLAG_TIMER0
 	bne IntrMain_FoundIntr
 	add r12, r12, 0x4
-	ands r0, r1, INTR_FLAG_TIMER1
+	ands r0, r1, #INTR_FLAG_TIMER1
 	bne IntrMain_FoundIntr
 	add r12, r12, 0x4
-	ands r0, r1, INTR_FLAG_TIMER2
+	ands r0, r1, #INTR_FLAG_TIMER2
 	bne IntrMain_FoundIntr
 	add r12, r12, 0x4
-	ands r0, r1, INTR_FLAG_DMA0
+	ands r0, r1, #INTR_FLAG_DMA0
 	bne IntrMain_FoundIntr
 	add r12, r12, 0x4
-	ands r0, r1, INTR_FLAG_DMA1
+	ands r0, r1, #INTR_FLAG_DMA1
 	bne IntrMain_FoundIntr
 	add r12, r12, 0x4
-	ands r0, r1, INTR_FLAG_DMA2
+	ands r0, r1, #INTR_FLAG_DMA2
 	bne IntrMain_FoundIntr
 	add r12, r12, 0x4
-	ands r0, r1, INTR_FLAG_DMA3
+	ands r0, r1, #INTR_FLAG_DMA3
 	bne IntrMain_FoundIntr
 	add r12, r12, 0x4
-	ands r0, r1, INTR_FLAG_KEYPAD
+	ands r0, r1, #INTR_FLAG_KEYPAD
 	bne IntrMain_FoundIntr
 	add r12, r12, 0x4
-	ands r0, r1, INTR_FLAG_GAMEPAK
-	strbne r0, [r3, OFFSET_REG_SOUNDCNT_X - 0x200]
+	ands r0, r1, #INTR_FLAG_GAMEPAK
+	strbne r0, [r3, #REG_SOUNDCNT_X - REG_IE]
 	bne . @ spin
 IntrMain_FoundIntr:
-	strh r0, [r3, OFFSET_REG_IF - 0x200]
+	strh r0, [r3, #OFFSET_REG_IF - 0x200]
 	bic r2, r2, r0
 	ldr r0, =gSTWIStatus
 	ldr r0, [r0]
 	ldrb r0, [r0, 0xA]
 	mov r1, 0x8
-	mov r0, r1, lsl r0
-	orr r0, r0, INTR_FLAG_GAMEPAK
-	orr r1, r0, INTR_FLAG_SERIAL | INTR_FLAG_TIMER3 | INTR_FLAG_VCOUNT | INTR_FLAG_HBLANK
+	lsl r0, r1, r0
+	orr r0, r0, #INTR_FLAG_GAMEPAK
+	orr r1, r0, #INTR_FLAG_SERIAL | INTR_FLAG_TIMER3 | INTR_FLAG_VCOUNT | INTR_FLAG_HBLANK
 	and r1, r1, r2
-	strh r1, [r3, OFFSET_REG_IE - 0x200]
+	strh r1, [r3, #OFFSET_REG_IE - 0x200]
 	mrs r3, cpsr
-	bic r3, r3, PSR_I_BIT | PSR_F_BIT | PSR_MODE_MASK
-	orr r3, r3, PSR_SYS_MODE
+	bic r3, r3, #PSR_I_BIT | PSR_F_BIT | PSR_MODE_MASK
+	orr r3, r3, #PSR_SYS_MODE
 	msr cpsr_cf, r3
 	ldr r1, =gIntrTable
 	add r1, r1, r12
 	ldr r0, [r1]
-	stmdb sp!, {lr}
+	stmfd sp!, {lr}
 	adr lr, IntrMain_RetAddr
 	bx r0
 IntrMain_RetAddr:
-	ldmia sp!, {lr}
+	ldmfd sp!, {lr}
 	mrs r3, cpsr
-	bic r3, r3, PSR_I_BIT | PSR_F_BIT | PSR_MODE_MASK
-	orr r3, r3, PSR_I_BIT | PSR_IRQ_MODE
+	bic r3, r3, #PSR_I_BIT | PSR_F_BIT | PSR_MODE_MASK
+	orr r3, r3, #PSR_I_BIT | PSR_IRQ_MODE
 	msr cpsr_cf, r3
 	ldmia sp!, {r0-r3,lr}
-	strh r2, [r3, OFFSET_REG_IE - 0x200]
-	strh r1, [r3, OFFSET_REG_IME - 0x200]
+	strh r2, [r3, #OFFSET_REG_IE - 0x200]
+	strh r1, [r3, #OFFSET_REG_IME - 0x200]
 	msr spsr_cf, r0
 	bx lr
 
diff --git a/src/data/field_effects/field_effect_object_template_pointers.h b/src/data/field_effects/field_effect_object_template_pointers.h
index de39e6db3..41d6271bf 100755
--- a/src/data/field_effects/field_effect_object_template_pointers.h
+++ b/src/data/field_effects/field_effect_object_template_pointers.h
@@ -8,70 +8,70 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_Ash;
 const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob;
 const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow;
 const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust;
-const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopTallGrass;
+const struct SpriteTemplate gFieldEffectObjectTemplate_JumpTallGrass;
 const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints;
-const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopBigSplash;
+const struct SpriteTemplate gFieldEffectObjectTemplate_JumpBigSplash;
 const struct SpriteTemplate gFieldEffectObjectTemplate_Splash;
-const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopSmallSplash;
+const struct SpriteTemplate gFieldEffectObjectTemplate_JumpSmallSplash;
 const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass;
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown16;
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17;
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown18;
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19;
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown20;
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown21;
-const struct SpriteTemplate gFieldEffectObjectTemplate_BerryTreeGrowthSparkle;
+const struct SpriteTemplate gFieldEffectObjectTemplate_JumpLongGrass;
+const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass;
+const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass2;
+const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedSand;
+const struct SpriteTemplate gFieldEffectObjectTemplate_WaterSurfacing;
+const struct SpriteTemplate gFieldEffectObjectTemplate_ReflectionDistortion;
+const struct SpriteTemplate gFieldEffectObjectTemplate_Sparkle;
 const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints;
 const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise;
 const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise;
 const struct SpriteTemplate gFieldEffectObjectTemplate_Bird;
 const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks;
 const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder;
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown29;
+const struct SpriteTemplate gFieldEffectObjectTemplate_SandPile;
 const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass;
 const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater;
-const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh;
-const struct SpriteTemplate gFieldEffectObjectTemplate_LavaridgeGymWarp;
+const struct SpriteTemplate gFieldEffectObjectTemplate_AshPuff;
+const struct SpriteTemplate gFieldEffectObjectTemplate_AshLaunch;
 const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles;
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown35;
+const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle;
 const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza;
 
 const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = {
-    &gFieldEffectObjectTemplate_ShadowSmall,
-    &gFieldEffectObjectTemplate_ShadowMedium,
-    &gFieldEffectObjectTemplate_ShadowLarge,
-    &gFieldEffectObjectTemplate_ShadowExtraLarge,
-    &gFieldEffectObjectTemplate_TallGrass,
-    &gFieldEffectObjectTemplate_Ripple,
-    &gFieldEffectObjectTemplate_Ash,
-    &gFieldEffectObjectTemplate_SurfBlob,
-    &gFieldEffectObjectTemplate_Arrow,
-    &gFieldEffectObjectTemplate_GroundImpactDust,
-    &gFieldEffectObjectTemplate_BikeHopTallGrass,
-    &gFieldEffectObjectTemplate_SandFootprints,
-    &gFieldEffectObjectTemplate_BikeHopBigSplash,
-    &gFieldEffectObjectTemplate_Splash,
-    &gFieldEffectObjectTemplate_BikeHopSmallSplash,
-    &gFieldEffectObjectTemplate_LongGrass,
-    &gFieldEffectObjectTemplate_Unknown16,
-    &gFieldEffectObjectTemplate_Unknown17,
-    &gFieldEffectObjectTemplate_Unknown18,
-    &gFieldEffectObjectTemplate_Unknown19,
-    &gFieldEffectObjectTemplate_Unknown20,
-    &gFieldEffectObjectTemplate_Unknown21,
-    &gFieldEffectObjectTemplate_BerryTreeGrowthSparkle,
-    &gFieldEffectObjectTemplate_DeepSandFootprints,
-    &gFieldEffectObjectTemplate_TreeDisguise,
-    &gFieldEffectObjectTemplate_MountainDisguise,
-    &gFieldEffectObjectTemplate_Bird,
-    &gFieldEffectObjectTemplate_BikeTireTracks,
-    &gFieldEffectObjectTemplate_SandDisguisePlaceholder,
-    &gFieldEffectObjectTemplate_Unknown29,
-    &gFieldEffectObjectTemplate_ShortGrass,
-    &gFieldEffectObjectTemplate_HotSpringsWater,
-    &gFieldEffectObjectTemplate_JumpOutOfAsh,
-    &gFieldEffectObjectTemplate_LavaridgeGymWarp,
-    &gFieldEffectObjectTemplate_Bubbles,
-    &gFieldEffectObjectTemplate_Unknown35,
-    &gFieldEffectObjectTemplate_Rayquaza,
+    [FLDEFFOBJ_SHADOW_S]              = &gFieldEffectObjectTemplate_ShadowSmall,
+    [FLDEFFOBJ_SHADOW_M]              = &gFieldEffectObjectTemplate_ShadowMedium,
+    [FLDEFFOBJ_SHADOW_L]              = &gFieldEffectObjectTemplate_ShadowLarge,
+    [FLDEFFOBJ_SHADOW_XL]             = &gFieldEffectObjectTemplate_ShadowExtraLarge,
+    [FLDEFFOBJ_TALL_GRASS]            = &gFieldEffectObjectTemplate_TallGrass,
+    [FLDEFFOBJ_RIPPLE]                = &gFieldEffectObjectTemplate_Ripple,
+    [FLDEFFOBJ_ASH]                   = &gFieldEffectObjectTemplate_Ash,
+    [FLDEFFOBJ_SURF_BLOB]             = &gFieldEffectObjectTemplate_SurfBlob,
+    [FLDEFFOBJ_ARROW]                 = &gFieldEffectObjectTemplate_Arrow,
+    [FLDEFFOBJ_GROUND_IMPACT_DUST]    = &gFieldEffectObjectTemplate_GroundImpactDust,
+    [FLDEFFOBJ_JUMP_TALL_GRASS]       = &gFieldEffectObjectTemplate_JumpTallGrass,
+    [FLDEFFOBJ_SAND_FOOTPRINTS]       = &gFieldEffectObjectTemplate_SandFootprints,
+    [FLDEFFOBJ_JUMP_BIG_SPLASH]       = &gFieldEffectObjectTemplate_JumpBigSplash,
+    [FLDEFFOBJ_SPLASH]                = &gFieldEffectObjectTemplate_Splash,
+    [FLDEFFOBJ_JUMP_SMALL_SPLASH]     = &gFieldEffectObjectTemplate_JumpSmallSplash,
+    [FLDEFFOBJ_LONG_GRASS]            = &gFieldEffectObjectTemplate_LongGrass,
+    [FLDEFFOBJ_JUMP_LONG_GRASS]       = &gFieldEffectObjectTemplate_JumpLongGrass,
+    [FLDEFFOBJ_UNUSED_GRASS]          = &gFieldEffectObjectTemplate_UnusedGrass,
+    [FLDEFFOBJ_UNUSED_GRASS_2]        = &gFieldEffectObjectTemplate_UnusedGrass2,
+    [FLDEFFOBJ_UNUSED_SAND]           = &gFieldEffectObjectTemplate_UnusedSand,
+    [FLDEFFOBJ_WATER_SURFACING]       = &gFieldEffectObjectTemplate_WaterSurfacing,
+    [FLDEFFOBJ_REFLECTION_DISTORTION] = &gFieldEffectObjectTemplate_ReflectionDistortion,
+    [FLDEFFOBJ_SPARKLE]               = &gFieldEffectObjectTemplate_Sparkle,
+    [FLDEFFOBJ_DEEP_SAND_FOOTPRINTS]  = &gFieldEffectObjectTemplate_DeepSandFootprints,
+    [FLDEFFOBJ_TREE_DISGUISE]         = &gFieldEffectObjectTemplate_TreeDisguise,
+    [FLDEFFOBJ_MOUNTAIN_DISGUISE]     = &gFieldEffectObjectTemplate_MountainDisguise,
+    [FLDEFFOBJ_BIRD]                  = &gFieldEffectObjectTemplate_Bird,
+    [FLDEFFOBJ_BIKE_TIRE_TRACKS]      = &gFieldEffectObjectTemplate_BikeTireTracks,
+    [FLDEFFOBJ_SAND_DISGUISE]         = &gFieldEffectObjectTemplate_SandDisguisePlaceholder,
+    [FLDEFFOBJ_SAND_PILE]             = &gFieldEffectObjectTemplate_SandPile,
+    [FLDEFFOBJ_SHORT_GRASS]           = &gFieldEffectObjectTemplate_ShortGrass,
+    [FLDEFFOBJ_HOT_SPRINGS_WATER]     = &gFieldEffectObjectTemplate_HotSpringsWater,
+    [FLDEFFOBJ_ASH_PUFF]              = &gFieldEffectObjectTemplate_AshPuff,
+    [FLDEFFOBJ_ASH_LAUNCH]            = &gFieldEffectObjectTemplate_AshLaunch,
+    [FLDEFFOBJ_BUBBLES]               = &gFieldEffectObjectTemplate_Bubbles,
+    [FLDEFFOBJ_SMALL_SPARKLE]         = &gFieldEffectObjectTemplate_SmallSparkle,
+    [FLDEFFOBJ_RAYQUAZA]              = &gFieldEffectObjectTemplate_Rayquaza,
 };
diff --git a/src/data/field_effects/field_effect_objects.h b/src/data/field_effects/field_effect_objects.h
index 65f35107d..1626b9f32 100755
--- a/src/data/field_effects/field_effect_objects.h
+++ b/src/data/field_effects/field_effect_objects.h
@@ -1,43 +1,74 @@
-const struct SpritePalette gFieldEffectObjectPaletteInfo0 = {gFieldEffectObjectPalette0, 0x1004};
+const struct SpritePalette gSpritePalette_GeneralFieldEffect0 = {gFieldEffectObjectPalette0, FLDEFF_PAL_TAG_GENERAL_0};
+const struct SpritePalette gSpritePalette_GeneralFieldEffect1 = {gFieldEffectObjectPalette1, FLDEFF_PAL_TAG_GENERAL_1};
 
-const struct SpritePalette gFieldEffectObjectPaletteInfo1 = {gFieldEffectObjectPalette1, 0x1005};
-
-const union AnimCmd gFieldEffectObjectImageAnim_850C9D0[] =
+static const union AnimCmd sAnim_Shadow[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_Shadow[] =
+static const union AnimCmd *const sAnimTable_Shadow[] =
 {
-    gFieldEffectObjectImageAnim_850C9D0,
+    sAnim_Shadow,
 };
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowSmall[] = {
+static const struct SpriteFrameImage sPicTable_ShadowSmall[] = {
     obj_frame_tiles(gFieldEffectObjectPic_ShadowSmall),
 };
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowMedium[] = {
+static const struct SpriteFrameImage sPicTable_ShadowMedium[] = {
     obj_frame_tiles(gFieldEffectObjectPic_ShadowMedium),
 };
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowLarge[] = {
+static const struct SpriteFrameImage sPicTable_ShadowLarge[] = {
     obj_frame_tiles(gFieldEffectObjectPic_ShadowLarge),
 };
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowExtraLarge[] = {
+static const struct SpriteFrameImage sPicTable_ShadowExtraLarge[] = {
     obj_frame_tiles(gFieldEffectObjectPic_ShadowExtraLarge),
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_8x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowSmall, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect};
+const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = {
+    .tileTag = 0xFFFF,
+    .paletteTag = 0xFFFF,
+    .oam = &gObjectEventBaseOam_8x8,
+    .anims = sAnimTable_Shadow,
+    .images = sPicTable_ShadowSmall,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateShadowFieldEffect,
+};
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowMedium, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect};
+const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = {
+    .tileTag = 0xFFFF,
+    .paletteTag = 0xFFFF,
+    .oam = &gObjectEventBaseOam_16x8,
+    .anims = sAnimTable_Shadow,
+    .images = sPicTable_ShadowMedium,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateShadowFieldEffect,
+};
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_32x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect};
+const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = {
+    .tileTag = 0xFFFF,
+    .paletteTag = 0xFFFF,
+    .oam = &gObjectEventBaseOam_32x8,
+    .anims = sAnimTable_Shadow,
+    .images = sPicTable_ShadowLarge,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateShadowFieldEffect,
+};
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_64x32, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect};
+const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = {
+    .tileTag = 0xFFFF,
+    .paletteTag = 0xFFFF,
+    .oam = &gObjectEventBaseOam_64x32,
+    .anims = sAnimTable_Shadow,
+    .images = sPicTable_ShadowExtraLarge,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateShadowFieldEffect,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_TallGrass[] = {
+static const struct SpriteFrameImage sPicTable_TallGrass[] = {
     overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 0),
     overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 1),
     overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 2),
@@ -45,7 +76,7 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_TallGrass[] = {
     overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 4),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CA84[] =
+static const union AnimCmd sAnim_TallGrass[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(2, 10),
@@ -55,14 +86,22 @@ const union AnimCmd gFieldEffectObjectImageAnim_850CA84[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_TallGrass[] =
+static const union AnimCmd *const sAnimTable_TallGrass[] =
 {
-    gFieldEffectObjectImageAnim_850CA84,
+    sAnim_TallGrass,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_TallGrass, gFieldEffectObjectPicTable_TallGrass, gDummySpriteAffineAnimTable, UpdateTallGrassFieldEffect};
+const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = {
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
+    .oam = &gObjectEventBaseOam_16x16,
+    .anims = sAnimTable_TallGrass,
+    .images = sPicTable_TallGrass,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateTallGrassFieldEffect,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_Ripple[] = {
+static const struct SpriteFrameImage sPicTable_Ripple[] = {
     overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 0),
     overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 1),
     overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 2),
@@ -70,7 +109,7 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_Ripple[] = {
     overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 4),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CAE0[] =
+static const union AnimCmd sAnim_Ripple[] =
 {
     ANIMCMD_FRAME(0, 12),
     ANIMCMD_FRAME(1, 9),
@@ -83,14 +122,22 @@ const union AnimCmd gFieldEffectObjectImageAnim_850CAE0[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_Ripple[] =
+static const union AnimCmd *const sAnimTable_Ripple[] =
 {
-    gFieldEffectObjectImageAnim_850CAE0,
+    sAnim_Ripple,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ripple, gFieldEffectObjectPicTable_Ripple, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim};
+const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = {
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
+    .oam = &gObjectEventBaseOam_16x16,
+    .anims = sAnimTable_Ripple,
+    .images = sPicTable_Ripple,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = WaitFieldEffectSpriteAnim,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_Ash[] = {
+static const struct SpriteFrameImage sPicTable_Ash[] = {
     overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 0),
     overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 1),
     overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 2),
@@ -98,7 +145,7 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_Ash[] = {
     overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 4),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CB48[] =
+static const union AnimCmd sAnim_Ash[] =
 {
     ANIMCMD_FRAME(0, 12),
     ANIMCMD_FRAME(1, 12),
@@ -108,54 +155,70 @@ const union AnimCmd gFieldEffectObjectImageAnim_850CB48[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_Ash[] =
+static const union AnimCmd *const sAnimTable_Ash[] =
 {
-    gFieldEffectObjectImageAnim_850CB48,
+    sAnim_Ash,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ash, gFieldEffectObjectPicTable_Ash, gDummySpriteAffineAnimTable, UpdateAshFieldEffect};
+const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = {
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
+    .oam = &gObjectEventBaseOam_16x16,
+    .anims = sAnimTable_Ash,
+    .images = sPicTable_Ash,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateAshFieldEffect,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_SurfBlob[] = {
+static const struct SpriteFrameImage sPicTable_SurfBlob[] = {
     overworld_frame(gFieldEffectObjectPic_SurfBlob, 4, 4, 0),
     overworld_frame(gFieldEffectObjectPic_SurfBlob, 4, 4, 1),
     overworld_frame(gFieldEffectObjectPic_SurfBlob, 4, 4, 2),
 };
 
-const union AnimCmd gSurfBlobAnim_FaceSouth[] =
+static const union AnimCmd sSurfBlobAnim_FaceSouth[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gSurfBlobAnim_FaceNorth[] =
+static const union AnimCmd sSurfBlobAnim_FaceNorth[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gSurfBlobAnim_FaceWest[] =
+static const union AnimCmd sSurfBlobAnim_FaceWest[] =
 {
     ANIMCMD_FRAME(2, 1),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gSurfBlobAnim_FaceEast[] =
+static const union AnimCmd sSurfBlobAnim_FaceEast[] =
 {
     ANIMCMD_FRAME(2, 1, .hFlip = TRUE),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_SurfBlob[] =
+static const union AnimCmd *const sAnimTable_SurfBlob[] =
 {
-    gSurfBlobAnim_FaceSouth,
-    gSurfBlobAnim_FaceNorth,
-    gSurfBlobAnim_FaceWest,
-    gSurfBlobAnim_FaceEast,
+    sSurfBlobAnim_FaceSouth,
+    sSurfBlobAnim_FaceNorth,
+    sSurfBlobAnim_FaceWest,
+    sSurfBlobAnim_FaceEast,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_32x32, gFieldEffectObjectImageAnimTable_SurfBlob, gFieldEffectObjectPicTable_SurfBlob, gDummySpriteAffineAnimTable, UpdateSurfBlobFieldEffect};
+const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = {
+    .tileTag = 0xFFFF,
+    .paletteTag = 0xFFFF,
+    .oam = &gObjectEventBaseOam_32x32,
+    .anims = sAnimTable_SurfBlob,
+    .images = sPicTable_SurfBlob,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateSurfBlobFieldEffect,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_Arrow[] = {
+static const struct SpriteFrameImage sPicTable_Arrow[] = {
     overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 0),
     overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 1),
     overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 2),
@@ -166,51 +229,59 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_Arrow[] = {
     overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 7),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CC1C[] =
+static const union AnimCmd sArrowAnim_South[] =
 {
     ANIMCMD_FRAME(3, 32),
     ANIMCMD_FRAME(7, 32),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CC28[] =
+static const union AnimCmd sArrowAnim_North[] =
 {
     ANIMCMD_FRAME(0, 32),
     ANIMCMD_FRAME(4, 32),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CC34[] =
+static const union AnimCmd sArrowAnim_West[] =
 {
     ANIMCMD_FRAME(1, 32),
     ANIMCMD_FRAME(5, 32),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CC40[] =
+static const union AnimCmd sArrowAnim_East[] =
 {
     ANIMCMD_FRAME(2, 32),
     ANIMCMD_FRAME(6, 32),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_Arrow[] =
+static const union AnimCmd *const sAnimTable_Arrow[] =
 {
-    gFieldEffectObjectImageAnim_850CC1C,
-    gFieldEffectObjectImageAnim_850CC28,
-    gFieldEffectObjectImageAnim_850CC34,
-    gFieldEffectObjectImageAnim_850CC40,
+    sArrowAnim_South,
+    sArrowAnim_North,
+    sArrowAnim_West,
+    sArrowAnim_East,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Arrow, gFieldEffectObjectPicTable_Arrow, gDummySpriteAffineAnimTable, SpriteCallbackDummy};
+const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = {
+    .tileTag = 0xFFFF,
+    .paletteTag = 0xFFFF,
+    .oam = &gObjectEventBaseOam_16x16,
+    .anims = sAnimTable_Arrow,
+    .images = sPicTable_Arrow,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_GroundImpactDust[] = {
+static const struct SpriteFrameImage sPicTable_GroundImpactDust[] = {
     overworld_frame(gFieldEffectObjectPic_GroundImpactDust, 2, 1, 0),
     overworld_frame(gFieldEffectObjectPic_GroundImpactDust, 2, 1, 1),
     overworld_frame(gFieldEffectObjectPic_GroundImpactDust, 2, 1, 2),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CC8C[] =
+static const union AnimCmd sAnim_GroundImpactDust[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 8),
@@ -218,21 +289,29 @@ const union AnimCmd gFieldEffectObjectImageAnim_850CC8C[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_GroundImpactDust[] =
+static const union AnimCmd *const sAnimTable_GroundImpactDust[] =
 {
-    gFieldEffectObjectImageAnim_850CC8C,
+    sAnim_GroundImpactDust,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_GroundImpactDust, gFieldEffectObjectPicTable_GroundImpactDust, gDummySpriteAffineAnimTable, sub_8156194};
+const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = {
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
+    .oam = &gObjectEventBaseOam_16x8,
+    .anims = sAnimTable_GroundImpactDust,
+    .images = sPicTable_GroundImpactDust,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateJumpImpactEffect,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopTallGrass[] = {
-    overworld_frame(gFieldEffectObjectPic_BikeHopTallGrass, 2, 1, 0),
-    overworld_frame(gFieldEffectObjectPic_BikeHopTallGrass, 2, 1, 1),
-    overworld_frame(gFieldEffectObjectPic_BikeHopTallGrass, 2, 1, 2),
-    overworld_frame(gFieldEffectObjectPic_BikeHopTallGrass, 2, 1, 3),
+static const struct SpriteFrameImage sPicTable_JumpTallGrass[] = {
+    overworld_frame(gFieldEffectObjectPic_JumpTallGrass, 2, 1, 0),
+    overworld_frame(gFieldEffectObjectPic_JumpTallGrass, 2, 1, 1),
+    overworld_frame(gFieldEffectObjectPic_JumpTallGrass, 2, 1, 2),
+    overworld_frame(gFieldEffectObjectPic_JumpTallGrass, 2, 1, 3),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CCD8[] =
+static const union AnimCmd sAnim_JumpTallGrass[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 8),
@@ -241,171 +320,203 @@ const union AnimCmd gFieldEffectObjectImageAnim_850CCD8[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopTallGrass[] =
+static const union AnimCmd *const sAnimTable_JumpTallGrass[] =
 {
-    gFieldEffectObjectImageAnim_850CCD8,
+    sAnim_JumpTallGrass,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopTallGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopTallGrass, gFieldEffectObjectPicTable_BikeHopTallGrass, gDummySpriteAffineAnimTable, sub_8156194};
+const struct SpriteTemplate gFieldEffectObjectTemplate_JumpTallGrass = {
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
+    .oam = &gObjectEventBaseOam_16x8,
+    .anims = sAnimTable_JumpTallGrass,
+    .images = sPicTable_JumpTallGrass,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateJumpImpactEffect,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_SandFootprints[] = {
+static const struct SpriteFrameImage sPicTable_SandFootprints[] = {
     overworld_frame(gFieldEffectObjectPic_SandFootprints, 2, 2, 0),
     overworld_frame(gFieldEffectObjectPic_SandFootprints, 2, 2, 1),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CD18[] =
+static const union AnimCmd sSandFootprintsAnim_South[] =
 {
     ANIMCMD_FRAME(0, 1, .vFlip = TRUE),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CD20[] =
+static const union AnimCmd sSandFootprintsAnim_North[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CD28[] =
+static const union AnimCmd sSandFootprintsAnim_West[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CD30[] =
+static const union AnimCmd sSandFootprintsAnim_East[] =
 {
     ANIMCMD_FRAME(1, 1, .hFlip = TRUE),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_SandFootprints[] =
+static const union AnimCmd *const sAnimTable_SandFootprints[] =
 {
-    gFieldEffectObjectImageAnim_850CD18,
-    gFieldEffectObjectImageAnim_850CD18,
-    gFieldEffectObjectImageAnim_850CD20,
-    gFieldEffectObjectImageAnim_850CD28,
-    gFieldEffectObjectImageAnim_850CD30,
+    sSandFootprintsAnim_South,
+    sSandFootprintsAnim_South,
+    sSandFootprintsAnim_North,
+    sSandFootprintsAnim_West,
+    sSandFootprintsAnim_East,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_SandFootprints, gFieldEffectObjectPicTable_SandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect};
+const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = {
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
+    .oam = &gObjectEventBaseOam_16x16,
+    .anims = sAnimTable_SandFootprints,
+    .images = sPicTable_SandFootprints,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateFootprintsTireTracksFieldEffect,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_DeepSandFootprints[] = {
+static const struct SpriteFrameImage sPicTable_DeepSandFootprints[] = {
     overworld_frame(gFieldEffectObjectPic_DeepSandFootprints, 2, 2, 0),
     overworld_frame(gFieldEffectObjectPic_DeepSandFootprints, 2, 2, 1),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CD74[] =
+static const union AnimCmd sDeepSandFootprintsAnim_South[] =
 {
     ANIMCMD_FRAME(0, 1, .vFlip = TRUE),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CD7C[] =
+static const union AnimCmd sDeepSandFootprintsAnim_North[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CD84[] =
+static const union AnimCmd sDeepSandFootprintsAnim_West[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CD8C[] =
+static const union AnimCmd sDeepSandFootprintsAnim_East[] =
 {
     ANIMCMD_FRAME(1, 1, .hFlip = TRUE),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_DeepSandFootprints[] =
+static const union AnimCmd *const sAnimTable_DeepSandFootprints[] =
 {
-    gFieldEffectObjectImageAnim_850CD74,
-    gFieldEffectObjectImageAnim_850CD74,
-    gFieldEffectObjectImageAnim_850CD7C,
-    gFieldEffectObjectImageAnim_850CD84,
-    gFieldEffectObjectImageAnim_850CD8C,
+    sDeepSandFootprintsAnim_South,
+    sDeepSandFootprintsAnim_South,
+    sDeepSandFootprintsAnim_North,
+    sDeepSandFootprintsAnim_West,
+    sDeepSandFootprintsAnim_East,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_DeepSandFootprints, gFieldEffectObjectPicTable_DeepSandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect};
+const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = {
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
+    .oam = &gObjectEventBaseOam_16x16,
+    .anims = sAnimTable_DeepSandFootprints,
+    .images = sPicTable_DeepSandFootprints,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateFootprintsTireTracksFieldEffect,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeTireTracks[] = {
+static const struct SpriteFrameImage sPicTable_BikeTireTracks[] = {
     overworld_frame(gFieldEffectObjectPic_BikeTireTracks, 2, 2, 0),
     overworld_frame(gFieldEffectObjectPic_BikeTireTracks, 2, 2, 1),
     overworld_frame(gFieldEffectObjectPic_BikeTireTracks, 2, 2, 2),
     overworld_frame(gFieldEffectObjectPic_BikeTireTracks, 2, 2, 3),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CDE0[] =
+static const union AnimCmd sBikeTireTracksAnim_South[] =
 {
     ANIMCMD_FRAME(2, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CDE8[] =
+static const union AnimCmd sBikeTireTracksAnim_North[] =
 {
     ANIMCMD_FRAME(2, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CDF0[] =
+static const union AnimCmd sBikeTireTracksAnim_West[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CDF8[] =
+static const union AnimCmd sBikeTireTracksAnim_East[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CE00[] =
+static const union AnimCmd sBikeTireTracksAnim_SECornerTurn[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CE08[] =
+static const union AnimCmd sBikeTireTracksAnim_SWCornerTurn[] =
 {
     ANIMCMD_FRAME(0, 1, .hFlip = TRUE),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CE10[] =
+static const union AnimCmd sBikeTireTracksAnim_NWCornerTurn[] =
 {
     ANIMCMD_FRAME(3, 1, .hFlip = TRUE),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CE18[] =
+static const union AnimCmd sBikeTireTracksAnim_NECornerTurn[] =
 {
     ANIMCMD_FRAME(3, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeTireTracks[] =
+static const union AnimCmd *const sAnimTable_BikeTireTracks[] =
 {
-    gFieldEffectObjectImageAnim_850CDE0,
-    gFieldEffectObjectImageAnim_850CDE0,
-    gFieldEffectObjectImageAnim_850CDE8,
-    gFieldEffectObjectImageAnim_850CDF0,
-    gFieldEffectObjectImageAnim_850CDF8,
-    gFieldEffectObjectImageAnim_850CE00,
-    gFieldEffectObjectImageAnim_850CE08,
-    gFieldEffectObjectImageAnim_850CE10,
-    gFieldEffectObjectImageAnim_850CE18,
+    sBikeTireTracksAnim_South,
+    sBikeTireTracksAnim_South,
+    sBikeTireTracksAnim_North,
+    sBikeTireTracksAnim_West,
+    sBikeTireTracksAnim_East,
+    sBikeTireTracksAnim_SECornerTurn,
+    sBikeTireTracksAnim_SWCornerTurn,
+    sBikeTireTracksAnim_NWCornerTurn,
+    sBikeTireTracksAnim_NECornerTurn,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeTireTracks, gFieldEffectObjectPicTable_BikeTireTracks, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect};
+const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = {
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
+    .oam = &gObjectEventBaseOam_16x16,
+    .anims = sAnimTable_BikeTireTracks,
+    .images = sPicTable_BikeTireTracks,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateFootprintsTireTracksFieldEffect,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopBigSplash[] = {
-    overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 2, 2, 0),
-    overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 2, 2, 1),
-    overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 2, 2, 2),
-    overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 2, 2, 3),
+static const struct SpriteFrameImage sPicTable_JumpBigSplash[] = {
+    overworld_frame(gFieldEffectObjectPic_JumpBigSplash, 2, 2, 0),
+    overworld_frame(gFieldEffectObjectPic_JumpBigSplash, 2, 2, 1),
+    overworld_frame(gFieldEffectObjectPic_JumpBigSplash, 2, 2, 2),
+    overworld_frame(gFieldEffectObjectPic_JumpBigSplash, 2, 2, 3),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CE7C[] =
+static const union AnimCmd sAnim_JumpBigSplash[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 8),
@@ -414,26 +525,34 @@ const union AnimCmd gFieldEffectObjectImageAnim_850CE7C[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopBigSplash[] =
+static const union AnimCmd *const sAnimTable_JumpBigSplash[] =
 {
-    gFieldEffectObjectImageAnim_850CE7C,
+    sAnim_JumpBigSplash,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopBigSplash = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeHopBigSplash, gFieldEffectObjectPicTable_BikeHopBigSplash, gDummySpriteAffineAnimTable, sub_8156194};
+const struct SpriteTemplate gFieldEffectObjectTemplate_JumpBigSplash = {
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
+    .oam = &gObjectEventBaseOam_16x16,
+    .anims = sAnimTable_JumpBigSplash,
+    .images = sPicTable_JumpBigSplash,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateJumpImpactEffect,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_Splash[] = {
+static const struct SpriteFrameImage sPicTable_Splash[] = {
     overworld_frame(gFieldEffectObjectPic_Splash, 2, 1, 0),
     overworld_frame(gFieldEffectObjectPic_Splash, 2, 1, 1),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CEBC[] =
+static const union AnimCmd sAnim_Splash_0[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(1, 4),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CEC8[] =
+static const union AnimCmd sAnim_Splash_1[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(1, 4),
@@ -446,21 +565,29 @@ const union AnimCmd gFieldEffectObjectImageAnim_850CEC8[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_Splash[] =
+static const union AnimCmd *const sAnimTable_Splash[] =
 {
-    gFieldEffectObjectImageAnim_850CEBC,
-    gFieldEffectObjectImageAnim_850CEC8,
+    sAnim_Splash_0,
+    sAnim_Splash_1,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_Splash, gFieldEffectObjectPicTable_Splash, gDummySpriteAffineAnimTable, UpdateSplashFieldEffect};
+const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = {
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
+    .oam = &gObjectEventBaseOam_16x8,
+    .anims = sAnimTable_Splash,
+    .images = sPicTable_Splash,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateSplashFieldEffect,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopSmallSplash[] = {
-    overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 2, 1, 0),
-    overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 2, 1, 1),
-    overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 2, 1, 2),
+static const struct SpriteFrameImage sPicTable_JumpSmallSplash[] = {
+    overworld_frame(gFieldEffectObjectPic_JumpSmallSplash, 2, 1, 0),
+    overworld_frame(gFieldEffectObjectPic_JumpSmallSplash, 2, 1, 1),
+    overworld_frame(gFieldEffectObjectPic_JumpSmallSplash, 2, 1, 2),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CF24[] =
+static const union AnimCmd sAnim_JumpSmallSplash[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(1, 4),
@@ -468,21 +595,29 @@ const union AnimCmd gFieldEffectObjectImageAnim_850CF24[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopSmallSplash[] =
+static const union AnimCmd *const sAnimTable_JumpSmallSplash[] =
 {
-    gFieldEffectObjectImageAnim_850CF24,
+    sAnim_JumpSmallSplash,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopSmallSplash = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopSmallSplash, gFieldEffectObjectPicTable_BikeHopSmallSplash, gDummySpriteAffineAnimTable, sub_8156194};
+const struct SpriteTemplate gFieldEffectObjectTemplate_JumpSmallSplash = {
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
+    .oam = &gObjectEventBaseOam_16x8,
+    .anims = sAnimTable_JumpSmallSplash,
+    .images = sPicTable_JumpSmallSplash,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateJumpImpactEffect,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_LongGrass[] = {
+static const struct SpriteFrameImage sPicTable_LongGrass[] = {
     overworld_frame(gFieldEffectObjectPic_LongGrass, 2, 2, 0),
     overworld_frame(gFieldEffectObjectPic_LongGrass, 2, 2, 1),
     overworld_frame(gFieldEffectObjectPic_LongGrass, 2, 2, 2),
     overworld_frame(gFieldEffectObjectPic_LongGrass, 2, 2, 3),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CF70[] =
+static const union AnimCmd sAnim_LongGrass[] =
 {
     ANIMCMD_FRAME(1, 3),
     ANIMCMD_FRAME(2, 3),
@@ -494,23 +629,31 @@ const union AnimCmd gFieldEffectObjectImageAnim_850CF70[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_LongGrass[] =
+static const union AnimCmd *const sAnimTable_LongGrass[] =
 {
-    gFieldEffectObjectImageAnim_850CF70,
+    sAnim_LongGrass,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_LongGrass, gFieldEffectObjectPicTable_LongGrass, gDummySpriteAffineAnimTable, UpdateLongGrassFieldEffect};
+const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = {
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
+    .oam = &gObjectEventBaseOam_16x16,
+    .anims = sAnimTable_LongGrass,
+    .images = sPicTable_LongGrass,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateLongGrassFieldEffect,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown16[] = {
-    overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 0),
-    overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 1),
-    overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 2),
-    overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 3),
-    overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 4),
-    overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 6),
+static const struct SpriteFrameImage sPicTable_JumpLongGrass[] = {
+    overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 0),
+    overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 1),
+    overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 2),
+    overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 3),
+    overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 4),
+    overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 6),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CFDC[] =
+static const union AnimCmd sAnim_JumpLongGrass[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(1, 4),
@@ -521,15 +664,23 @@ const union AnimCmd gFieldEffectObjectImageAnim_850CFDC[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown16[] =
+static const union AnimCmd *const sAnimTable_JumpLongGrass[] =
 {
-    gFieldEffectObjectImageAnim_850CFDC,
+    sAnim_JumpLongGrass,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown16 = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown16, gFieldEffectObjectPicTable_Unknown16, gDummySpriteAffineAnimTable, sub_8156194};
+const struct SpriteTemplate gFieldEffectObjectTemplate_JumpLongGrass = {
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
+    .oam = &gObjectEventBaseOam_16x16,
+    .anims = sAnimTable_JumpLongGrass,
+    .images = sPicTable_JumpLongGrass,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateJumpImpactEffect,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown17[] = {
-    overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 6),
+static const struct SpriteFrameImage sPicTable_UnusedGrass[] = {
+    overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 6),
     overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 0),
     overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 1),
     overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 2),
@@ -540,7 +691,7 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown17[] = {
     overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 7),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850D05C[] =
+static const union AnimCmd sAnim_UnusedGrass[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 4),
@@ -554,21 +705,29 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D05C[] =
     ANIMCMD_JUMP(7),
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown17[] =
+static const union AnimCmd *const sAnimTable_UnusedGrass[] =
 {
-    gFieldEffectObjectImageAnim_850D05C,
+    sAnim_UnusedGrass,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17 = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown17, gFieldEffectObjectPicTable_Unknown17, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim};
+const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass = {
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
+    .oam = &gObjectEventBaseOam_16x16,
+    .anims = sAnimTable_UnusedGrass,
+    .images = sPicTable_UnusedGrass,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = WaitFieldEffectSpriteAnim,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown18[] = {
-    overworld_frame(gFieldEffectObjectPic_Unknown18, 2, 2, 0),
-    overworld_frame(gFieldEffectObjectPic_Unknown18, 2, 2, 1),
-    overworld_frame(gFieldEffectObjectPic_Unknown18, 2, 2, 2),
-    overworld_frame(gFieldEffectObjectPic_Unknown18, 2, 2, 3),
+static const struct SpriteFrameImage sPicTable_UnusedGrass2[] = {
+    overworld_frame(gFieldEffectObjectPic_UnusedGrass2, 2, 2, 0),
+    overworld_frame(gFieldEffectObjectPic_UnusedGrass2, 2, 2, 1),
+    overworld_frame(gFieldEffectObjectPic_UnusedGrass2, 2, 2, 2),
+    overworld_frame(gFieldEffectObjectPic_UnusedGrass2, 2, 2, 3),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850D0C0[] =
+static const union AnimCmd sAnim_UnusedGrass2[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(1, 4),
@@ -579,21 +738,29 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D0C0[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown18[] =
+static const union AnimCmd *const sAnimTable_UnusedGrass2[] =
 {
-    gFieldEffectObjectImageAnim_850D0C0,
+    sAnim_UnusedGrass2,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown18 = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown18, gFieldEffectObjectPicTable_Unknown18, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim};
+const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass2 = {
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
+    .oam = &gObjectEventBaseOam_16x16,
+    .anims = sAnimTable_UnusedGrass2,
+    .images = sPicTable_UnusedGrass2,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = WaitFieldEffectSpriteAnim,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown19[] = {
-    overworld_frame(gFieldEffectObjectPic_Unknown19, 2, 2, 0),
-    overworld_frame(gFieldEffectObjectPic_Unknown19, 2, 2, 1),
-    overworld_frame(gFieldEffectObjectPic_Unknown19, 2, 2, 2),
-    overworld_frame(gFieldEffectObjectPic_Unknown19, 2, 2, 3),
+static const struct SpriteFrameImage sPicTable_UnusedSand[] = {
+    overworld_frame(gFieldEffectObjectPic_UnusedSand, 2, 2, 0),
+    overworld_frame(gFieldEffectObjectPic_UnusedSand, 2, 2, 1),
+    overworld_frame(gFieldEffectObjectPic_UnusedSand, 2, 2, 2),
+    overworld_frame(gFieldEffectObjectPic_UnusedSand, 2, 2, 3),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850D118[] =
+static const union AnimCmd sAnim_UnusedSand[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(1, 4),
@@ -602,20 +769,28 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D118[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown19[] =
+static const union AnimCmd *const sAnimTable_UnusedSand[] =
 {
-    gFieldEffectObjectImageAnim_850D118,
+    sAnim_UnusedSand,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19 = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown19, gFieldEffectObjectPicTable_Unknown19, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim};
+const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedSand = {
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
+    .oam = &gObjectEventBaseOam_16x16,
+    .anims = sAnimTable_UnusedSand,
+    .images = sPicTable_UnusedSand,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = WaitFieldEffectSpriteAnim,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown29[] = {
-    overworld_frame(gFieldEffectObjectPic_Unknown29, 2, 1, 0),
-    overworld_frame(gFieldEffectObjectPic_Unknown29, 2, 1, 1),
-    overworld_frame(gFieldEffectObjectPic_Unknown29, 2, 1, 2),
+static const struct SpriteFrameImage sPicTable_SandPile[] = {
+    overworld_frame(gFieldEffectObjectPic_SandPile, 2, 1, 0),
+    overworld_frame(gFieldEffectObjectPic_SandPile, 2, 1, 1),
+    overworld_frame(gFieldEffectObjectPic_SandPile, 2, 1, 2),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850D160[] =
+static const union AnimCmd sAnim_SandPile[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(1, 4),
@@ -623,21 +798,29 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D160[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown29[] =
+static const union AnimCmd *const sAnimTable_SandPile[] =
 {
-    gFieldEffectObjectImageAnim_850D160,
+    sAnim_SandPile,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown29 = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_Unknown29, gFieldEffectObjectPicTable_Unknown29, gDummySpriteAffineAnimTable, UpdateSandPileFieldEffect};
+const struct SpriteTemplate gFieldEffectObjectTemplate_SandPile = {
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
+    .oam = &gObjectEventBaseOam_16x8,
+    .anims = sAnimTable_SandPile,
+    .images = sPicTable_SandPile,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateSandPileFieldEffect,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown20[] = {
-    overworld_frame(gFieldEffectObjectPic_Unknown20, 2, 2, 0),
-    overworld_frame(gFieldEffectObjectPic_Unknown20, 2, 2, 1),
-    overworld_frame(gFieldEffectObjectPic_Unknown20, 2, 2, 2),
-    overworld_frame(gFieldEffectObjectPic_Unknown20, 2, 2, 3),
+static const struct SpriteFrameImage sPicTable_WaterSurfacing[] = {
+    overworld_frame(gFieldEffectObjectPic_WaterSurfacing, 2, 2, 0),
+    overworld_frame(gFieldEffectObjectPic_WaterSurfacing, 2, 2, 1),
+    overworld_frame(gFieldEffectObjectPic_WaterSurfacing, 2, 2, 2),
+    overworld_frame(gFieldEffectObjectPic_WaterSurfacing, 2, 2, 3),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850D1AC[] =
+static const union AnimCmd sAnim_WaterSurfacing[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(1, 4),
@@ -648,14 +831,22 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D1AC[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown20[] =
+static const union AnimCmd *const sAnimTable_WaterSurfacing[] =
 {
-    gFieldEffectObjectImageAnim_850D1AC,
+    sAnim_WaterSurfacing,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown20 = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown20, gFieldEffectObjectPicTable_Unknown20, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim};
+const struct SpriteTemplate gFieldEffectObjectTemplate_WaterSurfacing = {
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
+    .oam = &gObjectEventBaseOam_16x16,
+    .anims = sAnimTable_WaterSurfacing,
+    .images = sPicTable_WaterSurfacing,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = WaitFieldEffectSpriteAnim,
+};
 
-const union AffineAnimCmd gFieldEffectObjectRotScalAnim_850D1E4[] =
+static const union AffineAnimCmd sAffineAnim_ReflectionDistortion_0[] =
 {
     AFFINEANIMCMD_FRAME(0xFF00, 0x100, -128, 0),
     AFFINEANIMCMD_FRAME(0x1, 0x0, 0, 4),
@@ -669,7 +860,7 @@ const union AffineAnimCmd gFieldEffectObjectRotScalAnim_850D1E4[] =
     AFFINEANIMCMD_JUMP(1),
 };
 
-const union AffineAnimCmd gFieldEffectObjectRotScalAnim_850D234[] =
+static const union AffineAnimCmd sAffineAnim_ReflectionDistortion_1[] =
 {
     AFFINEANIMCMD_FRAME(0x100, 0x100, -128, 0),
     AFFINEANIMCMD_FRAME(0xFFFF, 0x0, 0, 4),
@@ -683,24 +874,32 @@ const union AffineAnimCmd gFieldEffectObjectRotScalAnim_850D234[] =
     AFFINEANIMCMD_JUMP(1),
 };
 
-const union AffineAnimCmd *const gFieldEffectObjectRotScalAnimTable_Unknown21[] =
+static const union AffineAnimCmd *const sAffineAnims_ReflectionDistortion[] =
 {
-    gFieldEffectObjectRotScalAnim_850D1E4,
-    gFieldEffectObjectRotScalAnim_850D234,
+    sAffineAnim_ReflectionDistortion_0,
+    sAffineAnim_ReflectionDistortion_1,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown21 = {0x0, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gFieldEffectObjectRotScalAnimTable_Unknown21, SpriteCallbackDummy};
+const struct SpriteTemplate gFieldEffectObjectTemplate_ReflectionDistortion = {
+    .tileTag = 0x0,
+    .paletteTag = 0xFFFF,
+    .oam = &gDummyOamData,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = sAffineAnims_ReflectionDistortion,
+    .callback = SpriteCallbackDummy,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_BerryTreeGrowthSparkle[] = {
-    overworld_frame(gFieldEffectObjectPic_BerryTreeGrowthSparkle, 2, 2, 0),
-    overworld_frame(gFieldEffectObjectPic_BerryTreeGrowthSparkle, 2, 2, 1),
-    overworld_frame(gFieldEffectObjectPic_BerryTreeGrowthSparkle, 2, 2, 2),
-    overworld_frame(gFieldEffectObjectPic_BerryTreeGrowthSparkle, 2, 2, 3),
-    overworld_frame(gFieldEffectObjectPic_BerryTreeGrowthSparkle, 2, 2, 4),
-    overworld_frame(gFieldEffectObjectPic_BerryTreeGrowthSparkle, 2, 2, 5),
+static const struct SpriteFrameImage sPicTable_Sparkle[] = {
+    overworld_frame(gFieldEffectObjectPic_Sparkle, 2, 2, 0),
+    overworld_frame(gFieldEffectObjectPic_Sparkle, 2, 2, 1),
+    overworld_frame(gFieldEffectObjectPic_Sparkle, 2, 2, 2),
+    overworld_frame(gFieldEffectObjectPic_Sparkle, 2, 2, 3),
+    overworld_frame(gFieldEffectObjectPic_Sparkle, 2, 2, 4),
+    overworld_frame(gFieldEffectObjectPic_Sparkle, 2, 2, 5),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850D2D4[] =
+static const union AnimCmd sAnim_Sparkle[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 8),
@@ -725,14 +924,22 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D2D4[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle[] =
+static const union AnimCmd *const sAnimTable_Sparkle[] =
 {
-    gFieldEffectObjectImageAnim_850D2D4,
+    sAnim_Sparkle,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_BerryTreeGrowthSparkle = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle, gFieldEffectObjectPicTable_BerryTreeGrowthSparkle, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim};
+const struct SpriteTemplate gFieldEffectObjectTemplate_Sparkle = {
+    .tileTag = 0xFFFF,
+    .paletteTag = 0xFFFF,
+    .oam = &gObjectEventBaseOam_16x16,
+    .anims = sAnimTable_Sparkle,
+    .images = sPicTable_Sparkle,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = WaitFieldEffectSpriteAnim,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_TreeDisguise[] = {
+static const struct SpriteFrameImage sPicTable_TreeDisguise[] = {
     overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 0),
     overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 1),
     overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 2),
@@ -742,13 +949,13 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_TreeDisguise[] = {
     overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 6),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850D37C[] =
+static const union AnimCmd sAnim_TreeDisguise[] =
 {
     ANIMCMD_FRAME(0, 16),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850D384[] =
+static const union AnimCmd sAnim_TreeDisguiseReveal[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(1, 4),
@@ -760,15 +967,23 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D384[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_TreeDisguise[] =
+static const union AnimCmd *const sAnimTable_TreeDisguise[] =
 {
-    gFieldEffectObjectImageAnim_850D37C,
-    gFieldEffectObjectImageAnim_850D384,
+    sAnim_TreeDisguise,
+    sAnim_TreeDisguiseReveal,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_TreeDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect};
+const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = {
+    .tileTag = 0xFFFF,
+    .paletteTag = 0xFFFF,
+    .oam = &gObjectEventBaseOam_16x32,
+    .anims = sAnimTable_TreeDisguise,
+    .images = sPicTable_TreeDisguise,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateDisguiseFieldEffect,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_MountainDisguise[] = {
+static const struct SpriteFrameImage sPicTable_MountainDisguise[] = {
     overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 0),
     overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 1),
     overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 2),
@@ -778,13 +993,13 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_MountainDisguise[] = {
     overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 6),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850D3FC[] =
+static const union AnimCmd sAnim_MountainDisguise[] =
 {
     ANIMCMD_FRAME(0, 16),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850D404[] =
+static const union AnimCmd sAnim_MountainDisguiseReveal[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(1, 4),
@@ -796,15 +1011,23 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D404[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_MountainDisguise[] =
+static const union AnimCmd *const sAnimTable_MountainDisguise[] =
 {
-    gFieldEffectObjectImageAnim_850D3FC,
-    gFieldEffectObjectImageAnim_850D404,
+    sAnim_MountainDisguise,
+    sAnim_MountainDisguiseReveal,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x32, gFieldEffectObjectImageAnimTable_MountainDisguise, gFieldEffectObjectPicTable_MountainDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect};
+const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = {
+    .tileTag = 0xFFFF,
+    .paletteTag = 0xFFFF,
+    .oam = &gObjectEventBaseOam_16x32,
+    .anims = sAnimTable_MountainDisguise,
+    .images = sPicTable_MountainDisguise,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateDisguiseFieldEffect,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_SandDisguisePlaceholder[] = {
+static const struct SpriteFrameImage sPicTable_SandDisguisePlaceholder[] = {
     overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 0),
     overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 1),
     overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 2),
@@ -814,70 +1037,102 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_SandDisguisePlaceholder
     overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 6),
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_SandDisguisePlaceholder, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect};
+const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = {
+    .tileTag = 0xFFFF,
+    .paletteTag = 0xFFFF,
+    .oam = &gObjectEventBaseOam_16x32,
+    .anims = sAnimTable_TreeDisguise,
+    .images = sPicTable_SandDisguisePlaceholder,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateDisguiseFieldEffect,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_Bird[] = {
+static const struct SpriteFrameImage sPicTable_Bird[] = {
     obj_frame_tiles(gFieldEffectObjectPic_Bird),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850D49C[] =
+static const union AnimCmd sAnim_Bird[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_Bird[] =
+static const union AnimCmd *const sAnimTable_Bird[] =
 {
-    gFieldEffectObjectImageAnim_850D49C,
+    sAnim_Bird,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_32x32, gFieldEffectObjectImageAnimTable_Bird, gFieldEffectObjectPicTable_Bird, gDummySpriteAffineAnimTable, SpriteCallbackDummy};
+const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = {
+    .tileTag = 0xFFFF,
+    .paletteTag = 0xFFFF,
+    .oam = &gObjectEventBaseOam_32x32,
+    .anims = sAnimTable_Bird,
+    .images = sPicTable_Bird,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_ShortGrass[] = {
+static const struct SpriteFrameImage sPicTable_ShortGrass[] = {
     overworld_frame(gFieldEffectObjectPic_ShortGrass, 2, 2, 0),
     overworld_frame(gFieldEffectObjectPic_ShortGrass, 2, 2, 1),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850D4D0[] =
+static const union AnimCmd sAnim_ShortGrass[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(1, 4),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_ShortGrass[] =
+static const union AnimCmd *const sAnimTable_ShortGrass[] =
 {
-    gFieldEffectObjectImageAnim_850D4D0,
+    sAnim_ShortGrass,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_ShortGrass, gFieldEffectObjectPicTable_ShortGrass, gDummySpriteAffineAnimTable, UpdateShortGrassFieldEffect};
+const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = {
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
+    .oam = &gObjectEventBaseOam_16x16,
+    .anims = sAnimTable_ShortGrass,
+    .images = sPicTable_ShortGrass,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateShortGrassFieldEffect,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_HotSpringsWater[] = {
+static const struct SpriteFrameImage sPicTable_HotSpringsWater[] = {
     obj_frame_tiles(gFieldEffectObjectPic_HotSpringsWater),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850D500[] =
+static const union AnimCmd sAnim_HotSpringsWater[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_HotSpringsWater[] =
+static const union AnimCmd *const sAnimTable_HotSpringsWater[] =
 {
-    gFieldEffectObjectImageAnim_850D500,
+    sAnim_HotSpringsWater,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_HotSpringsWater, gFieldEffectObjectPicTable_HotSpringsWater, gDummySpriteAffineAnimTable, UpdateHotSpringsWaterFieldEffect};
+const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = {
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
+    .oam = &gObjectEventBaseOam_16x16,
+    .anims = sAnimTable_HotSpringsWater,
+    .images = sPicTable_HotSpringsWater,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateHotSpringsWaterFieldEffect,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_JumpOutOfAsh[] = {
-    overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 2, 2, 0),
-    overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 2, 2, 1),
-    overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 2, 2, 2),
-    overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 2, 2, 3),
-    overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 2, 2, 4),
+static const struct SpriteFrameImage sPicTable_AshPuff[] = {
+    overworld_frame(gFieldEffectObjectPic_AshPuff, 2, 2, 0),
+    overworld_frame(gFieldEffectObjectPic_AshPuff, 2, 2, 1),
+    overworld_frame(gFieldEffectObjectPic_AshPuff, 2, 2, 2),
+    overworld_frame(gFieldEffectObjectPic_AshPuff, 2, 2, 3),
+    overworld_frame(gFieldEffectObjectPic_AshPuff, 2, 2, 4),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850D54C[] =
+static const union AnimCmd sAnim_AshPuff[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(1, 6),
@@ -887,33 +1142,33 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D54C[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_JumpOutOfAsh[] =
+static const union AnimCmd *const sAnimTable_AshPuff[] =
 {
-    gFieldEffectObjectImageAnim_850D54C,
+    sAnim_AshPuff,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh = 
+const struct SpriteTemplate gFieldEffectObjectTemplate_AshPuff = 
 {
     .tileTag = 0xFFFF, 
-    .paletteTag = 0x100D, 
+    .paletteTag = FLDEFF_PAL_TAG_ASH, 
     .oam = &gObjectEventBaseOam_16x16, 
-    .anims = gFieldEffectObjectImageAnimTable_JumpOutOfAsh, 
-    .images = gFieldEffectObjectPicTable_JumpOutOfAsh, 
+    .anims = sAnimTable_AshPuff, 
+    .images = sPicTable_AshPuff, 
     .affineAnims = gDummySpriteAffineAnimTable, 
-    .callback = SpriteCB_PopOutOfAsh
+    .callback = SpriteCB_AshPuff
 };
 
-const struct SpritePalette gFieldEffectObjectPaletteInfo2 = {gFieldEffectObjectPalette2, 0x100D};
+const struct SpritePalette gSpritePalette_Ash = {gFieldEffectPal_Ash, FLDEFF_PAL_TAG_ASH};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_LavaridgeGymWarp[] = {
-    overworld_frame(gFieldEffectObjectPic_LavaridgeGymWarp, 2, 2, 0),
-    overworld_frame(gFieldEffectObjectPic_LavaridgeGymWarp, 2, 2, 1),
-    overworld_frame(gFieldEffectObjectPic_LavaridgeGymWarp, 2, 2, 2),
-    overworld_frame(gFieldEffectObjectPic_LavaridgeGymWarp, 2, 2, 3),
-    overworld_frame(gFieldEffectObjectPic_LavaridgeGymWarp, 2, 2, 4),
+static const struct SpriteFrameImage sPicTable_AshLaunch[] = {
+    overworld_frame(gFieldEffectObjectPic_AshLaunch, 2, 2, 0),
+    overworld_frame(gFieldEffectObjectPic_AshLaunch, 2, 2, 1),
+    overworld_frame(gFieldEffectObjectPic_AshLaunch, 2, 2, 2),
+    overworld_frame(gFieldEffectObjectPic_AshLaunch, 2, 2, 3),
+    overworld_frame(gFieldEffectObjectPic_AshLaunch, 2, 2, 4),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_LavaridgeGymWarp[] =
+static const union AnimCmd sAnim_AshLaunch[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(1, 6),
@@ -923,23 +1178,23 @@ const union AnimCmd gFieldEffectObjectImageAnim_LavaridgeGymWarp[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_LavaridgeGymWarp[] =
+static const union AnimCmd *const sAnimTable_AshLaunch[] =
 {
-    gFieldEffectObjectImageAnim_LavaridgeGymWarp,
+    sAnim_AshLaunch,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_LavaridgeGymWarp = 
+const struct SpriteTemplate gFieldEffectObjectTemplate_AshLaunch = 
 {
     .tileTag = 0xFFFF, 
-    .paletteTag = 0x100D, 
+    .paletteTag = FLDEFF_PAL_TAG_ASH, 
     .oam = &gObjectEventBaseOam_16x16, 
-    .anims = gFieldEffectObjectImageAnimTable_LavaridgeGymWarp, 
-    .images = gFieldEffectObjectPicTable_LavaridgeGymWarp, 
+    .anims = sAnimTable_AshLaunch, 
+    .images = sPicTable_AshLaunch, 
     .affineAnims = gDummySpriteAffineAnimTable, 
-    .callback = SpriteCB_LavaridgeGymWarp
+    .callback = SpriteCB_AshLaunch
 };
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_Bubbles[] = {
+static const struct SpriteFrameImage sPicTable_Bubbles[] = {
     overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 0),
     overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 1),
     overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 2),
@@ -950,7 +1205,7 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_Bubbles[] = {
     overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 7),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850D624[] =
+static const union AnimCmd sAnim_Bubbles[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(1, 4),
@@ -963,19 +1218,27 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D624[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_Bubbles[] =
+static const union AnimCmd *const sAnimTable_Bubbles[] =
 {
-    gFieldEffectObjectImageAnim_850D624,
+    sAnim_Bubbles,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x32, gFieldEffectObjectImageAnimTable_Bubbles, gFieldEffectObjectPicTable_Bubbles, gDummySpriteAffineAnimTable, UpdateBubblesFieldEffect};
+const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = {
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
+    .oam = &gObjectEventBaseOam_16x32,
+    .anims = sAnimTable_Bubbles,
+    .images = sPicTable_Bubbles,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateBubblesFieldEffect,
+};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown35[] = {
-    overworld_frame(gFieldEffectObjectPic_Unknown35, 2, 2, 0),
-    overworld_frame(gFieldEffectObjectPic_Unknown35, 2, 2, 1),
+static const struct SpriteFrameImage sPicTable_SmallSparkle[] = {
+    overworld_frame(gFieldEffectObjectPic_SmallSparkle, 2, 2, 0),
+    overworld_frame(gFieldEffectObjectPic_SmallSparkle, 2, 2, 1),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850D674[] =
+static const union AnimCmd sAnim_SmallSparkle[] =
 {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_FRAME(1, 5),
@@ -983,28 +1246,44 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D674[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown35[] =
+static const union AnimCmd *const sAnimTable_SmallSparkle[] =
 {
-    gFieldEffectObjectImageAnim_850D674,
+    sAnim_SmallSparkle,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown35 = {0xFFFF, 0x100F, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown35, gFieldEffectObjectPicTable_Unknown35, gDummySpriteAffineAnimTable, UpdateSparkleFieldEffect};
+const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle = {
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_SMALL_SPARKLE,
+    .oam = &gObjectEventBaseOam_16x16,
+    .anims = sAnimTable_SmallSparkle,
+    .images = sPicTable_SmallSparkle,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateSparkleFieldEffect,
+};
 
-const struct SpritePalette gFieldEffectObjectPaletteInfo3 = {gFieldEffectObjectPalette3, 0x100F};
+const struct SpritePalette gSpritePalette_SmallSparkle = {gFieldEffectPal_SmallSparkle, FLDEFF_PAL_TAG_SMALL_SPARKLE};
 
-const union AnimCmd gFieldEffectObjectImageAnim_850D6A8[] = {
+static const union AnimCmd sAnim_Rayquaza[] = {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_Rayquaza[] = {
-    gFieldEffectObjectImageAnim_850D6A8,
+static const union AnimCmd *const sAnimTable_Rayquaza[] = {
+    sAnim_Rayquaza,
 };
 
-const struct SpriteFrameImage  gFieldEffectObjectPicTable_Rayquaza[] = {
+const struct SpriteFrameImage  sPicTable_Rayquaza[] = {
     overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 0),
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_32x32, gFieldEffectObjectImageAnimTable_Rayquaza, gFieldEffectObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable, sub_8155F80};
+const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {
+    .tileTag = 0xFFFF,
+    .paletteTag = 0xFFFF,
+    .oam = &gObjectEventBaseOam_32x32,
+    .anims = sAnimTable_Rayquaza,
+    .images = sPicTable_Rayquaza,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateRayquazaSpotlightEffect,
+};
 
-const struct SpritePalette gFieldEffectObjectPaletteInfoUnused = {gObjectEventPalette2, 0x1011};
+static const struct SpritePalette sSpritePalette_Unused = {gObjectEventPalette2, FLDEFF_PAL_TAG_UNKNOWN};
diff --git a/src/data/graphics/slot_machine.h b/src/data/graphics/slot_machine.h
index a94f2b622..6500ad7f3 100644
--- a/src/data/graphics/slot_machine.h
+++ b/src/data/graphics/slot_machine.h
@@ -2,21 +2,15 @@ const u16 gSlotMachineMenu_Pal[] = INCBIN_U16("graphics/slot_machine/menu.gbapal
 const u32 gSlotMachineMenu_Gfx[] = INCBIN_U32("graphics/slot_machine/menu.4bpp.lz");
 const u16 gSlotMachineMenu_Tilemap[] = INCBIN_U16("graphics/slot_machine/menu.bin");
 
-const u16 gUnknown_08DCEC70[] = INCBIN_U16("graphics/slot_machine/slots_layout.bin");
+const u16 gSlotMachineInfoBox_Tilemap[] = INCBIN_U16("graphics/slot_machine/info_box.bin");
 
-const u16 gUnknown_08DCF170[] = INCBIN_U16("graphics/slot_machine/reel_symbols/1.gbapal");
-
-const u16 gUnknown_08DCF190[] = INCBIN_U16("graphics/slot_machine/reel_pikachu.gbapal");
-
-const u16 gUnknown_08DCF1B0[] = INCBIN_U16("graphics/slot_machine/shadow.gbapal");
-
-const u16 gSlotMachineReelTime_Pal[] = INCBIN_U16("graphics/slot_machine/reel_time.gbapal");
-
-const u16 gUnknown_08DCF1F0[] = INCBIN_U16("graphics/slot_machine/smoke.gbapal"); // also duck and pika aura
-
-const u16 gUnknown_08DCF210[] = INCBIN_U16("graphics/slot_machine/reel_time_explosion/0.gbapal");
-
-const u16 gUnknown_08DCF230[] = INCBIN_U16("graphics/slot_machine/spr6.gbapal");
+const u16 gSlotMachineReelSymbols_Pal[] = INCBIN_U16("graphics/slot_machine/reel_symbols/1.gbapal");
+const u16 gSlotMachineReelTimePikachu_Pal[] = INCBIN_U16("graphics/slot_machine/reel_time_pikachu.gbapal");
+const u16 gSlotMachineReelTimeMisc_Pal[] = INCBIN_U16("graphics/slot_machine/shadow.gbapal");
+const u16 gSlotMachineReelTimeMachine_Pal[] = INCBIN_U16("graphics/slot_machine/reel_time_machine.gbapal");
+const u16 gSlotMachineMisc_Pal[] = INCBIN_U16("graphics/slot_machine/smoke.gbapal");
+const u16 gSlotMachineReelTimeExplosion_Pal[] = INCBIN_U16("graphics/slot_machine/reel_time_explosion/0.gbapal");
+const u16 gSlotMachineDigitalDisplay_Pal[] = INCBIN_U16("graphics/slot_machine/digital_display.gbapal");
 
 const u8 gSlotMachineReelSymbol1Tiles[] = INCBIN_U8("graphics/slot_machine/reel_symbols/1.4bpp");
 const u8 gSlotMachineReelSymbol2Tiles[] = INCBIN_U8("graphics/slot_machine/reel_symbols/2.4bpp");
@@ -26,7 +20,7 @@ const u8 gSlotMachineReelSymbol5Tiles[] = INCBIN_U8("graphics/slot_machine/reel_
 const u8 gSlotMachineReelSymbol6Tiles[] = INCBIN_U8("graphics/slot_machine/reel_symbols/6.4bpp");
 const u8 gSlotMachineReelSymbol7Tiles[] = INCBIN_U8("graphics/slot_machine/reel_symbols/7.4bpp");
 
-const u32 gSlotMachineReelTime_Gfx[] = INCBIN_U32("graphics/slot_machine/reel_time.4bpp.lz");
+const u32 gSlotMachineDigitalDisplay_Gfx[] = INCBIN_U32("graphics/slot_machine/digital_display.4bpp.lz");
 
 const u8 gSlotMachineNumber0Tiles[] = INCBIN_U8("graphics/slot_machine/numbers/0.4bpp");
 const u8 gSlotMachineNumber1Tiles[] = INCBIN_U8("graphics/slot_machine/numbers/1.4bpp");
@@ -39,7 +33,7 @@ const u8 gSlotMachineNumber7Tiles[] = INCBIN_U8("graphics/slot_machine/numbers/7
 const u8 gSlotMachineNumber8Tiles[] = INCBIN_U8("graphics/slot_machine/numbers/8.4bpp");
 const u8 gSlotMachineNumber9Tiles[] = INCBIN_U8("graphics/slot_machine/numbers/9.4bpp");
 
-const u8 gSlotMachineReelTimeBolt[] = INCBIN_U8("graphics/slot_machine/bolt.4bpp");
+const u8 gSlotMachinePikaPowerBolt[] = INCBIN_U8("graphics/slot_machine/bolt.4bpp");
 const u8 gSlotMachineReelTimeDuck[] = INCBIN_U8("graphics/slot_machine/duck.4bpp");
 const u8 gSlotMachineReelTimeSmoke[] = INCBIN_U8("graphics/slot_machine/smoke.4bpp");
 
@@ -50,8 +44,8 @@ const u8 gSlotMachineReelTimeNumber3[] = INCBIN_U8("graphics/slot_machine/reel_t
 const u8 gSlotMachineReelTimeNumber4[] = INCBIN_U8("graphics/slot_machine/reel_time_numbers/4.4bpp");
 const u8 gSlotMachineReelTimeNumber5[] = INCBIN_U8("graphics/slot_machine/reel_time_numbers/5.4bpp");
 
-const u8 gSlotMachineReelTimeLargeBolt0[] = INCBIN_U8("graphics/slot_machine/large_bolt/0.4bpp");
-const u8 gSlotMachineReelTimeLargeBolt1[] = INCBIN_U8("graphics/slot_machine/large_bolt/1.4bpp");
+const u8 gSlotMachineReelTimeBolt0[] = INCBIN_U8("graphics/slot_machine/large_bolt/0.4bpp");
+const u8 gSlotMachineReelTimeBolt1[] = INCBIN_U8("graphics/slot_machine/large_bolt/1.4bpp");
 
 const u8 gSlotMachineReelTimeExplosion0[] = INCBIN_U8("graphics/slot_machine/reel_time_explosion/0.4bpp");
 const u8 gSlotMachineReelTimeExplosion1[] = INCBIN_U8("graphics/slot_machine/reel_time_explosion/1.4bpp");
@@ -59,5 +53,5 @@ const u8 gSlotMachineReelTimeExplosion1[] = INCBIN_U8("graphics/slot_machine/ree
 const u8 gSlotMachineReelTimeShadow[] = INCBIN_U8("graphics/slot_machine/shadow.4bpp");
 const u8 gSlotMachineReelTimePikaAura[] = INCBIN_U8("graphics/slot_machine/pika_aura.4bpp");
 
-const u8 gUnknown_08DD19F8[] = INCBIN_U8("graphics/unknown/unknown_DD19F8.bin");
-const u8 gUnknown_08DD1A18[] = INCBIN_U8("graphics/unknown/unknown_DD1A18.4bpp");
+const u8 gSlotMachineReelBackground_Tilemap[] = INCBIN_U8("graphics/slot_machine/reel_background.bin");
+const u8 gSlotMachineReelTimeNumberGap_Gfx[] = INCBIN_U8("graphics/slot_machine/reel_time_number_gap.4bpp");
diff --git a/src/data/items.h b/src/data/items.h
index 4d262e683..30beb5352 100644
--- a/src/data/items.h
+++ b/src/data/items.h
@@ -3426,7 +3426,7 @@ const struct Item gItems[] =
         .pocket = POCKET_KEY_ITEMS,
         .type = 2,
         .fieldUseFunc = ItemUseOutOfBattle_Rod,
-        .secondaryId = 0,
+        .secondaryId = OLD_ROD,
     },
 
     [ITEM_GOOD_ROD] =
@@ -3440,7 +3440,7 @@ const struct Item gItems[] =
         .pocket = POCKET_KEY_ITEMS,
         .type = 2,
         .fieldUseFunc = ItemUseOutOfBattle_Rod,
-        .secondaryId = 1,
+        .secondaryId = GOOD_ROD,
     },
 
     [ITEM_SUPER_ROD] =
@@ -3454,7 +3454,7 @@ const struct Item gItems[] =
         .pocket = POCKET_KEY_ITEMS,
         .type = 2,
         .fieldUseFunc = ItemUseOutOfBattle_Rod,
-        .secondaryId = 2,
+        .secondaryId = SUPER_ROD,
     },
 
     [ITEM_SS_TICKET] =
diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h
index 769a6bb0a..50fc6715c 100755
--- a/src/data/object_events/object_event_graphics.h
+++ b/src/data/object_events/object_event_graphics.h
@@ -252,7 +252,7 @@ const u32 gObjectEventPic_CableCar[] = INCBIN_U32("graphics/object_events/pics/m
 const u16 gObjectEventPalette20[] = INCBIN_U16("graphics/object_events/palettes/20.gbapal");
 const u32 gObjectEventPic_SSTidal[] = INCBIN_U32("graphics/object_events/pics/misc/ss_tidal.4bpp");
 const u16 gObjectEventPalette21[] = INCBIN_U16("graphics/object_events/palettes/21.gbapal");
-const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/field_effects/pics/berry_tree_growth_sparkle.4bpp");
+const u32 gFieldEffectObjectPic_Sparkle[] = INCBIN_U32("graphics/field_effects/pics/sparkle.4bpp");
 const u32 gObjectEventPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/object_events/pics/berry_trees/dirt_pile.4bpp");
 const u32 gObjectEventPic_BerryTreeSprout[] = INCBIN_U32("graphics/object_events/pics/berry_trees/sprout.4bpp");
 const u32 gObjectEventPic_PechaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/pecha.4bpp");
@@ -293,43 +293,43 @@ const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/field_effec
 const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/field_effects/pics/shadow_medium.4bpp");
 const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/field_effects/pics/shadow_large.4bpp");
 const u32 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U32("graphics/field_effects/pics/shadow_extra_large.4bpp");
-const u32 filler_8368A08[0x48] = {};
+static const u32 sFiller[0x48] = {};
 const u8 gFieldEffectPic_CutGrass[] = INCBIN_U8("graphics/field_effects/pics/cut_grass.4bpp");
 const u32 gFieldEffectPic_CutGrass_Copy[] = INCBIN_U32("graphics/field_effects/pics/cut_grass.4bpp");
-const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/field_effects/palettes/06.gbapal");
+const u16 gFieldEffectPal_CutGrass[] = INCBIN_U16("graphics/field_effects/palettes/cut_grass.gbapal");
 const u32 gFieldEffectObjectPic_Ripple[] = INCBIN_U32("graphics/field_effects/pics/ripple.4bpp");
 const u32 gFieldEffectObjectPic_Ash[] = INCBIN_U32("graphics/field_effects/pics/ash.4bpp");
 const u32 gFieldEffectObjectPic_Arrow[] = INCBIN_U32("graphics/field_effects/pics/arrow.4bpp");
-const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/field_effects/palettes/00.gbapal");
-const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/field_effects/palettes/01.gbapal");
+const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/field_effects/palettes/general_0.gbapal");
+const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/field_effects/palettes/general_1.gbapal");
 const u32 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U32("graphics/field_effects/pics/ground_impact_dust.4bpp");
-const u32 gFieldEffectObjectPic_BikeHopTallGrass[] = INCBIN_U32("graphics/field_effects/pics/bike_hop_tall_grass.4bpp");
-const u32 gUnusedGrass[] = INCBIN_U32("graphics/field_effects/pics/unused_grass.4bpp");
-const u32 gFieldEffectObjectPic_Unknown16[] = INCBIN_U32("graphics/field_effects/pics/unknown_16.4bpp");
+const u32 gFieldEffectObjectPic_JumpTallGrass[] = INCBIN_U32("graphics/field_effects/pics/jump_tall_grass.4bpp");
+const u32 gUnusedGrass3[] = INCBIN_U32("graphics/field_effects/pics/unused_grass_3.4bpp");
+const u32 gFieldEffectObjectPic_JumpLongGrass[] = INCBIN_U32("graphics/field_effects/pics/unknown_16.4bpp");
 const u32 gFieldEffectObjectPic_Unknown17[] = INCBIN_U32("graphics/field_effects/pics/unknown_17.4bpp");
-const u32 gFieldEffectObjectPic_Unknown18[] = INCBIN_U32("graphics/field_effects/pics/unknown_18.4bpp");
+const u32 gFieldEffectObjectPic_UnusedGrass2[] = INCBIN_U32("graphics/field_effects/pics/unused_grass_2.4bpp");
 const u32 gFieldEffectObjectPic_LongGrass[] = INCBIN_U32("graphics/field_effects/pics/long_grass.4bpp");
 const u32 gFieldEffectObjectPic_TallGrass[] = INCBIN_U32("graphics/field_effects/pics/tall_grass.4bpp");
 const u32 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U32("graphics/field_effects/pics/short_grass.4bpp");
 const u32 gFieldEffectObjectPic_SandFootprints[] = INCBIN_U32("graphics/field_effects/pics/sand_footprints.4bpp");
 const u32 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U32("graphics/field_effects/pics/deep_sand_footprints.4bpp");
 const u32 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U32("graphics/field_effects/pics/bike_tire_tracks.4bpp");
-const u32 gFieldEffectObjectPic_Unknown19[] = INCBIN_U32("graphics/field_effects/pics/unknown_19.4bpp");
-const u32 gFieldEffectObjectPic_Unknown29[] = INCBIN_U32("graphics/field_effects/pics/unknown_29.4bpp");
-const u32 gFieldEffectObjectPic_BikeHopBigSplash[] = INCBIN_U32("graphics/field_effects/pics/bike_hop_big_splash.4bpp");
+const u32 gFieldEffectObjectPic_UnusedSand[] = INCBIN_U32("graphics/field_effects/pics/unused_sand.4bpp");
+const u32 gFieldEffectObjectPic_SandPile[] = INCBIN_U32("graphics/field_effects/pics/sand_pile.4bpp");
+const u32 gFieldEffectObjectPic_JumpBigSplash[] = INCBIN_U32("graphics/field_effects/pics/jump_big_splash.4bpp");
 const u32 gFieldEffectObjectPic_Splash[] = INCBIN_U32("graphics/field_effects/pics/splash.4bpp");
-const u32 gFieldEffectObjectPic_BikeHopSmallSplash[] = INCBIN_U32("graphics/field_effects/pics/bike_hop_small_splash.4bpp");
-const u32 gFieldEffectObjectPic_Unknown20[] = INCBIN_U32("graphics/field_effects/pics/unknown_20.4bpp");
+const u32 gFieldEffectObjectPic_JumpSmallSplash[] = INCBIN_U32("graphics/field_effects/pics/jump_small_splash.4bpp");
+const u32 gFieldEffectObjectPic_WaterSurfacing[] = INCBIN_U32("graphics/field_effects/pics/water_surfacing.4bpp");
 const u32 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U32("graphics/field_effects/pics/tree_disguise.4bpp");
 const u32 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U32("graphics/field_effects/pics/mountain_disguise.4bpp");
 const u32 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U32("graphics/field_effects/pics/sand_disguise_placeholder.4bpp");
 const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/field_effects/pics/hot_springs_water.4bpp");
-const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/field_effects/palettes/02.gbapal");
-const u32 gFieldEffectObjectPic_JumpOutOfAsh[] = INCBIN_U32("graphics/field_effects/pics/jump_out_of_ash.4bpp");
-const u32 gFieldEffectObjectPic_LavaridgeGymWarp[] = INCBIN_U32("graphics/field_effects/pics/lavaridge_gym_warp.4bpp");
+const u16 gFieldEffectPal_Ash[] = INCBIN_U16("graphics/field_effects/palettes/ash.gbapal");
+const u32 gFieldEffectObjectPic_AshPuff[] = INCBIN_U32("graphics/field_effects/pics/ash_puff.4bpp");
+const u32 gFieldEffectObjectPic_AshLaunch[] = INCBIN_U32("graphics/field_effects/pics/ash_launch.4bpp");
 const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/field_effects/pics/bubbles.4bpp");
-const u32 gFieldEffectObjectPic_Unknown35[] = INCBIN_U32("graphics/field_effects/pics/unknown_35.4bpp");
-const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/field_effects/palettes/03.gbapal");
+const u32 gFieldEffectObjectPic_SmallSparkle[] = INCBIN_U32("graphics/field_effects/pics/small_sparkle.4bpp");
+const u16 gFieldEffectPal_SmallSparkle[] = INCBIN_U16("graphics/field_effects/palettes/small_sparkle.gbapal");
 const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/field_effects/pics/bird.4bpp");
 const u32 gObjectEventPic_Juan[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/juan.4bpp");
 const u32 gObjectEventPic_Scott[] = INCBIN_U32("graphics/object_events/pics/people/scott.4bpp");
diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h
index 0a89f20c8..131ac13d9 100644
--- a/src/data/pokemon_graphics/back_pic_coordinates.h
+++ b/src/data/pokemon_graphics/back_pic_coordinates.h
@@ -3,2202 +3,2202 @@ const struct MonCoords gMonBackPicCoords[] =
     [SPECIES_NONE] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_BULBASAUR] =
     {
         .size = 0x64,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_IVYSAUR] =
     {
         .size = 0x66,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_VENUSAUR] =
     {
         .size = 0x87,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_CHARMANDER] =
     {
         .size = 0x65,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_CHARMELEON] =
     {
         .size = 0x66,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_CHARIZARD] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_SQUIRTLE] =
     {
         .size = 0x65,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_WARTORTLE] =
     {
         .size = 0x76,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_BLASTOISE] =
     {
         .size = 0x86,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_CATERPIE] =
     {
         .size = 0x55,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_METAPOD] =
     {
         .size = 0x65,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_BUTTERFREE] =
     {
         .size = 0x87,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_WEEDLE] =
     {
         .size = 0x56,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_KAKUNA] =
     {
         .size = 0x46,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_BEEDRILL] =
     {
         .size = 0x86,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_PIDGEY] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_PIDGEOTTO] =
     {
         .size = 0x85,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_PIDGEOT] =
     {
         .size = 0x78,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_RATTATA] =
     {
         .size = 0x65,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_RATICATE] =
     {
         .size = 0x75,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_SPEAROW] =
     {
         .size = 0x65,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_FEAROW] =
     {
         .size = 0x87,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_EKANS] =
     {
         .size = 0x66,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_ARBOK] =
     {
         .size = 0x77,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_PIKACHU] =
     {
         .size = 0x77,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_RAICHU] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_SANDSHREW] =
     {
         .size = 0x65,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_SANDSLASH] =
     {
         .size = 0x86,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_NIDORAN_F] =
     {
         .size = 0x55,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_NIDORINA] =
     {
         .size = 0x86,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_NIDOQUEEN] =
     {
         .size = 0x77,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_NIDORAN_M] =
     {
         .size = 0x56,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_NIDORINO] =
     {
         .size = 0x86,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_NIDOKING] =
     {
         .size = 0x88,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_CLEFAIRY] =
     {
         .size = 0x65,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_CLEFABLE] =
     {
         .size = 0x76,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_VULPIX] =
     {
         .size = 0x76,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_NINETALES] =
     {
         .size = 0x77,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_JIGGLYPUFF] =
     {
         .size = 0x65,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_WIGGLYTUFF] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_ZUBAT] =
     {
         .size = 0x76,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_GOLBAT] =
     {
         .size = 0x87,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_ODDISH] =
     {
         .size = 0x56,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_GLOOM] =
     {
         .size = 0x66,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_VILEPLUME] =
     {
         .size = 0x87,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_PARAS] =
     {
         .size = 0x63,
-        .y_offset = 0x14,
+        .y_offset = 20,
     },
     [SPECIES_PARASECT] =
     {
         .size = 0x87,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_VENONAT] =
     {
         .size = 0x77,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_VENOMOTH] =
     {
         .size = 0x77,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_DIGLETT] =
     {
         .size = 0x54,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_DUGTRIO] =
     {
         .size = 0x66,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_MEOWTH] =
     {
         .size = 0x65,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_PERSIAN] =
     {
         .size = 0x87,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_PSYDUCK] =
     {
         .size = 0x67,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_GOLDUCK] =
     {
         .size = 0x77,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_MANKEY] =
     {
         .size = 0x76,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_PRIMEAPE] =
     {
         .size = 0x77,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_GROWLITHE] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_ARCANINE] =
     {
         .size = 0x87,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_POLIWAG] =
     {
         .size = 0x74,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_POLIWHIRL] =
     {
         .size = 0x65,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_POLIWRATH] =
     {
         .size = 0x86,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_ABRA] =
     {
         .size = 0x66,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_KADABRA] =
     {
         .size = 0x76,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_ALAKAZAM] =
     {
         .size = 0x67,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_MACHOP] =
     {
         .size = 0x65,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_MACHOKE] =
     {
         .size = 0x76,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_MACHAMP] =
     {
         .size = 0x67,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_BELLSPROUT] =
     {
         .size = 0x66,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_WEEPINBELL] =
     {
         .size = 0x66,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_VICTREEBEL] =
     {
         .size = 0x87,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_TENTACOOL] =
     {
         .size = 0x56,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_TENTACRUEL] =
     {
         .size = 0x86,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_GEODUDE] =
     {
         .size = 0x66,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_GRAVELER] =
     {
         .size = 0x75,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_GOLEM] =
     {
         .size = 0x84,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_PONYTA] =
     {
         .size = 0x66,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_RAPIDASH] =
     {
         .size = 0x87,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_SLOWPOKE] =
     {
         .size = 0x85,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_SLOWBRO] =
     {
         .size = 0x86,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_MAGNEMITE] =
     {
         .size = 0x43,
-        .y_offset = 0x14,
+        .y_offset = 20,
     },
     [SPECIES_MAGNETON] =
     {
         .size = 0x66,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_FARFETCHD] =
     {
         .size = 0x66,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_DODUO] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_DODRIO] =
     {
         .size = 0x88,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_SEEL] =
     {
         .size = 0x66,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_DEWGONG] =
     {
         .size = 0x77,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_GRIMER] =
     {
         .size = 0x75,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_MUK] =
     {
         .size = 0x87,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_SHELLDER] =
     {
         .size = 0x76,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_CLOYSTER] =
     {
         .size = 0x87,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_GASTLY] =
     {
         .size = 0x85,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_HAUNTER] =
     {
         .size = 0x76,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_GENGAR] =
     {
         .size = 0x76,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_ONIX] =
     {
         .size = 0x78,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_DROWZEE] =
     {
         .size = 0x65,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_HYPNO] =
     {
         .size = 0x66,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_KRABBY] =
     {
         .size = 0x66,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_KINGLER] =
     {
         .size = 0x77,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_VOLTORB] =
     {
         .size = 0x55,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_ELECTRODE] =
     {
         .size = 0x65,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_EXEGGCUTE] =
     {
         .size = 0x65,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_EXEGGUTOR] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_CUBONE] =
     {
         .size = 0x66,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_MAROWAK] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_HITMONLEE] =
     {
         .size = 0x65,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_HITMONCHAN] =
     {
         .size = 0x65,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_LICKITUNG] =
     {
         .size = 0x65,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_KOFFING] =
     {
         .size = 0x66,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_WEEZING] =
     {
         .size = 0x77,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_RHYHORN] =
     {
         .size = 0x85,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_RHYDON] =
     {
         .size = 0x88,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_CHANSEY] =
     {
         .size = 0x86,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_TANGELA] =
     {
         .size = 0x85,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_KANGASKHAN] =
     {
         .size = 0x77,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_HORSEA] =
     {
         .size = 0x66,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_SEADRA] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_GOLDEEN] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_SEAKING] =
     {
         .size = 0x76,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_STARYU] =
     {
         .size = 0x65,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_STARMIE] =
     {
         .size = 0x85,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_MR_MIME] =
     {
         .size = 0x85,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_SCYTHER] =
     {
         .size = 0x77,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_JYNX] =
     {
         .size = 0x86,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_ELECTABUZZ] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_MAGMAR] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_PINSIR] =
     {
         .size = 0x66,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_TAUROS] =
     {
         .size = 0x85,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_MAGIKARP] =
     {
         .size = 0x76,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_GYARADOS] =
     {
         .size = 0x78,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_LAPRAS] =
     {
         .size = 0x77,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_DITTO] =
     {
         .size = 0x54,
-        .y_offset = 0x11,
+        .y_offset = 17,
     },
     [SPECIES_EEVEE] =
     {
         .size = 0x66,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_VAPOREON] =
     {
         .size = 0x66,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_JOLTEON] =
     {
         .size = 0x87,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_FLAREON] =
     {
         .size = 0x67,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_PORYGON] =
     {
         .size = 0x65,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_OMANYTE] =
     {
         .size = 0x66,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_OMASTAR] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_KABUTO] =
     {
         .size = 0x65,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_KABUTOPS] =
     {
         .size = 0x77,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_AERODACTYL] =
     {
         .size = 0x86,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_SNORLAX] =
     {
         .size = 0x86,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_ARTICUNO] =
     {
         .size = 0x65,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_ZAPDOS] =
     {
         .size = 0x76,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_MOLTRES] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_DRATINI] =
     {
         .size = 0x66,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_DRAGONAIR] =
     {
         .size = 0x78,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_DRAGONITE] =
     {
         .size = 0x87,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_MEWTWO] =
     {
         .size = 0x78,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_MEW] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_CHIKORITA] =
     {
         .size = 0x56,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_BAYLEEF] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_MEGANIUM] =
     {
         .size = 0x78,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_CYNDAQUIL] =
     {
         .size = 0x76,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_QUILAVA] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_TYPHLOSION] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_TOTODILE] =
     {
         .size = 0x66,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_CROCONAW] =
     {
         .size = 0x67,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_FERALIGATR] =
     {
         .size = 0x88,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_SENTRET] =
     {
         .size = 0x67,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_FURRET] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_HOOTHOOT] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_NOCTOWL] =
     {
         .size = 0x68,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_LEDYBA] =
     {
         .size = 0x76,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_LEDIAN] =
     {
         .size = 0x77,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_SPINARAK] =
     {
         .size = 0x73,
-        .y_offset = 0x15,
+        .y_offset = 21,
     },
     [SPECIES_ARIADOS] =
     {
         .size = 0x86,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_CROBAT] =
     {
         .size = 0x87,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_CHINCHOU] =
     {
         .size = 0x86,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_LANTURN] =
     {
         .size = 0x86,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_PICHU] =
     {
         .size = 0x66,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_CLEFFA] =
     {
         .size = 0x65,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_IGGLYBUFF] =
     {
         .size = 0x66,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_TOGEPI] =
     {
         .size = 0x54,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_TOGETIC] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_NATU] =
     {
         .size = 0x54,
-        .y_offset = 0x11,
+        .y_offset = 17,
     },
     [SPECIES_XATU] =
     {
         .size = 0x76,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_MAREEP] =
     {
         .size = 0x66,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_FLAAFFY] =
     {
         .size = 0x66,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_AMPHAROS] =
     {
         .size = 0x88,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_BELLOSSOM] =
     {
         .size = 0x66,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_MARILL] =
     {
         .size = 0x75,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_AZUMARILL] =
     {
         .size = 0x86,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_SUDOWOODO] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_POLITOED] =
     {
         .size = 0x66,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_HOPPIP] =
     {
         .size = 0x66,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_SKIPLOOM] =
     {
         .size = 0x65,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_JUMPLUFF] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_AIPOM] =
     {
         .size = 0x66,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_SUNKERN] =
     {
         .size = 0x56,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_SUNFLORA] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_YANMA] =
     {
         .size = 0x77,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_WOOPER] =
     {
         .size = 0x85,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_QUAGSIRE] =
     {
         .size = 0x76,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_ESPEON] =
     {
         .size = 0x76,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_UMBREON] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_MURKROW] =
     {
         .size = 0x66,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_SLOWKING] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_MISDREAVUS] =
     {
         .size = 0x66,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_UNOWN] =
     {
         .size = 0x36,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_WOBBUFFET] =
     {
         .size = 0x75,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_GIRAFARIG] =
     {
         .size = 0x87,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_PINECO] =
     {
         .size = 0x65,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_FORRETRESS] =
     {
         .size = 0x84,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_DUNSPARCE] =
     {
         .size = 0x85,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_GLIGAR] =
     {
         .size = 0x87,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_STEELIX] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_SNUBBULL] =
     {
         .size = 0x76,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_GRANBULL] =
     {
         .size = 0x87,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_QWILFISH] =
     {
         .size = 0x77,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_SCIZOR] =
     {
         .size = 0x77,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_SHUCKLE] =
     {
         .size = 0x56,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_HERACROSS] =
     {
         .size = 0x77,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_SNEASEL] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_TEDDIURSA] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_URSARING] =
     {
         .size = 0x88,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_SLUGMA] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_MAGCARGO] =
     {
         .size = 0x76,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_SWINUB] =
     {
         .size = 0x63,
-        .y_offset = 0x15,
+        .y_offset = 21,
     },
     [SPECIES_PILOSWINE] =
     {
         .size = 0x75,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_CORSOLA] =
     {
         .size = 0x65,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_REMORAID] =
     {
         .size = 0x75,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_OCTILLERY] =
     {
         .size = 0x66,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_DELIBIRD] =
     {
         .size = 0x67,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_MANTINE] =
     {
         .size = 0x87,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_SKARMORY] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_HOUNDOUR] =
     {
         .size = 0x55,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_HOUNDOOM] =
     {
         .size = 0x87,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_KINGDRA] =
     {
         .size = 0x87,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_PHANPY] =
     {
         .size = 0x65,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_DONPHAN] =
     {
         .size = 0x85,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_PORYGON2] =
     {
         .size = 0x76,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_STANTLER] =
     {
         .size = 0x78,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_SMEARGLE] =
     {
         .size = 0x76,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_TYROGUE] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_HITMONTOP] =
     {
         .size = 0x87,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_SMOOCHUM] =
     {
         .size = 0x56,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_ELEKID] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_MAGBY] =
     {
         .size = 0x66,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_MILTANK] =
     {
         .size = 0x87,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_BLISSEY] =
     {
         .size = 0x85,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_RAIKOU] =
     {
         .size = 0x86,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_ENTEI] =
     {
         .size = 0x87,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_SUICUNE] =
     {
         .size = 0x88,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_LARVITAR] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_PUPITAR] =
     {
         .size = 0x67,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_TYRANITAR] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_LUGIA] =
     {
         .size = 0x88,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_HO_OH] =
     {
         .size = 0x88,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_CELEBI] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_OLD_UNOWN_B] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_OLD_UNOWN_C] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_OLD_UNOWN_D] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_OLD_UNOWN_E] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_OLD_UNOWN_F] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_OLD_UNOWN_G] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_OLD_UNOWN_H] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_OLD_UNOWN_I] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_OLD_UNOWN_J] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_OLD_UNOWN_K] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_OLD_UNOWN_L] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_OLD_UNOWN_M] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_OLD_UNOWN_N] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_OLD_UNOWN_O] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_OLD_UNOWN_P] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_OLD_UNOWN_Q] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_OLD_UNOWN_R] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_OLD_UNOWN_S] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_OLD_UNOWN_T] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_OLD_UNOWN_U] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_OLD_UNOWN_V] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_OLD_UNOWN_W] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_OLD_UNOWN_X] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_OLD_UNOWN_Y] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_OLD_UNOWN_Z] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_TREECKO] =
     {
         .size = 0x87,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_GROVYLE] =
     {
         .size = 0x86,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_SCEPTILE] =
     {
         .size = 0x88,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_TORCHIC] =
     {
         .size = 0x67,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_COMBUSKEN] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_BLAZIKEN] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_MUDKIP] =
     {
         .size = 0x77,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_MARSHTOMP] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_SWAMPERT] =
     {
         .size = 0x87,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_POOCHYENA] =
     {
         .size = 0x76,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_MIGHTYENA] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_ZIGZAGOON] =
     {
         .size = 0x76,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_LINOONE] =
     {
         .size = 0x85,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_WURMPLE] =
     {
         .size = 0x76,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_SILCOON] =
     {
         .size = 0x83,
-        .y_offset = 0x15,
+        .y_offset = 21,
     },
     [SPECIES_BEAUTIFLY] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_CASCOON] =
     {
         .size = 0x73,
-        .y_offset = 0x14,
+        .y_offset = 20,
     },
     [SPECIES_DUSTOX] =
     {
         .size = 0x83,
-        .y_offset = 0x14,
+        .y_offset = 20,
     },
     [SPECIES_LOTAD] =
     {
         .size = 0x75,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_LOMBRE] =
     {
         .size = 0x86,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_LUDICOLO] =
     {
         .size = 0x86,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_SEEDOT] =
     {
         .size = 0x86,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_NUZLEAF] =
     {
         .size = 0x76,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_SHIFTRY] =
     {
         .size = 0x86,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_NINCADA] =
     {
         .size = 0x83,
-        .y_offset = 0x14,
+        .y_offset = 20,
     },
     [SPECIES_NINJASK] =
     {
         .size = 0x86,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_SHEDINJA] =
     {
         .size = 0x77,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_TAILLOW] =
     {
         .size = 0x64,
-        .y_offset = 0x11,
+        .y_offset = 17,
     },
     [SPECIES_SWELLOW] =
     {
         .size = 0x86,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_SHROOMISH] =
     {
         .size = 0x85,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_BRELOOM] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_SPINDA] =
     {
         .size = 0x77,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_WINGULL] =
     {
         .size = 0x85,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_PELIPPER] =
     {
         .size = 0x87,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_SURSKIT] =
     {
         .size = 0x86,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_MASQUERAIN] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_WAILMER] =
     {
         .size = 0x83,
-        .y_offset = 0x15,
+        .y_offset = 21,
     },
     [SPECIES_WAILORD] =
     {
         .size = 0x83,
-        .y_offset = 0x16,
+        .y_offset = 22,
     },
     [SPECIES_SKITTY] =
     {
         .size = 0x86,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_DELCATTY] =
     {
         .size = 0x86,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_KECLEON] =
     {
         .size = 0x87,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_BALTOY] =
     {
         .size = 0x86,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_CLAYDOL] =
     {
         .size = 0x87,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_NOSEPASS] =
     {
         .size = 0x85,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_TORKOAL] =
     {
         .size = 0x86,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_SABLEYE] =
     {
         .size = 0x76,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_BARBOACH] =
     {
         .size = 0x66,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_WHISCASH] =
     {
         .size = 0x86,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_LUVDISC] =
     {
         .size = 0x46,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_CORPHISH] =
     {
         .size = 0x77,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_CRAWDAUNT] =
     {
         .size = 0x87,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_FEEBAS] =
     {
         .size = 0x67,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_MILOTIC] =
     {
         .size = 0x68,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_CARVANHA] =
     {
         .size = 0x87,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_SHARPEDO] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_TRAPINCH] =
     {
         .size = 0x75,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_VIBRAVA] =
     {
         .size = 0x74,
-        .y_offset = 0x11,
+        .y_offset = 17,
     },
     [SPECIES_FLYGON] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_MAKUHITA] =
     {
         .size = 0x76,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_HARIYAMA] =
     {
         .size = 0x87,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_ELECTRIKE] =
     {
         .size = 0x84,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_MANECTRIC] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_NUMEL] =
     {
         .size = 0x86,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_CAMERUPT] =
     {
         .size = 0x84,
-        .y_offset = 0x13,
+        .y_offset = 19,
     },
     [SPECIES_SPHEAL] =
     {
         .size = 0x64,
-        .y_offset = 0x12,
+        .y_offset = 18,
     },
     [SPECIES_SEALEO] =
     {
         .size = 0x86,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_WALREIN] =
     {
         .size = 0x87,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_CACNEA] =
     {
         .size = 0x85,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_CACTURNE] =
     {
         .size = 0x87,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_SNORUNT] =
     {
         .size = 0x76,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_GLALIE] =
     {
         .size = 0x85,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_LUNATONE] =
     {
         .size = 0x87,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_SOLROCK] =
     {
         .size = 0x87,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_AZURILL] =
     {
         .size = 0x86,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_SPOINK] =
     {
         .size = 0x56,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_GRUMPIG] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_PLUSLE] =
     {
         .size = 0x76,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_MINUN] =
     {
         .size = 0x76,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_MAWILE] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_MEDITITE] =
     {
         .size = 0x76,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_MEDICHAM] =
     {
         .size = 0x68,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_SWABLU] =
     {
         .size = 0x86,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_ALTARIA] =
     {
         .size = 0x87,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_WYNAUT] =
     {
         .size = 0x77,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_DUSKULL] =
     {
         .size = 0x66,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_DUSCLOPS] =
     {
         .size = 0x86,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_ROSELIA] =
     {
         .size = 0x86,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_SLAKOTH] =
     {
         .size = 0x85,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_VIGOROTH] =
     {
         .size = 0x86,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_SLAKING] =
     {
         .size = 0x86,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_GULPIN] =
     {
         .size = 0x66,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_SWALOT] =
     {
         .size = 0x77,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_TROPIUS] =
     {
         .size = 0x87,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_WHISMUR] =
     {
         .size = 0x85,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_LOUDRED] =
     {
         .size = 0x86,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_EXPLOUD] =
     {
         .size = 0x88,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_CLAMPERL] =
     {
         .size = 0x85,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_HUNTAIL] =
     {
         .size = 0x68,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_GOREBYSS] =
     {
         .size = 0x77,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_ABSOL] =
     {
         .size = 0x78,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_SHUPPET] =
     {
         .size = 0x77,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_BANETTE] =
     {
         .size = 0x65,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_SEVIPER] =
     {
         .size = 0x88,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_ZANGOOSE] =
     {
         .size = 0x88,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_RELICANTH] =
     {
         .size = 0x86,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_ARON] =
     {
         .size = 0x54,
-        .y_offset = 0x11,
+        .y_offset = 17,
     },
     [SPECIES_LAIRON] =
     {
         .size = 0x84,
-        .y_offset = 0x11,
+        .y_offset = 17,
     },
     [SPECIES_AGGRON] =
     {
         .size = 0x87,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_CASTFORM] =
     {
         .size = 0x45,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_VOLBEAT] =
     {
         .size = 0x76,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_ILLUMISE] =
     {
         .size = 0x67,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_LILEEP] =
     {
         .size = 0x86,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_CRADILY] =
     {
         .size = 0x77,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_ANORITH] =
     {
         .size = 0x83,
-        .y_offset = 0x17,
+        .y_offset = 23,
     },
     [SPECIES_ARMALDO] =
     {
         .size = 0x77,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_RALTS] =
     {
         .size = 0x45,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_KIRLIA] =
     {
         .size = 0x57,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_GARDEVOIR] =
     {
         .size = 0x77,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_BAGON] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_SHELGON] =
     {
         .size = 0x85,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_SALAMENCE] =
     {
         .size = 0x77,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_BELDUM] =
     {
         .size = 0x66,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_METANG] =
     {
         .size = 0x84,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_METAGROSS] =
     {
         .size = 0x83,
-        .y_offset = 0x14,
+        .y_offset = 20,
     },
     [SPECIES_REGIROCK] =
     {
         .size = 0x86,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_REGICE] =
     {
         .size = 0x85,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_REGISTEEL] =
     {
         .size = 0x85,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_KYOGRE] =
     {
         .size = 0x84,
-        .y_offset = 0x13,
+        .y_offset = 19,
     },
     [SPECIES_GROUDON] =
     {
         .size = 0x87,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_RAYQUAZA] =
     {
         .size = 0x78,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_LATIAS] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_LATIOS] =
     {
         .size = 0x88,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_JIRACHI] =
     {
         .size = 0x87,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_DEOXYS] =
     {
         .size = 0x86,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_CHIMECHO] =
     {
         .size = 0x47,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_EGG] =
     {
         .size = 0x36,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_UNOWN_B] =
     {
         .size = 0x56,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_UNOWN_C] =
     {
         .size = 0x67,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_UNOWN_D] =
     {
         .size = 0x56,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_UNOWN_E] =
     {
         .size = 0x56,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_UNOWN_F] =
     {
         .size = 0x66,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_UNOWN_G] =
     {
         .size = 0x57,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_UNOWN_H] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_UNOWN_I] =
     {
         .size = 0x37,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_UNOWN_J] =
     {
         .size = 0x46,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_UNOWN_K] =
     {
         .size = 0x57,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_UNOWN_L] =
     {
         .size = 0x46,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_UNOWN_M] =
     {
         .size = 0x65,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_UNOWN_N] =
     {
         .size = 0x65,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_UNOWN_O] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_UNOWN_P] =
     {
         .size = 0x46,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_UNOWN_Q] =
     {
         .size = 0x55,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_UNOWN_R] =
     {
         .size = 0x45,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_UNOWN_S] =
     {
         .size = 0x57,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_UNOWN_T] =
     {
         .size = 0x45,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_UNOWN_U] =
     {
         .size = 0x65,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_UNOWN_V] =
     {
         .size = 0x56,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_UNOWN_W] =
     {
         .size = 0x55,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_UNOWN_X] =
     {
         .size = 0x55,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_UNOWN_Y] =
     {
         .size = 0x46,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_UNOWN_Z] =
     {
         .size = 0x46,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_UNOWN_EMARK] =
     {
         .size = 0x37,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_UNOWN_QMARK] =
     {
         .size = 0x47,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
 };
 
diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h
index 19de9a7dd..b787877b9 100644
--- a/src/data/pokemon_graphics/front_pic_coordinates.h
+++ b/src/data/pokemon_graphics/front_pic_coordinates.h
@@ -3,2201 +3,2201 @@ const struct MonCoords gMonFrontPicCoords[] =
     [SPECIES_NONE] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_BULBASAUR] =
     {
         .size = 0x45,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_IVYSAUR] =
     {
         .size = 0x56,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_VENUSAUR] =
     {
         .size = 0x88,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_CHARMANDER] =
     {
         .size = 0x55,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_CHARMELEON] =
     {
         .size = 0x66,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_CHARIZARD] =
     {
         .size = 0x88,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_SQUIRTLE] =
     {
         .size = 0x65,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_WARTORTLE] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_BLASTOISE] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_CATERPIE] =
     {
         .size = 0x45,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_METAPOD] =
     {
         .size = 0x54,
-        .y_offset = 0x14,
+        .y_offset = 20,
     },
     [SPECIES_BUTTERFREE] =
     {
         .size = 0x76,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_WEEDLE] =
     {
         .size = 0x54,
-        .y_offset = 0x12,
+        .y_offset = 18,
     },
     [SPECIES_KAKUNA] =
     {
         .size = 0x45,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_BEEDRILL] =
     {
         .size = 0x86,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_PIDGEY] =
     {
         .size = 0x65,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_PIDGEOTTO] =
     {
         .size = 0x67,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_PIDGEOT] =
     {
         .size = 0x88,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_RATTATA] =
     {
         .size = 0x44,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_RATICATE] =
     {
         .size = 0x66,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_SPEAROW] =
     {
         .size = 0x45,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_FEAROW] =
     {
         .size = 0x78,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_EKANS] =
     {
         .size = 0x65,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_ARBOK] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_PIKACHU] =
     {
         .size = 0x67,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_RAICHU] =
     {
         .size = 0x67,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_SANDSHREW] =
     {
         .size = 0x55,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_SANDSLASH] =
     {
         .size = 0x76,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_NIDORAN_F] =
     {
         .size = 0x45,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_NIDORINA] =
     {
         .size = 0x66,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_NIDOQUEEN] =
     {
         .size = 0x78,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_NIDORAN_M] =
     {
         .size = 0x55,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_NIDORINO] =
     {
         .size = 0x66,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_NIDOKING] =
     {
         .size = 0x78,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_CLEFAIRY] =
     {
         .size = 0x55,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_CLEFABLE] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_VULPIX] =
     {
         .size = 0x65,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_NINETALES] =
     {
         .size = 0x88,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_JIGGLYPUFF] =
     {
         .size = 0x45,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_WIGGLYTUFF] =
     {
         .size = 0x67,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_ZUBAT] =
     {
         .size = 0x67,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_GOLBAT] =
     {
         .size = 0x88,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_ODDISH] =
     {
         .size = 0x45,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_GLOOM] =
     {
         .size = 0x66,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_VILEPLUME] =
     {
         .size = 0x77,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_PARAS] =
     {
         .size = 0x55,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_PARASECT] =
     {
         .size = 0x86,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_VENONAT] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_VENOMOTH] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_DIGLETT] =
     {
         .size = 0x54,
-        .y_offset = 0x12,
+        .y_offset = 18,
     },
     [SPECIES_DUGTRIO] =
     {
         .size = 0x75,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_MEOWTH] =
     {
         .size = 0x55,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_PERSIAN] =
     {
         .size = 0x77,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_PSYDUCK] =
     {
         .size = 0x56,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_GOLDUCK] =
     {
         .size = 0x78,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_MANKEY] =
     {
         .size = 0x65,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_PRIMEAPE] =
     {
         .size = 0x77,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_GROWLITHE] =
     {
         .size = 0x66,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_ARCANINE] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_POLIWAG] =
     {
         .size = 0x74,
-        .y_offset = 0x13,
+        .y_offset = 19,
     },
     [SPECIES_POLIWHIRL] =
     {
         .size = 0x76,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_POLIWRATH] =
     {
         .size = 0x76,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_ABRA] =
     {
         .size = 0x66,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_KADABRA] =
     {
         .size = 0x77,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_ALAKAZAM] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_MACHOP] =
     {
         .size = 0x56,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_MACHOKE] =
     {
         .size = 0x67,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_MACHAMP] =
     {
         .size = 0x88,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_BELLSPROUT] =
     {
         .size = 0x65,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_WEEPINBELL] =
     {
         .size = 0x66,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_VICTREEBEL] =
     {
         .size = 0x77,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_TENTACOOL] =
     {
         .size = 0x46,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_TENTACRUEL] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_GEODUDE] =
     {
         .size = 0x54,
-        .y_offset = 0x12,
+        .y_offset = 18,
     },
     [SPECIES_GRAVELER] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_GOLEM] =
     {
         .size = 0x77,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_PONYTA] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_RAPIDASH] =
     {
         .size = 0x88,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_SLOWPOKE] =
     {
         .size = 0x66,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_SLOWBRO] =
     {
         .size = 0x86,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_MAGNEMITE] =
     {
         .size = 0x43,
-        .y_offset = 0x15,
+        .y_offset = 21,
     },
     [SPECIES_MAGNETON] =
     {
         .size = 0x76,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_FARFETCHD] =
     {
         .size = 0x66,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_DODUO] =
     {
         .size = 0x57,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_DODRIO] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_SEEL] =
     {
         .size = 0x76,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_DEWGONG] =
     {
         .size = 0x87,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_GRIMER] =
     {
         .size = 0x65,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_MUK] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_SHELLDER] =
     {
         .size = 0x55,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_CLOYSTER] =
     {
         .size = 0x87,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_GASTLY] =
     {
         .size = 0x77,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_HAUNTER] =
     {
         .size = 0x77,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_GENGAR] =
     {
         .size = 0x77,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_ONIX] =
     {
         .size = 0x78,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_DROWZEE] =
     {
         .size = 0x77,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_HYPNO] =
     {
         .size = 0x77,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_KRABBY] =
     {
         .size = 0x65,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_KINGLER] =
     {
         .size = 0x88,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_VOLTORB] =
     {
         .size = 0x44,
-        .y_offset = 0x13,
+        .y_offset = 19,
     },
     [SPECIES_ELECTRODE] =
     {
         .size = 0x55,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_EXEGGCUTE] =
     {
         .size = 0x87,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_EXEGGUTOR] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_CUBONE] =
     {
         .size = 0x55,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_MAROWAK] =
     {
         .size = 0x76,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_HITMONLEE] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_HITMONCHAN] =
     {
         .size = 0x67,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_LICKITUNG] =
     {
         .size = 0x86,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_KOFFING] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_WEEZING] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_RHYHORN] =
     {
         .size = 0x76,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_RHYDON] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_CHANSEY] =
     {
         .size = 0x76,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_TANGELA] =
     {
         .size = 0x67,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_KANGASKHAN] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_HORSEA] =
     {
         .size = 0x45,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_SEADRA] =
     {
         .size = 0x67,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_GOLDEEN] =
     {
         .size = 0x66,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_SEAKING] =
     {
         .size = 0x77,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_STARYU] =
     {
         .size = 0x66,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_STARMIE] =
     {
         .size = 0x77,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_MR_MIME] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_SCYTHER] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_JYNX] =
     {
         .size = 0x77,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_ELECTABUZZ] =
     {
         .size = 0x78,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_MAGMAR] =
     {
         .size = 0x77,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_PINSIR] =
     {
         .size = 0x77,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_TAUROS] =
     {
         .size = 0x78,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_MAGIKARP] =
     {
         .size = 0x67,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_GYARADOS] =
     {
         .size = 0x88,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_LAPRAS] =
     {
         .size = 0x85,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_DITTO] =
     {
         .size = 0x54,
-        .y_offset = 0x11,
+        .y_offset = 17,
     },
     [SPECIES_EEVEE] =
     {
         .size = 0x56,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_VAPOREON] =
     {
         .size = 0x67,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_JOLTEON] =
     {
         .size = 0x76,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_FLAREON] =
     {
         .size = 0x66,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_PORYGON] =
     {
         .size = 0x55,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_OMANYTE] =
     {
         .size = 0x45,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_OMASTAR] =
     {
         .size = 0x67,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_KABUTO] =
     {
         .size = 0x54,
-        .y_offset = 0x11,
+        .y_offset = 17,
     },
     [SPECIES_KABUTOPS] =
     {
         .size = 0x88,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_AERODACTYL] =
     {
         .size = 0x88,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_SNORLAX] =
     {
         .size = 0x87,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_ARTICUNO] =
     {
         .size = 0x88,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_ZAPDOS] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_MOLTRES] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_DRATINI] =
     {
         .size = 0x75,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_DRAGONAIR] =
     {
         .size = 0x87,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_DRAGONITE] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_MEWTWO] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_MEW] =
     {
         .size = 0x55,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_CHIKORITA] =
     {
         .size = 0x75,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_BAYLEEF] =
     {
         .size = 0x77,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_MEGANIUM] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_CYNDAQUIL] =
     {
         .size = 0x55,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_QUILAVA] =
     {
         .size = 0x76,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_TYPHLOSION] =
     {
         .size = 0x78,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_TOTODILE] =
     {
         .size = 0x55,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_CROCONAW] =
     {
         .size = 0x67,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_FERALIGATR] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_SENTRET] =
     {
         .size = 0x47,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_FURRET] =
     {
         .size = 0x67,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_HOOTHOOT] =
     {
         .size = 0x55,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_NOCTOWL] =
     {
         .size = 0x58,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_LEDYBA] =
     {
         .size = 0x56,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_LEDIAN] =
     {
         .size = 0x67,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_SPINARAK] =
     {
         .size = 0x54,
-        .y_offset = 0x13,
+        .y_offset = 19,
     },
     [SPECIES_ARIADOS] =
     {
         .size = 0x87,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_CROBAT] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_CHINCHOU] =
     {
         .size = 0x75,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_LANTURN] =
     {
         .size = 0x87,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_PICHU] =
     {
         .size = 0x45,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_CLEFFA] =
     {
         .size = 0x44,
-        .y_offset = 0x14,
+        .y_offset = 20,
     },
     [SPECIES_IGGLYBUFF] =
     {
         .size = 0x44,
-        .y_offset = 0x12,
+        .y_offset = 18,
     },
     [SPECIES_TOGEPI] =
     {
         .size = 0x34,
-        .y_offset = 0x14,
+        .y_offset = 20,
     },
     [SPECIES_TOGETIC] =
     {
         .size = 0x46,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_NATU] =
     {
         .size = 0x44,
-        .y_offset = 0x14,
+        .y_offset = 20,
     },
     [SPECIES_XATU] =
     {
         .size = 0x47,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_MAREEP] =
     {
         .size = 0x55,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_FLAAFFY] =
     {
         .size = 0x56,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_AMPHAROS] =
     {
         .size = 0x77,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_BELLOSSOM] =
     {
         .size = 0x45,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_MARILL] =
     {
         .size = 0x65,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_AZUMARILL] =
     {
         .size = 0x76,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_SUDOWOODO] =
     {
         .size = 0x67,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_POLITOED] =
     {
         .size = 0x67,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_HOPPIP] =
     {
         .size = 0x66,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_SKIPLOOM] =
     {
         .size = 0x55,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_JUMPLUFF] =
     {
         .size = 0x77,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_AIPOM] =
     {
         .size = 0x58,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_SUNKERN] =
     {
         .size = 0x44,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_SUNFLORA] =
     {
         .size = 0x56,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_YANMA] =
     {
         .size = 0x86,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_WOOPER] =
     {
         .size = 0x54,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_QUAGSIRE] =
     {
         .size = 0x77,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_ESPEON] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_UMBREON] =
     {
         .size = 0x67,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_MURKROW] =
     {
         .size = 0x66,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_SLOWKING] =
     {
         .size = 0x58,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_MISDREAVUS] =
     {
         .size = 0x55,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_UNOWN] =
     {
         .size = 0x35,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_WOBBUFFET] =
     {
         .size = 0x77,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_GIRAFARIG] =
     {
         .size = 0x88,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_PINECO] =
     {
         .size = 0x56,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_FORRETRESS] =
     {
         .size = 0x76,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_DUNSPARCE] =
     {
         .size = 0x74,
-        .y_offset = 0x11,
+        .y_offset = 17,
     },
     [SPECIES_GLIGAR] =
     {
         .size = 0x78,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_STEELIX] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_SNUBBULL] =
     {
         .size = 0x55,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_GRANBULL] =
     {
         .size = 0x57,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_QWILFISH] =
     {
         .size = 0x56,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_SCIZOR] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_SHUCKLE] =
     {
         .size = 0x66,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_HERACROSS] =
     {
         .size = 0x88,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_SNEASEL] =
     {
         .size = 0x67,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_TEDDIURSA] =
     {
         .size = 0x45,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_URSARING] =
     {
         .size = 0x78,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_SLUGMA] =
     {
         .size = 0x45,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_MAGCARGO] =
     {
         .size = 0x57,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_SWINUB] =
     {
         .size = 0x43,
-        .y_offset = 0x14,
+        .y_offset = 20,
     },
     [SPECIES_PILOSWINE] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_CORSOLA] =
     {
         .size = 0x65,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_REMORAID] =
     {
         .size = 0x55,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_OCTILLERY] =
     {
         .size = 0x66,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_DELIBIRD] =
     {
         .size = 0x56,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_MANTINE] =
     {
         .size = 0x88,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_SKARMORY] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_HOUNDOUR] =
     {
         .size = 0x56,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_HOUNDOOM] =
     {
         .size = 0x77,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_KINGDRA] =
     {
         .size = 0x78,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_PHANPY] =
     {
         .size = 0x54,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_DONPHAN] =
     {
         .size = 0x86,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_PORYGON2] =
     {
         .size = 0x55,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_STANTLER] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_SMEARGLE] =
     {
         .size = 0x77,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_TYROGUE] =
     {
         .size = 0x46,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_HITMONTOP] =
     {
         .size = 0x67,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_SMOOCHUM] =
     {
         .size = 0x35,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_ELEKID] =
     {
         .size = 0x76,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_MAGBY] =
     {
         .size = 0x45,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_MILTANK] =
     {
         .size = 0x77,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_BLISSEY] =
     {
         .size = 0x77,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_RAIKOU] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_ENTEI] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_SUICUNE] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_LARVITAR] =
     {
         .size = 0x46,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_PUPITAR] =
     {
         .size = 0x56,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_TYRANITAR] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_LUGIA] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_HO_OH] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_CELEBI] =
     {
         .size = 0x55,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_OLD_UNOWN_B] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_OLD_UNOWN_C] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_OLD_UNOWN_D] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_OLD_UNOWN_E] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_OLD_UNOWN_F] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_OLD_UNOWN_G] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_OLD_UNOWN_H] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_OLD_UNOWN_I] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_OLD_UNOWN_J] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_OLD_UNOWN_K] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_OLD_UNOWN_L] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_OLD_UNOWN_M] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_OLD_UNOWN_N] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_OLD_UNOWN_O] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_OLD_UNOWN_P] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_OLD_UNOWN_Q] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_OLD_UNOWN_R] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_OLD_UNOWN_S] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_OLD_UNOWN_T] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_OLD_UNOWN_U] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_OLD_UNOWN_V] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_OLD_UNOWN_W] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_OLD_UNOWN_X] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_OLD_UNOWN_Y] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_OLD_UNOWN_Z] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_TREECKO] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_GROVYLE] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_SCEPTILE] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_TORCHIC] =
     {
         .size = 0x56,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_COMBUSKEN] =
     {
         .size = 0x88,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_BLAZIKEN] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_MUDKIP] =
     {
         .size = 0x56,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_MARSHTOMP] =
     {
         .size = 0x67,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_SWAMPERT] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_POOCHYENA] =
     {
         .size = 0x55,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_MIGHTYENA] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_ZIGZAGOON] =
     {
         .size = 0x85,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_LINOONE] =
     {
         .size = 0x78,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_WURMPLE] =
     {
         .size = 0x45,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_SILCOON] =
     {
         .size = 0x75,
-        .y_offset = 0x11,
+        .y_offset = 17,
     },
     [SPECIES_BEAUTIFLY] =
     {
         .size = 0x86,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_CASCOON] =
     {
         .size = 0x74,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_DUSTOX] =
     {
         .size = 0x86,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_LOTAD] =
     {
         .size = 0x65,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_LOMBRE] =
     {
         .size = 0x66,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_LUDICOLO] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_SEEDOT] =
     {
         .size = 0x46,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_NUZLEAF] =
     {
         .size = 0x56,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_SHIFTRY] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_NINCADA] =
     {
         .size = 0x74,
-        .y_offset = 0x12,
+        .y_offset = 18,
     },
     [SPECIES_NINJASK] =
     {
         .size = 0x86,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_SHEDINJA] =
     {
         .size = 0x66,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_TAILLOW] =
     {
         .size = 0x64,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_SWELLOW] =
     {
         .size = 0x87,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_SHROOMISH] =
     {
         .size = 0x54,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_BRELOOM] =
     {
         .size = 0x77,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_SPINDA] =
     {
         .size = 0x68,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_WINGULL] =
     {
         .size = 0x84,
-        .y_offset = 0x18,
+        .y_offset = 24,
     },
     [SPECIES_PELIPPER] =
     {
         .size = 0x77,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_SURSKIT] =
     {
         .size = 0x65,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_MASQUERAIN] =
     {
         .size = 0x88,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_WAILMER] =
     {
         .size = 0x75,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_WAILORD] =
     {
         .size = 0x87,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_SKITTY] =
     {
         .size = 0x66,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_DELCATTY] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_KECLEON] =
     {
         .size = 0x67,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_BALTOY] =
     {
         .size = 0x55,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_CLAYDOL] =
     {
         .size = 0x78,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_NOSEPASS] =
     {
         .size = 0x56,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_TORKOAL] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_SABLEYE] =
     {
         .size = 0x66,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_BARBOACH] =
     {
         .size = 0x46,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_WHISCASH] =
     {
         .size = 0x76,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_LUVDISC] =
     {
         .size = 0x46,
-        .y_offset = 0x18,
+        .y_offset = 24,
     },
     [SPECIES_CORPHISH] =
     {
         .size = 0x66,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_CRAWDAUNT] =
     {
         .size = 0x88,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_FEEBAS] =
     {
         .size = 0x46,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_MILOTIC] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_CARVANHA] =
     {
         .size = 0x67,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_SHARPEDO] =
     {
         .size = 0x78,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_TRAPINCH] =
     {
         .size = 0x54,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_VIBRAVA] =
     {
         .size = 0x86,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_FLYGON] =
     {
         .size = 0x88,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_MAKUHITA] =
     {
         .size = 0x65,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_HARIYAMA] =
     {
         .size = 0x88,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_ELECTRIKE] =
     {
         .size = 0x64,
-        .y_offset = 0x12,
+        .y_offset = 18,
     },
     [SPECIES_MANECTRIC] =
     {
         .size = 0x67,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_NUMEL] =
     {
         .size = 0x65,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_CAMERUPT] =
     {
         .size = 0x87,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_SPHEAL] =
     {
         .size = 0x65,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_SEALEO] =
     {
         .size = 0x86,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_WALREIN] =
     {
         .size = 0x88,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_CACNEA] =
     {
         .size = 0x74,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_CACTURNE] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_SNORUNT] =
     {
         .size = 0x56,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_GLALIE] =
     {
         .size = 0x76,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_LUNATONE] =
     {
         .size = 0x66,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_SOLROCK] =
     {
         .size = 0x88,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_AZURILL] =
     {
         .size = 0x55,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_SPOINK] =
     {
         .size = 0x46,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_GRUMPIG] =
     {
         .size = 0x77,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_PLUSLE] =
     {
         .size = 0x56,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_MINUN] =
     {
         .size = 0x66,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_MAWILE] =
     {
         .size = 0x76,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_MEDITITE] =
     {
         .size = 0x65,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_MEDICHAM] =
     {
         .size = 0x68,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_SWABLU] =
     {
         .size = 0x76,
-        .y_offset = 0x11,
+        .y_offset = 17,
     },
     [SPECIES_ALTARIA] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_WYNAUT] =
     {
         .size = 0x55,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_DUSKULL] =
     {
         .size = 0x66,
-        .y_offset = 0x0a,
+        .y_offset = 10,
     },
     [SPECIES_DUSCLOPS] =
     {
         .size = 0x77,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_ROSELIA] =
     {
         .size = 0x76,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_SLAKOTH] =
     {
         .size = 0x74,
-        .y_offset = 0x12,
+        .y_offset = 18,
     },
     [SPECIES_VIGOROTH] =
     {
         .size = 0x78,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_SLAKING] =
     {
         .size = 0x86,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_GULPIN] =
     {
         .size = 0x55,
-        .y_offset = 0x12,
+        .y_offset = 18,
     },
     [SPECIES_SWALOT] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_TROPIUS] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_WHISMUR] =
     {
         .size = 0x55,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_LOUDRED] =
     {
         .size = 0x78,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_EXPLOUD] =
     {
         .size = 0x88,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_CLAMPERL] =
     {
         .size = 0x55,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_HUNTAIL] =
     {
         .size = 0x78,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_GOREBYSS] =
     {
         .size = 0x86,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_ABSOL] =
     {
         .size = 0x68,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_SHUPPET] =
     {
         .size = 0x56,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_BANETTE] =
     {
         .size = 0x55,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_SEVIPER] =
     {
         .size = 0x77,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_ZANGOOSE] =
     {
         .size = 0x87,
-        .y_offset = 0x05,
+        .y_offset = 5,
     },
     [SPECIES_RELICANTH] =
     {
         .size = 0x77,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_ARON] =
     {
         .size = 0x43,
-        .y_offset = 0x14,
+        .y_offset = 20,
     },
     [SPECIES_LAIRON] =
     {
         .size = 0x75,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_AGGRON] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_CASTFORM] =
     {
         .size = 0x34,
-        .y_offset = 0x11,
+        .y_offset = 17,
     },
     [SPECIES_VOLBEAT] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_ILLUMISE] =
     {
         .size = 0x56,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_LILEEP] =
     {
         .size = 0x67,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_CRADILY] =
     {
         .size = 0x78,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_ANORITH] =
     {
         .size = 0x66,
-        .y_offset = 0x08,
+        .y_offset = 8,
     },
     [SPECIES_ARMALDO] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_RALTS] =
     {
         .size = 0x35,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_KIRLIA] =
     {
         .size = 0x47,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_GARDEVOIR] =
     {
         .size = 0x78,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_BAGON] =
     {
         .size = 0x56,
-        .y_offset = 0x0b,
+        .y_offset = 11,
     },
     [SPECIES_SHELGON] =
     {
         .size = 0x66,
-        .y_offset = 0x09,
+        .y_offset = 9,
     },
     [SPECIES_SALAMENCE] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_BELDUM] =
     {
         .size = 0x55,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_METANG] =
     {
         .size = 0x87,
-        .y_offset = 0x07,
+        .y_offset = 7,
     },
     [SPECIES_METAGROSS] =
     {
         .size = 0x87,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_REGIROCK] =
     {
         .size = 0x78,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_REGICE] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_REGISTEEL] =
     {
         .size = 0x88,
-        .y_offset = 0x03,
+        .y_offset = 3,
     },
     [SPECIES_KYOGRE] =
     {
         .size = 0x87,
-        .y_offset = 0x04,
+        .y_offset = 4,
     },
     [SPECIES_GROUDON] =
     {
         .size = 0x88,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_RAYQUAZA] =
     {
         .size = 0x88,
-        .y_offset = 0x00,
+        .y_offset = 0,
     },
     [SPECIES_LATIAS] =
     {
         .size = 0x88,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_LATIOS] =
     {
         .size = 0x88,
-        .y_offset = 0x02,
+        .y_offset = 2,
     },
     [SPECIES_JIRACHI] =
     {
         .size = 0x66,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
     [SPECIES_DEOXYS] =
     {
         .size = 0x88,
-        .y_offset = 0x01,
+        .y_offset = 1,
     },
     [SPECIES_CHIMECHO] =
     {
         .size = 0x37,
-        .y_offset = 0x06,
+        .y_offset = 6,
     },
     [SPECIES_EGG] =
     {
         .size = 0x33,
-        .y_offset = 0x14,
+        .y_offset = 20,
     },
     [SPECIES_UNOWN_B] =
     {
         .size = 0x34,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_UNOWN_C] =
     {
         .size = 0x44,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_UNOWN_D] =
     {
         .size = 0x44,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_UNOWN_E] =
     {
         .size = 0x44,
-        .y_offset = 0x11,
+        .y_offset = 17,
     },
     [SPECIES_UNOWN_F] =
     {
         .size = 0x44,
-        .y_offset = 0x11,
+        .y_offset = 17,
     },
     [SPECIES_UNOWN_G] =
     {
         .size = 0x35,
-        .y_offset = 0x0e,
+        .y_offset = 14,
     },
     [SPECIES_UNOWN_H] =
     {
         .size = 0x44,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_UNOWN_I] =
     {
         .size = 0x34,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_UNOWN_J] =
     {
         .size = 0x34,
-        .y_offset = 0x11,
+        .y_offset = 17,
     },
     [SPECIES_UNOWN_K] =
     {
         .size = 0x44,
-        .y_offset = 0x11,
+        .y_offset = 17,
     },
     [SPECIES_UNOWN_L] =
     {
         .size = 0x34,
-        .y_offset = 0x13,
+        .y_offset = 19,
     },
     [SPECIES_UNOWN_M] =
     {
         .size = 0x44,
-        .y_offset = 0x13,
+        .y_offset = 19,
     },
     [SPECIES_UNOWN_N] =
     {
         .size = 0x43,
-        .y_offset = 0x14,
+        .y_offset = 20,
     },
     [SPECIES_UNOWN_O] =
     {
         .size = 0x44,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_UNOWN_P] =
     {
         .size = 0x34,
-        .y_offset = 0x13,
+        .y_offset = 19,
     },
     [SPECIES_UNOWN_Q] =
     {
         .size = 0x43,
-        .y_offset = 0x15,
+        .y_offset = 21,
     },
     [SPECIES_UNOWN_R] =
     {
         .size = 0x34,
-        .y_offset = 0x13,
+        .y_offset = 19,
     },
     [SPECIES_UNOWN_S] =
     {
         .size = 0x45,
-        .y_offset = 0x0c,
+        .y_offset = 12,
     },
     [SPECIES_UNOWN_T] =
     {
         .size = 0x34,
-        .y_offset = 0x12,
+        .y_offset = 18,
     },
     [SPECIES_UNOWN_U] =
     {
         .size = 0x44,
-        .y_offset = 0x12,
+        .y_offset = 18,
     },
     [SPECIES_UNOWN_V] =
     {
         .size = 0x44,
-        .y_offset = 0x12,
+        .y_offset = 18,
     },
     [SPECIES_UNOWN_W] =
     {
         .size = 0x44,
-        .y_offset = 0x13,
+        .y_offset = 19,
     },
     [SPECIES_UNOWN_X] =
     {
         .size = 0x33,
-        .y_offset = 0x15,
+        .y_offset = 21,
     },
     [SPECIES_UNOWN_Y] =
     {
         .size = 0x34,
-        .y_offset = 0x11,
+        .y_offset = 17,
     },
     [SPECIES_UNOWN_Z] =
     {
         .size = 0x34,
-        .y_offset = 0x10,
+        .y_offset = 16,
     },
     [SPECIES_UNOWN_EMARK] =
     {
         .size = 0x35,
-        .y_offset = 0x0f,
+        .y_offset = 15,
     },
     [SPECIES_UNOWN_QMARK] =
     {
         .size = 0x35,
-        .y_offset = 0x0d,
+        .y_offset = 13,
     },
 };
diff --git a/src/data/text/nature_names.h b/src/data/text/nature_names.h
index d0d217d9b..601898445 100644
--- a/src/data/text/nature_names.h
+++ b/src/data/text/nature_names.h
@@ -24,7 +24,7 @@ static const u8 sSassyNatureName[] = _("SASSY");
 static const u8 sCarefulNatureName[] = _("CAREFUL");
 static const u8 sQuirkyNatureName[] = _("QUIRKY");
 
-const u8 *const gNatureNamePointers[] = 
+const u8 *const gNatureNamePointers[NUM_NATURES] = 
 {
     [NATURE_HARDY] = sHardyNatureName,
     [NATURE_LONELY] = sLonelyNatureName,
diff --git a/src/data/union_room.h b/src/data/union_room.h
index 704978766..be7bfae71 100644
--- a/src/data/union_room.h
+++ b/src/data/union_room.h
@@ -222,7 +222,7 @@ static const u8 *const sAwaitingResponseTexts[] = {
 ALIGNED(4) const u8 sText_ShowTrainerCard[] = _("The other TRAINER showed\nyou their TRAINER CARD.\pWould you like to show your\nTRAINER CARD?");
 ALIGNED(4) const u8 sText_BattleChallenge[] = _("The other TRAINER challenges you\nto battle.\pWill you accept the battle\nchallenge?");
 ALIGNED(4) const u8 sText_ChatInvitation[] = _("The other TRAINER invites you\nto chat.\pWill you accept the chat\ninvitation?");
-ALIGNED(4) const u8 sText_OfferToTradeMon[] = _("There is an offer to trade your\nregistered Lv. {SPECIAL_F7 0x00} {SPECIAL_F7 0x01}\pin exchange for a\nLv. {SPECIAL_F7 0x02} {SPECIAL_F7 0x03}.\pWill you accept this trade\noffer?");
+ALIGNED(4) const u8 sText_OfferToTradeMon[] = _("There is an offer to trade your\nregistered Lv. {DYNAMIC 0} {DYNAMIC 1}\pin exchange for a\nLv. {DYNAMIC 2} {DYNAMIC 3}.\pWill you accept this trade\noffer?");
 ALIGNED(4) const u8 sText_OfferToTradeEgg[] = _("There is an offer to trade your\nregistered EGG.\lWill you accept this trade offer?");
 ALIGNED(4) const u8 sText_ChatDropped[] = _("The chat has been dropped.\p");
 ALIGNED(4) const u8 sText_OfferDeclined1[] = _("You declined the offer.\p");
@@ -567,17 +567,17 @@ static const u8 *const sCardColorTexts[] = {
     sText_ItsGoldCard
 };
 
-ALIGNED(4) const u8 sText_TrainerCardInfoPage1[] = _("This is {SPECIAL_F7 0x00} {SPECIAL_F7 0x01}'s\nTRAINER CARD…\l{SPECIAL_F7 0x02}\pPOKéDEX: {SPECIAL_F7 0x03}\nTIME:    {SPECIAL_F7 0x04}:{SPECIAL_F7 0x05}\p");
-ALIGNED(4) const u8 sText_TrainerCardInfoPage2[] = _("BATTLES: WINS: {SPECIAL_F7 0x00}  LOSSES: {SPECIAL_F7 0x02}\nTRADES: {SPECIAL_F7 0x03}\p“{SPECIAL_F7 0x04} {SPECIAL_F7 0x05}\n{SPECIAL_F7 0x06} {SPECIAL_F7 0x07}”\p");
-ALIGNED(4) const u8 sText_GladToMeetYouMale[] = _("{SPECIAL_F7 0x01}: Glad to have met you!{PAUSE 60}");
-ALIGNED(4) const u8 sText_GladToMeetYouFemale[] = _("{SPECIAL_F7 0x01}: Glad to meet you!{PAUSE 60}");
+ALIGNED(4) const u8 sText_TrainerCardInfoPage1[] = _("This is {DYNAMIC 0} {DYNAMIC 1}'s\nTRAINER CARD…\l{DYNAMIC 2}\pPOKéDEX: {DYNAMIC 3}\nTIME:    {DYNAMIC 4}:{DYNAMIC 5}\p");
+ALIGNED(4) const u8 sText_TrainerCardInfoPage2[] = _("BATTLES: WINS: {DYNAMIC 0}  LOSSES: {DYNAMIC 2}\nTRADES: {DYNAMIC 3}\p“{DYNAMIC 4} {DYNAMIC 5}\n{DYNAMIC 6} {DYNAMIC 7}”\p");
+ALIGNED(4) const u8 sText_GladToMeetYouMale[] = _("{DYNAMIC 1}: Glad to have met you!{PAUSE 60}");
+ALIGNED(4) const u8 sText_GladToMeetYouFemale[] = _("{DYNAMIC 1}: Glad to meet you!{PAUSE 60}");
 
 const u8 *const sGladToMeetYouTexts[GENDER_COUNT] = {
     sText_GladToMeetYouMale,
     sText_GladToMeetYouFemale
 };
 
-ALIGNED(4) const u8 sText_FinishedCheckingPlayersTrainerCard[] = _("Finished checking {SPECIAL_F7 0x01}'s\nTRAINER CARD.{PAUSE 60}");
+ALIGNED(4) const u8 sText_FinishedCheckingPlayersTrainerCard[] = _("Finished checking {DYNAMIC 1}'s\nTRAINER CARD.{PAUSE 60}");
 
 static const u8 *const sLinkGroupActivityNameTexts[] = {
     [ACTIVITY_NONE]              = sText_EmptyString,
diff --git a/src/digit_obj_util.c b/src/digit_obj_util.c
index fe5d49e69..f887dafb9 100644
--- a/src/digit_obj_util.c
+++ b/src/digit_obj_util.c
@@ -33,7 +33,7 @@ struct DigitPrinterAlloc
 };
 
 // this file's functions
-static u8 GetFirstOamId(u8 oamCount);;
+static u8 GetFirstOamId(u8 oamCount);
 static void CopyWorkToOam(struct DigitPrinter *objWork);
 static void DrawNumObjsLeadingZeros(struct DigitPrinter *objWork, s32 num, bool32 sign);
 static void DrawNumObjsMinusInFront(struct DigitPrinter *objWork, s32 num, bool32 sign);
diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c
index fc132943c..41d8aa419 100644
--- a/src/dodrio_berry_picking.c
+++ b/src/dodrio_berry_picking.c
@@ -4629,7 +4629,7 @@ static void sub_802A7A8(void)
     ChangeBgX(3, 0, 0);
     ChangeBgY(3, 0, 0);
     InitStandardTextBoxWindows();
-    sub_8197200();
+    InitTextBoxGfxAndPrinters();
     SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
     SetBgTilemapBuffer(3, gUnknown_02022CF8->tilemapBuffers[0]);
     SetBgTilemapBuffer(1, gUnknown_02022CF8->tilemapBuffers[1]);
@@ -4657,7 +4657,7 @@ static bool32 sub_802A8E8(void)
             return FALSE;
         break;
     case 5:
-        LoadPalette(stdpal_get(3), 0xD0, 0x20);
+        LoadPalette(GetTextWindowPalette(3), 0xD0, 0x20);
         break;
     default:
         gUnknown_02022CF8->unk3018 = 0;
diff --git a/src/dynamic_placeholder_text_util.c b/src/dynamic_placeholder_text_util.c
index bdfcf6653..1ec0c1e06 100644
--- a/src/dynamic_placeholder_text_util.c
+++ b/src/dynamic_placeholder_text_util.c
@@ -32,7 +32,7 @@ u8 *DynamicPlaceholderTextUtil_ExpandPlaceholders(u8 *dest, const u8 *src)
 {
     while (*src != EOS)
     {
-        if (*src != CHAR_SPECIAL_F7)
+        if (*src != CHAR_DYNAMIC)
         {
             *dest++ = *src++;
         }
diff --git a/src/easy_chat.c b/src/easy_chat.c
index 2a4c49213..c839c0070 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -29,7 +29,6 @@
 #include "window.h"
 #include "constants/easy_chat.h"
 #include "constants/event_objects.h"
-#include "constants/flags.h"
 #include "constants/lilycove_lady.h"
 #include "constants/mauville_old_man.h"
 #include "constants/songs.h"
@@ -2538,7 +2537,7 @@ u8 sub_811BBBC(void)
     return sEasyChatScreen->unk_0c;
 }
 
-void sub_811BBC8(u8 *arg0, u8 *arg1)
+static void sub_811BBC8(s8 *arg0, s8 *arg1)
 {
     *arg0 = sEasyChatScreen->unk_10;
     *arg1 = sEasyChatScreen->unk_11;
@@ -4530,18 +4529,18 @@ static void sub_811E30C(void)
     x = var0 * 13;
     x = x * 8 + 28;
     y = var1 * 16 + 96;
-    sub_811E34C(x, y);
+    sub_811E34C((u8)x, (u8)y);
 }
 
 static void sub_811E34C(u8 x, u8 y)
 {
-    if (sUnknown_0203A11C->unk2E4)
-    {
-        sUnknown_0203A11C->unk2E4->pos1.x = x;
-        sUnknown_0203A11C->unk2E4->pos1.y = y;
-        sUnknown_0203A11C->unk2E4->pos2.x = 0;
-        sUnknown_0203A11C->unk2E4->data[0] = 0;
-    }
+    if (!sUnknown_0203A11C->unk2E4)
+        return;
+
+    sUnknown_0203A11C->unk2E4->pos1.x = (s16)x;
+    sUnknown_0203A11C->unk2E4->pos1.y = (s16)y;
+    sUnknown_0203A11C->unk2E4->pos2.x = 0;
+    sUnknown_0203A11C->unk2E4->data[0] = 0;
 }
 
 static void sub_811E380(void)
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index db25dbbb8..3ccc7ebf8 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -672,7 +672,7 @@ static void CB2_EggHatch_1(void)
             species = GetMonData(&gPlayerParty[sEggHatchData->eggPartyID], MON_DATA_SPECIES);
             gender = GetMonGender(&gPlayerParty[sEggHatchData->eggPartyID]);
             personality = GetMonData(&gPlayerParty[sEggHatchData->eggPartyID], MON_DATA_PERSONALITY, 0);
-            DoNamingScreen(3, gStringVar3, species, gender, personality, EggHatchSetMonNickname);
+            DoNamingScreen(NAMING_SCREEN_NICKNAME, gStringVar3, species, gender, personality, EggHatchSetMonNickname);
             break;
         case 1:
         case -1:
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index ad839e006..a076a2a22 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -130,6 +130,9 @@ static struct ObjectEventTemplate *FindObjectEventTemplateByLocalId(u8 localId,
 static void ClearObjectEventMovement(struct ObjectEvent *, struct Sprite *);
 static void ObjectEventSetSingleMovement(struct ObjectEvent *, struct Sprite *, u8);
 static void oamt_npc_ministep_reset(struct Sprite *, u8, u8);
+static void UpdateObjectEventSpriteSubpriorityAndVisibility(struct Sprite *);
+static void InitSpriteForFigure8Anim(struct Sprite *sprite);
+static bool8 AnimateSpriteInFigure8(struct Sprite *sprite);
 static void UpdateObjectEventSprite(struct Sprite *);
 
 const u8 gReflectionEffectPaletteMap[] = {1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11, 0, 0, 0, 0};
@@ -1122,13 +1125,13 @@ void ResetObjectEvents(void)
 
 static void CreateReflectionEffectSprites(void)
 {
-    u8 spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[21], 0, 0, 31);
+    u8 spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_REFLECTION_DISTORTION], 0, 0, 31);
     gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
     InitSpriteAffineAnim(&gSprites[spriteId]);
     StartSpriteAffineAnim(&gSprites[spriteId], 0);
     gSprites[spriteId].invisible = TRUE;
 
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[21], 0, 0, 31);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_REFLECTION_DISTORTION], 0, 0, 31);
     gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
     InitSpriteAffineAnim(&gSprites[spriteId]);
     StartSpriteAffineAnim(&gSprites[spriteId], 1);
@@ -1220,7 +1223,6 @@ static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template,
     objectEvent->movementType = template->movementType;
     objectEvent->localId = template->localId;
     objectEvent->mapNum = mapNum;
-    objectEvent++; objectEvent--;
     objectEvent->mapGroup = mapGroup;
     objectEvent->initialCoords.x = x;
     objectEvent->initialCoords.y = y;
@@ -1233,13 +1235,11 @@ static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template,
     objectEvent->range.as_nybbles.x = template->movementRangeX;
     objectEvent->range.as_nybbles.y = template->movementRangeY;
     objectEvent->trainerType = template->trainerType;
+    objectEvent->mapNum = mapNum; //redundant, but needed to match
     objectEvent->trainerRange_berryTreeId = template->trainerRange_berryTreeId;
     objectEvent->previousMovementDirection = gInitialMovementTypeFacingDirections[template->movementType];
     SetObjectEventDirection(objectEvent, objectEvent->previousMovementDirection);
     SetObjectEventDynamicGraphicsId(objectEvent);
-#ifndef NONMATCHING
-    asm("":::"r5", "r6");
-#endif
     if (gRangedMovementTypes[objectEvent->movementType])
     {
         if (objectEvent->range.as_nybbles.x == 0)
@@ -1949,7 +1949,7 @@ void sub_808E7E4(u8 localId, u8 mapNum, u8 mapGroup)
     }
 }
 
-void sub_808E82C(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y)
+void SetObjectEventSpritePosByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y)
 {
     u8 objectEventId;
     struct Sprite *sprite;
@@ -2340,7 +2340,13 @@ const u8 *GetObjectEventScriptPointerByObjectEventId(u8 objectEventId)
 
 static u16 GetObjectEventFlagIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
 {
-    return GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->flagId;
+    struct ObjectEventTemplate *obj = GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup);
+#ifdef UBFIX
+    // BUG: The function may return NULL, and attempting to read from NULL may freeze the game using modern compilers.
+    if (obj == NULL)
+        return 0;
+#endif // UBFIX
+    return obj->flagId;
 }
 
 static u16 GetObjectEventFlagIdByObjectEventId(u8 objectEventId)
@@ -6868,15 +6874,15 @@ bool8 MovementAction_UnusedAcroActionRight_Step0(struct ObjectEvent *objectEvent
     return FALSE;
 }
 
-void sub_8095AF0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
+void InitFigure8Anim(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
-    sub_8097750(sprite);
+    InitSpriteForFigure8Anim(sprite);
     sprite->animPaused = FALSE;
 }
 
-bool8 sub_8095B0C(struct ObjectEvent *objectEvent, struct Sprite *sprite)
+bool8 DoFigure8Anim(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
-    if (sub_8097758(sprite))
+    if (AnimateSpriteInFigure8(sprite))
     {
         ShiftStillObjectEventCoords(objectEvent);
         objectEvent->triggerGroundEffectsOnStop = TRUE;
@@ -6888,14 +6894,14 @@ bool8 sub_8095B0C(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 
 bool8 MovementAction_Figure8_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
-    sub_8095AF0(objectEvent, sprite);
+    InitFigure8Anim(objectEvent, sprite);
     sprite->data[2] = 1;
     return MovementAction_Figure8_Step1(objectEvent, sprite);
 }
 
 bool8 MovementAction_Figure8_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
-    if (sub_8095B0C(objectEvent, sprite))
+    if (DoFigure8Anim(objectEvent, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -8098,33 +8104,33 @@ void GroundEffect_Seaweed(struct ObjectEvent *objEvent, struct Sprite *sprite)
 }
 
 static void (*const sGroundEffectFuncs[])(struct ObjectEvent *objEvent, struct Sprite *sprite) = {
-    GroundEffect_SpawnOnTallGrass,
-    GroundEffect_StepOnTallGrass,
-    GroundEffect_SpawnOnLongGrass,
-    GroundEffect_StepOnLongGrass,
-    GroundEffect_WaterReflection,
-    GroundEffect_IceReflection,
-    GroundEffect_FlowingWater,
-    GroundEffect_SandTracks,
-    GroundEffect_DeepSandTracks,
-    GroundEffect_Ripple,
-    GroundEffect_StepOnPuddle,
-    GroundEffect_SandHeap,
-    GroundEffect_JumpOnTallGrass,
-    GroundEffect_JumpOnLongGrass,
-    GroundEffect_JumpOnShallowWater,
-    GroundEffect_JumpOnWater,
-    GroundEffect_JumpLandingDust,
-    GroundEffect_ShortGrass,
-    GroundEffect_HotSprings,
-    GroundEffect_Seaweed
+    GroundEffect_SpawnOnTallGrass,      // GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN
+    GroundEffect_StepOnTallGrass,       // GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE
+    GroundEffect_SpawnOnLongGrass,      // GROUND_EFFECT_FLAG_LONG_GRASS_ON_SPAWN
+    GroundEffect_StepOnLongGrass,       // GROUND_EFFECT_FLAG_LONG_GRASS_ON_MOVE
+    GroundEffect_WaterReflection,       // GROUND_EFFECT_FLAG_ICE_REFLECTION
+    GroundEffect_IceReflection,         // GROUND_EFFECT_FLAG_REFLECTION
+    GroundEffect_FlowingWater,          // GROUND_EFFECT_FLAG_SHALLOW_FLOWING_WATER
+    GroundEffect_SandTracks,            // GROUND_EFFECT_FLAG_SAND
+    GroundEffect_DeepSandTracks,        // GROUND_EFFECT_FLAG_DEEP_SAND
+    GroundEffect_Ripple,                // GROUND_EFFECT_FLAG_RIPPLES
+    GroundEffect_StepOnPuddle,          // GROUND_EFFECT_FLAG_PUDDLE
+    GroundEffect_SandHeap,              // GROUND_EFFECT_FLAG_SAND_PILE
+    GroundEffect_JumpOnTallGrass,       // GROUND_EFFECT_FLAG_LAND_IN_TALL_GRASS
+    GroundEffect_JumpOnLongGrass,       // GROUND_EFFECT_FLAG_LAND_IN_LONG_GRASS
+    GroundEffect_JumpOnShallowWater,    // GROUND_EFFECT_FLAG_LAND_IN_SHALLOW_WATER
+    GroundEffect_JumpOnWater,           // GROUND_EFFECT_FLAG_LAND_IN_DEEP_WATER
+    GroundEffect_JumpLandingDust,       // GROUND_EFFECT_FLAG_LAND_ON_NORMAL_GROUND
+    GroundEffect_ShortGrass,            // GROUND_EFFECT_FLAG_SHORT_GRASS
+    GroundEffect_HotSprings,            // GROUND_EFFECT_FLAG_HOT_SPRINGS
+    GroundEffect_Seaweed                // GROUND_EFFECT_FLAG_SEAWEED
 };
 
 static void DoFlaggedGroundEffects(struct ObjectEvent *objEvent, struct Sprite *sprite, u32 flags)
 {
     u8 i;
 
-    if (ObjectEventIsFarawayIslandMew(objEvent) == TRUE && !sub_81D4A58(objEvent))
+    if (ObjectEventIsFarawayIslandMew(objEvent) == TRUE && !ShouldMewShakeGrass(objEvent))
         return;
 
     for (i = 0; i < ARRAY_COUNT(sGroundEffectFuncs); i++, flags >>= 1)
@@ -8395,7 +8401,7 @@ bool8 sub_80976EC(struct Sprite *sprite)
         return FALSE;
 }
 
-static const s8 gUnknown_0850E772[] = {
+static const s8 sFigure8XOffsets[FIGURE_8_LENGTH] = {
     1, 2, 2, 2, 2, 2, 2, 2,
     2, 2, 2, 1, 2, 2, 1, 2,
     2, 1, 2, 2, 1, 2, 1, 1,
@@ -8407,7 +8413,7 @@ static const s8 gUnknown_0850E772[] = {
     0, 1, 0, 0, 0, 0, 0, 0,
 };
 
-static const s8 gUnknown_0850E7BA[] = {
+static const s8 sFigure8YOffsets[FIGURE_8_LENGTH] = {
      0,  0,  1,  0,  0,  1,  0,  0,
      1,  0,  1,  1,  0,  1,  1,  0,
      1,  1,  0,  1,  1,  0,  1,  1,
@@ -8419,57 +8425,57 @@ static const s8 gUnknown_0850E7BA[] = {
     -1, -1, -1, -1, -1, -1, -1, -2,
 };
 
-s16 sub_8097728(s16 a1)
+s16 GetFigure8YOffset(s16 idx)
 {
-    return gUnknown_0850E7BA[a1];
+    return sFigure8YOffsets[idx];
 }
 
-s16 sub_809773C(s16 a1)
+s16 GetFigure8XOffset(s16 idx)
 {
-    return gUnknown_0850E772[a1];
+    return sFigure8XOffsets[idx];
 }
 
-void sub_8097750(struct Sprite *sprite)
+static void InitSpriteForFigure8Anim(struct Sprite *sprite)
 {
     sprite->data[6] = 0;
     sprite->data[7] = 0;
 }
 
-bool8 sub_8097758(struct Sprite *sprite)
+static bool8 AnimateSpriteInFigure8(struct Sprite *sprite)
 {
-    bool8 result = FALSE;
+    bool8 finished = FALSE;
 
     switch(sprite->data[7])
     {
-        case 0:
-            sprite->pos2.x += sub_809773C(sprite->data[6]);
-            sprite->pos2.y += sub_8097728(sprite->data[6]);
-            break;
-        case 1:
-            sprite->pos2.x -= sub_809773C(0x47 - sprite->data[6]);
-            sprite->pos2.y += sub_8097728(0x47 - sprite->data[6]);
-            break;
-        case 2:
-            sprite->pos2.x -= sub_809773C(sprite->data[6]);
-            sprite->pos2.y += sub_8097728(sprite->data[6]);
-            break;
-        case 3:
-            sprite->pos2.x += sub_809773C(0x47 - sprite->data[6]);
-            sprite->pos2.y += sub_8097728(0x47 - sprite->data[6]);
-            break;
-    }
-    if(++sprite->data[6] == 0x48)
+    case 0:
+        sprite->pos2.x += GetFigure8XOffset(sprite->data[6]);
+        sprite->pos2.y += GetFigure8YOffset(sprite->data[6]);
+        break;
+    case 1:
+        sprite->pos2.x -= GetFigure8XOffset((FIGURE_8_LENGTH - 1) - sprite->data[6]);
+        sprite->pos2.y += GetFigure8YOffset((FIGURE_8_LENGTH - 1) - sprite->data[6]);
+        break;
+    case 2:
+        sprite->pos2.x -= GetFigure8XOffset(sprite->data[6]);
+        sprite->pos2.y += GetFigure8YOffset(sprite->data[6]);
+        break;
+    case 3:
+        sprite->pos2.x += GetFigure8XOffset((FIGURE_8_LENGTH - 1) - sprite->data[6]);
+        sprite->pos2.y += GetFigure8YOffset((FIGURE_8_LENGTH - 1) - sprite->data[6]);
+        break;
+    }
+    if (++sprite->data[6] == FIGURE_8_LENGTH)
     {
         sprite->data[6] = 0;
         sprite->data[7]++;
     }
-    if(sprite->data[7] == 0x4)
+    if (sprite->data[7] == 4)
     {
         sprite->pos2.y = 0;
         sprite->pos2.x = 0;
-        result = TRUE;
+        finished = TRUE;
     }
-    return result;
+    return finished;
 }
 
 static const s8 gUnknown_0850E802[] = {
@@ -8950,7 +8956,7 @@ void CreateLevitateMovementTask(struct ObjectEvent *objectEvent)
     u8 taskId = CreateTask(ApplyLevitateMovement, 0xFF);
     struct Task *task = &gTasks[taskId];
 
-    StoreWordInTwoHalfwords(&task->data[0], (u32)objectEvent);
+    StoreWordInTwoHalfwords((u16 *)&task->data[0], (u32)objectEvent);
     objectEvent->warpArrowSpriteId = taskId;
     task->data[3] = 0xFFFF;
 }
@@ -8961,7 +8967,7 @@ static void ApplyLevitateMovement(u8 taskId)
     struct Sprite *sprite;
     struct Task *task = &gTasks[taskId];
 
-    LoadWordFromTwoHalfwords(&task->data[0], (u32 *)&objectEvent); // load the map object pointer.
+    LoadWordFromTwoHalfwords((u16 *)&task->data[0], (u32 *)&objectEvent); // load the map object pointer.
     sprite = &gSprites[objectEvent->spriteId];
 
     if(!(task->data[2] & 0x3))
@@ -8978,7 +8984,7 @@ void DestroyExtraMovementTask(u8 taskId)
     struct ObjectEvent *objectEvent;
     struct Task *task = &gTasks[taskId];
 
-    LoadWordFromTwoHalfwords(&task->data[0], (u32 *)&objectEvent); // unused objectEvent
+    LoadWordFromTwoHalfwords((u16 *)&task->data[0], (u32 *)&objectEvent); // unused objectEvent
     DestroyTask(taskId);
 }
 
diff --git a/src/faraway_island.c b/src/faraway_island.c
index 2ac9d5c1f..e3d8444c9 100755
--- a/src/faraway_island.c
+++ b/src/faraway_island.c
@@ -6,34 +6,33 @@
 #include "metatile_behavior.h"
 #include "sprite.h"
 #include "constants/event_objects.h"
-#include "constants/flags.h"
+#include "constants/field_effects.h"
 #include "constants/maps.h"
 #include "constants/metatile_behaviors.h"
-#include "constants/vars.h"
 
-static u8 sub_81D4890(u8);
-static bool8 sub_81D4C14(struct ObjectEvent*, u8);
-static u8 sub_81D4C9C(struct ObjectEvent*, u8);
-static u8 sub_81D4C58(struct ObjectEvent*, u8);
-static u8 sub_81D4CE0(struct ObjectEvent*, u8);
-static u8 sub_81D4D24(u8);
-static bool8 CanMewWalkToCoords(s16, s16);
+static u8 GetValidMewMoveDirection(u8);
+static bool8 ShouldMewMoveNorth(struct ObjectEvent*, u8);
+static bool8 ShouldMewMoveSouth(struct ObjectEvent*, u8);
+static bool8 ShouldMewMoveEast(struct ObjectEvent*, u8);
+static bool8 ShouldMewMoveWest(struct ObjectEvent*, u8);
+static u8 GetRandomMewDirectionCandidate(u8);
+static bool8 CanMewMoveToCoords(s16, s16);
 
-static EWRAM_DATA u8 sUnknown_0203CF50 = 0;
+static EWRAM_DATA u8 sGrassSpriteId = 0;
 
 static s16 sPlayerToMewDeltaX;
 static s16 sPlayerToMewDeltaY;
 static u8 sMewDirectionCandidates[4];
 
-extern const struct SpritePalette gFieldEffectObjectPaletteInfo1;
+extern const struct SpritePalette gSpritePalette_GeneralFieldEffect1;
 extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
 
 static const s16 sFarawayIslandRockCoords[4][2] =
 {
-    {21, 16},
-    {25, 16},
-    {16, 17},
-    {20, 20},
+    {14 + 7,  9 + 7},
+    {18 + 7,  9 + 7},
+    { 9 + 7, 10 + 7},
+    {13 + 7, 13 + 7},
 };
 
 static u8 GetMewObjectEventId(void)
@@ -43,10 +42,12 @@ static u8 GetMewObjectEventId(void)
     return objectEventId;
 }
 
+// When the player enters Faraway Island interior it begins a "hide and seek" minigame where Mew disappears into the grass
+// This function returns the direction Mew will take a step, and is run every time the player takes a step
 u32 GetMewMoveDirection(void)
 {
     u8 i;
-    int skip;
+    int mewSafeFromTrap;
     struct ObjectEvent *mew = &gObjectEvents[GetMewObjectEventId()];
 
     sPlayerToMewDeltaX = gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x - mew->currentCoords.x;
@@ -54,43 +55,47 @@ u32 GetMewMoveDirection(void)
     for (i = 0; i < ARRAY_COUNT(sMewDirectionCandidates); i++)
         sMewDirectionCandidates[i] = DIR_NONE;
 
+    // Player hasn't moved (just facing new direction), don't move
     if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x == gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x
      && gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y == gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y)
     {
         return DIR_NONE;
     }
 
+    // Mew is invisible except for every 8th step
     if (VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % 8 == 0)
-        mew->invisible = 0;
+        mew->invisible = FALSE;
     else
-        mew->invisible = 1;
+        mew->invisible = TRUE;
 
+    // Mew will stay in place for 1 step after its visible
     if (VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % 9 == 0)
         return DIR_NONE;
 
+    // Below loop is for Mew to try to avoid getting trapped between the player and a rock
     for (i = 0; i < ARRAY_COUNT(sFarawayIslandRockCoords); i++)
     {
         if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x == sFarawayIslandRockCoords[i][0])
         {
-            skip = 0;
+            mewSafeFromTrap = FALSE;
             if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y < sFarawayIslandRockCoords[i][1])
             {
                 if (mew->currentCoords.y <= sFarawayIslandRockCoords[i][1])
-                    skip = 1;
+                    mewSafeFromTrap = TRUE;
             }
             else
             {
                 if (mew->currentCoords.y >= sFarawayIslandRockCoords[i][1])
-                    skip = 1;
+                    mewSafeFromTrap = TRUE;
             }
 
-            if (!skip)
+            if (!mewSafeFromTrap)
             {
                 if (sPlayerToMewDeltaX > 0)
                 {
                     if (mew->currentCoords.x + 1 == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x)
                     {
-                        if (CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y))
+                        if (CanMewMoveToCoords(mew->currentCoords.x + 1, mew->currentCoords.y))
                             return DIR_EAST;
                     }
                 }
@@ -98,7 +103,7 @@ u32 GetMewMoveDirection(void)
                 {
                     if (mew->currentCoords.x - 1 == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x)
                     {
-                        if (CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y))
+                        if (CanMewMoveToCoords(mew->currentCoords.x - 1, mew->currentCoords.y))
                             return DIR_WEST;
                     }
                 }
@@ -107,12 +112,12 @@ u32 GetMewMoveDirection(void)
                 {
                     if (sPlayerToMewDeltaY > 0)
                     {
-                        if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1))
+                        if (CanMewMoveToCoords(mew->currentCoords.x, mew->currentCoords.y - 1))
                             return DIR_NORTH;
                     }
                     else
                     {
-                        if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1))
+                        if (CanMewMoveToCoords(mew->currentCoords.x, mew->currentCoords.y + 1))
                             return DIR_SOUTH;
                     }
                 }
@@ -121,25 +126,25 @@ u32 GetMewMoveDirection(void)
 
         if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y == sFarawayIslandRockCoords[i][1])
         {
-            skip = 0;
+            mewSafeFromTrap = FALSE;
             if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x < sFarawayIslandRockCoords[i][0])
             {
                 if (mew->currentCoords.x <= sFarawayIslandRockCoords[i][0])
-                    skip = 1;
+                    mewSafeFromTrap = TRUE;
             }
             else
             {
                 if (mew->currentCoords.x >= sFarawayIslandRockCoords[i][0])
-                    skip = 1;
+                    mewSafeFromTrap = TRUE;
             }
 
-            if (!skip)
+            if (!mewSafeFromTrap)
             {
                 if (sPlayerToMewDeltaY > 0)
                 {
                     if (mew->currentCoords.y + 1 == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y)
                     {
-                        if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1))
+                        if (CanMewMoveToCoords(mew->currentCoords.x, mew->currentCoords.y + 1))
                             return DIR_SOUTH;
                     }
                 }
@@ -147,7 +152,7 @@ u32 GetMewMoveDirection(void)
                 {
                     if (mew->currentCoords.y - 1 == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y)
                     {
-                        if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1))
+                        if (CanMewMoveToCoords(mew->currentCoords.x, mew->currentCoords.y - 1))
                             return DIR_NORTH;
                     }
                 }
@@ -156,12 +161,12 @@ u32 GetMewMoveDirection(void)
                 {
                     if (sPlayerToMewDeltaX > 0)
                     {
-                        if (CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y))
+                        if (CanMewMoveToCoords(mew->currentCoords.x - 1, mew->currentCoords.y))
                             return DIR_WEST;
                     }
                     else
                     {
-                        if (CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y))
+                        if (CanMewMoveToCoords(mew->currentCoords.x + 1, mew->currentCoords.y))
                             return DIR_EAST;
                     }
                 }
@@ -169,92 +174,101 @@ u32 GetMewMoveDirection(void)
         }
     }
 
-    if (sub_81D4C14(mew, 0))
+    // Check if Mew can move in any direction without getting closer to the player
+    // If so load into sMewDirectionCandidates
+    // If Mew can move in two of the checked directions, choose one randomly
+    if (ShouldMewMoveNorth(mew, 0))
     {
-        if (sub_81D4C58(mew, 1))
-            return sub_81D4D24(2);
-        else if (sub_81D4CE0(mew, 1))
-            return sub_81D4D24(2);
+        if (ShouldMewMoveEast(mew, 1))
+            return GetRandomMewDirectionCandidate(2);
+        else if (ShouldMewMoveWest(mew, 1))
+            return GetRandomMewDirectionCandidate(2);
         else
             return DIR_NORTH;
     }
 
-    if (sub_81D4C9C(mew, 0))
+    if (ShouldMewMoveSouth(mew, 0))
     {
-        if (sub_81D4C58(mew, 1))
-            return sub_81D4D24(2);
-        else if (sub_81D4CE0(mew, 1))
-            return sub_81D4D24(2);
+        if (ShouldMewMoveEast(mew, 1))
+            return GetRandomMewDirectionCandidate(2);
+        else if (ShouldMewMoveWest(mew, 1))
+            return GetRandomMewDirectionCandidate(2);
         else
             return DIR_SOUTH;
     }
 
-    if (sub_81D4C58(mew, 0))
+    if (ShouldMewMoveEast(mew, 0))
     {
-        if (sub_81D4C14(mew, 1))
-            return sub_81D4D24(2);
-        else if (sub_81D4C9C(mew, 1))
-            return sub_81D4D24(2);
+        if (ShouldMewMoveNorth(mew, 1))
+            return GetRandomMewDirectionCandidate(2);
+        else if (ShouldMewMoveSouth(mew, 1))
+            return GetRandomMewDirectionCandidate(2);
         else
             return DIR_EAST;
     }
 
-    if (sub_81D4CE0(mew, 0))
+    if (ShouldMewMoveWest(mew, 0))
     {
-        if (sub_81D4C14(mew, 1))
-            return sub_81D4D24(2);
-        else if (sub_81D4C9C(mew, 1))
-            return sub_81D4D24(2);
+        if (ShouldMewMoveNorth(mew, 1))
+            return GetRandomMewDirectionCandidate(2);
+        else if (ShouldMewMoveSouth(mew, 1))
+            return GetRandomMewDirectionCandidate(2);
         else
             return DIR_WEST;
     }
 
+    // If this point is reached, Mew cannot move without getting closer to the player
+
+    // Avoid player on same Y, try move North/South
     if (sPlayerToMewDeltaY == 0)
     {
         if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y > mew->currentCoords.y)
         {
-            if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1))
+            if (CanMewMoveToCoords(mew->currentCoords.x, mew->currentCoords.y - 1))
                 return DIR_NORTH;
         }
 
         if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y < mew->currentCoords.y)
         {
-            if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1))
+            if (CanMewMoveToCoords(mew->currentCoords.x, mew->currentCoords.y + 1))
                 return DIR_SOUTH;
         }
 
-        if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1))
+        if (CanMewMoveToCoords(mew->currentCoords.x, mew->currentCoords.y - 1))
             return DIR_NORTH;
 
-        if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1))
+        if (CanMewMoveToCoords(mew->currentCoords.x, mew->currentCoords.y + 1))
             return DIR_SOUTH;
     }
 
+    // Avoid player on same X, try move West/East
     if (sPlayerToMewDeltaX == 0)
     {
         if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x > mew->currentCoords.x)
         {
-            if (CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y))
+            if (CanMewMoveToCoords(mew->currentCoords.x - 1, mew->currentCoords.y))
                 return DIR_WEST;
         }
 
         if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x < mew->currentCoords.x)
         {
-            if (CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y))
+            if (CanMewMoveToCoords(mew->currentCoords.x + 1, mew->currentCoords.y))
                 return DIR_EAST;
         }
 
-        if (CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y))
+        if (CanMewMoveToCoords(mew->currentCoords.x + 1, mew->currentCoords.y))
             return DIR_EAST;
 
-        if (CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y))
+        if (CanMewMoveToCoords(mew->currentCoords.x - 1, mew->currentCoords.y))
             return DIR_WEST;
     }
 
-    return sub_81D4890(DIR_NONE);
+    // Can't avoid player on axis, move any valid direction
+    return GetValidMewMoveDirection(DIR_NONE);
 }
 
-static bool8 CanMewWalkToCoords(s16 x, s16 y)
+// Mew can move to any Tall/Long Grass metatile the player isn't currently on
+static bool8 CanMewMoveToCoords(s16 x, s16 y)
 {
     if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x == x
      && gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y == y)
@@ -265,7 +279,8 @@ static bool8 CanMewWalkToCoords(s16 x, s16 y)
     return MetatileBehavior_IsPokeGrass(MapGridGetMetatileBehaviorAt(x, y));
 }
 
-static u8 sub_81D4890(u8 ignoredDir)
+// Last ditch effort to move, clear move candidates and try all directions again
+static u8 GetValidMewMoveDirection(u8 ignoredDir)
 {
     u8 i;
     u8 count = 0;
@@ -274,25 +289,25 @@ static u8 sub_81D4890(u8 ignoredDir)
     for (i = 0; i < ARRAY_COUNT(sMewDirectionCandidates); i++)
         sMewDirectionCandidates[i] = DIR_NONE;
 
-    if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1) == TRUE && ignoredDir != DIR_NORTH)
+    if (CanMewMoveToCoords(mew->currentCoords.x, mew->currentCoords.y - 1) == TRUE && ignoredDir != DIR_NORTH)
     {
         sMewDirectionCandidates[count] = DIR_NORTH;
         count++;
     }
 
-    if (CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y) == TRUE && ignoredDir != DIR_EAST)
+    if (CanMewMoveToCoords(mew->currentCoords.x + 1, mew->currentCoords.y) == TRUE && ignoredDir != DIR_EAST)
     {
         sMewDirectionCandidates[count] = DIR_EAST;
         count++;
     }
 
-    if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1) == TRUE && ignoredDir != DIR_SOUTH)
+    if (CanMewMoveToCoords(mew->currentCoords.x, mew->currentCoords.y + 1) == TRUE && ignoredDir != DIR_SOUTH)
     {
         sMewDirectionCandidates[count] = DIR_SOUTH;
         count++;
     }
 
-    if (CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y) == TRUE && ignoredDir != DIR_WEST)
+    if (CanMewMoveToCoords(mew->currentCoords.x - 1, mew->currentCoords.y) == TRUE && ignoredDir != DIR_WEST)
     {
         sMewDirectionCandidates[count] = DIR_WEST;
         count++;
@@ -342,7 +357,9 @@ bool8 IsMewPlayingHideAndSeek(void)
     return FALSE;
 }
 
-bool8 sub_81D4A58(struct ObjectEvent *objectEvent)
+// Every 4th step Mew will shake the grass it steps into
+// Otherwise its movement leaves grass undisturbed
+bool8 ShouldMewShakeGrass(struct ObjectEvent *objectEvent)
 {
     if (VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) != 0xFFFF
      && VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % 4 == 0)
@@ -351,38 +368,41 @@ bool8 sub_81D4A58(struct ObjectEvent *objectEvent)
     return FALSE;
 }
 
-void sub_81D4A90(void)
+void SetMewAboveGrass(void)
 {
     s16 x;
     s16 y;
     u8 spriteId;
     struct ObjectEvent *mew = &gObjectEvents[GetMewObjectEventId()];
 
-    mew->invisible = 0;
+    mew->invisible = FALSE;
     if (gSpecialVar_0x8004 == 1)
     {
+        // For after battle where Mew should still be present (e.g. if ran from battle)
         mew->fixedPriority = 1;
         gSprites[mew->spriteId].subspriteMode = SUBSPRITES_IGNORE_PRIORITY;
         gSprites[mew->spriteId].subpriority = 1;
     }
     else
     {
+        // Mew emerging from grass when found
+        // Also do field effect for grass shaking as it emerges
         VarSet(VAR_FARAWAY_ISLAND_STEP_COUNTER, 0xFFFF);
         mew->fixedPriority = 1;
         gSprites[mew->spriteId].subspriteMode = SUBSPRITES_IGNORE_PRIORITY;
         if (gSpecialVar_Facing != DIR_NORTH)
             gSprites[mew->spriteId].subpriority = 1;
 
-        LoadSpritePalette(&gFieldEffectObjectPaletteInfo1);
-        UpdateSpritePaletteWithWeather(IndexOfSpritePaletteTag(gFieldEffectObjectPaletteInfo1.tag));
+        LoadSpritePalette(&gSpritePalette_GeneralFieldEffect1);
+        UpdateSpritePaletteWithWeather(IndexOfSpritePaletteTag(gSpritePalette_GeneralFieldEffect1.tag));
 
         x = mew->currentCoords.x;
         y = mew->currentCoords.y;
         SetSpritePosToOffsetMapCoords(&x, &y, 8, 8);
-        sUnknown_0203CF50 = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[15], x, y, gSprites[mew->spriteId].subpriority - 1);
-        if (sUnknown_0203CF50 != MAX_SPRITES)
+        sGrassSpriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_LONG_GRASS], x, y, gSprites[mew->spriteId].subpriority - 1);
+        if (sGrassSpriteId != MAX_SPRITES)
         {
-            struct Sprite *sprite = &gSprites[sUnknown_0203CF50];
+            struct Sprite *sprite = &gSprites[sGrassSpriteId];
             sprite->coordOffsetEnabled = 1;
             sprite->oam.priority = 2;
             sprite->callback = SpriteCallbackDummy;
@@ -390,15 +410,15 @@ void sub_81D4A90(void)
     }
 }
 
-void sub_81D4BEC(void)
+void DestroyMewEmergingGrassSprite(void)
 {
-    if (sUnknown_0203CF50 != MAX_SPRITES)
-        DestroySprite(&gSprites[sUnknown_0203CF50]);
+    if (sGrassSpriteId != MAX_SPRITES)
+        DestroySprite(&gSprites[sGrassSpriteId]);
 }
 
-static bool8 sub_81D4C14(struct ObjectEvent *mew, u8 index)
+static bool8 ShouldMewMoveNorth(struct ObjectEvent *mew, u8 index)
 {
-    if (sPlayerToMewDeltaY > 0 && CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1))
+    if (sPlayerToMewDeltaY > 0 && CanMewMoveToCoords(mew->currentCoords.x, mew->currentCoords.y - 1))
     {
         sMewDirectionCandidates[index] = DIR_NORTH;
         return TRUE;
@@ -407,9 +427,9 @@ static bool8 sub_81D4C14(struct ObjectEvent *mew, u8 index)
     return FALSE;
 }
 
-static u8 sub_81D4C58(struct ObjectEvent *mew, u8 index)
+static bool8 ShouldMewMoveEast(struct ObjectEvent *mew, u8 index)
 {
-    if (sPlayerToMewDeltaX < 0 && CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y))
+    if (sPlayerToMewDeltaX < 0 && CanMewMoveToCoords(mew->currentCoords.x + 1, mew->currentCoords.y))
     {
         sMewDirectionCandidates[index] = DIR_EAST;
         return TRUE;
@@ -418,9 +438,9 @@ static u8 sub_81D4C58(struct ObjectEvent *mew, u8 index)
     return FALSE;
 }
 
-static u8 sub_81D4C9C(struct ObjectEvent *mew, u8 index)
+static bool8 ShouldMewMoveSouth(struct ObjectEvent *mew, u8 index)
 {
-    if (sPlayerToMewDeltaY < 0 && CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1))
+    if (sPlayerToMewDeltaY < 0 && CanMewMoveToCoords(mew->currentCoords.x, mew->currentCoords.y + 1))
     {
         sMewDirectionCandidates[index] = DIR_SOUTH;
         return TRUE;
@@ -429,9 +449,9 @@ static u8 sub_81D4C9C(struct ObjectEvent *mew, u8 index)
     return FALSE;
 }
 
-static u8 sub_81D4CE0(struct ObjectEvent *mew, u8 index)
+static bool8 ShouldMewMoveWest(struct ObjectEvent *mew, u8 index)
 {
-    if (sPlayerToMewDeltaX > 0 && CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y))
+    if (sPlayerToMewDeltaX > 0 && CanMewMoveToCoords(mew->currentCoords.x - 1, mew->currentCoords.y))
     {
         sMewDirectionCandidates[index] = DIR_WEST;
         return TRUE;
@@ -440,7 +460,7 @@ static u8 sub_81D4CE0(struct ObjectEvent *mew, u8 index)
     return FALSE;
 }
 
-static u8 sub_81D4D24(u8 mod)
+static u8 GetRandomMewDirectionCandidate(u8 numDirections)
 {
-    return sMewDirectionCandidates[VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % mod];
+    return sMewDirectionCandidates[VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % numDirections];
 }
diff --git a/src/field_camera.c b/src/field_camera.c
index 038b6932e..57be52221 100644
--- a/src/field_camera.c
+++ b/src/field_camera.c
@@ -39,7 +39,7 @@ static void CameraPanningCB_PanAhead(void);
 static struct FieldCameraOffset sFieldCameraOffset;
 static s16 sHorizontalCameraPan;
 static s16 sVerticalCameraPan;
-static u8 gUnknown_03000E2C;
+static bool8 gUnknown_03000E2C;
 static void (*sFieldCameraPanningCallback)(void);
 
 struct CameraObject gFieldCamera;
@@ -47,7 +47,7 @@ u16 gTotalCameraPixelOffsetY;
 u16 gTotalCameraPixelOffsetX;
 
 // text
-static void move_tilemap_camera_to_upper_left_corner_(struct FieldCameraOffset *cameraOffset)
+static void ResetCameraOffset(struct FieldCameraOffset *cameraOffset)
 {
     cameraOffset->xTileOffset = 0;
     cameraOffset->yTileOffset = 0;
@@ -56,23 +56,23 @@ static void move_tilemap_camera_to_upper_left_corner_(struct FieldCameraOffset *
     cameraOffset->copyBGToVRAM = TRUE;
 }
 
-static void tilemap_move_something(struct FieldCameraOffset *cameraOffset, u32 b, u32 c)
+static void AddCameraTileOffset(struct FieldCameraOffset *cameraOffset, u32 xOffset, u32 yOffset)
 {
-    cameraOffset->xTileOffset += b;
+    cameraOffset->xTileOffset += xOffset;
     cameraOffset->xTileOffset %= 32;
-    cameraOffset->yTileOffset += c;
+    cameraOffset->yTileOffset += yOffset;
     cameraOffset->yTileOffset %= 32;
 }
 
-static void coords8_add(struct FieldCameraOffset *cameraOffset, u32 b, u32 c)
+static void AddCameraPixelOffset(struct FieldCameraOffset *cameraOffset, u32 xOffset, u32 yOffset)
 {
-    cameraOffset->xPixelOffset += b;
-    cameraOffset->yPixelOffset += c;
+    cameraOffset->xPixelOffset += xOffset;
+    cameraOffset->yPixelOffset += yOffset;
 }
 
-void move_tilemap_camera_to_upper_left_corner(void)
+void ResetFieldCamera(void)
 {
-    move_tilemap_camera_to_upper_left_corner_(&sFieldCameraOffset);
+    ResetCameraOffset(&sFieldCameraOffset);
 }
 
 void FieldUpdateBgTilemapScroll(void)
@@ -89,10 +89,10 @@ void FieldUpdateBgTilemapScroll(void)
     SetGpuReg(REG_OFFSET_BG3VOFS, r4);
 }
 
-void sub_8089C08(s16 *a, s16 *b)
+void sub_8089C08(s16 *x, s16 *y)
 {
-    *a = sFieldCameraOffset.xPixelOffset + sHorizontalCameraPan;
-    *b = sFieldCameraOffset.yPixelOffset + sVerticalCameraPan + 8;
+    *x = sFieldCameraOffset.xPixelOffset + sHorizontalCameraPan;
+    *y = sFieldCameraOffset.yPixelOffset + sVerticalCameraPan + 8;
 }
 
 void DrawWholeMapView(void)
@@ -418,11 +418,11 @@ void CameraUpdate(void)
         UpdateObjectEventsForCameraUpdate(deltaX, deltaY);
         RotatingGatePuzzleCameraUpdate(deltaX, deltaY);
         ResetBerryTreeSparkleFlags();
-        tilemap_move_something(&sFieldCameraOffset, deltaX * 2, deltaY * 2);
+        AddCameraTileOffset(&sFieldCameraOffset, deltaX * 2, deltaY * 2);
         RedrawMapSlicesForCameraUpdate(&sFieldCameraOffset, deltaX * 2, deltaY * 2);
     }
 
-    coords8_add(&sFieldCameraOffset, movementSpeedX, movementSpeedY);
+    AddCameraPixelOffset(&sFieldCameraOffset, movementSpeedX, movementSpeedY);
     gTotalCameraPixelOffsetX -= movementSpeedX;
     gTotalCameraPixelOffsetY -= movementSpeedY;
 }
@@ -436,9 +436,9 @@ void MoveCameraAndRedrawMap(int deltaX, int deltaY) //unused
     gTotalCameraPixelOffsetY -= deltaY * 16;
 }
 
-void SetCameraPanningCallback(void (*a)(void))
+void SetCameraPanningCallback(void (*callback)(void))
 {
-    sFieldCameraPanningCallback = a;
+    sFieldCameraPanningCallback = callback;
 }
 
 void SetCameraPanning(s16 a, s16 b)
@@ -450,7 +450,7 @@ void SetCameraPanning(s16 a, s16 b)
 void InstallCameraPanAheadCallback(void)
 {
     sFieldCameraPanningCallback = CameraPanningCB_PanAhead;
-    gUnknown_03000E2C = 0;
+    gUnknown_03000E2C = FALSE;
     sHorizontalCameraPan = 0;
     sVerticalCameraPan = 32;
 }
@@ -478,12 +478,12 @@ static void CameraPanningCB_PanAhead(void)
         if (gPlayerAvatar.tileTransitionState == T_TILE_TRANSITION)
         {
             gUnknown_03000E2C ^= 1;
-            if (gUnknown_03000E2C == 0)
+            if (gUnknown_03000E2C == FALSE)
                 return;
         }
         else
         {
-            gUnknown_03000E2C = 0;
+            gUnknown_03000E2C = FALSE;
         }
 
         var = GetPlayerMovementDirection();
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index e41b5a69a..3684b53e6 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -545,7 +545,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
     UpdateHappinessStepCounter();
     UpdateFarawayIslandStepCounter();
 
-    if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_6) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior))
+    if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FORCED_MOVE) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior))
     {
         if (UpdatePoisonStepCounter() == TRUE)
         {
@@ -725,7 +725,7 @@ static bool8 TryStartWarpEventScript(struct MapPosition *position, u16 metatileB
         }
         if (MetatileBehavior_IsAquaHideoutWarp(metatileBehavior) == TRUE)
         {
-            DoTeleportWarp();
+            DoTeleportTileWarp();
             return TRUE;
         }
         if (MetatileBehavior_IsWarpOrBridge(metatileBehavior) == TRUE)
@@ -938,7 +938,7 @@ static struct BgEvent *GetBackgroundEventAtPosition(struct MapHeader *mapHeader,
     return NULL;
 }
 
-bool8 dive_warp(struct MapPosition *position, u16 metatileBehavior)
+bool8 TryDoDiveWarp(struct MapPosition *position, u16 metatileBehavior)
 {
     if (gMapHeader.mapType == MAP_TYPE_UNDERWATER && !MetatileBehavior_IsUnableToEmerge(metatileBehavior))
     {
diff --git a/src/field_door.c b/src/field_door.c
index b4794349c..e81c3dc4b 100644
--- a/src/field_door.c
+++ b/src/field_door.c
@@ -5,7 +5,6 @@
 #include "fieldmap.h"
 #include "metatile_behavior.h"
 #include "task.h"
-#include "constants/flags.h"
 #include "constants/maps.h"
 #include "constants/songs.h"
 #include "constants/metatile_labels.h"
diff --git a/src/field_effect.c b/src/field_effect.c
index 07579f55d..582551a7e 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -39,195 +39,197 @@ EWRAM_DATA s32 gFieldEffectArguments[8] = {0};
 // Static type declarations
 
 static void Task_PokecenterHeal(u8 taskId);
-static void PokecenterHealEffect_0(struct Task *);
-static void PokecenterHealEffect_1(struct Task *);
-static void PokecenterHealEffect_2(struct Task *);
-static void PokecenterHealEffect_3(struct Task *);
+static void PokecenterHealEffect_Init(struct Task *);
+static void PokecenterHealEffect_WaitForBallPlacement(struct Task *);
+static void PokecenterHealEffect_WaitForBallFlashing(struct Task *);
+static void PokecenterHealEffect_WaitForSoundAndEnd(struct Task *);
+static u8 CreatePokecenterMonitorSprite(s16, s16);
+static void SpriteCB_PokecenterMonitor(struct Sprite *);
 
 static void Task_HallOfFameRecord(u8 taskId);
-static void HallOfFameRecordEffect_0(struct Task *);
-static void HallOfFameRecordEffect_1(struct Task *);
-static void HallOfFameRecordEffect_2(struct Task *);
-static void HallOfFameRecordEffect_3(struct Task *);
-
-static u8 CreatePokeballGlowSprite(s16, s16, s16, u16);
+static void HallOfFameRecordEffect_Init(struct Task *);
+static void HallOfFameRecordEffect_WaitForBallPlacement(struct Task *);
+static void HallOfFameRecordEffect_WaitForBallFlashing(struct Task *);
+static void HallOfFameRecordEffect_WaitForSoundAndEnd(struct Task *);
+static void CreateHofMonitorSprite(s16, s16, s16, bool8);
+static void SpriteCB_HallOfFameMonitor(struct Sprite *);
+
+static u8 CreateGlowingPokeballsEffect(s16, s16, s16, bool16);
 static void SpriteCB_PokeballGlowEffect(struct Sprite *);
-static void PokeballGlowEffect_0(struct Sprite *);
-static void PokeballGlowEffect_1(struct Sprite *);
-static void PokeballGlowEffect_2(struct Sprite *);
-static void PokeballGlowEffect_3(struct Sprite *);
-static void PokeballGlowEffect_4(struct Sprite *);
-static void PokeballGlowEffect_5(struct Sprite *);
-static void PokeballGlowEffect_6(struct Sprite *);
-static void PokeballGlowEffect_7(struct Sprite *);
-
-static u8 PokecenterHealEffectHelper(s16, s16);
-static void HallOfFameRecordEffectHelper(s16, s16, s16, u8);
-
-static void FieldCallback_Fly(void);
-static void task00_8084310(u8);
-static void mapldr_08084390(void);
-static void c3_080843F8(u8);
+static void PokeballGlowEffect_PlaceBalls(struct Sprite *);
+static void PokeballGlowEffect_TryPlaySe(struct Sprite *);
+static void PokeballGlowEffect_Flash1(struct Sprite *);
+static void PokeballGlowEffect_Flash2(struct Sprite *);
+static void PokeballGlowEffect_WaitAfterFlash(struct Sprite *);
+static void PokeballGlowEffect_Dummy(struct Sprite *);
+static void PokeballGlowEffect_WaitForSound(struct Sprite *);
+static void PokeballGlowEffect_Idle(struct Sprite *);
+static void SpriteCB_PokeballGlow(struct Sprite *);
+
+static void FieldCallback_UseFly(void);
+static void Task_UseFly(u8);
+static void FieldCallback_FlyIntoMap(void);
+static void Task_FlyIntoMap(u8);
 
 static void Task_FallWarpFieldEffect(u8);
-static bool8 FallWarpEffect_1(struct Task *);
-static bool8 FallWarpEffect_2(struct Task *);
-static bool8 FallWarpEffect_3(struct Task *);
-static bool8 FallWarpEffect_4(struct Task *);
-static bool8 FallWarpEffect_5(struct Task *);
-static bool8 FallWarpEffect_6(struct Task *);
-static bool8 FallWarpEffect_7(struct Task *);
-
-static void Task_EscalatorWarpFieldEffect(u8);
-static bool8 EscalatorWarpEffect_1(struct Task *);
-static bool8 EscalatorWarpEffect_2(struct Task *);
-static bool8 EscalatorWarpEffect_3(struct Task *);
-static bool8 EscalatorWarpEffect_4(struct Task *);
-static bool8 EscalatorWarpEffect_5(struct Task *);
-static bool8 EscalatorWarpEffect_6(struct Task *);
-
-static void sub_80B6FB8(struct Task *);
-static void sub_80B7004(struct Task *);
-static void sub_80B7050(void);
-static void sub_80B7060(void);
-static void sub_80B70B4(void);
-static void sub_80B70DC(u8);
-
-static bool8 sub_80B7114(struct Task *);
-static bool8 sub_80B7190(struct Task *);
-static bool8 sub_80B71D0(struct Task *);
-static bool8 sub_80B7230(struct Task *);
-static bool8 sub_80B7270(struct Task *);
-static bool8 sub_80B72D0(struct Task *);
-static bool8 sub_80B72F4(struct Task *);
-
-static void sub_80B7384(u8);
-static bool8 sub_80B73D0(struct Task *, struct ObjectEvent *);
-static bool8 waterfall_1_do_anim_probably(struct Task *, struct ObjectEvent *);
-static bool8 waterfall_2_wait_anim_finish_probably(struct Task *, struct ObjectEvent *);
-static bool8 sub_80B7450(struct Task *, struct ObjectEvent *);
-static bool8 sub_80B7478(struct Task *, struct ObjectEvent *);
-
-static void Task_Dive(u8);
-static bool8 dive_1_lock(struct Task *);
-static bool8 dive_2_unknown(struct Task *);
-static bool8 dive_3_unknown(struct Task *);
+static bool8 FallWarpEffect_Init(struct Task *);
+static bool8 FallWarpEffect_WaitWeather(struct Task *);
+static bool8 FallWarpEffect_StartFall(struct Task *);
+static bool8 FallWarpEffect_Fall(struct Task *);
+static bool8 FallWarpEffect_Land(struct Task *);
+static bool8 FallWarpEffect_CameraShake(struct Task *);
+static bool8 FallWarpEffect_End(struct Task *);
+
+static void Task_EscalatorWarpOut(u8);
+static bool8 EscalatorWarpOut_Init(struct Task *);
+static bool8 EscalatorWarpOut_WaitForPlayer(struct Task *);
+static bool8 EscalatorWarpOut_Up_Ride(struct Task *);
+static bool8 EscalatorWarpOut_Up_End(struct Task *);
+static bool8 EscalatorWarpOut_Down_Ride(struct Task *);
+static bool8 EscalatorWarpOut_Down_End(struct Task *);
+static void RideUpEscalatorOut(struct Task *);
+static void RideDownEscalatorOut(struct Task *);
+static void FadeOutAtEndOfEscalator(void);
+static void WarpAtEndOfEscalator(void);
+
+static void FieldCallback_EscalatorWarpIn(void);
+static void Task_EscalatorWarpIn(u8);
+static bool8 EscalatorWarpIn_Init(struct Task *);
+static bool8 EscalatorWarpIn_Down_Init(struct Task *);
+static bool8 EscalatorWarpIn_Down_Ride(struct Task *);
+static bool8 EscalatorWarpIn_Up_Init(struct Task *);
+static bool8 EscalatorWarpIn_Up_Ride(struct Task *);
+static bool8 EscalatorWarpIn_WaitForMovement(struct Task *);
+static bool8 EscalatorWarpIn_End(struct Task *);
+
+static void Task_UseWaterfall(u8);
+static bool8 WaterfallFieldEffect_Init(struct Task *, struct ObjectEvent *);
+static bool8 WaterfallFieldEffect_ShowMon(struct Task *, struct ObjectEvent *);
+static bool8 WaterfallFieldEffect_WaitForShowMon(struct Task *, struct ObjectEvent *);
+static bool8 WaterfallFieldEffect_RideUp(struct Task *, struct ObjectEvent *);
+static bool8 WaterfallFieldEffect_ContinueRideOrEnd(struct Task *, struct ObjectEvent *);
+
+static void Task_UseDive(u8);
+static bool8 DiveFieldEffect_Init(struct Task *);
+static bool8 DiveFieldEffect_ShowMon(struct Task *);
+static bool8 DiveFieldEffect_TryWarp(struct Task *);
 
 static void Task_LavaridgeGymB1FWarp(u8);
-static bool8 LavaridgeGymB1FWarpEffect_1(struct Task *, struct ObjectEvent *, struct Sprite *);
-static bool8 LavaridgeGymB1FWarpEffect_2(struct Task *, struct ObjectEvent *, struct Sprite *);
-static bool8 LavaridgeGymB1FWarpEffect_3(struct Task *, struct ObjectEvent *, struct Sprite *);
-static bool8 LavaridgeGymB1FWarpEffect_4(struct Task *, struct ObjectEvent *, struct Sprite *);
-static bool8 LavaridgeGymB1FWarpEffect_5(struct Task *, struct ObjectEvent *, struct Sprite *);
-static bool8 LavaridgeGymB1FWarpEffect_6(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 LavaridgeGymB1FWarpEffect_Init(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 LavaridgeGymB1FWarpEffect_CameraShake(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 LavaridgeGymB1FWarpEffect_Launch(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 LavaridgeGymB1FWarpEffect_Rise(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 LavaridgeGymB1FWarpEffect_FadeOut(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 LavaridgeGymB1FWarpEffect_Warp(struct Task *, struct ObjectEvent *, struct Sprite *);
 
 static void FieldCB_LavaridgeGymB1FWarpExit(void);
 static void Task_LavaridgeGymB1FWarpExit(u8);
-static bool8 LavaridgeGymB1FWarpExitEffect_1(struct Task *, struct ObjectEvent *, struct Sprite *);
-static bool8 LavaridgeGymB1FWarpExitEffect_2(struct Task *, struct ObjectEvent *, struct Sprite *);
-static bool8 LavaridgeGymB1FWarpExitEffect_3(struct Task *, struct ObjectEvent *, struct Sprite *);
-static bool8 LavaridgeGymB1FWarpExitEffect_4(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 LavaridgeGymB1FWarpExitEffect_Init(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 LavaridgeGymB1FWarpExitEffect_StartPopOut(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 LavaridgeGymB1FWarpExitEffect_PopOut(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 LavaridgeGymB1FWarpExitEffect_End(struct Task *, struct ObjectEvent *, struct Sprite *);
 
 static void Task_LavaridgeGym1FWarp(u8);
-static bool8 LavaridgeGym1FWarpEffect_1(struct Task *, struct ObjectEvent *, struct Sprite *);
-static bool8 LavaridgeGym1FWarpEffect_2(struct Task *, struct ObjectEvent *, struct Sprite *);
-static bool8 LavaridgeGym1FWarpEffect_3(struct Task *, struct ObjectEvent *, struct Sprite *);
-static bool8 LavaridgeGym1FWarpEffect_4(struct Task *, struct ObjectEvent *, struct Sprite *);
-static bool8 LavaridgeGym1FWarpEffect_5(struct Task *, struct ObjectEvent *, struct Sprite *);
-
-static void DoEscapeRopeFieldEffect(u8);
-static void EscapeRopeFieldEffect_Step0(struct Task *);
-static void EscapeRopeFieldEffect_Step1(struct Task *);
-
-static void mapldr_080859D4(void);
-static void sub_80B7E94(u8);
-
-static void sub_80B7EC4(struct Task *);
-static void sub_80B7EE8(struct Task *);
-
-static void ExecuteTeleportFieldEffectTask(u8);
-static void TeleportFieldEffectTask1(struct Task*);
-static void TeleportFieldEffectTask2(struct Task*);
-static void TeleportFieldEffectTask3(struct Task*);
-static void TeleportFieldEffectTask4(struct Task*);
-
-static void mapldr_08085D88(void);
-static void sub_80B8250(u8);
-
-static void sub_80B8280(struct Task *);
-static void sub_80B830C(struct Task *);
-static void sub_80B8410(struct Task *);
-
-static void sub_80B8554(u8);
-static void sub_80B8584(struct Task *);
-static void sub_80B85F8(struct Task *);
-static void sub_80B8660(struct Task *);
-static void sub_80B86EC(struct Task *);
-static void sub_80B871C(struct Task *);
-static void sub_80B8770(struct Task *);
-static void overworld_bg_setup_2(struct Task *);
-
-static void sub_80B880C(void);
-static void sub_80B8874(u16);
-
-static void sub_80B88B4(u8);
-static void sub_80B88E4(struct Task *);
-static void sub_80B8920(struct Task *);
-static void sub_80B898C(struct Task *);
-static void sub_80B89DC(struct Task *);
-static void sub_80B8A0C(struct Task *);
-static void sub_80B8A44(struct Task *);
-static void sub_80B8A64(struct Task *);
-
-static void sub_80B8AE0(void);
-static void sub_80B8B28(struct Task *);
-static bool8 sub_80B8B38(struct Task *);
-static bool8 sub_80B8BF0(struct Task *);
-
-static u8 sub_80B8C60(u32, u32, u32);
-static void sub_80B8CC0(struct Sprite *);
-static void sub_80B8D04(struct Sprite *);
-static void sub_80B8D20(struct Sprite *);
-
-static void sub_80B8D84(u8);
-static void sub_80B8DB4(struct Task *);
-static void sub_80B8E14(struct Task *);
-static void sub_80B8E60(struct Task *);
-static void sub_80B8EA8(struct Task *);
-static void sub_80B8F24(struct Task *);
-
-static void sub_80B9128(struct Sprite *);
-
-static void sub_80B91D4(u8);
-static void sub_80B9204(struct Task *);
-static void sub_80B925C(struct Task *);
-static void sub_80B92A0(struct Task *);
-static void sub_80B92F8(struct Task *);
-static void sub_80B933C(struct Task *);
-static void sub_80B9390(struct Task *);
-static void sub_80B9418(struct Task *);
-static void sub_80B9474(struct Task *);
-static void sub_80B9494(struct Task *);
-
-static u8 sub_80B94C4(void);
-static u8 sub_80B9508(u8);
-static void sub_80B9524(u8);
-static void sub_80B9560(u8, u8);
-static void sub_80B957C(struct Sprite *);
-static void sub_80B963C(struct Sprite *);
-
-static void sub_80B97D4(u8);
-static void sub_80B9804(struct Task *);
-static void sub_80B98B8(struct Task *);
-static void sub_80B9924(struct Task *);
-static void sub_80B9978(struct Task *);
-static void sub_80B99F0(struct Task *);
-static void sub_80B9A28(struct Task *);
-static void sub_80B9A60(struct Task *);
-
-static void sub_80B9BE8(u8 taskId);
-static void sub_80B9DB8(struct Sprite* sprite);
-static void Fldeff_MoveDeoxysRock_Step(u8 taskId);
+static bool8 LavaridgeGym1FWarpEffect_Init(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 LavaridgeGym1FWarpEffect_AshPuff(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 LavaridgeGym1FWarpEffect_Disappear(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 LavaridgeGym1FWarpEffect_FadeOut(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 LavaridgeGym1FWarpEffect_Warp(struct Task *, struct ObjectEvent *, struct Sprite *);
+
+static void Task_EscapeRopeWarpOut(u8);
+static void EscapeRopeWarpOutEffect_Init(struct Task *);
+static void EscapeRopeWarpOutEffect_Spin(struct Task *);
+
+static void FieldCallback_EscapeRopeWarpIn(void);
+static void Task_EscapeRopeWarpIn(u8);
+static void EscapeRopeWarpInEffect_Init(struct Task *);
+static void EscapeRopeWarpInEffect_Spin(struct Task *);
+
+static void Task_TeleportWarpOut(u8);
+static void TeleportWarpOutFieldEffect_Init(struct Task*);
+static void TeleportWarpOutFieldEffect_SpinGround(struct Task*);
+static void TeleportWarpOutFieldEffect_SpinExit(struct Task*);
+static void TeleportWarpOutFieldEffect_End(struct Task*);
+
+static void FieldCallback_TeleportWarpIn(void);
+static void Task_TeleportWarpIn(u8);
+static void TeleportWarpInFieldEffect_Init(struct Task *);
+static void TeleportWarpInFieldEffect_SpinEnter(struct Task *);
+static void TeleportWarpInFieldEffect_SpinGround(struct Task *);
+
+static void Task_FieldMoveShowMonOutdoors(u8);
+static void FieldMoveShowMonOutdoorsEffect_Init(struct Task *);
+static void FieldMoveShowMonOutdoorsEffect_LoadGfx(struct Task *);
+static void FieldMoveShowMonOutdoorsEffect_CreateBanner(struct Task *);
+static void FieldMoveShowMonOutdoorsEffect_WaitForMon(struct Task *);
+static void FieldMoveShowMonOutdoorsEffect_ShrinkBanner(struct Task *);
+static void FieldMoveShowMonOutdoorsEffect_RestoreBg(struct Task *);
+static void FieldMoveShowMonOutdoorsEffect_End(struct Task *);
+static void VBlankCB_FieldMoveShowMonOutdoors(void);
+static void LoadFieldMoveOutdoorStreaksTilemap(u16);
+
+static void Task_FieldMoveShowMonIndoors(u8);
+static void FieldMoveShowMonIndoorsEffect_Init(struct Task *);
+static void FieldMoveShowMonIndoorsEffect_LoadGfx(struct Task *);
+static void FieldMoveShowMonIndoorsEffect_SlideBannerOn(struct Task *);
+static void FieldMoveShowMonIndoorsEffect_WaitForMon(struct Task *);
+static void FieldMoveShowMonIndoorsEffect_RestoreBg(struct Task *);
+static void FieldMoveShowMonIndoorsEffect_SlideBannerOff(struct Task *);
+static void FieldMoveShowMonIndoorsEffect_End(struct Task *);
+static void VBlankCB_FieldMoveShowMonIndoors(void);
+static void AnimateIndoorShowMonBg(struct Task *);
+static bool8 SlideIndoorBannerOnscreen(struct Task *);
+static bool8 SlideIndoorBannerOffscreen(struct Task *);
+
+static u8 InitFieldMoveMonSprite(u32, u32, u32);
+static void SpriteCB_FieldMoveMonSlideOnscreen(struct Sprite *);
+static void SpriteCB_FieldMoveMonWaitAfterCry(struct Sprite *);
+static void SpriteCB_FieldMoveMonSlideOffscreen(struct Sprite *);
+
+static void Task_SurfFieldEffect(u8);
+static void SurfFieldEffect_Init(struct Task *);
+static void SurfFieldEffect_FieldMovePose(struct Task *);
+static void SurfFieldEffect_ShowMon(struct Task *);
+static void SurfFieldEffect_JumpOnSurfBlob(struct Task *);
+static void SurfFieldEffect_End(struct Task *);
+
+static void SpriteCB_NPCFlyOut(struct Sprite *);
+
+static void Task_FlyOut(u8);
+static void FlyOutFieldEffect_FieldMovePose(struct Task *);
+static void FlyOutFieldEffect_ShowMon(struct Task *);
+static void FlyOutFieldEffect_BirdLeaveBall(struct Task *);
+static void FlyOutFieldEffect_WaitBirdLeave(struct Task *);
+static void FlyOutFieldEffect_BirdSwoopDown(struct Task *);
+static void FlyOutFieldEffect_JumpOnBird(struct Task *);
+static void FlyOutFieldEffect_FlyOffWithBird(struct Task *);
+static void FlyOutFieldEffect_WaitFlyOff(struct Task *);
+static void FlyOutFieldEffect_End(struct Task *);
+
+static u8 CreateFlyBirdSprite(void);
+static u8 GetFlyBirdAnimCompleted(u8);
+static void StartFlyBirdSwoopDown(u8);
+static void SetFlyBirdPlayerSpriteId(u8, u8);
+static void SpriteCB_FlyBirdLeaveBall(struct Sprite *);
+static void SpriteCB_FlyBirdSwoopDown(struct Sprite *);
+
+static void Task_FlyIn(u8);
+static void FlyInFieldEffect_BirdSwoopDown(struct Task *);
+static void FlyInFieldEffect_FlyInWithBird(struct Task *);
+static void FlyInFieldEffect_JumpOffBird(struct Task *);
+static void FlyInFieldEffect_FieldMovePose(struct Task *);
+static void FlyInFieldEffect_BirdReturnToBall(struct Task *);
+static void FlyInFieldEffect_WaitBirdReturn(struct Task *);
+static void FlyInFieldEffect_End(struct Task *);
+
+static void Task_DestroyDeoxysRock(u8 taskId);
+static void DestroyDeoxysRockEffect_CameraShake(s16*, u8);
+static void DestroyDeoxysRockEffect_RockFragments(s16*, u8);
+static void DestroyDeoxysRockEffect_WaitAndEnd(s16*, u8);
+static void CreateDeoxysRockFragments(struct Sprite*);
+static void SpriteCB_DeoxysRockFragment(struct Sprite* sprite);
+
+static void Task_MoveDeoxysRock(u8 taskId);
 
 // Static RAM declarations
 
@@ -240,34 +242,33 @@ extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
 extern u8 *gFieldEffectScriptPointers[];
 extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
 
-// .rodata
-const u32 gNewGameBirchPic[] = INCBIN_U32("graphics/birch_speech/birch.4bpp");
-const u32 gUnusedBirchBeauty[] = INCBIN_U32("graphics/unused/intro_birch_beauty.4bpp");
-const u16 gNewGameBirchPalette[16] = INCBIN_U16("graphics/birch_speech/birch.gbapal");
-const u32 gSpriteImage_855A970[] = INCBIN_U32("graphics/misc/pokeball_glow.4bpp");
-const u16 gFieldEffectObjectPalette4[16] = INCBIN_U16("graphics/field_effects/palettes/04.gbapal");
-const u32 gSpriteImage_855A9B0[] = INCBIN_U32("graphics/misc/pokecenter_monitor/0.4bpp");
-const u32 gSpriteImage_855AA70[] = INCBIN_U32("graphics/misc/pokecenter_monitor/1.4bpp");
-const u32 gSpriteImage_855AB30[] = INCBIN_U32("graphics/misc/big_hof_monitor.4bpp");
-const u8 gSpriteImage_855AD30[] = INCBIN_U8("graphics/misc/small_hof_monitor.4bpp");
-const u16 gFieldEffectObjectPalette5[16] = INCBIN_U16("graphics/field_effects/palettes/05.gbapal");
+static const u32 sNewGameBirch_Gfx[] = INCBIN_U32("graphics/birch_speech/birch.4bpp");
+static const u32 sUnusedBirchBeauty[] = INCBIN_U32("graphics/unused/intro_birch_beauty.4bpp");
+static const u16 sNewGameBirch_Pal[16] = INCBIN_U16("graphics/birch_speech/birch.gbapal");
+static const u32 sPokeballGlow_Gfx[] = INCBIN_U32("graphics/misc/pokeball_glow.4bpp");
+static const u16 sPokeballGlow_Pal[16] = INCBIN_U16("graphics/field_effects/palettes/pokeball_glow.gbapal");
+static const u32 sPokecenterMonitor0_Gfx[] = INCBIN_U32("graphics/misc/pokecenter_monitor/0.4bpp");
+static const u32 sPokecenterMonitor1_Gfx[] = INCBIN_U32("graphics/misc/pokecenter_monitor/1.4bpp");
+static const u32 sHofMonitorBig_Gfx[] = INCBIN_U32("graphics/misc/hof_monitor_big.4bpp");
+static const u8 sHofMonitorSmall_Gfx[] = INCBIN_U8("graphics/misc/hof_monitor_small.4bpp");
+static const u16 sHofMonitor_Pal[16] = INCBIN_U16("graphics/field_effects/palettes/hof_monitor.gbapal");
 
 // Graphics for the lights streaking past your Pokemon when it uses a field move.
-const u32 gFieldMoveStreaksTiles[] = INCBIN_U32("graphics/misc/field_move_streaks.4bpp");
-const u16 gFieldMoveStreaksPalette[16] = INCBIN_U16("graphics/misc/field_move_streaks.gbapal");
-const u16 gFieldMoveStreaksTilemap[] = INCBIN_U16("graphics/misc/field_move_streaks_map.bin");
-
-// The following light streaks effect is used when the map is dark (e.g. a cave).
-const u32 gDarknessFieldMoveStreaksTiles[] = INCBIN_U32("graphics/misc/darkness_field_move_streaks.4bpp");
-const u16 gDarknessFieldMoveStreaksPalette[16] = INCBIN_U16("graphics/misc/darkness_field_move_streaks.gbapal");
-const u16 gDarknessFieldMoveStreaksTilemap[] = INCBIN_U16("graphics/misc/darkness_field_move_streaks_map.bin");
-
-const u16 gUnknown_0855B610[16] = INCBIN_U16("graphics/misc/spotlight.gbapal");
-const u8 gUnknown_0855B630[] = INCBIN_U8("graphics/misc/spotlight.4bpp");
-const u8 gUnknown_0855C170[] = INCBIN_U8("graphics/unknown/unknown_55C170.4bpp");
-const u8 gUnknown_0855C190[] = INCBIN_U8("graphics/unknown/unknown_55C190.4bpp");
-const u8 gUnknown_0855C1B0[] = INCBIN_U8("graphics/unknown/unknown_55C1B0.4bpp");
-const u8 gUnknown_0855C1D0[] = INCBIN_U8("graphics/unknown/unknown_55C1D0.4bpp");
+static const u32 sFieldMoveStreaksOutdoors_Gfx[] = INCBIN_U32("graphics/misc/field_move_streaks.4bpp");
+static const u16 sFieldMoveStreaksOutdoors_Pal[16] = INCBIN_U16("graphics/misc/field_move_streaks.gbapal");
+static const u16 sFieldMoveStreaksOutdoors_Tilemap[320] = INCBIN_U16("graphics/misc/field_move_streaks_map.bin");
+
+// The following light streaks effect is used when the map is indoors
+static const u32 sFieldMoveStreaksIndoors_Gfx[] = INCBIN_U32("graphics/misc/darkness_field_move_streaks.4bpp");
+static const u16 sFieldMoveStreaksIndoors_Pal[16] = INCBIN_U16("graphics/misc/darkness_field_move_streaks.gbapal");
+static const u16 sFieldMoveStreaksIndoors_Tilemap[320] = INCBIN_U16("graphics/misc/darkness_field_move_streaks_map.bin");
+
+static const u16 sSpotlight_Pal[16] = INCBIN_U16("graphics/misc/spotlight.gbapal");
+static const u8 sSpotlight_Gfx[] = INCBIN_U8("graphics/misc/spotlight.4bpp");
+static const u8 sRockFragment_TopLeft[] = INCBIN_U8("graphics/misc/deoxys_rock_fragment_top_left.4bpp");
+static const u8 sRockFragment_TopRight[] = INCBIN_U8("graphics/misc/deoxys_rock_fragment_top_right.4bpp");
+static const u8 sRockFragment_BottomLeft[] = INCBIN_U8("graphics/misc/deoxys_rock_fragment_bottom_left.4bpp");
+static const u8 sRockFragment_BottomRight[] = INCBIN_U8("graphics/misc/deoxys_rock_fragment_bottom_right.4bpp");
 
 bool8 (*const gFieldEffectScriptFuncs[])(u8 **, u32 *) =
 {
@@ -281,7 +282,7 @@ bool8 (*const gFieldEffectScriptFuncs[])(u8 **, u32 *) =
     FieldEffectCmd_loadfadedpal_callnative,
 };
 
-const struct OamData gNewGameBirchOamAttributes =
+static const struct OamData sOam_64x64 =
 {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
@@ -295,7 +296,7 @@ const struct OamData gNewGameBirchOamAttributes =
     .paletteNum = 0,
 };
 
-const struct OamData gOamData_855C218 =
+static const struct OamData sOam_8x8 =
 {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
@@ -309,7 +310,7 @@ const struct OamData gOamData_855C218 =
     .paletteNum = 0,
 };
 
-const struct OamData gOamData_855C220 =
+static const struct OamData sOam_16x16 =
 {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
@@ -323,52 +324,52 @@ const struct OamData gOamData_855C220 =
     .paletteNum = 0,
 };
 
-const struct SpriteFrameImage gNewGameBirchPicTable[] =
+static const struct SpriteFrameImage sPicTable_NewGameBirch[] =
 {
-    obj_frame_tiles(gNewGameBirchPic)
+    obj_frame_tiles(sNewGameBirch_Gfx)
 };
 
-const struct SpritePalette gNewGameBirchObjectPaletteInfo =
+static const struct SpritePalette sSpritePalette_NewGameBirch =
 {
-    .data = gNewGameBirchPalette,
+    .data = sNewGameBirch_Pal,
     .tag = 0x1006
 };
 
-const union AnimCmd gNewGameBirchImageAnim[] =
+static const union AnimCmd sAnim_NewGameBirch[] =
 {
     ANIMCMD_FRAME(.imageValue = 0, .duration = 1),
     ANIMCMD_END
 };
 
-const union AnimCmd *const gNewGameBirchImageAnimTable[] =
+static const union AnimCmd *const sAnimTable_NewGameBirch[] =
 {
-    gNewGameBirchImageAnim
+    sAnim_NewGameBirch
 };
 
-const struct SpriteTemplate gNewGameBirchObjectTemplate =
+static const struct SpriteTemplate sSpriteTemplate_NewGameBirch =
 {
     .tileTag = 0xFFFF,
-    .paletteTag = 4102,
-    .oam = &gNewGameBirchOamAttributes,
-    .anims = gNewGameBirchImageAnimTable,
-    .images = gNewGameBirchPicTable,
+    .paletteTag = 0x1006,
+    .oam = &sOam_64x64,
+    .anims = sAnimTable_NewGameBirch,
+    .images = sPicTable_NewGameBirch,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
-const struct SpritePalette gFieldEffectObjectPaletteInfo4 =
+const struct SpritePalette gSpritePalette_PokeballGlow =
 {
-    .data = gFieldEffectObjectPalette4,
-    .tag = 0x1007
+    .data = sPokeballGlow_Pal,
+    .tag = FLDEFF_PAL_TAG_POKEBALL_GLOW
 };
 
-const struct SpritePalette gFieldEffectObjectPaletteInfo5 =
+const struct SpritePalette gSpritePalette_HofMonitor =
 {
-    .data = gFieldEffectObjectPalette5,
-    .tag = 0x1010
+    .data = sHofMonitor_Pal,
+    .tag = FLDEFF_PAL_TAG_HOF_MONITOR
 };
 
-const struct OamData gOamData_855C26C =
+static const struct OamData sOam_32x16 =
 {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
@@ -382,28 +383,28 @@ const struct OamData gOamData_855C26C =
     .paletteNum = 0,
 };
 
-const struct SpriteFrameImage gSpriteImageTable_855C274[] =
+static const struct SpriteFrameImage sPicTable_PokeballGlow[] =
 {
-    obj_frame_tiles(gSpriteImage_855A970)
+    obj_frame_tiles(sPokeballGlow_Gfx)
 };
 
-const struct SpriteFrameImage gSpriteImageTable_855C27C[] =
+static const struct SpriteFrameImage sPicTable_PokecenterMonitor[] =
 {
-    obj_frame_tiles(gSpriteImage_855A9B0),
-    obj_frame_tiles(gSpriteImage_855AA70)
+    obj_frame_tiles(sPokecenterMonitor0_Gfx),
+    obj_frame_tiles(sPokecenterMonitor1_Gfx)
 };
 
-const struct SpriteFrameImage gSpriteImageTable_855C28C[] =
+static const struct SpriteFrameImage sPicTable_HofMonitorBig[] =
 {
-    obj_frame_tiles(gSpriteImage_855AB30)
+    obj_frame_tiles(sHofMonitorBig_Gfx)
 };
 
-const struct SpriteFrameImage gSpriteImageTable_855C294[] =
+static const struct SpriteFrameImage sPicTable_HofMonitorSmall[] =
 {
-    {.data = gSpriteImage_855AD30, .size = 0x200} // the macro breaks down here
+    {.data = sHofMonitorSmall_Gfx, .size = 0x200} // the macro breaks down here
 };
 
-const struct Subsprite gSubspriteTable_855C29C[] =
+static const struct Subsprite sSubsprites_PokecenterMonitor[] =
 {
     {
         .x = -12, 
@@ -439,9 +440,9 @@ const struct Subsprite gSubspriteTable_855C29C[] =
     }
 };
 
-const struct SubspriteTable gUnknown_0855C2AC = subsprite_table(gSubspriteTable_855C29C);
+static const struct SubspriteTable sSubspriteTable_PokecenterMonitor = subsprite_table(sSubsprites_PokecenterMonitor);
 
-const struct Subsprite gSubspriteTable_855C2B4[] =
+static const struct Subsprite sSubsprites_HofMonitorBig[] =
 {
     {
         .x = -32, 
@@ -477,7 +478,7 @@ const struct Subsprite gSubspriteTable_855C2B4[] =
     }
 };
 
-const struct SubspriteTable gUnknown_0855C2C4 = subsprite_table(gSubspriteTable_855C2B4);
+static const struct SubspriteTable sSubspriteTable_HofMonitorBig = subsprite_table(sSubsprites_HofMonitorBig);
 
 const union AnimCmd gSpriteAnim_855C2CC[] =
 {
@@ -504,84 +505,84 @@ const union AnimCmd *const gSpriteAnimTable_855C2F8[] =
     gSpriteAnim_855C2D4
 };
 
-const union AnimCmd *const gSpriteAnimTable_855C300[] =
+static const union AnimCmd *const sAnimTable_HofMonitor[] =
 {
     gSpriteAnim_855C2CC
 };
 
-const struct SpriteTemplate gSpriteTemplate_855C304 =
+static const struct SpriteTemplate sSpriteTemplate_PokeballGlow =
 {
     .tileTag = 0xFFFF,
-    .paletteTag = 4103,
-    .oam = &gOamData_855C218,
+    .paletteTag = FLDEFF_PAL_TAG_POKEBALL_GLOW,
+    .oam = &sOam_8x8,
     .anims = gSpriteAnimTable_855C2F8,
-    .images = gSpriteImageTable_855C274,
+    .images = sPicTable_PokeballGlow,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCB_PokeballGlow
 };
 
-const struct SpriteTemplate gSpriteTemplate_855C31C =
+static const struct SpriteTemplate sSpriteTemplate_PokecenterMonitor =
 {
     .tileTag = 0xFFFF,
-    .paletteTag = 4100,
-    .oam = &gOamData_855C220,
+    .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
+    .oam = &sOam_16x16,
     .anims = gSpriteAnimTable_855C2F8,
-    .images = gSpriteImageTable_855C27C,
+    .images = sPicTable_PokecenterMonitor,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCB_PokecenterMonitor
 };
 
-const struct SpriteTemplate gSpriteTemplate_855C334 =
+static const struct SpriteTemplate sSpriteTemplate_HofMonitorBig =
 {
     .tileTag = 0xFFFF,
-    .paletteTag = 4112,
-    .oam = &gOamData_855C220,
-    .anims = gSpriteAnimTable_855C300,
-    .images = gSpriteImageTable_855C28C,
+    .paletteTag = FLDEFF_PAL_TAG_HOF_MONITOR,
+    .oam = &sOam_16x16,
+    .anims = sAnimTable_HofMonitor,
+    .images = sPicTable_HofMonitorBig,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCB_HallOfFameMonitor
 };
 
-const struct SpriteTemplate gSpriteTemplate_855C34C =
+static const struct SpriteTemplate sSpriteTemplate_HofMonitorSmall =
 {
     .tileTag = 0xFFFF,
-    .paletteTag = 4112,
-    .oam = &gOamData_855C26C,
-    .anims = gSpriteAnimTable_855C300,
-    .images = gSpriteImageTable_855C294,
+    .paletteTag = FLDEFF_PAL_TAG_HOF_MONITOR,
+    .oam = &sOam_32x16,
+    .anims = sAnimTable_HofMonitor,
+    .images = sPicTable_HofMonitorSmall,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCB_HallOfFameMonitor
 };
 
-void (*const gUnknown_0855C364[])(struct Task *) =
+void (*const sPokecenterHealEffectFuncs[])(struct Task *) =
 {
-    PokecenterHealEffect_0,
-    PokecenterHealEffect_1,
-    PokecenterHealEffect_2,
-    PokecenterHealEffect_3
+    PokecenterHealEffect_Init,
+    PokecenterHealEffect_WaitForBallPlacement,
+    PokecenterHealEffect_WaitForBallFlashing,
+    PokecenterHealEffect_WaitForSoundAndEnd
 };
 
-void (*const gUnknown_0855C374[])(struct Task *) =
+void (*const sHallOfFameRecordEffectFuncs[])(struct Task *) =
 {
-    HallOfFameRecordEffect_0,
-    HallOfFameRecordEffect_1,
-    HallOfFameRecordEffect_2,
-    HallOfFameRecordEffect_3
+    HallOfFameRecordEffect_Init,
+    HallOfFameRecordEffect_WaitForBallPlacement,
+    HallOfFameRecordEffect_WaitForBallFlashing,
+    HallOfFameRecordEffect_WaitForSoundAndEnd
 };
 
-void (*const gUnknown_0855C384[])(struct Sprite *) =
+void (*const sPokeballGlowEffectFuncs[])(struct Sprite *) =
 {
-    PokeballGlowEffect_0,
-    PokeballGlowEffect_1,
-    PokeballGlowEffect_2,
-    PokeballGlowEffect_3,
-    PokeballGlowEffect_4,
-    PokeballGlowEffect_5,
-    PokeballGlowEffect_6,
-    PokeballGlowEffect_7
+    PokeballGlowEffect_PlaceBalls,
+    PokeballGlowEffect_TryPlaySe,
+    PokeballGlowEffect_Flash1,
+    PokeballGlowEffect_Flash2,
+    PokeballGlowEffect_WaitAfterFlash,
+    PokeballGlowEffect_Dummy,
+    PokeballGlowEffect_WaitForSound,
+    PokeballGlowEffect_Idle
 };
 
-const struct Coords16 gUnknown_0855C3A4[] =
+static const struct Coords16 sPokeballCoordOffsets[PARTY_SIZE] =
 {
     {.x = 0, .y = 0},
     {.x = 6, .y = 0},
@@ -591,93 +592,91 @@ const struct Coords16 gUnknown_0855C3A4[] =
     {.x = 6, .y = 8}
 };
 
-const u8 gUnknown_0855C3BC[] = {16, 12, 8, 0};
-const u8 gUnknown_0855C3C0[] = {16, 12, 8, 0};
-const u8 gUnknown_0855C3C4[] = { 0,  0, 0, 0};
+static const u8 sPokeballGlowReds[]   = {16, 12, 8, 0};
+static const u8 sPokeballGlowGreens[] = {16, 12, 8, 0};
+static const u8 sPokeballGlowBlues[]  = { 0,  0, 0, 0};
 
 bool8 (*const sFallWarpFieldEffectFuncs[])(struct Task *) =
 {
-    FallWarpEffect_1,
-    FallWarpEffect_2,
-    FallWarpEffect_3,
-    FallWarpEffect_4,
-    FallWarpEffect_5,
-    FallWarpEffect_6,
-    FallWarpEffect_7,
+    FallWarpEffect_Init,
+    FallWarpEffect_WaitWeather,
+    FallWarpEffect_StartFall,
+    FallWarpEffect_Fall,
+    FallWarpEffect_Land,
+    FallWarpEffect_CameraShake,
+    FallWarpEffect_End,
 };
 
-bool8 (*const sEscalatorWarpFieldEffectFuncs[])(struct Task *) =
+bool8 (*const sEscalatorWarpOutFieldEffectFuncs[])(struct Task *) =
 {
-    EscalatorWarpEffect_1,
-    EscalatorWarpEffect_2,
-    EscalatorWarpEffect_3,
-    EscalatorWarpEffect_4,
-    EscalatorWarpEffect_5,
-    EscalatorWarpEffect_6,
+    EscalatorWarpOut_Init,
+    EscalatorWarpOut_WaitForPlayer,
+    EscalatorWarpOut_Up_Ride,
+    EscalatorWarpOut_Up_End,
+    EscalatorWarpOut_Down_Ride,
+    EscalatorWarpOut_Down_End,
 };
 
-bool8 (*const gUnknown_0855C3FC[])(struct Task *) =
+bool8 (*const sEscalatorWarpInFieldEffectFuncs[])(struct Task *) =
 {
-    sub_80B7114,
-    sub_80B7190,
-    sub_80B71D0,
-    sub_80B7230,
-    sub_80B7270,
-    sub_80B72D0,
-    sub_80B72F4,
+    EscalatorWarpIn_Init,
+    EscalatorWarpIn_Down_Init,
+    EscalatorWarpIn_Down_Ride,
+    EscalatorWarpIn_Up_Init,
+    EscalatorWarpIn_Up_Ride,
+    EscalatorWarpIn_WaitForMovement,
+    EscalatorWarpIn_End,
 };
 
-bool8 (*const gUnknown_0855C418[])(struct Task *, struct ObjectEvent *) =
+bool8 (*const sWaterfallFieldEffectFuncs[])(struct Task *, struct ObjectEvent *) =
 {
-    sub_80B73D0,
-    waterfall_1_do_anim_probably,
-    waterfall_2_wait_anim_finish_probably,
-    sub_80B7450,
-    sub_80B7478,
+    WaterfallFieldEffect_Init,
+    WaterfallFieldEffect_ShowMon,
+    WaterfallFieldEffect_WaitForShowMon,
+    WaterfallFieldEffect_RideUp,
+    WaterfallFieldEffect_ContinueRideOrEnd,
 };
 
-bool8 (*const gUnknown_0855C42C[])(struct Task *) =
+bool8 (*const sDiveFieldEffectFuncs[])(struct Task *) =
 {
-    dive_1_lock,
-    dive_2_unknown,
-    dive_3_unknown,
+    DiveFieldEffect_Init,
+    DiveFieldEffect_ShowMon,
+    DiveFieldEffect_TryWarp,
 };
 
 bool8 (*const sLavaridgeGymB1FWarpEffectFuncs[])(struct Task *, struct ObjectEvent *, struct Sprite *) =
 {
-    LavaridgeGymB1FWarpEffect_1,
-    LavaridgeGymB1FWarpEffect_2,
-    LavaridgeGymB1FWarpEffect_3,
-    LavaridgeGymB1FWarpEffect_4,
-    LavaridgeGymB1FWarpEffect_5,
-    LavaridgeGymB1FWarpEffect_6,
+    LavaridgeGymB1FWarpEffect_Init,
+    LavaridgeGymB1FWarpEffect_CameraShake,
+    LavaridgeGymB1FWarpEffect_Launch,
+    LavaridgeGymB1FWarpEffect_Rise,
+    LavaridgeGymB1FWarpEffect_FadeOut,
+    LavaridgeGymB1FWarpEffect_Warp,
 };
 
 bool8 (*const sLavaridgeGymB1FWarpExitEffectFuncs[])(struct Task *, struct ObjectEvent *, struct Sprite *) =
 {
-    LavaridgeGymB1FWarpExitEffect_1,
-    LavaridgeGymB1FWarpExitEffect_2,
-    LavaridgeGymB1FWarpExitEffect_3,
-    LavaridgeGymB1FWarpExitEffect_4,
+    LavaridgeGymB1FWarpExitEffect_Init,
+    LavaridgeGymB1FWarpExitEffect_StartPopOut,
+    LavaridgeGymB1FWarpExitEffect_PopOut,
+    LavaridgeGymB1FWarpExitEffect_End,
 };
 
 bool8 (*const sLavaridgeGym1FWarpEffectFuncs[])(struct Task *, struct ObjectEvent *, struct Sprite *) =
 {
-    LavaridgeGym1FWarpEffect_1,
-    LavaridgeGym1FWarpEffect_2,
-    LavaridgeGym1FWarpEffect_3,
-    LavaridgeGym1FWarpEffect_4,
-    LavaridgeGym1FWarpEffect_5,
+    LavaridgeGym1FWarpEffect_Init,
+    LavaridgeGym1FWarpEffect_AshPuff,
+    LavaridgeGym1FWarpEffect_Disappear,
+    LavaridgeGym1FWarpEffect_FadeOut,
+    LavaridgeGym1FWarpEffect_Warp,
 };
 
-void (*const gEscapeRopeFieldEffectFuncs[])(struct Task *) =
+void (*const sEscapeRopeWarpOutEffectFuncs[])(struct Task *) =
 {
-    EscapeRopeFieldEffect_Step0,
-    EscapeRopeFieldEffect_Step1,
+    EscapeRopeWarpOutEffect_Init,
+    EscapeRopeWarpOutEffect_Spin,
 };
 
-// .text
-
 u32 FieldEffectStart(u8 id)
 {
     u8 *script;
@@ -881,7 +880,7 @@ u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buf
     LoadCompressedSpriteSheetOverrideBuffer(&gTrainerFrontPicTable[trainerSpriteID], buffer);
     spriteTemplate.tileTag = gTrainerFrontPicTable[trainerSpriteID].tag;
     spriteTemplate.paletteTag = gTrainerFrontPicPaletteTable[trainerSpriteID].tag;
-    spriteTemplate.oam = &gNewGameBirchOamAttributes;
+    spriteTemplate.oam = &sOam_64x64;
     spriteTemplate.anims = gDummySpriteAnimTable;
     spriteTemplate.images = NULL;
     spriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
@@ -897,8 +896,8 @@ void LoadTrainerGfx_TrainerCard(u8 gender, u16 palOffset, u8 *dest)
 
 u8 AddNewGameBirchObject(s16 x, s16 y, u8 subpriority)
 {
-    LoadSpritePalette(&gNewGameBirchObjectPaletteInfo);
-    return CreateSprite(&gNewGameBirchObjectTemplate, x, y, subpriority);
+    LoadSpritePalette(&sSpritePalette_NewGameBirch);
+    return CreateSprite(&sSpriteTemplate_NewGameBirch, x, y, subpriority);
 }
 
 u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority)
@@ -911,10 +910,10 @@ u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority)
         return spriteId;
 }
 
-u8 CreateMonSprite_FieldMove(u16 species, u32 d, u32 g, s16 x, s16 y, u8 subpriority)
+u8 CreateMonSprite_FieldMove(u16 species, u32 otId, u32 personality, s16 x, s16 y, u8 subpriority)
 {
-    const struct CompressedSpritePalette *spritePalette = GetMonSpritePalStructFromOtIdPersonality(species, d, g);
-    u16 spriteId = CreateMonPicSprite_HandleDeoxys(species, d, g, 1, x, y, 0, spritePalette->tag);
+    const struct CompressedSpritePalette *spritePalette = GetMonSpritePalStructFromOtIdPersonality(species, otId, personality);
+    u16 spriteId = CreateMonPicSprite_HandleDeoxys(species, otId, personality, 1, x, y, 0, spritePalette->tag);
     PreservePaletteInWeather(IndexOfSpritePaletteTag(spritePalette->tag) + 0x10);
     if (spriteId == 0xFFFF)
         return MAX_SPRITES;
@@ -974,6 +973,28 @@ void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b)
     gPlttBufferFaded[i] = outPal;
 }
 
+// Task data for Task_PokecenterHeal and Task_HallOfFameRecord
+#define tState           data[0]
+#define tNumMons         data[1]
+#define tFirstBallX      data[2]
+#define tFirstBallY      data[3]
+#define tMonitorX        data[4]
+#define tMonitorY        data[5]
+#define tBallSpriteId    data[6]
+#define tMonitorSpriteId data[7]
+#define tStartHofFlash   data[15]
+
+// Sprite data for SpriteCB_PokeballGlowEffect
+#define sState      data[0]
+#define sTimer      data[1]
+#define sCounter    data[2]
+#define sPlayHealSe data[5]
+#define sNumMons    data[6]
+#define sSpriteId   data[7]
+
+// Sprite data for SpriteCB_PokeballGlow
+#define sEffectSpriteId data[0]
+
 bool8 FldEff_PokecenterHeal(void)
 {
     u8 nPokemon;
@@ -981,11 +1002,11 @@ bool8 FldEff_PokecenterHeal(void)
 
     nPokemon = CalculatePlayerPartyCount();
     task = &gTasks[CreateTask(Task_PokecenterHeal, 0xff)];
-    task->data[1] = nPokemon;
-    task->data[2] = 0x5d;
-    task->data[3] = 0x24;
-    task->data[4] = 0x7c;
-    task->data[5] = 0x18;
+    task->tNumMons = nPokemon;
+    task->tFirstBallX = 93;
+    task->tFirstBallY = 36;
+    task->tMonitorX = 124;
+    task->tMonitorY = 24;
     return FALSE;
 }
 
@@ -993,38 +1014,38 @@ static void Task_PokecenterHeal(u8 taskId)
 {
     struct Task *task;
     task = &gTasks[taskId];
-    gUnknown_0855C364[task->data[0]](task);
+    sPokecenterHealEffectFuncs[task->tState](task);
 }
 
-static void PokecenterHealEffect_0(struct Task *task)
+static void PokecenterHealEffect_Init(struct Task *task)
 {
-    task->data[0]++;
-    task->data[6] = CreatePokeballGlowSprite(task->data[1], task->data[2], task->data[3], 1);
-    task->data[7] = PokecenterHealEffectHelper(task->data[4], task->data[5]);
+    task->tState++;
+    task->tBallSpriteId = CreateGlowingPokeballsEffect(task->tNumMons, task->tFirstBallX, task->tFirstBallY, TRUE);
+    task->tMonitorSpriteId = CreatePokecenterMonitorSprite(task->tMonitorX, task->tMonitorY);
 }
 
-static void PokecenterHealEffect_1(struct Task *task)
+static void PokecenterHealEffect_WaitForBallPlacement(struct Task *task)
 {
-    if (gSprites[task->data[6]].data[0] > 1)
+    if (gSprites[task->tBallSpriteId].sState > 1)
     {
-        gSprites[task->data[7]].data[0]++;
-        task->data[0]++;
+        gSprites[task->tMonitorSpriteId].sState++;
+        task->tState++;
     }
 }
 
-static void PokecenterHealEffect_2(struct Task *task)
+static void PokecenterHealEffect_WaitForBallFlashing(struct Task *task)
 {
-    if (gSprites[task->data[6]].data[0] > 4)
+    if (gSprites[task->tBallSpriteId].sState > 4)
     {
-        task->data[0]++;
+        task->tState++;
     }
 }
 
-static void PokecenterHealEffect_3(struct Task *task)
+static void PokecenterHealEffect_WaitForSoundAndEnd(struct Task *task)
 {
-    if (gSprites[task->data[6]].data[0] > 6)
+    if (gSprites[task->tBallSpriteId].sState > 6)
     {
-        DestroySprite(&gSprites[task->data[6]]);
+        DestroySprite(&gSprites[task->tBallSpriteId]);
         FieldEffectActiveListRemove(FLDEFF_POKECENTER_HEAL);
         DestroyTask(FindTaskIdByFunc(Task_PokecenterHeal));
     }
@@ -1037,9 +1058,9 @@ bool8 FldEff_HallOfFameRecord(void)
 
     nPokemon = CalculatePlayerPartyCount();
     task = &gTasks[CreateTask(Task_HallOfFameRecord, 0xff)];
-    task->data[1] = nPokemon;
-    task->data[2] = 0x75;
-    task->data[3] = 0x34;
+    task->tNumMons = nPokemon;
+    task->tFirstBallX = 117;
+    task->tFirstBallY = 52;
     return FALSE;
 }
 
@@ -1047,51 +1068,50 @@ static void Task_HallOfFameRecord(u8 taskId)
 {
     struct Task *task;
     task = &gTasks[taskId];
-    gUnknown_0855C374[task->data[0]](task);
+    sHallOfFameRecordEffectFuncs[task->tState](task);
 }
 
-static void HallOfFameRecordEffect_0(struct Task *task)
+static void HallOfFameRecordEffect_Init(struct Task *task)
 {
     u8 taskId;
-    task->data[0]++;
-    task->data[6] = CreatePokeballGlowSprite(task->data[1], task->data[2], task->data[3], 0);
+    task->tState++;
+    task->tBallSpriteId = CreateGlowingPokeballsEffect(task->tNumMons, task->tFirstBallX, task->tFirstBallY, FALSE);
     taskId = FindTaskIdByFunc(Task_HallOfFameRecord);
-    HallOfFameRecordEffectHelper(taskId, 0x78, 0x18, 0);
-    HallOfFameRecordEffectHelper(taskId, 0x28, 0x08, 1);
-    HallOfFameRecordEffectHelper(taskId, 0x48, 0x08, 1);
-    HallOfFameRecordEffectHelper(taskId, 0xa8, 0x08, 1);
-    HallOfFameRecordEffectHelper(taskId, 0xc8, 0x08, 1);
+    CreateHofMonitorSprite(taskId, 120, 24, FALSE);
+    CreateHofMonitorSprite(taskId, 40, 8, TRUE);
+    CreateHofMonitorSprite(taskId, 72, 8, TRUE);
+    CreateHofMonitorSprite(taskId, 168, 8, TRUE);
+    CreateHofMonitorSprite(taskId, 200, 8, TRUE);
 }
 
-static void HallOfFameRecordEffect_1(struct Task *task)
+static void HallOfFameRecordEffect_WaitForBallPlacement(struct Task *task)
 {
-    if (gSprites[task->data[6]].data[0] > 1)
+    if (gSprites[task->tBallSpriteId].sState > 1)
     {
-        task->data[15]++; // was this ever initialized? is this ever used?
-        task->data[0]++;
+        task->tStartHofFlash++;
+        task->tState++;
     }
 }
 
-static void HallOfFameRecordEffect_2(struct Task *task)
+static void HallOfFameRecordEffect_WaitForBallFlashing(struct Task *task)
 {
-    if (gSprites[task->data[6]].data[0] > 4)
+    if (gSprites[task->tBallSpriteId].sState > 4)
     {
-        task->data[0]++;
+        task->tState++;
     }
 }
 
-static void HallOfFameRecordEffect_3(struct Task *task)
+static void HallOfFameRecordEffect_WaitForSoundAndEnd(struct Task *task)
 {
-    if (gSprites[task->data[6]].data[0] > 6)
+    if (gSprites[task->tBallSpriteId].sState > 6)
     {
-        DestroySprite(&gSprites[task->data[6]]);
+        DestroySprite(&gSprites[task->tBallSpriteId]);
         FieldEffectActiveListRemove(FLDEFF_HALL_OF_FAME_RECORD);
         DestroyTask(FindTaskIdByFunc(Task_HallOfFameRecord));
     }
 }
 
-
-static u8 CreatePokeballGlowSprite(s16 data6, s16 x, s16 y, u16 data5)
+static u8 CreateGlowingPokeballsEffect(s16 numMons, s16 x, s16 y, bool16 playHealSe)
 {
     u8 spriteId;
     struct Sprite *sprite;
@@ -1099,150 +1119,150 @@ static u8 CreatePokeballGlowSprite(s16 data6, s16 x, s16 y, u16 data5)
     sprite = &gSprites[spriteId];
     sprite->pos2.x = x;
     sprite->pos2.y = y;
-    sprite->data[5] = data5;
-    sprite->data[6] = data6;
-    sprite->data[7] = spriteId;
+    sprite->sPlayHealSe = playHealSe;
+    sprite->sNumMons = numMons;
+    sprite->sSpriteId = spriteId;
     return spriteId;
 }
 
 static void SpriteCB_PokeballGlowEffect(struct Sprite *sprite)
 {
-    gUnknown_0855C384[sprite->data[0]](sprite);
+    sPokeballGlowEffectFuncs[sprite->sState](sprite);
 }
 
-static void PokeballGlowEffect_0(struct Sprite *sprite)
+static void PokeballGlowEffect_PlaceBalls(struct Sprite *sprite)
 {
-    u8 endSpriteId;
-    if (sprite->data[1] == 0 || (--sprite->data[1]) == 0)
-    {
-        sprite->data[1] = 25;
-        endSpriteId = CreateSpriteAtEnd(&gSpriteTemplate_855C304, gUnknown_0855C3A4[sprite->data[2]].x + sprite->pos2.x, gUnknown_0855C3A4[sprite->data[2]].y + sprite->pos2.y, 0);
-        gSprites[endSpriteId].oam.priority = 2;
-        gSprites[endSpriteId].data[0] = sprite->data[7];
-        sprite->data[2]++;
-        sprite->data[6]--;
+    u8 spriteId;
+    if (sprite->sTimer == 0 || (--sprite->sTimer) == 0)
+    {
+        sprite->sTimer = 25;
+        spriteId = CreateSpriteAtEnd(&sSpriteTemplate_PokeballGlow, sPokeballCoordOffsets[sprite->sCounter].x + sprite->pos2.x, sPokeballCoordOffsets[sprite->sCounter].y + sprite->pos2.y, 0);
+        gSprites[spriteId].oam.priority = 2;
+        gSprites[spriteId].sEffectSpriteId = sprite->sSpriteId;
+        sprite->sCounter++;
+        sprite->sNumMons--;
         PlaySE(SE_BOWA);
     }
-    if (sprite->data[6] == 0)
+    if (sprite->sNumMons == 0)
     {
-        sprite->data[1] = 32;
-        sprite->data[0]++;
+        sprite->sTimer = 32;
+        sprite->sState++;
     }
 }
 
-static void PokeballGlowEffect_1(struct Sprite *sprite)
+static void PokeballGlowEffect_TryPlaySe(struct Sprite *sprite)
 {
-    if ((--sprite->data[1]) == 0)
+    if ((--sprite->sTimer) == 0)
     {
-        sprite->data[0]++;
-        sprite->data[1] = 8;
-        sprite->data[2] = 0;
+        sprite->sState++;
+        sprite->sTimer = 8;
+        sprite->sCounter = 0;
         sprite->data[3] = 0;
-        if (sprite->data[5])
+        if (sprite->sPlayHealSe)
         {
             PlayFanfare(MUS_ME_ASA);
         }
     }
 }
 
-static void PokeballGlowEffect_2(struct Sprite *sprite)
+static void PokeballGlowEffect_Flash1(struct Sprite *sprite)
 {
     u8 phase;
-    if ((--sprite->data[1]) == 0)
+    if ((--sprite->sTimer) == 0)
     {
-        sprite->data[1] = 8;
-        sprite->data[2]++;
-        sprite->data[2] &= 3;
-        if (sprite->data[2] == 0)
-        {
+        sprite->sTimer = 8;
+        sprite->sCounter++;
+        sprite->sCounter &= 3;
+
+        if (sprite->sCounter == 0)
             sprite->data[3]++;
-        }
     }
-    phase = (sprite->data[2] + 3) & 3;
-    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x108, gUnknown_0855C3BC[phase], gUnknown_0855C3C0[phase], gUnknown_0855C3C4[phase]);
-    phase = (sprite->data[2] + 2) & 3;
-    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x106, gUnknown_0855C3BC[phase], gUnknown_0855C3C0[phase], gUnknown_0855C3C4[phase]);
-    phase = (sprite->data[2] + 1) & 3;
-    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x102, gUnknown_0855C3BC[phase], gUnknown_0855C3C0[phase], gUnknown_0855C3C4[phase]);
-    phase = sprite->data[2];
-    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x105, gUnknown_0855C3BC[phase], gUnknown_0855C3C0[phase], gUnknown_0855C3C4[phase]);
-    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x103, gUnknown_0855C3BC[phase], gUnknown_0855C3C0[phase], gUnknown_0855C3C4[phase]);
+    phase = (sprite->sCounter + 3) & 3;
+    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW) << 4) + 0x108, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]);
+    phase = (sprite->sCounter + 2) & 3;
+    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW) << 4) + 0x106, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]);
+    phase = (sprite->sCounter + 1) & 3;
+    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW) << 4) + 0x102, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]);
+    phase = sprite->sCounter;
+    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW) << 4) + 0x105, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]);
+    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW) << 4) + 0x103, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]);
     if (sprite->data[3] > 2)
     {
-        sprite->data[0]++;
-        sprite->data[1] = 8;
-        sprite->data[2] = 0;
+        sprite->sState++;
+        sprite->sTimer = 8;
+        sprite->sCounter = 0;
     }
 }
 
-static void PokeballGlowEffect_3(struct Sprite *sprite)
+static void PokeballGlowEffect_Flash2(struct Sprite *sprite)
 {
     u8 phase;
-    if ((--sprite->data[1]) == 0)
+    if ((--sprite->sTimer) == 0)
     {
-        sprite->data[1] = 8;
-        sprite->data[2]++;
-        sprite->data[2] &= 3;
-        if (sprite->data[2] == 3)
+        sprite->sTimer = 8;
+        sprite->sCounter++;
+        sprite->sCounter &= 3;
+        if (sprite->sCounter == 3)
         {
-            sprite->data[0]++;
-            sprite->data[1] = 30;
+            sprite->sState++;
+            sprite->sTimer = 30;
         }
     }
-    phase = sprite->data[2];
-    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x108, gUnknown_0855C3BC[phase], gUnknown_0855C3C0[phase], gUnknown_0855C3C4[phase]);
-    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x106, gUnknown_0855C3BC[phase], gUnknown_0855C3C0[phase], gUnknown_0855C3C4[phase]);
-    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x102, gUnknown_0855C3BC[phase], gUnknown_0855C3C0[phase], gUnknown_0855C3C4[phase]);
-    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x105, gUnknown_0855C3BC[phase], gUnknown_0855C3C0[phase], gUnknown_0855C3C4[phase]);
-    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x103, gUnknown_0855C3BC[phase], gUnknown_0855C3C0[phase], gUnknown_0855C3C4[phase]);
+    phase = sprite->sCounter;
+    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW) << 4) + 0x108, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]);
+    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW) << 4) + 0x106, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]);
+    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW) << 4) + 0x102, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]);
+    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW) << 4) + 0x105, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]);
+    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(FLDEFF_PAL_TAG_POKEBALL_GLOW) << 4) + 0x103, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]);
 }
 
-static void PokeballGlowEffect_4(struct Sprite *sprite)
+static void PokeballGlowEffect_WaitAfterFlash(struct Sprite *sprite)
 {
-    if ((--sprite->data[1]) == 0)
+    if ((--sprite->sTimer) == 0)
     {
-        sprite->data[0]++;
+        sprite->sState++;
     }
 }
 
-static void PokeballGlowEffect_5(struct Sprite *sprite)
+static void PokeballGlowEffect_Dummy(struct Sprite *sprite)
 {
-    sprite->data[0]++;
+    sprite->sState++;
 }
 
-static void PokeballGlowEffect_6(struct Sprite *sprite)
+static void PokeballGlowEffect_WaitForSound(struct Sprite *sprite)
 {
-    if (sprite->data[5] == 0 || IsFanfareTaskInactive())
+    if (sprite->sPlayHealSe == FALSE || IsFanfareTaskInactive())
     {
-        sprite->data[0]++;
+        sprite->sState++;
     }
 }
 
-static void PokeballGlowEffect_7(struct Sprite *sprite)
+static void PokeballGlowEffect_Idle(struct Sprite *sprite)
 {
+    // Idle until destroyed
 }
 
-void SpriteCB_PokeballGlow(struct Sprite *sprite)
+static void SpriteCB_PokeballGlow(struct Sprite *sprite)
 {
-    if (gSprites[sprite->data[0]].data[0] > 4)
+    if (gSprites[sprite->sEffectSpriteId].sState > 4)
     {
         FieldEffectFreeGraphicsResources(sprite);
     }
 }
 
-static u8 PokecenterHealEffectHelper(s16 x, s16 y)
+static u8 CreatePokecenterMonitorSprite(s16 x, s16 y)
 {
-    u8 spriteIdAtEnd;
+    u8 spriteId;
     struct Sprite *sprite;
-    spriteIdAtEnd = CreateSpriteAtEnd(&gSpriteTemplate_855C31C, x, y, 0);
-    sprite = &gSprites[spriteIdAtEnd];
+    spriteId = CreateSpriteAtEnd(&sSpriteTemplate_PokecenterMonitor, x, y, 0);
+    sprite = &gSprites[spriteId];
     sprite->oam.priority = 2;
     sprite->invisible = TRUE;
-    SetSubspriteTables(sprite, &gUnknown_0855C2AC);
-    return spriteIdAtEnd;
+    SetSubspriteTables(sprite, &sSubspriteTable_PokecenterMonitor);
+    return spriteId;
 }
 
-void SpriteCB_PokecenterMonitor(struct Sprite *sprite)
+static void SpriteCB_PokecenterMonitor(struct Sprite *sprite)
 {
     if (sprite->data[0] != 0)
     {
@@ -1256,24 +1276,24 @@ void SpriteCB_PokecenterMonitor(struct Sprite *sprite)
     }
 }
 
-static void HallOfFameRecordEffectHelper(s16 a0, s16 a1, s16 a2, u8 a3)
+static void CreateHofMonitorSprite(s16 taskId, s16 x, s16 y, bool8 isSmallMonitor)
 {
-    u8 spriteIdAtEnd;
-    if (!a3)
+    u8 spriteId;
+    if (!isSmallMonitor)
     {
-        spriteIdAtEnd = CreateSpriteAtEnd(&gSpriteTemplate_855C334, a1, a2, 0);
-        SetSubspriteTables(&gSprites[spriteIdAtEnd], &gUnknown_0855C2C4);
+        spriteId = CreateSpriteAtEnd(&sSpriteTemplate_HofMonitorBig, x, y, 0);
+        SetSubspriteTables(&gSprites[spriteId], &sSubspriteTable_HofMonitorBig);
     } else
     {
-        spriteIdAtEnd = CreateSpriteAtEnd(&gSpriteTemplate_855C34C, a1, a2, 0);
+        spriteId = CreateSpriteAtEnd(&sSpriteTemplate_HofMonitorSmall, x, y, 0);
     }
-    gSprites[spriteIdAtEnd].invisible = TRUE;
-    gSprites[spriteIdAtEnd].data[0] = a0;
+    gSprites[spriteId].invisible = TRUE;
+    gSprites[spriteId].data[0] = taskId;
 }
 
-void SpriteCB_HallOfFameMonitor(struct Sprite *sprite)
+static void SpriteCB_HallOfFameMonitor(struct Sprite *sprite)
 {
-    if (gTasks[sprite->data[0]].data[15])
+    if (gTasks[sprite->data[0]].tStartHofFlash)
     {
         if (sprite->data[1] == 0 || (--sprite->data[1]) == 0)
         {
@@ -1288,37 +1308,51 @@ void SpriteCB_HallOfFameMonitor(struct Sprite *sprite)
     }
 }
 
+#undef tState
+#undef tNumMons
+#undef tFirstBallX
+#undef tFirstBallY
+#undef tMonitorX
+#undef tMonitorY
+#undef tBallSpriteId
+#undef tMonitorSpriteId
+#undef tStartHofFlash
+#undef sState
+#undef sTimer
+#undef sCounter
+#undef sPlayHealSe
+#undef sNumMons
+#undef sSpriteId
+#undef sEffectSpriteId
 
 void ReturnToFieldFromFlyMapSelect(void)
 {
     SetMainCallback2(CB2_ReturnToField);
-    gFieldCallback = FieldCallback_Fly;
+    gFieldCallback = FieldCallback_UseFly;
 }
 
-static void FieldCallback_Fly(void)
+static void FieldCallback_UseFly(void)
 {
     FadeInFromBlack();
-    CreateTask(task00_8084310, 0);
+    CreateTask(Task_UseFly, 0);
     ScriptContext2_Enable();
     FreezeObjectEvents();
     gFieldCallback = NULL;
 }
 
-static void task00_8084310(u8 taskId)
+static void Task_UseFly(u8 taskId)
 {
     struct Task *task;
     task = &gTasks[taskId];
     if (!task->data[0])
     {
         if (!IsWeatherNotFadingIn())
-        {
             return;
-        }
+
         gFieldEffectArguments[0] = GetCursorSelectionMonId();
-        if ((int)gFieldEffectArguments[0] > 5)
-        {
+        if ((int)gFieldEffectArguments[0] > PARTY_SIZE - 1)
             gFieldEffectArguments[0] = 0;
-        }
+
         FieldEffectStart(FLDEFF_USE_FLY);
         task->data[0]++;
     }
@@ -1327,18 +1361,18 @@ static void task00_8084310(u8 taskId)
         Overworld_ResetStateAfterFly();
         WarpIntoMap();
         SetMainCallback2(CB2_LoadMap);
-        gFieldCallback = mapldr_08084390;
+        gFieldCallback = FieldCallback_FlyIntoMap;
         DestroyTask(taskId);
     }
 }
 
-static void mapldr_08084390(void)
+static void FieldCallback_FlyIntoMap(void)
 {
     Overworld_PlaySpecialMapMusic();
     FadeInFromBlack();
-    CreateTask(c3_080843F8, 0);
+    CreateTask(Task_FlyIntoMap, 0);
     gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE;
-    if (gPlayerAvatar.flags & 0x08)
+    if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
     {
         ObjectEventTurn(&gObjectEvents[gPlayerAvatar.objectEventId], DIR_WEST);
     }
@@ -1347,7 +1381,7 @@ static void mapldr_08084390(void)
     gFieldCallback = NULL;
 }
 
-static void c3_080843F8(u8 taskId)
+static void Task_FlyIntoMap(u8 taskId)
 {
     struct Task *task;
     task = &gTasks[taskId];
@@ -1368,6 +1402,15 @@ static void c3_080843F8(u8 taskId)
     }
 }
 
+#define tState      data[0]
+#define tFallOffset data[1]
+#define tTotalFall  data[2]
+#define tSetTrigger data[3]
+#define tSubsprMode data[4]
+
+#define tVertShake  data[1] // re-used
+#define tNumShakes  data[2]
+
 void FieldCB_FallWarpExit(void)
 {
     Overworld_PlaySpecialMapMusic();
@@ -1382,10 +1425,10 @@ static void Task_FallWarpFieldEffect(u8 taskId)
 {
     struct Task *task;
     task = &gTasks[taskId];
-    while (sFallWarpFieldEffectFuncs[task->data[0]](task)); // return code signifies whether to continue blocking here
+    while (sFallWarpFieldEffectFuncs[task->tState](task));
 }
 
-static bool8 FallWarpEffect_1(struct Task *task)
+static bool8 FallWarpEffect_Init(struct Task *task)
 {
     struct ObjectEvent *playerObject;
     struct Sprite *playerSprite;
@@ -1395,59 +1438,57 @@ static bool8 FallWarpEffect_1(struct Task *task)
     gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE;
     gPlayerAvatar.preventStep = TRUE;
     ObjectEventSetHeldMovement(playerObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection()));
-    task->data[4] = playerSprite->subspriteMode;
+    task->tSubsprMode = playerSprite->subspriteMode;
     playerObject->fixedPriority = 1;
     playerSprite->oam.priority = 1;
     playerSprite->subspriteMode = SUBSPRITES_IGNORE_PRIORITY;
-    task->data[0]++;
+    task->tState++;
     return TRUE;
 }
 
-static bool8 FallWarpEffect_2(struct Task *task)
+static bool8 FallWarpEffect_WaitWeather(struct Task *task)
 {
     if (IsWeatherNotFadingIn())
-    {
-        task->data[0]++;
-    }
+        task->tState++;
+
     return FALSE;
 }
 
-static bool8 FallWarpEffect_3(struct Task *task)
+static bool8 FallWarpEffect_StartFall(struct Task *task)
 {
     struct Sprite *sprite;
     s16 centerToCornerVecY;
     sprite = &gSprites[gPlayerAvatar.spriteId];
     centerToCornerVecY = -(sprite->centerToCornerVecY << 1);
     sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY);
-    task->data[1] = 1;
-    task->data[2] = 0;
+    task->tFallOffset = 1;
+    task->tTotalFall = 0;
     gObjectEvents[gPlayerAvatar.objectEventId].invisible = FALSE;
     PlaySE(SE_RU_HYUU);
-    task->data[0]++;
+    task->tState++;
     return FALSE;
 }
 
-static bool8 FallWarpEffect_4(struct Task *task)
+static bool8 FallWarpEffect_Fall(struct Task *task)
 {
     struct ObjectEvent *objectEvent;
     struct Sprite *sprite;
 
     objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
     sprite = &gSprites[gPlayerAvatar.spriteId];
-    sprite->pos2.y += task->data[1];
-    if (task->data[1] < 8)
+    sprite->pos2.y += task->tFallOffset;
+    if (task->tFallOffset < 8)
     {
-        task->data[2] += task->data[1];
-        if (task->data[2] & 0xf)
-        {
-            task->data[1] <<= 1;
-        }
+        task->tTotalFall += task->tFallOffset;
+
+        if (task->tTotalFall & 0xf)
+            task->tFallOffset <<= 1;
     }
-    if (task->data[3] == 0 && sprite->pos2.y >= -16)
+    if (task->tSetTrigger == FALSE && sprite->pos2.y >= -16)
     {
-        task->data[3]++;
+        task->tSetTrigger++;
         objectEvent->fixedPriority = 0;
-        sprite->subspriteMode = task->data[4];
+        sprite->subspriteMode = task->tSubsprMode;
         objectEvent->triggerGroundEffectsOnMove = 1;
     }
     if (sprite->pos2.y >= 0)
@@ -1456,37 +1497,36 @@ static bool8 FallWarpEffect_4(struct Task *task)
         objectEvent->triggerGroundEffectsOnStop = 1;
         objectEvent->landingJump = 1;
         sprite->pos2.y = 0;
-        task->data[0]++;
+        task->tState++;
     }
     return FALSE;
 }
 
-static bool8 FallWarpEffect_5(struct Task *task)
+static bool8 FallWarpEffect_Land(struct Task *task)
 {
-    task->data[0]++;
-    task->data[1] = 4;
-    task->data[2] = 0;
+    task->tState++;
+    task->tVertShake = 4;
+    task->tNumShakes = 0;
     SetCameraPanningCallback(NULL);
     return TRUE;
 }
 
-static bool8 FallWarpEffect_6(struct Task *task)
+static bool8 FallWarpEffect_CameraShake(struct Task *task)
 {
-    SetCameraPanning(0, task->data[1]);
-    task->data[1] = -task->data[1];
-    task->data[2]++;
-    if ((task->data[2] & 3) == 0)
-    {
-        task->data[1] >>= 1;
-    }
-    if (task->data[1] == 0)
-    {
-        task->data[0]++;
-    }
+    SetCameraPanning(0, task->tVertShake);
+    task->tVertShake = -task->tVertShake;
+    task->tNumShakes++;
+
+    if ((task->tNumShakes & 3) == 0)
+        task->tVertShake >>= 1;
+
+    if (task->tVertShake == 0)
+        task->tState++;
+
     return FALSE;
 }
 
-static bool8 FallWarpEffect_7(struct Task *task)
+static bool8 FallWarpEffect_End(struct Task *task)
 {
     gPlayerAvatar.preventStep = FALSE;
     ScriptContext2_Disable();
@@ -1497,89 +1537,100 @@ static bool8 FallWarpEffect_7(struct Task *task)
     return FALSE;
 }
 
+#undef tState
+#undef tFallOffset
+#undef tTotalFall
+#undef tSetTrigger
+#undef tSubsprMode
+#undef tVertShake
+#undef tNumShakes
+
+#define tState   data[0]
+#define tGoingUp data[1]
+
 void StartEscalatorWarp(u8 metatileBehavior, u8 priority)
 {
     u8 taskId;
-    taskId = CreateTask(Task_EscalatorWarpFieldEffect, priority);
-    gTasks[taskId].data[1] = 0;
+    taskId = CreateTask(Task_EscalatorWarpOut, priority);
+    gTasks[taskId].tGoingUp = FALSE;
     if (metatileBehavior == MB_UP_ESCALATOR)
     {
-        gTasks[taskId].data[1] = 1;
+        gTasks[taskId].tGoingUp = TRUE;
     }
 }
 
-static void Task_EscalatorWarpFieldEffect(u8 taskId)
+static void Task_EscalatorWarpOut(u8 taskId)
 {
     struct Task *task;
     task = &gTasks[taskId];
-    while (sEscalatorWarpFieldEffectFuncs[task->data[0]](task));
+    while (sEscalatorWarpOutFieldEffectFuncs[task->tState](task));
 }
 
-static bool8 EscalatorWarpEffect_1(struct Task *task)
+static bool8 EscalatorWarpOut_Init(struct Task *task)
 {
     FreezeObjectEvents();
     CameraObjectReset2();
-    sub_80E1558(task->data[1]);
-    task->data[0]++;
+    StartEscalator(task->tGoingUp);
+    task->tState++;
     return FALSE;
 }
 
-static bool8 EscalatorWarpEffect_2(struct Task *task)
+static bool8 EscalatorWarpOut_WaitForPlayer(struct Task *task)
 {
     struct ObjectEvent *objectEvent;
     objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
     if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent))
     {
         ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(GetPlayerFacingDirection()));
-        task->data[0]++;
+        task->tState++;
         task->data[2] = 0;
         task->data[3] = 0;
-        if ((u8)task->data[1] == 0)
+        if ((u8)task->tGoingUp == FALSE)
         {
-            task->data[0] = 4;
+            task->tState = 4; // jump to EscalatorWarpOut_Down_Ride
         }
         PlaySE(SE_ESUKA);
     }
     return FALSE;
 }
 
-static bool8 EscalatorWarpEffect_3(struct Task *task)
+static bool8 EscalatorWarpOut_Up_Ride(struct Task *task)
 {
-    sub_80B6FB8(task);
+    RideUpEscalatorOut(task);
     if (task->data[2] > 3)
     {
-        sub_80B7050();
-        task->data[0]++;
+        FadeOutAtEndOfEscalator();
+        task->tState++;
     }
     return FALSE;
 }
 
-static bool8 EscalatorWarpEffect_4(struct Task *task)
+static bool8 EscalatorWarpOut_Up_End(struct Task *task)
 {
-    sub_80B6FB8(task);
-    sub_80B7060();
+    RideUpEscalatorOut(task);
+    WarpAtEndOfEscalator();
     return FALSE;
 }
 
-static bool8 EscalatorWarpEffect_5(struct Task *task)
+static bool8 EscalatorWarpOut_Down_Ride(struct Task *task)
 {
-    sub_80B7004(task);
+    RideDownEscalatorOut(task);
     if (task->data[2] > 3)
     {
-        sub_80B7050();
-        task->data[0]++;
+        FadeOutAtEndOfEscalator();
+        task->tState++;
     }
     return FALSE;
 }
 
-static bool8 EscalatorWarpEffect_6(struct Task *task)
+static bool8 EscalatorWarpOut_Down_End(struct Task *task)
 {
-    sub_80B7004(task);
-    sub_80B7060();
+    RideDownEscalatorOut(task);
+    WarpAtEndOfEscalator();
     return FALSE;
 }
 
-static void sub_80B6FB8(struct Task *task)
+static void RideUpEscalatorOut(struct Task *task)
 {
     struct Sprite *sprite;
     sprite = &gSprites[gPlayerAvatar.spriteId];
@@ -1592,7 +1643,7 @@ static void sub_80B6FB8(struct Task *task)
     }
 }
 
-static void sub_80B7004(struct Task *task)
+static void RideDownEscalatorOut(struct Task *task)
 {
     struct Sprite *sprite;
     sprite = &gSprites[gPlayerAvatar.spriteId];
@@ -1605,41 +1656,46 @@ static void sub_80B7004(struct Task *task)
     }
 }
 
-static void sub_80B7050(void)
+static void FadeOutAtEndOfEscalator(void)
 {
     TryFadeOutOldMapMusic();
     WarpFadeOutScreen();
 }
 
-static void sub_80B7060(void)
+static void WarpAtEndOfEscalator(void)
 {
     if (!gPaletteFade.active && BGMusicStopped() == TRUE)
     {
-        sub_80E1570();
+        StopEscalator();
         WarpIntoMap();
-        gFieldCallback = sub_80B70B4;
+        gFieldCallback = FieldCallback_EscalatorWarpIn;
         SetMainCallback2(CB2_LoadMap);
-        DestroyTask(FindTaskIdByFunc(Task_EscalatorWarpFieldEffect));
+        DestroyTask(FindTaskIdByFunc(Task_EscalatorWarpOut));
     }
 }
 
-static void sub_80B70B4(void)
+#undef tState
+#undef tGoingUp
+
+static void FieldCallback_EscalatorWarpIn(void)
 {
     Overworld_PlaySpecialMapMusic();
     WarpFadeInScreen();
     ScriptContext2_Enable();
-    CreateTask(sub_80B70DC, 0);
+    CreateTask(Task_EscalatorWarpIn, 0);
     gFieldCallback = NULL;
 }
 
-static void sub_80B70DC(u8 taskId)
+#define tState data[0]
+
+static void Task_EscalatorWarpIn(u8 taskId)
 {
     struct Task *task;
     task = &gTasks[taskId];
-    while (gUnknown_0855C3FC[task->data[0]](task));
+    while (sEscalatorWarpInFieldEffectFuncs[task->tState](task));
 }
 
-static bool8 sub_80B7114(struct Task *task)
+static bool8 EscalatorWarpIn_Init(struct Task *task)
 {
     struct ObjectEvent *objectEvent;
     s16 x;
@@ -1650,31 +1706,35 @@ static bool8 sub_80B7114(struct Task *task)
     ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(DIR_EAST));
     PlayerGetDestCoords(&x, &y);
     behavior = MapGridGetMetatileBehaviorAt(x, y);
-    task->data[0]++;
+    task->tState++;
     task->data[1] = 16;
-    if (behavior == 0x6b)
+
+    if (behavior == MB_DOWN_ESCALATOR)
     {
-        behavior = 1;
-        task->data[0] = 3;
-    } else
+        // If dest is down escalator tile, player is riding up
+        behavior = TRUE;
+        task->tState = 3; // jump to EscalatorWarpIn_Up_Init
+    } 
+    else // MB_UP_ESCALATOR
     {
-        behavior = 0;
+        // If dest is up escalator tile, player is riding down
+        behavior = FALSE;
     }
-    sub_80E1558(behavior);
+    StartEscalator(behavior);
     return TRUE;
 }
 
-static bool8 sub_80B7190(struct Task *task)
+static bool8 EscalatorWarpIn_Down_Init(struct Task *task)
 {
     struct Sprite *sprite;
     sprite = &gSprites[gPlayerAvatar.spriteId];
     sprite->pos2.x = Cos(0x84, task->data[1]);
     sprite->pos2.y = Sin(0x94, task->data[1]);
-    task->data[0]++;
+    task->tState++;
     return FALSE;
 }
 
-static bool8 sub_80B71D0(struct Task *task)
+static bool8 EscalatorWarpIn_Down_Ride(struct Task *task)
 {
     struct Sprite *sprite;
     sprite = &gSprites[gPlayerAvatar.spriteId];
@@ -1689,22 +1749,22 @@ static bool8 sub_80B71D0(struct Task *task)
     {
         sprite->pos2.x = 0;
         sprite->pos2.y = 0;
-        task->data[0] = 5;
+        task->tState = 5;
     }
     return FALSE;
 }
 
-static bool8 sub_80B7230(struct Task *task)
+static bool8 EscalatorWarpIn_Up_Init(struct Task *task)
 {
     struct Sprite *sprite;
     sprite = &gSprites[gPlayerAvatar.spriteId];
     sprite->pos2.x = Cos(0x7c, task->data[1]);
     sprite->pos2.y = Sin(0x76, task->data[1]);
-    task->data[0]++;
+    task->tState++;
     return FALSE;
 }
 
-static bool8 sub_80B7270(struct Task *task)
+static bool8 EscalatorWarpIn_Up_Ride(struct Task *task)
 {
     struct Sprite *sprite;
     sprite = &gSprites[gPlayerAvatar.spriteId];
@@ -1719,23 +1779,23 @@ static bool8 sub_80B7270(struct Task *task)
     {
         sprite->pos2.x = 0;
         sprite->pos2.y = 0;
-        task->data[0]++;
+        task->tState++;
     }
     return FALSE;
 }
 
-static bool8 sub_80B72D0(struct Task *task)
+static bool8 EscalatorWarpIn_WaitForMovement(struct Task *task)
 {
-    if (sub_80E1584())
+    if (IsEscalatorMoving())
     {
         return FALSE;
     }
-    sub_80E1570();
-    task->data[0]++;
+    StopEscalator();
+    task->tState++;
     return TRUE;
 }
 
-static bool8 sub_80B72F4(struct Task *task)
+static bool8 EscalatorWarpIn_End(struct Task *task)
 {
     struct ObjectEvent *objectEvent;
     objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
@@ -1744,104 +1804,113 @@ static bool8 sub_80B72F4(struct Task *task)
         CameraObjectReset1();
         ScriptContext2_Disable();
         ObjectEventSetHeldMovement(objectEvent, GetWalkNormalMovementAction(DIR_EAST));
-        DestroyTask(FindTaskIdByFunc(sub_80B70DC));
+        DestroyTask(FindTaskIdByFunc(Task_EscalatorWarpIn));
     }
     return FALSE;
 }
 
+#undef tState
+
+#define tState data[0]
+#define tMonId data[1]
+
 bool8 FldEff_UseWaterfall(void)
 {
     u8 taskId;
-    taskId = CreateTask(sub_80B7384, 0xff);
-    gTasks[taskId].data[1] = gFieldEffectArguments[0];
-    sub_80B7384(taskId);
+    taskId = CreateTask(Task_UseWaterfall, 0xff);
+    gTasks[taskId].tMonId = gFieldEffectArguments[0];
+    Task_UseWaterfall(taskId);
     return FALSE;
 }
 
-static void sub_80B7384(u8 taskId)
+static void Task_UseWaterfall(u8 taskId)
 {
-    while (gUnknown_0855C418[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId]));
+    while (sWaterfallFieldEffectFuncs[gTasks[taskId].tState](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId]));
 }
 
-static bool8 sub_80B73D0(struct Task *task, struct ObjectEvent *objectEvent)
+static bool8 WaterfallFieldEffect_Init(struct Task *task, struct ObjectEvent *objectEvent)
 {
     ScriptContext2_Enable();
     gPlayerAvatar.preventStep = TRUE;
-    task->data[0]++;
+    task->tState++;
     return FALSE;
 }
 
-static bool8 waterfall_1_do_anim_probably(struct Task *task, struct ObjectEvent *objectEvent)
+static bool8 WaterfallFieldEffect_ShowMon(struct Task *task, struct ObjectEvent *objectEvent)
 {
     ScriptContext2_Enable();
     if (!ObjectEventIsMovementOverridden(objectEvent))
     {
         ObjectEventClearHeldMovementIfFinished(objectEvent);
-        gFieldEffectArguments[0] = task->data[1];
+        gFieldEffectArguments[0] = task->tMonId;
         FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
-        task->data[0]++;
+        task->tState++;
     }
     return FALSE;
 }
 
-static bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct ObjectEvent *objectEvent)
+static bool8 WaterfallFieldEffect_WaitForShowMon(struct Task *task, struct ObjectEvent *objectEvent)
 {
     if (FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
     {
         return FALSE;
     }
-    task->data[0]++;
+    task->tState++;
     return TRUE;
 }
 
-static bool8 sub_80B7450(struct Task *task, struct ObjectEvent *objectEvent)
+static bool8 WaterfallFieldEffect_RideUp(struct Task *task, struct ObjectEvent *objectEvent)
 {
     ObjectEventSetHeldMovement(objectEvent, GetWalkSlowMovementAction(DIR_NORTH));
-    task->data[0]++;
+    task->tState++;
     return FALSE;
 }
 
-static bool8 sub_80B7478(struct Task *task, struct ObjectEvent *objectEvent)
+static bool8 WaterfallFieldEffect_ContinueRideOrEnd(struct Task *task, struct ObjectEvent *objectEvent)
 {
     if (!ObjectEventClearHeldMovementIfFinished(objectEvent))
-    {
         return FALSE;
-    }
+
     if (MetatileBehavior_IsWaterfall(objectEvent->currentMetatileBehavior))
     {
-        task->data[0] = 3;
+        // Still ascending waterfall, back to WaterfallFieldEffect_RideUp
+        task->tState = 3;
         return TRUE;
     }
+
     ScriptContext2_Disable();
     gPlayerAvatar.preventStep = FALSE;
-    DestroyTask(FindTaskIdByFunc(sub_80B7384));
+    DestroyTask(FindTaskIdByFunc(Task_UseWaterfall));
     FieldEffectActiveListRemove(FLDEFF_USE_WATERFALL);
     return FALSE;
 }
 
+#undef tState
+#undef tMonId
+
 bool8 FldEff_UseDive(void)
 {
     u8 taskId;
-    taskId = CreateTask(Task_Dive, 0xff);
+    taskId = CreateTask(Task_UseDive, 0xff);
     gTasks[taskId].data[15] = gFieldEffectArguments[0];
     gTasks[taskId].data[14] = gFieldEffectArguments[1];
-    Task_Dive(taskId);
+    Task_UseDive(taskId);
     return FALSE;
 }
 
-void Task_Dive(u8 taskId)
+void Task_UseDive(u8 taskId)
 {
-    while (gUnknown_0855C42C[gTasks[taskId].data[0]](&gTasks[taskId]));
+    while (sDiveFieldEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]));
 }
 
-static bool8 dive_1_lock(struct Task *task)
+static bool8 DiveFieldEffect_Init(struct Task *task)
 {
     gPlayerAvatar.preventStep = TRUE;
     task->data[0]++;
     return FALSE;
 }
 
-static bool8 dive_2_unknown(struct Task *task)
+static bool8 DiveFieldEffect_ShowMon(struct Task *task)
 {
     ScriptContext2_Enable();
     gFieldEffectArguments[0] = task->data[15];
@@ -1850,14 +1919,16 @@ static bool8 dive_2_unknown(struct Task *task)
     return FALSE;
 }
 
-static bool8 dive_3_unknown(struct Task *task)
+static bool8 DiveFieldEffect_TryWarp(struct Task *task)
 {
     struct MapPosition mapPosition;
     PlayerGetDestCoords(&mapPosition.x, &mapPosition.y);
+
+    // Wait for show mon first
     if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
     {
-        dive_warp(&mapPosition, gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior);
-        DestroyTask(FindTaskIdByFunc(Task_Dive));
+        TryDoDiveWarp(&mapPosition, gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior);
+        DestroyTask(FindTaskIdByFunc(Task_UseDive));
         FieldEffectActiveListRemove(FLDEFF_USE_DIVE);
     }
     return FALSE;
@@ -1873,7 +1944,7 @@ static void Task_LavaridgeGymB1FWarp(u8 taskId)
     while (sLavaridgeGymB1FWarpEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId]));
 }
 
-static bool8 LavaridgeGymB1FWarpEffect_1(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 LavaridgeGymB1FWarpEffect_Init(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
     FreezeObjectEvents();
     CameraObjectReset2();
@@ -1885,7 +1956,7 @@ static bool8 LavaridgeGymB1FWarpEffect_1(struct Task *task, struct ObjectEvent *
     return TRUE;
 }
 
-static bool8 LavaridgeGymB1FWarpEffect_2(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 LavaridgeGymB1FWarpEffect_CameraShake(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
     SetCameraPanning(0, task->data[1]);
     task->data[1] = -task->data[1];
@@ -1898,7 +1969,7 @@ static bool8 LavaridgeGymB1FWarpEffect_2(struct Task *task, struct ObjectEvent *
     return FALSE;
 }
 
-static bool8 LavaridgeGymB1FWarpEffect_3(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 LavaridgeGymB1FWarpEffect_Launch(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
     sprite->pos2.y = 0;
     task->data[3] = 1;
@@ -1906,13 +1977,13 @@ static bool8 LavaridgeGymB1FWarpEffect_3(struct Task *task, struct ObjectEvent *
     gFieldEffectArguments[1] = objectEvent->currentCoords.y;
     gFieldEffectArguments[2] = sprite->subpriority - 1;
     gFieldEffectArguments[3] = sprite->oam.priority;
-    FieldEffectStart(FLDEFF_LAVARIDGE_GYM_WARP);
+    FieldEffectStart(FLDEFF_ASH_LAUNCH);
     PlaySE(SE_W153);
     task->data[0]++;
     return TRUE;
 }
 
-static bool8 LavaridgeGymB1FWarpEffect_4(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 LavaridgeGymB1FWarpEffect_Rise(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
     s16 centerToCornerVecY;
     SetCameraPanning(0, task->data[1]);
@@ -1955,7 +2026,7 @@ static bool8 LavaridgeGymB1FWarpEffect_4(struct Task *task, struct ObjectEvent *
     return FALSE;
 }
 
-static bool8 LavaridgeGymB1FWarpEffect_5(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 LavaridgeGymB1FWarpEffect_FadeOut(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
     TryFadeOutOldMapMusic();
     WarpFadeOutScreen();
@@ -1963,7 +2034,7 @@ static bool8 LavaridgeGymB1FWarpEffect_5(struct Task *task, struct ObjectEvent *
     return FALSE;
 }
 
-static bool8 LavaridgeGymB1FWarpEffect_6(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 LavaridgeGymB1FWarpEffect_Warp(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
     if (!gPaletteFade.active && BGMusicStopped() == TRUE)
     {
@@ -1989,7 +2060,7 @@ static void Task_LavaridgeGymB1FWarpExit(u8 taskId)
     while (sLavaridgeGymB1FWarpExitEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId]));
 }
 
-static bool8 LavaridgeGymB1FWarpExitEffect_1(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 LavaridgeGymB1FWarpExitEffect_Init(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
     CameraObjectReset2();
     FreezeObjectEvents();
@@ -1999,7 +2070,7 @@ static bool8 LavaridgeGymB1FWarpExitEffect_1(struct Task *task, struct ObjectEve
     return FALSE;
 }
 
-static bool8 LavaridgeGymB1FWarpExitEffect_2(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 LavaridgeGymB1FWarpExitEffect_StartPopOut(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
     if (IsWeatherNotFadingIn())
     {
@@ -2007,13 +2078,13 @@ static bool8 LavaridgeGymB1FWarpExitEffect_2(struct Task *task, struct ObjectEve
         gFieldEffectArguments[1] = objectEvent->currentCoords.y;
         gFieldEffectArguments[2] = sprite->subpriority - 1;
         gFieldEffectArguments[3] = sprite->oam.priority;
-        task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
+        task->data[1] = FieldEffectStart(FLDEFF_ASH_PUFF);
         task->data[0]++;
     }
     return FALSE;
 }
 
-static bool8 LavaridgeGymB1FWarpExitEffect_3(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 LavaridgeGymB1FWarpExitEffect_PopOut(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
     sprite = &gSprites[task->data[1]];
     if (sprite->animCmdIndex > 1)
@@ -2027,7 +2098,7 @@ static bool8 LavaridgeGymB1FWarpExitEffect_3(struct Task *task, struct ObjectEve
     return FALSE;
 }
 
-static bool8 LavaridgeGymB1FWarpExitEffect_4(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 LavaridgeGymB1FWarpExitEffect_End(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
     if (ObjectEventClearHeldMovementIfFinished(objectEvent))
     {
@@ -2039,23 +2110,21 @@ static bool8 LavaridgeGymB1FWarpExitEffect_4(struct Task *task, struct ObjectEve
     return FALSE;
 }
 
-// For the ash puff effect when warping off the B1F ash tiles
-u8 FldEff_LavaridgeGymWarp(void)
+// For the ash effect when jumping off the Lavaridge Gym B1F warp tiles
+u8 FldEff_AshLaunch(void)
 {
     u8 spriteId;
     SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[33], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_ASH_LAUNCH], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
     gSprites[spriteId].oam.priority = gFieldEffectArguments[3];
-    gSprites[spriteId].coordOffsetEnabled = 1;
+    gSprites[spriteId].coordOffsetEnabled = TRUE;
     return spriteId;
 }
 
-void SpriteCB_LavaridgeGymWarp(struct Sprite *sprite)
+void SpriteCB_AshLaunch(struct Sprite *sprite)
 {
     if (sprite->animEnded)
-    {
-        FieldEffectStop(sprite, FLDEFF_LAVARIDGE_GYM_WARP);
-    }
+        FieldEffectStop(sprite, FLDEFF_ASH_LAUNCH);
 }
 
 void StartLavaridgeGym1FWarp(u8 priority)
@@ -2068,7 +2137,7 @@ static void Task_LavaridgeGym1FWarp(u8 taskId)
     while(sLavaridgeGym1FWarpEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId]));
 }
 
-static bool8 LavaridgeGym1FWarpEffect_1(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 LavaridgeGym1FWarpEffect_Init(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
     FreezeObjectEvents();
     CameraObjectReset2();
@@ -2078,7 +2147,7 @@ static bool8 LavaridgeGym1FWarpEffect_1(struct Task *task, struct ObjectEvent *o
     return FALSE;
 }
 
-static bool8 LavaridgeGym1FWarpEffect_2(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 LavaridgeGym1FWarpEffect_AshPuff(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
     if (ObjectEventClearHeldMovementIfFinished(objectEvent))
     {
@@ -2088,7 +2157,7 @@ static bool8 LavaridgeGym1FWarpEffect_2(struct Task *task, struct ObjectEvent *o
             gFieldEffectArguments[1] = objectEvent->currentCoords.y;
             gFieldEffectArguments[2] = sprite->subpriority - 1;
             gFieldEffectArguments[3] = sprite->oam.priority;
-            task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
+            task->data[1] = FieldEffectStart(FLDEFF_ASH_PUFF);
             task->data[0]++;
         } else
         {
@@ -2100,7 +2169,7 @@ static bool8 LavaridgeGym1FWarpEffect_2(struct Task *task, struct ObjectEvent *o
     return FALSE;
 }
 
-static bool8 LavaridgeGym1FWarpEffect_3(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 LavaridgeGym1FWarpEffect_Disappear(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
     if (gSprites[task->data[1]].animCmdIndex == 2)
     {
@@ -2110,9 +2179,9 @@ static bool8 LavaridgeGym1FWarpEffect_3(struct Task *task, struct ObjectEvent *o
     return FALSE;
 }
 
-static bool8 LavaridgeGym1FWarpEffect_4(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 LavaridgeGym1FWarpEffect_FadeOut(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
-    if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH))
+    if (!FieldEffectActiveListContains(FLDEFF_ASH_PUFF))
     {
         TryFadeOutOldMapMusic();
         WarpFadeOutScreen();
@@ -2121,7 +2190,7 @@ static bool8 LavaridgeGym1FWarpEffect_4(struct Task *task, struct ObjectEvent *o
     return FALSE;
 }
 
-static bool8 LavaridgeGym1FWarpEffect_5(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 LavaridgeGym1FWarpEffect_Warp(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
     if (!gPaletteFade.active && BGMusicStopped() == TRUE)
     {
@@ -2133,48 +2202,53 @@ static bool8 LavaridgeGym1FWarpEffect_5(struct Task *task, struct ObjectEvent *o
     return FALSE;
 }
 
-u8 FldEff_PopOutOfAsh(void)
+// For the ash effect when a trainer pops out of ash, or when the player enters/exits a warp in Lavaridge Gym 1F
+u8 FldEff_AshPuff(void)
 {
     u8 spriteId;
     SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[32], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_ASH_PUFF], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
     gSprites[spriteId].oam.priority = gFieldEffectArguments[3];
-    gSprites[spriteId].coordOffsetEnabled = 1;
+    gSprites[spriteId].coordOffsetEnabled = TRUE;
     return spriteId;
 }
 
-void SpriteCB_PopOutOfAsh(struct Sprite *sprite)
+void SpriteCB_AshPuff(struct Sprite *sprite)
 {
     if (sprite->animEnded)
-    {
-        FieldEffectStop(sprite, FLDEFF_POP_OUT_OF_ASH);
-    }
+        FieldEffectStop(sprite, FLDEFF_ASH_PUFF);
 }
 
+#define tState     data[0]
+#define tSpinDelay data[1]
+#define tNumTurns  data[2]
+#define tTimer     data[14]
+#define tStartDir  data[15]
+
 void StartEscapeRopeFieldEffect(void)
 {
     ScriptContext2_Enable();
     FreezeObjectEvents();
-    CreateTask(DoEscapeRopeFieldEffect, 0x50);
+    CreateTask(Task_EscapeRopeWarpOut, 80);
 }
 
-static void DoEscapeRopeFieldEffect(u8 taskId)
+static void Task_EscapeRopeWarpOut(u8 taskId)
 {
-    gEscapeRopeFieldEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]);
+    sEscapeRopeWarpOutEffectFuncs[gTasks[taskId].tState](&gTasks[taskId]);
 }
 
-static void EscapeRopeFieldEffect_Step0(struct Task *task)
+static void EscapeRopeWarpOutEffect_Init(struct Task *task)
 {
-    task->data[0]++;
-    task->data[14] = 64;
-    task->data[15] = GetPlayerFacingDirection();
+    task->tState++;
+    task->tTimer = 64;
+    task->tStartDir = GetPlayerFacingDirection();
 }
 
-static void EscapeRopeFieldEffect_Step1(struct Task *task)
+static void EscapeRopeWarpOutEffect_Spin(struct Task *task)
 {
     struct ObjectEvent *objectEvent;
     u8 spinDirections[5] =  {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
-    if (task->data[14] != 0 && (--task->data[14]) == 0)
+    if (task->tTimer != 0 && (--task->tTimer) == 0)
     {
         TryFadeOutOldMapMusic();
         WarpFadeOutScreen();
@@ -2182,32 +2256,31 @@ static void EscapeRopeFieldEffect_Step1(struct Task *task)
     objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
     if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent))
     {
-        if (task->data[14] == 0 && !gPaletteFade.active && BGMusicStopped() == TRUE)
+        if (task->tTimer == 0 && !gPaletteFade.active && BGMusicStopped() == TRUE)
         {
-            SetObjectEventDirection(objectEvent, task->data[15]);
+            SetObjectEventDirection(objectEvent, task->tStartDir);
             SetWarpDestinationToEscapeWarp();
             WarpIntoMap();
-            gFieldCallback = mapldr_080859D4;
+            gFieldCallback = FieldCallback_EscapeRopeWarpIn;
             SetMainCallback2(CB2_LoadMap);
-            DestroyTask(FindTaskIdByFunc(DoEscapeRopeFieldEffect));
-        } else if (task->data[1] == 0 || (--task->data[1]) == 0)
+            DestroyTask(FindTaskIdByFunc(Task_EscapeRopeWarpOut));
+        } 
+        else if (task->tSpinDelay == 0 || (--task->tSpinDelay) == 0)
         {
             ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(spinDirections[objectEvent->facingDirection]));
-            if (task->data[2] < 12)
-            {
-                task->data[2]++;
-            }
-            task->data[1] = 8 >> (task->data[2] >> 2);
+            if (task->tNumTurns < 12)
+                task->tNumTurns++;
+            task->tSpinDelay = 8 >> (task->tNumTurns >> 2);
         }
     }
 }
 
-void (*const gUnknown_0855C484[])(struct Task *) = {
-    sub_80B7EC4,
-    sub_80B7EE8
+void (*const sEscapeRopeWarpInEffectFuncs[])(struct Task *) = {
+    EscapeRopeWarpInEffect_Init,
+    EscapeRopeWarpInEffect_Spin
 };
 
-static void mapldr_080859D4(void)
+static void FieldCallback_EscapeRopeWarpIn(void)
 {
     Overworld_PlaySpecialMapMusic();
     WarpFadeInScreen();
@@ -2215,78 +2288,84 @@ static void mapldr_080859D4(void)
     FreezeObjectEvents();
     gFieldCallback = NULL;
     gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE;
-    CreateTask(sub_80B7E94, 0);
+    CreateTask(Task_EscapeRopeWarpIn, 0);
 }
 
-static void sub_80B7E94(u8 taskId)
+static void Task_EscapeRopeWarpIn(u8 taskId)
 {
-    gUnknown_0855C484[gTasks[taskId].data[0]](&gTasks[taskId]);
+    sEscapeRopeWarpInEffectFuncs[gTasks[taskId].tState](&gTasks[taskId]);
 }
 
-static void sub_80B7EC4(struct Task *task)
+static void EscapeRopeWarpInEffect_Init(struct Task *task)
 {
     if (IsWeatherNotFadingIn())
     {
-        task->data[0]++;
-        task->data[15] = GetPlayerFacingDirection();
+        task->tState++;
+        task->tStartDir = GetPlayerFacingDirection();
     }
 }
 
-static void sub_80B7EE8(struct Task *task)
+static void EscapeRopeWarpInEffect_Spin(struct Task *task)
 {
-    u8 spinDirections[5] = {1, 3, 4, 2, 1};
+    u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
     struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
-    if (task->data[1] == 0 || (--task->data[1]) == 0)
+    if (task->tSpinDelay == 0 || (--task->tSpinDelay) == 0)
     {
         if (ObjectEventIsMovementOverridden(objectEvent) && !ObjectEventClearHeldMovementIfFinished(objectEvent))
         {
             return;
         }
-        if (task->data[2] >= 32 && task->data[15] == GetPlayerFacingDirection())
+        if (task->tNumTurns >= 32 && task->tStartDir == GetPlayerFacingDirection())
         {
             objectEvent->invisible = FALSE;
             ScriptContext2_Disable();
             UnfreezeObjectEvents();
-            DestroyTask(FindTaskIdByFunc(sub_80B7E94));
+            DestroyTask(FindTaskIdByFunc(Task_EscapeRopeWarpIn));
             return;
         }
         ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(spinDirections[objectEvent->facingDirection]));
-        if (task->data[2] < 32)
-        {
-            task->data[2]++;
-        }
-        task->data[1] = task->data[2] >> 2;
+        if (task->tNumTurns < 32)
+            task->tNumTurns++;
+        task->tSpinDelay = task->tNumTurns >> 2;
     }
     objectEvent->invisible ^= 1;
 }
 
-void CreateTeleportFieldEffectTask(void)
+#undef tState
+#undef tSpinDelay
+#undef tNumTurns
+#undef tTimer
+#undef tStartDir
+
+#define tState data[0]
+
+void FldEff_TeleportWarpOut(void)
 {
-    CreateTask(ExecuteTeleportFieldEffectTask, 0);
+    CreateTask(Task_TeleportWarpOut, 0);
 }
 
-static void (*const sTeleportFieldEffectTasks[])(struct Task *) = {
-    TeleportFieldEffectTask1,
-    TeleportFieldEffectTask2,
-    TeleportFieldEffectTask3,
-    TeleportFieldEffectTask4
+static void (*const sTeleportWarpOutFieldEffectFuncs[])(struct Task *) = {
+    TeleportWarpOutFieldEffect_Init,
+    TeleportWarpOutFieldEffect_SpinGround,
+    TeleportWarpOutFieldEffect_SpinExit,
+    TeleportWarpOutFieldEffect_End
 };
 
-static void ExecuteTeleportFieldEffectTask(u8 taskId)
+static void Task_TeleportWarpOut(u8 taskId)
 {
-    sTeleportFieldEffectTasks[gTasks[taskId].data[0]](&gTasks[taskId]);
+    sTeleportWarpOutFieldEffectFuncs[gTasks[taskId].tState](&gTasks[taskId]);
 }
 
-static void TeleportFieldEffectTask1(struct Task *task)
+static void TeleportWarpOutFieldEffect_Init(struct Task *task)
 {
     ScriptContext2_Enable();
     FreezeObjectEvents();
     CameraObjectReset2();
     task->data[15] = GetPlayerFacingDirection();
-    task->data[0]++;
+    task->tState++;
 }
 
-static void TeleportFieldEffectTask2(struct Task *task)
+static void TeleportWarpOutFieldEffect_SpinGround(struct Task *task)
 {
     u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
     struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
@@ -2298,7 +2377,7 @@ static void TeleportFieldEffectTask2(struct Task *task)
     }
     if (task->data[2] > 7 && task->data[15] == objectEvent->facingDirection)
     {
-        task->data[0]++;
+        task->tState++;
         task->data[1] = 4;
         task->data[2] = 8;
         task->data[3] = 1;
@@ -2306,7 +2385,7 @@ static void TeleportFieldEffectTask2(struct Task *task)
     }
 }
 
-static void TeleportFieldEffectTask3(struct Task *task)
+static void TeleportWarpOutFieldEffect_SpinExit(struct Task *task)
 {
     u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
     struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
@@ -2328,13 +2407,13 @@ static void TeleportFieldEffectTask3(struct Task *task)
     }
     if (task->data[4] >= 0xa8)
     {
-        task->data[0]++;
+        task->tState++;
         TryFadeOutOldMapMusic();
         WarpFadeOutScreen();
     }
 }
 
-static void TeleportFieldEffectTask4(struct Task *task)
+static void TeleportWarpOutFieldEffect_End(struct Task *task)
 {
     if (!gPaletteFade.active)
     {
@@ -2349,13 +2428,13 @@ static void TeleportFieldEffectTask4(struct Task *task)
             SetWarpDestinationToLastHealLocation();
             WarpIntoMap();
             SetMainCallback2(CB2_LoadMap);
-            gFieldCallback = mapldr_08085D88;
-            DestroyTask(FindTaskIdByFunc(ExecuteTeleportFieldEffectTask));
+            gFieldCallback = FieldCallback_TeleportWarpIn;
+            DestroyTask(FindTaskIdByFunc(Task_TeleportWarpOut));
         }
     }
 }
 
-static void mapldr_08085D88(void)
+static void FieldCallback_TeleportWarpIn(void)
 {
     Overworld_PlaySpecialMapMusic();
     WarpFadeInScreen();
@@ -2364,21 +2443,21 @@ static void mapldr_08085D88(void)
     gFieldCallback = NULL;
     gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE;
     CameraObjectReset2();
-    CreateTask(sub_80B8250, 0);
+    CreateTask(Task_TeleportWarpIn, 0);
 }
 
-void (*const gUnknown_0855C49C[])(struct Task *) = {
-    sub_80B8280,
-    sub_80B830C,
-    sub_80B8410
+void (*const sTeleportWarpInFieldEffectFuncs[])(struct Task *) = {
+    TeleportWarpInFieldEffect_Init,
+    TeleportWarpInFieldEffect_SpinEnter,
+    TeleportWarpInFieldEffect_SpinGround
 };
 
-static void sub_80B8250(u8 taskId)
+static void Task_TeleportWarpIn(u8 taskId)
 {
-    gUnknown_0855C49C[gTasks[taskId].data[0]](&gTasks[taskId]);
+    sTeleportWarpInFieldEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]);
 }
 
-static void sub_80B8280(struct Task *task)
+static void TeleportWarpInFieldEffect_Init(struct Task *task)
 {
     struct Sprite *sprite;
     s16 centerToCornerVecY;
@@ -2397,9 +2476,9 @@ static void sub_80B8280(struct Task *task)
     }
 }
 
-static void sub_80B830C(struct Task *task)
+static void TeleportWarpInFieldEffect_SpinEnter(struct Task *task)
 {
-    u8 spinDirections[5] = {1, 3, 4, 2, 1};
+    u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
     struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
     struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId];
     if ((sprite->pos2.y += task->data[1]) >= -8)
@@ -2436,9 +2515,9 @@ static void sub_80B830C(struct Task *task)
     }
 }
 
-static void sub_80B8410(struct Task *task)
+static void TeleportWarpInFieldEffect_SpinGround(struct Task *task)
 {
-    u8 spinDirections[5] = {1, 3, 4, 2, 1};
+    u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
     struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
     if ((--task->data[1]) == 0)
     {
@@ -2449,22 +2528,39 @@ static void sub_80B8410(struct Task *task)
             ScriptContext2_Disable();
             CameraObjectReset1();
             UnfreezeObjectEvents();
-            DestroyTask(FindTaskIdByFunc(sub_80B8250));
+            DestroyTask(FindTaskIdByFunc(Task_TeleportWarpIn));
         }
     }
 }
 
+// Task data for Task_FieldMoveShowMonOutDoors
+#define tState       data[0]
+#define tWinHoriz    data[1]
+#define tWinVert     data[2]
+#define tWinIn       data[3]
+#define tWinOut      data[4]
+#define tBgHoriz     data[5]
+#define tBgVert      data[6]
+#define tMonSpriteId data[15]
+
+// Sprite data for field move mon sprite
+#define sSpecies       data[0]
+#define sOnscreenTimer data[1]
+#define sSlidOffscreen data[7]
+
+// There are two variants (outdoor/indoor) of the "show mon for a field move" effect
+// Outdoor has a black background with thick white streaks and appears from the right by stretching vertically and horizontally
+// Indoor has blue background with thin white streaks and appears from the left by stretching horizontally
+// For both the background streaks move to the right, and the mon sprite enters from the right and exits left
 bool8 FldEff_FieldMoveShowMon(void)
 {
     u8 taskId;
     if (IsMapTypeOutdoors(GetCurrentMapType()) == TRUE)
-    {
-        taskId = CreateTask(sub_80B8554, 0xff);
-    } else
-    {
-        taskId = CreateTask(sub_80B88B4, 0xff);
-    }
-    gTasks[taskId].data[15] = sub_80B8C60(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+        taskId = CreateTask(Task_FieldMoveShowMonOutdoors, 0xff);
+    else
+        taskId = CreateTask(Task_FieldMoveShowMonIndoors, 0xff);
+
+    gTasks[taskId].tMonSpriteId = InitFieldMoveMonSprite(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
     return FALSE;
 }
 
@@ -2482,240 +2578,248 @@ bool8 FldEff_FieldMoveShowMonInit(void)
     return FALSE;
 }
 
-void (*const gUnknown_0855C4A8[])(struct Task *) = {
-    sub_80B8584,
-    sub_80B85F8,
-    sub_80B8660,
-    sub_80B86EC,
-    sub_80B871C,
-    sub_80B8770,
-    overworld_bg_setup_2,
+void (*const sFieldMoveShowMonOutdoorsEffectFuncs[])(struct Task *) = {
+    FieldMoveShowMonOutdoorsEffect_Init,
+    FieldMoveShowMonOutdoorsEffect_LoadGfx,
+    FieldMoveShowMonOutdoorsEffect_CreateBanner,
+    FieldMoveShowMonOutdoorsEffect_WaitForMon,
+    FieldMoveShowMonOutdoorsEffect_ShrinkBanner,
+    FieldMoveShowMonOutdoorsEffect_RestoreBg,
+    FieldMoveShowMonOutdoorsEffect_End,
 };
 
-static void sub_80B8554(u8 taskId)
+static void Task_FieldMoveShowMonOutdoors(u8 taskId)
 {
-    gUnknown_0855C4A8[gTasks[taskId].data[0]](&gTasks[taskId]);
+    sFieldMoveShowMonOutdoorsEffectFuncs[gTasks[taskId].tState](&gTasks[taskId]);
 }
 
-static void sub_80B8584(struct Task *task)
+static void FieldMoveShowMonOutdoorsEffect_Init(struct Task *task)
 {
     task->data[11] = REG_WININ;
     task->data[12] = REG_WINOUT;
-    StoreWordInTwoHalfwords(&task->data[13], (u32)gMain.vblankCallback);
-    task->data[1] = 0xf0f1;
-    task->data[2] = 0x5051;
-    task->data[3] = 0x3f;
-    task->data[4] = 0x3e;
-    SetGpuReg(REG_OFFSET_WIN0H, task->data[1]);
-    SetGpuReg(REG_OFFSET_WIN0V, task->data[2]);
-    SetGpuReg(REG_OFFSET_WININ, task->data[3]);
-    SetGpuReg(REG_OFFSET_WINOUT, task->data[4]);
-    SetVBlankCallback(sub_80B880C);
-    task->data[0]++;
+    StoreWordInTwoHalfwords((u16 *)&task->data[13], (u32)gMain.vblankCallback);
+    task->tWinHoriz = WIN_RANGE(DISPLAY_WIDTH, DISPLAY_WIDTH + 1);
+    task->tWinVert = WIN_RANGE(DISPLAY_HEIGHT / 2, DISPLAY_HEIGHT / 2 + 1);
+    task->tWinIn = WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR;
+    task->tWinOut = WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2 | WINOUT_WIN01_BG3 | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR;
+    SetGpuReg(REG_OFFSET_WIN0H, task->tWinHoriz);
+    SetGpuReg(REG_OFFSET_WIN0V, task->tWinVert);
+    SetGpuReg(REG_OFFSET_WININ, task->tWinIn);
+    SetGpuReg(REG_OFFSET_WINOUT, task->tWinOut);
+    SetVBlankCallback(VBlankCB_FieldMoveShowMonOutdoors);
+    task->tState++;
 }
 
-static void sub_80B85F8(struct Task *task)
+static void FieldMoveShowMonOutdoorsEffect_LoadGfx(struct Task *task)
 {
     u16 offset = ((REG_BG0CNT >> 2) << 14);
     u16 delta = ((REG_BG0CNT >> 8) << 11);
-    CpuCopy16(gFieldMoveStreaksTiles, (void *)(VRAM + offset), 0x200);
+    CpuCopy16(sFieldMoveStreaksOutdoors_Gfx, (void *)(VRAM + offset), 0x200);
     CpuFill32(0, (void *)(VRAM + delta), 0x800);
-    LoadPalette(gFieldMoveStreaksPalette, 0xf0, 0x20);
-    sub_80B8874(delta);
-    task->data[0]++;
+    LoadPalette(sFieldMoveStreaksOutdoors_Pal, 0xf0, 0x20);
+    LoadFieldMoveOutdoorStreaksTilemap(delta);
+    task->tState++;
 }
 
-static void sub_80B8660(struct Task *task)
+static void FieldMoveShowMonOutdoorsEffect_CreateBanner(struct Task *task)
 {
-    s16 v0;
-    s16 v2;
-    s16 v3;
-    task->data[5] -= 16;
-    v0 = ((u16)task->data[1] >> 8);
-    v2 = ((u16)task->data[2] >> 8);
-    v3 = ((u16)task->data[2] & 0xff);
-    v0 -= 16;
-    v2 -= 2;
-    v3 += 2;
-    if (v0 < 0)
-    {
-        v0 = 0;
-    }
-    if (v2 < 0x28)
-    {
-        v2 = 0x28;
-    }
-    if (v3 > 0x78)
-    {
-        v3 = 0x78;
-    }
-    task->data[1] = (v0 << 8) | (task->data[1] & 0xff);
-    task->data[2] = (v2 << 8) | v3;
-    if (v0 == 0 && v2 == 0x28 && v3 == 0x78)
+    s16 horiz;
+    s16 vertHi;
+    s16 vertLo;
+    task->tBgHoriz -= 16;
+    horiz = ((u16)task->tWinHoriz >> 8);
+    vertHi = ((u16)task->tWinVert >> 8);
+    vertLo = ((u16)task->tWinVert & 0xff);
+    horiz -= 16;
+    vertHi -= 2;
+    vertLo += 2;
+
+    if (horiz < 0)
+        horiz = 0;
+
+    if (vertHi < DISPLAY_HEIGHT / 4)
+        vertHi = DISPLAY_HEIGHT / 4;
+
+    if (vertLo > DISPLAY_WIDTH / 2)
+        vertLo = DISPLAY_WIDTH / 2;
+
+    task->tWinHoriz = (horiz << 8) | (task->tWinHoriz & 0xff);
+    task->tWinVert = (vertHi << 8) | vertLo;
+    if (horiz == 0 && vertHi == DISPLAY_HEIGHT / 4 && vertLo == DISPLAY_WIDTH / 2)
     {
-        gSprites[task->data[15]].callback = sub_80B8CC0;
-        task->data[0]++;
+        gSprites[task->tMonSpriteId].callback = SpriteCB_FieldMoveMonSlideOnscreen;
+        task->tState++;
     }
 }
 
-static void sub_80B86EC(struct Task *task)
+static void FieldMoveShowMonOutdoorsEffect_WaitForMon(struct Task *task)
 {
-    task->data[5] -= 16;
-    if (gSprites[task->data[15]].data[7])
-    {
-        task->data[0]++;
-    }
+    task->tBgHoriz -= 16;
+
+    if (gSprites[task->tMonSpriteId].sSlidOffscreen)
+        task->tState++;
 }
 
-static void sub_80B871C(struct Task *task)
+static void FieldMoveShowMonOutdoorsEffect_ShrinkBanner(struct Task *task)
 {
-    s16 v2;
-    s16 v3;
-    task->data[5] -= 16;
-    v2 = (task->data[2] >> 8);
-    v3 = (task->data[2] & 0xff);
-    v2 += 6;
-    v3 -= 6;
-    if (v2 > 0x50)
-    {
-        v2 = 0x50;
-    }
-    if (v3 < 0x51)
-    {
-        v3 = 0x51;
-    }
-    task->data[2] = (v2 << 8) | v3;
-    if (v2 == 0x50 && v3 == 0x51)
-    {
-        task->data[0]++;
-    }
+    s16 vertHi;
+    s16 vertLo;
+    task->tBgHoriz -= 16;
+    vertHi = (task->tWinVert >> 8);
+    vertLo = (task->tWinVert & 0xFF);
+    vertHi += 6;
+    vertLo -= 6;
+
+    if (vertHi > DISPLAY_HEIGHT / 2)
+        vertHi = DISPLAY_HEIGHT / 2;
+
+    if (vertLo < DISPLAY_HEIGHT / 2 + 1)
+        vertLo = DISPLAY_HEIGHT / 2 + 1;
+
+    task->tWinVert = (vertHi << 8) | vertLo;
+
+    if (vertHi == DISPLAY_HEIGHT / 2 && vertLo == DISPLAY_HEIGHT / 2 + 1)
+        task->tState++;
 }
 
-static void sub_80B8770(struct Task *task)
+static void FieldMoveShowMonOutdoorsEffect_RestoreBg(struct Task *task)
 {
     u16 bg0cnt = (REG_BG0CNT >> 8) << 11;
     CpuFill32(0, (void *)VRAM + bg0cnt, 0x800);
-    task->data[1] = 0xf1;
-    task->data[2] = 0xa1;
-    task->data[3] = task->data[11];
-    task->data[4] = task->data[12];
-    task->data[0]++;
+    task->tWinHoriz = DISPLAY_WIDTH + 1;
+    task->tWinVert = DISPLAY_HEIGHT + 1;
+    task->tWinIn = task->data[11];
+    task->tWinOut = task->data[12];
+    task->tState++;
 }
 
-static void overworld_bg_setup_2(struct Task *task)
+static void FieldMoveShowMonOutdoorsEffect_End(struct Task *task)
 {
     IntrCallback callback;
     LoadWordFromTwoHalfwords((u16 *)&task->data[13], (u32 *)&callback);
     SetVBlankCallback(callback);
-    sub_8197200();
-    FreeResourcesAndDestroySprite(&gSprites[task->data[15]], task->data[15]);
+    InitTextBoxGfxAndPrinters();
+    FreeResourcesAndDestroySprite(&gSprites[task->tMonSpriteId], task->tMonSpriteId);
     FieldEffectActiveListRemove(FLDEFF_FIELD_MOVE_SHOW_MON);
-    DestroyTask(FindTaskIdByFunc(sub_80B8554));
+    DestroyTask(FindTaskIdByFunc(Task_FieldMoveShowMonOutdoors));
 }
 
-static void sub_80B880C(void)
+static void VBlankCB_FieldMoveShowMonOutdoors(void)
 {
     IntrCallback callback;
-    struct Task *task = &gTasks[FindTaskIdByFunc(sub_80B8554)];
+    struct Task *task = &gTasks[FindTaskIdByFunc(Task_FieldMoveShowMonOutdoors)];
     LoadWordFromTwoHalfwords((u16 *)&task->data[13], (u32 *)&callback);
     callback();
-    SetGpuReg(REG_OFFSET_WIN0H, task->data[1]);
-    SetGpuReg(REG_OFFSET_WIN0V, task->data[2]);
-    SetGpuReg(REG_OFFSET_WININ, task->data[3]);
-    SetGpuReg(REG_OFFSET_WINOUT, task->data[4]);
-    SetGpuReg(REG_OFFSET_BG0HOFS, task->data[5]);
-    SetGpuReg(REG_OFFSET_BG0VOFS, task->data[6]);
+    SetGpuReg(REG_OFFSET_WIN0H, task->tWinHoriz);
+    SetGpuReg(REG_OFFSET_WIN0V, task->tWinVert);
+    SetGpuReg(REG_OFFSET_WININ, task->tWinIn);
+    SetGpuReg(REG_OFFSET_WINOUT, task->tWinOut);
+    SetGpuReg(REG_OFFSET_BG0HOFS, task->tBgHoriz);
+    SetGpuReg(REG_OFFSET_BG0VOFS, task->tBgVert);
 }
 
-static void sub_80B8874(u16 offs)
+static void LoadFieldMoveOutdoorStreaksTilemap(u16 offs)
 {
     u16 i;
     u16 *dest;
-    dest = (u16 *)(VRAM + 0x140 + offs);
-    for (i = 0; i < 0x140; i++, dest++)
-    {
-        *dest = gFieldMoveStreaksTilemap[i] | METATILE_ELEVATION_MASK;
-    }
-}
-
-void (*const gUnknown_0855C4C4[])(struct Task *) = {
-    sub_80B88E4,
-    sub_80B8920,
-    sub_80B898C,
-    sub_80B89DC,
-    sub_80B8A0C,
-    sub_80B8A44,
-    sub_80B8A64,
+    dest = (u16 *)(VRAM + ARRAY_COUNT(sFieldMoveStreaksOutdoors_Tilemap) + offs);
+    for (i = 0; i < ARRAY_COUNT(sFieldMoveStreaksOutdoors_Tilemap); i++, dest++)
+    {
+        *dest = sFieldMoveStreaksOutdoors_Tilemap[i] | 0xF000;
+    }
+}
+
+#undef tState
+#undef tWinHoriz
+#undef tWinVert
+#undef tWinIn
+#undef tWinOut
+#undef tBgHoriz
+#undef tBgVert
+#undef tMonSpriteId
+
+// Task data for Task_FieldMoveShowMonIndoors
+#define tState       data[0]
+#define tBgHoriz     data[1]
+#define tBgVert      data[2]
+#define tBgOffsetIdx data[3]
+#define tBgOffset    data[4]
+#define tMonSpriteId data[15]
+
+void (*const sFieldMoveShowMonIndoorsEffectFuncs[])(struct Task *) = {
+    FieldMoveShowMonIndoorsEffect_Init,
+    FieldMoveShowMonIndoorsEffect_LoadGfx,
+    FieldMoveShowMonIndoorsEffect_SlideBannerOn,
+    FieldMoveShowMonIndoorsEffect_WaitForMon,
+    FieldMoveShowMonIndoorsEffect_RestoreBg,
+    FieldMoveShowMonIndoorsEffect_SlideBannerOff,
+    FieldMoveShowMonIndoorsEffect_End,
 };
 
-static void sub_80B88B4(u8 taskId)
+static void Task_FieldMoveShowMonIndoors(u8 taskId)
 {
-    gUnknown_0855C4C4[gTasks[taskId].data[0]](&gTasks[taskId]);
+    sFieldMoveShowMonIndoorsEffectFuncs[gTasks[taskId].tState](&gTasks[taskId]);
 }
 
-static void sub_80B88E4(struct Task *task)
+static void FieldMoveShowMonIndoorsEffect_Init(struct Task *task)
 {
-    SetGpuReg(REG_OFFSET_BG0HOFS, task->data[1]);
-    SetGpuReg(REG_OFFSET_BG0VOFS, task->data[2]);
+    SetGpuReg(REG_OFFSET_BG0HOFS, task->tBgHoriz);
+    SetGpuReg(REG_OFFSET_BG0VOFS, task->tBgVert);
     StoreWordInTwoHalfwords((u16 *)&task->data[13], (u32)gMain.vblankCallback);
-    SetVBlankCallback(sub_80B8AE0);
-    task->data[0]++;
+    SetVBlankCallback(VBlankCB_FieldMoveShowMonIndoors);
+    task->tState++;
 }
 
-static void sub_80B8920(struct Task *task)
+static void FieldMoveShowMonIndoorsEffect_LoadGfx(struct Task *task)
 {
     u16 offset;
     u16 delta;
     offset = ((REG_BG0CNT >> 2) << 14);
     delta = ((REG_BG0CNT >> 8) << 11);
     task->data[12] = delta;
-    CpuCopy16(gDarknessFieldMoveStreaksTiles, (void *)(VRAM + offset), 0x80);
+    CpuCopy16(sFieldMoveStreaksIndoors_Gfx, (void *)(VRAM + offset), 0x80);
     CpuFill32(0, (void *)(VRAM + delta), 0x800);
-    LoadPalette(gDarknessFieldMoveStreaksPalette, 0xf0, 0x20);
-    task->data[0]++;
+    LoadPalette(sFieldMoveStreaksIndoors_Pal, 0xf0, 0x20);
+    task->tState++;
 }
 
-static void sub_80B898C(struct Task *task)
+static void FieldMoveShowMonIndoorsEffect_SlideBannerOn(struct Task *task)
 {
-    if (sub_80B8B38(task))
+    if (SlideIndoorBannerOnscreen(task))
     {
-        SetGpuReg(REG_OFFSET_WIN1H, 0x00f0);
-        SetGpuReg(REG_OFFSET_WIN1V, 0x2878);
-        gSprites[task->data[15]].callback = sub_80B8CC0;
-        task->data[0]++;
+        SetGpuReg(REG_OFFSET_WIN1H, WIN_RANGE(0, DISPLAY_WIDTH));
+        SetGpuReg(REG_OFFSET_WIN1V, WIN_RANGE(DISPLAY_HEIGHT / 4, DISPLAY_HEIGHT - DISPLAY_HEIGHT / 4));
+        gSprites[task->tMonSpriteId].callback = SpriteCB_FieldMoveMonSlideOnscreen;
+        task->tState++;
     }
-    sub_80B8B28(task);
+    AnimateIndoorShowMonBg(task);
 }
 
-static void sub_80B89DC(struct Task *task)
+static void FieldMoveShowMonIndoorsEffect_WaitForMon(struct Task *task)
 {
-    sub_80B8B28(task);
-    if (gSprites[task->data[15]].data[7])
-    {
-        task->data[0]++;
-    }
+    AnimateIndoorShowMonBg(task);
+    if (gSprites[task->tMonSpriteId].sSlidOffscreen)
+        task->tState++;
 }
 
-static void sub_80B8A0C(struct Task *task)
+static void FieldMoveShowMonIndoorsEffect_RestoreBg(struct Task *task)
 {
-    sub_80B8B28(task);
-    task->data[3] = task->data[1] & 7;
-    task->data[4] = 0;
-    SetGpuReg(REG_OFFSET_WIN1H, 0xffff);
-    SetGpuReg(REG_OFFSET_WIN1V, 0xffff);
-    task->data[0]++;
+    AnimateIndoorShowMonBg(task);
+    task->tBgOffsetIdx = task->tBgHoriz & 7;
+    task->tBgOffset = 0;
+    SetGpuReg(REG_OFFSET_WIN1H, WIN_RANGE(0xFF, 0xFF));
+    SetGpuReg(REG_OFFSET_WIN1V, WIN_RANGE(0xFF, 0xFF));
+    task->tState++;
 }
 
-static void sub_80B8A44(struct Task *task)
+static void FieldMoveShowMonIndoorsEffect_SlideBannerOff(struct Task *task)
 {
-    sub_80B8B28(task);
-    if (sub_80B8BF0(task))
-    {
-        task->data[0]++;
-    }
+    AnimateIndoorShowMonBg(task);
+    if (SlideIndoorBannerOffscreen(task))
+        task->tState++;
 }
 
-static void sub_80B8A64(struct Task *task)
+static void FieldMoveShowMonIndoorsEffect_End(struct Task *task)
 {
     IntrCallback intrCallback;
     u16 bg0cnt;
@@ -2723,231 +2827,248 @@ static void sub_80B8A64(struct Task *task)
     CpuFill32(0, (void *)VRAM + bg0cnt, 0x800);
     LoadWordFromTwoHalfwords((u16 *)&task->data[13], (u32 *)&intrCallback);
     SetVBlankCallback(intrCallback);
-    sub_8197200();
-    FreeResourcesAndDestroySprite(&gSprites[task->data[15]], task->data[15]);
+    InitTextBoxGfxAndPrinters();
+    FreeResourcesAndDestroySprite(&gSprites[task->tMonSpriteId], task->tMonSpriteId);
     FieldEffectActiveListRemove(FLDEFF_FIELD_MOVE_SHOW_MON);
-    DestroyTask(FindTaskIdByFunc(sub_80B88B4));
+    DestroyTask(FindTaskIdByFunc(Task_FieldMoveShowMonIndoors));
 }
 
-static void sub_80B8AE0(void)
+static void VBlankCB_FieldMoveShowMonIndoors(void)
 {
     IntrCallback intrCallback;
     struct Task *task;
-    task = &gTasks[FindTaskIdByFunc(sub_80B88B4)];
+    task = &gTasks[FindTaskIdByFunc(Task_FieldMoveShowMonIndoors)];
     LoadWordFromTwoHalfwords((u16 *)&task->data[13], (u32 *)&intrCallback);
     intrCallback();
-    SetGpuReg(REG_OFFSET_BG0HOFS, task->data[1]);
-    SetGpuReg(REG_OFFSET_BG0VOFS, task->data[2]);
+    SetGpuReg(REG_OFFSET_BG0HOFS, task->tBgHoriz);
+    SetGpuReg(REG_OFFSET_BG0VOFS, task->tBgVert);
 }
 
-static void sub_80B8B28(struct Task *task)
+static void AnimateIndoorShowMonBg(struct Task *task)
 {
-    task->data[1] -= 16;
-    task->data[3] += 16;
+    task->tBgHoriz -= 16;
+    task->tBgOffsetIdx += 16;
 }
 
-static bool8 sub_80B8B38(struct Task *task)
+static bool8 SlideIndoorBannerOnscreen(struct Task *task)
 {
     u16 i;
     u16 srcOffs;
     u16 dstOffs;
     u16 *dest;
-    if (task->data[4] >= 32)
-    {
+
+    if (task->tBgOffset >= 32)
         return TRUE;
-    }
-    dstOffs = (task->data[3] >> 3) & 0x1f;
-    if (dstOffs >= task->data[4])
+
+    dstOffs = (task->tBgOffsetIdx >> 3) & 0x1f;
+    if (dstOffs >= task->tBgOffset)
     {
         dstOffs = (32 - dstOffs) & 0x1f;
-        srcOffs = (32 - task->data[4]) & 0x1f;
+        srcOffs = (32 - task->tBgOffset) & 0x1f;
         dest = (u16 *)(VRAM + 0x140 + (u16)task->data[12]);
         for (i = 0; i < 10; i++)
         {
-            dest[dstOffs + i * 32] = gDarknessFieldMoveStreaksTilemap[srcOffs + i * 32];
+            dest[dstOffs + i * 32] = sFieldMoveStreaksIndoors_Tilemap[srcOffs + i * 32];
             dest[dstOffs + i * 32] |= 0xf000;
 
-            dest[((dstOffs + 1) & 0x1f) + i * 32] = gDarknessFieldMoveStreaksTilemap[((srcOffs + 1) & 0x1f) + i * 32] | 0xf000;
+            dest[((dstOffs + 1) & 0x1f) + i * 32] = sFieldMoveStreaksIndoors_Tilemap[((srcOffs + 1) & 0x1f) + i * 32] | 0xf000;
             dest[((dstOffs + 1) & 0x1f) + i * 32] |= 0xf000;
         }
-        task->data[4] += 2;
+        task->tBgOffset += 2;
     }
     return FALSE;
 }
 
-static bool8 sub_80B8BF0(struct Task *task)
+static bool8 SlideIndoorBannerOffscreen(struct Task *task)
 {
     u16 i;
     u16 dstOffs;
     u16 *dest;
-    if (task->data[4] >= 32)
-    {
+
+    if (task->tBgOffset >= 32)
         return TRUE;
-    }
-    dstOffs = task->data[3] >> 3;
-    if (dstOffs >= task->data[4])
+
+    dstOffs = task->tBgOffsetIdx >> 3;
+    if (dstOffs >= task->tBgOffset)
     {
-        dstOffs = (task->data[1] >> 3) & 0x1f;
+        dstOffs = (task->tBgHoriz >> 3) & 0x1f;
         dest = (u16 *)(VRAM + 0x140 + (u16)task->data[12]);
         for (i = 0; i < 10; i++)
         {
             dest[dstOffs + i * 32] = 0xf000;
             dest[((dstOffs + 1) & 0x1f) + i * 32] = 0xf000;
         }
-        task->data[4] += 2;
+        task->tBgOffset += 2;
     }
     return FALSE;
 }
 
-static u8 sub_80B8C60(u32 a0, u32 a1, u32 a2)
+#undef tState
+#undef tBgHoriz
+#undef tBgVert
+#undef tBgOffsetIdx
+#undef tBgOffset
+#undef tMonSpriteId
+
+static u8 InitFieldMoveMonSprite(u32 species, u32 otId, u32 personality)
 {
     u16 v0;
     u8 monSprite;
     struct Sprite *sprite;
-    v0 = (a0 & 0x80000000) >> 16;
-    a0 &= 0x7fffffff;
-    monSprite = CreateMonSprite_FieldMove(a0, a1, a2, 0x140, 0x50, 0);
+    v0 = (species & 0x80000000) >> 16;
+    species &= 0x7fffffff;
+    monSprite = CreateMonSprite_FieldMove(species, otId, personality, 320, 80, 0);
     sprite = &gSprites[monSprite];
     sprite->callback = SpriteCallbackDummy;
     sprite->oam.priority = 0;
-    sprite->data[0] = a0;
+    sprite->sSpecies = species;
     sprite->data[6] = v0;
     return monSprite;
 }
 
-static void sub_80B8CC0(struct Sprite *sprite)
+static void SpriteCB_FieldMoveMonSlideOnscreen(struct Sprite *sprite)
 {
-    if ((sprite->pos1.x -= 20) <= 0x78)
+    if ((sprite->pos1.x -= 20) <= DISPLAY_WIDTH / 2)
     {
-        sprite->pos1.x = 0x78;
-        sprite->data[1] = 30;
-        sprite->callback = sub_80B8D04;
+        sprite->pos1.x = DISPLAY_WIDTH / 2;
+        sprite->sOnscreenTimer = 30;
+        sprite->callback = SpriteCB_FieldMoveMonWaitAfterCry;
         if (sprite->data[6])
         {
-            PlayCry2(sprite->data[0], 0, 0x7d, 0xa);
+            PlayCry2(sprite->sSpecies, 0, 0x7d, 0xa);
         }
         else
         {
-            PlayCry1(sprite->data[0], 0);
+            PlayCry1(sprite->sSpecies, 0);
         }
     }
 }
 
-static void sub_80B8D04(struct Sprite *sprite)
+static void SpriteCB_FieldMoveMonWaitAfterCry(struct Sprite *sprite)
 {
-    if ((--sprite->data[1]) == 0)
-    {
-        sprite->callback = sub_80B8D20;
-    }
+    if ((--sprite->sOnscreenTimer) == 0)
+        sprite->callback = SpriteCB_FieldMoveMonSlideOffscreen;
 }
 
-static void sub_80B8D20(struct Sprite *sprite)
+static void SpriteCB_FieldMoveMonSlideOffscreen(struct Sprite *sprite)
 {
-    if (sprite->pos1.x < -0x40)
-    {
-        sprite->data[7] = 1;
-    }
+    if (sprite->pos1.x < -64)
+        sprite->sSlidOffscreen = TRUE;
     else
-    {
         sprite->pos1.x -= 20;
-    }
 }
 
+#undef tState
+#undef tMonSpriteId
+#undef sSpecies
+#undef sSlidOffscreen
+#undef sOnscreenTimer
+
+#define tState data[0]
+#define tDestX data[1]
+#define tDestY data[2]
+#define tMonId data[15]
+
 u8 FldEff_UseSurf(void)
 {
-    u8 taskId = CreateTask(sub_80B8D84, 0xff);
-    gTasks[taskId].data[15] = gFieldEffectArguments[0];
+    u8 taskId = CreateTask(Task_SurfFieldEffect, 0xff);
+    gTasks[taskId].tMonId = gFieldEffectArguments[0];
     Overworld_ClearSavedMusic();
     Overworld_ChangeMusicTo(MUS_NAMINORI);
     return FALSE;
 }
 
-void (*const gUnknown_0855C4E0[])(struct Task *) = {
-    sub_80B8DB4,
-    sub_80B8E14,
-    sub_80B8E60,
-    sub_80B8EA8,
-    sub_80B8F24,
+void (*const sSurfFieldEffectFuncs[])(struct Task *) = {
+    SurfFieldEffect_Init,
+    SurfFieldEffect_FieldMovePose,
+    SurfFieldEffect_ShowMon,
+    SurfFieldEffect_JumpOnSurfBlob,
+    SurfFieldEffect_End,
 };
 
-static void sub_80B8D84(u8 taskId)
+static void Task_SurfFieldEffect(u8 taskId)
 {
-    gUnknown_0855C4E0[gTasks[taskId].data[0]](&gTasks[taskId]);
+    sSurfFieldEffectFuncs[gTasks[taskId].tState](&gTasks[taskId]);
 }
 
-static void sub_80B8DB4(struct Task *task)
+static void SurfFieldEffect_Init(struct Task *task)
 {
     ScriptContext2_Enable();
     FreezeObjectEvents();
     gPlayerAvatar.preventStep = TRUE;
-    SetPlayerAvatarStateMask(8);
-    PlayerGetDestCoords(&task->data[1], &task->data[2]);
-    MoveCoords(gObjectEvents[gPlayerAvatar.objectEventId].movementDirection, &task->data[1], &task->data[2]);
-    task->data[0]++;
+    SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_SURFING);
+    PlayerGetDestCoords(&task->tDestX, &task->tDestY);
+    MoveCoords(gObjectEvents[gPlayerAvatar.objectEventId].movementDirection, &task->tDestX, &task->tDestY);
+    task->tState++;
 }
 
-static void sub_80B8E14(struct Task *task)
+static void SurfFieldEffect_FieldMovePose(struct Task *task)
 {
     struct ObjectEvent *objectEvent;
     objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
     if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent))
     {
-        sub_808C114();
+        SetPlayerAvatarFieldMove();
         ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION);
-        task->data[0]++;
+        task->tState++;
     }
 }
 
-static void sub_80B8E60(struct Task *task)
+static void SurfFieldEffect_ShowMon(struct Task *task)
 {
     struct ObjectEvent *objectEvent;
     objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
     if (ObjectEventCheckHeldMovementStatus(objectEvent))
     {
-        gFieldEffectArguments[0] = task->data[15] | 0x80000000;
+        gFieldEffectArguments[0] = task->tMonId | 0x80000000;
         FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
-        task->data[0]++;
+        task->tState++;
     }
 }
 
-static void sub_80B8EA8(struct Task *task)
+static void SurfFieldEffect_JumpOnSurfBlob(struct Task *task)
 {
     struct ObjectEvent *objectEvent;
     if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
     {
         objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
-        ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(3));
+        ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING));
         ObjectEventClearHeldMovementIfFinished(objectEvent);
         ObjectEventSetHeldMovement(objectEvent, GetJumpSpecialMovementAction(objectEvent->movementDirection));
-        gFieldEffectArguments[0] = task->data[1];
-        gFieldEffectArguments[1] = task->data[2];
+        gFieldEffectArguments[0] = task->tDestX;
+        gFieldEffectArguments[1] = task->tDestY;
         gFieldEffectArguments[2] = gPlayerAvatar.objectEventId;
         objectEvent->fieldEffectSpriteId = FieldEffectStart(FLDEFF_SURF_BLOB);
-        task->data[0]++;
+        task->tState++;
     }
 }
 
-static void sub_80B8F24(struct Task *task)
+static void SurfFieldEffect_End(struct Task *task)
 {
     struct ObjectEvent *objectEvent;
     objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
     if (ObjectEventClearHeldMovementIfFinished(objectEvent))
     {
         gPlayerAvatar.preventStep = FALSE;
-        gPlayerAvatar.flags &= 0xdf;
+        gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_5;
         ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(objectEvent->movementDirection));
-        sub_81555AC(objectEvent->fieldEffectSpriteId, 1);
+        SetSurfBobState(objectEvent->fieldEffectSpriteId, 1);
         UnfreezeObjectEvents();
         ScriptContext2_Disable();
         FieldEffectActiveListRemove(FLDEFF_USE_SURF);
-        DestroyTask(FindTaskIdByFunc(sub_80B8D84));
+        DestroyTask(FindTaskIdByFunc(Task_SurfFieldEffect));
     }
 }
 
-u8 sub_80B8F98(void)
+#undef tState
+#undef tDestX
+#undef tDestY
+#undef tMonId
+
+u8 FldEff_RayquazaSpotlight(void)
 {
     u8 i, j, k;
-    u8 spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[36], 0x78, -0x18, 1);
+    u8 spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_RAYQUAZA], 120, -24, 1);
     struct Sprite *sprite = &gSprites[spriteId];
 
     sprite->oam.priority = 1;
@@ -2961,7 +3082,7 @@ u8 sub_80B8F98(void)
     SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD);
     SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(14, 14));
     SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR);
-    LoadPalette(gUnknown_0855B610, 0xC0, sizeof(gUnknown_0855B610));
+    LoadPalette(sSpotlight_Pal, 0xC0, sizeof(sSpotlight_Pal));
     SetGpuReg(REG_OFFSET_BG0VOFS, 120);
     for (i = 3; i < 15; i++)
     {
@@ -2974,8 +3095,8 @@ u8 sub_80B8F98(void)
     {
         for (i = 0; i < 8; i++)
         {
-            *(u16*)(BG_CHAR_ADDR(2) + (k + 1) * 32 + i * 4) = (gUnknown_0855B630[k * 32 + i * 4 + 1] << 8) + gUnknown_0855B630[k * 32 + i * 4];
-            *(u16*)(BG_CHAR_ADDR(2) + (k + 1) * 32 + i * 4 + 2) = (gUnknown_0855B630[k * 32 + i * 4 + 3] << 8) + gUnknown_0855B630[k * 32 + i * 4 + 2];
+            *(u16*)(BG_CHAR_ADDR(2) + (k + 1) * 32 + i * 4) = (sSpotlight_Gfx[k * 32 + i * 4 + 1] << 8) + sSpotlight_Gfx[k * 32 + i * 4];
+            *(u16*)(BG_CHAR_ADDR(2) + (k + 1) * 32 + i * 4 + 2) = (sSpotlight_Gfx[k * 32 + i * 4 + 3] << 8) + sSpotlight_Gfx[k * 32 + i * 4 + 2];
         }
     }
     return spriteId;
@@ -2983,18 +3104,18 @@ u8 sub_80B8F98(void)
 
 u8 FldEff_NPCFlyOut(void)
 {
-    u8 spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[26], 0x78, 0, 1);
+    u8 spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_BIRD], 0x78, 0, 1);
     struct Sprite *sprite = &gSprites[spriteId];
 
     sprite->oam.paletteNum = 0;
     sprite->oam.priority = 1;
-    sprite->callback = sub_80B9128;
+    sprite->callback = SpriteCB_NPCFlyOut;
     sprite->data[1] = gFieldEffectArguments[0];
     PlaySE(SE_W019);
     return spriteId;
 }
 
-static void sub_80B9128(struct Sprite *sprite)
+static void SpriteCB_NPCFlyOut(struct Sprite *sprite)
 {
     struct Sprite *npcSprite;
 
@@ -3004,214 +3125,224 @@ static void sub_80B9128(struct Sprite *sprite)
     if (sprite->data[0])
     {
         npcSprite = &gSprites[sprite->data[1]];
-        npcSprite->coordOffsetEnabled = 0;
+        npcSprite->coordOffsetEnabled = FALSE;
         npcSprite->pos1.x = sprite->pos1.x + sprite->pos2.x;
         npcSprite->pos1.y = sprite->pos1.y + sprite->pos2.y - 8;
         npcSprite->pos2.x = 0;
         npcSprite->pos2.y = 0;
     }
+
     if (sprite->data[2] >= 0x80)
-    {
         FieldEffectStop(sprite, FLDEFF_NPCFLY_OUT);
-    }
 }
 
+// Task data for Task_FlyOut/FlyIn
+#define tState          data[0]
+#define tMonId          data[1]
+#define tBirdSpriteId   data[1] //re-used
+#define tTimer          data[2]
+#define tAvatarFlags    data[15]
+
+// Sprite data for the fly bird
+#define sPlayerSpriteId data[6]
+#define sAnimCompleted  data[7]
+
 u8 FldEff_UseFly(void)
 {
-    u8 taskId = CreateTask(sub_80B91D4, 0xfe);
-    gTasks[taskId].data[1] = gFieldEffectArguments[0];
+    u8 taskId = CreateTask(Task_FlyOut, 254);
+    gTasks[taskId].tMonId = gFieldEffectArguments[0];
     return 0;
 }
 
-void (*const gUnknown_0855C4F4[])(struct Task *) = {
-    sub_80B9204,
-    sub_80B925C,
-    sub_80B92A0,
-    sub_80B92F8,
-    sub_80B933C,
-    sub_80B9390,
-    sub_80B9418,
-    sub_80B9474,
-    sub_80B9494,
+void (*const sFlyOutFieldEffectFuncs[])(struct Task *) = {
+    FlyOutFieldEffect_FieldMovePose,
+    FlyOutFieldEffect_ShowMon,
+    FlyOutFieldEffect_BirdLeaveBall,
+    FlyOutFieldEffect_WaitBirdLeave,
+    FlyOutFieldEffect_BirdSwoopDown,
+    FlyOutFieldEffect_JumpOnBird,
+    FlyOutFieldEffect_FlyOffWithBird,
+    FlyOutFieldEffect_WaitFlyOff,
+    FlyOutFieldEffect_End,
 };
 
-static void sub_80B91D4(u8 taskId)
+static void Task_FlyOut(u8 taskId)
 {
-    gUnknown_0855C4F4[gTasks[taskId].data[0]](&gTasks[taskId]);
+    sFlyOutFieldEffectFuncs[gTasks[taskId].tState](&gTasks[taskId]);
 }
 
-static void sub_80B9204(struct Task *task)
+static void FlyOutFieldEffect_FieldMovePose(struct Task *task)
 {
     struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
     if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent))
     {
-        task->data[15] = gPlayerAvatar.flags;
+        task->tAvatarFlags = gPlayerAvatar.flags;
         gPlayerAvatar.preventStep = TRUE;
-        SetPlayerAvatarStateMask(1);
-        sub_808C114();
+        SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ON_FOOT);
+        SetPlayerAvatarFieldMove();
         ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION);
-        task->data[0]++;
+        task->tState++;
     }
 }
 
-static void sub_80B925C(struct Task *task)
+static void FlyOutFieldEffect_ShowMon(struct Task *task)
 {
     struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
     if (ObjectEventClearHeldMovementIfFinished(objectEvent))
     {
-        task->data[0]++;
-        gFieldEffectArguments[0] = task->data[1];
+        task->tState++;
+        gFieldEffectArguments[0] = task->tMonId;
         FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
     }
 }
 
-static void sub_80B92A0(struct Task *task)
+static void FlyOutFieldEffect_BirdLeaveBall(struct Task *task)
 {
     if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
     {
         struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
-        if (task->data[15] & 0x08)
+        if (task->tAvatarFlags & PLAYER_AVATAR_FLAG_SURFING)
         {
-            sub_81555AC(objectEvent->fieldEffectSpriteId, 2);
-            sub_81555D8(objectEvent->fieldEffectSpriteId, 0);
+            SetSurfBobState(objectEvent->fieldEffectSpriteId, 2);
+            SetSurfBobWhileFlyingOutState(objectEvent->fieldEffectSpriteId, 0);
         }
-        task->data[1] = sub_80B94C4();
-        task->data[0]++;
+        task->tBirdSpriteId = CreateFlyBirdSprite(); // Does "leave ball" animation by default
+        task->tState++;
     }
 }
 
-static void sub_80B92F8(struct Task *task)
+static void FlyOutFieldEffect_WaitBirdLeave(struct Task *task)
 {
-    if (sub_80B9508(task->data[1]))
+    if (GetFlyBirdAnimCompleted(task->tBirdSpriteId))
     {
-        task->data[0]++;
-        task->data[2] = 16;
+        task->tState++;
+        task->tTimer = 16;
         SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT);
         ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], MOVEMENT_ACTION_FACE_LEFT);
     }
 }
 
-static void sub_80B933C(struct Task *task)
+static void FlyOutFieldEffect_BirdSwoopDown(struct Task *task)
 {
     struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
-    if ((task->data[2] == 0 || (--task->data[2]) == 0) && ObjectEventClearHeldMovementIfFinished(objectEvent))
+    if ((task->tTimer == 0 || (--task->tTimer) == 0) && ObjectEventClearHeldMovementIfFinished(objectEvent))
     {
-        task->data[0]++;
+        task->tState++;
         PlaySE(SE_W019);
-        sub_80B9524(task->data[1]);
+        StartFlyBirdSwoopDown(task->tBirdSpriteId);
     }
 }
 
-static void sub_80B9390(struct Task *task)
+static void FlyOutFieldEffect_JumpOnBird(struct Task *task)
 {
-    if ((++task->data[2]) >= 8)
+    if ((++task->tTimer) >= 8)
     {
         struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
-        ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(0x03));
+        ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING));
         StartSpriteAnim(&gSprites[objectEvent->spriteId], 0x16);
-        objectEvent->inanimate = 1;
+        objectEvent->inanimate = TRUE;
         ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT);
-        if (task->data[15] & 0x08)
+        if (task->tAvatarFlags & PLAYER_AVATAR_FLAG_SURFING)
         {
             DestroySprite(&gSprites[objectEvent->fieldEffectSpriteId]);
         }
-        task->data[0]++;
-        task->data[2] = 0;
+        task->tState++;
+        task->tTimer = 0;
     }
 }
 
-static void sub_80B9418(struct Task *task)
+static void FlyOutFieldEffect_FlyOffWithBird(struct Task *task)
 {
-    if ((++task->data[2]) >= 10)
+    if ((++task->tTimer) >= 10)
     {
         struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
         ObjectEventClearHeldMovementIfActive(objectEvent);
-        objectEvent->inanimate = 0;
-        objectEvent->hasShadow = 0;
-        sub_80B9560(task->data[1], objectEvent->spriteId);
+        objectEvent->inanimate = FALSE;
+        objectEvent->hasShadow = FALSE;
+        SetFlyBirdPlayerSpriteId(task->tBirdSpriteId, objectEvent->spriteId);
         CameraObjectReset2();
-        task->data[0]++;
+        task->tState++;
     }
 }
 
-static void sub_80B9474(struct Task *task)
+static void FlyOutFieldEffect_WaitFlyOff(struct Task *task)
 {
-    if (sub_80B9508(task->data[1]))
+    if (GetFlyBirdAnimCompleted(task->tBirdSpriteId))
     {
         WarpFadeOutScreen();
-        task->data[0]++;
+        task->tState++;
     }
 }
 
-static void sub_80B9494(struct Task *task)
+static void FlyOutFieldEffect_End(struct Task *task)
 {
     if (!gPaletteFade.active)
     {
         FieldEffectActiveListRemove(FLDEFF_USE_FLY);
-        DestroyTask(FindTaskIdByFunc(sub_80B91D4));
+        DestroyTask(FindTaskIdByFunc(Task_FlyOut));
     }
 }
 
-static u8 sub_80B94C4(void)
+static u8 CreateFlyBirdSprite(void)
 {
     u8 spriteId;
     struct Sprite *sprite;
-    spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[26], 0xff, 0xb4, 0x1);
+    spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_BIRD], 0xff, 0xb4, 0x1);
     sprite = &gSprites[spriteId];
     sprite->oam.paletteNum = 0;
     sprite->oam.priority = 1;
-    sprite->callback = sub_80B957C;
+    sprite->callback = SpriteCB_FlyBirdLeaveBall;
     return spriteId;
 }
 
-static u8 sub_80B9508(u8 spriteId)
+static u8 GetFlyBirdAnimCompleted(u8 spriteId)
 {
-    return gSprites[spriteId].data[7];
+    return gSprites[spriteId].sAnimCompleted;
 }
 
-static void sub_80B9524(u8 spriteId)
+static void StartFlyBirdSwoopDown(u8 spriteId)
 {
     struct Sprite *sprite;
     sprite = &gSprites[spriteId];
-    sprite->callback = sub_80B963C;
-    sprite->pos1.x = 0x78;
-    sprite->pos1.y = 0x00;
+    sprite->callback = SpriteCB_FlyBirdSwoopDown;
+    sprite->pos1.x = DISPLAY_WIDTH / 2;
+    sprite->pos1.y = 0;
     sprite->pos2.x = 0;
     sprite->pos2.y = 0;
     memset(&sprite->data[0], 0, 8 * sizeof(u16) /* zero all data cells */);
-    sprite->data[6] = 0x40;
+    sprite->sPlayerSpriteId = MAX_SPRITES;
 }
 
-static void sub_80B9560(u8 a0, u8 a1)
+static void SetFlyBirdPlayerSpriteId(u8 birdSpriteId, u8 playerSpriteId)
 {
-    gSprites[a0].data[6] = a1;
+    gSprites[birdSpriteId].sPlayerSpriteId = playerSpriteId;
 }
 
-const union AffineAnimCmd SpriteAffineAnim_855C518[] = {
+static const union AffineAnimCmd sAffineAnim_FlyBirdLeaveBall[] = {
     AFFINEANIMCMD_FRAME(8, 8, -30, 0),
     AFFINEANIMCMD_FRAME(28, 28, 0, 30),
     AFFINEANIMCMD_END
 };
 
-const union AffineAnimCmd SpriteAffineAnim_855C530[] = {
+static const union AffineAnimCmd sAffineAnim_FlyBirdReturnToBall[] = {
     AFFINEANIMCMD_FRAME(256, 256, 64, 0),
     AFFINEANIMCMD_FRAME(-10, -10, 0, 22),
     AFFINEANIMCMD_END
 };
 
-const union AffineAnimCmd *const gSpriteAffineAnimTable_0855C548[] = {
-    SpriteAffineAnim_855C518,
-    SpriteAffineAnim_855C530
+static const union AffineAnimCmd *const sAffineAnims_FlyBird[] = {
+    sAffineAnim_FlyBirdLeaveBall,
+    sAffineAnim_FlyBirdReturnToBall
 };
 
-static void sub_80B957C(struct Sprite *sprite)
+static void SpriteCB_FlyBirdLeaveBall(struct Sprite *sprite)
 {
-    if (sprite->data[7] == 0)
+    if (sprite->sAnimCompleted == FALSE)
     {
         if (sprite->data[0] == 0)
         {
             sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE;
-            sprite->affineAnims = gSpriteAffineAnimTable_0855C548;
+            sprite->affineAnims = sAffineAnims_FlyBird;
             InitSpriteAffineAnim(sprite);
             StartSpriteAffineAnim(sprite, 0);
             sprite->pos1.x = 0x76;
@@ -3229,7 +3360,7 @@ static void sub_80B957C(struct Sprite *sprite)
         }
         if (sprite->data[1] > 0x81)
         {
-            sprite->data[7]++;
+            sprite->sAnimCompleted++;
             sprite->oam.affineMode = ST_OAM_AFFINE_OFF;
             FreeOamMatrix(sprite->oam.matrixNum);
             CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, ST_OAM_AFFINE_OFF);
@@ -3237,15 +3368,15 @@ static void sub_80B957C(struct Sprite *sprite)
     }
 }
 
-static void sub_80B963C(struct Sprite *sprite)
+static void SpriteCB_FlyBirdSwoopDown(struct Sprite *sprite)
 {
     sprite->pos2.x = Cos(sprite->data[2], 0x8c);
     sprite->pos2.y = Sin(sprite->data[2], 0x48);
     sprite->data[2] = (sprite->data[2] + 4) & 0xff;
-    if (sprite->data[6] != MAX_SPRITES)
+    if (sprite->sPlayerSpriteId != MAX_SPRITES)
     {
-        struct Sprite *sprite1 = &gSprites[sprite->data[6]];
-        sprite1->coordOffsetEnabled = 0;
+        struct Sprite *sprite1 = &gSprites[sprite->sPlayerSpriteId];
+        sprite1->coordOffsetEnabled = FALSE;
         sprite1->pos1.x = sprite->pos1.x + sprite->pos2.x;
         sprite1->pos1.y = sprite->pos1.y + sprite->pos2.y - 8;
         sprite1->pos2.x = 0;
@@ -3253,18 +3384,18 @@ static void sub_80B963C(struct Sprite *sprite)
     }
     if (sprite->data[2] >= 0x80)
     {
-        sprite->data[7] = 1;
+        sprite->sAnimCompleted = TRUE;
     }
 }
 
-void sub_80B96B0(struct Sprite *sprite)
+static void SpriteCB_FlyBirdReturnToBall(struct Sprite *sprite)
 {
-    if (sprite->data[7] == 0)
+    if (sprite->sAnimCompleted == FALSE)
     {
         if (sprite->data[0] == 0)
         {
             sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE;
-            sprite->affineAnims = gSpriteAffineAnimTable_0855C548;
+            sprite->affineAnims = sAffineAnims_FlyBird;
             InitSpriteAffineAnim(sprite);
             StartSpriteAffineAnim(sprite, 1);
             sprite->pos1.x = 0x5e;
@@ -3293,7 +3424,7 @@ void sub_80B96B0(struct Sprite *sprite)
         }
         if (sprite->data[3] >= 60)
         {
-            sprite->data[7]++;
+            sprite->sAnimCompleted++;
             sprite->oam.affineMode = ST_OAM_AFFINE_OFF;
             FreeOamMatrix(sprite->oam.matrixNum);
             sprite->invisible = TRUE;
@@ -3301,80 +3432,80 @@ void sub_80B96B0(struct Sprite *sprite)
     }
 }
 
-void sub_80B9794(u8 spriteId)
+static void StartFlyBirdReturnToBall(u8 spriteId)
 {
-    sub_80B9524(spriteId);
-    gSprites[spriteId].callback = sub_80B96B0;
+    StartFlyBirdSwoopDown(spriteId); // Set up is the same, but overrwrites the callback below
+    gSprites[spriteId].callback = SpriteCB_FlyBirdReturnToBall;
 }
 
 u8 FldEff_FlyIn(void)
 {
-    CreateTask(sub_80B97D4, 0xfe);
+    CreateTask(Task_FlyIn, 254);
     return 0;
 }
 
-void (*const gUnknown_0855C550[])(struct Task *) = {
-    sub_80B9804,
-    sub_80B98B8,
-    sub_80B9924,
-    sub_80B9978,
-    sub_80B99F0,
-    sub_80B9A28,
-    sub_80B9A60,
+void (*const sFlyInFieldEffectFuncs[])(struct Task *) = {
+    FlyInFieldEffect_BirdSwoopDown,
+    FlyInFieldEffect_FlyInWithBird,
+    FlyInFieldEffect_JumpOffBird,
+    FlyInFieldEffect_FieldMovePose,
+    FlyInFieldEffect_BirdReturnToBall,
+    FlyInFieldEffect_WaitBirdReturn,
+    FlyInFieldEffect_End,
 };
 
-static void sub_80B97D4(u8 taskId)
+static void Task_FlyIn(u8 taskId)
 {
-    gUnknown_0855C550[gTasks[taskId].data[0]](&gTasks[taskId]);
+    sFlyInFieldEffectFuncs[gTasks[taskId].tState](&gTasks[taskId]);
 }
 
-static void sub_80B9804(struct Task *task)
+static void FlyInFieldEffect_BirdSwoopDown(struct Task *task)
 {
     struct ObjectEvent *objectEvent;
     objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
     if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent))
     {
-        task->data[0]++;
-        task->data[2] = 17;
-        task->data[15] = gPlayerAvatar.flags;
+        task->tState++;
+        task->tTimer = 17;
+        task->tAvatarFlags = gPlayerAvatar.flags;
         gPlayerAvatar.preventStep = TRUE;
-        SetPlayerAvatarStateMask(0x01);
-        if (task->data[15] & 0x08)
+        SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ON_FOOT);
+        if (task->tAvatarFlags & PLAYER_AVATAR_FLAG_SURFING)
         {
-            sub_81555AC(objectEvent->fieldEffectSpriteId, 0);
+            SetSurfBobState(objectEvent->fieldEffectSpriteId, 0);
         }
-        ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(0x3));
+        ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING));
         CameraObjectReset2();
         ObjectEventTurn(objectEvent, DIR_WEST);
         StartSpriteAnim(&gSprites[objectEvent->spriteId], 0x16);
         objectEvent->invisible = FALSE;
-        task->data[1] = sub_80B94C4();
-        sub_80B9524(task->data[1]);
-        sub_80B9560(task->data[1], objectEvent->spriteId);
+        task->tBirdSpriteId = CreateFlyBirdSprite();
+        StartFlyBirdSwoopDown(task->tBirdSpriteId);
+        SetFlyBirdPlayerSpriteId(task->tBirdSpriteId, objectEvent->spriteId);
     }
 }
 
-static void sub_80B98B8(struct Task *task)
+static void FlyInFieldEffect_FlyInWithBird(struct Task *task)
 {
     struct ObjectEvent *objectEvent;
     struct Sprite *sprite;
-    if (task->data[2] == 0 || (--task->data[2]) == 0)
+    if (task->tTimer == 0 || (--task->tTimer) == 0)
     {
         objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
         sprite = &gSprites[objectEvent->spriteId];
-        sub_80B9560(task->data[1], 0x40);
+        SetFlyBirdPlayerSpriteId(task->tBirdSpriteId, MAX_SPRITES);
         sprite->pos1.x += sprite->pos2.x;
         sprite->pos1.y += sprite->pos2.y;
         sprite->pos2.x = 0;
         sprite->pos2.y = 0;
-        task->data[0]++;
-        task->data[2] = 0;
+        task->tState++;
+        task->tTimer = 0;
     }
 }
 
-static void sub_80B9924(struct Task *task)
+static void FlyInFieldEffect_JumpOffBird(struct Task *task)
 {
-    s16 unknown_0855C56C[18] = {
+    s16 sYPositions[18] = {
         -2,
         -4,
         -5,
@@ -3395,227 +3526,257 @@ static void sub_80B9924(struct Task *task)
         8
     };
     struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId];
-    sprite->pos2.y = unknown_0855C56C[task->data[2]];
-    if ((++task->data[2]) >= 18)
-    {
-        task->data[0]++;
-    }
+    sprite->pos2.y = sYPositions[task->tTimer];
+
+    if ((++task->tTimer) >= (int)ARRAY_COUNT(sYPositions))
+        task->tState++;
 }
 
-static void sub_80B9978(struct Task *task)
+static void FlyInFieldEffect_FieldMovePose(struct Task *task)
 {
     struct ObjectEvent *objectEvent;
     struct Sprite *sprite;
-    if (sub_80B9508(task->data[1]))
+    if (GetFlyBirdAnimCompleted(task->tBirdSpriteId))
     {
         objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
         sprite = &gSprites[objectEvent->spriteId];
-        objectEvent->inanimate = 0;
+        objectEvent->inanimate = FALSE;
         MoveObjectEventToMapCoords(objectEvent, objectEvent->currentCoords.x, objectEvent->currentCoords.y);
         sprite->pos2.x = 0;
         sprite->pos2.y = 0;
-        sprite->coordOffsetEnabled = 1;
-        sub_808C114();
+        sprite->coordOffsetEnabled = TRUE;
+        SetPlayerAvatarFieldMove();
         ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION);
-        task->data[0]++;
+        task->tState++;
     }
 }
 
-static void sub_80B99F0(struct Task *task)
+static void FlyInFieldEffect_BirdReturnToBall(struct Task *task)
 {
     if (ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gPlayerAvatar.objectEventId]))
     {
-        task->data[0]++;
-        sub_80B9794(task->data[1]);
+        task->tState++;
+        StartFlyBirdReturnToBall(task->tBirdSpriteId);
     }
 }
 
-static void sub_80B9A28(struct Task *task)
+static void FlyInFieldEffect_WaitBirdReturn(struct Task *task)
 {
-    if (sub_80B9508(task->data[1]))
+    if (GetFlyBirdAnimCompleted(task->tBirdSpriteId))
     {
-        DestroySprite(&gSprites[task->data[1]]);
-        task->data[0]++;
-        task->data[1] = 0x10;
+        DestroySprite(&gSprites[task->tBirdSpriteId]);
+        task->tState++;
+        task->data[1] = 16;
     }
 }
 
-static void sub_80B9A60(struct Task *task)
+static void FlyInFieldEffect_End(struct Task *task)
 {
     u8 state;
     struct ObjectEvent *objectEvent;
     if ((--task->data[1]) == 0)
     {
         objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
-        state = 0;
-        if (task->data[15] & 0x08)
+        state = PLAYER_AVATAR_STATE_NORMAL;
+        if (task->tAvatarFlags & PLAYER_AVATAR_FLAG_SURFING)
         {
-            state = 3;
-            sub_81555AC(objectEvent->fieldEffectSpriteId, 1);
+            state = PLAYER_AVATAR_STATE_SURFING;
+            SetSurfBobState(objectEvent->fieldEffectSpriteId, 1);
         }
         ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(state));
         ObjectEventTurn(objectEvent, DIR_SOUTH);
-        gPlayerAvatar.flags = task->data[15];
+        gPlayerAvatar.flags = task->tAvatarFlags;
         gPlayerAvatar.preventStep = FALSE;
         FieldEffectActiveListRemove(FLDEFF_FLY_IN);
-        DestroyTask(FindTaskIdByFunc(sub_80B97D4));
+        DestroyTask(FindTaskIdByFunc(Task_FlyIn));
     }
 }
 
-bool8 sub_80B9ADC(void)
+#undef tState
+#undef tMonId
+#undef tBirdSpriteId
+#undef tTimer
+#undef tAvatarFlags
+#undef sPlayerSpriteId
+#undef sAnimCompleted
+
+#define tState         data[1]
+#define tObjectEventId data[2]
+#define tTimer         data[3]
+#define tCameraTaskId  data[5]
+#define tLocalId       data[6]
+#define tMapNum        data[7]
+#define tMapGroup      data[8]
+
+bool8 FldEff_DestroyDeoxysRock(void)
 {
     u8 taskId;
-    u8 objectEventIdBuffer;
-    if (!TryGetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &objectEventIdBuffer))
+    u8 objectEventId;
+    if (!TryGetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &objectEventId))
     {
-        taskId = CreateTask(sub_80B9BE8, 0x50);
-        gTasks[taskId].data[2] = objectEventIdBuffer;
-        gTasks[taskId].data[6] = gFieldEffectArguments[0];
-        gTasks[taskId].data[7] = gFieldEffectArguments[1];
-        gTasks[taskId].data[8] = gFieldEffectArguments[2];
+        taskId = CreateTask(Task_DestroyDeoxysRock, 80);
+        gTasks[taskId].tObjectEventId = objectEventId;
+        gTasks[taskId].tLocalId = gFieldEffectArguments[0];
+        gTasks[taskId].tMapNum = gFieldEffectArguments[1];
+        gTasks[taskId].tMapGroup = gFieldEffectArguments[2];
     }
     else
     {
-        FieldEffectActiveListRemove(0x41);
+        FieldEffectActiveListRemove(FLDEFF_DESTROY_DEOXYS_ROCK);
     }
     return FALSE;
 }
 
-void sub_80B9B3C(u8 taskId)
+#define tShakeDelay data[0]
+#define tShakeUp    data[1]
+#define tShake      data[5]
+#define tEndDelay   data[6]
+#define tEnding     data[7]
+
+static void Task_DeoxysRockCameraShake(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
-    if (data[7] != 0)
+    if (tEnding)
     {
-        if (++data[6] > 20)
+        if (++tEndDelay > 20)
         {
-            data[6] = 0;
-            if (data[5] != 0)
-                data[5]--;
+            tEndDelay = 0;
+            if (tShake != 0)
+                tShake--;
         }
     }
     else
     {
-        data[5] = 4;
+        tShake = 4;
     }
 
-    if (++data[0] > 1)
+    if (++tShakeDelay > 1)
     {
-        data[0] = 0;
-        if (++data[1] & 1)
-        {
-            SetCameraPanning(0, -data[5]);
-        }
+        tShakeDelay = 0;
+
+        if (++tShakeUp & 1)
+            SetCameraPanning(0, -tShake);
         else
-        {
-            SetCameraPanning(0, data[5]);
-        }
+            SetCameraPanning(0, tShake);
     }
     UpdateCameraPanning();
-    if (data[5] == 0)
+    if (tShake == 0)
         DestroyTask(taskId);
 }
 
-void sub_80B9BD0(u8 taskId)
+static void StartEndingDeoxysRockCameraShake(u8 taskId)
 {
-    gTasks[taskId].data[7] = 1;
+    gTasks[taskId].tEnding = TRUE;
 }
 
-void (*const gUnknown_0855C590[])(s16*, u8) = {
-    sub_80B9C28,
-    sub_80B9C54,
-    sub_80B9CDC,
+#undef tShakeDelay
+#undef tShakeUp
+#undef tShake
+#undef tEndDelay
+#undef tEnding
+
+void (*const sDestroyDeoxysRockEffectFuncs[])(s16*, u8) = {
+    DestroyDeoxysRockEffect_CameraShake,
+    DestroyDeoxysRockEffect_RockFragments,
+    DestroyDeoxysRockEffect_WaitAndEnd,
 };
 
-static void sub_80B9BE8(u8 taskId)
+static void Task_DestroyDeoxysRock(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     InstallCameraPanAheadCallback();
     SetCameraPanningCallback(0);
-    gUnknown_0855C590[data[1]](data, taskId);
+    sDestroyDeoxysRockEffectFuncs[tState](data, taskId);
 }
 
-void sub_80B9C28(s16* data, u8 taskId)
+static void DestroyDeoxysRockEffect_CameraShake(s16* data, u8 taskId)
 {
-    u8 newTaskId = CreateTask(sub_80B9B3C, 0x5A);
+    u8 newTaskId = CreateTask(Task_DeoxysRockCameraShake, 90);
     PlaySE(SE_T_KAMI2);
-    data[5] = newTaskId;
-    data[1]++;
+    tCameraTaskId = newTaskId;
+    tState++;
 }
 
-void sub_80B9D24(struct Sprite*);
-
-void sub_80B9C54(s16* data, u8 taskId)
+static void DestroyDeoxysRockEffect_RockFragments(s16* data, u8 taskId)
 {
-    if (++data[3] > 0x78)
+    if (++tTimer > 120)
     {
-        struct Sprite *sprite = &gSprites[gObjectEvents[data[2]].spriteId];
-        gObjectEvents[data[2]].invisible = TRUE;
+        struct Sprite *sprite = &gSprites[gObjectEvents[tObjectEventId].spriteId];
+        gObjectEvents[tObjectEventId].invisible = TRUE;
         BlendPalettes(0x0000FFFF, 0x10, RGB_WHITE);
         BeginNormalPaletteFade(0x0000FFFF, 0, 0x10, 0, RGB_WHITE);
-        sub_80B9D24(sprite);
+        CreateDeoxysRockFragments(sprite);
         PlaySE(SE_T_KAMI);
-        sub_80B9BD0(data[5]);
-        data[3] = 0;
-        data[1]++;
+        StartEndingDeoxysRockCameraShake(tCameraTaskId);
+        tTimer = 0;
+        tState++;
     }
 }
 
-void sub_80B9CDC(s16* a0, u8 taskId)
+static void DestroyDeoxysRockEffect_WaitAndEnd(s16* data, u8 taskId)
 {
-    if (!gPaletteFade.active && !FuncIsActiveTask(sub_80B9B3C))
+    if (!gPaletteFade.active && !FuncIsActiveTask(Task_DeoxysRockCameraShake))
     {
         InstallCameraPanAheadCallback();
-        RemoveObjectEventByLocalIdAndMap(a0[6], a0[7], a0[8]);
-        FieldEffectActiveListRemove(0x41);
+        RemoveObjectEventByLocalIdAndMap(tLocalId, tMapNum, tMapGroup);
+        FieldEffectActiveListRemove(FLDEFF_DESTROY_DEOXYS_ROCK);
         DestroyTask(taskId);
     }
 }
 
-const struct SpriteFrameImage gSpriteImageTable_855C59C[] = {
-    obj_frame_tiles(gUnknown_0855C170),
-    obj_frame_tiles(gUnknown_0855C190),
-    obj_frame_tiles(gUnknown_0855C1B0),
-    obj_frame_tiles(gUnknown_0855C1D0),
+#undef tState
+#undef tObjectEventId
+#undef tTimer
+#undef tCameraTaskId
+#undef tLocalId
+#undef tMapNum
+#undef tMapGroup
+
+static const struct SpriteFrameImage sImages_DeoxysRockFragment[] = {
+    obj_frame_tiles(sRockFragment_TopLeft),
+    obj_frame_tiles(sRockFragment_TopRight),
+    obj_frame_tiles(sRockFragment_BottomLeft),
+    obj_frame_tiles(sRockFragment_BottomRight),
 };
 
-const union AnimCmd gSpriteAnim_855C5BC[] = {
+static const union AnimCmd sAnim_RockFragment_TopLeft[] = {
     ANIMCMD_FRAME(.imageValue = 0),
     ANIMCMD_END
 };
 
-const union AnimCmd gSpriteAnim_855C5C4[] = {
+static const union AnimCmd sAnim_RockFragment_TopRight[] = {
     ANIMCMD_FRAME(.imageValue = 1),
     ANIMCMD_END
 };
 
-const union AnimCmd gSpriteAnim_855C5CC[] = {
+static const union AnimCmd sAnim_RockFragment_BottomLeft[] = {
     ANIMCMD_FRAME(.imageValue = 2),
     ANIMCMD_END
 };
 
-const union AnimCmd gSpriteAnim_855C5D4[] = {
+static const union AnimCmd sAnim_RockFragment_BottomRight[] = {
     ANIMCMD_FRAME(.imageValue = 3),
     ANIMCMD_END
 };
 
-const union AnimCmd *const gSpriteAnimTable_855C5DC[] = {
-    gSpriteAnim_855C5BC,
-    gSpriteAnim_855C5C4,
-    gSpriteAnim_855C5CC,
-    gSpriteAnim_855C5D4,
+static const union AnimCmd *const sAnims_DeoxysRockFragment[] = {
+    sAnim_RockFragment_TopLeft,
+    sAnim_RockFragment_TopRight,
+    sAnim_RockFragment_BottomLeft,
+    sAnim_RockFragment_BottomRight,
 };
 
-const struct SpriteTemplate gUnknown_0855C5EC = {
+static const struct SpriteTemplate sSpriteTemplate_DeoxysRockFragment = {
     .tileTag = 0xFFFF,
     .paletteTag = 4378,
-    .oam = &gOamData_855C218,
-    .anims = gSpriteAnimTable_855C5DC,
-    .images = gSpriteImageTable_855C59C,
+    .oam = &sOam_8x8,
+    .anims = sAnims_DeoxysRockFragment,
+    .images = sImages_DeoxysRockFragment,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_80B9DB8
+    .callback = SpriteCB_DeoxysRockFragment
 };
 
-void sub_80B9D24(struct Sprite* sprite)
+static void CreateDeoxysRockFragments(struct Sprite* sprite)
 {
     int i;
     int xPos = (s16)gTotalCameraPixelOffsetX + sprite->pos1.x + sprite->pos2.x;
@@ -3623,7 +3784,7 @@ void sub_80B9D24(struct Sprite* sprite)
 
     for (i = 0; i < 4; i++)
     {
-        u8 spriteId = CreateSprite(&gUnknown_0855C5EC, xPos, yPos, 0);
+        u8 spriteId = CreateSprite(&sSpriteTemplate_DeoxysRockFragment, xPos, yPos, 0);
         if (spriteId != MAX_SPRITES)
         {
             StartSpriteAnim(&gSprites[spriteId], i);
@@ -3633,8 +3794,9 @@ void sub_80B9D24(struct Sprite* sprite)
     }
 }
 
-static void sub_80B9DB8(struct Sprite* sprite)
+static void SpriteCB_DeoxysRockFragment(struct Sprite* sprite)
 {
+    // 1 case for each fragment, fly off in 4 different directions
     switch (sprite->data[0])
     {
     case 0:
@@ -3654,11 +3816,11 @@ static void sub_80B9DB8(struct Sprite* sprite)
         sprite->pos1.y += 12;
         break;
     }
-    if ((u16)(sprite->pos1.x + 4) > 0xF8 || sprite->pos1.y < -4 || sprite->pos1.y > 0xA4)
+    if ((u16)(sprite->pos1.x + 4) > DISPLAY_WIDTH + 8 || sprite->pos1.y < -4 || sprite->pos1.y > DISPLAY_HEIGHT + 4)
         DestroySprite(sprite);
 }
 
-bool8 Fldeff_MoveDeoxysRock(struct Sprite* sprite)
+bool8 FldEff_MoveDeoxysRock(struct Sprite* sprite)
 {
     u8 objectEventIdBuffer;
     if (!TryGetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &objectEventIdBuffer))
@@ -3672,7 +3834,7 @@ bool8 Fldeff_MoveDeoxysRock(struct Sprite* sprite)
         xPos = (gFieldEffectArguments[3] - xPos) * 16;
         yPos = (gFieldEffectArguments[4] - yPos) * 16;
         ShiftObjectEventCoords(object, gFieldEffectArguments[3] + 7, gFieldEffectArguments[4] + 7);
-        taskId = CreateTask(Fldeff_MoveDeoxysRock_Step, 0x50);
+        taskId = CreateTask(Task_MoveDeoxysRock, 80);
         gTasks[taskId].data[1] = object->spriteId;
         gTasks[taskId].data[2] = gSprites[object->spriteId].pos1.x + xPos;
         gTasks[taskId].data[3] = gSprites[object->spriteId].pos1.y + yPos;
@@ -3682,7 +3844,7 @@ bool8 Fldeff_MoveDeoxysRock(struct Sprite* sprite)
     return FALSE;
 }
 
-static void Fldeff_MoveDeoxysRock_Step(u8 taskId)
+static void Task_MoveDeoxysRock(u8 taskId)
 {
     // BUG: Possible divide by zero
     s16 *data = gTasks[taskId].data;
@@ -3711,7 +3873,7 @@ static void Fldeff_MoveDeoxysRock_Step(u8 taskId)
                 sprite->pos1.y = data[3];
                 ShiftStillObjectEventCoords(object);
                 object->triggerGroundEffectsOnStop = TRUE;
-                FieldEffectActiveListRemove(0x42);
+                FieldEffectActiveListRemove(FLDEFF_MOVE_DEOXYS_ROCK);
                 DestroyTask(taskId);
             }
             break;
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index e02de959b..6929485c4 100755
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -166,7 +166,7 @@ u8 CreateWarpArrowSprite(void)
     u8 spriteId;
     struct Sprite *sprite;
 
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[8], 0, 0, 0x52);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_ARROW], 0, 0, 0x52);
     if (spriteId != MAX_SPRITES)
     {
         sprite = &gSprites[spriteId];
@@ -202,11 +202,11 @@ void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y)
     }
 }
 
-const u8 gShadowEffectTemplateIds[] = {
-    0,
-    1,
-    2,
-    3
+static const u8 sShadowEffectTemplateIds[] = {
+    FLDEFFOBJ_SHADOW_S,
+    FLDEFFOBJ_SHADOW_M,
+    FLDEFFOBJ_SHADOW_L,
+    FLDEFFOBJ_SHADOW_XL
 };
 
 const u16 gShadowVerticalOffsets[] = {
@@ -224,7 +224,7 @@ u32 FldEff_Shadow(void)
 
     objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
     graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[gShadowEffectTemplateIds[graphicsInfo->shadowSize]], 0, 0, 0x94);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[sShadowEffectTemplateIds[graphicsInfo->shadowSize]], 0, 0, 0x94);
     if (spriteId != MAX_SPRITES)
     {
         gSprites[spriteId].coordOffsetEnabled = TRUE;
@@ -275,7 +275,7 @@ u32 FldEff_TallGrass(void)
     x = gFieldEffectArguments[0];
     y = gFieldEffectArguments[1];
     SetSpritePosToOffsetMapCoords(&x, &y, 8, 8);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[4], x, y, 0);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_TALL_GRASS], x, y, 0);
     if (spriteId != MAX_SPRITES)
     {
         sprite = &gSprites[spriteId];
@@ -341,14 +341,14 @@ u32 FldEff_JumpTallGrass(void)
     struct Sprite *sprite;
 
     SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 12);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[10], gFieldEffectArguments[0], gFieldEffectArguments[1], 0);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_JUMP_TALL_GRASS], gFieldEffectArguments[0], gFieldEffectArguments[1], 0);
     if (spriteId != MAX_SPRITES)
     {
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
         sprite->data[0] = gFieldEffectArguments[2];
-        sprite->data[1] = 12;
+        sprite->data[1] = FLDEFF_JUMP_TALL_GRASS;
     }
     return 0;
 }
@@ -381,7 +381,7 @@ u32 FldEff_LongGrass(void)
     x = gFieldEffectArguments[0];
     y = gFieldEffectArguments[1];
     SetSpritePosToOffsetMapCoords(&x, &y, 8, 8);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[15], x, y, 0);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_LONG_GRASS], x, y, 0);
     if (spriteId != MAX_SPRITES)
     {
         sprite = &gSprites[spriteId];
@@ -444,14 +444,14 @@ u32 FldEff_JumpLongGrass(void)
     struct Sprite *sprite;
 
     SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[16], gFieldEffectArguments[0], gFieldEffectArguments[1], 0);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_JUMP_LONG_GRASS], gFieldEffectArguments[0], gFieldEffectArguments[1], 0);
     if (spriteId != MAX_SPRITES)
     {
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
         sprite->data[0] = gFieldEffectArguments[2];
-        sprite->data[1] = 18;
+        sprite->data[1] = FLDEFF_JUMP_LONG_GRASS;
     }
     return 0;
 }
@@ -465,7 +465,7 @@ u32 FldEff_ShortGrass(void)
 
     objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
     objectEvent = &gObjectEvents[objectEventId];
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[30], 0, 0, 0);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SHORT_GRASS], 0, 0, 0);
     if (spriteId != MAX_SPRITES)
     {
         sprite = &(gSprites[spriteId]);
@@ -522,7 +522,7 @@ u32 FldEff_SandFootprints(void)
     struct Sprite *sprite;
 
     SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[11], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SAND_FOOTPRINTS], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
     if (spriteId != MAX_SPRITES)
     {
         sprite = &gSprites[spriteId];
@@ -540,7 +540,7 @@ u32 FldEff_DeepSandFootprints(void)
     struct Sprite *sprite;
 
     SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[23], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_DEEP_SAND_FOOTPRINTS], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
     if (spriteId != MAX_SPRITES)
     {
         sprite = &gSprites[spriteId];
@@ -558,7 +558,7 @@ u32 FldEff_BikeTireTracks(void)
     struct Sprite *sprite;
 
     SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[27], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_BIKE_TIRE_TRACKS], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
     if (spriteId != MAX_SPRITES)
     {
         sprite = &gSprites[spriteId];
@@ -611,7 +611,7 @@ u32 FldEff_Splash(void)
 
     objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
     objectEvent = &gObjectEvents[objectEventId];
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[13], 0, 0, 0);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SPLASH], 0, 0, 0);
     if (spriteId != MAX_SPRITES)
     {
         graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
@@ -650,7 +650,7 @@ u32 FldEff_JumpSmallSplash(void)
     struct Sprite *sprite;
 
     SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 12);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[14], gFieldEffectArguments[0], gFieldEffectArguments[1], 0);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_JUMP_SMALL_SPLASH], gFieldEffectArguments[0], gFieldEffectArguments[1], 0);
     if (spriteId != MAX_SPRITES)
     {
         sprite = &gSprites[spriteId];
@@ -668,7 +668,7 @@ u32 FldEff_JumpBigSplash(void)
     struct Sprite *sprite;
 
     SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[12], gFieldEffectArguments[0], gFieldEffectArguments[1], 0);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_JUMP_BIG_SPLASH], gFieldEffectArguments[0], gFieldEffectArguments[1], 0);
     if (spriteId != MAX_SPRITES)
     {
         sprite = &gSprites[spriteId];
@@ -690,7 +690,7 @@ u32 FldEff_FeetInFlowingWater(void)
 
     objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
     objectEvent = &gObjectEvents[objectEventId];
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[13], 0, 0, 0);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SPLASH], 0, 0, 0);
     if (spriteId != MAX_SPRITES)
     {
         graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
@@ -744,7 +744,7 @@ u32 FldEff_Ripple(void)
     u8 spriteId;
     struct Sprite *sprite;
 
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[5], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_RIPPLE], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
     if (spriteId != MAX_SPRITES)
     {
         sprite = &gSprites[spriteId];
@@ -764,7 +764,7 @@ u32 FldEff_HotSpringsWater(void)
 
     objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
     objectEvent = &gObjectEvents[objectEventId];
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[31], 0, 0, 0);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_HOT_SPRINGS_WATER], 0, 0, 0);
     if (spriteId != MAX_SPRITES)
     {
         sprite = &gSprites[spriteId];
@@ -800,70 +800,70 @@ void UpdateHotSpringsWaterFieldEffect(struct Sprite *sprite)
     }
 }
 
-u32 FldEff_Unknown19(void)
+u32 FldEff_UnusedGrass(void)
 {
     u8 spriteId;
     struct Sprite *sprite;
 
     SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[17], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_UNUSED_GRASS], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
     if (spriteId != MAX_SPRITES)
     {
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
-        sprite->data[0] = FLDEFF_UNKNOWN_19;
+        sprite->data[0] = FLDEFF_UNUSED_GRASS;
     }
     return 0;
 }
 
-u32 FldEff_Unknown20(void)
+u32 FldEff_UnusedGrass2(void)
 {
     u8 spriteId;
     struct Sprite *sprite;
 
     SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[18], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_UNUSED_GRASS_2], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
     if (spriteId != MAX_SPRITES)
     {
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
-        sprite->data[0] = FLDEFF_UNKNOWN_20;
+        sprite->data[0] = FLDEFF_UNUSED_GRASS_2;
     }
     return 0;
 }
 
-u32 FldEff_Unknown21(void)
+u32 FldEff_UnusedSand(void)
 {
     u8 spriteId;
     struct Sprite *sprite;
 
     SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[19], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_UNUSED_SAND], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
     if (spriteId != MAX_SPRITES)
     {
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
-        sprite->data[0] = FLDEFF_UNKNOWN_21;
+        sprite->data[0] = FLDEFF_UNUSED_SAND;
     }
     return 0;
 }
 
-u32 FldEff_Unknown22(void)
+u32 FldEff_WaterSurfacing(void)
 {
     u8 spriteId;
     struct Sprite *sprite;
 
     SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[20], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_WATER_SURFACING], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
     if (spriteId != MAX_SPRITES)
     {
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
-        sprite->data[0] = FLDEFF_UNKNOWN_22;
+        sprite->data[0] = FLDEFF_WATER_SURFACING;
     }
     return 0;
 }
@@ -889,7 +889,7 @@ u32 FldEff_Ash(void)
     x = gFieldEffectArguments[0];
     y = gFieldEffectArguments[1];
     SetSpritePosToOffsetMapCoords(&x, &y, 8, 8);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[6], x, y, gFieldEffectArguments[2]);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_ASH], x, y, gFieldEffectArguments[2]);
     if (spriteId != MAX_SPRITES)
     {
         sprite = &gSprites[spriteId];
@@ -945,7 +945,7 @@ u32 FldEff_SurfBlob(void)
     struct Sprite *sprite;
 
     SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[7], gFieldEffectArguments[0], gFieldEffectArguments[1], 0x96);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SURF_BLOB], gFieldEffectArguments[0], gFieldEffectArguments[1], 0x96);
     if (spriteId !=MAX_SPRITES)
     {
         sprite = &gSprites[spriteId];
@@ -960,33 +960,34 @@ u32 FldEff_SurfBlob(void)
     return spriteId;
 }
 
-void sub_81555AC(u8 spriteId, u8 value)
+// States for bobbing up and down while surfing
+void SetSurfBobState(u8 spriteId, u8 value)
 {
     gSprites[spriteId].data[0] = (gSprites[spriteId].data[0] & ~0xF) | (value & 0xF);
 }
 
-void sub_81555D8(u8 spriteId, u8 value)
+void SetSurfBobWhileFlyingOutState(u8 spriteId, u8 value)
 {
     gSprites[spriteId].data[0] = (gSprites[spriteId].data[0] & ~0xF0) | ((value & 0xF) << 4);
 }
 
-void sub_8155604(u8 spriteId, u8 value, s16 data1)
+void SetSurfBobWhileFishingState(u8 spriteId, u8 value, s16 data1)
 {
     gSprites[spriteId].data[0] = (gSprites[spriteId].data[0] & ~0xF00) | ((value & 0xF) << 8);
     gSprites[spriteId].data[1] = data1;
 }
 
-static u8 sub_8155638(struct Sprite *sprite)
+static u8 GetSurfBobState(struct Sprite *sprite)
 {
     return sprite->data[0] & 0xF;
 }
 
-static u8 sub_8155640(struct Sprite *sprite)
+static u8 GetSurfBobWhileFlyingOutState(struct Sprite *sprite)
 {
     return (sprite->data[0] & 0xF0) >> 4;
 }
 
-static u8 sub_815564C(struct Sprite *sprite)
+static u8 GetSurfBobWhileFishingState(struct Sprite *sprite)
 {
     return (sprite->data[0] & 0xF00) >> 8;
 }
@@ -1018,7 +1019,7 @@ static void SynchroniseSurfAnim(struct ObjectEvent *objectEvent, struct Sprite *
         [DIR_NORTHEAST] = 1,
     };
 
-    if (sub_8155640(sprite) == 0)
+    if (GetSurfBobWhileFlyingOutState(sprite) == 0)
         StartSpriteAnimIfDifferent(sprite, surfBlobDirectionAnims[objectEvent->movementDirection]);
 }
 
@@ -1049,8 +1050,8 @@ void sub_81556E8(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 static void CreateBobbingEffect(struct ObjectEvent *objectEvent, struct Sprite *linkedSprite, struct Sprite *sprite)
 {
     u16 unk_085CDC6A[] = {3, 7};
-    u8 v0 = sub_8155638(sprite);
-    if (v0 != 0)
+    u8 bobState = GetSurfBobState(sprite);
+    if (bobState != 0)
     {
         if (((u16)(++ sprite->data[4]) & unk_085CDC6A[sprite->data[5]]) == 0)
         {
@@ -1060,9 +1061,9 @@ static void CreateBobbingEffect(struct ObjectEvent *objectEvent, struct Sprite *
         {
             sprite->data[3] = -sprite->data[3];
         }
-        if (v0 != 2)
+        if (bobState != 2)
         {
-            if (sub_815564C(sprite) == 0)
+            if (GetSurfBobWhileFishingState(sprite) == 0)
                 linkedSprite->pos2.y = sprite->pos2.y;
             else
                 linkedSprite->pos2.y = sprite->data[1] + sprite->pos2.y;
@@ -1107,14 +1108,14 @@ u32 FldEff_Dust(void)
     struct Sprite *sprite;
 
     SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 12);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[9], gFieldEffectArguments[0], gFieldEffectArguments[1], 0);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_GROUND_IMPACT_DUST], gFieldEffectArguments[0], gFieldEffectArguments[1], 0);
     if (spriteId != MAX_SPRITES)
     {
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
         sprite->data[0] = gFieldEffectArguments[2];
-        sprite->data[1] = 10;
+        sprite->data[1] = FLDEFF_DUST;
     }
     return 0;
 }
@@ -1129,7 +1130,7 @@ u32 FldEff_SandPile(void)
 
     objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
     objectEvent = &gObjectEvents[objectEventId];
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[29], 0, 0, 0);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SAND_PILE], 0, 0, 0);
     if (spriteId != MAX_SPRITES)
     {
         graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
@@ -1183,7 +1184,7 @@ u32 FldEff_Bubbles(void)
     struct Sprite *sprite;
 
     SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 0);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[34], gFieldEffectArguments[0], gFieldEffectArguments[1], 0x52);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_BUBBLES], gFieldEffectArguments[0], gFieldEffectArguments[1], 0x52);
     if (spriteId != MAX_SPRITES)
     {
         sprite = &gSprites[spriteId];
@@ -1211,7 +1212,7 @@ u32 FldEff_BerryTreeGrowthSparkle(void)
     struct Sprite *sprite;
 
     SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 4);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[22], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SPARKLE], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
     if (spriteId != MAX_SPRITES)
     {
         sprite = &gSprites[spriteId];
@@ -1225,20 +1226,20 @@ u32 FldEff_BerryTreeGrowthSparkle(void)
 
 u32 ShowTreeDisguiseFieldEffect(void)
 {
-    return ShowDisguiseFieldEffect(FLDEFF_TREE_DISGUISE, 24, 4);
+    return ShowDisguiseFieldEffect(FLDEFF_TREE_DISGUISE, FLDEFFOBJ_TREE_DISGUISE, 4);
 }
 
 u32 ShowMountainDisguiseFieldEffect(void)
 {
-    return ShowDisguiseFieldEffect(FLDEFF_MOUNTAIN_DISGUISE, 25, 3);
+    return ShowDisguiseFieldEffect(FLDEFF_MOUNTAIN_DISGUISE, FLDEFFOBJ_MOUNTAIN_DISGUISE, 3);
 }
 
 u32 ShowSandDisguiseFieldEffect(void)
 {
-    return ShowDisguiseFieldEffect(FLDEFF_SAND_DISGUISE, 28, 2);
+    return ShowDisguiseFieldEffect(FLDEFF_SAND_DISGUISE, FLDEFFOBJ_SAND_DISGUISE, 2);
 }
 
-static u32 ShowDisguiseFieldEffect(u8 fldEff, u8 templateIdx, u8 paletteNum)
+static u32 ShowDisguiseFieldEffect(u8 fldEff, u8 fldEffObj, u8 paletteNum)
 {
     u8 spriteId;
     struct Sprite *sprite;
@@ -1248,7 +1249,7 @@ static u32 ShowDisguiseFieldEffect(u8 fldEff, u8 templateIdx, u8 paletteNum)
         FieldEffectActiveListRemove(fldEff);
         return MAX_SPRITES;
     }
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[templateIdx], 0, 0, 0);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[fldEffObj], 0, 0, 0);
     if (spriteId != MAX_SPRITES)
     {
         sprite = &gSprites[spriteId];
@@ -1331,7 +1332,7 @@ u32 FldEff_Sparkle(void)
     gFieldEffectArguments[0] += 7;
     gFieldEffectArguments[1] += 7;
     SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[35], gFieldEffectArguments[0], gFieldEffectArguments[1], 0x52);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SMALL_SPARKLE], gFieldEffectArguments[0], gFieldEffectArguments[1], 0x52);
     if (spriteId != MAX_SPRITES)
     {
         gSprites[spriteId].oam.priority = gFieldEffectArguments[2];
@@ -1358,61 +1359,72 @@ void UpdateSparkleFieldEffect(struct Sprite *sprite)
         FieldEffectStop(sprite, FLDEFF_SPARKLE);
 }
 
-void sub_8155EA0(struct Sprite *sprite)
+#define sTimer       data[0]
+#define sState       data[2]
+#define sStartY      data[4]
+#define sCounter     data[5]
+#define sAnimCounter data[6]
+#define sAnimState   data[7]
+
+// Same as InitSpriteForFigure8Anim
+static void InitRayquazaForFigure8Anim(struct Sprite *sprite)
 {
-    sprite->data[6] = 0;
-    sprite->data[7] = 0;
+    sprite->sAnimCounter = 0;
+    sprite->sAnimState = 0;
 }
 
-bool8 sub_8155EA8(struct Sprite *sprite)
+// Only different from AnimateSpriteInFigure8 by the addition of SetGpuReg to move the spotlight
+static bool8 AnimateRayquazaInFigure8(struct Sprite *sprite)
 {
-    bool8 returnBool = FALSE;
+    bool8 finished = FALSE;
 
-    switch (sprite->data[7])
+    switch (sprite->sAnimState)
     {
-        case 0:
-            sprite->pos2.x += sub_809773C(sprite->data[6]);
-            sprite->pos2.y += sub_8097728(sprite->data[6]);
-            break;
-        case 1:
-            sprite->pos2.x -= sub_809773C(0x47 - sprite->data[6]);
-            sprite->pos2.y += sub_8097728(0x47 - sprite->data[6]);
-            break;
-        case 2:
-            sprite->pos2.x -= sub_809773C(sprite->data[6]);
-            sprite->pos2.y += sub_8097728(sprite->data[6]);
-            break;
-        case 3:
-            sprite->pos2.x += sub_809773C(0x47 - sprite->data[6]);
-            sprite->pos2.y += sub_8097728(0x47 - sprite->data[6]);
-            break;
+    case 0:
+        sprite->pos2.x += GetFigure8XOffset(sprite->sAnimCounter);
+        sprite->pos2.y += GetFigure8YOffset(sprite->sAnimCounter);
+        break;
+    case 1:
+        sprite->pos2.x -= GetFigure8XOffset((FIGURE_8_LENGTH - 1) - sprite->sAnimCounter);
+        sprite->pos2.y += GetFigure8YOffset((FIGURE_8_LENGTH - 1) - sprite->sAnimCounter);
+        break;
+    case 2:
+        sprite->pos2.x -= GetFigure8XOffset(sprite->sAnimCounter);
+        sprite->pos2.y += GetFigure8YOffset(sprite->sAnimCounter);
+        break;
+    case 3:
+        sprite->pos2.x += GetFigure8XOffset((FIGURE_8_LENGTH - 1) - sprite->sAnimCounter);
+        sprite->pos2.y += GetFigure8YOffset((FIGURE_8_LENGTH - 1) - sprite->sAnimCounter);
+        break;
     }
 
+    // Update spotlight to sweep left and right with Rayquaza
     SetGpuReg(REG_OFFSET_BG0HOFS, -sprite->pos2.x);
-    if (++sprite->data[6] == 72)
+
+    if (++sprite->sAnimCounter == FIGURE_8_LENGTH)
     {
-        sprite->data[6] = 0;
-        sprite->data[7]++;
+        sprite->sAnimCounter = 0;
+        sprite->sAnimState++;
     }
-    if (sprite->data[7] == 4)
+    if (sprite->sAnimState == 4)
     {
         sprite->pos2.y = 0;
         sprite->pos2.x = 0;
-        returnBool = TRUE;
+        finished = TRUE;
     }
 
-    return returnBool;
+    return finished;
 }
 
-void sub_8155F80(struct Sprite *sprite)
+void UpdateRayquazaSpotlightEffect(struct Sprite *sprite)
 {
     u8 i, j;
 
-    switch (sprite->data[2])
+    switch (sprite->sState)
     {
         case 0:
-            SetGpuReg(REG_OFFSET_BG0VOFS, 0x78 - (sprite->data[0] / 3));
-            if (sprite->data[0] == 0x60)
+            SetGpuReg(REG_OFFSET_BG0VOFS, DISPLAY_WIDTH / 2 - (sprite->sTimer / 3));
+            if (sprite->sTimer == 96)
             {
                 for (i = 0; i < 3; i++)
                 {
@@ -1422,42 +1434,42 @@ void sub_8155F80(struct Sprite *sprite)
                     }
                 }
             }
-            if (sprite->data[0] > 0x137)
+            if (sprite->sTimer > 311)
             {
-                sprite->data[2] = 1;
-                sprite->data[0] = 0;
+                sprite->sState = 1;
+                sprite->sTimer = 0;
             }
             break;
         case 1:
-            sprite->pos1.y = (gSineTable[sprite->data[0] / 3] >> 2) + sprite->data[4];
-            if (sprite->data[0] == 0xBD)
+            sprite->pos1.y = (gSineTable[sprite->sTimer / 3] >> 2) + sprite->sStartY;
+            if (sprite->sTimer == 189)
             {
-                sprite->data[2] = 2;
-                sprite->data[5] = 0;
-                sprite->data[0] = 0;
+                sprite->sState = 2;
+                sprite->sCounter = 0;
+                sprite->sTimer = 0;
             }
             break;
         case 2:
-            if (sprite->data[0] == 0x3C)
+            if (sprite->sTimer == 60)
             {
-                sprite->data[5]++;
-                sprite->data[0] = 0;
+                sprite->sCounter++;
+                sprite->sTimer = 0;
             }
-            if (sprite->data[5] == 7)
+            if (sprite->sCounter == 7)
             {
-                sprite->data[5] = 0;
-                sprite->data[2] = 3;
+                sprite->sCounter = 0;
+                sprite->sState = 3;
             }
             break;
         case 3:
             if (sprite->pos2.y == 0)
             {
-                sprite->data[0] = 0;
-                sprite->data[2]++;
+                sprite->sTimer = 0;
+                sprite->sState++;
             }
-            if (sprite->data[0] == 5)
+            if (sprite->sTimer == 5)
             {
-                sprite->data[0] = 0;
+                sprite->sTimer = 0;
                 if (sprite->pos2.y > 0)
                     sprite->pos2.y--;
                 else
@@ -1465,38 +1477,38 @@ void sub_8155F80(struct Sprite *sprite)
             }
             break;
         case 4:
-            if (sprite->data[0] == 0x3C)
+            if (sprite->sTimer == 60)
             {
-                sprite->data[2] = 5;
-                sprite->data[0] = 0;
-                sprite->data[5] = 0;
+                sprite->sState = 5;
+                sprite->sTimer = 0;
+                sprite->sCounter = 0;
             }
             break;
         case 5:
-            sub_8155EA0(sprite);
-            sprite->data[2] = 6;
-            sprite->data[0] = 0;
+            InitRayquazaForFigure8Anim(sprite);
+            sprite->sState = 6;
+            sprite->sTimer = 0;
             break;
         case 6:
-            if (sub_8155EA8(sprite))
+            if (AnimateRayquazaInFigure8(sprite))
             {
-                sprite->data[0] = 0;
-                if (++sprite->data[5] <= 2)
+                sprite->sTimer = 0;
+                if (++sprite->sCounter <= 2)
                 {
-                    sub_8155EA0(sprite);
+                    InitRayquazaForFigure8Anim(sprite);
                 }
                 else
                 {
-                    sprite->data[5] = 0;
-                    sprite->data[2] = 7;
+                    sprite->sCounter = 0;
+                    sprite->sState = 7;
                 }
             }
             break;
         case 7:
-            if (sprite->data[0] == 0x1E)
+            if (sprite->sTimer == 30)
             {
-                sprite->data[2] = 8;
-                sprite->data[0] = 0;
+                sprite->sState = 8;
+                sprite->sTimer = 0;
             }
             break;
         case 8:
@@ -1508,11 +1520,11 @@ void sub_8155F80(struct Sprite *sprite)
                 }
             }
             SetGpuReg(REG_OFFSET_BG0VOFS, 0);
-            FieldEffectStop(sprite, FLDEFF_RAYQUAZA);
+            FieldEffectStop(sprite, FLDEFF_RAYQUAZA_SPOTLIGHT);
             break;
     }
 
-    if (sprite->data[2] == 1)
+    if (sprite->sState == 1)
     {
         if ((sprite->data[1] & 7) == 0)
             sprite->pos2.y += sprite->data[3];
@@ -1521,10 +1533,17 @@ void sub_8155F80(struct Sprite *sprite)
         sprite->data[1]++;
     }
 
-    sprite->data[0]++;
+    sprite->sTimer++;
 }
 
-void sub_8156194(struct Sprite *sprite)
+#undef sTimer
+#undef sState
+#undef sStartY
+#undef sCounter
+#undef sAnimCounter
+#undef sAnimState
+
+void UpdateJumpImpactEffect(struct Sprite *sprite)
 {
     if (sprite->animEnded)
     {
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index b0918a78d..6ad92c2fb 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -25,7 +25,7 @@
 #include "constants/event_objects.h"
 #include "constants/event_object_movement.h"
 #include "constants/field_effects.h"
-#include "constants/flags.h"
+#include "constants/items.h"
 #include "constants/maps.h"
 #include "constants/moves.h"
 #include "constants/songs.h"
@@ -101,9 +101,9 @@ static void sub_808C280(struct ObjectEvent *);
 
 static void StartStrengthAnim(u8, u8);
 static void Task_PushBoulder(u8 taskId);
-static u8 PushBoulder_Start(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject);
-static u8 PushBoulder_Move(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject);
-static u8 PushBoulder_End(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject);
+static bool8 PushBoulder_Start(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject);
+static bool8 PushBoulder_Move(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject);
+static bool8 PushBoulder_End(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject);
 
 static void DoPlayerMatJump(void);
 static void DoPlayerAvatarSecretBaseMatJump(u8 taskId);
@@ -121,22 +121,22 @@ static void Task_StopSurfingInit(u8 taskId);
 static void Task_WaitStopSurfing(u8 taskId);
 
 static void Task_Fishing(u8 taskId);
-static u8 Fishing1(struct Task *task);
-static u8 Fishing2(struct Task *task);
-static u8 Fishing3(struct Task *task);
-static u8 Fishing4(struct Task *task);
-static u8 Fishing5(struct Task *task);
-static u8 Fishing6(struct Task *task);
-static u8 Fishing7(struct Task *task);
-static u8 Fishing8(struct Task *task);
-static u8 Fishing9(struct Task *task);
-static u8 Fishing10(struct Task *task);
-static u8 Fishing11(struct Task *task);
-static u8 Fishing12(struct Task *task);
-static u8 Fishing13(struct Task *task);
-static u8 Fishing14(struct Task *task);
-static u8 Fishing15(struct Task *task);
-static u8 Fishing16(struct Task *task);
+static u8 Fishing_Init(struct Task *task);
+static u8 Fishing_GetRodOut(struct Task *task);
+static u8 Fishing_WaitBeforeDots(struct Task *task);
+static u8 Fishing_InitDots(struct Task *task);
+static u8 Fishing_ShowDots(struct Task *task);
+static u8 Fishing_CheckForBite(struct Task *task);
+static u8 Fishing_GotBite(struct Task *task);
+static u8 Fishing_WaitForA(struct Task *task);
+static u8 Fishing_CheckMoreDots(struct Task *task);
+static u8 Fishing_MonOnHook(struct Task *task);
+static u8 Fishing_StartEncounter(struct Task *task);
+static u8 Fishing_NotEvenNibble(struct Task *task);
+static u8 Fishing_GotAway(struct Task *task);
+static u8 Fishing_NoMon(struct Task *task);
+static u8 Fishing_PutRodAway(struct Task *task);
+static u8 Fishing_EndNoMon(struct Task *task);
 static void AlignFishingAnimationFrames(void);
 
 static u8 sub_808D38C(struct ObjectEvent *object, s16 *a1);
@@ -320,7 +320,7 @@ static u8 ObjectEventCB2_NoMovement2(void)
     return 0;
 }
 
-void player_step(u8 direction, u16 newKeys, u16 heldKeys)
+void PlayerStep(u8 direction, u16 newKeys, u16 heldKeys)
 {
     struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
 
@@ -379,9 +379,9 @@ static bool8 TryInterruptObjectEventSpecialAnim(struct ObjectEvent *playerObjEve
 
 static void npc_clear_strange_bits(struct ObjectEvent *objEvent)
 {
-    objEvent->inanimate = 0;
-    objEvent->disableAnim = 0;
-    objEvent->facingDirectionLocked = 0;
+    objEvent->inanimate = FALSE;
+    objEvent->disableAnim = FALSE;
+    objEvent->facingDirectionLocked = FALSE;
     gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_DASH;
 }
 
@@ -424,14 +424,14 @@ static u8 GetForcedMovementByMetatileBehavior(void)
 
 static bool8 ForcedMovement_None(void)
 {
-    if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_6)
+    if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FORCED_MOVE)
     {
         struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
 
-        playerObjEvent->facingDirectionLocked = 0;
-        playerObjEvent->enableAnim = 1;
+        playerObjEvent->facingDirectionLocked = FALSE;
+        playerObjEvent->enableAnim = TRUE;
         SetObjectEventDirection(playerObjEvent, playerObjEvent->facingDirection);
-        gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_6;
+        gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_FORCED_MOVE;
     }
     return FALSE;
 }
@@ -441,7 +441,7 @@ static u8 DoForcedMovement(u8 direction, void (*b)(u8))
     struct PlayerAvatar *playerAvatar = &gPlayerAvatar;
     u8 collision = CheckForPlayerAvatarCollision(direction);
 
-    playerAvatar->flags |= PLAYER_AVATAR_FLAG_6;
+    playerAvatar->flags |= PLAYER_AVATAR_FLAG_FORCED_MOVE;
     if (collision)
     {
         ForcedMovement_None();
@@ -453,7 +453,7 @@ static u8 DoForcedMovement(u8 direction, void (*b)(u8))
         {
             if (collision == COLLISION_LEDGE_JUMP)
                 PlayerJumpLedge(direction);
-            playerAvatar->flags |= PLAYER_AVATAR_FLAG_6;
+            playerAvatar->flags |= PLAYER_AVATAR_FLAG_FORCED_MOVE;
             playerAvatar->runningState = MOVING;
             return 1;
         }
@@ -470,7 +470,7 @@ static u8 DoForcedMovementInCurrentDirection(void (*a)(u8))
 {
     struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
 
-    playerObjEvent->disableAnim = 1;
+    playerObjEvent->disableAnim = TRUE;
     return DoForcedMovement(playerObjEvent->movementDirection, a);
 }
 
@@ -519,12 +519,12 @@ static bool8 ForcedMovement_PushedEastByCurrent(void)
     return DoForcedMovement(DIR_EAST, PlayerRideWaterCurrent);
 }
 
-u8 ForcedMovement_Slide(u8 direction, void (*b)(u8))
+static u8 ForcedMovement_Slide(u8 direction, void (*b)(u8))
 {
     struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
 
-    playerObjEvent->disableAnim = 1;
-    playerObjEvent->facingDirectionLocked = 1;
+    playerObjEvent->disableAnim = TRUE;
+    playerObjEvent->facingDirectionLocked = TRUE;
     return DoForcedMovement(direction, b);
 }
 
@@ -567,8 +567,8 @@ static bool8 ForcedMovement_MuddySlope(void)
     if (playerObjEvent->movementDirection != DIR_NORTH || GetPlayerSpeed() <= 3)
     {
         Bike_UpdateBikeCounterSpeed(0);
-        playerObjEvent->facingDirectionLocked = 1;
-        return DoForcedMovement(1, PlayerGoSpeed2);
+        playerObjEvent->facingDirectionLocked = TRUE;
+        return DoForcedMovement(DIR_SOUTH, PlayerGoSpeed2);
     }
     else
     {
@@ -869,7 +869,7 @@ static void PlayerAvatarTransition_Surfing(struct ObjectEvent *objEvent)
     gFieldEffectArguments[2] = gPlayerAvatar.objectEventId;
     spriteId = FieldEffectStart(FLDEFF_SURF_BLOB);
     objEvent->fieldEffectSpriteId = spriteId;
-    sub_81555AC(spriteId, 1);
+    SetSurfBobState(spriteId, 1);
 }
 
 static void PlayerAvatarTransition_Underwater(struct ObjectEvent *objEvent)
@@ -885,7 +885,7 @@ static void PlayerAvatarTransition_ReturnToField(struct ObjectEvent *objEvent)
     gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_5;
 }
 
-void sub_808B578(void)
+void UpdatePlayerAvatarTransitionState(void)
 {
     gPlayerAvatar.tileTransitionState = T_NOT_MOVING;
     if (PlayerIsAnimActive())
@@ -1328,7 +1328,7 @@ void ClearPlayerAvatarInfo(void)
 
 void SetPlayerAvatarStateMask(u8 flags)
 {
-    gPlayerAvatar.flags &= (PLAYER_AVATAR_FLAG_DASH | PLAYER_AVATAR_FLAG_6 | PLAYER_AVATAR_FLAG_5);
+    gPlayerAvatar.flags &= (PLAYER_AVATAR_FLAG_DASH | PLAYER_AVATAR_FLAG_FORCED_MOVE | PLAYER_AVATAR_FLAG_5);
     gPlayerAvatar.flags |= flags;
 }
 
@@ -1404,13 +1404,13 @@ void SetPlayerInvisibility(bool8 invisible)
         gSprites[gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId].invisible = invisible;
 }
 
-void sub_808C114(void)
+void SetPlayerAvatarFieldMove(void)
 {
     ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FIELD_MOVE));
     StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 0);
 }
 
-void sub_808C15C(u8 direction)
+static void SetPlayerAvatarFishing(u8 direction)
 {
     ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FISHING));
     StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingDirectionAnimNum(direction));
@@ -1423,7 +1423,7 @@ void PlayerUseAcroBikeOnBumpySlope(u8 direction)
     SeekSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 1);
 }
 
-void sub_808C228(u8 direction)
+void SetPlayerAvatarWatering(u8 direction)
 {
     ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_WATERING));
     StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFaceDirectionAnimNum(direction));
@@ -1650,7 +1650,7 @@ static void Task_StopSurfingInit(u8 taskId)
         if (!ObjectEventClearHeldMovementIfFinished(playerObjEvent))
             return;
     }
-    sub_81555AC(playerObjEvent->fieldEffectSpriteId, 2);
+    SetSurfBobState(playerObjEvent->fieldEffectSpriteId, 2);
     ObjectEventSetHeldMovement(playerObjEvent, GetJumpSpecialMovementAction((u8)gTasks[taskId].data[0]));
     gTasks[taskId].func = Task_WaitStopSurfing;
 }
@@ -1670,26 +1670,6 @@ static void Task_WaitStopSurfing(u8 taskId)
     }
 }
 
-static bool8 (*const sFishingStateFuncs[])(struct Task *) =
-{
-    Fishing1,
-    Fishing2,
-    Fishing3,
-    Fishing4,
-    Fishing5,
-    Fishing6,
-    Fishing7,
-    Fishing8,
-    Fishing9,
-    Fishing10,
-    Fishing11,
-    Fishing12,
-    Fishing13,
-    Fishing14,
-    Fishing15,
-    Fishing16,
-};
-
 #define tStep              data[0]
 #define tFrameCounter      data[1]
 #define tNumDots           data[2]
@@ -1699,6 +1679,7 @@ static bool8 (*const sFishingStateFuncs[])(struct Task *) =
 #define tPlayerGfxId       data[14]
 #define tFishingRod        data[15]
 
+// Some states are jumped to directly, labeled below
 #define FISHING_START_ROUND 3
 #define FISHING_GOT_BITE 6
 #define FISHING_ON_HOOK 9
@@ -1706,6 +1687,26 @@ static bool8 (*const sFishingStateFuncs[])(struct Task *) =
 #define FISHING_GOT_AWAY 12
 #define FISHING_SHOW_RESULT 13
 
+static bool8 (*const sFishingStateFuncs[])(struct Task *) =
+{
+    Fishing_Init,
+    Fishing_GetRodOut,
+    Fishing_WaitBeforeDots, 
+    Fishing_InitDots,       // FISHING_START_ROUND
+    Fishing_ShowDots,
+    Fishing_CheckForBite,
+    Fishing_GotBite,        // FISHING_GOT_BITE
+    Fishing_WaitForA,
+    Fishing_CheckMoreDots,
+    Fishing_MonOnHook,      // FISHING_ON_HOOK
+    Fishing_StartEncounter,
+    Fishing_NotEvenNibble,  // FISHING_NO_BITE
+    Fishing_GotAway,        // FISHING_GOT_AWAY
+    Fishing_NoMon,          // FISHING_SHOW_RESULT
+    Fishing_PutRodAway,
+    Fishing_EndNoMon,
+};
+
 void StartFishing(u8 rod)
 {
     u8 taskId = CreateTask(Task_Fishing, 0xFF);
@@ -1720,7 +1721,7 @@ static void Task_Fishing(u8 taskId)
         ;
 }
 
-static bool8 Fishing1(struct Task *task)
+static bool8 Fishing_Init(struct Task *task)
 {
     ScriptContext2_Enable();
     gPlayerAvatar.preventStep = TRUE;
@@ -1728,24 +1729,32 @@ static bool8 Fishing1(struct Task *task)
     return FALSE;
 }
 
-static bool8 Fishing2(struct Task *task)
+static bool8 Fishing_GetRodOut(struct Task *task)
 {
     struct ObjectEvent *playerObjEvent;
-    const s16 arr1[] = {1, 1, 1};
-    const s16 arr2[] = {1, 3, 6};
+    const s16 minRounds1[] = {
+        [OLD_ROD]   = 1, 
+        [GOOD_ROD]  = 1, 
+        [SUPER_ROD] = 1
+    };
+    const s16 minRounds2[] = {
+        [OLD_ROD]   = 1, 
+        [GOOD_ROD]  = 3, 
+        [SUPER_ROD] = 6
+    };
 
     task->tRoundsPlayed = 0;
-    task->tMinRoundsRequired = arr1[task->tFishingRod] + (Random() % arr2[task->tFishingRod]);
+    task->tMinRoundsRequired = minRounds1[task->tFishingRod] + (Random() % minRounds2[task->tFishingRod]);
     task->tPlayerGfxId = gObjectEvents[gPlayerAvatar.objectEventId].graphicsId;
     playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
     ObjectEventClearHeldMovementIfActive(playerObjEvent);
-    playerObjEvent->enableAnim = 1;
-    sub_808C15C(playerObjEvent->facingDirection);
+    playerObjEvent->enableAnim = TRUE;
+    SetPlayerAvatarFishing(playerObjEvent->facingDirection);
     task->tStep++;
     return FALSE;
 }
 
-static bool8 Fishing3(struct Task *task)
+static bool8 Fishing_WaitBeforeDots(struct Task *task)
 {
     AlignFishingAnimationFrames();
 
@@ -1756,7 +1765,7 @@ static bool8 Fishing3(struct Task *task)
     return FALSE;
 }
 
-static bool8 Fishing4(struct Task *task)
+static bool8 Fishing_InitDots(struct Task *task)
 {
     u32 randVal;
 
@@ -1774,8 +1783,7 @@ static bool8 Fishing4(struct Task *task)
     return TRUE;
 }
 
-// Play a round of the dot game
-static bool8 Fishing5(struct Task *task)
+static bool8 Fishing_ShowDots(struct Task *task)
 {
     const u8 dot[] = _("·");
 
@@ -1810,8 +1818,7 @@ static bool8 Fishing5(struct Task *task)
     }
 }
 
-// Determine if fish bites
-static bool8 Fishing6(struct Task *task)
+static bool8 Fishing_CheckForBite(struct Task *task)
 {
     bool8 bite;
 
@@ -1831,34 +1838,25 @@ static bool8 Fishing6(struct Task *task)
             if (ability == ABILITY_SUCTION_CUPS || ability  == ABILITY_STICKY_HOLD)
             {
                 if (Random() % 100 > 14)
-                {
                     bite = TRUE;
-                }
             }
         }
 
         if (!bite)
         {
             if (Random() & 1)
-            {
                 task->tStep = FISHING_NO_BITE;
-            }
             else
-            {
                 bite = TRUE;
-            }
         }
 
         if (bite == TRUE)
-        {
             StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingBiteDirectionAnimNum(GetPlayerFacingDirection()));
-        }
     }
     return TRUE;
 }
 
-// Oh! A Bite!
-static bool8 Fishing7(struct Task *task)
+static bool8 Fishing_GotBite(struct Task *task)
 {
     AlignFishingAnimationFrames();
     AddTextPrinterParameterized(0, 1, gText_OhABite, 0, 17, 0, NULL);
@@ -1868,9 +1866,13 @@ static bool8 Fishing7(struct Task *task)
 }
 
 // We have a bite. Now, wait for the player to press A, or the timer to expire.
-static bool8 Fishing8(struct Task *task)
+static bool8 Fishing_WaitForA(struct Task *task)
 {
-    const s16 reelTimeouts[3] = {36, 33, 30};
+    const s16 reelTimeouts[3] = {
+        [OLD_ROD]   = 36, 
+        [GOOD_ROD]  = 33, 
+        [SUPER_ROD] = 30
+    };
 
     AlignFishingAnimationFrames();
     task->tFrameCounter++;
@@ -1882,13 +1884,13 @@ static bool8 Fishing8(struct Task *task)
 }
 
 // Determine if we're going to play the dot game again
-static bool8 Fishing9(struct Task *task)
+static bool8 Fishing_CheckMoreDots(struct Task *task)
 {
-    const s16 arr[][2] =
+    const s16 moreDotsChance[][2] =
     {
-        {0, 0},
-        {40, 10},
-        {70, 30}
+        [OLD_ROD]   = {0, 0},
+        [GOOD_ROD]  = {40, 10},
+        [SUPER_ROD] = {70, 30}
     };
 
     AlignFishingAnimationFrames();
@@ -1902,13 +1904,13 @@ static bool8 Fishing9(struct Task *task)
         // probability of having to play another round
         s16 probability = Random() % 100;
 
-        if (arr[task->tFishingRod][task->tRoundsPlayed] > probability)
+        if (moreDotsChance[task->tFishingRod][task->tRoundsPlayed] > probability)
             task->tStep = FISHING_START_ROUND;
     }
     return FALSE;
 }
 
-static bool8 Fishing10(struct Task *task)
+static bool8 Fishing_MonOnHook(struct Task *task)
 {
     AlignFishingAnimationFrames();
     FillWindowPixelBuffer(0, PIXEL_FILL(1));
@@ -1918,7 +1920,7 @@ static bool8 Fishing10(struct Task *task)
     return FALSE;
 }
 
-static bool8 Fishing11(struct Task *task)
+static bool8 Fishing_StartEncounter(struct Task *task)
 {
     if (task->tFrameCounter == 0)
         AlignFishingAnimationFrames();
@@ -1934,7 +1936,7 @@ static bool8 Fishing11(struct Task *task)
             ObjectEventSetGraphicsId(playerObjEvent, task->tPlayerGfxId);
             ObjectEventTurn(playerObjEvent, playerObjEvent->movementDirection);
             if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
-                sub_8155604(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0);
+                SetSurfBobWhileFishingState(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0);
             gSprites[gPlayerAvatar.spriteId].pos2.x = 0;
             gSprites[gPlayerAvatar.spriteId].pos2.y = 0;
             ClearDialogWindowAndFrame(0, TRUE);
@@ -1948,14 +1950,13 @@ static bool8 Fishing11(struct Task *task)
         gPlayerAvatar.preventStep = FALSE;
         ScriptContext2_Disable();
         FishingWildEncounter(task->tFishingRod);
-        sub_80ED950(1);
+        RecordFishingAttemptForTV(TRUE);
         DestroyTask(FindTaskIdByFunc(Task_Fishing));
     }
     return FALSE;
 }
 
-// Not even a nibble
-static bool8 Fishing12(struct Task *task)
+static bool8 Fishing_NotEvenNibble(struct Task *task)
 {
     AlignFishingAnimationFrames();
     StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
@@ -1965,8 +1966,7 @@ static bool8 Fishing12(struct Task *task)
     return TRUE;
 }
 
-// It got away
-static bool8 Fishing13(struct Task *task)
+static bool8 Fishing_GotAway(struct Task *task)
 {
     AlignFishingAnimationFrames();
     StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
@@ -1976,15 +1976,14 @@ static bool8 Fishing13(struct Task *task)
     return TRUE;
 }
 
-// Wait one second
-static bool8 Fishing14(struct Task *task)
+static bool8 Fishing_NoMon(struct Task *task)
 {
     AlignFishingAnimationFrames();
     task->tStep++;
     return FALSE;
 }
 
-static bool8 Fishing15(struct Task *task)
+static bool8 Fishing_PutRodAway(struct Task *task)
 {
     AlignFishingAnimationFrames();
     if (gSprites[gPlayerAvatar.spriteId].animEnded)
@@ -1994,7 +1993,7 @@ static bool8 Fishing15(struct Task *task)
         ObjectEventSetGraphicsId(playerObjEvent, task->tPlayerGfxId);
         ObjectEventTurn(playerObjEvent, playerObjEvent->movementDirection);
         if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
-            sub_8155604(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0);
+            SetSurfBobWhileFishingState(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0);
         gSprites[gPlayerAvatar.spriteId].pos2.x = 0;
         gSprites[gPlayerAvatar.spriteId].pos2.y = 0;
         task->tStep++;
@@ -2002,7 +2001,7 @@ static bool8 Fishing15(struct Task *task)
     return FALSE;
 }
 
-static bool8 Fishing16(struct Task *task)
+static bool8 Fishing_EndNoMon(struct Task *task)
 {
     RunTextPrinters();
     if (!IsTextPrinterActive(0))
@@ -2011,7 +2010,7 @@ static bool8 Fishing16(struct Task *task)
         ScriptContext2_Disable();
         UnfreezeObjectEvents();
         ClearDialogWindowAndFrame(0, TRUE);
-        sub_80ED950(0);
+        RecordFishingAttemptForTV(FALSE);
         DestroyTask(FindTaskIdByFunc(Task_Fishing));
     }
     return FALSE;
@@ -2053,7 +2052,7 @@ static void AlignFishingAnimationFrames(void)
     if (animType == 10 || animType == 11)
         playerSprite->pos2.y = 8;
     if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
-        sub_8155604(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 1, playerSprite->pos2.y);
+        SetSurfBobWhileFishingState(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 1, playerSprite->pos2.y);
 }
 
 void sub_808D074(u8 a0)
diff --git a/src/field_region_map.c b/src/field_region_map.c
index b442675f3..fc6f0fa76 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -116,7 +116,7 @@ static void MCB2_InitRegionMapRegisters(void)
     InitWindows(sFieldRegionMapWindowTemplates);
     DeactivateAllTextPrinters();
     LoadUserWindowBorderGfx(0, 0x27, 0xd0);
-    clear_scheduled_bg_copies_to_vram();
+    ClearScheduledBgCopiesToVram();
     SetMainCallback2(MCB2_FieldUpdateRegionMap);
     SetVBlankCallback(VBCB_FieldUpdateRegionMap);
 }
@@ -134,7 +134,7 @@ static void MCB2_FieldUpdateRegionMap(void)
     AnimateSprites();
     BuildOamBuffer();
     UpdatePaletteFade();
-    do_scheduled_bg_tilemap_copies_to_vram();
+    DoScheduledBgTilemapCopiesToVram();
 }
 
 static void FieldUpdateRegionMap(void)
diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index 183bd67fa..92ee8cad3 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -12,6 +12,7 @@
 #include "field_special_scene.h"
 #include "field_weather.h"
 #include "gpu_regs.h"
+#include "io_reg.h"
 #include "link.h"
 #include "link_rfu.h"
 #include "load_save.h"
@@ -34,18 +35,14 @@
 #include "trainer_hill.h"
 #include "fldeff.h"
 
-extern const u16 gOrbEffectBackgroundLayerFlags[];
-
 // This file's functions.
-static void sub_8080B9C(u8);
 static void Task_ExitNonAnimDoor(u8);
 static void Task_ExitNonDoor(u8);
-static void task0A_fade_n_map_maybe(u8);
-static void sub_808115C(u8);
+static void Task_DoContestHallWarp(u8);
 static void FillPalBufferWhite(void);
 static void Task_ExitDoor(u8);
 static bool32 WaitForWeatherFadeIn(void);
-static void task0A_mpl_807E31C(u8 taskId);
+static void Task_TeleportTileWarpExit(u8 taskId);
 static void Task_WarpAndLoadMap(u8 taskId);
 static void Task_DoDoorWarp(u8 taskId);
 static void Task_EnableScriptAfterMusicFade(u8 taskId);
@@ -291,19 +288,19 @@ void FieldCB_WarpExitFadeFromWhite(void)
 
 void FieldCB_WarpExitFadeFromBlack(void)
 {
-    if (!sub_81D6534()) // sub_81D6534 always returns false
+    if (!OnTrainerHillEReaderChallengeFloor()) // always false
         Overworld_PlaySpecialMapMusic();
     FadeInFromBlack();
     SetUpWarpExitTask();
     ScriptContext2_Enable();
 }
 
-static void FieldCB_TeleportWarpExit(void)
+static void FieldCB_TeleportTileWarpExit(void)
 {
     Overworld_PlaySpecialMapMusic();
     WarpFadeInScreen();
     PlaySE(SE_TK_WARPOUT);
-    CreateTask(task0A_mpl_807E31C, 10);
+    CreateTask(Task_TeleportTileWarpExit, 10);
     ScriptContext2_Enable();
 }
 
@@ -314,7 +311,7 @@ static void FieldCB_MossdeepGymWarpExit(void)
     PlaySE(SE_TK_WARPOUT);
     CreateTask(Task_ExitNonDoor, 10);
     ScriptContext2_Enable();
-    sub_8085540(0xE);
+    SetObjectEventLoadFlag((~SKIP_OBJECT_EVENT_LOAD) & 0xF);
 }
 
 static void Task_ExitDoor(u8 taskId)
@@ -546,19 +543,20 @@ void DoLavaridgeGym1FWarp(void)
     StartLavaridgeGym1FWarp(10);
 }
 
-void DoTeleportWarp(void)
+// Warp from a teleporting tile, e.g. in Aqua Hideout (For the move Teleport see FldEff_TeleportWarpOut)
+void DoTeleportTileWarp(void)
 {
     ScriptContext2_Enable();
     TryFadeOutOldMapMusic();
     WarpFadeOutScreen();
     PlaySE(SE_TK_WARPIN);
     CreateTask(Task_WarpAndLoadMap, 10);
-    gFieldCallback = FieldCB_TeleportWarpExit;
+    gFieldCallback = FieldCB_TeleportTileWarpExit;
 }
 
 void DoMossdeepGymWarp(void)
 {
-    sub_8085540(1);
+    SetObjectEventLoadFlag(SKIP_OBJECT_EVENT_LOAD);
     ScriptContext2_Enable();
     SaveObjectEvents();
     TryFadeOutOldMapMusic();
@@ -576,19 +574,21 @@ void DoPortholeWarp(void)
     gFieldCallback = FieldCB_ShowPortholeView;
 }
 
-static void sub_80AF8E0(u8 taskId)
+#define tState data[0]
+
+static void Task_DoCableClubWarp(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
 
-    switch (task->data[0])
+    switch (task->tState)
     {
     case 0:
         ScriptContext2_Enable();
-        task->data[0]++;
+        task->tState++;
         break;
     case 1:
         if (!PaletteFadeActive() && BGMusicStopped())
-            task->data[0]++;
+            task->tState++;
         break;
     case 2:
         WarpIntoMap();
@@ -598,13 +598,15 @@ static void sub_80AF8E0(u8 taskId)
     }
 }
 
+#undef tState
+
 void DoCableClubWarp(void)
 {
     ScriptContext2_Enable();
     TryFadeOutOldMapMusic();
     WarpFadeOutScreen();
     PlaySE(SE_KAIDAN);
-    CreateTask(sub_80AF8E0, 10);
+    CreateTask(Task_DoCableClubWarp, 10);
 }
 
 static void Task_ReturnToWorldFromLinkRoom(u8 taskId)
@@ -727,7 +729,7 @@ static void Task_DoDoorWarp(u8 taskId)
     }
 }
 
-static void task0A_fade_n_map_maybe(u8 taskId)
+static void Task_DoContestHallWarp(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
 
@@ -746,7 +748,7 @@ static void task0A_fade_n_map_maybe(u8 taskId)
         break;
     case 2:
         WarpIntoMap();
-        SetMainCallback2(sub_8086024);
+        SetMainCallback2(CB2_ReturnToFieldContestHall);
         DestroyTask(taskId);
         break;
     }
@@ -760,7 +762,7 @@ void DoContestHallWarp(void)
     PlayRainStoppingSoundEffect();
     PlaySE(SE_KAIDAN);
     gFieldCallback = FieldCB_WarpExitFadeFromBlack;
-    CreateTask(task0A_fade_n_map_maybe, 10);
+    CreateTask(Task_DoContestHallWarp, 10);
 }
 
 static void SetFlashScanlineEffectWindowBoundary(u16 *dest, u32 y, s32 left, s32 right)
@@ -976,7 +978,7 @@ void AnimateFlash(u8 flashLevel)
     u8 value = 0;
     if (!flashLevel)
         value = 1;
-    sub_80AFFDC(120, 80, sFlashLevelPixelRadii[curFlashLevel], sFlashLevelPixelRadii[flashLevel], value, 1);
+    sub_80AFFDC(DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2, sFlashLevelPixelRadii[curFlashLevel], sFlashLevelPixelRadii[flashLevel], value, 1);
     sub_80AFFB8();
     ScriptContext2_Enable();
 }
@@ -985,18 +987,18 @@ void WriteFlashScanlineEffectBuffer(u8 flashLevel)
 {
     if (flashLevel)
     {
-        SetFlashScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], 120, 80, sFlashLevelPixelRadii[flashLevel]);
+        SetFlashScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2, sFlashLevelPixelRadii[flashLevel]);
         CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480);
     }
 }
 
 void WriteBattlePyramidViewScanlineEffectBuffer(void)
 {
-    SetFlashScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], 120, 80, gSaveBlock2Ptr->frontier.pyramidLightRadius);
+    SetFlashScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2, gSaveBlock2Ptr->frontier.pyramidLightRadius);
     CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480);
 }
 
-static void task0A_mpl_807E31C(u8 taskId)
+static void Task_TeleportTileWarpExit(u8 taskId)
 {
     switch (gTasks[taskId].data[0])
     {
@@ -1053,7 +1055,7 @@ void sub_80B0244(void)
 {
     ScriptContext2_Enable();
     CreateTask(Task_WarpAndLoadMap, 10);
-    gFieldCallback = FieldCB_TeleportWarpExit;
+    gFieldCallback = FieldCB_TeleportTileWarpExit;
 }
 
 void sub_80B0268(void)
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index 540bcd1d4..bb8e8b1d9 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -17,7 +17,6 @@
 #include "constants/event_object_movement.h"
 #include "constants/field_specials.h"
 #include "constants/songs.h"
-#include "constants/vars.h"
 #include "constants/metatile_labels.h"
 
 #define SECONDS(value) ((signed) (60.0 * value + 0.5))
@@ -74,11 +73,11 @@ void Task_Truck1(u8 taskId)
     s16 box1, box2, box3;
 
     box1 = GetTruckBoxMovement(data[0] + 30) * 4; // top box.
-    sub_808E82C(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, 3 - cameraXpan, box1 + 3);
+    SetObjectEventSpritePosByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, 3 - cameraXpan, box1 + 3);
     box2 = GetTruckBoxMovement(data[0]) * 2; // bottom left box.
-    sub_808E82C(2, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, -cameraXpan, box2 - 3);
+    SetObjectEventSpritePosByLocalIdAndMap(2, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, -cameraXpan, box2 - 3);
     box3 = GetTruckBoxMovement(data[0]) * 4; // bottom right box.
-    sub_808E82C(3, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, -3 - cameraXpan, box3);
+    SetObjectEventSpritePosByLocalIdAndMap(3, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, -3 - cameraXpan, box3);
 
     if (++data[0] == SECONDS(500)) // this will never run
         data[0] = 0; // reset the timer if it gets stuck.
@@ -117,11 +116,11 @@ void Task_Truck2(u8 taskId)
         cameraYpan = GetTruckCameraBobbingY(data[2]);
         SetCameraPanning(cameraXpan, cameraYpan);
         box1 = GetTruckBoxMovement(data[2] + 30) * 4;
-        sub_808E82C(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, 3 - cameraXpan, box1 + 3);
+        SetObjectEventSpritePosByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, 3 - cameraXpan, box1 + 3);
         box2 = GetTruckBoxMovement(data[2]) * 2;
-        sub_808E82C(2, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, -cameraXpan, box2 - 3);
+        SetObjectEventSpritePosByLocalIdAndMap(2, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, -cameraXpan, box2 - 3);
         box3 = GetTruckBoxMovement(data[2]) * 4;
-        sub_808E82C(3, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, -3 - cameraXpan, box3);
+        SetObjectEventSpritePosByLocalIdAndMap(3, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, -3 - cameraXpan, box3);
     }
 }
 
@@ -148,9 +147,9 @@ static void Task_Truck3(u8 taskId)
        cameraXpan = gTruckCamera_HorizontalTable[data[1]];
        cameraYpan = 0;
        SetCameraPanning(cameraXpan, 0);
-       sub_808E82C(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, 3 - cameraXpan, cameraYpan + 3);
-       sub_808E82C(2, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, -cameraXpan, cameraYpan - 3);
-       sub_808E82C(3, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, -3 - cameraXpan, cameraYpan);
+       SetObjectEventSpritePosByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, 3 - cameraXpan, cameraYpan + 3);
+       SetObjectEventSpritePosByLocalIdAndMap(2, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, -cameraXpan, cameraYpan - 3);
+       SetObjectEventSpritePosByLocalIdAndMap(3, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, -3 - cameraXpan, cameraYpan);
    }
 }
 
@@ -216,9 +215,9 @@ void Task_HandleTruckSequence(u8 taskId)
         data[1]++;
         if (data[1] == 120)
         {
-            MapGridSetMetatileIdAt(11, 8, METATILE_ID(InsideOfTruck, ExitLight_Top));
-            MapGridSetMetatileIdAt(11, 9, METATILE_ID(InsideOfTruck, ExitLight_Mid));
-            MapGridSetMetatileIdAt(11, 10, METATILE_ID(InsideOfTruck, ExitLight_Bottom));
+            MapGridSetMetatileIdAt(11, 8, METATILE_InsideOfTruck_ExitLight_Top);
+            MapGridSetMetatileIdAt(11, 9, METATILE_InsideOfTruck_ExitLight_Mid);
+            MapGridSetMetatileIdAt(11, 10, METATILE_InsideOfTruck_ExitLight_Bottom);
             DrawWholeMapView();
             PlaySE(SE_TRACK_DOOR);
             DestroyTask(taskId);
@@ -230,9 +229,9 @@ void Task_HandleTruckSequence(u8 taskId)
 
 void ExecuteTruckSequence(void)
 {
-    MapGridSetMetatileIdAt(11, 8, METATILE_ID(InsideOfTruck, DoorClosedFloor_Top));
-    MapGridSetMetatileIdAt(11, 9, METATILE_ID(InsideOfTruck, DoorClosedFloor_Mid));
-    MapGridSetMetatileIdAt(11, 10, METATILE_ID(InsideOfTruck, DoorClosedFloor_Bottom));
+    MapGridSetMetatileIdAt(11, 8, METATILE_InsideOfTruck_DoorClosedFloor_Top);
+    MapGridSetMetatileIdAt(11, 9, METATILE_InsideOfTruck_DoorClosedFloor_Mid);
+    MapGridSetMetatileIdAt(11, 10, METATILE_InsideOfTruck_DoorClosedFloor_Bottom);
     DrawWholeMapView();
     ScriptContext2_Enable();
     CpuFastFill(0, gPlttBufferFaded, 0x400);
@@ -243,9 +242,9 @@ void EndTruckSequence(u8 taskId)
 {
     if (!FuncIsActiveTask(Task_HandleTruckSequence))
     {
-        sub_808E82C(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, 3, 3);
-        sub_808E82C(2, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, 0, -3);
-        sub_808E82C(3, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, -3, 0);
+        SetObjectEventSpritePosByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, 3, 3);
+        SetObjectEventSpritePosByLocalIdAndMap(2, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, 0, -3);
+        SetObjectEventSpritePosByLocalIdAndMap(3, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, -3, 0);
     }
 }
 
diff --git a/src/field_specials.c b/src/field_specials.c
index db82f35b4..7c6ef37d7 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -63,7 +63,6 @@
 #include "constants/species.h"
 #include "constants/moves.h"
 #include "constants/party_menu.h"
-#include "constants/vars.h"
 #include "constants/battle_frontier.h"
 #include "constants/weather.h"
 #include "constants/metatile_labels.h"
@@ -656,9 +655,9 @@ void MauvilleGymPressSwitch(void)
     for (i = 0; i < ARRAY_COUNT(sMauvilleGymSwitchCoords); i++)
     {
         if (i == gSpecialVar_0x8004)
-            MapGridSetMetatileIdAt(sMauvilleGymSwitchCoords[i].x, sMauvilleGymSwitchCoords[i].y, METATILE_ID(MauvilleGym, PressedSwitch));
+            MapGridSetMetatileIdAt(sMauvilleGymSwitchCoords[i].x, sMauvilleGymSwitchCoords[i].y, METATILE_MauvilleGym_PressedSwitch);
         else
-            MapGridSetMetatileIdAt(sMauvilleGymSwitchCoords[i].x, sMauvilleGymSwitchCoords[i].y, METATILE_ID(MauvilleGym, RaisedSwitch));
+            MapGridSetMetatileIdAt(sMauvilleGymSwitchCoords[i].x, sMauvilleGymSwitchCoords[i].y, METATILE_MauvilleGym_RaisedSwitch);
     }
 }
 
@@ -673,83 +672,83 @@ void MauvilleGymSetDefaultBarriers(void)
         {
             switch (MapGridGetMetatileIdAt(x, y))
             {
-                case METATILE_ID(MauvilleGym, GreenBeamH1_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH1_Off));
+                case METATILE_MauvilleGym_GreenBeamH1_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH1_Off);
                     break;
-                case METATILE_ID(MauvilleGym, GreenBeamH2_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH2_Off));
+                case METATILE_MauvilleGym_GreenBeamH2_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH2_Off);
                     break;
-                case METATILE_ID(MauvilleGym, GreenBeamH3_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH3_Off));
+                case METATILE_MauvilleGym_GreenBeamH3_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH3_Off);
                     break;
-                case METATILE_ID(MauvilleGym, GreenBeamH4_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH4_Off));
+                case METATILE_MauvilleGym_GreenBeamH4_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH4_Off);
                     break;
-                case METATILE_ID(MauvilleGym, GreenBeamH1_Off):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH1_On));
+                case METATILE_MauvilleGym_GreenBeamH1_Off:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH1_On);
                     break;
-                case METATILE_ID(MauvilleGym, GreenBeamH2_Off):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH2_On));
+                case METATILE_MauvilleGym_GreenBeamH2_Off:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH2_On);
                     break;
-                case METATILE_ID(MauvilleGym, GreenBeamH3_Off):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH3_On) | METATILE_COLLISION_MASK);
+                case METATILE_MauvilleGym_GreenBeamH3_Off:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH3_On | METATILE_COLLISION_MASK);
                     break;
-                case METATILE_ID(MauvilleGym, GreenBeamH4_Off):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH4_On) | METATILE_COLLISION_MASK);
+                case METATILE_MauvilleGym_GreenBeamH4_Off:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH4_On | METATILE_COLLISION_MASK);
                     break;
-                case METATILE_ID(MauvilleGym, RedBeamH1_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH1_Off));
+                case METATILE_MauvilleGym_RedBeamH1_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH1_Off);
                     break;
-                case METATILE_ID(MauvilleGym, RedBeamH2_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH2_Off));
+                case METATILE_MauvilleGym_RedBeamH2_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH2_Off);
                     break;
-                case METATILE_ID(MauvilleGym, RedBeamH3_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH3_Off));
+                case METATILE_MauvilleGym_RedBeamH3_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH3_Off);
                     break;
-                case METATILE_ID(MauvilleGym, RedBeamH4_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH4_Off));
+                case METATILE_MauvilleGym_RedBeamH4_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH4_Off);
                     break;
-                case METATILE_ID(MauvilleGym, RedBeamH1_Off):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH1_On));
+                case METATILE_MauvilleGym_RedBeamH1_Off:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH1_On);
                     break;
-                case METATILE_ID(MauvilleGym, RedBeamH2_Off):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH2_On));
+                case METATILE_MauvilleGym_RedBeamH2_Off:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH2_On);
                     break;
-                case METATILE_ID(MauvilleGym, RedBeamH3_Off):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH3_On) | METATILE_COLLISION_MASK);
+                case METATILE_MauvilleGym_RedBeamH3_Off:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH3_On | METATILE_COLLISION_MASK);
                     break;
-                case METATILE_ID(MauvilleGym, RedBeamH4_Off):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH4_On) | METATILE_COLLISION_MASK);
+                case METATILE_MauvilleGym_RedBeamH4_Off:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH4_On | METATILE_COLLISION_MASK);
                     break;
-                case METATILE_ID(MauvilleGym, GreenBeamV1_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, PoleBottom_On) | METATILE_COLLISION_MASK);
+                case METATILE_MauvilleGym_GreenBeamV1_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleBottom_On | METATILE_COLLISION_MASK);
                     break;
-                case METATILE_ID(MauvilleGym, GreenBeamV2_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, FloorTile));
+                case METATILE_MauvilleGym_GreenBeamV2_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_FloorTile);
                     break;
-                case METATILE_ID(MauvilleGym, RedBeamV1_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, PoleBottom_Off) | METATILE_COLLISION_MASK);
+                case METATILE_MauvilleGym_RedBeamV1_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleBottom_Off | METATILE_COLLISION_MASK);
                     break;
-                case METATILE_ID(MauvilleGym, RedBeamV2_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, FloorTile));
+                case METATILE_MauvilleGym_RedBeamV2_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_FloorTile);
                     break;
-                case METATILE_ID(MauvilleGym, PoleBottom_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamV1_On) | METATILE_COLLISION_MASK);
+                case METATILE_MauvilleGym_PoleBottom_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamV1_On | METATILE_COLLISION_MASK);
                     break;
-                case METATILE_ID(MauvilleGym, FloorTile):
-                    if (MapGridGetMetatileIdAt(x, y - 1) == METATILE_ID(MauvilleGym, GreenBeamV1_On))
-                        MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamV2_On) | METATILE_COLLISION_MASK);
+                case METATILE_MauvilleGym_FloorTile:
+                    if (MapGridGetMetatileIdAt(x, y - 1) == METATILE_MauvilleGym_GreenBeamV1_On)
+                        MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamV2_On | METATILE_COLLISION_MASK);
                     else
-                        MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamV2_On) | METATILE_COLLISION_MASK);
+                        MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamV2_On | METATILE_COLLISION_MASK);
                     break;
-                case METATILE_ID(MauvilleGym, PoleBottom_Off):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamV1_On) | METATILE_COLLISION_MASK);
+                case METATILE_MauvilleGym_PoleBottom_Off:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamV1_On | METATILE_COLLISION_MASK);
                     break;
-                case METATILE_ID(MauvilleGym, PoleTop_Off):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, PoleTop_On) | METATILE_COLLISION_MASK);
+                case METATILE_MauvilleGym_PoleTop_Off:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleTop_On | METATILE_COLLISION_MASK);
                     break;
-                case METATILE_ID(MauvilleGym, PoleTop_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, PoleTop_Off));
+                case METATILE_MauvilleGym_PoleTop_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleTop_Off);
                     break;
             }
         }
@@ -763,7 +762,7 @@ void MauvilleGymDeactivatePuzzle(void)
     const struct UCoords8 *switchCoords = sMauvilleGymSwitchCoords;
     for (i = ARRAY_COUNT(sMauvilleGymSwitchCoords) - 1; i >= 0; i--)
     {
-        MapGridSetMetatileIdAt(switchCoords->x, switchCoords->y, METATILE_ID(MauvilleGym, PressedSwitch));
+        MapGridSetMetatileIdAt(switchCoords->x, switchCoords->y, METATILE_MauvilleGym_PressedSwitch);
         switchCoords++;
     }
     for (y = 12; y < 24; y++)
@@ -772,42 +771,42 @@ void MauvilleGymDeactivatePuzzle(void)
         {
             switch (MapGridGetMetatileIdAt(x, y))
             {
-                case METATILE_ID(MauvilleGym, GreenBeamH1_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH1_Off));
+                case METATILE_MauvilleGym_GreenBeamH1_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH1_Off);
                     break;
-                case METATILE_ID(MauvilleGym, GreenBeamH2_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH2_Off));
+                case METATILE_MauvilleGym_GreenBeamH2_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH2_Off);
                     break;
-                case METATILE_ID(MauvilleGym, GreenBeamH3_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH3_Off));
+                case METATILE_MauvilleGym_GreenBeamH3_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH3_Off);
                     break;
-                case METATILE_ID(MauvilleGym, GreenBeamH4_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH4_Off));
+                case METATILE_MauvilleGym_GreenBeamH4_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH4_Off);
                     break;
-                case METATILE_ID(MauvilleGym, RedBeamH1_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH1_Off));
+                case METATILE_MauvilleGym_RedBeamH1_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH1_Off);
                     break;
-                case METATILE_ID(MauvilleGym, RedBeamH2_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH2_Off));
+                case METATILE_MauvilleGym_RedBeamH2_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH2_Off);
                     break;
-                case METATILE_ID(MauvilleGym, RedBeamH3_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH3_Off));
+                case METATILE_MauvilleGym_RedBeamH3_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH3_Off);
                     break;
-                case METATILE_ID(MauvilleGym, RedBeamH4_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH4_Off));
+                case METATILE_MauvilleGym_RedBeamH4_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH4_Off);
                     break;
-                case METATILE_ID(MauvilleGym, GreenBeamV1_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, PoleBottom_On) | METATILE_COLLISION_MASK);
+                case METATILE_MauvilleGym_GreenBeamV1_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleBottom_On | METATILE_COLLISION_MASK);
                     break;
-                case METATILE_ID(MauvilleGym, RedBeamV1_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, PoleBottom_Off) | METATILE_COLLISION_MASK);
+                case METATILE_MauvilleGym_RedBeamV1_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleBottom_Off | METATILE_COLLISION_MASK);
                     break;
-                case METATILE_ID(MauvilleGym, GreenBeamV2_On):
-                case METATILE_ID(MauvilleGym, RedBeamV2_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, FloorTile));
+                case METATILE_MauvilleGym_GreenBeamV2_On:
+                case METATILE_MauvilleGym_RedBeamV2_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_FloorTile);
                     break;
-                case METATILE_ID(MauvilleGym, PoleTop_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, PoleTop_Off));
+                case METATILE_MauvilleGym_PoleTop_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleTop_Off);
                     break;
             }
         }
@@ -817,11 +816,11 @@ void MauvilleGymDeactivatePuzzle(void)
 static const bool8 sSlidingDoorNextFrameDelay[] = {0, 1, 1, 1, 1};
 
 static const u16 sPetalburgGymSlidingDoorMetatiles[] = {
-    METATILE_ID(PetalburgGym, SlidingDoor_Frame0),
-    METATILE_ID(PetalburgGym, SlidingDoor_Frame1),
-    METATILE_ID(PetalburgGym, SlidingDoor_Frame2),
-    METATILE_ID(PetalburgGym, SlidingDoor_Frame3),
-    METATILE_ID(PetalburgGym, SlidingDoor_Frame4),
+    METATILE_PetalburgGym_SlidingDoor_Frame0,
+    METATILE_PetalburgGym_SlidingDoor_Frame1,
+    METATILE_PetalburgGym_SlidingDoor_Frame2,
+    METATILE_PetalburgGym_SlidingDoor_Frame3,
+    METATILE_PetalburgGym_SlidingDoor_Frame4,
 };
 
 void PetalburgGymSlideOpenRoomDoors(void)
@@ -1096,30 +1095,30 @@ static void PCTurnOnEffect_1(s16 isPcTurnedOn, s8 dx, s8 dy)
     {
         if (gSpecialVar_0x8004 == PC_LOCATION_OTHER)
         {
-            tileId = METATILE_ID(Building, PC_Off);
+            tileId = METATILE_Building_PC_Off;
         }
         else if (gSpecialVar_0x8004 == PC_LOCATION_BRENDANS_HOUSE)
         {
-            tileId = METATILE_ID(BrendansMaysHouse, BrendanPC_Off);
+            tileId = METATILE_BrendansMaysHouse_BrendanPC_Off;
         }
         else if (gSpecialVar_0x8004 == PC_LOCATION_MAYS_HOUSE)
         {
-            tileId = METATILE_ID(BrendansMaysHouse, MayPC_Off);
+            tileId = METATILE_BrendansMaysHouse_MayPC_Off;
         }
     }
     else
     {
         if (gSpecialVar_0x8004 == PC_LOCATION_OTHER)
         {
-            tileId = METATILE_ID(Building, PC_On);
+            tileId = METATILE_Building_PC_On;
         }
         else if (gSpecialVar_0x8004 == PC_LOCATION_BRENDANS_HOUSE)
         {
-            tileId = METATILE_ID(BrendansMaysHouse, BrendanPC_On);
+            tileId = METATILE_BrendansMaysHouse_BrendanPC_On;
         }
         else if (gSpecialVar_0x8004 == PC_LOCATION_MAYS_HOUSE)
         {
-            tileId = METATILE_ID(BrendansMaysHouse, MayPC_On);
+            tileId = METATILE_BrendansMaysHouse_MayPC_On;
         }
     }
     MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + dx + 7, gSaveBlock1Ptr->pos.y + dy + 7, tileId | METATILE_COLLISION_MASK);
@@ -1153,15 +1152,15 @@ static void PCTurnOffEffect(void)
     }
     if (gSpecialVar_0x8004 == 0)
     {
-        tileId = METATILE_ID(Building, PC_Off);
+        tileId = METATILE_Building_PC_Off;
     }
     else if (gSpecialVar_0x8004 == 1)
     {
-        tileId = METATILE_ID(BrendansMaysHouse, BrendanPC_Off);
+        tileId = METATILE_BrendansMaysHouse_BrendanPC_Off;
     }
     else if (gSpecialVar_0x8004 == 2)
     {
-        tileId = METATILE_ID(BrendansMaysHouse, MayPC_Off);
+        tileId = METATILE_BrendansMaysHouse_MayPC_Off;
     }
     MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + dx + 7, gSaveBlock1Ptr->pos.y + dy + 7, tileId | METATILE_COLLISION_MASK);
     DrawWholeMapView();
@@ -1196,13 +1195,13 @@ static void LotteryCornerComputerEffect(struct Task *task)
         task->data[3] = 0;
         if (task->data[4] != 0)
         {
-            MapGridSetMetatileIdAt(18, 8, METATILE_ID(Shop, Laptop1_Normal) | METATILE_COLLISION_MASK);
-            MapGridSetMetatileIdAt(18, 9, METATILE_ID(Shop, Laptop2_Normal) | METATILE_COLLISION_MASK);
+            MapGridSetMetatileIdAt(18, 8, METATILE_Shop_Laptop1_Normal | METATILE_COLLISION_MASK);
+            MapGridSetMetatileIdAt(18, 9, METATILE_Shop_Laptop2_Normal | METATILE_COLLISION_MASK);
         }
         else
         {
-            MapGridSetMetatileIdAt(18, 8, METATILE_ID(Shop, Laptop1_Flash) | METATILE_COLLISION_MASK);
-            MapGridSetMetatileIdAt(18, 9, METATILE_ID(Shop, Laptop2_Flash) | METATILE_COLLISION_MASK);
+            MapGridSetMetatileIdAt(18, 8, METATILE_Shop_Laptop1_Flash | METATILE_COLLISION_MASK);
+            MapGridSetMetatileIdAt(18, 9, METATILE_Shop_Laptop2_Flash | METATILE_COLLISION_MASK);
         }
         DrawWholeMapView();
         task->data[4] ^= 1;
@@ -1216,8 +1215,8 @@ static void LotteryCornerComputerEffect(struct Task *task)
 
 void EndLotteryCornerComputerEffect(void)
 {
-    MapGridSetMetatileIdAt(18, 8, METATILE_ID(Shop, Laptop1_Normal) | METATILE_COLLISION_MASK);
-    MapGridSetMetatileIdAt(18, 9, METATILE_ID(Shop, Laptop2_Normal) | METATILE_COLLISION_MASK);
+    MapGridSetMetatileIdAt(18, 8, METATILE_Shop_Laptop1_Normal | METATILE_COLLISION_MASK);
+    MapGridSetMetatileIdAt(18, 9, METATILE_Shop_Laptop2_Normal | METATILE_COLLISION_MASK);
     DrawWholeMapView();
 }
 
@@ -1751,38 +1750,38 @@ const u8 *const gDeptStoreFloorNames[] =
 static const u16 sElevatorWindowTiles_Ascending[][3] =
 {
     {
-        METATILE_ID(BattleFrontier, Elevator_Top0),
-        METATILE_ID(BattleFrontier, Elevator_Top1),
-        METATILE_ID(BattleFrontier, Elevator_Top2)
+        METATILE_BattleFrontier_Elevator_Top0,
+        METATILE_BattleFrontier_Elevator_Top1,
+        METATILE_BattleFrontier_Elevator_Top2
     },
     {
-        METATILE_ID(BattleFrontier, Elevator_Mid0),
-        METATILE_ID(BattleFrontier, Elevator_Mid1),
-        METATILE_ID(BattleFrontier, Elevator_Mid2)
+        METATILE_BattleFrontier_Elevator_Mid0,
+        METATILE_BattleFrontier_Elevator_Mid1,
+        METATILE_BattleFrontier_Elevator_Mid2
     },
     {
-        METATILE_ID(BattleFrontier, Elevator_Bottom0),
-        METATILE_ID(BattleFrontier, Elevator_Bottom1),
-        METATILE_ID(BattleFrontier, Elevator_Bottom2)
+        METATILE_BattleFrontier_Elevator_Bottom0,
+        METATILE_BattleFrontier_Elevator_Bottom1,
+        METATILE_BattleFrontier_Elevator_Bottom2
     },
 };
 
 static const u16 sElevatorWindowTiles_Descending[][3] =
 {
     {
-        METATILE_ID(BattleFrontier, Elevator_Top0),
-        METATILE_ID(BattleFrontier, Elevator_Top2),
-        METATILE_ID(BattleFrontier, Elevator_Top1)
+        METATILE_BattleFrontier_Elevator_Top0,
+        METATILE_BattleFrontier_Elevator_Top2,
+        METATILE_BattleFrontier_Elevator_Top1
     },
     {
-        METATILE_ID(BattleFrontier, Elevator_Mid0),
-        METATILE_ID(BattleFrontier, Elevator_Mid2),
-        METATILE_ID(BattleFrontier, Elevator_Mid1)
+        METATILE_BattleFrontier_Elevator_Mid0,
+        METATILE_BattleFrontier_Elevator_Mid2,
+        METATILE_BattleFrontier_Elevator_Mid1
     },
     {
-        METATILE_ID(BattleFrontier, Elevator_Bottom0),
-        METATILE_ID(BattleFrontier, Elevator_Bottom2),
-        METATILE_ID(BattleFrontier, Elevator_Bottom1)
+        METATILE_BattleFrontier_Elevator_Bottom0,
+        METATILE_BattleFrontier_Elevator_Bottom2,
+        METATILE_BattleFrontier_Elevator_Bottom1
     },
 };
 
@@ -2855,7 +2854,7 @@ void SetBattleTowerLinkPlayerGfx(void)
 
 void ShowNatureGirlMessage(void)
 {
-    static const u8 *const sNatureGirlMessages[] = {
+    static const u8 *const sNatureGirlMessages[NUM_NATURES] = {
         [NATURE_HARDY]   = BattleFrontier_Lounge5_Text_NatureGirlHardy,
         [NATURE_LONELY]  = BattleFrontier_Lounge5_Text_NatureGirlLonely,
         [NATURE_BRAVE]   = BattleFrontier_Lounge5_Text_NatureGirlBrave,
@@ -3688,7 +3687,7 @@ void Unused_SetWeatherSunny(void)
     SetCurrentAndNextWeather(WEATHER_SUNNY);
 }
 
-// Always returns 1
+// All mart employees have a local id of 1, so function always returns 1
 u32 GetMartEmployeeObjectEventId(void)
 {
     static const u8 sPokeMarts[][3] =
diff --git a/src/field_tasks.c b/src/field_tasks.c
index 21b2732c3..49b6fbdd8 100644
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -19,7 +19,6 @@
 #include "constants/field_tasks.h"
 #include "constants/items.h"
 #include "constants/songs.h"
-#include "constants/vars.h"
 #include "constants/metatile_labels.h"
 
 struct PacifidlogMetatileOffsets
@@ -52,26 +51,26 @@ static const TaskFunc sPerStepCallbacks[] =
 // they are in pairs but declared as 1D array
 static const struct PacifidlogMetatileOffsets sHalfSubmergedBridgeMetatileOffsets[] =
 {
-    { 0,  0, METATILE_ID(Pacifidlog, HalfSubmergedLogs_Vertical0)}, {0, 1, METATILE_ID(Pacifidlog, HalfSubmergedLogs_Vertical1)},
-    { 0, -1, METATILE_ID(Pacifidlog, HalfSubmergedLogs_Vertical0)}, {0, 0, METATILE_ID(Pacifidlog, HalfSubmergedLogs_Vertical1)},
-    { 0,  0, METATILE_ID(Pacifidlog, HalfSubmergedLogs_Horizontal0)}, {1, 0, METATILE_ID(Pacifidlog, HalfSubmergedLogs_Horizontal1)},
-    {-1,  0, METATILE_ID(Pacifidlog, HalfSubmergedLogs_Horizontal0)}, {0, 0, METATILE_ID(Pacifidlog, HalfSubmergedLogs_Horizontal1)}
+    { 0,  0, METATILE_Pacifidlog_HalfSubmergedLogs_Vertical0}, {0, 1, METATILE_Pacifidlog_HalfSubmergedLogs_Vertical1},
+    { 0, -1, METATILE_Pacifidlog_HalfSubmergedLogs_Vertical0}, {0, 0, METATILE_Pacifidlog_HalfSubmergedLogs_Vertical1},
+    { 0,  0, METATILE_Pacifidlog_HalfSubmergedLogs_Horizontal0}, {1, 0, METATILE_Pacifidlog_HalfSubmergedLogs_Horizontal1},
+    {-1,  0, METATILE_Pacifidlog_HalfSubmergedLogs_Horizontal0}, {0, 0, METATILE_Pacifidlog_HalfSubmergedLogs_Horizontal1}
 };
 
 static const struct PacifidlogMetatileOffsets sFullySubmergedBridgeMetatileOffsets[] =
 {
-    { 0,  0, METATILE_ID(Pacifidlog, SubmergedLogs_Vertical0)}, {0, 1, METATILE_ID(Pacifidlog, SubmergedLogs_Vertical1)},
-    { 0, -1, METATILE_ID(Pacifidlog, SubmergedLogs_Vertical0)}, {0, 0, METATILE_ID(Pacifidlog, SubmergedLogs_Vertical1)},
-    { 0,  0, METATILE_ID(Pacifidlog, SubmergedLogs_Horizontal0)}, {1, 0, METATILE_ID(Pacifidlog, SubmergedLogs_Horizontal1)},
-    {-1,  0, METATILE_ID(Pacifidlog, SubmergedLogs_Horizontal0)}, {0, 0, METATILE_ID(Pacifidlog, SubmergedLogs_Horizontal1)}
+    { 0,  0, METATILE_Pacifidlog_SubmergedLogs_Vertical0}, {0, 1, METATILE_Pacifidlog_SubmergedLogs_Vertical1},
+    { 0, -1, METATILE_Pacifidlog_SubmergedLogs_Vertical0}, {0, 0, METATILE_Pacifidlog_SubmergedLogs_Vertical1},
+    { 0,  0, METATILE_Pacifidlog_SubmergedLogs_Horizontal0}, {1, 0, METATILE_Pacifidlog_SubmergedLogs_Horizontal1},
+    {-1,  0, METATILE_Pacifidlog_SubmergedLogs_Horizontal0}, {0, 0, METATILE_Pacifidlog_SubmergedLogs_Horizontal1}
 };
 
 static const struct PacifidlogMetatileOffsets sFloatingBridgeMetatileOffsets[] =
 {
-    { 0,  0, METATILE_ID(Pacifidlog, FloatingLogs_Vertical0)}, {0, 1, METATILE_ID(Pacifidlog, FloatingLogs_Vertical1)},
-    { 0, -1, METATILE_ID(Pacifidlog, FloatingLogs_Vertical0)}, {0, 0, METATILE_ID(Pacifidlog, FloatingLogs_Vertical1)},
-    { 0,  0, METATILE_ID(Pacifidlog, FloatingLogs_Horizontal0)}, {1, 0, METATILE_ID(Pacifidlog, FloatingLogs_Horizontal1)},
-    {-1,  0, METATILE_ID(Pacifidlog, FloatingLogs_Horizontal0)}, {0, 0, METATILE_ID(Pacifidlog, FloatingLogs_Horizontal1)}
+    { 0,  0, METATILE_Pacifidlog_FloatingLogs_Vertical0}, {0, 1, METATILE_Pacifidlog_FloatingLogs_Vertical1},
+    { 0, -1, METATILE_Pacifidlog_FloatingLogs_Vertical0}, {0, 0, METATILE_Pacifidlog_FloatingLogs_Vertical1},
+    { 0,  0, METATILE_Pacifidlog_FloatingLogs_Horizontal0}, {1, 0, METATILE_Pacifidlog_FloatingLogs_Horizontal1},
+    {-1,  0, METATILE_Pacifidlog_FloatingLogs_Horizontal0}, {0, 0, METATILE_Pacifidlog_FloatingLogs_Horizontal1}
 };
 
 // Each element corresponds to a y coordinate row in the sootopolis gym 1F map.
@@ -106,10 +105,10 @@ static const u16 sSootopolisGymIceRowVars[] =
 };
 
 static const u16 sMuddySlopeMetatiles[] = {
-    METATILE_ID(General, MuddySlope_Frame0),
-    METATILE_ID(General, MuddySlope_Frame3),
-    METATILE_ID(General, MuddySlope_Frame2),
-    METATILE_ID(General, MuddySlope_Frame1)
+    METATILE_General_MuddySlope_Frame0,
+    METATILE_General_MuddySlope_Frame3,
+    METATILE_General_MuddySlope_Frame2,
+    METATILE_General_MuddySlope_Frame1
 };
 
 static void Task_RunPerStepCallback(u8 taskId)
@@ -381,11 +380,11 @@ static void SetLoweredForetreeBridgeMetatile(s16 x, s16 y)
     {
         switch (MapGridGetMetatileIdAt(x, y))
         {
-            case METATILE_ID(Fortree, BridgeOverGrass_Raised):
-                MapGridSetMetatileIdAt(x, y, METATILE_ID(Fortree, BridgeOverGrass_Lowered));
+            case METATILE_Fortree_BridgeOverGrass_Raised:
+                MapGridSetMetatileIdAt(x, y, METATILE_Fortree_BridgeOverGrass_Lowered);
                 break;
-            case METATILE_ID(Fortree, BridgeOverTrees_Raised):
-                MapGridSetMetatileIdAt(x, y, METATILE_ID(Fortree, BridgeOverTrees_Lowered));
+            case METATILE_Fortree_BridgeOverTrees_Raised:
+                MapGridSetMetatileIdAt(x, y, METATILE_Fortree_BridgeOverTrees_Lowered);
                 break;
         }
     }
@@ -398,11 +397,11 @@ static void SetNormalFortreeBridgeMetatile(s16 x, s16 y)
     {
         switch (MapGridGetMetatileIdAt(x, y))
         {
-            case METATILE_ID(Fortree, BridgeOverGrass_Lowered):
-                MapGridSetMetatileIdAt(x, y, METATILE_ID(Fortree, BridgeOverGrass_Raised));
+            case METATILE_Fortree_BridgeOverGrass_Lowered:
+                MapGridSetMetatileIdAt(x, y, METATILE_Fortree_BridgeOverGrass_Raised);
                 break;
-            case METATILE_ID(Fortree, BridgeOverTrees_Lowered):
-                MapGridSetMetatileIdAt(x, y, METATILE_ID(Fortree, BridgeOverTrees_Raised));
+            case METATILE_Fortree_BridgeOverTrees_Lowered:
+                MapGridSetMetatileIdAt(x, y, METATILE_Fortree_BridgeOverTrees_Raised);
                 break;
         }
     }
@@ -530,7 +529,7 @@ void SetSootopolisGymCrackedIceMetatiles(void)
         for (y = 0; y < height; y++)
         {
             if (IsIcePuzzleCoordVisited(x, y) == TRUE)
-                MapGridSetMetatileIdAt(x + 7, y + 7, METATILE_ID(SootopolisGym, Ice_Cracked));
+                MapGridSetMetatileIdAt(x + 7, y + 7, METATILE_SootopolisGym_Ice_Cracked);
         }
     }
 }
@@ -585,7 +584,7 @@ static void SootopolisGymIcePerStepCallback(u8 taskId)
                 x = data[4];
                 y = data[5];
                 PlaySE(SE_RU_BARI);
-                MapGridSetMetatileIdAt(x, y, METATILE_ID(SootopolisGym, Ice_Cracked));
+                MapGridSetMetatileIdAt(x, y, METATILE_SootopolisGym_Ice_Cracked);
                 CurrentMapDrawMetatileAt(x, y);
                 MarkIcePuzzleCoordVisited(x - 7, y - 7);
                 data[1] = 1;
@@ -601,7 +600,7 @@ static void SootopolisGymIcePerStepCallback(u8 taskId)
                 x = data[4];
                 y = data[5];
                 PlaySE(SE_RU_GASYAN);
-                MapGridSetMetatileIdAt(x, y, METATILE_ID(SootopolisGym, Ice_Broken));
+                MapGridSetMetatileIdAt(x, y, METATILE_SootopolisGym_Ice_Broken);
                 CurrentMapDrawMetatileAt(x, y);
                 data[1] = 1;
             }
@@ -621,10 +620,10 @@ static void AshGrassPerStepCallback(u8 taskId)
         data[2] = y;
         if (MetatileBehavior_IsAshGrass(MapGridGetMetatileBehaviorAt(x, y)))
         {
-            if (MapGridGetMetatileIdAt(x, y) == METATILE_ID(Fallarbor, AshGrass))
-                StartAshFieldEffect(x, y, METATILE_ID(Fallarbor, NormalGrass), 4);
+            if (MapGridGetMetatileIdAt(x, y) == METATILE_Fallarbor_AshGrass)
+                StartAshFieldEffect(x, y, METATILE_Fallarbor_NormalGrass, 4);
             else
-                StartAshFieldEffect(x, y, METATILE_ID(Lavaridge, NormalGrass), 4);
+                StartAshFieldEffect(x, y, METATILE_Lavaridge_NormalGrass, 4);
 
             if (CheckBagHasItem(ITEM_SOOT_SACK, 1))
             {
@@ -693,7 +692,7 @@ static void SetMuddySlopeMetatile(s16 *data, s16 x, s16 y)
 
     MapGridSetMetatileIdAt(x, y, tile);
     CurrentMapDrawMetatileAt(x, y);
-    MapGridSetMetatileIdAt(x, y, METATILE_ID(General, MuddySlope_Frame0));
+    MapGridSetMetatileIdAt(x, y, METATILE_General_MuddySlope_Frame0);
 }
 
 static void Task_MuddySlope(u8 taskId)
diff --git a/src/fieldmap.c b/src/fieldmap.c
index cfc7018bd..49337ebbe 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -44,7 +44,7 @@ static void InitBackupMapLayoutConnections(struct MapHeader *mapHeader);
 static void LoadSavedMapView(void);
 static bool8 SkipCopyingMetatileFromSavedMap(u16* mapMetatilePtr, u16 mapWidth, u8 yMode);
 
-struct MapHeader const *const mapconnection_get_mapheader(struct MapConnection *connection)
+struct MapHeader const *const GetMapHeaderFromConnection(struct MapConnection *connection)
 {
     return Overworld_GetMapHeaderByGroupAndId(connection->mapGroup, connection->mapNum);
 }
@@ -124,7 +124,7 @@ static void InitBackupMapLayoutConnections(struct MapHeader *mapHeader)
         gMapConnectionFlags = sDummyConnectionFlags;
         for (i = 0; i < count; i++, connection++)
         {
-            struct MapHeader const *cMap = mapconnection_get_mapheader(connection);
+            struct MapHeader const *cMap = GetMapHeaderFromConnection(connection);
             u32 offset = connection->offset;
             switch (connection->direction)
             {
@@ -741,7 +741,7 @@ int CanCameraMoveInDirection(int direction)
 void sub_80887F8(struct MapConnection *connection, int direction, int x, int y)
 {
     struct MapHeader const *mapHeader;
-    mapHeader = mapconnection_get_mapheader(connection);
+    mapHeader = GetMapHeaderFromConnection(connection);
     switch (direction)
     {
     case CONNECTION_EAST:
@@ -812,7 +812,7 @@ struct MapConnection *sub_8088950(u8 direction, int x, int y)
 bool8 sub_80889A8(u8 direction, int x, int y, struct MapConnection *connection)
 {
     struct MapHeader const *mapHeader;
-    mapHeader = mapconnection_get_mapheader(connection);
+    mapHeader = GetMapHeaderFromConnection(connection);
     switch (direction)
     {
     case CONNECTION_SOUTH:
@@ -853,7 +853,7 @@ int sub_8088A38(int x, int width)
 int sub_8088A4C(struct MapConnection *connection, int x, int y)
 {
     struct MapHeader const *mapHeader;
-    mapHeader = mapconnection_get_mapheader(connection);
+    mapHeader = GetMapHeaderFromConnection(connection);
     switch (connection->direction)
     {
     case CONNECTION_SOUTH:
@@ -900,7 +900,7 @@ struct MapConnection *GetConnectionAtCoords(s16 x, s16 y)
     return NULL;
 }
 
-void sub_8088B3C(u16 x, u16 y)
+void SetCameraFocusCoords(u16 x, u16 y)
 {
     gSaveBlock1Ptr->pos.x = x - 7;
     gSaveBlock1Ptr->pos.y = y - 7;
@@ -912,7 +912,8 @@ void GetCameraFocusCoords(u16 *x, u16 *y)
     *y = gSaveBlock1Ptr->pos.y + 7;
 }
 
-void SetPlayerCoords(u16 x, u16 y)
+// Unused
+static void SetCameraCoords(u16 x, u16 y)
 {
     gSaveBlock1Ptr->pos.x = x;
     gSaveBlock1Ptr->pos.y = y;
@@ -945,12 +946,12 @@ static bool8 SkipCopyingMetatileFromSavedMap(u16* mapMetatilePtr, u16 mapWidth,
     else
         mapMetatilePtr += mapWidth;
 
-    if (sub_80FADE4(*mapMetatilePtr & METATILE_ID_MASK, yMode) == 1)
+    if (IsLargeBreakableDecoration(*mapMetatilePtr & METATILE_ID_MASK, yMode) == TRUE)
         return TRUE;
     return FALSE;
 }
 
-void copy_tileset_patterns_to_vram(struct Tileset const *tileset, u16 numTiles, u16 offset)
+static void CopyTilesetToVram(struct Tileset const *tileset, u16 numTiles, u16 offset)
 {
     if (tileset)
     {
@@ -961,7 +962,7 @@ void copy_tileset_patterns_to_vram(struct Tileset const *tileset, u16 numTiles,
     }
 }
 
-void copy_tileset_patterns_to_vram2(struct Tileset const *tileset, u16 numTiles, u16 offset)
+static void CopyTilesetToVramUsingHeap(struct Tileset const *tileset, u16 numTiles, u16 offset)
 {
     if (tileset)
     {
@@ -982,7 +983,7 @@ void nullsub_90(void)
 
 }
 
-void apply_map_tileset_palette(struct Tileset const *tileset, u16 destOffset, u16 size)
+void LoadTilesetPalette(struct Tileset const *tileset, u16 destOffset, u16 size)
 {
     u16 black = RGB_BLACK;
 
@@ -1007,45 +1008,45 @@ void apply_map_tileset_palette(struct Tileset const *tileset, u16 destOffset, u1
     }
 }
 
-void copy_map_tileset1_to_vram(struct MapLayout const *mapLayout)
+void CopyPrimaryTilesetToVram(struct MapLayout const *mapLayout)
 {
-    copy_tileset_patterns_to_vram(mapLayout->primaryTileset, NUM_TILES_IN_PRIMARY, 0);
+    CopyTilesetToVram(mapLayout->primaryTileset, NUM_TILES_IN_PRIMARY, 0);
 }
 
-void copy_map_tileset2_to_vram(struct MapLayout const *mapLayout)
+void CopySecondaryTilesetToVram(struct MapLayout const *mapLayout)
 {
-    copy_tileset_patterns_to_vram(mapLayout->secondaryTileset, NUM_TILES_TOTAL - NUM_TILES_IN_PRIMARY, NUM_TILES_IN_PRIMARY);
+    CopyTilesetToVram(mapLayout->secondaryTileset, NUM_TILES_TOTAL - NUM_TILES_IN_PRIMARY, NUM_TILES_IN_PRIMARY);
 }
 
-void copy_map_tileset2_to_vram_2(struct MapLayout const *mapLayout)
+void CopySecondaryTilesetToVramUsingHeap(struct MapLayout const *mapLayout)
 {
-    copy_tileset_patterns_to_vram2(mapLayout->secondaryTileset, NUM_TILES_TOTAL - NUM_TILES_IN_PRIMARY, NUM_TILES_IN_PRIMARY);
+    CopyTilesetToVramUsingHeap(mapLayout->secondaryTileset, NUM_TILES_TOTAL - NUM_TILES_IN_PRIMARY, NUM_TILES_IN_PRIMARY);
 }
 
-void apply_map_tileset1_palette(struct MapLayout const *mapLayout)
+static void LoadPrimaryTilesetPalette(struct MapLayout const *mapLayout)
 {
-    apply_map_tileset_palette(mapLayout->primaryTileset, 0, NUM_PALS_IN_PRIMARY * 16 * 2);
+    LoadTilesetPalette(mapLayout->primaryTileset, 0, NUM_PALS_IN_PRIMARY * 16 * 2);
 }
 
-void apply_map_tileset2_palette(struct MapLayout const *mapLayout)
+void LoadSecondaryTilesetPalette(struct MapLayout const *mapLayout)
 {
-    apply_map_tileset_palette(mapLayout->secondaryTileset, NUM_PALS_IN_PRIMARY * 16, (NUM_PALS_TOTAL - NUM_PALS_IN_PRIMARY) * 16 * 2);
+    LoadTilesetPalette(mapLayout->secondaryTileset, NUM_PALS_IN_PRIMARY * 16, (NUM_PALS_TOTAL - NUM_PALS_IN_PRIMARY) * 16 * 2);
 }
 
-void copy_map_tileset1_tileset2_to_vram(struct MapLayout const *mapLayout)
+void CopyMapTilesetsToVram(struct MapLayout const *mapLayout)
 {
     if (mapLayout)
     {
-        copy_tileset_patterns_to_vram2(mapLayout->primaryTileset, NUM_TILES_IN_PRIMARY, 0);
-        copy_tileset_patterns_to_vram2(mapLayout->secondaryTileset, NUM_TILES_TOTAL - NUM_TILES_IN_PRIMARY, NUM_TILES_IN_PRIMARY);
+        CopyTilesetToVramUsingHeap(mapLayout->primaryTileset, NUM_TILES_IN_PRIMARY, 0);
+        CopyTilesetToVramUsingHeap(mapLayout->secondaryTileset, NUM_TILES_TOTAL - NUM_TILES_IN_PRIMARY, NUM_TILES_IN_PRIMARY);
     }
 }
 
-void apply_map_tileset1_tileset2_palette(struct MapLayout const *mapLayout)
+void LoadMapTilesetPalettes(struct MapLayout const *mapLayout)
 {
     if (mapLayout)
     {
-        apply_map_tileset1_palette(mapLayout);
-        apply_map_tileset2_palette(mapLayout);
+        LoadPrimaryTilesetPalette(mapLayout);
+        LoadSecondaryTilesetPalette(mapLayout);
     }
 }
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 88927959e..34868342f 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "event_object_lock.h"
 #include "event_object_movement.h"
+#include "event_scripts.h"
 #include "faraway_island.h"
 #include "field_camera.h"
 #include "field_effect.h"
@@ -24,11 +25,10 @@
 
 extern struct MapPosition gPlayerFacingPosition;
 
-extern const u8 EventScript_FldEffCut[];
 extern const u8 FarawayIsland_Interior_EventScript_HideMewWhenGrassCut[];
 
 extern const u8 gFieldEffectPic_CutGrass[];
-extern const u16 gFieldEffectObjectPalette6[];
+extern const u16 gFieldEffectPal_CutGrass[];
 
 // cut 'square' defines
 #define CUT_NORMAL_SIDE 3
@@ -122,12 +122,12 @@ static const struct SpriteFrameImage sSpriteImageTable_CutGrass[] =
     {gFieldEffectPic_CutGrass, 0x20},
 };
 
-const struct SpritePalette gFieldEffectObjectPaletteInfo6 = {gFieldEffectObjectPalette6, 0x1000};
+const struct SpritePalette gSpritePalette_CutGrass = {gFieldEffectPal_CutGrass, FLDEFF_PAL_TAG_CUT_GRASS};
 
 static const struct SpriteTemplate sSpriteTemplate_CutGrass =
 {
     .tileTag = 0xFFFF,
-    .paletteTag = 0x1000,
+    .paletteTag = FLDEFF_PAL_TAG_CUT_GRASS,
     .oam = &sOamData_CutGrass,
     .anims = sSpriteAnimTable_CutGrass,
     .images = sSpriteImageTable_CutGrass,
@@ -281,7 +281,7 @@ static void FieldCallback_CutGrass(void)
 
 bool8 FldEff_UseCutOnGrass(void)
 {
-    u8 taskId = oei_task_add();
+    u8 taskId = CreateFieldMoveTask();
 
     gTasks[taskId].data[8] = (u32)StartCutGrassFieldEffect >> 16;
     gTasks[taskId].data[9] = (u32)StartCutGrassFieldEffect;
@@ -292,12 +292,12 @@ bool8 FldEff_UseCutOnGrass(void)
 static void FieldCallback_CutTree(void)
 {
     gFieldEffectArguments[0] = GetCursorSelectionMonId();
-    ScriptContext1_SetupScript(EventScript_FldEffCut);
+    ScriptContext1_SetupScript(EventScript_UseCut);
 }
 
 bool8 FldEff_UseCutOnTree(void)
 {
-    u8 taskId = oei_task_add();
+    u8 taskId = CreateFieldMoveTask();
 
     gTasks[taskId].data[8] = (u32)StartCutTreeFieldEffect >> 16;
     gTasks[taskId].data[9] = (u32)StartCutTreeFieldEffect;
@@ -355,36 +355,36 @@ static void SetCutGrassMetatile(s16 x, s16 y)
 
     switch (metatileId)
     {
-    case METATILE_ID(Fortree, LongGrass_Root):
-    case METATILE_ID(General, LongGrass):
-    case METATILE_ID(General, TallGrass):
-        MapGridSetMetatileIdAt(x, y, METATILE_ID(General, Grass));
+    case METATILE_Fortree_LongGrass_Root:
+    case METATILE_General_LongGrass:
+    case METATILE_General_TallGrass:
+        MapGridSetMetatileIdAt(x, y, METATILE_General_Grass);
         break;
-    case METATILE_ID(General, TallGrass_TreeLeft):
-        MapGridSetMetatileIdAt(x, y, METATILE_ID(General, Grass_TreeLeft));
+    case METATILE_General_TallGrass_TreeLeft:
+        MapGridSetMetatileIdAt(x, y, METATILE_General_Grass_TreeLeft);
         break;
-    case METATILE_ID(General, TallGrass_TreeRight):
-        MapGridSetMetatileIdAt(x, y, METATILE_ID(General, Grass_TreeRight));
+    case METATILE_General_TallGrass_TreeRight:
+        MapGridSetMetatileIdAt(x, y, METATILE_General_Grass_TreeRight);
         break;
-    case METATILE_ID(Fortree, SecretBase_LongGrass_BottomLeft):
-        MapGridSetMetatileIdAt(x, y, METATILE_ID(Fortree, SecretBase_LongGrass_TopLeft));
+    case METATILE_Fortree_SecretBase_LongGrass_BottomLeft:
+        MapGridSetMetatileIdAt(x, y, METATILE_Fortree_SecretBase_LongGrass_TopLeft);
         break;
-    case METATILE_ID(Fortree, SecretBase_LongGrass_BottomMid):
-        MapGridSetMetatileIdAt(x, y, METATILE_ID(Fortree, SecretBase_LongGrass_TopMid));
+    case METATILE_Fortree_SecretBase_LongGrass_BottomMid:
+        MapGridSetMetatileIdAt(x, y, METATILE_Fortree_SecretBase_LongGrass_TopMid);
         break;
-    case METATILE_ID(Fortree, SecretBase_LongGrass_BottomRight):
-        MapGridSetMetatileIdAt(x, y, METATILE_ID(Fortree, SecretBase_LongGrass_TopRight));
+    case METATILE_Fortree_SecretBase_LongGrass_BottomRight:
+        MapGridSetMetatileIdAt(x, y, METATILE_Fortree_SecretBase_LongGrass_TopRight);
         break;
-    case METATILE_ID(Lavaridge, NormalGrass):
-    case METATILE_ID(Lavaridge, AshGrass):
-        MapGridSetMetatileIdAt(x, y, METATILE_ID(Lavaridge, LavaField));
+    case METATILE_Lavaridge_NormalGrass:
+    case METATILE_Lavaridge_AshGrass:
+        MapGridSetMetatileIdAt(x, y, METATILE_Lavaridge_LavaField);
         break;
-    case METATILE_ID(Fallarbor, NormalGrass):
-    case METATILE_ID(Fallarbor, AshGrass):
-        MapGridSetMetatileIdAt(x, y, METATILE_ID(Fallarbor, AshField));
+    case METATILE_Fallarbor_NormalGrass:
+    case METATILE_Fallarbor_AshGrass:
+        MapGridSetMetatileIdAt(x, y, METATILE_Fallarbor_AshField);
         break;
-    case METATILE_ID(General, TallGrass_TreeUp):
-        MapGridSetMetatileIdAt(x, y, METATILE_ID(General, Grass_TreeUp));
+    case METATILE_General_TallGrass_TreeUp:
+        MapGridSetMetatileIdAt(x, y, METATILE_General_Grass_TreeUp);
         break;
     }
 }
@@ -402,13 +402,13 @@ static u8 GetLongGrassCaseAt(s16 x, s16 y)
 {
     u16 metatileId = MapGridGetMetatileIdAt(x, y);
 
-    if (metatileId == METATILE_ID(General, Grass))
+    if (metatileId == METATILE_General_Grass)
         return LONG_GRASS_FIELD;
-    else if (metatileId == METATILE_ID(Fortree, SecretBase_LongGrass_TopLeft))
+    else if (metatileId == METATILE_Fortree_SecretBase_LongGrass_TopLeft)
         return LONG_GRASS_BASE_LEFT;
-    else if (metatileId == METATILE_ID(Fortree, SecretBase_LongGrass_TopMid))
+    else if (metatileId == METATILE_Fortree_SecretBase_LongGrass_TopMid)
         return LONG_GRASS_BASE_CENTER;
-    else if (metatileId == METATILE_ID(Fortree, SecretBase_LongGrass_TopRight))
+    else if (metatileId == METATILE_Fortree_SecretBase_LongGrass_TopRight)
         return LONG_GRASS_BASE_RIGHT;
     else
         return LONG_GRASS_NONE;
@@ -422,34 +422,34 @@ static void SetCutGrassMetatiles(s16 x, s16 y)
     for (i = 0; i < sCutSquareSide; i++)
     {
         s16 currentX = x + i;
-        if (MapGridGetMetatileIdAt(currentX, y) == METATILE_ID(General, LongGrass))
+        if (MapGridGetMetatileIdAt(currentX, y) == METATILE_General_LongGrass)
         {
             switch (GetLongGrassCaseAt(currentX, y + 1))
             {
             case LONG_GRASS_FIELD:
-                MapGridSetMetatileIdAt(currentX, y + 1, METATILE_ID(Fortree, LongGrass_Root));
+                MapGridSetMetatileIdAt(currentX, y + 1, METATILE_Fortree_LongGrass_Root);
                 break;
             case LONG_GRASS_BASE_LEFT:
-                MapGridSetMetatileIdAt(currentX, y + 1, METATILE_ID(Fortree, SecretBase_LongGrass_BottomLeft));
+                MapGridSetMetatileIdAt(currentX, y + 1, METATILE_Fortree_SecretBase_LongGrass_BottomLeft);
                 break;
             case LONG_GRASS_BASE_CENTER:
-                MapGridSetMetatileIdAt(currentX, y + 1, METATILE_ID(Fortree, SecretBase_LongGrass_BottomMid));
+                MapGridSetMetatileIdAt(currentX, y + 1, METATILE_Fortree_SecretBase_LongGrass_BottomMid);
                 break;
             case LONG_GRASS_BASE_RIGHT:
-                MapGridSetMetatileIdAt(currentX, y + 1, METATILE_ID(Fortree, SecretBase_LongGrass_BottomRight));
+                MapGridSetMetatileIdAt(currentX, y + 1, METATILE_Fortree_SecretBase_LongGrass_BottomRight);
                 break;
             }
         }
-        if (MapGridGetMetatileIdAt(currentX, lowerY) == METATILE_ID(General, Grass))
+        if (MapGridGetMetatileIdAt(currentX, lowerY) == METATILE_General_Grass)
         {
-            if (MapGridGetMetatileIdAt(currentX, lowerY + 1) == METATILE_ID(Fortree, LongGrass_Root))
-                MapGridSetMetatileIdAt(currentX, lowerY + 1, METATILE_ID(General, Grass));
-            if (MapGridGetMetatileIdAt(currentX, lowerY + 1) == METATILE_ID(Fortree, SecretBase_LongGrass_BottomLeft))
-                MapGridSetMetatileIdAt(currentX, lowerY + 1, METATILE_ID(Fortree, SecretBase_LongGrass_TopLeft));
-            if (MapGridGetMetatileIdAt(currentX, lowerY + 1) == METATILE_ID(Fortree, SecretBase_LongGrass_BottomMid))
-                MapGridSetMetatileIdAt(currentX, lowerY + 1, METATILE_ID(Fortree, SecretBase_LongGrass_TopMid));
-            if (MapGridGetMetatileIdAt(currentX, lowerY + 1) == METATILE_ID(Fortree, SecretBase_LongGrass_BottomRight))
-                MapGridSetMetatileIdAt(currentX, lowerY + 1, METATILE_ID(Fortree, SecretBase_LongGrass_TopRight));
+            if (MapGridGetMetatileIdAt(currentX, lowerY + 1) == METATILE_Fortree_LongGrass_Root)
+                MapGridSetMetatileIdAt(currentX, lowerY + 1, METATILE_General_Grass);
+            if (MapGridGetMetatileIdAt(currentX, lowerY + 1) == METATILE_Fortree_SecretBase_LongGrass_BottomLeft)
+                MapGridSetMetatileIdAt(currentX, lowerY + 1, METATILE_Fortree_SecretBase_LongGrass_TopLeft);
+            if (MapGridGetMetatileIdAt(currentX, lowerY + 1) == METATILE_Fortree_SecretBase_LongGrass_BottomMid)
+                MapGridSetMetatileIdAt(currentX, lowerY + 1, METATILE_Fortree_SecretBase_LongGrass_TopMid);
+            if (MapGridGetMetatileIdAt(currentX, lowerY + 1) == METATILE_Fortree_SecretBase_LongGrass_BottomRight)
+                MapGridSetMetatileIdAt(currentX, lowerY + 1, METATILE_Fortree_SecretBase_LongGrass_TopRight);
         }
     }
 
@@ -486,62 +486,62 @@ static void HandleLongGrassOnHyper(u8 caseId, s16 x, s16 y)
 
     if (arr[0] == TRUE)
     {
-        if (MapGridGetMetatileIdAt(newX, y + 3) == METATILE_ID(Fortree, LongGrass_Root))
-            MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID(General, Grass));
-        if (MapGridGetMetatileIdAt(newX, y + 3) == METATILE_ID(Fortree, SecretBase_LongGrass_BottomLeft))
-            MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID(Fortree, SecretBase_LongGrass_TopLeft));
-        if (MapGridGetMetatileIdAt(newX, y + 3) == METATILE_ID(Fortree, SecretBase_LongGrass_BottomMid))
-            MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID(Fortree, SecretBase_LongGrass_TopMid));
-        if (MapGridGetMetatileIdAt(newX, y + 3) == METATILE_ID(Fortree, SecretBase_LongGrass_BottomRight))
-            MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID(Fortree, SecretBase_LongGrass_TopRight));
+        if (MapGridGetMetatileIdAt(newX, y + 3) == METATILE_Fortree_LongGrass_Root)
+            MapGridSetMetatileIdAt(newX, y + 3, METATILE_General_Grass);
+        if (MapGridGetMetatileIdAt(newX, y + 3) == METATILE_Fortree_SecretBase_LongGrass_BottomLeft)
+            MapGridSetMetatileIdAt(newX, y + 3, METATILE_Fortree_SecretBase_LongGrass_TopLeft);
+        if (MapGridGetMetatileIdAt(newX, y + 3) == METATILE_Fortree_SecretBase_LongGrass_BottomMid)
+            MapGridSetMetatileIdAt(newX, y + 3, METATILE_Fortree_SecretBase_LongGrass_TopMid);
+        if (MapGridGetMetatileIdAt(newX, y + 3) == METATILE_Fortree_SecretBase_LongGrass_BottomRight)
+            MapGridSetMetatileIdAt(newX, y + 3, METATILE_Fortree_SecretBase_LongGrass_TopRight);
     }
     if (arr[1] == TRUE)
     {
-        if (MapGridGetMetatileIdAt(newX, y + 2) == METATILE_ID(General, LongGrass))
+        if (MapGridGetMetatileIdAt(newX, y + 2) == METATILE_General_LongGrass)
         {
             switch (GetLongGrassCaseAt(newX, y + 3))
             {
             case LONG_GRASS_FIELD:
-                MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID(Fortree, LongGrass_Root));
+                MapGridSetMetatileIdAt(newX, y + 3, METATILE_Fortree_LongGrass_Root);
                 break;
             case LONG_GRASS_BASE_LEFT:
-                MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID(Fortree, SecretBase_LongGrass_BottomLeft));
+                MapGridSetMetatileIdAt(newX, y + 3, METATILE_Fortree_SecretBase_LongGrass_BottomLeft);
                 break;
             case LONG_GRASS_BASE_CENTER:
-                MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID(Fortree, SecretBase_LongGrass_BottomMid));
+                MapGridSetMetatileIdAt(newX, y + 3, METATILE_Fortree_SecretBase_LongGrass_BottomMid);
                 break;
             case LONG_GRASS_BASE_RIGHT:
-                MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID(Fortree, SecretBase_LongGrass_BottomRight));
+                MapGridSetMetatileIdAt(newX, y + 3, METATILE_Fortree_SecretBase_LongGrass_BottomRight);
                 break;
             }
         }
 
-        if (MapGridGetMetatileIdAt(newX, y + 4) == METATILE_ID(Fortree, LongGrass_Root))
-            MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID(General, Grass));
-        if (MapGridGetMetatileIdAt(newX, y + 4) == METATILE_ID(Fortree, SecretBase_LongGrass_BottomLeft))
-            MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID(Fortree, SecretBase_LongGrass_TopLeft));
-        if (MapGridGetMetatileIdAt(newX, y + 4) == METATILE_ID(Fortree, SecretBase_LongGrass_BottomMid))
-            MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID(Fortree, SecretBase_LongGrass_TopMid));
-        if (MapGridGetMetatileIdAt(newX, y + 4) == METATILE_ID(Fortree, SecretBase_LongGrass_BottomRight))
-            MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID(Fortree, SecretBase_LongGrass_TopRight));
+        if (MapGridGetMetatileIdAt(newX, y + 4) == METATILE_Fortree_LongGrass_Root)
+            MapGridSetMetatileIdAt(newX, y + 4, METATILE_General_Grass);
+        if (MapGridGetMetatileIdAt(newX, y + 4) == METATILE_Fortree_SecretBase_LongGrass_BottomLeft)
+            MapGridSetMetatileIdAt(newX, y + 4, METATILE_Fortree_SecretBase_LongGrass_TopLeft);
+        if (MapGridGetMetatileIdAt(newX, y + 4) == METATILE_Fortree_SecretBase_LongGrass_BottomMid)
+            MapGridSetMetatileIdAt(newX, y + 4, METATILE_Fortree_SecretBase_LongGrass_TopMid);
+        if (MapGridGetMetatileIdAt(newX, y + 4) == METATILE_Fortree_SecretBase_LongGrass_BottomRight)
+            MapGridSetMetatileIdAt(newX, y + 4, METATILE_Fortree_SecretBase_LongGrass_TopRight);
     }
     if (arr[2] == TRUE)
     {
-        if (MapGridGetMetatileIdAt(newX, y + 3) == METATILE_ID(General, LongGrass))
+        if (MapGridGetMetatileIdAt(newX, y + 3) == METATILE_General_LongGrass)
         {
             switch (GetLongGrassCaseAt(newX, y + 4))
             {
             case LONG_GRASS_FIELD:
-                MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID(Fortree, LongGrass_Root));
+                MapGridSetMetatileIdAt(newX, y + 4, METATILE_Fortree_LongGrass_Root);
                 break;
             case LONG_GRASS_BASE_LEFT:
-                MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID(Fortree, SecretBase_LongGrass_BottomLeft));
+                MapGridSetMetatileIdAt(newX, y + 4, METATILE_Fortree_SecretBase_LongGrass_BottomLeft);
                 break;
             case LONG_GRASS_BASE_CENTER:
-                MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID(Fortree, SecretBase_LongGrass_BottomMid));
+                MapGridSetMetatileIdAt(newX, y + 4, METATILE_Fortree_SecretBase_LongGrass_BottomMid);
                 break;
             case LONG_GRASS_BASE_RIGHT:
-                MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID(Fortree, SecretBase_LongGrass_BottomRight));
+                MapGridSetMetatileIdAt(newX, y + 4, METATILE_Fortree_SecretBase_LongGrass_BottomRight);
                 break;
             }
         }
@@ -595,16 +595,16 @@ void FixLongGrassMetatilesWindowTop(s16 x, s16 y)
         switch (GetLongGrassCaseAt(x, y + 1))
         {
         case LONG_GRASS_FIELD:
-            MapGridSetMetatileIdAt(x, y + 1, METATILE_ID(Fortree, LongGrass_Root));
+            MapGridSetMetatileIdAt(x, y + 1, METATILE_Fortree_LongGrass_Root);
             break;
         case LONG_GRASS_BASE_LEFT:
-            MapGridSetMetatileIdAt(x, y + 1, METATILE_ID(Fortree, SecretBase_LongGrass_BottomLeft));
+            MapGridSetMetatileIdAt(x, y + 1, METATILE_Fortree_SecretBase_LongGrass_BottomLeft);
             break;
         case LONG_GRASS_BASE_CENTER:
-            MapGridSetMetatileIdAt(x, y + 1, METATILE_ID(Fortree, SecretBase_LongGrass_BottomMid));
+            MapGridSetMetatileIdAt(x, y + 1, METATILE_Fortree_SecretBase_LongGrass_BottomMid);
             break;
         case LONG_GRASS_BASE_RIGHT:
-            MapGridSetMetatileIdAt(x, y + 1, METATILE_ID(Fortree, SecretBase_LongGrass_BottomRight));
+            MapGridSetMetatileIdAt(x, y + 1, METATILE_Fortree_SecretBase_LongGrass_BottomRight);
             break;
         }
     }
@@ -612,7 +612,7 @@ void FixLongGrassMetatilesWindowTop(s16 x, s16 y)
 
 void FixLongGrassMetatilesWindowBottom(s16 x, s16 y)
 {
-    if (MapGridGetMetatileIdAt(x, y) == METATILE_ID(General, Grass))
+    if (MapGridGetMetatileIdAt(x, y) == METATILE_General_Grass)
     {
         u8 metatileBehavior = MapGridGetMetatileBehaviorAt(x, y + 1);
         if (MetatileBehavior_IsLongGrassSouthEdge(metatileBehavior))
@@ -620,17 +620,17 @@ void FixLongGrassMetatilesWindowBottom(s16 x, s16 y)
             s32 metatileId = MapGridGetMetatileIdAt(x, y + 1);
             switch (metatileId)
             {
-            case METATILE_ID(Fortree, LongGrass_Root):
-                MapGridSetMetatileIdAt(x, y + 1, METATILE_ID(General, Grass));
+            case METATILE_Fortree_LongGrass_Root:
+                MapGridSetMetatileIdAt(x, y + 1, METATILE_General_Grass);
                 break;
-            case METATILE_ID(Fortree, SecretBase_LongGrass_BottomLeft):
-                MapGridSetMetatileIdAt(x, y + 1, METATILE_ID(Fortree, SecretBase_LongGrass_TopLeft));
+            case METATILE_Fortree_SecretBase_LongGrass_BottomLeft:
+                MapGridSetMetatileIdAt(x, y + 1, METATILE_Fortree_SecretBase_LongGrass_TopLeft);
                 break;
-            case METATILE_ID(Fortree, SecretBase_LongGrass_BottomMid):
-                MapGridSetMetatileIdAt(x, y + 1, METATILE_ID(Fortree, SecretBase_LongGrass_TopMid));
+            case METATILE_Fortree_SecretBase_LongGrass_BottomMid:
+                MapGridSetMetatileIdAt(x, y + 1, METATILE_Fortree_SecretBase_LongGrass_TopMid);
                 break;
-            case METATILE_ID(Fortree, SecretBase_LongGrass_BottomRight):
-                MapGridSetMetatileIdAt(x, y + 1, METATILE_ID(Fortree, SecretBase_LongGrass_TopRight));
+            case METATILE_Fortree_SecretBase_LongGrass_BottomRight:
+                MapGridSetMetatileIdAt(x, y + 1, METATILE_Fortree_SecretBase_LongGrass_TopRight);
                 break;
             }
         }
diff --git a/src/fldeff_dig.c b/src/fldeff_dig.c
index ee5caa0df..c3ab989cd 100644
--- a/src/fldeff_dig.c
+++ b/src/fldeff_dig.c
@@ -10,8 +10,8 @@
 #include "constants/field_effects.h"
 
 // static functions
-static void hm2_dig(void);
-static void sub_8135780(void);
+static void FieldCallback_Dig(void);
+static void StartDigFieldEffect(void);
 
 // text
 bool8 SetUpFieldMove_Dig(void)
@@ -19,7 +19,7 @@ bool8 SetUpFieldMove_Dig(void)
     if (CanUseDigOrEscapeRopeOnCurMap() == TRUE)
     {
         gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
-        gPostMenuFieldCallback = hm2_dig;
+        gPostMenuFieldCallback = FieldCallback_Dig;
         return TRUE;
     }
     else
@@ -28,7 +28,7 @@ bool8 SetUpFieldMove_Dig(void)
     }
 }
 
-static void hm2_dig(void)
+static void FieldCallback_Dig(void)
 {
     Overworld_ResetStateAfterDigEscRope();
     FieldEffectStart(FLDEFF_USE_DIG);
@@ -37,16 +37,16 @@ static void hm2_dig(void)
 
 bool8 FldEff_UseDig(void)
 {
-    u8 taskId = oei_task_add();
+    u8 taskId = CreateFieldMoveTask();
 
-    gTasks[taskId].data[8] = (u32)sub_8135780 >> 16;
-    gTasks[taskId].data[9] = (u32)sub_8135780;
+    gTasks[taskId].data[8] = (u32)StartDigFieldEffect >> 16;
+    gTasks[taskId].data[9] = (u32)StartDigFieldEffect;
     if (!ShouldDoBrailleDigEffect())
         SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT);
     return FALSE;
 }
 
-static void sub_8135780(void)
+static void StartDigFieldEffect(void)
 {
     u8 taskId;
 
diff --git a/src/fldeff_escalator.c b/src/fldeff_escalator.c
index 10fb78ee2..7a96eaa82 100644
--- a/src/fldeff_escalator.c
+++ b/src/fldeff_escalator.c
@@ -8,161 +8,188 @@
 
 static EWRAM_DATA u8 sEscalatorAnim_TaskId = 0;
 
-static void sub_80E12E8(u8 taskId, const s16 *list, u16 isImpassableFlag)
-{
-    s16 r5 = gTasks[taskId].data[4] - 1;
-    s16 r3 = gTasks[taskId].data[5] - 1;
-    s16 r4 = gTasks[taskId].data[1];
-    s16 y;
-    s16 x;
+static void SetEscalatorMetatile(u8 taskId, const s16 *metatileIds, u16 metatileMasks);
+static void Task_DrawEscalator(u8 taskId);
+static void Task_DrawTeleporterHousing(u8 taskId);
+static void Task_DrawTeleporterCable(u8 taskId);
+
+#define ESCALATOR_STAGES     3
+#define LAST_ESCALATOR_STAGE (ESCALATOR_STAGES - 1)
+
+static const u16 sEscalatorMetatiles_1F_0[ESCALATOR_STAGES] = {
+    METATILE_PokemonCenter_Escalator1F_Tile0_Frame2,
+    METATILE_PokemonCenter_Escalator1F_Tile0_Frame1,
+    METATILE_PokemonCenter_Escalator1F_Tile0_Frame0
+};
+
+static const u16 sEscalatorMetatiles_1F_1[ESCALATOR_STAGES] = {
+    METATILE_PokemonCenter_Escalator1F_Tile1_Frame2,
+    METATILE_PokemonCenter_Escalator1F_Tile1_Frame1,
+    METATILE_PokemonCenter_Escalator1F_Tile1_Frame0
+};
+
+static const u16 sEscalatorMetatiles_1F_2[ESCALATOR_STAGES] = {
+    METATILE_PokemonCenter_Escalator1F_Tile2_Frame2,
+    METATILE_PokemonCenter_Escalator1F_Tile2_Frame1,
+    METATILE_PokemonCenter_Escalator1F_Tile2_Frame0
+};
+
+static const u16 sEscalatorMetatiles_1F_3[ESCALATOR_STAGES] = {
+    METATILE_PokemonCenter_Escalator1F_Tile3_Frame2,
+    METATILE_PokemonCenter_Escalator1F_Tile3_Frame1,
+    METATILE_PokemonCenter_Escalator1F_Tile3_Frame0
+};
 
-    if (gTasks[taskId].data[2] == 0)
+static const u16 sEscalatorMetatiles_2F_0[ESCALATOR_STAGES] = {
+    METATILE_PokemonCenter_Escalator2F_Tile0_Frame0,
+    METATILE_PokemonCenter_Escalator2F_Tile0_Frame1,
+    METATILE_PokemonCenter_Escalator2F_Tile0_Frame2
+};
+
+static const u16 sEscalatorMetatiles_2F_1[ESCALATOR_STAGES] = {
+    METATILE_PokemonCenter_Escalator2F_Tile1_Frame0,
+    METATILE_PokemonCenter_Escalator2F_Tile1_Frame1,
+    METATILE_PokemonCenter_Escalator2F_Tile1_Frame2
+};
+
+static const u16 sEscalatorMetatiles_2F_2[ESCALATOR_STAGES] = {
+    METATILE_PokemonCenter_Escalator2F_Tile2_Frame0,
+    METATILE_PokemonCenter_Escalator2F_Tile2_Frame1,
+    METATILE_PokemonCenter_Escalator2F_Tile2_Frame2
+};
+
+#define tState            data[0]
+#define tTransitionStage  data[1]
+#define tGoingUp          data[2]
+#define tDrawingEscalator data[3]
+#define tPlayerX          data[4]
+#define tPlayerY          data[5]
+
+static void SetEscalatorMetatile(u8 taskId, const s16 *metatileIds, u16 metatileMasks)
+{
+    s16 x = gTasks[taskId].tPlayerX - 1;
+    s16 y = gTasks[taskId].tPlayerY - 1;
+    s16 transitionStage = gTasks[taskId].tTransitionStage;
+    s16 i;
+    s16 j;
+
+    // Check all the escalator sections and only progress the selected one to the next stage    
+    if (!gTasks[taskId].tGoingUp)
     {
-        for (y = 0; y < 3; y++)
+        for (i = 0; i < 3; i++)
         {
-            for (x = 0; x < 3; x++)
+            for (j = 0; j < 3; j++)
             {
-                s16 metatileId = MapGridGetMetatileIdAt(r5 + x, r3 + y);
+                s16 metatileId = MapGridGetMetatileIdAt(x + j, y + i);
 
-                if (list[r4] == metatileId)
+                if (metatileIds[transitionStage] == metatileId)
                 {
-                    if (r4 != 2)
-                        MapGridSetMetatileIdAt(r5 + x, r3 + y, isImpassableFlag | list[r4 + 1]);
+                    if (transitionStage != LAST_ESCALATOR_STAGE)
+                        MapGridSetMetatileIdAt(x + j, y + i, metatileMasks | metatileIds[transitionStage + 1]);
                     else
-                        MapGridSetMetatileIdAt(r5 + x, r3 + y, isImpassableFlag | list[0]);
+                        MapGridSetMetatileIdAt(x + j, y + i, metatileMasks | metatileIds[0]);
                 }
             }
         }
     }
     else
     {
-        for (y = 0; y < 3; y++)
+        for (i = 0; i < 3; i++)
         {
-            for (x = 0; x < 3; x++)
+            for (j = 0; j < 3; j++)
             {
-                s16 metatileId = MapGridGetMetatileIdAt(r5 + x, r3 + y);
+                s16 metatileId = MapGridGetMetatileIdAt(x + j, y + i);
 
-                if (list[2 - r4] == metatileId)
+                if (metatileIds[LAST_ESCALATOR_STAGE - transitionStage] == metatileId)
                 {
-                    if (r4 != 2)
-                        MapGridSetMetatileIdAt(r5 + x, r3 + y, isImpassableFlag | list[1 - r4]);
+                    if (transitionStage != LAST_ESCALATOR_STAGE)
+                        MapGridSetMetatileIdAt(x + j, y + i, metatileMasks | metatileIds[1 - transitionStage]);
                     else
-                        MapGridSetMetatileIdAt(r5 + x, r3 + y, isImpassableFlag | list[2]);
+                        MapGridSetMetatileIdAt(x + j, y + i, metatileMasks | metatileIds[LAST_ESCALATOR_STAGE]);
                 }
             }
         }
     }
 }
 
-static const u16 sElevatorMetatiles_1F_0[] = {
-    METATILE_ID(PokemonCenter, Elevator1F_Tile0_Frame2),
-    METATILE_ID(PokemonCenter, Elevator1F_Tile0_Frame1),
-    METATILE_ID(PokemonCenter, Elevator1F_Tile0_Frame0)
-};
-
-static const u16 sElevatorMetatiles_1F_1[] = {
-    METATILE_ID(PokemonCenter, Elevator1F_Tile1_Frame2),
-    METATILE_ID(PokemonCenter, Elevator1F_Tile1_Frame1),
-    METATILE_ID(PokemonCenter, Elevator1F_Tile1_Frame0)
-};
-
-static const u16 sElevatorMetatiles_1F_2[] = {
-    METATILE_ID(PokemonCenter, Elevator1F_Tile2_Frame2),
-    METATILE_ID(PokemonCenter, Elevator1F_Tile2_Frame1),
-    METATILE_ID(PokemonCenter, Elevator1F_Tile2_Frame0)
-};
-
-static const u16 sElevatorMetatiles_1F_3[] = {
-    METATILE_ID(PokemonCenter, Elevator1F_Tile3_Frame2),
-    METATILE_ID(PokemonCenter, Elevator1F_Tile3_Frame1),
-    METATILE_ID(PokemonCenter, Elevator1F_Tile3_Frame0)
-};
-
-static const u16 sElevatorMetatiles_2F_0[] = {
-    METATILE_ID(PokemonCenter, Elevator2F_Tile0_Frame0),
-    METATILE_ID(PokemonCenter, Elevator2F_Tile0_Frame1),
-    METATILE_ID(PokemonCenter, Elevator2F_Tile0_Frame2)
-};
-
-static const u16 sElevatorMetatiles_2F_1[] = {
-    METATILE_ID(PokemonCenter, Elevator2F_Tile1_Frame0),
-    METATILE_ID(PokemonCenter, Elevator2F_Tile1_Frame1),
-    METATILE_ID(PokemonCenter, Elevator2F_Tile1_Frame2)
-};
-
-static const u16 sElevatorMetatiles_2F_2[] = {
-    METATILE_ID(PokemonCenter, Elevator2F_Tile2_Frame0),
-    METATILE_ID(PokemonCenter, Elevator2F_Tile2_Frame1),
-    METATILE_ID(PokemonCenter, Elevator2F_Tile2_Frame2)
-};
-
-static void sub_80E1444(u8 taskId)
+static void Task_DrawEscalator(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
-    data[3] = 1;
+    tDrawingEscalator = TRUE;
 
-    switch (data[0])
+    // Set tile for each section of the escalator in sequence for current transition stage
+    switch (tState)
     {
         case 0:
-            sub_80E12E8(taskId, sElevatorMetatiles_1F_0, 0);
+            SetEscalatorMetatile(taskId, sEscalatorMetatiles_1F_0, 0);
             break;
         case 1:
-            sub_80E12E8(taskId, sElevatorMetatiles_1F_1, 0);
+            SetEscalatorMetatile(taskId, sEscalatorMetatiles_1F_1, 0);
             break;
         case 2:
-            sub_80E12E8(taskId, sElevatorMetatiles_1F_2, METATILE_COLLISION_MASK);
+            SetEscalatorMetatile(taskId, sEscalatorMetatiles_1F_2, METATILE_COLLISION_MASK);
             break;
         case 3:
-            sub_80E12E8(taskId, sElevatorMetatiles_1F_3, 0);
+            SetEscalatorMetatile(taskId, sEscalatorMetatiles_1F_3, 0);
             break;
         case 4:
-            sub_80E12E8(taskId, sElevatorMetatiles_2F_0, METATILE_COLLISION_MASK);
+            SetEscalatorMetatile(taskId, sEscalatorMetatiles_2F_0, METATILE_COLLISION_MASK);
             break;
         case 5:
-            sub_80E12E8(taskId, sElevatorMetatiles_2F_1, 0);
+            SetEscalatorMetatile(taskId, sEscalatorMetatiles_2F_1, 0);
             break;
         case 6:
-            sub_80E12E8(taskId, sElevatorMetatiles_2F_2, 0);
+            SetEscalatorMetatile(taskId, sEscalatorMetatiles_2F_2, 0);
             break;
     }
 
-    data[0] = (data[0] + 1) & 7;
-    if (!data[0])
+    tState = (tState + 1) & 7;
+
+    // If all metatiles of the escalator have been set, draw map and progress to next stage
+    if (tState == 0)
     {
         DrawWholeMapView();
-        data[1] = (data[1] + 1) % 3;
-        data[3] = 0;
+        tTransitionStage = (tTransitionStage + 1) % ESCALATOR_STAGES;
+        tDrawingEscalator = FALSE;
     }
 }
 
-static u8 sub_80E150C(u16 var)
+static u8 CreateEscalatorTask(bool16 goingUp)
 {
-    u8 taskId = CreateTask(sub_80E1444, 0);
+    u8 taskId = CreateTask(Task_DrawEscalator, 0);
     s16 *data = gTasks[taskId].data;
 
-    PlayerGetDestCoords(&data[4], &data[5]);
-    data[0] = 0;
-    data[1] = 0;
-    data[2] = var;
-    sub_80E1444(taskId);
+    PlayerGetDestCoords(&tPlayerX, &tPlayerY);
+    tState = 0;
+    tTransitionStage = 0;
+    tGoingUp = goingUp;
+    Task_DrawEscalator(taskId);
     return taskId;
 }
 
-void sub_80E1558(u8 var)
+void StartEscalator(bool8 goingUp)
 {
-    sEscalatorAnim_TaskId = sub_80E150C(var);
+    sEscalatorAnim_TaskId = CreateEscalatorTask(goingUp);
 }
 
-void sub_80E1570(void)
+void StopEscalator(void)
 {
     DestroyTask(sEscalatorAnim_TaskId);
 }
 
-bool8 sub_80E1584(void)
+bool8 IsEscalatorMoving(void)
 {
-    if (gTasks[sEscalatorAnim_TaskId].data[3] == 0 && gTasks[sEscalatorAnim_TaskId].data[1] == 2)
+    if (gTasks[sEscalatorAnim_TaskId].tDrawingEscalator == FALSE 
+     && gTasks[sEscalatorAnim_TaskId].tTransitionStage == LAST_ESCALATOR_STAGE)
         return FALSE;
     else
         return TRUE;
 }
+
+#undef tState
+#undef tTransitionStage
+#undef tGoingUp
+#undef tDrawingEscalator
+#undef tPlayerX
+#undef tPlayerY
diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c
index 3cb91d4b1..2d25928b8 100644
--- a/src/fldeff_flash.c
+++ b/src/fldeff_flash.c
@@ -96,7 +96,7 @@ bool8 SetUpFieldMove_Flash(void)
 
 static void FieldCallback_Flash(void)
 {
-    u8 taskId = oei_task_add();
+    u8 taskId = CreateFieldMoveTask();
     gFieldEffectArguments[0] = GetCursorSelectionMonId();
     gTasks[taskId].data[8] = (uintptr_t)FldEff_UseFlash >> 16;
     gTasks[taskId].data[9] = (uintptr_t)FldEff_UseFlash;
@@ -106,7 +106,7 @@ static void FldEff_UseFlash(void)
 {
     PlaySE(SE_W115);
     FlagSet(FLAG_SYS_USE_FLASH);
-    ScriptContext1_SetupScript(EventScript_FldEffFlash);
+    ScriptContext1_SetupScript(EventScript_UseFlash);
 }
 
 static void CB2_ChangeMapMain(void)
diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c
index ab04e47ff..6db44d752 100644
--- a/src/fldeff_misc.c
+++ b/src/fldeff_misc.c
@@ -23,73 +23,58 @@
 #include "constants/metatile_labels.h"
 #include "constants/songs.h"
 #include "constants/tv.h"
-#include "constants/vars.h"
 
 
 EWRAM_DATA struct MapPosition gPlayerFacingPosition = {0};
 
-static void sub_80F9C90(u8);
-static void sub_80F9DFC(u8);
+static void Task_ComputerScreenOpenEffect(u8);
+static void Task_ComputerScreenCloseEffect(u8);
+static void CreateComputerScreenEffectTask(TaskFunc, u16, u16, u8);
 
 static void Task_SecretBasePCTurnOn(u8);
 
 static void Task_PopSecretBaseBalloon(u8);
 static void DoBalloonSoundEffect(s16);
 
-static void Task_WateringBerryTreeAnim_1(u8);
-static void Task_WateringBerryTreeAnim_2(u8);
-static void Task_WateringBerryTreeAnim_3(u8);
-
-static void sub_80F9C44(TaskFunc, u16, u16, u8);
+static void Task_WateringBerryTreeAnim_Start(u8);
+static void Task_WateringBerryTreeAnim_Continue(u8);
+static void Task_WateringBerryTreeAnim_End(u8);
 
 static void FieldCallback_SecretBaseCave(void);
-static void CaveEntranceSpriteCallback1(struct Sprite *);
-static void CaveEntranceSpriteCallback2(struct Sprite *);
-static void CaveEntranceSpriteCallbackEnd(struct Sprite *);
+static void SpriteCB_CaveEntranceInit(struct Sprite *);
+static void SpriteCB_CaveEntranceOpen(struct Sprite *);
+static void SpriteCB_CaveEntranceEnd(struct Sprite *);
 static void StartSecretBaseCaveFieldEffect(void);
 
 static void FieldCallback_SecretBaseTree(void);
-static void TreeEntranceSpriteCallback1(struct Sprite *);
-static void TreeEntranceSpriteCallback2(struct Sprite *);
-static void TreeEntranceSpriteCallbackEnd(struct Sprite *);
+static void SpriteCB_TreeEntranceInit(struct Sprite *);
+static void SpriteCB_TreeEntranceOpen(struct Sprite *);
+static void SpriteCB_TreeEntranceEnd(struct Sprite *);
 static void StartSecretBaseTreeFieldEffect(void);
 
 static void FieldCallback_SecretBaseShrub(void);
-static void ShrubEntranceSpriteCallback1(struct Sprite *);
-static void ShrubEntranceSpriteCallback2(struct Sprite *);
-static void ShrubEntranceSpriteCallbackEnd(struct Sprite *);
+static void SpriteCB_ShrubEntranceInit(struct Sprite *);
+static void SpriteCB_ShrubEntranceOpen(struct Sprite *);
+static void SpriteCB_ShrubEntranceEnd(struct Sprite *);
 static void StartSecretBaseShrubFieldEffect(void);
 
-static void SpriteCB_SandPillar_0(struct Sprite *);
-static void SpriteCB_SandPillar_1(struct Sprite *);
-static void SpriteCB_SandPillar_2(struct Sprite *);
-
-static const u8 gSpriteImage_858D978[] = INCBIN_U8("graphics/unknown/858E588/0.4bpp");
-static const u8 gSpriteImage_858D9F8[] = INCBIN_U8("graphics/unknown/858E588/1.4bpp");
-static const u8 gSpriteImage_858DA78[] = INCBIN_U8("graphics/unknown/858E588/2.4bpp");
-static const u8 gSpriteImage_858DAF8[] = INCBIN_U8("graphics/unknown/858E588/3.4bpp");
-static const u8 gSpriteImage_858DB78[] = INCBIN_U8("graphics/unknown/858E588/4.4bpp");
-
-static const u8 gUnusedEmptySpace_858DBF8[32] = {0};
-
-static const u16 gFieldEffectObjectPalette7[] = INCBIN_U16("graphics/field_effects/palettes/07.gbapal");
-static const u8 gSpriteImage_858DC38[] = INCBIN_U8("graphics/unknown/858E5D8/0.4bpp");
-static const u8 gSpriteImage_858DCB8[] = INCBIN_U8("graphics/unknown/858E5D8/1.4bpp");
-static const u8 gSpriteImage_858DD38[] = INCBIN_U8("graphics/unknown/858E5D8/2.4bpp");
-static const u8 gSpriteImage_858DDB8[] = INCBIN_U8("graphics/unknown/858E5D8/3.4bpp");
-static const u8 gSpriteImage_858DE38[] = INCBIN_U8("graphics/unknown/858E5D8/4.4bpp");
-static const u8 gSpriteImage_858DEB8[] = INCBIN_U8("graphics/unknown/858E5B0/0.4bpp");
-static const u8 gSpriteImage_858DF38[] = INCBIN_U8("graphics/unknown/858E5B0/1.4bpp");
-static const u8 gSpriteImage_858DFB8[] = INCBIN_U8("graphics/unknown/858E5B0/2.4bpp");
-static const u8 gSpriteImage_858E038[] = INCBIN_U8("graphics/unknown/858E5B0/3.4bpp");
-static const u8 gSpriteImage_858E0B8[] = INCBIN_U8("graphics/unknown/858E5B0/4.4bpp");
-static const u8 gSpriteImage_858E138[] = INCBIN_U8("graphics/unknown/858E5B0/5.4bpp");
-static const u16 gFieldEffectObjectPalette8[] = INCBIN_U16("graphics/field_effects/palettes/08.gbapal");
-static const u8 gSpriteImage_858E1D8[] = INCBIN_U8("graphics/unknown/858E674/0.4bpp");
-static const u8 gSpriteImage_858E2D8[] = INCBIN_U8("graphics/unknown/858E674/1.4bpp");
-static const u8 gSpriteImage_858E3D8[] = INCBIN_U8("graphics/unknown/858E674/2.4bpp");
-
-static const struct OamData gOamData_858E4D8 =
+static void SpriteCB_SandPillar_BreakTop(struct Sprite *);
+static void SpriteCB_SandPillar_BreakBase(struct Sprite *);
+static void SpriteCB_SandPillar_End(struct Sprite *);
+
+static const u8 sSecretPowerCave_Gfx[] = INCBIN_U8("graphics/field_effects/pics/secret_power_cave.4bpp");
+static const u8 sFiller[32] = {0};
+static const u16 sSecretPowerCave_Pal[] = INCBIN_U16("graphics/field_effects/palettes/secret_power_cave.gbapal");
+static const u8 sSecretPowerShrub_Gfx[] = INCBIN_U8("graphics/field_effects/pics/secret_power_shrub.4bpp");
+static const u8 sSecretPowerTree_Gfx[] = INCBIN_U8("graphics/field_effects/pics/secret_power_tree.4bpp");
+static const u16 sSecretPowerPlant_Pal[] = INCBIN_U16("graphics/field_effects/palettes/secret_power_plant.gbapal");
+
+// TODO: These should also be combined into a single image, not matching for some reason
+static const u8 sSandPillar0_Gfx[] = INCBIN_U8("graphics/field_effects/pics/sand_pillar/0.4bpp");
+static const u8 sSandPillar1_Gfx[] = INCBIN_U8("graphics/field_effects/pics/sand_pillar/1.4bpp");
+static const u8 sSandPillar2_Gfx[] = INCBIN_U8("graphics/field_effects/pics/sand_pillar/2.4bpp");
+
+static const struct OamData sOam_SecretPower =
 {
     .y = 0,
     .x = 0,
@@ -101,7 +86,7 @@ static const struct OamData gOamData_858E4D8 =
     .priority = 2,
 };
 
-static const union AnimCmd gSpriteAnim_858E4E0[] =
+static const union AnimCmd sAnim_SecretPowerCave[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 8),
@@ -111,7 +96,7 @@ static const union AnimCmd gSpriteAnim_858E4E0[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd gSpriteAnim_858E4F8[] =
+static const union AnimCmd sAnim_VineDropLeft[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 8),
@@ -121,7 +106,7 @@ static const union AnimCmd gSpriteAnim_858E4F8[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd gSpriteAnim_858E510[] =
+static const union AnimCmd sAnim_VineRiseLeft[] =
 {
     ANIMCMD_FRAME(4, 8),
     ANIMCMD_FRAME(3, 8),
@@ -131,7 +116,7 @@ static const union AnimCmd gSpriteAnim_858E510[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd gSpriteAnim_858E528[] =
+static const union AnimCmd sAnim_VineDropRight[] =
 {
     ANIMCMD_FRAME(0, 8, .hFlip = TRUE),
     ANIMCMD_FRAME(1, 8, .hFlip = TRUE),
@@ -141,7 +126,7 @@ static const union AnimCmd gSpriteAnim_858E528[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd gSpriteAnim_858E540[] =
+static const union AnimCmd sAnim_VineRiseRight[] =
 {
     ANIMCMD_FRAME(4, 8, .hFlip = TRUE),
     ANIMCMD_FRAME(3, 8, .hFlip = TRUE),
@@ -151,7 +136,7 @@ static const union AnimCmd gSpriteAnim_858E540[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd gSpriteAnim_858E558[] =
+static const union AnimCmd sAnim_SecretPowerShrub[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 8),
@@ -161,88 +146,89 @@ static const union AnimCmd gSpriteAnim_858E558[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd *const gSpriteAnimTable_858E570[] =
+static const union AnimCmd *const sAnimTable_SecretPowerCave[] =
 {
-    gSpriteAnim_858E4E0,
+    sAnim_SecretPowerCave,
 };
 
-static const union AnimCmd *const gSpriteAnimTable_858E574[] =
+static const union AnimCmd *const sAnimTable_SecretPowerTree[] =
 {
-    gSpriteAnim_858E4F8,
-    gSpriteAnim_858E510,
-    gSpriteAnim_858E528,
-    gSpriteAnim_858E540,
+    sAnim_VineDropLeft,
+    sAnim_VineRiseLeft,
+    sAnim_VineDropRight,
+    sAnim_VineRiseRight,
 };
 
-static const union AnimCmd *const gSpriteAnimTable_858E584[] =
+static const union AnimCmd *const sAnimTable_SecretPowerShrub[] =
 {
-    gSpriteAnim_858E558,
+    sAnim_SecretPowerShrub,
 };
 
-static const struct SpriteFrameImage gUnknown_858E588[] =
+static const struct SpriteFrameImage sPicTable_SecretPowerCave[] =
 {
-    {gSpriteImage_858D978, 0x80},
-    {gSpriteImage_858D9F8, 0x80},
-    {gSpriteImage_858DA78, 0x80},
-    {gSpriteImage_858DAF8, 0x80},
-    {gSpriteImage_858DB78, 0x80},
+    overworld_frame(sSecretPowerCave_Gfx, 2, 2, 0),
+    overworld_frame(sSecretPowerCave_Gfx, 2, 2, 1),
+    overworld_frame(sSecretPowerCave_Gfx, 2, 2, 2),
+    overworld_frame(sSecretPowerCave_Gfx, 2, 2, 3),
+    overworld_frame(sSecretPowerCave_Gfx, 2, 2, 4),
 };
 
-static const struct SpriteFrameImage gUnknown_858E5B0[] =
+static const struct SpriteFrameImage sPicTable_SecretPowerTree[] =
 {
-    {gSpriteImage_858DEB8, 0x80},
-    {gSpriteImage_858DF38, 0x80},
-    {gSpriteImage_858DFB8, 0x80},
-    {gSpriteImage_858E038, 0x80},
-    {gSpriteImage_858E0B8, 0x80},
+    overworld_frame(sSecretPowerTree_Gfx, 2, 2, 0),
+    overworld_frame(sSecretPowerTree_Gfx, 2, 2, 1),
+    overworld_frame(sSecretPowerTree_Gfx, 2, 2, 2),
+    overworld_frame(sSecretPowerTree_Gfx, 2, 2, 3),
+    overworld_frame(sSecretPowerTree_Gfx, 2, 2, 4),
+    // 6th frame exists but isnt accessed, the tree vine metatile is used instead
 };
 
-static const struct SpriteFrameImage gUnknown_858E5D8[] =
+static const struct SpriteFrameImage sPicTable_SecretPowerShrub[] =
 {
-    {gSpriteImage_858DC38, 0x80},
-    {gSpriteImage_858DCB8, 0x80},
-    {gSpriteImage_858DD38, 0x80},
-    {gSpriteImage_858DDB8, 0x80},
-    {gSpriteImage_858DE38, 0x80},
+    overworld_frame(sSecretPowerShrub_Gfx, 2, 2, 0),
+    overworld_frame(sSecretPowerShrub_Gfx, 2, 2, 1),
+    overworld_frame(sSecretPowerShrub_Gfx, 2, 2, 2),
+    overworld_frame(sSecretPowerShrub_Gfx, 2, 2, 3),
+    overworld_frame(sSecretPowerShrub_Gfx, 2, 2, 4),
 };
 
-static const struct SpriteTemplate gUnknown_0858E600 =
+static const struct SpriteTemplate sSpriteTemplate_SecretPowerCave =
 {
     .tileTag = 0xFFFF,
-    .paletteTag = 0x1003,
-    .oam = &gOamData_858E4D8,
-    .anims = gSpriteAnimTable_858E570,
-    .images = gUnknown_858E588,
+    .paletteTag = FLDEFF_PAL_TAG_SECRET_POWER_TREE,
+    .oam = &sOam_SecretPower,
+    .anims = sAnimTable_SecretPowerCave,
+    .images = sPicTable_SecretPowerCave,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = CaveEntranceSpriteCallback1,
+    .callback = SpriteCB_CaveEntranceInit,
 };
 
-static const struct SpriteTemplate gUnknown_0858E618 =
+static const struct SpriteTemplate sSpriteTemplate_SecretPowerTree =
 {
     .tileTag = 0xFFFF,
-    .paletteTag = 0x1008,
-    .oam = &gOamData_858E4D8,
-    .anims = gSpriteAnimTable_858E574,
-    .images = gUnknown_858E5B0,
+    .paletteTag = FLDEFF_PAL_TAG_SECRET_POWER_PLANT,
+    .oam = &sOam_SecretPower,
+    .anims = sAnimTable_SecretPowerTree,
+    .images = sPicTable_SecretPowerTree,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = TreeEntranceSpriteCallback1,
+    .callback = SpriteCB_TreeEntranceInit,
 };
 
-static const struct SpriteTemplate gUnknown_0858E630 =
+static const struct SpriteTemplate sSpriteTemplate_SecretPowerShrub =
 {
     .tileTag = 0xFFFF,
-    .paletteTag = 0x1008,
-    .oam = &gOamData_858E4D8,
-    .anims = gSpriteAnimTable_858E584,
-    .images = gUnknown_858E5D8,
+    .paletteTag = FLDEFF_PAL_TAG_SECRET_POWER_PLANT,
+    .oam = &sOam_SecretPower,
+    .anims = sAnimTable_SecretPowerShrub,
+    .images = sPicTable_SecretPowerShrub,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = ShrubEntranceSpriteCallback1,
+    .callback = SpriteCB_ShrubEntranceInit,
 };
 
-const struct SpritePalette gFieldEffectObjectPaletteInfo7 = {gFieldEffectObjectPalette7, 0x1003};
-const struct SpritePalette gFieldEffectObjectPaletteInfo8 = {gFieldEffectObjectPalette8, 0x1008};
+const struct SpritePalette gSpritePalette_SecretPower_Cave = {sSecretPowerCave_Pal, FLDEFF_PAL_TAG_SECRET_POWER_TREE};
+const struct SpritePalette gSpritePalette_SecretPower_Plant = {sSecretPowerPlant_Pal, FLDEFF_PAL_TAG_SECRET_POWER_PLANT};
 
-static const struct OamData gOamData_858E658 =
+static const struct OamData sOam_SandPillar =
 {
     .x = 0,
     .y = 0,
@@ -254,7 +240,7 @@ static const struct OamData gOamData_858E658 =
     .priority = 2,
 };
 
-static const union AnimCmd gSpriteAnim_858E660[] =
+static const union AnimCmd sAnim_SandPillar[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(1, 6),
@@ -262,47 +248,44 @@ static const union AnimCmd gSpriteAnim_858E660[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd *const gSpriteAnimTable_858E670[] =
+static const union AnimCmd *const sAnimTable_SandPillar[] =
 {
-    gSpriteAnim_858E660,
+    sAnim_SandPillar,
 };
 
-static const struct SpriteFrameImage gUnknown_0858E674[] =
+static const struct SpriteFrameImage sPicTable_SandPillar[] =
 {
-    {gSpriteImage_858E1D8, 0x100},
-    {gSpriteImage_858E2D8, 0x100},
-    {gSpriteImage_858E3D8, 0x100},
+    {sSandPillar0_Gfx, sizeof(sSandPillar0_Gfx)},
+    {sSandPillar1_Gfx, sizeof(sSandPillar1_Gfx)},
+    {sSandPillar2_Gfx, sizeof(sSandPillar2_Gfx)},
 };
 
-static const struct SpriteTemplate gUnknown_0858E68C =
+static const struct SpriteTemplate sSpriteTemplate_SandPillar =
 {
     .tileTag = 0xFFFF,
-    .paletteTag = 0x100E,
-    .oam = &gOamData_858E658,
-    .anims = gSpriteAnimTable_858E670,
-    .images = gUnknown_0858E674,
+    .paletteTag = FLDEFF_PAL_TAG_SAND_PILLAR,
+    .oam = &sOam_SandPillar,
+    .anims = sAnimTable_SandPillar,
+    .images = sPicTable_SandPillar,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = SpriteCB_SandPillar_0,
+    .callback = SpriteCB_SandPillar_BreakTop,
 };
 
-// This uses one of the secret base palettes, so there is no "graphics/field_effects/palettes/09.pal" file.
-const struct SpritePalette gFieldEffectObjectPaletteInfo9 = {gTilesetPalettes_SecretBase[5], 0x100E};
+const struct SpritePalette gSpritePalette_SandPillar = {gTilesetPalettes_SecretBase[5], FLDEFF_PAL_TAG_SAND_PILLAR};
 
-static const u8 gSpriteImage_858E6AC[] = INCBIN_U8("graphics/unknown/858E84C/0.4bpp");
-static const u8 gSpriteImage_858E72C[] = INCBIN_U8("graphics/unknown/858E84C/1.4bpp");
-static const u8 gSpriteImage_858E7AC[] = INCBIN_U8("graphics/unknown/858E84C/2.4bpp");
-static const u16 gUnknown_0858E82C[] = INCBIN_U16("graphics/unknown/unknown_58E82C.gbapal");
+static const u8 sRecordMixLights_Gfx[] = INCBIN_U8("graphics/field_effects/pics/record_mix_lights.4bpp");
+static const u16 sRecordMixLights_Pal[] = INCBIN_U16("graphics/field_effects/palettes/record_mix_lights.gbapal");
 
-static const struct SpriteFrameImage gUnknown_0858E84C[] =
+static const struct SpriteFrameImage sPicTable_RecordMixLights[] =
 {
-    {gSpriteImage_858E6AC, sizeof(gSpriteImage_858E6AC)},
-    {gSpriteImage_858E72C, sizeof(gSpriteImage_858E72C)},
-    {gSpriteImage_858E7AC, sizeof(gSpriteImage_858E7AC)},
+    overworld_frame(sRecordMixLights_Gfx, 4, 1, 0),
+    overworld_frame(sRecordMixLights_Gfx, 4, 1, 1),
+    overworld_frame(sRecordMixLights_Gfx, 4, 1, 2),
 };
 
-static const struct SpritePalette gUnknown_0858E864 = {gUnknown_0858E82C, 0x1000};
+static const struct SpritePalette sSpritePalette_RecordMixLights = {sRecordMixLights_Pal, 0x1000};
 
-static const union AnimCmd gSpriteAnim_858E86C[] =
+static const union AnimCmd sAnim_RecordMixLights[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -310,173 +293,182 @@ static const union AnimCmd gSpriteAnim_858E86C[] =
     ANIMCMD_JUMP(0),
 };
 
-static const union AnimCmd *const gSpriteAnimTable_858E87C[] =
+static const union AnimCmd *const sAnimTable_RecordMixLights[] =
 {
-    gSpriteAnim_858E86C,
+    sAnim_RecordMixLights,
 };
 
-static const struct SpriteTemplate gUnknown_0858E880 =
+static const struct SpriteTemplate sSpriteTemplate_RecordMixLights =
 {
     .tileTag = 0xFFFF,
     .paletteTag = 0x1000,
     .oam = &gObjectEventBaseOam_32x8,
-    .anims = gSpriteAnimTable_858E87C,
-    .images = gUnknown_0858E84C,
+    .anims = sAnimTable_RecordMixLights,
+    .images = sPicTable_RecordMixLights,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy,
 };
 
-void sub_80F9BCC(u16 a0, u16 a1, u8 a2)
+// For accessing pokemon storage PC or the Hall of Fame PC
+void ComputerScreenOpenEffect(u16 increment, u16 unused, u8 priority)
 {
-    sub_80F9C44(sub_80F9C90, a0, a1, a2);
+    CreateComputerScreenEffectTask(Task_ComputerScreenOpenEffect, increment, unused, priority);
 }
 
-void sub_80F9BF4(u16 a0, u16 a1, u8 a2)
+void ComputerScreenCloseEffect(u16 increment, u16 unused, u8 priority)
 {
-    sub_80F9C44(sub_80F9DFC, a0, a1, a2);
+    CreateComputerScreenEffectTask(Task_ComputerScreenCloseEffect, increment, unused, priority);
 }
 
-bool8 sub_80F9C1C(void)
+bool8 IsComputerScreenOpenEffectActive(void)
 {
-    return FuncIsActiveTask(sub_80F9C90);
+    return FuncIsActiveTask(Task_ComputerScreenOpenEffect);
 }
 
-bool8 sub_80F9C30(void)
+bool8 IsComputerScreenCloseEffectActive(void)
 {
-    return FuncIsActiveTask(sub_80F9DFC);
+    return FuncIsActiveTask(Task_ComputerScreenCloseEffect);
 }
 
-static void sub_80F9C44(void (*taskfunc) (u8), u16 a1, u16 a2, u8 a3)
+#define tState         data[0]
+#define tHorzIncrement data[1]
+#define tVertIncrement data[2]
+#define tWinLeft       data[3]
+#define tWinRight      data[4]
+#define tWinTop        data[5]
+#define tWinBottom     data[6]
+#define tBlendCnt      data[7]
+#define tBlendY        data[8]
+
+static void CreateComputerScreenEffectTask(void (*taskfunc) (u8), u16 increment, u16 unused, u8 priority)
 {
-    u8 taskId = CreateTask(taskfunc, a3);
+    u8 taskId = CreateTask(taskfunc, priority);
 
-    gTasks[taskId].data[0] = 0;
-    gTasks[taskId].data[1] = a1 == 0 ? 16 : a1;
-    gTasks[taskId].data[2] = a1 == 0 ? 20 : a1;
+    gTasks[taskId].tState = 0;
+    gTasks[taskId].tHorzIncrement = increment == 0 ? 16 : increment;
+    gTasks[taskId].tVertIncrement = increment == 0 ? 20 : increment;
     gTasks[taskId].func(taskId);
 }
 
-static void sub_80F9C90(u8 taskId)
+static void Task_ComputerScreenOpenEffect(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
 
-    switch (task->data[0])
+    switch (task->tState)
     {
     case 0:
-        task->data[3] = 0x78;
-        task->data[4] = 0x78;
-        task->data[5] = 0x50;
-        task->data[6] = 0x51;
+        task->tWinLeft = DISPLAY_WIDTH / 2;
+        task->tWinRight = DISPLAY_WIDTH / 2;
+        task->tWinTop = DISPLAY_HEIGHT / 2;
+        task->tWinBottom = DISPLAY_HEIGHT / 2 + 1;
 
         SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON);
-        SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->data[3], task->data[4]));
-        SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->data[5], task->data[6]));
-        SetGpuReg(REG_OFFSET_WININ, 0x3F);
+        SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->tWinLeft, task->tWinRight));
+        SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->tWinTop, task->tWinBottom));
+        SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR);
         SetGpuReg(REG_OFFSET_WINOUT, 0);
 
         break;
     case 1:
-        task->data[7] = GetGpuReg(REG_OFFSET_BLDCNT);
-        task->data[8] = GetGpuReg(REG_OFFSET_BLDY);
+        task->tBlendCnt = GetGpuReg(REG_OFFSET_BLDCNT);
+        task->tBlendY = GetGpuReg(REG_OFFSET_BLDY);
 
         SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_ALL | BLDCNT_EFFECT_LIGHTEN);
-        SetGpuReg(REG_OFFSET_BLDY, 0x10);
+        SetGpuReg(REG_OFFSET_BLDY, 16);
 
         break;
     case 2:
-        task->data[3] -= task->data[1];
-        task->data[4] += task->data[1];
+        task->tWinLeft -= task->tHorzIncrement;
+        task->tWinRight += task->tHorzIncrement;
 
-        if (task->data[3] < 1 || task->data[4] > 0xEF)
+        if (task->tWinLeft < 1 || task->tWinRight > DISPLAY_WIDTH - 1)
         {
-            task->data[3] = 0;
-            task->data[4] = 0xF0;
+            task->tWinLeft = 0;
+            task->tWinRight = DISPLAY_WIDTH;
             SetGpuReg(REG_OFFSET_BLDY, 0);
-            SetGpuReg(REG_OFFSET_BLDCNT, task->data[7]);
+            SetGpuReg(REG_OFFSET_BLDCNT, task->tBlendCnt);
             BlendPalettes(0xFFFFFFFF, 0, 0);
             gPlttBufferFaded[0] = 0;
         }
-        SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->data[3], task->data[4]));
+        SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->tWinLeft, task->tWinRight));
 
-        if (task->data[3] != 0)
+        if (task->tWinLeft != 0)
             return;
         break;
     case 3:
-        task->data[5] -= task->data[2];
-        task->data[6] += task->data[2];
+        task->tWinTop -= task->tVertIncrement;
+        task->tWinBottom += task->tVertIncrement;
 
-        if (task->data[5] < 1 || task->data[6] > 0x9F)
+        if (task->tWinTop < 1 || task->tWinBottom > DISPLAY_HEIGHT - 1)
         {
-            task->data[5] = 0;
-            task->data[6] = 0xA0;
+            task->tWinTop = 0;
+            task->tWinBottom = DISPLAY_HEIGHT;
             ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON);
         }
-        SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->data[5], task->data[6]));
+        SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->tWinTop, task->tWinBottom));
 
-        if (task->data[5] != 0)
+        if (task->tWinTop != 0)
             return;
         break;
     default:
-        SetGpuReg(REG_OFFSET_BLDCNT, task->data[7]);
+        SetGpuReg(REG_OFFSET_BLDCNT, task->tBlendCnt);
         DestroyTask(taskId);
         return;
     }
-    task->data[0]++;
+    task->tState++;
 }
 
-static void sub_80F9DFC(u8 taskId)
+static void Task_ComputerScreenCloseEffect(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
 
-    int temp = task->data[0];
-
-    switch (temp)
+    switch (task->tState)
     {
     case 0:
-        gPlttBufferFaded[0] = temp;
+        gPlttBufferFaded[0] = 0;
         break;
     case 1:
-        task->data[3] = 0;
-        task->data[4] = 0xF0;
-        task->data[5] = 0;
-        task->data[6] = 0xA0;
+        task->tWinLeft = 0;
+        task->tWinRight = DISPLAY_WIDTH;
+        task->tWinTop = 0;
+        task->tWinBottom = DISPLAY_HEIGHT;
 
         SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON);
-        SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->data[3], task->data[4]));
-        SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->data[5], task->data[6]));
-        SetGpuReg(REG_OFFSET_WININ, 0x3F);
+        SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->tWinLeft, task->tWinRight));
+        SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->tWinTop, task->tWinBottom));
+        SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR);
         SetGpuReg(REG_OFFSET_WINOUT, 0);
         break;
     case 2:
-        task->data[5] += task->data[2];
-        task->data[6] -= task->data[2];
+        task->tWinTop += task->tVertIncrement;
+        task->tWinBottom -= task->tVertIncrement;
 
-        if (task->data[5] > 0x4F || task->data[6] < 0x52)
+        if (task->tWinTop >= DISPLAY_HEIGHT / 2 || task->tWinBottom <= DISPLAY_HEIGHT / 2 + 1)
         {
-            task->data[5] = 0x50;
-            task->data[6] = 0x51;
+            task->tWinTop = DISPLAY_HEIGHT / 2;
+            task->tWinBottom = DISPLAY_HEIGHT / 2 + 1;
             SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_ALL | BLDCNT_EFFECT_LIGHTEN);
-            SetGpuReg(REG_OFFSET_BLDY, 0x10);
+            SetGpuReg(REG_OFFSET_BLDY, 16);
         }
-        SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->data[5], task->data[6]));
+        SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->tWinTop, task->tWinBottom));
 
-        if (task->data[5] != 0x50)
+        if (task->tWinTop != DISPLAY_HEIGHT / 2)
             return;
         break;
     case 3:
-        task->data[3] += task->data[1];
-        task->data[4] -= task->data[1];
+        task->tWinLeft += task->tHorzIncrement;
+        task->tWinRight -= task->tHorzIncrement;
 
-        if (task->data[3] > 0x77 || task->data[4] < 0x79)
+        if (task->tWinLeft >= DISPLAY_WIDTH / 2 || task->tWinRight <= DISPLAY_WIDTH / 2)
         {
-            task->data[3] = 0x78;
-            task->data[4] = 0x78;
-            BlendPalettes(-1, 0x10, 0);
+            task->tWinLeft = DISPLAY_WIDTH / 2;
+            task->tWinRight = DISPLAY_WIDTH / 2;
+            BlendPalettes(-1, 16, 0);
             gPlttBufferFaded[0] = 0;
         }
-        SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->data[3], task->data[4]));
+        SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->tWinLeft, task->tWinRight));
 
-        if (task->data[3] != 0x78)
+        if (task->tWinLeft != DISPLAY_WIDTH / 2)
             return;
         break;
     default:
@@ -486,9 +478,19 @@ static void sub_80F9DFC(u8 taskId)
         DestroyTask(taskId);
         return;
     }
-    task->data[0]++;
+    task->tState++;
 }
 
+#undef tState
+#undef tHorzIncrement
+#undef tVertIncrement
+#undef tWinLeft
+#undef tWinRight
+#undef tWinTop
+#undef tWinBottom
+#undef tBlendCnt
+#undef tBlendY
+
 static void SetCurrentSecretBase(void)
 {
     SetCurSecretBaseIdFromPosition(&gPlayerFacingPosition, gMapHeader.events);
@@ -497,7 +499,7 @@ static void SetCurrentSecretBase(void)
 
 static void AdjustSecretPowerSpritePixelOffsets(void)
 {
-    if (gPlayerAvatar.flags & 0x6)
+    if (gPlayerAvatar.flags & (PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
     {
         switch (gFieldEffectArguments[1])
         {
@@ -590,7 +592,7 @@ static void FieldCallback_SecretBaseCave(void)
 
 bool8 FldEff_UseSecretPowerCave(void)
 {
-    u8 taskId = oei_task_add();
+    u8 taskId = CreateFieldMoveTask();
 
     gTasks[taskId].data[8] = (u32)StartSecretBaseCaveFieldEffect >> 16;
     gTasks[taskId].data[9] = (u32)StartSecretBaseCaveFieldEffect;
@@ -607,22 +609,22 @@ static void StartSecretBaseCaveFieldEffect(void)
 bool8 FldEff_SecretPowerCave(void)
 {
     AdjustSecretPowerSpritePixelOffsets();
-    CreateSprite(&gUnknown_0858E600,
+    CreateSprite(&sSpriteTemplate_SecretPowerCave,
                  gSprites[gPlayerAvatar.spriteId].oam.x + gFieldEffectArguments[5],
                  gSprites[gPlayerAvatar.spriteId].oam.y + gFieldEffectArguments[6],
                  148);
     return FALSE;
 }
 
-static void CaveEntranceSpriteCallback1(struct Sprite *sprite)
+static void SpriteCB_CaveEntranceInit(struct Sprite *sprite)
 {
     PlaySE(SE_W088);
 
     sprite->data[0] = 0;
-    sprite->callback = CaveEntranceSpriteCallback2;
+    sprite->callback = SpriteCB_CaveEntranceOpen;
 }
 
-static void CaveEntranceSpriteCallback2(struct Sprite *sprite)
+static void SpriteCB_CaveEntranceOpen(struct Sprite *sprite)
 {
     if (sprite->data[0] < 40)
     {
@@ -632,11 +634,11 @@ static void CaveEntranceSpriteCallback2(struct Sprite *sprite)
     else
     {
         sprite->data[0] = 0;
-        sprite->callback = CaveEntranceSpriteCallbackEnd;
+        sprite->callback = SpriteCB_CaveEntranceEnd;
     }
 }
 
-static void CaveEntranceSpriteCallbackEnd(struct Sprite *sprite)
+static void SpriteCB_CaveEntranceEnd(struct Sprite *sprite)
 {
     FieldEffectStop(sprite, FLDEFF_SECRET_POWER_CAVE);
     EnableBothScriptContexts();
@@ -650,7 +652,7 @@ static void FieldCallback_SecretBaseTree(void)
 
 bool8 FldEff_UseSecretPowerTree(void)
 {
-    u8 taskId = oei_task_add();
+    u8 taskId = CreateFieldMoveTask();
 
     gTasks[taskId].data[8] = (u32)StartSecretBaseTreeFieldEffect >> 16;
     gTasks[taskId].data[9] = (u32)StartSecretBaseTreeFieldEffect;
@@ -676,7 +678,7 @@ bool8 FldEff_SecretPowerTree(void)
 
     AdjustSecretPowerSpritePixelOffsets();
 
-    CreateSprite(&gUnknown_0858E618,
+    CreateSprite(&sSpriteTemplate_SecretPowerTree,
                  gSprites[gPlayerAvatar.spriteId].oam.x + gFieldEffectArguments[5],
                  gSprites[gPlayerAvatar.spriteId].oam.y + gFieldEffectArguments[6],
                  148);
@@ -687,16 +689,16 @@ bool8 FldEff_SecretPowerTree(void)
     return FALSE;
 }
 
-static void TreeEntranceSpriteCallback1(struct Sprite *sprite)
+static void SpriteCB_TreeEntranceInit(struct Sprite *sprite)
 {
     PlaySE(SE_W010);
 
     sprite->animNum = gFieldEffectArguments[7];
     sprite->data[0] = 0;
-    sprite->callback = TreeEntranceSpriteCallback2;
+    sprite->callback = SpriteCB_TreeEntranceOpen;
 }
 
-static void TreeEntranceSpriteCallback2(struct Sprite *sprite)
+static void SpriteCB_TreeEntranceOpen(struct Sprite *sprite)
 {
     sprite->data[0]++;
 
@@ -706,11 +708,11 @@ static void TreeEntranceSpriteCallback2(struct Sprite *sprite)
             ToggleSecretBaseEntranceMetatile();
 
         sprite->data[0] = 0;
-        sprite->callback = TreeEntranceSpriteCallbackEnd;
+        sprite->callback = SpriteCB_TreeEntranceEnd;
     }
 }
 
-static void TreeEntranceSpriteCallbackEnd(struct Sprite *sprite)
+static void SpriteCB_TreeEntranceEnd(struct Sprite *sprite)
 {
     FieldEffectStop(sprite, FLDEFF_SECRET_POWER_TREE);
     EnableBothScriptContexts();
@@ -724,7 +726,7 @@ static void FieldCallback_SecretBaseShrub(void)
 
 bool8 FldEff_UseSecretPowerShrub(void)
 {
-    u8 taskId = oei_task_add();
+    u8 taskId = CreateFieldMoveTask();
 
     gTasks[taskId].data[8] = (u32)StartSecretBaseShrubFieldEffect >> 16;
     gTasks[taskId].data[9] = (u32)StartSecretBaseShrubFieldEffect;
@@ -742,7 +744,7 @@ bool8 FldEff_SecretPowerShrub(void)
 {
     AdjustSecretPowerSpritePixelOffsets();
 
-    CreateSprite(&gUnknown_0858E630,
+    CreateSprite(&sSpriteTemplate_SecretPowerShrub,
                  gSprites[gPlayerAvatar.spriteId].oam.x + gFieldEffectArguments[5],
                  gSprites[gPlayerAvatar.spriteId].oam.y + gFieldEffectArguments[6],
                  148);
@@ -750,15 +752,15 @@ bool8 FldEff_SecretPowerShrub(void)
     return FALSE;
 }
 
-static void ShrubEntranceSpriteCallback1(struct Sprite *sprite)
+static void SpriteCB_ShrubEntranceInit(struct Sprite *sprite)
 {
     PlaySE(SE_W077);
 
     sprite->data[0] = 0;
-    sprite->callback = ShrubEntranceSpriteCallback2;
+    sprite->callback = SpriteCB_ShrubEntranceOpen;
 }
 
-static void ShrubEntranceSpriteCallback2(struct Sprite *sprite)
+static void SpriteCB_ShrubEntranceOpen(struct Sprite *sprite)
 {
     if (sprite->data[0] < 40)
     {
@@ -770,16 +772,20 @@ static void ShrubEntranceSpriteCallback2(struct Sprite *sprite)
     else
     {
         sprite->data[0] = 0;
-        sprite->callback = ShrubEntranceSpriteCallbackEnd;
+        sprite->callback = SpriteCB_ShrubEntranceEnd;
     }
 }
 
-static void ShrubEntranceSpriteCallbackEnd(struct Sprite *sprite)
+static void SpriteCB_ShrubEntranceEnd(struct Sprite *sprite)
 {
     FieldEffectStop(sprite, FLDEFF_SECRET_POWER_SHRUB);
     EnableBothScriptContexts();
 }
 
+#define tX     data[0]
+#define tY     data[1]
+#define tState data[2]
+
 bool8 FldEff_SecretBasePCTurnOn(void)
 {
     s16 x, y;
@@ -788,9 +794,9 @@ bool8 FldEff_SecretBasePCTurnOn(void)
     GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
 
     taskId = CreateTask(Task_SecretBasePCTurnOn, 0);
-    gTasks[taskId].data[0] = x;
-    gTasks[taskId].data[1] = y;
-    gTasks[taskId].data[2] = 0;
+    gTasks[taskId].tX = x;
+    gTasks[taskId].tY = y;
+    gTasks[taskId].tState = 0;
 
     return FALSE;
 }
@@ -799,30 +805,34 @@ static void Task_SecretBasePCTurnOn(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
-    switch (data[2])
+    switch (tState)
     {
     case 4:
     case 12:
-        MapGridSetMetatileIdAt(data[0], data[1], METATILE_SecretBase_PC_On);
-        CurrentMapDrawMetatileAt(data[0], data[1]);
+        MapGridSetMetatileIdAt(tX, tY, METATILE_SecretBase_PC_On);
+        CurrentMapDrawMetatileAt(tX, tY);
         break;
     case 8:
     case 16:
-        MapGridSetMetatileIdAt(data[0], data[1], METATILE_SecretBase_PC);
-        CurrentMapDrawMetatileAt(data[0], data[1]);
+        MapGridSetMetatileIdAt(tX, tY, METATILE_SecretBase_PC);
+        CurrentMapDrawMetatileAt(tX, tY);
         break;
     case 20:
-        MapGridSetMetatileIdAt(data[0], data[1], METATILE_SecretBase_PC_On);
-        CurrentMapDrawMetatileAt(data[0], data[1]);
+        MapGridSetMetatileIdAt(tX, tY, METATILE_SecretBase_PC_On);
+        CurrentMapDrawMetatileAt(tX, tY);
         FieldEffectActiveListRemove(FLDEFF_PCTURN_ON);
         EnableBothScriptContexts();
         DestroyTask(taskId);
         return;
     }
 
-    data[2]++;
+    tState++;
 }
 
+#undef tX
+#undef tY
+#undef tState
+
 void DoSecretBasePCTurnOffEffect(void)
 {
     s16 x, y;
@@ -892,12 +902,12 @@ static void DoBalloonSoundEffect(s16 metatileId)
     }
 }
 
-bool8 FldEff_NopA6FC(void)
+bool8 FldEff_Nop47(void)
 {
     return FALSE;
 }
 
-bool8 FldEff_NopA700(void)
+bool8 FldEff_Nop48(void)
 {
     return FALSE;
 }
@@ -1010,7 +1020,7 @@ void DoSecretBaseGlitterMatSparkle(void)
 
     SetSpritePosToOffsetMapCoords(&x, &y, 8, 4);
 
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[22], x, y, 0);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SPARKLE], x, y, 0);
     if (spriteId != MAX_SPRITES)
     {
         gSprites[spriteId].coordOffsetEnabled = TRUE;
@@ -1034,7 +1044,7 @@ bool8 FldEff_SandPillar(void)
     switch (GetPlayerFacingDirection())
     {
     case DIR_SOUTH:
-        CreateSprite(&gUnknown_0858E68C,
+        CreateSprite(&sSpriteTemplate_SandPillar,
                      gSprites[gPlayerAvatar.spriteId].oam.x + 8,
                      gSprites[gPlayerAvatar.spriteId].oam.y + 32,
                      0);
@@ -1042,7 +1052,7 @@ bool8 FldEff_SandPillar(void)
         break;
 
     case DIR_NORTH:
-        CreateSprite(&gUnknown_0858E68C,
+        CreateSprite(&sSpriteTemplate_SandPillar,
                      gSprites[gPlayerAvatar.spriteId].oam.x + 8,
                      gSprites[gPlayerAvatar.spriteId].oam.y,
                      148);
@@ -1050,7 +1060,7 @@ bool8 FldEff_SandPillar(void)
         break;
 
     case DIR_WEST:
-        CreateSprite(&gUnknown_0858E68C,
+        CreateSprite(&sSpriteTemplate_SandPillar,
                      gSprites[gPlayerAvatar.spriteId].oam.x - 8,
                      gSprites[gPlayerAvatar.spriteId].oam.y + 16,
                      148);
@@ -1058,7 +1068,7 @@ bool8 FldEff_SandPillar(void)
         break;
 
     case DIR_EAST:
-        CreateSprite(&gUnknown_0858E68C,
+        CreateSprite(&sSpriteTemplate_SandPillar,
                      gSprites[gPlayerAvatar.spriteId].oam.x + 24,
                      gSprites[gPlayerAvatar.spriteId].oam.y + 16,
                      148);
@@ -1069,7 +1079,7 @@ bool8 FldEff_SandPillar(void)
     return FALSE;
 }
 
-static void SpriteCB_SandPillar_0(struct Sprite *sprite)
+static void SpriteCB_SandPillar_BreakTop(struct Sprite *sprite)
 {
     PlaySE(SE_W088);
 
@@ -1083,10 +1093,10 @@ static void SpriteCB_SandPillar_0(struct Sprite *sprite)
     CurrentMapDrawMetatileAt(gFieldEffectArguments[5], gFieldEffectArguments[6]);
 
     sprite->data[0] = 0;
-    sprite->callback = SpriteCB_SandPillar_1;
+    sprite->callback = SpriteCB_SandPillar_BreakBase;
 }
 
-static void SpriteCB_SandPillar_1(struct Sprite *sprite)
+static void SpriteCB_SandPillar_BreakBase(struct Sprite *sprite)
 {
     if (sprite->data[0] < 18)
     {
@@ -1097,11 +1107,11 @@ static void SpriteCB_SandPillar_1(struct Sprite *sprite)
         MapGridSetMetatileIdAt(gFieldEffectArguments[5], gFieldEffectArguments[6], METATILE_SecretBase_SandOrnament_BrokenBase | METATILE_COLLISION_MASK);
         CurrentMapDrawMetatileAt(gFieldEffectArguments[5], gFieldEffectArguments[6]);
         sprite->data[0] = 0;
-        sprite->callback = SpriteCB_SandPillar_2;
+        sprite->callback = SpriteCB_SandPillar_End;
     }
 }
 
-static void SpriteCB_SandPillar_2(struct Sprite *sprite)
+static void SpriteCB_SandPillar_End(struct Sprite *sprite)
 {
     FieldEffectStop(sprite, FLDEFF_SAND_PILLAR);
     EnableBothScriptContexts();
@@ -1167,12 +1177,13 @@ void InteractWithShieldOrTVDecoration(void)
     }
 }
 
-bool8 sub_80FADE4(u16 metatileId, u8 arg1)
+// As opposed to a small one (single metatile) like the balloons
+bool8 IsLargeBreakableDecoration(u16 metatileId, bool8 checkBase)
 {
     if (!CurMapIsSecretBase())
         return FALSE;
 
-    if (!arg1)
+    if (!checkBase)
     {
         if (metatileId == METATILE_SecretBase_SandOrnament_Top || metatileId == METATILE_SecretBase_SandOrnament_TopWall)
             return TRUE;
@@ -1224,25 +1235,26 @@ bool32 FldEffPoison_IsActive(void)
     return FuncIsActiveTask(Task_FieldPoisonEffect);
 }
 
-static void Task_WateringBerryTreeAnim_0(u8 taskId)
+static void Task_WateringBerryTreeAnim(u8 taskId)
 {
-    gTasks[taskId].func = Task_WateringBerryTreeAnim_1;
+    gTasks[taskId].func = Task_WateringBerryTreeAnim_Start;
 }
 
-static void Task_WateringBerryTreeAnim_1(u8 taskId)
+static void Task_WateringBerryTreeAnim_Start(u8 taskId)
 {
     struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
 
     if (!ObjectEventIsMovementOverridden(playerObjEvent)
         || ObjectEventClearHeldMovementIfFinished(playerObjEvent))
     {
-        sub_808C228(GetPlayerFacingDirection());
+        // Start watering
+        SetPlayerAvatarWatering(GetPlayerFacingDirection());
         ObjectEventSetHeldMovement(playerObjEvent, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection()));
-        gTasks[taskId].func = Task_WateringBerryTreeAnim_2;
+        gTasks[taskId].func = Task_WateringBerryTreeAnim_Continue;
     }
 }
 
-static void Task_WateringBerryTreeAnim_2(u8 taskId)
+static void Task_WateringBerryTreeAnim_Continue(u8 taskId)
 {
     struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
 
@@ -1250,15 +1262,15 @@ static void Task_WateringBerryTreeAnim_2(u8 taskId)
     {
         s16 value = gTasks[taskId].data[1]++;
 
+        // Continue holding watering action 10 times, then end
         if (value < 10)
             ObjectEventSetHeldMovement(playerObjEvent, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection()));
-
         else
-            gTasks[taskId].func = Task_WateringBerryTreeAnim_3;
+            gTasks[taskId].func = Task_WateringBerryTreeAnim_End;
     }
 }
 
-static void Task_WateringBerryTreeAnim_3(u8 taskId)
+static void Task_WateringBerryTreeAnim_End(u8 taskId)
 {
     SetPlayerAvatarTransitionFlags(GetPlayerAvatarFlags());
     DestroyTask(taskId);
@@ -1267,16 +1279,17 @@ static void Task_WateringBerryTreeAnim_3(u8 taskId)
 
 void DoWateringBerryTreeAnim(void)
 {
-    CreateTask(Task_WateringBerryTreeAnim_0, 80);
+    CreateTask(Task_WateringBerryTreeAnim, 80);
 }
 
-u8 CreateRecordMixingSprite(void)
+// The lights that blink on the counter when mixing records in the cable club
+u8 CreateRecordMixingLights(void)
 {
     u8 spriteId;
 
-    LoadSpritePalette(&gUnknown_0858E864);
+    LoadSpritePalette(&sSpritePalette_RecordMixLights);
 
-    spriteId = CreateSprite(&gUnknown_0858E880, 0, 0, 82);
+    spriteId = CreateSprite(&sSpriteTemplate_RecordMixLights, 0, 0, 82);
 
     if (spriteId == MAX_SPRITES)
     {
@@ -1293,13 +1306,13 @@ u8 CreateRecordMixingSprite(void)
     return spriteId;
 }
 
-void DestroyRecordMixingSprite(void)
+void DestroyRecordMixingLights(void)
 {
     int i;
 
     for (i = 0; i < MAX_SPRITES; i++)
     {
-        if (gSprites[i].template == &gUnknown_0858E880)
+        if (gSprites[i].template == &sSpriteTemplate_RecordMixLights)
         {
             FreeSpritePalette(&gSprites[i]);
             DestroySprite(&gSprites[i]);
diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c
index 614fa6135..0c35ec74e 100644
--- a/src/fldeff_rocksmash.c
+++ b/src/fldeff_rocksmash.c
@@ -20,12 +20,13 @@
 #include "constants/songs.h"
 
 // static functions
-static void task08_080C9820(u8 taskId);
-static void sub_8135578(u8 taskId);
-static void sub_813552C(u8 taskId);
-static void sub_813561C(u8 taskId);
-static void sub_81356C4(void);
-static void sub_8135714(void);
+static void Task_DoFieldMove_Init(u8 taskId);
+static void Task_DoFieldMove_ShowMonAfterPose(u8 taskId);
+static void Task_DoFieldMove_WaitForMon(u8 taskId);
+static void Task_DoFieldMove_RunFunc(u8 taskId);
+
+static void FieldCallback_RockSmash(void);
+static void FieldMove_RockSmash(void);
 
 // text
 bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId)
@@ -46,13 +47,13 @@ bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId)
     }
 }
 
-u8 oei_task_add(void)
+u8 CreateFieldMoveTask(void)
 {
     GetXYCoordsOneStepInFrontOfPlayer(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y);
-    return CreateTask(task08_080C9820, 8);
+    return CreateTask(Task_DoFieldMove_Init, 8);
 }
 
-static void task08_080C9820(u8 taskId)
+static void Task_DoFieldMove_Init(u8 taskId)
 {
     u8 objEventId;
 
@@ -64,56 +65,61 @@ static void task08_080C9820(u8 taskId)
     {
         if (gMapHeader.mapType == MAP_TYPE_UNDERWATER)
         {
+            // Skip field move pose underwater
             FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
-            gTasks[taskId].func = sub_8135578;
+            gTasks[taskId].func = Task_DoFieldMove_WaitForMon;
         }
         else
         {
-            sub_808C114();
+            // Do field move pose
+            SetPlayerAvatarFieldMove();
             ObjectEventSetHeldMovement(&gObjectEvents[objEventId], MOVEMENT_ACTION_START_ANIM_IN_DIRECTION);
-            gTasks[taskId].func = sub_813552C;
+            gTasks[taskId].func = Task_DoFieldMove_ShowMonAfterPose;
         }
     }
 }
 
-static void sub_813552C(u8 taskId)
+static void Task_DoFieldMove_ShowMonAfterPose(u8 taskId)
 {
     if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[gPlayerAvatar.objectEventId]) == TRUE)
     {
         FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
-        gTasks[taskId].func = sub_8135578;
+        gTasks[taskId].func = Task_DoFieldMove_WaitForMon;
     }
 }
 
-static void sub_8135578(u8 taskId)
+static void Task_DoFieldMove_WaitForMon(u8 taskId)
 {
     if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
     {
         gFieldEffectArguments[1] = GetPlayerFacingDirection();
-        if (gFieldEffectArguments[1] == 1)
+        if (gFieldEffectArguments[1] == DIR_SOUTH)
             gFieldEffectArguments[2] = 0;
-        if (gFieldEffectArguments[1] == 2)
+        if (gFieldEffectArguments[1] == DIR_NORTH)
             gFieldEffectArguments[2] = 1;
-        if (gFieldEffectArguments[1] == 3)
+        if (gFieldEffectArguments[1] == DIR_WEST)
             gFieldEffectArguments[2] = 2;
-        if (gFieldEffectArguments[1] == 4)
+        if (gFieldEffectArguments[1] == DIR_EAST)
             gFieldEffectArguments[2] = 3;
         ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByCurrentState());
         StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gFieldEffectArguments[2]);
-        FieldEffectActiveListRemove(6);
-        gTasks[taskId].func = sub_813561C;
+        FieldEffectActiveListRemove(FLDEFF_FIELD_MOVE_SHOW_MON);
+        gTasks[taskId].func = Task_DoFieldMove_RunFunc;
     }
 }
 
-static void sub_813561C(u8 taskId)
+static void Task_DoFieldMove_RunFunc(u8 taskId)
 {
-    void (*func)(void) = (void (*)(void))(((u16)gTasks[taskId].data[8] << 16) | (u16)gTasks[taskId].data[9]);
+    // The function for the field move to do is stored in halves across data[8] and data[9]
+    void (*fieldMoveFunc)(void) = (void (*)(void))(((u16)gTasks[taskId].data[8] << 16) | (u16)gTasks[taskId].data[9]);
 
-    func();
+    fieldMoveFunc();
     gPlayerAvatar.preventStep = FALSE;
     DestroyTask(taskId);
 }
 
+// Called when Rock Smash is used from the party menu
+// For interacting with a smashable rock in the field, see EventScript_RockSmash
 bool8 SetUpFieldMove_RockSmash(void)
 {
     // In Ruby and Sapphire, Regirock's tomb is opened by using Strength. In Emerald,
@@ -128,7 +134,7 @@ bool8 SetUpFieldMove_RockSmash(void)
     else if (CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_BREAKABLE_ROCK) == TRUE)
     {
         gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
-        gPostMenuFieldCallback = sub_81356C4;
+        gPostMenuFieldCallback = FieldCallback_RockSmash;
         return TRUE;
     }
     else
@@ -137,23 +143,24 @@ bool8 SetUpFieldMove_RockSmash(void)
     }
 }
 
-static void sub_81356C4(void)
+static void FieldCallback_RockSmash(void)
 {
     gFieldEffectArguments[0] = GetCursorSelectionMonId();
-    ScriptContext1_SetupScript(EventScript_FldEffRockSmash);
+    ScriptContext1_SetupScript(EventScript_UseRockSmash);
 }
 
 bool8 FldEff_UseRockSmash(void)
 {
-    u8 taskId = oei_task_add();
+    u8 taskId = CreateFieldMoveTask();
 
-    gTasks[taskId].data[8] = (u32)sub_8135714 >> 16;
-    gTasks[taskId].data[9] = (u32)sub_8135714;
+    gTasks[taskId].data[8] = (u32)FieldMove_RockSmash >> 16;
+    gTasks[taskId].data[9] = (u32)FieldMove_RockSmash;
     IncrementGameStat(GAME_STAT_USED_ROCK_SMASH);
     return FALSE;
 }
 
-static void sub_8135714(void)
+// The actual rock smashing is handled by EventScript_SmashRock, so this function does very little
+static void FieldMove_RockSmash(void)
 {
     PlaySE(SE_W088);
     FieldEffectActiveListRemove(FLDEFF_USE_ROCK_SMASH);
diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c
index f479ef68d..61960d0ff 100644
--- a/src/fldeff_strength.c
+++ b/src/fldeff_strength.c
@@ -11,8 +11,8 @@
 #include "constants/field_effects.h"
 
 // static functions
-static void FldEff_UseStrength(void);
-static void sub_8145E74(void);
+static void FieldCallback_Strength(void);
+static void StartStrengthFieldEffect(void);
 
 // text
 bool8 SetUpFieldMove_Strength(void)
@@ -21,28 +21,29 @@ bool8 SetUpFieldMove_Strength(void)
     {
         gSpecialVar_Result = GetCursorSelectionMonId();
         gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
-        gPostMenuFieldCallback = FldEff_UseStrength;
+        gPostMenuFieldCallback = FieldCallback_Strength;
         return TRUE;
     }
     return FALSE;
 }
 
-static void FldEff_UseStrength(void)
+static void FieldCallback_Strength(void)
 {
     gFieldEffectArguments[0] = GetCursorSelectionMonId();
-    ScriptContext1_SetupScript(EventScript_FldEffStrength);
+    ScriptContext1_SetupScript(EventScript_UseStrength);
 }
 
-bool8 sub_8145E2C(void)
+bool8 FldEff_UseStrength(void)
 {
-    u8 taskId = oei_task_add();
-    gTasks[taskId].data[8] = (u32)sub_8145E74 >> 16;
-    gTasks[taskId].data[9] = (u32)sub_8145E74;
+    u8 taskId = CreateFieldMoveTask();
+    gTasks[taskId].data[8] = (u32)StartStrengthFieldEffect >> 16;
+    gTasks[taskId].data[9] = (u32)StartStrengthFieldEffect;
     GetMonNickname(&gPlayerParty[gFieldEffectArguments[0]], gStringVar1);
     return FALSE;
 }
 
-static void sub_8145E74(void)
+// Just passes control back to EventScript_UseStrength
+static void StartStrengthFieldEffect(void)
 {
     FieldEffectActiveListRemove(FLDEFF_USE_STRENGTH);
     EnableBothScriptContexts();
diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c
index 788310b5d..1ee82674e 100644
--- a/src/fldeff_sweetscent.c
+++ b/src/fldeff_sweetscent.c
@@ -41,7 +41,7 @@ bool8 FldEff_SweetScent(void)
     u8 taskId;
 
     SetWeatherScreenFadeOut();
-    taskId = oei_task_add();
+    taskId = CreateFieldMoveTask();
     gTasks[taskId].data[8] = (u32)StartSweetScentFieldEffect >> 16;
     gTasks[taskId].data[9] = (u32)StartSweetScentFieldEffect;
     return FALSE;
diff --git a/src/fldeff_teleport.c b/src/fldeff_teleport.c
index cbf8ee6cc..3f087e5da 100644
--- a/src/fldeff_teleport.c
+++ b/src/fldeff_teleport.c
@@ -30,7 +30,7 @@ static void FieldCallback_Teleport(void)
 
 bool8 FldEff_UseTeleport(void)
 {
-    u8 taskId = oei_task_add();
+    u8 taskId = CreateFieldMoveTask();
     gTasks[taskId].data[8] = (u32)StartTeleportFieldEffect >> 16;
     gTasks[taskId].data[9] = (u32)StartTeleportFieldEffect;
     SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT);
@@ -40,5 +40,5 @@ bool8 FldEff_UseTeleport(void)
 static void StartTeleportFieldEffect(void)
 {
     FieldEffectActiveListRemove(FLDEFF_USE_TELEPORT);
-    CreateTeleportFieldEffectTask();
+    FldEff_TeleportWarpOut();
 }
diff --git a/src/frontier_pass.c b/src/frontier_pass.c
index 757205656..024a954d1 100644
--- a/src/frontier_pass.c
+++ b/src/frontier_pass.c
@@ -735,7 +735,7 @@ static bool32 InitFrontierPass(void)
     case 8:
         LoadPalette(gUnknown_08DE07C8[0], 0, 0x1A0);
         LoadPalette(gUnknown_08DE07C8[1 + sPassData->trainerStars], 0x10, 0x20);
-        LoadPalette(stdpal_get(0), 0xF0, 0x20);
+        LoadPalette(GetTextWindowPalette(0), 0xF0, 0x20);
         sub_80C629C();
         sub_80C6104(sPassData->cursorArea, sPassData->previousCursorArea);
         if (sPassData->unkE == 1 || sPassData->unkE == 2)
@@ -1378,7 +1378,7 @@ static bool32 InitFrontierMap(void)
         if (FreeTempTileDataBuffersIfPossible())
             return FALSE;
         LoadPalette(gUnknown_08DE07C8[0], 0, 0x1A0);
-        LoadPalette(stdpal_get(0), 0xF0, 0x20);
+        LoadPalette(GetTextWindowPalette(0), 0xF0, 0x20);
         CopyToBgTilemapBuffer(2, gUnknown_08570E00, 0, 0);
         CopyBgTilemapBufferToVram(2);
         break;
diff --git a/src/graphics.c b/src/graphics.c
index 055a6c4cd..ab49af5ed 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1227,13 +1227,14 @@ const u32 gCableCar_Gfx[] = INCBIN_U32("graphics/misc/cable_car.4bpp.lz");
 const u32 gCableCarDoor_Gfx[] = INCBIN_U32("graphics/misc/cable_car_door.4bpp.lz");
 const u32 gCableCarCord_Gfx[] = INCBIN_U32("graphics/misc/cable_car_cord.4bpp.lz");
 
-const u32 gRouletteMenuTiles[] = INCBIN_U32("graphics/roulette/window.4bpp.lz");
-const u32 gRouletteWheelTiles[] = INCBIN_U32("graphics/roulette/wheel.8bpp.lz");
+// Roulette
+const u32 gRouletteMenu_Gfx[] = INCBIN_U32("graphics/roulette/window.4bpp.lz");
+const u32 gRouletteWheel_Gfx[] = INCBIN_U32("graphics/roulette/wheel.8bpp.lz");
 const u32 gRouletteCenter_Gfx[] = INCBIN_U32("graphics/roulette/center.4bpp.lz");
-const u32 gRouletteHeadersTiles[] = INCBIN_U32("graphics/roulette/headers.4bpp.lz");
-const u32 gRouletteCreditTiles[] = INCBIN_U32("graphics/roulette/credit.4bpp.lz");
-const u32 gRouletteNumbersTiles[] = INCBIN_U32("graphics/roulette/numbers.4bpp.lz");
-const u32 gRouletteMultiplierTiles[] = INCBIN_U32("graphics/roulette/multiplier.4bpp.lz");
+const u32 gRouletteHeaders_Gfx[] = INCBIN_U32("graphics/roulette/headers.4bpp.lz");
+const u32 gRouletteCredit_Gfx[] = INCBIN_U32("graphics/roulette/credit.4bpp.lz");
+const u32 gRouletteNumbers_Gfx[] = INCBIN_U32("graphics/roulette/numbers.4bpp.lz");
+const u32 gRouletteMultiplier_Gfx[] = INCBIN_U32("graphics/roulette/multiplier.4bpp.lz");
 
 #include "data/graphics/mail.h"
 
@@ -1435,15 +1436,13 @@ const u32 gNamingScreenMenu_Gfx[] = INCBIN_U32("graphics/naming_screen/menu.4bpp
 const u8 gNamingScreenRWindow_Gfx[] = INCBIN_U8("graphics/naming_screen/rwindow.4bpp");
 const u8 gNamingScreenROptions_Gfx[] = INCBIN_U8("graphics/naming_screen/roptions.4bpp");
 const u8 gNamingScreenCursor_Gfx[] = INCBIN_U8("graphics/naming_screen/cursor.4bpp");
-const u8 gNamingScreenKeyboardButton_Gfx[] = INCBIN_U8("graphics/naming_screen/keyboard_button.4bpp");
-
-const u8 gNamingScreenRightPointingTriangleTiles[] = INCBIN_U8("graphics/naming_screen/right_pointing_triangle.4bpp");
-const u8 gNamingScreenUnderscoreTiles[] = INCBIN_U8("graphics/naming_screen/underscore.4bpp");
-
-const u32 gUnknown_08DD4544[] = INCBIN_U32("graphics/unknown/unknown_DD4544.bin.lz");
-const u32 gUnknown_08DD4620[] = INCBIN_U32("graphics/unknown/unknown_DD4620.bin.lz");
-const u32 gUnknown_08DD46E0[] = INCBIN_U32("graphics/unknown/unknown_DD46E0.bin.lz");
-const u32 gUnknown_08DD47A0[] = INCBIN_U32("graphics/unknown/unknown_DD47A0.bin.lz");
+const u8 gNamingScreenPageButton_Gfx[] = INCBIN_U8("graphics/naming_screen/page_button.4bpp");
+const u8 gNamingScreenInputArrow_Gfx[] = INCBIN_U8("graphics/naming_screen/input_arrow.4bpp");
+const u8 gNamingScreenUnderscore_Gfx[] = INCBIN_U8("graphics/naming_screen/underscore.4bpp");
+const u32 gNamingScreenBackground_Tilemap[] = INCBIN_U32("graphics/naming_screen/background.bin.lz");
+const u32 gNamingScreenKeyboardUpper_Tilemap[] = INCBIN_U32("graphics/naming_screen/keyboard_upper.bin.lz");
+const u32 gNamingScreenKeyboardLower_Tilemap[] = INCBIN_U32("graphics/naming_screen/keyboard_lower.bin.lz");
+const u32 gNamingScreenKeyboardSymbols_Tilemap[] = INCBIN_U32("graphics/naming_screen/keyboard_symbols.bin.lz");
 
 // union room chat
 const u16 gUnionRoomChat_Background_Pal[] = INCBIN_U16("graphics/union_room_chat/background.gbapal");
diff --git a/src/gym_leader_rematch.c b/src/gym_leader_rematch.c
index 355ae5534..efe874894 100644
--- a/src/gym_leader_rematch.c
+++ b/src/gym_leader_rematch.c
@@ -1,5 +1,4 @@
 #include "global.h"
-#include "constants/flags.h"
 #include "random.h"
 #include "event_data.h"
 #include "battle_setup.h"
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index bf9850dec..19217ae85 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -702,7 +702,7 @@ static void Task_Hof_DisplayPlayer(u8 taskId)
     gTasks[taskId].tPlayerSpriteID = CreateTrainerPicSprite(PlayerGenderToFrontTrainerPicId_Debug(gSaveBlock2Ptr->playerGender, TRUE), 1, 120, 72, 6, 0xFFFF);
     AddWindow(&sHof_WindowTemplate);
     LoadWindowGfx(1, gSaveBlock2Ptr->optionsWindowFrameType, 0x21D, 0xD0);
-    LoadPalette(stdpal_get(1), 0xE0, 0x20);
+    LoadPalette(GetTextWindowPalette(1), 0xE0, 0x20);
     gTasks[taskId].tFrameCount = 120;
     gTasks[taskId].func = Task_Hof_WaitAndPrintPlayerInfo;
 }
@@ -824,7 +824,7 @@ void CB2_DoHallOfFamePC(void)
         {
             struct HallofFameTeam *fameTeam = (struct HallofFameTeam*)(gDecompressionBuffer);
             fameTeam->mon[0] = sDummyFameMon;
-            sub_80F9BCC(0, 0, 0);
+            ComputerScreenOpenEffect(0, 0, 0);
             SetVBlankCallback(VBlankCB_HallOfFame);
             gMain.state++;
         }
@@ -834,7 +834,7 @@ void CB2_DoHallOfFamePC(void)
         AnimateSprites();
         BuildOamBuffer();
         UpdatePaletteFade();
-        if (!sub_80F9C1C())
+        if (!IsComputerScreenOpenEffectActive())
             gMain.state++;
         break;
     case 5:
@@ -1048,13 +1048,13 @@ static void Task_HofPC_HandlePaletteOnExit(u8 taskId)
     CpuCopy16(gPlttBufferFaded, gPlttBufferUnfaded, 0x400);
     fameTeam = (struct HallofFameTeam*)(gDecompressionBuffer);
     fameTeam->mon[0] = sDummyFameMon;
-    sub_80F9BF4(0, 0, 0);
+    ComputerScreenCloseEffect(0, 0, 0);
     gTasks[taskId].func = Task_HofPC_HandleExit;
 }
 
 static void Task_HofPC_HandleExit(u8 taskId)
 {
-    if (!sub_80F9C30())
+    if (!IsComputerScreenCloseEffectActive())
     {
         u8 i;
 
@@ -1324,7 +1324,7 @@ static bool8 sub_8175024(void)
         break;
     case 3:
         InitStandardTextBoxWindows();
-        sub_8197200();
+        InitTextBoxGfxAndPrinters();
         break;
     case 4:
         SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON);
diff --git a/src/international_string_util.c b/src/international_string_util.c
index ec5057359..23ca6c081 100644
--- a/src/international_string_util.c
+++ b/src/international_string_util.c
@@ -136,7 +136,7 @@ void PadNameString(u8 *dest, u8 padChar)
         while (length < PLAYER_NAME_LENGTH - 1)
         {
             dest[length] = EXT_CTRL_CODE_BEGIN;
-            dest[length + 1] = EXT_CTRL_CODE_UNKNOWN_7;
+            dest[length + 1] = EXT_CTRL_CODE_RESET_SIZE;
             length += 2;
         }
     }
diff --git a/src/item_menu.c b/src/item_menu.c
index 591ebe018..ae09ec7ed 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -600,7 +600,7 @@ void CB2_BagMenuRun(void)
     RunTasks();
     AnimateSprites();
     BuildOamBuffer();
-    do_scheduled_bg_tilemap_copies_to_vram();
+    DoScheduledBgTilemapCopiesToVram();
     UpdatePaletteFade();
 }
 
@@ -627,7 +627,7 @@ bool8 SetupBagMenu(void)
     {
     case 0:
         SetVBlankHBlankCallbacksToNull();
-        clear_scheduled_bg_copies_to_vram();
+        ClearScheduledBgCopiesToVram();
         gMain.state++;
         break;
     case 1:
diff --git a/src/item_use.c b/src/item_use.c
index ff689a19a..2c9ffaf32 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -38,11 +38,9 @@
 #include "text.h"
 #include "constants/event_bg.h"
 #include "constants/event_objects.h"
-#include "constants/flags.h"
 #include "constants/item_effects.h"
 #include "constants/items.h"
 #include "constants/songs.h"
-#include "constants/vars.h"
 
 static void SetUpItemUseCallback(u8 taskId);
 static void FieldCB_UseItemOnField(void);
@@ -399,7 +397,7 @@ static bool8 IsHiddenItemPresentInConnection(struct MapConnection *connection, i
     u32 localOffset;
     s32 localLength;
 
-    struct MapHeader const *const mapHeader = mapconnection_get_mapheader(connection);
+    struct MapHeader const *const mapHeader = GetMapHeaderFromConnection(connection);
 
     switch (connection->direction)
     {
@@ -723,7 +721,7 @@ static void ItemUseOnFieldCB_WailmerPailBerry(u8 taskId)
 
 static bool8 TryToWaterSudowoodo(void)
 {
-    u16 x, y;
+    s16 x, y;
     u8 z;
     u8 objId;
     GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
diff --git a/src/libgcnmultiboot.s b/src/libgcnmultiboot.s
index 0e418e51f..dbf70ccf8 100644
--- a/src/libgcnmultiboot.s
+++ b/src/libgcnmultiboot.s
@@ -22,7 +22,7 @@ GameCubeMultiBoot_Hash: @ 82DED70
 	movs r2, 0x20
 
 GameCubeMultiBoot_Hash_Loop:
-	lsrs r3, 1
+	lsrs r3, #1
 	bcc GameCubeMultiBoot_Hash_SkipEor
 
 	eors r3, r4
@@ -37,8 +37,8 @@ GameCubeMultiBoot_Hash_SkipEor:
 	thumb_func_start GameCubeMultiBoot_Main
 @ void GameCubeMultiBoot_Main(struct GameCubeMultiBoot *mb);
 GameCubeMultiBoot_Main: @ 82DED84
-	ldr r1, [r0, GCMB_STRUCT_SERIAL_INTR_HANDLER]
-	cmp r1, 0
+	ldr r1, [r0, #GCMB_STRUCT_SERIAL_INTR_HANDLER]
+	cmp r1, #0
 	beq _082DEDAA
 	ldrb r1, [r0, 0x1]
 	adds r1, 0x1
@@ -47,30 +47,30 @@ GameCubeMultiBoot_Main: @ 82DED84
 	cmp r1, 0x2
 	beq _082DEDF4
 	ldr r3, pool_InterruptRegs
-	ldrh r2, [r3, OFFSET_REG_IME - 0x200]
+	ldrh r2, [r3, #OFFSET_REG_IME - 0x200]
 	movs r1, 0
-	strh r1, [r3, OFFSET_REG_IME - 0x200]
+	strh r1, [r3, #OFFSET_REG_IME - 0x200]
 	ldrb r1, [r0]
 	cmp r1, 0xA
 	bgt _082DEDA8
 	adds r1, 0x1
 	strb r1, [r0]
 _082DEDA8:
-	strh r2, [r3, OFFSET_REG_IME - 0x200]
+	strh r2, [r3, #OFFSET_REG_IME - 0x200]
 _082DEDAA:
 	bcs GameCubeMultiBoot_Init
 	ldrb r1, [r0, 0x2]
 	cmp r1, 0
 	bne _082DEDF6
-	ldr r1, [r0, GCMB_STRUCT_CUR_DEST_PTR]
-	ldr r2, [r0, GCMB_STRUCT_BASE_DEST_PTR]
+	ldr r1, [r0, #GCMB_STRUCT_CUR_DEST_PTR]
+	ldr r2, [r0, #GCMB_STRUCT_BASE_DEST_PTR]
 	subs r1, r2
 	beq _082DEE76
 	cmp r1, 0xA0
 	bcc _082DEE76
 	push {r4-r6}
 	movs r1, 0x98
-	adds r2, ROM_HEADER_NINTENDO_LOGO_OFFSET
+	adds r2, #ROM_HEADER_NINTENDO_LOGO_OFFSET
 	ldr r4, pool_NintendoLogo
 _082DEDC6:
 	ldm r2!, {r5}
@@ -82,8 +82,8 @@ _082DEDC6:
 	ldm r2!, {r5}
 	ldm r4!, {r6}
 	eors r5, r6
-	lsrs r5, 8
-	str r2, [r0, GCMB_STRUCT_BASE_DEST_PTR]
+	lsrs r5, #8
+	str r2, [r0, #GCMB_STRUCT_BASE_DEST_PTR]
 _082DEDDC:
 	pop {r4-r6}
 	bne GameCubeMultiBoot_Init
@@ -100,11 +100,11 @@ _082DEDDC:
 _082DEDF4:
 	bx lr
 _082DEDF6:
-	ldr r1, [r0, GCMB_STRUCT_CUR_DEST_PTR]
+	ldr r1, [r0, #GCMB_STRUCT_CUR_DEST_PTR]
 	mov r12, r1
 	ldr r3, [r0, 0x18]
 	push {r4-r7}
-	ldr r4, [r0, GCMB_STRUCT_BASE_DEST_PTR]
+	ldr r4, [r0, #GCMB_STRUCT_BASE_DEST_PTR]
 	ldr r5, pool_Kawa
 	ldr r6, [r0, 0x14]
 	ldr r7, pool_HashVal
@@ -118,7 +118,7 @@ _082DEE06:
 	eors r3, r1
 	movs r2, 0x20
 _082DEE16:
-	lsrs r3, 1
+	lsrs r3, #1
 	bcc _082DEE1C
 	eors r3, r7
 _082DEE1C:
@@ -128,22 +128,22 @@ _082DEE1C:
 	adds r6, 0x1
 	b _082DEE06
 _082DEE26:
-	str r4, [r0, GCMB_STRUCT_BASE_DEST_PTR]
+	str r4, [r0, #GCMB_STRUCT_BASE_DEST_PTR]
 	str r6, [r0, 0x14]
 	pop {r4-r7}
 	str r3, [r0, 0x18]
 	ldrh r1, [r0, 0x12]
-	cmp r1, 0
+	cmp r1, #0
 	bne _082DEE76
-	ldr r1, [r0, GCMB_STRUCT_CUR_DEST_PTR]
-	ldr r2, [r0, GCMB_STRUCT_BASE_DEST_PTR]
+	ldr r1, [r0, #GCMB_STRUCT_CUR_DEST_PTR]
+	ldr r2, [r0, #GCMB_STRUCT_BASE_DEST_PTR]
 	cmp r1, r2
 	bne _082DEE76
 	ldr r1, [r0, 0xC]
-	cmp r1, 0
+	cmp r1, #0
 	beq _082DEE60
 	ldrh r1, [r0, 0x10]
-	cmp r1, 0
+	cmp r1, #0
 	beq _082DEDF4
 	mov r12, lr
 	movs r1, 0xBB
@@ -159,11 +159,11 @@ _082DEE26:
 _082DEE60:
 	mov r12, lr
 	ldrb r1, [r0, 0x3]
-	lsls r1, 24
+	lsls r1, #24
 	subs r1, 0x1
 	str r1, [r0, 0xC]
 	bl GameCubeMultiBoot_Hash
-	lsls r3, 8
+	lsls r3, #8
 	adds r3, 0xFF
 	str r3, [r0, 0x1C]
 	bx r12
@@ -186,8 +186,8 @@ GameCubeMultiBoot_ExecuteProgram: @ 82DEE84
 	cmp r1, 0x2
 	bne GameCubeMultiBoot_ExecuteProgram_Fail
 	ldr r3, pool_InterruptRegs
-	movs r1, 0
-	strh r1, [r3, OFFSET_REG_IME - 0x200]
+	movs r1, #0
+	strh r1, [r3, #OFFSET_REG_IME - 0x200]
 	ldr r1, pool_MultiBootLoadAddr
 	adds r1, 0xC0
 	bx r1
@@ -201,25 +201,25 @@ GameCubeMultiBoot_Init: @ 82DEE98
 	ldr r3, pool_InterruptRegs
 
 @ Save IME register.
-	ldrh r2, [r3, OFFSET_REG_IME - 0x200]
+	ldrh r2, [r3, #OFFSET_REG_IME - 0x200]
 
 @ Disable interrupts.
 	movs r1, 0
-	strh r1, [r3, OFFSET_REG_IME - 0x200]
+	strh r1, [r3, #OFFSET_REG_IME - 0x200]
 
 @ Set the handler to the "Stop" routine.
 @ Unless the first command that is received is a device reset command, the
 @ "Stop" routine will be executed and no further commands will be processed.
 	adr r3, GcMbIntrHandler_Stop
-	str r3, [r0, GCMB_STRUCT_SERIAL_INTR_HANDLER]
+	str r3, [r0, #GCMB_STRUCT_SERIAL_INTR_HANDLER]
 
 	ldrb r3, [r0, 0x3]
 	push {r3}
 	ldrb r3, [r0, 0x1]
 	push {r0,r3}
 
-	adds r3, r0, 0
-	adds r3, GCMB_STRUCT_BASE_DEST_PTR
+	adds r3, r0, #0
+	adds r3, #GCMB_STRUCT_BASE_DEST_PTR
 
 @ clear all but the last 3 fields of the struct
 GameCubeMultiBoot_Init_ClearStructLoop:
@@ -261,7 +261,7 @@ GameCubeMultiBoot_Init_ClearStructLoop:
 	strh r1, [r3, OFFSET_REG_IE - 0x200]
 
 @ Restore IME register.
-	strh r2, [r3, OFFSET_REG_IME - 0x200]
+	strh r2, [r3, #OFFSET_REG_IME - 0x200]
 
 	bx lr
 	thumb_func_end GameCubeMultiBoot_Init
@@ -275,11 +275,11 @@ GameCubeMultiBoot_HandleSerialInterrupt: @ 82DEEE2
 	ldrh r1, [r3, OFFSET_REG_JOYCNT - 0x120]
 	strh r1, [r3, OFFSET_REG_JOYCNT - 0x120]
 
-	movs r2, 0
+	movs r2, #0
 	strb r2, [r0]
 
-	ldr r2, [r0, GCMB_STRUCT_SERIAL_INTR_HANDLER]
-	cmp r2, 0
+	ldr r2, [r0, #GCMB_STRUCT_SERIAL_INTR_HANDLER]
+	cmp r2, #0
 	beq GameCubeMultiBoot_HandleSerialInterruptDone
 
 	lsrs r1, 1 @ was a device reset command received?
@@ -297,7 +297,7 @@ GcMbIntrHandler_Stop:
 	strh r2, [r3, OFFSET_REG_JOYSTAT - 0x120]
 
 GameCubeMultiBoot_SetInterruptHandler:
-	str r2, [r0, GCMB_STRUCT_SERIAL_INTR_HANDLER]
+	str r2, [r0, #GCMB_STRUCT_SERIAL_INTR_HANDLER]
 
 GameCubeMultiBoot_ReadVCount:
 	ldr r3, pool_RegDispstat
@@ -319,8 +319,8 @@ GameCubeMultiBoot_BeginHandshake:
 	cmp r1, 0
 	bne GcMbIntrHandler_Stop
 	ldr r1, pool_MultiBootLoadAddr
-	str r1, [r0, GCMB_STRUCT_BASE_DEST_PTR]
-	str r1, [r0, GCMB_STRUCT_CUR_DEST_PTR]
+	str r1, [r0, #GCMB_STRUCT_BASE_DEST_PTR]
+	str r1, [r0, #GCMB_STRUCT_CUR_DEST_PTR]
 	adr r2, GcMbIntrHandler_CheckGameCodeSent
 	b GameCubeMultiBoot_SetInterruptHandler
 
@@ -417,8 +417,8 @@ _082DEF94:
 _082DEFA6:
 	bne GcMbIntrHandler_Stop
 	ldr r1, pool_MultiBootLoadAddr
-	str r1, [r0, GCMB_STRUCT_BASE_DEST_PTR]
-	str r1, [r0, GCMB_STRUCT_CUR_DEST_PTR]
+	str r1, [r0, #GCMB_STRUCT_BASE_DEST_PTR]
+	str r1, [r0, #GCMB_STRUCT_CUR_DEST_PTR]
 	adr r2, GcMbIntrHandler_82DEFB4
 	b GameCubeMultiBoot_SetInterruptHandler
 
@@ -427,7 +427,7 @@ _082DEFA6:
 GcMbIntrHandler_82DEFB4: @ 82DEFB4
 	lsrs r1, 1 @ is receive complete?
 	bcc GcMbIntrHandler_Stop @ branch if not
-	ldr r2, [r0, GCMB_STRUCT_CUR_DEST_PTR]
+	ldr r2, [r0, #GCMB_STRUCT_CUR_DEST_PTR]
 	movs r1, 0x4
 	ands r1, r2
 	adds r1, 0x8
@@ -435,7 +435,7 @@ GcMbIntrHandler_82DEFB4: @ 82DEFB4
 	strh r1, [r3, OFFSET_REG_JOYSTAT - 0x120]
 	ldr r1, [r3, OFFSET_REG_JOY_RECV - 0x120]
 	stm r2!, {r1}
-	str r2, [r0, GCMB_STRUCT_CUR_DEST_PTR]
+	str r2, [r0, #GCMB_STRUCT_CUR_DEST_PTR]
 	ldrh r1, [r0, 0x12]
 	subs r1, 0x1
 	strh r1, [r0, 0x12]
@@ -500,11 +500,11 @@ GameCubeMultiBoot_Quit: @ 82DF012
 	ldr r3, pool_InterruptRegs
 
 @ Save IME register.
-	ldrh r2, [r3, OFFSET_REG_IME - 0x200]
+	ldrh r2, [r3, #OFFSET_REG_IME - 0x200]
 
 @ Disable interrupts.
 	movs r1, 0
-	strh r1, [r3, OFFSET_REG_IME - 0x200]
+	strh r1, [r3, #OFFSET_REG_IME - 0x200]
 
 	ldr r3, pool_SerialRegs
 
@@ -528,7 +528,7 @@ GameCubeMultiBoot_Quit: @ 82DF012
 	strh r1, [r3, OFFSET_REG_IE - 0x200]
 
 @ Restore IME register.
-	strh r2, [r3, OFFSET_REG_IME - 0x200]
+	strh r2, [r3, #OFFSET_REG_IME - 0x200]
 
 	bx lr
 	thumb_func_end GameCubeMultiBoot_Quit
diff --git a/src/link_rfu_3.c b/src/link_rfu_3.c
index c53e1c59e..db1ba8b43 100644
--- a/src/link_rfu_3.c
+++ b/src/link_rfu_3.c
@@ -220,9 +220,9 @@ static const u8 sWireless_RSEtoASCIITable[256] = {
     [CHAR_y] = 'y', 
     [CHAR_z] = 'z', 
     0x20, 0x20, 0x2b, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 
-    [CHAR_SPECIAL_F7] = ' ',
-    [CHAR_SPECIAL_F8] = ' ', 
-    [CHAR_SPECIAL_F9] = ' ', 
+    [CHAR_DYNAMIC] = ' ',
+    [CHAR_KEYPAD_ICON] = ' ', 
+    [CHAR_EXTRA_SYMBOL] = ' ', 
     [CHAR_PROMPT_SCROLL] = ' ', 
     [CHAR_PROMPT_CLEAR] = ' ', 
     [EXT_CTRL_CODE_BEGIN] = ' ', 
diff --git a/src/list_menu.c b/src/list_menu.c
index ddcad0fe9..ebf02bab6 100644
--- a/src/list_menu.c
+++ b/src/list_menu.c
@@ -1257,17 +1257,17 @@ void ListMenuSetUpRedOutlineCursorSpriteOamTable(u16 rowWidth, u16 rowHeight, st
     s32 i, j, id = 0;
 
     subsprites[id] = sSubsprite_RedOutline1;
-    subsprites[id].x = 136;
-    subsprites[id].y = 136;
+    subsprites[id].x = -120;
+    subsprites[id].y = -120;
     id++;
 
     subsprites[id] = sSubsprite_RedOutline2;
     subsprites[id].x = rowWidth + 128;
-    subsprites[id].y = 136;
+    subsprites[id].y = -120;
     id++;
 
     subsprites[id] = sSubsprite_RedOutline7;
-    subsprites[id].x = 136;
+    subsprites[id].x = -120;
     subsprites[id].y = rowHeight + 128;
     id++;
 
@@ -1297,7 +1297,7 @@ void ListMenuSetUpRedOutlineCursorSpriteOamTable(u16 rowWidth, u16 rowHeight, st
         for (j = 8; j < rowHeight - 8; j += 8)
         {
             subsprites[id] = sSubsprite_RedOutline4;
-            subsprites[id].x = 136;
+            subsprites[id].x = -120;
             subsprites[id].y = j - 120;
             id++;
 
diff --git a/src/main.c b/src/main.c
index 5249d11fa..454fefc5c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -280,7 +280,7 @@ static void ReadKeys(void)
     gMain.heldKeys = gMain.heldKeysRaw;
 
     // Remap L to A if the L=A option is enabled.
-    if (gSaveBlock2Ptr->optionsButtonMode == 2)
+    if (gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_L_EQUALS_A)
     {
         if (gMain.newKeys & L_BUTTON)
             gMain.newKeys |= A_BUTTON;
diff --git a/src/main_menu.c b/src/main_menu.c
index 91931e581..a4de99207 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -1,7 +1,6 @@
 #include "global.h"
 #include "trainer_pokemon_sprites.h"
 #include "bg.h"
-#include "constants/flags.h"
 #include "constants/rgb.h"
 #include "constants/songs.h"
 #include "constants/species.h"
@@ -1610,7 +1609,7 @@ static void Task_NewGameBirchSpeech_StartNamingScreen(u8 taskId)
         FreeAndDestroyMonPicSprite(gTasks[taskId].tLotadSpriteId);
         NewGameBirchSpeech_SetDefaultPlayerName(Random() % 20);
         DestroyTask(taskId);
-        DoNamingScreen(0, gSaveBlock2Ptr->playerName, gSaveBlock2Ptr->playerGender, 0, 0, CB2_NewGameBirchSpeech_ReturnFromNamingScreen);
+        DoNamingScreen(NAMING_SCREEN_PLAYER, gSaveBlock2Ptr->playerName, gSaveBlock2Ptr->playerGender, 0, 0, CB2_NewGameBirchSpeech_ReturnFromNamingScreen);
     }
 }
 
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c
index dc5a0b335..af68c6116 100644
--- a/src/mauville_old_man.c
+++ b/src/mauville_old_man.c
@@ -3,7 +3,6 @@
 #include "constants/songs.h"
 #include "constants/easy_chat.h"
 #include "constants/event_objects.h"
-#include "constants/vars.h"
 #include "mauville_old_man.h"
 #include "event_data.h"
 #include "string_util.h"
@@ -221,7 +220,7 @@ static void PrepareSongText(void)
         if (lineNum == 0)
         {
             *(wordEnd++) = EXT_CTRL_CODE_BEGIN;
-            *(wordEnd++) = 15;
+            *(wordEnd++) = EXT_CTRL_CODE_FILL_WINDOW;
         }
     }
 }
diff --git a/src/menu.c b/src/menu.c
index 7d5f02b60..ac2f7d85b 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -18,7 +18,6 @@
 #include "task.h"
 #include "text_window.h"
 #include "window.h"
-#include "constants/flags.h"
 #include "constants/songs.h"
 
 #define DLG_WINDOW_PALETTE_NUM 15
@@ -57,9 +56,9 @@ static EWRAM_DATA u8 sPaletteNum = 0;
 static EWRAM_DATA u8 sYesNoWindowId = 0;
 static EWRAM_DATA u8 sWindowId = 0;
 static EWRAM_DATA u16 sFiller = 0;  // needed to align
-static EWRAM_DATA bool8 gUnknown_0203CDA4[4] = {FALSE};
-static EWRAM_DATA u16 gUnknown_0203CDA8 = 0;
-static EWRAM_DATA void *gUnknown_0203CDAC[0x20] = {NULL};
+static EWRAM_DATA bool8 sScheduledBgCopiesToVram[4] = {FALSE};
+static EWRAM_DATA u16 sTempTileDataBufferIdx = 0;
+static EWRAM_DATA void *sTempTileDataBuffer[0x20] = {NULL};
 
 const u16 gUnknown_0860F074[] = INCBIN_U16("graphics/interface/860F074.gbapal");
 
@@ -154,7 +153,7 @@ void FreeAllOverworldWindowBuffers(void)
     FreeAllWindowBuffers();
 }
 
-void sub_8197200(void)
+void InitTextBoxGfxAndPrinters(void)
 {
     ChangeBgX(0, 0, 0);
     ChangeBgY(0, 0, 0);
@@ -1737,48 +1736,48 @@ u8 sub_8199944(u8 windowId, u8 optionWidth, u8 columns, u8 rows, u8 initialCurso
     return sMenu.cursorPos;
 }
 
-void clear_scheduled_bg_copies_to_vram(void)
+void ClearScheduledBgCopiesToVram(void)
 {
-    memset(gUnknown_0203CDA4, 0, sizeof(gUnknown_0203CDA4));
+    memset(sScheduledBgCopiesToVram, 0, sizeof(sScheduledBgCopiesToVram));
 }
 
 void ScheduleBgCopyTilemapToVram(u8 bgId)
 {
-    gUnknown_0203CDA4[bgId] = TRUE;
+    sScheduledBgCopiesToVram[bgId] = TRUE;
 }
 
-void do_scheduled_bg_tilemap_copies_to_vram(void)
+void DoScheduledBgTilemapCopiesToVram(void)
 {
-    if (gUnknown_0203CDA4[0] == TRUE)
+    if (sScheduledBgCopiesToVram[0] == TRUE)
     {
         CopyBgTilemapBufferToVram(0);
-        gUnknown_0203CDA4[0] = FALSE;
+        sScheduledBgCopiesToVram[0] = FALSE;
     }
-    if (gUnknown_0203CDA4[1] == TRUE)
+    if (sScheduledBgCopiesToVram[1] == TRUE)
     {
         CopyBgTilemapBufferToVram(1);
-        gUnknown_0203CDA4[1] = FALSE;
+        sScheduledBgCopiesToVram[1] = FALSE;
     }
-    if (gUnknown_0203CDA4[2] == TRUE)
+    if (sScheduledBgCopiesToVram[2] == TRUE)
     {
         CopyBgTilemapBufferToVram(2);
-        gUnknown_0203CDA4[2] = FALSE;
+        sScheduledBgCopiesToVram[2] = FALSE;
     }
-    if (gUnknown_0203CDA4[3] == TRUE)
+    if (sScheduledBgCopiesToVram[3] == TRUE)
     {
         CopyBgTilemapBufferToVram(3);
-        gUnknown_0203CDA4[3] = FALSE;
+        sScheduledBgCopiesToVram[3] = FALSE;
     }
 }
 
 void ResetTempTileDataBuffers(void)
 {
     int i;
-    for (i = 0; i < (s32)ARRAY_COUNT(gUnknown_0203CDAC); i++)
+    for (i = 0; i < (int)ARRAY_COUNT(sTempTileDataBuffer); i++)
     {
-        gUnknown_0203CDAC[i] = NULL;
+        sTempTileDataBuffer[i] = NULL;
     }
-    gUnknown_0203CDA8 = 0;
+    sTempTileDataBufferIdx = 0;
 }
 
 bool8 FreeTempTileDataBuffersIfPossible(void)
@@ -1787,13 +1786,13 @@ bool8 FreeTempTileDataBuffersIfPossible(void)
 
     if (!IsDma3ManagerBusyWithBgCopy())
     {
-        if (gUnknown_0203CDA8)
+        if (sTempTileDataBufferIdx)
         {
-            for (i = 0; i < gUnknown_0203CDA8; i++)
+            for (i = 0; i < sTempTileDataBufferIdx; i++)
             {
-                FREE_AND_SET_NULL(gUnknown_0203CDAC[i]);
+                FREE_AND_SET_NULL(sTempTileDataBuffer[i]);
             }
-            gUnknown_0203CDA8 = 0;
+            sTempTileDataBufferIdx = 0;
         }
         return FALSE;
     }
@@ -1806,7 +1805,7 @@ bool8 FreeTempTileDataBuffersIfPossible(void)
 void *DecompressAndCopyTileDataToVram(u8 bgId, const void *src, u32 size, u16 offset, u8 mode)
 {
     u32 sizeOut;
-    if (gUnknown_0203CDA8 < ARRAY_COUNT(gUnknown_0203CDAC))
+    if (sTempTileDataBufferIdx < ARRAY_COUNT(sTempTileDataBuffer))
     {
         void *ptr = malloc_and_decompress(src, &sizeOut);
         if (!size)
@@ -1814,7 +1813,7 @@ void *DecompressAndCopyTileDataToVram(u8 bgId, const void *src, u32 size, u16 of
         if (ptr)
         {
             copy_decompressed_tile_data_to_vram(bgId, ptr, size, offset, mode);
-            gUnknown_0203CDAC[gUnknown_0203CDA8++] = ptr;
+            sTempTileDataBuffer[sTempTileDataBufferIdx++] = ptr;
         }
         return ptr;
     }
diff --git a/src/menu_specialized.c b/src/menu_specialized.c
index b7dd1f33a..ecef9982b 100644
--- a/src/menu_specialized.c
+++ b/src/menu_specialized.c
@@ -884,10 +884,10 @@ static u8 *sub_81D2CD0(u8 *dst, u16 boxId, u16 monId)
     u8 *str;
 
     *(dst++) = EXT_CTRL_CODE_BEGIN;
-    *(dst++) = 4;
-    *(dst++) = 8;
-    *(dst++) = 0;
-    *(dst++) = 9;
+    *(dst++) = EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW;
+    *(dst++) = TEXT_COLOR_BLUE;
+    *(dst++) = TEXT_COLOR_TRANSPARENT;
+    *(dst++) = TEXT_COLOR_LIGHT_BLUE;
     if (GetBoxOrPartyMonData(boxId, monId, MON_DATA_IS_EGG, NULL))
     {
         return StringCopyPadded(dst, gText_EggNickname, 0, 12);
@@ -920,8 +920,8 @@ static u8 *sub_81D2CD0(u8 *dst, u16 boxId, u16 monId)
             ;
 
         *(str++) = EXT_CTRL_CODE_BEGIN;
-        *(str++) = 0x12;
-        *(str++) = 0x3C;
+        *(str++) = EXT_CTRL_CODE_SKIP;
+        *(str++) = 60;
 
         switch (gender)
         {
@@ -931,30 +931,30 @@ static u8 *sub_81D2CD0(u8 *dst, u16 boxId, u16 monId)
         case MON_MALE:
             *(str++) = EXT_CTRL_CODE_BEGIN;
             *(str++) = EXT_CTRL_CODE_COLOR;
-            *(str++) = 4;
+            *(str++) = TEXT_COLOR_RED;
             *(str++) = EXT_CTRL_CODE_BEGIN;
-            *(str++) = 3;
-            *(str++) = 5;
+            *(str++) = EXT_CTRL_CODE_SHADOW;
+            *(str++) = TEXT_COLOR_LIGHT_RED;
             *(str++) = CHAR_MALE;
             break;
         case MON_FEMALE:
             *(str++) = EXT_CTRL_CODE_BEGIN;
             *(str++) = EXT_CTRL_CODE_COLOR;
-            *(str++) = 6;
+            *(str++) = TEXT_COLOR_GREEN;
             *(str++) = EXT_CTRL_CODE_BEGIN;
-            *(str++) = 3;
-            *(str++) = 7;
+            *(str++) = EXT_CTRL_CODE_SHADOW;
+            *(str++) = TEXT_COLOR_LIGHT_GREEN;
             *(str++) = CHAR_FEMALE;
             break;
         }
 
         *(str++) = EXT_CTRL_CODE_BEGIN;
-        *(str++) = 4;
-        *(str++) = 8;
-        *(str++) = 0;
-        *(str++) = 9;
+        *(str++) = EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW;
+        *(str++) = TEXT_COLOR_BLUE;
+        *(str++) = TEXT_COLOR_TRANSPARENT;
+        *(str++) = TEXT_COLOR_LIGHT_BLUE;
         *(str++) = CHAR_SLASH;
-        *(str++) = CHAR_SPECIAL_F9;
+        *(str++) = CHAR_EXTRA_SYMBOL;
         *(str++) = CHAR_LV_2;
         str = ConvertIntToDecimalStringN(str, level, STR_CONV_MODE_LEFT_ALIGN, 3);
         *(str++) = CHAR_SPACE;
@@ -989,10 +989,10 @@ void sub_81D2ED4(u8 *dst, u8 *nameDst, u16 boxId, u16 monId, u16 arg5, u16 arg6,
     {
         sub_81D2CD0(nameDst, boxId, monId);
         dst[0] = EXT_CTRL_CODE_BEGIN;
-        dst[1] = 4;
-        dst[2] = 8;
-        dst[3] = 0;
-        dst[4] = 9;
+        dst[1] = EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW;
+        dst[2] = TEXT_COLOR_BLUE;
+        dst[3] = TEXT_COLOR_TRANSPARENT;
+        dst[4] = TEXT_COLOR_LIGHT_BLUE;
         if (boxId == TOTAL_BOXES_COUNT) // Party mon.
         {
             sub_81D2E7C(dst + 5, gText_InParty, 8);
diff --git a/src/mevent_801BAAC.c b/src/mevent_801BAAC.c
index 1bfac23d1..847449c45 100644
--- a/src/mevent_801BAAC.c
+++ b/src/mevent_801BAAC.c
@@ -208,7 +208,7 @@ s32 FadeToWonderCardMenu(void)
         case 3:
             if (FreeTempTileDataBuffersIfPossible())
                 return 0;
-            LoadPalette(stdpal_get(1), 0x20, 0x20);
+            LoadPalette(GetTextWindowPalette(1), 0x20, 0x20);
             gPaletteFade.bufferTransferDisabled = TRUE;
             LoadPalette(sWonderCardData->unk_0170->pal, 0x10, 0x20);
             LZ77UnCompWram(sWonderCardData->unk_0170->map, sWonderCardData->buffer_045C);
@@ -607,7 +607,7 @@ s32 FadeToWonderNewsMenu(void)
         case 3:
             if (FreeTempTileDataBuffersIfPossible())
                 return 0;
-            LoadPalette(stdpal_get(1), 0x20, 0x20);
+            LoadPalette(GetTextWindowPalette(1), 0x20, 0x20);
             gPaletteFade.bufferTransferDisabled = TRUE;
             LoadPalette(sWonderNewsData->unk_01BC->pal, 0x10, 0x20);
             LZ77UnCompWram(sWonderNewsData->unk_01BC->map, sWonderNewsData->buffer_03A4);
diff --git a/src/mirage_tower.c b/src/mirage_tower.c
index 2a6d6d6c4..02cccf2a5 100644
--- a/src/mirage_tower.c
+++ b/src/mirage_tower.c
@@ -8,13 +8,12 @@
 #include "gpu_regs.h"
 #include "menu.h"
 #include "random.h"
-#include "roulette_util.h"
+#include "palette_util.h"
 #include "script.h"
 #include "sound.h"
 #include "sprite.h"
 #include "task.h"
 #include "window.h"
-#include "constants/flags.h"
 #include "constants/maps.h"
 #include "constants/rgb.h"
 #include "constants/songs.h"
@@ -110,24 +109,24 @@ const struct SpriteSheet gMirageTowerCeilingCrumbleSpriteSheets[] =
 
 static const struct MetatileCoords sInvisibleMirageTowerMetatiles[] =
 {
-    {18, 53, METATILE_ID(Mauville, DeepSand_Center)},
-    {19, 53, METATILE_ID(Mauville, DeepSand_Center)},
-    {20, 53, METATILE_ID(Mauville, DeepSand_Center)},
-    {18, 54, METATILE_ID(Mauville, DeepSand_Center)},
-    {19, 54, METATILE_ID(Mauville, DeepSand_Center)},
-    {20, 54, METATILE_ID(Mauville, DeepSand_Center)},
-    {18, 55, METATILE_ID(Mauville, DeepSand_Center)},
-    {19, 55, METATILE_ID(Mauville, DeepSand_Center)},
-    {20, 55, METATILE_ID(Mauville, DeepSand_Center)},
-    {18, 56, METATILE_ID(Mauville, DeepSand_Center)},
-    {19, 56, METATILE_ID(Mauville, DeepSand_Center)},
-    {20, 56, METATILE_ID(Mauville, DeepSand_Center)},
-    {18, 57, METATILE_ID(Mauville, DeepSand_BottomMid)},
-    {19, 57, METATILE_ID(Mauville, DeepSand_BottomMid)},
-    {20, 57, METATILE_ID(Mauville, DeepSand_BottomMid)},
-    {18, 58, METATILE_ID(General, SandPit_Center)},
-    {19, 58, METATILE_ID(General, SandPit_Center)},
-    {20, 58, METATILE_ID(General, SandPit_Center)},
+    {18, 53, METATILE_Mauville_DeepSand_Center},
+    {19, 53, METATILE_Mauville_DeepSand_Center},
+    {20, 53, METATILE_Mauville_DeepSand_Center},
+    {18, 54, METATILE_Mauville_DeepSand_Center},
+    {19, 54, METATILE_Mauville_DeepSand_Center},
+    {20, 54, METATILE_Mauville_DeepSand_Center},
+    {18, 55, METATILE_Mauville_DeepSand_Center},
+    {19, 55, METATILE_Mauville_DeepSand_Center},
+    {20, 55, METATILE_Mauville_DeepSand_Center},
+    {18, 56, METATILE_Mauville_DeepSand_Center},
+    {19, 56, METATILE_Mauville_DeepSand_Center},
+    {20, 56, METATILE_Mauville_DeepSand_Center},
+    {18, 57, METATILE_Mauville_DeepSand_BottomMid},
+    {19, 57, METATILE_Mauville_DeepSand_BottomMid},
+    {20, 57, METATILE_Mauville_DeepSand_BottomMid},
+    {18, 58, METATILE_General_SandPit_Center},
+    {19, 58, METATILE_General_SandPit_Center},
+    {20, 58, METATILE_General_SandPit_Center},
 };
 
 static const union AnimCmd gSpriteAnim_8617DEC[] =
@@ -169,7 +168,7 @@ const struct PulseBlendSettings gMirageTowerPulseBlendSettings = {
     .numColors = 15,
     .delay = 5,
     .numFadeCycles = -1,
-    .maxBlendCoeff = 11,
+    .maxBlendCoeff = -5,
     .fadeType = 1,
     .restorePaletteOnUnload = FALSE,
     .unk7_7 = 1,
@@ -413,10 +412,9 @@ void DoMirageTowerCeilingCrumble(void)
 
 static void WaitCeilingCrumble(u8 taskId)
 {
-    u16 *data = gTasks[taskId].data;
-    data[1]++;
+    u16 *data = (u16 *)gTasks[taskId].data;
     // Either wait 1000 frames, or until all 16 crumble sprites and the one screen-shake task are completed.
-    if (data[1] == 1000 || data[0] == 17)
+    if (++data[1] == 1000 || data[0] == 17)
         gTasks[taskId].func = FinishCeilingCrumbleTask;
 }
 
@@ -692,7 +690,7 @@ static void DoFossilFallAndSink(u8 taskId)
         if (gSprites[sUnknown_0203CF0C->spriteId].callback != SpriteCallbackDummy)
             return;
         DestroySprite(&gSprites[sUnknown_0203CF0C->spriteId]);
-        FREE_AND_SET_NULL(sUnknown_0203CF0C->unkC);;
+        FREE_AND_SET_NULL(sUnknown_0203CF0C->unkC);
         FREE_AND_SET_NULL(sUnknown_0203CF0C->frameImage);
         FREE_AND_SET_NULL(sUnknown_0203CF0C->frameImageTiles);
         FREE_AND_SET_NULL(sUnknown_0203CF0C);
diff --git a/src/move_relearner.c b/src/move_relearner.c
index 8c4cf7b2e..1c863804b 100644
--- a/src/move_relearner.c
+++ b/src/move_relearner.c
@@ -384,7 +384,7 @@ static void CB2_InitLearnMove(void)
     ResetSpriteData();
     FreeAllSpritePalettes();
     ResetTasks();
-    clear_scheduled_bg_copies_to_vram();
+    ClearScheduledBgCopiesToVram();
     sMoveRelearnerStruct = AllocZeroed(sizeof(*sMoveRelearnerStruct));
     sMoveRelearnerStruct->partyMon = gSpecialVar_0x8004;
     SetVBlankCallback(VBlankCB_MoveRelearner);
@@ -412,7 +412,7 @@ static void CB2_InitLearnMoveReturnFromSelectMove(void)
     ResetSpriteData();
     FreeAllSpritePalettes();
     ResetTasks();
-    clear_scheduled_bg_copies_to_vram();
+    ClearScheduledBgCopiesToVram();
     sMoveRelearnerStruct = AllocZeroed(sizeof(*sMoveRelearnerStruct));
     sMoveRelearnerStruct->state = MENU_STATE_FADE_FROM_SUMMARY_SCREEN;
     sMoveRelearnerStruct->partyMon = gSpecialVar_0x8004;
@@ -452,7 +452,7 @@ static void CB2_MoveRelearnerMain(void)
     RunTasks();
     AnimateSprites();
     BuildOamBuffer();
-    do_scheduled_bg_tilemap_copies_to_vram();
+    DoScheduledBgTilemapCopiesToVram();
     UpdatePaletteFade();
 }
 
diff --git a/src/mystery_gift.c b/src/mystery_gift.c
index b8ae470a9..7f1370a5e 100644
--- a/src/mystery_gift.c
+++ b/src/mystery_gift.c
@@ -410,7 +410,7 @@ bool32 HandleMysteryGiftOrEReaderSetup(s32 mg_or_ereader)
         break;
     case 1:
         LoadPalette(gUnkTextboxBorderPal, 0, 0x20);
-        LoadPalette(stdpal_get(2), 0xd0, 0x20);
+        LoadPalette(GetTextWindowPalette(2), 0xd0, 0x20);
         Menu_LoadStdPalAt(0xC0);
         LoadUserWindowBorderGfx(0, 0xA, 0xE0);
         LoadUserWindowBorderGfx_(0, 0x1, 0xF0);
diff --git a/src/naming_screen.c b/src/naming_screen.c
index 161d4a7e0..4ed9d78d0 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -13,7 +13,6 @@
 #include "field_player_avatar.h"
 #include "event_object_movement.h"
 #include "event_data.h"
-#include "constants/vars.h"
 #include "constants/songs.h"
 #include "pokemon_storage_system.h"
 #include "graphics.h"
@@ -29,7 +28,157 @@
 #include "constants/event_objects.h"
 #include "constants/rgb.h"
 
-EWRAM_DATA static struct NamingScreenData *gNamingScreenData = NULL;
+enum {
+    INPUT_NONE,
+    INPUT_DPAD_UP,
+    INPUT_DPAD_DOWN,
+    INPUT_DPAD_LEFT,
+    INPUT_DPAD_RIGHT,
+    INPUT_A_BUTTON,
+    INPUT_B_BUTTON,
+    INPUT_LR_BUTTON,
+    INPUT_SELECT,
+    INPUT_START,
+};
+
+#define KBROW_COUNT 4
+#define KBCOL_COUNT 8
+
+enum {
+    GFXTAG_BACK_BUTTON,
+    GFXTAG_OK_BUTTON,
+    GFXTAG_PAGE_SWAP_FRAME,
+    GFXTAG_PAGE_SWAP_BUTTON,
+    GFXTAG_PAGE_SWAP_UPPER,
+    GFXTAG_PAGE_SWAP_LOWER,
+    GFXTAG_PAGE_SWAP_OTHERS,
+    GFXTAG_CURSOR,
+    GFXTAG_CURSOR_SQUISHED,
+    GFXTAG_CURSOR_FILLED,
+    GFXTAG_INPUT_ARROW,
+    GFXTAG_UNDERSCORE,
+};
+
+enum {
+    PALTAG_PC_ICON,
+    PALTAG_PAGE_SWAP_UPPER,
+    PALTAG_PAGE_SWAP_LOWER,
+    PALTAG_PAGE_SWAP_OTHERS,
+    PALTAG_PAGE_SWAP,
+    PALTAG_CURSOR,
+    PALTAG_BACK_BUTTON,
+    PALTAG_OK_BUTTON,
+};
+
+enum {
+    WIN_KB_PAGE_1, // Which of these two windows is in front is cycled as the player swaps
+    WIN_KB_PAGE_2, // Initially WIN_KB_PAGE_1 is in front, with WIN_KB_PAGE_2 on deck
+    WIN_TEXT_ENTRY,
+    WIN_TEXT_ENTRY_BOX,
+    WIN_BANNER,
+    WIN_COUNT,
+};
+
+// The constants for the pages are needlessly complicated because GF didn't keep the indexing order consistent
+// This set is used for sNamingScreen->currentPage. It uses the order that the pages are cycled in
+enum {
+    KBPAGE_SYMBOLS,
+    KBPAGE_LETTERS_UPPER,
+    KBPAGE_LETTERS_LOWER,
+    KBPAGE_COUNT,
+};
+
+// This set is used for initializing a page's keyboard text and getting its number of columns
+enum {
+    KEYBOARD_LETTERS_LOWER,
+    KEYBOARD_LETTERS_UPPER,
+    KEYBOARD_SYMBOLS,
+};
+
+// This set is used for getting the gfx/pal tags of the page's swap button
+enum {
+    PAGE_SWAP_UPPER,
+    PAGE_SWAP_OTHERS,
+    PAGE_SWAP_LOWER,
+};
+
+enum {
+    KEY_ROLE_CHAR,
+    KEY_ROLE_PAGE,
+    KEY_ROLE_BACKSPACE,
+    KEY_ROLE_OK,
+};
+
+enum {
+    BUTTON_PAGE,
+    BUTTON_BACK,
+    BUTTON_OK,
+    BUTTON_COUNT,
+};
+
+// states for Task_NamingScreen
+enum {
+    STATE_FADE_IN,
+    STATE_WAIT_FADE_IN,
+    STATE_HANDLE_INPUT,
+    STATE_MOVE_TO_OK_BUTTON,
+    STATE_START_PAGE_SWAP,
+    STATE_WAIT_PAGE_SWAP,
+    STATE_PRESSED_OK,
+    STATE_WAIT_SENT_TO_PC_MESSAGE,
+    STATE_FADE_OUT,
+    STATE_EXIT,
+};
+
+// sates for Task_HandleInput
+enum
+{
+    INPUT_STATE_DISABLED,
+    INPUT_STATE_ENABLED,
+    INPUT_STATE_OVERRIDE,
+};
+
+struct NamingScreenTemplate
+{
+    u8 copyExistingString;
+    u8 maxChars;
+    u8 iconFunction;
+    u8 addGenderIcon;
+    u8 initialPage;
+    u8 unused;
+    const u8 *title;
+};
+
+struct NamingScreenData 
+{
+    u8 tilemapBuffer1[0x800];
+    u8 tilemapBuffer2[0x800];
+    u8 tilemapBuffer3[0x800];
+    u8 textBuffer[16];
+    u8 tileBuffer[0x600];
+    u8 state;
+    u8 windows[WIN_COUNT];
+    u16 inputCharBaseXPos;
+    u16 bg1vOffset;
+    u16 bg2vOffset;
+    u16 bg1Priority;
+    u16 bg2Priority;
+    u8 bgToReveal;
+    u8 bgToHide;
+    u8 currentPage;
+    u8 cursorSpriteId;
+    u8 swapBtnFrameSpriteId;
+    u8 keyRepeatStartDelayCopy;
+    const struct NamingScreenTemplate *template;
+    u8 templateNum;
+    u8 *destBuffer;
+    u16 monSpecies;
+    u16 monGender;
+    u32 monPersonality;
+    MainCallback returnCallback;
+};
+
+EWRAM_DATA static struct NamingScreenData *sNamingScreen = NULL;
 extern u16 gKeyRepeatStartDelay;
 
 // extern text
@@ -41,10 +190,10 @@ extern const u8 gText_TellHimTheWords[];
 
 
 // start of .rodata
-static const u8 gSpriteImage_858BBF8[] = INCBIN_U8("graphics/naming_screen/pc_icon/0.4bpp");
-static const u8 gSpriteImage_858BCB8[] = INCBIN_U8("graphics/naming_screen/pc_icon/1.4bpp");
-static const u16 gUnknown_0858BD78[] = INCBIN_U16("graphics/naming_screen/0.gbapal");
-static const u16 gUnknown_0858BD98[] = INCBIN_U16("graphics/naming_screen/1.gbapal");
+static const u8 sPCIconOff_Gfx[] = INCBIN_U8("graphics/naming_screen/pc_icon/off.4bpp");
+static const u8 sPCIconOn_Gfx[] = INCBIN_U8("graphics/naming_screen/pc_icon/on.4bpp");
+static const u16 sKeyboard_Pal[] = INCBIN_U16("graphics/naming_screen/keyboard.gbapal");
+static const u16 sUnused_Pal[] = INCBIN_U16("graphics/naming_screen/unused.gbapal");
 
 static const u8 *const sTransferredToPCMessages[] =
 {
@@ -56,7 +205,7 @@ static const u8 *const sTransferredToPCMessages[] =
 
 static const u8 sText_AlphabetUpperLower[] = _("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!");
 
-static const struct BgTemplate gUnknown_0858BE00[] =
+static const struct BgTemplate sBgTemplates[] =
 {
     {
         .bg = 0,
@@ -84,9 +233,9 @@ static const struct BgTemplate gUnknown_0858BE00[] =
     }
 };
 
-static const struct WindowTemplate gUnknown_0858BE10[] =
+static const struct WindowTemplate sWindowTemplates[WIN_COUNT + 1] =
 {
-    {
+    [WIN_KB_PAGE_1] = {
         .bg = 1,
         .tilemapLeft = 3,
         .tilemapTop = 10,
@@ -95,7 +244,7 @@ static const struct WindowTemplate gUnknown_0858BE10[] =
         .paletteNum = 10,
         .baseBlock = 0x030
     },
-    {
+    [WIN_KB_PAGE_2] = {
         .bg = 2,
         .tilemapLeft = 3,
         .tilemapTop = 10,
@@ -104,7 +253,7 @@ static const struct WindowTemplate gUnknown_0858BE10[] =
         .paletteNum = 10,
         .baseBlock = 0x0C8
     },
-    {
+    [WIN_TEXT_ENTRY] = {
         .bg = 3,
         .tilemapLeft = 8,
         .tilemapTop = 6,
@@ -113,7 +262,7 @@ static const struct WindowTemplate gUnknown_0858BE10[] =
         .paletteNum = 10,
         .baseBlock = 0x030
     },
-    {
+    [WIN_TEXT_ENTRY_BOX] = {
         .bg = 3,
         .tilemapLeft = 8,
         .tilemapTop = 4,
@@ -122,7 +271,7 @@ static const struct WindowTemplate gUnknown_0858BE10[] =
         .paletteNum = 10,
         .baseBlock = 0x052
     },
-    {
+    [WIN_BANNER] = {
         .bg = 0,
         .tilemapLeft = 0,
         .tilemapTop = 0,
@@ -134,124 +283,146 @@ static const struct WindowTemplate gUnknown_0858BE10[] =
     DUMMY_WIN_TEMPLATE
 };
 
-static const u8 gUnknown_0858BE40[] = __("abcdef .ghijkl ,mnopqrs tuvwxyz ABCDEF .GHIJKL ,MNOPQRS TUVWXYZ 01234   56789   !?♂♀/-  …“”‘'   ");
-
-static const u8 gUnknown_0858BEA0[] = { 8, 8, 6 };
-static const u8 gUnknown_0858BEA3[] = { 0, 12, 24, 56, 68, 80, 92, 123, 0, 12, 24, 56, 68, 80, 92, 123, 0, 22, 44, 66, 88, 110, 0, 0 };
+// This handles what characters get inserted when a key is pressed
+// The keys shown on the keyboard are handled separately by sNamingScreenKeyboardText
+static const u8 sKeyboardChars[KBPAGE_COUNT * KBROW_COUNT * KBCOL_COUNT] = __(
+    "abcdef ."
+    "ghijkl ,"
+    "mnopqrs "
+    "tuvwxyz "
+    "ABCDEF ."
+    "GHIJKL ,"
+    "MNOPQRS "
+    "TUVWXYZ "
+    "01234   "
+    "56789   "
+    "!?♂♀/-  "
+    "…“”‘'   ");
+
+static const u8 sPageColumnCounts[KBPAGE_COUNT] = { 
+    [KEYBOARD_LETTERS_LOWER] = KBCOL_COUNT, 
+    [KEYBOARD_LETTERS_UPPER] = KBCOL_COUNT, 
+    [KEYBOARD_SYMBOLS]       = 6 
+};
+static const u8 sPageColumnXPos[KBPAGE_COUNT * KBCOL_COUNT] = { 
+    0, 12, 24, 56, 68, 80, 92, 123, // KEYBOARD_LETTERS_LOWER
+    0, 12, 24, 56, 68, 80, 92, 123, // KEYBOARD_LETTERS_UPPER
+    0, 22, 44, 66, 88, 110          // KEYBOARD_SYMBOLS
+};
 
 // forward declarations
 static const struct NamingScreenTemplate *const sNamingScreenTemplates[];
-static const struct SubspriteTable gUnknown_0858C050[];
-static const struct SubspriteTable gUnknown_0858C058[];
-static const struct SubspriteTable gUnknown_0858C070[];
-static const struct SubspriteTable gUnknown_0858C078[];
-static const struct SpriteTemplate gUnknown_0858C0C0;
-static const struct SpriteTemplate gUnknown_0858C0D8;
-static const struct SpriteTemplate gUnknown_0858C0F0;
-static const struct SpriteTemplate gUnknown_0858C108;
-static const struct SpriteTemplate gUnknown_0858C120;
-static const struct SpriteTemplate gUnknown_0858C138;
+static const struct SubspriteTable sSubspriteTable_PageSwapFrame[];
+static const struct SubspriteTable sSubspriteTable_PageSwapText[];
+static const struct SubspriteTable sSubspriteTable_Button[];
+static const struct SubspriteTable sSubspriteTable_PCIcon[];
+static const struct SpriteTemplate sSpriteTemplate_PageSwapFrame;
+static const struct SpriteTemplate sSpriteTemplate_PageSwapButton;
+static const struct SpriteTemplate sSpriteTemplate_PageSwapText;
+static const struct SpriteTemplate sSpriteTemplate_BackButton;
+static const struct SpriteTemplate sSpriteTemplate_OkButton;
+static const struct SpriteTemplate sSpriteTemplate_Cursor;
 static const struct SpriteTemplate sSpriteTemplate_InputArrow;
 static const struct SpriteTemplate sSpriteTemplate_Underscore;
-static const struct SpriteTemplate gUnknown_0858C180;
+static const struct SpriteTemplate sSpriteTemplate_PCIcon;
 static const u8* const sNamingScreenKeyboardText[KBPAGE_COUNT][KBROW_COUNT];
-static const struct SpriteSheet gUnknown_0858C1C8[];
-static const struct SpritePalette gUnknown_0858C230[];
+static const struct SpriteSheet sSpriteSheets[];
+static const struct SpritePalette sSpritePalettes[];
 
-static void C2_NamingScreen(void);
+static void CB2_LoadNamingScreen(void);
 static void NamingScreen_Init(void);
 static void NamingScreen_InitBGs(void);
-static void sub_80E3194(void);
-static void sub_80E31B0(u8 taskId);
-static bool8 MainState_BeginFadeIn(void);
+static void CreateNamingScreenTask(void);
+static void Task_NamingScreen(u8 taskId);
+static bool8 MainState_FadeIn(void);
 static bool8 MainState_WaitFadeIn(void);
 static bool8 MainState_HandleInput(void);
 static bool8 MainState_MoveToOKButton(void);
-static bool8 MainState_6(void);
-static bool8 MainState_BeginFadeInOut(void);
-static bool8 MainState_WaitFadeOutAndExit(void);
+static bool8 MainState_PressedOKButton(void);
+static bool8 MainState_FadeOut(void);
+static bool8 MainState_Exit(void);
 static void DisplaySentToPCMessage(void);
-static bool8 sub_80E3604(void);
+static bool8 MainState_WaitSentToPCMessage(void);
 static bool8 MainState_StartPageSwap(void);
 static bool8 MainState_WaitPageSwap(void);
 static void StartPageSwapAnim(void);
 static void Task_HandlePageSwapAnim(u8);
 static bool8 IsPageSwapAnimNotInProgress(void);
-static void sub_80E3948(u8, u8, u8);
-static void Task_80E39BC(u8);
-static u16 sub_80E3A74(u8);
-static void sub_80E3AE8(u8);
-static void sub_80E3B10(struct Task *, u8, u8);
-static void sub_80E3CC8(void);
-static void CursorInit(void);
+static void TryStartButtonFlash(u8, bool8, bool8);
+static void Task_UpdateButtonFlash(u8);
+static u16 GetButtonPalOffset(u8);
+static void RestoreButtonColor(u8);
+static void StartButtonFlash(struct Task *, u8, bool8);
+static void CreateSprites(void);
+static void CreateCursorSprite(void);
 static void SetCursorPos(s16, s16);
 static void GetCursorPos(s16 *x, s16 *y);
 static void MoveCursorToOKButton(void);
-static void sub_80E3E3C(u8);
-static void sub_80E3E94(u8);
+static void SetCursorInvisibility(u8);
+static void SetCursorFlashing(bool8);
 static u8 IsCursorAnimFinished(void);
 static u8 GetCurrentPageColumnCount(void);
-static void CreatePageSwitcherSprites(void);
-static void sub_80E4050(void);
-static void sub_80E41B8(u8, struct Sprite *, struct Sprite *);
+static void CreatePageSwapButtonSprites(void);
+static void StartPageSwapButtonAnim(void);
+static void SetPageSwapButtonGfx(u8, struct Sprite *, struct Sprite *);
 static void CreateBackOkSprites(void);
-static void CreateUnderscoreSprites(void);
+static void CreateTextEntrySprites(void);
 static void CreateInputTargetIcon(void);
 static u8 HandleKeyboardEvent(void);
-static u8 sub_80E45E0(void);
+static u8 SwapKeyboardPage(void);
 static u8 GetInputEvent(void);
 static void SetInputState(u8);
-static void sub_80E4964(void);
-static u8 GetTextCaretPosition(void);
+static void DrawTextEntryBox(void);
+static u8 GetTextEntryPosition(void);
 static void DeleteTextCharacter(void);
-static bool8 sub_80E4B54(void);
-static void AddTextCharacter(u8);
-static void sub_80E4BE4(void);
-static void choose_name_or_words_screen_load_bg_tile_patterns(void);
-static void sub_80E4CB8(void);
-static void choose_name_or_words_screen_apply_bg_pals(void);
-static void sub_80E4CF8(u8, const void *);
-static void nullsub_10(u8, u8);
-static void sub_80E4D10(void);
-static void sub_80E4DE4(u8, u8);
-static void sub_80E4E5C(void);
-static void sub_80E4EF0(void);
-static void sub_80E4F58(void);
-static void NamingScreen_TurnOffScreen(void);
-static void NamingScreen_InitDisplayMode(void);
+static bool8 AddTextCharacter(void);
+static void BufferCharacter(u8);
+static void SaveInputText(void);
+static void LoadGfx(void);
+static void CreateHelperTasks(void);
+static void LoadPalettes(void);
+static void DrawBgTilemap(u8, const void *);
+static void NamingScreen_Dummy(u8, u8);
+static void DrawTextEntry(void);
+static void PrintKeyboardKeys(u8, u8);
+static void DrawKeyboardPageOnDeck(void);
+static void PrintControls(void);
+static void CB2_NamingScreen(void);
+static void ResetVHBlank(void);
+static void SetVBlank(void);
 static void VBlankCB_NamingScreen(void);
-static void sub_80E501C(void);
-static bool8 IsLetter(u8);
+static void NamingScreen_ShowBgs(void);
+static bool8 IsWideLetter(u8);
 
 void DoNamingScreen(u8 templateNum, u8 *destBuffer, u16 monSpecies, u16 monGender, u32 monPersonality, MainCallback returnCallback)
 {
-    gNamingScreenData = Alloc(sizeof(struct NamingScreenData));
-    if (!gNamingScreenData)
+    sNamingScreen = Alloc(sizeof(struct NamingScreenData));
+    if (!sNamingScreen)
     {
         SetMainCallback2(returnCallback);
     }
     else
     {
-        gNamingScreenData->templateNum = templateNum;
-        gNamingScreenData->monSpecies = monSpecies;
-        gNamingScreenData->monGender = monGender;
-        gNamingScreenData->monPersonality = monPersonality;
-        gNamingScreenData->destBuffer = destBuffer;
-        gNamingScreenData->returnCallback = returnCallback;
+        sNamingScreen->templateNum = templateNum;
+        sNamingScreen->monSpecies = monSpecies;
+        sNamingScreen->monGender = monGender;
+        sNamingScreen->monPersonality = monPersonality;
+        sNamingScreen->destBuffer = destBuffer;
+        sNamingScreen->returnCallback = returnCallback;
 
-        if (templateNum == 0)
+        if (templateNum == NAMING_SCREEN_PLAYER)
             StartTimer1();
 
-        SetMainCallback2(C2_NamingScreen);
+        SetMainCallback2(CB2_LoadNamingScreen);
     }
 }
 
-static void C2_NamingScreen(void)
+static void CB2_LoadNamingScreen(void)
 {
     switch (gMain.state)
     {
     case 0:
-        NamingScreen_TurnOffScreen();
+        ResetVHBlank();
         NamingScreen_Init();
         gMain.state++;
         break;
@@ -273,48 +444,48 @@ static void C2_NamingScreen(void)
         gMain.state++;
         break;
     case 5:
-        choose_name_or_words_screen_apply_bg_pals();
+        LoadPalettes();
         gMain.state++;
         break;
     case 6:
-        choose_name_or_words_screen_load_bg_tile_patterns();
+        LoadGfx();
         gMain.state++;
         break;
     case 7:
-        sub_80E3CC8();
+        CreateSprites();
         UpdatePaletteFade();
-        sub_80E501C();
+        NamingScreen_ShowBgs();
         gMain.state++;
         break;
     default:
-        sub_80E4CB8();
-        sub_80E3194();
+        CreateHelperTasks();
+        CreateNamingScreenTask();
         break;
     }
 }
 
 static void NamingScreen_Init(void)
 {
-    gNamingScreenData->state = 0;
-    gNamingScreenData->bg1vOffset = 0;
-    gNamingScreenData->bg2vOffset = 0;
-    gNamingScreenData->bg1Priority = BGCNT_PRIORITY(1);
-    gNamingScreenData->bg2Priority = BGCNT_PRIORITY(2);
-    gNamingScreenData->bgToReveal = 0;
-    gNamingScreenData->bgToHide = 1;
-    gNamingScreenData->template = sNamingScreenTemplates[gNamingScreenData->templateNum];
-    gNamingScreenData->currentPage = gNamingScreenData->template->initialPage;
-    gNamingScreenData->inputCharBaseXPos = (240 - gNamingScreenData->template->maxChars * 8) / 2 + 6;
-    if (gNamingScreenData->templateNum == 4)
-        gNamingScreenData->inputCharBaseXPos += 11;
-    gNamingScreenData->keyRepeatStartDelayCopy = gKeyRepeatStartDelay;
-    memset(gNamingScreenData->textBuffer, 0xFF, sizeof(gNamingScreenData->textBuffer));
-    if (gNamingScreenData->template->copyExistingString != 0)
-        StringCopy(gNamingScreenData->textBuffer, gNamingScreenData->destBuffer);
+    sNamingScreen->state = STATE_FADE_IN;
+    sNamingScreen->bg1vOffset = 0;
+    sNamingScreen->bg2vOffset = 0;
+    sNamingScreen->bg1Priority = BGCNT_PRIORITY(1);
+    sNamingScreen->bg2Priority = BGCNT_PRIORITY(2);
+    sNamingScreen->bgToReveal = 0;
+    sNamingScreen->bgToHide = 1;
+    sNamingScreen->template = sNamingScreenTemplates[sNamingScreen->templateNum];
+    sNamingScreen->currentPage = sNamingScreen->template->initialPage;
+    sNamingScreen->inputCharBaseXPos = (240 - sNamingScreen->template->maxChars * 8) / 2 + 6;
+    if (sNamingScreen->templateNum == NAMING_SCREEN_WALDA)
+        sNamingScreen->inputCharBaseXPos += 11;
+    sNamingScreen->keyRepeatStartDelayCopy = gKeyRepeatStartDelay;
+    memset(sNamingScreen->textBuffer, EOS, sizeof(sNamingScreen->textBuffer));
+    if (sNamingScreen->template->copyExistingString)
+        StringCopy(sNamingScreen->textBuffer, sNamingScreen->destBuffer);
     gKeyRepeatStartDelay = 16;
 }
 
-static void sub_80E2FA4(void)
+static void SetSpritesVisible(void)
 {
     u8 i;
     for (i = 0; i < MAX_SPRITES; i++)
@@ -322,7 +493,7 @@ static void sub_80E2FA4(void)
         if (gSprites[i].inUse)
             gSprites[i].invisible = FALSE;
     }
-    sub_80E3E3C(0);
+    SetCursorInvisibility(FALSE);
 }
 
 static void NamingScreen_InitBGs(void)
@@ -335,7 +506,7 @@ static void NamingScreen_InitBGs(void)
 
     SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0);
     ResetBgsAndClearDma3BusyFlags(0);
-    InitBgsFromTemplates(0, gUnknown_0858BE00, 4);
+    InitBgsFromTemplates(0, sBgTemplates, ARRAY_COUNT(sBgTemplates));
 
     ChangeBgX(0, 0, 0);
     ChangeBgY(0, 0, 0);
@@ -347,125 +518,126 @@ static void NamingScreen_InitBGs(void)
     ChangeBgY(3, 0, 0);
 
     InitStandardTextBoxWindows();
-    sub_8197200();
+    InitTextBoxGfxAndPrinters();
 
-    for (i = 0; i < 5; i++)
-        gNamingScreenData->windows[i] = AddWindow(&gUnknown_0858BE10[i]);
+    for (i = 0; i < WIN_COUNT; i++)
+        sNamingScreen->windows[i] = AddWindow(&sWindowTemplates[i]);
 
     SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON);
     SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2);
-    SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0xC, 0x8));
+    SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(12, 8));
 
-    SetBgTilemapBuffer(1, gNamingScreenData->tilemapBuffer1);
-    SetBgTilemapBuffer(2, gNamingScreenData->tilemapBuffer2);
-    SetBgTilemapBuffer(3, gNamingScreenData->tilemapBuffer3);
+    SetBgTilemapBuffer(1, sNamingScreen->tilemapBuffer1);
+    SetBgTilemapBuffer(2, sNamingScreen->tilemapBuffer2);
+    SetBgTilemapBuffer(3, sNamingScreen->tilemapBuffer3);
 
     FillBgTilemapBufferRect_Palette0(1, 0, 0, 0, 0x20, 0x20);
     FillBgTilemapBufferRect_Palette0(2, 0, 0, 0, 0x20, 0x20);
     FillBgTilemapBufferRect_Palette0(3, 0, 0, 0, 0x20, 0x20);
 }
 
-static void sub_80E3194(void)
+static void CreateNamingScreenTask(void)
 {
-    CreateTask(sub_80E31B0, 2);
-    SetMainCallback2(sub_80E4F58);
+    CreateTask(Task_NamingScreen, 2);
+    SetMainCallback2(CB2_NamingScreen);
 }
 
-static void sub_80E31B0(u8 taskId)
+static void Task_NamingScreen(u8 taskId)
 {
-    switch (gNamingScreenData->state)
+    switch (sNamingScreen->state)
     {
-    case 0:
-        MainState_BeginFadeIn();
-        sub_80E2FA4();
-        NamingScreen_InitDisplayMode();
+    case STATE_FADE_IN:
+        MainState_FadeIn();
+        SetSpritesVisible();
+        SetVBlank();
         break;
-    case 1:
+    case STATE_WAIT_FADE_IN:
         MainState_WaitFadeIn();
         break;
-    case 2:
+    case STATE_HANDLE_INPUT:
         MainState_HandleInput();
         break;
-    case 3:
+    case STATE_MOVE_TO_OK_BUTTON:
         MainState_MoveToOKButton();
         MainState_HandleInput();
         break;
-    case 4:
+    case STATE_START_PAGE_SWAP:
         MainState_StartPageSwap();
         break;
-    case 5:
+    case STATE_WAIT_PAGE_SWAP:
         MainState_WaitPageSwap();
         break;
-    case 6:
-        MainState_6();
+    case STATE_PRESSED_OK:
+        MainState_PressedOKButton();
         break;
-    case 7:
-        sub_80E3604();
+    case STATE_WAIT_SENT_TO_PC_MESSAGE:
+        MainState_WaitSentToPCMessage();
         break;
-    case 8:
-        MainState_BeginFadeInOut();
+    case STATE_FADE_OUT:
+        MainState_FadeOut();
         break;
-    case 9:
-        MainState_WaitFadeOutAndExit();
+    case STATE_EXIT:
+        MainState_Exit();
         break;
     }
 }
 
-static const u8 sPageOrderLowerFirst[] = 
+// Which gfx/pal to load for the swap page button
+static const u8 sPageToNextGfxId[KBPAGE_COUNT] = 
 { 
-    KBPAGE_LETTERS_LOWER, 
-    KBPAGE_SYMBOLS, 
-    KBPAGE_LETTERS_UPPER 
+    [KBPAGE_SYMBOLS]       = PAGE_SWAP_UPPER, 
+    [KBPAGE_LETTERS_UPPER] = PAGE_SWAP_LOWER, 
+    [KBPAGE_LETTERS_LOWER] = PAGE_SWAP_OTHERS 
 };
 
-static const u8 sPageOrderUpperFirst[] = 
+static const u8 sPageToNextKeyboardId[KBPAGE_COUNT] = 
 { 
-    KBPAGE_LETTERS_UPPER, 
-    KBPAGE_LETTERS_LOWER, 
-    KBPAGE_SYMBOLS 
+    [KBPAGE_SYMBOLS]       = KEYBOARD_LETTERS_UPPER, 
+    [KBPAGE_LETTERS_UPPER] = KEYBOARD_LETTERS_LOWER, 
+    [KBPAGE_LETTERS_LOWER] = KEYBOARD_SYMBOLS 
 };
 
-static const u8 sPageOrderSymbolsFirst[] = 
+static const u8 sPageToKeyboardId[KBPAGE_COUNT] = 
 { 
-    KBPAGE_SYMBOLS, 
-    KBPAGE_LETTERS_UPPER, 
-    KBPAGE_LETTERS_LOWER 
+    [KBPAGE_SYMBOLS]       = KEYBOARD_SYMBOLS, 
+    [KBPAGE_LETTERS_UPPER] = KEYBOARD_LETTERS_UPPER, 
+    [KBPAGE_LETTERS_LOWER] = KEYBOARD_LETTERS_LOWER 
 };
 
-static u8 sub_80E3244(u8 a1)
+static u8 PageToNextGfxId(u8 page)
 {
-    return sPageOrderLowerFirst[a1];
+    return sPageToNextGfxId[page];
 }
 
-static u8 sub_80E3254(void)
+static u8 CurrentPageToNextKeyboardId(void)
 {
-    return sPageOrderUpperFirst[gNamingScreenData->currentPage];
+    return sPageToNextKeyboardId[sNamingScreen->currentPage];
 }
 
-static u8 sub_80E3274(void)
+static u8 CurrentPageToKeyboardId(void)
 {
-    return sPageOrderSymbolsFirst[gNamingScreenData->currentPage];
+    return sPageToKeyboardId[sNamingScreen->currentPage];
 }
 
-static bool8 MainState_BeginFadeIn(void)
+static bool8 MainState_FadeIn(void)
 {
-    sub_80E4CF8(3, gUnknown_08DD4544);
-    gNamingScreenData->currentPage = KBPAGE_LETTERS_UPPER;
-    sub_80E4CF8(2, gUnknown_08DD46E0);
-    sub_80E4CF8(1, gUnknown_08DD4620);
-    sub_80E4DE4(gNamingScreenData->windows[1], KBPAGE_LETTERS_LOWER);
-    sub_80E4DE4(gNamingScreenData->windows[0], KBPAGE_LETTERS_UPPER);
-    nullsub_10(2, KBPAGE_LETTERS_LOWER);
-    nullsub_10(1, KBPAGE_LETTERS_UPPER);
-    sub_80E4D10();
-    sub_80E4964();
-    sub_80E4EF0();
+    DrawBgTilemap(3, gNamingScreenBackground_Tilemap);
+    sNamingScreen->currentPage = KBPAGE_LETTERS_UPPER;
+    DrawBgTilemap(2, gNamingScreenKeyboardLower_Tilemap);
+    DrawBgTilemap(1, gNamingScreenKeyboardUpper_Tilemap);
+    PrintKeyboardKeys(sNamingScreen->windows[WIN_KB_PAGE_2], KEYBOARD_LETTERS_LOWER);
+    PrintKeyboardKeys(sNamingScreen->windows[WIN_KB_PAGE_1], KEYBOARD_LETTERS_UPPER);
+    NamingScreen_Dummy(2, KEYBOARD_LETTERS_LOWER);
+    NamingScreen_Dummy(1, KEYBOARD_LETTERS_UPPER);
+    DrawTextEntry();
+    DrawTextEntryBox();
+    PrintControls();
     CopyBgTilemapBufferToVram(1);
     CopyBgTilemapBufferToVram(2);
     CopyBgTilemapBufferToVram(3);
     BlendPalettes(-1, 16, 0);
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
-    gNamingScreenData->state++;
+    sNamingScreen->state++;
     return FALSE;
 }
 
@@ -474,8 +646,8 @@ static bool8 MainState_WaitFadeIn(void)
     if (!gPaletteFade.active)
     {
         SetInputState(INPUT_STATE_ENABLED);
-        sub_80E3E94(1);
-        gNamingScreenData->state++;
+        SetCursorFlashing(TRUE);
+        sNamingScreen->state++;
     }
     return FALSE;
 }
@@ -491,48 +663,48 @@ static bool8 MainState_MoveToOKButton(void)
     {
         SetInputState(INPUT_STATE_ENABLED);
         MoveCursorToOKButton();
-        gNamingScreenData->state = MAIN_STATE_HANDLE_INPUT;
+        sNamingScreen->state = STATE_HANDLE_INPUT;
     }
     return FALSE;
 }
 
-static bool8 MainState_6(void)
+static bool8 MainState_PressedOKButton(void)
 {
-    sub_80E4BE4();
+    SaveInputText();
     SetInputState(INPUT_STATE_DISABLED);
-    sub_80E3E94(0);
-    sub_80E3948(3, 0, 1);
-    if (gNamingScreenData->templateNum == NAMING_SCREEN_CAUGHT_MON &&
-        CalculatePlayerPartyCount() >= 6)
+    SetCursorFlashing(FALSE);
+    TryStartButtonFlash(BUTTON_COUNT, FALSE, TRUE);
+    if (sNamingScreen->templateNum == NAMING_SCREEN_CAUGHT_MON 
+        && CalculatePlayerPartyCount() >= PARTY_SIZE)
     {
         DisplaySentToPCMessage();
-        gNamingScreenData->state = MAIN_STATE_UPDATE_SENT_TO_PC_MESSAGE;
+        sNamingScreen->state = STATE_WAIT_SENT_TO_PC_MESSAGE;
         return FALSE;
     }
     else
     {
-        gNamingScreenData->state = MAIN_STATE_BEGIN_FADE_OUT;
-        return TRUE;  //Exit the naming screen
+        sNamingScreen->state = STATE_FADE_OUT;
+        return TRUE;
     }
 }
 
-static bool8 MainState_BeginFadeInOut(void)
+static bool8 MainState_FadeOut(void)
 {
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
-    gNamingScreenData->state++;
+    sNamingScreen->state++;
     return FALSE;
 }
 
-static bool8 MainState_WaitFadeOutAndExit(void)
+static bool8 MainState_Exit(void)
 {
     if (!gPaletteFade.active)
     {
-        if (gNamingScreenData->templateNum == NAMING_SCREEN_PLAYER)
+        if (sNamingScreen->templateNum == NAMING_SCREEN_PLAYER)
             SeedRngAndSetTrainerId();
-        SetMainCallback2(gNamingScreenData->returnCallback);
-        DestroyTask(FindTaskIdByFunc(sub_80E31B0));
+        SetMainCallback2(sNamingScreen->returnCallback);
+        DestroyTask(FindTaskIdByFunc(Task_NamingScreen));
         FreeAllWindowBuffers();
-        FREE_AND_SET_NULL(gNamingScreenData);
+        FREE_AND_SET_NULL(sNamingScreen);
     }
     return FALSE;
 }
@@ -544,12 +716,12 @@ static void DisplaySentToPCMessage(void)
     if (!IsDestinationBoxFull())
     {
         StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_PC_BOX_TO_SEND_MON)));
-        StringCopy(gStringVar2, gNamingScreenData->destBuffer);
+        StringCopy(gStringVar2, sNamingScreen->destBuffer);
     }
     else
     {
         StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_PC_BOX_TO_SEND_MON)));
-        StringCopy(gStringVar2, gNamingScreenData->destBuffer);
+        StringCopy(gStringVar2, sNamingScreen->destBuffer);
         StringCopy(gStringVar3, GetBoxNamePtr(GetPCBoxToSendMon()));
         stringToDisplay = 2;
     }
@@ -564,12 +736,11 @@ static void DisplaySentToPCMessage(void)
     CopyWindowToVram(0, 3);
 }
 
-static bool8 sub_80E3604(void)
+static bool8 MainState_WaitSentToPCMessage(void)
 {
     RunTextPrinters();
-
-    if (!IsTextPrinterActive(0) && (gMain.newKeys & A_BUTTON))
-        gNamingScreenData->state = MAIN_STATE_BEGIN_FADE_OUT;
+    if (!IsTextPrinterActive(0) && JOY_NEW(A_BUTTON))
+        sNamingScreen->state = STATE_FADE_OUT;
 
     return FALSE;
 }
@@ -577,12 +748,12 @@ static bool8 sub_80E3604(void)
 static bool8 MainState_StartPageSwap(void)
 {
     SetInputState(INPUT_STATE_DISABLED);
-    sub_80E4050();
+    StartPageSwapButtonAnim();
     StartPageSwapAnim();
-    sub_80E3E3C(1);
-    sub_80E3948(0, 0, 1);
+    SetCursorInvisibility(TRUE);
+    TryStartButtonFlash(BUTTON_PAGE, FALSE, TRUE);
     PlaySE(SE_WIN_OPEN);
-    gNamingScreenData->state = MAIN_STATE_WAIT_PAGE_SWAP;
+    sNamingScreen->state = STATE_WAIT_PAGE_SWAP;
     return FALSE;
 }
 
@@ -590,19 +761,19 @@ static bool8 MainState_WaitPageSwap(void)
 {
     s16 cursorX;
     s16 cursorY;
-    bool32 var3;
+    bool32 onLastColumn;
 
     if (IsPageSwapAnimNotInProgress())
     {
 
         GetCursorPos(&cursorX, &cursorY);
-        var3 = (cursorX == GetCurrentPageColumnCount());
+        onLastColumn = (cursorX == GetCurrentPageColumnCount());
 
-        gNamingScreenData->state = MAIN_STATE_HANDLE_INPUT;
-        gNamingScreenData->currentPage++;
-        gNamingScreenData->currentPage %= 3;
+        sNamingScreen->state = STATE_HANDLE_INPUT;
+        sNamingScreen->currentPage++;
+        sNamingScreen->currentPage %= KBPAGE_COUNT;
 
-        if (var3)
+        if (onLastColumn)
         {
             cursorX = GetCurrentPageColumnCount();
         }
@@ -613,9 +784,9 @@ static bool8 MainState_WaitPageSwap(void)
         }
 
         SetCursorPos(cursorX, cursorY);
-        sub_80E4E5C();
+        DrawKeyboardPageOnDeck();
         SetInputState(INPUT_STATE_ENABLED);
-        sub_80E3E3C(0);
+        SetCursorInvisibility(FALSE);
     }
     return FALSE;
 }
@@ -663,29 +834,29 @@ static bool8 IsPageSwapAnimNotInProgress(void)
 
 static bool8 PageSwapAnimState_Init(struct Task *task)
 {
-    gNamingScreenData->bg1vOffset = 0;
-    gNamingScreenData->bg2vOffset = 0;
+    sNamingScreen->bg1vOffset = 0;
+    sNamingScreen->bg2vOffset = 0;
     task->tState++;
     return 0;
 }
 
 static bool8 PageSwapAnimState_1(struct Task *task)
 {
-    u16 *const arr[] =
+    u16 *const vOffsets[] =
     {
-        &gNamingScreenData->bg2vOffset,
-        &gNamingScreenData->bg1vOffset
+        &sNamingScreen->bg2vOffset,
+        &sNamingScreen->bg1vOffset
     };
 
     task->tFrameCount += 4;
-    *arr[gNamingScreenData->bgToReveal] = Sin(task->tFrameCount, 40);
-    *arr[gNamingScreenData->bgToHide] = Sin((task->tFrameCount + 128) & 0xFF, 40);
+    *vOffsets[sNamingScreen->bgToReveal] = Sin(task->tFrameCount, 40);
+    *vOffsets[sNamingScreen->bgToHide] = Sin((task->tFrameCount + 128) & 0xFF, 40);
     if (task->tFrameCount >= 64)
     {
-        u8 temp = gNamingScreenData->bg1Priority;  //Why u8 and not u16?
+        u8 temp = sNamingScreen->bg1Priority;  //Why u8 and not u16?
 
-        gNamingScreenData->bg1Priority = gNamingScreenData->bg2Priority;
-        gNamingScreenData->bg2Priority = temp;
+        sNamingScreen->bg1Priority = sNamingScreen->bg2Priority;
+        sNamingScreen->bg2Priority = temp;
         task->tState++;
     }
     return 0;
@@ -693,21 +864,21 @@ static bool8 PageSwapAnimState_1(struct Task *task)
 
 static bool8 PageSwapAnimState_2(struct Task *task)
 {
-    u16 *const arr[] =
+    u16 *const vOffsets[] =
     {
-        &gNamingScreenData->bg2vOffset,
-        &gNamingScreenData->bg1vOffset
+        &sNamingScreen->bg2vOffset,
+        &sNamingScreen->bg1vOffset
     };
 
     task->tFrameCount += 4;
-    *arr[gNamingScreenData->bgToReveal] = Sin(task->tFrameCount, 40);
-    *arr[gNamingScreenData->bgToHide] = Sin((task->tFrameCount + 128) & 0xFF, 40);
+    *vOffsets[sNamingScreen->bgToReveal] = Sin(task->tFrameCount, 40);
+    *vOffsets[sNamingScreen->bgToHide] = Sin((task->tFrameCount + 128) & 0xFF, 40);
     if (task->tFrameCount >= 128)
     {
-        u8 temp = gNamingScreenData->bgToReveal;
+        u8 temp = sNamingScreen->bgToReveal;
 
-        gNamingScreenData->bgToReveal = gNamingScreenData->bgToHide;
-        gNamingScreenData->bgToHide = temp;
+        sNamingScreen->bgToReveal = sNamingScreen->bgToHide;
+        sNamingScreen->bgToHide = temp;
         task->tState++;
     }
     return 0;
@@ -726,221 +897,260 @@ static bool8 PageSwapAnimState_Done(struct Task *task)
 //
 //--------------------------------------------------
 
-static void sub_80E3920(void)
+#define tButtonId     data[0]
+#define tKeepFlashing data[1]
+#define tAllowFlash   data[2]
+#define tColor        data[3]
+#define tColorIncr    data[4]
+#define tColorDelay   data[5]
+#define tColorDelta   data[6]
+
+static void CreateButtonFlashTask(void)
 {
     u8 taskId;
 
-    taskId = CreateTask(Task_80E39BC, 3);
-    gTasks[taskId].data[0] = 3;
+    taskId = CreateTask(Task_UpdateButtonFlash, 3);
+    gTasks[taskId].tButtonId = BUTTON_COUNT;
 }
 
-static void sub_80E3948(u8 a, u8 b, u8 c)
+static void TryStartButtonFlash(u8 button, bool8 keepFlashing, bool8 interruptCurFlash)
 {
-    struct Task *task = &gTasks[FindTaskIdByFunc(Task_80E39BC)];
+    struct Task *task = &gTasks[FindTaskIdByFunc(Task_UpdateButtonFlash)];
 
-    if (a == task->data[0] && c == 0)
+    if (button == task->tButtonId && !interruptCurFlash)
     {
-        task->data[1] = b;
-        task->data[2] = 1;
+        task->tKeepFlashing = keepFlashing;
+        task->tAllowFlash = TRUE;
         return;
     }
-    if (a == 3 && task->data[1] == 0 && c == 0)
+    if (button == BUTTON_COUNT && !task->tKeepFlashing && !interruptCurFlash)
         return;
-    if (task->data[0] != 3)
-        sub_80E3AE8(task->data[0]);
-    sub_80E3B10(task, a, b);
+
+    if (task->tButtonId != BUTTON_COUNT)
+        RestoreButtonColor(task->tButtonId);
+
+    StartButtonFlash(task, button, keepFlashing);
 }
 
-static void Task_80E39BC(u8 taskId)
+static void Task_UpdateButtonFlash(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
 
-    if (task->data[0] == 3 || task->data[2] == 0)
+    if (task->tButtonId == BUTTON_COUNT || !task->tAllowFlash)
         return;
-    MultiplyInvertedPaletteRGBComponents(sub_80E3A74(task->data[0]), task->data[3], task->data[3], task->data[3]);
-    if (task->data[5] != 0)
-    {
-        task->data[5]--;
-        if (task->data[5] != 0)
-            return;
-    }
-    task->data[5] = 2;
-    if (task->data[4] >= 0)
+
+    MultiplyInvertedPaletteRGBComponents(GetButtonPalOffset(task->tButtonId), task->tColor, task->tColor, task->tColor);
+
+    if (task->tColorDelay && --task->tColorDelay)
+        return;
+
+    task->tColorDelay = 2;
+    if (task->tColorIncr >= 0)
     {
-        if (task->data[3] < 14)
+        if (task->tColor < 14)
         {
-            task->data[3] += task->data[4];
-            task->data[6] += task->data[4];
+            task->tColor += task->tColorIncr;
+            task->tColorDelta += task->tColorIncr;
         }
         else
         {
-            task->data[3] = 16;
-            task->data[6]++;
+            task->tColor = 16;
+            task->tColorDelta++;
         }
     }
     else
     {
-        task->data[3] += task->data[4];
-        task->data[6] += task->data[4];
+        task->tColor += task->tColorIncr;
+        task->tColorDelta += task->tColorIncr;
     }
 
-    if (task->data[3] == 16 && task->data[6] == 22)
+    if (task->tColor == 16 && task->tColorDelta == 22)
     {
-        task->data[4] = -4;
+        task->tColorIncr = -4;
     }
-    else if (task->data[3] == 0)
+    else if (task->tColor == 0)
     {
-        task->data[2] = task->data[1];
-        task->data[4] = 2;
-        task->data[6] = 0;
+        task->tAllowFlash = task->tKeepFlashing;
+        task->tColorIncr = 2;
+        task->tColorDelta = 0;
     }
 }
 
-static u16 sub_80E3A74(u8 a)
+static u16 GetButtonPalOffset(u8 button)
 {
-    const u16 arr[] =
+    const u16 palOffsets[BUTTON_COUNT + 1] =
     {
-        IndexOfSpritePaletteTag(4) * 16 + 0x10E,
-        IndexOfSpritePaletteTag(6) * 16 + 0x10E,
-        IndexOfSpritePaletteTag(7) * 16 + 0x10E,
-        IndexOfSpritePaletteTag(7) * 16 + 0x101,
+        [BUTTON_PAGE]  = IndexOfSpritePaletteTag(PALTAG_PAGE_SWAP) * 16 + 0x10E,
+        [BUTTON_BACK]  = IndexOfSpritePaletteTag(PALTAG_BACK_BUTTON) * 16 + 0x10E,
+        [BUTTON_OK]    = IndexOfSpritePaletteTag(PALTAG_OK_BUTTON) * 16 + 0x10E,
+        [BUTTON_COUNT] = IndexOfSpritePaletteTag(PALTAG_OK_BUTTON) * 16 + 0x101,
     };
 
-    return arr[a];
+    return palOffsets[button];
 }
 
-static void sub_80E3AE8(u8 a)
+static void RestoreButtonColor(u8 button)
 {
-    u16 index = sub_80E3A74(a);
-
+    u16 index = GetButtonPalOffset(button);
     gPlttBufferFaded[index] = gPlttBufferUnfaded[index];
 }
 
-static void sub_80E3B10(struct Task *task, u8 b, u8 c)
+static void StartButtonFlash(struct Task *task, u8 button, bool8 keepFlashing)
 {
-    task->data[0] = b;
-    task->data[1] = c;
-    task->data[2] = 1;
-    task->data[3] = 4;
-    task->data[4] = 2;
-    task->data[5] = 0;
-    task->data[6] = 4;
+    task->tButtonId = button;
+    task->tKeepFlashing = keepFlashing;
+    task->tAllowFlash = TRUE;
+    task->tColor = 4;
+    task->tColorIncr = 2;
+    task->tColorDelay = 0;
+    task->tColorDelta = 4;
 }
 
-static void sub_80E3B30(struct Sprite *sprite)
+#undef tButtonId
+#undef tColor
+
+// Sprite data for the the cursor
+#define sX          data[0]
+#define sY          data[1]
+#define sPrevX      data[2]
+#define sPrevY      data[3]
+#define sInvisible  data[4] & 0x00FF
+#define sFlashing   data[4] & 0xFF00
+#define sColor      data[5]
+#define sColorIncr  data[6]
+#define sColorDelay data[7]
+
+static void SpriteCB_Cursor(struct Sprite *sprite)
 {
     if (sprite->animEnded)
         StartSpriteAnim(sprite, 0);
-    sprite->invisible = (sprite->data[4] & 0xFF);
-    if (sprite->data[0] == GetCurrentPageColumnCount())
+
+    // Hide cursor when on button column
+    sprite->invisible = sprite->sInvisible;
+    if (sprite->sX == GetCurrentPageColumnCount())
         sprite->invisible = TRUE;
-    if (sprite->invisible || (sprite->data[4] & 0xFF00) == 0
-     || sprite->data[0] != sprite->data[2] || sprite->data[1] != sprite->data[3])
+
+    if (sprite->invisible 
+       || !(sprite->sFlashing)
+       || sprite->sX != sprite->sPrevX 
+       || sprite->sY != sprite->sPrevY)
     {
-        sprite->data[5] = 0;
-        sprite->data[6] = 2;
-        sprite->data[7] = 2;
+        sprite->sColor = 0;
+        sprite->sColorIncr = 2;
+        sprite->sColorDelay = 2;
     }
-    sprite->data[7]--;
-    if (sprite->data[7] == 0)
+
+    sprite->sColorDelay--;
+    if (sprite->sColorDelay == 0)
     {
-        sprite->data[5] += sprite->data[6];
-        if (sprite->data[5] == 16 || sprite->data[5] == 0)
-            sprite->data[6] = -sprite->data[6];
-        sprite->data[7] = 2;
+        sprite->sColor += sprite->sColorIncr;
+        if (sprite->sColor == 16 || sprite->sColor == 0)
+            sprite->sColorIncr = -sprite->sColorIncr;
+        sprite->sColorDelay = 2;
     }
-    if ((sprite->data[4] & 0xFF00) != 0)
+
+    if (sprite->sFlashing)
     {
-        s8 gb = sprite->data[5];
-        s8 r = sprite->data[5] >> 1;
-        u16 index = IndexOfSpritePaletteTag(5) * 16 + 0x0101;
+        s8 gb = sprite->sColor;
+        s8 r = sprite->sColor >> 1;
+        u16 index = IndexOfSpritePaletteTag(PALTAG_CURSOR) * 16 + 0x0101;
 
         MultiplyInvertedPaletteRGBComponents(index, r, gb, gb);
     }
 }
 
-static void sub_80E3C20(struct Sprite *sprite)
+#define sDelay  data[0]
+#define sXPosId data[1]
+
+static void SpriteCB_InputArrow(struct Sprite *sprite)
 {
-    const s16 arr[] = {0, -4, -2, -1};
+    const s16 x[] = {0, -4, -2, -1};
 
-    if (sprite->data[0] == 0 || --sprite->data[0] == 0)
+    if (sprite->sDelay == 0 || --sprite->sDelay == 0)
     {
-        sprite->data[0] = 8;
-        sprite->data[1] = (sprite->data[1] + 1) & 3;
+        sprite->sDelay = 8;
+        sprite->sXPosId = (sprite->sXPosId + 1) & (ARRAY_COUNT(x) - 1);
     }
-    sprite->pos2.x = arr[sprite->data[1]];
+    sprite->pos2.x = x[sprite->sXPosId];
 }
 
-static void sub_80E3C6C(struct Sprite *sprite)
+#undef sDelay
+#undef sXPosId
+
+#define sId     data[0] // set in CreateTextEntrySprites
+#define sYPosId data[1]
+#define sDelay  data[2]
+
+static void SpriteCB_Underscore(struct Sprite *sprite)
 {
-    const s16 arr[] = {2, 3, 2, 1};
-    u8 var;
+    const s16 y[] = {2, 3, 2, 1};
+    u8 pos;
 
-    var = GetTextCaretPosition();
-    if (var != (u8)sprite->data[0])
+    pos = GetTextEntryPosition();
+    if (pos != (u8)sprite->sId)
     {
         sprite->pos2.y = 0;
-        sprite->data[1] = 0;
-        sprite->data[2] = 0;
+        sprite->sYPosId = 0;
+        sprite->sDelay = 0;
     }
     else
     {
-        sprite->pos2.y = arr[sprite->data[1]];
-        sprite->data[2]++;
-        if (sprite->data[2] > 8)
+        sprite->pos2.y = y[sprite->sYPosId];
+        sprite->sDelay++;
+        if (sprite->sDelay > 8)
         {
-            sprite->data[1] = (sprite->data[1] + 1) & 3;
-            sprite->data[2] = 0;
+            sprite->sYPosId = (sprite->sYPosId + 1) & (ARRAY_COUNT(y) - 1);
+            sprite->sDelay = 0;
         }
     }
 }
 
-//--------------------------------------------------
-// Cursor
-//--------------------------------------------------
+#undef sId
+#undef sYPosId
+#undef sDelay
 
-static void sub_80E3CC8(void)
+static void CreateSprites(void)
 {
-    CursorInit();
-    CreatePageSwitcherSprites();
+    CreateCursorSprite();
+    CreatePageSwapButtonSprites();
     CreateBackOkSprites();
-    CreateUnderscoreSprites();
+    CreateTextEntrySprites();
     CreateInputTargetIcon();
 }
 
-static void CursorInit(void)
+static void CreateCursorSprite(void)
 {
-    gNamingScreenData->cursorSpriteId = CreateSprite(&gUnknown_0858C138, 38, 88, 1);
-    sub_80E3E3C(1);
-    gSprites[gNamingScreenData->cursorSpriteId].oam.priority = 1;
-    gSprites[gNamingScreenData->cursorSpriteId].oam.objMode = ST_OAM_OBJ_BLEND;
-    gSprites[gNamingScreenData->cursorSpriteId].data[6] = 1;
-    gSprites[gNamingScreenData->cursorSpriteId].data[6] = 2;
+    sNamingScreen->cursorSpriteId = CreateSprite(&sSpriteTemplate_Cursor, 38, 88, 1);
+    SetCursorInvisibility(TRUE);
+    gSprites[sNamingScreen->cursorSpriteId].oam.priority = 1;
+    gSprites[sNamingScreen->cursorSpriteId].oam.objMode = ST_OAM_OBJ_BLEND;
+    gSprites[sNamingScreen->cursorSpriteId].sColorIncr = 1; // ? immediately overwritten
+    gSprites[sNamingScreen->cursorSpriteId].sColorIncr = 2;
     SetCursorPos(0, 0);
 }
 
 static void SetCursorPos(s16 x, s16 y)
 {
-    struct Sprite *cursorSprite = &gSprites[gNamingScreenData->cursorSpriteId];
+    struct Sprite *cursorSprite = &gSprites[sNamingScreen->cursorSpriteId];
 
-    if (x < gUnknown_0858BEA0[sub_80E3274()])
-        cursorSprite->pos1.x = gUnknown_0858BEA3[x + sub_80E3274() * 8] + 38;
+    if (x < sPageColumnCounts[CurrentPageToKeyboardId()])
+        cursorSprite->pos1.x = sPageColumnXPos[x + CurrentPageToKeyboardId() * KBCOL_COUNT] + 38;
     else
         cursorSprite->pos1.x = 0;
 
     cursorSprite->pos1.y = y * 16 + 88;
-    cursorSprite->data[2] = cursorSprite->data[0];
-    cursorSprite->data[3] = cursorSprite->data[1];
-    cursorSprite->data[0] = x;
-    cursorSprite->data[1] = y;
+    cursorSprite->sPrevX = cursorSprite->sX;
+    cursorSprite->sPrevY = cursorSprite->sY;
+    cursorSprite->sX = x;
+    cursorSprite->sY = y;
 }
 
 static void GetCursorPos(s16 *x, s16 *y)
 {
-    struct Sprite *cursorSprite = &gSprites[gNamingScreenData->cursorSpriteId];
+    struct Sprite *cursorSprite = &gSprites[sNamingScreen->cursorSpriteId];
 
-    *x = cursorSprite->data[0];
-    *y = cursorSprite->data[1];
+    *x = cursorSprite->sX;
+    *y = cursorSprite->sY;
 }
 
 static void MoveCursorToOKButton(void)
@@ -948,38 +1158,30 @@ static void MoveCursorToOKButton(void)
     SetCursorPos(GetCurrentPageColumnCount(), 2);
 }
 
-static void sub_80E3E3C(u8 a)
+static void SetCursorInvisibility(bool8 invisible)
 {
-    gSprites[gNamingScreenData->cursorSpriteId].data[4] &= -256;
-    gSprites[gNamingScreenData->cursorSpriteId].data[4] |= a;
-    StartSpriteAnim(&gSprites[gNamingScreenData->cursorSpriteId], 0);
+    gSprites[sNamingScreen->cursorSpriteId].data[4] &= 0xFF00;
+    gSprites[sNamingScreen->cursorSpriteId].data[4] |= invisible; // sInvisible
+    StartSpriteAnim(&gSprites[sNamingScreen->cursorSpriteId], 0);
 }
 
-static void sub_80E3E94(u8 a)
+static void SetCursorFlashing(bool8 flashing)
 {
-    gSprites[gNamingScreenData->cursorSpriteId].data[4] &= 0xFF;
-    gSprites[gNamingScreenData->cursorSpriteId].data[4] |= a << 8;
+    gSprites[sNamingScreen->cursorSpriteId].data[4] &= 0xFF;
+    gSprites[sNamingScreen->cursorSpriteId].data[4] |= flashing << 8; // sFlashing
 }
 
-static void sub_80E3ED8(void)
+static void SquishCursor(void)
 {
-    StartSpriteAnim(&gSprites[gNamingScreenData->cursorSpriteId], 1);
+    StartSpriteAnim(&gSprites[sNamingScreen->cursorSpriteId], 1);
 }
 
 static bool8 IsCursorAnimFinished(void)
 {
-    return gSprites[gNamingScreenData->cursorSpriteId].animEnded;
+    return gSprites[sNamingScreen->cursorSpriteId].animEnded;
 }
 
-enum
-{
-    KEY_ROLE_CHAR,
-    KEY_ROLE_PAGE,
-    KEY_ROLE_BACKSPACE,
-    KEY_ROLE_OK,
-};
-
-static const u8 sKeyRoles[] = {KEY_ROLE_PAGE, KEY_ROLE_BACKSPACE, KEY_ROLE_OK};
+static const u8 sButtonKeyRoles[] = {KEY_ROLE_PAGE, KEY_ROLE_BACKSPACE, KEY_ROLE_OK};
 
 static u8 GetKeyRoleAtCursorPos(void)
 {
@@ -990,146 +1192,174 @@ static u8 GetKeyRoleAtCursorPos(void)
     if (cursorX < GetCurrentPageColumnCount())
         return KEY_ROLE_CHAR;
     else
-        return sKeyRoles[cursorY];
+        return sButtonKeyRoles[cursorY];
 }
 
+// If the cursor's x is equal to the column count, cursor is in the button column
 static u8 GetCurrentPageColumnCount(void)
 {
-    return gUnknown_0858BEA0[sub_80E3274()];
+    return sPageColumnCounts[CurrentPageToKeyboardId()];
 }
 
-static void CreatePageSwitcherSprites(void)
+#undef sX
+#undef sY
+#undef sPrevX
+#undef sPrevY
+#undef sInvisible
+#undef sFlashing
+#undef sColor
+#undef sColorIncr
+#undef sColorDelay
+
+static bool8 PageSwapSprite_Init(struct Sprite *);
+static bool8 PageSwapSprite_Idle(struct Sprite *);
+static bool8 PageSwapSprite_SlideOff(struct Sprite *);
+static bool8 PageSwapSprite_SlideOn(struct Sprite *);
+
+#define sState          data[0]
+#define sPage           data[1]
+#define sTextSpriteId   data[6]
+#define sButtonSpriteId data[7]
+
+static void CreatePageSwapButtonSprites(void)
 {
-    u8 spriteId1;
-    u8 spriteId2;
-    u8 spriteId3;
+    u8 frameSpriteId;
+    u8 textSpriteId;
+    u8 buttonSpriteId;
 
-    spriteId1 = CreateSprite(&gUnknown_0858C0C0, 0xCC, 0x58, 0);
-    gNamingScreenData->selectBtnFrameSpriteId = spriteId1;
-    SetSubspriteTables(&gSprites[spriteId1], gUnknown_0858C050);
-    gSprites[spriteId1].invisible = TRUE;
+    frameSpriteId = CreateSprite(&sSpriteTemplate_PageSwapFrame, 204, 88, 0);
+    sNamingScreen->swapBtnFrameSpriteId = frameSpriteId;
+    SetSubspriteTables(&gSprites[frameSpriteId], sSubspriteTable_PageSwapFrame);
+    gSprites[frameSpriteId].invisible = TRUE;
 
-    spriteId2 = CreateSprite(&gUnknown_0858C0F0, 0xCC, 0x54, 1);
-    gSprites[spriteId1].data[6] = spriteId2;
-    SetSubspriteTables(&gSprites[spriteId2], gUnknown_0858C058);
-    gSprites[spriteId2].invisible = TRUE;
+    textSpriteId = CreateSprite(&sSpriteTemplate_PageSwapText, 204, 84, 1);
+    gSprites[frameSpriteId].sTextSpriteId = textSpriteId;
+    SetSubspriteTables(&gSprites[textSpriteId], sSubspriteTable_PageSwapText);
+    gSprites[textSpriteId].invisible = TRUE;
 
-    spriteId3 = CreateSprite(&gUnknown_0858C0D8, 0xCC, 0x53, 2);
-    gSprites[spriteId3].oam.priority = 1;
-    gSprites[spriteId1].data[7] = spriteId3;
-    gSprites[spriteId3].invisible = TRUE;
+    buttonSpriteId = CreateSprite(&sSpriteTemplate_PageSwapButton, 204, 83, 2);
+    gSprites[buttonSpriteId].oam.priority = 1;
+    gSprites[frameSpriteId].sButtonSpriteId = buttonSpriteId;
+    gSprites[buttonSpriteId].invisible = TRUE;
 }
 
-static void sub_80E4050(void)
+static void StartPageSwapButtonAnim(void)
 {
-    struct Sprite *sprite = &gSprites[gNamingScreenData->selectBtnFrameSpriteId];
+    struct Sprite *sprite = &gSprites[sNamingScreen->swapBtnFrameSpriteId];
 
-    sprite->data[0] = 2;
-    sprite->data[1] = gNamingScreenData->currentPage;
+    sprite->sState = 2; // go to PageSwapSprite_SlideOff
+    sprite->sPage = sNamingScreen->currentPage;
 }
 
-static u8 sub_80E40AC(struct Sprite *);
-static u8 sub_80E4100(struct Sprite *);
-static u8 sub_80E4104(struct Sprite *);
-static u8 sub_80E4178(struct Sprite *);
-
-static u8 (*const gUnknown_0858BEE8[])(struct Sprite *) =
+static u8 (*const sPageSwapSpriteFuncs[])(struct Sprite *) =
 {
-    sub_80E40AC,
-    sub_80E4100,
-    sub_80E4104,
-    sub_80E4178,
+    PageSwapSprite_Init,
+    PageSwapSprite_Idle,
+    PageSwapSprite_SlideOff,
+    PageSwapSprite_SlideOn,
 };
 
-static void sub_80E4084(struct Sprite *sprite)
+static void SpriteCB_PageSwap(struct Sprite *sprite)
 {
-    while (gUnknown_0858BEE8[sprite->data[0]](sprite) != 0);
+    while (sPageSwapSpriteFuncs[sprite->sState](sprite));
 }
 
-static u8 sub_80E40AC(struct Sprite *sprite)
+static bool8 PageSwapSprite_Init(struct Sprite *sprite)
 {
-    struct Sprite *sprite1 = &gSprites[sprite->data[6]];
-    struct Sprite *sprite2 = &gSprites[sprite->data[7]];
+    struct Sprite *text = &gSprites[sprite->sTextSpriteId];
+    struct Sprite *button = &gSprites[sprite->sButtonSpriteId];
 
-    sub_80E41B8(sub_80E3244(gNamingScreenData->currentPage), sprite1, sprite2);
-    sprite->data[0]++;
-    return 0;
+    SetPageSwapButtonGfx(PageToNextGfxId(sNamingScreen->currentPage), text, button);
+    sprite->sState++;
+    return FALSE;
 }
 
-static u8 sub_80E4100(struct Sprite *sprite)
+static bool8 PageSwapSprite_Idle(struct Sprite *sprite)
 {
-    return 0;
+    return FALSE;
 }
 
-static u8 sub_80E4104(struct Sprite *sprite)
+static bool8 PageSwapSprite_SlideOff(struct Sprite *sprite)
 {
-    struct Sprite *r4 = &gSprites[sprite->data[6]];
-    struct Sprite *r5 = &gSprites[sprite->data[7]];
+    struct Sprite *text = &gSprites[sprite->sTextSpriteId];
+    struct Sprite *button = &gSprites[sprite->sButtonSpriteId];
 
-    r4->pos2.y++;
-    if (r4->pos2.y > 7)
+    text->pos2.y++;
+    if (text->pos2.y > 7)
     {
-        sprite->data[0]++;
-        r4->pos2.y = -4;
-        r4->invisible = TRUE;
-        sub_80E41B8(sub_80E3244(((u8)sprite->data[1] + 1) % 3), r4, r5);
+        sprite->sState++;
+        text->pos2.y = -4;
+        text->invisible = TRUE;
+        SetPageSwapButtonGfx(PageToNextGfxId(((u8)sprite->sPage + 1) % KBPAGE_COUNT), text, button);
     }
-    return 0;
+    return FALSE;
 }
 
-static u8 sub_80E4178(struct Sprite *sprite)
+static bool8 PageSwapSprite_SlideOn(struct Sprite *sprite)
 {
-    struct Sprite *r2 = &gSprites[sprite->data[6]];
+    struct Sprite *text = &gSprites[sprite->sTextSpriteId];
 
-    r2->invisible = FALSE;
-    r2->pos2.y++;
-    if (r2->pos2.y >= 0)
+    text->invisible = FALSE;
+    text->pos2.y++;
+    if (text->pos2.y >= 0)
     {
-        r2->pos2.y = 0;
-        sprite->data[0] = 1;
+        text->pos2.y = 0;
+        sprite->sState = 1; // go to PageSwapSprite_Idle
     }
-    return 0;
+    return FALSE;
 }
 
-static const u16 gUnknown_0858BEF8[] = {1, 3, 2};
-static const u16 gUnknown_0858BEFE[] = {4, 6, 5};
+static const u16 sPageSwapPalTags[] = {
+    [PAGE_SWAP_UPPER]  = PALTAG_PAGE_SWAP_UPPER, 
+    [PAGE_SWAP_OTHERS] = PALTAG_PAGE_SWAP_OTHERS, 
+    [PAGE_SWAP_LOWER]  = PALTAG_PAGE_SWAP_LOWER
+};
+
+static const u16 sPageSwapGfxTags[] = {
+    [PAGE_SWAP_UPPER]  = GFXTAG_PAGE_SWAP_UPPER, 
+    [PAGE_SWAP_OTHERS] = GFXTAG_PAGE_SWAP_OTHERS, 
+    [PAGE_SWAP_LOWER]  = GFXTAG_PAGE_SWAP_LOWER
+};
 
-static void sub_80E41B8(u8 a, struct Sprite *b, struct Sprite *c)
+static void SetPageSwapButtonGfx(u8 page, struct Sprite *text, struct Sprite *button)
 {
-    c->oam.paletteNum = IndexOfSpritePaletteTag(gUnknown_0858BEF8[a]);
-    b->sheetTileStart = GetSpriteTileStartByTag(gUnknown_0858BEFE[a]);
-    b->subspriteTableNum = a;
+    button->oam.paletteNum = IndexOfSpritePaletteTag(sPageSwapPalTags[page]);
+    text->sheetTileStart = GetSpriteTileStartByTag(sPageSwapGfxTags[page]);
+    text->subspriteTableNum = page;
 }
 
-//
+#undef sState
+#undef sPage
+#undef sTextSpriteId
+#undef sButtonSpriteId
 
 static void CreateBackOkSprites(void)
 {
     u8 spriteId;
 
-    spriteId = CreateSprite(&gUnknown_0858C108, 0xCC, 0x74, 0);
-    SetSubspriteTables(&gSprites[spriteId], gUnknown_0858C070);
+    spriteId = CreateSprite(&sSpriteTemplate_BackButton, 204, 116, 0);
+    SetSubspriteTables(&gSprites[spriteId], sSubspriteTable_Button);
     gSprites[spriteId].invisible = TRUE;
 
-    spriteId = CreateSprite(&gUnknown_0858C120, 0xCC, 0x8C, 0);
-    SetSubspriteTables(&gSprites[spriteId], gUnknown_0858C070);
+    spriteId = CreateSprite(&sSpriteTemplate_OkButton, 204, 140, 0);
+    SetSubspriteTables(&gSprites[spriteId], sSubspriteTable_Button);
     gSprites[spriteId].invisible = TRUE;
 }
 
-static void CreateUnderscoreSprites(void)
+static void CreateTextEntrySprites(void)
 {
     u8 spriteId;
     s16 xPos;
     u8 i;
 
-    xPos = gNamingScreenData->inputCharBaseXPos - 5;
-    spriteId = CreateSprite(&sSpriteTemplate_InputArrow, xPos, 0x38, 0);
+    xPos = sNamingScreen->inputCharBaseXPos - 5;
+    spriteId = CreateSprite(&sSpriteTemplate_InputArrow, xPos, 56, 0);
     gSprites[spriteId].oam.priority = 3;
     gSprites[spriteId].invisible = TRUE;
-    xPos = gNamingScreenData->inputCharBaseXPos;
-    for (i = 0; i < gNamingScreenData->template->maxChars; i++, xPos += 8)
+    xPos = sNamingScreen->inputCharBaseXPos;
+    for (i = 0; i < sNamingScreen->template->maxChars; i++, xPos += 8)
     {
-        spriteId = CreateSprite(&sSpriteTemplate_Underscore, xPos + 3, 0x3C, 0);
+        spriteId = CreateSprite(&sSpriteTemplate_Underscore, xPos + 3, 60, 0);
         gSprites[spriteId].oam.priority = 3;
         gSprites[spriteId].data[0] = i;
         gSprites[spriteId].invisible = TRUE;
@@ -1140,27 +1370,27 @@ static void CreateUnderscoreSprites(void)
 // Icon creation (the thing you're naming or giving input to)
 //--------------------------------------------------
 
-static void TaskDummy2(void);
+static void NamingScreen_NoIcon(void);
 static void NamingScreen_CreatePlayerIcon(void);
 static void NamingScreen_CreatePCIcon(void);
 static void NamingScreen_CreateMonIcon(void);
-static void NamingScreen_CreateWandaDadIcon(void);
+static void NamingScreen_CreateWaldaDadIcon(void);
 
 static void (*const sIconFunctions[])(void) =
 {
-    TaskDummy2,
+    NamingScreen_NoIcon,
     NamingScreen_CreatePlayerIcon,
     NamingScreen_CreatePCIcon,
     NamingScreen_CreateMonIcon,
-    NamingScreen_CreateWandaDadIcon,
+    NamingScreen_CreateWaldaDadIcon,
 };
 
 static void CreateInputTargetIcon(void)
 {
-    sIconFunctions[gNamingScreenData->template->iconFunction]();
+    sIconFunctions[sNamingScreen->template->iconFunction]();
 }
 
-static void TaskDummy2(void)
+static void NamingScreen_NoIcon(void)
 {
 
 }
@@ -1170,8 +1400,8 @@ static void NamingScreen_CreatePlayerIcon(void)
     u8 rivalGfxId;
     u8 spriteId;
 
-    rivalGfxId = GetRivalAvatarGraphicsIdByStateIdAndGender(0, gNamingScreenData->monSpecies);
-    spriteId = AddPseudoObjectEvent(rivalGfxId, SpriteCallbackDummy, 0x38, 0x25, 0);
+    rivalGfxId = GetRivalAvatarGraphicsIdByStateIdAndGender(0, sNamingScreen->monSpecies);
+    spriteId = AddPseudoObjectEvent(rivalGfxId, SpriteCallbackDummy, 56, 37, 0);
     gSprites[spriteId].oam.priority = 3;
     StartSpriteAnim(&gSprites[spriteId], 4);
 }
@@ -1180,8 +1410,8 @@ static void NamingScreen_CreatePCIcon(void)
 {
     u8 spriteId;
 
-    spriteId = CreateSprite(&gUnknown_0858C180, 0x38, 0x29, 0);
-    SetSubspriteTables(&gSprites[spriteId], gUnknown_0858C078);
+    spriteId = CreateSprite(&sSpriteTemplate_PCIcon, 56, 41, 0);
+    SetSubspriteTables(&gSprites[spriteId], sSubspriteTable_PCIcon);
     gSprites[spriteId].oam.priority = 3;
 }
 
@@ -1190,15 +1420,15 @@ static void NamingScreen_CreateMonIcon(void)
     u8 spriteId;
 
     LoadMonIconPalettes();
-    spriteId = CreateMonIcon(gNamingScreenData->monSpecies, SpriteCallbackDummy, 0x38, 0x28, 0, gNamingScreenData->monPersonality, 1);
+    spriteId = CreateMonIcon(sNamingScreen->monSpecies, SpriteCallbackDummy, 56, 40, 0, sNamingScreen->monPersonality, 1);
     gSprites[spriteId].oam.priority = 3;
 }
 
-static void NamingScreen_CreateWandaDadIcon(void)
+static void NamingScreen_CreateWaldaDadIcon(void)
 {
     u8 spriteId;
 
-    spriteId = AddPseudoObjectEvent(OBJ_EVENT_GFX_MAN_1, SpriteCallbackDummy, 0x38, 0x25, 0);
+    spriteId = AddPseudoObjectEvent(OBJ_EVENT_GFX_MAN_1, SpriteCallbackDummy, 56, 37, 0);
     gSprites[spriteId].oam.priority = 3;
     StartSpriteAnim(&gSprites[spriteId], 4);
 }
@@ -1214,87 +1444,87 @@ static bool8 KeyboardKeyHandler_OK(u8);
 
 static bool8 (*const sKeyboardKeyHandlers[])(u8) =
 {
-    KeyboardKeyHandler_Character,
-    KeyboardKeyHandler_Page,
-    KeyboardKeyHandler_Backspace,
-    KeyboardKeyHandler_OK,
+    [KEY_ROLE_CHAR]      = KeyboardKeyHandler_Character,
+    [KEY_ROLE_PAGE]      = KeyboardKeyHandler_Page,
+    [KEY_ROLE_BACKSPACE] = KeyboardKeyHandler_Backspace,
+    [KEY_ROLE_OK]        = KeyboardKeyHandler_OK,
 };
 
 static bool8 HandleKeyboardEvent(void)
 {
-    u8 event = GetInputEvent();
+    u8 input = GetInputEvent();
     u8 keyRole = GetKeyRoleAtCursorPos();
 
-    if (event == KBEVENT_PRESSED_SELECT)
+    if (input == INPUT_SELECT)
     {
-        return sub_80E45E0();
+        return SwapKeyboardPage();
     }
-    else if (event == KBEVENT_PRESSED_B)
+    else if (input == INPUT_B_BUTTON)
     {
         DeleteTextCharacter();
         return FALSE;
     }
-    else if (event == KBEVENT_PRESSED_START)
+    else if (input == INPUT_START)
     {
         MoveCursorToOKButton();
         return FALSE;
     }
     else
     {
-        return sKeyboardKeyHandlers[keyRole](event);
+        return sKeyboardKeyHandlers[keyRole](input);
     }
 }
 
-static bool8 KeyboardKeyHandler_Character(u8 event)
+static bool8 KeyboardKeyHandler_Character(u8 input)
 {
-    sub_80E3948(3, 0, 0);
-    if (event == KBEVENT_PRESSED_A)
+    TryStartButtonFlash(BUTTON_COUNT, FALSE, FALSE);
+    if (input == INPUT_A_BUTTON)
     {
-        bool8 var = sub_80E4B54();
+        bool8 textFull = AddTextCharacter();
 
-        sub_80E3ED8();
-        if (var)
+        SquishCursor();
+        if (textFull)
         {
-            SetInputState(INPUT_STATE_2);
-            gNamingScreenData->state = MAIN_STATE_MOVE_TO_OK_BUTTON;
+            SetInputState(INPUT_STATE_OVERRIDE);
+            sNamingScreen->state = STATE_MOVE_TO_OK_BUTTON;
         }
     }
     return FALSE;
 }
 
-static bool8 KeyboardKeyHandler_Page(u8 event)
+static bool8 KeyboardKeyHandler_Page(u8 input)
 {
-    sub_80E3948(0, 1, 0);
-    if (event == KBEVENT_PRESSED_A)
-        return sub_80E45E0();
+    TryStartButtonFlash(BUTTON_PAGE, TRUE, FALSE);
+    if (input == INPUT_A_BUTTON)
+        return SwapKeyboardPage();
     else
         return FALSE;
 }
 
-static bool8 KeyboardKeyHandler_Backspace(u8 event)
+static bool8 KeyboardKeyHandler_Backspace(u8 input)
 {
-    sub_80E3948(1, 1, 0);
-    if (event == KBEVENT_PRESSED_A)
+    TryStartButtonFlash(BUTTON_BACK, TRUE, FALSE);
+    if (input == INPUT_A_BUTTON)
         DeleteTextCharacter();
     return FALSE;
 }
 
-static bool8 KeyboardKeyHandler_OK(u8 event)
+static bool8 KeyboardKeyHandler_OK(u8 input)
 {
-    sub_80E3948(2, 1, 0);
-    if (event == KBEVENT_PRESSED_A)
+    TryStartButtonFlash(BUTTON_OK, TRUE, FALSE);
+    if (input == INPUT_A_BUTTON)
     {
         PlaySE(SE_SELECT);
-        gNamingScreenData->state = MAIN_STATE_6;
+        sNamingScreen->state = STATE_PRESSED_OK;
         return TRUE;
     }
     else
         return FALSE;
 }
 
-static bool8 sub_80E45E0(void)
+static bool8 SwapKeyboardPage(void)
 {
-    gNamingScreenData->state = MAIN_STATE_START_PAGE_SWAP;
+    sNamingScreen->state = STATE_START_PAGE_SWAP;
     return TRUE;
 }
 
@@ -1302,33 +1532,26 @@ static bool8 sub_80E45E0(void)
 // Input handling
 //--------------------------------------------------
 
-enum
-{
-    FNKEY_CASE,
-    FNKEY_BACK,
-    FNKEY_OK,
-};
-
 #define tState data[0]
 #define tKeyboardEvent data[1]
-#define tKbFunctionKey data[2]
+#define tButtonId data[2]
 
 
-static void InputState_Disabled(struct Task *);
-static void InputState_Enabled(struct Task *);
-static void InputState_2(struct Task *);
+static void Input_Disabled(struct Task *);
+static void Input_Enabled(struct Task *);
+static void Input_Override(struct Task *);
 
-static void (*const sInputStateFuncs[])(struct Task *) =
+static void (*const sInputFuncs[])(struct Task *) =
 {
-    InputState_Disabled,
-    InputState_Enabled,
-    InputState_2,
+    [INPUT_STATE_DISABLED] = Input_Disabled,
+    [INPUT_STATE_ENABLED]  = Input_Enabled,
+    [INPUT_STATE_OVERRIDE] = Input_Override,
 };
 
 static void Task_HandleInput(u8);
 static void HandleDpadMovement(struct Task *);
 
-static void InputInit(void)
+static void CreateInputHandlerTask(void)
 {
     CreateTask(Task_HandleInput, 1);
 }
@@ -1349,121 +1572,128 @@ static void SetInputState(u8 state)
 
 static void Task_HandleInput(u8 taskId)
 {
-    sInputStateFuncs[gTasks[taskId].tState](&gTasks[taskId]);
+    sInputFuncs[gTasks[taskId].tState](&gTasks[taskId]);
 }
 
-static void InputState_Disabled(struct Task *task)
+static void Input_Disabled(struct Task *task)
 {
-    task->tKeyboardEvent = 0;
+    task->tKeyboardEvent = INPUT_NONE;
 }
 
-static void InputState_Enabled(struct Task *task)
+static void Input_Enabled(struct Task *task)
 {
-    task->tKeyboardEvent = 0;
+    task->tKeyboardEvent = INPUT_NONE;
 
-    if (gMain.newKeys & A_BUTTON)
-        task->tKeyboardEvent = KBEVENT_PRESSED_A;
-    else if (gMain.newKeys & B_BUTTON)
-        task->tKeyboardEvent = KBEVENT_PRESSED_B;
-    else if (gMain.newKeys & SELECT_BUTTON)
-        task->tKeyboardEvent = KBEVENT_PRESSED_SELECT;
-    else if (gMain.newKeys & START_BUTTON)
-        task->tKeyboardEvent = KBEVENT_PRESSED_START;
+    if (JOY_NEW(A_BUTTON))
+        task->tKeyboardEvent = INPUT_A_BUTTON;
+    else if (JOY_NEW(B_BUTTON))
+        task->tKeyboardEvent = INPUT_B_BUTTON;
+    else if (JOY_NEW(SELECT_BUTTON))
+        task->tKeyboardEvent = INPUT_SELECT;
+    else if (JOY_NEW(START_BUTTON))
+        task->tKeyboardEvent = INPUT_START;
     else
         HandleDpadMovement(task);
 }
 
-static void InputState_2(struct Task *task)
+static void Input_Override(struct Task *task)
 {
-    task->tKeyboardEvent = 0;
+    task->tKeyboardEvent = INPUT_NONE;
 }
 
 static void HandleDpadMovement(struct Task *task)
 {
     const s16 sDpadDeltaX[] =
     {
-        0,   //none
-        0,   //up
-        0,   //down
-        -1,  //left
-        1    //right
+        [INPUT_NONE]       = 0,
+        [INPUT_DPAD_UP]    = 0,
+        [INPUT_DPAD_DOWN]  = 0,
+        [INPUT_DPAD_LEFT]  = -1,
+        [INPUT_DPAD_RIGHT] = 1
     };
 
     const s16 sDpadDeltaY[] =
     {
-        0,   //none
-        -1,  //up
-        1,   //down
-        0,   //left
-        0    //right
+        [INPUT_NONE]       = 0,
+        [INPUT_DPAD_UP]    = -1,
+        [INPUT_DPAD_DOWN]  = 1,
+        [INPUT_DPAD_LEFT]  = 0,
+        [INPUT_DPAD_RIGHT] = 0
     };
 
-    const s16 s4RowTo3RowTableY[] = {0, 1, 1, 2};
-    const s16 gUnknown_0858BF50[] = {0, 0, 3};
+    const s16 sKeyRowToButtonRow[KBROW_COUNT] = {0, 1, 1, 2};
+    const s16 sButtonRowToKeyRow[BUTTON_COUNT] = {0, 0, 3};
 
     s16 cursorX;
     s16 cursorY;
-    u16 dpadDir;
+    u16 input;
     s16 prevCursorX;
 
     GetCursorPos(&cursorX, &cursorY);
-    dpadDir = 0;
-    if (gMain.newAndRepeatedKeys & DPAD_UP)
-        dpadDir = 1;
-    if (gMain.newAndRepeatedKeys & DPAD_DOWN)
-        dpadDir = 2;
-    if (gMain.newAndRepeatedKeys & DPAD_LEFT)
-        dpadDir = 3;
-    if (gMain.newAndRepeatedKeys & DPAD_RIGHT)
-        dpadDir = 4;
-
-    //Get new cursor position
+    input = INPUT_NONE;
+    if (JOY_REPEAT(DPAD_UP))
+        input = INPUT_DPAD_UP;
+    if (JOY_REPEAT(DPAD_DOWN))
+        input = INPUT_DPAD_DOWN;
+    if (JOY_REPEAT(DPAD_LEFT))
+        input = INPUT_DPAD_LEFT;
+    if (JOY_REPEAT(DPAD_RIGHT))
+        input = INPUT_DPAD_RIGHT;
+
+    // Get new cursor position
     prevCursorX = cursorX;
-    cursorX += sDpadDeltaX[dpadDir];
-    cursorY += sDpadDeltaY[dpadDir];
+    cursorX += sDpadDeltaX[input];
+    cursorY += sDpadDeltaY[input];
 
-    //Wrap cursor position in the X direction
+    // Wrap cursor position in the X direction
     if (cursorX < 0)
         cursorX = GetCurrentPageColumnCount();
     if (cursorX > GetCurrentPageColumnCount())
         cursorX = 0;
 
-    //Handle cursor movement in X direction
-    if (sDpadDeltaX[dpadDir] != 0)
+    
+    // Handle moving on/off the button column
+    if (sDpadDeltaX[input] != 0)
     {
         if (cursorX == GetCurrentPageColumnCount())
         {
-            //We are now on the last column
-            task->tKbFunctionKey = cursorY;
-            cursorY = s4RowTo3RowTableY[cursorY];
+            // Moved onto button column
+            // Save cursor pos in tButtonId for moving back onto keys
+            task->tButtonId = cursorY;
+            cursorY = sKeyRowToButtonRow[cursorY];
         }
         else if (prevCursorX == GetCurrentPageColumnCount())
         {
-            if (cursorY == 1)
-                cursorY = task->tKbFunctionKey;
+            // Moved off button column
+            // If you're on the middle button, go to the row that
+            // the cursor was on previously (saved in tButtonId above)
+            if (cursorY == BUTTON_COUNT / 2)
+                cursorY = task->tButtonId;
             else
-                cursorY = gUnknown_0858BF50[cursorY];
+                cursorY = sButtonRowToKeyRow[cursorY];
         }
     }
 
+    // Wrap cursor position in the y direction
     if (cursorX == GetCurrentPageColumnCount())
     {
-        //There are only 3 keys on the last column, unlike the others,
-        //so wrap Y accordingly
+        // There are only 3 keys in the button column
+        // so wrap Y accordingly
         if (cursorY < 0)
-            cursorY = 2;
-        if (cursorY > 2)
+            cursorY = BUTTON_COUNT - 1;
+        if (cursorY >= BUTTON_COUNT)
             cursorY = 0;
+
         if (cursorY == 0)
-            task->tKbFunctionKey = FNKEY_BACK;
-        else if (cursorY == 2)
-            task->tKbFunctionKey = FNKEY_OK;
+            task->tButtonId = BUTTON_BACK;
+        else if (cursorY == BUTTON_COUNT - 1)
+            task->tButtonId = BUTTON_OK;
     }
     else
     {
         if (cursorY < 0)
-            cursorY = 3;
-        if (cursorY > 3)
+            cursorY = KBROW_COUNT - 1;
+        if (cursorY > KBROW_COUNT - 1)
             cursorY = 0;
     }
     SetCursorPos(cursorX, cursorY);
@@ -1471,55 +1701,55 @@ static void HandleDpadMovement(struct Task *task)
 
 #undef tState
 #undef tKeyboardEvent
-#undef tKbFunctionKey
+#undef tButtonId
 
-static void sub_80E4894(void)
+static void DrawNormalTextEntryBox(void)
 {
-    FillWindowPixelBuffer(gNamingScreenData->windows[3], PIXEL_FILL(1));
-    AddTextPrinterParameterized(gNamingScreenData->windows[3], 1, gNamingScreenData->template->title, 8, 1, 0, 0);
-    PutWindowTilemap(gNamingScreenData->windows[3]);
+    FillWindowPixelBuffer(sNamingScreen->windows[WIN_TEXT_ENTRY_BOX], PIXEL_FILL(1));
+    AddTextPrinterParameterized(sNamingScreen->windows[WIN_TEXT_ENTRY_BOX], 1, sNamingScreen->template->title, 8, 1, 0, 0);
+    PutWindowTilemap(sNamingScreen->windows[WIN_TEXT_ENTRY_BOX]);
 }
 
-static void sub_80E48E8(void)
+static void DrawMonTextEntryBox(void)
 {
-    u8 buffer[0x20];
+    u8 buffer[32];
 
-    StringCopy(buffer, gSpeciesNames[gNamingScreenData->monSpecies]);
-    StringAppendN(buffer, gNamingScreenData->template->title, 15);
-    FillWindowPixelBuffer(gNamingScreenData->windows[3], PIXEL_FILL(1));
-    AddTextPrinterParameterized(gNamingScreenData->windows[3], 1, buffer, 8, 1, 0, 0);
-    PutWindowTilemap(gNamingScreenData->windows[3]);
+    StringCopy(buffer, gSpeciesNames[sNamingScreen->monSpecies]);
+    StringAppendN(buffer, sNamingScreen->template->title, 15);
+    FillWindowPixelBuffer(sNamingScreen->windows[WIN_TEXT_ENTRY_BOX], PIXEL_FILL(1));
+    AddTextPrinterParameterized(sNamingScreen->windows[WIN_TEXT_ENTRY_BOX], 1, buffer, 8, 1, 0, 0);
+    PutWindowTilemap(sNamingScreen->windows[WIN_TEXT_ENTRY_BOX]);
 }
 
-static void (*const gUnknown_0858BF58[])(void) =
+static void (*const sDrawTextEntryBoxFuncs[])(void) =
 {
-    sub_80E4894,
-    sub_80E4894,
-    sub_80E48E8,
-    sub_80E48E8,
-    sub_80E4894,
+    [NAMING_SCREEN_PLAYER]     = DrawNormalTextEntryBox,
+    [NAMING_SCREEN_BOX]        = DrawNormalTextEntryBox,
+    [NAMING_SCREEN_CAUGHT_MON] = DrawMonTextEntryBox,
+    [NAMING_SCREEN_NICKNAME]   = DrawMonTextEntryBox,
+    [NAMING_SCREEN_WALDA]      = DrawNormalTextEntryBox,
 };
 
-static void sub_80E4964(void)
+static void DrawTextEntryBox(void)
 {
-    gUnknown_0858BF58[gNamingScreenData->templateNum]();
+    sDrawTextEntryBoxFuncs[sNamingScreen->templateNum]();
 }
 
-static void TaskDummy3(void);
-static void sub_80E49BC(void);
+static void DummyGenderIcon(void);
+static void DrawGenderIcon(void);
 
-static void (*const gUnknown_0858BF6C[])(void) =
+static void (*const sDrawGenderIconFuncs[])(void) =
 {
-    TaskDummy3,
-    sub_80E49BC,
+    [FALSE] = DummyGenderIcon,
+    [TRUE]  = DrawGenderIcon,
 };
 
-static void sub_80E498C(void)
+static void TryDrawGenderIcon(void)
 {
-    gUnknown_0858BF6C[gNamingScreenData->template->addGenderIcon]();
+    sDrawGenderIconFuncs[sNamingScreen->template->addGenderIcon]();
 }
 
-static void TaskDummy3(void)
+static void DummyGenderIcon(void)
 {
 
 }
@@ -1530,49 +1760,48 @@ static const u8 sGenderColors[2][3] =
     {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_RED, TEXT_COLOR_RED}
 };
 
-static void sub_80E49BC(void)
+static void DrawGenderIcon(void)
 {
-    u8 genderSymbol[2];
+    u8 text[2];
     bool8 isFemale = FALSE;
 
-    StringCopy(genderSymbol, gText_MaleSymbol);
-
-    if (gNamingScreenData->monGender != MON_GENDERLESS)
+    StringCopy(text, gText_MaleSymbol);
+    if (sNamingScreen->monGender != MON_GENDERLESS)
     {
-        if (gNamingScreenData->monGender == MON_FEMALE)
+        if (sNamingScreen->monGender == MON_FEMALE)
         {
-            StringCopy(genderSymbol, gText_FemaleSymbol);
+            StringCopy(text, gText_FemaleSymbol);
             isFemale = TRUE;
         }
-        AddTextPrinterParameterized3(gNamingScreenData->windows[2], 1, 0x68, 1, sGenderColors[isFemale], -1, genderSymbol);
+        AddTextPrinterParameterized3(sNamingScreen->windows[WIN_TEXT_ENTRY], 1, 0x68, 1, sGenderColors[isFemale], -1, text);
     }
 }
 
-static u8 GetCharAtKeyboardPos(s16 a, s16 b)
+static u8 GetCharAtKeyboardPos(s16 x, s16 y)
 {
-    return gUnknown_0858BE40[a + b * 8 + sub_80E3274() * 32];
+    return sKeyboardChars[x + y * KBCOL_COUNT + CurrentPageToKeyboardId() * KBCOL_COUNT * KBROW_COUNT];
 }
 
 
-static u8 GetTextCaretPosition(void)
+static u8 GetTextEntryPosition(void)
 {
     u8 i;
 
-    for (i = 0; i < gNamingScreenData->template->maxChars; i++)
+    for (i = 0; i < sNamingScreen->template->maxChars; i++)
     {
-        if (gNamingScreenData->textBuffer[i] == EOS)
+        if (sNamingScreen->textBuffer[i] == EOS)
             return i;
     }
-    return gNamingScreenData->template->maxChars - 1;
+    return sNamingScreen->template->maxChars - 1;
 }
 
 static u8 GetPreviousTextCaretPosition(void)
 {
     s8 i;
 
-    for (i = gNamingScreenData->template->maxChars - 1; i > 0; i--)
+    for (i = sNamingScreen->template->maxChars - 1; i > 0; i--)
     {
-        if (gNamingScreenData->textBuffer[i] != EOS)
+        if (sNamingScreen->textBuffer[i] != EOS)
             return i;
     }
     return 0;
@@ -1581,112 +1810,115 @@ static u8 GetPreviousTextCaretPosition(void)
 static void DeleteTextCharacter(void)
 {
     u8 index;
-    u8 var2;
+    u8 keyRole;
 
     index = GetPreviousTextCaretPosition();
-    gNamingScreenData->textBuffer[index] = 0;
-    sub_80E4D10();
+    sNamingScreen->textBuffer[index] = 0;
+    DrawTextEntry();
     CopyBgTilemapBufferToVram(3);
-    gNamingScreenData->textBuffer[index] = EOS;
-    var2 = GetKeyRoleAtCursorPos();
-    if (var2 == 0 || var2 == 2)
-        sub_80E3948(1, 0, 1);
+    sNamingScreen->textBuffer[index] = EOS;
+    keyRole = GetKeyRoleAtCursorPos();
+
+    // The below flashes the Back key once on delete
+    // It incorrectly leaves the Back key 1 shade lighter than its default
+    if (keyRole == KEY_ROLE_CHAR || keyRole == KEY_ROLE_BACKSPACE)
+        TryStartButtonFlash(BUTTON_BACK, FALSE, TRUE);
     PlaySE(SE_BOWA);
 }
 
-static bool8 sub_80E4B54(void)
+// Returns TRUE if the text entry is now full
+static bool8 AddTextCharacter(void)
 {
     s16 x;
     s16 y;
 
     GetCursorPos(&x, &y);
-    AddTextCharacter(GetCharAtKeyboardPos(x, y));
-    sub_80E4D10();
+    BufferCharacter(GetCharAtKeyboardPos(x, y));
+    DrawTextEntry();
     CopyBgTilemapBufferToVram(3);
     PlaySE(SE_SELECT);
 
-    if (GetPreviousTextCaretPosition() != gNamingScreenData->template->maxChars - 1)
+    if (GetPreviousTextCaretPosition() != sNamingScreen->template->maxChars - 1)
         return FALSE;
     else
         return TRUE;
 }
 
-static void AddTextCharacter(u8 ch)
+static void BufferCharacter(u8 ch)
 {
-    u8 index = GetTextCaretPosition();
-
-    gNamingScreenData->textBuffer[index] = ch;
+    u8 index = GetTextEntryPosition();
+    sNamingScreen->textBuffer[index] = ch;
 }
 
-static void sub_80E4BE4(void)
+static void SaveInputText(void)
 {
     u8 i;
 
-    for (i = 0; i < gNamingScreenData->template->maxChars; i++)
+    for (i = 0; i < sNamingScreen->template->maxChars; i++)
     {
-        if (gNamingScreenData->textBuffer[i] != CHAR_SPACE && gNamingScreenData->textBuffer[i] != EOS)
+        if (sNamingScreen->textBuffer[i] != CHAR_SPACE && sNamingScreen->textBuffer[i] != EOS)
         {
-            StringCopyN(gNamingScreenData->destBuffer, gNamingScreenData->textBuffer, gNamingScreenData->template->maxChars + 1);
+            StringCopyN(sNamingScreen->destBuffer, sNamingScreen->textBuffer, sNamingScreen->template->maxChars + 1);
             break;
         }
     }
 }
 
-static void choose_name_or_words_screen_load_bg_tile_patterns(void)
+static void LoadGfx(void)
 {
-    LZ77UnCompWram(gNamingScreenMenu_Gfx, gNamingScreenData->tileBuffer);
-    LoadBgTiles(1, gNamingScreenData->tileBuffer, 0x600, 0);
-    LoadBgTiles(2, gNamingScreenData->tileBuffer, 0x600, 0);
-    LoadBgTiles(3, gNamingScreenData->tileBuffer, 0x600, 0);
-    LoadSpriteSheets(gUnknown_0858C1C8);
-    LoadSpritePalettes(gUnknown_0858C230);
+    LZ77UnCompWram(gNamingScreenMenu_Gfx, sNamingScreen->tileBuffer);
+    LoadBgTiles(1, sNamingScreen->tileBuffer, sizeof(sNamingScreen->tileBuffer), 0);
+    LoadBgTiles(2, sNamingScreen->tileBuffer, sizeof(sNamingScreen->tileBuffer), 0);
+    LoadBgTiles(3, sNamingScreen->tileBuffer, sizeof(sNamingScreen->tileBuffer), 0);
+    LoadSpriteSheets(sSpriteSheets);
+    LoadSpritePalettes(sSpritePalettes);
 }
 
-static void sub_80E4CB8(void)
+static void CreateHelperTasks(void)
 {
-    InputInit();
-    sub_80E3920();
+    CreateInputHandlerTask();
+    CreateButtonFlashTask();
 }
 
-static void choose_name_or_words_screen_apply_bg_pals(void)
+static void LoadPalettes(void)
 {
     LoadPalette(gNamingScreenMenu_Pal, 0, 0xC0);
-    LoadPalette(gUnknown_0858BD78, 0xA0, sizeof(gUnknown_0858BD78));
-    LoadPalette(stdpal_get(2), 0xB0, 0x20);
+    LoadPalette(sKeyboard_Pal, 0xA0, sizeof(sKeyboard_Pal));
+    LoadPalette(GetTextWindowPalette(2), 0xB0, 0x20);
 }
 
-static void sub_80E4CF8(u8 bg, const void *src)
+static void DrawBgTilemap(u8 bg, const void *src)
 {
     CopyToBgTilemapBuffer(bg, src, 0, 0);
 }
 
-static void nullsub_10(u8 a1, u8 page)
+static void NamingScreen_Dummy(u8 bg, u8 page)
 {
 
 }
 
-static void sub_80E4D10(void)
+static void DrawTextEntry(void)
 {
     u8 i;
     u8 temp[2];
-    u16 unk2;
-    u8 maxChars = gNamingScreenData->template->maxChars;
-    u16 unk = gNamingScreenData->inputCharBaseXPos - 0x40;
+    u16 extraWidth;
+    u8 maxChars = sNamingScreen->template->maxChars;
+    u16 x = sNamingScreen->inputCharBaseXPos - 0x40;
 
-    FillWindowPixelBuffer(gNamingScreenData->windows[2], PIXEL_FILL(1));
+    FillWindowPixelBuffer(sNamingScreen->windows[WIN_TEXT_ENTRY], PIXEL_FILL(1));
 
     for (i = 0; i < maxChars; i++)
     {
-        temp[0] = gNamingScreenData->textBuffer[i];
+        temp[0] = sNamingScreen->textBuffer[i];
         temp[1] = gText_ExpandedPlaceholder_Empty[0];
-        unk2 = (IsLetter(temp[0]) == TRUE) ? 2 : 0;
+        extraWidth = (IsWideLetter(temp[0]) == TRUE) ? 2 : 0;
 
-        AddTextPrinterParameterized(gNamingScreenData->windows[2], 1, temp, i * 8 + unk + unk2, 1, 0xFF, NULL);
+        AddTextPrinterParameterized(sNamingScreen->windows[WIN_TEXT_ENTRY], 1, temp, i * 8 + x + extraWidth, 1, 0xFF, NULL);
     }
 
-    sub_80E498C();
-    CopyWindowToVram(gNamingScreenData->windows[2], 2);
-    PutWindowTilemap(gNamingScreenData->windows[2]);
+    TryDrawGenderIcon();
+    CopyWindowToVram(sNamingScreen->windows[WIN_TEXT_ENTRY], 2);
+    PutWindowTilemap(sNamingScreen->windows[WIN_TEXT_ENTRY]);
 }
 
 struct TextColor   // Needed because of alignment
@@ -1705,77 +1937,77 @@ static const struct TextColor sTextColorStruct =
 
 static const u8 sFillValues[KBPAGE_COUNT] =
 {
-    [KBPAGE_LETTERS_LOWER] = PIXEL_FILL(0xE),
-    [KBPAGE_LETTERS_UPPER] = PIXEL_FILL(0xD),
-    [KBPAGE_SYMBOLS] = PIXEL_FILL(0xF)
+    [KEYBOARD_LETTERS_LOWER] = PIXEL_FILL(14),
+    [KEYBOARD_LETTERS_UPPER] = PIXEL_FILL(13),
+    [KEYBOARD_SYMBOLS]       = PIXEL_FILL(15)
 };
 
 static const u8 *const sKeyboardTextColors[KBPAGE_COUNT] =
 {
-    [KBPAGE_LETTERS_LOWER] = sTextColorStruct.colors[1],
-    [KBPAGE_LETTERS_UPPER] = sTextColorStruct.colors[0],
-    [KBPAGE_SYMBOLS] = sTextColorStruct.colors[2]
+    [KEYBOARD_LETTERS_LOWER] = sTextColorStruct.colors[1],
+    [KEYBOARD_LETTERS_UPPER] = sTextColorStruct.colors[0],
+    [KEYBOARD_SYMBOLS]       = sTextColorStruct.colors[2]
 };
 
-static void sub_80E4DE4(u8 window, u8 page)
+static void PrintKeyboardKeys(u8 window, u8 page)
 {
     u8 i;
 
     FillWindowPixelBuffer(window, sFillValues[page]);
 
     for (i = 0; i < KBROW_COUNT; i++)
-    {
         AddTextPrinterParameterized3(window, 1, 0, i * 16 + 1, sKeyboardTextColors[page], 0, sNamingScreenKeyboardText[page][i]);
-    }
 
     PutWindowTilemap(window);
 }
 
-static const u8 *const gUnknown_0858BF98[] =
+static const u8 *const sNextKeyboardPageTilemaps[] =
 {
-    gUnknown_08DD4620,
-    gUnknown_08DD46E0,
-    gUnknown_08DD47A0
+    [KBPAGE_SYMBOLS] = gNamingScreenKeyboardUpper_Tilemap,
+    [KBPAGE_LETTERS_UPPER] = gNamingScreenKeyboardLower_Tilemap, // lower
+    [KBPAGE_LETTERS_LOWER] = gNamingScreenKeyboardSymbols_Tilemap  // symbols
 };
 
-static void sub_80E4E5C(void)
+// There are always 2 keyboard pages drawn, the current page and the one that will shown next if the player swaps
+// When the page swap is complete this function invisibly replaces the old page with the new next one
+static void DrawKeyboardPageOnDeck(void)
 {
-    u8 unk1;
-    u8 unk2;
-    u8 unk3;
+    u8 bg;
+    u8 bg_;
+    u8 windowId;
     u8 bg1Priority = GetGpuReg(REG_OFFSET_BG1CNT) & 3;
     u8 bg2Priority = GetGpuReg(REG_OFFSET_BG2CNT) & 3;
 
     if (bg1Priority > bg2Priority)
     {
-        unk1 = 1;
-        unk2 = 1;
-        unk3 = gNamingScreenData->windows[0];
+        bg = 1;
+        bg_ = 1;
+        windowId = sNamingScreen->windows[WIN_KB_PAGE_1];
     }
     else
     {
-        unk1 = 2;
-        unk2 = 2;
-        unk3 = gNamingScreenData->windows[1];
+        bg = 2;
+        bg_ = 2;
+        windowId = sNamingScreen->windows[WIN_KB_PAGE_2];
     }
 
-    sub_80E4CF8(unk1, gUnknown_0858BF98[gNamingScreenData->currentPage]);
-    sub_80E4DE4(unk3, sub_80E3254());
-    nullsub_10(unk1, sub_80E3254());
-    CopyBgTilemapBufferToVram(unk2);
+    DrawBgTilemap(bg, sNextKeyboardPageTilemaps[sNamingScreen->currentPage]);
+    PrintKeyboardKeys(windowId, CurrentPageToNextKeyboardId());
+    NamingScreen_Dummy(bg, CurrentPageToNextKeyboardId());
+    CopyBgTilemapBufferToVram(bg_);
 }
 
-static void sub_80E4EF0(void)
+static void PrintControls(void)
 {
     const u8 color[3] = { TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY };
 
-    FillWindowPixelBuffer(gNamingScreenData->windows[4], PIXEL_FILL(15));
-    AddTextPrinterParameterized3(gNamingScreenData->windows[4], 0, 2, 1, color, 0, gText_MoveOkBack);
-    PutWindowTilemap(gNamingScreenData->windows[4]);
-    CopyWindowToVram(gNamingScreenData->windows[4], 3);
+    FillWindowPixelBuffer(sNamingScreen->windows[WIN_BANNER], PIXEL_FILL(15));
+    AddTextPrinterParameterized3(sNamingScreen->windows[WIN_BANNER], 0, 2, 1, color, 0, gText_MoveOkBack);
+    PutWindowTilemap(sNamingScreen->windows[WIN_BANNER]);
+    CopyWindowToVram(sNamingScreen->windows[WIN_BANNER], 3);
 }
 
-static void sub_80E4F58(void)
+static void CB2_NamingScreen(void)
 {
     RunTasks();
     AnimateSprites();
@@ -1783,13 +2015,13 @@ static void sub_80E4F58(void)
     UpdatePaletteFade();
 }
 
-static void NamingScreen_TurnOffScreen(void)
+static void ResetVHBlank(void)
 {
     SetVBlankCallback(NULL);
     SetHBlankCallback(NULL);
 }
 
-static void NamingScreen_InitDisplayMode(void)
+static void SetVBlank(void)
 {
     SetVBlankCallback(VBlankCB_NamingScreen);
 }
@@ -1799,15 +2031,15 @@ static void VBlankCB_NamingScreen(void)
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
-    SetGpuReg(REG_OFFSET_BG1VOFS, gNamingScreenData->bg1vOffset);
-    SetGpuReg(REG_OFFSET_BG2VOFS, gNamingScreenData->bg2vOffset);
+    SetGpuReg(REG_OFFSET_BG1VOFS, sNamingScreen->bg1vOffset);
+    SetGpuReg(REG_OFFSET_BG2VOFS, sNamingScreen->bg2vOffset);
     SetGpuReg(REG_OFFSET_BG1CNT, GetGpuReg(REG_OFFSET_BG1CNT) & 0xFFFC);
-    SetGpuRegBits(REG_OFFSET_BG1CNT, gNamingScreenData->bg1Priority);
+    SetGpuRegBits(REG_OFFSET_BG1CNT, sNamingScreen->bg1Priority);
     SetGpuReg(REG_OFFSET_BG2CNT, GetGpuReg(REG_OFFSET_BG2CNT) & 0xFFFC);
-    SetGpuRegBits(REG_OFFSET_BG2CNT, gNamingScreenData->bg2Priority);
+    SetGpuRegBits(REG_OFFSET_BG2CNT, sNamingScreen->bg2Priority);
 }
 
-static void sub_80E501C(void)
+static void NamingScreen_ShowBgs(void)
 {
     ShowBg(0);
     ShowBg(1);
@@ -1815,7 +2047,8 @@ static void sub_80E501C(void)
     ShowBg(3);
 }
 
-static bool8 IsLetter(u8 character)
+// Always false (presumably for non-latin languages)
+static bool8 IsWideLetter(u8 character)
 {
     u8 i;
 
@@ -1827,69 +2060,71 @@ static bool8 IsLetter(u8 character)
     return FALSE;
 }
 
-static void sub_80E5074(void)
+// Debug? Unused, and arguments aren't sensible for non-player screens.
+static void Debug_NamingScreenPlayer(void)
 {
-    DoNamingScreen(0, gSaveBlock2Ptr->playerName, gSaveBlock2Ptr->playerGender, 0, 0, CB2_ReturnToFieldWithOpenMenu);
+    DoNamingScreen(NAMING_SCREEN_PLAYER, gSaveBlock2Ptr->playerName, gSaveBlock2Ptr->playerGender, 0, 0, CB2_ReturnToFieldWithOpenMenu);
 }
 
-static void sub_80E509C(void)
+static void Debug_NamingScreenBox(void)
 {
-    DoNamingScreen(1, gSaveBlock2Ptr->playerName, gSaveBlock2Ptr->playerGender, 0, 0, CB2_ReturnToFieldWithOpenMenu);
+    DoNamingScreen(NAMING_SCREEN_BOX, gSaveBlock2Ptr->playerName, gSaveBlock2Ptr->playerGender, 0, 0, CB2_ReturnToFieldWithOpenMenu);
 }
 
-static void sub_80E50C4(void)
+static void Debug_NamingScreenCaughtMon(void)
 {
-    DoNamingScreen(2, gSaveBlock2Ptr->playerName, gSaveBlock2Ptr->playerGender, 0, 0, CB2_ReturnToFieldWithOpenMenu);
+    DoNamingScreen(NAMING_SCREEN_CAUGHT_MON, gSaveBlock2Ptr->playerName, gSaveBlock2Ptr->playerGender, 0, 0, CB2_ReturnToFieldWithOpenMenu);
 }
 
-static void sub_80E50EC(void)
+static void Debug_NamingScreenNickname(void)
 {
-    DoNamingScreen(3, gSaveBlock2Ptr->playerName, gSaveBlock2Ptr->playerGender, 0, 0, CB2_ReturnToFieldWithOpenMenu);
+    DoNamingScreen(NAMING_SCREEN_NICKNAME, gSaveBlock2Ptr->playerName, gSaveBlock2Ptr->playerGender, 0, 0, CB2_ReturnToFieldWithOpenMenu);
 }
 
 //--------------------------------------------------
 // Forward-declared variables
 //--------------------------------------------------
 
-static const struct NamingScreenTemplate playerNamingScreenTemplate =
+// Initial pages below are pointless, they're overwritten with KBPAGE_LETTERS_UPPER in MainState_FadeIn()
+static const struct NamingScreenTemplate sPlayerNamingScreenTemplate =
 {
-    .copyExistingString = 0,
+    .copyExistingString = FALSE,
     .maxChars = 7,
     .iconFunction = 1,
-    .addGenderIcon = 0,
+    .addGenderIcon = FALSE,
     .initialPage = KBPAGE_LETTERS_UPPER,
     .unused = 35,
     .title = gText_YourName,
 };
 
-static const struct NamingScreenTemplate pcBoxNamingTemplate =
+static const struct NamingScreenTemplate sPCBoxNamingTemplate =
 {
-    .copyExistingString = 0,
+    .copyExistingString = FALSE,
     .maxChars = 8,
     .iconFunction = 2,
-    .addGenderIcon = 0,
+    .addGenderIcon = FALSE,
     .initialPage = KBPAGE_LETTERS_UPPER,
     .unused = 19,
     .title = gText_BoxName,
 };
 
-static const struct NamingScreenTemplate monNamingScreenTemplate =
+static const struct NamingScreenTemplate sMonNamingScreenTemplate =
 {
-    .copyExistingString = 0,
+    .copyExistingString = FALSE,
     .maxChars = 10,
     .iconFunction = 3,
-    .addGenderIcon = 1,
+    .addGenderIcon = TRUE,
     .initialPage = KBPAGE_LETTERS_UPPER,
     .unused = 35,
     .title = gText_PkmnsNickname,
 };
 
-static const struct NamingScreenTemplate wandaWordsScreenTemplate =
+static const struct NamingScreenTemplate sWaldaWordsScreenTemplate =
 {
-    .copyExistingString = 1,
+    .copyExistingString = TRUE,
     .maxChars = 15,
     .iconFunction = 4,
-    .addGenderIcon = 0,
+    .addGenderIcon = FALSE,
     .initialPage = KBPAGE_LETTERS_UPPER,
     .unused = 11,
     .title = gText_TellHimTheWords,
@@ -1897,14 +2132,14 @@ static const struct NamingScreenTemplate wandaWordsScreenTemplate =
 
 static const struct NamingScreenTemplate *const sNamingScreenTemplates[] =
 {
-    &playerNamingScreenTemplate,
-    &pcBoxNamingTemplate,
-    &monNamingScreenTemplate,
-    &monNamingScreenTemplate,
-    &wandaWordsScreenTemplate,
+    [NAMING_SCREEN_PLAYER]     = &sPlayerNamingScreenTemplate,
+    [NAMING_SCREEN_BOX]        = &sPCBoxNamingTemplate,
+    [NAMING_SCREEN_CAUGHT_MON] = &sMonNamingScreenTemplate,
+    [NAMING_SCREEN_NICKNAME]   = &sMonNamingScreenTemplate,
+    [NAMING_SCREEN_WALDA]      = &sWaldaWordsScreenTemplate,
 };
 
-const struct OamData gOamData_858BFEC =
+static const struct OamData sOam_8x8 =
 {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
@@ -1918,7 +2153,7 @@ const struct OamData gOamData_858BFEC =
     .paletteNum = 0,
 };
 
-const struct OamData gOamData_858BFF4 =
+static const struct OamData sOam_16x16 =
 {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
@@ -1932,7 +2167,7 @@ const struct OamData gOamData_858BFF4 =
     .paletteNum = 0,
 };
 
-const struct OamData gOamData_858BFFC =
+static const struct OamData sOam_32x16 =
 {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
@@ -1946,7 +2181,7 @@ const struct OamData gOamData_858BFFC =
     .paletteNum = 0,
 };
 
-static const struct Subsprite gUnknown_0858C004[] =
+static const struct Subsprite sSubsprites_PageSwapFrame[] =
 {
     {
         .x = -20,  
@@ -2014,7 +2249,7 @@ static const struct Subsprite gUnknown_0858C004[] =
     }
 };
 
-static const struct Subsprite gUnknown_0858C024[] =
+static const struct Subsprite sSubsprites_PageSwapText[] =
 {
     {
         .x = -12,  
@@ -2034,7 +2269,7 @@ static const struct Subsprite gUnknown_0858C024[] =
     }
 };
 
-static const struct Subsprite gUnknown_0858C02C[] =
+static const struct Subsprite sSubsprites_Button[] =
 {
     {
         .x = -20,  
@@ -2086,7 +2321,7 @@ static const struct Subsprite gUnknown_0858C02C[] =
     }
 };
 
-static const struct Subsprite gUnknown_0858C044[] =
+static const struct Subsprite sSubsprites_PCIcon[] =
 {
     {
         .x = -8,   
@@ -2114,186 +2349,186 @@ static const struct Subsprite gUnknown_0858C044[] =
     }
 };
 
-static const struct SubspriteTable gUnknown_0858C050[] =
+static const struct SubspriteTable sSubspriteTable_PageSwapFrame[] =
 {
-    {ARRAY_COUNT(gUnknown_0858C004), gUnknown_0858C004}
+    {ARRAY_COUNT(sSubsprites_PageSwapFrame), sSubsprites_PageSwapFrame}
 };
 
-static const struct SubspriteTable gUnknown_0858C058[] =
+static const struct SubspriteTable sSubspriteTable_PageSwapText[] =
 {
-    {ARRAY_COUNT(gUnknown_0858C024), gUnknown_0858C024},
-    {ARRAY_COUNT(gUnknown_0858C024), gUnknown_0858C024},
-    {ARRAY_COUNT(gUnknown_0858C024), gUnknown_0858C024}
+    {ARRAY_COUNT(sSubsprites_PageSwapText), sSubsprites_PageSwapText},
+    {ARRAY_COUNT(sSubsprites_PageSwapText), sSubsprites_PageSwapText},
+    {ARRAY_COUNT(sSubsprites_PageSwapText), sSubsprites_PageSwapText}
 };
 
-static const struct SubspriteTable gUnknown_0858C070[] =
+static const struct SubspriteTable sSubspriteTable_Button[] =
 {
-    {ARRAY_COUNT(gUnknown_0858C02C), gUnknown_0858C02C}
+    {ARRAY_COUNT(sSubsprites_Button), sSubsprites_Button}
 };
 
-static const struct SubspriteTable gUnknown_0858C078[] =
+static const struct SubspriteTable sSubspriteTable_PCIcon[] =
 {
-    {ARRAY_COUNT(gUnknown_0858C044), gUnknown_0858C044}
+    {ARRAY_COUNT(sSubsprites_PCIcon), sSubsprites_PCIcon}
 };
 
-static const struct SpriteFrameImage gUnknown_0858C080[] =
+static const struct SpriteFrameImage sImageTable_PCIcon[] =
 {
-    {gSpriteImage_858BBF8, sizeof(gSpriteImage_858BBF8)},
-    {gSpriteImage_858BCB8, sizeof(gSpriteImage_858BCB8)},
+    {sPCIconOff_Gfx, sizeof(sPCIconOff_Gfx)},
+    {sPCIconOn_Gfx, sizeof(sPCIconOn_Gfx)},
 };
 
-static const union AnimCmd gSpriteAnim_858C090[] =
+static const union AnimCmd sAnim_Loop[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd gSpriteAnim_858C098[] =
+static const union AnimCmd sAnim_CursorSquish[] =
 {
     ANIMCMD_FRAME(4, 8),
     ANIMCMD_FRAME(8, 8),
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_858C0A4[] =
+static const union AnimCmd sAnim_PCIcon[] =
 {
     ANIMCMD_FRAME(0, 2),
     ANIMCMD_FRAME(1, 2),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd *const gSpriteAnimTable_858C0B0[] =
+static const union AnimCmd *const sAnims_Loop[] =
 {
-    gSpriteAnim_858C090
+    sAnim_Loop
 };
 
-static const union AnimCmd *const gSpriteAnimTable_858C0B4[] =
+static const union AnimCmd *const sAnims_Cursor[] =
 {
-    gSpriteAnim_858C090,
-    gSpriteAnim_858C098
+    sAnim_Loop,
+    sAnim_CursorSquish
 };
 
-static const union AnimCmd *const gSpriteAnimTable_858C0BC[] =
+static const union AnimCmd *const sAnims_PCIcon[] =
 {
-    gSpriteAnim_858C0A4
+    sAnim_PCIcon
 };
 
-static const struct SpriteTemplate gUnknown_0858C0C0 =
+static const struct SpriteTemplate sSpriteTemplate_PageSwapFrame =
 {
-    .tileTag = 0x0002,
-    .paletteTag = 0x0004,
-    .oam = &gOamData_858BFEC,
-    .anims = gSpriteAnimTable_858C0B0,
+    .tileTag = GFXTAG_PAGE_SWAP_FRAME,
+    .paletteTag = PALTAG_PAGE_SWAP,
+    .oam = &sOam_8x8,
+    .anims = sAnims_Loop,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_80E4084
+    .callback = SpriteCB_PageSwap
 };
 
-static const struct SpriteTemplate gUnknown_0858C0D8 =
+static const struct SpriteTemplate sSpriteTemplate_PageSwapButton =
 {
-    .tileTag = 0x0003,
-    .paletteTag = 0x0001,
-    .oam = &gOamData_858BFFC,
-    .anims = gSpriteAnimTable_858C0B0,
+    .tileTag = GFXTAG_PAGE_SWAP_BUTTON,
+    .paletteTag = PALTAG_PAGE_SWAP_UPPER,
+    .oam = &sOam_32x16,
+    .anims = sAnims_Loop,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gUnknown_0858C0F0 =
+static const struct SpriteTemplate sSpriteTemplate_PageSwapText =
 {
-    .tileTag = 0x0004,
-    .paletteTag = 0x0004,
-    .oam = &gOamData_858BFEC,
-    .anims = gSpriteAnimTable_858C0B0,
+    .tileTag = GFXTAG_PAGE_SWAP_UPPER,
+    .paletteTag = PALTAG_PAGE_SWAP,
+    .oam = &sOam_8x8,
+    .anims = sAnims_Loop,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gUnknown_0858C108 =
+static const struct SpriteTemplate sSpriteTemplate_BackButton =
 {
-    .tileTag = 0x0000,
-    .paletteTag = 0x0006,
-    .oam = &gOamData_858BFEC,
-    .anims = gSpriteAnimTable_858C0B0,
+    .tileTag = GFXTAG_BACK_BUTTON,
+    .paletteTag = PALTAG_BACK_BUTTON,
+    .oam = &sOam_8x8,
+    .anims = sAnims_Loop,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gUnknown_0858C120 =
+static const struct SpriteTemplate sSpriteTemplate_OkButton =
 {
-    .tileTag = 0x0001,
-    .paletteTag = 0x0007,
-    .oam = &gOamData_858BFEC,
-    .anims = gSpriteAnimTable_858C0B0,
+    .tileTag = GFXTAG_OK_BUTTON,
+    .paletteTag = PALTAG_OK_BUTTON,
+    .oam = &sOam_8x8,
+    .anims = sAnims_Loop,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gUnknown_0858C138 =
+static const struct SpriteTemplate sSpriteTemplate_Cursor =
 {
-    .tileTag = 0x0007,
-    .paletteTag = 0x0005,
-    .oam = &gOamData_858BFF4,
-    .anims = gSpriteAnimTable_858C0B4,
+    .tileTag = GFXTAG_CURSOR,
+    .paletteTag = PALTAG_CURSOR,
+    .oam = &sOam_16x16,
+    .anims = sAnims_Cursor,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_80E3B30
+    .callback = SpriteCB_Cursor
 };
 
 static const struct SpriteTemplate sSpriteTemplate_InputArrow =
 {
-    .tileTag = 0x000A,
-    .paletteTag = 0x0003,
-    .oam = &gOamData_858BFEC,
-    .anims = gSpriteAnimTable_858C0B0,
+    .tileTag = GFXTAG_INPUT_ARROW,
+    .paletteTag = PALTAG_PAGE_SWAP_OTHERS,
+    .oam = &sOam_8x8,
+    .anims = sAnims_Loop,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_80E3C20
+    .callback = SpriteCB_InputArrow
 };
 
 static const struct SpriteTemplate sSpriteTemplate_Underscore =
 {
-    .tileTag = 0x000B,
-    .paletteTag = 0x0003,
-    .oam = &gOamData_858BFEC,
-    .anims = gSpriteAnimTable_858C0B0,
+    .tileTag = GFXTAG_UNDERSCORE,
+    .paletteTag = PALTAG_PAGE_SWAP_OTHERS,
+    .oam = &sOam_8x8,
+    .anims = sAnims_Loop,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_80E3C6C
+    .callback = SpriteCB_Underscore
 };
 
-static const struct SpriteTemplate gUnknown_0858C180 =
+static const struct SpriteTemplate sSpriteTemplate_PCIcon =
 {
     .tileTag = 0xFFFF,
-    .paletteTag = 0x0000,
-    .oam = &gOamData_858BFEC,
-    .anims = gSpriteAnimTable_858C0BC,
-    .images = gUnknown_0858C080,
+    .paletteTag = PALTAG_PC_ICON,
+    .oam = &sOam_8x8,
+    .anims = sAnims_PCIcon,
+    .images = sImageTable_PCIcon,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
 static const u8* const sNamingScreenKeyboardText[KBPAGE_COUNT][KBROW_COUNT] =
 {
-    [KBPAGE_LETTERS_LOWER] = 
+    [KEYBOARD_LETTERS_LOWER] = 
     {
         gText_NamingScreenKeyboard_abcdef,
         gText_NamingScreenKeyboard_ghijkl,
         gText_NamingScreenKeyboard_mnopqrs,
         gText_NamingScreenKeyboard_tuvwxyz
     },
-    [KBPAGE_LETTERS_UPPER] = 
+    [KEYBOARD_LETTERS_UPPER] = 
     {
         gText_NamingScreenKeyboard_ABCDEF,
         gText_NamingScreenKeyboard_GHIJKL,
         gText_NamingScreenKeyboard_MNOPQRS,
         gText_NamingScreenKeyboard_TUVWXYZ
     },
-    [KBPAGE_SYMBOLS] = 
+    [KEYBOARD_SYMBOLS] = 
     {
         gText_NamingScreenKeyboard_01234,
         gText_NamingScreenKeyboard_56789,
@@ -2302,34 +2537,34 @@ static const u8* const sNamingScreenKeyboardText[KBPAGE_COUNT][KBROW_COUNT] =
     },
 };
 
-static const struct SpriteSheet gUnknown_0858C1C8[] =
-{
-    {gNamingScreenRWindow_Gfx + 0x280,          0x1E0,  0x0000},
-    {gNamingScreenRWindow_Gfx + 0x460,          0x1E0,  0x0001},
-    {gNamingScreenRWindow_Gfx,                  0x280,  0x0002},
-    {gNamingScreenKeyboardButton_Gfx + 0x20,    0x100,  0x0003},
-    {gNamingScreenROptions_Gfx,                 0x060,  0x0004},
-    {gNamingScreenROptions_Gfx + 0xA0,          0x060,  0x0005},
-    {gNamingScreenROptions_Gfx + 0x140,         0x060,  0x0006},
-    {gNamingScreenCursor_Gfx,                   0x080,  0x0007},
-    {gNamingScreenCursor_Gfx + 0xA0,            0x080,  0x0008},
-    {gNamingScreenCursor_Gfx + 0x140,           0x080,  0x0009},
-    {gNamingScreenRightPointingTriangleTiles,   0x020,  0x000A},
-    {gNamingScreenUnderscoreTiles,              0x020,  0x000B},
-    {NULL}
-};
-
-static const struct SpritePalette gUnknown_0858C230[] =
-{
-    {gNamingScreenMenu_Pal,         0x0000},
-    {gNamingScreenMenu_Pal + 0x10,  0x0001},
-    {gNamingScreenMenu_Pal + 0x20,  0x0002},
-    {gNamingScreenMenu_Pal + 0x30,  0x0003},
-    {gNamingScreenMenu_Pal + 0x40,  0x0004},
-    {gNamingScreenMenu_Pal + 0x50,  0x0005},
-    {gNamingScreenMenu_Pal + 0x40,  0x0006},
-    {gNamingScreenMenu_Pal + 0x40,  0x0007},
-    {NULL}
+static const struct SpriteSheet sSpriteSheets[] =
+{
+    {gNamingScreenRWindow_Gfx + 0x280,          0x1E0,  GFXTAG_BACK_BUTTON},
+    {gNamingScreenRWindow_Gfx + 0x460,          0x1E0,  GFXTAG_OK_BUTTON},
+    {gNamingScreenRWindow_Gfx,                  0x280,  GFXTAG_PAGE_SWAP_FRAME},
+    {gNamingScreenPageButton_Gfx + 0x20,        0x100,  GFXTAG_PAGE_SWAP_BUTTON},
+    {gNamingScreenROptions_Gfx,                 0x060,  GFXTAG_PAGE_SWAP_UPPER},
+    {gNamingScreenROptions_Gfx + 0xA0,          0x060,  GFXTAG_PAGE_SWAP_LOWER},
+    {gNamingScreenROptions_Gfx + 0x140,         0x060,  GFXTAG_PAGE_SWAP_OTHERS},
+    {gNamingScreenCursor_Gfx,                   0x080,  GFXTAG_CURSOR},
+    {gNamingScreenCursor_Gfx + 0xA0,            0x080,  GFXTAG_CURSOR_SQUISHED},
+    {gNamingScreenCursor_Gfx + 0x140,           0x080,  GFXTAG_CURSOR_FILLED},
+    {gNamingScreenInputArrow_Gfx,               0x020,  GFXTAG_INPUT_ARROW},
+    {gNamingScreenUnderscore_Gfx,               0x020,  GFXTAG_UNDERSCORE},
+    {}
+};
+
+static const struct SpritePalette sSpritePalettes[] =
+{
+    {gNamingScreenMenu_Pal,         PALTAG_PC_ICON},
+    {gNamingScreenMenu_Pal + 0x10,  PALTAG_PAGE_SWAP_UPPER},
+    {gNamingScreenMenu_Pal + 0x20,  PALTAG_PAGE_SWAP_LOWER},
+    {gNamingScreenMenu_Pal + 0x30,  PALTAG_PAGE_SWAP_OTHERS},
+    {gNamingScreenMenu_Pal + 0x40,  PALTAG_PAGE_SWAP},
+    {gNamingScreenMenu_Pal + 0x50,  PALTAG_CURSOR},
+    {gNamingScreenMenu_Pal + 0x40,  PALTAG_BACK_BUTTON},
+    {gNamingScreenMenu_Pal + 0x40,  PALTAG_OK_BUTTON},
+    {}
 };
 
 
diff --git a/src/option_menu.c b/src/option_menu.c
index e0473b5c3..1cf0bad2e 100644
--- a/src/option_menu.c
+++ b/src/option_menu.c
@@ -77,11 +77,9 @@ static void DrawTextOption(void);
 static void DrawOptionMenuTexts(void);
 static void sub_80BB154(void);
 
-// EWRAM vars
 EWRAM_DATA static bool8 sArrowPressed = FALSE;
 
-// const rom data
-static const u16 sUnknown_0855C604[] = INCBIN_U16("graphics/misc/option_menu_text.gbapal");
+static const u16 sOptionMenuText_Pal[] = INCBIN_U16("graphics/misc/option_menu_text.gbapal");
 // note: this is only used in the Japanese release
 static const u8 sEqualSignGfx[] = INCBIN_U8("graphics/misc/option_menu_equals_sign.4bpp");
 
@@ -141,7 +139,7 @@ static const struct BgTemplate sOptionMenuBgTemplates[] =
    }
 };
 
-static const u16 sUnknown_0855C6A0[] = {0x7E51};
+static const u16 sOptionMenuBg_Pal[] = {RGB(17, 18, 31)};
 
 // code
 static void MainCB2(void)
@@ -209,12 +207,12 @@ void CB2_InitOptionMenu(void)
         gMain.state++;
         break;
     case 4:
-        LoadPalette(sUnknown_0855C6A0, 0, sizeof(sUnknown_0855C6A0));
+        LoadPalette(sOptionMenuBg_Pal, 0, sizeof(sOptionMenuBg_Pal));
         LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->pal, 0x70, 0x20);
         gMain.state++;
         break;
     case 5:
-        LoadPalette(sUnknown_0855C604, 0x10, sizeof(sUnknown_0855C604));
+        LoadPalette(sOptionMenuText_Pal, 16, sizeof(sOptionMenuText_Pal));
         gMain.state++;
         break;
     case 6:
diff --git a/src/overworld.c b/src/overworld.c
index 1d9f70430..2d838fc4d 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -7,10 +7,11 @@
 #include "cable_club.h"
 #include "clock.h"
 #include "event_data.h"
+#include "event_object_movement.h"
+#include "event_scripts.h"
 #include "field_camera.h"
 #include "field_control_avatar.h"
 #include "field_effect.h"
-#include "event_object_movement.h"
 #include "field_message_box.h"
 #include "field_player_avatar.h"
 #include "field_screen_effect.h"
@@ -22,6 +23,7 @@
 #include "fldeff.h"
 #include "gpu_regs.h"
 #include "heal_location.h"
+#include "io_reg.h"
 #include "link.h"
 #include "link_rfu.h"
 #include "load_save.h"
@@ -82,58 +84,36 @@
 #define FACING_FORCED_LEFT 9
 #define FACING_FORCED_RIGHT 10
 
-// event scripts
-extern const u8 EventScript_WhiteOut[];
-extern const u8 EventScript_ResetMrBriney[];
-extern const u8 EventScript_DoLinkRoomExit[];
-extern const u8 CableClub_EventScript_TooBusyToNotice[];
-extern const u8 CableClub_EventScript_ReadTrainerCard[];
-extern const u8 CableClub_EventScript_ReadTrainerCardColored[];
-extern const u8 EventScript_BattleColosseum_4P_PlayerSpot0[];
-extern const u8 EventScript_BattleColosseum_4P_PlayerSpot1[];
-extern const u8 EventScript_BattleColosseum_4P_PlayerSpot2[];
-extern const u8 EventScript_BattleColosseum_4P_PlayerSpot3[];
-extern const u8 EventScript_RecordCenter_Spot0[];
-extern const u8 EventScript_RecordCenter_Spot1[];
-extern const u8 EventScript_RecordCenter_Spot2[];
-extern const u8 EventScript_RecordCenter_Spot3[];
-extern const u8 EventScript_BattleColosseum_2P_PlayerSpot0[];
-extern const u8 EventScript_BattleColosseum_2P_PlayerSpot1[];
-extern const u8 EventScript_TradeCenter_Chair1[];
-extern const u8 EventScript_TradeCenter_Chair0[];
-extern const u8 EventScript_ConfirmLeaveTradeRoom[];
-extern const u8 EventScript_TerminateLink[];
-
 extern const struct MapLayout *const gMapLayouts[];
 extern const struct MapHeader *const *const gMapGroups[];
-extern const int gMaxFlashLevel;
-extern const u16 gOverworldBackgroundLayerFlags[];
 
 static void Overworld_ResetStateAfterWhiteOut(void);
-static void c2_80567AC(void);
+static void CB2_ReturnToFieldLocal(void);
+static void CB2_ReturnToFieldLink(void);
+static void CB2_LoadMapOnReturnToFieldCableClub(void);
 static void CB2_LoadMap2(void);
 static void VBlankCB_Field(void);
 static void SpriteCB_LinkPlayer(struct Sprite *sprite);
 static void ChooseAmbientCrySpecies(void);
-static void do_load_map_stuff_loop(u8 *state);
-static bool32 map_loading_iteration_3(u8 *state);
-static bool32 sub_8086638(u8 *state);
-static bool32 load_map_stuff(u8 *state, u32);
-static bool32 map_loading_iteration_2_link(u8 *state);
-static void mli4_mapscripts_and_other(void);
+static void DoMapLoadLoop(u8 *state);
+static bool32 LoadMapInStepsLocal(u8 *state, bool32);
+static bool32 LoadMapInStepsLink(u8 *state);
+static bool32 ReturnToFieldLocal(u8 *state);
+static bool32 ReturnToFieldLink(u8 *state);
+static void InitObjectEventsLink(void);
+static void InitObjectEventsLocal(void);
 static void InitOverworldGraphicsRegisters(void);
 static u8 GetSpriteForLinkedPlayer(u8);
 static u16 KeyInterCB_SendNothing(u32 a1);
-static void sub_80867C8(void);
+static void ResetMirageTowerAndSaveBlockPtrs(void);
 static void sub_80867D8(void);
-static void sub_8086AE4(void);
-static void sub_80869DC(void);
-static void sub_8086B14(void);
+static void OffsetCameraFocusByLinkPlayerId(void);
+static void SpawnLinkPlayers(void);
 static void SetCameraToTrackGuestPlayer(void);
-static void sub_8086988(bool32 arg0);
-static void sub_8086A80(void);
+static void ResumeMap(bool32 arg0);
+static void SetCameraToTrackPlayer(void);
 static void sub_8086A68(void);
-static void sub_8086860(void);
+static void InitViewGraphics(void);
 static void SetCameraToTrackGuestPlayer_2(void);
 static void CreateLinkPlayerSprites(void);
 static void ClearAllPlayerKeys(void);
@@ -155,7 +135,7 @@ static void InitLinkPlayerObjectEventPos(struct ObjectEvent *objEvent, s16 x, s1
 static void sub_80877DC(u8 linkPlayerId, u8 a2);
 static void sub_808780C(u8 linkPlayerId);
 static u8 GetSpriteForLinkedPlayer(u8 linkPlayerId);
-static void sub_8087584(void);
+static void RunTerminateLinkScript(void);
 static u32 GetLinkSendQueueLength(void);
 static void ZeroLinkPlayerObjectEvent(struct LinkPlayerObjectEvent *linkPlayerObjEvent);
 static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *a1);
@@ -181,14 +161,14 @@ static void CB1_UpdateLinkState(void);
 static void SetKeyInterceptCallback(u16 (*func)(u32));
 static void SetFieldVBlankCallback(void);
 static void FieldClearVBlankHBlankCallbacks(void);
-static void sub_8085810(void);
+static void TransitionMapMusic(void);
 static u8 GetAdjustedInitialTransitionFlags(struct InitialPlayerAvatarState *playerStruct, u16 a2, u8 a3);
 static u8 GetAdjustedInitialDirection(struct InitialPlayerAvatarState *playerStruct, u8 a2, u16 a3, u8 a4);
 static u16 GetCenterScreenMetatileBehavior(void);
 
 // IWRAM bss vars
 static void *sUnusedOverworldCallback;
-static u8 sPlayerTradingStates[4];
+static u8 sPlayerTradingStates[MAX_LINK_PLAYERS];
 // This callback is called with a player's key code. It then returns an
 // adjusted key code, effectively intercepting the input before anything
 // can process it.
@@ -208,13 +188,13 @@ u8 gLocalLinkPlayerId; // This is our player id in a multiplayer mode.
 u8 gFieldLinkPlayerCount;
 
 // EWRAM vars
-EWRAM_DATA static u8 sUnknown_020322D8 = 0;
+EWRAM_DATA static u8 sObjectEventLoadFlag = 0;
 EWRAM_DATA struct WarpData gLastUsedWarp = {0};
 EWRAM_DATA static struct WarpData sWarpDestination = {0};  // new warp position
-EWRAM_DATA static struct WarpData gFixedDiveWarp = {0};
-EWRAM_DATA static struct WarpData gFixedHoleWarp = {0};
+EWRAM_DATA static struct WarpData sFixedDiveWarp = {0};
+EWRAM_DATA static struct WarpData sFixedHoleWarp = {0};
 EWRAM_DATA static u16 sLastMapSectionId = 0;
-EWRAM_DATA static struct InitialPlayerAvatarState gInitialPlayerAvatarState = {0};
+EWRAM_DATA static struct InitialPlayerAvatarState sInitialPlayerAvatarState = {0};
 EWRAM_DATA static u16 sAmbientCrySpecies = 0;
 EWRAM_DATA static bool8 sIsAmbientCryWaterMon = FALSE;
 EWRAM_DATA struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[4] = {0};
@@ -229,16 +209,9 @@ static const struct WarpData sDummyWarpData =
     .y = -1,
 };
 
-static const u8 sUnusedData[] =
+static const u32 sUnusedData[] =
 {
-    0xB0, 0x04, 0x00, 0x00,
-    0x10, 0x0E, 0x00, 0x00,
-    0xB0, 0x04, 0x00, 0x00,
-    0x60, 0x09, 0x00, 0x00,
-    0x32, 0x00, 0x00, 0x00,
-    0x50, 0x00, 0x00, 0x00,
-    0xD4, 0xFF, 0xFF, 0xFF,
-    0x2C, 0x00, 0x00, 0x00,
+    1200, 3600, 1200, 2400, 50, 80, -44, 44
 };
 
 const struct UCoords32 gDirectionToVectors[] =
@@ -547,11 +520,11 @@ void Overworld_SetObjEventTemplateMovementType(u8 localId, u8 movementType)
     }
 }
 
-static void mapdata_load_assets_to_gpu_and_full_redraw(void)
+static void InitMapView(void)
 {
-    move_tilemap_camera_to_upper_left_corner();
-    copy_map_tileset1_tileset2_to_vram(gMapHeader.mapLayout);
-    apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout);
+    ResetFieldCamera();
+    CopyMapTilesetsToVram(gMapHeader.mapLayout);
+    LoadMapTilesetPalettes(gMapHeader.mapLayout);
     DrawWholeMapView();
     InitTilesetAnimations();
 }
@@ -568,14 +541,14 @@ void ApplyCurrentWarp(void)
 {
     gLastUsedWarp = gSaveBlock1Ptr->location;
     gSaveBlock1Ptr->location = sWarpDestination;
-    gFixedDiveWarp = sDummyWarpData;
-    gFixedHoleWarp = sDummyWarpData;
+    sFixedDiveWarp = sDummyWarpData;
+    sFixedHoleWarp = sDummyWarpData;
 }
 
 static void ClearDiveAndHoleWarps(void)
 {
-    gFixedDiveWarp = sDummyWarpData;
-    gFixedHoleWarp = sDummyWarpData;
+    sFixedDiveWarp = sDummyWarpData;
+    sFixedHoleWarp = sDummyWarpData;
 }
 
 static void SetWarpData(struct WarpData *warp, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y)
@@ -717,25 +690,25 @@ void SetWarpDestinationToEscapeWarp(void)
 
 void SetFixedDiveWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y)
 {
-    SetWarpData(&gFixedDiveWarp, mapGroup, mapNum, warpId, x, y);
+    SetWarpData(&sFixedDiveWarp, mapGroup, mapNum, warpId, x, y);
 }
 
 static void SetWarpDestinationToDiveWarp(void)
 {
-    sWarpDestination = gFixedDiveWarp;
+    sWarpDestination = sFixedDiveWarp;
 }
 
 void SetFixedHoleWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y)
 {
-    SetWarpData(&gFixedHoleWarp, mapGroup, mapNum, warpId, x, y);
+    SetWarpData(&sFixedHoleWarp, mapGroup, mapNum, warpId, x, y);
 }
 
 void SetWarpDestinationToFixedHoleWarp(s16 x, s16 y)
 {
-    if (IsDummyWarp(&gFixedHoleWarp) == TRUE)
+    if (IsDummyWarp(&sFixedHoleWarp) == TRUE)
         sWarpDestination = gLastUsedWarp;
     else
-        SetWarpDestination(gFixedHoleWarp.mapGroup, gFixedHoleWarp.mapNum, -1, x, y);
+        SetWarpDestination(sFixedHoleWarp.mapGroup, sFixedHoleWarp.mapNum, -1, x, y);
 }
 
 static void SetWarpDestinationToContinueGameWarp(void)
@@ -787,7 +760,7 @@ static bool8 SetDiveWarp(u8 dir, u16 x, u16 y)
     else
     {
         RunOnDiveWarpMapScript();
-        if (IsDummyWarp(&gFixedDiveWarp))
+        if (IsDummyWarp(&sFixedDiveWarp))
             return FALSE;
         SetWarpDestinationToDiveWarp();
     }
@@ -809,8 +782,10 @@ void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum)
     s32 paletteIndex;
 
     SetWarpDestination(mapGroup, mapNum, -1, -1, -1);
-    if (gMapHeader.regionMapSectionId != 0x3A)
-        sub_8085810();
+
+    // Dont transition map music between BF Outside West/East
+    if (gMapHeader.regionMapSectionId != MAPSEC_BATTLE_FRONTIER)
+        TransitionMapMusic();
 
     ApplyCurrentWarp();
     LoadCurrentMapData();
@@ -827,8 +802,8 @@ void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum)
     Overworld_ClearSavedMusic();
     RunOnTransitionMapScript();
     InitMap();
-    copy_map_tileset2_to_vram_2(gMapHeader.mapLayout);
-    apply_map_tileset2_palette(gMapHeader.mapLayout);
+    CopySecondaryTilesetToVramUsingHeap(gMapHeader.mapLayout);
+    LoadSecondaryTilesetPalette(gMapHeader.mapLayout);
 
     for (paletteIndex = 6; paletteIndex < 13; paletteIndex++)
         ApplyWeatherGammaShiftToPal(paletteIndex);
@@ -840,17 +815,18 @@ void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum)
     ResetFieldTasksArgs();
     RunOnResumeMapScript();
 
-    if (gMapHeader.regionMapSectionId != MAPSEC_BATTLE_FRONTIER || gMapHeader.regionMapSectionId != sLastMapSectionId)
+    if (gMapHeader.regionMapSectionId != MAPSEC_BATTLE_FRONTIER 
+     || gMapHeader.regionMapSectionId != sLastMapSectionId)
         ShowMapNamePopup();
 }
 
-static void mli0_load_map(u32 a1)
+static void LoadMapFromWarp(bool32 a1)
 {
     bool8 isOutdoors;
     bool8 isIndoors;
 
     LoadCurrentMapData();
-    if (!(sUnknown_020322D8 & 1))
+    if (!(sObjectEventLoadFlag & SKIP_OBJECT_EVENT_LOAD))
     {
         if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR)
             LoadBattlePyramidObjectEventTemplates();
@@ -869,7 +845,7 @@ static void mli0_load_map(u32 a1)
     ResetCyclingRoadChallengeData();
     RestartWildEncounterImmunitySteps();
     TryUpdateRandomTrainerRematches(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum);
-    if (a1 != 1)
+    if (a1 != TRUE)
         DoTimeBasedEvents();
     SetSav1WeatherFromCurrMapHeader();
     ChooseAmbientCrySpecies();
@@ -887,7 +863,7 @@ static void mli0_load_map(u32 a1)
     else
         InitMap();
 
-    if (a1 != 1 && isIndoors)
+    if (a1 != TRUE && isIndoors)
     {
         UpdateTVScreensOnMap(gBackupMapLayout.width, gBackupMapLayout.height);
         InitSecretBaseAppearance(TRUE);
@@ -896,24 +872,24 @@ static void mli0_load_map(u32 a1)
 
 void ResetInitialPlayerAvatarState(void)
 {
-    gInitialPlayerAvatarState.direction = DIR_SOUTH;
-    gInitialPlayerAvatarState.transitionFlags = PLAYER_AVATAR_FLAG_ON_FOOT;
+    sInitialPlayerAvatarState.direction = DIR_SOUTH;
+    sInitialPlayerAvatarState.transitionFlags = PLAYER_AVATAR_FLAG_ON_FOOT;
 }
 
 void StoreInitialPlayerAvatarState(void)
 {
-    gInitialPlayerAvatarState.direction = GetPlayerFacingDirection();
+    sInitialPlayerAvatarState.direction = GetPlayerFacingDirection();
 
     if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE))
-        gInitialPlayerAvatarState.transitionFlags = PLAYER_AVATAR_FLAG_MACH_BIKE;
+        sInitialPlayerAvatarState.transitionFlags = PLAYER_AVATAR_FLAG_MACH_BIKE;
     else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE))
-        gInitialPlayerAvatarState.transitionFlags = PLAYER_AVATAR_FLAG_ACRO_BIKE;
+        sInitialPlayerAvatarState.transitionFlags = PLAYER_AVATAR_FLAG_ACRO_BIKE;
     else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
-        gInitialPlayerAvatarState.transitionFlags = PLAYER_AVATAR_FLAG_SURFING;
+        sInitialPlayerAvatarState.transitionFlags = PLAYER_AVATAR_FLAG_SURFING;
     else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_UNDERWATER))
-        gInitialPlayerAvatarState.transitionFlags = PLAYER_AVATAR_FLAG_UNDERWATER;
+        sInitialPlayerAvatarState.transitionFlags = PLAYER_AVATAR_FLAG_UNDERWATER;
     else
-        gInitialPlayerAvatarState.transitionFlags = PLAYER_AVATAR_FLAG_ON_FOOT;
+        sInitialPlayerAvatarState.transitionFlags = PLAYER_AVATAR_FLAG_ON_FOOT;
 }
 
 static struct InitialPlayerAvatarState *GetInitialPlayerAvatarState(void)
@@ -921,11 +897,11 @@ static struct InitialPlayerAvatarState *GetInitialPlayerAvatarState(void)
     struct InitialPlayerAvatarState playerStruct;
     u8 mapType = GetCurrentMapType();
     u16 metatileBehavior = GetCenterScreenMetatileBehavior();
-    u8 transitionFlags = GetAdjustedInitialTransitionFlags(&gInitialPlayerAvatarState, metatileBehavior, mapType);
+    u8 transitionFlags = GetAdjustedInitialTransitionFlags(&sInitialPlayerAvatarState, metatileBehavior, mapType);
     playerStruct.transitionFlags = transitionFlags;
-    playerStruct.direction = GetAdjustedInitialDirection(&gInitialPlayerAvatarState, transitionFlags, metatileBehavior, mapType);
-    gInitialPlayerAvatarState = playerStruct;
-    return &gInitialPlayerAvatarState;
+    playerStruct.direction = GetAdjustedInitialDirection(&sInitialPlayerAvatarState, transitionFlags, metatileBehavior, mapType);
+    sInitialPlayerAvatarState = playerStruct;
+    return &sInitialPlayerAvatarState;
 }
 
 static u8 GetAdjustedInitialTransitionFlags(struct InitialPlayerAvatarState *playerStruct, u16 metatileBehavior, u8 mapType)
@@ -963,7 +939,7 @@ static u8 GetAdjustedInitialDirection(struct InitialPlayerAvatarState *playerStr
     else if (MetatileBehavior_IsEastArrowWarp(metatileBehavior) == TRUE)
         return DIR_WEST;
     else if ((playerStruct->transitionFlags == PLAYER_AVATAR_FLAG_UNDERWATER  && transitionFlags == PLAYER_AVATAR_FLAG_SURFING)
-     || (playerStruct->transitionFlags == PLAYER_AVATAR_FLAG_SURFING && transitionFlags == PLAYER_AVATAR_FLAG_UNDERWATER ))
+          || (playerStruct->transitionFlags == PLAYER_AVATAR_FLAG_SURFING && transitionFlags == PLAYER_AVATAR_FLAG_UNDERWATER))
         return playerStruct->direction;
     else if (MetatileBehavior_IsLadder(metatileBehavior) == TRUE)
         return playerStruct->direction;
@@ -1012,14 +988,15 @@ void SetCurrentMapLayout(u16 mapLayoutId)
     gMapHeader.mapLayout = GetMapLayout();
 }
 
-void sub_8085540(u8 var)
+void SetObjectEventLoadFlag(u8 flag)
 {
-    sUnknown_020322D8 = var;
+    sObjectEventLoadFlag = flag;
 }
 
-u8 sub_808554C(void)
+// Unused, sObjectEventLoadFlag is read directly
+static u8 GetObjectEventLoadFlag(void)
 {
-    return sUnknown_020322D8;
+    return sObjectEventLoadFlag;
 }
 
 static bool16 ShouldLegendaryMusicPlayAtLocation(struct WarpData *warp)
@@ -1179,10 +1156,10 @@ void Overworld_SetSavedMusic(u16 songNum)
 
 void Overworld_ClearSavedMusic(void)
 {
-    gSaveBlock1Ptr->savedMusic = 0;
+    gSaveBlock1Ptr->savedMusic = MUS_DUMMY;
 }
 
-static void sub_8085810(void)
+static void TransitionMapMusic(void)
 {
     if (FlagGet(FLAG_DONT_TRANSITION_MUSIC) != TRUE)
     {
@@ -1444,7 +1421,7 @@ static void DoCB1_Overworld(u16 newKeys, u16 heldKeys)
 {
     struct FieldInput inputStruct;
 
-    sub_808B578();
+    UpdatePlayerAvatarTransitionState();
     FieldClearPlayerInput(&inputStruct);
     FieldGetPlayerInput(&inputStruct, newKeys, heldKeys);
     if (!ScriptContext2_IsEnabled())
@@ -1456,7 +1433,7 @@ static void DoCB1_Overworld(u16 newKeys, u16 heldKeys)
         }
         else
         {
-            player_step(inputStruct.dpadDirection, newKeys, heldKeys);
+            PlayerStep(inputStruct.dpadDirection, newKeys, heldKeys);
         }
     }
 }
@@ -1477,7 +1454,7 @@ static void OverworldBasic(void)
     BuildOamBuffer();
     UpdatePaletteFade();
     UpdateTilesetAnimations();
-    do_scheduled_bg_tilemap_copies_to_vram();
+    DoScheduledBgTilemapCopiesToVram();
 }
 
 // This CB2 is used when starting
@@ -1507,7 +1484,7 @@ void SetUnusedCallback(void *func)
     sUnusedOverworldCallback = func;
 }
 
-static bool8 map_post_load_hook_exec(void)
+static bool8 RunFieldCallback(void)
 {
     if (gFieldCallback2)
     {
@@ -1546,7 +1523,7 @@ void CB2_NewGame(void)
     ScriptContext2_Disable();
     gFieldCallback = ExecuteTruckSequence;
     gFieldCallback2 = NULL;
-    do_load_map_stuff_loop(&gMain.state);
+    DoMapLoadLoop(&gMain.state);
     SetFieldVBlankCallback();
     SetMainCallback1(CB1_Overworld);
     SetMainCallback2(CB2_Overworld);
@@ -1554,7 +1531,7 @@ void CB2_NewGame(void)
 
 void CB2_WhiteOut(void)
 {
-    u8 val;
+    u8 state;
 
     if (++gMain.state >= 120)
     {
@@ -1566,8 +1543,8 @@ void CB2_WhiteOut(void)
         ScriptContext1_Init();
         ScriptContext2_Disable();
         gFieldCallback = FieldCB_WarpExitFadeFromBlack;
-        val = 0;
-        do_load_map_stuff_loop(&val);
+        state = 0;
+        DoMapLoadLoop(&state);
         SetFieldVBlankCallback();
         SetMainCallback1(CB1_Overworld);
         SetMainCallback2(CB2_Overworld);
@@ -1586,13 +1563,13 @@ void CB2_LoadMap(void)
 
 static void CB2_LoadMap2(void)
 {
-    do_load_map_stuff_loop(&gMain.state);
+    DoMapLoadLoop(&gMain.state);
     SetFieldVBlankCallback();
     SetMainCallback1(CB1_Overworld);
     SetMainCallback2(CB2_Overworld);
 }
 
-void sub_8086024(void)
+void CB2_ReturnToFieldContestHall(void)
 {
     if (!gMain.state)
     {
@@ -1601,7 +1578,7 @@ void sub_8086024(void)
         ScriptContext2_Disable();
         SetMainCallback1(NULL);
     }
-    if (load_map_stuff(&gMain.state, 1))
+    if (LoadMapInStepsLocal(&gMain.state, TRUE))
     {
         SetFieldVBlankCallback();
         SetMainCallback1(CB1_Overworld);
@@ -1613,12 +1590,12 @@ void CB2_ReturnToFieldCableClub(void)
 {
     FieldClearVBlankHBlankCallbacks();
     gFieldCallback = FieldCB_ReturnToFieldWirelessLink;
-    SetMainCallback2(c2_80567AC);
+    SetMainCallback2(CB2_LoadMapOnReturnToFieldCableClub);
 }
 
-static void c2_80567AC(void)
+static void CB2_LoadMapOnReturnToFieldCableClub(void)
 {
-    if (map_loading_iteration_3(&gMain.state))
+    if (LoadMapInStepsLink(&gMain.state))
     {
         SetFieldVBlankCallback();
         SetMainCallback1(CB1_UpdateLinkState);
@@ -1640,18 +1617,18 @@ void CB2_ReturnToField(void)
     }
 }
 
-void CB2_ReturnToFieldLocal(void)
+static void CB2_ReturnToFieldLocal(void)
 {
-    if (sub_8086638(&gMain.state))
+    if (ReturnToFieldLocal(&gMain.state))
     {
         SetFieldVBlankCallback();
         SetMainCallback2(CB2_Overworld);
     }
 }
 
-void CB2_ReturnToFieldLink(void)
+static void CB2_ReturnToFieldLink(void)
 {
-    if (!sub_8087598() && map_loading_iteration_2_link(&gMain.state))
+    if (!sub_8087598() && ReturnToFieldLink(&gMain.state))
         SetMainCallback2(CB2_Overworld);
 }
 
@@ -1746,12 +1723,12 @@ void CB2_ContinueSavedGame(void)
         ClearContinueGameWarpStatus();
         SetWarpDestinationToContinueGameWarp();
         WarpIntoMap();
-        sub_80EDB44();
+        TryPutTodaysRivalTrainerOnAir();
         SetMainCallback2(CB2_LoadMap);
     }
     else
     {
-        sub_80EDB44();
+        TryPutTodaysRivalTrainerOnAir();
         gFieldCallback = sub_8086204;
         SetMainCallback1(CB1_Overworld);
         CB2_ReturnToField();
@@ -1812,7 +1789,7 @@ static void InitCurrentFlashLevelScanlineEffect(void)
     }
 }
 
-static bool32 map_loading_iteration_3(u8 *state)
+static bool32 LoadMapInStepsLink(u8 *state)
 {
     switch (*state)
     {
@@ -1820,47 +1797,47 @@ static bool32 map_loading_iteration_3(u8 *state)
         InitOverworldBgs();
         ScriptContext1_Init();
         ScriptContext2_Disable();
-        sub_80867C8();
+        ResetMirageTowerAndSaveBlockPtrs();
         sub_80867D8();
         (*state)++;
         break;
     case 1:
-        mli0_load_map(1);
+        LoadMapFromWarp(TRUE);
         (*state)++;
         break;
     case 2:
-        sub_8086988(TRUE);
+        ResumeMap(TRUE);
         (*state)++;
         break;
     case 3:
-        sub_8086AE4();
-        sub_80869DC();
-        sub_8086B14();
+        OffsetCameraFocusByLinkPlayerId();
+        InitObjectEventsLink();
+        SpawnLinkPlayers();
         SetCameraToTrackGuestPlayer();
         (*state)++;
         break;
     case 4:
         InitCurrentFlashLevelScanlineEffect();
         InitOverworldGraphicsRegisters();
-        sub_8197200();
+        InitTextBoxGfxAndPrinters();
         (*state)++;
         break;
     case 5:
-        move_tilemap_camera_to_upper_left_corner();
+        ResetFieldCamera();
         (*state)++;
         break;
     case 6:
-        copy_map_tileset1_to_vram(gMapHeader.mapLayout);
+        CopyPrimaryTilesetToVram(gMapHeader.mapLayout);
         (*state)++;
         break;
     case 7:
-        copy_map_tileset2_to_vram(gMapHeader.mapLayout);
+        CopySecondaryTilesetToVram(gMapHeader.mapLayout);
         (*state)++;
         break;
     case 8:
         if (FreeTempTileDataBuffersIfPossible() != TRUE)
         {
-            apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout);
+            LoadMapTilesetPalettes(gMapHeader.mapLayout);
             (*state)++;
         }
         break;
@@ -1881,7 +1858,7 @@ static bool32 map_loading_iteration_3(u8 *state)
         (*state)++;
         break;
     case 12:
-        if (map_post_load_hook_exec())
+        if (RunFieldCallback())
             (*state)++;
         break;
     case 13:
@@ -1891,51 +1868,51 @@ static bool32 map_loading_iteration_3(u8 *state)
     return FALSE;
 }
 
-static bool32 load_map_stuff(u8 *state, u32 a2)
+static bool32 LoadMapInStepsLocal(u8 *state, bool32 a2)
 {
     switch (*state)
     {
     case 0:
         FieldClearVBlankHBlankCallbacks();
-        mli0_load_map(a2);
+        LoadMapFromWarp(a2);
         (*state)++;
         break;
     case 1:
-        sub_80867C8();
+        ResetMirageTowerAndSaveBlockPtrs();
         sub_80867D8();
         (*state)++;
         break;
     case 2:
-        sub_8086988(a2);
+        ResumeMap(a2);
         (*state)++;
         break;
     case 3:
-        mli4_mapscripts_and_other();
-        sub_8086A80();
+        InitObjectEventsLocal();
+        SetCameraToTrackPlayer();
         (*state)++;
         break;
     case 4:
         InitCurrentFlashLevelScanlineEffect();
         InitOverworldGraphicsRegisters();
-        sub_8197200();
+        InitTextBoxGfxAndPrinters();
         (*state)++;
         break;
     case 5:
-        move_tilemap_camera_to_upper_left_corner();
+        ResetFieldCamera();
         (*state)++;
         break;
     case 6:
-        copy_map_tileset1_to_vram(gMapHeader.mapLayout);
+        CopyPrimaryTilesetToVram(gMapHeader.mapLayout);
         (*state)++;
         break;
     case 7:
-        copy_map_tileset2_to_vram(gMapHeader.mapLayout);
+        CopySecondaryTilesetToVram(gMapHeader.mapLayout);
         (*state)++;
         break;
     case 8:
         if (FreeTempTileDataBuffersIfPossible() != TRUE)
         {
-            apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout);
+            LoadMapTilesetPalettes(gMapHeader.mapLayout);
             (*state)++;
         }
         break;
@@ -1953,7 +1930,7 @@ static bool32 load_map_stuff(u8 *state, u32 a2)
         (*state)++;
         break;
     case 12:
-        if (map_post_load_hook_exec())
+        if (RunFieldCallback())
             (*state)++;
         break;
     case 13:
@@ -1963,25 +1940,25 @@ static bool32 load_map_stuff(u8 *state, u32 a2)
     return FALSE;
 }
 
-static bool32 sub_8086638(u8 *state)
+static bool32 ReturnToFieldLocal(u8 *state)
 {
     switch (*state)
     {
     case 0:
-        sub_80867C8();
+        ResetMirageTowerAndSaveBlockPtrs();
         sub_80867D8();
-        sub_8086988(0);
+        ResumeMap(FALSE);
         sub_8086A68();
-        sub_8086A80();
+        SetCameraToTrackPlayer();
         (*state)++;
         break;
     case 1:
-        sub_8086860();
-        sub_81D64C0();
+        InitViewGraphics();
+        TryLoadTrainerHillEReaderPalette();
         (*state)++;
         break;
     case 2:
-        if (map_post_load_hook_exec())
+        if (RunFieldCallback())
             (*state)++;
         break;
     case 3:
@@ -1991,18 +1968,18 @@ static bool32 sub_8086638(u8 *state)
     return FALSE;
 }
 
-static bool32 map_loading_iteration_2_link(u8 *state)
+static bool32 ReturnToFieldLink(u8 *state)
 {
     switch (*state)
     {
     case 0:
         FieldClearVBlankHBlankCallbacks();
-        sub_80867C8();
+        ResetMirageTowerAndSaveBlockPtrs();
         sub_80867D8();
         (*state)++;
         break;
     case 1:
-        sub_8086988(1);
+        ResumeMap(TRUE);
         (*state)++;
         break;
     case 2:
@@ -2014,25 +1991,25 @@ static bool32 map_loading_iteration_2_link(u8 *state)
     case 3:
         InitCurrentFlashLevelScanlineEffect();
         InitOverworldGraphicsRegisters();
-        sub_8197200();
+        InitTextBoxGfxAndPrinters();
         (*state)++;
         break;
     case 4:
-        move_tilemap_camera_to_upper_left_corner();
+        ResetFieldCamera();
         (*state)++;
         break;
     case 5:
-        copy_map_tileset1_to_vram(gMapHeader.mapLayout);
+        CopyPrimaryTilesetToVram(gMapHeader.mapLayout);
         (*state)++;
         break;
     case 6:
-        copy_map_tileset2_to_vram(gMapHeader.mapLayout);
+        CopySecondaryTilesetToVram(gMapHeader.mapLayout);
         (*state)++;
         break;
     case 7:
         if (FreeTempTileDataBuffersIfPossible() != TRUE)
         {
-            apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout);
+            LoadMapTilesetPalettes(gMapHeader.mapLayout);
             (*state)++;
         }
         break;
@@ -2053,7 +2030,7 @@ static bool32 map_loading_iteration_2_link(u8 *state)
         (*state)++;
         break;
     case 12:
-        if (map_post_load_hook_exec())
+        if (RunFieldCallback())
             (*state)++;
         break;
     case 10:
@@ -2068,12 +2045,12 @@ static bool32 map_loading_iteration_2_link(u8 *state)
     return FALSE;
 }
 
-static void do_load_map_stuff_loop(u8 *state)
+static void DoMapLoadLoop(u8 *state)
 {
-    while (!load_map_stuff(state, 0));
+    while (!LoadMapInStepsLocal(state, FALSE));
 }
 
-static void sub_80867C8(void)
+static void ResetMirageTowerAndSaveBlockPtrs(void)
 {
     ClearMirageTowerPulseBlend();
     MoveSaveBlocks_ResetHeap();
@@ -2090,17 +2067,17 @@ static void sub_80867D8(void)
     LoadOam();
 }
 
-static void sub_8086860(void)
+static void InitViewGraphics(void)
 {
     InitCurrentFlashLevelScanlineEffect();
     InitOverworldGraphicsRegisters();
-    sub_8197200();
-    mapdata_load_assets_to_gpu_and_full_redraw();
+    InitTextBoxGfxAndPrinters();
+    InitMapView();
 }
 
 static void InitOverworldGraphicsRegisters(void)
 {
-    clear_scheduled_bg_copies_to_vram();
+    ClearScheduledBgCopiesToVram();
     ResetTempTileDataBuffers();
     SetGpuReg(REG_OFFSET_MOSAIC, 0);
     SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ);
@@ -2133,7 +2110,7 @@ static void InitOverworldGraphicsRegisters(void)
     InitFieldMessageBox();
 }
 
-static void sub_8086988(u32 a1)
+static void ResumeMap(bool32 a1)
 {
     ResetTasks();
     ResetSpriteData();
@@ -2156,7 +2133,7 @@ static void sub_8086988(u32 a1)
     TryStartMirageTowerPulseBlendEffect();
 }
 
-static void sub_80869DC(void)
+static void InitObjectEventsLink(void)
 {
     gTotalCameraPixelOffsetX = 0;
     gTotalCameraPixelOffsetY = 0;
@@ -2165,7 +2142,7 @@ static void sub_80869DC(void)
     TryRunOnWarpIntoMapScript();
 }
 
-static void mli4_mapscripts_and_other(void)
+static void InitObjectEventsLocal(void)
 {
     s16 x, y;
     struct InitialPlayerAvatarState *player;
@@ -2189,9 +2166,9 @@ static void sub_8086A68(void)
     RunOnReturnToFieldMapScript();
 }
 
-static void sub_8086A80(void)
+static void SetCameraToTrackPlayer(void)
 {
-    gObjectEvents[gPlayerAvatar.objectEventId].trackedByCamera = 1;
+    gObjectEvents[gPlayerAvatar.objectEventId].trackedByCamera = TRUE;
     InitCameraUpdateCallback(gPlayerAvatar.spriteId);
 }
 
@@ -2206,17 +2183,17 @@ static void SetCameraToTrackGuestPlayer_2(void)
     InitCameraUpdateCallback(GetSpriteForLinkedPlayer(gLocalLinkPlayerId));
 }
 
-static void sub_8086AE4(void)
+static void OffsetCameraFocusByLinkPlayerId(void)
 {
     u16 x, y;
     GetCameraFocusCoords(&x, &y);
 
-    // This is a hack of some kind; it's undone in sub_8086B14, which is called
+    // This is a hack of some kind; it's undone in SpawnLinkPlayers, which is called
     // soon after this function.
-    sub_8088B3C(x + gLocalLinkPlayerId, y);
+    SetCameraFocusCoords(x + gLocalLinkPlayerId, y);
 }
 
-static void sub_8086B14(void)
+static void SpawnLinkPlayers(void)
 {
     u16 i;
     u16 x, y;
@@ -2294,7 +2271,7 @@ static void CheckRfuKeepAliveTimer(void)
 static void ResetAllTradingStates(void)
 {
     s32 i;
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < MAX_LINK_PLAYERS; i++)
         sPlayerTradingStates[i] = PLAYER_TRADING_STATE_IDLE;
 }
 
@@ -2345,7 +2322,7 @@ static void HandleLinkPlayerKeyInput(u32 playerId, u16 key, struct TradeRoomPlay
             if (trainer->isLocalPlayer)
             {
                 SetKeyInterceptCallback(KeyInterCB_DeferToEventScript);
-                sub_8087584();
+                RunTerminateLinkScript();
             }
             return;
         }
@@ -2763,7 +2740,7 @@ static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *player)
     otherPlayerPos.height = 0;
     linkPlayerId = GetLinkPlayerIdAt(otherPlayerPos.x, otherPlayerPos.y);
 
-    if (linkPlayerId != 4)
+    if (linkPlayerId != MAX_LINK_PLAYERS)
     {
         if (!player->isLocalPlayer)
             return CableClub_EventScript_TooBusyToNotice;
@@ -2843,7 +2820,7 @@ static void InitMenuBasedScript(const u8 *script)
     ScriptContext2_Enable();
 }
 
-static void sub_8087584(void)
+static void RunTerminateLinkScript(void)
 {
     ScriptContext1_SetupScript(EventScript_TerminateLink);
     ScriptContext2_Enable();
@@ -3212,7 +3189,7 @@ static void SpriteCB_LinkPlayer(struct Sprite *sprite)
     SetObjectSubpriorityByZCoord(objEvent->previousElevation, sprite, 1);
     sprite->oam.priority = ZCoordToPriority(objEvent->previousElevation);
 
-    if (!linkPlayerObjEvent->movementMode != MOVEMENT_MODE_FREE)
+    if (linkPlayerObjEvent->movementMode == MOVEMENT_MODE_FREE)
         StartSpriteAnim(sprite, GetFaceDirectionAnimNum(objEvent->range.as_byte));
     else
         StartSpriteAnimIfDifferent(sprite, GetMoveDirectionAnimNum(objEvent->range.as_byte));
diff --git a/src/roulette_util.c b/src/palette_util.c
index f1f04a73a..5364ff6d9 100755
--- a/src/roulette_util.c
+++ b/src/palette_util.c
@@ -1,208 +1,217 @@
 #include "global.h"
 #include "palette.h"
-#include "roulette.h"
-#include "roulette_util.h"
+#include "palette_util.h"
 #include "util.h"
 
-void sub_8151678(struct UnkStruct0 *r0)
+// "RouletteFlash" is more accurately a general flashing/fading util
+// this file handles fading the palettes for the color/icon selections on the Roulette wheel
+// but it also handles the "pulse blend" effect of Mirage Tower
+
+void RouletteFlash_Reset(struct RouletteFlashUtil *flash)
 {
-    r0->var00 = 0;
-    r0->var02 = 0;
-    memset(&r0->var04, 0, sizeof(r0->var04));
+    flash->enabled = 0;
+    flash->flags = 0;
+    memset(&flash->palettes, 0, sizeof(flash->palettes));
 }
 
-u8 sub_815168C(struct UnkStruct0 *r0, u8 r1, const struct UnkStruct1 *r2)
+u8 RouletteFlash_Add(struct RouletteFlashUtil *flash, u8 id, const struct RouletteFlashSettings *settings)
 {
-    if (!(r1 < 16) || (r0->var04[r1].var00_7))
+    if (id >= ARRAY_COUNT(flash->palettes) || flash->palettes[id].available)
         return 0xFF;
 
-    r0->var04[r1].var04.var00 = r2->var00;
-    r0->var04[r1].var04.var02 = r2->var02;
-    r0->var04[r1].var04.var04 = r2->var04;
-    r0->var04[r1].var04.var05 = r2->var05;
-    r0->var04[r1].var04.var06 = r2->var06;
-    r0->var04[r1].var04.var07_0 = r2->var07_0;
-    r0->var04[r1].var04.var07_5 = r2->var07_5;
-    r0->var04[r1].var04.var07_7 = r2->var07_7;
-    r0->var04[r1].var00_0 = 0;
-    r0->var04[r1].var00_7 = 1;
-    r0->var04[r1].var02 = 0;
-    r0->var04[r1].var01 = 0;
-    if (r0->var04[r1].var04.var07_7 < 0)
-        r0->var04[r1].var03 = 0xFF;
+    flash->palettes[id].settings.color = settings->color;
+    flash->palettes[id].settings.paletteOffset = settings->paletteOffset;
+    flash->palettes[id].settings.numColors = settings->numColors;
+    flash->palettes[id].settings.delay = settings->delay;
+    flash->palettes[id].settings.unk6 = settings->unk6;
+    flash->palettes[id].settings.numFadeCycles = settings->numFadeCycles;
+    flash->palettes[id].settings.unk7_5 = settings->unk7_5;
+    flash->palettes[id].settings.colorDeltaDir = settings->colorDeltaDir;
+    flash->palettes[id].state = 0;
+    flash->palettes[id].available = TRUE;
+    flash->palettes[id].fadeCycleCounter = 0;
+    flash->palettes[id].delayCounter = 0;
+    if (flash->palettes[id].settings.colorDeltaDir < 0)
+        flash->palettes[id].colorDelta = -1;
     else
-        r0->var04[r1].var03 = 1;
+        flash->palettes[id].colorDelta = 1;
 
-    return r1;
+    return id;
 }
 
-u8 sub_8151710(struct UnkStruct0 *r0, u8 r1)
+// Unused
+static u8 RouletteFlash_Remove(struct RouletteFlashUtil *flash, u8 id)
 {
-    if (r1 >= 16)
+    if (id >= ARRAY_COUNT(flash->palettes))
         return 0xFF;
-    if (!r0->var04[r1].var00_7)
+    if (!flash->palettes[id].available)
         return 0xFF;
 
-    memset(&r0->var04[r1], 0, sizeof(r0->var04[r1]));
-    return r1;
+    memset(&flash->palettes[id], 0, sizeof(flash->palettes[id]));
+    return id;
 }
 
-u8 sub_8151744(struct UnkStruct3 *r0)
+static u8 RouletteFlash_FadePalette(struct RouletteFlashPalette *pal)
 {
     u8 i;
     u8 returnval;
 
-    for (i = 0; i < r0->var04.var04; i++)
+    for (i = 0; i < pal->settings.numColors; i++)
     {
-        struct PlttData *faded =   (struct PlttData *)&gPlttBufferFaded[r0->var04.var02 + i];
-        struct PlttData *unfaded = (struct PlttData *)&gPlttBufferUnfaded[r0->var04.var02 + i];
+        struct PlttData *faded =   (struct PlttData *)&gPlttBufferFaded[pal->settings.paletteOffset + i];
+        struct PlttData *unfaded = (struct PlttData *)&gPlttBufferUnfaded[pal->settings.paletteOffset + i];
 
-        switch (r0->var00_0)
+        switch (pal->state)
         {
         case 1:
-            if (faded->r + r0->var03 >= 0 && faded->r + r0->var03 < 32)
-                faded->r += r0->var03;
-            if (faded->g + r0->var03 >= 0 && faded->g + r0->var03 < 32)
-                faded->g += r0->var03;
-            if (faded->b + r0->var03 >= 0 && faded->b + r0->var03 < 32)
-                faded->b += r0->var03;
+            // Fade color
+            if (faded->r + pal->colorDelta >= 0 && faded->r + pal->colorDelta < 32)
+                faded->r += pal->colorDelta;
+            if (faded->g + pal->colorDelta >= 0 && faded->g + pal->colorDelta < 32)
+                faded->g += pal->colorDelta;
+            if (faded->b + pal->colorDelta >= 0 && faded->b + pal->colorDelta < 32)
+                faded->b += pal->colorDelta;
             break;
         case 2:
-            if (r0->var03 < 0)
+            // Fade back to original color
+            if (pal->colorDelta < 0)
             {
-                if (faded->r + r0->var03 >= unfaded->r)
-                    faded->r += r0->var03;
-                if (faded->g + r0->var03 >= unfaded->g)
-                    faded->g += r0->var03;
-                if (faded->b + r0->var03 >= unfaded->b)
-                    faded->b += r0->var03;
+                if (faded->r + pal->colorDelta >= unfaded->r)
+                    faded->r += pal->colorDelta;
+                if (faded->g + pal->colorDelta >= unfaded->g)
+                    faded->g += pal->colorDelta;
+                if (faded->b + pal->colorDelta >= unfaded->b)
+                    faded->b += pal->colorDelta;
             }
             else
             {
-                if (faded->r + r0->var03 <= unfaded->r)
-                    faded->r += r0->var03;
-                if (faded->g + r0->var03 <= unfaded->g)
-                    faded->g += r0->var03;
-                if (faded->b + r0->var03 <= unfaded->b)
-                    faded->b += r0->var03;
+                if (faded->r + pal->colorDelta <= unfaded->r)
+                    faded->r += pal->colorDelta;
+                if (faded->g + pal->colorDelta <= unfaded->g)
+                    faded->g += pal->colorDelta;
+                if (faded->b + pal->colorDelta <= unfaded->b)
+                    faded->b += pal->colorDelta;
             }
             break;
         }
     }
-    if ((u32)r0->var02++ != r0->var04.var07_0)
+    if ((u32)pal->fadeCycleCounter++ != pal->settings.numFadeCycles)
     {
         returnval = 0;
     }
     else
     {
-        r0->var02 = 0;
-        r0->var03 *= -1;
-        if (r0->var00_0 == 1)
-            r0->var00_0++;
+        pal->fadeCycleCounter = 0;
+        pal->colorDelta *= -1;
+        if (pal->state == 1)
+            pal->state++;
         else
-            r0->var00_0--;
+            pal->state--;
         returnval = 1;
     }
     return returnval;
 }
 
-u8 sub_815194C(struct UnkStruct3 *r0)
+static u8 RouletteFlash_FlashPalette(struct RouletteFlashPalette *pal)
 {
-    u8 rg2 = 0;
-
-    switch (r0->var00_0)
+    u8 i = 0;
+    switch (pal->state)
     {
     case 1:
-        for (rg2 = 0; rg2 < r0->var04.var04; rg2++)
-            gPlttBufferFaded[r0->var04.var02 + rg2] = r0->var04.var00;
-        r0->var00_0++;
+        // Flash to color
+        for (; i < pal->settings.numColors; i++)
+            gPlttBufferFaded[pal->settings.paletteOffset + i] = pal->settings.color;
+        pal->state++;
         break;
     case 2:
-        for (rg2 = 0; rg2 < r0->var04.var04; rg2++)
-            gPlttBufferFaded[r0->var04.var02 + rg2] = gPlttBufferUnfaded[r0->var04.var02 + rg2];
-        r0->var00_0--;
+        // Restore to original color
+        for (; i < pal->settings.numColors; i++)
+            gPlttBufferFaded[pal->settings.paletteOffset + i] = gPlttBufferUnfaded[pal->settings.paletteOffset + i];
+        pal->state--;
         break;
     }
     return 1;
 }
 
-void task_tutorial_controls_fadein(struct UnkStruct0 *r0)
+void RouletteFlash_Run(struct RouletteFlashUtil *flash)
 {
     u8 i = 0;
 
-    if (r0->var00)
+    if (flash->enabled)
     {
-        for (i = 0; i < 16; i++)
+        for (i = 0; i < ARRAY_COUNT(flash->palettes); i++)
         {
-            if ((r0->var02 >> i) & 1)
+            if ((flash->flags >> i) & 1)
             {
-                if (--r0->var04[i].var01 == 0xFF) // if underflow ?
+                if (--flash->palettes[i].delayCounter == (u8)-1)
                 {
-                    if (r0->var04[i].var04.var00 & 0x8000) // PlttData->unused_15 ?
-                        sub_8151744(&r0->var04[i]);
+                    if (flash->palettes[i].settings.color & FLASHUTIL_USE_EXISTING_COLOR)
+                        RouletteFlash_FadePalette(&flash->palettes[i]);
                     else
-                        sub_815194C(&r0->var04[i]);
+                        RouletteFlash_FlashPalette(&flash->palettes[i]);
 
-                    r0->var04[i].var01 = r0->var04[i].var04.var05;
+                    flash->palettes[i].delayCounter = flash->palettes[i].settings.delay;
                 }
             }
         }
     }
 }
 
-void sub_8151A48(struct UnkStruct0 *r0, u16 r1)
+void RouletteFlash_Enable(struct RouletteFlashUtil *flash, u16 flags)
 {
     u8 i = 0;
 
-    r0->var00++;
-    for (i = 0; i < 16; i++)
+    flash->enabled++;
+    for (i = 0; i < ARRAY_COUNT(flash->palettes); i++)
     {
-        if ((r1 >> i) & 1)
+        if ((flags >> i) & 1)
         {
-            if (r0->var04[i].var00_7)
+            if (flash->palettes[i].available)
             {
-                r0->var02 |= 1 << i;
-                r0->var04[i].var00_0 = 1;
+                flash->flags |= 1 << i;
+                flash->palettes[i].state = 1;
             }
         }
     }
 }
 
-void sub_8151A9C(struct UnkStruct0 *r0, u16 r1)
+void RouletteFlash_Stop(struct RouletteFlashUtil *flash, u16 flags)
 {
     u8 i;
 
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < ARRAY_COUNT(flash->palettes); i++)
     {
-        if ((r0->var02 >> i) & 1)
+        if ((flash->flags >> i) & 1)
         {
-            if (r0->var04[i].var00_7)
+            if (flash->palettes[i].available)
             {
-                if ((r1 >> i) & 1)
+                if ((flags >> i) & 1)
                 {
-                    u32 offset = r0->var04[i].var04.var02;
+                    u32 offset = flash->palettes[i].settings.paletteOffset;
                     u16 *faded = &gPlttBufferFaded[offset];
                     u16 *unfaded = &gPlttBufferUnfaded[offset];
-                    memcpy(faded, unfaded, r0->var04[i].var04.var04 * 2);
-                    r0->var04[i].var00_0 = 0;
-                    r0->var04[i].var02 = 0;
-                    r0->var04[i].var01 = 0;
-                    if (r0->var04[i].var04.var07_7 < 0)
-                        r0->var04[i].var03 = 0xFF;
+                    memcpy(faded, unfaded, flash->palettes[i].settings.numColors * 2);
+                    flash->palettes[i].state = 0;
+                    flash->palettes[i].fadeCycleCounter = 0;
+                    flash->palettes[i].delayCounter = 0;
+                    if (flash->palettes[i].settings.colorDeltaDir < 0)
+                        flash->palettes[i].colorDelta = -1;
                     else
-                        r0->var04[i].var03 = 0x1;
+                        flash->palettes[i].colorDelta = 1;
                 }
             }
         }
     }
-    if (r1 == 0xFFFF)
+
+    if (flags == 0xFFFF)
     {
-        r0->var00 = 0;
-        r0->var02 = 0;
+        // Stopped all
+        flash->enabled = 0;
+        flash->flags = 0;
     }
     else
     {
-        r0->var02 = r0->var02 & ~r1;
+        flash->flags &= ~flags;
     }
 }
 
@@ -429,7 +438,8 @@ void UpdatePulseBlend(struct PulseBlend *pulseBlend)
     }
 }
 
-void sub_8152008(u16 *dest, u16 src, u8 left, u8 top, u8 width, u8 height)
+// Below used for the Roulette grid
+void ClearTilemapRect(u16 *dest, u16 src, u8 left, u8 top, u8 width, u8 height)
 {
     u16 *_dest;
     u8 i;
@@ -446,7 +456,7 @@ void sub_8152008(u16 *dest, u16 src, u8 left, u8 top, u8 width, u8 height)
     }
 }
 
-void sub_8152058(u16 *dest, u16 *src, u8 left, u8 top, u8 width, u8 height)
+void SetTilemapRect(u16 *dest, u16 *src, u8 left, u8 top, u8 width, u8 height)
 {
     u16 *_dest;
     u16 *_src = src;
diff --git a/src/party_menu.c b/src/party_menu.c
index e9cbfc2ad..f61cbc5e6 100755
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -67,7 +67,6 @@
 #include "constants/battle_frontier.h"
 #include "constants/easy_chat.h"
 #include "constants/field_effects.h"
-#include "constants/flags.h"
 #include "constants/item_effects.h"
 #include "constants/items.h"
 #include "constants/maps.h"
@@ -76,7 +75,6 @@
 #include "constants/rgb.h"
 #include "constants/songs.h"
 #include "constants/species.h"
-#include "constants/vars.h"
 
 #define PARTY_PAL_SELECTED     (1 << 0)
 #define PARTY_PAL_FAINTED      (1 << 1)
@@ -464,7 +462,7 @@ static void CB2_UpdatePartyMenu(void)
     RunTasks();
     AnimateSprites();
     BuildOamBuffer();
-    do_scheduled_bg_tilemap_copies_to_vram();
+    DoScheduledBgTilemapCopiesToVram();
     UpdatePaletteFade();
 }
 
@@ -491,7 +489,7 @@ static bool8 ShowPartyMenu(void)
     case 0:
         SetVBlankHBlankCallbacksToNull();
         ResetVramOamAndBgCntRegs();
-        clear_scheduled_bg_copies_to_vram();
+        ClearScheduledBgCopiesToVram();
         gMain.state++;
         break;
     case 1:
@@ -1864,7 +1862,7 @@ u8 GetMonAilment(struct Pokemon *mon)
 
 static void SetPartyMonsAllowedInMinigame(void)
 {
-    u16 *ptr;
+    s16 *ptr;
 
     if (gPartyMenu.menuType == PARTY_MENU_TYPE_MINIGAME)
     {
@@ -4953,9 +4951,9 @@ static void Task_DisplayLevelUpStatsPg2(u8 taskId)
 
 static void DisplayLevelUpStatsPg1(u8 taskId)
 {
-    s16 *arrayPtr = sPartyMenuInternal->data;
+    u16 *arrayPtr = (u16*)sPartyMenuInternal->data;
 
-    arrayPtr[12] = CreateLevelUpStatsWindow();
+    arrayPtr[12] = (u16)CreateLevelUpStatsWindow();
     DrawLevelUpWindowPg1(arrayPtr[12], arrayPtr, &arrayPtr[6], TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY);
     CopyWindowToVram(arrayPtr[12], 2);
     ScheduleBgCopyTilemapToVram(2);
@@ -4963,7 +4961,7 @@ static void DisplayLevelUpStatsPg1(u8 taskId)
 
 static void DisplayLevelUpStatsPg2(u8 taskId)
 {
-    s16 *arrayPtr = sPartyMenuInternal->data;
+    u16 *arrayPtr = (u16 *)sPartyMenuInternal->data;
 
     DrawLevelUpWindowPg2(arrayPtr[12], &arrayPtr[6], TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY);
     CopyWindowToVram(arrayPtr[12], 2);
diff --git a/src/player_pc.c b/src/player_pc.c
index fc0bd9f4c..2010d84f8 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -327,7 +327,7 @@ void PlayerPC(void)
 
 static void InitPlayerPCMenu(u8 taskId)
 {
-    u16 *data;
+    s16 *data;
     struct WindowTemplate windowTemplate;
 
     data = gTasks[taskId].data;
@@ -346,7 +346,7 @@ static void InitPlayerPCMenu(u8 taskId)
 
 static void PlayerPCProcessMenuInput(u8 taskId)
 {
-    u16 *data;
+    s16 *data;
     s8 inputOptionId;
 
     data = gTasks[taskId].data;
@@ -435,7 +435,7 @@ static void PlayerPC_TurnOff(u8 taskId)
 
 static void InitItemStorageMenu(u8 taskId, u8 var)
 {
-    u16 *data;
+    s16 *data;
     struct WindowTemplate windowTemplate;
 
     data = gTasks[taskId].data;
@@ -548,7 +548,7 @@ static void ItemStorage_Toss(u8 taskId)
 
 static void ItemStorage_WithdrawToss_Helper(u8 taskId, bool8 toss)
 {
-    u16 *data = gTasks[taskId].data;
+    s16 *data = gTasks[taskId].data;
 
     data[3] = toss;
     sub_816B4DC(taskId);
@@ -581,9 +581,9 @@ static void ItemStorage_SetItemAndMailCount(u8 taskId)
 
 static void sub_816B4DC(u8 taskId)
 {
-    u16 *data = gTasks[taskId].data;
+    u16 *data = (u16 *)gTasks[taskId].data;
 
-    ClearStdWindowAndFrameToTransparent(data[4], FALSE);
+    ClearStdWindowAndFrameToTransparent((u8)data[4], FALSE);
     ClearWindowTilemap(data[4]);
     RemoveWindow(data[4]);
     ScheduleBgCopyTilemapToVram(0);
@@ -1380,7 +1380,7 @@ static void ItemStorage_DoItemToss(u8 taskId)
 
     data = gTasks[taskId].data;
     b = (playerPCItemPageInfo.cursorPos + playerPCItemPageInfo.itemsAbove);
-    if (!ItemId_GetImportance(gSaveBlock1Ptr->pcItems[b].itemId))
+    if (ItemId_GetImportance(gSaveBlock1Ptr->pcItems[b].itemId) == 0)
     {
         CopyItemName(gSaveBlock1Ptr->pcItems[b].itemId, gStringVar1);
         ConvertIntToDecimalStringN(gStringVar2, data[2], STR_CONV_MODE_LEFT_ALIGN, 3);
diff --git a/src/pokeball.c b/src/pokeball.c
index d473f9ba0..1a0561c33 100644
--- a/src/pokeball.c
+++ b/src/pokeball.c
@@ -798,9 +798,9 @@ static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite)
     StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[sprite->sBattler]], 1);
 
     if (GetBattlerSide(sprite->sBattler) == B_SIDE_OPPONENT)
-        gSprites[gBattlerSpriteIds[sprite->sBattler]].callback = sub_8039B58;
+        gSprites[gBattlerSpriteIds[sprite->sBattler]].callback = SpriteCb_OpponentMonFromBall;
     else
-        gSprites[gBattlerSpriteIds[sprite->sBattler]].callback = sub_8039E44;
+        gSprites[gBattlerSpriteIds[sprite->sBattler]].callback = SpriteCb_PlayerMonFromBall;
 
     AnimateSprite(&gSprites[gBattlerSpriteIds[sprite->sBattler]]);
     gSprites[gBattlerSpriteIds[sprite->sBattler]].data[1] = 0x1000;
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 523c4ad91..025adf875 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -117,7 +117,7 @@ EWRAM_DATA static struct PokeblockSavedData sSavedPokeblockData = {0};
 EWRAM_DATA static struct PokeblockMenuStruct *sPokeblockMenu = NULL;
 
 // const rom data
-const s8 gPokeblockFlavorCompatibilityTable[] =
+const s8 gPokeblockFlavorCompatibilityTable[NUM_NATURES * FLAVOR_COUNT] =
 {
     // Cool, Beauty, Cute, Smart, Tough
           0,      0,    0,     0,     0, // Hardy
@@ -475,7 +475,7 @@ static void CB2_PokeblockMenu(void)
     RunTasks();
     AnimateSprites();
     BuildOamBuffer();
-    do_scheduled_bg_tilemap_copies_to_vram();
+    DoScheduledBgTilemapCopiesToVram();
     UpdatePaletteFade();
 }
 
@@ -507,7 +507,7 @@ static bool8 InitPokeblockMenu(void)
     {
     case 0:
         SetVBlankHBlankCallbacksToNull();
-        clear_scheduled_bg_copies_to_vram();
+        ClearScheduledBgCopiesToVram();
         gMain.state++;
         break;
     case 1:
@@ -725,8 +725,8 @@ static void PutPokeblockListMenuString(u8 *dst, u16 pkblId)
     u8 *txtPtr = StringCopy(dst, gPokeblockNames[pkblock->color]);
 
     *(txtPtr++) = EXT_CTRL_CODE_BEGIN;
-    *(txtPtr++) = 0x12;
-    *(txtPtr++) = 0x57;
+    *(txtPtr++) = EXT_CTRL_CODE_SKIP;
+    *(txtPtr++) = 87;
 
     ConvertIntToDecimalStringN(gStringVar1, GetHighestPokeblocksFlavorLevel(pkblock), STR_CONV_MODE_LEFT_ALIGN, 3);
     StringExpandPlaceholders(txtPtr, gText_LvVar1);
@@ -1386,7 +1386,7 @@ s16 PokeblockGetGain(u8 nature, const struct Pokeblock *pokeblock)
     {
         curGain = GetPokeblockData(pokeblock, flavor + PBLOCK_SPICY);
         if (curGain > 0)
-            totalGain += curGain * gPokeblockFlavorCompatibilityTable[5 * nature + flavor];
+            totalGain += curGain * gPokeblockFlavorCompatibilityTable[FLAVOR_COUNT * nature + flavor];
     }
 
     return totalGain;
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c
index f6e6a19b2..e15a005e6 100644
--- a/src/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -84,7 +84,7 @@ EWRAM_DATA static struct PokeblockFeedStruct *sPokeblockFeed = NULL;
 EWRAM_DATA static struct CompressedSpritePalette sPokeblockSpritePal = {0};
 
 // const rom data
-static const u8 sNatureToMonPokeblockAnim[][2] =
+static const u8 sNatureToMonPokeblockAnim[NUM_NATURES][2] =
 {
     [NATURE_HARDY] = {  0, 0 },
     [NATURE_LONELY] = {  3, 0 },
@@ -518,7 +518,7 @@ static void CB2_PokeblockFeed(void)
     RunTasks();
     AnimateSprites();
     BuildOamBuffer();
-    do_scheduled_bg_tilemap_copies_to_vram();
+    DoScheduledBgTilemapCopiesToVram();
     UpdatePaletteFade();
 }
 
@@ -536,7 +536,7 @@ static bool8 TransitionToPokeblockFeedScene(void)
     case 0:
         sPokeblockFeed = AllocZeroed(sizeof(*sPokeblockFeed));
         SetVBlankHBlankCallbacksToNull();
-        clear_scheduled_bg_copies_to_vram();
+        ClearScheduledBgCopiesToVram();
         gMain.state++;
         break;
     case 1:
diff --git a/src/pokedex.c b/src/pokedex.c
index 0541f3f2e..2a6a33633 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -4145,7 +4145,7 @@ static void PrintMonHeight(u16 height, u8 left, u8 top)
     inches = (inches - (feet * 120)) / 10;
 
     buffer[i++] = EXT_CTRL_CODE_BEGIN;
-    buffer[i++] = 0x13;
+    buffer[i++] = EXT_CTRL_CODE_CLEAR_TO;
     if (feet / 10 == 0)
     {
         buffer[i++] = 18;
@@ -5117,9 +5117,9 @@ static void Task_SelectSearchMenuItem(u8 taskId)
     u16 *scrollOffset;
 
     DrawOrEraseSearchParameterBox(FALSE);
-    menuItem = gTasks[taskId].tMenuItem;
-    cursorPos = &gTasks[taskId].data[sSearchOptions[menuItem].taskDataCursorPos];
-    scrollOffset = &gTasks[taskId].data[sSearchOptions[menuItem].taskDataScrollOffset];
+    menuItem = (u16)gTasks[taskId].tMenuItem;
+    cursorPos = (u16*)&gTasks[taskId].data[sSearchOptions[menuItem].taskDataCursorPos];
+    scrollOffset = (u16*)&gTasks[taskId].data[sSearchOptions[menuItem].taskDataScrollOffset];
     gTasks[taskId].tCursorPos = *cursorPos;
     gTasks[taskId].tScrollOffset = *scrollOffset;
     PrintSearchParameterText(taskId);
diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c
index a2545cc1a..0232d4fc4 100755
--- a/src/pokedex_area_screen.c
+++ b/src/pokedex_area_screen.c
@@ -21,7 +21,6 @@
 #include "constants/rgb.h"
 #include "constants/songs.h"
 #include "constants/species.h"
-#include "constants/vars.h"
 
 #define AREA_SCREEN_WIDTH 32
 #define AREA_SCREEN_HEIGHT 20
diff --git a/src/pokemon.c b/src/pokemon.c
index 9687a5abf..faf00a7bf 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -1349,7 +1349,7 @@ const struct SpindaSpot gSpindaSpotGraphics[] =
 
 #include "data/pokemon/item_effects.h"
 
-const s8 gNatureStatTable[][NUM_EV_STATS] =
+const s8 gNatureStatTable[NUM_NATURES][NUM_NATURE_STATS] =
 {
     // Atk Def Spd Sp.Atk Sp.Def
     {    0,  0,  0,     0,     0}, // Hardy
@@ -1868,21 +1868,21 @@ const u8 gPPUpGetMask[] = {0x03, 0x0c, 0x30, 0xc0}; // Masks for getting PP Up c
 const u8 gPPUpSetMask[] = {0xfc, 0xf3, 0xcf, 0x3f}; // Masks for setting PP Up count
 const u8 gPPUpAddMask[] = {0x01, 0x04, 0x10, 0x40}; // Values added to PP Up count
 
-const u8 gStatStageRatios[][2] =
+const u8 gStatStageRatios[MAX_STAT_STAGE + 1][2] =
 {
-    {10, 40}, // -6
+    {10, 40}, // -6, MIN_STAT_STAGE
     {10, 35}, // -5
     {10, 30}, // -4
     {10, 25}, // -3
     {10, 20}, // -2
     {10, 15}, // -1
-    {10, 10}, //  0
+    {10, 10}, //  0, DEFAULT_STAT_STAGE
     {15, 10}, // +1
     {20, 10}, // +2
     {25, 10}, // +3
     {30, 10}, // +4
     {35, 10}, // +5
-    {40, 10}, // +6
+    {40, 10}, // +6, MAX_STAT_STAGE
 };
 
 static const u16 sDeoxysBaseStats[] =
@@ -3199,7 +3199,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
     {
         if (gCritMultiplier == 2)
         {
-            if (attacker->statStages[STAT_ATK] > 6)
+            if (attacker->statStages[STAT_ATK] > DEFAULT_STAT_STAGE)
                 APPLY_STAT_MOD(damage, attacker, attack, STAT_ATK)
             else
                 damage = attack;
@@ -3212,7 +3212,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
 
         if (gCritMultiplier == 2)
         {
-            if (defender->statStages[STAT_DEF] < 6)
+            if (defender->statStages[STAT_DEF] < DEFAULT_STAT_STAGE)
                 APPLY_STAT_MOD(damageHelper, defender, defense, STAT_DEF)
             else
                 damageHelper = defense;
@@ -3249,7 +3249,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
     {
         if (gCritMultiplier == 2)
         {
-            if (attacker->statStages[STAT_SPATK] > 6)
+            if (attacker->statStages[STAT_SPATK] > DEFAULT_STAT_STAGE)
                 APPLY_STAT_MOD(damage, attacker, spAttack, STAT_SPATK)
             else
                 damage = spAttack;
@@ -3262,7 +3262,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
 
         if (gCritMultiplier == 2)
         {
-            if (defender->statStages[STAT_SPDEF] < 6)
+            if (defender->statStages[STAT_SPDEF] < DEFAULT_STAT_STAGE)
                 APPLY_STAT_MOD(damageHelper, defender, spDefense, STAT_SPDEF)
             else
                 damageHelper = spDefense;
@@ -4624,11 +4624,11 @@ void CopyPlayerPartyMonToBattleData(u8 battlerId, u8 partyIndex)
     hpSwitchout = &gBattleStruct->hpOnSwitchout[GetBattlerSide(battlerId)];
     *hpSwitchout = gBattleMons[battlerId].hp;
 
-    for (i = 0; i < 8; i++)
-        gBattleMons[battlerId].statStages[i] = 6;
+    for (i = 0; i < NUM_BATTLE_STATS; i++)
+        gBattleMons[battlerId].statStages[i] = DEFAULT_STAT_STAGE;
 
     gBattleMons[battlerId].status2 = 0;
-    sub_803FA70(battlerId);
+    UpdateSentPokesToOpponentValue(battlerId);
     ClearTemporarySpeciesSpriteData(battlerId, FALSE);
 }
 
@@ -4728,49 +4728,49 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
                 retVal = FALSE;
             }
             if ((itemEffect[cmdIndex] & ITEM0_X_ATTACK)
-             && gBattleMons[gActiveBattler].statStages[STAT_ATK] < 12)
+             && gBattleMons[gActiveBattler].statStages[STAT_ATK] < MAX_STAT_STAGE)
             {
                 gBattleMons[gActiveBattler].statStages[STAT_ATK] += itemEffect[cmdIndex] & ITEM0_X_ATTACK;
-                if (gBattleMons[gActiveBattler].statStages[STAT_ATK] > 12)
-                    gBattleMons[gActiveBattler].statStages[STAT_ATK] = 12;
+                if (gBattleMons[gActiveBattler].statStages[STAT_ATK] > MAX_STAT_STAGE)
+                    gBattleMons[gActiveBattler].statStages[STAT_ATK] = MAX_STAT_STAGE;
                 retVal = FALSE;
             }
             break;
         // in-battle stat boosting effects
         case 1:
             if ((itemEffect[cmdIndex] & ITEM1_X_DEFEND)
-             && gBattleMons[gActiveBattler].statStages[STAT_DEF] < 12)
+             && gBattleMons[gActiveBattler].statStages[STAT_DEF] < MAX_STAT_STAGE)
             {
                 gBattleMons[gActiveBattler].statStages[STAT_DEF] += (itemEffect[cmdIndex] & ITEM1_X_DEFEND) >> 4;
-                if (gBattleMons[gActiveBattler].statStages[STAT_DEF] > 12)
-                    gBattleMons[gActiveBattler].statStages[STAT_DEF] = 12;
+                if (gBattleMons[gActiveBattler].statStages[STAT_DEF] > MAX_STAT_STAGE)
+                    gBattleMons[gActiveBattler].statStages[STAT_DEF] = MAX_STAT_STAGE;
                 retVal = FALSE;
             }
             if ((itemEffect[cmdIndex] & ITEM1_X_SPEED)
-             && gBattleMons[gActiveBattler].statStages[STAT_SPEED] < 12)
+             && gBattleMons[gActiveBattler].statStages[STAT_SPEED] < MAX_STAT_STAGE)
             {
                 gBattleMons[gActiveBattler].statStages[STAT_SPEED] += itemEffect[cmdIndex] & ITEM1_X_SPEED;
-                if (gBattleMons[gActiveBattler].statStages[STAT_SPEED] > 12)
-                    gBattleMons[gActiveBattler].statStages[STAT_SPEED] = 12;
+                if (gBattleMons[gActiveBattler].statStages[STAT_SPEED] > MAX_STAT_STAGE)
+                    gBattleMons[gActiveBattler].statStages[STAT_SPEED] = MAX_STAT_STAGE;
                 retVal = FALSE;
             }
             break;
         // more stat boosting effects
         case 2:
             if ((itemEffect[cmdIndex] & ITEM2_X_ACCURACY)
-             && gBattleMons[gActiveBattler].statStages[STAT_ACC] < 12)
+             && gBattleMons[gActiveBattler].statStages[STAT_ACC] < MAX_STAT_STAGE)
             {
                 gBattleMons[gActiveBattler].statStages[STAT_ACC] += (itemEffect[cmdIndex] & ITEM2_X_ACCURACY) >> 4;
-                if (gBattleMons[gActiveBattler].statStages[STAT_ACC] > 12)
-                    gBattleMons[gActiveBattler].statStages[STAT_ACC] = 12;
+                if (gBattleMons[gActiveBattler].statStages[STAT_ACC] > MAX_STAT_STAGE)
+                    gBattleMons[gActiveBattler].statStages[STAT_ACC] = MAX_STAT_STAGE;
                 retVal = FALSE;
             }
             if ((itemEffect[cmdIndex] & ITEM2_X_SPATK)
-             && gBattleMons[gActiveBattler].statStages[STAT_SPATK] < 12)
+             && gBattleMons[gActiveBattler].statStages[STAT_SPATK] < MAX_STAT_STAGE)
             {
                 gBattleMons[gActiveBattler].statStages[STAT_SPATK] += itemEffect[cmdIndex] & ITEM2_X_SPATK;
-                if (gBattleMons[gActiveBattler].statStages[STAT_SPATK] > 12)
-                    gBattleMons[gActiveBattler].statStages[STAT_SPATK] = 12;
+                if (gBattleMons[gActiveBattler].statStages[STAT_SPATK] > MAX_STAT_STAGE)
+                    gBattleMons[gActiveBattler].statStages[STAT_SPATK] = MAX_STAT_STAGE;
                 retVal = FALSE;
             }
             break;
@@ -5372,12 +5372,12 @@ u8 *UseStatIncreaseItem(u16 itemId)
 
 u8 GetNature(struct Pokemon *mon)
 {
-    return GetMonData(mon, MON_DATA_PERSONALITY, 0) % 25;
+    return GetMonData(mon, MON_DATA_PERSONALITY, 0) % NUM_NATURES;
 }
 
 u8 GetNatureFromPersonality(u32 personality)
 {
-    return personality % 25;
+    return personality % NUM_NATURES;
 }
 
 u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem)
@@ -5747,7 +5747,7 @@ u8 GetTrainerEncounterMusicId(u16 trainerOpponentId)
 u16 ModifyStatByNature(u8 nature, u16 n, u8 statIndex)
 {
     // Dont modify HP, Accuracy, or Evasion by nature
-    if (statIndex <= STAT_HP || statIndex > NUM_EV_STATS)
+    if (statIndex <= STAT_HP || statIndex > NUM_NATURE_STATS)
     {
         // Should just be "return n", but it wouldn't match without this.
         u16 retVal = n;
@@ -5836,7 +5836,7 @@ void MonGainEVs(struct Pokemon *mon, u16 defeatedSpecies)
     u16 totalEVs = 0;
     u16 heldItem;
     u8 holdEffect;
-    int i;
+    int i, multiplier;
 
     for (i = 0; i < NUM_STATS; i++)
     {
@@ -5846,43 +5846,37 @@ void MonGainEVs(struct Pokemon *mon, u16 defeatedSpecies)
 
     for (i = 0; i < NUM_STATS; i++)
     {
-        u8 hasHadPokerus;
-        int multiplier;
-
         if (totalEVs >= MAX_TOTAL_EVS)
             break;
-
-        hasHadPokerus = CheckPartyHasHadPokerus(mon, 0);
-
-        if (hasHadPokerus)
+        
+        if (CheckPartyHasHadPokerus(mon, 0))
             multiplier = 2;
         else
             multiplier = 1;
 
         switch (i)
         {
-        case 0:
+        case STAT_HP:
             evIncrease = gBaseStats[defeatedSpecies].evYield_HP * multiplier;
             break;
-        case 1:
+        case STAT_ATK:
             evIncrease = gBaseStats[defeatedSpecies].evYield_Attack * multiplier;
             break;
-        case 2:
+        case STAT_DEF:
             evIncrease = gBaseStats[defeatedSpecies].evYield_Defense * multiplier;
             break;
-        case 3:
+        case STAT_SPEED:
             evIncrease = gBaseStats[defeatedSpecies].evYield_Speed * multiplier;
             break;
-        case 4:
+        case STAT_SPATK:
             evIncrease = gBaseStats[defeatedSpecies].evYield_SpAttack * multiplier;
             break;
-        case 5:
+        case STAT_SPDEF:
             evIncrease = gBaseStats[defeatedSpecies].evYield_SpDefense * multiplier;
             break;
         }
 
         heldItem = GetMonData(mon, MON_DATA_HELD_ITEM, 0);
-
         if (heldItem == ITEM_ENIGMA_BERRY)
         {
             if (gMain.inBattle)
@@ -6410,13 +6404,13 @@ bool8 IsMonSpriteNotFlipped(u16 species)
 s8 GetMonFlavorRelation(struct Pokemon *mon, u8 flavor)
 {
     u8 nature = GetNature(mon);
-    return gPokeblockFlavorCompatibilityTable[nature * 5 + flavor];
+    return gPokeblockFlavorCompatibilityTable[nature * FLAVOR_COUNT + flavor];
 }
 
 s8 GetFlavorRelationByPersonality(u32 personality, u8 flavor)
 {
     u8 nature = GetNatureFromPersonality(personality);
-    return gPokeblockFlavorCompatibilityTable[nature * 5 + flavor];
+    return gPokeblockFlavorCompatibilityTable[nature * FLAVOR_COUNT + flavor];
 }
 
 bool8 IsTradedMon(struct Pokemon *mon)
diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c
index 1c07b0962..a388be39a 100644
--- a/src/pokemon_animation.c
+++ b/src/pokemon_animation.c
@@ -783,7 +783,7 @@ static const u8 sBackAnimationIds[] =
     0x94, 0x95, 0x96, // 0x19
 };
 
-static const u8 sBackAnimNatureModTable[] =
+static const u8 sBackAnimNatureModTable[NUM_NATURES] =
 {
     [NATURE_HARDY] = 0x00,
     [NATURE_LONELY] = 0x02,
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index 30a29b6ea..5f2f5516b 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -128,7 +128,7 @@ struct PokemonStorageSystemData
     u16 field_B0[528 / 2];
     u16 field_2C0;
     u16 field_2C2;
-    u8 field_2C4;
+    u8 field_2C4; // Unused
     u8 field_2C5;
     u8 showPartyMenuState;
     u8 unk_02C7;
@@ -136,21 +136,21 @@ struct PokemonStorageSystemData
     bool8 unk_02C9;
     s16 newCurrBoxId;
     u16 bg2_X;
-    s16 field_2CE;
+    s16 wallpaperScrollSpeed;
     u16 field_2D0;
     u8 field_2D2;
-    u8 field_2D3;
-    u8 field_2D4;
-    u16 field_2D6;
-    s16 field_2D8;
-    u16 field_2DA;
-    u16 field_2DC;
-    u16 field_2DE;
-    u16 field_2E0;
+    u8 field_2D3; // Written to, but never read.
+    u8 field_2D4; // Written to, but never read.
+    u16 field_2D6; // Written to, but never read.
+    s16 field_2D8; // Written to, but never read.
+    u16 field_2DA; // Written to, but never read.
+    u16 field_2DC; // Written to, but never read.
+    u16 field_2DE; // Written to, but never read.
+    u16 field_2E0; // Written to, but never read.
     u8 filler[22];
     u8 field_2F8[1024];
     u8 field_6F8;
-    u8 field_6F9;
+    u8 field_6F9; // Written to, but never read.
     u8 field_6FA;
     s8 field_6FB;
     u16 field_6FC[16];
@@ -160,14 +160,14 @@ struct PokemonStorageSystemData
     struct Sprite *field_728[2];
     struct Sprite *field_730[2];
     u32 field_738;
-    u8 field_73C[80];
-    u16 field_78C;
+    u8 field_73C[80]; // Unused
+    u16 field_78C; // Written to, but never read.
     s16 wallpaperSetId;
     s16 wallpaperId;
     u16 field_792[360];
     u8 wallpaperChangeState;
     u8 field_A63;
-    u8 field_A64;
+    u8 boxScrollDestination;
     s8 field_A65;
     u8 *wallpaperTiles;
     struct Sprite *movingMonSprite;
@@ -189,12 +189,12 @@ struct PokemonStorageSystemData
     u8 field_C68;
     s8 field_C69;
     u8 field_C6A;
-    u8 field_C6B;
+    u8 field_C6B; // Written to, but never read.
     struct WindowTemplate menuWindow;
     struct StorageMenu menuItems[7];
     u8 menuItemsCount;
     u8 menuWidth;
-    u8 field_CAE;
+    u8 field_CAE; // Written to, but never read.
     u16 field_CB0;
     struct Sprite *field_CB4;
     struct Sprite *field_CB8;
@@ -247,7 +247,7 @@ struct PokemonStorageSystemData
     u16 field_2176[8];
     u8 field_2186;
     u8 field_2187;
-    u8 field_2188;
+    u8 pokemonSummaryScreenMode;
     union
     {
         struct Pokemon *mon;
@@ -262,13 +262,13 @@ struct PokemonStorageSystemData
     struct UnkStorageStruct field_2204[3];
     u16 movingItem;
     u16 field_2236;
-    u8 field_2238;
+    u8 field_2238; // Unused
     u16 field_223A;
     u16 *field_223C;
     struct Sprite *cursorMonSprite;
     u16 field_2244[0x40];
     u8 field_22C4[0x800];
-    u8 field_2AC4[0x1800];
+    u8 field_2AC4[0x1800]; // Unused
     u8 field_42C4[0x800];
     u8 field_4AC4[0x1000];
     u8 field_5AC4[0x800];
@@ -658,7 +658,7 @@ static void SetBoxSpeciesAndPersonalities(u8 boxId);
 static void sub_80CB9D0(struct Sprite *sprite, u16 partyId);
 static void sub_80CC370(u8 taskId);
 static void sub_80CCB50(u8 boxId);
-static s8 sub_80CC644(u8 boxId);
+static s8 DetermineBoxScrollDirection(u8 boxId);
 static void sub_80CCA3C(const void *tilemap, s8 direction, u8 arg2);
 static s16 sub_80CD00C(const u8 *string);
 static bool8 MonPlaceChange_Shift(void);
@@ -2146,7 +2146,7 @@ static void VblankCb_PSS(void)
 static void Cb2_PSS(void)
 {
     RunTasks();
-    do_scheduled_bg_tilemap_copies_to_vram();
+    DoScheduledBgTilemapCopiesToVram();
     ScrollBackground();
     sub_80CAA14();
     AnimateSprites();
@@ -2214,7 +2214,7 @@ static void sub_80C7E98(void)
     gReservedSpriteTileCount = 0x280;
     sub_80D2A90(&sPSSData->unk_0020, sPSSData->unk_0028, 8);
     gKeyRepeatStartDelay = 20;
-    clear_scheduled_bg_copies_to_vram();
+    ClearScheduledBgCopiesToVram();
     sub_80D259C(3);
     sub_80D2644(0, 1, gUnknown_0857239C, 8, 4);
     sub_80D2770(0, 1, 0);
@@ -2360,11 +2360,11 @@ static void Cb_ShowPSS(u8 taskId)
     {
     case 0:
         PlaySE(SE_PC_LOGIN);
-        sub_80F9BCC(0x14, 0, 1);
+        ComputerScreenOpenEffect(20, 0, 1);
         sPSSData->state++;
         break;
     case 1:
-        if (!sub_80F9C1C())
+        if (!IsComputerScreenOpenEffectActive())
             SetPSSCallback(Cb_MainPSS);
         break;
     }
@@ -3781,11 +3781,11 @@ static void Cb_OnCloseBoxPressed(u8 taskId)
         }
         break;
     case 3:
-        sub_80F9BF4(0x14, 0, 1);
+        ComputerScreenCloseEffect(20, 0, 1);
         sPSSData->state++;
         break;
     case 4:
-        if (!sub_80F9C30())
+        if (!IsComputerScreenCloseEffectActive())
         {
             sub_80CABE0();
             gPlayerPartyCount = CalculatePlayerPartyCount();
@@ -3842,11 +3842,11 @@ static void Cb_OnBPressed(u8 taskId)
         }
         break;
     case 3:
-        sub_80F9BF4(0x14, 0, 0);
+        ComputerScreenCloseEffect(20, 0, 0);
         sPSSData->state++;
         break;
     case 4:
-        if (!sub_80F9C30())
+        if (!IsComputerScreenCloseEffectActive())
         {
             sub_80CABE0();
             gPlayerPartyCount = CalculatePlayerPartyCount();
@@ -3879,7 +3879,7 @@ static void Cb_ChangeScreen(u8 taskId)
         boxMons = sPSSData->field_218C.box;
         monIndex = sPSSData->field_2187;
         maxMonIndex = sPSSData->field_2186;
-        mode = sPSSData->field_2188;
+        mode = sPSSData->pokemonSummaryScreenMode;
         FreePSSData();
         if (mode == PSS_MODE_NORMAL && boxMons == &gUnknown_02039D14.box)
             ShowPokemonSummaryScreenSet40EF(mode, boxMons, monIndex, maxMonIndex, Cb2_ReturnToPSS);
@@ -5276,9 +5276,9 @@ static void sub_80CC370(u8 taskId)
 
 static void SetUpScrollToBox(u8 boxId)
 {
-    s8 direction = sub_80CC644(boxId);
+    s8 direction = DetermineBoxScrollDirection(boxId);
 
-    sPSSData->field_2CE = (direction > 0) ? 6 : -6;
+    sPSSData->wallpaperScrollSpeed = (direction > 0) ? 6 : -6;
     sPSSData->field_2D3 = (direction > 0) ? 1 : 2;
     sPSSData->field_2D0 = 32;
     sPSSData->field_2D4 = boxId;
@@ -5288,7 +5288,7 @@ static void SetUpScrollToBox(u8 boxId)
     sPSSData->field_2DC = (direction <= 0) ? 5 : 0;
     sPSSData->field_2DE = 0;
     sPSSData->field_2E0 = 2;
-    sPSSData->field_A64 = boxId;
+    sPSSData->boxScrollDestination = boxId;
     sPSSData->field_A65 = direction;
     sPSSData->field_A63 = 0;
 }
@@ -5300,21 +5300,21 @@ static bool8 ScrollToBox(void)
     switch (sPSSData->field_A63)
     {
     case 0:
-        LoadWallpaperGfx(sPSSData->field_A64, sPSSData->field_A65);
+        LoadWallpaperGfx(sPSSData->boxScrollDestination, sPSSData->field_A65);
         sPSSData->field_A63++;
     case 1:
         if (!WaitForWallpaperGfxLoad())
             return TRUE;
 
-        sub_80CB4CC(sPSSData->field_A64, sPSSData->field_A65);
-        sub_80CCCFC(sPSSData->field_A64, sPSSData->field_A65);
+        sub_80CB4CC(sPSSData->boxScrollDestination, sPSSData->field_A65);
+        sub_80CCCFC(sPSSData->boxScrollDestination, sPSSData->field_A65);
         sub_80CD0B8(sPSSData->field_A65);
         break;
     case 2:
         var = sub_80CB584();
         if (sPSSData->field_2D0 != 0)
         {
-            sPSSData->bg2_X += sPSSData->field_2CE;
+            sPSSData->bg2_X += sPSSData->wallpaperScrollSpeed;
             if (--sPSSData->field_2D0 != 0)
                 return TRUE;
             sub_80CCEE0();
@@ -5327,7 +5327,7 @@ static bool8 ScrollToBox(void)
     return TRUE;
 }
 
-static s8 sub_80CC644(u8 boxId)
+static s8 DetermineBoxScrollDirection(u8 boxId)
 {
     u8 i;
     u8 currentBox = StorageGetCurrentBox();
@@ -5735,7 +5735,7 @@ static void sub_80CD210(struct Sprite *sprite)
         sprite->data[0] = 3;
         break;
     case 3:
-        sprite->pos1.x -= sPSSData->field_2CE;
+        sprite->pos1.x -= sPSSData->wallpaperScrollSpeed;
         if (sprite->pos1.x < 73 || sprite->pos1.x > 247)
             sprite->invisible = TRUE;
         if (--sprite->data[1] == 0)
@@ -5746,7 +5746,7 @@ static void sub_80CD210(struct Sprite *sprite)
         }
         break;
     case 4:
-        sprite->pos1.x -= sPSSData->field_2CE;
+        sprite->pos1.x -= sPSSData->wallpaperScrollSpeed;
         break;
     }
 }
@@ -6632,21 +6632,21 @@ static void sub_80CE7E8(void)
         sPSSData->field_218C.mon = &gUnknown_02039D14;
         sPSSData->field_2187 = 0;
         sPSSData->field_2186 = 0;
-        sPSSData->field_2188 = 0;
+        sPSSData->pokemonSummaryScreenMode = PSS_MODE_NORMAL;
     }
     else if (sBoxCursorArea == CURSOR_AREA_IN_PARTY)
     {
         sPSSData->field_218C.mon = gPlayerParty;
         sPSSData->field_2187 = sBoxCursorPosition;
         sPSSData->field_2186 = CountPartyMons() - 1;
-        sPSSData->field_2188 = 0;
+        sPSSData->pokemonSummaryScreenMode = PSS_MODE_NORMAL;
     }
     else
     {
         sPSSData->field_218C.box = GetBoxedMonPtr(StorageGetCurrentBox(), 0);
         sPSSData->field_2187 = sBoxCursorPosition;
         sPSSData->field_2186 = IN_BOX_COUNT - 1;
-        sPSSData->field_2188 = 2;
+        sPSSData->pokemonSummaryScreenMode = PSS_MODE_BOX;
     }
 }
 
@@ -6869,36 +6869,36 @@ static void SetCursorMonData(void *pokemon, u8 mode)
 
         txtPtr = sPSSData->cursorMonGenderLvlText;
         *(txtPtr)++ = EXT_CTRL_CODE_BEGIN;
-        *(txtPtr)++ = 4;
+        *(txtPtr)++ = EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW;
         switch (gender)
         {
         case MON_MALE:
-            *(txtPtr)++ = 4;
-            *(txtPtr)++ = 1;
-            *(txtPtr)++ = 5;
+            *(txtPtr)++ = TEXT_COLOR_RED;
+            *(txtPtr)++ = TEXT_COLOR_WHITE;
+            *(txtPtr)++ = TEXT_COLOR_LIGHT_RED;
             *(txtPtr)++ = CHAR_MALE;
             break;
         case MON_FEMALE:
-            *(txtPtr)++ = 6;
-            *(txtPtr)++ = 1;
-            *(txtPtr)++ = 7;
+            *(txtPtr)++ = TEXT_COLOR_GREEN;
+            *(txtPtr)++ = TEXT_COLOR_WHITE;
+            *(txtPtr)++ = TEXT_COLOR_LIGHT_GREEN;
             *(txtPtr)++ = CHAR_FEMALE;
             break;
         default:
-            *(txtPtr)++ = 2;
-            *(txtPtr)++ = 1;
-            *(txtPtr)++ = 3;
-            *(txtPtr)++ = 0x77;
+            *(txtPtr)++ = TEXT_COLOR_DARK_GREY;
+            *(txtPtr)++ = TEXT_COLOR_WHITE;
+            *(txtPtr)++ = TEXT_COLOR_LIGHT_GREY;
+            *(txtPtr)++ = CHAR_UNK_SPACER;
             break;
         }
 
         *(txtPtr++) = EXT_CTRL_CODE_BEGIN;
-        *(txtPtr++) = 4;
-        *(txtPtr++) = 2;
-        *(txtPtr++) = 1;
-        *(txtPtr++) = 3;
-        *(txtPtr++) = 0;
-        *(txtPtr++) = CHAR_SPECIAL_F9;
+        *(txtPtr++) = EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW;
+        *(txtPtr++) = TEXT_COLOR_DARK_GREY;
+        *(txtPtr++) = TEXT_COLOR_WHITE;
+        *(txtPtr++) = TEXT_COLOR_LIGHT_GREY;
+        *(txtPtr++) = CHAR_SPACE;
+        *(txtPtr++) = CHAR_EXTRA_SYMBOL;
         *(txtPtr++) = CHAR_LV_2;
 
         txtPtr = ConvertIntToDecimalStringN(txtPtr, sPSSData->cursorMonLevel, STR_CONV_MODE_LEFT_ALIGN, 3);
@@ -8097,7 +8097,7 @@ static bool8 sub_80D0344(void)
         if (!IsDma3ManagerBusyWithBgCopy())
         {
             sub_80CFE84();
-            LoadPalette(stdpal_get(3), 0xD0, 0x20);
+            LoadPalette(GetTextWindowPalette(3), 0xD0, 0x20);
             ShowBg(0);
             return FALSE;
         }
@@ -8203,7 +8203,7 @@ static bool8 sub_80D04C8(void)
     case 3:
         if (!IsDma3ManagerBusyWithBgCopy())
         {
-            LoadPalette(stdpal_get(3), 0xD0, 0x20);
+            LoadPalette(GetTextWindowPalette(3), 0xD0, 0x20);
             sub_80CFE84();
             ShowBg(0);
             return FALSE;
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index e8b30f773..2e7995222 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -709,9 +709,9 @@ static void (*const sTextPrinterTasks[])(u8 taskId) =
 
 static const u8 sMemoNatureTextColor[] = _("{COLOR LIGHT_RED}{SHADOW GREEN}");
 static const u8 sMemoMiscTextColor[] = _("{COLOR WHITE}{SHADOW DARK_GREY}"); // This is also affected by palettes, apparently
-static const u8 sStatsLeftColumnLayout[] = _("{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}\n{SPECIAL_F7 0x02}\n{SPECIAL_F7 0x03}");
-static const u8 sStatsRightColumnLayout[] = _("{SPECIAL_F7 0x00}\n{SPECIAL_F7 0x01}\n{SPECIAL_F7 0x02}");
-static const u8 sMovesPPLayout[] = _("{PP}{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}");
+static const u8 sStatsLeftColumnLayout[] = _("{DYNAMIC 0}/{DYNAMIC 1}\n{DYNAMIC 2}\n{DYNAMIC 3}");
+static const u8 sStatsRightColumnLayout[] = _("{DYNAMIC 0}\n{DYNAMIC 1}\n{DYNAMIC 2}");
+static const u8 sMovesPPLayout[] = _("{PP}{DYNAMIC 0}/{DYNAMIC 1}");
 
 #define TAG_MOVE_SELECTOR 30000
 #define TAG_MON_STATUS 30001
@@ -1120,7 +1120,7 @@ static void MainCB2(void)
     RunTasks();
     AnimateSprites();
     BuildOamBuffer();
-    do_scheduled_bg_tilemap_copies_to_vram();
+    DoScheduledBgTilemapCopiesToVram();
     UpdatePaletteFade();
 }
 
@@ -1143,7 +1143,7 @@ static bool8 LoadGraphics(void)
     case 0:
         SetVBlankHBlankCallbacksToNull();
         ResetVramOamAndBgCntRegs();
-        clear_scheduled_bg_copies_to_vram();
+        ClearScheduledBgCopiesToVram();
         gMain.state++;
         break;
     case 1:
diff --git a/src/pokenav_conditions_1.c b/src/pokenav_conditions_1.c
index 84e2a9682..7184271ea 100644
--- a/src/pokenav_conditions_1.c
+++ b/src/pokenav_conditions_1.c
@@ -337,10 +337,10 @@ u8 *sub_81CD624(u8 *str, u16 id, bool8 arg3)
     boxId = unkPtr->unk4[id].boxId;
     monId = unkPtr->unk4[id].monId;
     *(str++) = EXT_CTRL_CODE_BEGIN;
-    *(str++) = 4;
-    *(str++) = 8;
-    *(str++) = 0;
-    *(str++) = 9;
+    *(str++) = EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW;
+    *(str++) = TEXT_COLOR_BLUE;
+    *(str++) = TEXT_COLOR_TRANSPARENT;
+    *(str++) = TEXT_COLOR_LIGHT_BLUE;
 
     if (GetBoxOrPartyMonData(boxId, monId, MON_DATA_IS_EGG, NULL))
         return StringCopyPadded(str, gText_EggNickname, CHAR_SPACE, 12);
@@ -368,40 +368,40 @@ u8 *sub_81CD624(u8 *str, u16 id, bool8 arg3)
         (str_++);
 
     *(str_++) = EXT_CTRL_CODE_BEGIN;
-    *(str_++) = 0x12;
-    *(str_++) = 0x3C;
+    *(str_++) = EXT_CTRL_CODE_SKIP;
+    *(str_++) = 60;
     switch (gender)
     {
     default:
-        *(str_++) = 0x77;
+        *(str_++) = CHAR_UNK_SPACER;
         break;
     case MON_MALE:
         *(str_++) = EXT_CTRL_CODE_BEGIN;
         *(str_++) = EXT_CTRL_CODE_COLOR;
-        *(str_++) = 4;
+        *(str_++) = TEXT_COLOR_RED;
         *(str_++) = EXT_CTRL_CODE_BEGIN;
-        *(str_++) = 3;
-        *(str_++) = 5;
+        *(str_++) = EXT_CTRL_CODE_SHADOW;
+        *(str_++) = TEXT_COLOR_LIGHT_RED;
         *(str_++) = CHAR_MALE;
         break;
     case MON_FEMALE:
         *(str_++) = EXT_CTRL_CODE_BEGIN;
         *(str_++) = EXT_CTRL_CODE_COLOR;
-        *(str_++) = 6;
+        *(str_++) = TEXT_COLOR_GREEN;
         *(str_++) = EXT_CTRL_CODE_BEGIN;
-        *(str_++) = 3;
-        *(str_++) = 7;
+        *(str_++) = EXT_CTRL_CODE_SHADOW;
+        *(str_++) = TEXT_COLOR_LIGHT_GREEN;
         *(str_++) = CHAR_FEMALE;
         break;
     }
 
     *(str_++) = EXT_CTRL_CODE_BEGIN;
-    *(str_++) = 4;
-    *(str_++) = 8;
-    *(str_++) = 0;
-    *(str_++) = 9;
+    *(str_++) = EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW;
+    *(str_++) = TEXT_COLOR_BLUE;
+    *(str_++) = TEXT_COLOR_TRANSPARENT;
+    *(str_++) = TEXT_COLOR_LIGHT_BLUE;
     *(str_++) = CHAR_SLASH;
-    *(str_++) = CHAR_SPECIAL_F9;
+    *(str_++) = CHAR_EXTRA_SYMBOL;
     *(str_++) = CHAR_LV_2;
     txtPtr = str_;
     str_ = ConvertIntToDecimalStringN(str_, level, STR_CONV_MODE_LEFT_ALIGN, 3);
@@ -429,10 +429,10 @@ void sub_81CD824(s16 arg0, u8 arg1)
         sub_81CD624(structPtr->unk6368[arg1], arg0, FALSE);
         boxId = unkPtr->unk4[arg0].boxId;
         structPtr->unk6320[arg1][0] = EXT_CTRL_CODE_BEGIN;
-        structPtr->unk6320[arg1][1] = 4;
-        structPtr->unk6320[arg1][2] = 8;
-        structPtr->unk6320[arg1][3] = 0;
-        structPtr->unk6320[arg1][4] = 9;
+        structPtr->unk6320[arg1][1] = EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW;
+        structPtr->unk6320[arg1][2] = TEXT_COLOR_BLUE;
+        structPtr->unk6320[arg1][3] = TEXT_COLOR_TRANSPARENT;
+        structPtr->unk6320[arg1][4] = TEXT_COLOR_LIGHT_BLUE;
         if (boxId == TOTAL_BOXES_COUNT)
             sub_81CD5CC(&structPtr->unk6320[arg1][5], gText_InParty, 8);
         else
diff --git a/src/pokenav_conditions_2.c b/src/pokenav_conditions_2.c
index 65a85aa7e..32e673aa4 100644
--- a/src/pokenav_conditions_2.c
+++ b/src/pokenav_conditions_2.c
@@ -581,10 +581,10 @@ bool32 sub_81CE754(u8 a0, u16 a1, bool8 a2)
             str = sub_81CDD24(a1);
             AddTextPrinterParameterized(structPtr->unk1820, 1, str, 0, 17, 0, NULL);
             text[0] = EXT_CTRL_CODE_BEGIN;
-            text[1] = 4;
-            text[2] = 8;
-            text[3] = 0;
-            text[4] = 9;
+            text[1] = EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW;
+            text[2] = TEXT_COLOR_BLUE;
+            text[3] = TEXT_COLOR_TRANSPARENT;
+            text[4] = TEXT_COLOR_LIGHT_BLUE;
             StringCopy(text + 5, gText_Number2);
             AddTextPrinterParameterized(structPtr->unk1821, 1, text, 4, 1, 0, NULL);
             ConvertIntToDecimalStringN(text + 5, sub_81CDD48(), STR_CONV_MODE_RIGHT_ALIGN, 4);
diff --git a/src/pokenav_conditions_3.c b/src/pokenav_conditions_3.c
index 7a48b9234..eea4aa397 100644
--- a/src/pokenav_conditions_3.c
+++ b/src/pokenav_conditions_3.c
@@ -707,7 +707,7 @@ static void sub_81CF8E4(struct PokenavMonList * item, u8 * dest)
     }
     s = StringCopy(gStringVar1, genderStr);
     *s++ = CHAR_SLASH;
-    *s++ = CHAR_SPECIAL_F9;
+    *s++ = CHAR_EXTRA_SYMBOL;
     *s++ = CHAR_LV_2;
     ConvertIntToDecimalStringN(s, level, STR_CONV_MODE_LEFT_ALIGN, 3);
     sub_81DB494(dest, 1, gStringVar1, 40);
diff --git a/src/pokenav_match_call_1.c b/src/pokenav_match_call_1.c
index ef1d5343f..1e4239bbc 100755
--- a/src/pokenav_match_call_1.c
+++ b/src/pokenav_match_call_1.c
@@ -12,7 +12,6 @@
 #include "sound.h"
 #include "string_util.h"
 #include "strings.h"
-#include "constants/flags.h"
 #include "constants/songs.h"
 
 struct Pokenav3Struct
diff --git a/src/pokenav_ribbons_1.c b/src/pokenav_ribbons_1.c
index ffc049c47..aad0053a8 100644
--- a/src/pokenav_ribbons_1.c
+++ b/src/pokenav_ribbons_1.c
@@ -724,7 +724,7 @@ static void BufferRibbonMonInfoText(struct PokenavMonList * item0, u8 * dest)
 
     s = StringCopy(gStringVar1, genderStr);
     *s++ = CHAR_SLASH;
-    *s++ = CHAR_SPECIAL_F9;
+    *s++ = CHAR_EXTRA_SYMBOL;
     *s++ = CHAR_LV_2;
     ConvertIntToDecimalStringN(s, level, STR_CONV_MODE_LEFT_ALIGN, 3);
     dest = sub_81DB494(dest, 1, gStringVar1, 54);
diff --git a/src/pokenav_ribbons_2.c b/src/pokenav_ribbons_2.c
index bb6116472..e5a89acad 100644
--- a/src/pokenav_ribbons_2.c
+++ b/src/pokenav_ribbons_2.c
@@ -836,7 +836,7 @@ void sub_81D0FF0(struct PokenavSub14 *structPtr)
 
     txtPtr = StringCopy(gStringVar1, genderTxt);
     *(txtPtr++) = CHAR_SLASH;
-    *(txtPtr++) = CHAR_SPECIAL_F9;
+    *(txtPtr++) = CHAR_EXTRA_SYMBOL;
     *(txtPtr++) = CHAR_LV_2;
     ConvertIntToDecimalStringN(txtPtr, level, STR_CONV_MODE_LEFT_ALIGN, 3);
     AddTextPrinterParameterized(windowId, 1, gStringVar1, 60, 1, TEXT_SPEED_FF, NULL);
diff --git a/src/post_battle_event_funcs.c b/src/post_battle_event_funcs.c
index afafca0ca..78ebe02e4 100644
--- a/src/post_battle_event_funcs.c
+++ b/src/post_battle_event_funcs.c
@@ -8,7 +8,6 @@
 #include "script_pokemon_util.h"
 #include "tv.h"
 #include "constants/heal_locations.h"
-#include "constants/flags.h"
 #include "constants/tv.h"
 
 int GameClear(void)
diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c
index d902b7319..986a2d3a2 100644
--- a/src/rayquaza_scene.c
+++ b/src/rayquaza_scene.c
@@ -1244,7 +1244,7 @@ void DoRayquazaScene(u8 animId, bool8 onlyOneAnim, void (*callback)(void))
 static void CB2_InitRayquazaScene(void)
 {
     SetVBlankHBlankCallbacksToNull();
-    clear_scheduled_bg_copies_to_vram();
+    ClearScheduledBgCopiesToVram();
     ScanlineEffect_Stop();
     FreeAllSpritePalettes();
     ResetPaletteFade();
@@ -1260,7 +1260,7 @@ static void CB2_RayquazaScene(void)
     RunTasks();
     AnimateSprites();
     BuildOamBuffer();
-    do_scheduled_bg_tilemap_copies_to_vram();
+    DoScheduledBgTilemapCopiesToVram();
     UpdatePaletteFade();
 }
 
diff --git a/src/record_mixing.c b/src/record_mixing.c
index a4229b91e..1e9b0bcf7 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -326,7 +326,7 @@ static void Task_RecordMixing_Main(u8 taskId)
         VarSet(VAR_TEMP_0, 1);
         gUnknown_03001130 = FALSE;
         PrepareExchangePacket();
-        CreateRecordMixingSprite();
+        CreateRecordMixingLights();
         tState = 1;
         data[10] = CreateTask(Task_MixingRecordsRecv, 80);
         tSndEffTaskId = CreateTask(Task_RecordMixing_SoundEffect, 81);
@@ -336,7 +336,7 @@ static void Task_RecordMixing_Main(u8 taskId)
         {
             tState = 2;
             FlagSet(FLAG_SYS_MIX_RECORD);
-            DestroyRecordMixingSprite();
+            DestroyRecordMixingLights();
             DestroyTask(tSndEffTaskId);
         }
         break;
diff --git a/src/region_map.c b/src/region_map.c
index 287e97fe9..de3b04cb2 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -9,7 +9,6 @@
 #include "trig.h"
 #include "constants/maps.h"
 #include "overworld.h"
-#include "constants/flags.h"
 #include "event_data.h"
 #include "secret_base.h"
 #include "string_util.h"
@@ -1684,7 +1683,7 @@ void CB2_OpenFlyMap(void)
         break;
     case 3:
         LoadUserWindowBorderGfx(0, 0x65, 0xd0);
-        clear_scheduled_bg_copies_to_vram();
+        ClearScheduledBgCopiesToVram();
         gMain.state++;
         break;
     case 4:
@@ -1747,7 +1746,7 @@ static void CB2_FlyMap(void)
     sFlyMap->callback();
     AnimateSprites();
     BuildOamBuffer();
-    do_scheduled_bg_tilemap_copies_to_vram();
+    DoScheduledBgTilemapCopiesToVram();
 }
 
 static void SetFlyMapCallback(void callback(void))
diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c
index 2756aa861..c948cde4c 100644
--- a/src/reset_rtc_screen.c
+++ b/src/reset_rtc_screen.c
@@ -467,7 +467,7 @@ void CB2_InitResetRtcScreen(void)
 
 static void sub_809F048(void)
 {
-    clear_scheduled_bg_copies_to_vram();
+    ClearScheduledBgCopiesToVram();
     ResetBgsAndClearDma3BusyFlags(0);
     InitBgsFromTemplates(0, sBackgroundTemplates, ARRAY_COUNT(sBackgroundTemplates));
     ScheduleBgCopyTilemapToVram(0);
@@ -483,7 +483,7 @@ static void CB2_ResetRtcScreen(void)
     RunTasks();
     AnimateSprites();
     BuildOamBuffer();
-    do_scheduled_bg_tilemap_copies_to_vram();
+    DoScheduledBgTilemapCopiesToVram();
     UpdatePaletteFade();
 }
 
diff --git a/src/roulette.c b/src/roulette.c
index 58e120cb5..4ca892912 100644
--- a/src/roulette.c
+++ b/src/roulette.c
@@ -13,199 +13,416 @@
 #include "menu_helpers.h"
 #include "overworld.h"
 #include "palette.h"
+#include "palette_util.h"
 #include "random.h"
 #include "roulette.h"
-#include "roulette_util.h"
 #include "rtc.h"
 #include "scanline_effect.h"
 #include "script.h"
 #include "sound.h"
 #include "sprite.h"
 #include "string_util.h"
+#include "strings.h"
 #include "task.h"
 #include "trig.h"
 #include "tv.h"
 #include "window.h"
+#include "constants/coins.h"
 #include "constants/rgb.h"
+#include "constants/roulette.h"
 #include "constants/species.h"
 #include "constants/songs.h"
 
-struct StructgUnknown_083F8DF4
-{
-    u8 var00;
-    u8 var01;
-    u8 var02;
-    u8 var03;
-    u8 var04;
-    u8 filler_05[3];
-    u16 var08;
-    u16 var0A;
-    u16 var0C;
-    u8 filler_0E[2];
-    u16 var10;
-    u16 var12;
-    u16 var14;
-    u8 filler_16[2];
-    u16 var18;
-    u16 var1A;
+#define BALLS_PER_ROUND 6
+
+// "Board" is used in this file to refer to both the wheel and the bet selection grid
+#define NUM_BOARD_COLORS 3 // Rows on grid
+#define NUM_BOARD_POKES  4 // Columns on grid
+#define NUM_ROULETTE_SLOTS (NUM_BOARD_COLORS * NUM_BOARD_POKES)
+
+// The degree change between each slot on the roulette wheel
+#define DEGREES_PER_SLOT (360 / NUM_ROULETTE_SLOTS)
+
+// Where in the slot the ball will drop when landing
+#define SLOT_MIDPOINT (DEGREES_PER_SLOT / 2 - 1)
+
+// IDs for grid selections when betting
+#define SELECTION_NONE      0
+#define COL_WYNAUT          1
+#define COL_AZURILL         2
+#define COL_SKITTY          3
+#define COL_MAKUHITA        4
+#define ROW_ORANGE          (COL_MAKUHITA + 1)
+#define SQU_ORANGE_WYNAUT   (ROW_ORANGE + COL_WYNAUT)
+#define SQU_ORANGE_AZURILL  (ROW_ORANGE + COL_AZURILL)
+#define SQU_ORANGE_SKITTY   (ROW_ORANGE + COL_SKITTY)
+#define SQU_ORANGE_MAKUHITA (ROW_ORANGE + COL_MAKUHITA)
+#define ROW_GREEN           (SQU_ORANGE_MAKUHITA + 1)
+#define SQU_GREEN_WYNAUT    (ROW_GREEN + COL_WYNAUT)
+#define SQU_GREEN_AZURILL   (ROW_GREEN + COL_AZURILL)
+#define SQU_GREEN_SKITTY    (ROW_GREEN + COL_SKITTY)
+#define SQU_GREEN_MAKUHITA  (ROW_GREEN + COL_MAKUHITA)
+#define ROW_PURPLE          (SQU_GREEN_MAKUHITA + 1)
+#define SQU_PURPLE_WYNAUT   (ROW_PURPLE + COL_WYNAUT)
+#define SQU_PURPLE_AZURILL  (ROW_PURPLE + COL_AZURILL)
+#define SQU_PURPLE_SKITTY   (ROW_PURPLE + COL_SKITTY)
+#define SQU_PURPLE_MAKUHITA (ROW_PURPLE + COL_MAKUHITA)
+#define NUM_GRID_SELECTIONS SQU_PURPLE_MAKUHITA
+
+// Get the id of the col/row from the selection ID
+// e.g. GET_ROW(SQU_PURPLE_SKITTY) is ROW_PURPLE
+#define GET_COL(selectionId)((selectionId) % (NUM_BOARD_POKES + 1))
+#define GET_ROW(selectionId)((selectionId) / (NUM_BOARD_POKES + 1) * (NUM_BOARD_POKES + 1))
+
+// Get the col/row index from the selection ID
+// e.g. GET_ROW_IDX(SQU_PURPLE_SKITTY) is 2 (purple being the 3rd row)
+#define GET_COL_IDX(selectionId)(selectionId - 1)
+#define GET_ROW_IDX(selectionId)(selectionId / 5 - 1)
+
+// Flags for the above selections, used to set which spaces have been hit or bet on
+#define F_WYNAUT_COL      (1 << COL_WYNAUT)
+#define F_AZURILL_COL     (1 << COL_AZURILL)
+#define F_SKITTY_COL      (1 << COL_SKITTY)
+#define F_MAKUHITA_COL    (1 << COL_MAKUHITA)
+#define F_ORANGE_ROW      (1 << ROW_ORANGE)
+#define F_ORANGE_WYNAUT   (1 << SQU_ORANGE_WYNAUT)
+#define F_ORANGE_AZURILL  (1 << SQU_ORANGE_AZURILL)
+#define F_ORANGE_SKITTY   (1 << SQU_ORANGE_SKITTY)
+#define F_ORANGE_MAKUHITA (1 << SQU_ORANGE_MAKUHITA)
+#define F_GREEN_ROW       (1 << ROW_GREEN)
+#define F_GREEN_WYNAUT    (1 << SQU_GREEN_WYNAUT)
+#define F_GREEN_AZURILL   (1 << SQU_GREEN_AZURILL)
+#define F_GREEN_SKITTY    (1 << SQU_GREEN_SKITTY)
+#define F_GREEN_MAKUHITA  (1 << SQU_GREEN_MAKUHITA)
+#define F_PURPLE_ROW      (1 << ROW_PURPLE)
+#define F_PURPLE_WYNAUT   (1 << SQU_PURPLE_WYNAUT)
+#define F_PURPLE_AZURILL  (1 << SQU_PURPLE_AZURILL)
+#define F_PURPLE_SKITTY   (1 << SQU_PURPLE_SKITTY)
+#define F_PURPLE_MAKUHITA (1 << SQU_PURPLE_MAKUHITA)
+
+// Flags for flashing selections on the roulette wheel
+#define F_FLASH_COLOR_O_WYNAUT   (1 << 0)
+#define F_FLASH_COLOR_G_AZURILL  (1 << 1)
+#define F_FLASH_COLOR_P_SKITTY   (1 << 2)
+#define F_FLASH_COLOR_O_MAKUHITA (1 << 3)
+#define F_FLASH_COLOR_G_WYNAUT   (1 << 4)
+#define F_FLASH_COLOR_P_AZURILL  (1 << 5)
+#define F_FLASH_COLOR_O_SKITTY   (1 << 6)
+#define F_FLASH_COLOR_G_MAKUHITA (1 << 7)
+#define F_FLASH_COLOR_P_WYNAUT   (1 << 8)
+#define F_FLASH_COLOR_O_AZURILL  (1 << 9)
+#define F_FLASH_COLOR_G_SKITTY   (1 << 10)
+#define F_FLASH_COLOR_P_MAKUHITA (1 << 11)
+#define F_FLASH_OUTER_EDGES      (1 << 12) // when the player wins
+#define FLASH_ICON               (NUM_ROULETTE_SLOTS + 1)
+#define FLASH_ICON_2             (FLASH_ICON + 1)
+#define FLASH_ICON_3             (FLASH_ICON + 2)
+#define F_FLASH_ICON             (1 << FLASH_ICON)
+#define F_FLASH_COLUMN           (1 << FLASH_ICON | 1 << FLASH_ICON_2 | 1 << FLASH_ICON_3)
+
+#define MAX_MULTIPLIER 12
+
+#define PALTAG_SHADOW 1
+#define PALTAG_BALL 2
+#define PALTAG_BALL_COUNTER 3
+#define PALTAG_CURSOR 4
+#define PALTAG_INTERFACE 5
+#define PALTAG_SHROOMISH 6
+#define PALTAG_TAILLOW   7
+#define PALTAG_GRID_ICONS 8
+#define PALTAG_WYNAUT    9
+#define PALTAG_AZURILL   10
+#define PALTAG_SKITTY    11
+#define PALTAG_MAKUHITA  12
+
+#define GFXTAG_WHEEL_ICONS 0
+#define GFXTAG_HEADERS 4
+#define GFXTAG_GRID_ICONS 5
+#define GFXTAG_WHEEL_CENTER 6
+#define GFXTAG_CREDIT 7
+#define GFXTAG_CREDIT_DIGIT 8
+#define GFXTAG_MULTIPLIER 9
+#define GFXTAG_BALL_COUNTER 10
+#define GFXTAG_CURSOR 11
+#define GFXTAG_BALL 12
+#define GFXTAG_SHROOMISH_TAILLOW 13
+#define GFXTAG_SHADOW 14
+
+// 2 different Roulette tables with 2 different rates (normal vs service day special)
+// & 1 gets which table, >> 7 gets if ROULETTE_SPECIAL_RATE is set 
+#define GET_MIN_BET_ID(var)(((var) & 1) + (((var) >> 7) * 2))
+
+// Having Shroomish or Taillow in the party can make rolls more consistent in length
+// It also increases the likelihood that, if they appear to unstick a ball, they'll move it to a slot the player bet on
+#define HAS_SHROOMISH  (1 << 0)
+#define HAS_TAILLOW    (1 << 1)
+
+#define NO_DELAY 0xFFFF
+
+enum {
+    BALL_STATE_ROLLING,
+    BALL_STATE_STUCK,
+    BALL_STATE_LANDED = 0xFF,
+};
+
+enum {
+    SELECT_STATE_WAIT,
+    SELECT_STATE_DRAW,
+    SELECT_STATE_UPDATE,
+    SELECT_STATE_ERASE = 0xFF,
+};
+
+// Roulette uses a large amount of sprites, and stores ids for these in a single array
+// Many are looped over rather than referenced directly
+enum {
+    SPR_WHEEL_BALL_1,
+    SPR_WHEEL_BALL_2,
+    SPR_WHEEL_BALL_3,
+    SPR_WHEEL_BALL_4,
+    SPR_WHEEL_BALL_5,
+    SPR_WHEEL_BALL_6,
+    SPR_WHEEL_CENTER,
+    SPR_WHEEL_ICON_ORANGE_WYNAUT,
+    SPR_WHEEL_ICON_GREEN_AZURILL,
+    SPR_WHEEL_ICON_PURPLE_SKITTY,
+    SPR_WHEEL_ICON_ORANGE_MAKUHITA,
+    SPR_WHEEL_ICON_GREEN_WYNAUT,
+    SPR_WHEEL_ICON_PURPLE_AZURILL,
+    SPR_WHEEL_ICON_ORANGE_SKITTY,
+    SPR_WHEEL_ICON_GREEN_MAKUHITA,
+    SPR_WHEEL_ICON_PURPLE_WYNAUT,
+    SPR_WHEEL_ICON_ORANGE_AZURILL,
+    SPR_WHEEL_ICON_GREEN_SKITTY,
+    SPR_WHEEL_ICON_PURPLE_MAKUHITA,
+    SPR_19, // Unused
+    SPR_CREDIT,
+    SPR_CREDIT_DIG_1,
+    SPR_CREDIT_DIG_10,
+    SPR_CREDIT_DIG_100,
+    SPR_CREDIT_DIG_1000,
+    SPR_MULTIPLIER,
+    SPR_BALL_COUNTER_1,
+    SPR_BALL_COUNTER_2,
+    SPR_BALL_COUNTER_3,
+    SPR_GRID_ICON_ORANGE_WYNAUT,
+    SPR_GRID_ICON_GREEN_AZURILL,
+    SPR_GRID_ICON_PURPLE_SKITTY,
+    SPR_GRID_ICON_ORANGE_MAKUHITA,
+    SPR_GRID_ICON_GREEN_WYNAUT,
+    SPR_GRID_ICON_PURPLE_AZURILL,
+    SPR_GRID_ICON_ORANGE_SKITTY,
+    SPR_GRID_ICON_GREEN_MAKUHITA,
+    SPR_GRID_ICON_PURPLE_WYNAUT,
+    SPR_GRID_ICON_ORANGE_AZURILL,
+    SPR_GRID_ICON_GREEN_SKITTY,
+    SPR_GRID_ICON_PURPLE_MAKUHITA,
+    SPR_POKE_HEADER_1,
+    SPR_POKE_HEADER_2,
+    SPR_POKE_HEADER_3,
+    SPR_POKE_HEADER_4,
+    SPR_COLOR_HEADER_1,
+    SPR_COLOR_HEADER_2,
+    SPR_COLOR_HEADER_3,
+    SPR_WIN_SLOT_CURSOR,
+    SPR_GRID_BALL_1,
+    SPR_GRID_BALL_2,
+    SPR_GRID_BALL_3,
+    SPR_GRID_BALL_4,
+    SPR_GRID_BALL_5,
+    SPR_GRID_BALL_6,
+    SPR_CLEAR_MON, // Shroomish/Taillow
+    SPR_CLEAR_MON_SHADOW_1,
+    SPR_CLEAR_MON_SHADOW_2,
+    SPR_58, // Here below unused
+    SPR_59,
+    SPR_60,
+    SPR_61,
+    SPR_62,
+    SPR_63,
+};
+
+// Start points for sprite IDs that are looped over
+#define SPR_WHEEL_BALLS SPR_WHEEL_BALL_1
+#define SPR_WHEEL_ICONS SPR_WHEEL_ICON_ORANGE_WYNAUT
+#define SPR_BALL_COUNTER SPR_BALL_COUNTER_1
+#define SPR_CREDIT_DIGITS SPR_CREDIT_DIG_1
+#define SPR_GRID_ICONS SPR_GRID_ICON_ORANGE_WYNAUT
+#define SPR_POKE_HEADERS SPR_POKE_HEADER_1
+#define SPR_COLOR_HEADERS SPR_COLOR_HEADER_1
+#define SPR_GRID_BALLS SPR_GRID_BALL_1
+
+struct Shroomish
+{
+    u16 startAngle;
+    u16 dropAngle;
+    u16 fallSlowdown;
+};
+
+struct Taillow
+{
+    u16 baseDropDelay;
+    u16 rightStartAngle;
+    u16 leftStartAngle;
+};
+
+struct RouletteTable
+{
+    u8 minBet; // Never read
+    u8 randDistanceHigh;
+    u8 randDistanceLow;
+    u8 wheelSpeed;
+    u8 wheelDelay;
+    struct Shroomish shroomish;
+    struct Taillow taillow;
+    u16 ballSpeed;
+    u16 baseTravelDist;
     float var1C;
 };
 
-struct StructgUnknown_085B6154
-{
-    u8 var00;
-    u8 var01_0:4;
-    u8 var01_4:4;
-    u8 var02;
-    u8 var03;
-    u8 var04;
-    u8 var05;
-    u8 var06;
-    u32 var08;
-    u32 var0C;
-    u16 var10;
+struct GridSelection
+{
+    u8 spriteIdOffset;
+    u8 baseMultiplier:4;
+    u8 column:4; // Never read
+    u8 row;      // Never read
+    u8 x;
+    u8 y;
+    u8 var05;    // Never read
+    u8 tilemapOffset;
+    u32 flag;
+    u32 inSelectionFlags;
+    u16 flashFlags;
 };
 
-struct StructgUnknown_083F8D90
+struct RouletteSlot
 {
-    u8 var00;
-    u8 var01;
-    u8 var02;
-    u32 var04;
+    u8 id1; // Never read
+    u8 id2; // Never read
+    u8 gridSquare;
+    u32 flag;
 };
 
-EWRAM_DATA struct Roulette
-{
-    u8 var00;
-    u8 var01;
-    u8 var02;
-    u8 var03_0:5;
-    u8 var03_5:1;
-    u8 var03_6:1;
-    u8 var03_7:1;
-    u8 var04_0:2;
-    u8 var04_2:5;
-    u8 var04_7:1;
-    u32 var08;
-    u8 var0C[6];
-    u8 var12[4];
-    u8 var16[3];
-    u8 var19;
-    u8 var1A_0:4;
-    u8 var1A_4:4;
-    u8 var1B[6];
-    u8 var21;
-    u8 var22;
-    u8 var23;
-    s16 var24;
-    s16 var26;
-    s16 var28;
-    s16 var2A;
-    struct OamMatrix var2C;
-    u16 var34;
-    struct Sprite *var38;
-    u8 var3C[MAX_SPRITES]; // Sprite IDs
-    u8 var7C;
-    u8 var7D;
-    u8 var7E;
-    u8 var7F;
-    s16 var80;
-    s16 var82;
-    u16 var84;
-    u16 var86;
-    float var88;
-    float var8C;
-    float var90;
-    float var94;
-    float var98;
-    float var9C;
+static EWRAM_DATA struct Roulette
+{
+    u8 unk0; // Never read
+    u8 shroomishShadowTimer;
+    u8 partySpeciesFlags;
+    bool8 useTaillow:5;
+    bool8 ballStuck:1;
+    bool8 ballUnstuck:1;
+    bool8 ballRolling:1; // Never read
+    u8 tableId:2;
+    u8 unused:5;
+    bool8 isSpecialRate:1;
+    u32 hitFlags;
+    u8 hitSquares[BALLS_PER_ROUND];
+    u8 pokeHits[NUM_BOARD_POKES];
+    u8 colorHits[NUM_BOARD_COLORS];
+    u8 minBet;
+    u8 curBallNum:4; // Never actually gets incremented, tracked with tBallNum instead
+    u8 unk1:4; // Never read
+    u8 betSelection[BALLS_PER_ROUND]; // Because curBallNum is used as the only index, only the first element is ever used (prev bet selections are never needed)
+    u8 wheelDelayTimer;
+    u8 wheelSpeed;
+    u8 wheelDelay;
+    s16 wheelAngle;
+    s16 gridX;
+    s16 selectionRectDrawState;
+    s16 updateGridHighlight;
+    struct OamMatrix wheelRotation;
+    u16 shroomishShadowAlpha;
+    struct Sprite *ball;
+    u8 spriteIds[MAX_SPRITES];
+    u8 curBallSpriteId;
+    u8 ballState;
+    u8 hitSlot;
+    u8 stuckHitSlot;
+    s16 ballTravelDist; // Never read
+    s16 ballTravelDistFast;
+    u16 ballTravelDistMed;
+    u16 ballTravelDistSlow;
+    float ballAngle;
+    float ballAngleSpeed;
+    float ballAngleAccel;
+    float ballDistToCenter;
+    float ballFallSpeed;
+    float ballFallAccel;
     float varA0;
-    u8 varA4;
-    u8 varA5;
-    u8 v51[2];
-    u16 varA8;
-    u16 varAA;
-    TaskFunc varAC;
-    u8 v46[4];
-    TaskFunc varB4;
-    struct UnkStruct0 varB8;
+    u8 playTaskId;
+    u8 spinTaskId;
+    u8 filler_1[2];
+    u16 taskWaitDelay;
+    u16 taskWaitKey;
+    TaskFunc nextTask;
+    u8 filler_2[4];
+    TaskFunc prevTask;
+    struct RouletteFlashUtil flashUtil;
     u16 tilemapBuffers[7][0x400];
-    u16 *unk_397C;
-} *gUnknown_0203AB88 = NULL;
-EWRAM_DATA u8 gUnknown_0203AB8C = 0;
-
-static void sub_8140814(u8);
-static void sub_81408A8(u8);
-static void sub_8140968(u8);
-static void sub_8140994(u8);
-static void sub_8140BD0(u8);
-static void sub_8141040(u8);
-static void sub_81410FC(u8);
-static void sub_8141344(u8);
-static void sub_814155C(u8);
-static void sub_81415D4(u8);
-static void sub_81416D4(u8);
-static void sub_8141778(u8);
-static void sub_814189C(u8);
-static void sub_8141A18(u8);
-static void sub_8141AC0(u8);
-static void sub_8141B58(u8);
-static void dp01t_12_3_battle_menu(u8);
-static void sub_8141DE4(u8);
-static void sub_8141E7C(u8);
-static void sub_8141F7C(u8 taskId, TaskFunc r1, u16 r2, u16 r3);
-static void sub_8141FF4(u8);
-static void sub_8142070(void);
-static void sub_8142918(u8);
-static void sub_814297C(u8);
-static u8 sub_81420D0(u8, u8);
-static bool8 sub_81421E8(u8, u8);
-static void sub_8142284(u8);
-static void sub_81424FC(u8);
-static u8 sub_8142758(u8);
-static void sub_8142814(void);
-static void sub_8142C0C(u8);
-static void sub_8142CD0(void);
-static void sub_8142E70(u8, u8);
-static void sub_8142F7C(void);
-static void sub_8143038(u8, u8);
-static void sub_8143150(u8);
-static void sub_81431E4(void);
-static void sub_8143280(struct Sprite *);
-static void sub_8143314(void);
-static void sub_8143514(u16);
-static void sub_81436D0(u8);
-static void sub_814372C(u8);
-static void sub_814390C(struct Sprite *);
-static void sub_814391C(void);
-static void sub_814399C(struct Sprite *);
-static void sub_81439C8(void);
-static void sub_8143A40(void);
-static void sub_81446AC(struct Sprite *);
-static void sub_81446DC(struct Sprite *);
-static void sub_81448B8(struct Sprite *);
-static void sub_8144A24(struct Sprite *);
-static void sub_8144E60(struct Sprite *);
-static void sub_8145294(struct Sprite *);
-
-extern const u8 Roulette_Text_ControlsInstruction[];
-extern const u8 Roulette_Text_KeepPlaying[];
-extern const u8 Roulette_Text_Jackpot[];
-extern const u8 Roulette_Text_ItsAHit[];
-extern const u8 Roulette_Text_NothingDoing[];
-extern const u8 Roulette_Text_YouveWonXCoins[];
-extern const u8 Roulette_Text_BoardWillBeCleared[];
-extern const u8 Roulette_Text_CoinCaseIsFull[];
-extern const u8 Roulette_Text_NoCoinsLeft[];
-extern const u8 Roulette_Text_PlayMinimumWagerIsX[];
-extern const u8 Roulette_Text_SpecialRateTable[];
-extern const u8 Roulette_Text_NotEnoughCoins[];
-
-static const u16 gUnknown_085B5BFC[] = INCBIN_U16("graphics/roulette/85B5BFC.gbapal");
-static const u32 gUnknown_085B5DFC[] = INCBIN_U32("graphics/roulette/85B5DFC.bin.lz");
-static const u32 gUnknown_085B5FA0[] = INCBIN_U32("graphics/roulette/wheel_map.bin.lz");
-static const struct BgTemplate gUnknown_085B6140[] =
-{
+    u16 *gridTilemap;
+} *sRoulette = NULL;
+
+static EWRAM_DATA u8 sTextWindowId = 0;
+
+static void Task_SpinWheel(u8);
+static void Task_StartPlaying(u8);
+static void Task_ContinuePlaying(u8);
+static void Task_StopPlaying(u8);
+static void Task_SelectFirstEmptySquare(u8);
+static void Task_HandleBetGridInput(u8);
+static void Task_SlideGridOffscreen(u8);
+static void Task_InitBallRoll(u8);
+static void Task_RollBall(u8);
+static void Task_RecordBallHit(u8);
+static void Task_SlideGridOnscreen(u8);
+static void Task_FlashBallOnWinningSquare(u8);
+static void Task_PrintSpinResult(u8);
+static void Task_PrintPayout(u8);
+static void Task_EndTurn(u8);
+static void Task_TryPrintEndTurnMsg(u8);
+static void Task_ClearBoard(u8);
+static void ExitRoulette(u8);
+static void Task_ExitRoulette(u8);
+static void StartTaskAfterDelayOrInput(u8, TaskFunc, u16, u16);
+static void ResetBallDataForNewSpin(u8);
+static void ResetHits(void);
+static void Task_AcceptMinBet(u8);
+static void Task_DeclineMinBet(u8);
+static u8 RecordHit(u8, u8);
+static bool8 IsHitInBetSelection(u8, u8);
+static void FlashSelectionOnWheel(u8);
+static void DrawGridBackground(u8);
+static u8 GetMultiplier(u8);
+static void UpdateWheelPosition(void);
+static void LoadOrFreeMiscSpritePalettesAndSheets(u8);
+static void CreateGridSprites(void);
+static void ShowHideGridIcons(bool8, u8);
+static void CreateGridBallSprites(void);
+static void ShowHideGridBalls(bool8, u8);
+static void ShowHideWinSlotCursor(u8);
+static void CreateWheelIconSprites(void);
+static void SpriteCB_WheelIcon(struct Sprite *);
+static void CreateInterfaceSprites(void);
+static void SetCreditDigits(u16);
+static void SetMultiplierSprite(u8);
+static void SetBallCounterNumLeft(u8);
+static void SpriteCB_GridSquare(struct Sprite *);
+static void CreateWheelCenterSprite(void);
+static void SpriteCB_WheelCenter(struct Sprite *);
+static void CreateWheelBallSprites(void);
+static void HideWheelBalls(void);
+static void SpriteCB_RollBall_Start(struct Sprite *);
+static void CreateShroomishSprite(struct Sprite *);
+static void CreateTaillowSprite(struct Sprite *);
+static void SetBallStuck(struct Sprite *);
+static void SpriteCB_Shroomish(struct Sprite *);
+static void SpriteCB_Taillow(struct Sprite *);
+
+static const u16 sWheel_Pal[] = INCBIN_U16("graphics/roulette/wheel.gbapal"); // also palette for grid
+static const u32 sGrid_Tilemap[] = INCBIN_U32("graphics/roulette/grid.bin.lz");
+static const u32 sWheel_Tilemap[] = INCBIN_U32("graphics/roulette/wheel.bin.lz");
+static const struct BgTemplate sBgTemplates[] =
+{
+    // Text box
     {
         .bg = 0,
         .charBaseIndex = 2,
@@ -215,6 +432,7 @@ static const struct BgTemplate gUnknown_085B6140[] =
         .priority = 0,
         .baseTile = 0
     },
+    // Selection grid
     {
         .bg = 1,
         .charBaseIndex = 0,
@@ -224,6 +442,7 @@ static const struct BgTemplate gUnknown_085B6140[] =
         .priority = 1,
         .baseTile = 0
     },
+    // Wheel
     {
         .bg = 2,
         .charBaseIndex = 1,
@@ -234,7 +453,7 @@ static const struct BgTemplate gUnknown_085B6140[] =
         .baseTile = 0
     }
 };
-static const struct WindowTemplate gUnknown_085B614C[] =
+static const struct WindowTemplate sWindowTemplates[] =
 {
     {
         .bg = 0,
@@ -248,659 +467,679 @@ static const struct WindowTemplate gUnknown_085B614C[] =
     // BUG: Array not terminated properly
     //DUMMY_WIN_TEMPLATE
 };
-static const struct StructgUnknown_085B6154 gUnknown_085B6154[] =
+
+static const struct GridSelection sGridSelections[NUM_GRID_SELECTIONS + 1] =
 {
-    {
-        .var00 = 0xFF,
-        .var01_0 = 0,
-        .var01_4 = 0,
-        .var02 = 0,
-        .var03 = 7,
-        .var04 = 7,
+    [SELECTION_NONE] = {
+        .spriteIdOffset = 0xFF,
+        .baseMultiplier = 0,
+        .column = 0,
+        .row = 0,
+        .x = 7,
+        .y = 7,
         .var05 = 0,
-        .var06 = 0,
-        .var08 = 0x0,
-        .var0C = 0x0,
-        .var10 = 0x0,
+        .tilemapOffset = 0,
+        .flag = 0,
+        .inSelectionFlags = 0,
+        .flashFlags = 0,
     },
-    {
-        .var00 = 12,
-        .var01_0 = 4,
-        .var01_4 = 1,
-        .var02 = 0,
-        .var03 = 17,
-        .var04 = 7,
+    [COL_WYNAUT] = {
+        .spriteIdOffset = 12,
+        .baseMultiplier = NUM_BOARD_POKES,
+        .column = 1,
+        .row = 0,
+        .x = 17,
+        .y = 7,
         .var05 = 0,
-        .var06 = 0,
-        .var08 = 0x2,
-        .var0C = 0x10842,
-        .var10 = 0xE000,
+        .tilemapOffset = 0,
+        .flag = F_WYNAUT_COL,
+        .inSelectionFlags = F_WYNAUT_COL | F_ORANGE_WYNAUT | F_GREEN_WYNAUT | F_PURPLE_WYNAUT,
+        .flashFlags = F_FLASH_COLUMN,
     },
-    {
-        .var00 = 13,
-        .var01_0 = 4,
-        .var01_4 = 2,
-        .var02 = 0,
-        .var03 = 20,
-        .var04 = 7,
+    [COL_AZURILL] = {
+        .spriteIdOffset = 13,
+        .baseMultiplier = NUM_BOARD_POKES,
+        .column = 2,
+        .row = 0,
+        .x = 20,
+        .y = 7,
         .var05 = 0,
-        .var06 = 0,
-        .var08 = 0x4,
-        .var0C = 0x21084,
-        .var10 = 0xE000,
+        .tilemapOffset = 0,
+        .flag = F_AZURILL_COL,
+        .inSelectionFlags = F_AZURILL_COL | F_ORANGE_AZURILL | F_GREEN_AZURILL | F_PURPLE_AZURILL,
+        .flashFlags = F_FLASH_COLUMN,
     },
-    {
-        .var00 = 14,
-        .var01_0 = 4,
-        .var01_4 = 3,
-        .var02 = 0,
-        .var03 = 23,
-        .var04 = 7,
+    [COL_SKITTY] = {
+        .spriteIdOffset = 14,
+        .baseMultiplier = NUM_BOARD_POKES,
+        .column = 3,
+        .row = 0,
+        .x = 23,
+        .y = 7,
         .var05 = 0,
-        .var06 = 0,
-        .var08 = 0x8,
-        .var0C = 0x42108,
-        .var10 = 0xE000,
+        .tilemapOffset = 0,
+        .flag = F_SKITTY_COL,
+        .inSelectionFlags = F_SKITTY_COL | F_ORANGE_SKITTY | F_GREEN_SKITTY | F_PURPLE_SKITTY,
+        .flashFlags = F_FLASH_COLUMN,
     },
-    {
-        .var00 = 15,
-        .var01_0 = 4,
-        .var01_4 = 4,
-        .var02 = 0,
-        .var03 = 26,
-        .var04 = 7,
+    [COL_MAKUHITA] = {
+        .spriteIdOffset = 15,
+        .baseMultiplier = NUM_BOARD_POKES,
+        .column = 4,
+        .row = 0,
+        .x = 26,
+        .y = 7,
         .var05 = 0,
-        .var06 = 0,
-        .var08 = 0x10,
-        .var0C = 0x84210,
-        .var10 = 0xE000,
+        .tilemapOffset = 0,
+        .flag = F_MAKUHITA_COL,
+        .inSelectionFlags = F_MAKUHITA_COL | F_ORANGE_MAKUHITA | F_GREEN_MAKUHITA | F_PURPLE_MAKUHITA,
+        .flashFlags = F_FLASH_COLUMN,
     },
-    {
-        .var00 = 16,
-        .var01_0 = 3,
-        .var01_4 = 0,
-        .var02 = 1,
-        .var03 = 14,
-        .var04 = 10,
+    [ROW_ORANGE] = {
+        .spriteIdOffset = 16,
+        .baseMultiplier = NUM_BOARD_COLORS,
+        .column = 0,
+        .row = 1,
+        .x = 14,
+        .y = 10,
         .var05 = 0,
-        .var06 = 12,
-        .var08 = 0x20,
-        .var0C = 0x3E0,
-        .var10 = 0x249,
+        .tilemapOffset = 12,
+        .flag = F_ORANGE_ROW,
+        .inSelectionFlags = F_ORANGE_ROW | F_ORANGE_WYNAUT | F_ORANGE_AZURILL | F_ORANGE_SKITTY | F_ORANGE_MAKUHITA,
+        .flashFlags = F_FLASH_COLOR_O_WYNAUT | F_FLASH_COLOR_O_AZURILL | F_FLASH_COLOR_O_SKITTY | F_FLASH_COLOR_O_MAKUHITA,
     },
-    {
-        .var00 = 0,
-        .var01_0 = 12,
-        .var01_4 = 1,
-        .var02 = 1,
-        .var03 = 17,
-        .var04 = 10,
+    [SQU_ORANGE_WYNAUT] = {
+        .spriteIdOffset = 0,
+        .baseMultiplier = NUM_ROULETTE_SLOTS,
+        .column = 1,
+        .row = 1,
+        .x = 17,
+        .y = 10,
         .var05 = 3,
-        .var06 = 3,
-        .var08 = 0x40,
-        .var0C = 0x40,
-        .var10 = 0x2001,
+        .tilemapOffset = 3,
+        .flag = F_ORANGE_WYNAUT,
+        .inSelectionFlags = F_ORANGE_WYNAUT,
+        .flashFlags = F_FLASH_ICON | F_FLASH_COLOR_O_WYNAUT,
     },
-    {
-        .var00 = 9,
-        .var01_0 = 12,
-        .var01_4 = 2,
-        .var02 = 1,
-        .var03 = 20,
-        .var04 = 10,
+    [SQU_ORANGE_AZURILL] = {
+        .spriteIdOffset = 9,
+        .baseMultiplier = NUM_ROULETTE_SLOTS,
+        .column = 2,
+        .row = 1,
+        .x = 20,
+        .y = 10,
         .var05 = 3,
-        .var06 = 3,
-        .var08 = 0x80,
-        .var0C = 0x80,
-        .var10 = 0x2200,
+        .tilemapOffset = 3,
+        .flag = F_ORANGE_AZURILL,
+        .inSelectionFlags = F_ORANGE_AZURILL,
+        .flashFlags = F_FLASH_ICON | F_FLASH_COLOR_O_AZURILL,
     },
-    {
-        .var00 = 6,
-        .var01_0 = 12,
-        .var01_4 = 3,
-        .var02 = 1,
-        .var03 = 23,
-        .var04 = 10,
+    [SQU_ORANGE_SKITTY] = {
+        .spriteIdOffset = 6,
+        .baseMultiplier = NUM_ROULETTE_SLOTS,
+        .column = 3,
+        .row = 1,
+        .x = 23,
+        .y = 10,
         .var05 = 3,
-        .var06 = 3,
-        .var08 = 0x100,
-        .var0C = 0x100,
-        .var10 = 0x2040,
+        .tilemapOffset = 3,
+        .flag = F_ORANGE_SKITTY,
+        .inSelectionFlags = F_ORANGE_SKITTY,
+        .flashFlags = F_FLASH_ICON | F_FLASH_COLOR_O_SKITTY,
     },
-    {
-        .var00 = 3,
-        .var01_0 = 12,
-        .var01_4 = 4,
-        .var02 = 1,
-        .var03 = 26,
-        .var04 = 10,
+    [SQU_ORANGE_MAKUHITA] = {
+        .spriteIdOffset = 3,
+        .baseMultiplier = NUM_ROULETTE_SLOTS,
+        .column = 4,
+        .row = 1,
+        .x = 26,
+        .y = 10,
         .var05 = 3,
-        .var06 = 3,
-        .var08 = 0x200,
-        .var0C = 0x200,
-        .var10 = 0x2008,
+        .tilemapOffset = 3,
+        .flag = F_ORANGE_MAKUHITA,
+        .inSelectionFlags = F_ORANGE_MAKUHITA,
+        .flashFlags = F_FLASH_ICON | F_FLASH_COLOR_O_MAKUHITA,
     },
-    {
-        .var00 = 17,
-        .var01_0 = 3,
-        .var01_4 = 0,
-        .var02 = 2,
-        .var03 = 14,
-        .var04 = 13,
+    [ROW_GREEN] = {
+        .spriteIdOffset = 17,
+        .baseMultiplier = NUM_BOARD_COLORS,
+        .column = 0,
+        .row = 2,
+        .x = 14,
+        .y = 13,
         .var05 = 3,
-        .var06 = 15,
-        .var08 = 0x400,
-        .var0C = 0x7C00,
-        .var10 = 0x492,
+        .tilemapOffset = 15,
+        .flag = F_GREEN_ROW,
+        .inSelectionFlags = F_GREEN_ROW | F_GREEN_WYNAUT | F_GREEN_AZURILL | F_GREEN_SKITTY | F_GREEN_MAKUHITA,
+        .flashFlags = F_FLASH_COLOR_G_WYNAUT | F_FLASH_COLOR_G_AZURILL | F_FLASH_COLOR_G_SKITTY | F_FLASH_COLOR_G_MAKUHITA,
     },
-    {
-        .var00 = 4,
-        .var01_0 = 12,
-        .var01_4 = 1,
-        .var02 = 2,
-        .var03 = 17,
-        .var04 = 13,
+    [SQU_GREEN_WYNAUT] = {
+        .spriteIdOffset = 4,
+        .baseMultiplier = NUM_ROULETTE_SLOTS,
+        .column = 1,
+        .row = 2,
+        .x = 17,
+        .y = 13,
         .var05 = 6,
-        .var06 = 6,
-        .var08 = 0x800,
-        .var0C = 0x800,
-        .var10 = 0x2010,
+        .tilemapOffset = 6,
+        .flag = F_GREEN_WYNAUT,
+        .inSelectionFlags = F_GREEN_WYNAUT,
+        .flashFlags = F_FLASH_ICON | F_FLASH_COLOR_G_WYNAUT,
     },
-    {
-        .var00 = 1,
-        .var01_0 = 12,
-        .var01_4 = 2,
-        .var02 = 2,
-        .var03 = 20,
-        .var04 = 13,
+    [SQU_GREEN_AZURILL] = {
+        .spriteIdOffset = 1,
+        .baseMultiplier = NUM_ROULETTE_SLOTS,
+        .column = 2,
+        .row = 2,
+        .x = 20,
+        .y = 13,
         .var05 = 6,
-        .var06 = 6,
-        .var08 = 0x1000,
-        .var0C = 0x1000,
-        .var10 = 0x2002,
+        .tilemapOffset = 6,
+        .flag = F_GREEN_AZURILL,
+        .inSelectionFlags = F_GREEN_AZURILL,
+        .flashFlags = F_FLASH_ICON | F_FLASH_COLOR_G_AZURILL,
     },
-    {
-        .var00 = 10,
-        .var01_0 = 12,
-        .var01_4 = 3,
-        .var02 = 2,
-        .var03 = 23,
-        .var04 = 13,
+    [SQU_GREEN_SKITTY] = {
+        .spriteIdOffset = 10,
+        .baseMultiplier = NUM_ROULETTE_SLOTS,
+        .column = 3,
+        .row = 2,
+        .x = 23,
+        .y = 13,
         .var05 = 6,
-        .var06 = 6,
-        .var08 = 0x2000,
-        .var0C = 0x2000,
-        .var10 = 0x2400,
+        .tilemapOffset = 6,
+        .flag = F_GREEN_SKITTY,
+        .inSelectionFlags = F_GREEN_SKITTY,
+        .flashFlags = F_FLASH_ICON | F_FLASH_COLOR_G_SKITTY,
     },
-    {
-        .var00 = 7,
-        .var01_0 = 12,
-        .var01_4 = 4,
-        .var02 = 2,
-        .var03 = 26,
-        .var04 = 13,
+    [SQU_GREEN_MAKUHITA] = {
+        .spriteIdOffset = 7,
+        .baseMultiplier = NUM_ROULETTE_SLOTS,
+        .column = 4,
+        .row = 2,
+        .x = 26,
+        .y = 13,
         .var05 = 6,
-        .var06 = 6,
-        .var08 = 0x4000,
-        .var0C = 0x4000,
-        .var10 = 0x2080,
+        .tilemapOffset = 6,
+        .flag = F_GREEN_MAKUHITA,
+        .inSelectionFlags = F_GREEN_MAKUHITA,
+        .flashFlags = F_FLASH_ICON | F_FLASH_COLOR_G_MAKUHITA,
     },
-    {
-        .var00 = 18,
-        .var01_0 = 3,
-        .var01_4 = 0,
-        .var02 = 3,
-        .var03 = 14,
-        .var04 = 16,
+    [ROW_PURPLE] = {
+        .spriteIdOffset = 18,
+        .baseMultiplier = NUM_BOARD_COLORS,
+        .column = 0,
+        .row = 3,
+        .x = 14,
+        .y = 16,
         .var05 = 6,
-        .var06 = 18,
-        .var08 = 0x8000,
-        .var0C = 0xF8000,
-        .var10 = 0x924,
+        .tilemapOffset = 18,
+        .flag = F_PURPLE_ROW,
+        .inSelectionFlags = F_PURPLE_ROW | F_PURPLE_WYNAUT | F_PURPLE_AZURILL | F_PURPLE_SKITTY | F_PURPLE_MAKUHITA,
+        .flashFlags = F_FLASH_COLOR_P_WYNAUT | F_FLASH_COLOR_P_AZURILL | F_FLASH_COLOR_P_SKITTY | F_FLASH_COLOR_P_MAKUHITA,
     },
-    {
-        .var00 = 8,
-        .var01_0 = 12,
-        .var01_4 = 1,
-        .var02 = 3,
-        .var03 = 17,
-        .var04 = 16,
+    [SQU_PURPLE_WYNAUT] = {
+        .spriteIdOffset = 8,
+        .baseMultiplier = NUM_ROULETTE_SLOTS,
+        .column = 1,
+        .row = 3,
+        .x = 17,
+        .y = 16,
         .var05 = 9,
-        .var06 = 9,
-        .var08 = 0x10000,
-        .var0C = 0x10000,
-        .var10 = 0x2100,
+        .tilemapOffset = 9,
+        .flag = F_PURPLE_WYNAUT,
+        .inSelectionFlags = F_PURPLE_WYNAUT,
+        .flashFlags = F_FLASH_ICON | F_FLASH_COLOR_P_WYNAUT,
     },
-    {
-        .var00 = 5,
-        .var01_0 = 12,
-        .var01_4 = 2,
-        .var02 = 3,
-        .var03 = 20,
-        .var04 = 16,
+    [SQU_PURPLE_AZURILL] = {
+        .spriteIdOffset = 5,
+        .baseMultiplier = NUM_ROULETTE_SLOTS,
+        .column = 2,
+        .row = 3,
+        .x = 20,
+        .y = 16,
         .var05 = 9,
-        .var06 = 9,
-        .var08 = 0x20000,
-        .var0C = 0x20000,
-        .var10 = 0x2020,
+        .tilemapOffset = 9,
+        .flag = F_PURPLE_AZURILL,
+        .inSelectionFlags = F_PURPLE_AZURILL,
+        .flashFlags = F_FLASH_ICON | F_FLASH_COLOR_P_AZURILL,
     },
-    {
-        .var00 = 2,
-        .var01_0 = 12,
-        .var01_4 = 3,
-        .var02 = 3,
-        .var03 = 23,
-        .var04 = 16,
+    [SQU_PURPLE_SKITTY] = {
+        .spriteIdOffset = 2,
+        .baseMultiplier = NUM_ROULETTE_SLOTS,
+        .column = 3,
+        .row = 3,
+        .x = 23,
+        .y = 16,
         .var05 = 9,
-        .var06 = 9,
-        .var08 = 0x40000,
-        .var0C = 0x40000,
-        .var10 = 0x2004,
+        .tilemapOffset = 9,
+        .flag = F_PURPLE_SKITTY,
+        .inSelectionFlags = F_PURPLE_SKITTY,
+        .flashFlags = F_FLASH_ICON | F_FLASH_COLOR_P_SKITTY,
     },
-    {
-        .var00 = 11,
-        .var01_0 = 12,
-        .var01_4 = 4,
-        .var02 = 3,
-        .var03 = 26,
-        .var04 = 16,
+    [SQU_PURPLE_MAKUHITA] = {
+        .spriteIdOffset = 11,
+        .baseMultiplier = NUM_ROULETTE_SLOTS,
+        .column = 4,
+        .row = 3,
+        .x = 26,
+        .y = 16,
         .var05 = 9,
-        .var06 = 9,
-        .var08 = 0x80000,
-        .var0C = 0x80000,
-        .var10 = 0x2800,
+        .tilemapOffset = 9,
+        .flag = F_PURPLE_MAKUHITA,
+        .inSelectionFlags = F_PURPLE_MAKUHITA,
+        .flashFlags = F_FLASH_ICON | F_FLASH_COLOR_P_MAKUHITA,
     },
 };
 
-static const struct StructgUnknown_083F8D90 gUnknown_085B62E4[] =
+static const struct RouletteSlot sRouletteSlots[] =
 {
     {
-        .var00 = 0,
-        .var01 = 1,
-        .var02 = 6,
-        .var04 = 0x40,
+        .id1 = 0,
+        .id2 = 1,
+        .gridSquare = SQU_ORANGE_WYNAUT,
+        .flag = F_ORANGE_WYNAUT,
     },
     {
-        .var00 = 1,
-        .var01 = 3,
-        .var02 = 12,
-        .var04 = 0x1000,
+        .id1 = 1,
+        .id2 = 3,
+        .gridSquare = SQU_GREEN_AZURILL,
+        .flag = F_GREEN_AZURILL,
     },
     {
-        .var00 = 2,
-        .var01 = 5,
-        .var02 = 18,
-        .var04 = 0x40000,
+        .id1 = 2,
+        .id2 = 5,
+        .gridSquare = SQU_PURPLE_SKITTY,
+        .flag = F_PURPLE_SKITTY,
     },
     {
-        .var00 = 3,
-        .var01 = 7,
-        .var02 = 9,
-        .var04 = 0x200,
+        .id1 = 3,
+        .id2 = 7,
+        .gridSquare = SQU_ORANGE_MAKUHITA,
+        .flag = F_ORANGE_MAKUHITA,
     },
     {
-        .var00 = 4,
-        .var01 = 9,
-        .var02 = 11,
-        .var04 = 0x800,
+        .id1 = 4,
+        .id2 = 9,
+        .gridSquare = SQU_GREEN_WYNAUT,
+        .flag = F_GREEN_WYNAUT,
     },
     {
-        .var00 = 5,
-        .var01 = 11,
-        .var02 = 17,
-        .var04 = 0x20000,
+        .id1 = 5,
+        .id2 = 11,
+        .gridSquare = SQU_PURPLE_AZURILL,
+        .flag = F_PURPLE_AZURILL,
     },
     {
-        .var00 = 6,
-        .var01 = 13,
-        .var02 = 8,
-        .var04 = 0x100,
+        .id1 = 6,
+        .id2 = 13,
+        .gridSquare = SQU_ORANGE_SKITTY,
+        .flag = F_ORANGE_SKITTY,
     },
     {
-        .var00 = 7,
-        .var01 = 15,
-        .var02 = 14,
-        .var04 = 0x4000,
+        .id1 = 7,
+        .id2 = 15,
+        .gridSquare = SQU_GREEN_MAKUHITA,
+        .flag = F_GREEN_MAKUHITA,
     },
     {
-        .var00 = 8,
-        .var01 = 17,
-        .var02 = 16,
-        .var04 = 0x10000,
+        .id1 = 8,
+        .id2 = 17,
+        .gridSquare = SQU_PURPLE_WYNAUT,
+        .flag = F_PURPLE_WYNAUT,
     },
     {
-        .var00 = 9,
-        .var01 = 19,
-        .var02 = 7,
-        .var04 = 0x80,
+        .id1 = 9,
+        .id2 = 19,
+        .gridSquare = SQU_ORANGE_AZURILL,
+        .flag = F_ORANGE_AZURILL,
     },
     {
-        .var00 = 10,
-        .var01 = 21,
-        .var02 = 13,
-        .var04 = 0x2000,
+        .id1 = 10,
+        .id2 = 21,
+        .gridSquare = SQU_GREEN_SKITTY,
+        .flag = F_GREEN_SKITTY,
     },
     {
-        .var00 = 11,
-        .var01 = 23,
-        .var02 = 19,
-        .var04 = 0x80000,
+        .id1 = 11,
+        .id2 = 23,
+        .gridSquare = SQU_PURPLE_MAKUHITA,
+        .flag = F_PURPLE_MAKUHITA,
     },
 };
-static const u8 gUnknown_085B6344[] = {1, 3, 1, 6};
-static const struct StructgUnknown_083F8DF4 gUnknown_085B6348[] =
-{
-    {
-        .var00 = 1,
-        .var01 = 60,
-        .var02 = 30,
-        .var03 = 1,
-        .var04 = 1,
-        .var08 = 45,
-        .var0A = 30,
-        .var0C = 1,
-        .var10 = 75,
-        .var12 = 27,
-        .var14 = 24,
-        .var18 = 10,
-        .var1A = 360,
+static const u8 sTableMinBets[] = {1, 3, 1, 6};
+
+static const struct RouletteTable sRouletteTables[] =
+{
+    // Left table
+    {
+        .minBet = 1,
+        .randDistanceHigh = DEGREES_PER_SLOT * 2,
+        .randDistanceLow = DEGREES_PER_SLOT,
+        .wheelSpeed = 1,
+        .wheelDelay = 1,
+        .shroomish = {
+            .startAngle = 45,
+            .dropAngle = 30,
+            .fallSlowdown = 1,
+        },
+        .taillow = {
+            .baseDropDelay = 75,
+            .rightStartAngle = 27,
+            .leftStartAngle = 24,
+        },
+        .ballSpeed = 10,
+        .baseTravelDist = 360,
         .var1C = -0.5f
     },
-    {
-        .var00 = 3,
-        .var01 = 30,
-        .var02 = 15,
-        .var03 = 1,
-        .var04 = 0,
-        .var08 = 75,
-        .var0A = 60,
-        .var0C = 2,
-        .var10 = 0,
-        .var12 = 54,
-        .var14 = 48,
-        .var18 = 10,
-        .var1A = 270,
+    // Right table
+    {
+        .minBet = 3,
+        .randDistanceHigh = DEGREES_PER_SLOT,
+        .randDistanceLow = DEGREES_PER_SLOT / 2,
+        .wheelSpeed = 1,
+        .wheelDelay = 0,
+        .shroomish = {
+            .startAngle = 75,
+            .dropAngle = 60,
+            .fallSlowdown = 2,
+        },
+        .taillow = {
+            .baseDropDelay = 0,
+            .rightStartAngle = 54,
+            .leftStartAngle = 48,
+        },
+        .ballSpeed = 10,
+        .baseTravelDist = 270,
         .var1C = -1.0f
     }
 };
 
-static const struct UnkStruct1 gUnknown_085B6388[] =
-{
-    {
-        .var00 = 0x8000,
-        .var02 = 0x0005,
-        .var04 = 1,
-        .var05 = 1,
-        .var06 = 0xFF,
-        .var07_0 = 8,
-        .var07_5 = 2,
-        .var07_7 = 0
+// Data to flash the color indicator for each slot on the roulette wheel
+static const struct RouletteFlashSettings sFlashData_Colors[NUM_ROULETTE_SLOTS + 1] =
+{
+    { // F_FLASH_COLOR_O_WYNAUT
+        .color = FLASHUTIL_USE_EXISTING_COLOR,
+        .paletteOffset = 0x5,
+        .numColors = 1,
+        .delay = 1,
+        .unk6 = -1,
+        .numFadeCycles = 8,
+        .unk7_5 = -2,
+        .colorDeltaDir = 0,
     },
-    {
-        .var00 = 0x8000,
-        .var02 = 0x000A,
-        .var04 = 1,
-        .var05 = 1,
-        .var06 = 0xFF,
-        .var07_0 = 8,
-        .var07_5 = 2,
-        .var07_7 = 0
+    { // F_FLASH_COLOR_G_AZURILL
+        .color = FLASHUTIL_USE_EXISTING_COLOR,
+        .paletteOffset = 0xA,
+        .numColors = 1,
+        .delay = 1,
+        .unk6 = -1,
+        .numFadeCycles = 8,
+        .unk7_5 = -2,
+        .colorDeltaDir = 0,
     },
-    {
-        .var00 = 0x8000,
-        .var02 = 0x0015,
-        .var04 = 1,
-        .var05 = 1,
-        .var06 = 0xFF,
-        .var07_0 = 8,
-        .var07_5 = 2,
-        .var07_7 = 0
+    { // F_FLASH_COLOR_P_SKITTY
+        .color = FLASHUTIL_USE_EXISTING_COLOR,
+        .paletteOffset = 0x15,
+        .numColors = 1,
+        .delay = 1,
+        .unk6 = -1,
+        .numFadeCycles = 8,
+        .unk7_5 = -2,
+        .colorDeltaDir = 0,
     },
-    {
-        .var00 = 0x8000,
-        .var02 = 0x0055,
-        .var04 = 1,
-        .var05 = 1,
-        .var06 = 0xFF,
-        .var07_0 = 8,
-        .var07_5 = 2,
-        .var07_7 = 0
+    { // F_FLASH_COLOR_O_MAKUHITA
+        .color = FLASHUTIL_USE_EXISTING_COLOR,
+        .paletteOffset = 0x55,
+        .numColors = 1,
+        .delay = 1,
+        .unk6 = -1,
+        .numFadeCycles = 8,
+        .unk7_5 = -2,
+        .colorDeltaDir = 0,
     },
-    {
-        .var00 = 0x8000,
-        .var02 = 0x005A,
-        .var04 = 1,
-        .var05 = 1,
-        .var06 = 0xFF,
-        .var07_0 = 8,
-        .var07_5 = 2,
-        .var07_7 = 0
+    { // F_FLASH_COLOR_G_WYNAUT
+        .color = FLASHUTIL_USE_EXISTING_COLOR,
+        .paletteOffset = 0x5A,
+        .numColors = 1,
+        .delay = 1,
+        .unk6 = -1,
+        .numFadeCycles = 8,
+        .unk7_5 = -2,
+        .colorDeltaDir = 0,
     },
-    {
-        .var00 = 0x8000,
-        .var02 = 0x0065,
-        .var04 = 1,
-        .var05 = 1,
-        .var06 = 0xFF,
-        .var07_0 = 8,
-        .var07_5 = 2,
-        .var07_7 = 0
+    { // F_FLASH_COLOR_P_AZURILL
+        .color = FLASHUTIL_USE_EXISTING_COLOR,
+        .paletteOffset = 0x65,
+        .numColors = 1,
+        .delay = 1,
+        .unk6 = -1,
+        .numFadeCycles = 8,
+        .unk7_5 = -2,
+        .colorDeltaDir = 0,
     },
-    {
-        .var00 = 0x8000,
-        .var02 = 0x0075,
-        .var04 = 1,
-        .var05 = 1,
-        .var06 = 0xFF,
-        .var07_0 = 8,
-        .var07_5 = 2,
-        .var07_7 = 0
+    { // F_FLASH_COLOR_O_SKITTY
+        .color = FLASHUTIL_USE_EXISTING_COLOR,
+        .paletteOffset = 0x75,
+        .numColors = 1,
+        .delay = 1,
+        .unk6 = -1,
+        .numFadeCycles = 8,
+        .unk7_5 = -2,
+        .colorDeltaDir = 0,
     },
-    {
-        .var00 = 0x8000,
-        .var02 = 0x007A,
-        .var04 = 1,
-        .var05 = 1,
-        .var06 = 0xFF,
-        .var07_0 = 8,
-        .var07_5 = 2,
-        .var07_7 = 0
+    { // F_FLASH_COLOR_G_MAKUHITA
+        .color = FLASHUTIL_USE_EXISTING_COLOR,
+        .paletteOffset = 0x7A,
+        .numColors = 1,
+        .delay = 1,
+        .unk6 = -1,
+        .numFadeCycles = 8,
+        .unk7_5 = -2,
+        .colorDeltaDir = 0,
     },
-    {
-        .var00 = 0x8000,
-        .var02 = 0x0085,
-        .var04 = 1,
-        .var05 = 1,
-        .var06 = 0xFF,
-        .var07_0 = 8,
-        .var07_5 = 2,
-        .var07_7 = 0
+    { // F_FLASH_COLOR_P_WYNAUT
+        .color = FLASHUTIL_USE_EXISTING_COLOR,
+        .paletteOffset = 0x85,
+        .numColors = 1,
+        .delay = 1,
+        .unk6 = -1,
+        .numFadeCycles = 8,
+        .unk7_5 = -2,
+        .colorDeltaDir = 0,
     },
-    {
-        .var00 = 0x8000,
-        .var02 = 0x0095,
-        .var04 = 1,
-        .var05 = 1,
-        .var06 = 0xFF,
-        .var07_0 = 8,
-        .var07_5 = 2,
-        .var07_7 = 0
+    { // F_FLASH_COLOR_O_AZURILL
+        .color = FLASHUTIL_USE_EXISTING_COLOR,
+        .paletteOffset = 0x95,
+        .numColors = 1,
+        .delay = 1,
+        .unk6 = -1,
+        .numFadeCycles = 8,
+        .unk7_5 = -2,
+        .colorDeltaDir = 0,
     },
-    {
-        .var00 = 0x8000,
-        .var02 = 0x009A,
-        .var04 = 1,
-        .var05 = 1,
-        .var06 = 0xFF,
-        .var07_0 = 8,
-        .var07_5 = 2,
-        .var07_7 = 0
+    { // F_FLASH_COLOR_G_SKITTY
+        .color = FLASHUTIL_USE_EXISTING_COLOR,
+        .paletteOffset = 0x9A,
+        .numColors = 1,
+        .delay = 1,
+        .unk6 = -1,
+        .numFadeCycles = 8,
+        .unk7_5 = -2,
+        .colorDeltaDir = 0,
     },
-    {
-        .var00 = 0x8000,
-        .var02 = 0x00A5,
-        .var04 = 1,
-        .var05 = 1,
-        .var06 = 0xFF,
-        .var07_0 = 8,
-        .var07_5 = 2,
-        .var07_7 = 0
+    { // F_FLASH_COLOR_P_MAKUHITA
+        .color = FLASHUTIL_USE_EXISTING_COLOR,
+        .paletteOffset = 0xA5,
+        .numColors = 1,
+        .delay = 1,
+        .unk6 = -1,
+        .numFadeCycles = 8,
+        .unk7_5 = -2,
+        .colorDeltaDir = 0,
     },
-    {
-        .var00 = 0x77D6,
-        .var02 = 0x0028,
-        .var04 = 2,
-        .var05 = 10,
-        .var06 = 0xFF,
-        .var07_0 = 14,
-        .var07_5 = 2,
-        .var07_7 = 0
+    { // F_FLASH_OUTER_EDGES
+        .color = RGB(22, 30, 29),
+        .paletteOffset = 0x28,
+        .numColors = 2,
+        .delay = 10,
+        .unk6 = -1,
+        .numFadeCycles = 14,
+        .unk7_5 = -2,
+        .colorDeltaDir = 0,
     },
 };
 
-static const struct UnkStruct1 gUnknown_085B63F0[] =
-{
-    {
-        .var00 = 0x53FF,
-        .var02 = 0x0101,
-        .var04 = 5,
-        .var05 = 30,
-        .var06 = 0xFF,
-        .var07_0 = 14,
-        .var07_5 = 2,
-        .var07_7 = 0
+// Data to flash any pokemon icon (F_FLASH_ICON) on the roulette wheel. One entry for each color row
+// Each poke icon flashes with the tint of the row color it belongs to, so the pokemon itself is irrelevant
+static const struct RouletteFlashSettings sFlashData_PokeIcons[NUM_BOARD_COLORS] =
+{
+    [GET_ROW_IDX(ROW_ORANGE)] = {
+        .color = RGB(31, 31, 20),
+        .paletteOffset = 0x101,
+        .numColors = 5,
+        .delay = 30,
+        .unk6 = -1,
+        .numFadeCycles = 14,
+        .unk7_5 = -2,
+        .colorDeltaDir = 0,
     },
-    {
-        .var00 = 0x7FFB,
-        .var02 = 0x0106,
-        .var04 = 5,
-        .var05 = 30,
-        .var06 = 0xFF,
-        .var07_0 = 14,
-        .var07_5 = 2,
-        .var07_7 = 0
+    [GET_ROW_IDX(ROW_GREEN)] = {
+        .color = RGB(27, 31, 31),
+        .paletteOffset = 0x106,
+        .numColors = 5,
+        .delay = 30,
+        .unk6 = -1,
+        .numFadeCycles = 14,
+        .unk7_5 = -2,
+        .colorDeltaDir = 0,
     },
-    {
-        .var00 = 0x7F7F,
-        .var02 = 0x010B,
-        .var04 = 5,
-        .var05 = 30,
-        .var06 = 0xFF,
-        .var07_0 = 14,
-        .var07_5 = 2,
-        .var07_7 = 0
+    [GET_ROW_IDX(ROW_PURPLE)] = {
+        .color = RGB(31, 27, 31),
+        .paletteOffset = 0x10B,
+        .numColors = 5,
+        .delay = 30,
+        .unk6 = -1,
+        .numFadeCycles = 14,
+        .unk7_5 = -2,
+        .colorDeltaDir = 0,
     }
 };
 
-static const struct YesNoFuncTable gUnknown_085B6408 =
+static const struct YesNoFuncTable sYesNoTable_AcceptMinBet =
 {
-    sub_8142918,
-    sub_814297C
+    Task_AcceptMinBet,
+    Task_DeclineMinBet
 };
 
-static const struct YesNoFuncTable gUnknown_085B6410 =
+static const struct YesNoFuncTable sYesNoTable_KeepPlaying =
 {
-    sub_8140968,
-    sub_8140994
+    Task_ContinuePlaying,
+    Task_StopPlaying
 };
 
-static void sub_8140238(void)
+static void CB2_Roulette(void)
 {
 	RunTasks();
 	AnimateSprites();
 	BuildOamBuffer();
-	if (gUnknown_0203AB88->varB8.var00)
-	   task_tutorial_controls_fadein(&gUnknown_0203AB88->varB8);
+	if (sRoulette->flashUtil.enabled)
+	   RouletteFlash_Run(&sRoulette->flashUtil);
 }
 
-static void sub_8140264(void)
+static void VBlankCB_Roulette(void)
 {
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
-    sub_8142814();
-    SetGpuReg(REG_OFFSET_BG1HOFS, 0x200 - gUnknown_0203AB88->var26);
-    if (gUnknown_0203AB88->var01)
-        SetGpuReg(REG_OFFSET_BLDALPHA, gUnknown_0203AB88->var34);
-    if (gUnknown_0203AB88->var2A != 0)
-    {
-        DmaCopy16(3, &gUnknown_0203AB88->tilemapBuffers[2][0xE0], (void *)BG_SCREEN_ADDR(4) + 0x1C0, 0x340);
-        gUnknown_0203AB88->var2A = 0;
+    UpdateWheelPosition();
+    SetGpuReg(REG_OFFSET_BG1HOFS, 0x200 - sRoulette->gridX);
+
+    if (sRoulette->shroomishShadowTimer)
+        SetGpuReg(REG_OFFSET_BLDALPHA, sRoulette->shroomishShadowAlpha);
+
+    if (sRoulette->updateGridHighlight)
+    {
+        DmaCopy16(3, &sRoulette->tilemapBuffers[2][0xE0], (void *)BG_SCREEN_ADDR(4) + 0x1C0, 0x340);
+        sRoulette->updateGridHighlight = FALSE;
     }
-    switch (gUnknown_0203AB88->var28)
+    switch (sRoulette->selectionRectDrawState)
     {
-    case 1:
+    case SELECT_STATE_DRAW:
         SetBgAttribute(0, BG_ATTR_CHARBASEINDEX, 0);
         ShowBg(0);
-        DmaCopy16(3, &gUnknown_0203AB88->tilemapBuffers[0][0xE0], (void *)BG_SCREEN_ADDR(31) + 0x1C0, 0x340);
-        gUnknown_0203AB88->var28 = 2;
+        DmaCopy16(3, &sRoulette->tilemapBuffers[0][0xE0], (void *)BG_SCREEN_ADDR(31) + 0x1C0, 0x340);
+        sRoulette->selectionRectDrawState = SELECT_STATE_UPDATE;
         break;
-    case 2:
-        DmaCopy16(3, &gUnknown_0203AB88->tilemapBuffers[0][0xE0], (void *)BG_SCREEN_ADDR(31) + 0x1C0, 0x340);
+    case SELECT_STATE_UPDATE:
+        DmaCopy16(3, &sRoulette->tilemapBuffers[0][0xE0], (void *)BG_SCREEN_ADDR(31) + 0x1C0, 0x340);
         break;
-    case 0xFF:
+    case SELECT_STATE_ERASE:
         SetBgAttribute(0, BG_ATTR_CHARBASEINDEX, 2);
         ShowBg(0);
         DmaFill16(3, 0, (void *)BG_SCREEN_ADDR(31) + 0x1C0, 0x340);
-        gUnknown_0203AB88->var28 = 0;
-    case 0:
+        sRoulette->selectionRectDrawState = SELECT_STATE_WAIT;
+    case SELECT_STATE_WAIT:
         break;
     }
 }
 
-static void sub_8140388(void)
+static void InitRouletteBgAndWindows(void)
 {
     u32 size = 0;
 
-    gUnknown_0203AB88 = AllocZeroed(sizeof(*gUnknown_0203AB88));
+    sRoulette = AllocZeroed(sizeof(*sRoulette));
     ResetBgsAndClearDma3BusyFlags(0);
-    InitBgsFromTemplates(1, gUnknown_085B6140, ARRAY_COUNT(gUnknown_085B6140));
-    SetBgTilemapBuffer(0, gUnknown_0203AB88->tilemapBuffers[0]);
-    SetBgTilemapBuffer(1, gUnknown_0203AB88->tilemapBuffers[2]);
-    SetBgTilemapBuffer(2, gUnknown_0203AB88->tilemapBuffers[6]);
-    InitWindows(gUnknown_085B614C);
-    sub_8197200();
-    gUnknown_0203AB8C = 0;
-    gUnknown_0203AB88->unk_397C = malloc_and_decompress(gUnknown_085B5DFC, &size);
+    InitBgsFromTemplates(1, sBgTemplates, ARRAY_COUNT(sBgTemplates));
+    SetBgTilemapBuffer(0, sRoulette->tilemapBuffers[0]);
+    SetBgTilemapBuffer(1, sRoulette->tilemapBuffers[2]);
+    SetBgTilemapBuffer(2, sRoulette->tilemapBuffers[6]);
+    InitWindows(sWindowTemplates);
+    InitTextBoxGfxAndPrinters();
+    sTextWindowId = 0;
+    sRoulette->gridTilemap = malloc_and_decompress(sGrid_Tilemap, &size);
 }
 
-static void sub_8140418(void)
+static void FreeRoulette(void)
 {
-    FREE_AND_SET_NULL(gUnknown_0203AB88->unk_397C);
+    FREE_AND_SET_NULL(sRoulette->gridTilemap);
     FreeAllWindowBuffers();
     UnsetBgTilemapBuffer(0);
     UnsetBgTilemapBuffer(1);
     UnsetBgTilemapBuffer(2);
     ResetBgsAndClearDma3BusyFlags(0);
-    memset(gUnknown_0203AB88, 0, sizeof(*gUnknown_0203AB88));
-    FREE_AND_SET_NULL(gUnknown_0203AB88);
+    memset(sRoulette, 0, sizeof(*sRoulette));
+    FREE_AND_SET_NULL(sRoulette);
 }
 
-static void sub_8140470(void)
+static void InitRouletteTableData(void)
 {
     u8 i;
-    u16 arr[3] = {RGB(24, 4, 10), RGB(10, 19, 6), RGB(24, 4, 10)}; // the third is never used ?
+    u16 bgColors[3] = {RGB(24, 4, 10), RGB(10, 19, 6), RGB(24, 4, 10)}; // 3rd is never used, same as 1st
 
-    gUnknown_0203AB88->var04_0 = (gSpecialVar_0x8004 & 1);
+    sRoulette->tableId = (gSpecialVar_0x8004 & 1);
 
-    if (gSpecialVar_0x8004 & 0x80)
-        gUnknown_0203AB88->var04_7 = 1;
+    if (gSpecialVar_0x8004 & ROULETTE_SPECIAL_RATE)
+        sRoulette->isSpecialRate = TRUE;
 
-    gUnknown_0203AB88->var22 = gUnknown_085B6348[gUnknown_0203AB88->var04_0].var03;
-    gUnknown_0203AB88->var23 = gUnknown_085B6348[gUnknown_0203AB88->var04_0].var04;
-    gUnknown_0203AB88->var19 = gUnknown_085B6344[gUnknown_0203AB88->var04_0 + gUnknown_0203AB88->var04_7 * 2];
-    gUnknown_0203AB88->var1A_4 = 1;
+    sRoulette->wheelSpeed = sRouletteTables[sRoulette->tableId].wheelSpeed;
+    sRoulette->wheelDelay = sRouletteTables[sRoulette->tableId].wheelDelay;
+    sRoulette->minBet = sTableMinBets[sRoulette->tableId + sRoulette->isSpecialRate * 2];
+    sRoulette->unk1 = 1;
 
-    if (gUnknown_0203AB88->var19 == 1)
-        gPlttBufferUnfaded[0] = gPlttBufferUnfaded[0x51] = gPlttBufferFaded[0] = gPlttBufferFaded[0x51] = arr[0];
+    // Left table (with min bet of 1) has red background, other table has green
+    if (sRoulette->minBet == 1)
+        gPlttBufferUnfaded[0] = gPlttBufferUnfaded[0x51] = gPlttBufferFaded[0] = gPlttBufferFaded[0x51] = bgColors[0];
     else
-        gPlttBufferUnfaded[0] = gPlttBufferUnfaded[0x51] = gPlttBufferFaded[0] = gPlttBufferFaded[0x51] = arr[1];
+        gPlttBufferUnfaded[0] = gPlttBufferUnfaded[0x51] = gPlttBufferFaded[0] = gPlttBufferFaded[0x51] = bgColors[1];
 
-    sub_8151678(&gUnknown_0203AB88->varB8);
+    RouletteFlash_Reset(&sRoulette->flashUtil);
 
-    for (i = 0; i < 13; i++)
+    // Init flash util for flashing the selected colors on the wheel
+    // + 1 for the additional entry to flash the outer edges on a win
+    for (i = 0; i < NUM_ROULETTE_SLOTS + 1; i++)
     {
-        sub_815168C(&gUnknown_0203AB88->varB8, i, &gUnknown_085B6388[i]);
+        RouletteFlash_Add(&sRoulette->flashUtil, i, &sFlashData_Colors[i]);
     }
 
     for (i = 0; i < PARTY_SIZE; i++)
@@ -908,17 +1147,27 @@ static void sub_8140470(void)
         switch (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2))
         {
         case SPECIES_SHROOMISH:
-            gUnknown_0203AB88->var02 |= 0x1;
+            sRoulette->partySpeciesFlags |= HAS_SHROOMISH;
             break;
         case SPECIES_TAILLOW:
-            gUnknown_0203AB88->var02 |= 0x2;
+            sRoulette->partySpeciesFlags |= HAS_TAILLOW;
             break;
         }
     }
     RtcCalcLocalTime();
 }
 
-static void sub_81405CC(void)
+// Task data for the roulette game tasks, starting with Task_StartPlaying
+#define tMultiplier      data[2]
+#define tSelectionId     data[4]
+#define tWonBet          data[5]
+#define tBallNum         data[6]
+#define tTotalBallNum    data[8] // Same as tBallNum but isn't cleared every 6 balls
+#define tConsecutiveWins data[11]
+#define tWinningSquare   data[12]
+#define tCoins           data[13]
+
+static void CB2_LoadRoulette(void)
 {
     u8 taskId;
 
@@ -932,7 +1181,7 @@ static void sub_81405CC(void)
         ResetAllBgsCoordinates();
         break;
     case 1:
-        sub_8140388();
+        InitRouletteBgAndWindows();
         DeactivateAllTextPrinters();
         SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_NONE |
                                      BLDCNT_TGT2_BG2 |
@@ -946,36 +1195,36 @@ static void sub_81405CC(void)
         ResetTempTileDataBuffers();
         break;
     case 3:
-        LoadPalette(&gUnknown_085B5BFC, 0, 0x1C0);
-        DecompressAndCopyTileDataToVram(1, gRouletteMenuTiles, 0, 0, 0);
-        DecompressAndCopyTileDataToVram(2, gRouletteWheelTiles, 0, 0, 0);
+        LoadPalette(&sWheel_Pal, 0, 0x1C0);
+        DecompressAndCopyTileDataToVram(1, gRouletteMenu_Gfx, 0, 0, 0);
+        DecompressAndCopyTileDataToVram(2, gRouletteWheel_Gfx, 0, 0, 0);
         break;
     case 4:
         if (FreeTempTileDataBuffersIfPossible())
             return;
 
-        sub_8140470();
-        CopyToBgTilemapBuffer(2, gUnknown_085B5FA0, 0, 0);
+        InitRouletteTableData();
+        CopyToBgTilemapBuffer(2, sWheel_Tilemap, 0, 0);
         break;
     case 5:
-        sub_8142C0C(0);
-        sub_81439C8();
-        sub_814391C();
-        sub_8143314();
-        sub_8142CD0();
-        sub_8142F7C();
-        sub_81431E4();
+        LoadOrFreeMiscSpritePalettesAndSheets(FALSE);
+        CreateWheelBallSprites();
+        CreateWheelCenterSprite();
+        CreateInterfaceSprites();
+        CreateGridSprites();
+        CreateGridBallSprites();
+        CreateWheelIconSprites();
         break;
     case 6:
         AnimateSprites();
         BuildOamBuffer();
-        sub_8143514(GetCoins());
-        sub_814372C(6);
-        sub_81436D0(0);
-        sub_81424FC(0);
-        DrawStdWindowFrame(gUnknown_0203AB8C, FALSE);
-        AddTextPrinterParameterized(gUnknown_0203AB8C, 1, Roulette_Text_ControlsInstruction, 0, 1, TEXT_SPEED_FF, NULL);
-        CopyWindowToVram(gUnknown_0203AB8C, 3);
+        SetCreditDigits(GetCoins());
+        SetBallCounterNumLeft(BALLS_PER_ROUND);
+        SetMultiplierSprite(SELECTION_NONE);
+        DrawGridBackground(SELECTION_NONE);
+        DrawStdWindowFrame(sTextWindowId, FALSE);
+        AddTextPrinterParameterized(sTextWindowId, 1, Roulette_Text_ControlsInstruction, 0, 1, TEXT_SPEED_FF, NULL);
+        CopyWindowToVram(sTextWindowId, 3);
         gSpriteCoordOffsetX = -60;
         gSpriteCoordOffsetY = 0;
         break;
@@ -991,39 +1240,39 @@ static void sub_81405CC(void)
         break;
     case 8:
         EnableInterrupts(INTR_FLAG_VBLANK);
-        SetVBlankCallback(sub_8140264);
+        SetVBlankCallback(VBlankCB_Roulette);
         BeginHardwarePaletteFade(0xFF, 0, 16, 0, 1);
-        taskId = gUnknown_0203AB88->varA4 = CreateTask(sub_81408A8, 0);
-        gTasks[taskId].data[6] = 6;
-        gTasks[taskId].data[13] = GetCoins();
+        taskId = sRoulette->playTaskId = CreateTask(Task_StartPlaying, 0);
+        gTasks[taskId].tBallNum = BALLS_PER_ROUND;
+        gTasks[taskId].tCoins = GetCoins();
         AlertTVThatPlayerPlayedRoulette(GetCoins());
-        gUnknown_0203AB88->varA5 = CreateTask(sub_8140814, 1);
-        SetMainCallback2(sub_8140238);
+        sRoulette->spinTaskId = CreateTask(Task_SpinWheel, 1);
+        SetMainCallback2(CB2_Roulette);
         return;
     }
     gMain.state++;
 }
 
-static void sub_8140814(u8 unused)
+static void Task_SpinWheel(u8 taskId)
 {
     s16 sin;
     s16 cos;
 
-    if (gUnknown_0203AB88->var21++ == gUnknown_0203AB88->var23)
+    if (sRoulette->wheelDelayTimer++ == sRoulette->wheelDelay)
     {
-        gUnknown_0203AB88->var21 = 0;
-        if ((gUnknown_0203AB88->var24 -= gUnknown_0203AB88->var22) < 0)
-            gUnknown_0203AB88->var24 = 360 - gUnknown_0203AB88->var22;
+        sRoulette->wheelDelayTimer = 0;
+        if ((sRoulette->wheelAngle -= sRoulette->wheelSpeed) < 0)
+            sRoulette->wheelAngle = 360 - sRoulette->wheelSpeed;
     }
-    sin = Sin2(gUnknown_0203AB88->var24);
-    cos = Cos2(gUnknown_0203AB88->var24);
+    sin = Sin2(sRoulette->wheelAngle);
+    cos = Cos2(sRoulette->wheelAngle);
     sin = sin / 16;
-    gUnknown_0203AB88->var2C.a = gUnknown_0203AB88->var2C.d = cos / 16;
-    gUnknown_0203AB88->var2C.b =  sin;
-    gUnknown_0203AB88->var2C.c = -sin;
+    sRoulette->wheelRotation.a = sRoulette->wheelRotation.d = cos / 16;
+    sRoulette->wheelRotation.b =  sin;
+    sRoulette->wheelRotation.c = -sin;
 }
 
-static void sub_81408A8(u8 taskId)
+static void Task_StartPlaying(u8 taskId)
 {
     if (UpdatePaletteFade() == 0)
     {
@@ -1031,222 +1280,230 @@ static void sub_81408A8(u8 taskId)
                                      BLDCNT_TGT2_BG2 |
                                      BLDCNT_TGT2_BD);
         SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(8, 8));
-        gTasks[taskId].data[6] = 0;
-        sub_8141FF4(taskId);
-        sub_8142070();
-        sub_8143A40();
-        sub_81424FC(0);
-        sub_814372C(6);
-        sub_8141F7C(taskId, sub_8140968, 0xFFFF, 0x3);
+        gTasks[taskId].tBallNum = 0;
+        ResetBallDataForNewSpin(taskId);
+        ResetHits();
+        HideWheelBalls();
+        DrawGridBackground(SELECTION_NONE);
+        SetBallCounterNumLeft(BALLS_PER_ROUND);
+        StartTaskAfterDelayOrInput(taskId, Task_ContinuePlaying, NO_DELAY, A_BUTTON | B_BUTTON);
     }
 }
 
-static void sub_8140914(u8 taskId)
+static void Task_AskKeepPlaying(u8 taskId)
 {
     DisplayYesNoMenuDefaultYes();
-    DrawStdWindowFrame(gUnknown_0203AB8C, 0);
-    AddTextPrinterParameterized(gUnknown_0203AB8C, 1, Roulette_Text_KeepPlaying, 0, 1, TEXT_SPEED_FF, 0);
-    CopyWindowToVram(gUnknown_0203AB8C, 3);
-    DoYesNoFuncWithChoice(taskId, &gUnknown_085B6410);
+    DrawStdWindowFrame(sTextWindowId, 0);
+    AddTextPrinterParameterized(sTextWindowId, 1, Roulette_Text_KeepPlaying, 0, 1, TEXT_SPEED_FF, 0);
+    CopyWindowToVram(sTextWindowId, 3);
+    DoYesNoFuncWithChoice(taskId, &sYesNoTable_KeepPlaying);
 }
 
-static void sub_8140968(u8 taskId)
+static void Task_ContinuePlaying(u8 taskId)
 {
     ClearStdWindowAndFrame(0, TRUE);
-    gTasks[taskId].func = sub_8140BD0;
+    gTasks[taskId].func = Task_SelectFirstEmptySquare;
 }
 
-static void sub_8140994(u8 taskId)
+static void Task_StopPlaying(u8 taskId)
 {
-    DestroyTask(gUnknown_0203AB88->varA5);
-    sub_8141DE4(taskId);
+    DestroyTask(sRoulette->spinTaskId);
+    ExitRoulette(taskId);
 }
 
-static void sub_81409B8(u8 r0)
+static void UpdateGridSelectionRect(u8 selectionId)
 {
     u8 temp0, temp1;
-    switch (r0)
+    switch (selectionId)
     {
-    case 0:
-        sub_8152008(&gUnknown_0203AB88->tilemapBuffers[0][0], 0, 14, 7, 16, 13);
+    case SELECTION_NONE:
+        ClearTilemapRect(&sRoulette->tilemapBuffers[0][0], 0, 14, 7, 16, 13);
         break;
-    case 1:
-    case 2:
-    case 3:
-    case 4:
-        temp0 = (r0 * 3 + 14);
-        sub_8152008(&gUnknown_0203AB88->tilemapBuffers[0][0], 0, 14, 7, 16, 13);
-        sub_8152058(&gUnknown_0203AB88->tilemapBuffers[0][0], &gUnknown_0203AB88->unk_397C[281], temp0, 7, 3, 13);
+    case COL_WYNAUT:
+    case COL_AZURILL:
+    case COL_SKITTY:
+    case COL_MAKUHITA:
+        temp0 = (selectionId * 3 + 14);
+        ClearTilemapRect(&sRoulette->tilemapBuffers[0][0], 0, 14, 7, 16, 13);
+        SetTilemapRect(&sRoulette->tilemapBuffers[0][0], &sRoulette->gridTilemap[281], temp0, 7, 3, 13);
         break;
-    case 0x5:
-    case 0xA:
-    case 0xF:
-        temp1 = ((r0 - 1) / 5 * 3 + 10);
-        sub_8152008(&gUnknown_0203AB88->tilemapBuffers[0][0], 0, 14, 7, 16, 13);
-        sub_8152058(&gUnknown_0203AB88->tilemapBuffers[0][0], &gUnknown_0203AB88->unk_397C[320], 14, temp1, 16, 3);
+    case ROW_ORANGE:
+    case ROW_GREEN:
+    case ROW_PURPLE:
+        temp1 = ((selectionId - 1) / 5 * 3 + 10);
+        ClearTilemapRect(&sRoulette->tilemapBuffers[0][0], 0, 14, 7, 16, 13);
+        SetTilemapRect(&sRoulette->tilemapBuffers[0][0], &sRoulette->gridTilemap[320], 14, temp1, 16, 3);
         break;
+    // Individual square
     default:
-        temp0 = ((r0 % 5) * 3 + 14);
-        temp1 = ((r0 - 1) / 5 * 3 + 7);
-        sub_8152008(&gUnknown_0203AB88->tilemapBuffers[0][0], 0, 14, 7, 16, 13);
-        sub_8152058(&gUnknown_0203AB88->tilemapBuffers[0][0], &gUnknown_0203AB88->unk_397C[272], temp0, temp1, 3, 3);
+        temp0 = GET_COL(selectionId) * 3 + 14;
+        temp1 = ((selectionId - 1) / 5 * 3 + 7);
+        ClearTilemapRect(&sRoulette->tilemapBuffers[0][0], 0, 14, 7, 16, 13);
+        SetTilemapRect(&sRoulette->tilemapBuffers[0][0], &sRoulette->gridTilemap[272], temp0, temp1, 3, 3);
         break;
     }
 }
 
-static void sub_8140B64(u8 taskId)
+static void UpdateGridSelection(u8 taskId)
 {
-    sub_81436D0(gTasks[taskId].data[4]);
-    sub_81409B8(gTasks[taskId].data[4]);
+    SetMultiplierSprite(gTasks[taskId].tSelectionId);
+    UpdateGridSelectionRect(gTasks[taskId].tSelectionId);
 }
 
-static void sub_8140B8C(u8 taskId)
+static void Task_StartHandleBetGridInput(u8 taskId)
 {
-    gUnknown_0203AB88->var28 = 1;
-    sub_81409B8(gTasks[taskId].data[4]);
-    gUnknown_0203AB88->var23 = 2;
-    gUnknown_0203AB88->var21 = 0;
-    gTasks[taskId].func = sub_8141040;
+    sRoulette->selectionRectDrawState = SELECT_STATE_DRAW;
+    UpdateGridSelectionRect(gTasks[taskId].tSelectionId);
+    sRoulette->wheelDelay = 2;
+    sRoulette->wheelDelayTimer = 0;
+    gTasks[taskId].func = Task_HandleBetGridInput;
 }
 
-static void sub_8140BD0(u8 taskId)
+static void Task_SelectFirstEmptySquare(u8 taskId)
 {
     s16 i;
 
-    if (gUnknown_0203AB88->var08 & 0x20)
+    if (sRoulette->hitFlags & F_ORANGE_ROW)
     {
-        for (i = 11; i < 14; i++)
+        // If the whole orange row is filled, get first in green row
+        for (i = SQU_GREEN_WYNAUT; i < SQU_GREEN_MAKUHITA; i++)
         {
-            if ((gUnknown_0203AB88->var08 & gUnknown_085B6154[i].var08) == 0)
+            if (!(sRoulette->hitFlags & sGridSelections[i].flag))
                 break;
         }
     }
     else
     {
-        for (i = 6; i < 10; i++)
+        // Otherwise get first in orange row
+        // With only 6 balls both rows can't be filled, no need to check purple row
+        for (i = SQU_ORANGE_WYNAUT; i <= SQU_ORANGE_MAKUHITA; i++) // <= is accidental, but it will never get that far
         {
-            if ((gUnknown_0203AB88->var08 & gUnknown_085B6154[i].var08) == 0)
+            if (!(sRoulette->hitFlags & sGridSelections[i].flag))
                 break;
         }
     }
-    gTasks[taskId].data[4] = i;
-    sub_8141FF4(taskId);
-    sub_81424FC(gTasks[taskId].data[4]);
-    sub_81436D0(gTasks[taskId].data[4]);
-    sub_8142284(gTasks[taskId].data[4]);
+    gTasks[taskId].tSelectionId = i;
+    ResetBallDataForNewSpin(taskId);
+    DrawGridBackground(gTasks[taskId].tSelectionId);
+    SetMultiplierSprite(gTasks[taskId].tSelectionId);
+    FlashSelectionOnWheel(gTasks[taskId].tSelectionId);
     gTasks[taskId].data[1] = 0;
-    gTasks[taskId].func = sub_8140B8C;
+    gTasks[taskId].func = Task_StartHandleBetGridInput;
 }
 
-static u8 sub_8140CA8(s16 *r0, u8 r1)
+static bool8 CanMoveSelectionInDir(s16 *selectionId, u8 dir)
 {
     s8 temp1 = 0;
     s8 temp = 0;
-    s8 arr[4] = {-5, 5, -1, 1};
-    s8 t = *r0;
+    s8 moveOffsets[4] = {-5, 5, -1, 1};
+    s8 originalSelection = *selectionId;
 
-    switch (r1)
+    switch (dir)
     {
-    case 0:
-    case 1:
-        temp1 = (*r0 % 5);
-        temp = temp1 + 15;
-        if (temp1 == 0)
+    case 0: // UP
+    case 1: // DOWN
+        temp1 = GET_COL(*selectionId);
+        temp = temp1 + ROW_PURPLE;
+        if (temp1 == SELECTION_NONE)
             temp1 = 5;
         break;
-    case 2:
-    case 3:
-        temp1 = (*r0 / 5) * 5;
-        temp = temp1 + 4;
-        if (temp1 == 0)
+    case 2: // LEFT
+    case 3: // RIGHT
+        temp1 = GET_ROW(*selectionId);
+        temp = temp1 + COL_MAKUHITA;
+        if (temp1 == SELECTION_NONE)
             temp1 = 1;
         break;
     }
 
-    *r0 += arr[r1];
+    *selectionId += moveOffsets[dir];
 
-    if (*r0 < temp1)
-        *r0 = temp;
+    if (*selectionId < temp1)
+        *selectionId = temp;
 
-    if (*r0 > temp)
-        *r0 = temp1;
+    if (*selectionId > temp)
+        *selectionId = temp1;
 
-    if (*r0 != t)
+    if (*selectionId != originalSelection)
         return TRUE;
 
     return FALSE;
 }
 
-static void sub_8140D6C(u8 r0)
-{
-    u8 z = 0;
-    bool8 var0 = FALSE;
-    if (!(gMain.newKeys & DPAD_UP) || ((var0 = TRUE), sub_8140CA8(&gTasks[r0].data[4], 0)))
-        if (!(gMain.newKeys & DPAD_DOWN) || ((var0 = TRUE), sub_8140CA8(&gTasks[r0].data[4], 1)))
-            if (!(gMain.newKeys & DPAD_LEFT) || ((var0 = TRUE), sub_8140CA8(&gTasks[r0].data[4], 2)))
-                if (!(gMain.newKeys & DPAD_RIGHT) || ((var0 = TRUE), sub_8140CA8(&gTasks[r0].data[4], 3)))
-                    if (var0)
-                    {
-                        u8 i;
-                        sub_81424FC(gTasks[r0].data[4]);
-                        sub_8140B64(r0);
-                        gTasks[r0].data[1] = z;
-                        PlaySE(SE_SELECT);
-                        sub_8151A9C(&gUnknown_0203AB88->varB8, 0xFFFF);
-                        gUnknown_0203AB88->varB8.var04[13].var00_7 = gUnknown_0203AB88->varB8.var04[14].var00_7 = gUnknown_0203AB88->varB8.var04[15].var00_7 = 0;
-                        sub_8142284(gTasks[r0].data[4]);
-                        for (i = 0; i < 4; i++)
-                        {
-                            gSprites[gUnknown_0203AB88->var3C[i + 41]].oam.tileNum =
-                            gSprites[gUnknown_0203AB88->var3C[i + 41]].sheetTileStart
-                            + (*gSprites[gUnknown_0203AB88->var3C[i + 41]].anims)->type;
-                        }
-                        if ((u16)(gTasks[r0].data[4] - 1) < 4 && !(gUnknown_0203AB88->var08 & gUnknown_085B6154[gTasks[r0].data[4]].var08) )
-                        {
-                            z = gTasks[r0].data[4] - 1;
-                            gSprites[gUnknown_0203AB88->var3C[z + 41]].oam.tileNum =
-                            gSprites[gUnknown_0203AB88->var3C[z + 41]].sheetTileStart
-                            + (*gSprites[gUnknown_0203AB88->var3C[z + 41]].anims + 1)->type;
-                        }
-                    }
+static void ProcessBetGridInput(u8 taskId)
+{
+    u8 headerOffset = 0;
+    bool8 dirPressed = FALSE;
+    if ((!(JOY_NEW(DPAD_UP))    || ((dirPressed = TRUE) && CanMoveSelectionInDir(&gTasks[taskId].tSelectionId, 0)))
+     && (!(JOY_NEW(DPAD_DOWN))  || ((dirPressed = TRUE) && CanMoveSelectionInDir(&gTasks[taskId].tSelectionId, 1)))
+     && (!(JOY_NEW(DPAD_LEFT))  || ((dirPressed = TRUE) && CanMoveSelectionInDir(&gTasks[taskId].tSelectionId, 2)))
+     && (!(JOY_NEW(DPAD_RIGHT)) || ((dirPressed = TRUE) && CanMoveSelectionInDir(&gTasks[taskId].tSelectionId, 3)))
+     && (dirPressed))
+    {
+        u8 i;
+        DrawGridBackground(gTasks[taskId].tSelectionId);
+        UpdateGridSelection(taskId);
+        gTasks[taskId].data[1] = 0;
+        PlaySE(SE_SELECT);
+        RouletteFlash_Stop(&sRoulette->flashUtil, 0xFFFF);
+        sRoulette->flashUtil.palettes[FLASH_ICON].available = sRoulette->flashUtil.palettes[FLASH_ICON_2].available = sRoulette->flashUtil.palettes[FLASH_ICON_3].available = FALSE;
+        FlashSelectionOnWheel(gTasks[taskId].tSelectionId);
+        
+        // Switch all the poke (column) headers to gray outlines
+        for (i = 0; i < NUM_BOARD_POKES; i++)
+        {
+            gSprites[sRoulette->spriteIds[i + SPR_POKE_HEADERS]].oam.tileNum =
+            gSprites[sRoulette->spriteIds[i + SPR_POKE_HEADERS]].sheetTileStart
+            + (*gSprites[sRoulette->spriteIds[i + SPR_POKE_HEADERS]].anims)->type;
+        }
+        // If the current selection is a column with at least 1 unhit space, fill in the header
+        if ((u16)(gTasks[taskId].tSelectionId - 1) < COL_MAKUHITA && !(sRoulette->hitFlags & sGridSelections[gTasks[taskId].tSelectionId].flag))
+        {
+            headerOffset = gTasks[taskId].tSelectionId - 1;
+            gSprites[sRoulette->spriteIds[headerOffset + SPR_POKE_HEADERS]].oam.tileNum =
+            gSprites[sRoulette->spriteIds[headerOffset + SPR_POKE_HEADERS]].sheetTileStart
+            + (*gSprites[sRoulette->spriteIds[headerOffset + SPR_POKE_HEADERS]].anims + 1)->type;
+        }
+    }
 }
 
-static void sub_8140F6C(u8 r0)
+static void Task_StartSpin(u8 taskId)
 {
     IncrementDailyRouletteUses();
-    gUnknown_0203AB88->var28 = 0xFF;
-    if (gUnknown_0203AB88->var19 == 1)
-        gUnknown_0203AB88->var23 = 1;
+    sRoulette->selectionRectDrawState = SELECT_STATE_ERASE;
+    if (sRoulette->minBet == 1)
+        sRoulette->wheelDelay = 1;
     else
-        gUnknown_0203AB88->var23 = 0;
-    gUnknown_0203AB88->var21 = 0;
-    gTasks[r0].data[1] = 32;
-    gTasks[r0].func = sub_81410FC;
+        sRoulette->wheelDelay = 0;
+    sRoulette->wheelDelayTimer = 0;
+    gTasks[taskId].data[1] = 32;
+    gTasks[taskId].func = Task_SlideGridOffscreen;
 }
 
-static void sub_8140FC4(u8 taskId)
+static void Task_PlaceBet(u8 taskId)
 {
-    gUnknown_0203AB88->var1B[gUnknown_0203AB88->var1A_0] = gTasks[taskId].data[4];
-    gTasks[taskId].data[2] = sub_8142758(gUnknown_0203AB88->var1B[gUnknown_0203AB88->var1A_0]);
-    sub_81436D0(gUnknown_0203AB88->var1B[gUnknown_0203AB88->var1A_0]);
-    if ((gTasks[taskId].data[13] -= gUnknown_0203AB88->var19) < 0)
-        gTasks[taskId].data[13] = 0;
-    sub_8143514(gTasks[taskId].data[13]);
-    gTasks[taskId].func = sub_8140F6C;
+    sRoulette->betSelection[sRoulette->curBallNum] = gTasks[taskId].tSelectionId;
+    gTasks[taskId].tMultiplier = GetMultiplier(sRoulette->betSelection[sRoulette->curBallNum]);
+    SetMultiplierSprite(sRoulette->betSelection[sRoulette->curBallNum]);
+    if ((gTasks[taskId].tCoins -= sRoulette->minBet) < 0)
+        gTasks[taskId].tCoins = 0;
+    SetCreditDigits(gTasks[taskId].tCoins);
+    gTasks[taskId].func = Task_StartSpin;
 }
 
-static void sub_8141040(u8 taskId)
+static void Task_HandleBetGridInput(u8 taskId)
 {
-    sub_8140D6C(taskId);
+    ProcessBetGridInput(taskId);
 
+    // Flash selection rect
     switch (gTasks[taskId].data[1])
     {
     case 0:
-        sub_81409B8(gTasks[taskId].data[4]);
+        UpdateGridSelectionRect(gTasks[taskId].tSelectionId);
         gTasks[taskId].data[1]++;
         break;
     case 30:
-        sub_81409B8(0);
+        UpdateGridSelectionRect(SELECTION_NONE);
         gTasks[taskId].data[1]++;
         break;
     case 59:
@@ -1256,83 +1513,86 @@ static void sub_8141040(u8 taskId)
         gTasks[taskId].data[1]++;
     }
 
-    if (gMain.newKeys & A_BUTTON)
+    if (JOY_NEW(A_BUTTON))
     {
-        if ((gUnknown_0203AB88->var08 & gUnknown_085B6154[gTasks[taskId].data[4]].var08))
+        if (sRoulette->hitFlags & sGridSelections[gTasks[taskId].tSelectionId].flag)
+        {
+            // Ball has already landed on this space
             PlaySE(SE_BOO);
+        }
         else
         {
             m4aSongNumStart(SE_REGI);
-            gTasks[taskId].func = sub_8140FC4;
+            gTasks[taskId].func = Task_PlaceBet;
         }
     }
 }
 
-static void sub_81410FC(u8 taskId)
+static void Task_SlideGridOffscreen(u8 taskId)
 {
     if (gTasks[taskId].data[1]-- > 0)
     {
+        // Slide wheel over
         if (gTasks[taskId].data[1] > 2)
             gSpriteCoordOffsetX += 2;
-        if ((gUnknown_0203AB88->var26 += 4) == 104)
-            gSprites[gUnknown_0203AB88->var3C[25]].callback = &SpriteCallbackDummy;
+
+        // Slide grid over
+        if ((sRoulette->gridX += 4) == 104)
+            gSprites[sRoulette->spriteIds[SPR_MULTIPLIER]].callback = &SpriteCallbackDummy;
     }
     else
     {
-        sub_8142E70(1, -1);
-        sub_8143038(1, -1);
-        gTasks[taskId].func = sub_8141344;
+        ShowHideGridIcons(TRUE, -1);
+        ShowHideGridBalls(TRUE, -1);
+        gTasks[taskId].func = Task_InitBallRoll;
         gTasks[taskId].data[1] = 0;
     }
 }
 
-static u8 sub_814118C(u16 r0, u16 r1)
+// Each table has a set base distance used to determine how far the ball will travel
+// Each roll a random value is generated to add onto this distance
+// Half the value returned by this function is the max distance that can be added on per roll
+// i.e. the lower this value is, the closer the roll will be to a consistent distance
+// Odds of a lower value increase as play continues, if the player has Shroomish and/or Taillow in the party, and dependent on the time
+static u8 GetRandomForBallTravelDistance(u16 ballNum, u16 rand)
 {
-    switch (gUnknown_0203AB88->var02)
+    switch (sRoulette->partySpeciesFlags)
     {
-    case 1: // SHROOMISH
-    case 2: // TAILLOW
+    case HAS_SHROOMISH:
+    case HAS_TAILLOW:
         // one of the two is in party
         if (gLocalTime.hours > 3 && gLocalTime.hours < 10)
         {
-            if (r0 < 12 || (r1 & 1))
-            {
-                return gUnknown_085B6348[gUnknown_0203AB88->var04_0].var02 / 2;
-            }
+            if (ballNum < BALLS_PER_ROUND * 2 || (rand & 1))
+                return sRouletteTables[sRoulette->tableId].randDistanceLow / 2;
             else
-            {
                 return 1;
-            }
         }
-        else if (!(r1 & 0x3))
+        else if (!(rand & 3)) 
         {
-            return gUnknown_085B6348[gUnknown_0203AB88->var04_0].var02 / 2;
+            return sRouletteTables[sRoulette->tableId].randDistanceLow / 2;
         }
-        else
+        else 
         {
-            return gUnknown_085B6348[gUnknown_0203AB88->var04_0].var02;
+            return sRouletteTables[sRoulette->tableId].randDistanceLow;
         }
         break;
-    case 3:
+    case HAS_SHROOMISH | HAS_TAILLOW:
         // both are in party
         if (gLocalTime.hours > 3 && gLocalTime.hours < 11)
         {
-            if (r0 < 6 || (r1 & 1))
-            {
-                return gUnknown_085B6348[gUnknown_0203AB88->var04_0].var02 / 2;
-            }
+            if (ballNum < BALLS_PER_ROUND || (rand & 1))
+                return sRouletteTables[sRoulette->tableId].randDistanceLow / 2;
             else
-            {
                 return 1;
-            }
         }
-        else if ((r1 & 1) && r0 > 6)
+        else if ((rand & 1) && ballNum > BALLS_PER_ROUND) 
         {
-            return gUnknown_085B6348[gUnknown_0203AB88->var04_0].var02 / 4;
+            return sRouletteTables[sRoulette->tableId].randDistanceLow / 4;
         }
-        else
+        else 
         {
-            return gUnknown_085B6348[gUnknown_0203AB88->var04_0].var02 / 2;
+            return sRouletteTables[sRoulette->tableId].randDistanceLow / 2;
         }
         break;
     case 0:
@@ -1340,257 +1600,252 @@ static u8 sub_814118C(u16 r0, u16 r1)
         // neither is in party
         if (gLocalTime.hours > 3 && gLocalTime.hours < 10)
         {
-            if (!(r1 & 3))
-            {
+            if (!(rand & 3))
                 return 1;
-            }
             else
-            {
-                return gUnknown_085B6348[gUnknown_0203AB88->var04_0].var02 / 2;
-            }
+                return sRouletteTables[sRoulette->tableId].randDistanceLow / 2;
         }
-        else if (!(r1 & 3))
+        else if (!(rand & 3))
         {
-            if (r0 > 12)
-            {
-                return gUnknown_085B6348[gUnknown_0203AB88->var04_0].var02 / 2;
-            }
+            if (ballNum > BALLS_PER_ROUND * 2)
+                return sRouletteTables[sRoulette->tableId].randDistanceLow / 2;
             else
-            {
-                return gUnknown_085B6348[gUnknown_0203AB88->var04_0].var02;
-            }
+                return sRouletteTables[sRoulette->tableId].randDistanceLow;
         }
-        else if (r1 & 0x8000)
+        else if (rand & (1 << 15))
         {
-            if (r0 > 12)
-            {
-                return gUnknown_085B6348[gUnknown_0203AB88->var04_0].var02;
-            }
+            if (ballNum > BALLS_PER_ROUND * 2)
+                return sRouletteTables[sRoulette->tableId].randDistanceLow;
             else
-            {
-                return gUnknown_085B6348[gUnknown_0203AB88->var04_0].var01;
-            }
+                return sRouletteTables[sRoulette->tableId].randDistanceHigh;
         }
         else
         {
-            return gUnknown_085B6348[gUnknown_0203AB88->var04_0].var01 * 2;
+            return sRouletteTables[sRoulette->tableId].randDistanceHigh * 2;
         }
         break;
     }
 }
 
-static void sub_8141344(u8 taskId)
+static void Task_InitBallRoll(u8 taskId)
 {
-    u8 randf;
-    s8 randfinal;
-    s8 r5;
-    u16 g = 0;
+    u8 randTravelMod;
+    s8 randTravelDist;
+    s8 startAngleId;
+    u16 travelDist = 0;
     u16 rand;
     u16 randmod;
-    u16 angles[4] = {0, 180, 90, 270}; // angles in 90 degree steps
+    u16 startAngles[4] = {0, 180, 90, 270}; // possible angles to start ball from
 
     rand = Random();
     randmod = rand % 100;
-    gUnknown_0203AB88->var7C = gTasks[taskId].data[6];
-    gUnknown_0203AB88->var7D = gUnknown_0203AB88->var7E = gUnknown_0203AB88->var7F = g;
-    randf = sub_814118C(gTasks[taskId].data[8], rand);
-    randfinal = (rand % randf) - (randf / 2);
+    sRoulette->curBallSpriteId = gTasks[taskId].tBallNum;
+    // BALL_STATE_ROLLING set below
+    sRoulette->ballState = sRoulette->hitSlot = sRoulette->stuckHitSlot = 0;
+    randTravelMod = GetRandomForBallTravelDistance(gTasks[taskId].tTotalBallNum, rand);
+    randTravelDist = (rand % randTravelMod) - (randTravelMod / 2);
 
     if (gLocalTime.hours < 13)
-        r5 = 0;
+        startAngleId = 0;
     else
-        r5 = 1;
+        startAngleId = 1;
 
     if (randmod < 80)
-        r5 *= 2;
+        startAngleId *= 2;
     else
-        r5 = (1 - r5) * 2;
-
-    gUnknown_0203AB88->var80 = g = gUnknown_085B6348[gUnknown_0203AB88->var04_0].var1A + randfinal;
-
-    g = S16TOPOSFLOAT(g) / 5.0f;
-    gUnknown_0203AB88->var82 = g * 3;
-    gUnknown_0203AB88->var86 = gUnknown_0203AB88->var84 = g;
-
-    gUnknown_0203AB88->var88 = S16TOPOSFLOAT(angles[(rand & 1) + r5]);
-    gUnknown_0203AB88->var8C = S16TOPOSFLOAT(gUnknown_085B6348[gUnknown_0203AB88->var04_0].var18);
-    gUnknown_0203AB88->var90 = ((gUnknown_0203AB88->var8C * 0.5f) - gUnknown_0203AB88->var8C) / S16TOPOSFLOAT(gUnknown_0203AB88->var82);
-    gUnknown_0203AB88->var94 = 68.0f;
-    gUnknown_0203AB88->var9C = 0.0f;
-    gUnknown_0203AB88->var98 = -(8.0f / S16TOPOSFLOAT(gUnknown_0203AB88->var82));
-    gUnknown_0203AB88->varA0 = 36.0f;
-    gTasks[taskId].func = sub_814155C;
+        startAngleId = (1 - startAngleId) * 2;
+
+    sRoulette->ballTravelDist = travelDist = sRouletteTables[sRoulette->tableId].baseTravelDist + randTravelDist;
+
+    travelDist = S16TOPOSFLOAT(travelDist) / 5.0f;
+    sRoulette->ballTravelDistFast = travelDist * 3;
+    sRoulette->ballTravelDistSlow = sRoulette->ballTravelDistMed = travelDist;
+
+    sRoulette->ballAngle = S16TOPOSFLOAT(startAngles[(rand & 1) + startAngleId]);
+    sRoulette->ballAngleSpeed = S16TOPOSFLOAT(sRouletteTables[sRoulette->tableId].ballSpeed);
+    sRoulette->ballAngleAccel = ((sRoulette->ballAngleSpeed * 0.5f) - sRoulette->ballAngleSpeed) / S16TOPOSFLOAT(sRoulette->ballTravelDistFast);
+    sRoulette->ballDistToCenter = 68.0f;
+    sRoulette->ballFallAccel = 0.0f;
+    sRoulette->ballFallSpeed = -(8.0f / S16TOPOSFLOAT(sRoulette->ballTravelDistFast));
+    sRoulette->varA0 = 36.0f;
+    gTasks[taskId].func = Task_RollBall;
 }
 
-static void sub_814155C(u8 taskId)
+static void Task_RollBall(u8 taskId)
 {
-    u8 index;
-    gUnknown_0203AB88->var03_7 = 1;
-    index = gUnknown_0203AB88->var3C[gUnknown_0203AB88->var7C];
-    gUnknown_0203AB88->var38 = &gSprites[index];
-    gUnknown_0203AB88->var38->callback = sub_81446AC;
-    gTasks[taskId].data[6]++;
-    gTasks[taskId].data[0x8]++;
-    sub_814372C(6 - gTasks[taskId].data[6]);
+    sRoulette->ballRolling = TRUE;
+    sRoulette->ball = &gSprites[sRoulette->spriteIds[sRoulette->curBallSpriteId]];
+    sRoulette->ball->callback = SpriteCB_RollBall_Start;
+    gTasks[taskId].tBallNum++;
+    gTasks[taskId].tTotalBallNum++;
+    SetBallCounterNumLeft(BALLS_PER_ROUND - gTasks[taskId].tBallNum);
     m4aSongNumStart(SE_TAMAKORO);
-    gTasks[taskId].func = sub_81415D4;
+    gTasks[taskId].func = Task_RecordBallHit;
 }
 
-static void sub_81415D4(u8 taskId)
+static void Task_RecordBallHit(u8 taskId)
 {
-    if (gUnknown_0203AB88->var7D)
+    // Wait for ball to finish rolling
+    if (sRoulette->ballState != BALL_STATE_ROLLING)
     {
-        if (gUnknown_0203AB88->var03_5)
+        // If the ball got stuck, wait for it to be unstuck
+        if (sRoulette->ballStuck)
         {
-            if (gUnknown_0203AB88->var03_6)
+            if (sRoulette->ballUnstuck)
             {
-                gUnknown_0203AB88->var03_6 = FALSE;
-                gUnknown_0203AB88->var03_5 = FALSE;
+                sRoulette->ballUnstuck = FALSE;
+                sRoulette->ballStuck = FALSE;
             }
         }
         else
         {
-            if (!gTasks[taskId].data[1])
+            if (gTasks[taskId].data[1] == 0)
             {
-                bool8 temp = sub_81421E8(sub_81420D0(taskId, gUnknown_0203AB88->var7E), gUnknown_0203AB88->var1B[gUnknown_0203AB88->var1A_0]);
-                gTasks[taskId].data[5] = temp;
-                if (temp == TRUE)
-                    sub_8151A48(&gUnknown_0203AB88->varB8, 0x1000);
+                bool8 won = IsHitInBetSelection(RecordHit(taskId, sRoulette->hitSlot), sRoulette->betSelection[sRoulette->curBallNum]);
+                gTasks[taskId].tWonBet = won;
+                if (won == TRUE)
+                    RouletteFlash_Enable(&sRoulette->flashUtil, F_FLASH_OUTER_EDGES);
             }
             if (gTasks[taskId].data[1] <= 60)
             {
-                if (gMain.newKeys & A_BUTTON)
+                if (JOY_NEW(A_BUTTON))
                     gTasks[taskId].data[1] = 60;
                 gTasks[taskId].data[1]++;
             }
             else
             {
-                sub_81424FC(gUnknown_0203AB88->var1B[gUnknown_0203AB88->var1A_0]);
-                sub_8142E70(0, gTasks[taskId].data[12]);
-                sub_8143038(0, gTasks[taskId].data[6] - 1);
+                DrawGridBackground(sRoulette->betSelection[sRoulette->curBallNum]);
+                ShowHideGridIcons(FALSE, gTasks[taskId].tWinningSquare);
+                ShowHideGridBalls(FALSE, gTasks[taskId].tBallNum - 1);
                 gTasks[taskId].data[1] = 32;
-                gTasks[taskId].func = sub_81416D4;
+                gTasks[taskId].func = Task_SlideGridOnscreen;
             }
         }
     }
 }
 
-static void sub_81416D4(u8 taskId)
+static void Task_SlideGridOnscreen(u8 taskId)
 {
     if (gTasks[taskId].data[1]-- > 0)
     {
+        // Slide wheel over
         if (gTasks[taskId].data[1] > 2)
             gSpriteCoordOffsetX -= 2;
-        if ((gUnknown_0203AB88->var26 -= 4) == 104)
-            gSprites[gUnknown_0203AB88->var3C[25]].callback = sub_814390C;
+
+        // Slide grid over
+        if ((sRoulette->gridX -= 4) == 104)
+            gSprites[sRoulette->spriteIds[SPR_MULTIPLIER]].callback = SpriteCB_GridSquare;
     }
     else
     {
-        sub_8143150(gTasks[taskId].data[12]);
-        if (gTasks[taskId].data[5] == 1)
+        ShowHideWinSlotCursor(gTasks[taskId].tWinningSquare);
+        if (gTasks[taskId].tWonBet == TRUE)
             gTasks[taskId].data[1] = 121;
         else
             gTasks[taskId].data[1] = 61;
-        gTasks[taskId].func = sub_8141778;
+        gTasks[taskId].func = Task_FlashBallOnWinningSquare;
     }
 }
 
-static void sub_8141778(u8 taskId)
+static void Task_FlashBallOnWinningSquare(u8 taskId)
 {
     if (gTasks[taskId].data[1]-- > 1)
     {
         switch (gTasks[taskId].data[1] % 16)
         {
         case 8:
-            sub_8142E70(0, -1);
-            sub_8143038(0, -1);
+            // Winning square uncovered
+            ShowHideGridIcons(FALSE, -1);
+            ShowHideGridBalls(FALSE, -1);
             break;
         case 0:
-            sub_8142E70(0, gTasks[taskId].data[12]);
-            sub_8143038(0, gTasks[taskId].data[6] - 1);
+            // Winning square occluded by ball
+            ShowHideGridIcons(FALSE, gTasks[taskId].tWinningSquare);
+            ShowHideGridBalls(FALSE, gTasks[taskId].tBallNum - 1);
             break;
         }
     }
     else
     {
-        sub_8141F7C(taskId, sub_814189C, 30, 0);
+        StartTaskAfterDelayOrInput(taskId, Task_PrintSpinResult, 30, 0);
     }
 }
 
-static void sub_8141800(u8 taskId)
+static void Task_TryIncrementWins(u8 taskId)
 {
-    switch (gTasks[taskId].data[0x5])
+    switch (gTasks[taskId].tWonBet)
     {
-    case 1:
-    case 2:
+    case TRUE:
+    case 2: // never happens
         if (IsFanfareTaskInactive())
         {
             u32 wins = GetGameStat(GAME_STAT_CONSECUTIVE_ROULETTE_WINS);
-            if (wins < ++gTasks[taskId].data[11])
-                SetGameStat(GAME_STAT_CONSECUTIVE_ROULETTE_WINS, gTasks[taskId].data[11]);
-            sub_8141F7C(taskId, sub_8141A18, 0xFFFF, 3);
+            if (wins < ++gTasks[taskId].tConsecutiveWins)
+                SetGameStat(GAME_STAT_CONSECUTIVE_ROULETTE_WINS, gTasks[taskId].tConsecutiveWins);
+            StartTaskAfterDelayOrInput(taskId, Task_PrintPayout, NO_DELAY, A_BUTTON | B_BUTTON);
         }
         break;
-    case 0:
+    case FALSE:
     default:
         if (!IsSEPlaying())
         {
-            gTasks[taskId].data[11] = FALSE;
-            sub_8141F7C(taskId, sub_8141AC0, 0xFFFF, 3);
+            gTasks[taskId].tConsecutiveWins = 0;
+            StartTaskAfterDelayOrInput(taskId, Task_EndTurn, NO_DELAY, A_BUTTON | B_BUTTON);
         }
         break;
     }
 }
 
-static void sub_814189C(u8 taskId)
+static void Task_PrintSpinResult(u8 taskId)
 {
-    switch (gTasks[taskId].data[5])
+    switch (gTasks[taskId].tWonBet)
     {
-    case 1:
-    case 2:
-        if (gTasks[taskId].data[2] == 12)
+    case TRUE:
+    case 2: // never happens
+        if (gTasks[taskId].tMultiplier == MAX_MULTIPLIER)
         {
             PlayFanfare(MUS_ME_B_BIG);
-            DrawStdWindowFrame(gUnknown_0203AB8C, FALSE);
-            AddTextPrinterParameterized(gUnknown_0203AB8C, 1, Roulette_Text_Jackpot, 0, 1, TEXT_SPEED_FF, NULL);
-            CopyWindowToVram(gUnknown_0203AB8C, 3);
+            DrawStdWindowFrame(sTextWindowId, FALSE);
+            AddTextPrinterParameterized(sTextWindowId, 1, Roulette_Text_Jackpot, 0, 1, TEXT_SPEED_FF, NULL);
+            CopyWindowToVram(sTextWindowId, 3);
         }
         else
         {
             PlayFanfare(MUS_ME_B_SMALL);
-            DrawStdWindowFrame(gUnknown_0203AB8C, FALSE);
-            AddTextPrinterParameterized(gUnknown_0203AB8C, 1, Roulette_Text_ItsAHit, 0, 1, TEXT_SPEED_FF, NULL);
-            CopyWindowToVram(gUnknown_0203AB8C, 3);
+            DrawStdWindowFrame(sTextWindowId, FALSE);
+            AddTextPrinterParameterized(sTextWindowId, 1, Roulette_Text_ItsAHit, 0, 1, TEXT_SPEED_FF, NULL);
+            CopyWindowToVram(sTextWindowId, 3);
         }
         break;
-    case 0:
+    case FALSE:
     default:
         m4aSongNumStart(SE_HAZURE);
-        DrawStdWindowFrame(gUnknown_0203AB8C, FALSE);
-        AddTextPrinterParameterized(gUnknown_0203AB8C, 1, Roulette_Text_NothingDoing, 0, 1, TEXT_SPEED_FF, NULL);
-        CopyWindowToVram(gUnknown_0203AB8C, 3);
+        DrawStdWindowFrame(sTextWindowId, FALSE);
+        AddTextPrinterParameterized(sTextWindowId, 1, Roulette_Text_NothingDoing, 0, 1, TEXT_SPEED_FF, NULL);
+        CopyWindowToVram(sTextWindowId, 3);
         break;
     }
     gTasks[taskId].data[1] = 0;
-    gTasks[taskId].func = sub_8141800;
+    gTasks[taskId].func = Task_TryIncrementWins;
 }
 
-static void sub_8141984(u8 taskId)
+#define tPayout data[1]
+
+static void Task_GivePayout(u8 taskId)
 {
-    s32 r0 = gTasks[taskId].data[7];
-    switch (r0)
+    switch (gTasks[taskId].data[7])
     {
     case 0:
-        gTasks[taskId].data[13]++;
+        gTasks[taskId].tCoins++;
         m4aSongNumStart(SE_PIN);
-        sub_8143514(gTasks[taskId].data[13]);
-        if (gTasks[taskId].data[13] >= 9999)
+        SetCreditDigits(gTasks[taskId].tCoins);
+        if (gTasks[taskId].tCoins >= MAX_COINS)
         {
-            gTasks[taskId].data[1] = r0;
+            gTasks[taskId].tPayout = 0;
         }
         else
         {
-            gTasks[taskId].data[1]--;
+            gTasks[taskId].tPayout--;
             gTasks[taskId].data[7]++;
         }
         break;
@@ -1602,117 +1857,123 @@ static void sub_8141984(u8 taskId)
         gTasks[taskId].data[7]++;
         break;
     }
-    if (gTasks[taskId].data[1] == 0)
-        sub_8141F7C(taskId, sub_8141AC0, 0xFFFF, 3);
+    if (gTasks[taskId].tPayout == 0)
+        StartTaskAfterDelayOrInput(taskId, Task_EndTurn, NO_DELAY, A_BUTTON | B_BUTTON);
 }
 
-static void sub_8141A18(u8 taskId)
+static void Task_PrintPayout(u8 taskId)
 {
-    ConvertIntToDecimalStringN(gStringVar1, (gUnknown_0203AB88->var19 * gTasks[taskId].data[2]), STR_CONV_MODE_LEFT_ALIGN, 2);
+    ConvertIntToDecimalStringN(gStringVar1, (sRoulette->minBet * gTasks[taskId].tMultiplier), STR_CONV_MODE_LEFT_ALIGN, 2);
     StringExpandPlaceholders(gStringVar4, Roulette_Text_YouveWonXCoins);
-    DrawStdWindowFrame(gUnknown_0203AB8C, FALSE);
-    AddTextPrinterParameterized(gUnknown_0203AB8C, 1, gStringVar4, 0, 1, TEXT_SPEED_FF, NULL);
-    CopyWindowToVram(gUnknown_0203AB8C, 3);
-    gTasks[taskId].data[1] = (gUnknown_0203AB88->var19 * gTasks[taskId].data[2]);
+    DrawStdWindowFrame(sTextWindowId, FALSE);
+    AddTextPrinterParameterized(sTextWindowId, 1, gStringVar4, 0, 1, TEXT_SPEED_FF, NULL);
+    CopyWindowToVram(sTextWindowId, 3);
+    gTasks[taskId].tPayout = (sRoulette->minBet * gTasks[taskId].tMultiplier);
     gTasks[taskId].data[7] = 0;
-    gTasks[taskId].func = sub_8141984;
+    gTasks[taskId].func = Task_GivePayout;
 }
 
-static void sub_8141AC0(u8 taskId)
+#undef tPayout
+
+static void Task_EndTurn(u8 taskId)
 {
-    sub_8151A9C(&gUnknown_0203AB88->varB8, 0xFFFF);
-    gUnknown_0203AB88->varB8.var04[13].var00_7 = gUnknown_0203AB88->varB8.var04[14].var00_7 = gUnknown_0203AB88->varB8.var04[15].var00_7 = 0;
-    gSprites[gUnknown_0203AB88->var3C[7 + gUnknown_085B6154[gTasks[taskId].data[12]].var00]].invisible = TRUE;
-    gTasks[taskId].func = sub_8141B58;
+    RouletteFlash_Stop(&sRoulette->flashUtil, 0xFFFF);
+    sRoulette->flashUtil.palettes[FLASH_ICON].available = sRoulette->flashUtil.palettes[FLASH_ICON_2].available = sRoulette->flashUtil.palettes[FLASH_ICON_3].available = FALSE;
+    gSprites[sRoulette->spriteIds[SPR_WHEEL_ICONS + sGridSelections[gTasks[taskId].tWinningSquare].spriteIdOffset]].invisible = TRUE;
+    gTasks[taskId].func = Task_TryPrintEndTurnMsg;
 }
 
-static void sub_8141B58(u8 taskId)
+static void Task_TryPrintEndTurnMsg(u8 taskId)
 {
     u8 i = 0;
-    gTasks[taskId].data[4] = i;
-    gUnknown_0203AB88->var1B[gUnknown_0203AB88->var1A_0] = 0;
-    sub_81424FC(0);
-    gSprites[gUnknown_0203AB88->var3C[48]].invisible = TRUE;
-    for (i = 0; i < 4; i++)
-    {
-        gSprites[gUnknown_0203AB88->var3C[i + 41]].oam.tileNum =
-            gSprites[gUnknown_0203AB88->var3C[i + 41]].sheetTileStart
-            + (*gSprites[gUnknown_0203AB88->var3C[i + 41]].anims)->type;
+    gTasks[taskId].tSelectionId = i;
+    sRoulette->betSelection[sRoulette->curBallNum] = SELECTION_NONE;
+    DrawGridBackground(SELECTION_NONE);
+    gSprites[sRoulette->spriteIds[SPR_WIN_SLOT_CURSOR]].invisible = TRUE;
+    for (i = 0; i < NUM_BOARD_POKES; i++)
+    {
+        gSprites[sRoulette->spriteIds[i + SPR_POKE_HEADERS]].oam.tileNum =
+            gSprites[sRoulette->spriteIds[i + SPR_POKE_HEADERS]].sheetTileStart
+            + (*gSprites[sRoulette->spriteIds[i + SPR_POKE_HEADERS]].anims)->type;
     }
-    if (gTasks[taskId].data[13] >= gUnknown_0203AB88->var19)
+    if (gTasks[taskId].tCoins >= sRoulette->minBet)
     {
-        if (gTasks[taskId].data[6] == 6)
+        if (gTasks[taskId].tBallNum == BALLS_PER_ROUND)
         {
-            DrawStdWindowFrame(gUnknown_0203AB8C, FALSE);
-            AddTextPrinterParameterized(gUnknown_0203AB8C, 1, Roulette_Text_BoardWillBeCleared, 0, 1, TEXT_SPEED_FF, NULL);
-            CopyWindowToVram(gUnknown_0203AB8C, 3);
-            sub_8141F7C(taskId, dp01t_12_3_battle_menu, 0xFFFF, 3);
+            // Reached Ball 6, clear board
+            DrawStdWindowFrame(sTextWindowId, FALSE);
+            AddTextPrinterParameterized(sTextWindowId, 1, Roulette_Text_BoardWillBeCleared, 0, 1, TEXT_SPEED_FF, NULL);
+            CopyWindowToVram(sTextWindowId, 3);
+            StartTaskAfterDelayOrInput(taskId, Task_ClearBoard, NO_DELAY, A_BUTTON | B_BUTTON);
         }
-        else if (gTasks[taskId].data[13] == 9999)
+        else if (gTasks[taskId].tCoins == MAX_COINS)
         {
-            DrawStdWindowFrame(gUnknown_0203AB8C, FALSE);
-            AddTextPrinterParameterized(gUnknown_0203AB8C, 1, Roulette_Text_CoinCaseIsFull, 0, 1, TEXT_SPEED_FF, NULL);
-            CopyWindowToVram(gUnknown_0203AB8C, 3);
-            sub_8141F7C(taskId, sub_8140914, 0xFFFF, 0x3);
+            // Player maxed out coins
+            DrawStdWindowFrame(sTextWindowId, FALSE);
+            AddTextPrinterParameterized(sTextWindowId, 1, Roulette_Text_CoinCaseIsFull, 0, 1, TEXT_SPEED_FF, NULL);
+            CopyWindowToVram(sTextWindowId, 3);
+            StartTaskAfterDelayOrInput(taskId, Task_AskKeepPlaying, NO_DELAY, A_BUTTON | B_BUTTON);
         }
         else
         {
-            gTasks[taskId].func = sub_8140914;
+            // No special msg, ask to continue
+            gTasks[taskId].func = Task_AskKeepPlaying;
         }
     }
     else
     {
-        DrawStdWindowFrame(gUnknown_0203AB8C, FALSE);
-        AddTextPrinterParameterized(gUnknown_0203AB8C, 1, Roulette_Text_NoCoinsLeft, 0, 1, TEXT_SPEED_FF, NULL);
-        CopyWindowToVram(gUnknown_0203AB8C, 3);
-        sub_8141F7C(taskId, sub_8140994, 0x3C, 0x3);
+        // Player out of coins
+        DrawStdWindowFrame(sTextWindowId, FALSE);
+        AddTextPrinterParameterized(sTextWindowId, 1, Roulette_Text_NoCoinsLeft, 0, 1, TEXT_SPEED_FF, NULL);
+        CopyWindowToVram(sTextWindowId, 3);
+        StartTaskAfterDelayOrInput(taskId, Task_StopPlaying, 60, A_BUTTON | B_BUTTON);
     }
 }
 
-static void dp01t_12_3_battle_menu(u8 taskId)
+static void Task_ClearBoard(u8 taskId)
 {
     u8 i = 0;
 
-    gTasks[taskId].data[6] = 0;
-    sub_8141FF4(taskId);
-    sub_8142070();
-    sub_8143A40();
-    sub_81424FC(0);
-    sub_814372C(6);
+    gTasks[taskId].tBallNum = 0;
+    ResetBallDataForNewSpin(taskId);
+    ResetHits();
+    HideWheelBalls();
+    DrawGridBackground(SELECTION_NONE);
+    SetBallCounterNumLeft(BALLS_PER_ROUND);
 
-    for (i = 0; i < 12; i++)
+    for (i = 0; i < NUM_ROULETTE_SLOTS; i++)
     {
-        gSprites[gUnknown_0203AB88->var3C[i + 7]].invisible = FALSE;
+        gSprites[sRoulette->spriteIds[i + SPR_WHEEL_ICONS]].invisible = FALSE;
     }
 
-    if (gTasks[taskId].data[13] == 9999)
+    if (gTasks[taskId].tCoins == MAX_COINS)
     {
-        DrawStdWindowFrame(gUnknown_0203AB8C, FALSE);
-        AddTextPrinterParameterized(gUnknown_0203AB8C, 1, Roulette_Text_CoinCaseIsFull, 0, 1, TEXT_SPEED_FF, NULL);
-        CopyWindowToVram(gUnknown_0203AB8C, 3);
-        sub_8141F7C(taskId, sub_8140914, 0xFFFF, 3);
+        DrawStdWindowFrame(sTextWindowId, FALSE);
+        AddTextPrinterParameterized(sTextWindowId, 1, Roulette_Text_CoinCaseIsFull, 0, 1, TEXT_SPEED_FF, NULL);
+        CopyWindowToVram(sTextWindowId, 3);
+        StartTaskAfterDelayOrInput(taskId, Task_AskKeepPlaying, NO_DELAY, A_BUTTON | B_BUTTON);
     }
     else
     {
-        gTasks[taskId].func = sub_8140914;
+        gTasks[taskId].func = Task_AskKeepPlaying;
     }
 }
 
-static void sub_8141DE4(u8 taskId)
+static void ExitRoulette(u8 taskId)
 {
-    sub_8151A9C(&gUnknown_0203AB88->varB8, 0xFFFF);
-    sub_8151678(&gUnknown_0203AB88->varB8);
-    SetCoins(gTasks[taskId].data[13]);
-    if (GetCoins() < gUnknown_0203AB88->var19)
+    RouletteFlash_Stop(&sRoulette->flashUtil, 0xFFFF);
+    RouletteFlash_Reset(&sRoulette->flashUtil);
+    SetCoins(gTasks[taskId].tCoins);
+    if (GetCoins() < sRoulette->minBet)
         gSpecialVar_0x8004 = TRUE;
     else
         gSpecialVar_0x8004 = FALSE;
     AlertTVOfNewCoinTotal(GetCoins());
     BeginHardwarePaletteFade(0xFF, 0, 0, 16, 0);
-    gTasks[taskId].func = sub_8141E7C;
+    gTasks[taskId].func = Task_ExitRoulette;
 }
 
-static void sub_8141E7C(u8 taskId) // end roulette ?
+static void Task_ExitRoulette(u8 taskId)
 {
     if (UpdatePaletteFade() == 0)
     {
@@ -1726,350 +1987,384 @@ static void sub_8141E7C(u8 taskId) // end roulette ?
         FreeAllSpritePalettes();
         ResetPaletteFade();
         ResetSpriteData();
-        sub_8140418();
+        FreeRoulette();
         gFieldCallback = FieldCB_ContinueScriptHandleMusic;
         SetMainCallback2(CB2_ReturnToField);
         DestroyTask(taskId);
     }
 }
 
-static void sub_8141EF8(u8 taskId)
+static void Task_WaitForNextTask(u8 taskId)
 {
-    if (gUnknown_0203AB88->varA8 == 0 || gMain.newKeys & gUnknown_0203AB88->varAA)
+    if (sRoulette->taskWaitDelay == 0 || JOY_NEW(sRoulette->taskWaitKey))
     {
-        gTasks[taskId].func = gUnknown_0203AB88->varAC;
-        if (gUnknown_0203AB88->varAA > 0)
+        gTasks[taskId].func = sRoulette->nextTask;
+        if (sRoulette->taskWaitKey > 0)
             PlaySE(SE_SELECT);
-        gUnknown_0203AB88->varAC = NULL;
-        gUnknown_0203AB88->varAA = 0;
-        gUnknown_0203AB88->varA8 = 0;
+        sRoulette->nextTask = NULL;
+        sRoulette->taskWaitKey = 0;
+        sRoulette->taskWaitDelay = 0;
     }
-    if (gUnknown_0203AB88->varA8 != 0xFFFF)
-        gUnknown_0203AB88->varA8--;
+    if (sRoulette->taskWaitDelay != NO_DELAY)
+        sRoulette->taskWaitDelay--;
 }
 
-static void sub_8141F7C(u8 taskId, TaskFunc r1, u16 r2, u16 r3)
+static void StartTaskAfterDelayOrInput(u8 taskId, TaskFunc task, u16 delay, u16 key)
 {
-    gUnknown_0203AB88->varB4 = gTasks[taskId].func;
-    if (r1 == NULL)
-        r1 = gUnknown_0203AB88->varB4;
-    gUnknown_0203AB88->varAC = r1;
-    gUnknown_0203AB88->varA8 = r2;
-    if (r2 == 0xFFFF && r3 == 0)
-        gUnknown_0203AB88->varAA = 0xFFFF;
+    sRoulette->prevTask = gTasks[taskId].func;
+    if (task == NULL)
+        task = sRoulette->prevTask;
+    sRoulette->nextTask = task;
+    sRoulette->taskWaitDelay = delay;
+    if (delay == NO_DELAY && key == 0)
+        sRoulette->taskWaitKey = 0xFFFF;
     else
-        gUnknown_0203AB88->varAA = r3;
-    gTasks[taskId].func = sub_8141EF8;
+        sRoulette->taskWaitKey = key;
+    gTasks[taskId].func = Task_WaitForNextTask;
 }
 
-static void sub_8141FF4(u8 taskId)
+static void ResetBallDataForNewSpin(u8 taskId)
 {
     u8 i = 0;
-    gUnknown_0203AB88->var00 = i;
-    gUnknown_0203AB88->var03_7 = 0;
-    gUnknown_0203AB88->var03_5 = 0;
-    gUnknown_0203AB88->var03_6 = 0;
-    gUnknown_0203AB88->var03_0 = 0;
-    for (i = 0; i < 6; i++)
-    {
-        gUnknown_0203AB88->var1B[i] = 0;
-    }
-    gUnknown_0203AB88->var1A_0 = 0;
+    sRoulette->unk0 = FALSE;
+    sRoulette->ballRolling = FALSE;
+    sRoulette->ballStuck = FALSE;
+    sRoulette->ballUnstuck = FALSE;
+    sRoulette->useTaillow = FALSE;
+
+    for (i = 0; i < BALLS_PER_ROUND; i++)
+        sRoulette->betSelection[i] = SELECTION_NONE;
+
+    sRoulette->curBallNum = 0;
     gTasks[taskId].data[1] = 0;
 }
 
-static void sub_8142070(void)
+static void ResetHits(void)
 {
     u8 i;
-    gUnknown_0203AB88->var08 = 0;
-    for (i = 0; i < 6; i++)
-    {
-        gUnknown_0203AB88->var0C[i] = 0;
-    }
-    for (i = 0; i < 4; i++)
-    {
-        gUnknown_0203AB88->var12[i] = 0;
-    }
-    for (i = 0; i < 3; i++)
-    {
-        gUnknown_0203AB88->var16[i] = 0;
-    }
-    sub_8143038(1, -1);
+    sRoulette->hitFlags = 0;
+
+    for (i = 0; i < BALLS_PER_ROUND; i++)
+        sRoulette->hitSquares[i] = 0;
+
+    for (i = 0; i < NUM_BOARD_POKES; i++)
+        sRoulette->pokeHits[i] = 0;
+
+    for (i = 0; i < NUM_BOARD_COLORS; i++)
+        sRoulette->colorHits[i] = 0;
+
+    ShowHideGridBalls(TRUE, -1);
 }
 
-static u8 sub_81420D0(u8 taskId, u8 r1)
+static u8 RecordHit(u8 taskId, u8 slotId)
 {
-    u8 i;
-    u8 z;
-    u32 t0[4] = {0x10842, 0x21084, 0x42108, 0x84210};
-    u32 t1[3] = {0x3E0, 0x7C00, 0xF8000};
+    u8 i, j;
+    u32 columnFlags[NUM_BOARD_POKES] = {
+        F_WYNAUT_COL | F_ORANGE_WYNAUT | F_GREEN_WYNAUT | F_PURPLE_WYNAUT, 
+        F_AZURILL_COL | F_ORANGE_AZURILL | F_GREEN_AZURILL | F_PURPLE_AZURILL, 
+        F_SKITTY_COL | F_ORANGE_SKITTY | F_GREEN_SKITTY | F_PURPLE_SKITTY, 
+        F_MAKUHITA_COL | F_ORANGE_MAKUHITA | F_GREEN_MAKUHITA | F_PURPLE_MAKUHITA
+    };
+    u32 rowFlags[NUM_BOARD_COLORS] = {
+        F_ORANGE_ROW | F_ORANGE_WYNAUT | F_ORANGE_AZURILL | F_ORANGE_SKITTY | F_ORANGE_MAKUHITA, 
+        F_GREEN_ROW | F_GREEN_WYNAUT | F_GREEN_AZURILL | F_GREEN_SKITTY | F_GREEN_MAKUHITA, 
+        F_PURPLE_ROW | F_PURPLE_WYNAUT | F_PURPLE_AZURILL | F_PURPLE_SKITTY | F_PURPLE_MAKUHITA
+    };
 
-    if (r1 > 11)
+    if (slotId >= NUM_ROULETTE_SLOTS)
         return 0;
 
-    gUnknown_0203AB88->var0C[gTasks[taskId].data[6] - 1] = gUnknown_085B62E4[r1].var02;
-    gTasks[taskId].data[12] = gUnknown_085B62E4[r1].var02;
-    gUnknown_0203AB88->var08 |= gUnknown_085B62E4[r1].var04;
-    for (i = 0; i < 4; i++)
+    sRoulette->hitSquares[gTasks[taskId].tBallNum - 1] = sRouletteSlots[slotId].gridSquare;
+    gTasks[taskId].tWinningSquare = sRouletteSlots[slotId].gridSquare;
+    sRoulette->hitFlags |= sRouletteSlots[slotId].flag;
+    for (i = 0; i < NUM_BOARD_POKES; i++)
     {
-        if (gUnknown_085B62E4[r1].var04 & t0[i])
-            gUnknown_0203AB88->var12[i]++;
-        if (gUnknown_0203AB88->var12[i] > 2)
-            gUnknown_0203AB88->var08 |= t0[i];
+        if (sRouletteSlots[slotId].flag & columnFlags[i])
+            sRoulette->pokeHits[i]++;
+        // If hit every color of a poke, set column completed
+        if (sRoulette->pokeHits[i] >= NUM_BOARD_COLORS)
+            sRoulette->hitFlags |= columnFlags[i];
     }
-    for (z = 0; z < 3; z++)
+    for (j = 0; j < NUM_BOARD_COLORS; j++)
     {
-        if (gUnknown_085B62E4[r1].var04 & t1[z])
-            gUnknown_0203AB88->var16[z]++;
-        if (gUnknown_0203AB88->var16[z] > 3)
-            gUnknown_0203AB88->var08 |= t1[z];
+        if (sRouletteSlots[slotId].flag & rowFlags[j])
+            sRoulette->colorHits[j]++;
+        // If hit every poke of a color, set row completed
+        if (sRoulette->colorHits[j] >= NUM_BOARD_POKES)
+            sRoulette->hitFlags |= rowFlags[j];
     }
-    return gUnknown_085B62E4[r1].var02;
+    return sRouletteSlots[slotId].gridSquare;
 }
 
-static bool8 sub_81421E8(u8 r0, u8 r1)
+static bool8 IsHitInBetSelection(u8 gridSquare, u8 betSelection)
 {
-    u8 t = r0;
-    if (--r0 < 19)
+    u8 hit = gridSquare;
+    if (--gridSquare < NUM_GRID_SELECTIONS)
     {
-        switch (r1)
+        switch (betSelection)
         {
-        case 0:
-            return 3;
-        case 1 ... 4:
-            if (t == r1 + 5 || t == r1 + 10 || t == r1 + 15)
+        case SELECTION_NONE:
+            return 3; // should never happen, player must place bet
+        case COL_WYNAUT:
+        case COL_AZURILL:
+        case COL_SKITTY:
+        case COL_MAKUHITA:
+            if (hit == betSelection + ROW_ORANGE 
+             || hit == betSelection + ROW_GREEN 
+             || hit == betSelection + ROW_PURPLE)
                 return TRUE;
             break;
-        case 5:
-        case 10:
-        case 15:
-            if (t >= (r1 + 1) && t <= (r1 + 4))
+        case ROW_ORANGE:
+        case ROW_GREEN:
+        case ROW_PURPLE:
+            if (hit >= (betSelection + COL_WYNAUT) 
+             && hit <= (betSelection + COL_MAKUHITA))
                 return TRUE;
             break;
+        // Individual square
         default:
-            if (t == r1)
+            if (hit == betSelection)
                 return TRUE;
         }
     }
     return FALSE;
 }
 
-static void sub_8142284(u8 r0)
+static void FlashSelectionOnWheel(u8 selectionId)
 {
-
-    u16 var0 = 0;
-    u8 var2;
-    u16 var3;
+    u16 flashFlags = 0;
+    u8 numSelected;
+    u16 palOffset;
     u8 i;
 
-    switch (r0)
+    switch (selectionId)
     {
-    case 5:
-    case 10:
-    case 15:
-        for (i = (r0 + 1); i < (r0 + 5); i++)
+    case ROW_ORANGE:
+    case ROW_GREEN:
+    case ROW_PURPLE:
+        // Flash colors of row selection
+        for (i = (selectionId + 1); i < (selectionId + 5); i++)
         {
-            if (!(gUnknown_0203AB88->var08 & gUnknown_085B6154[i].var08))
-                var0 |= gUnknown_085B6154[i].var10;
+            if (!(sRoulette->hitFlags & sGridSelections[i].flag))
+                flashFlags |= sGridSelections[i].flashFlags;
         }
-        sub_8151A48(&gUnknown_0203AB88->varB8, var0 &= 0xDFFF);
+        RouletteFlash_Enable(&sRoulette->flashUtil, flashFlags &= ~(F_FLASH_ICON));
         break;
     default:
     {
-        struct UnkStruct1 var1[3];
-        memcpy(var1, gUnknown_085B63F0, sizeof(var1));
-        if (r0 > 0 && r0 < 5)
-            var2 = 3;
+        // Selection is either a column or individual square
+        struct RouletteFlashSettings iconFlash[NUM_BOARD_COLORS];
+        memcpy(iconFlash, sFlashData_PokeIcons, sizeof(iconFlash));
+
+        if (selectionId >= COL_WYNAUT && selectionId <= COL_MAKUHITA)
+            numSelected = NUM_BOARD_COLORS; // Selection is full column
         else
-            var2 = 1;
-        var3 = r0 / 5 - 1;
-        switch (r0 % 5)
+            numSelected = 1;
+
+        palOffset = GET_ROW_IDX(selectionId);
+        switch (GET_COL(selectionId))
         {
-            case 1:
-                var3 = gSprites[gUnknown_0203AB88->var3C[7]].oam.paletteNum * 16;
-                break;
-            case 2:
-                var3 = gSprites[gUnknown_0203AB88->var3C[8]].oam.paletteNum * 16;
-                break;
-            case 3:
-                var3 = gSprites[gUnknown_0203AB88->var3C[9]].oam.paletteNum * 16;
-                break;
-            case 4:
-                var3 = gSprites[gUnknown_0203AB88->var3C[10]].oam.paletteNum * 16;
-                break;
+        // The specific color of the poke it references doesn't matter, because the icons of a poke share a palette
+        // So it just uses the first sprite ID of each
+        case COL_WYNAUT:
+            palOffset = gSprites[sRoulette->spriteIds[SPR_WHEEL_ICON_ORANGE_WYNAUT]].oam.paletteNum * 16;
+            break;
+        case COL_AZURILL:
+            palOffset = gSprites[sRoulette->spriteIds[SPR_WHEEL_ICON_GREEN_AZURILL]].oam.paletteNum * 16;
+            break;
+        case COL_SKITTY:
+            palOffset = gSprites[sRoulette->spriteIds[SPR_WHEEL_ICON_PURPLE_SKITTY]].oam.paletteNum * 16;
+            break;
+        case COL_MAKUHITA:
+            palOffset = gSprites[sRoulette->spriteIds[SPR_WHEEL_ICON_ORANGE_MAKUHITA]].oam.paletteNum * 16;
+            break;
         }
-        if (var2 == 1)
+        if (numSelected == 1)
         {
-            if (!(gUnknown_0203AB88->var08 & gUnknown_085B6154[r0].var08))
+            // Selection is individual square, add entry in flash util for its icon
+            if (!(sRoulette->hitFlags & sGridSelections[selectionId].flag))
             {
-                var1[r0 / 5 - 1].var02 += var3;
-                sub_815168C(&gUnknown_0203AB88->varB8, 13, &var1[r0 / 5 - 1]);
+                iconFlash[GET_ROW_IDX(selectionId)].paletteOffset += palOffset;
+                RouletteFlash_Add(&sRoulette->flashUtil, NUM_ROULETTE_SLOTS + 1, &iconFlash[GET_ROW_IDX(selectionId)]);
             }
             else
             {
+                // Square was already hit, don't flash it
                 break;
             }
         }
         else
         {
-            for (i = 0; i < 3; i++)
+            // Selection is full column, add entry in flash util for each unhit space's icon
+            // If there is only 1 unhit space, also add its flags so its color will flash as well
+            for (i = 0; i < NUM_BOARD_COLORS; i++)
             {
-                u8 var4 = i * 5 + r0 + 5;
-                if (!(gUnknown_0203AB88->var08 & gUnknown_085B6154[var4].var08))
+                u8 columnSlotId = i * 5 + selectionId + 5;
+                if (!(sRoulette->hitFlags & sGridSelections[columnSlotId].flag))
                 {
-                    var1[var4 / 5 - 1].var02 += var3;
-                    sub_815168C(&gUnknown_0203AB88->varB8, i + 13, &var1[var4 / 5 - 1]);
-                    if (var2 == 3)
-                        var0 = gUnknown_085B6154[var4].var10;
-                    var2--;
+                    iconFlash[GET_ROW_IDX(columnSlotId)].paletteOffset += palOffset;
+                    RouletteFlash_Add(&sRoulette->flashUtil, i + NUM_ROULETTE_SLOTS + 1, &iconFlash[GET_ROW_IDX(columnSlotId)]);
+                    if (numSelected == 3)
+                        flashFlags = sGridSelections[columnSlotId].flashFlags;
+                    numSelected--;
                 }
             }
-            if (var2 != 2)
-                var0 = 0;
+            // If there was more than 1 space in the column, reset flags; only icons will flash
+            if (numSelected != 2)
+                flashFlags = 0;
         }
-        sub_8151A48(&gUnknown_0203AB88->varB8, var0 |= gUnknown_085B6154[r0].var10);
+        // Do flash
+        RouletteFlash_Enable(&sRoulette->flashUtil, flashFlags |= sGridSelections[selectionId].flashFlags);
         break;
     }
     }
 }
 
-static void sub_81424FC(u8 r0)
+static void DrawGridBackground(u8 selectionId)
 {
-    vu8 i;
-    vu8 z;
-    vu16 var1;
-    vu16 var2;
-    vu8 var0;
-    u8 v[5];
-    u8 l;
-    gUnknown_0203AB88->var2A = 1;
-    sub_8142E70(0, 0);
-    sub_8152058(gUnknown_0203AB88->tilemapBuffers[2], gUnknown_0203AB88->unk_397C, 14, 7, 16, 13);
-    switch (r0)
+    vu8 i, j;
+    vu16 x, y;
+    vu8 tilemapOffset;
+    u8 selectionIds[NUM_BOARD_POKES >= NUM_BOARD_COLORS ? NUM_BOARD_POKES + 1 : NUM_BOARD_COLORS + 1];
+    u8 numSquares;
+    sRoulette->updateGridHighlight = TRUE;
+    ShowHideGridIcons(FALSE, 0);
+    SetTilemapRect(sRoulette->tilemapBuffers[2], sRoulette->gridTilemap, 14, 7, 16, 13);
+
+    // Highlight selected square
+    // (just buffers the highlight, it's actually drawn in VBlankCB_Roulette)
+    switch (selectionId)
     {
-    case 0:
+    case SELECTION_NONE:
         return;
-    case 1 ... 4:
-        l = 4;
-        for (i = 0; i < l; i++)
-        {
-            v[i] = i * 5 + r0;
-        }
+    case COL_WYNAUT:
+    case COL_AZURILL:
+    case COL_SKITTY:
+    case COL_MAKUHITA:
+        numSquares = NUM_BOARD_COLORS + 1; // For each poke column, 3 colors and a header
+        for (i = 0; i < numSquares; i++)
+            selectionIds[i] = i * ROW_ORANGE + selectionId;
         break;
-    case 5:
-    case 10:
-    case 15:
-        l = 5;
-        for (i = 0; i < l; i++)
-        {
-            v[i] = i + r0;
-        }
+    case ROW_ORANGE:
+    case ROW_GREEN:
+    case ROW_PURPLE:
+        numSquares = NUM_BOARD_POKES + 1; // For each color row, 4 pokes and a header
+        for (i = 0; i < numSquares; i++)
+            selectionIds[i] = i + selectionId;
         break;
+    // Individual square
     default:
-        l = 1;
-        v[0] = r0;
+        numSquares = 1;
+        selectionIds[0] = selectionId;
     }
-    for (i = 0; i < l; i++)
+    for (i = 0; i < numSquares; i++)
     {
-        var0 = gUnknown_085B6154[v[i]].var06;
-        var1 = gUnknown_085B6154[v[i]].var03;
-        for (z = 0; z < 3; z++)
+        tilemapOffset = sGridSelections[selectionIds[i]].tilemapOffset;
+        x = sGridSelections[selectionIds[i]].x;
+
+        // Grid square highlight is drawn in 9 segments, starting from the top left of the square
+        // Each iteration of this loop draws 3 segments to form a single horizontal segment
+        for (j = 0; j < 3; j++)
         {
-            var2 = (gUnknown_085B6154[v[i]].var04 + z) * 32;
-            gUnknown_0203AB88->tilemapBuffers[2][var1 + var2 + 0] = gUnknown_0203AB88->unk_397C[(var0 + z) * 3 + 208];
-            gUnknown_0203AB88->tilemapBuffers[2][var1 + var2 + 1] = gUnknown_0203AB88->unk_397C[(var0 + z) * 3 + 209];
-            gUnknown_0203AB88->tilemapBuffers[2][var1 + var2 + 2] = gUnknown_0203AB88->unk_397C[(var0 + z) * 3 + 210];
+            y = (sGridSelections[selectionIds[i]].y + j) * 32;
+            sRoulette->tilemapBuffers[2][x + y + 0] = sRoulette->gridTilemap[(tilemapOffset + j) * 3 + 208 + 0];
+            sRoulette->tilemapBuffers[2][x + y + 1] = sRoulette->gridTilemap[(tilemapOffset + j) * 3 + 208 + 1];
+            sRoulette->tilemapBuffers[2][x + y + 2] = sRoulette->gridTilemap[(tilemapOffset + j) * 3 + 208 + 2];
         }
     }
 }
 
-static u8 sub_8142758(u8 r0)
+static u8 GetMultiplier(u8 selectionId)
 {
-    u8 var0[5] = {0, 3, 4, 6, 12};
+    u8 multipliers[5] = {0, 3, 4, 6, MAX_MULTIPLIER};
+
+    if (selectionId > NUM_GRID_SELECTIONS)
+        selectionId = 0;
 
-    if (r0 > 19)
-        r0 = 0;
-    switch (gUnknown_085B6154[r0].var01_0)
+    switch (sGridSelections[selectionId].baseMultiplier)
     {
-    case 3:
-        r0 = r0 / 5 - 1;
-        if (gUnknown_0203AB88->var16[r0] > 3)
+    case NUM_BOARD_COLORS:
+        selectionId = GET_ROW_IDX(selectionId);
+        // If already hit all pokes of this color, multiplier is 0
+        if (sRoulette->colorHits[selectionId] >= NUM_BOARD_POKES)
             return 0;
-        return var0[gUnknown_0203AB88->var16[r0] + 1];
-    case 4:
-        r0--;
-        if (gUnknown_0203AB88->var12[r0] > 2)
+        return multipliers[sRoulette->colorHits[selectionId] + 1];
+    case NUM_BOARD_POKES:
+        selectionId = GET_COL_IDX(selectionId);
+        // If already hit all colors of this poke, multiplier is 0
+        if (sRoulette->pokeHits[selectionId] >= NUM_BOARD_COLORS)
             return 0;
-        return var0[gUnknown_0203AB88->var12[r0] + 2];
-    case 12:
-        if (gUnknown_0203AB88->var08 & gUnknown_085B6154[r0].var08)
+        return multipliers[sRoulette->pokeHits[selectionId] + 2];
+    case NUM_ROULETTE_SLOTS:
+        // If square has been hit already, multiplier is 0
+        if (sRoulette->hitFlags & sGridSelections[selectionId].flag)
             return 0;
-        return var0[4];
+        return multipliers[ARRAY_COUNT(multipliers) - 1];
     }
     return 0;
 }
 
-static void sub_8142814(void)
-{
-    s32 x1;
-    s32 x2;
-    SetGpuReg(REG_OFFSET_BG2PA, gUnknown_0203AB88->var2C.a);
-    SetGpuReg(REG_OFFSET_BG2PB, gUnknown_0203AB88->var2C.b);
-    SetGpuReg(REG_OFFSET_BG2PC, gUnknown_0203AB88->var2C.c);
-    SetGpuReg(REG_OFFSET_BG2PD, gUnknown_0203AB88->var2C.d);
-    x1 = 0x7400 - gUnknown_0203AB88->var2C.a * (gSpriteCoordOffsetX + 116)
-                - gUnknown_0203AB88->var2C.b * (gSpriteCoordOffsetY + 80);
-    x2 = 0x5400 - gUnknown_0203AB88->var2C.c * (gSpriteCoordOffsetX + 116)
-                - gUnknown_0203AB88->var2C.d * (gSpriteCoordOffsetY + 80);
-    SetGpuReg(REG_OFFSET_BG2X_L, x1);
-    SetGpuReg(REG_OFFSET_BG2X_H, (x1 & 0x0fff0000) >> 16);
-    SetGpuReg(REG_OFFSET_BG2Y_L, x2);
-    SetGpuReg(REG_OFFSET_BG2Y_H, (x2 & 0x0fff0000) >> 16);
+static void UpdateWheelPosition(void)
+{
+    s32 bg2x;
+    s32 bg2y;
+    SetGpuReg(REG_OFFSET_BG2PA, sRoulette->wheelRotation.a);
+    SetGpuReg(REG_OFFSET_BG2PB, sRoulette->wheelRotation.b);
+    SetGpuReg(REG_OFFSET_BG2PC, sRoulette->wheelRotation.c);
+    SetGpuReg(REG_OFFSET_BG2PD, sRoulette->wheelRotation.d);
+    bg2x = 0x7400 - sRoulette->wheelRotation.a * (gSpriteCoordOffsetX + 116)
+                - sRoulette->wheelRotation.b * (gSpriteCoordOffsetY + 80);
+    bg2y = 0x5400 - sRoulette->wheelRotation.c * (gSpriteCoordOffsetX + 116)
+                - sRoulette->wheelRotation.d * (gSpriteCoordOffsetY + 80);
+    SetGpuReg(REG_OFFSET_BG2X_L, bg2x);
+    SetGpuReg(REG_OFFSET_BG2X_H, (bg2x & 0x0fff0000) >> 16);
+    SetGpuReg(REG_OFFSET_BG2Y_L, bg2y);
+    SetGpuReg(REG_OFFSET_BG2Y_H, (bg2y & 0x0fff0000) >> 16);
 }
 
-static const u8 sFiller_085B644D[3] = {};
-static const u16 RouletteSpritePalette_01[] = INCBIN_U16("graphics/roulette/shadow.gbapal");
-static const u16 RouletteSpritePalette_02[] = INCBIN_U16("graphics/roulette/ball.gbapal");
-static const u16 RouletteSpritePalette_03[] = INCBIN_U16("graphics/roulette/ball_counter.gbapal");
-static const u16 RouletteSpritePalette_04[] = INCBIN_U16("graphics/roulette/cursor.gbapal");
-static const u16 RouletteSpritePalette_05[] = INCBIN_U16("graphics/roulette/credit.gbapal");
-static const u16 RouletteSpritePalette_06[] = INCBIN_U16("graphics/roulette/shroomish.gbapal");
-static const u16 RouletteSpritePalette_07[] = INCBIN_U16("graphics/roulette/tailow.gbapal");
-static const u16 RouletteSpritePalette_08[] = INCBIN_U16("graphics/roulette/poke_icons.gbapal");
-static const u16 RouletteSpritePalette_09[] = INCBIN_U16("graphics/roulette/wynaut.gbapal");
-static const u16 RouletteSpritePalette_10[] = INCBIN_U16("graphics/roulette/azurill.gbapal");
-static const u16 RouletteSpritePalette_11[] = INCBIN_U16("graphics/roulette/skitty.gbapal");
-static const u16 RouletteSpritePalette_12[] = INCBIN_U16("graphics/roulette/makuhita.gbapal");
-static const u16 RouletteSpritePalette_13[] = INCBIN_U16("graphics/roulette/85B65D0.gbapal");
-static const u16 RouletteSpritePalette_14[] = INCBIN_U16("graphics/roulette/85B65F0.gbapal");
-static const u16 RouletteSpritePalette_15[] = INCBIN_U16("graphics/roulette/85B6610.gbapal");
-static const u16 RouletteSpritePalette_16[] = INCBIN_U16("graphics/roulette/85B6630.gbapal");
-static const u32 gUnknown_085B6650[] = INCBIN_U32("graphics/roulette/ball.4bpp.lz");
-static const u32 RouletteBallCounterTiles[] = INCBIN_U32("graphics/roulette/ball_counter.4bpp.lz");
-static const u32 gUnknown_085B67FC[] = INCBIN_U32("graphics/roulette/roulette_tilt.4bpp.lz");
-static const u32 RoulettePokeIconsTiles[] = INCBIN_U32("graphics/roulette/poke_icons.4bpp.lz");
-static const u32 RoulettePokeIcons2Tiles[] = INCBIN_U32("graphics/roulette/poke_icons2.4bpp.lz");
-static const u32 gUnknown_085B7290[] = INCBIN_U32("graphics/roulette/shadow.4bpp.lz");
-static const u32 RouletteCursorTiles[] = INCBIN_U32("graphics/roulette/cursor.4bpp.lz");
-
-static const struct SpritePalette gUnknown_085B7384[] =
-{
-    { .data = RouletteSpritePalette_01, .tag = 1 },
-    { .data = RouletteSpritePalette_02, .tag = 2 },
-    { .data = RouletteSpritePalette_03, .tag = 3 },
-    { .data = RouletteSpritePalette_04, .tag = 4 },
-    { .data = RouletteSpritePalette_05, .tag = 5 },
-    { .data = RouletteSpritePalette_06, .tag = 6 },
-    { .data = RouletteSpritePalette_07, .tag = 7 },
-    { .data = RouletteSpritePalette_08, .tag = 8 },
-    { .data = RouletteSpritePalette_09, .tag = 9 },
-    { .data = RouletteSpritePalette_10, .tag = 10 },
-    { .data = RouletteSpritePalette_11, .tag = 11 },
-    { .data = RouletteSpritePalette_12, .tag = 12 },
+static const u8 sFiller[3] = {};
+static const u16 sShadow_Pal[] = INCBIN_U16("graphics/roulette/shadow.gbapal");
+static const u16 sBall_Pal[] = INCBIN_U16("graphics/roulette/ball.gbapal");
+static const u16 sBallCounter_Pal[] = INCBIN_U16("graphics/roulette/ball_counter.gbapal");
+static const u16 sCursor_Pal[] = INCBIN_U16("graphics/roulette/cursor.gbapal");
+static const u16 sCredit_Pal[] = INCBIN_U16("graphics/roulette/credit.gbapal");
+static const u16 sShroomish_Pal[] = INCBIN_U16("graphics/roulette/shroomish.gbapal");
+static const u16 sTaillow_Pal[] = INCBIN_U16("graphics/roulette/tailow.gbapal");
+static const u16 sGridIcons_Pal[] = INCBIN_U16("graphics/roulette/grid_icons.gbapal");
+static const u16 sWynaut_Pal[] = INCBIN_U16("graphics/roulette/wynaut.gbapal");
+static const u16 sAzurill_Pal[] = INCBIN_U16("graphics/roulette/azurill.gbapal");
+static const u16 sSkitty_Pal[] = INCBIN_U16("graphics/roulette/skitty.gbapal");
+static const u16 sMakuhita_Pal[] = INCBIN_U16("graphics/roulette/makuhita.gbapal");
+static const u16 sUnused1_Pal[] = INCBIN_U16("graphics/roulette/unused_1.gbapal");
+static const u16 sUnused2_Pal[] = INCBIN_U16("graphics/roulette/unused_2.gbapal");
+static const u16 sUnused3_Pal[] = INCBIN_U16("graphics/roulette/unused_3.gbapal");
+static const u16 sUnused4_Pal[] = INCBIN_U16("graphics/roulette/unused_4.gbapal");
+static const u32 sBall_Gfx[] = INCBIN_U32("graphics/roulette/ball.4bpp.lz");
+static const u32 sBallCounter_Gfx[] = INCBIN_U32("graphics/roulette/ball_counter.4bpp.lz");
+static const u32 sShroomishTaillow_Gfx[] = INCBIN_U32("graphics/roulette/roulette_tilt.4bpp.lz");
+static const u32 sGridIcons_Gfx[] = INCBIN_U32("graphics/roulette/grid_icons.4bpp.lz");
+static const u32 sWheelIcons_Gfx[] = INCBIN_U32("graphics/roulette/wheel_icons.4bpp.lz");
+static const u32 sShadow_Gfx[] = INCBIN_U32("graphics/roulette/shadow.4bpp.lz");
+static const u32 sCursor_Gfx[] = INCBIN_U32("graphics/roulette/cursor.4bpp.lz");
+
+static const struct SpritePalette sSpritePalettes[] =
+{
+    { .data = sShadow_Pal,      .tag = PALTAG_SHADOW },
+    { .data = sBall_Pal,        .tag = PALTAG_BALL },
+    { .data = sBallCounter_Pal, .tag = PALTAG_BALL_COUNTER },
+    { .data = sCursor_Pal,      .tag = PALTAG_CURSOR },
+    { .data = sCredit_Pal,      .tag = PALTAG_INTERFACE },
+    { .data = sShroomish_Pal,   .tag = PALTAG_SHROOMISH },
+    { .data = sTaillow_Pal,     .tag = PALTAG_TAILLOW },
+    { .data = sGridIcons_Pal,   .tag = PALTAG_GRID_ICONS },
+    { .data = sWynaut_Pal,      .tag = PALTAG_WYNAUT },
+    { .data = sAzurill_Pal,     .tag = PALTAG_AZURILL },
+    { .data = sSkitty_Pal,      .tag = PALTAG_SKITTY },
+    { .data = sMakuhita_Pal,    .tag = PALTAG_MAKUHITA },
     {}
 };
 
-static const struct OamData gOamData_85B73EC =
+static const struct OamData sOam_GridHeader =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
@@ -2078,7 +2373,7 @@ static const struct OamData gOamData_85B73EC =
     .priority = 1,
 };
 
-static const struct OamData gOamData_85B73F4 =
+static const struct OamData sOam_GridIcon =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
@@ -2087,7 +2382,7 @@ static const struct OamData gOamData_85B73F4 =
     .priority = 1,
 };
 
-static const struct OamData gOamData_85B73FC =
+static const struct OamData sOam_WheelIcon =
 {
     .y = 60,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -2097,35 +2392,35 @@ static const struct OamData gOamData_85B73FC =
     .priority = 2,
 };
 
-static const union AnimCmd gSpriteAnim_85B7404[] =
+static const union AnimCmd sAffineAnim_Unused1[] =
 {
     ANIMCMD_FRAME(0, 0),
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B740C[] =
+static const union AnimCmd *const sAffineAnims_Unused1[] =
 {
-    gSpriteAnim_85B7404
+    sAffineAnim_Unused1
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_85B7410[] =
+static const union AffineAnimCmd sAffineAnim_Unused2[] =
 {
     AFFINEANIMCMD_END
 };
 
-static const union AffineAnimCmd *const gSpriteAffineAnimTable_85B7418[] =
+static const union AffineAnimCmd *const sAffineAnims_Unused2[] =
 {
-    gSpriteAffineAnim_85B7410
+    sAffineAnim_Unused2
 };
 
-static const struct CompressedSpriteSheet gUnknown_085B741C =
+static const struct CompressedSpriteSheet sSpriteSheet_WheelIcons =
 {
-    .data = RoulettePokeIcons2Tiles,
+    .data = sWheelIcons_Gfx,
     .size = 0xC00,
-    .tag = 0
+    .tag = GFXTAG_WHEEL_ICONS
 };
 
-static const union AnimCmd gSpriteAnim_85B7420[] =
+static const union AnimCmd sAnim_WheelIcons[] =
 {
     ANIMCMD_FRAME(0, 0),
     ANIMCMD_FRAME(32, 0),
@@ -2142,81 +2437,81 @@ static const union AnimCmd gSpriteAnim_85B7420[] =
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7458[] =
+static const union AnimCmd *const sAnim_WheelIcon_OrangeWynaut[] =
 {
-    &gSpriteAnim_85B7420[0]
+    &sAnim_WheelIcons[0]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B745C[] =
+static const union AnimCmd *const sAnim_WheelIcon_GreenAzurill[] =
 {
-    &gSpriteAnim_85B7420[1]
+    &sAnim_WheelIcons[1]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7460[] =
+static const union AnimCmd *const sAnim_WheelIcon_PurpleSkitty[] =
 {
-    &gSpriteAnim_85B7420[2]
+    &sAnim_WheelIcons[2]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7464[] =
+static const union AnimCmd *const sAnim_WheelIcon_OrangeMakuhita[] =
 {
-    &gSpriteAnim_85B7420[3]
+    &sAnim_WheelIcons[3]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7468[] =
+static const union AnimCmd *const sAnim_WheelIcon_GreenWynaut[] =
 {
-    &gSpriteAnim_85B7420[4]
+    &sAnim_WheelIcons[4]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B746C[] =
+static const union AnimCmd *const sAnim_WheelIcon_PurpleAzurill[] =
 {
-    &gSpriteAnim_85B7420[5]
+    &sAnim_WheelIcons[5]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7470[] =
+static const union AnimCmd *const sAnim_WheelIcon_OrangeSkitty[] =
 {
-    &gSpriteAnim_85B7420[6]
+    &sAnim_WheelIcons[6]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7474[] =
+static const union AnimCmd *const sAnim_WheelIcon_GreenMakuhita[] =
 {
-    &gSpriteAnim_85B7420[7]
+    &sAnim_WheelIcons[7]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7478[] =
+static const union AnimCmd *const sAnim_WheelIcon_PurpleWynaut[] =
 {
-    &gSpriteAnim_85B7420[8]
+    &sAnim_WheelIcons[8]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B747C[] =
+static const union AnimCmd *const sAnim_WheelIcon_OrangeAzurill[] =
 {
-    &gSpriteAnim_85B7420[9]
+    &sAnim_WheelIcons[9]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7480[] =
+static const union AnimCmd *const sAnim_WheelIcon_GreenSkitty[] =
 {
-    &gSpriteAnim_85B7420[10]
+    &sAnim_WheelIcons[10]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7484[] =
+static const union AnimCmd *const sAnim_WheelIcon_PurpleMakuhita[] =
 {
-    &gSpriteAnim_85B7420[11]
+    &sAnim_WheelIcons[11]
 };
 
-static const struct CompressedSpriteSheet gUnknown_085B7488 =
+static const struct CompressedSpriteSheet sSpriteSheet_Headers =
 {
-    .data = gRouletteHeadersTiles,
+    .data = gRouletteHeaders_Gfx,
     .size = 0x1600,
-    .tag = 4
+    .tag = GFXTAG_HEADERS
 };
 
-static const struct CompressedSpriteSheet gUnknown_085B7490 =
+static const struct CompressedSpriteSheet sSpriteSheet_GridIcons =
 {
-    .data = RoulettePokeIconsTiles,
+    .data = sGridIcons_Gfx,
     .size = 0x400,
-    .tag = 5
+    .tag = GFXTAG_GRID_ICONS
 };
 
-static const union AnimCmd gSpriteAnim_85B7498[] =
+static const union AnimCmd sAnim_Headers[] =
 {
     ANIMCMD_FRAME(0, 0),
     ANIMCMD_FRAME(16, 0),
@@ -2232,7 +2527,7 @@ static const union AnimCmd gSpriteAnim_85B7498[] =
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_85B74C8[] =
+static const union AnimCmd sAnim_GridIcons[] =
 {
     ANIMCMD_FRAME(0, 0),
     ANIMCMD_FRAME(4, 0),
@@ -2241,285 +2536,287 @@ static const union AnimCmd gSpriteAnim_85B74C8[] =
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B74DC[] =
+static const union AnimCmd *const sAnim_WynautHeader[] =
 {
-    &gSpriteAnim_85B7498[0]
+    &sAnim_Headers[0]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B74E0[] =
+static const union AnimCmd *const sAnim_AzurillHeader[] =
 {
-    &gSpriteAnim_85B7498[2]
+    &sAnim_Headers[2]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B74E4[] =
+static const union AnimCmd *const sAnim_SkittyHeader[] =
 {
-    &gSpriteAnim_85B7498[4]
+    &sAnim_Headers[4]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B74E8[] =
+static const union AnimCmd *const sAnim_MakuhitaHeader[] =
 {
-    &gSpriteAnim_85B7498[6]
+    &sAnim_Headers[6]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B74EC[] =
+static const union AnimCmd *const sAnim_OrangeHeader[] =
 {
-    &gSpriteAnim_85B7498[8]
+    &sAnim_Headers[8]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B74F0[] =
+static const union AnimCmd *const sAnim_GreenHeader[] =
 {
-    &gSpriteAnim_85B7498[9]
+    &sAnim_Headers[9]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B74F4[] =
+static const union AnimCmd *const sAnim_PurpleHeader[] =
 {
-    &gSpriteAnim_85B7498[10]
+    &sAnim_Headers[10]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B74F8[] =
+static const union AnimCmd *const sAnim_GridIcon_Wynaut[] =
 {
-    &gSpriteAnim_85B74C8[0]
+    &sAnim_GridIcons[0]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B74FC[] =
+static const union AnimCmd *const sAnim_GridIcon_Azurill[] =
 {
-    &gSpriteAnim_85B74C8[1]
+    &sAnim_GridIcons[1]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7500[] =
+static const union AnimCmd *const sAnim_GridIcon_Skitty[] =
 {
-    &gSpriteAnim_85B74C8[2]
+    &sAnim_GridIcons[2]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7504[] =
+static const union AnimCmd *const sAnim_GridIcon_Makuhita[] =
 {
-    &gSpriteAnim_85B74C8[3]
+    &sAnim_GridIcons[3]
 };
 
-static const struct SpriteTemplate gSpriteTemplate_85B7508[] =
+static const struct SpriteTemplate sSpriteTemplates_PokeHeaders[NUM_BOARD_POKES] =
 {
     {
-        .tileTag = 4,
-        .paletteTag = 8,
-        .oam = &gOamData_85B73EC,
-        .anims = gSpriteAnimTable_85B74DC,
+        .tileTag = GFXTAG_HEADERS,
+        .paletteTag = PALTAG_GRID_ICONS,
+        .oam = &sOam_GridHeader,
+        .anims = sAnim_WynautHeader,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = sub_814390C
+        .callback = SpriteCB_GridSquare
     },
     {
-        .tileTag = 4,
-        .paletteTag = 8,
-        .oam = &gOamData_85B73EC,
-        .anims = gSpriteAnimTable_85B74E0,
+        .tileTag = GFXTAG_HEADERS,
+        .paletteTag = PALTAG_GRID_ICONS,
+        .oam = &sOam_GridHeader,
+        .anims = sAnim_AzurillHeader,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = sub_814390C
+        .callback = SpriteCB_GridSquare
     },
     {
-        .tileTag = 4,
-        .paletteTag = 8,
-        .oam = &gOamData_85B73EC,
-        .anims = gSpriteAnimTable_85B74E4,
+        .tileTag = GFXTAG_HEADERS,
+        .paletteTag = PALTAG_GRID_ICONS,
+        .oam = &sOam_GridHeader,
+        .anims = sAnim_SkittyHeader,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = sub_814390C
+        .callback = SpriteCB_GridSquare
     },
     {
-        .tileTag = 4,
-        .paletteTag = 8,
-        .oam = &gOamData_85B73EC,
-        .anims = gSpriteAnimTable_85B74E8,
+        .tileTag = GFXTAG_HEADERS,
+        .paletteTag = PALTAG_GRID_ICONS,
+        .oam = &sOam_GridHeader,
+        .anims = sAnim_MakuhitaHeader,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = sub_814390C
+        .callback = SpriteCB_GridSquare
     }
 };
 
-static const struct SpriteTemplate gSpriteTemplate_85B7568[] =
+static const struct SpriteTemplate sSpriteTemplates_ColorHeaders[NUM_BOARD_COLORS] =
 {
     {
-        .tileTag = 4,
-        .paletteTag = 8,
-        .oam = &gOamData_85B73EC,
-        .anims = gSpriteAnimTable_85B74EC,
+        .tileTag = GFXTAG_HEADERS,
+        .paletteTag = PALTAG_GRID_ICONS,
+        .oam = &sOam_GridHeader,
+        .anims = sAnim_OrangeHeader,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = sub_814390C
+        .callback = SpriteCB_GridSquare
     },
     {
-        .tileTag = 4,
-        .paletteTag = 8,
-        .oam = &gOamData_85B73EC,
-        .anims = gSpriteAnimTable_85B74F0,
+        .tileTag = GFXTAG_HEADERS,
+        .paletteTag = PALTAG_GRID_ICONS,
+        .oam = &sOam_GridHeader,
+        .anims = sAnim_GreenHeader,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = sub_814390C
+        .callback = SpriteCB_GridSquare
     },
     {
-        .tileTag = 4,
-        .paletteTag = 8,
-        .oam = &gOamData_85B73EC,
-        .anims = gSpriteAnimTable_85B74F4,
+        .tileTag = GFXTAG_HEADERS,
+        .paletteTag = PALTAG_GRID_ICONS,
+        .oam = &sOam_GridHeader,
+        .anims = sAnim_PurpleHeader,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = sub_814390C
+        .callback = SpriteCB_GridSquare
     }
 };
 
-static const struct SpriteTemplate gSpriteTemplate_85B75B0[] =
+static const struct SpriteTemplate sSpriteTemplate_GridIcons[NUM_BOARD_POKES] =
 {
     {
-        .tileTag = 5,
-        .paletteTag = 8,
-        .oam = &gOamData_85B73F4,
-        .anims = gSpriteAnimTable_85B74F8,
+        .tileTag = GFXTAG_GRID_ICONS,
+        .paletteTag = PALTAG_GRID_ICONS,
+        .oam = &sOam_GridIcon,
+        .anims = sAnim_GridIcon_Wynaut,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = sub_814390C
+        .callback = SpriteCB_GridSquare
     },
     {
-        .tileTag = 5,
-        .paletteTag = 8,
-        .oam = &gOamData_85B73F4,
-        .anims = gSpriteAnimTable_85B74FC,
+        .tileTag = GFXTAG_GRID_ICONS,
+        .paletteTag = PALTAG_GRID_ICONS,
+        .oam = &sOam_GridIcon,
+        .anims = sAnim_GridIcon_Azurill,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = sub_814390C
+        .callback = SpriteCB_GridSquare
     },
     {
-        .tileTag = 5,
-        .paletteTag = 8,
-        .oam = &gOamData_85B73F4,
-        .anims = gSpriteAnimTable_85B7500,
+        .tileTag = GFXTAG_GRID_ICONS,
+        .paletteTag = PALTAG_GRID_ICONS,
+        .oam = &sOam_GridIcon,
+        .anims = sAnim_GridIcon_Skitty,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = sub_814390C
+        .callback = SpriteCB_GridSquare
     },
     {
-        .tileTag = 5,
-        .paletteTag = 8,
-        .oam = &gOamData_85B73F4,
-        .anims = gSpriteAnimTable_85B7504,
+        .tileTag = GFXTAG_GRID_ICONS,
+        .paletteTag = PALTAG_GRID_ICONS,
+        .oam = &sOam_GridIcon,
+        .anims = sAnim_GridIcon_Makuhita,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = sub_814390C
+        .callback = SpriteCB_GridSquare
     }
 };
 
-static const struct SpriteTemplate gSpriteTemplate_85B7610[] =
+// Wheel icons are listed clockwise starting from 1 oclock on the roulette wheel (with pokeball upside right)
+// They go Wynaut -> Azurill -> Skitty -> Makuhita, and Orange -> Green -> Purple
+static const struct SpriteTemplate sSpriteTemplates_WheelIcons[NUM_ROULETTE_SLOTS] =
 {
     {
-        .tileTag = 0,
-        .paletteTag = 9,
-        .oam = &gOamData_85B73FC,
-        .anims = gSpriteAnimTable_85B7458,
+        .tileTag = GFXTAG_WHEEL_ICONS,
+        .paletteTag = PALTAG_WYNAUT,
+        .oam = &sOam_WheelIcon,
+        .anims = sAnim_WheelIcon_OrangeWynaut,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = sub_8143280
+        .callback = SpriteCB_WheelIcon
     },
     {
-        .tileTag = 0,
-        .paletteTag = 10,
-        .oam = &gOamData_85B73FC,
-        .anims = gSpriteAnimTable_85B745C,
+        .tileTag = GFXTAG_WHEEL_ICONS,
+        .paletteTag = PALTAG_AZURILL,
+        .oam = &sOam_WheelIcon,
+        .anims = sAnim_WheelIcon_GreenAzurill,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = sub_8143280
+        .callback = SpriteCB_WheelIcon
     },
     {
-        .tileTag = 0,
-        .paletteTag = 11,
-        .oam = &gOamData_85B73FC,
-        .anims = gSpriteAnimTable_85B7460,
+        .tileTag = GFXTAG_WHEEL_ICONS,
+        .paletteTag = PALTAG_SKITTY,
+        .oam = &sOam_WheelIcon,
+        .anims = sAnim_WheelIcon_PurpleSkitty,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = sub_8143280
+        .callback = SpriteCB_WheelIcon
     },
     {
-        .tileTag = 0,
-        .paletteTag = 12,
-        .oam = &gOamData_85B73FC,
-        .anims = gSpriteAnimTable_85B7464,
+        .tileTag = GFXTAG_WHEEL_ICONS,
+        .paletteTag = PALTAG_MAKUHITA,
+        .oam = &sOam_WheelIcon,
+        .anims = sAnim_WheelIcon_OrangeMakuhita,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = sub_8143280
+        .callback = SpriteCB_WheelIcon
     },
     {
-        .tileTag = 0,
-        .paletteTag = 9,
-        .oam = &gOamData_85B73FC,
-        .anims = gSpriteAnimTable_85B7468,
+        .tileTag = GFXTAG_WHEEL_ICONS,
+        .paletteTag = PALTAG_WYNAUT,
+        .oam = &sOam_WheelIcon,
+        .anims = sAnim_WheelIcon_GreenWynaut,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = sub_8143280
+        .callback = SpriteCB_WheelIcon
     },
     {
-        .tileTag = 0,
-        .paletteTag = 10,
-        .oam = &gOamData_85B73FC,
-        .anims = gSpriteAnimTable_85B746C,
+        .tileTag = GFXTAG_WHEEL_ICONS,
+        .paletteTag = PALTAG_AZURILL,
+        .oam = &sOam_WheelIcon,
+        .anims = sAnim_WheelIcon_PurpleAzurill,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = sub_8143280
+        .callback = SpriteCB_WheelIcon
     },
     {
-        .tileTag = 0,
-        .paletteTag = 11,
-        .oam = &gOamData_85B73FC,
-        .anims = gSpriteAnimTable_85B7470,
+        .tileTag = GFXTAG_WHEEL_ICONS,
+        .paletteTag = PALTAG_SKITTY,
+        .oam = &sOam_WheelIcon,
+        .anims = sAnim_WheelIcon_OrangeSkitty,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = sub_8143280
+        .callback = SpriteCB_WheelIcon
     },
     {
-        .tileTag = 0,
-        .paletteTag = 12,
-        .oam = &gOamData_85B73FC,
-        .anims = gSpriteAnimTable_85B7474,
+        .tileTag = GFXTAG_WHEEL_ICONS,
+        .paletteTag = PALTAG_MAKUHITA,
+        .oam = &sOam_WheelIcon,
+        .anims = sAnim_WheelIcon_GreenMakuhita,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = sub_8143280
+        .callback = SpriteCB_WheelIcon
     },
     {
-        .tileTag = 0,
-        .paletteTag = 9,
-        .oam = &gOamData_85B73FC,
-        .anims = gSpriteAnimTable_85B7478,
+        .tileTag = GFXTAG_WHEEL_ICONS,
+        .paletteTag = PALTAG_WYNAUT,
+        .oam = &sOam_WheelIcon,
+        .anims = sAnim_WheelIcon_PurpleWynaut,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = sub_8143280
+        .callback = SpriteCB_WheelIcon
     },
     {
-        .tileTag = 0,
-        .paletteTag = 10,
-        .oam = &gOamData_85B73FC,
-        .anims = gSpriteAnimTable_85B747C,
+        .tileTag = GFXTAG_WHEEL_ICONS,
+        .paletteTag = PALTAG_AZURILL,
+        .oam = &sOam_WheelIcon,
+        .anims = sAnim_WheelIcon_OrangeAzurill,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = sub_8143280
+        .callback = SpriteCB_WheelIcon
     },
     {
-        .tileTag = 0,
-        .paletteTag = 11,
-        .oam = &gOamData_85B73FC,
-        .anims = gSpriteAnimTable_85B7480,
+        .tileTag = GFXTAG_WHEEL_ICONS,
+        .paletteTag = PALTAG_SKITTY,
+        .oam = &sOam_WheelIcon,
+        .anims = sAnim_WheelIcon_GreenSkitty,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = sub_8143280
+        .callback = SpriteCB_WheelIcon
     },
     {
-        .tileTag = 0,
-        .paletteTag = 12,
-        .oam = &gOamData_85B73FC,
-        .anims = gSpriteAnimTable_85B7484,
+        .tileTag = GFXTAG_WHEEL_ICONS,
+        .paletteTag = PALTAG_MAKUHITA,
+        .oam = &sOam_WheelIcon,
+        .anims = sAnim_WheelIcon_PurpleMakuhita,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = sub_8143280
+        .callback = SpriteCB_WheelIcon
     }
 };
 
-static const struct OamData gOamData_85B7730 =
+static const struct OamData sOam_Credit =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
@@ -2528,7 +2825,7 @@ static const struct OamData gOamData_85B7730 =
     .priority = 1,
 };
 
-static const struct OamData gOamData_85B7738 =
+static const struct OamData sOam_CreditDigit =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
@@ -2537,7 +2834,7 @@ static const struct OamData gOamData_85B7738 =
     .priority = 1,
 };
 
-static const struct OamData gOamData_85B7740 =
+static const struct OamData sOam_Multiplier =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
@@ -2546,7 +2843,7 @@ static const struct OamData gOamData_85B7740 =
     .priority = 1,
 };
 
-static const struct OamData gOamData_85B7748 =
+static const struct OamData sOam_BallCounter =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
@@ -2555,58 +2852,59 @@ static const struct OamData gOamData_85B7748 =
     .priority = 1,
 };
 
-static const struct CompressedSpriteSheet gUnknown_085B7750[] =
+static const struct CompressedSpriteSheet sSpriteSheets_Interface[] =
 {
     {
-        .data = gRouletteCreditTiles,
+        .data = gRouletteCredit_Gfx,
         .size = 0x400,
-        .tag = 7
+        .tag = GFXTAG_CREDIT
     },
     {
-        .data = gRouletteNumbersTiles,
+        .data = gRouletteNumbers_Gfx,
         .size = 0x280,
-        .tag = 8
+        .tag = GFXTAG_CREDIT_DIGIT
     },
     {
-        .data = gRouletteMultiplierTiles,
+        .data = gRouletteMultiplier_Gfx,
         .size = 0x500,
-        .tag = 9
+        .tag = GFXTAG_MULTIPLIER
     },
     {
-        .data = RouletteBallCounterTiles,
+        .data = sBallCounter_Gfx,
         .size = 0x140,
-        .tag = 10
+        .tag = GFXTAG_BALL_COUNTER
     },
     {
-        .data = RouletteCursorTiles,
+        .data = sCursor_Gfx,
         .size = 0x200,
-        .tag = 11
+        .tag = GFXTAG_CURSOR
     },
     {}
 };
 
-static const union AnimCmd gSpriteAnim_85B7780[] =
-{
-    ANIMCMD_FRAME(0, 0),
-    ANIMCMD_FRAME(2, 0),
-    ANIMCMD_FRAME(4, 0),
-    ANIMCMD_FRAME(6, 0),
-    ANIMCMD_FRAME(8, 0),
-    ANIMCMD_FRAME(10, 0),
-    ANIMCMD_FRAME(12, 0),
-    ANIMCMD_FRAME(14, 0),
-    ANIMCMD_FRAME(16, 0),
-    ANIMCMD_FRAME(18, 0),
+static const union AnimCmd sAnim_CreditDigit[] =
+{
+    ANIMCMD_FRAME(0, 0),  // 0
+    ANIMCMD_FRAME(2, 0),  // 1
+    ANIMCMD_FRAME(4, 0),  // 2
+    ANIMCMD_FRAME(6, 0),  // 3
+    ANIMCMD_FRAME(8, 0),  // 4
+    ANIMCMD_FRAME(10, 0), // 5
+    ANIMCMD_FRAME(12, 0), // 6
+    ANIMCMD_FRAME(14, 0), // 7
+    ANIMCMD_FRAME(16, 0), // 8
+    ANIMCMD_FRAME(18, 0), // 9
     // BUG: Animation not terminated properly
+    // Doesn't matter in practice, the frames are set directly and not looped
     //ANIMCMD_END
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B77A8[] =
+static const union AnimCmd *const sAnims_CreditDigit[] =
 {
-    gSpriteAnim_85B7780
+    sAnim_CreditDigit
 };
 
-static const union AnimCmd gSpriteAnim_85B77AC[] =
+static const union AnimCmd sAnim_Multiplier[] =
 {
     ANIMCMD_FRAME(0, 0),
     ANIMCMD_FRAME(8, 0),
@@ -2616,12 +2914,12 @@ static const union AnimCmd gSpriteAnim_85B77AC[] =
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B77C4[] =
+static const union AnimCmd *const sAnims_Multiplier[] =
 {
-    gSpriteAnim_85B77AC
+    sAnim_Multiplier
 };
 
-static const union AnimCmd gSpriteAnim_85B77C8[] =
+static const union AnimCmd sAnim_BallCounter[] =
 {
     ANIMCMD_FRAME(0, 0),
     ANIMCMD_FRAME(2, 0),
@@ -2631,67 +2929,68 @@ static const union AnimCmd gSpriteAnim_85B77C8[] =
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B77E0[] =
+static const union AnimCmd *const sAnims_BallCounter[] =
 {
-    gSpriteAnim_85B77C8
+    sAnim_BallCounter
 };
 
-static const struct SpriteTemplate gSpriteTemplate_85B77E4 =
+static const struct SpriteTemplate sSpriteTemplate_Credit =
 {
-    .tileTag = 7,
-    .paletteTag = 5,
-    .oam = &gOamData_85B7730,
+    .tileTag = GFXTAG_CREDIT,
+    .paletteTag = PALTAG_INTERFACE,
+    .oam = &sOam_Credit,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gUnknown_085B77FC =
+static const struct SpriteTemplate sSpriteTemplate_CreditDigit =
 {
-    .tileTag = 8,
-    .paletteTag = 5,
-    .oam = &gOamData_85B7738,
-    .anims = gSpriteAnimTable_85B77A8,
+    .tileTag = GFXTAG_CREDIT_DIGIT,
+    .paletteTag = PALTAG_INTERFACE,
+    .oam = &sOam_CreditDigit,
+    .anims = sAnims_CreditDigit,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gUnknown_085B7814 =
+static const struct SpriteTemplate sSpriteTemplate_Multiplier =
 {
-    .tileTag = 9,
-    .paletteTag = 5,
-    .oam = &gOamData_85B7740,
-    .anims = gSpriteAnimTable_85B77C4,
+    .tileTag = GFXTAG_MULTIPLIER,
+    .paletteTag = PALTAG_INTERFACE,
+    .oam = &sOam_Multiplier,
+    .anims = sAnims_Multiplier,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_814390C
+    .callback = SpriteCB_GridSquare
 };
 
-static const struct SpriteTemplate gUnknown_085B782C =
+static const struct SpriteTemplate sSpriteTemplate_BallCounter =
 {
-    .tileTag = 10,
-    .paletteTag = 3,
-    .oam = &gOamData_85B7748,
-    .anims = gSpriteAnimTable_85B77E0,
+    .tileTag = GFXTAG_BALL_COUNTER,
+    .paletteTag = PALTAG_BALL_COUNTER,
+    .oam = &sOam_BallCounter,
+    .anims = sAnims_BallCounter,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gUnknown_085B7844 =
+// NOTE: This cursor is only used to identify the winning square on the grid
+static const struct SpriteTemplate sSpriteTemplate_Cursor =
 {
-    .tileTag = 11,
-    .paletteTag = 5,
-    .oam = &gOamData_85B73EC,
+    .tileTag = GFXTAG_CURSOR,
+    .paletteTag = PALTAG_INTERFACE,
+    .oam = &sOam_GridHeader,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
-static const struct OamData gOamData_85B785C =
+static const struct OamData sOam_Ball =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
@@ -2700,13 +2999,13 @@ static const struct OamData gOamData_85B785C =
     .priority = 2,
 };
 
-static const struct CompressedSpriteSheet gUnknown_085B7864 = {
-    .data = gUnknown_085B6650,
+static const struct CompressedSpriteSheet sSpriteSheet_Ball = {
+    .data = sBall_Gfx,
     .size = 0x200,
-    .tag = 12
+    .tag = GFXTAG_BALL
 };
 
-static const union AnimCmd gSpriteAnim_85B786C[] =
+static const union AnimCmd sAnim_Ball_RollFast[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(4, 5),
@@ -2715,7 +3014,7 @@ static const union AnimCmd gSpriteAnim_85B786C[] =
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd gSpriteAnim_85B7880[] =
+static const union AnimCmd sAnim_Ball_RollMedium[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(4, 10),
@@ -2724,7 +3023,7 @@ static const union AnimCmd gSpriteAnim_85B7880[] =
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd gSpriteAnim_85B7894[] =
+static const union AnimCmd sAnim_Ball_RollSlow[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(4, 15),
@@ -2733,7 +3032,7 @@ static const union AnimCmd gSpriteAnim_85B7894[] =
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd gSpriteAnim_85B78A8[] =
+static const union AnimCmd sAnim_Ball_StopOnFrame1[] =
 {
     ANIMCMD_FRAME(4, 2),
     ANIMCMD_FRAME(8, 5),
@@ -2742,7 +3041,7 @@ static const union AnimCmd gSpriteAnim_85B78A8[] =
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_85B78BC[] =
+static const union AnimCmd sAnim_Ball_StopOnFrame3[] =
 {
     ANIMCMD_FRAME(4, 2),
     ANIMCMD_FRAME(0, 4),
@@ -2752,7 +3051,7 @@ static const union AnimCmd gSpriteAnim_85B78BC[] =
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_85B78D4[] =
+static const union AnimCmd sAnim_Ball_StopOnFrame4[] =
 {
     ANIMCMD_FRAME(0, 2),
     ANIMCMD_FRAME(4, 5),
@@ -2761,13 +3060,13 @@ static const union AnimCmd gSpriteAnim_85B78D4[] =
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_85B78E8[] =
+static const union AnimCmd sAnim_Ball_Still[] =
 {
     ANIMCMD_FRAME(12, 0),
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_85B78F0[] =
+static const union AnimCmd sAnim_Ball_StopOnFrame2[] =
 {
     ANIMCMD_FRAME(8, 2),
     ANIMCMD_FRAME(4, 5),
@@ -2776,31 +3075,31 @@ static const union AnimCmd gSpriteAnim_85B78F0[] =
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7904[] =
-{
-    gSpriteAnim_85B786C,
-    gSpriteAnim_85B7880,
-    gSpriteAnim_85B7894,
-    gSpriteAnim_85B78A8,
-    gSpriteAnim_85B78F0,
-    gSpriteAnim_85B78BC,
-    gSpriteAnim_85B78D4,
-    gSpriteAnim_85B78D4,
-    gSpriteAnim_85B78E8
+static const union AnimCmd *const sAnims_Ball[] =
+{
+    sAnim_Ball_RollFast,
+    sAnim_Ball_RollMedium,
+    sAnim_Ball_RollSlow,
+    sAnim_Ball_StopOnFrame1,
+    sAnim_Ball_StopOnFrame2,
+    sAnim_Ball_StopOnFrame3,
+    sAnim_Ball_StopOnFrame4,
+    sAnim_Ball_StopOnFrame4,
+    sAnim_Ball_Still
 };
 
-static const struct SpriteTemplate gSpriteTemplate_85B7928 =
+static const struct SpriteTemplate sSpriteTemplate_Ball =
 {
-    .tileTag = 12,
-    .paletteTag = 2,
-    .oam = &gOamData_85B785C,
-    .anims = gSpriteAnimTable_85B7904,
+    .tileTag = GFXTAG_BALL,
+    .paletteTag = PALTAG_BALL,
+    .oam = &sOam_Ball,
+    .anims = sAnims_Ball,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
-static const struct OamData gOamData_85B7940 =
+static const struct OamData sOam_WheelCenter =
 {
     .y = 81,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -2810,25 +3109,25 @@ static const struct OamData gOamData_85B7940 =
     .priority = 2,
 };
 
-static const struct CompressedSpriteSheet gUnknown_085B7948 =
+static const struct CompressedSpriteSheet sSpriteSheet_WheelCenter =
 {
     .data = gRouletteCenter_Gfx,
     .size = 0x800,
-    .tag = 6
+    .tag = GFXTAG_WHEEL_CENTER
 };
 
-static const struct SpriteTemplate gSpriteTemplate_85B7950 =
+static const struct SpriteTemplate sSpriteTemplate_WheelCenter =
 {
-    .tileTag = 6,
-    .paletteTag = 2,
-    .oam = &gOamData_85B7940,
+    .tileTag = GFXTAG_WHEEL_CENTER,
+    .paletteTag = PALTAG_BALL,
+    .oam = &sOam_WheelCenter,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_814399C
+    .callback = SpriteCB_WheelCenter
 };
 
-static const struct OamData gOamData_85B7968 =
+static const struct OamData sOam_Shroomish =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
@@ -2837,7 +3136,7 @@ static const struct OamData gOamData_85B7968 =
     .priority = 2,
 };
 
-static const struct OamData gOamData_85B7970 =
+static const struct OamData sOam_Taillow =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
@@ -2846,14 +3145,14 @@ static const struct OamData gOamData_85B7970 =
     .priority = 2,
 };
 
-static const struct CompressedSpriteSheet gUnknown_085B7978 =
+static const struct CompressedSpriteSheet sSpriteSheet_ShroomishTaillow =
 {
-    .data = gUnknown_085B67FC,
+    .data = sShroomishTaillow_Gfx,
     .size = 0xE00,
-    .tag = 13
+    .tag = GFXTAG_SHROOMISH_TAILLOW
 };
 
-static const union AnimCmd gSpriteAnim_85B7980[] =
+static const union AnimCmd sAnim_Shroomish[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(16, 6),
@@ -2864,84 +3163,84 @@ static const union AnimCmd gSpriteAnim_85B7980[] =
     ANIMCMD_JUMP(2)
 };
 
-static const union AnimCmd gSpriteAnim_85B799C[] =
+static const union AnimCmd sAnim_Taillow_WingDown_Left[] =
 {
     ANIMCMD_FRAME(80, 10),
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_85B79A4[] =
+static const union AnimCmd sAnim_Taillow_WingDown_Right[] =
 {
     ANIMCMD_FRAME(80, 10, .hFlip = TRUE),
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_85B79AC[] =
+static const union AnimCmd sAnim_Taillow_FlapSlow_Left[] =
 {
     ANIMCMD_FRAME(80, 20),
     ANIMCMD_FRAME(96, 20),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd gSpriteAnim_85B79B8[] =
+static const union AnimCmd sAnim_Taillow_FlapSlow_Right[] =
 {
     ANIMCMD_FRAME(80, 20, .hFlip = TRUE),
     ANIMCMD_FRAME(96, 20, .hFlip = TRUE),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd gSpriteAnim_85B79C4[] =
+static const union AnimCmd sAnim_Taillow_FlapFast_Left[] =
 {
     ANIMCMD_FRAME(80, 10),
     ANIMCMD_FRAME(96, 10),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd gSpriteAnim_85B79D0[] =
+static const union AnimCmd sAnim_Taillow_FlapFast_Right[] =
 {
     ANIMCMD_FRAME(80, 10, .hFlip = TRUE),
     ANIMCMD_FRAME(96, 10, .hFlip = TRUE),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B79DC[] =
+static const union AnimCmd *const sAnims_Shroomish[] =
 {
-    gSpriteAnim_85B7980
+    sAnim_Shroomish
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B79E0[] =
+static const union AnimCmd *const sAnims_Taillow[] =
 {
-    gSpriteAnim_85B799C,
-    gSpriteAnim_85B79A4,
-    gSpriteAnim_85B79AC,
-    gSpriteAnim_85B79B8,
-    gSpriteAnim_85B79C4,
-    gSpriteAnim_85B79D0
+    sAnim_Taillow_WingDown_Left,   // While gliding in
+    sAnim_Taillow_WingDown_Right,
+    sAnim_Taillow_FlapSlow_Left,   // While carrying ball
+    sAnim_Taillow_FlapSlow_Right,
+    sAnim_Taillow_FlapFast_Left,   // While flying off
+    sAnim_Taillow_FlapFast_Right
 };
 
-static const struct SpriteTemplate gSpriteTemplate_85B79F8 =
+static const struct SpriteTemplate sSpriteTemplate_Shroomish =
 {
-    .tileTag = 13,
-    .paletteTag = 6,
-    .oam = &gOamData_85B7968,
-    .anims = gSpriteAnimTable_85B79DC,
+    .tileTag = GFXTAG_SHROOMISH_TAILLOW,
+    .paletteTag = PALTAG_SHROOMISH,
+    .oam = &sOam_Shroomish,
+    .anims = sAnims_Shroomish,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gSpriteTemplate_85B7A10 =
+static const struct SpriteTemplate sSpriteTemplate_Taillow =
 {
-    .tileTag = 13,
-    .paletteTag = 7,
-    .oam = &gOamData_85B7970,
-    .anims = gSpriteAnimTable_85B79E0,
+    .tileTag = GFXTAG_SHROOMISH_TAILLOW,
+    .paletteTag = PALTAG_TAILLOW,
+    .oam = &sOam_Taillow,
+    .anims = sAnims_Taillow,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_8145294
+    .callback = SpriteCB_Taillow
 };
 
-static const struct OamData gOamData_85B7A28 =
+static const struct OamData sOam_ShroomishBallShadow =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
@@ -2950,7 +3249,7 @@ static const struct OamData gOamData_85B7A28 =
     .priority = 2,
 };
 
-static const struct OamData gOamData_85B7A30 =
+static const struct OamData sOam_ShroomishShadow =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
@@ -2959,7 +3258,7 @@ static const struct OamData gOamData_85B7A30 =
     .priority = 2,
 };
 
-static const struct OamData gOamData_85B7A38 =
+static const struct OamData sOam_TaillowShadow =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
@@ -2968,21 +3267,21 @@ static const struct OamData gOamData_85B7A38 =
     .priority = 2,
 };
 
-static const struct CompressedSpriteSheet gUnknown_085B7A40 =
+static const struct CompressedSpriteSheet sSpriteSheet_Shadow =
 {
-    .data = gUnknown_085B7290,
+    .data = sShadow_Gfx,
     .size = 0x180,
-    .tag = 14
+    .tag = GFXTAG_SHADOW
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_85B7A48[] =
+static const union AffineAnimCmd sAffineAnim_Unused3[] =
 {
     AFFINEANIMCMD_FRAME(0x80, 0x80, 0, 0),
     AFFINEANIMCMD_FRAME(2,    2,    0, 60),
     AFFINEANIMCMD_END
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_85B7A60[] =
+static const union AffineAnimCmd sAffineAnim_TaillowShadow[] =
 {
     AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
     AFFINEANIMCMD_FRAME(-2,    0x0,   0, 15),
@@ -2991,99 +3290,101 @@ static const union AffineAnimCmd gSpriteAffineAnim_85B7A60[] =
     AFFINEANIMCMD_END
 };
 
-static const union AffineAnimCmd *const gSpriteAffineAnimTable_85B7A88[] =
+static const union AffineAnimCmd *const sAffineAnims_Unused3[] =
 {
-    gSpriteAffineAnim_85B7A48
+    sAffineAnim_Unused3
 };
 
-static const union AffineAnimCmd *const gSpriteAffineAnimTable_85B7A8C[] =
+static const union AffineAnimCmd *const sAffineAnims_TaillowShadow[] =
 {
-    gSpriteAffineAnim_85B7A60
+    sAffineAnim_TaillowShadow
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_85B7A90[] =
+static const union AffineAnimCmd sAffineAnim_Unused4[] =
 {
     AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
     AFFINEANIMCMD_END
 };
 
-static const union AffineAnimCmd *const gSpriteAffineAnimTable_85B7AA0[] =
+static const union AffineAnimCmd *const sAffineAnims_Unused4[] =
 {
-    gSpriteAffineAnim_85B7A90
+    sAffineAnim_Unused4
 };
 
-static const union AnimCmd gSpriteAnim_85B7AA4[] =
+static const union AnimCmd sAnim_ShroomishBallShadow[] =
 {
     ANIMCMD_FRAME(0, 0),
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_85B7AAC[] =
+static const union AnimCmd sAnim_UnstickMonShadow[] =
 {
     ANIMCMD_FRAME(4, 0),
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7AB4[] =
+static const union AnimCmd *const sAnims_ShroomishBallShadow[] =
 {
-    gSpriteAnim_85B7AA4
+    sAnim_ShroomishBallShadow
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7AB8[] =
+static const union AnimCmd *const sAnims_UnstickMonShadow[] =
 {
-    gSpriteAnim_85B7AAC
+    sAnim_UnstickMonShadow
 };
 
-static const struct SpriteTemplate gSpriteTemplate_85B7ABC[] =
+static const struct SpriteTemplate sSpriteTemplate_ShroomishShadow[] =
 {
+    // Ball's shadow as it flies up
     {
-        .tileTag = 14,
-        .paletteTag = 1,
-        .oam = &gOamData_85B7A28,
-        .anims = gSpriteAnimTable_85B7AB4,
+        .tileTag = GFXTAG_SHADOW,
+        .paletteTag = PALTAG_SHADOW,
+        .oam = &sOam_ShroomishBallShadow,
+        .anims = sAnims_ShroomishBallShadow,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy
     },
+    // Shroomish's Shadow
     {
-        .tileTag = 14,
-        .paletteTag = 1,
-        .oam = &gOamData_85B7A30,
-        .anims = gSpriteAnimTable_85B7AB8,
+        .tileTag = GFXTAG_SHADOW,
+        .paletteTag = PALTAG_SHADOW,
+        .oam = &sOam_ShroomishShadow,
+        .anims = sAnims_UnstickMonShadow,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = sub_8144E60
+        .callback = SpriteCB_Shroomish
     }
 };
 
-static const struct SpriteTemplate gUnknown_085B7AEC =
+static const struct SpriteTemplate sSpriteTemplate_TaillowShadow =
 {
-    .tileTag = 14,
-    .paletteTag = 1,
-    .oam = &gOamData_85B7A38,
-    .anims = gSpriteAnimTable_85B7AB8,
+    .tileTag = GFXTAG_SHADOW,
+    .paletteTag = PALTAG_SHADOW,
+    .oam = &sOam_TaillowShadow,
+    .anims = sAnims_UnstickMonShadow,
     .images = NULL,
-    .affineAnims = gSpriteAffineAnimTable_85B7A8C,
-    .callback = sub_8145294
+    .affineAnims = sAffineAnims_TaillowShadow,
+    .callback = SpriteCB_Taillow
 };
 
-static void sub_81428C4(u8 r0)
+static void Task_ShowMinBetYesNo(u8 taskId)
 {
     DisplayYesNoMenuDefaultYes();
-    DoYesNoFuncWithChoice(r0, &gUnknown_085B6408);
+    DoYesNoFuncWithChoice(taskId, &sYesNoTable_AcceptMinBet);
 }
 
-static void sub_81428E4(u8 taskId)
+static void Task_FadeToRouletteGame(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
         SetVBlankCallback(NULL);
-        SetMainCallback2(sub_81405CC);
+        SetMainCallback2(CB2_LoadRoulette);
         DestroyTask(taskId);
     }
 }
 
-static void sub_8142918(u8 taskId)
+static void Task_AcceptMinBet(u8 taskId)
 {
     ClearStdWindowAndFrame(0, TRUE);
     HideCoinsWindow();
@@ -3091,10 +3392,10 @@ static void sub_8142918(u8 taskId)
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
     gPaletteFade.delayCounter = gPaletteFade.multipurpose2;
     UpdatePaletteFade();
-    gTasks[taskId].func = sub_81428E4;
+    gTasks[taskId].func = Task_FadeToRouletteGame;
 }
 
-static void sub_814297C(u8 taskId)
+static void Task_DeclineMinBet(u8 taskId)
 {
     ClearStdWindowAndFrame(0, FALSE);
     HideCoinsWindow();
@@ -3102,10 +3403,10 @@ static void sub_814297C(u8 taskId)
     DestroyTask(taskId);
 }
 
-static void sub_81429A0(u8 taskId)
+static void Task_NotEnoughForMinBet(u8 taskId)
 {
     gTasks[taskId].data[0]++;
-    if (gMain.newKeys & (A_BUTTON | B_BUTTON))
+    if (JOY_NEW(A_BUTTON | B_BUTTON))
     {
         gSpecialVar_0x8004 = 1;
         HideCoinsWindow();
@@ -3115,52 +3416,56 @@ static void sub_81429A0(u8 taskId)
     }
 }
 
-static void sub_81429F0(u8 taskId)
+static void Task_PrintMinBet(u8 taskId)
 {
-    if (gMain.newKeys & (A_BUTTON | B_BUTTON))
+    if (JOY_NEW(A_BUTTON | B_BUTTON))
     {
-        u32 temp = gUnknown_085B6344[(gSpecialVar_0x8004 & 1) + (gSpecialVar_0x8004 >> 7 << 1)];
-        ConvertIntToDecimalStringN(gStringVar1, temp, STR_CONV_MODE_LEADING_ZEROS, 1);
+        u32 minBet = sTableMinBets[GET_MIN_BET_ID(gSpecialVar_0x8004)];
+        ConvertIntToDecimalStringN(gStringVar1, minBet, STR_CONV_MODE_LEADING_ZEROS, 1);
         StringExpandPlaceholders(gStringVar4, Roulette_Text_PlayMinimumWagerIsX);
         DrawStdWindowFrame(0, FALSE);
         AddTextPrinterParameterized(0, 1, gStringVar4, 0, 1, TEXT_SPEED_FF, NULL);
         CopyWindowToVram(0, 3);
-        gTasks[taskId].func = sub_81428C4;
+        gTasks[taskId].func = Task_ShowMinBetYesNo;
     }
 }
 
-static void Task_Roulette_0(u8 taskId)
+static void Task_PrintRouletteEntryMsg(u8 taskId)
 {
-    s32 temp;
-    PrintCoinsString(gTasks[taskId].data[13]);
-    temp = gUnknown_085B6344[(gSpecialVar_0x8004 & 1) + (gSpecialVar_0x8004 >> 7 << 1)];
-    ConvertIntToDecimalStringN(gStringVar1, temp, STR_CONV_MODE_LEADING_ZEROS, 1);
-    if (gTasks[taskId].data[13] >= temp)
+    s32 minBet;
+    PrintCoinsString(gTasks[taskId].tCoins);
+    minBet = sTableMinBets[GET_MIN_BET_ID(gSpecialVar_0x8004)];
+    ConvertIntToDecimalStringN(gStringVar1, minBet, STR_CONV_MODE_LEADING_ZEROS, 1);
+    
+    if (gTasks[taskId].tCoins >= minBet)
     {
-        if ((gSpecialVar_0x8004 & 0x80) && (gSpecialVar_0x8004 & 1))
+        if ((gSpecialVar_0x8004 & ROULETTE_SPECIAL_RATE) && (gSpecialVar_0x8004 & 1))
         {
+            // Special rate for Game Corner service day (only at second table)
             DrawStdWindowFrame(0, FALSE);
             AddTextPrinterParameterized(0, 1, Roulette_Text_SpecialRateTable, 0, 1, TEXT_SPEED_FF, NULL);
             CopyWindowToVram(0, 3);
-            gTasks[taskId].func = sub_81429F0;
+            gTasks[taskId].func = Task_PrintMinBet;
         }
         else
         {
+            // Print minimum bet
             StringExpandPlaceholders(gStringVar4, Roulette_Text_PlayMinimumWagerIsX);
             DrawStdWindowFrame(0, FALSE);
             AddTextPrinterParameterized(0, 1, gStringVar4, 0, 1, TEXT_SPEED_FF, NULL);
             CopyWindowToVram(0, 3);
-            gTasks[taskId].func = sub_81428C4;
+            gTasks[taskId].func = Task_ShowMinBetYesNo;
         }
     }
     else
     {
+        // Not enough for minimum bet
         StringExpandPlaceholders(gStringVar4, Roulette_Text_NotEnoughCoins);
         DrawStdWindowFrame(0, FALSE);
         AddTextPrinterParameterized(0, 1, gStringVar4, 0, 1, TEXT_SPEED_FF, NULL);
         CopyWindowToVram(0, 3);
-        gTasks[taskId].func = sub_81429A0;
-        gTasks[taskId].data[13] = 0;
+        gTasks[taskId].func = Task_NotEnoughForMinBet;
+        gTasks[taskId].tCoins = 0;
         gTasks[taskId].data[0] = 0;
     }
 }
@@ -3168,212 +3473,215 @@ static void Task_Roulette_0(u8 taskId)
 void PlayRoulette(void)
 {
     u8 taskId;
-
     ScriptContext2_Enable();
     ShowCoinsWindow(GetCoins(), 1, 1);
-    taskId = CreateTask(Task_Roulette_0, 0);
-    gTasks[taskId].data[13] = GetCoins();
+    taskId = CreateTask(Task_PrintRouletteEntryMsg, 0);
+    gTasks[taskId].tCoins = GetCoins();
 }
 
-static void sub_8142C0C(u8 r0)
+static void LoadOrFreeMiscSpritePalettesAndSheets(bool8 free)
 {
-    if (!r0)
+    if (!free)
     {
         FreeAllSpritePalettes();
-        LoadSpritePalettes(gUnknown_085B7384);
-        LoadCompressedSpriteSheet(&gUnknown_085B7864);
-        LoadCompressedSpriteSheet(&gUnknown_085B7978);
-        LoadCompressedSpriteSheet(&gUnknown_085B7A40);
+        LoadSpritePalettes(sSpritePalettes);
+        LoadCompressedSpriteSheet(&sSpriteSheet_Ball);
+        LoadCompressedSpriteSheet(&sSpriteSheet_ShroomishTaillow);
+        LoadCompressedSpriteSheet(&sSpriteSheet_Shadow);
     }
     else
     {
-        FreeSpriteTilesByTag(14);
-        FreeSpriteTilesByTag(13);
-        FreeSpriteTilesByTag(12);
+        // Unused
+        FreeSpriteTilesByTag(GFXTAG_SHADOW);
+        FreeSpriteTilesByTag(GFXTAG_SHROOMISH_TAILLOW);
+        FreeSpriteTilesByTag(GFXTAG_BALL);
         FreeAllSpritePalettes();
     }
 }
 
-static u8 sub_8142C60(const struct SpriteTemplate *r0, u8 r1, u16 *r2)
+static u8 CreateWheelIconSprite(const struct SpriteTemplate *template, u8 r1, u16 *angle)
 {
     u16 temp;
-    u8 spriteId = CreateSprite(r0, 116, 80, r0->oam->y);
-    gSprites[spriteId].data[0]            = *r2;
-    gSprites[spriteId].data[1]            = r1;
+    u8 spriteId = CreateSprite(template, 116, 80, template->oam->y);
+    gSprites[spriteId].data[0] = *angle;
+    gSprites[spriteId].data[1] = r1;
     gSprites[spriteId].coordOffsetEnabled = TRUE;
-    gSprites[spriteId].animPaused         = TRUE;
-    gSprites[spriteId].affineAnimPaused   = TRUE;
-    temp = *r2;
-    *r2 += 30;
-    if (*r2 >= 360)
-        *r2 = temp - 330;
+    gSprites[spriteId].animPaused = TRUE;
+    gSprites[spriteId].affineAnimPaused = TRUE;
+    temp = *angle;
+    *angle += DEGREES_PER_SLOT;
+    if (*angle >= 360)
+        *angle = temp - (360 - DEGREES_PER_SLOT);
     return spriteId;
 }
 
-static void sub_8142CD0(void)
+static void CreateGridSprites(void)
 {
     u8 i, j;
     u8 spriteId;
     struct SpriteSheet s;
-    LZ77UnCompWram(gUnknown_085B7488.data, gDecompressionBuffer);
+    LZ77UnCompWram(sSpriteSheet_Headers.data, gDecompressionBuffer);
     s.data = gDecompressionBuffer;
-    s.size = gUnknown_085B7488.size;
-    s.tag  = gUnknown_085B7488.tag;
+    s.size = sSpriteSheet_Headers.size;
+    s.tag  = sSpriteSheet_Headers.tag;
     LoadSpriteSheet(&s);
-    LZ77UnCompWram(gUnknown_085B7490.data, gDecompressionBuffer);
+    LZ77UnCompWram(sSpriteSheet_GridIcons.data, gDecompressionBuffer);
     s.data = gDecompressionBuffer;
-    s.size = gUnknown_085B7490.size;
-    s.tag  = gUnknown_085B7490.tag;
+    s.size = sSpriteSheet_GridIcons.size;
+    s.tag  = sSpriteSheet_GridIcons.tag;
     LoadSpriteSheet(&s);
-    for (i = 0; i < 3; i++)
+    for (i = 0; i < NUM_BOARD_COLORS; i++)
     {
-        u8 o = i * 24;
-        for (j = 0; j < 4; j++)
+        u8 y = i * 24;
+        for (j = 0; j < NUM_BOARD_POKES; j++)
         {
-            spriteId = gUnknown_0203AB88->var3C[(i * 4) + 29 + j] = CreateSprite(&gSpriteTemplate_85B75B0[j], (j * 24) + 148, o + 92, 30);
+            spriteId = sRoulette->spriteIds[(i * NUM_BOARD_POKES) + SPR_GRID_ICONS + j] = CreateSprite(&sSpriteTemplate_GridIcons[j], (j * 24) + 148, y + 92, 30);
             gSprites[spriteId].animPaused = TRUE;
-            o += 24;
-            if (o >= 72)
-                o = 0;
+            y += 24;
+            if (y >= 72)
+                y = 0;
         }
     }
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < ARRAY_COUNT(sSpriteTemplates_PokeHeaders); i++)
     {
-        spriteId = gUnknown_0203AB88->var3C[i + 41] = CreateSprite(&gSpriteTemplate_85B7508[i], (i * 24) + 148, 70, 30);
+        spriteId = sRoulette->spriteIds[i + SPR_POKE_HEADERS] = CreateSprite(&sSpriteTemplates_PokeHeaders[i], (i * 24) + 148, 70, 30);
         gSprites[spriteId].animPaused = TRUE;
     }
-    for (i = 0; i < 3; i++)
+    for (i = 0; i < ARRAY_COUNT(sSpriteTemplates_ColorHeaders); i++)
     {
-        spriteId = gUnknown_0203AB88->var3C[i + 45] = CreateSprite(&gSpriteTemplate_85B7568[i], 126, (i * 24) + 92, 30);
+        spriteId = sRoulette->spriteIds[i + SPR_COLOR_HEADERS] = CreateSprite(&sSpriteTemplates_ColorHeaders[i], 126, (i * 24) + 92, 30);
         gSprites[spriteId].animPaused = TRUE;
     }
 }
 
-static void unref_sub_8142E3C(void)
+// Unused
+static void DestroyGridSprites(void)
 {
     u8 i;
-    for (i = 0; i < 12; i++)
+    for (i = 0; i < NUM_ROULETTE_SLOTS; i++)
     {
-        DestroySprite(&gSprites[gUnknown_0203AB88->var3C[i + 29]]);
+        DestroySprite(&gSprites[sRoulette->spriteIds[i + SPR_GRID_ICONS]]);
     }
 }
 
-static void sub_8142E70(u8 r0, u8 r1)
+static void ShowHideGridIcons(bool8 hideAll, u8 hideSquare)
 {
     u8 i;
-    switch (r0)
+    switch (hideAll)
     {
-    case 1:
-        for (i = 0; i < 19; i++)
+    case TRUE:
+        // Hide grid icons and headers
+        for (i = 0; i < NUM_GRID_SELECTIONS; i++)
         {
-            gSprites[gUnknown_0203AB88->var3C[i + 29]].invisible = TRUE;
+            gSprites[sRoulette->spriteIds[i + SPR_GRID_ICONS]].invisible = TRUE;
         }
         break;
-    case 0:
-        for (i = 0; i < 12; i++)
+    case FALSE:
+        for (i = 0; i < NUM_ROULETTE_SLOTS; i++)
         {
-            if (!(gUnknown_0203AB88->var08 & gUnknown_085B62E4[i].var04))
-                gSprites[gUnknown_0203AB88->var3C[i + 29]].invisible = FALSE;
-            else if (gUnknown_085B62E4[i].var02 != r1)
-                gSprites[gUnknown_0203AB88->var3C[i + 29]].invisible = TRUE;
+            if (!(sRoulette->hitFlags & sRouletteSlots[i].flag))
+                gSprites[sRoulette->spriteIds[i + SPR_GRID_ICONS]].invisible = FALSE;
+            else if (sRouletteSlots[i].gridSquare != hideSquare)
+                gSprites[sRoulette->spriteIds[i + SPR_GRID_ICONS]].invisible = TRUE;
             else
-                gSprites[gUnknown_0203AB88->var3C[i + 29]].invisible = FALSE;
+                gSprites[sRoulette->spriteIds[i + SPR_GRID_ICONS]].invisible = FALSE;
         }
-        for (; i < 19; i++)
+        // Always show grid headers
+        for (; i < NUM_GRID_SELECTIONS; i++)
         {
-            gSprites[gUnknown_0203AB88->var3C[i + 29]].invisible = FALSE;
+            gSprites[sRoulette->spriteIds[i + SPR_GRID_ICONS]].invisible = FALSE;
         }
         break;
     }
 }
 
-static void sub_8142F7C(void)
+static void CreateGridBallSprites(void)
 {
     u8 i;
-    for (i = 0; i < 6; i++)
-    {
-        gUnknown_0203AB88->var3C[i + 49] = CreateSprite(&gSpriteTemplate_85B7928, 116, 20, 10);
-        gSprites[gUnknown_0203AB88->var3C[i + 49]].invisible = TRUE;
-        gSprites[gUnknown_0203AB88->var3C[i + 49]].data[0] = 1;
-        gSprites[gUnknown_0203AB88->var3C[i + 49]].callback = sub_814390C;
-        gSprites[gUnknown_0203AB88->var3C[i + 49]].oam.priority = 1;
-        StartSpriteAnim(&gSprites[gUnknown_0203AB88->var3C[i + 49]], 8);
+    for (i = 0; i < BALLS_PER_ROUND; i++)
+    {
+        sRoulette->spriteIds[i + SPR_GRID_BALLS] = CreateSprite(&sSpriteTemplate_Ball, 116, 20, 10);
+        gSprites[sRoulette->spriteIds[i + SPR_GRID_BALLS]].invisible = TRUE;
+        gSprites[sRoulette->spriteIds[i + SPR_GRID_BALLS]].data[0] = 1;
+        gSprites[sRoulette->spriteIds[i + SPR_GRID_BALLS]].callback = SpriteCB_GridSquare;
+        gSprites[sRoulette->spriteIds[i + SPR_GRID_BALLS]].oam.priority = 1;
+        StartSpriteAnim(&gSprites[sRoulette->spriteIds[i + SPR_GRID_BALLS]], 8);
     }
 }
 
-static void sub_8143038(u8 r0, u8 r1)
+static void ShowHideGridBalls(bool8 hideAll, u8 hideBallId)
 {
     u8 i = 0;
-    if (r0)
+    if (hideAll)
     {
-        for ( ; i < 6; i++)
+        for (; i < BALLS_PER_ROUND; i++)
         {
-            gSprites[gUnknown_0203AB88->var3C[i + 49]].invisible = TRUE;
+            gSprites[sRoulette->spriteIds[i + SPR_GRID_BALLS]].invisible = TRUE;
         }
     }
     else
     {
-        for ( ; i < 6; i++)
+        for (; i < BALLS_PER_ROUND; i++)
         {
-            if (!gUnknown_0203AB88->var0C[i] || i == r1)
+            if (!sRoulette->hitSquares[i] || i == hideBallId)
             {
-                gSprites[gUnknown_0203AB88->var3C[i + 49]].invisible = TRUE;
+                gSprites[sRoulette->spriteIds[i + SPR_GRID_BALLS]].invisible = TRUE;
             }
             else
             {
-                gSprites[gUnknown_0203AB88->var3C[i + 49]].invisible = FALSE;
-                gSprites[gUnknown_0203AB88->var3C[i + 49]].pos1.x = (gUnknown_085B6154[gUnknown_0203AB88->var0C[i]].var03 + 1) * 8 + 4;
-                gSprites[gUnknown_0203AB88->var3C[i + 49]].pos1.y = (gUnknown_085B6154[gUnknown_0203AB88->var0C[i]].var04 + 1) * 8 + 3;
+                gSprites[sRoulette->spriteIds[i + SPR_GRID_BALLS]].invisible = FALSE;
+                gSprites[sRoulette->spriteIds[i + SPR_GRID_BALLS]].pos1.x = (sGridSelections[sRoulette->hitSquares[i]].x + 1) * 8 + 4;
+                gSprites[sRoulette->spriteIds[i + SPR_GRID_BALLS]].pos1.y = (sGridSelections[sRoulette->hitSquares[i]].y + 1) * 8 + 3;
             }
         }
     }
 }
 
-static void sub_8143150(u8 r0)
+static void ShowHideWinSlotCursor(u8 selectionId)
 {
-    if (!r0)
+    if (selectionId == 0)
     {
-        gSprites[gUnknown_0203AB88->var3C[48]].invisible = TRUE;
+        gSprites[sRoulette->spriteIds[SPR_WIN_SLOT_CURSOR]].invisible = TRUE;
     }
     else
     {
-        gSprites[gUnknown_0203AB88->var3C[48]].invisible = FALSE;
-        gSprites[gUnknown_0203AB88->var3C[48]].pos1.x = (gUnknown_085B6154[r0].var03 + 2) * 8;
-        gSprites[gUnknown_0203AB88->var3C[48]].pos1.y = (gUnknown_085B6154[r0].var04 + 2) * 8;
+        gSprites[sRoulette->spriteIds[SPR_WIN_SLOT_CURSOR]].invisible = FALSE;
+        gSprites[sRoulette->spriteIds[SPR_WIN_SLOT_CURSOR]].pos1.x = (sGridSelections[selectionId].x + 2) * 8;
+        gSprites[sRoulette->spriteIds[SPR_WIN_SLOT_CURSOR]].pos1.y = (sGridSelections[selectionId].y + 2) * 8;
     }
 }
 
-static void sub_81431E4(void)
+static void CreateWheelIconSprites(void)
 {
     u8 i, j;
-    u16 k;
+    u16 angle;
     struct SpriteSheet s;
 
-    LZ77UnCompWram(gUnknown_085B741C.data, gDecompressionBuffer);
+    LZ77UnCompWram(sSpriteSheet_WheelIcons.data, gDecompressionBuffer);
     s.data = gDecompressionBuffer;
-    s.size = gUnknown_085B741C.size;
-    s.tag  = gUnknown_085B741C.tag;
+    s.size = sSpriteSheet_WheelIcons.size;
+    s.tag  = sSpriteSheet_WheelIcons.tag;
     LoadSpriteSheet(&s);
 
-    k = 15;
-    for (i = 0; i < 3; i++)
+    angle = 15;
+    for (i = 0; i < NUM_BOARD_COLORS; i++)
     {
-        for (j = 0; j < 4; j++)
+        for (j = 0; j < NUM_BOARD_POKES; j++)
         {
             u8 spriteId;
-            spriteId = gUnknown_0203AB88->var3C[(i * 4) + 7 + j] = sub_8142C60(&gSpriteTemplate_85B7610[i * 4 + j], 40, &k);
+            spriteId = sRoulette->spriteIds[(i * NUM_BOARD_POKES) + SPR_WHEEL_ICONS + j] = CreateWheelIconSprite(&sSpriteTemplates_WheelIcons[i * NUM_BOARD_POKES + j], 40, &angle);
             gSprites[spriteId].animPaused = TRUE;
             gSprites[spriteId].affineAnimPaused = TRUE;
         }
     }
 }
 
-static void sub_8143280(struct Sprite *sprite)
+static void SpriteCB_WheelIcon(struct Sprite *sprite)
 {
     s16 cos;
     s16 sin;
     u32 matrixNum;
-    s16 angle = gUnknown_0203AB88->var24 + sprite->data[0];
+    s16 angle = sRoulette->wheelAngle + sprite->data[0];
     if (angle >= 360)
         angle -= 360;
     sin = Sin2(angle);
@@ -3388,275 +3696,305 @@ static void sub_8143280(struct Sprite *sprite)
     gOamMatrices[matrixNum].c = -sin;
 }
 
-static void sub_8143314(void)
+static void CreateInterfaceSprites(void)
 {
     u8 i;
-    for (i = 0; i < 5; i++)
+    for (i = 0; i < ARRAY_COUNT(sSpriteSheets_Interface) - 1; i++)
     {
         struct SpriteSheet s;
-        LZ77UnCompWram(gUnknown_085B7750[i].data, gDecompressionBuffer);
+        LZ77UnCompWram(sSpriteSheets_Interface[i].data, gDecompressionBuffer);
         s.data = gDecompressionBuffer;
-        s.size = gUnknown_085B7750[i].size;
-        s.tag  = gUnknown_085B7750[i].tag;
+        s.size = sSpriteSheets_Interface[i].size;
+        s.tag  = sSpriteSheets_Interface[i].tag;
         LoadSpriteSheet(&s);
     }
-    gUnknown_0203AB88->var3C[20] = CreateSprite(&gSpriteTemplate_85B77E4, 208, 16, 4);
-    gSprites[gUnknown_0203AB88->var3C[20]].animPaused = TRUE;
-    for (i = 0; i < 4; i++)
+    sRoulette->spriteIds[SPR_CREDIT] = CreateSprite(&sSpriteTemplate_Credit, 208, 16, 4);
+    gSprites[sRoulette->spriteIds[SPR_CREDIT]].animPaused = TRUE;
+    for (i = 0; i < MAX_COIN_DIGITS; i++)
     {
-        gUnknown_0203AB88->var3C[i + 21] = CreateSprite(&gUnknown_085B77FC, i * 8 + 196, 24, 0);
-        gSprites[gUnknown_0203AB88->var3C[i + 21]].invisible = TRUE;
-        gSprites[gUnknown_0203AB88->var3C[i + 21]].animPaused = TRUE;
+        sRoulette->spriteIds[i + SPR_CREDIT_DIGITS] = CreateSprite(&sSpriteTemplate_CreditDigit, i * 8 + 196, 24, 0);
+        gSprites[sRoulette->spriteIds[i + SPR_CREDIT_DIGITS]].invisible = TRUE;
+        gSprites[sRoulette->spriteIds[i + SPR_CREDIT_DIGITS]].animPaused = TRUE;
     }
-    gUnknown_0203AB88->var3C[25] = CreateSprite(&gUnknown_085B7814, 120, 68, 4);
-    gSprites[gUnknown_0203AB88->var3C[25]].animPaused = TRUE;
-    for (i = 0; i < 3; i++)
-    {
-        gUnknown_0203AB88->var3C[i + 26] = CreateSprite(&gUnknown_085B782C, i * 16 + 192, 36, 4);
-        gSprites[gUnknown_0203AB88->var3C[i + 26]].invisible = TRUE;
-        gSprites[gUnknown_0203AB88->var3C[i + 26]].animPaused = TRUE;
+    sRoulette->spriteIds[SPR_MULTIPLIER] = CreateSprite(&sSpriteTemplate_Multiplier, 120, 68, 4);
+    gSprites[sRoulette->spriteIds[SPR_MULTIPLIER]].animPaused = TRUE;
+    for (i = 0; i < BALLS_PER_ROUND / 2; i++)
+    {
+        // Each ball counter sprite has 2 balls
+        sRoulette->spriteIds[i + SPR_BALL_COUNTER] = CreateSprite(&sSpriteTemplate_BallCounter, i * 16 + 192, 36, 4);
+        gSprites[sRoulette->spriteIds[i + SPR_BALL_COUNTER]].invisible = TRUE;
+        gSprites[sRoulette->spriteIds[i + SPR_BALL_COUNTER]].animPaused = TRUE;
     }
-    gUnknown_0203AB88->var3C[48] = CreateSprite(&gUnknown_085B7844, 152, 96, 9);
-    gSprites[gUnknown_0203AB88->var3C[48]].oam.priority = 1;
-    gSprites[gUnknown_0203AB88->var3C[48]].animPaused = TRUE;
-    gSprites[gUnknown_0203AB88->var3C[48]].invisible = TRUE;
+    sRoulette->spriteIds[SPR_WIN_SLOT_CURSOR] = CreateSprite(&sSpriteTemplate_Cursor, 152, 96, 9);
+    gSprites[sRoulette->spriteIds[SPR_WIN_SLOT_CURSOR]].oam.priority = 1;
+    gSprites[sRoulette->spriteIds[SPR_WIN_SLOT_CURSOR]].animPaused = TRUE;
+    gSprites[sRoulette->spriteIds[SPR_WIN_SLOT_CURSOR]].invisible = TRUE;
 }
 
-static void sub_8143514(u16 r0)
+static void SetCreditDigits(u16 num)
 {
     u8 i;
     u16 d = 1000;
-    bool8 v = FALSE;
-    for (i = 0; i < 4; i++)
+    bool8 printZero = FALSE;
+    for (i = 0; i < MAX_COIN_DIGITS; i++)
     {
-        u8 t = r0 / d;
-        gSprites[gUnknown_0203AB88->var3C[i + 21]].invisible = TRUE;
-        if (t > 0 || v || i == 3)
+        u8 digit = num / d;
+        gSprites[sRoulette->spriteIds[i + SPR_CREDIT_DIGITS]].invisible = TRUE;
+        if (digit > 0 || printZero || i == MAX_COIN_DIGITS - 1)
         {
-            gSprites[gUnknown_0203AB88->var3C[i + 21]].invisible = FALSE;
-            gSprites[gUnknown_0203AB88->var3C[i + 21]].oam.tileNum =
-                gSprites[gUnknown_0203AB88->var3C[i + 21]].sheetTileStart
-                + (*gSprites[gUnknown_0203AB88->var3C[i + 21]].anims + t)->type;
-            v = TRUE;
+            gSprites[sRoulette->spriteIds[i + SPR_CREDIT_DIGITS]].invisible = FALSE;
+            gSprites[sRoulette->spriteIds[i + SPR_CREDIT_DIGITS]].oam.tileNum =
+                gSprites[sRoulette->spriteIds[i + SPR_CREDIT_DIGITS]].sheetTileStart
+                + (*gSprites[sRoulette->spriteIds[i + SPR_CREDIT_DIGITS]].anims + digit)->type;
+            printZero = TRUE;
         }
-        r0 = r0 % d;
+        num = num % d;
         d = d / 10;
     }
 }
 
-static u8 sub_8143614(u8 r0)
+// Identical to GetMultiplier but with different data array
+static u8 GetMultiplierAnimId(u8 selectionId)
 {
-    u8 t[5] = {0, 1, 2, 3, 4};
+    u8 animIds[5] = {0, 1, 2, 3, 4};
 
-    if (r0 >= 20)
-        r0 = 0;
-    switch (gUnknown_085B6154[r0].var01_0)
+    if (selectionId > NUM_GRID_SELECTIONS)
+        selectionId = 0;
+
+    switch (sGridSelections[selectionId].baseMultiplier)
     {
-    case 3:
-        r0 = r0 / 5 - 1;
-        if (gUnknown_0203AB88->var16[r0] > 3)
+    case NUM_BOARD_COLORS:
+        selectionId = GET_ROW_IDX(selectionId);
+        if (sRoulette->colorHits[selectionId] > 3)
             return 0;
-        return t[gUnknown_0203AB88->var16[r0] + 1];
-    case 4:
-        r0--;
-        if (gUnknown_0203AB88->var12[r0] > 2)
+        return animIds[sRoulette->colorHits[selectionId] + 1];
+    case NUM_BOARD_POKES:
+        selectionId = GET_COL_IDX(selectionId);
+        if (sRoulette->pokeHits[selectionId] > 2)
             return 0;
-        return t[gUnknown_0203AB88->var12[r0] + 2];
-    case 12:
-        if (gUnknown_0203AB88->var08 & gUnknown_085B6154[r0].var08)
+        return animIds[sRoulette->pokeHits[selectionId] + 2];
+    case NUM_ROULETTE_SLOTS:
+        if (sRoulette->hitFlags & sGridSelections[selectionId].flag)
             return 0;
-        return t[4];
+        return animIds[4];
     }
     return 0;
 }
 
-static void sub_81436D0(u8 r0)
+static void SetMultiplierSprite(u8 selectionId)
 {
-    struct Sprite *s = &gSprites[gUnknown_0203AB88->var3C[25]];
-    s->animCmdIndex = sub_8143614(r0);
-    s->oam.tileNum = s->sheetTileStart + (*s->anims + s->animCmdIndex)->type;
+    struct Sprite *sprite = &gSprites[sRoulette->spriteIds[SPR_MULTIPLIER]];
+    sprite->animCmdIndex = GetMultiplierAnimId(selectionId);
+    sprite->oam.tileNum = sprite->sheetTileStart + (*sprite->anims + sprite->animCmdIndex)->type;
 }
 
-static void sub_814372C(u8 r0)
+static void SetBallCounterNumLeft(u8 numBalls)
 {
     u8 i;
     u8 t = 0;
-    if (gUnknown_0203AB88->var19 == 1)
+    if (sRoulette->minBet == 1)
         t = 2;
-    switch (r0)
+    switch (numBalls)
     {
     case 6:
-        for (i = 0; i < 3; i++)
+        for (i = 0; i < BALLS_PER_ROUND / 2; i++)
         {
-            gSprites[gUnknown_0203AB88->var3C[i + 26]].invisible = FALSE;
-            gSprites[gUnknown_0203AB88->var3C[i + 26]].oam.tileNum =
-                gSprites[gUnknown_0203AB88->var3C[i + 26]].sheetTileStart
-                + (*gSprites[gUnknown_0203AB88->var3C[i + 26]].anims)->type;
+            gSprites[sRoulette->spriteIds[i + SPR_BALL_COUNTER]].invisible = FALSE;
+            gSprites[sRoulette->spriteIds[i + SPR_BALL_COUNTER]].oam.tileNum =
+                gSprites[sRoulette->spriteIds[i + SPR_BALL_COUNTER]].sheetTileStart
+                + (*gSprites[sRoulette->spriteIds[i + SPR_BALL_COUNTER]].anims)->type;
         }
         break;
     case 5:
-        gSprites[gUnknown_0203AB88->var3C[28]].oam.tileNum =
-            gSprites[gUnknown_0203AB88->var3C[28]].sheetTileStart
-            + (*gSprites[gUnknown_0203AB88->var3C[28]].anims + t + 1)->type;
+        gSprites[sRoulette->spriteIds[SPR_BALL_COUNTER_3]].oam.tileNum =
+            gSprites[sRoulette->spriteIds[SPR_BALL_COUNTER_3]].sheetTileStart
+            + (*gSprites[sRoulette->spriteIds[SPR_BALL_COUNTER_3]].anims + t + 1)->type;
         break;
     case 4:
-        gSprites[gUnknown_0203AB88->var3C[28]].oam.tileNum =
-            gSprites[gUnknown_0203AB88->var3C[28]].sheetTileStart
-            + (*gSprites[gUnknown_0203AB88->var3C[28]].anims + t + 2)->type;
+        gSprites[sRoulette->spriteIds[SPR_BALL_COUNTER_3]].oam.tileNum =
+            gSprites[sRoulette->spriteIds[SPR_BALL_COUNTER_3]].sheetTileStart
+            + (*gSprites[sRoulette->spriteIds[SPR_BALL_COUNTER_3]].anims + t + 2)->type;
         break;
     case 3:
-        gSprites[gUnknown_0203AB88->var3C[27]].oam.tileNum =
-            gSprites[gUnknown_0203AB88->var3C[27]].sheetTileStart
-            + (*gSprites[gUnknown_0203AB88->var3C[27]].anims + t + 1)->type;
+        gSprites[sRoulette->spriteIds[SPR_BALL_COUNTER_2]].oam.tileNum =
+            gSprites[sRoulette->spriteIds[SPR_BALL_COUNTER_2]].sheetTileStart
+            + (*gSprites[sRoulette->spriteIds[SPR_BALL_COUNTER_2]].anims + t + 1)->type;
         break;
     case 2:
-        gSprites[gUnknown_0203AB88->var3C[27]].oam.tileNum =
-            gSprites[gUnknown_0203AB88->var3C[27]].sheetTileStart
-            + (*gSprites[gUnknown_0203AB88->var3C[27]].anims + t + 2)->type;
+        gSprites[sRoulette->spriteIds[SPR_BALL_COUNTER_2]].oam.tileNum =
+            gSprites[sRoulette->spriteIds[SPR_BALL_COUNTER_2]].sheetTileStart
+            + (*gSprites[sRoulette->spriteIds[SPR_BALL_COUNTER_2]].anims + t + 2)->type;
         break;
     case 1:
-        gSprites[gUnknown_0203AB88->var3C[26]].oam.tileNum =
-            gSprites[gUnknown_0203AB88->var3C[26]].sheetTileStart
-            + (*gSprites[gUnknown_0203AB88->var3C[26]].anims + t + 1)->type;
+        gSprites[sRoulette->spriteIds[SPR_BALL_COUNTER_1]].oam.tileNum =
+            gSprites[sRoulette->spriteIds[SPR_BALL_COUNTER_1]].sheetTileStart
+            + (*gSprites[sRoulette->spriteIds[SPR_BALL_COUNTER_1]].anims + t + 1)->type;
         break;
     case 0:
     default:
-        for (i = 0; i < 3; i++)
+        for (i = 0; i < BALLS_PER_ROUND / 2; i++)
         {
-            gSprites[gUnknown_0203AB88->var3C[i + 26]].oam.tileNum =
-                gSprites[gUnknown_0203AB88->var3C[i + 26]].sheetTileStart
-                + (*gSprites[gUnknown_0203AB88->var3C[i + 26]].anims + t + 2)->type;
+            gSprites[sRoulette->spriteIds[i + SPR_BALL_COUNTER]].oam.tileNum =
+                gSprites[sRoulette->spriteIds[i + SPR_BALL_COUNTER]].sheetTileStart
+                + (*gSprites[sRoulette->spriteIds[i + SPR_BALL_COUNTER]].anims + t + 2)->type;
         }
     }
 }
 
-static void sub_814390C(struct Sprite *sprite)
+static void SpriteCB_GridSquare(struct Sprite *sprite)
 {
-    sprite->pos2.x = gUnknown_0203AB88->var26;
+    sprite->pos2.x = sRoulette->gridX;
 }
 
-static void sub_814391C(void)
+static void CreateWheelCenterSprite(void)
 {
     u8 spriteId;
     struct SpriteSheet s;
-    LZ77UnCompWram(gUnknown_085B7948.data, gDecompressionBuffer);
+    LZ77UnCompWram(sSpriteSheet_WheelCenter.data, gDecompressionBuffer);
     s.data = gDecompressionBuffer;
-    s.size = gUnknown_085B7948.size;
-    s.tag = gUnknown_085B7948.tag;
+    s.size = sSpriteSheet_WheelCenter.size;
+    s.tag = sSpriteSheet_WheelCenter.tag;
     LoadSpriteSheet(&s);
-    spriteId = CreateSprite(&gSpriteTemplate_85B7950, 116, 80, 81);
-    gSprites[spriteId].data[0] = gUnknown_0203AB88->var24;
+    // This sprite id isn't saved because it doesn't need to be referenced again
+    // but by virtue of creation order it's SPR_WHEEL_CENTER
+    spriteId = CreateSprite(&sSpriteTemplate_WheelCenter, 116, 80, 81);
+    gSprites[spriteId].data[0] = sRoulette->wheelAngle;
     gSprites[spriteId].data[1] = 0;
     gSprites[spriteId].animPaused = TRUE;
     gSprites[spriteId].affineAnimPaused = TRUE;
     gSprites[spriteId].coordOffsetEnabled = TRUE;
 }
 
-static void sub_814399C(struct Sprite *sprite)
+static void SpriteCB_WheelCenter(struct Sprite *sprite)
 {
-    u32 t = sprite->oam.matrixNum;
-    struct OamMatrix *m = &gOamMatrices[0];
-    m[t].d = gUnknown_0203AB88->var2C.a;
-    m[t].a = gUnknown_0203AB88->var2C.a;
-    m[t].b = gUnknown_0203AB88->var2C.b;
-    m[t].c = gUnknown_0203AB88->var2C.c;
+    u32 matrixNum = sprite->oam.matrixNum;
+    struct OamMatrix *matrix = &gOamMatrices[0];
+    matrix[matrixNum].d = sRoulette->wheelRotation.a;
+    matrix[matrixNum].a = sRoulette->wheelRotation.a;
+    matrix[matrixNum].b = sRoulette->wheelRotation.b;
+    matrix[matrixNum].c = sRoulette->wheelRotation.c;
 }
 
-static void sub_81439C8(void)
+static void CreateWheelBallSprites(void)
 {
     u8 i;
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < BALLS_PER_ROUND; i++)
     {
-        gUnknown_0203AB88->var3C[i] = CreateSprite(&gSpriteTemplate_85B7928, 116, 80, 57 - i);
-        if (gUnknown_0203AB88->var3C[i] != MAX_SPRITES)
+        sRoulette->spriteIds[i] = CreateSprite(&sSpriteTemplate_Ball, 116, 80, 57 - i);
+        if (sRoulette->spriteIds[i] != MAX_SPRITES)
         {
-            gSprites[gUnknown_0203AB88->var3C[i]].invisible = TRUE;
-            gSprites[gUnknown_0203AB88->var3C[i]].coordOffsetEnabled = TRUE;
+            gSprites[sRoulette->spriteIds[i]].invisible = TRUE;
+            gSprites[sRoulette->spriteIds[i]].coordOffsetEnabled = TRUE;
         }
     }
 }
 
-static void sub_8143A40(void)
+static void HideWheelBalls(void)
 {
-    u8 t = gUnknown_0203AB88->var3C[0];
+    u8 spriteId = sRoulette->spriteIds[SPR_WHEEL_BALLS];
     u8 i;
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < BALLS_PER_ROUND; i++)
     {
         u8 j;
-        gSprites[t].invisible = TRUE;
-        gSprites[t].callback = &SpriteCallbackDummy;
-        StartSpriteAnim(&gSprites[t], 0);
+        gSprites[spriteId].invisible = TRUE;
+        gSprites[spriteId].callback = &SpriteCallbackDummy;
+        StartSpriteAnim(&gSprites[spriteId], 0);
         for (j = 0; j < 8; j++)
-        {
-            gSprites[t].data[j] = 0;
-        }
-        t++;
+            gSprites[spriteId].data[j] = 0;
+
+        spriteId++;
     }
 }
 
-static s16 sub_8143AC8(struct Sprite *sprite)
+// Sprite data for the roulette ball
+#define sStuckOnWheelLeft data[0] // if true, ball got stuck in left half of wheel, else got stuck in right half
+#define sState            data[1]
+#define sSlotMidpointDist data[2]
+#define sBallAngle        data[3]
+#define sBallDistToCenter data[4]
+#define sBallWheelAngle   data[6]
+
+#define LandBall()                                                                                  \
+{                                                                                                   \
+    sRoulette->ballState = BALL_STATE_LANDED;                                                       \
+    sRoulette->ballRolling = FALSE;                                                                 \
+    StartSpriteAnim(sprite, sprite->animCmdIndex + 3);                                              \
+    UpdateSlotBelowBall(sprite);                                                                    \
+    sprite->sBallDistToCenter = 30;                                                                 \
+    UpdateBallRelativeWheelAngle(sprite);                                                           \
+    sprite->sBallWheelAngle = (sprite->sBallWheelAngle / DEGREES_PER_SLOT) * DEGREES_PER_SLOT + 15; \
+    sprite->callback = SpriteCB_BallLandInSlot;                                                     \
+    m4aSongNumStartOrChange(SE_HASHI);                                                              \
+}
+
+// "wheelAngle" and "sBallAngle" are relative to the screen (e.g. 180 degrees for either is always screen bottom)
+// "sBallWheelAngle" is the ball's angle relative to the wheel
+//   e.g. if the ball is screen right (90), but wheel is upside down (180), sBallWheelAngle is 270 (because the ball is wheel left)
+static s16 UpdateBallRelativeWheelAngle(struct Sprite *sprite)
 {
-    if (gUnknown_0203AB88->var24 > sprite->data[3])
+    if (sRoulette->wheelAngle > sprite->sBallAngle)
     {
-        sprite->data[6] = 360 - gUnknown_0203AB88->var24 + sprite->data[3];
-        if (sprite->data[6] >= 360)
-            sprite->data[6] -= 360;
+        sprite->sBallWheelAngle = 360 - sRoulette->wheelAngle + sprite->sBallAngle;
+        if (sprite->sBallWheelAngle >= 360)
+            sprite->sBallWheelAngle -= 360;
     }
     else
     {
-        sprite->data[6] = sprite->data[3] - gUnknown_0203AB88->var24;
+        sprite->sBallWheelAngle = sprite->sBallAngle - sRoulette->wheelAngle;
     }
 
-    return sprite->data[6];
+    return sprite->sBallWheelAngle;
 }
 
-static u8 sub_8143B14(struct Sprite *sprite)
+static u8 UpdateSlotBelowBall(struct Sprite *sprite)
 {
-    gUnknown_0203AB88->var7E = sub_8143AC8(sprite) / 30.0f;
-    return gUnknown_0203AB88->var7E;
+    sRoulette->hitSlot = UpdateBallRelativeWheelAngle(sprite) / (float) DEGREES_PER_SLOT;
+    return sRoulette->hitSlot;
 }
 
-static s16 sub_8143B48(struct Sprite *sprite)
+static s16 GetBallDistanceToSlotMidpoint(struct Sprite *sprite)
 {
-    s16 t = sub_8143AC8(sprite) % 30;
-    u16 z;
-    if (t == 14)
+    s16 angleIntoSlot = UpdateBallRelativeWheelAngle(sprite) % DEGREES_PER_SLOT;
+    u16 distanceToMidpoint;
+    if (angleIntoSlot == SLOT_MIDPOINT)
     {
-        z = 0;
-        return sprite->data[2] = z;
+        // Ball is at midpoint, ok to drop into slot
+        distanceToMidpoint = 0;
+        return sprite->sSlotMidpointDist = distanceToMidpoint;
     }
-    else if (t > 13)
+    else if (angleIntoSlot >= SLOT_MIDPOINT)
     {
-        z = 43 - t;
-        return sprite->data[2] = z;
+        // Ball has passed midpoint, travel to midpoint of next slot
+        distanceToMidpoint = (DEGREES_PER_SLOT - 1) + SLOT_MIDPOINT - angleIntoSlot;
+        return sprite->sSlotMidpointDist = distanceToMidpoint;
     }
     else
     {
-        z = 14 - t;
-        return sprite->data[2] = z;
+        // Ball hasn't reached midpoint of this slot yet
+        distanceToMidpoint = SLOT_MIDPOINT - angleIntoSlot;
+        return sprite->sSlotMidpointDist = distanceToMidpoint;
     }
 }
 
-static void sub_8143B84(struct Sprite *sprite)
+static void UpdateBallPos(struct Sprite *sprite)
 {
     s16 sin, cos;
-
-    gUnknown_0203AB88->var8C += gUnknown_0203AB88->var90;
-    gUnknown_0203AB88->var88 += gUnknown_0203AB88->var8C;
-
-    if (gUnknown_0203AB88->var88 >= 360)
-        gUnknown_0203AB88->var88 -= 360.0f;
-    else if (gUnknown_0203AB88->var88 < 0.0f)
-        gUnknown_0203AB88->var88 += 360.0f;
-
-    sprite->data[3] = gUnknown_0203AB88->var88;
-    gUnknown_0203AB88->var98 += gUnknown_0203AB88->var9C;
-    gUnknown_0203AB88->var94 += gUnknown_0203AB88->var98;
-    sprite->data[4] = gUnknown_0203AB88->var94;
-    sin = Sin2(sprite->data[3]);
-    cos = Cos2(sprite->data[3]);
-    sprite->pos2.x =  sin * sprite->data[4] >> 12;
-    sprite->pos2.y = -cos * sprite->data[4] >> 12;
+    sRoulette->ballAngleSpeed += sRoulette->ballAngleAccel;
+    sRoulette->ballAngle += sRoulette->ballAngleSpeed;
+
+    if (sRoulette->ballAngle >= 360)
+        sRoulette->ballAngle -= 360.0f;
+    else if (sRoulette->ballAngle < 0.0f)
+        sRoulette->ballAngle += 360.0f;
+
+    sprite->sBallAngle = sRoulette->ballAngle;
+    sRoulette->ballFallSpeed += sRoulette->ballFallAccel;
+    sRoulette->ballDistToCenter += sRoulette->ballFallSpeed;
+    sprite->sBallDistToCenter = sRoulette->ballDistToCenter;
+    sin = Sin2(sprite->sBallAngle);
+    cos = Cos2(sprite->sBallAngle);
+    sprite->pos2.x =  sin * sprite->sBallDistToCenter >> 12;
+    sprite->pos2.y = -cos * sprite->sBallDistToCenter >> 12;
     if (IsSEPlaying())
     {
         m4aMPlayPanpotControl(&gMPlayInfo_SE1, 0xFFFF, sprite->pos2.x);
@@ -3664,80 +4002,65 @@ static void sub_8143B84(struct Sprite *sprite)
     }
 }
 
-static void sub_8143C90(struct Sprite *sprite)
+// Snap to the bottom of the slot and continue to spin with the wheel
+static void SpriteCB_BallLandInSlot(struct Sprite *sprite)
 {
     s16 sin, cos;
-    sprite->data[3] = gUnknown_0203AB88->var24 + sprite->data[6];
-    if (sprite->data[3] >= 360)
-        sprite->data[3] -= 360;
-    sin = Sin2(sprite->data[3]);
-    cos = Cos2(sprite->data[3]);
-    sprite->pos2.x =  sin * sprite->data[4] >> 12;
-    sprite->pos2.y = -cos * sprite->data[4] >> 12;
+    sprite->sBallAngle = sRoulette->wheelAngle + sprite->sBallWheelAngle;
+    if (sprite->sBallAngle >= 360)
+        sprite->sBallAngle -= 360;
+    sin = Sin2(sprite->sBallAngle);
+    cos = Cos2(sprite->sBallAngle);
+    sprite->pos2.x =  sin * sprite->sBallDistToCenter >> 12;
+    sprite->pos2.y = -cos * sprite->sBallDistToCenter >> 12;
     sprite->pos2.y += gSpriteCoordOffsetY;
 }
 
-static void sub_8143CFC(struct Sprite *sprite)
+static void SpriteCB_UnstickBall_ShroomishBallFall(struct Sprite *sprite)
 {
-    sub_8143B84(sprite);
+    UpdateBallPos(sprite);
     sprite->data[2]++;
-    if (sprite->data[4] < -132 || sprite->data[4] > 80)
+    if (sprite->sBallDistToCenter < -132 || sprite->sBallDistToCenter > 80)
         sprite->invisible = TRUE;
     else
         sprite->invisible = FALSE;
 
-    if (sprite->data[2] >= 30)
+    if (sprite->data[2] >= DEGREES_PER_SLOT)
     {
-        if (!sprite->data[0])
+        if (!sprite->sStuckOnWheelLeft)
         {
-            if (gUnknown_0203AB88->var94 <= gUnknown_0203AB88->varA0 - 2.0f)
+            if (sRoulette->ballDistToCenter <= sRoulette->varA0 - 2.0f)
             {
-                gUnknown_0203AB88->var7D = 0xFF;
-                gUnknown_0203AB88->var03_7 = 0;
-                StartSpriteAnim(sprite, sprite->animCmdIndex + 0x3);
-                sub_8143B14(sprite);
-                sprite->data[4] = 30;
-                sub_8143AC8(sprite);
-                sprite->data[6] = (sprite->data[6] / 30) * 30 + 15;
-                sprite->callback = sub_8143C90;
-                m4aSongNumStartOrChange(SE_HASHI);
-                gUnknown_0203AB88->var9C = gUnknown_0203AB88->var98 = 0.0f;
-                gUnknown_0203AB88->var8C = -1.0f;
+                LandBall()
+                sRoulette->ballFallAccel = sRoulette->ballFallSpeed = 0.0f;
+                sRoulette->ballAngleSpeed = -1.0f;
             }
         }
         else
         {
-            if (gUnknown_0203AB88->var94 >= gUnknown_0203AB88->varA0 - 2.0f)
+            if (sRoulette->ballDistToCenter >= sRoulette->varA0 - 2.0f)
             {
-                gUnknown_0203AB88->var7D = 0xFF;
-                gUnknown_0203AB88->var03_7 = 0;
-                StartSpriteAnim(sprite, sprite->animCmdIndex + 3);
-                sub_8143B14(sprite);
-                sprite->data[4] = 30;
-                sub_8143AC8(sprite);
-                sprite->data[6] = (sprite->data[6] / 30) * 30 + 15;
-                sprite->callback = sub_8143C90;
-                m4aSongNumStartOrChange(SE_HASHI);
-                gUnknown_0203AB88->var9C = gUnknown_0203AB88->var98 = 0.0f;
-                gUnknown_0203AB88->var8C = -1.0f;
+                LandBall()
+                sRoulette->ballFallAccel = sRoulette->ballFallSpeed = 0.0f;
+                sRoulette->ballAngleSpeed = -1.0f;
             }
         }
     }
 }
 
-static void sub_8143E14(struct Sprite *sprite)
+static void SpriteCB_UnstickBall_Shroomish(struct Sprite *sprite)
 {
-    float f0, f1, f2;
-    sub_8143B84(sprite);
+    float slotOffset, ballFallDist, ballFallSpeed;
+    UpdateBallPos(sprite);
 
-    switch (sprite->data[3])
+    switch (sprite->sBallAngle)
     {
     case 0:
-        if (sprite->data[0] != 1)
+        if (sprite->sStuckOnWheelLeft != TRUE)
         {
-            f0 = sprite->data[7];
-            f1 = (f0 * gUnknown_085B6348[gUnknown_0203AB88->var04_0].var01 + (gUnknown_085B6348[gUnknown_0203AB88->var04_0].var02 - 1));
-            f2 = (f0 / gUnknown_085B6348[gUnknown_0203AB88->var04_0].var0C);
+            slotOffset = sprite->data[7];
+            ballFallDist = (slotOffset * sRouletteTables[sRoulette->tableId].randDistanceHigh + (sRouletteTables[sRoulette->tableId].randDistanceLow - 1));
+            ballFallSpeed = (slotOffset / sRouletteTables[sRoulette->tableId].shroomish.fallSlowdown);
         }
         else
         {
@@ -3745,11 +4068,11 @@ static void sub_8143E14(struct Sprite *sprite)
         }
         break;
     case 180:
-        if (sprite->data[0] != 0)
+        if (sprite->sStuckOnWheelLeft)
         {
-            f0 = sprite->data[7];
-            f1 = (f0 * gUnknown_085B6348[gUnknown_0203AB88->var04_0].var01 + (gUnknown_085B6348[gUnknown_0203AB88->var04_0].var02 - 1));
-            f2 = -(f0 / gUnknown_085B6348[gUnknown_0203AB88->var04_0].var0C);
+            slotOffset = sprite->data[7];
+            ballFallDist = (slotOffset * sRouletteTables[sRoulette->tableId].randDistanceHigh + (sRouletteTables[sRoulette->tableId].randDistanceLow - 1));
+            ballFallSpeed = -(slotOffset / sRouletteTables[sRoulette->tableId].shroomish.fallSlowdown);
         }
         else
         {
@@ -3759,45 +4082,37 @@ static void sub_8143E14(struct Sprite *sprite)
     default:
         return;
     }
-    gUnknown_0203AB88->varA0 = gUnknown_0203AB88->var94;
-    gUnknown_0203AB88->var98 = f2;
-    gUnknown_0203AB88->var9C = -((f2 * 2.0f) / f1 + (2.0f / (f1 * f1)));
-    gUnknown_0203AB88->var8C = 0.0f;
+    sRoulette->varA0 = sRoulette->ballDistToCenter;
+    sRoulette->ballFallSpeed = ballFallSpeed;
+    sRoulette->ballFallAccel = -((ballFallSpeed * 2.0f) / ballFallDist + (2.0f / (ballFallDist * ballFallDist)));
+    sRoulette->ballAngleSpeed = 0.0f;
     sprite->animPaused = FALSE;
     sprite->animNum = 0;
     sprite->animBeginning = TRUE;
     sprite->animEnded = FALSE;
-    sprite->callback = sub_8143CFC;
+    sprite->callback = SpriteCB_UnstickBall_ShroomishBallFall;
     sprite->data[2] = 0;
 }
 
-static void sub_8143FA4(struct Sprite *sprite)
+static void SpriteCB_UnstickBall_TaillowDrop(struct Sprite *sprite)
 {
     sprite->pos2.y = (s16)(sprite->data[2] * 0.05f * sprite->data[2]) - 45;
     sprite->data[2]++;
-    if (sprite->data[2] > 29 && sprite->pos2.y >= 0)
-    {
-        gUnknown_0203AB88->var7D = 0xFF;
-        gUnknown_0203AB88->var03_7 = FALSE;
-        StartSpriteAnim(sprite, sprite->animCmdIndex + 3);
-        sub_8143B14(sprite);
-        sprite->data[4] = 30;
-        sub_8143AC8(sprite);
-        sprite->data[6] = (sprite->data[6] / 30) * 30 + 15;
-        sprite->callback = sub_8143C90;
-        m4aSongNumStartOrChange(SE_HASHI);
-        gUnknown_0203AB88->var03_6 = TRUE;
+    if (sprite->data[2] >= DEGREES_PER_SLOT && sprite->pos2.y >= 0)
+    {
+        LandBall()
+        sRoulette->ballUnstuck = TRUE;
     }
 }
 
-static void sub_8144050(struct Sprite *sprite)
+static void SpriteCB_UnstickBall_TaillowPickUp(struct Sprite *sprite)
 {
     if (sprite->data[2]++ < 45)
     {
         sprite->pos2.y--;
         if (sprite->data[2] == 45)
         {
-            if (gSprites[gUnknown_0203AB88->var3C[55]].animCmdIndex == 1)
+            if (gSprites[sRoulette->spriteIds[SPR_CLEAR_MON]].animCmdIndex == 1)
                 sprite->pos2.y++;
         }
     }
@@ -3805,9 +4120,9 @@ static void sub_8144050(struct Sprite *sprite)
     {
         if (sprite->data[2] < sprite->data[7])
         {
-            if (gSprites[gUnknown_0203AB88->var3C[55]].animDelayCounter == 0)
+            if (gSprites[sRoulette->spriteIds[SPR_CLEAR_MON]].animDelayCounter == 0)
             {
-                if (gSprites[gUnknown_0203AB88->var3C[55]].animCmdIndex == 1)
+                if (gSprites[sRoulette->spriteIds[SPR_CLEAR_MON]].animCmdIndex == 1)
                     sprite->pos2.y++;
                 else
                     sprite->pos2.y--;
@@ -3820,315 +4135,318 @@ static void sub_8144050(struct Sprite *sprite)
             sprite->animBeginning = TRUE;
             sprite->animEnded = FALSE;
             sprite->data[2] = 0;
-            sprite->callback = sub_8143FA4;
+            sprite->callback = SpriteCB_UnstickBall_TaillowDrop;
             m4aSongNumStart(SE_NAGERU);
         }
     }
 }
 
-static void sub_8144128(struct Sprite *sprite)
+static void SpriteCB_UnstickBall_Taillow(struct Sprite *sprite)
 {
-    sub_8143B84(sprite);
-    switch (sprite->data[3])
+    UpdateBallPos(sprite);
+
+    switch (sprite->sBallAngle)
     {
     case 90:
-        if (sprite->data[0] != 1)
+        if (sprite->sStuckOnWheelLeft != TRUE)
         {
-            sprite->callback  = &sub_8144050;
+            sprite->callback = &SpriteCB_UnstickBall_TaillowPickUp;
             sprite->data[2] = 0;
         }
         break;
     case 270:
-        if (sprite->data[0] != 0)
+        if (sprite->sStuckOnWheelLeft)
         {
-            sprite->callback  = &sub_8144050;
+            sprite->callback = &SpriteCB_UnstickBall_TaillowPickUp;
             sprite->data[2] = 0;
         }
         break;
     }
 }
 
-static void sub_8144168(struct Sprite *sprite)
+// The below SpriteCB_UnstickBall_* callbacks handle the ball while its being cleared by Shroomish/Taillow
+// For what Shroomish/Taillow do during this sequence, see SpriteCB_Shroomish / SpriteCB_Taillow
+static void SpriteCB_UnstickBall(struct Sprite *sprite)
 {
-    sub_8143B84(sprite);
-    switch (gUnknown_0203AB88->var03_0)
+    UpdateBallPos(sprite);
+    switch (sRoulette->useTaillow)
     {
     default:
-    case 0:
-        sub_81446DC(sprite);
-        sprite->callback = sub_8143E14;
+    case FALSE:
+        CreateShroomishSprite(sprite);
+        sprite->callback = SpriteCB_UnstickBall_Shroomish;
         break;
-    case 1:
-        sub_81448B8(sprite);
-        sprite->callback = sub_8144128;
+    case TRUE:
+        CreateTaillowSprite(sprite);
+        sprite->callback = SpriteCB_UnstickBall_Taillow;
         break;
     }
 }
 
-static void prev_quest_read_x24_hm_usage(struct Sprite *sprite)
+#define sStillStuck data[0]
+
+static void SpriteCB_RollBall_TryLandAdjacent(struct Sprite *sprite)
 {
-    sub_8143B84(sprite);
+    UpdateBallPos(sprite);
+
     if (sprite->data[2]-- == 16)
-        gUnknown_0203AB88->var98 *= -1.0f;
+        sRoulette->ballFallSpeed *= -1.0f;
+
     if (sprite->data[2] == 0)
     {
-        if (!sprite->data[0])
+        if (!sprite->sStillStuck)
         {
-            gUnknown_0203AB88->var7D = 0xFF;
-            gUnknown_0203AB88->var03_7 = 0;
-            StartSpriteAnim(sprite, sprite->animCmdIndex + 3);
-            sub_8143B14(sprite);
-            sprite->data[4] = 30;
-            sub_8143AC8(sprite);
-            sprite->data[6] = (sprite->data[6] / 30) * 30 + 15;
-            sprite->callback = sub_8143C90;
-            m4aSongNumStartOrChange(SE_HASHI);
+            // Ball can successfully fall into adjacent space
+            LandBall()
         }
         else
         {
+            // Ball is stuck, need Shroomish/Taillow to clear ball
             sprite->animPaused = TRUE;
             m4aSongNumStart(SE_KON);
-            sub_8144A24(sprite);
+            SetBallStuck(sprite);
         }
     }
 }
 
-static void sub_8144264(struct Sprite *sprite)
+static void SpriteCB_RollBall_TryLand(struct Sprite *sprite)
 {
-    sub_8143B84(sprite);
+    UpdateBallPos(sprite);
     sprite->data[2] = 0;
-    sub_8143B14(sprite);
-    if (!(gUnknown_085B62E4[gUnknown_0203AB88->var7E].var04 & gUnknown_0203AB88->var08))
-    {
-        gUnknown_0203AB88->var7D = 0xFF;
-        gUnknown_0203AB88->var03_7 = 0;
-        StartSpriteAnim(sprite, sprite->animCmdIndex + 3);
-        sub_8143B14(sprite);
-        sprite->data[4] = 30;
-        sub_8143AC8(sprite);
-        sprite->data[6] = (sprite->data[6] / 30) * 30 + 15;
-        sprite->callback = sub_8143C90;
-        m4aSongNumStartOrChange(SE_HASHI);
+    UpdateSlotBelowBall(sprite);
+    if (!(sRouletteSlots[sRoulette->hitSlot].flag & sRoulette->hitFlags))
+    {
+        // Space is empty, land successfully
+        LandBall()
     }
     else
     {
-        u8 t;
-        u32 z;
+        // Space has already been landed on, try to fall into adjacent space
+        u8 slotId;
+        u32 fallRight;
         m4aSongNumStart(SE_KON);
-        z = Random() & 1;
-        if (z)
+        fallRight = Random() & 1;
+        if (fallRight)
         {
-            gUnknown_0203AB88->var8C = 0.0f;
-            gUnknown_0203AB88->var7F = t = (gUnknown_0203AB88->var7E + 1) % 12;
+            sRoulette->ballAngleSpeed = 0.0f;
+            sRoulette->stuckHitSlot = slotId = (sRoulette->hitSlot + 1) % NUM_ROULETTE_SLOTS;
         }
-        else
+        else // fall left
         {
             float temp;
-            gUnknown_0203AB88->var8C = (temp = gUnknown_085B6348[gUnknown_0203AB88->var04_0].var1C) * 2.0f;
-            t = (gUnknown_0203AB88->var7E + 11) % 12;
-            gUnknown_0203AB88->var7F = gUnknown_0203AB88->var7E;
+            sRoulette->ballAngleSpeed = (temp = sRouletteTables[sRoulette->tableId].var1C) * 2.0f;
+            slotId = (sRoulette->hitSlot + NUM_ROULETTE_SLOTS - 1) % NUM_ROULETTE_SLOTS;
+            sRoulette->stuckHitSlot = sRoulette->hitSlot;
         }
-        if (gUnknown_085B62E4[t].var04 & gUnknown_0203AB88->var08)
+        if (sRouletteSlots[slotId].flag & sRoulette->hitFlags)
         {
-            sprite->data[0] = 1;
-            sprite->data[2] = gUnknown_085B6348[gUnknown_0203AB88->var04_0].var02;
+            // Attempted adjacent space has also been landed on
+            sprite->sStillStuck = TRUE;
+            sprite->data[2] = sRouletteTables[sRoulette->tableId].randDistanceLow;
         }
         else
         {
-            sprite->data[0] = gUnknown_085B62E4[t].var04 & gUnknown_0203AB88->var08;
-            if (gUnknown_0203AB88->var04_0)
+            sprite->sStillStuck = FALSE;
+            if (sRoulette->tableId)
             {
-                sprite->data[2] = gUnknown_085B6348[gUnknown_0203AB88->var04_0].var01;
+                sprite->data[2] = sRouletteTables[sRoulette->tableId].randDistanceHigh;
             }
             else
             {
-                sprite->data[2] = gUnknown_085B6348[gUnknown_0203AB88->var04_0].var02;
-                if (z)
-                {
-                    gUnknown_0203AB88->var8C = 0.5f;
-                }
+                sprite->data[2] = sRouletteTables[sRoulette->tableId].randDistanceLow;
+                if (fallRight)
+                    sRoulette->ballAngleSpeed = 0.5f;
                 else
-                {
-                    gUnknown_0203AB88->var8C = -1.5f;
-                }
+                    sRoulette->ballAngleSpeed = -1.5f;
             }
         }
-        gUnknown_0203AB88->var98 = 0.085f;
-        sprite->callback = prev_quest_read_x24_hm_usage;
-        sprite->data[1] = 5;
+        sRoulette->ballFallSpeed = 0.085f;
+        sprite->callback = SpriteCB_RollBall_TryLandAdjacent;
+        sprite->sState = 5;
     }
 }
 
-static void sub_8144410(struct Sprite *sprite)
+#undef sStillStuck
+
+static void SpriteCB_RollBall_Slow(struct Sprite *sprite)
 {
-    sub_8143B84(sprite);
-    if (gUnknown_0203AB88->var8C > 0.5f)
+    UpdateBallPos(sprite);
+    if (sRoulette->ballAngleSpeed > 0.5f)
         return;
 
-    sub_8143B14(sprite);
-    if (!sub_8143B48(sprite))
+    UpdateSlotBelowBall(sprite);
+    if (GetBallDistanceToSlotMidpoint(sprite) == 0)
     {
-        gUnknown_0203AB88->var90 = 0.0f;
-        gUnknown_0203AB88->var8C -= (float)(gUnknown_085B6348[gUnknown_0203AB88->var04_0].var03)
-            / (gUnknown_085B6348[gUnknown_0203AB88->var04_0].var04 + 1);
-        sprite->data[1] = 4;
-        sprite->callback = sub_8144264;
+        // Reached slot to land in
+        sRoulette->ballAngleAccel = 0.0f;
+        sRoulette->ballAngleSpeed -= (float)(sRouletteTables[sRoulette->tableId].wheelSpeed)
+            / (sRouletteTables[sRoulette->tableId].wheelDelay + 1);
+        sprite->sState = 4;
+        sprite->callback = SpriteCB_RollBall_TryLand;
     }
     else
     {
-        if (gUnknown_0203AB88->var90 != 0.0f)
+        if (sRoulette->ballAngleAccel != 0.0f)
         {
-            if (gUnknown_0203AB88->var8C < 0.0f)
+            if (sRoulette->ballAngleSpeed < 0.0f)
             {
-                gUnknown_0203AB88->var90 = 0.0f;
-                gUnknown_0203AB88->var8C = 0.0f;
-                gUnknown_0203AB88->var98 /= 1.2;
+                sRoulette->ballAngleAccel = 0.0f;
+                sRoulette->ballAngleSpeed = 0.0f;
+                sRoulette->ballFallSpeed /= 1.2;
             }
         }
     }
 }
 
-static void sub_8144514(struct Sprite *sprite)
+static void SpriteCB_RollBall_Medium(struct Sprite *sprite)
 {
-    sub_8143B84(sprite);
-    if (gUnknown_0203AB88->var94 > 40.f)
+    UpdateBallPos(sprite);
+    if (sRoulette->ballDistToCenter > 40.0f)
         return;
 
-    gUnknown_0203AB88->var98 = -(4.0f / (float)(gUnknown_0203AB88->var86));
-    gUnknown_0203AB88->var90 = -(gUnknown_0203AB88->var8C / (float)(gUnknown_0203AB88->var86));
+    sRoulette->ballFallSpeed = -(4.0f / (float)(sRoulette->ballTravelDistSlow));
+    sRoulette->ballAngleAccel = -(sRoulette->ballAngleSpeed / (float)(sRoulette->ballTravelDistSlow));
     sprite->animNum = 2;
     sprite->animBeginning = TRUE;
     sprite->animEnded = FALSE;
-    sprite->data[1] = 3;
-    sprite->callback = sub_8144410;
+    sprite->sState = 3;
+    sprite->callback = SpriteCB_RollBall_Slow;
 }
 
-static void sub_81445D8(struct Sprite *sprite)
+static void SpriteCB_RollBall_Fast(struct Sprite *sprite)
 {
-    sub_8143B84(sprite);
-    if (gUnknown_0203AB88->var94 > 60.0f)
+    UpdateBallPos(sprite);
+    if (sRoulette->ballDistToCenter > 60.0f)
         return;
 
     m4aSongNumStartOrChange(SE_TAMAKORO_E);
-    gUnknown_0203AB88->var98 = -(20.0f / (float)(gUnknown_0203AB88->var84));
-    gUnknown_0203AB88->var90 = ((1.0f - gUnknown_0203AB88->var8C) / (float)(gUnknown_0203AB88->var84));
+    sRoulette->ballFallSpeed = -(20.0f / (float)(sRoulette->ballTravelDistMed));
+    sRoulette->ballAngleAccel = ((1.0f - sRoulette->ballAngleSpeed) / (float)(sRoulette->ballTravelDistMed));
     sprite->animNum = 1;
     sprite->animBeginning = TRUE;
     sprite->animEnded = FALSE;
-    sprite->data[1] = 2;
-    sprite->callback = sub_8144514;
+    sprite->sState = 2;
+    sprite->callback = SpriteCB_RollBall_Medium;
 }
 
-static void sub_81446AC(struct Sprite *sprite)
+static void SpriteCB_RollBall_Start(struct Sprite *sprite)
 {
-    sprite->data[1] = 1;
+    sprite->sState = 1;
     sprite->data[2] = 0;
-    sub_8143B84(sprite);
+    UpdateBallPos(sprite);
     sprite->invisible = FALSE;
-    sprite->callback = sub_81445D8;
+    sprite->callback = SpriteCB_RollBall_Fast;
 }
 
-static void sub_81446DC(struct Sprite *sprite)
+// Sprite data for Shroomish / its shadows
+#define sMonSpriteId        data[4]
+#define sBallShadowSpriteId data[5]
+#define sMonShadowSpriteId  data[6]
+
+static void CreateShroomishSprite(struct Sprite *ball)
 {
     u16 t;
     u8 i;
-    s16 s[2][2] = {
+    s16 coords[2][2] = {
         {116, 44},
         {116, 112}
     };
-    struct Roulette *p;
-
-    t = sprite->data[7] - 2;
-    p = gUnknown_0203AB88;  // why???
-    gUnknown_0203AB88->var3C[55] = CreateSprite(&gSpriteTemplate_85B79F8, 36, -12, 50);
-    gUnknown_0203AB88->var3C[56] = CreateSprite(&gSpriteTemplate_85B7ABC[0], s[sprite->data[0]][0], s[sprite->data[0]][1], 59);
-    gUnknown_0203AB88->var3C[57] = CreateSprite(&gSpriteTemplate_85B7ABC[1], 36, 140, 51);
-    gSprites[gUnknown_0203AB88->var3C[57]].oam.objMode = ST_OAM_OBJ_BLEND;
+    struct Roulette *roulette;
+
+    t = ball->data[7] - 2;
+    roulette = sRoulette;  // Unnecessary, needed to match
+    sRoulette->spriteIds[SPR_CLEAR_MON] = CreateSprite(&sSpriteTemplate_Shroomish, 36, -12, 50);
+    sRoulette->spriteIds[SPR_CLEAR_MON_SHADOW_1] = CreateSprite(&sSpriteTemplate_ShroomishShadow[0], coords[ball->sStuckOnWheelLeft][0], coords[ball->sStuckOnWheelLeft][1], 59);
+    sRoulette->spriteIds[SPR_CLEAR_MON_SHADOW_2] = CreateSprite(&sSpriteTemplate_ShroomishShadow[1], 36, 140, 51);
+    gSprites[sRoulette->spriteIds[SPR_CLEAR_MON_SHADOW_2]].oam.objMode = ST_OAM_OBJ_BLEND;
     for (i = 0; i < 3; i++)
     {
-        gSprites[gUnknown_0203AB88->var3C[i + 55]].coordOffsetEnabled = FALSE;
-        gSprites[gUnknown_0203AB88->var3C[i + 55]].invisible = TRUE;
-        gSprites[gUnknown_0203AB88->var3C[i + 55]].animPaused = TRUE;
-        gSprites[gUnknown_0203AB88->var3C[i + 55]].affineAnimPaused = TRUE;
-        gSprites[gUnknown_0203AB88->var3C[i + 55]].data[4] = gUnknown_0203AB88->var3C[55];
-        gSprites[gUnknown_0203AB88->var3C[i + 55]].data[5] = gUnknown_0203AB88->var3C[56];
-        gSprites[gUnknown_0203AB88->var3C[i + 55]].data[6] = gUnknown_0203AB88->var3C[57];
-        gSprites[gUnknown_0203AB88->var3C[i + 55]].data[2] = t;
-        gSprites[gUnknown_0203AB88->var3C[i + 55]].data[3] = (sprite->data[7] * gUnknown_085B6348[gUnknown_0203AB88->var04_0].var01) +
-                                                                (gUnknown_085B6348[gUnknown_0203AB88->var04_0].var02 + 0xFFFF);
+        gSprites[sRoulette->spriteIds[i + SPR_CLEAR_MON]].coordOffsetEnabled = FALSE;
+        gSprites[sRoulette->spriteIds[i + SPR_CLEAR_MON]].invisible = TRUE;
+        gSprites[sRoulette->spriteIds[i + SPR_CLEAR_MON]].animPaused = TRUE;
+        gSprites[sRoulette->spriteIds[i + SPR_CLEAR_MON]].affineAnimPaused = TRUE;
+        gSprites[sRoulette->spriteIds[i + SPR_CLEAR_MON]].sMonSpriteId = sRoulette->spriteIds[SPR_CLEAR_MON];
+        gSprites[sRoulette->spriteIds[i + SPR_CLEAR_MON]].sBallShadowSpriteId = sRoulette->spriteIds[SPR_CLEAR_MON_SHADOW_1];
+        gSprites[sRoulette->spriteIds[i + SPR_CLEAR_MON]].sMonShadowSpriteId = sRoulette->spriteIds[SPR_CLEAR_MON_SHADOW_2];
+        gSprites[sRoulette->spriteIds[i + SPR_CLEAR_MON]].data[2] = t;
+        gSprites[sRoulette->spriteIds[i + SPR_CLEAR_MON]].data[3] = (ball->data[7] * sRouletteTables[sRoulette->tableId].randDistanceHigh) +
+                                                                (sRouletteTables[sRoulette->tableId].randDistanceLow + 0xFFFF);
     }
-    gSprites[gUnknown_0203AB88->var3C[56]].coordOffsetEnabled = TRUE;
-    gUnknown_0203AB88->var38 = sprite;
+    gSprites[sRoulette->spriteIds[SPR_CLEAR_MON_SHADOW_1]].coordOffsetEnabled = TRUE;
+    sRoulette->ball = ball;
 }
 
-static void sub_81448B8(struct Sprite *sprite)
+static void CreateTaillowSprite(struct Sprite *ball)
 {
     u8 i = 0;
     s16 t;
-    s16 s[2][2] = {
-        {256, 84},
-        {-16, 84}
+    s16 coords[2][2] = {
+        {256, 84}, // Right approach
+        {-16, 84}  // Left approach
     };
 
-    t = sprite->data[7] - 2;
-    gUnknown_0203AB88->var3C[55] = CreateSprite(&gSpriteTemplate_85B7A10, s[sprite->data[0]][0], s[sprite->data[0]][1], 50);
-    StartSpriteAnim(&gSprites[gUnknown_0203AB88->var3C[55]], sprite->data[0]);
-    gUnknown_0203AB88->var3C[56] = CreateSprite(&gUnknown_085B7AEC, s[sprite->data[0]][0], s[sprite->data[0]][1], 51);
-    gSprites[gUnknown_0203AB88->var3C[56]].affineAnimPaused = TRUE;
-    gSprites[gUnknown_0203AB88->var3C[56]].animPaused = TRUE;
-    sprite->data[7] = (t * gUnknown_085B6348[gUnknown_0203AB88->var04_0].var01) + (gUnknown_085B6348[gUnknown_0203AB88->var04_0].var10 + 45);
+    t = ball->data[7] - 2;
+    sRoulette->spriteIds[SPR_CLEAR_MON] = CreateSprite(&sSpriteTemplate_Taillow, coords[ball->sStuckOnWheelLeft][0], coords[ball->sStuckOnWheelLeft][1], 50);
+    StartSpriteAnim(&gSprites[sRoulette->spriteIds[SPR_CLEAR_MON]], ball->sStuckOnWheelLeft);
+    sRoulette->spriteIds[SPR_CLEAR_MON_SHADOW_1] = CreateSprite(&sSpriteTemplate_TaillowShadow, coords[ball->sStuckOnWheelLeft][0], coords[ball->sStuckOnWheelLeft][1], 51);
+    gSprites[sRoulette->spriteIds[SPR_CLEAR_MON_SHADOW_1]].affineAnimPaused = TRUE;
+    gSprites[sRoulette->spriteIds[SPR_CLEAR_MON_SHADOW_1]].animPaused = TRUE;
+    ball->data[7] = (t * sRouletteTables[sRoulette->tableId].randDistanceHigh) + (sRouletteTables[sRoulette->tableId].taillow.baseDropDelay + 45);
     for (; i < 2; i++)
     {
-        gSprites[gUnknown_0203AB88->var3C[55 + i]].data[4] = gUnknown_0203AB88->var3C[55];
-        gSprites[gUnknown_0203AB88->var3C[55 + i]].data[5] = gUnknown_0203AB88->var3C[56];
-        gSprites[gUnknown_0203AB88->var3C[55 + i]].data[6] = gUnknown_0203AB88->var3C[56];
-        gSprites[gUnknown_0203AB88->var3C[55 + i]].data[2] = t;
-        gSprites[gUnknown_0203AB88->var3C[55 + i]].data[3] = sprite->data[7] - 45;
+        gSprites[sRoulette->spriteIds[SPR_CLEAR_MON + i]].sMonSpriteId = sRoulette->spriteIds[SPR_CLEAR_MON];
+        gSprites[sRoulette->spriteIds[SPR_CLEAR_MON + i]].sBallShadowSpriteId = sRoulette->spriteIds[SPR_CLEAR_MON_SHADOW_1];
+        gSprites[sRoulette->spriteIds[SPR_CLEAR_MON + i]].sMonShadowSpriteId = sRoulette->spriteIds[SPR_CLEAR_MON_SHADOW_1];
+        gSprites[sRoulette->spriteIds[SPR_CLEAR_MON + i]].data[2] = t;
+        gSprites[sRoulette->spriteIds[SPR_CLEAR_MON + i]].data[3] = ball->data[7] - 45;
     }
-    gUnknown_0203AB88->var38 = sprite;
+    sRoulette->ball = ball;
 }
 
-static void sub_8144A24(struct Sprite *sprite)
+static void SetBallStuck(struct Sprite *sprite)
 {
-    u8 z;
-    u16 o;
-    u8 h = 0;
-    u8 j = 5;
-    u8 p = 0;
+    u8 slotId;
+    u16 angle;
+    u8 numCandidates = 0;
+    u8 maxSlotToCheck = 5;
+    u8 betSlotId = 0;
     u8 i = 0;
-    u8 val;
-    u8 s[10] = {};
+    u8 slotsToSkip;
+    u8 slotCandidates[NUM_ROULETTE_SLOTS - 2] = {}; // - 2 because we know at least 2 are already occupied
     u16 rand = Random();
 
-    gUnknown_0203AB88->var7D = 1;
-    gUnknown_0203AB88->var03_5 = TRUE;
-    gUnknown_0203AB88->var03_6 = FALSE;
-    gUnknown_0203AB88->var7E = 0xFF;
-    gUnknown_0203AB88->var88 = sprite->data[3];
-    gUnknown_0203AB88->var98 = 0.0f;
-    gUnknown_0203AB88->var8C = gUnknown_085B6348[gUnknown_0203AB88->var04_0].var1C;
+    sRoulette->ballState = BALL_STATE_STUCK;
+    sRoulette->ballStuck = TRUE;
+    sRoulette->ballUnstuck = FALSE;
+    sRoulette->hitSlot = 0xFF;
+    sRoulette->ballAngle = sprite->sBallAngle;
+    sRoulette->ballFallSpeed = 0.0f;
+    sRoulette->ballAngleSpeed = sRouletteTables[sRoulette->tableId].var1C;
+
+    angle = (sRoulette->tableId * DEGREES_PER_SLOT + 33) + (1 - sRoulette->useTaillow) * 15;
 
-    o = (gUnknown_0203AB88->var04_0 * 30 + 33) + (0x1 - gUnknown_0203AB88->var03_0) * 15;
+    // Determine which quadrant the ball got stuck in
+    // Use either Shroomish or Taillow to clear the ball depending on where it's stuck
     for (i = 0; i < 4; i++)
     {
-        if (o < sprite->data[3] && sprite->data[3] <= o + 90)
+        if (angle < sprite->sBallAngle && sprite->sBallAngle <= angle + 90)
         {
-            sprite->data[0] = i / 2;
-            gUnknown_0203AB88->var03_0 = i % 2;
+            sprite->sStuckOnWheelLeft = i / 2;
+            sRoulette->useTaillow = i % 2;
             break;
         }
         if (i == 3)
         {
-            sprite->data[0] = 1;
-            gUnknown_0203AB88->var03_0 = 1;
+            sprite->sStuckOnWheelLeft = TRUE;
+            sRoulette->useTaillow = TRUE;
             break;
         }
-        o += 90;
+        angle += 90;
     }
 
-    if (gUnknown_0203AB88->var03_0)
+    if (sRoulette->useTaillow)
     {
-        if (sprite->data[0])
+        if (sprite->sStuckOnWheelLeft)
             PlayCry1(SPECIES_TAILLOW, -63);
         else
             PlayCry1(SPECIES_TAILLOW, 63);
@@ -4138,41 +4456,47 @@ static void sub_8144A24(struct Sprite *sprite)
         PlayCry1(SPECIES_SHROOMISH, -63);
     }
 
-    val = 2;
-    z = (gUnknown_0203AB88->var7F + 2) % 12;
+    slotsToSkip = 2;
+    slotId = (sRoulette->stuckHitSlot + 2) % NUM_ROULETTE_SLOTS;
 
-    if (gUnknown_0203AB88->var03_0 == 1 && gUnknown_0203AB88->var04_0 == 1)
-        j += 6;
+    if (sRoulette->useTaillow == TRUE && sRoulette->tableId == 1)
+        maxSlotToCheck += 6; // Check all remaining slots
     else
-        j += val;
+        maxSlotToCheck += slotsToSkip; // Check enough slots to guarantee an empty will be found
 
-    for (i = val; i < j; i++)
+    // Identify open slots on the wheel that the stuck ball could be moved to
+    for (i = slotsToSkip; i < maxSlotToCheck; i++)
     {
-        if (!(gUnknown_0203AB88->var08 & gUnknown_085B62E4[z].var04))
+        if (!(sRoulette->hitFlags & sRouletteSlots[slotId].flag))
         {
-            s[h++] = i;
-            if (p == 0 && (gUnknown_085B62E4[z].var04 & gUnknown_085B6154[gUnknown_0203AB88->var1B[gUnknown_0203AB88->var1A_0]].var0C))
-                p = i;
+            slotCandidates[numCandidates++] = i;
+            if (betSlotId == 0 && (sRouletteSlots[slotId].flag & sGridSelections[sRoulette->betSelection[sRoulette->curBallNum]].inSelectionFlags))
+                betSlotId = i;
         }
-        z = (z + 1) % 0xC;
+        slotId = (slotId + 1) % NUM_ROULETTE_SLOTS;
     }
 
-    if ((gUnknown_0203AB88->var03_0 + 1) & gUnknown_0203AB88->var02)
+    // Determine which identified slot the ball should be moved to
+    // The below slot ids are relative to the slot the ball got stuck on
+    if ((sRoulette->useTaillow + 1) & sRoulette->partySpeciesFlags)
     {
-        if (p && (rand & 0xFF) < 0xc0)
-            sprite->data[7] = p;
+        // If the player has the corresponding pokemon in their party (HAS_SHROOMISH or HAS_TAILLOW),
+        // there's a 75% chance that the ball will be moved to a spot they bet on
+        // assuming it was one of the slots identified as a candidate
+        if (betSlotId && (rand % 256) < 192)
+            sprite->data[7] = betSlotId;
         else
-            sprite->data[7] = s[rand % h];
+            sprite->data[7] = slotCandidates[rand % numCandidates];
     }
     else
     {
-        sprite->data[7] = s[rand % h];
+        sprite->data[7] = slotCandidates[rand % numCandidates];
     }
 
-    sprite->callback = sub_8144168;
+    sprite->callback = SpriteCB_UnstickBall;
 }
 
-static const u16 gUnknown_085B7B1A[] = {
+static const u16 sShroomishShadowAlphas[] = {
     0x907,
     0x808,
     0x709,
@@ -4185,26 +4509,28 @@ static const u16 gUnknown_085B7B1A[] = {
     0x010,
 };
 
-static void sub_8144C70(struct Sprite *sprite)
+static void SpriteCB_ShroomishExit(struct Sprite *sprite)
 {
+    // Delay for screen shaking, then exit left
     if (sprite->data[1]++ >= sprite->data[3])
     {
 	    sprite->pos1.x -= 2;
         if (sprite->pos1.x < -16)
         {
-            if (!gUnknown_0203AB88->var03_6)
-                gUnknown_0203AB88->var03_6 = TRUE;
+            if (!sRoulette->ballUnstuck)
+                sRoulette->ballUnstuck = TRUE;
             DestroySprite(sprite);
-            gUnknown_0203AB88->var01 = 0;
-            gUnknown_0203AB88->var34 = gUnknown_085B7B1A[0];
+            sRoulette->shroomishShadowTimer = 0;
+            sRoulette->shroomishShadowAlpha = sShroomishShadowAlphas[0];
         }
     }
 }
 
-static void sub_8144CD0(struct Sprite *sprite)
+// Handles both the screen shake and ball shadow effect for when Shroomish unsticks the ball
+static void SpriteCB_ShroomishShakeScreen(struct Sprite *sprite)
 {
-    int p;
-    u16 t[][4] = {
+    int screenShakeIdx;
+    u16 screenShakeOffsets[][4] = {
         {-1, 0, 1, 0},
         {-2, 0, 2, 0},
         {-3, 0, 3, 0},
@@ -4214,92 +4540,99 @@ static void sub_8144CD0(struct Sprite *sprite)
     {
         if (sprite->data[1] & 1)
         {
-            gSpriteCoordOffsetY = t[sprite->data[2] / 2][sprite->data[7]];
-            p = sprite->data[7] + 1;
-            sprite->data[7] = p - ((p / 4) * 4);
+            // Shake screen
+            gSpriteCoordOffsetY = screenShakeOffsets[sprite->data[2] / 2][sprite->data[7]];
+            screenShakeIdx = sprite->data[7] + 1;
+            sprite->data[7] = screenShakeIdx - ((screenShakeIdx / 4) * 4);
         }
+        // Flicker shadow
         sprite->invisible ^= 1;
     }
     else
     {
         gSpriteCoordOffsetY = 0;
-        gSprites[gUnknown_0203AB88->var3C[55]].animPaused = FALSE;
+        gSprites[sRoulette->spriteIds[SPR_CLEAR_MON]].animPaused = FALSE;
         DestroySprite(sprite);
     }
 }
 
-static void sub_8144D94(struct Sprite *sprite)
+static void SpriteCB_ShroomishFall(struct Sprite *sprite)
 {
-    float t;
+    float timer;
     sprite->data[1]++;
-    t = sprite->data[1];
-    sprite->pos2.y = t * 0.039f * t;
-    gUnknown_0203AB88->var34 = gUnknown_085B7B1A[(gUnknown_0203AB88->var01 - 1) / 2];
-    if (gUnknown_0203AB88->var01 < 19)
-        gUnknown_0203AB88->var01++;
+    timer = sprite->data[1];
+    sprite->pos2.y = timer * 0.039f * timer;
+    sRoulette->shroomishShadowAlpha = sShroomishShadowAlphas[(sRoulette->shroomishShadowTimer - 1) / 2];
+    if (sRoulette->shroomishShadowTimer < ARRAY_COUNT(sShroomishShadowAlphas) * 2 - 1)
+        sRoulette->shroomishShadowTimer++;
     if (sprite->data[1] > 60)
     {
         sprite->data[1] = 0;
-        sprite->callback = sub_8144C70;
-        gSprites[sprite->data[6]].callback  = sub_8144C70;
-        gSprites[sprite->data[6]].data[1] = -2;
-        gSprites[sprite->data[5]].invisible = FALSE;
-        gSprites[sprite->data[5]].callback  = sub_8144CD0;
+        sprite->callback = SpriteCB_ShroomishExit;
+        gSprites[sprite->sMonShadowSpriteId].callback  = SpriteCB_ShroomishExit;
+        gSprites[sprite->sMonShadowSpriteId].data[1] = -2;
+        gSprites[sprite->sBallShadowSpriteId].invisible = FALSE;
+        gSprites[sprite->sBallShadowSpriteId].callback  = SpriteCB_ShroomishShakeScreen;
         m4aSongNumStart(SE_W070);
     }
 }
 
-static void sub_8144E60(struct Sprite *sprite)
+static void SpriteCB_Shroomish(struct Sprite *sprite)
 {
     if (sprite->data[7] == 0)
     {
-        if (gUnknown_0203AB88->var38->data[0] == 0)
+        // Wait for the ball to be a specific angle (or its 180 degree opposite) specified by the table
+        // Once it is, reveal the shadow for Shroomish falling in
+        if (!sRoulette->ball->sStuckOnWheelLeft)
         {
-            if (gUnknown_0203AB88->var38->data[3] != gUnknown_085B6348[gUnknown_0203AB88->var04_0].var08)
+            if (sRoulette->ball->sBallAngle != sRouletteTables[sRoulette->tableId].shroomish.startAngle)
                 return;
         }
         else
         {
-            if (gUnknown_0203AB88->var38->data[3] != gUnknown_085B6348[gUnknown_0203AB88->var04_0].var08 + 180)
+            if (sRoulette->ball->sBallAngle != sRouletteTables[sRoulette->tableId].shroomish.startAngle + 180)
                 return;
         }
 
         sprite->invisible = FALSE;
         sprite->data[7]++;
         m4aSongNumStart(SE_RU_HYUU);
-        gUnknown_0203AB88->var01 = 1;
-        gUnknown_0203AB88->var34 = gUnknown_085B7B1A[0];
+        sRoulette->shroomishShadowTimer = 1;
+        sRoulette->shroomishShadowAlpha = sShroomishShadowAlphas[0];
     }
     else
     {
-        gUnknown_0203AB88->var34 = gUnknown_085B7B1A[(gUnknown_0203AB88->var01 - 1) / 2];
-        if (gUnknown_0203AB88->var01 < 19)
-            gUnknown_0203AB88->var01++;
+        sRoulette->shroomishShadowAlpha = sShroomishShadowAlphas[(sRoulette->shroomishShadowTimer - 1) / 2];
+        if (sRoulette->shroomishShadowTimer < 19)
+            sRoulette->shroomishShadowTimer++;
 
-        if (gUnknown_0203AB88->var38->data[0] == 0)
+        // Wait for the ball to be a specific angle (or its 180 degree opposite) specified by the table
+        // Once it is, have Shroomish begin to fall in
+        // On both tables this angle is 15 degrees off the "start" angle
+        if (!sRoulette->ball->sStuckOnWheelLeft)
         {
-            if (gUnknown_0203AB88->var38->data[3] != gUnknown_085B6348[gUnknown_0203AB88->var04_0].var0A)
+            if (sRoulette->ball->sBallAngle != sRouletteTables[sRoulette->tableId].shroomish.dropAngle)
                 return;
         }
         else
         {
-            if (gUnknown_0203AB88->var38->data[3] != gUnknown_085B6348[gUnknown_0203AB88->var04_0].var0A + 180)
+            if (sRoulette->ball->sBallAngle != sRouletteTables[sRoulette->tableId].shroomish.dropAngle + 180)
                 return;
         }
 
-        gSprites[sprite->data[4]].callback  = sub_8144D94;
-        gSprites[sprite->data[4]].invisible = FALSE;
+        gSprites[sprite->sMonSpriteId].callback  = SpriteCB_ShroomishFall;
+        gSprites[sprite->sMonSpriteId].invisible = FALSE;
         sprite->callback  = &SpriteCallbackDummy;
         sprite->data[7] = 0;
     }
 }
 
-static void sub_8144F94(struct Sprite *sprite)
+static void SpriteCB_TaillowShadow_Flash(struct Sprite *sprite)
 {
     sprite->invisible ^= 1;
 }
 
-static void sub_8144FB0(struct Sprite *sprite)
+static void SpriteCB_Taillow_FlyAway(struct Sprite *sprite)
 {
     if (sprite->pos1.y > -16)
     {
@@ -4312,12 +4645,12 @@ static void sub_8144FB0(struct Sprite *sprite)
         sprite->animPaused = TRUE;
         m4aSongNumStop(SE_BASABASA);
         DestroySprite(sprite);
-        FreeOamMatrix(gSprites[gUnknown_0203AB88->var3C[56]].oam.matrixNum);
-        DestroySprite(&gSprites[gUnknown_0203AB88->var3C[56]]);
+        FreeOamMatrix(gSprites[sRoulette->spriteIds[SPR_CLEAR_MON_SHADOW_1]].oam.matrixNum);
+        DestroySprite(&gSprites[sRoulette->spriteIds[SPR_CLEAR_MON_SHADOW_1]]);
     }
 }
 
-static void sub_8145030(struct Sprite *sprite)
+static void SpriteCB_Taillow_PickUpBall(struct Sprite *sprite)
 {
     if (sprite->data[1] >= 0)
     {
@@ -4342,17 +4675,17 @@ static void sub_8145030(struct Sprite *sprite)
         else
         {
             m4aSongNumStart(SE_RU_HYUU);
-            StartSpriteAnim(sprite, gUnknown_0203AB88->var38->data[0] + 4);
-            sprite->callback = sub_8144FB0;
-            gSprites[sprite->data[6]].affineAnimPaused = FALSE;
+            StartSpriteAnim(sprite, sRoulette->ball->sStuckOnWheelLeft + 4);
+            sprite->callback = SpriteCB_Taillow_FlyAway;
+            gSprites[sprite->sMonShadowSpriteId].affineAnimPaused = FALSE;
         }
     }
 }
 
-static void sub_81450D8(struct Sprite *sprite)
+static void SpriteCB_Taillow_FlyIn(struct Sprite *sprite)
 {
-    s8 t[2] = {-1, 1};
-    s8 z[][2] = {
+    s8 xMoveOffsets[2] = {-1, 1};
+    s8 yMoveOffsets[][2] = {
         {2, 0},
         {2, 0},
         {2, -1},
@@ -4365,7 +4698,7 @@ static void sub_81450D8(struct Sprite *sprite)
 
     if (sprite->data[1]-- > 7)
     {
-        sprite->pos1.x += t[gUnknown_0203AB88->var38->data[0]] * 2;
+        sprite->pos1.x += xMoveOffsets[sRoulette->ball->sStuckOnWheelLeft] * 2;
         if (IsSEPlaying())
         {
             s8 pan = -((116 - sprite->pos1.x) / 2);
@@ -4377,46 +4710,46 @@ static void sub_81450D8(struct Sprite *sprite)
     {
         if (sprite->data[1] >= 0)
         {
-            sprite->pos1.x += t[gUnknown_0203AB88->var38->data[0]] * z[7 - sprite->data[1]][0];
-            sprite->pos1.y += z[7 - sprite->data[1]][1];
+            sprite->pos1.x += xMoveOffsets[sRoulette->ball->sStuckOnWheelLeft] * yMoveOffsets[7 - sprite->data[1]][0];
+            sprite->pos1.y += yMoveOffsets[7 - sprite->data[1]][1];
         }
         else
         {
             m4aSongNumStartOrChange(SE_BASABASA);
-            if (gUnknown_0203AB88->var38->data[0] == 0)
+            if (sRoulette->ball->sStuckOnWheelLeft == 0)
                 PlayCry1(SPECIES_TAILLOW, 63);
             else
                 PlayCry1(SPECIES_TAILLOW, -63);
-            StartSpriteAnim(sprite, gUnknown_0203AB88->var38->data[0] + 2);
+            StartSpriteAnim(sprite, sRoulette->ball->sStuckOnWheelLeft + 2);
             sprite->data[1] = 45;
-            sprite->callback = sub_8145030;
+            sprite->callback = SpriteCB_Taillow_PickUpBall;
         }
     }
 }
 
-static void sub_8145218(struct Sprite *sprite)
+static void SpriteCB_TaillowShadow_FlyIn(struct Sprite *sprite)
 {
-    s8 t[2] = {-1, 1};
+    s8 moveDir[2] = {-1, 1};
 
     if (sprite->data[1]-- >= 0)
     {
-        sprite->pos1.x += t[gUnknown_0203AB88->var38->data[0]] * 2;
-        gSprites[sprite->data[6]].invisible ^= 1;
+        sprite->pos1.x += moveDir[sRoulette->ball->sStuckOnWheelLeft] * 2;
+        gSprites[sprite->sMonShadowSpriteId].invisible ^= 1;
     }
     else
     {
-        sprite->callback = sub_8144F94;
+        sprite->callback = SpriteCB_TaillowShadow_Flash;
     }
 }
 
-static void sub_8145294(struct Sprite *sprite)
+static void SpriteCB_Taillow(struct Sprite *sprite)
 {
-    if (gUnknown_0203AB88->var38->data[0] == 0)
+    if (sRoulette->ball->sStuckOnWheelLeft == FALSE)
     {
-        if (gUnknown_0203AB88->var38->data[3] == gUnknown_085B6348[gUnknown_0203AB88->var04_0].var12 + 90)
+        if (sRoulette->ball->sBallAngle == sRouletteTables[sRoulette->tableId].taillow.rightStartAngle + 90)
         {
-            gSprites[sprite->data[6]].data[1] = 52;
-            gSprites[sprite->data[4]].data[1] = 52;
+            gSprites[sprite->sMonShadowSpriteId].data[1] = 52;
+            gSprites[sprite->sMonSpriteId].data[1] = 52;
         }
         else
         {
@@ -4425,17 +4758,17 @@ static void sub_8145294(struct Sprite *sprite)
     }
     else
     {
-        if (gUnknown_0203AB88->var38->data[3] == gUnknown_085B6348[gUnknown_0203AB88->var04_0].var14 + 270)
+        if (sRoulette->ball->sBallAngle == sRouletteTables[sRoulette->tableId].taillow.leftStartAngle + 270)
         {
-            gSprites[sprite->data[6]].data[1] = 46;
-            gSprites[sprite->data[4]].data[1] = 46;
+            gSprites[sprite->sMonShadowSpriteId].data[1] = 46;
+            gSprites[sprite->sMonSpriteId].data[1] = 46;
         }
         else
         {
             return;
         }
     }
-    gSprites[sprite->data[6]].callback = sub_8145218;
-    gSprites[sprite->data[4]].callback = sub_81450D8;
+    gSprites[sprite->sMonShadowSpriteId].callback = SpriteCB_TaillowShadow_FlyIn;
+    gSprites[sprite->sMonSpriteId].callback = SpriteCB_Taillow_FlyIn;
     m4aSongNumStart(SE_RU_HYUU);
 }
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index a2a2acc8d..7c824e82d 100644
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -349,7 +349,7 @@ static void VBlankCB_UpdateClockGraphics(void)
 
     gMain.oamBuffer[0] = sClockOamData;
     gMain.oamBuffer[0].x = 112;
-    gMain.oamBuffer[0].y = (CLOCK_WIN_TOP + 1) * 8;;
+    gMain.oamBuffer[0].y = (CLOCK_WIN_TOP + 1) * 8;
 
     if (gSaveFailedClockInfo[CLOCK_RUNNING] != FALSE)
     {
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 815588784..d2ebcbb85 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -788,8 +788,8 @@ bool8 ScrCmd_warphole(struct ScriptContext *ctx)
 {
     u8 mapGroup = ScriptReadByte(ctx);
     u8 mapNum = ScriptReadByte(ctx);
-    u16 x;
-    u16 y;
+    s16 x;
+    s16 y;
 
     PlayerGetDestCoords(&x, &y);
     if (mapGroup == 0xFF && mapNum == 0xFF)
@@ -801,6 +801,7 @@ bool8 ScrCmd_warphole(struct ScriptContext *ctx)
     return TRUE;
 }
 
+// RS mossdeep gym warp, unused in Emerald
 bool8 ScrCmd_warpteleport(struct ScriptContext *ctx)
 {
     u8 mapGroup = ScriptReadByte(ctx);
@@ -810,7 +811,7 @@ bool8 ScrCmd_warpteleport(struct ScriptContext *ctx)
     u16 y = VarGet(ScriptReadHalfword(ctx));
 
     SetWarpDestination(mapGroup, mapNum, warpId, x, y);
-    DoTeleportWarp();
+    DoTeleportTileWarp();
     ResetInitialPlayerAvatarState();
     return TRUE;
 }
diff --git a/src/script_pokemon_util.c b/src/script_pokemon_util.c
index 3546ed126..a7b5433f0 100755
--- a/src/script_pokemon_util.c
+++ b/src/script_pokemon_util.c
@@ -24,7 +24,6 @@
 #include "constants/items.h"
 #include "constants/species.h"
 #include "constants/tv.h"
-#include "constants/vars.h"
 #include "constants/battle_frontier.h"
 
 static void CB2_ReturnFromChooseHalfParty(void);
diff --git a/src/secret_base.c b/src/secret_base.c
index 83626710f..3f69e0419 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -964,7 +964,7 @@ static void HandleRegistryMenuInput(u8 taskId)
 
     data = gTasks[taskId].data;
     input = ListMenu_ProcessInput(data[5]);
-    ListMenuGetScrollAndRow(data[5], &data[2], &data[1]);
+    ListMenuGetScrollAndRow(data[5], (u16 *)&data[2], (u16 *)&data[1]);
     switch (input)
     {
     case LIST_NOTHING_CHOSEN:
@@ -1045,10 +1045,10 @@ void DeleteRegistry_Yes_Callback(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     ClearDialogWindowAndFrame(0, 0);
-    DestroyListMenuTask(data[5], &data[2], &data[1]);
+    DestroyListMenuTask((u8)data[5], (u16 *)&data[2], (u16 *)&data[1]);
     gSaveBlock1Ptr->secretBases[data[4]].registryStatus = 0;
     BuildRegistryMenuItems(taskId);
-    sub_812225C(&data[2], &data[1], data[3], data[0]);
+    sub_812225C((u16 *)&data[2], (u16 *)&data[1], (u16)data[3], (u16)data[0]);
     FinalizeRegistryMenu(taskId);
     gTasks[taskId].func = HandleRegistryMenuInput;
 }
@@ -1062,7 +1062,7 @@ static void DeleteRegistry_No(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     ClearDialogWindowAndFrame(0, 0);
-    DestroyListMenuTask(data[5], &data[2], &data[1]);
+    DestroyListMenuTask((u8)data[5], (u16 *)&data[2], (u16 *)&data[1]);
     FinalizeRegistryMenu(taskId);
     gTasks[taskId].func = HandleRegistryMenuInput;
 }
diff --git a/src/shop.c b/src/shop.c
index 837ba1bca..4fc44beee 100755
--- a/src/shop.c
+++ b/src/shop.c
@@ -416,7 +416,7 @@ static void CB2_BuyMenu(void)
     RunTasks();
     AnimateSprites();
     BuildOamBuffer();
-    do_scheduled_bg_tilemap_copies_to_vram();
+    DoScheduledBgTilemapCopiesToVram();
     UpdatePaletteFade();
 }
 
@@ -446,7 +446,7 @@ static void CB2_InitBuyMenu(void)
         ResetPaletteFade();
         ResetSpriteData();
         ResetTasks();
-        clear_scheduled_bg_copies_to_vram();
+        ClearScheduledBgCopiesToVram();
         gShopDataPtr = AllocZeroed(sizeof(struct ShopData));
         gShopDataPtr->scrollIndicatorsTaskId = 0xFF;
         gShopDataPtr->itemSpriteIds[0] = 0xFF;
diff --git a/src/slot_machine.c b/src/slot_machine.c
index d1cb05b18..8669b543b 100644
--- a/src/slot_machine.c
+++ b/src/slot_machine.c
@@ -1,5 +1,4 @@
 #include "global.h"
-#include "constants/songs.h"
 #include "overworld.h"
 #include "field_effect.h"
 #include "random.h"
@@ -18,23 +17,225 @@
 #include "bg.h"
 #include "gpu_regs.h"
 #include "coins.h"
+#include "strings.h"
 #include "tv.h"
 #include "text_window.h"
-#include "constants/rgb.h"
 #include "main_menu.h"
 #include "bg.h"
 #include "window.h"
 #include "constants/coins.h"
+#include "constants/rgb.h"
 #include "constants/slot_machine.h"
+#include "constants/songs.h"
 
-// Text
-extern const u8 gText_YouDontHaveThreeCoins[];
-extern const u8 gText_QuitTheGame[];
-extern const u8 gText_YouveGot9999Coins[];
-extern const u8 gText_YouveRunOutOfCoins[];
-extern const u8 gText_ReelTimeHelp[];
-
-struct SlotMachineEwramStruct
+#define SLOTMACHINE_GFX_TILES 233
+#define MAX_BET 3
+
+#define SYMBOLS_PER_REEL      21
+#define REEL_SYMBOL_HEIGHT    24
+
+// Lucky Flags
+#define LUCKY_BIAS_REPLAY    (1 << 0)
+#define LUCKY_BIAS_CHERRY    (1 << 1)
+#define LUCKY_BIAS_LOTAD     (1 << 2)
+#define LUCKY_BIAS_AZURILL   (1 << 3)
+#define LUCKY_BIAS_POWER     (1 << 4)
+#define LUCKY_BIAS_REELTIME  (1 << 5)
+#define LUCKY_BIAS_MIXED_777 (1 << 6)
+#define LUCKY_BIAS_777       (1 << 7)
+
+enum {
+    GFXTAG_7_RED,
+    GFXTAG_7_BLUE,
+    GFXTAG_AZURILL,
+    GFXTAG_LOTAD,
+    GFXTAG_CHERRY,
+    GFXTAG_POWER,
+    GFXTAG_REPLAY,
+    GFXTAG_NUM_0,
+    GFXTAG_NUM_1,
+    GFXTAG_NUM_2,
+    GFXTAG_NUM_3,
+    GFXTAG_NUM_4,
+    GFXTAG_NUM_5,
+    GFXTAG_NUM_6,
+    GFXTAG_NUM_7,
+    GFXTAG_NUM_8,
+    GFXTAG_NUM_9,
+    GFXTAG_REEL_BG,
+    GFXTAG_STOP,
+    GFXTAG_BONUS,
+    GFXTAG_BIG,
+    GFXTAG_REG,
+};
+
+#define GFXTAG_SYMBOLS_START (GFXTAG_7_RED)
+#define GFXTAG_NUMBERS_START (GFXTAG_NUM_0)
+
+enum {
+    PALTAG_REEL,
+    PALTAG_REEL_TIME_PIKACHU,
+    PALTAG_REEL_TIME_MISC,
+    PALTAG_REEL_TIME_MACHINE,
+    PALTAG_MISC,
+    PALTAG_EXPLOSION,
+    PALTAG_DIG_DISPLAY,
+    PALTAG_PIKA_AURA,
+};
+
+enum {
+    MATCHED_1CHERRY,
+    MATCHED_2CHERRY,
+    MATCHED_REPLAY,
+    MATCHED_LOTAD,
+    MATCHED_AZURILL,
+    MATCHED_POWER,
+    MATCHED_777_MIXED,
+    MATCHED_777_RED,
+    MATCHED_777_BLUE,
+    MATCHED_NONE,
+};
+
+enum {
+    MATCH_MIDDLE_ROW,
+    MATCH_TOP_ROW,
+    MATCH_BOTTOM_ROW,
+    MATCH_NWSE_DIAG,
+    MATCH_NESW_DIAG,
+    NUM_MATCH_LINES,
+};
+
+enum {
+    LEFT_REEL,
+    MIDDLE_REEL,
+    RIGHT_REEL,
+    NUM_REELS,
+};
+
+enum {
+    SLOT_ACTION_UNFADE,
+    SLOT_ACTION_WAIT_FADE,
+    SLOT_ACTION_READY_NEW_SPIN,
+    SLOT_ACTION_READY_NEW_RT_SPIN,
+    SLOT_ACTION_ASK_INSERT_BET,
+    SLOT_ACTION_BET_INPUT,
+    SLOT_ACTION_MSG_NEED_3_COINS,
+    SLOT_ACTION_WAIT_MSG_NEED_3_COINS,
+    SLOT_ACTION_WAIT_INFO_BOX,
+    SLOT_ACTION_START_SPIN,
+    SLOT_ACTION_START_RT_SPIN,
+    SLOT_ACTION_SET_LUCKY_SPINS,
+    SLOT_ACTION_AWAIT_REEL_STOP,
+    SLOT_ACTION_AWAIT_ALL_REELS_STOP,
+    SLOT_ACTION_CHECK_MATCHES,
+    SLOT_ACTION_WAIT_PAYOUT,
+    SLOT_ACTION_END_PAYOUT,
+    SLOT_ACTION_MATCHED_POWER,
+    SLOT_ACTION_WAIT_RT_ANIM,
+    SLOT_ACTION_RESET_BET_TILES,
+    SLOT_ACTION_NO_MATCHES,
+    SLOT_ACTION_ASK_QUIT,
+    SLOT_ACTION_HANDLE_QUIT_INPUT,
+    SLOT_ACTION_MSG_MAX_COINS,
+    SLOT_ACTION_WAIT_MSG_MAX_COINS,
+    SLOT_ACTION_MSG_NO_MORE_COINS,
+    SLOT_ACTION_WAIT_MSG_NO_MORE_COINS,
+    SLOT_ACTION_END,
+    SLOT_ACTION_FREE,
+};
+
+enum {
+    REEL_ACTION_STILL,
+    REEL_ACTION_SPIN,
+    REEL_ACTION_STOP,
+    REEL_ACTION_STOP_MOVE,
+    REEL_ACTION_STOP_SHAKE,
+};
+
+#define DIG_SPRITE_DUMMY {255, 0, 0}
+
+// Sprite template IDs for the digital display in the right panel
+enum {
+    DIG_SPRITE_REEL,
+    DIG_SPRITE_TIME,
+    DIG_SPRITE_INSERT,
+    DIG_SPRITE_WIN,
+    DIG_SPRITE_LOSE,
+    DIG_SPRITE_A_BUTTON,
+    DIG_SPRITE_SMOKE,
+    DIG_SPRITE_NUMBER,
+    DIG_SPRITE_POKE_BALL,
+    DIG_SPRITE_D_PAD,
+    DIG_SPRITE_STOP_S,
+    DIG_SPRITE_STOP_T,
+    DIG_SPRITE_STOP_O,
+    DIG_SPRITE_STOP_P,
+    DIG_SPRITE_BONUS_B,
+    DIG_SPRITE_BONUS_O,
+    DIG_SPRITE_BONUS_N,
+    DIG_SPRITE_BONUS_U,
+    DIG_SPRITE_BONUS_S,
+    DIG_SPRITE_BIG_B,
+    DIG_SPRITE_BIG_I,
+    DIG_SPRITE_BIG_G,
+    DIG_SPRITE_REG_R,
+    DIG_SPRITE_REG_E,
+    DIG_SPRITE_REG_G,
+    DIG_SPRITE_EMPTY,
+    NUM_DIG_DISPLAY_SPRITES
+};
+
+// IDs used by the digital display to set coords and callbacks for its sprites
+enum {
+    DIG_DISPINFO_INSERT,
+    DIG_DISPINFO_STOP_S,
+    DIG_DISPINFO_STOP_T,
+    DIG_DISPINFO_STOP_O,
+    DIG_DISPINFO_STOP_P,
+    DIG_DISPINFO_A_BUTTON_STOP,
+    DIG_DISPINFO_POKE_BALL_ROCKING,
+    DIG_DISPINFO_WIN,
+    DIG_DISPINFO_LOSE,
+    DIG_DISPINFO_SMOKE_NW,
+    DIG_DISPINFO_SMOKE_NE,
+    DIG_DISPINFO_SMOKE_SW,
+    DIG_DISPINFO_SMOKE_SE,
+    DIG_DISPINFO_REEL,
+    DIG_DISPINFO_TIME,
+    DIG_DISPINFO_NUMBER,
+    DIG_DISPINFO_DPAD,
+    DIG_DISPINFO_POKE_BALL_SHINING,
+    DIG_DISPINFO_REG_R,
+    DIG_DISPINFO_REG_E,
+    DIG_DISPINFO_REG_G,
+    DIG_DISPINFO_REG_BONUS_B,
+    DIG_DISPINFO_REG_BONUS_O,
+    DIG_DISPINFO_REG_BONUS_N,
+    DIG_DISPINFO_REG_BONUS_U,
+    DIG_DISPINFO_REG_BONUS_S,
+    DIG_DISPINFO_BIG_B,
+    DIG_DISPINFO_BIG_I,
+    DIG_DISPINFO_BIG_G,
+    DIG_DISPINFO_BIG_BONUS_B,
+    DIG_DISPINFO_BIG_BONUS_O,
+    DIG_DISPINFO_BIG_BONUS_N,
+    DIG_DISPINFO_BIG_BONUS_U,
+    DIG_DISPINFO_BIG_BONUS_S,
+    DIG_DISPINFO_A_BUTTON_START
+};
+
+// IDs for digital display "scenes", i.e. each of the screens it can show made up of sprites
+enum {
+    DIG_DISPLAY_INSERT_BET,
+    DIG_DISPLAY_STOP_REEL,
+    DIG_DISPLAY_WIN,
+    DIG_DISPLAY_LOSE,
+    DIG_DISPLAY_REEL_TIME,
+    DIG_DISPLAY_BONUS_REG,
+    DIG_DISPLAY_BONUS_BIG
+};
+
+struct SlotMachine
 {
     /*0x00*/ u8 state;
     /*0x01*/ u8 machineId;
@@ -42,11 +243,11 @@ struct SlotMachineEwramStruct
     /*0x03*/ u8 luckyGame;
     /*0x04*/ u8 luckyFlags;
     /*0x05*/ u8 reelTimeDraw;
-    /*0x06*/ u8 luckySpinsLeft;  // tentative
+    /*0x06*/ u8 isLuckySpin;
     /*0x07*/ u8 biasTag;
     /*0x08*/ u16 matchedSymbols;
-    /*0x0A*/ u8 fairRollsLeft;  // only happens if you win reeltime
-    /*0x0B*/ u8 fairRollsUsed;
+    /*0x0A*/ u8 reelTimeSpinsLeft;
+    /*0x0B*/ u8 reelTimeSpinsUsed;
     /*0x0C*/ s16 coins;
     /*0x0E*/ s16 payout;
     /*0x10*/ s16 netCoinLoss; // coins lost to machine (but never goes below 0)
@@ -55,26 +256,26 @@ struct SlotMachineEwramStruct
     /*0x16*/ s16 reeltimePosition;
     /*0x18*/ s16 currReel;
     /*0x1A*/ s16 reelIncrement; // speed of reel
-    /*0x1C*/ s16 reelPixelOffsets[3];
-    /*0x22*/ u16 reelPixelOffsetsWhileStopping[3];
-    /*0x28*/ s16 reelPositions[3];
-    /*0x2E*/ s16 reelExtraTurns[3];
-    /*0x34*/ s16 winnerRows[3];
-    /*0x3A*/ u8 slotReelTasks[3];
-    /*0x3D*/ u8 unkTaskPointer3D;
-    /*0x3E*/ u8 unkTaskPointer3E;
-    /*0x3F*/ u8 reelTimeSprite3F;
-    /*0x40*/ u8 unk40;
-    /*0x41*/ u8 unk41;
-    /*0x42*/ u8 unk42;
-    /*0x43*/ u8 unk43;
-    /*0x44*/ u8 unk44[5];
-    /*0x49*/ u8 unk49[2];
-    /*0x49*/ u8 unk4B[3];
-    /*0x4E*/ u8 unk4E[2];
-    /*0x50*/ u8 reelTimeSprites1[2];
-    /*0x52*/ u8 reelTimeSprites2[2];
-    /*0x54*/ u8 unk54[4];
+    /*0x1C*/ s16 reelPixelOffsets[NUM_REELS];
+    /*0x22*/ u16 reelPixelOffsetsWhileStopping[NUM_REELS];
+    /*0x28*/ s16 reelPositions[NUM_REELS];
+    /*0x2E*/ s16 reelExtraTurns[NUM_REELS];
+    /*0x34*/ s16 winnerRows[NUM_REELS];
+    /*0x3A*/ u8 slotReelTasks[NUM_REELS];
+    /*0x3D*/ u8 digDisplayTaskId;
+    /*0x3E*/ u8 pikaPowerBoltTaskId;
+    /*0x3F*/ u8 reelTimePikachuSpriteId;
+    /*0x40*/ u8 reelTimeNumberGapSpriteId;
+    /*0x41*/ u8 reelTimeExplosionSpriteId;
+    /*0x42*/ u8 reelTimeBrokenMachineSpriteId;
+    /*0x43*/ u8 reelTimeSmokeSpriteId;
+    /*0x44*/ u8 flashMatchLineSpriteIds[NUM_MATCH_LINES];
+    /*0x49*/ u8 reelTimeMachineSpriteIds[2];
+    /*0x49*/ u8 reelTimeNumberSpriteIds[3];
+    /*0x4E*/ u8 reelTimeShadowSpriteIds[2];
+    /*0x50*/ u8 reelTimeBoltSpriteIds[2];
+    /*0x52*/ u8 reelTimePikachuAuraSpriteIds[2];
+    /*0x54*/ u8 reelTimeDuckSpriteIds[4];
     /*0x58*/ u16 win0h;
     /*0x5a*/ u16 win0v;
     /*0x5c*/ u16 winIn;
@@ -83,66 +284,62 @@ struct SlotMachineEwramStruct
     /*0x64*/ MainCallback prevMainCb;
 };
 
-struct UnkStruct1
+struct DigitalDisplaySprite
 {
-    /*0x00*/ u8 unk00;
-    /*0x01*/ u8 unk01;
-    /*0x02*/ s16 unk02;
+    /*0x00*/ u8 spriteTemplateId;
+    /*0x01*/ u8 dispInfoId;
+    /*0x02*/ s16 spriteId;
 };
 
-#define SLOTMACHINE_GFX_TILES 233
-
 static void CB2_SlotMachineSetup(void);
-static void CB2_SlotMachineLoop(void);
-static void PlaySlotMachine_Internal(u8 slotMachineIndex, MainCallback cb);
-static void SlotMachineDummyTask(u8 taskId);
-static void SlotMachineSetup_0_0(void);
-static void SlotMachineSetup_6_2(void);
-static void SlotMachineSetup_1_0(void);
-static void SlotMachineSetup_2_0(void);
-static void SlotMachineSetup_2_1(void);
-static void SlotMachineSetup_0_1(void);
-static void SlotMachineSetup_3_0(void);
-static void SlotMachineSetup_4_0(void);
-static void SlotMachineSetup_5_0(void);
-static void SlotMachineSetup_6_0(void);
-static void SlotMachineSetup_6_1(void);
-static void SlotMachineSetup_8_0(void);
-static void SlotMachineSetup_9_0(void);
-static void SlotMachineSetup_10_0(void);
-static void SlotMachineSetupGameplayTasks(void);
-static void GameplayTasks_Slots(void);
-static void sub_8104DA4(void);
-static void RunSlotActions(u8 taskId);
-static bool8 SlotAction_UnfadeScreen(struct Task *task);
-static bool8 SlotAction_WaitForUnfade(struct Task *task);
-static bool8 SlotAction_SetSlotMachineVars(struct Task *task);
-static bool8 SlotAction3(struct Task *task);
-static bool8 SlotAction4(struct Task *task);
-static bool8 SlotAction_AwaitPlayerInput(struct Task *task);
-static bool8 SlotAction_PrintYouDontHaveThreeCoins(struct Task *task);
-static bool8 SlotAction_ExitYouDontHaveThreeCoinsMessage(struct Task *task);
-static bool8 SlotAction_GivingInformation(struct Task *task);
-static bool8 SlotAction9(struct Task *task);
-static bool8 SlotAction10(struct Task *task);
-static bool8 SlotAction_SetLuckySpins(struct Task *task);
-static bool8 SlotAction_AwaitReelStop(struct Task *task);
-static bool8 SlotAction_WaitForAllReelsToStop(struct Task *task);
-static bool8 SlotAction_CheckMatches(struct Task *task);
-static bool8 SlotAction_WaitForPayoutToBeAwarded(struct Task *task);
-static bool8 SlotAction_EndOfRoll(struct Task *task);
-static bool8 SlotAction_MatchedPower(struct Task *task);
-static bool8 SlotAction18(struct Task *task);
-static bool8 SlotAction_Loop(struct Task *task);
-static bool8 SlotAction_NoMatches(struct Task *task);
-static bool8 SlotAction_PrintQuitTheGame(struct Task *task);
-static bool8 SlotAction_SeeIfPlayerQuits(struct Task *task);
-static bool8 SlotAction_PrintMessage_9999Coins(struct Task *task);
-static bool8 SlotAction_ExitMessage_9999Coins(struct Task *task);
-static bool8 SlotAction_PrintMessage_NoMoreCoins(struct Task *task);
-static bool8 SlotAction_ExitMessage_NoMoreCoins(struct Task *task);
-static bool8 SlotAction_EndGame(struct Task *task);
-static bool8 SlotAction_FreeDataStructures(struct Task *task);
+static void CB2_SlotMachine(void);
+static void PlaySlotMachine_Internal(u8, MainCallback);
+static void SlotMachineDummyTask(u8);
+static void SlotMachineSetup_InitBgsWindows(void);
+static void SlotMachineSetup_InitVRAM(void);
+static void SlotMachineSetup_InitOAM(void);
+static void SlotMachineSetup_InitGpuRegs(void);
+static void SlotMachineSetup_InitSlotMachineStruct(void);
+static void SlotMachineSetup_InitPalsSpritesTasks(void);
+static void SlotMachineSetup_InitTilemaps(void);
+static void SlotMachineSetup_LoadGfxAndTilemaps(void);
+static void SlotMachineSetup_InitVBlank(void);
+static void AllocDigitalDisplayGfx(void);
+static void SetDigitalDisplayImagePtrs(void);
+static void CreateSlotMachineSprites(void);
+static void CreateGameplayTasks(void);
+static void CreateSlotMachineTask(void);
+static void DestroyDigitalDisplayScene(void);
+static void Task_SlotMachine(u8);
+static bool8 SlotAction_UnfadeScreen(struct Task *);
+static bool8 SlotAction_WaitForUnfade(struct Task *);
+static bool8 SlotAction_ReadyNewSpin(struct Task *);
+static bool8 SlotAction_ReadyNewReelTimeSpin(struct Task *);
+static bool8 SlotAction_AskInsertBet(struct Task *);
+static bool8 SlotAction_HandleBetInput(struct Task *);
+static bool8 SlotAction_PrintMsg_Need3Coins(struct Task *);
+static bool8 SlotAction_WaitMsg_Need3Coins(struct Task *);
+static bool8 SlotAction_WaitForInfoBox(struct Task *);
+static bool8 SlotAction_StartSpin(struct Task *);
+static bool8 SlotAction_StartReelTimeSpin(struct Task *);
+static bool8 SlotAction_SetLuckySpins(struct Task *);
+static bool8 SlotAction_AwaitReelStop(struct Task *);
+static bool8 SlotAction_WaitForAllReelsToStop(struct Task *);
+static bool8 SlotAction_CheckMatches(struct Task *);
+static bool8 SlotAction_WaitForPayoutToBeAwarded(struct Task *);
+static bool8 SlotAction_EndPayout(struct Task *);
+static bool8 SlotAction_MatchedPower(struct Task *);
+static bool8 SlotAction_WaitReelTimeAnim(struct Task *);
+static bool8 SlotAction_ResetBetTiles(struct Task *);
+static bool8 SlotAction_NoMatches(struct Task *);
+static bool8 SlotAction_AskQuit(struct Task *);
+static bool8 SlotAction_HandleQuitInput(struct Task *);
+static bool8 SlotAction_PrintMsg_9999Coins(struct Task *);
+static bool8 SlotAction_WaitMsg_9999Coins(struct Task *);
+static bool8 SlotAction_PrintMsg_NoMoreCoins(struct Task *);
+static bool8 SlotAction_WaitMsg_NoMoreCoins(struct Task *);
+static bool8 SlotAction_EndGame(struct Task *);
+static bool8 SlotAction_FreeDataStructures(struct Task *);
 static void DrawLuckyFlags(void);
 static void SetLuckySpins(void);
 static bool8 IsThisRoundLucky(void);
@@ -153,33 +350,33 @@ static void CheckMatch(void);
 static void CheckMatch_CenterRow(void);
 static void CheckMatch_TopAndBottom(void);
 static void CheckMatch_Diagonals(void);
-static u8 GetMatchFromSymbolsInRow(u8 c1, u8 c2, u8 c3);
+static u8 GetMatchFromSymbols(u8, u8, u8);
 static void AwardPayout(void);
-static void RunAwardPayoutActions(u8 taskId);
+static void RunAwardPayoutActions(u8);
 static bool8 IsFinalTask_RunAwardPayoutActions(void);
-static bool8 AwardPayoutAction0(struct Task *task);
-static bool8 AwardPayoutAction_GivePayoutToPlayer(struct Task *task);
-static bool8 AwardPayoutAction_FreeTask(struct Task *task);
-static u8 GetTagAtRest(u8 x, s16 y);
-static void GameplayTask_StopSlotReel(void);
-static void ReelTasks_SetUnkTaskData(u8 a0);
-static void sub_8102E1C(u8 a0);
-static bool8 IsSlotReelMoving(u8 a0);
-static void RunSlotReelActions(u8 taskId);
-static bool8 SlotReelAction_StayStill(struct Task *task);
-static bool8 SlotReelAction_Spin(struct Task *task);
-static bool8 SlotReelAction_DecideWhereToStop(struct Task *task);
-static bool8 SlotReelAction_MoveToStop(struct Task *task);
-static bool8 SlotReelAction_OscillatingStop(struct Task *task);
+static bool8 AwardPayoutAction0(struct Task *);
+static bool8 AwardPayoutAction_GivePayoutToPlayer(struct Task *);
+static bool8 AwardPayoutAction_FreeTask(struct Task *);
+static u8 GetTagAtRest(u8, s16);
+static void CreateSlotReelTasks(void);
+static void SpinSlotReel(u8);
+static void StopSlotReel(u8);
+static bool8 IsSlotReelMoving(u8);
+static void Task_RunSlotReelActions(u8);
+static bool8 SlotReelAction_StayStill(struct Task *);
+static bool8 SlotReelAction_Spin(struct Task *);
+static bool8 SlotReelAction_DecideWhereToStop(struct Task *);
+static bool8 SlotReelAction_MoveToStop(struct Task *);
+static bool8 SlotReelAction_OscillatingStop(struct Task *);
 static bool8 DecideReelTurns_BiasTag_Reel1(void);
-static bool8 DecideReelTurns_BiasTag_Reel1_Bet1(u8 a0, u8 a1);
-static bool8 DecideReelTurns_BiasTag_Reel1_Bet2or3(u8 a0, u8 a1);
+static bool8 DecideReelTurns_BiasTag_Reel1_Bet1(u8, u8);
+static bool8 DecideReelTurns_BiasTag_Reel1_Bet2or3(u8, u8);
 static bool8 DecideReelTurns_BiasTag_Reel2(void);
 static bool8 DecideReelTurns_BiasTag_Reel2_Bet1or2(void);
 static bool8 DecideReelTurns_BiasTag_Reel2_Bet3(void);
 static bool8 DecideReelTurns_BiasTag_Reel3(void);
-static bool8 DecideReelTurns_BiasTag_Reel3_Bet1or2(u8 a0);
-static bool8 DecideReelTurns_BiasTag_Reel3_Bet3(u8 a0);
+static bool8 DecideReelTurns_BiasTag_Reel3_Bet1or2(u8);
+static bool8 DecideReelTurns_BiasTag_Reel3_Bet3(u8);
 static void DecideReelTurns_NoBiasTag_Reel1(void);
 static void DecideReelTurns_NoBiasTag_Reel2(void);
 static void DecideReelTurns_NoBiasTag_Reel2_Bet1(void);
@@ -189,243 +386,238 @@ static void DecideReelTurns_NoBiasTag_Reel3(void);
 static void DecideReelTurns_NoBiasTag_Reel3_Bet1(void);
 static void DecideReelTurns_NoBiasTag_Reel3_Bet2(void);
 static void DecideReelTurns_NoBiasTag_Reel3_Bet3(void);
-static void sub_8103C14(u8 a0);
-static void sub_8103C48(u8 taskId);
-static void LoadBetTiles(u8 a0);
-static void sub_8103C78(struct Task *task, u8 taskId);
-static void sub_8103CAC(struct Task *task, u8 taskId);
-static void sub_8103CC8(struct Task *task, u8 taskId);
-static void sub_8103D8C(u8 a0);
-static void sub_8103DC8(void);
-static void sub_8103E04(u8 a0);
-static bool8 sub_8103E38(void);
-static bool8 sub_8103E7C(void);
-static bool8 sub_8103EAC(u8 spriteId);
-static void sub_8103EE4(struct Sprite *sprite);
-static void sub_8103F70(void);
-static bool8 sub_8103FA0(void);
-static void sub_8103FE8_(u8 taskId);
-static void GameplayTask_PikaPower(void);
-static void DisplayPikaPower(u8 pikaPower);
-static bool8 sub_81040C8(void);
-static void sub_81040E8(u8 taskId);
-static void nullsub_68(struct Task *task);
-static void sub_810411C(struct Task *task);
-static void sub_8104144(struct Task *task);
-static void sub_81041AC(struct Task *task);
-static void ClearTaskDataFields_2orHigher(struct Task *task);
-static void sub_810423C(u8 pikaPower);
-static void BeginReeltime(void);
-static bool8 IsFinalTask_RunReelTimeActions(void);
-static void RunReeltimeActions(u8 taskId);
-static void ReeltimeAction0(struct Task *task);
-static void ReeltimeAction1(struct Task *task);
-static void ReeltimeAction2(struct Task *task);
-static void ReeltimeAction3(struct Task *task);
-static void ReeltimeAction4(struct Task *task);
-static void ReeltimeAction5(struct Task *task);
-static void ReeltimeAction6(struct Task *task);
-static void ReelTimeAction_LandOnOutcome(struct Task *task);
-static void ReeltimeAction8(struct Task *task);
-static void ReeltimeAction9(struct Task *task);
-static void ReeltimeAction10(struct Task *task);
-static void ReeltimeAction11(struct Task *task);
-static void ReeltimeAction12(struct Task *task);
-static void ReeltimeAction13(struct Task *task);
-static void ReeltimeAction14(struct Task *task);
-static void ReeltimeAction15(struct Task *task);
-static void ReeltimeAction16(struct Task *task);
-static void ReeltimeAction17(struct Task *task);
-static void sub_8104A40(s16 a0, s16 a1);
-static void sub_8104A88(s16 a0);
-static void OpenInfoBox(u8 a0);
+static void PressStopReelButton(u8);
+static void Task_PressStopReelButton(u8);
+static void LightenBetTiles(u8);
+static void StopReelButton_Press(struct Task *, u8);
+static void StopReelButton_Wait(struct Task *, u8);
+static void StopReelButton_Unpress(struct Task *, u8);
+static void DarkenBetTiles(u8);
+static void CreateInvisibleFlashMatchLineSprites(void);
+static void FlashMatchLine(u8);
+static bool8 IsMatchLineDoneFlashingBeforePayout(void);
+static bool8 TryStopMatchLinesFlashing(void);
+static bool8 TryStopMatchLineFlashing(u8);
+static void SpriteCB_FlashMatchingLines(struct Sprite *);
+static void FlashSlotMachineLights(void);
+static bool8 TryStopSlotMachineLights(void);
+static void Task_FlashSlotMachineLights(u8);
+static void CreatePikaPowerBoltTask(void);
+static void AddPikaPowerBolt(u8);
+static bool8 IsPikaPowerBoltAnimating(void);
+static void Task_CreatePikaPowerBolt(u8);
+static void PikaPowerBolt_Idle(struct Task *);
+static void PikaPowerBolt_AddBolt(struct Task *);
+static void PikaPowerBolt_WaitAnim(struct Task *);
+static void PikaPowerBolt_ClearAll(struct Task *);
+static void ResetPikaPowerBoltTask(struct Task *);
+static void LoadPikaPowerMeter(u8 );
+static void BeginReelTime(void);
+static bool8 IsReelTimeTaskDone(void);
+static void Task_ReelTime(u8 );
+static void ReelTime_Init(struct Task *);
+static void ReelTime_WindowEnter(struct Task *);
+static void ReelTime_WaitStartPikachu(struct Task *);
+static void ReelTime_PikachuSpeedUp1(struct Task *);
+static void ReelTime_PikachuSpeedUp2(struct Task *);
+static void ReelTime_WaitReel(struct Task *);
+static void ReelTime_CheckExplode(struct Task *);
+static void ReelTime_LandOnOutcome(struct Task *);
+static void ReelTime_PikachuReact(struct Task *);
+static void ReelTime_WaitClearPikaPower(struct Task *);
+static void ReelTime_CloseWindow(struct Task *);
+static void ReelTime_DestroySprites(struct Task *);
+static void ReelTime_SetReelIncrement(struct Task *);
+static void ReelTime_EndSuccess(struct Task *);
+static void ReelTime_ExplodeMachine(struct Task *);
+static void ReelTime_WaitExplode(struct Task *);
+static void ReelTime_WaitSmoke(struct Task *);
+static void ReelTime_EndFailure(struct Task *);
+static void LoadReelTimeWindowTilemap(s16, s16);
+static void ClearReelTimeWindowTilemap(s16);
+static void OpenInfoBox(u8);
 static bool8 IsInfoBoxClosed(void);
-static void RunInfoBoxActions(u8 taskId);
-static void InfoBox_FadeIn(struct Task *task);
-static void InfoBox_WaitForFade(struct Task *task);
-static void InfoBox_8104B80(struct Task *task);
-static void InfoBox_AwaitPlayerInput(struct Task *task);
-static void InfoBox_AddText(struct Task *task);
-static void InfoBox_8104BFC(struct Task *task);
-static void InfoBox_812DE14(struct Task *task);
-static void InfoBox_812DE30(struct Task *task);
-static void InfoBox_FreeTask(struct Task *task);
-static void sub_8104C5C(void);
-static void sub_8104CAC(u8 arg0);
-static bool8 sub_8104E18(void);
-static void nullsub_69(struct Task *task);
-static void sub_8104E74_(u8 taskId);
-static void sub_8104EA8(void);
-static void sub_8104F8C(void);
-static void sub_8104FF4(s16 x, s16 y, u8 a2, s16 a3);
-static void sub_81050C4(void);
-static void sub_8105100(void);
-static void sub_810514C(void);
-static void sub_81051C0(void);
-static void sub_8105284_(void);
-static void sub_81052EC(void);
-static void sub_81053A0(void);
-static void sub_810545C(void);
-static void sub_81054B8(void);
-static void sub_8105524(void);
-static void sub_8105554(void);
-static void CreateReelTimeSprites1(void);
-static void sub_8105688(s16 a0);
-static void sub_81056C0(void);
-static void CreateReelTimeSprite2(void);
-static void sub_81057E8(s16 a0);
-static void sub_8105804(void);
-static void sub_8105854(void);
-static void sub_81058A0(void);
-static void sub_81058C4(void);
-static void sub_81059B8(void);
-static void sub_81059E8(void);
-static bool8 sub_8105ACC(void);
-static void sub_8105AEC(void);
-static u8 sub_8105B1C(s16 x, s16 y);
-static void sub_8105B88(u8 spriteId);
-static u8 sub_8105BF8(u8 templateIdx, void (*callback)(struct Sprite*), s16 x, s16 y, s16 a4);
-static void sub_81063C0(void);
-static void sub_8106404(void);
-static void sub_8106448(void);
-static void sub_81064B8(void);
-static void sub_81065A8(s16 arg0, u16 arg1, u16 arg2, u16 arg3, u16 arg4);
-static void sub_81065DC(void);
-static void sub_812F958(void);
-static void sub_812F968(void);
-static void LoadSlotMachineWheelOverlay(void);
-static u8 sub_8105BB4(u8 templateIdx, u8 cbAndCoordsIdx, s16 a2);
-static void sub_8105C64(struct Sprite *sprite);
-static void sub_8105F54(struct Sprite *sprite);
-static void sub_8105F9C(struct Sprite *sprite);
-static void sub_8105EB4(struct Sprite *sprite);
-static void sub_8105C6C(struct Sprite *sprite);
-static void sub_8105CF0(struct Sprite *sprite);
-static void sub_8105D08(struct Sprite *sprite);
-static void sub_8105D20(struct Sprite *sprite);
-static void sub_8105D3C(struct Sprite *sprite);
-static void sub_8105DA4(struct Sprite *sprite);
-static void sub_8105E08(struct Sprite *sprite);
-static void sub_8106058(struct Sprite *sprite);
-static void sub_81060FC(struct Sprite *sprite);
-static void sub_81061C8(struct Sprite *sprite);
-static void sub_8106230(struct Sprite *sprite);
-static void sub_810639C(void);
-static void sub_8106364(void);
-static void sub_8106370(void);
-static void nullsub_70(void);
-static void sub_8104F18(struct Sprite *sprite);
-static void sub_810506C(struct Sprite *sprite);
-static void sub_8105170(struct Sprite *sprite);
-static void sub_810535C(struct Sprite *sprite);
-static void sub_810562C(struct Sprite *sprite);
-static void sub_8105784(struct Sprite *sprite);
-static void sub_8105894(struct Sprite *sprite);
-static void sub_810594C(struct Sprite *sprite);
-static void sub_8105A38(struct Sprite *sprite);
-static void sub_8105B70(struct Sprite *sprite);
+static void RunInfoBoxActions(u8 );
+static void InfoBox_FadeIn(struct Task *);
+static void InfoBox_WaitForFade(struct Task *);
+static void InfoBox_DrawWindow(struct Task *);
+static void InfoBox_AwaitPlayerInput(struct Task *);
+static void InfoBox_AddText(struct Task *);
+static void InfoBox_LoadPikaPowerMeter(struct Task *);
+static void InfoBox_LoadSlotMachineTilemap(struct Task *);
+static void InfoBox_CreateDigitalDisplay(struct Task *);
+static void InfoBox_FreeTask(struct Task *);
+static void CreateDigitalDisplayTask(void);
+static void CreateDigitalDisplayScene(u8 );
+static bool8 IsDigitalDisplayAnimFinished(void);
+static void DigitalDisplay_Idle(struct Task *);
+static void Task_DigitalDisplay(u8);
+static void CreateReelSymbolSprites(void);
+static void CreateCreditPayoutNumberSprites(void);
+static void CreateCoinNumberSprite(s16, s16, u8, s16);
+static void CreateReelBackgroundSprite(void);
+static void CreateReelTimePikachuSprite(void);
+static void DestroyReelTimePikachuSprite(void);
+static void CreateReelTimeMachineSprites(void);
+static void CreateBrokenReelTimeMachineSprite(void);
+static void CreateReelTimeNumberSprites(void);
+static void CreateReelTimeShadowSprites(void);
+static void CreateReelTimeNumberGapSprite(void);
+static void DestroyReelTimeMachineSprites(void);
+static void DestroyReelTimeShadowSprites(void);
+static void DestroyBrokenReelTimeMachineSprite(void);
+static void CreateReelTimeBoltSprites(void);
+static void SetReelTimeBoltDelay(s16);
+static void DestroyReelTimeBoltSprites(void);
+static void CreateReelTimePikachuAuraSprites(void);
+static void SetReelTimePikachuAuraFlashDelay(s16);
+static void DestroyReelTimePikachuAuraSprites(void);
+static void CreateReelTimeExplosionSprite(void);
+static void DestroyReelTimeExplosionSprite(void);
+static void CreateReelTimeDuckSprites(void);
+static void DestroyReelTimeDuckSprites(void);
+static void CreateReelTimeSmokeSprite(void);
+static bool8 IsReelTimeSmokeAnimFinished(void);
+static void DestroyReelTimeSmokeSprite(void);
+static u8 CreatePikaPowerBoltSprite(s16, s16);
+static void DestroyPikaPowerBoltSprite(u8);
+static u8 CreateDigitalDisplaySprite(u8, void (*callback)(struct Sprite*), s16, s16, s16);
+static void LoadSlotMachineGfx(void);
+static void LoadReelBackground(void);
+static void LoadMenuGfx(void);
+static void LoadMenuAndReelOverlayTilemaps(void);
+static void SetReelButtonTilemap(s16, u16, u16, u16, u16);
+static void LoadInfoBoxTilemap(void);
+static void LoadSlotMachineMenuTilemap(void);
+static void LoadSlotMachineReelOverlay(void);
+static u8 CreateStdDigitalDisplaySprite(u8, u8, s16);
+static void SpriteCB_DigitalDisplay_Static(struct Sprite *);
+static void SpriteCB_DigitalDisplay_Stop(struct Sprite *);
+static void SpriteCB_DigitalDisplay_AButtonStop(struct Sprite *);
+static void SpriteCB_DigitalDisplay_PokeballRocking(struct Sprite *);
+static void SpriteCB_DigitalDisplay_Smoke(struct Sprite *);
+static void SpriteCB_DigitalDisplay_SmokeNE(struct Sprite *);
+static void SpriteCB_DigitalDisplay_SmokeSW(struct Sprite *);
+static void SpriteCB_DigitalDisplay_SmokeSE(struct Sprite *);
+static void SpriteCB_DigitalDisplay_Reel(struct Sprite *);
+static void SpriteCB_DigitalDisplay_Time(struct Sprite *);
+static void SpriteCB_DigitalDisplay_ReelTimeNumber(struct Sprite *);
+static void SpriteCB_DigitalDisplay_PokeballShining(struct Sprite *);
+static void SpriteCB_DigitalDisplay_RegBonus(struct Sprite *);
+static void SpriteCB_DigitalDisplay_BigBonus(struct Sprite *);
+static void SpriteCB_DigitalDisplay_AButtonStart(struct Sprite *);
+static void EndDigitalDisplayScene_InsertBet(void);
+static void EndDigitalDisplayScene_StopReel(void);
+static void EndDigitalDisplayScene_Win(void);
+static void EndDigitalDisplayScene_Dummy(void);
+static void SpriteCB_ReelSymbol(struct Sprite *);
+static void SpriteCB_CoinNumber(struct Sprite *);
+static void SpriteCB_ReelTimePikachu(struct Sprite *);
+static void SpriteCB_ReelTimeNumbers(struct Sprite *);
+static void SpriteCB_ReelTimeBolt(struct Sprite *);
+static void SpriteCB_ReelTimePikachuAura(struct Sprite *);
+static void SpriteCB_ReelTimeExplosion(struct Sprite *);
+static void SpriteCB_ReelTimeDuck(struct Sprite *);
+static void SpriteCB_ReelTimeSmoke(struct Sprite *);
+static void SpriteCB_PikaPowerBolt(struct Sprite *);
 
 // Ewram variables
-static EWRAM_DATA u16 *sUnknown_0203AAC8 = NULL;
+static EWRAM_DATA u16 *sMenuGfx = NULL;
 static EWRAM_DATA u16 *sSelectedPikaPowerTile = NULL;
-static EWRAM_DATA u16 *sUnknown_0203AAD0 = NULL;
-static EWRAM_DATA u8 *sUnknown_0203AAD4 = NULL;
-static EWRAM_DATA u8 *sUnknown_0203AAD8 = NULL;
-static EWRAM_DATA u16 *sUnknown_0203AADC = NULL;
-static EWRAM_DATA u8 *sUnknown_0203AAE0 = NULL;
-static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AAE4 = NULL;
-static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AAE8 = NULL;
-static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AAEC = NULL;
-static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AAF0 = NULL;
-static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AAF4 = NULL;
-static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AAF8 = NULL;
-static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AAFC = NULL;
-static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AB00 = NULL;
-static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AB04 = NULL;
-static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AB08 = NULL;
-static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AB0C = NULL;
-static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AB10 = NULL;
-static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AB14 = NULL;
-static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AB18 = NULL;
-static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AB1C = NULL;
-static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AB20 = NULL;
-static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AB24 = NULL;
-static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AB28 = NULL;
-static EWRAM_DATA struct SpriteSheet *sUnknown_0203AB2C = NULL;
-static EWRAM_DATA struct SpriteSheet *sUnknown_0203AB30 = NULL;
-static EWRAM_DATA struct SlotMachineEwramStruct *sSlotMachine = NULL;
+static EWRAM_DATA u16 *sReelOverlay_Tilemap = NULL;
+static EWRAM_DATA u8 *sDigitalDisplayGfxPtr = NULL;
+static EWRAM_DATA u8 *sReelTimeGfxPtr = NULL;
+static EWRAM_DATA u16 *sReelButtonPress_Tilemap = NULL;
+static EWRAM_DATA u8 *sReelBackground_Gfx = NULL;
+static EWRAM_DATA struct SpriteFrameImage *sImageTable_ReelTimePikachu = NULL;
+static EWRAM_DATA struct SpriteFrameImage *sImageTable_ReelTimeMachineAntennae = NULL;
+static EWRAM_DATA struct SpriteFrameImage *sImageTable_ReelTimeMachine = NULL;
+static EWRAM_DATA struct SpriteFrameImage *sImageTable_BrokenReelTimeMachine = NULL;
+static EWRAM_DATA struct SpriteFrameImage *sImageTable_DigitalDisplay_Reel = NULL;
+static EWRAM_DATA struct SpriteFrameImage *sImageTable_DigitalDisplay_Time = NULL;
+static EWRAM_DATA struct SpriteFrameImage *sImageTable_DigitalDisplay_Insert = NULL;
+static EWRAM_DATA struct SpriteFrameImage *sImageTable_DigitalDisplay_Stop = NULL;
+static EWRAM_DATA struct SpriteFrameImage *sImageTable_DigitalDisplay_Win = NULL;
+static EWRAM_DATA struct SpriteFrameImage *sImageTable_DigitalDisplay_Lose = NULL;
+static EWRAM_DATA struct SpriteFrameImage *sImageTable_DigitalDisplay_Bonus = NULL;
+static EWRAM_DATA struct SpriteFrameImage *sImageTable_DigitalDisplay_Big = NULL;
+static EWRAM_DATA struct SpriteFrameImage *sImageTable_DigitalDisplay_Reg = NULL;
+static EWRAM_DATA struct SpriteFrameImage *sImageTable_DigitalDisplay_AButton = NULL;
+static EWRAM_DATA struct SpriteFrameImage *sImageTable_DigitalDisplay_Smoke = NULL;
+static EWRAM_DATA struct SpriteFrameImage *sImageTable_DigitalDisplay_Number = NULL;
+static EWRAM_DATA struct SpriteFrameImage *sImageTable_DigitalDisplay_Pokeball = NULL;
+static EWRAM_DATA struct SpriteFrameImage *sImageTable_DigitalDisplay_DPad = NULL;
+static EWRAM_DATA struct SpriteSheet *sReelBackgroundSpriteSheet = NULL;
+static EWRAM_DATA struct SpriteSheet *sSlotMachineSpritesheetsPtr = NULL;
+static EWRAM_DATA struct SlotMachine *sSlotMachine = NULL;
 
 // IWRAM bss
-static struct SpriteFrameImage *gUnknown_03001188[26];
+static struct SpriteFrameImage *sImageTables_DigitalDisplay[NUM_DIG_DISPLAY_SPRITES];
 
 // Const rom data.
-static const struct UnkStruct1 *const gUnknown_083ED048[];
-static const u16 gPalette_83EDE24[];
-static const u8 gLuckyRoundProbabilities[][3];
-static const u8 gBiasTags[];
-static const u16 gLuckyFlagSettings_Top3[];
-static const u16 gLuckyFlagSettings_NotTop3[];
-static const s16 gUnknown_083ECE7E[][2];
-static const SpriteCallback gUnknown_083ECF0C[];
-static const struct SpriteTemplate *const gUnknown_083EDB5C[];
-static const struct SubspriteTable *const gUnknown_083EDBC4[];
-static const struct SpriteTemplate gSpriteTemplate_83ED6CC;
-static const struct SpriteTemplate gSpriteTemplate_83ED564;
-static const struct SpriteTemplate gSpriteTemplate_83ED54C;
-static const struct SpriteTemplate gSpriteTemplate_83ED534;
-static const u8 gUnknown_083ECC58[2];
-static const struct SpriteTemplate gSpriteTemplate_83ED51C;
-static const u16 gProbabilityTable_SkipToReeltimeAction14[];
-static const u16 *const gUnknown_083EDE10[];
-static const u16 gReelIncrementTable[][2];
-static const u16 gReelTimeBonusIncrementTable[];
-static const u16 gSlotMatchFlags[];
-static const u16 gSlotPayouts[];
-static const u8 *const gUnknown_083EDCE4;
-static const u8 *const gUnknown_083EDCDC;
-static const u32 gReelTimeGfx[];
-static const struct SpriteSheet gSlotMachineSpriteSheets[22];
-static const struct SpritePalette gSlotMachineSpritePalettes[];
-static const u16 *const gUnknown_083EDE20;
-static const s16 gInitialReelPositions[][2];
-static const struct BgTemplate gUnknown_085A7424[4];
-static const struct WindowTemplate gUnknown_085A7434[];
-static const u8 gLuckyFlagProbabilities_Top3[][6];
-static const u8 gLuckyFlagProbabilities_NotTop3[][6];
-static const u8 gReeltimeProbabilities_UnluckyGame[][17];
-static const u8 gReelTimeProbabilities_LuckyGame[][17];
-static const u8 gSym2Match[];
-static const u8 gReelTimeTags[];
-static const u8 gReelSymbols[][REEL_NUM_TAGS];
-static const u8 *const gUnknown_083EDD08[];
-static const u16 *const gUnknown_083EDD1C[];
-static const u8 gUnknown_083EDD30[];
-static const u8 gBettingTilesId[][2];
-static const u8 gNumberBettingTiles[];
-static const u16 *const gUnknown_083EDDA0[];
-static const u16 *const gUnknown_083EDDAC;
-static const u16 gReelTimeWindowTilemap[];
-static const u16 gUnknown_085A9898[];
-static void (*const gUnknown_083ED064[])(void);
-static const struct SpriteTemplate gSpriteTemplate_83ED504;
-static const struct SpriteTemplate gSpriteTemplate_83ED4EC;
-static const struct SpriteTemplate gSpriteTemplate_83ED4D4;
-static const struct SpriteTemplate gSpriteTemplate_83ED4BC;
-static const struct SpriteTemplate gSpriteTemplate_83ED4A4;
-static const struct SpriteTemplate gSpriteTemplate_83ED474;
-static const struct SpriteTemplate gSpriteTemplate_83ED48C;
-static const struct SpriteTemplate gSpriteTemplate_83ED444;
-static const struct SpriteTemplate gSpriteTemplate_83ED42C;
-static const struct SpriteTemplate gSpriteTemplate_83ED414;
-static const struct SpriteTemplate gSpriteTemplate_83ED45C;
-static const struct SubspriteTable gSubspriteTables_83ED7D4[];
-static const struct SubspriteTable gSubspriteTables_83ED7B4[];
-static const struct SubspriteTable gSubspriteTables_83ED78C[];
-static const struct SubspriteTable gSubspriteTables_83ED73C[];
-static const struct SubspriteTable gSubspriteTables_83ED75C[];
-static const struct SubspriteTable gSubspriteTables_83ED704[];
-
-static const struct BgTemplate gUnknown_085A7424[] =
+static const struct DigitalDisplaySprite *const sDigitalDisplayScenes[];
+static const u16 sUnkPalette[];
+static const u8 sLuckyRoundProbabilities[][3];
+static const u8 sBiasTags[];
+static const u16 sLuckyFlagSettings_Top3[];
+static const u16 sLuckyFlagSettings_NotTop3[];
+static const s16 sDigitalDisplay_SpriteCoords[][2];
+static const SpriteCallback sDigitalDisplay_SpriteCallbacks[];
+static const struct SpriteTemplate *const sSpriteTemplates_DigitalDisplay[NUM_DIG_DISPLAY_SPRITES];
+static const struct SubspriteTable *const sSubspriteTables_DigitalDisplay[NUM_DIG_DISPLAY_SPRITES];
+static const struct SpriteTemplate sSpriteTemplate_PikaPowerBolt;
+static const struct SpriteTemplate sSpriteTemplate_ReelTimeSmoke;
+static const struct SpriteTemplate sSpriteTemplate_ReelTimeDuck;
+static const struct SpriteTemplate sSpriteTemplate_ReelTimeExplosion;
+static const struct SpriteTemplate sSpriteTemplate_ReelTimePikachuAura;
+static const u16 sReelTimeExplodeProbability[];
+static const u16 *const sPokeballShiningPalTable[];
+static const u16 sReelIncrementTable[][2];
+static const u16 sReelTimeBonusIncrementTable[];
+static const u16 sSlotMatchFlags[];
+static const u16 sSlotPayouts[];
+static const u8 *const sReelBackground_Tilemap;
+static const u32 sReelTimeGfx[];
+static const struct SpriteSheet sSlotMachineSpriteSheets[22];
+static const struct SpritePalette sSlotMachineSpritePalettes[];
+static const u16 *const sDigitalDisplay_Pal;
+static const s16 sInitialReelPositions[NUM_REELS][2];
+static const u8 sLuckyFlagProbabilities_Top3[][6];
+static const u8 sLuckyFlagProbabilities_NotTop3[][6];
+static const u8 sReeltimeProbabilities_UnluckyGame[][17];
+static const u8 sReelTimeProbabilities_LuckyGame[][17];
+static const u8 sSymToMatch[];
+static const u8 sReelTimeTags[];
+static const u8 sReelSymbolTileTags[NUM_REELS][SYMBOLS_PER_REEL];
+static const u16 *const sLitMatchLinePalTable[NUM_MATCH_LINES];
+static const u16 *const sDarkMatchLinePalTable[NUM_MATCH_LINES];
+static const u8 sMatchLinePalOffsets[NUM_MATCH_LINES];
+static const u8 sBetToMatchLineIds[MAX_BET][2];
+static const u8 sMatchLinesPerBet[MAX_BET];
+static const u16 *const sFlashingLightsPalTable[];
+static const u16 *const sSlotMachineMenu_Pal;
+static const u16 sReelTimeWindow_Tilemap[];
+static const u16 sEmptyTilemap[];
+static void (*const sDigitalDisplaySceneExitCallbacks[])(void);
+static const struct SpriteTemplate sSpriteTemplate_ReelTimeBolt;
+static const struct SpriteTemplate sSpriteTemplate_ReelTimeNumberGap;
+static const struct SpriteTemplate sSpriteTemplate_ReelTimeShadow;
+static const struct SpriteTemplate sSpriteTemplate_ReelTimeNumbers;
+static const struct SpriteTemplate sSpriteTemplate_BrokenReelTimeMachine;
+static const struct SpriteTemplate sSpriteTemplate_ReelTimeMachineAntennae;
+static const struct SpriteTemplate sSpriteTemplate_ReelTimeMachine;
+static const struct SpriteTemplate sSpriteTemplate_ReelBackground;
+static const struct SpriteTemplate sSpriteTemplate_CoinNumber;
+static const struct SpriteTemplate sSpriteTemplate_ReelSymbol;
+static const struct SpriteTemplate sSpriteTemplate_ReelTimePikachu;
+static const struct SubspriteTable sSubspriteTable_ReelTimeNumberGap[];
+static const struct SubspriteTable sSubspriteTable_ReelTimeShadow[];
+static const struct SubspriteTable sSubspriteTable_BrokenReelTimeMachine[];
+static const struct SubspriteTable sSubspriteTable_ReelTimeMachineAntennae[];
+static const struct SubspriteTable sSubspriteTable_ReelTimeMachine[];
+static const struct SubspriteTable sSubspriteTable_ReelBackground[];
+
+static const struct BgTemplate sBgTemplates[] =
 {
     {
         .bg = 0,
@@ -465,194 +657,212 @@ static const struct BgTemplate gUnknown_085A7424[] =
     },
 };
 
-static const struct WindowTemplate gUnknown_085A7434[] =
+static const struct WindowTemplate sWindowTemplates[] =
 {
-    {0, 2, 15, 0x1B, 4, 15, 0x194},
+    {
+        .bg = 0, 
+        .tilemapLeft = 2, 
+        .tilemapTop = 15, 
+        .width = 27, 
+        .height = 4, 
+        .paletteNum = 15, 
+        .baseBlock = 0x194
+    },
     DUMMY_WIN_TEMPLATE
 };
 
-static const struct WindowTemplate gUnknown_085A7444 =
+static const struct WindowTemplate sWindowTemplate_InfoBox =
 {
-    0, 1, 3, 20, 13, 13, 1
+    .bg = 0, 
+    .tilemapLeft = 1, 
+    .tilemapTop = 3, 
+    .width = 20, 
+    .height = 13, 
+    .paletteNum = 13, 
+    .baseBlock = 1
 };
 
 static const u8 sColors_ReeltimeHelp[] = {TEXT_COLOR_LIGHT_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY};
 
-bool8 (*const SlotActions[])(struct Task *task) =
-{
-    SlotAction_UnfadeScreen,                        // 0
-    SlotAction_WaitForUnfade,                       // 1
-    SlotAction_SetSlotMachineVars,                  // 2
-    SlotAction3,                                    // 3
-    SlotAction4,                                    // 4
-    SlotAction_AwaitPlayerInput,                    // 5
-    SlotAction_PrintYouDontHaveThreeCoins,          // 6
-    SlotAction_ExitYouDontHaveThreeCoinsMessage,    // 7
-    SlotAction_GivingInformation,                   // 8
-    SlotAction9,                                    // 9
-    SlotAction10,                                   // 10
-    SlotAction_SetLuckySpins,                       // 11
-    SlotAction_AwaitReelStop,                       // 12
-    SlotAction_WaitForAllReelsToStop,               // 13
-    SlotAction_CheckMatches,                        // 14
-    SlotAction_WaitForPayoutToBeAwarded,            // 15
-    SlotAction_EndOfRoll,                           // 16
-    SlotAction_MatchedPower,                        // 17
-    SlotAction18,                                   // 18
-    SlotAction_Loop,                                // 19
-    SlotAction_NoMatches,                           // 20
-    SlotAction_PrintQuitTheGame,                    // 21
-    SlotAction_SeeIfPlayerQuits,                    // 22
-    SlotAction_PrintMessage_9999Coins,                // 23
-    SlotAction_ExitMessage_9999Coins,                 // 24
-    SlotAction_PrintMessage_NoMoreCoins,                    // 25
-    SlotAction_ExitMessage_NoMoreCoins,              // 26
-    SlotAction_EndGame,                             // 27
-    SlotAction_FreeDataStructures,                  // 28
-};
-
-bool8 (*const AwardPayoutActions[])(struct Task *task) =
+static bool8 (*const sSlotActions[])(struct Task *task) =
+{
+    [SLOT_ACTION_UNFADE]                 = SlotAction_UnfadeScreen,
+    [SLOT_ACTION_WAIT_FADE]              = SlotAction_WaitForUnfade,
+    [SLOT_ACTION_READY_NEW_SPIN]         = SlotAction_ReadyNewSpin,
+    [SLOT_ACTION_READY_NEW_RT_SPIN]      = SlotAction_ReadyNewReelTimeSpin,
+    [SLOT_ACTION_ASK_INSERT_BET]         = SlotAction_AskInsertBet,
+    [SLOT_ACTION_BET_INPUT]              = SlotAction_HandleBetInput,
+    [SLOT_ACTION_MSG_NEED_3_COINS]       = SlotAction_PrintMsg_Need3Coins,
+    [SLOT_ACTION_WAIT_MSG_NEED_3_COINS]  = SlotAction_WaitMsg_Need3Coins,
+    [SLOT_ACTION_WAIT_INFO_BOX]          = SlotAction_WaitForInfoBox,
+    [SLOT_ACTION_START_SPIN]             = SlotAction_StartSpin,
+    [SLOT_ACTION_START_RT_SPIN]          = SlotAction_StartReelTimeSpin,
+    [SLOT_ACTION_SET_LUCKY_SPINS]        = SlotAction_SetLuckySpins,
+    [SLOT_ACTION_AWAIT_REEL_STOP]        = SlotAction_AwaitReelStop,
+    [SLOT_ACTION_AWAIT_ALL_REELS_STOP]   = SlotAction_WaitForAllReelsToStop,
+    [SLOT_ACTION_CHECK_MATCHES]          = SlotAction_CheckMatches,
+    [SLOT_ACTION_WAIT_PAYOUT]            = SlotAction_WaitForPayoutToBeAwarded,
+    [SLOT_ACTION_END_PAYOUT]             = SlotAction_EndPayout,
+    [SLOT_ACTION_MATCHED_POWER]          = SlotAction_MatchedPower,
+    [SLOT_ACTION_WAIT_RT_ANIM]           = SlotAction_WaitReelTimeAnim,
+    [SLOT_ACTION_RESET_BET_TILES]        = SlotAction_ResetBetTiles,
+    [SLOT_ACTION_NO_MATCHES]             = SlotAction_NoMatches,
+    [SLOT_ACTION_ASK_QUIT]               = SlotAction_AskQuit,
+    [SLOT_ACTION_HANDLE_QUIT_INPUT]      = SlotAction_HandleQuitInput,
+    [SLOT_ACTION_MSG_MAX_COINS]          = SlotAction_PrintMsg_9999Coins,
+    [SLOT_ACTION_WAIT_MSG_MAX_COINS]     = SlotAction_WaitMsg_9999Coins,
+    [SLOT_ACTION_MSG_NO_MORE_COINS]      = SlotAction_PrintMsg_NoMoreCoins,
+    [SLOT_ACTION_WAIT_MSG_NO_MORE_COINS] = SlotAction_WaitMsg_NoMoreCoins,
+    [SLOT_ACTION_END]                    = SlotAction_EndGame,
+    [SLOT_ACTION_FREE]                   = SlotAction_FreeDataStructures,
+};
+
+static bool8 (*const sAwardPayoutActions[])(struct Task *task) =
 {
     AwardPayoutAction0,
     AwardPayoutAction_GivePayoutToPlayer,
     AwardPayoutAction_FreeTask
 };
 
-bool8 (*const SlotReelActions[])(struct Task *task) =
+static bool8 (*const sSlotReelActions[])(struct Task *task) =
 {
-    SlotReelAction_StayStill,
-    SlotReelAction_Spin,
-    SlotReelAction_DecideWhereToStop,
-    SlotReelAction_MoveToStop,
-    SlotReelAction_OscillatingStop
+    [REEL_ACTION_STILL]      = SlotReelAction_StayStill,
+    [REEL_ACTION_SPIN]       = SlotReelAction_Spin,
+    [REEL_ACTION_STOP]       = SlotReelAction_DecideWhereToStop,
+    [REEL_ACTION_STOP_MOVE]  = SlotReelAction_MoveToStop,
+    [REEL_ACTION_STOP_SHAKE] = SlotReelAction_OscillatingStop
 };
 
 // returns True if a match with the biasTag is possible in that reel
 // also modifies data in sSlotMachine reel arrays to indicate how to get to the matching state
-bool8 (*const DecideReelTurns_BiasTag[])(void) =
+static bool8 (*const sDecideReelTurns_BiasTag[NUM_REELS])(void) =
 {
     DecideReelTurns_BiasTag_Reel1,
     DecideReelTurns_BiasTag_Reel2,
     DecideReelTurns_BiasTag_Reel3
 };
 
-void (*const DecideReelTurns_NoBiasTag[])(void) =
+static void (*const sDecideReelTurns_NoBiasTag[NUM_REELS])(void) =
 {
     DecideReelTurns_NoBiasTag_Reel1,
     DecideReelTurns_NoBiasTag_Reel2,
     DecideReelTurns_NoBiasTag_Reel3
 };
 
-const u16 ReelStopShocks[] = {2, 4, 4, 4, 8};
+static const u16 sReelStopShocks[] = {2, 4, 4, 4, 8};
 
-bool8 (*const DecideReelTurns_BiasTag_Reel1_Bets[])(u8 tag1, u8 tag2) =
+static bool8 (*const sDecideReelTurns_BiasTag_Reel1_Bets[MAX_BET])(u8 tag1, u8 tag2) =
 {
     DecideReelTurns_BiasTag_Reel1_Bet1,
     DecideReelTurns_BiasTag_Reel1_Bet2or3,
     DecideReelTurns_BiasTag_Reel1_Bet2or3
 };
 
-bool8 (*const DecideReelTurns_BiasTag_Reel2_Bets[])(void) =
+static bool8 (*const sDecideReelTurns_BiasTag_Reel2_Bets[MAX_BET])(void) =
 {
     DecideReelTurns_BiasTag_Reel2_Bet1or2,
     DecideReelTurns_BiasTag_Reel2_Bet1or2,
     DecideReelTurns_BiasTag_Reel2_Bet3
 };
 
-bool8 (*const DecideReelTurns_BiasTag_Reel3_Bets[])(u8 biasTag) =
+static bool8 (*const sDecideReelTurns_BiasTag_Reel3_Bets[MAX_BET])(u8 biasTag) =
 {
     DecideReelTurns_BiasTag_Reel3_Bet1or2,
     DecideReelTurns_BiasTag_Reel3_Bet1or2,
     DecideReelTurns_BiasTag_Reel3_Bet3
 };
 
-void (*const DecideReelTurns_NoBiasTag_Reel2_Bets[])(void) =
+static void (*const sDecideReelTurns_NoBiasTag_Reel2_Bets[MAX_BET])(void) =
 {
     DecideReelTurns_NoBiasTag_Reel2_Bet1,
     DecideReelTurns_NoBiasTag_Reel2_Bet2,
     DecideReelTurns_NoBiasTag_Reel2_Bet3
 };
 
-void (*const DecideReelTurns_NoBiasTag_Reel3_Bets[])(void) =
+static void (*const sDecideReelTurns_NoBiasTag_Reel3_Bets[MAX_BET])(void) =
 {
     DecideReelTurns_NoBiasTag_Reel3_Bet1,
     DecideReelTurns_NoBiasTag_Reel3_Bet2,
     DecideReelTurns_NoBiasTag_Reel3_Bet3
 };
 
-void (*const gUnknown_083ECBA0[])(struct Task *task, u8 taskId) =
+static void (*const sReelStopButtonFuncs[])(struct Task *task, u8 taskId) =
 {
-    sub_8103C78,
-    sub_8103CAC,
-    sub_8103CC8
+    StopReelButton_Press,
+    StopReelButton_Wait,
+    StopReelButton_Unpress
 };
 
-const s16 gUnknown_083ECBAC[] = {5, 10, 15};
+static const s16 sReelButtonOffsets[NUM_REELS] = {5, 10, 15};
 
-void (*const gUnknown_083ECBB4[])(struct Task *task) =
+static void (*const sPikaPowerBoltFuncs[])(struct Task *task) =
 {
-    nullsub_68,
-    sub_810411C,
-    sub_8104144,
-    sub_81041AC
+    PikaPowerBolt_Idle,
+    PikaPowerBolt_AddBolt,
+    PikaPowerBolt_WaitAnim,
+    PikaPowerBolt_ClearAll
 };
 
-const u16 pikaPowerTileTable[][2] =
+static const u16 sPikaPowerTileTable[][2] =
 {
     {0x9e, 0x6e},
     {0x9f, 0x6f},
     {0xaf, 0x7f},
 };
 
-void (*const ReeltimeActions[])(struct Task *task) =
-{
-    ReeltimeAction0,
-    ReeltimeAction1,
-    ReeltimeAction2,
-    ReeltimeAction3,
-    ReeltimeAction4,
-    ReeltimeAction5,
-    ReeltimeAction6,
-    ReelTimeAction_LandOnOutcome,
-    ReeltimeAction8,
-    ReeltimeAction9,
-    ReeltimeAction10,
-    ReeltimeAction11,
-    ReeltimeAction12,
-    ReeltimeAction13,
-    ReeltimeAction14,
-    ReeltimeAction15,
-    ReeltimeAction16,
-    ReeltimeAction10,
-    ReeltimeAction17
-};
-
-const u8 gUnknown_085A75C0[] = {1, 1, 2, 2};
-const s16 gUnknown_085A75C4[] = {0x40, 0x30, 0x18, 0x08};
-const s16 gUnknown_085A75CC[] = {10, 8, 6, 4};
-
-void (*const InfoBoxActions[])(struct Task *task) =
-{
+static void (*const sReelTimeActions[])(struct Task *task) =
+{
+    ReelTime_Init,
+    ReelTime_WindowEnter,
+    ReelTime_WaitStartPikachu,
+    ReelTime_PikachuSpeedUp1,
+    ReelTime_PikachuSpeedUp2,
+    ReelTime_WaitReel,
+    ReelTime_CheckExplode,
+    ReelTime_LandOnOutcome,
+    ReelTime_PikachuReact,
+    ReelTime_WaitClearPikaPower,
+    ReelTime_CloseWindow,
+    ReelTime_DestroySprites,
+    ReelTime_SetReelIncrement,
+    ReelTime_EndSuccess,
+    ReelTime_ExplodeMachine,
+    ReelTime_WaitExplode,
+    ReelTime_WaitSmoke,
+    ReelTime_CloseWindow,
+    ReelTime_EndFailure
+};
+
+static const u8 sReelTimePikachuAnimIds[] = {1, 1, 2, 2};
+static const s16 sReelTimeBoltDelays[] = {64, 48, 24, 8};
+static const s16 sPikachuAuraFlashDelays[] = {10, 8, 6, 4};
+
+static void (*const sInfoBoxActions[])(struct Task *task) =
+{
+    // Go to Info screen
     InfoBox_FadeIn,
     InfoBox_WaitForFade,
-    InfoBox_8104B80,
+    InfoBox_DrawWindow,
     InfoBox_WaitForFade,
     InfoBox_AddText,
     InfoBox_WaitForFade,
+    // On Info screen
     InfoBox_AwaitPlayerInput,
+    // Exit Info screen
     InfoBox_WaitForFade,
-    InfoBox_812DE14,
+    InfoBox_LoadSlotMachineTilemap,
     InfoBox_WaitForFade,
-    InfoBox_812DE30,
+    InfoBox_CreateDigitalDisplay,
     InfoBox_WaitForFade,
-    InfoBox_8104BFC,
+    InfoBox_LoadPikaPowerMeter,
     InfoBox_WaitForFade,
     InfoBox_FreeTask,
 };
 
-void (*const gUnknown_083ECC54[])(struct Task *task) =
+// Just idles, digital display is handled by CreateDigitalDisplayScene and sprite callbacks
+static void (*const sDigitalDisplayActions[])(struct Task *task) =
 {
-    nullsub_69,
+    DigitalDisplay_Idle,
 };
 
 
@@ -679,12 +889,12 @@ static void Task_FadeToSlotMachine(u8 taskId)
     }
 }
 
-void PlaySlotMachine(u8 slotMachineIndex, MainCallback cb)
+void PlaySlotMachine(u8 slotMachineIndex, MainCallback exitCallback)
 {
     u8 taskId;
 
     sSlotMachine = AllocZeroed(sizeof(*sSlotMachine));
-    PlaySlotMachine_Internal(slotMachineIndex, cb);
+    PlaySlotMachine_Internal(slotMachineIndex, exitCallback);
     taskId = CreateTask(Task_FadeToSlotMachine, 0);
     gTasks[taskId].tState = 0;
 }
@@ -696,33 +906,33 @@ static void CB2_SlotMachineSetup(void)
     switch (gMain.state)
     {
         case 0:
-            SlotMachineSetup_0_0();
-            SlotMachineSetup_0_1();
+            SlotMachineSetup_InitBgsWindows();
+            SlotMachineSetup_InitSlotMachineStruct();
             gMain.state++;
             break;
         case 1:
-            SlotMachineSetup_1_0();
+            SlotMachineSetup_InitVRAM();
             gMain.state++;
             break;
         case 2:
-            SlotMachineSetup_2_0();
-            SlotMachineSetup_2_1();
+            SlotMachineSetup_InitOAM();
+            SlotMachineSetup_InitGpuRegs();
             gMain.state++;
             break;
         case 3:
-            SlotMachineSetup_3_0();
+            SlotMachineSetup_InitPalsSpritesTasks();
             gMain.state++;
             break;
         case 4:
-            SlotMachineSetup_4_0();
+            SlotMachineSetup_InitTilemaps();
             gMain.state++;
             break;
         case 5:
-            SlotMachineSetup_5_0();
+            SlotMachineSetup_LoadGfxAndTilemaps();
             gMain.state++;
             break;
         case 6:
-            SlotMachineSetup_6_0();
+            SlotMachineSetup_InitVBlank();
             gMain.state++;
             break;
         case 7:
@@ -734,25 +944,25 @@ static void CB2_SlotMachineSetup(void)
             gMain.state++;
             break;
         case 8:
-            SlotMachineSetup_8_0();
+            AllocDigitalDisplayGfx();
             gMain.state++;
             break;
         case 9:
-            SlotMachineSetup_9_0();
+            SetDigitalDisplayImagePtrs();
             gMain.state++;
             break;
         case 10:
-            SlotMachineSetup_10_0();
-            SlotMachineSetupGameplayTasks();
+            CreateSlotMachineSprites();
+            CreateGameplayTasks();
             gMain.state++;
             break;
         case 11:
-            SetMainCallback2(CB2_SlotMachineLoop);
+            SetMainCallback2(CB2_SlotMachine);
             break;
     }
 }
 
-static void CB2_SlotMachineLoop(void)
+static void CB2_SlotMachine(void)
 {
     RunTasks();
     AnimateSprites();
@@ -760,7 +970,7 @@ static void CB2_SlotMachineLoop(void)
     UpdatePaletteFade();
 }
 
-static void SlotMachine_VBlankCallback(void)
+static void SlotMachine_VBlankCB(void)
 {
     LoadOam();
     ProcessSpriteCopyRequests();
@@ -771,54 +981,54 @@ static void SlotMachine_VBlankCallback(void)
     SetGpuReg(REG_OFFSET_WINOUT, sSlotMachine->winOut);
 }
 
-static void PlaySlotMachine_Internal(u8 slotMachineIndex, MainCallback cb)
+static void PlaySlotMachine_Internal(u8 slotMachineIndex, MainCallback exitCallback)
 {
     struct Task *task = &gTasks[CreateTask(SlotMachineDummyTask, 0xFF)];
     task->data[0] = slotMachineIndex;
-    StoreWordInTwoHalfwords(task->data + 1, (intptr_t)cb);
+    StoreWordInTwoHalfwords((u16 *)&task->data[1], (intptr_t)exitCallback);
 }
 
 
-static void sub_81019EC(void)
+static void SlotMachineInitDummyTask(void)
 {
     struct Task *task = &gTasks[FindTaskIdByFunc(SlotMachineDummyTask)];
     sSlotMachine->machineId = task->data[0];
-    LoadWordFromTwoHalfwords((u16 *)(task->data + 1), (u32 *)&sSlotMachine->prevMainCb);
+    LoadWordFromTwoHalfwords((u16 *)&task->data[1], (u32 *)&sSlotMachine->prevMainCb);
 }
 
 static void SlotMachineDummyTask(u8 taskId)
 {
 }
 
-static void SlotMachineSetup_0_0(void)
+static void SlotMachineSetup_InitBgsWindows(void)
 {
     SetVBlankCallback(NULL);
     SetHBlankCallback(NULL);
     CpuFill32(0, (void *)VRAM, VRAM_SIZE);
     ResetBgsAndClearDma3BusyFlags(0);
-    InitBgsFromTemplates(0, gUnknown_085A7424, ARRAY_COUNT(gUnknown_085A7424));
-    InitWindows(gUnknown_085A7434);
+    InitBgsFromTemplates(0, sBgTemplates, ARRAY_COUNT(sBgTemplates));
+    InitWindows(sWindowTemplates);
     DeactivateAllTextPrinters();
 }
 
-static void SlotMachineSetup_6_0(void)
+static void SlotMachineSetup_InitVBlank(void)
 {
-    SetVBlankCallback(SlotMachine_VBlankCallback);
+    SetVBlankCallback(SlotMachine_VBlankCB);
     EnableInterrupts(INTR_FLAG_VBLANK);
     SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON | DISPCNT_WIN0_ON);
 }
 
-static void SlotMachineSetup_1_0(void)
+static void SlotMachineSetup_InitVRAM(void)
 {
     DmaClearLarge16(3, (u16 *)(BG_VRAM), BG_VRAM_SIZE, 0x1000);
 }
 
-static void SlotMachineSetup_2_0(void)
+static void SlotMachineSetup_InitOAM(void)
 {
     DmaClear16(3, (u16 *)OAM, OAM_SIZE);
 }
 
-static void SlotMachineSetup_2_1(void)
+static void SlotMachineSetup_InitGpuRegs(void)
 {
     SetGpuReg(REG_OFFSET_BG0CNT, 0);
     SetGpuReg(REG_OFFSET_BG1CNT, 0);
@@ -832,48 +1042,48 @@ static void SlotMachineSetup_2_1(void)
     SetGpuReg(REG_OFFSET_BG2VOFS, 0);
     SetGpuReg(REG_OFFSET_BG3HOFS, 0);
     SetGpuReg(REG_OFFSET_BG3VOFS, 0);
-    SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG0 | WININ_WIN0_BG1 | WININ_WIN0_BG2 | WININ_WIN0_BG3 | WININ_WIN0_OBJ | WININ_WIN0_CLR);
-    SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG0 | WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2 | WINOUT_WIN01_BG3 | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR);
+    SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR);
+    SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR);
     SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG3 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_OBJ);
     SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(9, 8));
 }
 
 // set up initial state of slot machine
-static void SlotMachineSetup_0_1(void)
+static void SlotMachineSetup_InitSlotMachineStruct(void)
 {
     u8 i;
 
-    sub_81019EC();  // assigns sSlotMachine->machineId, etc.
+    SlotMachineInitDummyTask();  // assigns sSlotMachine->machineId, etc.
     sSlotMachine->state = 0;
     sSlotMachine->pikaPower = 0;
     sSlotMachine->luckyGame = Random() & 1;
     sSlotMachine->luckyFlags = 0;
     sSlotMachine->matchedSymbols = 0;
-    sSlotMachine->fairRollsLeft = 0;
-    sSlotMachine->fairRollsUsed = 0;
+    sSlotMachine->reelTimeSpinsLeft = 0;
+    sSlotMachine->reelTimeSpinsUsed = 0;
     sSlotMachine->coins = GetCoins();
     sSlotMachine->payout = 0;
     sSlotMachine->netCoinLoss = 0;
     sSlotMachine->bet = 0;
     sSlotMachine->currReel = 0;
     sSlotMachine->reelIncrement = 8;
-    sSlotMachine->win0h = 0xf0;
-    sSlotMachine->win0v = 0xa0;
-    sSlotMachine->winIn = 0x3f;
-    sSlotMachine->winOut = 0x3f;
+    sSlotMachine->win0h = DISPLAY_WIDTH;
+    sSlotMachine->win0v = DISPLAY_HEIGHT;
+    sSlotMachine->winIn = WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR;
+    sSlotMachine->winOut = WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR;
     sSlotMachine->backupMapMusic = GetCurrentMapMusic();
 
     for (i = 0; i < NUM_REELS; i++)
     {
         sSlotMachine->reelPixelOffsetsWhileStopping[i] = 0;
-        sSlotMachine->reelPositions[i] = gInitialReelPositions[i][sSlotMachine->luckyGame] % REEL_NUM_TAGS;
-        sSlotMachine->reelPixelOffsets[i] = REEL_NUM_TAGS * REEL_TAG_HEIGHT - sSlotMachine->reelPositions[i] * REEL_TAG_HEIGHT;
-        sSlotMachine->reelPixelOffsets[i] %= REEL_NUM_TAGS * REEL_TAG_HEIGHT;
+        sSlotMachine->reelPositions[i] = sInitialReelPositions[i][sSlotMachine->luckyGame] % SYMBOLS_PER_REEL;
+        sSlotMachine->reelPixelOffsets[i] = SYMBOLS_PER_REEL * REEL_SYMBOL_HEIGHT - sSlotMachine->reelPositions[i] * REEL_SYMBOL_HEIGHT;
+        sSlotMachine->reelPixelOffsets[i] %= SYMBOLS_PER_REEL * REEL_SYMBOL_HEIGHT;
     }
     AlertTVThatPlayerPlayedSlotMachine(GetCoins());
 }
 
-static void SlotMachineSetup_3_0(void)
+static void SlotMachineSetup_InitPalsSpritesTasks(void)
 {
     ResetPaletteFade();
     ResetSpriteData();
@@ -882,69 +1092,70 @@ static void SlotMachineSetup_3_0(void)
     ResetTasks();
 }
 
-static void SlotMachineSetup_4_0(void)
+static void SlotMachineSetup_InitTilemaps(void)
 {
     sSelectedPikaPowerTile = Alloc(8);
-    sUnknown_0203AAD0 = AllocZeroed(0xE);
-    sUnknown_0203AADC = AllocZeroed(8);
+    sReelOverlay_Tilemap = AllocZeroed(14);
+    sReelButtonPress_Tilemap = AllocZeroed(8);
 
     // several of these are 1 bit off from each other
-    sUnknown_0203AAD0[0] = 0x2051;
-    sUnknown_0203AAD0[1] = 0x2851;
-    sUnknown_0203AAD0[2] = 0x2061;
-    sUnknown_0203AAD0[3] = 0x2861;
-    sUnknown_0203AAD0[4] = 0x20BE;
-    sUnknown_0203AAD0[5] = 0x28BE;
-    sUnknown_0203AAD0[6] = 0x20BF;
+    sReelOverlay_Tilemap[0] = 0x2051;
+    sReelOverlay_Tilemap[1] = 0x2851;
+    sReelOverlay_Tilemap[2] = 0x2061;
+    sReelOverlay_Tilemap[3] = 0x2861;
+    sReelOverlay_Tilemap[4] = 0x20BE;
+    sReelOverlay_Tilemap[5] = 0x28BE;
+    sReelOverlay_Tilemap[6] = 0x20BF;
 }
 
-static void SlotMachineSetup_5_0(void)
+static void SlotMachineSetup_LoadGfxAndTilemaps(void)
 {
-    sub_8106448();
-    sub_81064B8();
-    sub_81063C0();
+    LoadMenuGfx();
+    LoadMenuAndReelOverlayTilemaps();
+    LoadSlotMachineGfx();
     LoadMessageBoxGfx(0, 0x200, 0xF0);
     LoadUserWindowBorderGfx(0, 0x214, 0xE0);
     PutWindowTilemap(0);
 }
 
-static void SlotMachineSetup_10_0(void)
+static void CreateSlotMachineSprites(void)
 {
-    sub_8104EA8();
-    sub_8104F8C();
-    sub_8103DC8();
-    sub_81050C4();
+    CreateReelSymbolSprites();
+    CreateCreditPayoutNumberSprites();
+    CreateInvisibleFlashMatchLineSprites();
+    CreateReelBackgroundSprite();
 }
 
-// create gameplay tasks
-static void SlotMachineSetupGameplayTasks(void)
+static void CreateGameplayTasks(void)
 {
-    GameplayTask_PikaPower();
-    GameplayTask_StopSlotReel();
-    sub_8104C5C();
-    GameplayTasks_Slots();
+    CreatePikaPowerBoltTask();
+    CreateSlotReelTasks();
+    CreateDigitalDisplayTask();
+    CreateSlotMachineTask();
 }
 
-static void GameplayTasks_Slots(void)
+static void CreateSlotMachineTask(void)
 {
-    RunSlotActions(CreateTask(RunSlotActions, 0));
+    Task_SlotMachine(CreateTask(Task_SlotMachine, 0));
 }
 
 // task->data[0] is a timer
-static void RunSlotActions(u8 taskId)
+static void Task_SlotMachine(u8 taskId)
 {
-    while (SlotActions[sSlotMachine->state](&gTasks[taskId]))
+    while (sSlotActions[sSlotMachine->state](&gTasks[taskId]))
         ;
 }
 
+// SLOT_ACTION_UNFADE
 static bool8 SlotAction_UnfadeScreen(struct Task *task)
 {
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0));
-    sub_810423C(sSlotMachine->pikaPower);
-    sSlotMachine->state++;
+    LoadPikaPowerMeter(sSlotMachine->pikaPower);
+    sSlotMachine->state++; // SLOT_ACTION_WAIT_FADE
     return FALSE;
 }
 
+// SLOT_ACTION_WAIT_FADE
 static bool8 SlotAction_WaitForUnfade(struct Task *task)
 {
     if (!gPaletteFade.active)
@@ -952,448 +1163,478 @@ static bool8 SlotAction_WaitForUnfade(struct Task *task)
     return FALSE;
 }
 
-static bool8 SlotAction_SetSlotMachineVars(struct Task *task)
+// SLOT_ACTION_READY_NEW_SPIN
+static bool8 SlotAction_ReadyNewSpin(struct Task *task)
 {
     sSlotMachine->payout = 0;
     sSlotMachine->bet = 0;
     sSlotMachine->currReel = 0;
     sSlotMachine->luckyFlags &= (LUCKY_BIAS_777 | LUCKY_BIAS_MIXED_777);
-    sSlotMachine->state = 4;
+    sSlotMachine->state = SLOT_ACTION_ASK_INSERT_BET;
     if (sSlotMachine->coins <= 0)
     {
-        sSlotMachine->state = 25;
+        sSlotMachine->state = SLOT_ACTION_MSG_NO_MORE_COINS;
     }
-    else if (sSlotMachine->fairRollsLeft)
+    else if (sSlotMachine->reelTimeSpinsLeft)
     {
-        sSlotMachine->state = 3;
-        sub_8104CAC(4);
+        sSlotMachine->state = SLOT_ACTION_READY_NEW_RT_SPIN;
+        CreateDigitalDisplayScene(DIG_DISPLAY_REEL_TIME);
     }
     return TRUE;
 }
 
-static bool8 SlotAction3(struct Task *task)
+// SLOT_ACTION_READY_NEW_RT_SPIN
+static bool8 SlotAction_ReadyNewReelTimeSpin(struct Task *task)
 {
-    if (sub_8104E18())
-        sSlotMachine->state = 4;
+    if (IsDigitalDisplayAnimFinished())
+        sSlotMachine->state = SLOT_ACTION_ASK_INSERT_BET;
     return FALSE;
 }
 
-static bool8 SlotAction4(struct Task *task)
+// SLOT_ACTION_ASK_INSERT_BET
+static bool8 SlotAction_AskInsertBet(struct Task *task)
 {
-    sub_8104CAC(0);
-    sSlotMachine->state = 5;
+    CreateDigitalDisplayScene(DIG_DISPLAY_INSERT_BET);
+    sSlotMachine->state = SLOT_ACTION_BET_INPUT;
     if (sSlotMachine->coins >= MAX_COINS)
-        sSlotMachine->state = 23;
+        sSlotMachine->state = SLOT_ACTION_MSG_MAX_COINS;
     return TRUE;
 }
 
-static bool8 SlotAction_AwaitPlayerInput(struct Task *task)
+// SLOT_ACTION_BET_INPUT
+static bool8 SlotAction_HandleBetInput(struct Task *task)
 {
     s16 i;
 
-    if (gMain.newKeys & SELECT_BUTTON)
+    if (JOY_NEW(SELECT_BUTTON))
     {
-        OpenInfoBox(0);
-        sSlotMachine->state = 8;
+        OpenInfoBox(DIG_DISPLAY_INSERT_BET);
+        sSlotMachine->state = SLOT_ACTION_WAIT_INFO_BOX;
     }
-    else if (gMain.newKeys & R_BUTTON)  // bet the max amount
+    else if (JOY_NEW(R_BUTTON))  // bet the max amount
     {
-        if (sSlotMachine->coins - (3 - sSlotMachine->bet) >= 0)
+        if (sSlotMachine->coins - (MAX_BET - sSlotMachine->bet) >= 0)
         {
-            for (i = sSlotMachine->bet; i < 3; i++)
-                LoadBetTiles(i);
-            sSlotMachine->coins -= (3 - sSlotMachine->bet);
-            sSlotMachine->bet = 3;
-            sSlotMachine->state = 9;
+            for (i = sSlotMachine->bet; i < MAX_BET; i++)
+                LightenBetTiles(i);
+            sSlotMachine->coins -= (MAX_BET - sSlotMachine->bet);
+            sSlotMachine->bet = MAX_BET;
+            sSlotMachine->state = SLOT_ACTION_START_SPIN;
             PlaySE(SE_REGI);
         }
         else  // you didn't have enough coins to bet the max
         {
-            sSlotMachine->state = 6;
+            sSlotMachine->state = SLOT_ACTION_MSG_NEED_3_COINS;
         }
     }
     else
     {
-        if (gMain.newKeys & DPAD_DOWN && sSlotMachine->coins != 0)
+        // Increase bet
+        if (JOY_NEW(DPAD_DOWN) && sSlotMachine->coins != 0)
         {
             PlaySE(SE_REGI);
-            LoadBetTiles(sSlotMachine->bet);
+            LightenBetTiles(sSlotMachine->bet);
             sSlotMachine->coins--;
             sSlotMachine->bet++;
         }
-        // player maxed out or finished betting
-        if (sSlotMachine->bet >= 3 || (sSlotMachine->bet != 0 && gMain.newKeys & A_BUTTON))
-            sSlotMachine->state = 9;
-        // player wants to quit
-        if (gMain.newKeys & B_BUTTON)
-            sSlotMachine->state = 21;
+
+        // Maxed bet or finished betting
+        if (sSlotMachine->bet >= MAX_BET || (sSlotMachine->bet != 0 && JOY_NEW(A_BUTTON)))
+            sSlotMachine->state = SLOT_ACTION_START_SPIN;
+
+        // Quit prompt
+        if (JOY_NEW(B_BUTTON))
+            sSlotMachine->state = SLOT_ACTION_ASK_QUIT;
     }
     return FALSE;
 }
 
-static bool8 SlotAction_PrintYouDontHaveThreeCoins(struct Task *task)
+// SLOT_ACTION_NEED_3_COINS
+static bool8 SlotAction_PrintMsg_Need3Coins(struct Task *task)
 {
     DrawDialogueFrame(0, 0);
     AddTextPrinterParameterized(0, 1, gText_YouDontHaveThreeCoins, 0, 1, 0, 0);
     CopyWindowToVram(0, 3);
-    sSlotMachine->state = 7;
+    sSlotMachine->state = SLOT_ACTION_WAIT_MSG_NEED_3_COINS;
     return FALSE;
 }
 
-static bool8 SlotAction_ExitYouDontHaveThreeCoinsMessage(struct Task *task)
+// SLOT_ACTION_WAIT_MSG_NEED_3_COINS
+static bool8 SlotAction_WaitMsg_Need3Coins(struct Task *task)
 {
-    if (gMain.newKeys & (A_BUTTON | B_BUTTON))
+    if (JOY_NEW(A_BUTTON | B_BUTTON))
     {
         ClearDialogWindowAndFrame(0, TRUE);
-        sSlotMachine->state = 5;
+        sSlotMachine->state = SLOT_ACTION_BET_INPUT;
     }
     return FALSE;
 }
 
-static bool8 SlotAction_GivingInformation(struct Task *task)
+// SLOT_ACTION_WAIT_INFO_BOX
+static bool8 SlotAction_WaitForInfoBox(struct Task *task)
 {
     if (IsInfoBoxClosed())
-        sSlotMachine->state = 5;
+        sSlotMachine->state = SLOT_ACTION_BET_INPUT;
     return FALSE;
 }
 
-// probably make all the slots roll
-static bool8 SlotAction9(struct Task *task)
+// SLOT_ACTION_START_SPIN
+static bool8 SlotAction_StartSpin(struct Task *task)
 {
     DrawLuckyFlags();
-    sub_8104DA4();
+    DestroyDigitalDisplayScene();
 
-    // for each reel...
-    ReelTasks_SetUnkTaskData(0);
-    ReelTasks_SetUnkTaskData(1);
-    ReelTasks_SetUnkTaskData(2);
+    SpinSlotReel(LEFT_REEL);
+    SpinSlotReel(MIDDLE_REEL);
+    SpinSlotReel(RIGHT_REEL);
 
     IncrementDailySlotsUses();
 
     task->data[0] = 0;
     if (sSlotMachine->luckyFlags & LUCKY_BIAS_REELTIME)
     {
-        BeginReeltime();
-        sSlotMachine->state = 10;
+        BeginReelTime();
+        sSlotMachine->state = SLOT_ACTION_START_RT_SPIN;
     }
     else
     {
-        sub_8104CAC(1);
-        sSlotMachine->state = 11;
+        CreateDigitalDisplayScene(DIG_DISPLAY_STOP_REEL);
+        sSlotMachine->state = SLOT_ACTION_SET_LUCKY_SPINS;
     }
     sSlotMachine->reelIncrement = 8;
-    if (sSlotMachine->fairRollsLeft)
+    if (sSlotMachine->reelTimeSpinsLeft)
         sSlotMachine->reelIncrement = SlowReelSpeed();
     return FALSE;
 }
 
-static bool8 SlotAction10(struct Task *task)
+// SLOT_ACTION_START_RT_SPIN
+static bool8 SlotAction_StartReelTimeSpin(struct Task *task)
 {
-    if (IsFinalTask_RunReelTimeActions())
+    if (IsReelTimeTaskDone())
     {
-        sub_8104CAC(1);
+        CreateDigitalDisplayScene(DIG_DISPLAY_STOP_REEL);
         sSlotMachine->luckyFlags &= ~LUCKY_BIAS_REELTIME;
-        sSlotMachine->state = 11;
+        sSlotMachine->state = SLOT_ACTION_SET_LUCKY_SPINS;
     }
     return FALSE;
 }
 
+// SLOT_ACTION_SET_LUCKY_SPINS
 static bool8 SlotAction_SetLuckySpins(struct Task *task)
 {
     if (++task->data[0] >= 30)
     {
         SetLuckySpins();
-        sSlotMachine->state = 12;
+        sSlotMachine->state = SLOT_ACTION_AWAIT_REEL_STOP;
     }
     return FALSE;
 }
 
+// SLOT_ACTION_AWAIT_REEL_STOP
 static bool8 SlotAction_AwaitReelStop(struct Task *task)
 {
-    if (gMain.newKeys & A_BUTTON)
+    if (JOY_NEW(A_BUTTON))
     {
         PlaySE(SE_JYUNI);
-        sub_8102E1C(sSlotMachine->currReel);
-        sub_8103C14(sSlotMachine->currReel);
-        sSlotMachine->state = 13;
+        StopSlotReel(sSlotMachine->currReel);
+        PressStopReelButton(sSlotMachine->currReel);
+        sSlotMachine->state = SLOT_ACTION_AWAIT_ALL_REELS_STOP;
     }
     return FALSE;
 }
 
+// SLOT_ACTION_AWAIT_ALL_REELS_STOP
 static bool8 SlotAction_WaitForAllReelsToStop(struct Task *task)
 {
     if (!IsSlotReelMoving(sSlotMachine->currReel))
     {
         sSlotMachine->currReel++;
-        sSlotMachine->state = 12;
-        if (sSlotMachine->currReel > 2)
+        sSlotMachine->state = SLOT_ACTION_AWAIT_REEL_STOP;
+        if (sSlotMachine->currReel >= NUM_REELS)
         {
-            sSlotMachine->state = 14;
+            sSlotMachine->state = SLOT_ACTION_CHECK_MATCHES;
         }
         return TRUE;
     }
     return FALSE;
 }
 
-// once all reels have stopped
+// SLOT_ACTION_CHECK_MATCHES
 static bool8 SlotAction_CheckMatches(struct Task *task)
 {
     sSlotMachine->luckyFlags &= (LUCKY_BIAS_777 | LUCKY_BIAS_MIXED_777);
     CheckMatch();
-    if (sSlotMachine->fairRollsLeft)
+    if (sSlotMachine->reelTimeSpinsLeft)
     {
-        sSlotMachine->fairRollsLeft--;
-        sSlotMachine->fairRollsUsed++;
+        sSlotMachine->reelTimeSpinsLeft--;
+        sSlotMachine->reelTimeSpinsUsed++;
     }
 
     if (sSlotMachine->matchedSymbols)
     {
-        sSlotMachine->state = 15;
+        sSlotMachine->state = SLOT_ACTION_WAIT_PAYOUT;
         AwardPayout();
-        sub_8103F70();
+        FlashSlotMachineLights();
         if ((sSlotMachine->netCoinLoss -= sSlotMachine->payout) < 0)
         {
             sSlotMachine->netCoinLoss = 0;
         }
-        if (sSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_BLUE) | (1 << SLOT_MACHINE_MATCHED_777_RED)))
+        if (sSlotMachine->matchedSymbols & ((1 << MATCHED_777_BLUE) | (1 << MATCHED_777_RED)))
         {
             PlayFanfare(MUS_ME_B_BIG);
-            sub_8104CAC(6);
+            CreateDigitalDisplayScene(DIG_DISPLAY_BONUS_BIG);
         }
-        else if (sSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_777_MIXED))
+        else if (sSlotMachine->matchedSymbols & (1 << MATCHED_777_MIXED))
         {
             PlayFanfare(MUS_ME_B_BIG);
-            sub_8104CAC(5);
+            CreateDigitalDisplayScene(DIG_DISPLAY_BONUS_REG);
         }
         else
         {
             PlayFanfare(MUS_ME_B_SMALL);
-            sub_8104CAC(2);
+            CreateDigitalDisplayScene(DIG_DISPLAY_WIN);
         }
         // if you matched 777...
-        if (sSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_MIXED) | (1 << SLOT_MACHINE_MATCHED_777_BLUE) | (1 << SLOT_MACHINE_MATCHED_777_RED)))
+        if (sSlotMachine->matchedSymbols & ((1 << MATCHED_777_MIXED) | (1 << MATCHED_777_BLUE) | (1 << MATCHED_777_RED)))
         {
             sSlotMachine->luckyFlags &= ~(LUCKY_BIAS_777 | LUCKY_BIAS_MIXED_777);
-            if (sSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_BLUE) | (1 << SLOT_MACHINE_MATCHED_777_RED)))
+            if (sSlotMachine->matchedSymbols & ((1 << MATCHED_777_BLUE) | (1 << MATCHED_777_RED)))
             {
-                sSlotMachine->fairRollsLeft = 0;
-                sSlotMachine->fairRollsUsed = 0;
+                sSlotMachine->reelTimeSpinsLeft = 0;
+                sSlotMachine->reelTimeSpinsUsed = 0;
                 sSlotMachine->luckyGame = FALSE;
-                if (sSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_777_BLUE))
+                if (sSlotMachine->matchedSymbols & (1 << MATCHED_777_BLUE))
                     // this may be an error, but if you get blue 777, the game becomes lucky
                     sSlotMachine->luckyGame = TRUE;
             }
         }
-        if (sSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_POWER) && sSlotMachine->pikaPower < 16)
+        if (sSlotMachine->matchedSymbols & (1 << MATCHED_POWER) && sSlotMachine->pikaPower < 16)
         {
             sSlotMachine->pikaPower++;
-            DisplayPikaPower(sSlotMachine->pikaPower);
+            AddPikaPowerBolt(sSlotMachine->pikaPower);
         }
     }
     else
     {
-        sub_8104CAC(3);
-        sSlotMachine->state = 20;
+        CreateDigitalDisplayScene(DIG_DISPLAY_LOSE);
+        sSlotMachine->state = SLOT_ACTION_NO_MATCHES;
         if ((sSlotMachine->netCoinLoss += sSlotMachine->bet) > MAX_COINS)
             sSlotMachine->netCoinLoss = MAX_COINS;
     }
     return FALSE;
 }
 
+// SLOT_ACTION_WAIT_PAYOUT
 static bool8 SlotAction_WaitForPayoutToBeAwarded(struct Task *task)
 {
     if (IsFinalTask_RunAwardPayoutActions())
-        sSlotMachine->state = 16;
+        sSlotMachine->state = SLOT_ACTION_END_PAYOUT;
     return FALSE;
 }
 
-static bool8 SlotAction_EndOfRoll(struct Task *task)
+// SLOT_ACTION_END_PAYOUT
+static bool8 SlotAction_EndPayout(struct Task *task)
 {
-    if (sub_8103FA0())
+    if (TryStopSlotMachineLights())
     {
-        sSlotMachine->state = 19;
-        if (sSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_RED) | (1 << SLOT_MACHINE_MATCHED_777_BLUE)))
+        sSlotMachine->state = SLOT_ACTION_RESET_BET_TILES;
+
+        if (sSlotMachine->matchedSymbols & ((1 << MATCHED_777_RED) | (1 << MATCHED_777_BLUE)))
             IncrementGameStat(GAME_STAT_SLOT_JACKPOTS);
-        if (sSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_REPLAY))
+
+        if (sSlotMachine->matchedSymbols & (1 << MATCHED_REPLAY))
         {
             sSlotMachine->currReel = 0;
-            sSlotMachine->state = 9;
+            sSlotMachine->state = SLOT_ACTION_START_SPIN;
         }
-        if (sSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_POWER))
-            sSlotMachine->state = 17;
-        if (sSlotMachine->fairRollsLeft && sSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_REPLAY))
+
+        if (sSlotMachine->matchedSymbols & (1 << MATCHED_POWER))
+            sSlotMachine->state = SLOT_ACTION_MATCHED_POWER;
+
+        if (sSlotMachine->reelTimeSpinsLeft && sSlotMachine->matchedSymbols & (1 << MATCHED_REPLAY))
         {
-            sub_8104CAC(4);
-            sSlotMachine->state = 18;
+            CreateDigitalDisplayScene(DIG_DISPLAY_REEL_TIME);
+            sSlotMachine->state = SLOT_ACTION_WAIT_RT_ANIM;
         }
     }
     return FALSE;
 }
 
+// SLOT_ACTION_MATCHED_POWER
 static bool8 SlotAction_MatchedPower(struct Task *task)
 {
-    if (!sub_81040C8())
+    if (!IsPikaPowerBoltAnimating())
     {
-        sSlotMachine->state = 19;
-        if (sSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_REPLAY))
+        sSlotMachine->state = SLOT_ACTION_RESET_BET_TILES;
+        if (sSlotMachine->matchedSymbols & (1 << MATCHED_REPLAY))
         {
-            sSlotMachine->state = 9;
-            if (sSlotMachine->fairRollsLeft)
+            sSlotMachine->state = SLOT_ACTION_START_SPIN;
+            if (sSlotMachine->reelTimeSpinsLeft)
             {
-                sub_8104CAC(4);
-                sSlotMachine->state = 18;
+                CreateDigitalDisplayScene(DIG_DISPLAY_REEL_TIME);
+                sSlotMachine->state = SLOT_ACTION_WAIT_RT_ANIM;
             }
         }
     }
     return FALSE;
 }
 
-static bool8 SlotAction18(struct Task *task)
+// SLOT_ACTION_WAIT_RT_ANIM
+static bool8 SlotAction_WaitReelTimeAnim(struct Task *task)
 {
-    if (sub_8104E18())
+    if (IsDigitalDisplayAnimFinished())
     {
-        sSlotMachine->state = 19;
-        if (sSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_REPLAY))
+        sSlotMachine->state = SLOT_ACTION_RESET_BET_TILES;
+        if (sSlotMachine->matchedSymbols & (1 << MATCHED_REPLAY))
         {
-            sSlotMachine->state = 9;
+            sSlotMachine->state = SLOT_ACTION_START_SPIN;
         }
     }
     return FALSE;
 }
 
-static bool8 SlotAction_Loop(struct Task *task)
+// SLOT_ACTION_RESET_BET_TILES
+static bool8 SlotAction_ResetBetTiles(struct Task *task)
 {
-    sub_8103D8C(0);
-    sub_8103D8C(1);
-    sub_8103D8C(2);
-    sSlotMachine->state = 2;
+    DarkenBetTiles(0);
+    DarkenBetTiles(1);
+    DarkenBetTiles(2);
+    sSlotMachine->state = SLOT_ACTION_READY_NEW_SPIN;
     return FALSE;
 }
 
+// SLOT_ACTION_NO_MATCHES
 static bool8 SlotAction_NoMatches(struct Task *task)
 {
     if (++task->data[1] > 64)
     {
         task->data[1] = 0;
-        sSlotMachine->state = 19;
+        sSlotMachine->state = SLOT_ACTION_RESET_BET_TILES;
     }
     return FALSE;
 }
 
-static bool8 SlotAction_PrintQuitTheGame(struct Task *task)
+// SLOT_ACTION_ASK_QUIT
+static bool8 SlotAction_AskQuit(struct Task *task)
 {
     DrawDialogueFrame(0, 0);
     AddTextPrinterParameterized(0, 1, gText_QuitTheGame, 0, 1, 0, 0);
     CopyWindowToVram(0, 3);
     CreateYesNoMenuParameterized(0x15, 7, 0x214, 0x180, 0xE, 0xF);
-    sSlotMachine->state = 22;
+    sSlotMachine->state = SLOT_ACTION_HANDLE_QUIT_INPUT;
     return FALSE;
 }
 
-static bool8 SlotAction_SeeIfPlayerQuits(struct Task *task)
+// SLOT_ACTION_HANDLE_QUIT_INPUT
+static bool8 SlotAction_HandleQuitInput(struct Task *task)
 {
     s8 input = Menu_ProcessInputNoWrapClearOnChoose();
     if (input == 0) // player chooses to quit
     {
         ClearDialogWindowAndFrame(0, TRUE);
-        sub_8103D8C(0);
-        sub_8103D8C(1);
-        sub_8103D8C(2);
+        DarkenBetTiles(0);
+        DarkenBetTiles(1);
+        DarkenBetTiles(2);
         sSlotMachine->coins += sSlotMachine->bet;
-        sSlotMachine->state = 27;
+        sSlotMachine->state = SLOT_ACTION_END;
     }
     else if (input == 1 || input == -1) // player chooses not to quit
     {
         ClearDialogWindowAndFrame(0, TRUE);
-        sSlotMachine->state = 5;
+        sSlotMachine->state = SLOT_ACTION_BET_INPUT;
     }
     return FALSE;
 }
 
-static bool8 SlotAction_PrintMessage_9999Coins(struct Task *task)
+// SLOT_ACTION_MSG_MAX_COINS
+static bool8 SlotAction_PrintMsg_9999Coins(struct Task *task)
 {
     DrawDialogueFrame(0, 0);
     AddTextPrinterParameterized(0, 1, gText_YouveGot9999Coins, 0, 1, 0, 0);
     CopyWindowToVram(0, 3);
-    sSlotMachine->state = 24;
+    sSlotMachine->state = SLOT_ACTION_WAIT_MSG_MAX_COINS;
     return FALSE;
 }
 
-static bool8 SlotAction_ExitMessage_9999Coins(struct Task *task)
+// SLOT_ACTION_WAIT_MSG_MAX_COINS
+static bool8 SlotAction_WaitMsg_9999Coins(struct Task *task)
 {
-    if (gMain.newKeys & (A_BUTTON | B_BUTTON))
+    if (JOY_NEW(A_BUTTON | B_BUTTON))
     {
         ClearDialogWindowAndFrame(0, TRUE);
-        sSlotMachine->state = 5;
+        sSlotMachine->state = SLOT_ACTION_BET_INPUT;
     }
     return FALSE;
 }
 
-static bool8 SlotAction_PrintMessage_NoMoreCoins(struct Task *task)
+// SLOT_ACTION_MSG_NO_MORE_COINS
+static bool8 SlotAction_PrintMsg_NoMoreCoins(struct Task *task)
 {
     DrawDialogueFrame(0, 0);
     AddTextPrinterParameterized(0, 1, gText_YouveRunOutOfCoins, 0, 1, 0, 0);
     CopyWindowToVram(0, 3);
-    sSlotMachine->state = 26;
+    sSlotMachine->state = SLOT_ACTION_WAIT_MSG_NO_MORE_COINS;
     return FALSE;
 }
 
-static bool8 SlotAction_ExitMessage_NoMoreCoins(struct Task *task)
+// SLOT_ACTION_WAIT_MSG_NO_MORE_COINS
+static bool8 SlotAction_WaitMsg_NoMoreCoins(struct Task *task)
 {
-    if (gMain.newKeys & (A_BUTTON | B_BUTTON))
+    if (JOY_NEW(A_BUTTON | B_BUTTON))
     {
         ClearDialogWindowAndFrame(0, TRUE);
-        sSlotMachine->state = 27;
+        sSlotMachine->state = SLOT_ACTION_END;
     }
     return FALSE;
 }
 
+// SLOT_ACTION_END
 static bool8 SlotAction_EndGame(struct Task *task)
 {
     SetCoins(sSlotMachine->coins);
     AlertTVOfNewCoinTotal(GetCoins());
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
-    sSlotMachine->state++;
+    sSlotMachine->state++; // SLOT_ACTION_FREE
     return FALSE;
 }
 
+// SLOT_ACTION_FREE
 static bool8 SlotAction_FreeDataStructures(struct Task *task)
 {
     if (!gPaletteFade.active)
     {
         SetMainCallback2(sSlotMachine->prevMainCb);
-        FREE_AND_SET_NULL(sUnknown_0203AAF4);
-        FREE_AND_SET_NULL(sUnknown_0203AAF8);
-        FREE_AND_SET_NULL(sUnknown_0203AAFC);
-        FREE_AND_SET_NULL(sUnknown_0203AB00);
-        FREE_AND_SET_NULL(sUnknown_0203AB04);
-        FREE_AND_SET_NULL(sUnknown_0203AB08);
-        FREE_AND_SET_NULL(sUnknown_0203AB0C);
-        FREE_AND_SET_NULL(sUnknown_0203AB10);
-        FREE_AND_SET_NULL(sUnknown_0203AB14);
-        FREE_AND_SET_NULL(sUnknown_0203AB18);
-        FREE_AND_SET_NULL(sUnknown_0203AB1C);
-        FREE_AND_SET_NULL(sUnknown_0203AB20);
-        FREE_AND_SET_NULL(sUnknown_0203AB24);
-        FREE_AND_SET_NULL(sUnknown_0203AB28);
-        if (sUnknown_0203AAE4 != NULL)
-            FREE_AND_SET_NULL(sUnknown_0203AAE4);
-        if (sUnknown_0203AAE8 != NULL)
-            FREE_AND_SET_NULL(sUnknown_0203AAE8);
-        if (sUnknown_0203AAEC != NULL)
-            FREE_AND_SET_NULL(sUnknown_0203AAEC);
-        if (sUnknown_0203AAF0 != NULL)
-            FREE_AND_SET_NULL(sUnknown_0203AAF0);
-        FREE_AND_SET_NULL(sUnknown_0203AAC8);
+        FREE_AND_SET_NULL(sImageTable_DigitalDisplay_Reel);
+        FREE_AND_SET_NULL(sImageTable_DigitalDisplay_Time);
+        FREE_AND_SET_NULL(sImageTable_DigitalDisplay_Insert);
+        FREE_AND_SET_NULL(sImageTable_DigitalDisplay_Stop);
+        FREE_AND_SET_NULL(sImageTable_DigitalDisplay_Win);
+        FREE_AND_SET_NULL(sImageTable_DigitalDisplay_Lose);
+        FREE_AND_SET_NULL(sImageTable_DigitalDisplay_Bonus);
+        FREE_AND_SET_NULL(sImageTable_DigitalDisplay_Big);
+        FREE_AND_SET_NULL(sImageTable_DigitalDisplay_Reg);
+        FREE_AND_SET_NULL(sImageTable_DigitalDisplay_AButton);
+        FREE_AND_SET_NULL(sImageTable_DigitalDisplay_Smoke);
+        FREE_AND_SET_NULL(sImageTable_DigitalDisplay_Number);
+        FREE_AND_SET_NULL(sImageTable_DigitalDisplay_Pokeball);
+        FREE_AND_SET_NULL(sImageTable_DigitalDisplay_DPad);
+        if (sImageTable_ReelTimePikachu != NULL)
+            FREE_AND_SET_NULL(sImageTable_ReelTimePikachu);
+        if (sImageTable_ReelTimeMachineAntennae != NULL)
+            FREE_AND_SET_NULL(sImageTable_ReelTimeMachineAntennae);
+        if (sImageTable_ReelTimeMachine != NULL)
+            FREE_AND_SET_NULL(sImageTable_ReelTimeMachine);
+        if (sImageTable_BrokenReelTimeMachine != NULL)
+            FREE_AND_SET_NULL(sImageTable_BrokenReelTimeMachine);
+        FREE_AND_SET_NULL(sMenuGfx);
         FREE_AND_SET_NULL(sSelectedPikaPowerTile);
-        FREE_AND_SET_NULL(sUnknown_0203AAD0);
-        FREE_AND_SET_NULL(sUnknown_0203AAD4);
-        FREE_AND_SET_NULL(sUnknown_0203AAD8);
-        FREE_AND_SET_NULL(sUnknown_0203AADC);
-        FREE_AND_SET_NULL(sUnknown_0203AAE0);
-        FREE_AND_SET_NULL(sUnknown_0203AB2C);
-        FREE_AND_SET_NULL(sUnknown_0203AB30);
-
+        FREE_AND_SET_NULL(sReelOverlay_Tilemap);
+        FREE_AND_SET_NULL(sDigitalDisplayGfxPtr);
+        FREE_AND_SET_NULL(sReelTimeGfxPtr);
+        FREE_AND_SET_NULL(sReelButtonPress_Tilemap);
+        FREE_AND_SET_NULL(sReelBackground_Gfx);
+        FREE_AND_SET_NULL(sReelBackgroundSpriteSheet);
+        FREE_AND_SET_NULL(sSlotMachineSpritesheetsPtr);
         FREE_AND_SET_NULL(sSlotMachine);
     }
     return FALSE;
@@ -1403,7 +1644,7 @@ static void DrawLuckyFlags(void)
 {
     u8 attempts;
 
-    if (sSlotMachine->fairRollsLeft == 0)
+    if (sSlotMachine->reelTimeSpinsLeft == 0)
     {
         if (!(sSlotMachine->luckyFlags & (LUCKY_BIAS_777 | LUCKY_BIAS_MIXED_777)))
         {
@@ -1413,7 +1654,7 @@ static void DrawLuckyFlags(void)
                 if (attempts != 3) // if you found a lucky number
                 {
                     // attempts == 1:  reelTime flag set
-                    sSlotMachine->luckyFlags |= gLuckyFlagSettings_Top3[attempts];
+                    sSlotMachine->luckyFlags |= sLuckyFlagSettings_Top3[attempts];
                     if (attempts != 1)
                     {
                         return;
@@ -1424,7 +1665,7 @@ static void DrawLuckyFlags(void)
             attempts = AttemptsAtLuckyFlags_NotTop3();
             if (attempts != 5)  // if you found a lucky number
             {
-                sSlotMachine->luckyFlags |= gLuckyFlagSettings_NotTop3[attempts];
+                sSlotMachine->luckyFlags |= sLuckyFlagSettings_NotTop3[attempts];
             }
         }
     }
@@ -1432,9 +1673,9 @@ static void DrawLuckyFlags(void)
 
 static void SetLuckySpins(void)
 {
-    sSlotMachine->luckySpinsLeft = 0;
+    sSlotMachine->isLuckySpin = FALSE;
     if (sSlotMachine->luckyFlags)
-        sSlotMachine->luckySpinsLeft = 1;
+        sSlotMachine->isLuckySpin = TRUE;
 }
 
 static u8 GetBiasTag(u8 luckyFlags)
@@ -1444,7 +1685,7 @@ static u8 GetBiasTag(u8 luckyFlags)
     for (i = 0; i < 8; i++)
     {
         if (luckyFlags & 1)
-            return gBiasTags[i];
+            return sBiasTags[i];
         luckyFlags >>= 1;
     }
     return 0;
@@ -1454,7 +1695,7 @@ static u8 GetBiasTag(u8 luckyFlags)
 static bool8 IsThisRoundLucky(void)
 {
     u8 rval = Random();
-    if (gLuckyRoundProbabilities[sSlotMachine->machineId][sSlotMachine->bet - 1] > rval)
+    if (sLuckyRoundProbabilities[sSlotMachine->machineId][sSlotMachine->bet - 1] > rval)
         return TRUE;
     return FALSE;
 }
@@ -1466,7 +1707,7 @@ static u8 AttemptsAtLuckyFlags_Top3(void)
     for (count = 0; count < 3; count++)
     {
         s16 rval = Random() & 0xff;
-        s16 value = gLuckyFlagProbabilities_Top3[count][sSlotMachine->machineId];
+        s16 value = sLuckyFlagProbabilities_Top3[count][sSlotMachine->machineId];
         if (value > rval)
             break;
     }
@@ -1480,7 +1721,7 @@ static u8 AttemptsAtLuckyFlags_NotTop3(void)
     for (count = 0; count < 5; count++)
     {
         s16 rval = Random() & 0xff; // random byte
-        s16 value = gLuckyFlagProbabilities_NotTop3[count][sSlotMachine->machineId];
+        s16 value = sLuckyFlagProbabilities_NotTop3[count][sSlotMachine->machineId];
         // make first attempt easier if it's a lucky game
         if (count == 0 && sSlotMachine->luckyGame == TRUE)
         {
@@ -1504,9 +1745,9 @@ static u8 AttemptsAtLuckyFlags_NotTop3(void)
 static u8 GetReelTimeProbability(u8 reelTimeDraw)
 {
     if (sSlotMachine->luckyGame == FALSE)
-        return gReeltimeProbabilities_UnluckyGame[reelTimeDraw][sSlotMachine->pikaPower];
+        return sReeltimeProbabilities_UnluckyGame[reelTimeDraw][sSlotMachine->pikaPower];
     else
-        return gReelTimeProbabilities_LuckyGame[reelTimeDraw][sSlotMachine->pikaPower];
+        return sReelTimeProbabilities_LuckyGame[reelTimeDraw][sSlotMachine->pikaPower];
 }
 
 static void GetReeltimeDraw(void)
@@ -1527,10 +1768,10 @@ static void GetReeltimeDraw(void)
     sSlotMachine->reelTimeDraw = reelTimeDraw;
 }
 
-static bool8 SkipToReeltimeAction14(u16 i)
+static bool8 ShouldReelTimeMachineExplode(u16 i)
 {
     u16 rval = Random() & 0xff;
-    if (rval < gProbabilityTable_SkipToReeltimeAction14[i])
+    if (rval < sReelTimeExplodeProbability[i])
         return TRUE;
     else
         return FALSE;
@@ -1550,11 +1791,11 @@ static u16 SlowReelSpeed(void)
     else if (sSlotMachine->netCoinLoss >= 150)
         i = 1;
     rval = Random() % 100;
-    value = gReelIncrementTable[i][0];
+    value = sReelIncrementTable[i][0];
     if (rval < value)
         return 4;
     rval = Random() % 100;
-    value = gReelIncrementTable[i][1] + gReelTimeBonusIncrementTable[sSlotMachine->fairRollsUsed];
+    value = sReelIncrementTable[i][1] + sReelTimeBonusIncrementTable[sSlotMachine->reelTimeSpinsUsed];
     if (rval < value)
         return 2;
     return 8;
@@ -1577,12 +1818,12 @@ static void CheckMatch_CenterRow(void)
     c1 = GetTagAtRest(LEFT_REEL, 2);
     c2 = GetTagAtRest(MIDDLE_REEL, 2);
     c3 = GetTagAtRest(RIGHT_REEL, 2);
-    match = GetMatchFromSymbolsInRow(c1, c2, c3);
-    if (match != SLOT_MACHINE_MATCHED_NONE)
+    match = GetMatchFromSymbols(c1, c2, c3);
+    if (match != MATCHED_NONE)
     {
-        sSlotMachine->payout += gSlotPayouts[match];
-        sSlotMachine->matchedSymbols |= gSlotMatchFlags[match];
-        sub_8103E04(0);
+        sSlotMachine->payout += sSlotPayouts[match];
+        sSlotMachine->matchedSymbols |= sSlotMatchFlags[match];
+        FlashMatchLine(MATCH_MIDDLE_ROW);
     }
 }
 
@@ -1593,26 +1834,26 @@ static void CheckMatch_TopAndBottom(void)
     c1 = GetTagAtRest(LEFT_REEL, 1);
     c2 = GetTagAtRest(MIDDLE_REEL, 1);
     c3 = GetTagAtRest(RIGHT_REEL, 1);
-    match = GetMatchFromSymbolsInRow(c1, c2, c3);
-    if (match != SLOT_MACHINE_MATCHED_NONE)
+    match = GetMatchFromSymbols(c1, c2, c3);
+    if (match != MATCHED_NONE)
     {
-        if (match == SLOT_MACHINE_MATCHED_1CHERRY)
-            match = SLOT_MACHINE_MATCHED_2CHERRY;
-        sSlotMachine->payout += gSlotPayouts[match];
-        sSlotMachine->matchedSymbols |= gSlotMatchFlags[match];
-        sub_8103E04(1);
+        if (match == MATCHED_1CHERRY)
+            match = MATCHED_2CHERRY;
+        sSlotMachine->payout += sSlotPayouts[match];
+        sSlotMachine->matchedSymbols |= sSlotMatchFlags[match];
+        FlashMatchLine(MATCH_TOP_ROW);
     }
     c1 = GetTagAtRest(LEFT_REEL, 3);
     c2 = GetTagAtRest(MIDDLE_REEL, 3);
     c3 = GetTagAtRest(RIGHT_REEL, 3);
-    match = GetMatchFromSymbolsInRow(c1, c2, c3);
-    if (match != SLOT_MACHINE_MATCHED_NONE)
+    match = GetMatchFromSymbols(c1, c2, c3);
+    if (match != MATCHED_NONE)
     {
-        if (match == SLOT_MACHINE_MATCHED_1CHERRY)
-            match = SLOT_MACHINE_MATCHED_2CHERRY;
-        sSlotMachine->payout += gSlotPayouts[match];
-        sSlotMachine->matchedSymbols |= gSlotMatchFlags[match];
-        sub_8103E04(2);
+        if (match == MATCHED_1CHERRY)
+            match = MATCHED_2CHERRY;
+        sSlotMachine->payout += sSlotPayouts[match];
+        sSlotMachine->matchedSymbols |= sSlotMatchFlags[match];
+        FlashMatchLine(MATCH_BOTTOM_ROW);
     }
 }
 
@@ -1623,42 +1864,42 @@ static void CheckMatch_Diagonals(void)
     c1 = GetTagAtRest(LEFT_REEL, 1);
     c2 = GetTagAtRest(MIDDLE_REEL, 2);
     c3 = GetTagAtRest(RIGHT_REEL, 3);
-    match = GetMatchFromSymbolsInRow(c1, c2, c3);
-    if (match != SLOT_MACHINE_MATCHED_NONE)
+    match = GetMatchFromSymbols(c1, c2, c3);
+    if (match != MATCHED_NONE)
     {
-        if (match != SLOT_MACHINE_MATCHED_1CHERRY)
+        if (match != MATCHED_1CHERRY)
         {
-            sSlotMachine->payout += gSlotPayouts[match];
-            sSlotMachine->matchedSymbols |= gSlotMatchFlags[match];
+            sSlotMachine->payout += sSlotPayouts[match];
+            sSlotMachine->matchedSymbols |= sSlotMatchFlags[match];
         }
-        sub_8103E04(3);
+        FlashMatchLine(MATCH_NWSE_DIAG);
     }
     c1 = GetTagAtRest(LEFT_REEL, 3);
     c2 = GetTagAtRest(MIDDLE_REEL, 2);
     c3 = GetTagAtRest(RIGHT_REEL, 1);
-    match = GetMatchFromSymbolsInRow(c1, c2, c3);
-    if (match != SLOT_MACHINE_MATCHED_NONE)
+    match = GetMatchFromSymbols(c1, c2, c3);
+    if (match != MATCHED_NONE)
     {
-        if (match != SLOT_MACHINE_MATCHED_1CHERRY)
+        if (match != MATCHED_1CHERRY)
         {
-            sSlotMachine->payout += gSlotPayouts[match];
-            sSlotMachine->matchedSymbols |= gSlotMatchFlags[match];
+            sSlotMachine->payout += sSlotPayouts[match];
+            sSlotMachine->matchedSymbols |= sSlotMatchFlags[match];
         }
-        sub_8103E04(4);
+        FlashMatchLine(MATCH_NESW_DIAG);
     }
 }
 
-static u8 GetMatchFromSymbolsInRow(u8 c1, u8 c2, u8 c3)
+static u8 GetMatchFromSymbols(u8 c1, u8 c2, u8 c3)
 {
     if (c1 == c2 && c1 == c3)
-        return gSym2Match[c1];
-    if (c1 == SLOT_MACHINE_TAG_7_RED && c2 == SLOT_MACHINE_TAG_7_RED && c3 == SLOT_MACHINE_TAG_7_BLUE)
-        return SLOT_MACHINE_MATCHED_777_MIXED;
-    if (c1 == SLOT_MACHINE_TAG_7_BLUE && c2 == SLOT_MACHINE_TAG_7_BLUE && c3 == SLOT_MACHINE_TAG_7_RED)
-        return SLOT_MACHINE_MATCHED_777_MIXED;
-    if (c1 == SLOT_MACHINE_TAG_CHERRY)
-        return SLOT_MACHINE_MATCHED_1CHERRY;
-    return SLOT_MACHINE_MATCHED_NONE;
+        return sSymToMatch[c1];
+    if (c1 == GFXTAG_7_RED && c2 == GFXTAG_7_RED && c3 == GFXTAG_7_BLUE)
+        return MATCHED_777_MIXED;
+    if (c1 == GFXTAG_7_BLUE && c2 == GFXTAG_7_BLUE && c3 == GFXTAG_7_RED)
+        return MATCHED_777_MIXED;
+    if (c1 == GFXTAG_CHERRY)
+        return MATCHED_1CHERRY;
+    return MATCHED_NONE;
 }
 
 static void AwardPayout(void)
@@ -1676,13 +1917,13 @@ static bool8 IsFinalTask_RunAwardPayoutActions(void)
 
 static void RunAwardPayoutActions(u8 taskId)
 {
-    while (AwardPayoutActions[gTasks[taskId].data[0]](&gTasks[taskId]))
+    while (sAwardPayoutActions[gTasks[taskId].data[0]](&gTasks[taskId]))
         ;
 }
 
 static bool8 AwardPayoutAction0(struct Task *task)
 {
-    if (sub_8103E38())
+    if (IsMatchLineDoneFlashingBeforePayout())
     {
         task->data[0]++;
         if (sSlotMachine->payout == 0)
@@ -1707,7 +1948,7 @@ static bool8 AwardPayoutAction_GivePayoutToPlayer(struct Task *task)
         if (gMain.heldKeys & A_BUTTON)
             task->data[1] = 4;
     }
-    if (IsFanfareTaskInactive() && gMain.newKeys & START_BUTTON)
+    if (IsFanfareTaskInactive() && JOY_NEW(START_BUTTON))
     {
         PlaySE(SE_PIN);
         sSlotMachine->coins += sSlotMachine->payout;
@@ -1722,7 +1963,7 @@ static bool8 AwardPayoutAction_GivePayoutToPlayer(struct Task *task)
 
 static bool8 AwardPayoutAction_FreeTask(struct Task *task)
 {
-    if (sub_8103E7C())
+    if (TryStopMatchLinesFlashing())
         DestroyTask(FindTaskIdByFunc(RunAwardPayoutActions));
     return FALSE;
 }
@@ -1741,17 +1982,17 @@ static bool8 AwardPayoutAction_FreeTask(struct Task *task)
 //           .-----------------.
 static u8 GetTagAtRest(u8 reel, s16 offset)
 {
-    s16 pos = (sSlotMachine->reelPositions[reel] + offset) % REEL_NUM_TAGS;
+    s16 pos = (sSlotMachine->reelPositions[reel] + offset) % SYMBOLS_PER_REEL;
     if (pos < 0)
-        pos += REEL_NUM_TAGS;
-    return gReelSymbols[reel][pos];
+        pos += SYMBOLS_PER_REEL;
+    return sReelSymbolTileTags[reel][pos];
 }
 
 // Calculates GetTagAtRest as if the reel were snapped downwards into place.
 static u8 GetTag(u8 reel, s16 offset)
 {
     s16 inc = 0;
-    s16 pixelOffset = sSlotMachine->reelPixelOffsets[reel] % REEL_TAG_HEIGHT;
+    s16 pixelOffset = sSlotMachine->reelPixelOffsets[reel] % REEL_SYMBOL_HEIGHT;
     if (pixelOffset != 0)
         inc = -1;
     return GetTagAtRest(reel, offset + inc);
@@ -1762,25 +2003,25 @@ static u8 GetNearbyReelTimeTag(s16 n)
     s16 newPosition = (sSlotMachine->reeltimePosition + n) % 6;
     if (newPosition < 0)
         newPosition += 6;
-    return gReelTimeTags[newPosition];
+    return sReelTimeTags[newPosition];
 }
 
 static void AdvanceSlotReel(u8 reelIndex, s16 value)
 {
     sSlotMachine->reelPixelOffsets[reelIndex] += value;
     sSlotMachine->reelPixelOffsets[reelIndex] %= 504;
-    sSlotMachine->reelPositions[reelIndex] = REEL_NUM_TAGS - sSlotMachine->reelPixelOffsets[reelIndex] / 24;
+    sSlotMachine->reelPositions[reelIndex] = SYMBOLS_PER_REEL - sSlotMachine->reelPixelOffsets[reelIndex] / REEL_SYMBOL_HEIGHT;
 }
 
 s16 AdvanceSlotReelToNextTag(u8 reelIndex, s16 value)
 {
-    s16 offset = sSlotMachine->reelPixelOffsets[reelIndex] % 24;
+    s16 offset = sSlotMachine->reelPixelOffsets[reelIndex] % REEL_SYMBOL_HEIGHT;
     if (offset != 0)
     {
         if (offset < value)
             value = offset;
         AdvanceSlotReel(reelIndex, value);
-        offset = sSlotMachine->reelPixelOffsets[reelIndex] % 24;
+        offset = sSlotMachine->reelPixelOffsets[reelIndex] % REEL_SYMBOL_HEIGHT;
     }
     return offset;
 }
@@ -1805,42 +2046,45 @@ s16 AdvanceReeltimeReelToNextTag(s16 value)
     return offset;
 }
 
-static void GameplayTask_StopSlotReel(void)
+#define tState  data[0]
+#define tMoving data[14]
+#define tReelId data[15]
+
+static void CreateSlotReelTasks(void)
 {
     u8 i;
-    for (i = 0; i < 3; i++)
+    for (i = 0; i < NUM_REELS; i++)
     {
-        u8 taskId = CreateTask(RunSlotReelActions, 2);
-        gTasks[taskId].data[15] = i;
+        u8 taskId = CreateTask(Task_RunSlotReelActions, 2);
+        gTasks[taskId].tReelId = i;
         sSlotMachine->slotReelTasks[i] = taskId;
-        RunSlotReelActions(taskId);
+        Task_RunSlotReelActions(taskId);
     }
 }
 
-static void ReelTasks_SetUnkTaskData(u8 reelIndex)
+static void SpinSlotReel(u8 reelIndex)
 {
-    gTasks[sSlotMachine->slotReelTasks[reelIndex]].data[0] = 1;
-    gTasks[sSlotMachine->slotReelTasks[reelIndex]].data[14] = 1;
+    gTasks[sSlotMachine->slotReelTasks[reelIndex]].tState = REEL_ACTION_SPIN;
+    gTasks[sSlotMachine->slotReelTasks[reelIndex]].tMoving = TRUE;
 }
 
-static void sub_8102E1C(u8 reelIndex)
+static void StopSlotReel(u8 reelIndex)
 {
-    gTasks[sSlotMachine->slotReelTasks[reelIndex]].data[0] = 2;
+    gTasks[sSlotMachine->slotReelTasks[reelIndex]].tState = REEL_ACTION_STOP;
 }
 
 static bool8 IsSlotReelMoving(u8 reelIndex)
 {
-    return gTasks[sSlotMachine->slotReelTasks[reelIndex]].data[14];
+    return gTasks[sSlotMachine->slotReelTasks[reelIndex]].tMoving;
 }
 
-static void RunSlotReelActions(u8 taskId)
+static void Task_RunSlotReelActions(u8 taskId)
 {
-    while (SlotReelActions[gTasks[taskId].data[0]](&gTasks[taskId]))
+    while (sSlotReelActions[gTasks[taskId].tState](&gTasks[taskId]))
         ;
 }
 
 // task->data[1]  reel turns
-// task->data[15]  reelIndex
 static bool8 SlotReelAction_StayStill(struct Task *task)
 {
     return FALSE;
@@ -1848,46 +2092,46 @@ static bool8 SlotReelAction_StayStill(struct Task *task)
 
 static bool8 SlotReelAction_Spin(struct Task *task)
 {
-    AdvanceSlotReel(task->data[15], sSlotMachine->reelIncrement);
+    AdvanceSlotReel(task->tReelId, sSlotMachine->reelIncrement);
     return FALSE;
 }
 
 // As in previous generations, the slot machine often doesn't stop exactly when you press stop
 static bool8 SlotReelAction_DecideWhereToStop(struct Task *task)
 {
-    task->data[0]++;
-    // initialize data for that reel --> these will be changed if gBiasTags can be lined up
-    sSlotMachine->winnerRows[task->data[15]] = 0;
-    sSlotMachine->reelExtraTurns[task->data[15]] = 0;
+    task->tState++;
+    // initialize data for that reel --> these will be changed if sBiasTags can be lined up
+    sSlotMachine->winnerRows[task->tReelId] = 0;
+    sSlotMachine->reelExtraTurns[task->tReelId] = 0;
 
-    if (sSlotMachine->fairRollsLeft == 0 && (sSlotMachine->luckyFlags == 0 || sSlotMachine->luckySpinsLeft == 0 || !DecideReelTurns_BiasTag[task->data[15]]()))
+    if (sSlotMachine->reelTimeSpinsLeft == 0 && (sSlotMachine->luckyFlags == 0 || !sSlotMachine->isLuckySpin || !sDecideReelTurns_BiasTag[task->tReelId]()))
     {
-        sSlotMachine->luckySpinsLeft = 0;
-        DecideReelTurns_NoBiasTag[task->data[15]]();
+        sSlotMachine->isLuckySpin = FALSE;
+        sDecideReelTurns_NoBiasTag[task->tReelId]();
     }
-    task->data[1] = sSlotMachine->reelExtraTurns[task->data[15]];
+    task->data[1] = sSlotMachine->reelExtraTurns[task->tReelId];
     return TRUE;
 }
 
 // go to next tag and then do any additional turns
 static bool8 SlotReelAction_MoveToStop(struct Task *task)
 {
-    u16 reelStopShocks[ARRAY_COUNT(ReelStopShocks)];
+    u16 reelStopShocks[ARRAY_COUNT(sReelStopShocks)];
     s16 reelPixelPos;
 
-    memcpy(reelStopShocks, ReelStopShocks, sizeof(ReelStopShocks));
-    reelPixelPos = sSlotMachine->reelPixelOffsets[task->data[15]] % 24;
+    memcpy(reelStopShocks, sReelStopShocks, sizeof(sReelStopShocks));
+    reelPixelPos = sSlotMachine->reelPixelOffsets[task->tReelId] % REEL_SYMBOL_HEIGHT;
     if (reelPixelPos != 0)
-        reelPixelPos = AdvanceSlotReelToNextTag(task->data[15], sSlotMachine->reelIncrement);
-    else if (sSlotMachine->reelExtraTurns[task->data[15]])
+        reelPixelPos = AdvanceSlotReelToNextTag(task->tReelId, sSlotMachine->reelIncrement);
+    else if (sSlotMachine->reelExtraTurns[task->tReelId])
     {
-        sSlotMachine->reelExtraTurns[task->data[15]]--;
-        AdvanceSlotReel(task->data[15], sSlotMachine->reelIncrement);
-        reelPixelPos = sSlotMachine->reelPixelOffsets[task->data[15]] % 24;
+        sSlotMachine->reelExtraTurns[task->tReelId]--;
+        AdvanceSlotReel(task->tReelId, sSlotMachine->reelIncrement);
+        reelPixelPos = sSlotMachine->reelPixelOffsets[task->tReelId] % REEL_SYMBOL_HEIGHT;
     }
-    if (reelPixelPos == 0 && sSlotMachine->reelExtraTurns[task->data[15]] == 0)
+    if (reelPixelPos == 0 && sSlotMachine->reelExtraTurns[task->tReelId] == 0)
     {
-        task->data[0]++;
+        task->tState++;
         task->data[1] = reelStopShocks[task->data[1]];
         task->data[2] = 0;
     }
@@ -1897,30 +2141,34 @@ static bool8 SlotReelAction_MoveToStop(struct Task *task)
 // make selected tag oscillate before it becomes still
 static bool8 SlotReelAction_OscillatingStop(struct Task *task)
 {
-    sSlotMachine->reelPixelOffsetsWhileStopping[task->data[15]] = task->data[1];
+    sSlotMachine->reelPixelOffsetsWhileStopping[task->tReelId] = task->data[1];
     task->data[1] = -task->data[1];
     task->data[2]++;
     if ((task->data[2] & 0x3) == 0)
         task->data[1] >>= 1;
     if (task->data[1] == 0)
     {
-        task->data[0] = 0;
-        task->data[14] = 0;
-        sSlotMachine->reelPixelOffsetsWhileStopping[task->data[15]] = 0;
+        task->tState = 0;
+        task->tMoving = FALSE;
+        sSlotMachine->reelPixelOffsetsWhileStopping[task->tReelId] = 0;
     }
     return FALSE;
 }
 
+#undef tState
+#undef tMoving
+#undef tReelId
+
 static bool8 DecideReelTurns_BiasTag_Reel1(void)
 {
     u8 tag2 = GetBiasTag(sSlotMachine->luckyFlags);
     u8 tag1 = tag2;
     if (sSlotMachine->luckyFlags & (LUCKY_BIAS_777 | LUCKY_BIAS_MIXED_777))
     {
-        tag1 = SLOT_MACHINE_TAG_7_RED;
-        tag2 = SLOT_MACHINE_TAG_7_BLUE;
+        tag1 = GFXTAG_7_RED;
+        tag2 = GFXTAG_7_BLUE;
     }
-    return DecideReelTurns_BiasTag_Reel1_Bets[sSlotMachine->bet - 1](tag1, tag2);
+    return sDecideReelTurns_BiasTag_Reel1_Bets[sSlotMachine->bet - 1](tag1, tag2);
 }
 
 static bool8 AreTagsAtPosition_Reel1(s16 pos, u8 tag1, u8 tag2)
@@ -1936,7 +2184,9 @@ static bool8 AreTagsAtPosition_Reel1(s16 pos, u8 tag1, u8 tag2)
 
 static bool8 AreCherriesOnScreen_Reel1(s16 offsetFromCenter)
 {
-    if (GetTag(LEFT_REEL, 1 - offsetFromCenter) == SLOT_MACHINE_TAG_CHERRY || GetTag(LEFT_REEL, 2 - offsetFromCenter) == SLOT_MACHINE_TAG_CHERRY || GetTag(LEFT_REEL, 3 - offsetFromCenter) == SLOT_MACHINE_TAG_CHERRY)
+    if (GetTag(LEFT_REEL, 1 - offsetFromCenter) == GFXTAG_CHERRY 
+     || GetTag(LEFT_REEL, 2 - offsetFromCenter) == GFXTAG_CHERRY 
+     || GetTag(LEFT_REEL, 3 - offsetFromCenter) == GFXTAG_CHERRY)
         return TRUE;
     else
         return FALSE;
@@ -1959,7 +2209,7 @@ static bool8 DecideReelTurns_BiasTag_Reel1_Bet1(u8 tag1, u8 tag2)
         // if a lucky tag appears in the center row within 4 turns
         if (AreTagsAtPosition_Reel1(2 - i, tag1, tag2))
         {
-            sSlotMachine->winnerRows[0] = 2;
+            sSlotMachine->winnerRows[LEFT_REEL] = 2;
             sSlotMachine->reelExtraTurns[0] = i;
             return TRUE;
         }
@@ -2020,7 +2270,7 @@ static bool8 DecideReelTurns_BiasTag_Reel1_Bet2or3(u8 tag1, u8 tag2)
 
 static bool8 DecideReelTurns_BiasTag_Reel2(void)
 {
-    return DecideReelTurns_BiasTag_Reel2_Bets[sSlotMachine->bet - 1]();
+    return sDecideReelTurns_BiasTag_Reel2_Bets[sSlotMachine->bet - 1]();
 }
 
 static bool8 DecideReelTurns_BiasTag_Reel2_Bet1or2(void)
@@ -2085,13 +2335,13 @@ static bool8 DecideReelTurns_BiasTag_Reel3(void)
     u8 biasTag = sSlotMachine->biasTag;
     if (sSlotMachine->luckyFlags & LUCKY_BIAS_MIXED_777)
     {
-        biasTag = SLOT_MACHINE_TAG_7_RED;
-        if (sSlotMachine->biasTag == SLOT_MACHINE_TAG_7_RED)
+        biasTag = GFXTAG_7_RED;
+        if (sSlotMachine->biasTag == GFXTAG_7_RED)
         {
-            biasTag = SLOT_MACHINE_TAG_7_BLUE;
+            biasTag = GFXTAG_7_BLUE;
         }
     }
-    return DecideReelTurns_BiasTag_Reel3_Bets[sSlotMachine->bet - 1](biasTag);
+    return sDecideReelTurns_BiasTag_Reel3_Bets[sSlotMachine->bet - 1](biasTag);
 }
 
 static bool8 DecideReelTurns_BiasTag_Reel3_Bet1or2(u8 biasTag)
@@ -2151,14 +2401,14 @@ static void DecideReelTurns_NoBiasTag_Reel1(void)
 
 static bool8 IsBiasTag777_SwitchColor(u8 *biasTagPtr)
 {
-    if (*biasTagPtr == SLOT_MACHINE_TAG_7_RED)
+    if (*biasTagPtr == GFXTAG_7_RED)
     {
-        *biasTagPtr = SLOT_MACHINE_TAG_7_BLUE;
+        *biasTagPtr = GFXTAG_7_BLUE;
         return TRUE;
     }
-    if (*biasTagPtr == SLOT_MACHINE_TAG_7_BLUE)
+    if (*biasTagPtr == GFXTAG_7_BLUE)
     {
-        *biasTagPtr = SLOT_MACHINE_TAG_7_RED;
+        *biasTagPtr = GFXTAG_7_RED;
         return TRUE;
     }
     return FALSE;
@@ -2166,7 +2416,7 @@ static bool8 IsBiasTag777_SwitchColor(u8 *biasTagPtr)
 
 static void DecideReelTurns_NoBiasTag_Reel2(void)
 {
-    DecideReelTurns_NoBiasTag_Reel2_Bets[sSlotMachine->bet - 1]();
+    sDecideReelTurns_NoBiasTag_Reel2_Bets[sSlotMachine->bet - 1]();
 }
 
 // only does stuff if the biasTag is one of the 7's, plus other conditions
@@ -2289,7 +2539,7 @@ static void DecideReelTurns_NoBiasTag_Reel2_Bet3(void)
 
 static bool8 AreTagsMixed77(u8 tag1, u8 tag2)
 {
-    if ((tag1 == SLOT_MACHINE_TAG_7_RED && tag2 == SLOT_MACHINE_TAG_7_BLUE) || (tag1 == SLOT_MACHINE_TAG_7_BLUE && tag2 == SLOT_MACHINE_TAG_7_RED))
+    if ((tag1 == GFXTAG_7_RED && tag2 == GFXTAG_7_BLUE) || (tag1 == GFXTAG_7_BLUE && tag2 == GFXTAG_7_RED))
         return TRUE;
     else
         return FALSE;
@@ -2297,8 +2547,8 @@ static bool8 AreTagsMixed77(u8 tag1, u8 tag2)
 
 static bool8 AreTagsMixed777(u8 tag1, u8 tag2, u8 tag3)
 {
-    if ((tag1 == SLOT_MACHINE_TAG_7_RED && tag2 == SLOT_MACHINE_TAG_7_BLUE && tag3 == SLOT_MACHINE_TAG_7_RED) ||
-        (tag1 == SLOT_MACHINE_TAG_7_BLUE && tag2 == SLOT_MACHINE_TAG_7_RED && tag3 == SLOT_MACHINE_TAG_7_BLUE))
+    if ((tag1 == GFXTAG_7_RED && tag2 == GFXTAG_7_BLUE && tag3 == GFXTAG_7_RED) ||
+        (tag1 == GFXTAG_7_BLUE && tag2 == GFXTAG_7_RED && tag3 == GFXTAG_7_BLUE))
         return TRUE;
     else
         return FALSE;
@@ -2306,10 +2556,10 @@ static bool8 AreTagsMixed777(u8 tag1, u8 tag2, u8 tag3)
 
 static bool8 TagsDontMatchOrHaveAny7s(u8 tag1, u8 tag2, u8 tag3)
 {
-    if ((tag1 == SLOT_MACHINE_TAG_7_RED && tag2 == SLOT_MACHINE_TAG_7_BLUE && tag3 == SLOT_MACHINE_TAG_7_RED) ||
-        (tag1 == SLOT_MACHINE_TAG_7_BLUE && tag2 == SLOT_MACHINE_TAG_7_RED && tag3 == SLOT_MACHINE_TAG_7_BLUE) ||
-        (tag1 == SLOT_MACHINE_TAG_7_RED && tag2 == SLOT_MACHINE_TAG_7_RED && tag3 == SLOT_MACHINE_TAG_7_BLUE) ||
-        (tag1 == SLOT_MACHINE_TAG_7_BLUE && tag2 == SLOT_MACHINE_TAG_7_BLUE && tag3 == SLOT_MACHINE_TAG_7_RED) ||
+    if ((tag1 == GFXTAG_7_RED && tag2 == GFXTAG_7_BLUE && tag3 == GFXTAG_7_RED) ||
+        (tag1 == GFXTAG_7_BLUE && tag2 == GFXTAG_7_RED && tag3 == GFXTAG_7_BLUE) ||
+        (tag1 == GFXTAG_7_RED && tag2 == GFXTAG_7_RED && tag3 == GFXTAG_7_BLUE) ||
+        (tag1 == GFXTAG_7_BLUE && tag2 == GFXTAG_7_BLUE && tag3 == GFXTAG_7_RED) ||
         (tag1 == tag2 && tag1 == tag3))
     {
         return FALSE;
@@ -2319,7 +2569,7 @@ static bool8 TagsDontMatchOrHaveAny7s(u8 tag1, u8 tag2, u8 tag3)
 
 static void DecideReelTurns_NoBiasTag_Reel3(void)
 {
-    DecideReelTurns_NoBiasTag_Reel3_Bets[sSlotMachine->bet - 1]();
+    sDecideReelTurns_NoBiasTag_Reel3_Bets[sSlotMachine->bet - 1]();
 }
 
 static void DecideReelTurns_NoBiasTag_Reel3_Bet1(void)
@@ -2334,7 +2584,7 @@ static void DecideReelTurns_NoBiasTag_Reel3_Bet1(void)
         while (1)
         {
             u8 tag3;
-            if (!(tag1 == (tag3 = GetTag(RIGHT_REEL, 2 - i)) || (tag1 == SLOT_MACHINE_TAG_7_RED && tag3 == SLOT_MACHINE_TAG_7_BLUE) || (tag1 == SLOT_MACHINE_TAG_7_BLUE && tag3 == SLOT_MACHINE_TAG_7_RED)))
+            if (!(tag1 == (tag3 = GetTag(RIGHT_REEL, 2 - i)) || (tag1 == GFXTAG_7_RED && tag3 == GFXTAG_7_BLUE) || (tag1 == GFXTAG_7_BLUE && tag3 == GFXTAG_7_RED)))
                 break;
             i++;
         }
@@ -2465,273 +2715,312 @@ static void DecideReelTurns_NoBiasTag_Reel3_Bet3(void)
     }
 }
 
-static void sub_8103C14(u8 a0)
+static void PressStopReelButton(u8 reelNum)
 {
-    u8 taskId = CreateTask(sub_8103C48, 5);
-    gTasks[taskId].data[15] = a0;
-    sub_8103C48(taskId);
+    u8 taskId = CreateTask(Task_PressStopReelButton, 5);
+    gTasks[taskId].data[15] = reelNum;
+    Task_PressStopReelButton(taskId);
 }
 
-static void sub_8103C48(u8 taskId)
+static void Task_PressStopReelButton(u8 taskId)
 {
-    gUnknown_083ECBA0[gTasks[taskId].data[0]](&gTasks[taskId], taskId);
+    sReelStopButtonFuncs[gTasks[taskId].data[0]](&gTasks[taskId], taskId);
 }
 
-static void sub_8103C78(struct Task *task, u8 taskId)
+static void StopReelButton_Press(struct Task *task, u8 taskId)
 {
-    sub_81065A8(gUnknown_083ECBAC[task->data[15]], 0x62, 0x63, 0x72, 0x73);
+    SetReelButtonTilemap(sReelButtonOffsets[task->data[15]], 0x62, 0x63, 0x72, 0x73);
     task->data[0]++;
 }
 
-static void sub_8103CAC(struct Task *task, u8 taskId)
+static void StopReelButton_Wait(struct Task *task, u8 taskId)
 {
     if (++task->data[1] > 11)
         task->data[0]++;
 }
 
-static void sub_8103CC8(struct Task *task, u8 taskId)
+static void StopReelButton_Unpress(struct Task *task, u8 taskId)
 {
-    sub_81065A8(gUnknown_083ECBAC[task->data[15]], 0x42, 0x43, 0x52, 0x53);
+    SetReelButtonTilemap(sReelButtonOffsets[task->data[15]], 0x42, 0x43, 0x52, 0x53);
     DestroyTask(taskId);
 }
 
-static void LoadLitTile(u8 tileId)
+static void LightenMatchLine(u8 matchLineId)
 {
-    LoadPalette(gUnknown_083EDD08[tileId], gUnknown_083EDD30[tileId], 2);
+    LoadPalette(sLitMatchLinePalTable[matchLineId], sMatchLinePalOffsets[matchLineId], 2);
 }
 
-static void sub_8103D28(u8 a0)
+static void DarkenMatchLine(u8 matchLineId)
 {
-    LoadPalette(gUnknown_083EDD1C[a0], gUnknown_083EDD30[a0], 2);
+    LoadPalette(sDarkMatchLinePalTable[matchLineId], sMatchLinePalOffsets[matchLineId], 2);
 }
 
-// light up the value bet by the player
-static void LoadBetTiles(u8 betVal)
+// light up the match line for each bet by the player
+static void LightenBetTiles(u8 betVal)
 {
     u8 i;
-    for (i = 0; i < gNumberBettingTiles[betVal]; i++)
-        LoadLitTile(gBettingTilesId[betVal][i]);
+    for (i = 0; i < sMatchLinesPerBet[betVal]; i++)
+        LightenMatchLine(sBetToMatchLineIds[betVal][i]);
 }
 
-static void sub_8103D8C(u8 a0)
+static void DarkenBetTiles(u8 betVal)
 {
     u8 i;
-    for (i = 0; i < gNumberBettingTiles[a0]; i++)
-        sub_8103D28(gBettingTilesId[a0][i]);
+    for (i = 0; i < sMatchLinesPerBet[betVal]; i++)
+        DarkenMatchLine(sBetToMatchLineIds[betVal][i]);
 }
 
-static void sub_8103DC8(void)
+#define sMatchLineId     data[0]
+#define sFlashing        data[1]
+#define sNumFullFlashes  data[2]
+#define sDelayTimer      data[3]
+#define sColor           data[4]
+#define sColorIncr       data[5]
+#define sAtOriginalColor data[7]
+
+// Creates invisible sprites that flash the bet lines/numbers where a match occurs
+// 5 are created, 1 for each possible match line (3 rows, 2 diagonals)
+static void CreateInvisibleFlashMatchLineSprites(void)
 {
     u8 i;
-    for (i = 0; i < 5; i++)
+    for (i = 0; i < ARRAY_COUNT(sSlotMachine->flashMatchLineSpriteIds); i++)
     {
-        u8 spriteId = CreateInvisibleSprite(sub_8103EE4);
-        gSprites[spriteId].data[0] = i;
-        sSlotMachine->unk44[i] = spriteId;
+        u8 spriteId = CreateInvisibleSprite(SpriteCB_FlashMatchingLines);
+        gSprites[spriteId].sMatchLineId = i;
+        sSlotMachine->flashMatchLineSpriteIds[i] = spriteId;
     }
 }
 
-static void sub_8103E04(u8 a0)
+static void FlashMatchLine(u8 matchLineId)
 {
-    struct Sprite *sprite = gSprites + sSlotMachine->unk44[a0];
-    sprite->data[1] = 1;
-    sprite->data[2] = 4;
-    sprite->data[3] = 0;
-    sprite->data[4] = 0;
-    sprite->data[5] = 2;
-    sprite->data[7] = 0;
+    struct Sprite *sprite = &gSprites[sSlotMachine->flashMatchLineSpriteIds[matchLineId]];
+    sprite->sFlashing = TRUE;
+    sprite->sNumFullFlashes = 4;
+    sprite->sDelayTimer = 0;
+    sprite->sColor = 0;
+    sprite->sColorIncr = 2;
+    sprite->sAtOriginalColor = FALSE;
 }
 
-// something with payout digits
-static bool8 sub_8103E38(void)
+// Match line flashes 4 times before the payout begins
+// After this it does half-brightness flashes until the payout finishes
+static bool8 IsMatchLineDoneFlashingBeforePayout(void)
 {
     u8 i;
-    for (i = 0; i < 5; i++)
+    for (i = 0; i < ARRAY_COUNT(sSlotMachine->flashMatchLineSpriteIds); i++)
     {
-        struct Sprite *sprite = &gSprites[sSlotMachine->unk44[i]];
-        if (sprite->data[1] && sprite->data[2])
+        struct Sprite *sprite = &gSprites[sSlotMachine->flashMatchLineSpriteIds[i]];
+        if (sprite->sFlashing && sprite->sNumFullFlashes)
             return FALSE;
     }
     return TRUE;
 }
 
-static bool8 sub_8103E7C(void)
+// When payout is finished, stop lines flashing (but not if they're in the middle of a flash)
+static bool8 TryStopMatchLinesFlashing(void)
 {
     u8 i;
-    for (i = 0; i < 5; i++)
+    for (i = 0; i < ARRAY_COUNT(sSlotMachine->flashMatchLineSpriteIds); i++)
     {
-        if (!sub_8103EAC(sSlotMachine->unk44[i]))
+        if (!TryStopMatchLineFlashing(sSlotMachine->flashMatchLineSpriteIds[i]))
             return FALSE;
     }
     return TRUE;
 }
 
-static bool8 sub_8103EAC(u8 spriteId)
+static bool8 TryStopMatchLineFlashing(u8 spriteId)
 {
-    struct Sprite *sprite = gSprites + spriteId;
-    if (!sprite->data[1])
+    struct Sprite *sprite = &gSprites[spriteId];
+    if (!sprite->sFlashing)
         return TRUE;
-    if (sprite->data[7])
-        sprite->data[1] = 0;
-    return sprite->data[7];
+    if (sprite->sAtOriginalColor)
+        sprite->sFlashing = FALSE;
+
+    return sprite->sAtOriginalColor;
 }
 
-static void sub_8103EE4(struct Sprite *sprite)
+static void SpriteCB_FlashMatchingLines(struct Sprite *sprite)
 {
-    s16 r4;
-    if (sprite->data[1])
+    s16 maxColorChange;
+    if (sprite->sFlashing)
     {
-        if (!sprite->data[3]--)
+        if (!sprite->sDelayTimer--)
         {
-            sprite->data[7] = 0;
-            sprite->data[3] = 1;
-            sprite->data[4] += sprite->data[5];
-            r4 = 4;
-            if (sprite->data[2])
-                r4 = 8;
-            if (sprite->data[4] <= 0)
+            sprite->sAtOriginalColor = FALSE;
+            sprite->sDelayTimer = 1;
+            sprite->sColor += sprite->sColorIncr;
+            maxColorChange = 4;
+            if (sprite->sNumFullFlashes)
+                maxColorChange = 8;
+            if (sprite->sColor <= 0)
             {
-                sprite->data[7] = 1;
-                sprite->data[5] = -sprite->data[5];
-                if (sprite->data[2])
-                    sprite->data[2]--;
+                // Returned to original color, reverse
+                sprite->sAtOriginalColor = TRUE;
+                sprite->sColorIncr = -sprite->sColorIncr;
+                if (sprite->sNumFullFlashes)
+                    sprite->sNumFullFlashes--;
+            }
+            else if (sprite->sColor >= maxColorChange) {
+                // Reached peak darkness, reverse
+                sprite->sColorIncr = -sprite->sColorIncr;
             }
-            else if (sprite->data[4] >= r4)
-                sprite->data[5] = -sprite->data[5];
-            if (sprite->data[2])
-                sprite->data[3] <<= 1;
+            if (sprite->sNumFullFlashes)
+                sprite->sDelayTimer <<= 1;
         }
-        MultiplyPaletteRGBComponents(gUnknown_083EDD30[sprite->data[0]], sprite->data[4], sprite->data[4], sprite->data[4]);
+        MultiplyPaletteRGBComponents(sMatchLinePalOffsets[sprite->sMatchLineId], sprite->sColor, sprite->sColor, sprite->sColor);
     }
 }
 
-static void sub_8103F70(void)
+#undef sMatchLineId
+#undef sFlashing
+#undef sNumFullFlashes
+#undef sDelayTimer
+#undef sColor
+#undef sColorIncr
+#undef sAtOriginalColor
+
+#define sDelayTimer data[1]
+#define sFlashState data[2]
+#define sFlashDir   data[3]
+
+static void FlashSlotMachineLights(void)
 {
-    u8 taskId = CreateTask(sub_8103FE8_, 6);
-    gTasks[taskId].data[3] = 1;
-    sub_8103FE8_(taskId);
+    u8 taskId = CreateTask(Task_FlashSlotMachineLights, 6);
+    gTasks[taskId].sFlashDir = 1;
+    Task_FlashSlotMachineLights(taskId);
 }
 
-static bool8 sub_8103FA0(void)
+static bool8 TryStopSlotMachineLights(void)
 {
-    u8 taskId = FindTaskIdByFunc(sub_8103FE8_);
-    if (!gTasks[taskId].data[2])
+    u8 taskId = FindTaskIdByFunc(Task_FlashSlotMachineLights);
+    if (gTasks[taskId].sFlashState == 0)
     {
         DestroyTask(taskId);
-        LoadPalette(gUnknown_083EDDAC, 0x10, 0x20);
+        LoadPalette(sSlotMachineMenu_Pal, 0x10, 0x20);
         return TRUE;
     }
     return FALSE;
 }
 
-static void sub_8103FE8_(u8 taskId)
+static void Task_FlashSlotMachineLights(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
-    if (!task->data[1]--)
+    if (!task->sDelayTimer--)
     {
-        task->data[1] = 4;
-        task->data[2] += task->data[3];
-        if (task->data[2] == 0 || task->data[2] == 2)
-            task->data[3] = -task->data[3];
+        task->sDelayTimer = 4;
+        task->sFlashState += task->sFlashDir;
+        if (task->sFlashState == 0 || task->sFlashState == 2)
+            task->sFlashDir = -task->sFlashDir;
     }
-    LoadPalette(gUnknown_083EDDA0[task->data[2]], 0x10, 0x20);
+    LoadPalette(sFlashingLightsPalTable[task->sFlashState], 0x10, 0x20);
 }
 
-static void GameplayTask_PikaPower(void)
+#undef sDelayTimer
+#undef sFlashState
+#undef sFlashDir
+
+#define tState     data[0]
+#define tNumBolts  data[1]
+#define tSpriteId  data[2]
+#define tTimer     data[2] // re-used
+#define tAnimating data[15]
+
+static void CreatePikaPowerBoltTask(void)
 {
-    sSlotMachine->unkTaskPointer3E = CreateTask(sub_81040E8, 8);
+    sSlotMachine->pikaPowerBoltTaskId = CreateTask(Task_CreatePikaPowerBolt, 8);
 }
 
-static void DisplayPikaPower(u8 pikaPower)
+static void AddPikaPowerBolt(u8 pikaPower)
 {
-    struct Task *task = &gTasks[sSlotMachine->unkTaskPointer3E];
-    ClearTaskDataFields_2orHigher(task);
-    task->data[0] = 1;
-    task->data[1]++;
-    task->data[15] = 1; // points to a reelIndex
+    struct Task *task = &gTasks[sSlotMachine->pikaPowerBoltTaskId];
+    ResetPikaPowerBoltTask(task);
+    task->tState = 1;
+    task->tNumBolts++;
+    task->tAnimating = TRUE;
 }
 
-static void sub_8104098(void)
+static void ResetPikaPowerBolts(void)
 {
-    struct Task *task = &gTasks[sSlotMachine->unkTaskPointer3E];
-    ClearTaskDataFields_2orHigher(task);
-    task->data[0] = 3;
-    task->data[15] = 1; // points to a reelIndex
+    struct Task *task = &gTasks[sSlotMachine->pikaPowerBoltTaskId];
+    ResetPikaPowerBoltTask(task);
+    task->tState = 3;
+    task->tAnimating = TRUE;
 }
 
-static bool8 sub_81040C8(void)
+static bool8 IsPikaPowerBoltAnimating(void)
 {
-    return gTasks[sSlotMachine->unkTaskPointer3E].data[15];
+    return gTasks[sSlotMachine->pikaPowerBoltTaskId].tAnimating;
 }
 
-static void sub_81040E8(u8 taskId)
+static void Task_CreatePikaPowerBolt(u8 taskId)
 {
-    gUnknown_083ECBB4[gTasks[taskId].data[0]](&gTasks[taskId]);
+    sPikaPowerBoltFuncs[gTasks[taskId].tState](&gTasks[taskId]);
 }
 
-static void nullsub_68(struct Task *task)
+static void PikaPowerBolt_Idle(struct Task *task)
 {
 }
 
-static void sub_810411C(struct Task *task)
+static void PikaPowerBolt_AddBolt(struct Task *task)
 {
-    task->data[2] = sub_8105B1C((task->data[1] << 3) + 20, 20);
-    task->data[0]++;
+    task->tSpriteId = CreatePikaPowerBoltSprite((task->tNumBolts << 3) + 20, 20);
+    task->tState++;
 }
 
-static void sub_8104144(struct Task *task)
+// The bolt sprite spins around as it appears
+// Once the anim is done, destroy the sprite and set the bolt in the tilemap instead
+static void PikaPowerBolt_WaitAnim(struct Task *task)
 {
-    if (gSprites[task->data[2]].data[7])
+    if (gSprites[task->tSpriteId].data[7])
     {
-        s16 r5 = task->data[1] + 2;
+        s16 r5 = task->tNumBolts + 2;
         s16 r3 = 0;
         s16 r2 = 0;
-        if (task->data[1] == 1)
+        if (task->tNumBolts == 1)
             r3 = 1, r2 = 1;
-        else if (task->data[1] == 16)
+        else if (task->tNumBolts == 16)
             r3 = 2, r2 = 2;
-        sSelectedPikaPowerTile[r2] = pikaPowerTileTable[r3][0];
+        sSelectedPikaPowerTile[r2] = sPikaPowerTileTable[r3][0];
         LoadBgTilemap(2, &sSelectedPikaPowerTile[r2], 2, r5 + 0x40);
-        sub_8105B88(task->data[2]);
-        task->data[0] = 0;
-        task->data[15] = 0; // points to a reelIndex
+        DestroyPikaPowerBoltSprite(task->tSpriteId);
+        task->tState = 0;
+        task->tAnimating = 0;
     }
 }
 
-static void sub_81041AC(struct Task *task)
+static void PikaPowerBolt_ClearAll(struct Task *task)
 {
-    s16 r5 = task->data[1] + 2;
+    s16 r5 = task->tNumBolts + 2;
     s16 r3 = 0;
     s16 r2 = 3;
-    if (task->data[1] == 1)
+    if (task->tNumBolts == 1)
         r3 = 1, r2 = 1;
-    else if (task->data[1] == 16)
+    else if (task->tNumBolts == 16)
         r3 = 2, r2 = 2;
-    if (task->data[2] == 0)
+    if (task->tTimer == 0)
     {
-        sSelectedPikaPowerTile[r2] = pikaPowerTileTable[r3][1];
+        sSelectedPikaPowerTile[r2] = sPikaPowerTileTable[r3][1];
         LoadBgTilemap(2, &sSelectedPikaPowerTile[r2], 2, r5 + 0x40);
-        task->data[1]--;
+        task->tNumBolts--;
     }
-    if (++task->data[2] >= 20)
-        task->data[2] = 0;
-    if (task->data[1] == 0)
+    if (++task->tTimer >= 20)
+        task->tTimer = 0;
+    if (task->tNumBolts == 0)
     {
-        task->data[0] = 0;
-        task->data[15] = 0;
+        task->tState = 0;
+        task->tAnimating = 0;
     }
 }
 
-static void ClearTaskDataFields_2orHigher(struct Task *task)
+static void ResetPikaPowerBoltTask(struct Task *task)
 {
     u8 i;
 
-    for (i = 2; i < 16; i++)
+    for (i = 2; i < NUM_TASK_DATA; i++)
         task->data[i] = 0;
 }
 
-// possibly load tiles for pika power meter
-static void sub_810423C(u8 pikaPower)
+static void LoadPikaPowerMeter(u8 pikaPower)
 {
     s16 i;
     s16 r3 = 0, r1 = 0;
@@ -2743,7 +3032,7 @@ static void sub_810423C(u8 pikaPower)
             r3 = 1, r1 = 1;
         else if (i == 15) // pikaPower meter is full
             r3 = 2, r1 = 2;
-        sSelectedPikaPowerTile[r1] = pikaPowerTileTable[r3][0];
+        sSelectedPikaPowerTile[r1] = sPikaPowerTileTable[r3][0];
         LoadBgTilemap(2, &sSelectedPikaPowerTile[r1], 2, r4 + 0x40);
     }
     for (; i < 16; i++, r4++)
@@ -2753,40 +3042,47 @@ static void sub_810423C(u8 pikaPower)
             r3 = 1, r1 = 1;
         else if (i == 15)
             r3 = 2, r1 = 2;
-        sSelectedPikaPowerTile[r1] = pikaPowerTileTable[r3][1];
+        sSelectedPikaPowerTile[r1] = sPikaPowerTileTable[r3][1];
         LoadBgTilemap(2, &sSelectedPikaPowerTile[r1], 2, r4 + 0x40);
     }
-    gTasks[sSlotMachine->unkTaskPointer3E].data[1] = pikaPower;
+    gTasks[sSlotMachine->pikaPowerBoltTaskId].data[1] = pikaPower;
 }
 
-static void BeginReeltime(void)
+#undef tState
+#undef tNumBolts
+#undef tSpriteId
+#undef tTimer
+#undef tAnimating
+
+#define tState data[0]
+
+static void BeginReelTime(void)
 {
-    u8 taskId = CreateTask(RunReeltimeActions, 7);
-    RunReeltimeActions(taskId);
+    u8 taskId = CreateTask(Task_ReelTime, 7);
+    Task_ReelTime(taskId);
 }
 
-static bool8 IsFinalTask_RunReelTimeActions(void)
+static bool8 IsReelTimeTaskDone(void)
 {
-    if (FindTaskIdByFunc(RunReeltimeActions) == TAIL_SENTINEL)
+    if (FindTaskIdByFunc(Task_ReelTime) == TAIL_SENTINEL)
         return TRUE;
     return FALSE;
 }
 
-static void RunReeltimeActions(u8 taskId)
+static void Task_ReelTime(u8 taskId)
 {
-    // task.data[0] points to which ReelTimeAction to do, and starts at 0
     // task.data[1] has something to do with the threshold
     // task.data[4] says how many pixels to advance the reel
     // task.data[5] is a timer
-    ReeltimeActions[gTasks[taskId].data[0]](&gTasks[taskId]);
+    sReelTimeActions[gTasks[taskId].tState](&gTasks[taskId]);
 }
 
-static void ReeltimeAction0(struct Task *task)
+static void ReelTime_Init(struct Task *task)
 {
-    sSlotMachine->fairRollsLeft = 0;
+    sSlotMachine->reelTimeSpinsLeft = 0;
     sSlotMachine->reeltimePixelOffset = 0;
     sSlotMachine->reeltimePosition = 0;
-    task->data[0]++;
+    task->tState++;
     task->data[1] = 0;
     task->data[2] = 30;
     task->data[4] = 1280; // reel speed
@@ -2794,18 +3090,18 @@ static void ReeltimeAction0(struct Task *task)
     gSpriteCoordOffsetY = 0;
     SetGpuReg(REG_OFFSET_BG1HOFS, 0);
     SetGpuReg(REG_OFFSET_BG1VOFS, 0);
-    sub_8104A40(REG_OFFSET_BG3VOFS, 0);
-    sub_81051C0();
-    sub_8105100();
-    sub_81052EC();
-    sub_81053A0();
-    sub_810545C();
+    LoadReelTimeWindowTilemap(REG_OFFSET_BG3VOFS, 0);
+    CreateReelTimeMachineSprites();
+    CreateReelTimePikachuSprite();
+    CreateReelTimeNumberSprites();
+    CreateReelTimeShadowSprites();
+    CreateReelTimeNumberGapSprite();
     GetReeltimeDraw();
     StopMapMusic();
     PlayNewMapMusic(MUS_BD_TIME);
 }
 
-static void ReeltimeAction1(struct Task *task)
+static void ReelTime_WindowEnter(struct Task *task)
 {
     s16 r3;
     gSpriteCoordOffsetX -= 8;
@@ -2816,78 +3112,78 @@ static void ReeltimeAction1(struct Task *task)
     {
         task->data[2] = r3;
         task->data[3] = task->data[1] >> 3;
-        sub_8104A40(r3, task->data[3]);
+        LoadReelTimeWindowTilemap(r3, task->data[3]);
     }
     if (task->data[1] >= 200)
     {
-        task->data[0]++;
+        task->tState++;
         task->data[3] = 0;
     }
     AdvanceReeltimeReel(task->data[4] >> 8);
 }
 
-static void ReeltimeAction2(struct Task *task)
+static void ReelTime_WaitStartPikachu(struct Task *task)
 {
     AdvanceReeltimeReel(task->data[4] >> 8);
     if (++task->data[5] >= 60)
     {
-        task->data[0]++;
-        CreateReelTimeSprites1();
-        CreateReelTimeSprite2();
+        task->tState++;
+        CreateReelTimeBoltSprites();
+        CreateReelTimePikachuAuraSprites();
     }
 }
 
-static void ReeltimeAction3(struct Task *task)
+static void ReelTime_PikachuSpeedUp1(struct Task *task)
 {
-    int r5;
-    u8 sp0[ARRAY_COUNT(gUnknown_085A75C0)];
-    s16 sp4[ARRAY_COUNT(gUnknown_085A75C4)];
-    s16 spC[ARRAY_COUNT(gUnknown_085A75CC)];
+    int i;
+    u8 pikachuAnimIds[ARRAY_COUNT(sReelTimePikachuAnimIds)];
+    s16 reelTimeBoltDelays[ARRAY_COUNT(sReelTimeBoltDelays)];
+    s16 pikachuAuraFlashDelays[ARRAY_COUNT(sPikachuAuraFlashDelays)];
 
-    memcpy(sp0, gUnknown_085A75C0, sizeof(gUnknown_085A75C0));
-    memcpy(sp4, gUnknown_085A75C4, sizeof(gUnknown_085A75C4));
-    memcpy(spC, gUnknown_085A75CC, sizeof(gUnknown_085A75CC));
+    memcpy(pikachuAnimIds, sReelTimePikachuAnimIds, sizeof(sReelTimePikachuAnimIds));
+    memcpy(reelTimeBoltDelays, sReelTimeBoltDelays, sizeof(sReelTimeBoltDelays));
+    memcpy(pikachuAuraFlashDelays, sPikachuAuraFlashDelays, sizeof(sPikachuAuraFlashDelays));
 
     AdvanceReeltimeReel(task->data[4] >> 8);
     // gradually slow down the reel
     task->data[4] -= 4;
-    r5 = 4 - (task->data[4] >> 8);
-    sub_8105688(sp4[r5]);
-    sub_81057E8(spC[r5]);
-    StartSpriteAnimIfDifferent(gSprites + sSlotMachine->reelTimeSprite3F, sp0[r5]);
+    i = 4 - (task->data[4] >> 8);
+    SetReelTimeBoltDelay(reelTimeBoltDelays[i]);
+    SetReelTimePikachuAuraFlashDelay(pikachuAuraFlashDelays[i]);
+    StartSpriteAnimIfDifferent(&gSprites[sSlotMachine->reelTimePikachuSpriteId], pikachuAnimIds[i]);
     // once speed goes below 256, go to next ReelTimeAction and keep the speed level
     if (task->data[4] <= 0x100)
     {
-        task->data[0]++;
+        task->tState++;
         task->data[4] = 0x100;
         task->data[5] = 0;
     }
 }
 
-static void ReeltimeAction4(struct Task *task)
+static void ReelTime_PikachuSpeedUp2(struct Task *task)
 {
     AdvanceReeltimeReel(task->data[4] >> 8);
     if (++task->data[5] >= 80)
     {
-        task->data[0]++;
+        task->tState++;
         task->data[5] = 0;
-        sub_81057E8(2);
-        StartSpriteAnimIfDifferent(gSprites + sSlotMachine->reelTimeSprite3F, 3);
+        SetReelTimePikachuAuraFlashDelay(2);
+        StartSpriteAnimIfDifferent(&gSprites[sSlotMachine->reelTimePikachuSpriteId], 3);
     }
 }
 
-static void ReeltimeAction5(struct Task *task)
+static void ReelTime_WaitReel(struct Task *task)
 {
     AdvanceReeltimeReel(task->data[4] >> 8);
     task->data[4] = (u8)task->data[4] + 0x80;
     if (++task->data[5] >= 80)
     {
-        task->data[0]++;
+        task->tState++;
         task->data[5] = 0;
     }
 }
 
-static void ReeltimeAction6(struct Task *task)
+static void ReelTime_CheckExplode(struct Task *task)
 {
     AdvanceReeltimeReel(task->data[4] >> 8);
     task->data[4] = (u8)task->data[4] + 0x40;
@@ -2896,22 +3192,22 @@ static void ReeltimeAction6(struct Task *task)
         task->data[5] = 0;
         if (sSlotMachine->reelTimeDraw)
         {
-            if (sSlotMachine->fairRollsLeft <= task->data[6])
-                task->data[0]++;
+            if (sSlotMachine->reelTimeSpinsLeft <= task->data[6])
+                task->tState++;
         }
         else if (task->data[6] > 3)
         {
-            task->data[0]++;
+            task->tState++;
         }
-        else if (SkipToReeltimeAction14(task->data[6]))
+        else if (ShouldReelTimeMachineExplode(task->data[6]))
         {
-            task->data[0] = 14;
+            task->tState = 14; // ReelTime_ExplodeMachine
         }
         task->data[6]++;
     }
 }
 
-static void ReelTimeAction_LandOnOutcome(struct Task *task)
+static void ReelTime_LandOnOutcome(struct Task *task)
 {
     s16 reeltimePixelOffset = sSlotMachine->reeltimePixelOffset % 20;
     if (reeltimePixelOffset)
@@ -2928,32 +3224,32 @@ static void ReelTimeAction_LandOnOutcome(struct Task *task)
     if (reeltimePixelOffset == 0 && GetNearbyReelTimeTag(1) == sSlotMachine->reelTimeDraw)
     {
         task->data[4] = 0;  // stop moving
-        task->data[0]++;
+        task->tState++;
     }
 }
 
-static void ReeltimeAction8(struct Task *task)
+static void ReelTime_PikachuReact(struct Task *task)
 {
     if (++task->data[4] >= 60)
     {
         StopMapMusic();
-        sub_81056C0();
-        sub_8105804();
-        task->data[0]++;
+        DestroyReelTimeBoltSprites();
+        DestroyReelTimePikachuAuraSprites();
+        task->tState++;
         if(sSlotMachine->reelTimeDraw == 0)
         {
             task->data[4] = 0xa0;
-            StartSpriteAnimIfDifferent(gSprites + sSlotMachine->reelTimeSprite3F, 5);
+            StartSpriteAnimIfDifferent(&gSprites[sSlotMachine->reelTimePikachuSpriteId], 5);
             PlayFanfare(MUS_ME_ZANNEN);
         }
         else
         {
             task->data[4] = 0xc0;
-            StartSpriteAnimIfDifferent(gSprites + sSlotMachine->reelTimeSprite3F, 4);
-            gSprites[sSlotMachine->reelTimeSprite3F].animCmdIndex = 0;
+            StartSpriteAnimIfDifferent(&gSprites[sSlotMachine->reelTimePikachuSpriteId], 4);
+            gSprites[sSlotMachine->reelTimePikachuSpriteId].animCmdIndex = 0;
             if (sSlotMachine->pikaPower)
             {
-                sub_8104098();
+                ResetPikaPowerBolts();
                 sSlotMachine->pikaPower = 0;
             }
             PlayFanfare(MUS_ME_B_SMALL);
@@ -2961,13 +3257,13 @@ static void ReeltimeAction8(struct Task *task)
     }
 }
 
-static void ReeltimeAction9(struct Task *task)
+static void ReelTime_WaitClearPikaPower(struct Task *task)
 {
-    if ((task->data[4] == 0 || --task->data[4] == 0) && !sub_81040C8())
-        task->data[0]++;
+    if ((task->data[4] == 0 || --task->data[4] == 0) && !IsPikaPowerBoltAnimating())
+        task->tState++;
 }
 
-static void ReeltimeAction10(struct Task *task)
+static void ReelTime_CloseWindow(struct Task *task)
 {
     s16 r4;
     gSpriteCoordOffsetX -= 8;
@@ -2976,59 +3272,59 @@ static void ReeltimeAction10(struct Task *task)
     r4 = ((task->data[1] - 8) & 0xff) >> 3;
     SetGpuReg(REG_OFFSET_BG1HOFS, task->data[1] & 0x1ff);
     if (task->data[3] >> 3 <= 25)
-        sub_8104A88(r4);
+        ClearReelTimeWindowTilemap(r4);
     else
-        task->data[0]++;
+        task->tState++;
 }
 
-static void ReeltimeAction11(struct Task *task)
+static void ReelTime_DestroySprites(struct Task *task)
 {
-    sSlotMachine->fairRollsUsed = 0;
-    sSlotMachine->fairRollsLeft = sSlotMachine->reelTimeDraw;
+    sSlotMachine->reelTimeSpinsUsed = 0;
+    sSlotMachine->reelTimeSpinsLeft = sSlotMachine->reelTimeDraw;
     gSpriteCoordOffsetX = 0;
     SetGpuReg(REG_OFFSET_BG1HOFS, 0);
     sSlotMachine->reelIncrement = 8;
-    sub_810514C();
-    sub_81054B8();
-    sub_8105524();
+    DestroyReelTimePikachuSprite();
+    DestroyReelTimeMachineSprites();
+    DestroyReelTimeShadowSprites();
     PlayNewMapMusic(sSlotMachine->backupMapMusic);
-    if (sSlotMachine->fairRollsLeft == 0)
+    if (sSlotMachine->reelTimeSpinsLeft == 0)
     {
-        DestroyTask(FindTaskIdByFunc(RunReeltimeActions));
+        DestroyTask(FindTaskIdByFunc(Task_ReelTime));
     }
     else
     {
-        sub_8104CAC(4);
+        CreateDigitalDisplayScene(DIG_DISPLAY_REEL_TIME);
         task->data[1] = SlowReelSpeed();
         task->data[2] = 0;
         task->data[3] = 0;
-        task->data[0]++;
+        task->tState++;
     }
 }
 
-static void ReeltimeAction12(struct Task *task)
+static void ReelTime_SetReelIncrement(struct Task *task)
 {
     if (sSlotMachine->reelIncrement == task->data[1])
-        task->data[0]++;
-    else if (sSlotMachine->reelPixelOffsets[0] % 24 == 0 && (++task->data[2]& 0x07) == 0)
+        task->tState++;
+    else if (sSlotMachine->reelPixelOffsets[0] % REEL_SYMBOL_HEIGHT == 0 && (++task->data[2]& 0x07) == 0)
         sSlotMachine->reelIncrement >>= 1;
 }
 
-static void ReeltimeAction13(struct Task *task)
+static void ReelTime_EndSuccess(struct Task *task)
 {
-    if (sub_8104E18())
-        DestroyTask(FindTaskIdByFunc(RunReeltimeActions));
+    if (IsDigitalDisplayAnimFinished())
+        DestroyTask(FindTaskIdByFunc(Task_ReelTime));
 }
 
-static void ReeltimeAction14(struct Task *task)
+static void ReelTime_ExplodeMachine(struct Task *task)
 {
-    sub_81054B8();
-    sub_81056C0();
-    sub_8105804();
-    sub_8105854();
-    gSprites[sSlotMachine->unk4E[0]].invisible = TRUE;
-    StartSpriteAnimIfDifferent(gSprites + sSlotMachine->reelTimeSprite3F, 5);
-    task->data[0]++;
+    DestroyReelTimeMachineSprites();
+    DestroyReelTimeBoltSprites();
+    DestroyReelTimePikachuAuraSprites();
+    CreateReelTimeExplosionSprite();
+    gSprites[sSlotMachine->reelTimeShadowSpriteIds[0]].invisible = TRUE;
+    StartSpriteAnimIfDifferent(&gSprites[sSlotMachine->reelTimePikachuSpriteId], 5);
+    task->tState++;
     task->data[4] = 4;
     task->data[5] = 0;
     StopMapMusic();
@@ -3036,7 +3332,7 @@ static void ReeltimeAction14(struct Task *task)
     PlaySE(SE_W153);
 }
 
-static void ReeltimeAction15(struct Task *task)
+static void ReelTime_WaitExplode(struct Task *task)
 {
     gSpriteCoordOffsetY = task->data[4];
     SetGpuReg(REG_OFFSET_BG1VOFS, task->data[4]);
@@ -3046,63 +3342,68 @@ static void ReeltimeAction15(struct Task *task)
         task->data[4] >>= 1;
     if (task->data[4] == 0)
     {
-        sub_81058A0();
-        sub_81058C4();
-        sub_8105284_();
-        sub_81059E8();
-        gSprites[sSlotMachine->unk4E[0]].invisible = FALSE;
-        task->data[0]++;
+        DestroyReelTimeExplosionSprite();
+        CreateReelTimeDuckSprites();
+        CreateBrokenReelTimeMachineSprite();
+        CreateReelTimeSmokeSprite();
+        gSprites[sSlotMachine->reelTimeShadowSpriteIds[0]].invisible = FALSE;
+        task->tState++;
         task->data[5] = 0;
     }
 }
 
-static void ReeltimeAction16(struct Task *task)
+static void ReelTime_WaitSmoke(struct Task *task)
 {
     gSpriteCoordOffsetY = 0;
     SetGpuReg(REG_OFFSET_BG1VOFS, 0);
-    if (sub_8105ACC())
+    if (IsReelTimeSmokeAnimFinished())
     {
-        task->data[0]++;
-        sub_8105AEC();
+        task->tState++;
+        DestroyReelTimeSmokeSprite();
     }
 }
 
-static void ReeltimeAction17(struct Task *task)
+static void ReelTime_EndFailure(struct Task *task)
 {
     gSpriteCoordOffsetX = 0;
     SetGpuReg(REG_OFFSET_BG1HOFS, 0);
     PlayNewMapMusic(sSlotMachine->backupMapMusic);
-    sub_810514C();
-    sub_8105554();
-    sub_8105524();
-    sub_81059B8();
-    DestroyTask(FindTaskIdByFunc(RunReeltimeActions));
+    DestroyReelTimePikachuSprite();
+    DestroyBrokenReelTimeMachineSprite();
+    DestroyReelTimeShadowSprites();
+    DestroyReelTimeDuckSprites();
+    DestroyTask(FindTaskIdByFunc(Task_ReelTime));
 }
 
-static void sub_8104A40(s16 a0, s16 a1)
+static void LoadReelTimeWindowTilemap(s16 a0, s16 a1)
 {
     s16 i;
 
     for (i = 4; i < 15; i++)
     {
-        LoadBgTilemap(1, &gReelTimeWindowTilemap[a1 + (i - 4) * 20], 2, 32 * i + a0);
+        LoadBgTilemap(1, &sReelTimeWindow_Tilemap[a1 + (i - 4) * 20], 2, 32 * i + a0);
     }
 }
 
-static void sub_8104A88(s16 a0)
+static void ClearReelTimeWindowTilemap(s16 a0)
 {
     u8 i;
 
     for (i = 4; i < 15; i++)
     {
-        LoadBgTilemap(1, gUnknown_085A9898, 2, 32 * i + a0);
+        LoadBgTilemap(1, sEmptyTilemap, 2, 32 * i + a0);
     }
 }
 
-static void OpenInfoBox(u8 seemsUnused)
+#undef tState
+
+#define tState data[0]
+
+// Info Box is the screen shown when Select is pressed
+static void OpenInfoBox(u8 digDisplayId)
 {
     u8 taskId = CreateTask(RunInfoBoxActions, 1);
-    gTasks[taskId].data[1] = seemsUnused;
+    gTasks[taskId].data[1] = digDisplayId;
     RunInfoBoxActions(taskId);
 }
 
@@ -3116,29 +3417,29 @@ static bool8 IsInfoBoxClosed(void)
 
 static void RunInfoBoxActions(u8 taskId)
 {
-    InfoBoxActions[gTasks[taskId].data[0]](&gTasks[taskId]);
+    sInfoBoxActions[gTasks[taskId].tState](&gTasks[taskId]);
 }
 
 static void InfoBox_FadeIn(struct Task *task)
 {
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
-    task->data[0]++;
+    task->tState++;
 }
 
 static void InfoBox_WaitForFade(struct Task *task)
 {
     if (!gPaletteFade.active)
-        task->data[0]++;
+        task->tState++;
 }
 
-static void InfoBox_8104B80(struct Task *task)
+static void InfoBox_DrawWindow(struct Task *task)
 {
-    sub_8104DA4();
-    sub_81065DC();
-    AddWindow(&gUnknown_085A7444);
+    DestroyDigitalDisplayScene();
+    LoadInfoBoxTilemap();
+    AddWindow(&sWindowTemplate_InfoBox);
     PutWindowTilemap(1);
     FillWindowPixelBuffer(1, PIXEL_FILL(0));
-    task->data[0]++;
+    task->tState++;
 }
 
 static void InfoBox_AddText(struct Task *task)
@@ -3146,40 +3447,40 @@ static void InfoBox_AddText(struct Task *task)
     AddTextPrinterParameterized3(1, 1, 2, 5, sColors_ReeltimeHelp, 0, gText_ReelTimeHelp);
     CopyWindowToVram(1, 3);
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0));
-    task->data[0]++;
+    task->tState++;
 }
 
 static void InfoBox_AwaitPlayerInput(struct Task *task)
 {
-    if (gMain.newKeys & (B_BUTTON | SELECT_BUTTON))
+    if (JOY_NEW(B_BUTTON | SELECT_BUTTON))
     {
         FillWindowPixelBuffer(1, PIXEL_FILL(0));
         ClearWindowTilemap(1);
         CopyWindowToVram(1, 1);
         RemoveWindow(1);
         BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
-        task->data[0]++;
+        task->tState++;
     }
 }
 
-static void InfoBox_812DE14(struct Task *task)
+static void InfoBox_LoadSlotMachineTilemap(struct Task *task)
 {
-    sub_812F968();
+    LoadSlotMachineMenuTilemap();
     ShowBg(3);
-    task->data[0]++;
+    task->tState++;
 }
 
-static void InfoBox_812DE30(struct Task *task)
+static void InfoBox_CreateDigitalDisplay(struct Task *task)
 {
-    sub_8104CAC(task->data[1]);
-    task->data[0]++;
+    CreateDigitalDisplayScene(task->data[1]);
+    task->tState++;
 }
 
-static void InfoBox_8104BFC(struct Task *task)
+static void InfoBox_LoadPikaPowerMeter(struct Task *task)
 {
-    sub_810423C(sSlotMachine->pikaPower);
+    LoadPikaPowerMeter(sSlotMachine->pikaPower);
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0));
-    task->data[0]++;
+    task->tState++;
 }
 
 static void InfoBox_FreeTask(struct Task *task)
@@ -3187,62 +3488,68 @@ static void InfoBox_FreeTask(struct Task *task)
     DestroyTask(FindTaskIdByFunc(RunInfoBoxActions));
 }
 
-static void sub_8104C5C(void)
+#undef tState
+
+#define sWaitForAnim data[7]
+
+static void CreateDigitalDisplayTask(void)
 {
     u8 i;
     struct Task *task;
-    i = CreateTask(sub_8104E74_, 3);
-    sSlotMachine->unkTaskPointer3D = i;
+    i = CreateTask(Task_DigitalDisplay, 3);
+    sSlotMachine->digDisplayTaskId = i;
     task = &gTasks[i];
     task->data[1] = -1;
-    for (i = 4; i < 16; i++)
+    for (i = 4; i < NUM_TASK_DATA; i++)
         task->data[i] = MAX_SPRITES;
 }
 
-// possibly initialize each wheel
-static void sub_8104CAC(u8 arg0)
+// For the panel on the right side of the slot screen
+static void CreateDigitalDisplayScene(u8 id)
 {
     u8 i;
     struct Task *task;
 
-    sub_8104DA4();
+    DestroyDigitalDisplayScene();
 
-    task = &gTasks[sSlotMachine->unkTaskPointer3D];
-    task->data[1] = arg0;
+    task = &gTasks[sSlotMachine->digDisplayTaskId];
+    task->data[1] = id;
 
-    for (i = 0; gUnknown_083ED048[arg0][i].unk00 != 0xFF; i++)
+    for (i = 0; sDigitalDisplayScenes[id][i].spriteTemplateId != 255; i++)
     {
         u8 spriteId;
-        spriteId = sub_8105BB4(
-                gUnknown_083ED048[arg0][i].unk00,
-                gUnknown_083ED048[arg0][i].unk01,
-                gUnknown_083ED048[arg0][i].unk02
+        spriteId = CreateStdDigitalDisplaySprite(
+                sDigitalDisplayScenes[id][i].spriteTemplateId,
+                sDigitalDisplayScenes[id][i].dispInfoId,
+                sDigitalDisplayScenes[id][i].spriteId
         );
         task->data[4 + i] = spriteId;
     }
 }
 
-static void sub_8104D30(u8 a0, SpriteCallback a1, s16 a2, s16 a3, s16 a4)
+static void AddDigitalDisplaySprite(u8 templateIdx, SpriteCallback callback, s16 x, s16 y, s16 spriteId)
 {
     u8 i;
-    struct Task *task = &gTasks[sSlotMachine->unkTaskPointer3D];
-    for (i = 4; i < 16; i++)
+    struct Task *task = &gTasks[sSlotMachine->digDisplayTaskId];
+    for (i = 4; i < NUM_TASK_DATA; i++)
     {
         if (task->data[i] == MAX_SPRITES)
         {
-            task->data[i] = sub_8105BF8(a0, a1, a2, a3, a4);
+            task->data[i] = CreateDigitalDisplaySprite(templateIdx, callback, x, y, spriteId);
             break;
         }
     }
 }
 
-static void sub_8104DA4(void)
+static void DestroyDigitalDisplayScene(void)
 {
     u8 i;
-    struct Task *task = &gTasks[sSlotMachine->unkTaskPointer3D];
+    struct Task *task = &gTasks[sSlotMachine->digDisplayTaskId];
+
     if ((u16)task->data[1] != 0xFFFF)
-        gUnknown_083ED064[task->data[1]]();
-    for (i = 4; i < 16; i++)
+        sDigitalDisplaySceneExitCallbacks[task->data[1]]();
+
+    for (i = 4; i < NUM_TASK_DATA; i++)
     {
         if (task->data[i] != MAX_SPRITES)
         {
@@ -3252,31 +3559,31 @@ static void sub_8104DA4(void)
     }
 }
 
-static bool8 sub_8104E18(void)
+static bool8 IsDigitalDisplayAnimFinished(void)
 {
     u8 i;
-    struct Task *task = &gTasks[sSlotMachine->unkTaskPointer3D];
-    for (i = 4; i < 16; i++)
+    struct Task *task = &gTasks[sSlotMachine->digDisplayTaskId];
+    for (i = 4; i < NUM_TASK_DATA; i++)
     {
         if (task->data[i] != MAX_SPRITES)
         {
-            if (gSprites[task->data[i]].data[7])
+            if (gSprites[task->data[i]].sWaitForAnim)
                 return FALSE;
         }
     }
     return TRUE;
 }
 
-static void sub_8104E74_(u8 taskId)
+static void Task_DigitalDisplay(u8 taskId)
 {
-    gUnknown_083ECC54[gTasks[taskId].data[0]](&gTasks[taskId]);
+    sDigitalDisplayActions[gTasks[taskId].data[0]](&gTasks[taskId]);
 }
 
-static void nullsub_69(struct Task *task)
+static void DigitalDisplay_Idle(struct Task *task)
 {
 }
 
-static void sub_8104EA8(void)
+static void CreateReelSymbolSprites(void)
 {
     s16 i;
     s16 j;
@@ -3285,7 +3592,7 @@ static void sub_8104EA8(void)
     {
         for (j = 0; j < 120; j += 24)
         {
-            struct Sprite *sprite = gSprites + CreateSprite(&gSpriteTemplate_83ED414, x, 0, 14);
+            struct Sprite *sprite = gSprites + CreateSprite(&sSpriteTemplate_ReelSymbol, x, 0, 14);
             sprite->oam.priority = 3;
             sprite->data[0] = i;
             sprite->data[1] = j;
@@ -3294,7 +3601,7 @@ static void sub_8104EA8(void)
     }
 }
 
-static void sub_8104F18(struct Sprite *sprite)
+static void SpriteCB_ReelSymbol(struct Sprite *sprite)
 {
     sprite->data[2] = sSlotMachine->reelPixelOffsets[sprite->data[0]] + sprite->data[1];
     sprite->data[2] %= 120;
@@ -3303,28 +3610,31 @@ static void sub_8104F18(struct Sprite *sprite)
     SetSpriteSheetFrameTileNum(sprite);
 }
 
-static void sub_8104F8C(void)
+static void CreateCreditPayoutNumberSprites(void)
 {
     s16 i;
     s16 x;
 
+    // Credit number sprite
     for (x = 203, i = 1; i <= MAX_COINS; i *= 10, x -= 7)
-        sub_8104FF4(x, 23, 0, i);
+        CreateCoinNumberSprite(x, 23, FALSE, i);
+
+    // Payout number sprite
     for (x = 235, i = 1; i <= MAX_COINS; i *= 10, x -= 7)
-        sub_8104FF4(x, 23, 1, i);
+        CreateCoinNumberSprite(x, 23, TRUE, i);
 }
 
-static void sub_8104FF4(s16 x, s16 y, u8 a2, s16 a3)
+static void CreateCoinNumberSprite(s16 x, s16 y, bool8 isPayout, s16 a3)
 {
-    struct Sprite *sprite = gSprites + CreateSprite(&gSpriteTemplate_83ED42C, x, y, 13);
+    struct Sprite *sprite = &gSprites[CreateSprite(&sSpriteTemplate_CoinNumber, x, y, 13)];
     sprite->oam.priority = 2;
-    sprite->data[0] = a2;
+    sprite->data[0] = isPayout;
     sprite->data[1] = a3;
     sprite->data[2] = a3 * 10;
     sprite->data[3] = -1;
 }
 
-static void sub_810506C(struct Sprite *sprite)
+static void SpriteCB_CoinNumber(struct Sprite *sprite)
 {
     u16 tag = sSlotMachine->coins;
     if (sprite->data[0])
@@ -3340,47 +3650,47 @@ static void sub_810506C(struct Sprite *sprite)
     }
 }
 
-static void sub_81050C4(void)
+static void CreateReelBackgroundSprite(void)
 {
-    u8 spriteId = CreateSprite(&gSpriteTemplate_83ED444, 0x58, 0x48, 15);
+    u8 spriteId = CreateSprite(&sSpriteTemplate_ReelBackground, 88, 72, 15);
     gSprites[spriteId].oam.priority = 3;
-    SetSubspriteTables(gSprites + spriteId, gSubspriteTables_83ED704);
+    SetSubspriteTables(&gSprites[spriteId], sSubspriteTable_ReelBackground);
 }
 
-static void sub_8105100(void)
+static void CreateReelTimePikachuSprite(void)
 {
     struct SpriteTemplate spriteTemplate;
     u8 spriteId;
-    if (sUnknown_0203AAE4 == NULL)
-        sUnknown_0203AAE4 = AllocZeroed(sizeof(struct SpriteFrameImage) * 5);
-
-    sUnknown_0203AAE4[0].data = sUnknown_0203AAD8 + (0 * 0x800);
-    sUnknown_0203AAE4[0].size = 0x800;
-    sUnknown_0203AAE4[1].data = sUnknown_0203AAD8 + (1 * 0x800);
-    sUnknown_0203AAE4[1].size = 0x800;
-    sUnknown_0203AAE4[2].data = sUnknown_0203AAD8 + (2 * 0x800);
-    sUnknown_0203AAE4[2].size = 0x800;
-    sUnknown_0203AAE4[3].data = sUnknown_0203AAD8 + (3 * 0x800);
-    sUnknown_0203AAE4[3].size = 0x800;
-    sUnknown_0203AAE4[4].data = sUnknown_0203AAD8 + (4 * 0x800);
-    sUnknown_0203AAE4[4].size = 0x800;
-
-    spriteTemplate = gSpriteTemplate_83ED45C;
-    spriteTemplate.images = sUnknown_0203AAE4;
+    if (sImageTable_ReelTimePikachu == NULL)
+        sImageTable_ReelTimePikachu = AllocZeroed(sizeof(struct SpriteFrameImage) * 5);
+
+    sImageTable_ReelTimePikachu[0].data = sReelTimeGfxPtr + (0 * 0x800);
+    sImageTable_ReelTimePikachu[0].size = 0x800;
+    sImageTable_ReelTimePikachu[1].data = sReelTimeGfxPtr + (1 * 0x800);
+    sImageTable_ReelTimePikachu[1].size = 0x800;
+    sImageTable_ReelTimePikachu[2].data = sReelTimeGfxPtr + (2 * 0x800);
+    sImageTable_ReelTimePikachu[2].size = 0x800;
+    sImageTable_ReelTimePikachu[3].data = sReelTimeGfxPtr + (3 * 0x800);
+    sImageTable_ReelTimePikachu[3].size = 0x800;
+    sImageTable_ReelTimePikachu[4].data = sReelTimeGfxPtr + (4 * 0x800);
+    sImageTable_ReelTimePikachu[4].size = 0x800;
+
+    spriteTemplate = sSpriteTemplate_ReelTimePikachu;
+    spriteTemplate.images = sImageTable_ReelTimePikachu;
     spriteId = CreateSprite(&spriteTemplate, 280, 80, 1);
     gSprites[spriteId].oam.priority = 1;
     gSprites[spriteId].coordOffsetEnabled = TRUE;
-    sSlotMachine->reelTimeSprite3F = spriteId;
+    sSlotMachine->reelTimePikachuSpriteId = spriteId;
 }
 
-static void sub_810514C(void)
+static void DestroyReelTimePikachuSprite(void)
 {
-    DestroySprite(gSprites + sSlotMachine->reelTimeSprite3F);
-    if (sUnknown_0203AAE4 != NULL)
-        FREE_AND_SET_NULL(sUnknown_0203AAE4);
+    DestroySprite(&gSprites[sSlotMachine->reelTimePikachuSpriteId]);
+    if (sImageTable_ReelTimePikachu != NULL)
+        FREE_AND_SET_NULL(sImageTable_ReelTimePikachu);
 }
 
-static void sub_8105170(struct Sprite *sprite)
+static void SpriteCB_ReelTimePikachu(struct Sprite *sprite)
 {
     sprite->pos2.y = sprite->pos2.x = 0;
     if (sprite->animNum == 4)
@@ -3391,78 +3701,78 @@ static void sub_8105170(struct Sprite *sprite)
     }
 }
 
-static void sub_81051C0(void)
+static void CreateReelTimeMachineSprites(void)
 {
     struct SpriteTemplate spriteTemplate;
     u8 spriteId;
     struct Sprite *sprite;
 
-    if (sUnknown_0203AAE8 == NULL)
-        sUnknown_0203AAE8 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
+    if (sImageTable_ReelTimeMachineAntennae == NULL)
+        sImageTable_ReelTimeMachineAntennae = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
 
-    sUnknown_0203AAE8[0].data = sUnknown_0203AAD8 + 0x2800;
-    sUnknown_0203AAE8[0].size = 0x300;
-    spriteTemplate = gSpriteTemplate_83ED474;
-    spriteTemplate.images = sUnknown_0203AAE8;
+    sImageTable_ReelTimeMachineAntennae[0].data = sReelTimeGfxPtr + 0x2800;
+    sImageTable_ReelTimeMachineAntennae[0].size = 0x300;
+    spriteTemplate = sSpriteTemplate_ReelTimeMachineAntennae;
+    spriteTemplate.images = sImageTable_ReelTimeMachineAntennae;
     spriteId = CreateSprite(&spriteTemplate, 368, 52, 7);
     sprite = &gSprites[spriteId];
     sprite->oam.priority = 1;
     sprite->coordOffsetEnabled = TRUE;
-    SetSubspriteTables(sprite, gSubspriteTables_83ED73C);
-    sSlotMachine->unk49[0] = spriteId;
+    SetSubspriteTables(sprite, sSubspriteTable_ReelTimeMachineAntennae);
+    sSlotMachine->reelTimeMachineSpriteIds[0] = spriteId;
 
-    if (sUnknown_0203AAEC == NULL)
-        sUnknown_0203AAEC = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
+    if (sImageTable_ReelTimeMachine == NULL)
+        sImageTable_ReelTimeMachine = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
 
-    sUnknown_0203AAEC[0].data = sUnknown_0203AAD8 + 0x2800 + 0x300;
-    sUnknown_0203AAEC[0].size = 0x500;
-    spriteTemplate = gSpriteTemplate_83ED48C;
-    spriteTemplate.images = sUnknown_0203AAEC;
+    sImageTable_ReelTimeMachine[0].data = sReelTimeGfxPtr + 0x2800 + 0x300;
+    sImageTable_ReelTimeMachine[0].size = 0x500;
+    spriteTemplate = sSpriteTemplate_ReelTimeMachine;
+    spriteTemplate.images = sImageTable_ReelTimeMachine;
     spriteId = CreateSprite(&spriteTemplate, 368, 84, 7);
     sprite = &gSprites[spriteId];
     sprite->oam.priority = 1;
     sprite->coordOffsetEnabled = TRUE;
-    SetSubspriteTables(sprite, gSubspriteTables_83ED75C);
-    sSlotMachine->unk49[1] = spriteId;
+    SetSubspriteTables(sprite, sSubspriteTable_ReelTimeMachine);
+    sSlotMachine->reelTimeMachineSpriteIds[1] = spriteId;
 }
 
-static void sub_8105284_(void)
+static void CreateBrokenReelTimeMachineSprite(void)
 {
     struct SpriteTemplate spriteTemplate;
     u8 spriteId;
     struct Sprite *sprite;
 
-    if (sUnknown_0203AAF0 == NULL)
-        sUnknown_0203AAF0 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
+    if (sImageTable_BrokenReelTimeMachine == NULL)
+        sImageTable_BrokenReelTimeMachine = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
 
-    sUnknown_0203AAF0[0].data = sUnknown_0203AAD8 + 0x3000;
-    sUnknown_0203AAF0[0].size = 0x600;
-    spriteTemplate = gSpriteTemplate_83ED4A4;
-    spriteTemplate.images = sUnknown_0203AAF0;
-    spriteId = CreateSprite(&spriteTemplate, 0xa8 - gSpriteCoordOffsetX, 0x50, 7);
+    sImageTable_BrokenReelTimeMachine[0].data = sReelTimeGfxPtr + 0x3000;
+    sImageTable_BrokenReelTimeMachine[0].size = 0x600;
+    spriteTemplate = sSpriteTemplate_BrokenReelTimeMachine;
+    spriteTemplate.images = sImageTable_BrokenReelTimeMachine;
+    spriteId = CreateSprite(&spriteTemplate, 168 - gSpriteCoordOffsetX, 80, 7);
     sprite = &gSprites[spriteId];
     sprite->oam.priority = 1;
     sprite->coordOffsetEnabled = TRUE;
-    SetSubspriteTables(sprite, gSubspriteTables_83ED78C);
-    sSlotMachine->unk42 = spriteId;
+    SetSubspriteTables(sprite, sSubspriteTable_BrokenReelTimeMachine);
+    sSlotMachine->reelTimeBrokenMachineSpriteId = spriteId;
 }
 
-static void sub_81052EC(void)
+static void CreateReelTimeNumberSprites(void)
 {
     u8 i;
     s16 r5;
-    for (i = 0, r5 = 0; i < 3; i++, r5 += 20)
+    for (i = 0, r5 = 0; i < ARRAY_COUNT(sSlotMachine->reelTimeNumberSpriteIds); i++, r5 += 20)
     {
-        u8 spriteId = CreateSprite(&gSpriteTemplate_83ED4BC, 0x170, 0, 10);
+        u8 spriteId = CreateSprite(&sSpriteTemplate_ReelTimeNumbers, 368, 0, 10);
         struct Sprite *sprite = &gSprites[spriteId];
         sprite->oam.priority = 1;
         sprite->coordOffsetEnabled = TRUE;
         sprite->data[7] = r5;
-        sSlotMachine->unk4B[i] = spriteId;
+        sSlotMachine->reelTimeNumberSpriteIds[i] = spriteId;
     }
 }
 
-static void sub_810535C(struct Sprite *sprite)
+static void SpriteCB_ReelTimeNumbers(struct Sprite *sprite)
 {
     s16 r0 = (u16)(sSlotMachine->reeltimePixelOffset + sprite->data[7]);
     r0 %= 40;
@@ -3470,92 +3780,98 @@ static void sub_810535C(struct Sprite *sprite)
     StartSpriteAnimIfDifferent(sprite, GetNearbyReelTimeTag(r0 / 20));
 }
 
-static void sub_81053A0(void)
+static void CreateReelTimeShadowSprites(void)
 {
-    u8 spriteId = CreateSprite(&gSpriteTemplate_83ED4D4, 0x170, 0x64, 9);
+    u8 spriteId = CreateSprite(&sSpriteTemplate_ReelTimeShadow, 368, 100, 9);
     struct Sprite *sprite = &gSprites[spriteId];
     sprite->coordOffsetEnabled = TRUE;
     sprite->oam.priority = 1;
-    SetSubspriteTables(sprite, gSubspriteTables_83ED7B4);
-    sSlotMachine->unk4E[0] = spriteId;
+    SetSubspriteTables(sprite, sSubspriteTable_ReelTimeShadow);
+    sSlotMachine->reelTimeShadowSpriteIds[0] = spriteId;
 
-    spriteId = CreateSprite(&gSpriteTemplate_83ED4D4, 0x120, 0x68, 4);
+    spriteId = CreateSprite(&sSpriteTemplate_ReelTimeShadow, 288, 104, 4);
     sprite = &gSprites[spriteId];
     sprite->coordOffsetEnabled = TRUE;
     sprite->oam.priority = 1;
-    SetSubspriteTables(sprite, gSubspriteTables_83ED7B4);
-    sSlotMachine->unk4E[1] = spriteId;
+    SetSubspriteTables(sprite, sSubspriteTable_ReelTimeShadow);
+    sSlotMachine->reelTimeShadowSpriteIds[1] = spriteId;
 }
 
-static void sub_810545C(void)
+// Creates a small black bar on the Reel Time machine to fill the gap between the numbers
+static void CreateReelTimeNumberGapSprite(void)
 {
-    u8 spriteId = CreateSprite(&gSpriteTemplate_83ED4EC, 0x170, 0x4c, 11);
+    u8 spriteId = CreateSprite(&sSpriteTemplate_ReelTimeNumberGap, 368, 76, 11);
     struct Sprite *sprite = &gSprites[spriteId];
     sprite->coordOffsetEnabled = TRUE;
     sprite->oam.priority = 1;
-    SetSubspriteTables(sprite, gSubspriteTables_83ED7D4);
-    sSlotMachine->unk40 = spriteId;
+    SetSubspriteTables(sprite, sSubspriteTable_ReelTimeNumberGap);
+    sSlotMachine->reelTimeNumberGapSpriteId = spriteId;
 }
 
-static void sub_81054B8(void)
+static void DestroyReelTimeMachineSprites(void)
 {
     u8 i;
 
-    DestroySprite(&gSprites[sSlotMachine->unk40]);
-    for (i = 0; i < 2; i++)
-        DestroySprite(&gSprites[sSlotMachine->unk49[i]]);
+    DestroySprite(&gSprites[sSlotMachine->reelTimeNumberGapSpriteId]);
+    for (i = 0; i < ARRAY_COUNT(sSlotMachine->reelTimeMachineSpriteIds); i++)
+        DestroySprite(&gSprites[sSlotMachine->reelTimeMachineSpriteIds[i]]);
 
-    if (sUnknown_0203AAE8 != NULL)
-        FREE_AND_SET_NULL(sUnknown_0203AAE8);
-    if (sUnknown_0203AAEC != NULL)
-        FREE_AND_SET_NULL(sUnknown_0203AAEC);
+    if (sImageTable_ReelTimeMachineAntennae != NULL)
+        FREE_AND_SET_NULL(sImageTable_ReelTimeMachineAntennae);
+    if (sImageTable_ReelTimeMachine != NULL)
+        FREE_AND_SET_NULL(sImageTable_ReelTimeMachine);
 
-    for (i = 0; i < 3; i++)
-        DestroySprite(&gSprites[sSlotMachine->unk4B[i]]);
+    for (i = 0; i < ARRAY_COUNT(sSlotMachine->reelTimeNumberSpriteIds); i++)
+        DestroySprite(&gSprites[sSlotMachine->reelTimeNumberSpriteIds[i]]);
 }
 
-static void sub_8105524(void)
+static void DestroyReelTimeShadowSprites(void)
 {
     u8 i;
 
-    for (i = 0; i < 2; i++)
-        DestroySprite(&gSprites[sSlotMachine->unk4E[i]]);
+    for (i = 0; i < ARRAY_COUNT(sSlotMachine->reelTimeShadowSpriteIds); i++)
+        DestroySprite(&gSprites[sSlotMachine->reelTimeShadowSpriteIds[i]]);
 }
 
-static void sub_8105554(void)
+static void DestroyBrokenReelTimeMachineSprite(void)
 {
-    DestroySprite(&gSprites[sSlotMachine->unk42]);
-    if (sUnknown_0203AAF0 != NULL)
-        FREE_AND_SET_NULL(sUnknown_0203AAF0);
+    DestroySprite(&gSprites[sSlotMachine->reelTimeBrokenMachineSpriteId]);
+    if (sImageTable_BrokenReelTimeMachine != NULL)
+        FREE_AND_SET_NULL(sImageTable_BrokenReelTimeMachine);
 }
 
-// TODO: check if this is true
-static void CreateReelTimeSprites1(void)
+#define sDelayTimer data[0]
+#define sXDir       data[1]
+#define sYDir       data[2]
+#define sCounter    data[3]
+#define sDelay      data[7]
+
+static void CreateReelTimeBoltSprites(void)
 {
-    u8 spriteId = CreateSprite(&gSpriteTemplate_83ED504, 0x98, 0x20, 5);
+    u8 spriteId = CreateSprite(&sSpriteTemplate_ReelTimeBolt, 152, 32, 5);
     struct Sprite *sprite = &gSprites[spriteId];
     sprite->oam.priority = 1;
     sprite->hFlip = TRUE;
-    sSlotMachine->reelTimeSprites1[0] = spriteId;
-    sprite->data[0] = 8;
-    sprite->data[1] = -1;
-    sprite->data[2] = -1;
-    sprite->data[7] = 0x20;
+    sSlotMachine->reelTimeBoltSpriteIds[0] = spriteId;
+    sprite->sDelayTimer = 8;
+    sprite->sXDir = -1;
+    sprite->sYDir = -1;
+    sprite->sDelay = 32;
 
-    spriteId = CreateSprite(&gSpriteTemplate_83ED504, 0xb8, 0x20, 5);
+    spriteId = CreateSprite(&sSpriteTemplate_ReelTimeBolt, 184, 32, 5);
     sprite = &gSprites[spriteId];
     sprite->oam.priority = 1;
-    sSlotMachine->reelTimeSprites1[1] = spriteId;
-    sprite->data[1] = 1;
-    sprite->data[2] = -1;
-    sprite->data[7] = 0x20;
+    sSlotMachine->reelTimeBoltSpriteIds[1] = spriteId;
+    sprite->sXDir = 1;
+    sprite->sYDir = -1;
+    sprite->sDelay = 32;
 }
 
-static void sub_810562C(struct Sprite *sprite)
+static void SpriteCB_ReelTimeBolt(struct Sprite *sprite)
 {
-    if (sprite->data[0] != 0)
+    if (sprite->sDelayTimer != 0)
     {
-        sprite->data[0]--;
+        sprite->sDelayTimer--;
         sprite->pos2.x = 0;
         sprite->pos2.y = 0;
         sprite->invisible = TRUE;
@@ -3563,104 +3879,123 @@ static void sub_810562C(struct Sprite *sprite)
     else
     {
         sprite->invisible = FALSE;
-        sprite->pos2.x += sprite->data[1];
-        sprite->pos2.y += sprite->data[2];
-        if (++sprite->data[3] >= 8)
+        sprite->pos2.x += sprite->sXDir;
+        sprite->pos2.y += sprite->sYDir;
+        if (++sprite->sCounter >= 8)
         {
-            sprite->data[0] = sprite->data[7];
-            sprite->data[3] = 0;
+            sprite->sDelayTimer = sprite->sDelay;
+            sprite->sCounter = 0;
         }
     }
 }
 
-static void sub_8105688(s16 a0)
+static void SetReelTimeBoltDelay(s16 delay)
 {
-    gSprites[sSlotMachine->reelTimeSprites1[0]].data[7] = a0;
-    gSprites[sSlotMachine->reelTimeSprites1[1]].data[7] = a0;
+    gSprites[sSlotMachine->reelTimeBoltSpriteIds[0]].sDelay = delay;
+    gSprites[sSlotMachine->reelTimeBoltSpriteIds[1]].sDelay = delay;
 }
 
-static void sub_81056C0(void)
+static void DestroyReelTimeBoltSprites(void)
 {
     u8 i;
 
-    for (i = 0; i < 2; i++)
-        DestroySprite(&gSprites[sSlotMachine->reelTimeSprites1[i]]);
+    for (i = 0; i < ARRAY_COUNT(sSlotMachine->reelTimeBoltSpriteIds); i++)
+        DestroySprite(&gSprites[sSlotMachine->reelTimeBoltSpriteIds[i]]);
 }
 
-static void CreateReelTimeSprite2(void)
+#undef sDelayTimer
+#undef sXDir
+#undef sYDir
+#undef sCounter
+#undef sDelay
+
+#define sFlashPal   data[0]
+#define sColorIdx   data[5]
+#define sDelayTimer data[6]
+#define sDelay      data[7]
+
+static void CreateReelTimePikachuAuraSprites(void)
 {
-    u8 spriteId = CreateSprite(&gSpriteTemplate_83ED51C, 0x48, 0x50, 3);
+    // Left half of electricity orb
+    u8 spriteId = CreateSprite(&sSpriteTemplate_ReelTimePikachuAura, 72, 80, 3);
     gSprites[spriteId].oam.priority = 1;
-    gSprites[spriteId].data[0] = 1;
-    gSprites[spriteId].data[5] = 0;
-    gSprites[spriteId].data[6] = 16;
-    gSprites[spriteId].data[7] = 8;
-    sSlotMachine->reelTimeSprites2[0] = spriteId;
-
-    spriteId = CreateSprite(&gSpriteTemplate_83ED51C, 0x68, 0x50, 3);
+    gSprites[spriteId].sFlashPal = TRUE; // Only one of them needs to do the flashing, they share the palette
+    gSprites[spriteId].sColorIdx = 0;
+    gSprites[spriteId].sDelayTimer = 16;
+    gSprites[spriteId].sDelay = 8;
+    sSlotMachine->reelTimePikachuAuraSpriteIds[0] = spriteId;
+
+    // Right half
+    spriteId = CreateSprite(&sSpriteTemplate_ReelTimePikachuAura, 104, 80, 3);
     gSprites[spriteId].oam.priority = 1;
     gSprites[spriteId].hFlip = TRUE;
-    sSlotMachine->reelTimeSprites2[1] = spriteId;
+    sSlotMachine->reelTimePikachuAuraSpriteIds[1] = spriteId;
 }
 
-static void sub_8105784(struct Sprite *sprite)
+static void SpriteCB_ReelTimePikachuAura(struct Sprite *sprite)
 {
-    u8 sp[] = {16, 0};
-    if (sprite->data[0] && --sprite->data[6] <= 0)
+    u8 colors[] = {16, 0};
+    if (sprite->sFlashPal && --sprite->sDelayTimer <= 0)
     {
-        MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(7) << 4) + 0x103, sp[sprite->data[5]], sp[sprite->data[5]], sp[sprite->data[5]]);
-        ++sprite->data[5];
-        sprite->data[5] &= 1;
-        sprite->data[6] = sprite->data[7];
+        MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(PALTAG_PIKA_AURA) << 4) + 0x103, colors[sprite->sColorIdx], colors[sprite->sColorIdx], colors[sprite->sColorIdx]);
+        ++sprite->sColorIdx;
+        sprite->sColorIdx &= 1;
+        sprite->sDelayTimer = sprite->sDelay;
     }
 }
 
-static void sub_81057E8(s16 a0)
+static void SetReelTimePikachuAuraFlashDelay(s16 delay)
 {
-    gSprites[sSlotMachine->reelTimeSprites2[0]].data[7] = a0;
+    gSprites[sSlotMachine->reelTimePikachuAuraSpriteIds[0]].sDelay = delay;
 }
 
-static void sub_8105804(void)
+static void DestroyReelTimePikachuAuraSprites(void)
 {
     u8 i;
-    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(7) << 4) + 0x103, 0, 0, 0);
-    for (i = 0; i < 2; i++)
-        DestroySprite(&gSprites[sSlotMachine->reelTimeSprites2[i]]);
+    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(PALTAG_PIKA_AURA) << 4) + 0x103, 0, 0, 0);
+    for (i = 0; i < ARRAY_COUNT(sSlotMachine->reelTimePikachuAuraSpriteIds); i++)
+        DestroySprite(&gSprites[sSlotMachine->reelTimePikachuAuraSpriteIds[i]]);
 }
 
-static void sub_8105854(void)
+#undef sFlashPal
+#undef sColorIdx
+#undef sDelayTimer
+#undef sDelay
+
+static void CreateReelTimeExplosionSprite(void)
 {
-    u8 spriteId = CreateSprite(&gSpriteTemplate_83ED534, 0xa8, 0x50, 6);
+    u8 spriteId = CreateSprite(&sSpriteTemplate_ReelTimeExplosion, 168, 80, 6);
     gSprites[spriteId].oam.priority = 1;
-    sSlotMachine->unk41 = spriteId;
+    sSlotMachine->reelTimeExplosionSpriteId = spriteId;
 }
 
-static void sub_8105894(struct Sprite *sprite)
+static void SpriteCB_ReelTimeExplosion(struct Sprite *sprite)
 {
     sprite->pos2.y = gSpriteCoordOffsetY;
 }
 
-static void sub_81058A0(void)
+static void DestroyReelTimeExplosionSprite(void)
 {
-    DestroySprite(&gSprites[sSlotMachine->unk41]);
+    DestroySprite(&gSprites[sSlotMachine->reelTimeExplosionSpriteId]);
 }
 
-static void sub_81058C4(void)
+// The "confusion" ducks that circle Pikachu if the Reel Time machine explodes
+static void CreateReelTimeDuckSprites(void)
 {
     u8 i;
     u16 sp[] = {0x0, 0x40, 0x80, 0xC0};
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < ARRAY_COUNT(sSlotMachine->reelTimeDuckSpriteIds); i++)
     {
-        u8 spriteId = CreateSprite(&gSpriteTemplate_83ED54C, 0x50 - gSpriteCoordOffsetX, 0x44, 0);
+        u8 spriteId = CreateSprite(&sSpriteTemplate_ReelTimeDuck, 80 - gSpriteCoordOffsetX, 68, 0);
         struct Sprite *sprite = &gSprites[spriteId];
         sprite->oam.priority = 1;
         sprite->coordOffsetEnabled = TRUE;
         sprite->data[0] = sp[i];
-        sSlotMachine->unk54[i] = spriteId;
+        sSlotMachine->reelTimeDuckSpriteIds[i] = spriteId;
     }
 }
 
-static void sub_810594C(struct Sprite *sprite)
+static void SpriteCB_ReelTimeDuck(struct Sprite *sprite)
 {
     sprite->data[0] -= 2;
     sprite->data[0] &= 0xff;
@@ -3678,67 +4013,77 @@ static void sub_810594C(struct Sprite *sprite)
     }
 }
 
-static void sub_81059B8(void)
+static void DestroyReelTimeDuckSprites(void)
 {
     u8 i;
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < ARRAY_COUNT(sSlotMachine->reelTimeDuckSpriteIds); i++)
     {
-        DestroySprite(&gSprites[sSlotMachine->unk54[i]]);
+        DestroySprite(&gSprites[sSlotMachine->reelTimeDuckSpriteIds[i]]);
     }
 }
 
-static void sub_81059E8(void)
+#define sState        data[0]
+#define sMoveY        data[1]
+#define sTimer        data[2]
+#define sAnimFinished data[7]
+
+static void CreateReelTimeSmokeSprite(void)
 {
-    u8 spriteId = CreateSprite(&gSpriteTemplate_83ED564, 0xa8, 0x3c, 8);
+    u8 spriteId = CreateSprite(&sSpriteTemplate_ReelTimeSmoke, 168, 60, 8);
     struct Sprite *sprite = &gSprites[spriteId];
     sprite->oam.priority = 1;
     sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE;
     InitSpriteAffineAnim(sprite);
-    sSlotMachine->unk43 = spriteId;
+    sSlotMachine->reelTimeSmokeSpriteId = spriteId;
 }
 
-static void sub_8105A38(struct Sprite *sprite)
+static void SpriteCB_ReelTimeSmoke(struct Sprite *sprite)
 {
-    if (sprite->data[0] == 0)
+    if (sprite->sState == 0)
     {
         if (sprite->affineAnimEnded)
-            sprite->data[0]++;
+            sprite->sState++;
     }
-    else if (sprite->data[0] == 1)
+    else if (sprite->sState == 1)
     {
         sprite->invisible ^= 1;
-        if (++sprite->data[2] >= 24)
+        if (++sprite->sTimer >= 24)
         {
-            sprite->data[0]++;
-            sprite->data[2] = 0;
+            sprite->sState++;
+            sprite->sTimer = 0;
         }
     }
     else
     {
         sprite->invisible = TRUE;
-        if (++sprite->data[2] >= 16)
-            sprite->data[7] = 1;
+        if (++sprite->sTimer >= 16)
+            sprite->sAnimFinished = TRUE;
     }
-    sprite->data[1] &= 0xff;
-    sprite->data[1] += 16;
-    sprite->pos2.y -= (sprite->data[1] >> 8);
+    sprite->sMoveY &= 0xff;
+    sprite->sMoveY += 16;
+    sprite->pos2.y -= (sprite->sMoveY >> 8);
 }
 
-static u8 sub_8105ACC(void)
+static u8 IsReelTimeSmokeAnimFinished(void)
 {
-    return gSprites[sSlotMachine->unk43].data[7];
+    return gSprites[sSlotMachine->reelTimeSmokeSpriteId].sAnimFinished;
 }
 
-static void sub_8105AEC(void)
+static void DestroyReelTimeSmokeSprite(void)
 {
-    struct Sprite *sprite = &gSprites[sSlotMachine->unk43];
+    struct Sprite *sprite = &gSprites[sSlotMachine->reelTimeSmokeSpriteId];
     FreeOamMatrix(sprite->oam.matrixNum);
     DestroySprite(sprite);
 }
 
-static u8 sub_8105B1C(s16 x, s16 y)
+#undef sState
+#undef sMoveY
+#undef sTimer
+#undef sAnimFinished
+
+static u8 CreatePikaPowerBoltSprite(s16 x, s16 y)
 {
-    u8 spriteId = CreateSprite(&gSpriteTemplate_83ED6CC, x, y, 12);
+    u8 spriteId = CreateSprite(&sSpriteTemplate_PikaPowerBolt, x, y, 12);
     struct Sprite *sprite = &gSprites[spriteId];
     sprite->oam.priority = 2;
     sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE;
@@ -3746,153 +4091,159 @@ static u8 sub_8105B1C(s16 x, s16 y)
     return spriteId;
 }
 
-static void sub_8105B70(struct Sprite *sprite)
+static void SpriteCB_PikaPowerBolt(struct Sprite *sprite)
 {
     if (sprite->affineAnimEnded)
-        sprite->data[7] = 1;
+        sprite->data[7] = TRUE;
 }
 
-static void sub_8105B88(u8 spriteId)
+static void DestroyPikaPowerBoltSprite(u8 spriteId)
 {
     struct Sprite *sprite = &gSprites[spriteId];
     FreeOamMatrix(sprite->oam.matrixNum);
     DestroySprite(sprite);
 }
 
-static u8 sub_8105BB4(u8 templateIdx, u8 cbAndCoordsIdx, s16 a2)
+static u8 CreateStdDigitalDisplaySprite(u8 templateIdx, u8 dispInfoId, s16 spriteId)
 {
-    return sub_8105BF8(templateIdx, gUnknown_083ECF0C[cbAndCoordsIdx], gUnknown_083ECE7E[cbAndCoordsIdx][0], gUnknown_083ECE7E[cbAndCoordsIdx][1], a2);
+    return CreateDigitalDisplaySprite(templateIdx, sDigitalDisplay_SpriteCallbacks[dispInfoId], sDigitalDisplay_SpriteCoords[dispInfoId][0], sDigitalDisplay_SpriteCoords[dispInfoId][1], spriteId);
 }
 
-static u8 sub_8105BF8(u8 templateIdx, SpriteCallback callback, s16 x, s16 y, s16 a4)
+#define sState       data[0]
+#define sCounter     data[1]
+#define sSpriteId    data[6]
+
+static u8 CreateDigitalDisplaySprite(u8 templateIdx, SpriteCallback callback, s16 x, s16 y, s16 internalSpriteId)
 {
     struct SpriteTemplate spriteTemplate;
     u8 spriteId;
     struct Sprite *sprite;
 
-    spriteTemplate = *gUnknown_083EDB5C[templateIdx];
-    spriteTemplate.images = gUnknown_03001188[templateIdx];
+    spriteTemplate = *sSpriteTemplates_DigitalDisplay[templateIdx];
+    spriteTemplate.images = sImageTables_DigitalDisplay[templateIdx];
     spriteId = CreateSprite(&spriteTemplate, x, y, 16);
     sprite = &gSprites[spriteId];
     sprite->oam.priority = 3;
     sprite->callback = callback;
-    sprite->data[6] = a4;
-    sprite->data[7] = 1;
-    if (gUnknown_083EDBC4[templateIdx])
-        SetSubspriteTables(sprite, gUnknown_083EDBC4[templateIdx]);
+    sprite->sSpriteId = internalSpriteId;
+    sprite->sWaitForAnim = TRUE;
+    if (sSubspriteTables_DigitalDisplay[templateIdx])
+        SetSubspriteTables(sprite, sSubspriteTables_DigitalDisplay[templateIdx]);
     return spriteId;
 }
 
-static void sub_8105C64(struct Sprite *sprite)
+static void SpriteCB_DigitalDisplay_Static(struct Sprite *sprite)
 {
-    sprite->data[7] = 0;
+    sprite->sWaitForAnim = FALSE;
 }
 
-static void sub_8105C6C(struct Sprite *sprite)
+static void SpriteCB_DigitalDisplay_Smoke(struct Sprite *sprite)
 {
-    s16 sp0[] = {4, -4, 4, -4};
-    s16 sp8[] = {4, 4, -4, -4};
+    s16 targetX[] = {4, -4, 4, -4};
+    s16 targetY[] = {4, 4, -4, -4};
 
-    if (sprite->data[1]++ >= 16)
+    if (sprite->sCounter++ >= 16)
     {
         sprite->subspriteTableNum ^= 1;
-        sprite->data[1] = 0;
+        sprite->sCounter = 0;
     }
     sprite->pos2.x = 0;
     sprite->pos2.y = 0;
     if (sprite->subspriteTableNum != 0)
     {
-        sprite->pos2.x = sp0[sprite->data[6]];
-        sprite->pos2.y = sp8[sprite->data[6]];
+        sprite->pos2.x = targetX[sprite->sSpriteId];
+        sprite->pos2.y = targetY[sprite->sSpriteId];
     }
 }
 
-static void sub_8105CF0(struct Sprite *sprite)
+static void SpriteCB_DigitalDisplay_SmokeNE(struct Sprite *sprite)
 {
     sprite->hFlip = TRUE;
-    sub_8105C6C(sprite);
+    SpriteCB_DigitalDisplay_Smoke(sprite);
 }
 
-static void sub_8105D08(struct Sprite *sprite)
+static void SpriteCB_DigitalDisplay_SmokeSW(struct Sprite *sprite)
 {
     sprite->vFlip = TRUE;
-    sub_8105C6C(sprite);
+    SpriteCB_DigitalDisplay_Smoke(sprite);
 }
 
-static void sub_8105D20(struct Sprite *sprite)
+static void SpriteCB_DigitalDisplay_SmokeSE(struct Sprite *sprite)
 {
     sprite->hFlip = TRUE;
     sprite->vFlip = TRUE;
-    sub_8105C6C(sprite);
+    SpriteCB_DigitalDisplay_Smoke(sprite);
 }
 
-static void sub_8105D3C(struct Sprite *sprite)
+// The word "Reel" in Reel Time
+static void SpriteCB_DigitalDisplay_Reel(struct Sprite *sprite)
 {
-    switch (sprite->data[0])
+    switch (sprite->sState)
     {
     case 0:
         sprite->pos1.x += 4;
         if (sprite->pos1.x >= 0xd0)
         {
             sprite->pos1.x = 0xd0;
-            sprite->data[0]++;
+            sprite->sState++;
         }
         break;
     case 1:
-        if (++sprite->data[1] > 90)
-            sprite->data[0]++;
+        if (++sprite->sCounter > 90)
+            sprite->sState++;
         break;
     case 2:
         sprite->pos1.x += 4;
         if (sprite->pos1.x >= 0x110)
-            sprite->data[0]++;
+            sprite->sState++;
         break;
     case 3:
-        sprite->data[7] = 0;
+        sprite->sWaitForAnim = FALSE;
         break;
     }
 }
 
-static void sub_8105DA4(struct Sprite *sprite)
+// The word "Time" in Reel Time
+static void SpriteCB_DigitalDisplay_Time(struct Sprite *sprite)
 {
-    switch (sprite->data[0])
+    switch (sprite->sState)
     {
     case 0:
         sprite->pos1.x -= 4;
         if (sprite->pos1.x <= 0xd0)
         {
             sprite->pos1.x = 0xd0;
-            sprite->data[0]++;
+            sprite->sState++;
         }
         break;
     case 1:
-        if (++sprite->data[1] > 90)
-            sprite->data[0]++;
+        if (++sprite->sCounter > 90)
+            sprite->sState++;
         break;
     case 2:
         sprite->pos1.x -= 4;
         if (sprite->pos1.x <= 0x90)
-            sprite->data[0]++;
+            sprite->sState++;
         break;
     case 3:
-        sprite->data[7] = 0;
+        sprite->sWaitForAnim = FALSE;
         break;
     }
 }
 
-static void sub_8105E08(struct Sprite *sprite)
+static void SpriteCB_DigitalDisplay_ReelTimeNumber(struct Sprite *sprite)
 {
-    switch (sprite->data[0])
+    switch (sprite->sState)
     {
     case 0:
-        StartSpriteAnim(sprite, sSlotMachine->fairRollsLeft - 1);
-        sprite->data[0]++;
+        StartSpriteAnim(sprite, sSlotMachine->reelTimeSpinsLeft - 1);
+        sprite->sState++;
         // fallthrough
     case 1:
-        if (++sprite->data[1] >= 4)
+        if (++sprite->sCounter >= 4)
         {
-            sprite->data[0]++;
-            sprite->data[1] = 0;
+            sprite->sState++;
+            sprite->sCounter = 0;
         }
         break;
     case 2:
@@ -3900,54 +4251,54 @@ static void sub_8105E08(struct Sprite *sprite)
         if (sprite->pos1.x >= 0xd0)
         {
             sprite->pos1.x = 0xd0;
-            sprite->data[0]++;
+            sprite->sState++;
         }
         break;
     case 3:
-        if (++sprite->data[1] > 90)
-            sprite->data[0]++;
+        if (++sprite->sCounter > 90)
+            sprite->sState++;
         break;
     case 4:
         sprite->pos1.x += 4;
         if (sprite->pos1.x >= 0xf8)
-            sprite->data[0]++;
+            sprite->sState++;
         break;
     case 5:
-        sprite->data[7] = 0;
+        sprite->sWaitForAnim = FALSE;
         break;
     }
 }
 
-static void sub_8105EB4(struct Sprite *sprite)
+static void SpriteCB_DigitalDisplay_PokeballRocking(struct Sprite *sprite)
 {
-    switch (sprite->data[0])
+    switch (sprite->sState)
     {
     case 0:
         sprite->animPaused = TRUE;
-        sprite->data[0]++;
+        sprite->sState++;
         // fallthrough
     case 1:
         sprite->pos1.y += 8;
         if (sprite->pos1.y >= 0x70)
         {
             sprite->pos1.y = 0x70;
-            sprite->data[1] = 16;
-            sprite->data[0]++;
+            sprite->sCounter = 16;
+            sprite->sState++;
         }
         break;
     case 2:
         if (sprite->data[2] == 0)
         {
-            sprite->pos1.y -= sprite->data[1];
-            sprite->data[1] = -sprite->data[1];
+            sprite->pos1.y -= sprite->sCounter;
+            sprite->sCounter = -sprite->sCounter;
             if (++sprite->data[3] >= 2)
             {
-                sprite->data[1] >>= 2;
+                sprite->sCounter >>= 2;
                 sprite->data[3] = 0;
-                if (sprite->data[1] == 0)
+                if (sprite->sCounter == 0)
                 {
-                    sprite->data[0]++;
-                    sprite->data[7] = 0;
+                    sprite->sState++;
+                    sprite->sWaitForAnim = FALSE;
                     sprite->animPaused = FALSE;
                 }
             }
@@ -3958,53 +4309,53 @@ static void sub_8105EB4(struct Sprite *sprite)
     }
 }
 
-static void sub_8105F54(struct Sprite *sprite)
+static void SpriteCB_DigitalDisplay_Stop(struct Sprite *sprite)
 {
-    switch (sprite->data[0])
+    switch (sprite->sState)
     {
     case 0:
-        if (++sprite->data[1] > 8)
-            sprite->data[0]++;
+        if (++sprite->sCounter > 8)
+            sprite->sState++;
         break;
     case 1:
         sprite->pos1.y += 2;
         if (sprite->pos1.y >= 0x30)
         {
             sprite->pos1.y = 0x30;
-            sprite->data[0]++;
-            sprite->data[7] = 0;
+            sprite->sState++;
+            sprite->sWaitForAnim = FALSE;
         }
         break;
     }
 }
 
-static void sub_8105F9C(struct Sprite *sprite)
+static void SpriteCB_DigitalDisplay_AButtonStop(struct Sprite *sprite)
 {
-    switch (sprite->data[0])
+    switch (sprite->sState)
     {
     case 0:
         sprite->invisible = TRUE;
-        if (++sprite->data[1] > 0x20)
+        if (++sprite->sCounter > 0x20)
         {
-            sprite->data[0]++;
-            sprite->data[1] = 5;
+            sprite->sState++;
+            sprite->sCounter = 5;
             sprite->oam.mosaic = TRUE;
             sprite->invisible = FALSE;
             StartSpriteAnim(sprite, 1);
-            SetGpuReg(REG_OFFSET_MOSAIC, ((sprite->data[1] << 4) | sprite->data[1]) << 8);
+            SetGpuReg(REG_OFFSET_MOSAIC, ((sprite->sCounter << 4) | sprite->sCounter) << 8);
         }
         break;
     case 1:
-        sprite->data[1] -= (sprite->data[2] >> 8);
-        if (sprite->data[1] < 0)
-            sprite->data[1] = 0;
-        SetGpuReg(REG_OFFSET_MOSAIC, ((sprite->data[1] << 4) | sprite->data[1]) << 8);
+        sprite->sCounter -= (sprite->data[2] >> 8);
+        if (sprite->sCounter < 0)
+            sprite->sCounter = 0;
+        SetGpuReg(REG_OFFSET_MOSAIC, ((sprite->sCounter << 4) | sprite->sCounter) << 8);
         sprite->data[2] &= 0xff;
         sprite->data[2] += 0x80;
-        if (sprite->data[1] == 0)
+        if (sprite->sCounter == 0)
         {
-            sprite->data[0]++;
-            sprite->data[7] = 0;
+            sprite->sState++;
+            sprite->sWaitForAnim = FALSE;
             sprite->oam.mosaic = FALSE;
             StartSpriteAnim(sprite, 0);
         }
@@ -4012,11 +4363,11 @@ static void sub_8105F9C(struct Sprite *sprite)
     }
 }
 
-static void sub_8106058(struct Sprite *sprite)
+static void SpriteCB_DigitalDisplay_PokeballShining(struct Sprite *sprite)
 {
-    if (sprite->data[1] < 3)
+    if (sprite->sCounter < 3)
     {
-        LoadPalette(gUnknown_083EDE10[sprite->data[1]], (IndexOfSpritePaletteTag(6) << 4) + 0x100, 0x20);
+        LoadPalette(sPokeballShiningPalTable[sprite->sCounter], (IndexOfSpritePaletteTag(PALTAG_DIG_DISPLAY) << 4) + 0x100, 32);
         if (++sprite->data[2] >= 4)
         {
             sprite->data[1]++;
@@ -4025,34 +4376,35 @@ static void sub_8106058(struct Sprite *sprite)
     }
     else
     {
-        LoadPalette(gUnknown_083EDE10[sprite->data[1]], (IndexOfSpritePaletteTag(6) << 4) + 0x100, 0x20);
+        LoadPalette(sPokeballShiningPalTable[sprite->sCounter], (IndexOfSpritePaletteTag(PALTAG_DIG_DISPLAY) << 4) + 0x100, 32);
         if (++sprite->data[2] >= 25)
         {
-            sprite->data[1] = 0;
+            sprite->sCounter = 0;
             sprite->data[2] = 0;
         }
     }
     StartSpriteAnimIfDifferent(sprite, 1);
-    sprite->data[7] = 0;
+    sprite->sWaitForAnim = FALSE;
 }
 
-static void sub_81060FC(struct Sprite *sprite)
+static void SpriteCB_DigitalDisplay_RegBonus(struct Sprite *sprite)
 {
-    s16 sp00[] = {0, -40, 0, 0, 48, 0, 24, 0};
-    s16 sp10[] = {-32, 0, -32, -48, 0, -48, 0, -48};
-    s16 sp20[] = {16, 12, 16, 0, 0, 4, 8, 8};
+    // Elements in array correspond to R E G B O N U S
+    s16 letterXOffset[] = {  0, -40,   0,   0, 48,   0,  24,   0};
+    s16 letterYOffset[] = {-32,   0, -32, -48,  0, -48,   0, -48};
+    s16 letterDelay[]   = { 16,  12,  16,   0,  0,   4,   8,   8};
 
-    switch (sprite->data[0])
+    switch (sprite->sState)
     {
     case 0:
-        sprite->pos2.x = sp00[sprite->data[6]];
-        sprite->pos2.y = sp10[sprite->data[6]];
-        sprite->data[1] = sp20[sprite->data[6]];
-        sprite->data[0]++;
+        sprite->pos2.x = letterXOffset[sprite->sSpriteId];
+        sprite->pos2.y = letterYOffset[sprite->sSpriteId];
+        sprite->sCounter = letterDelay[sprite->sSpriteId];
+        sprite->sState++;
         // fallthrough
     case 1:
-        if (sprite->data[1]-- == 0)
-            sprite->data[0]++;
+        if (sprite->sCounter-- == 0)
+            sprite->sState++;
         break;
     case 2:
         if (sprite->pos2.x > 0)
@@ -4066,166 +4418,168 @@ static void sub_81060FC(struct Sprite *sprite)
             sprite->pos2.y += 4;
 
         if (sprite->pos2.x == 0 && sprite->pos2.y == 0)
-            sprite->data[0]++;
+            sprite->sState++;
         break;
     }
 }
 
-static void sub_81061C8(struct Sprite *sprite)
+static void SpriteCB_DigitalDisplay_BigBonus(struct Sprite *sprite)
 {
     s16 sp0[] = {160, 192, 224, 104, 80, 64, 48, 24};
 
-    if (sprite->data[0] == 0)
+    if (sprite->sState == 0)
     {
-        sprite->data[0]++;
-        sprite->data[1] = 12;
+        sprite->sState++;
+        sprite->sCounter = 12;
     }
-    sprite->pos2.x = Cos(sp0[sprite->data[6]], sprite->data[1]);
-    sprite->pos2.y = Sin(sp0[sprite->data[6]], sprite->data[1]);
-    if (sprite->data[1] != 0)
-        sprite->data[1]--;
+    sprite->pos2.x = Cos(sp0[sprite->sSpriteId], sprite->sCounter);
+    sprite->pos2.y = Sin(sp0[sprite->sSpriteId], sprite->sCounter);
+    if (sprite->sCounter != 0)
+        sprite->sCounter--;
 }
 
-static void sub_8106230(struct Sprite *sprite)
+// For the A Button prompt when inserting bet
+// Initially no sprite until after the first bet
+static void SpriteCB_DigitalDisplay_AButtonStart(struct Sprite *sprite)
 {
-    switch (sprite->data[0])
+    switch (sprite->sState)
     {
         case 0:
-            sSlotMachine->winIn = 0x2f;
-            sSlotMachine->winOut = 0x3f;
-            sSlotMachine->win0v = 0x2088;
+            sSlotMachine->winIn = WININ_WIN0_BG_ALL | WININ_WIN0_CLR;
+            sSlotMachine->winOut = WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR;
+            sSlotMachine->win0v = WIN_RANGE(32, 136);
             sprite->invisible = TRUE;
-            sprite->data[0]++;
+            sprite->sState++;
             // fallthrough
         case 1:
-            sprite->data[1] += 2;
-            sprite->data[2] = sprite->data[1] + 0xb0;
-            sprite->data[3] = 0xf0 - sprite->data[1];
-            if (sprite->data[2] > 0xd0)
-                sprite->data[2] = 0xd0;
-            if (sprite->data[3] < 0xd0)
-                sprite->data[3] = 0xd0;
+            sprite->sCounter += 2;
+            sprite->data[2] = sprite->sCounter + 176;
+            sprite->data[3] = DISPLAY_WIDTH - sprite->sCounter;
+            if (sprite->data[2] > 208)
+                sprite->data[2] = 208;
+            if (sprite->data[3] < 208)
+                sprite->data[3] = 208;
             sSlotMachine->win0h = (sprite->data[2] << 8) | sprite->data[3];
-            if (sprite->data[1] > 0x33)
+            if (sprite->sCounter > 51)
             {
-                sprite->data[0]++;
-                sSlotMachine->winIn = 0x3f;
+                sprite->sState++;
+                sSlotMachine->winIn = WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR;
             }
             break;
         case 2:
             if (sSlotMachine->bet == 0)
                 break;
-            sub_8104D30(5, SpriteCallbackDummy, 0xd0, 0x74, 0);
-            sSlotMachine->win0h = 0xc0e0;
-            sSlotMachine->win0v = 0x6880;
-            sSlotMachine->winIn = 0x2f;
-            sprite->data[0]++;
-            sprite->data[1] = 0;
+            AddDigitalDisplaySprite(DIG_SPRITE_A_BUTTON, SpriteCallbackDummy, 208, 116, 0);
+            sSlotMachine->win0h = WIN_RANGE(192, 224);
+            sSlotMachine->win0v = WIN_RANGE(104, 128);
+            sSlotMachine->winIn = WININ_WIN0_BG_ALL | WININ_WIN0_CLR;
+            sprite->sState++;
+            sprite->sCounter = 0;
             // fallthrough
         case 3:
-            sprite->data[1] += 2;
-            sprite->data[2] = sprite->data[1] + 0xc0;
-            sprite->data[3] = 0xe0 - sprite->data[1];
-            if (sprite->data[2] > 0xd0)
-                sprite->data[2] = 0xd0;
-            if (sprite->data[3] < 0xd0)
-                sprite->data[3] = 0xd0;
+            sprite->sCounter += 2;
+            sprite->data[2] = sprite->sCounter + 192;
+            sprite->data[3] = DISPLAY_WIDTH - 16 - sprite->sCounter;
+            if (sprite->data[2] > 208)
+                sprite->data[2] = 208;
+            if (sprite->data[3] < 208)
+                sprite->data[3] = 208;
             sSlotMachine->win0h = (sprite->data[2] << 8) | sprite->data[3];
-            if (sprite->data[1] > 0x0f)
+            if (sprite->sCounter > 15)
             {
-                sprite->data[0]++;
-                sSlotMachine->winIn = 0x3f;
+                sprite->sState++;
+                sSlotMachine->winIn = WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR;
             }
             break;
     }
 }
 
-static void nullsub_70(void)
+static void EndDigitalDisplayScene_Dummy(void)
 {
 }
 
-static void sub_8106364(void)
+static void EndDigitalDisplayScene_StopReel(void)
 {
     SetGpuReg(REG_OFFSET_MOSAIC, 0);
 }
 
-static void sub_8106370(void)
+static void EndDigitalDisplayScene_Win(void)
 {
-    LoadPalette(gUnknown_083EDE20, (IndexOfSpritePaletteTag(6) << 4) + 0x100, 0x20);
+    LoadPalette(sDigitalDisplay_Pal, (IndexOfSpritePaletteTag(PALTAG_DIG_DISPLAY) << 4) + 0x100, 0x20);
 }
 
-static void sub_810639C(void)
+static void EndDigitalDisplayScene_InsertBet(void)
 {
-    sSlotMachine->win0h = 0xf0;
-    sSlotMachine->win0v = 0xa0;
-    sSlotMachine->winIn = 0x3f;
-    sSlotMachine->winOut = 0x3f;
+    sSlotMachine->win0h = DISPLAY_WIDTH;
+    sSlotMachine->win0v = DISPLAY_HEIGHT;
+    sSlotMachine->winIn = WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR;
+    sSlotMachine->winOut = WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR;
 }
 
-static void sub_81063C0(void)
+static void LoadSlotMachineGfx(void)
 {
     u8 i;
 
-    sub_8106404();
-    sUnknown_0203AAD4 = Alloc(0x3200);
-    LZDecompressWram(gSlotMachineReelTime_Gfx, sUnknown_0203AAD4);
-    sUnknown_0203AAD8 = Alloc(0x3600);
-    LZDecompressWram(gReelTimeGfx, sUnknown_0203AAD8);
-    sUnknown_0203AB30 = AllocZeroed(sizeof(struct SpriteSheet) * ARRAY_COUNT(gSlotMachineSpriteSheets));
-    for (i = 0; i < ARRAY_COUNT(gSlotMachineSpriteSheets); i++)
+    LoadReelBackground();
+    sDigitalDisplayGfxPtr = Alloc(0x3200);
+    LZDecompressWram(gSlotMachineDigitalDisplay_Gfx, sDigitalDisplayGfxPtr);
+    sReelTimeGfxPtr = Alloc(0x3600);
+    LZDecompressWram(sReelTimeGfx, sReelTimeGfxPtr);
+    sSlotMachineSpritesheetsPtr = AllocZeroed(sizeof(struct SpriteSheet) * ARRAY_COUNT(sSlotMachineSpriteSheets));
+    for (i = 0; i < ARRAY_COUNT(sSlotMachineSpriteSheets); i++)
     {
-        sUnknown_0203AB30[i].data = gSlotMachineSpriteSheets[i].data;
-        sUnknown_0203AB30[i].size = gSlotMachineSpriteSheets[i].size;
-        sUnknown_0203AB30[i].tag = gSlotMachineSpriteSheets[i].tag;
+        sSlotMachineSpritesheetsPtr[i].data = sSlotMachineSpriteSheets[i].data;
+        sSlotMachineSpritesheetsPtr[i].size = sSlotMachineSpriteSheets[i].size;
+        sSlotMachineSpritesheetsPtr[i].tag = sSlotMachineSpriteSheets[i].tag;
     }
-    sUnknown_0203AB30[17].data = sUnknown_0203AAD4 + 0xA00;
-    sUnknown_0203AB30[18].data = sUnknown_0203AAD4 + 0x1400;
-    sUnknown_0203AB30[19].data = sUnknown_0203AAD4 + 0x1600;
-    sUnknown_0203AB30[20].data = sUnknown_0203AAD4 + 0x1900;
-    LoadSpriteSheets(sUnknown_0203AB30);
-    LoadSpritePalettes(gSlotMachineSpritePalettes);
+    sSlotMachineSpritesheetsPtr[GFXTAG_STOP - 1].data = sDigitalDisplayGfxPtr + 0xA00;
+    sSlotMachineSpritesheetsPtr[GFXTAG_BONUS - 1].data = sDigitalDisplayGfxPtr + 0x1400;
+    sSlotMachineSpritesheetsPtr[GFXTAG_BIG - 1].data = sDigitalDisplayGfxPtr + 0x1600;
+    sSlotMachineSpritesheetsPtr[GFXTAG_REG - 1].data = sDigitalDisplayGfxPtr + 0x1900;
+    LoadSpriteSheets(sSlotMachineSpritesheetsPtr);
+    LoadSpritePalettes(sSlotMachineSpritePalettes);
 }
 
-static void sub_8106404(void)
+static void LoadReelBackground(void)
 {
     u8 *dest;
     u8 i, j;
 
-    sUnknown_0203AB2C = AllocZeroed(sizeof(struct SpriteSheet));
-    sUnknown_0203AAE0 = AllocZeroed(0x2000);
-    dest = sUnknown_0203AAE0;
+    sReelBackgroundSpriteSheet = AllocZeroed(sizeof(struct SpriteSheet));
+    sReelBackground_Gfx = AllocZeroed(0x2000); // Background is plain white
+    dest = sReelBackground_Gfx;
     for (i = 0; i < 0x40; i++)
     {
         for (j = 0; j < 0x20; j++, dest++)
-            *dest = gUnknown_083EDCDC[j];
+            *dest = sReelBackground_Tilemap[j];
     }
-    sUnknown_0203AB2C->data = sUnknown_0203AAE0;
-    sUnknown_0203AB2C->size = 0x800;
-    sUnknown_0203AB2C->tag  = 0x11;
-    LoadSpriteSheet(sUnknown_0203AB2C);
+    sReelBackgroundSpriteSheet->data = sReelBackground_Gfx;
+    sReelBackgroundSpriteSheet->size = 0x800;
+    sReelBackgroundSpriteSheet->tag  = GFXTAG_REEL_BG;
+    LoadSpriteSheet(sReelBackgroundSpriteSheet);
 }
 
-static void sub_8106448(void)
+static void LoadMenuGfx(void)
 {
-    sUnknown_0203AAC8 = Alloc(0x2200);
-    LZDecompressWram(gSlotMachineMenu_Gfx, sUnknown_0203AAC8);
-    LoadBgTiles(2, sUnknown_0203AAC8, 0x2200, 0);
+    sMenuGfx = Alloc(0x2200);
+    LZDecompressWram(gSlotMachineMenu_Gfx, sMenuGfx);
+    LoadBgTiles(2, sMenuGfx, 0x2200, 0);
     LoadPalette(gSlotMachineMenu_Pal, 0, 160);
-    LoadPalette(gPalette_83EDE24, 208, 32);
+    LoadPalette(sUnkPalette, 208, 32);
 }
 
-static void sub_81064B8(void)
+static void LoadMenuAndReelOverlayTilemaps(void)
 {
-    sub_812F968();
-    LoadSlotMachineWheelOverlay();
+    LoadSlotMachineMenuTilemap();
+    LoadSlotMachineReelOverlay();
 }
 
-static void sub_812F968(void)
+static void LoadSlotMachineMenuTilemap(void)
 {
     LoadBgTilemap(2, gSlotMachineMenu_Tilemap, 0x500, 0);
 }
 
-static void LoadSlotMachineWheelOverlay(void)
+static void LoadSlotMachineReelOverlay(void)
 {
     s16 x, y, dx;
 
@@ -4233,226 +4587,227 @@ static void LoadSlotMachineWheelOverlay(void)
     {
         for (dx = 0; dx < 4; dx++)
         {
-            LoadBgTilemap(3, sUnknown_0203AAD0,     2, x + dx + 5  * 32);
-            LoadBgTilemap(3, sUnknown_0203AAD0 + 1, 2, x + dx + 13 * 32);
-            LoadBgTilemap(3, sUnknown_0203AAD0 + 2, 2, x + dx + 6  * 32);
-            LoadBgTilemap(3, sUnknown_0203AAD0 + 3, 2, x + dx + 12 * 32);
+            LoadBgTilemap(3, sReelOverlay_Tilemap,     2, x + dx + 5  * 32);
+            LoadBgTilemap(3, sReelOverlay_Tilemap + 1, 2, x + dx + 13 * 32);
+            LoadBgTilemap(3, sReelOverlay_Tilemap + 2, 2, x + dx + 6  * 32);
+            LoadBgTilemap(3, sReelOverlay_Tilemap + 3, 2, x + dx + 12 * 32);
         }
 
-        LoadBgTilemap(3, sUnknown_0203AAD0 + 4, 2, x + 6 * 32);
-        LoadBgTilemap(3, sUnknown_0203AAD0 + 5, 2, x + 12 * 32);
+        LoadBgTilemap(3, sReelOverlay_Tilemap + 4, 2, x + 6 * 32);
+        LoadBgTilemap(3, sReelOverlay_Tilemap + 5, 2, x + 12 * 32);
 
         for (y = 7; y <= 11; y++)
-            LoadBgTilemap(3, sUnknown_0203AAD0 + 6, 2, x + y * 32);
+            LoadBgTilemap(3, sReelOverlay_Tilemap + 6, 2, x + y * 32);
     }
 }
 
-static void sub_81065A8(s16 arg0, u16 arg1, u16 arg2, u16 arg3, u16 arg4)
+// For (un)shading the gray button at the bottom of a reel when A is pressed. The button is colored in quadrants
+static void SetReelButtonTilemap(s16 offset, u16 topLeft, u16 topRight, u16 bottomLeft, u16 bottomRight)
 {
-    sUnknown_0203AADC[0] = arg1;
-    sUnknown_0203AADC[1] = arg2;
-    sUnknown_0203AADC[2] = arg3;
-    sUnknown_0203AADC[3] = arg4;
+    sReelButtonPress_Tilemap[0] = topLeft;
+    sReelButtonPress_Tilemap[1] = topRight;
+    sReelButtonPress_Tilemap[2] = bottomLeft;
+    sReelButtonPress_Tilemap[3] = bottomRight;
 
-    LoadBgTilemap(2, sUnknown_0203AADC,     2, 15 * 32 + arg0);
-    LoadBgTilemap(2, sUnknown_0203AADC + 1, 2, 15 * 32 + 1 + arg0);
-    LoadBgTilemap(2, sUnknown_0203AADC + 2, 2, 16 * 32 + arg0);
-    LoadBgTilemap(2, sUnknown_0203AADC + 3, 2, 16 * 32 + 1 + arg0);
+    LoadBgTilemap(2, sReelButtonPress_Tilemap,     2, 15 * 32 + offset);     // Top left
+    LoadBgTilemap(2, sReelButtonPress_Tilemap + 1, 2, 15 * 32 + 1 + offset); // Top right
+    LoadBgTilemap(2, sReelButtonPress_Tilemap + 2, 2, 16 * 32 + offset);     // Bottom left
+    LoadBgTilemap(2, sReelButtonPress_Tilemap + 3, 2, 16 * 32 + 1 + offset); // Bottom Right
 }
 
-static void sub_81065DC(void)
+static void LoadInfoBoxTilemap(void)
 {
-    LoadBgTilemap(2, gUnknown_08DCEC70, 0x500, 0);
+    LoadBgTilemap(2, gSlotMachineInfoBox_Tilemap, 0x500, 0);
     HideBg(3);
 }
 
-static void SlotMachineSetup_9_0(void)
-{
-    gUnknown_03001188[0]  = sUnknown_0203AAF4;
-    gUnknown_03001188[1]  = sUnknown_0203AAF8;
-    gUnknown_03001188[2]  = sUnknown_0203AAFC;
-    gUnknown_03001188[3]  = sUnknown_0203AB04;
-    gUnknown_03001188[4]  = sUnknown_0203AB08;
-    gUnknown_03001188[5]  = sUnknown_0203AB18;
-    gUnknown_03001188[6]  = sUnknown_0203AB1C;
-    gUnknown_03001188[7]  = sUnknown_0203AB20;
-    gUnknown_03001188[8]  = sUnknown_0203AB24;
-    gUnknown_03001188[9]  = sUnknown_0203AB28;
-    gUnknown_03001188[10] = sUnknown_0203AB00;
-    gUnknown_03001188[11] = sUnknown_0203AB00;
-    gUnknown_03001188[12] = sUnknown_0203AB00;
-    gUnknown_03001188[13] = sUnknown_0203AB00;
-    gUnknown_03001188[14] = sUnknown_0203AB0C;
-    gUnknown_03001188[15] = sUnknown_0203AB0C;
-    gUnknown_03001188[16] = sUnknown_0203AB0C;
-    gUnknown_03001188[17] = sUnknown_0203AB0C;
-    gUnknown_03001188[18] = sUnknown_0203AB0C;
-    gUnknown_03001188[19] = sUnknown_0203AB10;
-    gUnknown_03001188[20] = sUnknown_0203AB10;
-    gUnknown_03001188[21] = sUnknown_0203AB10;
-    gUnknown_03001188[22] = sUnknown_0203AB14;
-    gUnknown_03001188[23] = sUnknown_0203AB14;
-    gUnknown_03001188[24] = sUnknown_0203AB14;
-    gUnknown_03001188[25] = NULL;
-}
-
-static void SlotMachineSetup_8_0(void)
-{
-    sUnknown_0203AAF4 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
-    sUnknown_0203AAF4[0].data = sUnknown_0203AAD4;
-    sUnknown_0203AAF4[0].size = 0x600;
-
-    sUnknown_0203AAF8 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
-    sUnknown_0203AAF8[0].data = sUnknown_0203AAD4 + 0x600;
-    sUnknown_0203AAF8[0].size = 0x200;
-
-    sUnknown_0203AAFC = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
-    sUnknown_0203AAFC[0].data = sUnknown_0203AAD4 + 0x800;
-    sUnknown_0203AAFC[0].size = 0x200;
-
-    sUnknown_0203AB00 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
-    sUnknown_0203AB00[0].data = sUnknown_0203AAD4 + 0xA00;
-    sUnknown_0203AB00[0].size = 0x200;
-
-    sUnknown_0203AB04 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
-    sUnknown_0203AB04[0].data = sUnknown_0203AAD4 + 0xC00;
-    sUnknown_0203AB04[0].size = 0x300;
-
-    sUnknown_0203AB08 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
-    sUnknown_0203AB08[0].data = sUnknown_0203AAD4 + 0x1000;
-    sUnknown_0203AB08[0].size = 0x400;
-
-    sUnknown_0203AB0C = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
-    sUnknown_0203AB0C[0].data = sUnknown_0203AAD4 + 0x1400;
-    sUnknown_0203AB0C[0].size = 0x200;
-
-    sUnknown_0203AB10 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
-    sUnknown_0203AB10[0].data = sUnknown_0203AAD4 + 0x1600;
-    sUnknown_0203AB10[0].size = 0x300;
-
-    sUnknown_0203AB14 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
-    sUnknown_0203AB14[0].data = sUnknown_0203AAD4 + 0x1900;
-    sUnknown_0203AB14[0].size = 0x300;
-
-    sUnknown_0203AB18 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2);
-    sUnknown_0203AB18[0].data = sUnknown_0203AAD4 + 0x1C00;
-    sUnknown_0203AB18[0].size = 0x200;
-    sUnknown_0203AB18[1].data = sUnknown_0203AAD4 + 0x1E00;
-    sUnknown_0203AB18[1].size = 0x200;
-
-    sUnknown_0203AB1C = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
-    sUnknown_0203AB1C[0].data = sUnknown_0203AAD4 + 0x2000;
-    sUnknown_0203AB1C[0].size = 640;
-
-    sUnknown_0203AB20 = AllocZeroed(sizeof(struct SpriteFrameImage) * 5);
-    sUnknown_0203AB20[0].data = sUnknown_0203AAD4 + 0x2280;
-    sUnknown_0203AB20[0].size = 0x80;
-    sUnknown_0203AB20[1].data = sUnknown_0203AAD4 + 0x2300;
-    sUnknown_0203AB20[1].size = 0x80;
-    sUnknown_0203AB20[2].data = sUnknown_0203AAD4 + 0x2380;
-    sUnknown_0203AB20[2].size = 0x80;
-    sUnknown_0203AB20[3].data = sUnknown_0203AAD4 + 0x2400;
-    sUnknown_0203AB20[3].size = 0x80;
-    sUnknown_0203AB20[4].data = sUnknown_0203AAD4 + 0x2480;
-    sUnknown_0203AB20[4].size = 0x80;
-
-    sUnknown_0203AB24 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2);
-    sUnknown_0203AB24[0].data = sUnknown_0203AAD4 + 0x2600;
-    sUnknown_0203AB24[0].size = 0x480;
-    sUnknown_0203AB24[1].data = sUnknown_0203AAD4 + 10880;
-    sUnknown_0203AB24[1].size = 0x480;
-
-    sUnknown_0203AB28 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2);
-    sUnknown_0203AB28[0].data = sUnknown_0203AAD4 + 0x2F00;
-    sUnknown_0203AB28[0].size = 0x180;
-    sUnknown_0203AB28[1].data = sUnknown_0203AAD4 + 0x3080;
-    sUnknown_0203AB28[1].size = 0x180;
-}
-
-static const u8 gReelSymbols[][REEL_NUM_TAGS] =
-{
-    {
-        SLOT_MACHINE_TAG_7_RED,
-        SLOT_MACHINE_TAG_CHERRY,
-        SLOT_MACHINE_TAG_AZURILL,
-        SLOT_MACHINE_TAG_REPLAY,
-        SLOT_MACHINE_TAG_POWER,
-        SLOT_MACHINE_TAG_LOTAD,
-        SLOT_MACHINE_TAG_7_BLUE,
-        SLOT_MACHINE_TAG_LOTAD,
-        SLOT_MACHINE_TAG_CHERRY,
-        SLOT_MACHINE_TAG_POWER,
-        SLOT_MACHINE_TAG_REPLAY,
-        SLOT_MACHINE_TAG_AZURILL,
-        SLOT_MACHINE_TAG_7_RED,
-        SLOT_MACHINE_TAG_POWER,
-        SLOT_MACHINE_TAG_LOTAD,
-        SLOT_MACHINE_TAG_REPLAY,
-        SLOT_MACHINE_TAG_AZURILL,
-        SLOT_MACHINE_TAG_7_BLUE,
-        SLOT_MACHINE_TAG_POWER,
-        SLOT_MACHINE_TAG_LOTAD,
-        SLOT_MACHINE_TAG_REPLAY
+static void SetDigitalDisplayImagePtrs(void)
+{
+    sImageTables_DigitalDisplay[DIG_SPRITE_REEL]      = sImageTable_DigitalDisplay_Reel;
+    sImageTables_DigitalDisplay[DIG_SPRITE_TIME]      = sImageTable_DigitalDisplay_Time;
+    sImageTables_DigitalDisplay[DIG_SPRITE_INSERT]    = sImageTable_DigitalDisplay_Insert;
+    sImageTables_DigitalDisplay[DIG_SPRITE_WIN]       = sImageTable_DigitalDisplay_Win;
+    sImageTables_DigitalDisplay[DIG_SPRITE_LOSE]      = sImageTable_DigitalDisplay_Lose;
+    sImageTables_DigitalDisplay[DIG_SPRITE_A_BUTTON]  = sImageTable_DigitalDisplay_AButton;
+    sImageTables_DigitalDisplay[DIG_SPRITE_SMOKE]     = sImageTable_DigitalDisplay_Smoke;
+    sImageTables_DigitalDisplay[DIG_SPRITE_NUMBER]    = sImageTable_DigitalDisplay_Number;
+    sImageTables_DigitalDisplay[DIG_SPRITE_POKE_BALL] = sImageTable_DigitalDisplay_Pokeball;
+    sImageTables_DigitalDisplay[DIG_SPRITE_D_PAD]     = sImageTable_DigitalDisplay_DPad;
+    sImageTables_DigitalDisplay[DIG_SPRITE_STOP_S]    = sImageTable_DigitalDisplay_Stop;
+    sImageTables_DigitalDisplay[DIG_SPRITE_STOP_T]    = sImageTable_DigitalDisplay_Stop;
+    sImageTables_DigitalDisplay[DIG_SPRITE_STOP_O]    = sImageTable_DigitalDisplay_Stop;
+    sImageTables_DigitalDisplay[DIG_SPRITE_STOP_P]    = sImageTable_DigitalDisplay_Stop;
+    sImageTables_DigitalDisplay[DIG_SPRITE_BONUS_B]   = sImageTable_DigitalDisplay_Bonus;
+    sImageTables_DigitalDisplay[DIG_SPRITE_BONUS_O]   = sImageTable_DigitalDisplay_Bonus;
+    sImageTables_DigitalDisplay[DIG_SPRITE_BONUS_N]   = sImageTable_DigitalDisplay_Bonus;
+    sImageTables_DigitalDisplay[DIG_SPRITE_BONUS_U]   = sImageTable_DigitalDisplay_Bonus;
+    sImageTables_DigitalDisplay[DIG_SPRITE_BONUS_S]   = sImageTable_DigitalDisplay_Bonus;
+    sImageTables_DigitalDisplay[DIG_SPRITE_BIG_B]     = sImageTable_DigitalDisplay_Big;
+    sImageTables_DigitalDisplay[DIG_SPRITE_BIG_I]     = sImageTable_DigitalDisplay_Big;
+    sImageTables_DigitalDisplay[DIG_SPRITE_BIG_G]     = sImageTable_DigitalDisplay_Big;
+    sImageTables_DigitalDisplay[DIG_SPRITE_REG_R]     = sImageTable_DigitalDisplay_Reg;
+    sImageTables_DigitalDisplay[DIG_SPRITE_REG_E]     = sImageTable_DigitalDisplay_Reg;
+    sImageTables_DigitalDisplay[DIG_SPRITE_REG_G]     = sImageTable_DigitalDisplay_Reg;
+    sImageTables_DigitalDisplay[DIG_SPRITE_EMPTY]     = NULL;
+}
+
+static void AllocDigitalDisplayGfx(void)
+{
+    sImageTable_DigitalDisplay_Reel = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
+    sImageTable_DigitalDisplay_Reel[0].data = sDigitalDisplayGfxPtr;
+    sImageTable_DigitalDisplay_Reel[0].size = 0x600;
+
+    sImageTable_DigitalDisplay_Time = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
+    sImageTable_DigitalDisplay_Time[0].data = sDigitalDisplayGfxPtr + 0x600;
+    sImageTable_DigitalDisplay_Time[0].size = 0x200;
+
+    sImageTable_DigitalDisplay_Insert = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
+    sImageTable_DigitalDisplay_Insert[0].data = sDigitalDisplayGfxPtr + 0x800;
+    sImageTable_DigitalDisplay_Insert[0].size = 0x200;
+
+    sImageTable_DigitalDisplay_Stop = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
+    sImageTable_DigitalDisplay_Stop[0].data = sDigitalDisplayGfxPtr + 0xA00;
+    sImageTable_DigitalDisplay_Stop[0].size = 0x200;
+
+    sImageTable_DigitalDisplay_Win = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
+    sImageTable_DigitalDisplay_Win[0].data = sDigitalDisplayGfxPtr + 0xC00;
+    sImageTable_DigitalDisplay_Win[0].size = 0x300;
+
+    sImageTable_DigitalDisplay_Lose = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
+    sImageTable_DigitalDisplay_Lose[0].data = sDigitalDisplayGfxPtr + 0x1000;
+    sImageTable_DigitalDisplay_Lose[0].size = 0x400;
+
+    sImageTable_DigitalDisplay_Bonus = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
+    sImageTable_DigitalDisplay_Bonus[0].data = sDigitalDisplayGfxPtr + 0x1400;
+    sImageTable_DigitalDisplay_Bonus[0].size = 0x200;
+
+    sImageTable_DigitalDisplay_Big = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
+    sImageTable_DigitalDisplay_Big[0].data = sDigitalDisplayGfxPtr + 0x1600;
+    sImageTable_DigitalDisplay_Big[0].size = 0x300;
+
+    sImageTable_DigitalDisplay_Reg = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
+    sImageTable_DigitalDisplay_Reg[0].data = sDigitalDisplayGfxPtr + 0x1900;
+    sImageTable_DigitalDisplay_Reg[0].size = 0x300;
+
+    sImageTable_DigitalDisplay_AButton = AllocZeroed(sizeof(struct SpriteFrameImage) * 2);
+    sImageTable_DigitalDisplay_AButton[0].data = sDigitalDisplayGfxPtr + 0x1C00;
+    sImageTable_DigitalDisplay_AButton[0].size = 0x200;
+    sImageTable_DigitalDisplay_AButton[1].data = sDigitalDisplayGfxPtr + 0x1E00;
+    sImageTable_DigitalDisplay_AButton[1].size = 0x200;
+
+    sImageTable_DigitalDisplay_Smoke = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
+    sImageTable_DigitalDisplay_Smoke[0].data = sDigitalDisplayGfxPtr + 0x2000;
+    sImageTable_DigitalDisplay_Smoke[0].size = 640;
+
+    sImageTable_DigitalDisplay_Number = AllocZeroed(sizeof(struct SpriteFrameImage) * 5);
+    sImageTable_DigitalDisplay_Number[0].data = sDigitalDisplayGfxPtr + 0x2280;
+    sImageTable_DigitalDisplay_Number[0].size = 0x80;
+    sImageTable_DigitalDisplay_Number[1].data = sDigitalDisplayGfxPtr + 0x2300;
+    sImageTable_DigitalDisplay_Number[1].size = 0x80;
+    sImageTable_DigitalDisplay_Number[2].data = sDigitalDisplayGfxPtr + 0x2380;
+    sImageTable_DigitalDisplay_Number[2].size = 0x80;
+    sImageTable_DigitalDisplay_Number[3].data = sDigitalDisplayGfxPtr + 0x2400;
+    sImageTable_DigitalDisplay_Number[3].size = 0x80;
+    sImageTable_DigitalDisplay_Number[4].data = sDigitalDisplayGfxPtr + 0x2480;
+    sImageTable_DigitalDisplay_Number[4].size = 0x80;
+
+    sImageTable_DigitalDisplay_Pokeball = AllocZeroed(sizeof(struct SpriteFrameImage) * 2);
+    sImageTable_DigitalDisplay_Pokeball[0].data = sDigitalDisplayGfxPtr + 0x2600;
+    sImageTable_DigitalDisplay_Pokeball[0].size = 0x480;
+    sImageTable_DigitalDisplay_Pokeball[1].data = sDigitalDisplayGfxPtr + 10880;
+    sImageTable_DigitalDisplay_Pokeball[1].size = 0x480;
+
+    sImageTable_DigitalDisplay_DPad = AllocZeroed(sizeof(struct SpriteFrameImage) * 2);
+    sImageTable_DigitalDisplay_DPad[0].data = sDigitalDisplayGfxPtr + 0x2F00;
+    sImageTable_DigitalDisplay_DPad[0].size = 0x180;
+    sImageTable_DigitalDisplay_DPad[1].data = sDigitalDisplayGfxPtr + 0x3080;
+    sImageTable_DigitalDisplay_DPad[1].size = 0x180;
+}
+
+static const u8 sReelSymbolTileTags[NUM_REELS][SYMBOLS_PER_REEL] =
+{
+    [LEFT_REEL] = {
+        GFXTAG_7_RED,
+        GFXTAG_CHERRY,
+        GFXTAG_AZURILL,
+        GFXTAG_REPLAY,
+        GFXTAG_POWER,
+        GFXTAG_LOTAD,
+        GFXTAG_7_BLUE,
+        GFXTAG_LOTAD,
+        GFXTAG_CHERRY,
+        GFXTAG_POWER,
+        GFXTAG_REPLAY,
+        GFXTAG_AZURILL,
+        GFXTAG_7_RED,
+        GFXTAG_POWER,
+        GFXTAG_LOTAD,
+        GFXTAG_REPLAY,
+        GFXTAG_AZURILL,
+        GFXTAG_7_BLUE,
+        GFXTAG_POWER,
+        GFXTAG_LOTAD,
+        GFXTAG_REPLAY
     },
-    {
-        SLOT_MACHINE_TAG_7_RED,
-        SLOT_MACHINE_TAG_CHERRY,
-        SLOT_MACHINE_TAG_REPLAY,
-        SLOT_MACHINE_TAG_LOTAD,
-        SLOT_MACHINE_TAG_AZURILL,
-        SLOT_MACHINE_TAG_CHERRY,
-        SLOT_MACHINE_TAG_REPLAY,
-        SLOT_MACHINE_TAG_POWER,
-        SLOT_MACHINE_TAG_POWER,
-        SLOT_MACHINE_TAG_LOTAD,
-        SLOT_MACHINE_TAG_7_BLUE,
-        SLOT_MACHINE_TAG_LOTAD,
-        SLOT_MACHINE_TAG_REPLAY,
-        SLOT_MACHINE_TAG_CHERRY,
-        SLOT_MACHINE_TAG_AZURILL,
-        SLOT_MACHINE_TAG_LOTAD,
-        SLOT_MACHINE_TAG_REPLAY,
-        SLOT_MACHINE_TAG_CHERRY,
-        SLOT_MACHINE_TAG_LOTAD,
-        SLOT_MACHINE_TAG_REPLAY,
-        SLOT_MACHINE_TAG_CHERRY
+    [MIDDLE_REEL] = {
+        GFXTAG_7_RED,
+        GFXTAG_CHERRY,
+        GFXTAG_REPLAY,
+        GFXTAG_LOTAD,
+        GFXTAG_AZURILL,
+        GFXTAG_CHERRY,
+        GFXTAG_REPLAY,
+        GFXTAG_POWER,
+        GFXTAG_POWER,
+        GFXTAG_LOTAD,
+        GFXTAG_7_BLUE,
+        GFXTAG_LOTAD,
+        GFXTAG_REPLAY,
+        GFXTAG_CHERRY,
+        GFXTAG_AZURILL,
+        GFXTAG_LOTAD,
+        GFXTAG_REPLAY,
+        GFXTAG_CHERRY,
+        GFXTAG_LOTAD,
+        GFXTAG_REPLAY,
+        GFXTAG_CHERRY
     },
-    {
-        SLOT_MACHINE_TAG_7_RED,
-        SLOT_MACHINE_TAG_POWER,
-        SLOT_MACHINE_TAG_7_BLUE,
-        SLOT_MACHINE_TAG_REPLAY,
-        SLOT_MACHINE_TAG_LOTAD,
-        SLOT_MACHINE_TAG_AZURILL,
-        SLOT_MACHINE_TAG_REPLAY,
-        SLOT_MACHINE_TAG_LOTAD,
-        SLOT_MACHINE_TAG_POWER,
-        SLOT_MACHINE_TAG_AZURILL,
-        SLOT_MACHINE_TAG_REPLAY,
-        SLOT_MACHINE_TAG_LOTAD,
-        SLOT_MACHINE_TAG_AZURILL,
-        SLOT_MACHINE_TAG_POWER,
-        SLOT_MACHINE_TAG_REPLAY,
-        SLOT_MACHINE_TAG_LOTAD,
-        SLOT_MACHINE_TAG_AZURILL,
-        SLOT_MACHINE_TAG_POWER,
-        SLOT_MACHINE_TAG_REPLAY,
-        SLOT_MACHINE_TAG_LOTAD,
-        SLOT_MACHINE_TAG_CHERRY
+    [RIGHT_REEL] = {
+        GFXTAG_7_RED,
+        GFXTAG_POWER,
+        GFXTAG_7_BLUE,
+        GFXTAG_REPLAY,
+        GFXTAG_LOTAD,
+        GFXTAG_AZURILL,
+        GFXTAG_REPLAY,
+        GFXTAG_LOTAD,
+        GFXTAG_POWER,
+        GFXTAG_AZURILL,
+        GFXTAG_REPLAY,
+        GFXTAG_LOTAD,
+        GFXTAG_AZURILL,
+        GFXTAG_POWER,
+        GFXTAG_REPLAY,
+        GFXTAG_LOTAD,
+        GFXTAG_AZURILL,
+        GFXTAG_POWER,
+        GFXTAG_REPLAY,
+        GFXTAG_LOTAD,
+        GFXTAG_CHERRY
     },
 };
 
-static const u8 gReelTimeTags[] = {
+static const u8 sReelTimeTags[] = {
     1, 0, 5, 4, 3, 2
 };
 
-static const s16 gInitialReelPositions[][2] = {
-    {0,  6},
-    {0, 10},
-    {0,  2}
+static const s16 sInitialReelPositions[NUM_REELS][2] = {
+    [LEFT_REEL]   = {0,  6},
+    [MIDDLE_REEL] = {0, 10},
+    [RIGHT_REEL]  = {0,  2}
 };
 
-static const u8 gLuckyRoundProbabilities[][3] = {
+static const u8 sLuckyRoundProbabilities[][3] = {
     {1, 1, 12},
     {1, 1, 14},
     {2, 2, 14},
@@ -4461,13 +4816,13 @@ static const u8 gLuckyRoundProbabilities[][3] = {
     {3, 3, 16}
 };
 
-static const u8 gLuckyFlagProbabilities_Top3[][6] = {
+static const u8 sLuckyFlagProbabilities_Top3[][6] = {
     {25, 25, 30, 40, 40, 50},
     {25, 25, 30, 30, 35, 35},
     {25, 25, 30, 25, 25, 30}
 };
 
-static const u8 gLuckyFlagProbabilities_NotTop3[][6] = {
+static const u8 sLuckyFlagProbabilities_NotTop3[][6] = {
     {20, 25, 25, 20, 25, 25},
     {12, 15, 15, 18, 19, 22},
     {25, 25, 25, 30, 30, 40},
@@ -4475,7 +4830,7 @@ static const u8 gLuckyFlagProbabilities_NotTop3[][6] = {
     {40, 40, 35, 35, 40, 40}
 };
 
-static const u8 gReeltimeProbabilities_UnluckyGame[][17] = {
+static const u8 sReeltimeProbabilities_UnluckyGame[][17] = {
     {243, 243, 243,  80,  80,  80,  80,  40,  40,  40,  40,  40,  40,   5,   5,   5,   5},
     {  5,   5,   5, 150, 150, 150, 150, 130, 130, 130, 130, 130, 130, 100, 100, 100,   5},
     {  4,   4,   4,  20,  20,  20,  20,  80,  80,  80,  80,  80,  80, 100, 100, 100,  40},
@@ -4484,7 +4839,7 @@ static const u8 gReeltimeProbabilities_UnluckyGame[][17] = {
     {  1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   6}
 };
 
-static const u8 gReelTimeProbabilities_LuckyGame[][17] = {
+static const u8 sReelTimeProbabilities_LuckyGame[][17] = {
     { 243, 243, 243, 200, 200, 200, 200, 160, 160, 160, 160, 160, 160,  70,  70,  70,   5},
     {   5,   5,   5,  25,  25,  25,  25,   5,   5,   5,   5,   5,   5,   2,   2,   2,   6},
     {   4,   4,   4,  25,  25,  25,  25,  30,  30,  30,  30,  30,  30,  40,  40,  40,  35},
@@ -4493,11 +4848,11 @@ static const u8 gReelTimeProbabilities_LuckyGame[][17] = {
     {   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   4,   4,   4,  60}
 };
 
-static const u16 gProbabilityTable_SkipToReeltimeAction14[] = {
+static const u16 sReelTimeExplodeProbability[] = {
     128, 175, 200, 225, 256
 };
 
-static const u16 gReelIncrementTable[][2] = {
+static const u16 sReelIncrementTable[][2] = {
     {10,  5},
     {10, 10},
     {10, 15},
@@ -4505,211 +4860,219 @@ static const u16 gReelIncrementTable[][2] = {
     {10, 35}
 };
 
-static const u16 gReelTimeBonusIncrementTable[] = {
+static const u16 sReelTimeBonusIncrementTable[] = {
     0, 5, 10, 15, 20
 };
 
 // tentative name
-static const u8 gBiasTags[] = {
-  SLOT_MACHINE_TAG_REPLAY, SLOT_MACHINE_TAG_CHERRY, SLOT_MACHINE_TAG_LOTAD, SLOT_MACHINE_TAG_AZURILL, SLOT_MACHINE_TAG_POWER, SLOT_MACHINE_TAG_7_RED, SLOT_MACHINE_TAG_7_RED, SLOT_MACHINE_TAG_7_RED
+static const u8 sBiasTags[] = {
+  GFXTAG_REPLAY, GFXTAG_CHERRY, GFXTAG_LOTAD, GFXTAG_AZURILL, GFXTAG_POWER, GFXTAG_7_RED, GFXTAG_7_RED, GFXTAG_7_RED
 };
 
-static const u16 gLuckyFlagSettings_Top3[] = {
+static const u16 sLuckyFlagSettings_Top3[] = {
     LUCKY_BIAS_777, LUCKY_BIAS_REELTIME, LUCKY_BIAS_MIXED_777
 };
 
-static const u16 gLuckyFlagSettings_NotTop3[] = {
+static const u16 sLuckyFlagSettings_NotTop3[] = {
     LUCKY_BIAS_POWER, LUCKY_BIAS_AZURILL, LUCKY_BIAS_LOTAD, LUCKY_BIAS_CHERRY, LUCKY_BIAS_REPLAY
 };
 
-static const u8 gSym2Match[] = {
-    SLOT_MACHINE_MATCHED_777_RED,
-    SLOT_MACHINE_MATCHED_777_BLUE,
-    SLOT_MACHINE_MATCHED_AZURILL,
-    SLOT_MACHINE_MATCHED_LOTAD,
-    SLOT_MACHINE_MATCHED_1CHERRY,
-    SLOT_MACHINE_MATCHED_POWER,
-    SLOT_MACHINE_MATCHED_REPLAY
-};
-
-static const u16 gSlotMatchFlags[] = {
-    1 << SLOT_MACHINE_MATCHED_1CHERRY,
-    1 << SLOT_MACHINE_MATCHED_2CHERRY,
-    1 << SLOT_MACHINE_MATCHED_REPLAY,
-    1 << SLOT_MACHINE_MATCHED_LOTAD,
-    1 << SLOT_MACHINE_MATCHED_AZURILL,
-    1 << SLOT_MACHINE_MATCHED_POWER,
-    1 << SLOT_MACHINE_MATCHED_777_MIXED,
-    1 << SLOT_MACHINE_MATCHED_777_RED,
-    1 << SLOT_MACHINE_MATCHED_777_BLUE
-};
-
-static const u16 gSlotPayouts[] = {
-    2, 4, 0, 6, 12, 3, 90, 300, 300
-};
-
-static const s16 gUnknown_083ECE7E[][2] = {
-    { 0xd0, 0x38},
-    { 0xb8, 0x00},
-    { 0xc8, 0x08},
-    { 0xd8, 0x10},
-    { 0xe8, 0x18},
-    { 0xd0, 0x48},
-    { 0xd0, 0x08},
-    { 0xd0, 0x40},
-    { 0xd0, 0x38},
-    { 0xc0, 0x58},
-    { 0xe0, 0x58},
-    { 0xc0, 0x78},
-    { 0xe0, 0x78},
-    { 0x90, 0x38},
-    {0x110, 0x58},
-    { 0xa8, 0x70},
-    { 0xd0, 0x54},
-    { 0xd0, 0x70},
-    { 0xbc, 0x34},
-    { 0xd0, 0x34},
-    { 0xe4, 0x34},
-    { 0xb8, 0x48},
-    { 0xc4, 0x48},
-    { 0xd0, 0x48},
-    { 0xdc, 0x48},
-    { 0xe8, 0x48},
-    { 0xbc, 0x34},
-    { 0xd0, 0x34},
-    { 0xe4, 0x34},
-    { 0xb8, 0x48},
-    { 0xc4, 0x48},
-    { 0xd0, 0x48},
-    { 0xdc, 0x48},
-    { 0xe8, 0x48},
-    { 0x00, 0x00}
-};
-
-static const SpriteCallback gUnknown_083ECF0C[] = {
-    sub_8105C64,
-    sub_8105F54,
-    sub_8105F54,
-    sub_8105F54,
-    sub_8105F54,
-    sub_8105F9C,
-    sub_8105EB4,
-    sub_8105C64,
-    sub_8105C64,
-    sub_8105C6C,
-    sub_8105CF0,
-    sub_8105D08,
-    sub_8105D20,
-    sub_8105D3C,
-    sub_8105DA4,
-    sub_8105E08,
-    sub_8105C64,
-    sub_8106058,
-    sub_81060FC,
-    sub_81060FC,
-    sub_81060FC,
-    sub_81060FC,
-    sub_81060FC,
-    sub_81060FC,
-    sub_81060FC,
-    sub_81060FC,
-    sub_81061C8,
-    sub_81061C8,
-    sub_81061C8,
-    sub_81061C8,
-    sub_81061C8,
-    sub_81061C8,
-    sub_81061C8,
-    sub_81061C8,
-    sub_8106230
-};
-
-static const struct UnkStruct1 Unknown_83ECF98[] = {
-    {25, 34, 0},
-    {2, 0, 0},
-    {9, 16, 0},
-    {255, 0, 0}
-};
-
-static const struct UnkStruct1 Unknown_83ECFA8[] = {
-    {10, 1, 0},
-    {11, 2, 0},
-    {12, 3, 0},
-    {13, 4, 0},
-    {5, 5, 0},
-    {8, 6, 0},
-    {255, 0, 0}
-};
-
-static const struct UnkStruct1 Unknown_83ECFC4[] = {
-    {3, 7, 0},
-    {8, 17, 0},
-    {255, 0, 0}
-};
-
-static const struct UnkStruct1 Unknown_83ECFD0[] = {
-    {4, 8, 0},
-    {6, 9, 0},
-    {6, 10, 1},
-    {6, 11, 2},
-    {6, 12, 3},
-    {255, 0, 0}
-};
-
-static const struct UnkStruct1 Unknown_83ECFE8[] = {
-    {0, 13, 0},
-    {1, 14, 0},
-    {7, 15, 0},
-    {255, 0, 0}
-};
-
-static const struct UnkStruct1 Unknown_83ECFF8[] = {
-    {19, 26, 0},
-    {20, 27, 1},
-    {21, 28, 2},
-    {14, 29, 3},
-    {15, 30, 4},
-    {16, 31, 5},
-    {17, 32, 6},
-    {18, 33, 7},
-    {8, 17, 0},
-    {255, 0, 0}
-};
-
-static const struct UnkStruct1 Unknown_83ED020[] = {
-    {22, 18, 0},
-    {23, 19, 1},
-    {24, 20, 2},
-    {14, 21, 3},
-    {15, 22, 4},
-    {16, 23, 5},
-    {17, 24, 6},
-    {18, 25, 7},
-    {8, 17, 0},
-    {255, 0, 0}
-};
-
-static const struct UnkStruct1 *const gUnknown_083ED048[] = {
-    Unknown_83ECF98,
-    Unknown_83ECFA8,
-    Unknown_83ECFC4,
-    Unknown_83ECFD0,
-    Unknown_83ECFE8,
-    Unknown_83ED020,
-    Unknown_83ECFF8
-};
-
-static void (*const gUnknown_083ED064[])(void) = {
-    sub_810639C,
-    sub_8106364,
-    sub_8106370,
-    nullsub_70,
-    nullsub_70,
-    sub_8106370,
-    sub_8106370
-};
-
-static const struct OamData gUnknown_085A7A3C = 
+static const u8 sSymToMatch[] = {
+    [GFXTAG_7_RED]   = MATCHED_777_RED,
+    [GFXTAG_7_BLUE]  = MATCHED_777_BLUE,
+    [GFXTAG_AZURILL] = MATCHED_AZURILL,
+    [GFXTAG_LOTAD]   = MATCHED_LOTAD,
+    [GFXTAG_CHERRY]  = MATCHED_1CHERRY,
+    [GFXTAG_POWER]   = MATCHED_POWER,
+    [GFXTAG_REPLAY]  = MATCHED_REPLAY
+};
+
+static const u16 sSlotMatchFlags[] = {
+    [MATCHED_1CHERRY]   = 1 << MATCHED_1CHERRY,
+    [MATCHED_2CHERRY]   = 1 << MATCHED_2CHERRY,
+    [MATCHED_REPLAY]    = 1 << MATCHED_REPLAY,
+    [MATCHED_LOTAD]     = 1 << MATCHED_LOTAD,
+    [MATCHED_AZURILL]   = 1 << MATCHED_AZURILL,
+    [MATCHED_POWER]     = 1 << MATCHED_POWER,
+    [MATCHED_777_MIXED] = 1 << MATCHED_777_MIXED,
+    [MATCHED_777_RED]   = 1 << MATCHED_777_RED,
+    [MATCHED_777_BLUE]  = 1 << MATCHED_777_BLUE
+};
+
+static const u16 sSlotPayouts[] = {
+    [MATCHED_1CHERRY]   = 2, 
+    [MATCHED_2CHERRY]   = 4, 
+    [MATCHED_REPLAY]    = 0, 
+    [MATCHED_LOTAD]     = 6, 
+    [MATCHED_AZURILL]   = 12, 
+    [MATCHED_POWER]     = 3, 
+    [MATCHED_777_MIXED] = 90, 
+    [MATCHED_777_RED]   = 300, 
+    [MATCHED_777_BLUE]  = 300
+};
+
+static const s16 sDigitalDisplay_SpriteCoords[][2] = {
+    [DIG_DISPINFO_INSERT] = { 208, 56},
+    [DIG_DISPINFO_STOP_S] = { 184,  0},
+    [DIG_DISPINFO_STOP_T] = { 200,  8},
+    [DIG_DISPINFO_STOP_O] = { 216, 16},
+    [DIG_DISPINFO_STOP_P] = { 232, 24},
+    [DIG_DISPINFO_A_BUTTON_STOP] = { 208, 72},
+    [DIG_DISPINFO_POKE_BALL_ROCKING] = { 208, 8},
+    [DIG_DISPINFO_WIN] = { 208, 64},
+    [DIG_DISPINFO_LOSE] = { 208, 56},
+    [DIG_DISPINFO_SMOKE_NW] = { 192,  88},
+    [DIG_DISPINFO_SMOKE_NE] = { 224,  88},
+    [DIG_DISPINFO_SMOKE_SW] = { 192, 120},
+    [DIG_DISPINFO_SMOKE_SE] = { 224, 120},
+    [DIG_DISPINFO_REEL] = { 144, 56},
+    [DIG_DISPINFO_TIME] = { 272, 88},
+    [DIG_DISPINFO_NUMBER] = { 168, 112},
+    [DIG_DISPINFO_DPAD] = { 208, 84},
+    [DIG_DISPINFO_POKE_BALL_SHINING] = { 208, 112},
+    [DIG_DISPINFO_REG_R] = { 188, 52},
+    [DIG_DISPINFO_REG_E] = { 208, 52},
+    [DIG_DISPINFO_REG_G] = { 228, 52},
+    [DIG_DISPINFO_REG_BONUS_B] = { 184, 72},
+    [DIG_DISPINFO_REG_BONUS_O] = { 196, 72},
+    [DIG_DISPINFO_REG_BONUS_N] = { 208, 72},
+    [DIG_DISPINFO_REG_BONUS_U] = { 220, 72},
+    [DIG_DISPINFO_REG_BONUS_S] = { 232, 72},
+    [DIG_DISPINFO_BIG_B] = { 188, 52},
+    [DIG_DISPINFO_BIG_I] = { 208, 52},
+    [DIG_DISPINFO_BIG_G] = { 228, 52},
+    [DIG_DISPINFO_BIG_BONUS_B] = { 184, 72},
+    [DIG_DISPINFO_BIG_BONUS_O] = { 196, 72},
+    [DIG_DISPINFO_BIG_BONUS_N] = { 208, 72},
+    [DIG_DISPINFO_BIG_BONUS_U] = { 220, 72},
+    [DIG_DISPINFO_BIG_BONUS_S] = { 232, 72},
+    [DIG_DISPINFO_A_BUTTON_START] = { 0, 0} // Initially offscreen
+};
+
+static const SpriteCallback sDigitalDisplay_SpriteCallbacks[] = {
+    [DIG_DISPINFO_INSERT]            = SpriteCB_DigitalDisplay_Static,
+    [DIG_DISPINFO_STOP_S]            = SpriteCB_DigitalDisplay_Stop,
+    [DIG_DISPINFO_STOP_T]            = SpriteCB_DigitalDisplay_Stop,
+    [DIG_DISPINFO_STOP_O]            = SpriteCB_DigitalDisplay_Stop,
+    [DIG_DISPINFO_STOP_P]            = SpriteCB_DigitalDisplay_Stop,
+    [DIG_DISPINFO_A_BUTTON_STOP]     = SpriteCB_DigitalDisplay_AButtonStop,
+    [DIG_DISPINFO_POKE_BALL_ROCKING] = SpriteCB_DigitalDisplay_PokeballRocking,
+    [DIG_DISPINFO_WIN]               = SpriteCB_DigitalDisplay_Static,
+    [DIG_DISPINFO_LOSE]              = SpriteCB_DigitalDisplay_Static,
+    [DIG_DISPINFO_SMOKE_NW]          = SpriteCB_DigitalDisplay_Smoke,
+    [DIG_DISPINFO_SMOKE_NE]          = SpriteCB_DigitalDisplay_SmokeNE,
+    [DIG_DISPINFO_SMOKE_SW]          = SpriteCB_DigitalDisplay_SmokeSW,
+    [DIG_DISPINFO_SMOKE_SE]          = SpriteCB_DigitalDisplay_SmokeSE,
+    [DIG_DISPINFO_REEL]              = SpriteCB_DigitalDisplay_Reel,
+    [DIG_DISPINFO_TIME]              = SpriteCB_DigitalDisplay_Time,
+    [DIG_DISPINFO_NUMBER]            = SpriteCB_DigitalDisplay_ReelTimeNumber,
+    [DIG_DISPINFO_DPAD]              = SpriteCB_DigitalDisplay_Static,
+    [DIG_DISPINFO_POKE_BALL_SHINING] = SpriteCB_DigitalDisplay_PokeballShining,
+    [DIG_DISPINFO_REG_R]             = SpriteCB_DigitalDisplay_RegBonus,
+    [DIG_DISPINFO_REG_E]             = SpriteCB_DigitalDisplay_RegBonus,
+    [DIG_DISPINFO_REG_G]             = SpriteCB_DigitalDisplay_RegBonus,
+    [DIG_DISPINFO_REG_BONUS_B]       = SpriteCB_DigitalDisplay_RegBonus,
+    [DIG_DISPINFO_REG_BONUS_O]       = SpriteCB_DigitalDisplay_RegBonus,
+    [DIG_DISPINFO_REG_BONUS_N]       = SpriteCB_DigitalDisplay_RegBonus,
+    [DIG_DISPINFO_REG_BONUS_U]       = SpriteCB_DigitalDisplay_RegBonus,
+    [DIG_DISPINFO_REG_BONUS_S]       = SpriteCB_DigitalDisplay_RegBonus,
+    [DIG_DISPINFO_BIG_B]             = SpriteCB_DigitalDisplay_BigBonus,
+    [DIG_DISPINFO_BIG_I]             = SpriteCB_DigitalDisplay_BigBonus,
+    [DIG_DISPINFO_BIG_G]             = SpriteCB_DigitalDisplay_BigBonus,
+    [DIG_DISPINFO_BIG_BONUS_B]       = SpriteCB_DigitalDisplay_BigBonus,
+    [DIG_DISPINFO_BIG_BONUS_O]       = SpriteCB_DigitalDisplay_BigBonus,
+    [DIG_DISPINFO_BIG_BONUS_N]       = SpriteCB_DigitalDisplay_BigBonus,
+    [DIG_DISPINFO_BIG_BONUS_U]       = SpriteCB_DigitalDisplay_BigBonus,
+    [DIG_DISPINFO_BIG_BONUS_S]       = SpriteCB_DigitalDisplay_BigBonus,
+    [DIG_DISPINFO_A_BUTTON_START]    = SpriteCB_DigitalDisplay_AButtonStart
+};
+
+static const struct DigitalDisplaySprite sDigitalDisplay_InsertBet[] = {
+    {DIG_SPRITE_EMPTY, DIG_DISPINFO_A_BUTTON_START, 0}, // Sprite replaced with DIG_SPRITE_A_BUTTON after first bet
+    {DIG_SPRITE_INSERT, DIG_DISPINFO_INSERT, 0},
+    {DIG_SPRITE_D_PAD, DIG_DISPINFO_DPAD, 0},
+    DIG_SPRITE_DUMMY
+};
+
+static const struct DigitalDisplaySprite sDigitalDisplay_StopReel[] = {
+    {DIG_SPRITE_STOP_S, DIG_DISPINFO_STOP_S, 0},
+    {DIG_SPRITE_STOP_T, DIG_DISPINFO_STOP_T, 0},
+    {DIG_SPRITE_STOP_O, DIG_DISPINFO_STOP_O, 0},
+    {DIG_SPRITE_STOP_P, DIG_DISPINFO_STOP_P, 0},
+    {DIG_SPRITE_A_BUTTON, DIG_DISPINFO_A_BUTTON_STOP, 0},
+    {DIG_SPRITE_POKE_BALL, DIG_DISPINFO_POKE_BALL_ROCKING, 0},
+    DIG_SPRITE_DUMMY
+};
+
+static const struct DigitalDisplaySprite sDigitalDisplay_Win[] = {
+    {DIG_SPRITE_WIN, DIG_DISPINFO_WIN, 0},
+    {DIG_SPRITE_POKE_BALL, DIG_DISPINFO_POKE_BALL_SHINING, 0},
+    DIG_SPRITE_DUMMY
+};
+
+static const struct DigitalDisplaySprite sDigitalDisplay_Lose[] = {
+    {DIG_SPRITE_LOSE, DIG_DISPINFO_LOSE, 0},
+    {DIG_SPRITE_SMOKE, DIG_DISPINFO_SMOKE_NW, 0},
+    {DIG_SPRITE_SMOKE, DIG_DISPINFO_SMOKE_NE, 1},
+    {DIG_SPRITE_SMOKE, DIG_DISPINFO_SMOKE_SW, 2},
+    {DIG_SPRITE_SMOKE, DIG_DISPINFO_SMOKE_SE, 3},
+    DIG_SPRITE_DUMMY
+};
+
+static const struct DigitalDisplaySprite sDigitalDisplay_ReelTime[] = {
+    {DIG_SPRITE_REEL, DIG_DISPINFO_REEL, 0},
+    {DIG_SPRITE_TIME, DIG_DISPINFO_TIME, 0},
+    {DIG_SPRITE_NUMBER, DIG_DISPINFO_NUMBER, 0}, // Number of reel time spins left
+    DIG_SPRITE_DUMMY
+};
+
+static const struct DigitalDisplaySprite sDigitalDisplay_BonusBig[] = {
+    {DIG_SPRITE_BIG_B, DIG_DISPINFO_BIG_B, 0},
+    {DIG_SPRITE_BIG_I, DIG_DISPINFO_BIG_I, 1},
+    {DIG_SPRITE_BIG_G, DIG_DISPINFO_BIG_G, 2},
+    {DIG_SPRITE_BONUS_B, DIG_DISPINFO_BIG_BONUS_B, 3},
+    {DIG_SPRITE_BONUS_O, DIG_DISPINFO_BIG_BONUS_O, 4},
+    {DIG_SPRITE_BONUS_N, DIG_DISPINFO_BIG_BONUS_N, 5},
+    {DIG_SPRITE_BONUS_U, DIG_DISPINFO_BIG_BONUS_U, 6},
+    {DIG_SPRITE_BONUS_S, DIG_DISPINFO_BIG_BONUS_S, 7},
+    {DIG_SPRITE_POKE_BALL, DIG_DISPINFO_POKE_BALL_SHINING, 0},
+    DIG_SPRITE_DUMMY
+};
+
+static const struct DigitalDisplaySprite sDigitalDisplay_BonusRegular[] = {
+    {DIG_SPRITE_REG_R, DIG_DISPINFO_REG_R, 0},
+    {DIG_SPRITE_REG_E, DIG_DISPINFO_REG_E, 1},
+    {DIG_SPRITE_REG_G, DIG_DISPINFO_REG_G, 2},
+    {DIG_SPRITE_BONUS_B, DIG_DISPINFO_REG_BONUS_B, 3},
+    {DIG_SPRITE_BONUS_O, DIG_DISPINFO_REG_BONUS_O, 4},
+    {DIG_SPRITE_BONUS_N, DIG_DISPINFO_REG_BONUS_N, 5},
+    {DIG_SPRITE_BONUS_U, DIG_DISPINFO_REG_BONUS_U, 6},
+    {DIG_SPRITE_BONUS_S, DIG_DISPINFO_REG_BONUS_S, 7},
+    {DIG_SPRITE_POKE_BALL, DIG_DISPINFO_POKE_BALL_SHINING, 0},
+    DIG_SPRITE_DUMMY
+};
+
+static const struct DigitalDisplaySprite *const sDigitalDisplayScenes[] = {
+    [DIG_DISPLAY_INSERT_BET] = sDigitalDisplay_InsertBet,
+    [DIG_DISPLAY_STOP_REEL]  = sDigitalDisplay_StopReel,
+    [DIG_DISPLAY_WIN]        = sDigitalDisplay_Win,
+    [DIG_DISPLAY_LOSE]       = sDigitalDisplay_Lose,
+    [DIG_DISPLAY_REEL_TIME]  = sDigitalDisplay_ReelTime,
+    [DIG_DISPLAY_BONUS_REG]  = sDigitalDisplay_BonusRegular,
+    [DIG_DISPLAY_BONUS_BIG]  = sDigitalDisplay_BonusBig
+};
+
+static void (*const sDigitalDisplaySceneExitCallbacks[])(void) = {
+    [DIG_DISPLAY_INSERT_BET] = EndDigitalDisplayScene_InsertBet,
+    [DIG_DISPLAY_STOP_REEL]  = EndDigitalDisplayScene_StopReel,
+    [DIG_DISPLAY_WIN]        = EndDigitalDisplayScene_Win,
+    [DIG_DISPLAY_LOSE]       = EndDigitalDisplayScene_Dummy,
+    [DIG_DISPLAY_REEL_TIME]  = EndDigitalDisplayScene_Dummy,
+    [DIG_DISPLAY_BONUS_REG]  = EndDigitalDisplayScene_Win,
+    [DIG_DISPLAY_BONUS_BIG]  = EndDigitalDisplayScene_Win
+};
+
+static const struct OamData sOam_8x8 = 
 {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
@@ -4726,7 +5089,7 @@ static const struct OamData gUnknown_085A7A3C =
     .affineParam = 0,
 };
 
-static const struct OamData gUnknown_085A7A44 =
+static const struct OamData sOam_8x16 =
 {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
@@ -4743,7 +5106,7 @@ static const struct OamData gUnknown_085A7A44 =
     .affineParam = 0,
 };
 
-static const struct OamData gUnknown_085A7A4C =
+static const struct OamData sOam_16x16 =
 {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
@@ -4760,7 +5123,7 @@ static const struct OamData gUnknown_085A7A4C =
     .affineParam = 0,
 };
 
-static const struct OamData gUnknown_085A7A54 =
+static const struct OamData sOam_16x32 =
 {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
@@ -4777,7 +5140,7 @@ static const struct OamData gUnknown_085A7A54 =
     .affineParam = 0,
 };
 
-static const struct OamData gUnknown_085A7A5C =
+static const struct OamData sOam_32x32 =
 {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
@@ -4794,7 +5157,7 @@ static const struct OamData gUnknown_085A7A5C =
     .affineParam = 0,
 };
 
-static const struct OamData gUnknown_085A7A64 =
+static const struct OamData sOam_32x64 =
 {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
@@ -4811,7 +5174,7 @@ static const struct OamData gUnknown_085A7A64 =
     .affineParam = 0,
 };
 
-static const struct OamData gUnknown_085A7A6C =
+static const struct OamData sOam_64x32 =
 {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
@@ -4828,7 +5191,7 @@ static const struct OamData gUnknown_085A7A6C =
     .affineParam = 0,
 };
 
-static const struct OamData gUnknown_085A7A74 =
+static const struct OamData sOam_64x64 =
 {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
@@ -4845,7 +5208,7 @@ static const struct OamData gUnknown_085A7A74 =
     .affineParam = 0,
 };
 
-static const struct SpriteFrameImage gUnknown_085A7A7C[] =
+static const struct SpriteFrameImage sImageTable_ReelTimeNumbers[] =
 {
     { gSlotMachineReelTimeNumber0, 0x80 },
     { gSlotMachineReelTimeNumber1, 0x80 },
@@ -4855,151 +5218,151 @@ static const struct SpriteFrameImage gUnknown_085A7A7C[] =
     { gSlotMachineReelTimeNumber5, 0x80 },
 };
 
-static const struct SpriteFrameImage gUnknown_085A7AAC[] = { gSlotMachineReelTimeShadow, 0x200 };
-static const struct SpriteFrameImage gUnknown_085A7AB4[] = { gUnknown_08DD1A18, 0x40 };
+static const struct SpriteFrameImage sImageTable_ReelTimeShadow[] = { gSlotMachineReelTimeShadow, 0x200 };
+static const struct SpriteFrameImage sImageTable_ReelTimeNumberGap[] = { gSlotMachineReelTimeNumberGap_Gfx, 0x40 };
 
-static const struct SpriteFrameImage gUnknown_085A7ABC[] = 
+static const struct SpriteFrameImage sImageTable_ReelTimeBolt[] = 
 {
-    { gSlotMachineReelTimeLargeBolt0, 0x100 },
-    { gSlotMachineReelTimeLargeBolt1, 0x100 },
+    { gSlotMachineReelTimeBolt0, 0x100 },
+    { gSlotMachineReelTimeBolt1, 0x100 },
 };
 
-static const struct SpriteFrameImage gUnknown_085A7ACC[] = { gSlotMachineReelTimePikaAura, 0x400 };
+static const struct SpriteFrameImage sImageTable_ReelTimePikachuAura[] = { gSlotMachineReelTimePikaAura, 0x400 };
 
-static const struct SpriteFrameImage gUnknown_085A7AD4[] = 
+static const struct SpriteFrameImage sImageTable_ReelTimeExplosion[] = 
 { 
     { gSlotMachineReelTimeExplosion0, 0x200 },
     { gSlotMachineReelTimeExplosion1, 0x200 },
 };
 
-static const struct SpriteFrameImage gUnknown_085A7AE4[] = { gSlotMachineReelTimeDuck, 0x20};
-static const struct SpriteFrameImage gUnknown_085A7AEC[] = { gSlotMachineReelTimeSmoke, 0x80};
-static const struct SpriteFrameImage gUnknown_085A7AF4[] = { gSlotMachineReelTimeBolt, 0x20};
+static const struct SpriteFrameImage sImageTable_ReelTimeDuck[] = { gSlotMachineReelTimeDuck, 0x20};
+static const struct SpriteFrameImage sImageTable_ReelTimeSmoke[] = { gSlotMachineReelTimeSmoke, 0x80};
+static const struct SpriteFrameImage sImageTable_PikaPowerBolt[] = { gSlotMachinePikaPowerBolt, 0x20};
 
-static const union AnimCmd gUnknown_085A7AFC[] = 
+static const union AnimCmd sAnim_SingleFrame[] = 
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085A7B04[] = 
+static const union AnimCmd sAnim_ReelTimeDuck[] = 
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd gUnknown_085A7B0C[] =
+static const union AnimCmd sAnim_ReelTimePikachu_Still[] =
 {
     ANIMCMD_FRAME(0, 16),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085A7B14[] =
+static const union AnimCmd sAnim_ReelTimePikachu_ChargingSlow[] =
 {
     ANIMCMD_FRAME(1, 16),
     ANIMCMD_FRAME(0, 16),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd gUnknown_085A7B20[] =
+static const union AnimCmd sAnim_ReelTimePikachu_ChargingMedium[] =
 {
     ANIMCMD_FRAME(1, 8),
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd gUnknown_085A7B2C[] =
+static const union AnimCmd sAnim_ReelTimePikachu_ChargingFast[] =
 {
     ANIMCMD_FRAME(1, 4),
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd gUnknown_085A7B38[] =
+static const union AnimCmd sAnim_ReelTimePikachu_Cheering[] =
 {
     ANIMCMD_FRAME(2, 32),
     ANIMCMD_FRAME(3, 32),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd gUnknown_085A7B44[] =
+static const union AnimCmd sAnim_ReelTimePikachu_FellOver[] =
 {
     ANIMCMD_FRAME(4, 1),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085A7B4C[] =
+static const union AnimCmd sAnim_ReelTimeNumber_0[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085A7B54[] =
+static const union AnimCmd sAnim_ReelTimeNumber_1[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085A7B5C[] =
+static const union AnimCmd sAnim_ReelTimeNumber_2[] =
 {
     ANIMCMD_FRAME(2, 1),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085A7B64[] =
+static const union AnimCmd sAnim_ReelTimeNumber_3[] =
 {
     ANIMCMD_FRAME(3, 1),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085A7B6C[] =
+static const union AnimCmd sAnim_ReelTimeNumber_4[] =
 {
     ANIMCMD_FRAME(4, 1),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085A7B74[] =
+static const union AnimCmd sAnim_ReelTimeNumber_5[] =
 {
     ANIMCMD_FRAME(5, 1),
     ANIMCMD_END
 };
 
 
-static const union AnimCmd gUnknown_085A7B7C[] =
+static const union AnimCmd sAnim_ReelTimeBolt[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(1, 4),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd gUnknown_085A7B88[] =
+static const union AnimCmd sAnim_ReelTimeExplosion[] =
 {
     ANIMCMD_FRAME(0, 16),
     ANIMCMD_FRAME(1, 16),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd gUnknown_085A7B94[] =
+static const union AnimCmd sAnim_DigitalDisplay_AButton_Flashing[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd gUnknown_085A7BA0[] =
+static const union AnimCmd sAnim_DigitalDisplay_AButton_Static[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085A7BA8[] =
+static const union AnimCmd sAnim_DigitalDisplay_DPad_Flashing[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd gUnknown_085A7BB4[] =
+static const union AnimCmd sAnim_DigitalDisplay_Pokeball_Rocking[] =
 {
     ANIMCMD_FRAME(0, 16),
     ANIMCMD_FRAME(1, 16),
@@ -5008,110 +5371,110 @@ static const union AnimCmd gUnknown_085A7BB4[] =
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd gUnknown_085A7BC8[] =
+static const union AnimCmd sAnim_DigitalDisplay_Pokeball_Static[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085A7BD0[] =
+static const union AnimCmd sAnim_DigitalDisplay_Number_1[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085A7BD8[] =
+static const union AnimCmd sAnim_DigitalDisplay_Number_2[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085A7BE0[] =
+static const union AnimCmd sAnim_DigitalDisplay_Number_3[] =
 {
     ANIMCMD_FRAME(2, 1),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085A7BE8[] =
+static const union AnimCmd sAnim_DigitalDisplay_Number_4[] =
 {
     ANIMCMD_FRAME(3, 1),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085A7BF0[] =
+static const union AnimCmd sAnim_DigitalDisplay_Number_5[] =
 {
     ANIMCMD_FRAME(4, 1),
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gUnknown_085A7BF8[] =
+static const union AnimCmd *const sAnims_SingleFrame[] =
 {
-    gUnknown_085A7AFC
+    sAnim_SingleFrame
 };
 
-static const union AnimCmd *const gUnknown_085A7BFC[] =
+static const union AnimCmd *const sAnims_ReelTimeDuck[] =
 {
-    gUnknown_085A7B04
+    sAnim_ReelTimeDuck
 };
 
-static const union AnimCmd *const gUnknown_085A7C00[] =
+static const union AnimCmd *const sAnims_ReelTimePikachu[] =
 {
-    gUnknown_085A7B0C,
-    gUnknown_085A7B14,
-    gUnknown_085A7B20,
-    gUnknown_085A7B2C,
-    gUnknown_085A7B38,
-    gUnknown_085A7B44
+    sAnim_ReelTimePikachu_Still,
+    sAnim_ReelTimePikachu_ChargingSlow,
+    sAnim_ReelTimePikachu_ChargingMedium,
+    sAnim_ReelTimePikachu_ChargingFast,
+    sAnim_ReelTimePikachu_Cheering,
+    sAnim_ReelTimePikachu_FellOver
 };
 
-static const union AnimCmd *const gUnknown_085A7C18[] =
+static const union AnimCmd *const sAnims_ReelTimeNumbers[] =
 {
-    gUnknown_085A7B4C,
-    gUnknown_085A7B54,
-    gUnknown_085A7B5C,
-    gUnknown_085A7B64,
-    gUnknown_085A7B6C,
-    gUnknown_085A7B74
+    sAnim_ReelTimeNumber_0,
+    sAnim_ReelTimeNumber_1,
+    sAnim_ReelTimeNumber_2,
+    sAnim_ReelTimeNumber_3,
+    sAnim_ReelTimeNumber_4,
+    sAnim_ReelTimeNumber_5
 };
 
-static const union AnimCmd *const gUnknown_085A7C30[] =
+static const union AnimCmd *const sAnims_ReelTimeBolt[] =
 {
-    gUnknown_085A7B7C
+    sAnim_ReelTimeBolt
 };
 
-static const union AnimCmd *const gUnknown_085A7C34[] =
+static const union AnimCmd *const sAnims_ReelTimeExplosion[] =
 {
-    gUnknown_085A7B88
+    sAnim_ReelTimeExplosion
 };
 
-static const union AnimCmd *const gUnknown_085A7C38[] =
+static const union AnimCmd *const sAnims_DigitalDisplay_AButton[] =
 {
-    gUnknown_085A7B94,
-    gUnknown_085A7BA0
+    sAnim_DigitalDisplay_AButton_Flashing,
+    sAnim_DigitalDisplay_AButton_Static
 };
 
-static const union AnimCmd *const gUnknown_085A7C40[] =
+static const union AnimCmd *const sAnims_DigitalDisplay_DPad[] =
 {
-    gUnknown_085A7BA8
+    sAnim_DigitalDisplay_DPad_Flashing
 };
 
-static const union AnimCmd *const gUnknown_085A7C44[] =
+static const union AnimCmd *const sAnims_DigitalDisplay_Pokeball[] =
 {
-    gUnknown_085A7BB4,
-    gUnknown_085A7BC8
+    sAnim_DigitalDisplay_Pokeball_Rocking,
+    sAnim_DigitalDisplay_Pokeball_Static
 };
 
-static const union AnimCmd *const gUnknown_085A7C4C[] =
+static const union AnimCmd *const sAnims_DigitalDisplay_Number[] =
 {
-    gUnknown_085A7BD0,
-    gUnknown_085A7BD8,
-    gUnknown_085A7BE0,
-    gUnknown_085A7BE8,
-    gUnknown_085A7BF0
+    sAnim_DigitalDisplay_Number_1,
+    sAnim_DigitalDisplay_Number_2,
+    sAnim_DigitalDisplay_Number_3,
+    sAnim_DigitalDisplay_Number_4,
+    sAnim_DigitalDisplay_Number_5
 };
 
 
-static const union AffineAnimCmd gUnknown_085A7C60[] =
+static const union AffineAnimCmd sAffineAnim_ReelTimeSmoke[] =
 {
     AFFINEANIMCMD_FRAME(16, 16, 0, 0),
     AFFINEANIMCMD_LOOP(0),
@@ -5120,12 +5483,13 @@ static const union AffineAnimCmd gUnknown_085A7C60[] =
     AFFINEANIMCMD_END
 };
 
-static const union AffineAnimCmd *const gUnknown_085A7C88[] =
+static const union AffineAnimCmd *const sAffineAnims_ReelTimeSmoke[] =
 {
-    gUnknown_085A7C60
+    sAffineAnim_ReelTimeSmoke
 };
 
-static const union AffineAnimCmd gUnknown_085A7C8C[] =
+// Spin as it appears
+static const union AffineAnimCmd sAffineAnim_PikaPowerBolt[] =
 {
     AFFINEANIMCMD_FRAME(0, 0, 8, 32),
     AFFINEANIMCMD_FRAME(0, 0, 6, 32),
@@ -5139,342 +5503,342 @@ static const union AffineAnimCmd gUnknown_085A7C8C[] =
     AFFINEANIMCMD_END
 };
 
-static const union AffineAnimCmd *const gUnknown_085A7CDC[] =
+static const union AffineAnimCmd *const sAffineAnims_PikaPowerBolt[] =
 {
-    gUnknown_085A7C8C
+    sAffineAnim_PikaPowerBolt
 };
 
-static const struct SpriteTemplate gSpriteTemplate_83ED414 =
+static const struct SpriteTemplate sSpriteTemplate_ReelSymbol =
 {
-    .tileTag = 0, 
-    .paletteTag = 0, 
-    .oam = &gUnknown_085A7A5C, 
-    .anims = gUnknown_085A7BF8, 
+    .tileTag = GFXTAG_SYMBOLS_START, 
+    .paletteTag = PALTAG_REEL, 
+    .oam = &sOam_32x32, 
+    .anims = sAnims_SingleFrame, 
     .images = NULL, 
     .affineAnims = gDummySpriteAffineAnimTable, 
-    .callback = sub_8104F18
+    .callback = SpriteCB_ReelSymbol
 };
 
-static const struct SpriteTemplate gSpriteTemplate_83ED42C =
+static const struct SpriteTemplate sSpriteTemplate_CoinNumber =
 {
-    .tileTag = 7, 
-    .paletteTag = 4, 
-    .oam = &gUnknown_085A7A44, 
-    .anims = gUnknown_085A7BF8, 
+    .tileTag = GFXTAG_NUMBERS_START, 
+    .paletteTag = PALTAG_MISC, 
+    .oam = &sOam_8x16, 
+    .anims = sAnims_SingleFrame, 
     .images = NULL, 
     .affineAnims = gDummySpriteAffineAnimTable, 
-    .callback = sub_810506C
+    .callback = SpriteCB_CoinNumber
 };
 
-static const struct SpriteTemplate gSpriteTemplate_83ED444 =
+static const struct SpriteTemplate sSpriteTemplate_ReelBackground =
 {
-    .tileTag = 17, 
-    .paletteTag = 0, 
-    .oam = &gUnknown_085A7A74, 
-    .anims = gUnknown_085A7BF8, 
+    .tileTag = GFXTAG_REEL_BG, 
+    .paletteTag = PALTAG_REEL, 
+    .oam = &sOam_64x64, 
+    .anims = sAnims_SingleFrame, 
     .images = NULL, 
     .affineAnims = gDummySpriteAffineAnimTable, 
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gSpriteTemplate_83ED45C =
+static const struct SpriteTemplate sSpriteTemplate_ReelTimePikachu =
 {
     .tileTag = 0xFFFF, 
-    .paletteTag = 1, 
-    .oam = &gUnknown_085A7A74, 
-    .anims = gUnknown_085A7C00, 
+    .paletteTag = PALTAG_REEL_TIME_PIKACHU, 
+    .oam = &sOam_64x64, 
+    .anims = sAnims_ReelTimePikachu, 
     .images = NULL, 
     .affineAnims = gDummySpriteAffineAnimTable, 
-    .callback = sub_8105170
+    .callback = SpriteCB_ReelTimePikachu
 };
 
-static const struct SpriteTemplate gSpriteTemplate_83ED474 =
+static const struct SpriteTemplate sSpriteTemplate_ReelTimeMachineAntennae =
 {
     .tileTag = 0xFFFF, 
-    .paletteTag = 2, 
-    .oam = &gUnknown_085A7A44, 
-    .anims = gUnknown_085A7BF8,
+    .paletteTag = PALTAG_REEL_TIME_MISC, 
+    .oam = &sOam_8x16, 
+    .anims = sAnims_SingleFrame,
     .images = NULL, 
     .affineAnims = gDummySpriteAffineAnimTable, 
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gSpriteTemplate_83ED48C =
+static const struct SpriteTemplate sSpriteTemplate_ReelTimeMachine =
 {
     .tileTag = 0xFFFF, 
-    .paletteTag = 3, 
-    .oam = &gUnknown_085A7A44, 
-    .anims = gUnknown_085A7BF8, 
+    .paletteTag = PALTAG_REEL_TIME_MACHINE, 
+    .oam = &sOam_8x16, 
+    .anims = sAnims_SingleFrame, 
     .images = NULL, 
     .affineAnims = gDummySpriteAffineAnimTable, 
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gSpriteTemplate_83ED4A4 =
+static const struct SpriteTemplate sSpriteTemplate_BrokenReelTimeMachine =
 {
     .tileTag = 0xFFFF, 
-    .paletteTag = 3, 
-    .oam = &gUnknown_085A7A44, 
-    .anims = gUnknown_085A7BF8, 
+    .paletteTag = PALTAG_REEL_TIME_MACHINE, 
+    .oam = &sOam_8x16, 
+    .anims = sAnims_SingleFrame, 
     .images = NULL, 
     .affineAnims = gDummySpriteAffineAnimTable, 
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gSpriteTemplate_83ED4BC =
+static const struct SpriteTemplate sSpriteTemplate_ReelTimeNumbers =
 {
     .tileTag = 0xFFFF, 
-    .paletteTag = 4, 
-    .oam = &gUnknown_085A7A4C, 
-    .anims = gUnknown_085A7C18, 
-    .images = gUnknown_085A7A7C, 
+    .paletteTag = PALTAG_MISC, 
+    .oam = &sOam_16x16, 
+    .anims = sAnims_ReelTimeNumbers, 
+    .images = sImageTable_ReelTimeNumbers, 
     .affineAnims = gDummySpriteAffineAnimTable, 
-    .callback = sub_810535C
+    .callback = SpriteCB_ReelTimeNumbers
 };
 
-static const struct SpriteTemplate gSpriteTemplate_83ED4D4 =
+static const struct SpriteTemplate sSpriteTemplate_ReelTimeShadow =
 {
     .tileTag = 0xFFFF, 
-    .paletteTag = 4, 
-    .oam = &gUnknown_085A7A4C, 
-    .anims = gUnknown_085A7BF8, 
-    .images = gUnknown_085A7AAC, 
+    .paletteTag = PALTAG_MISC, 
+    .oam = &sOam_16x16, 
+    .anims = sAnims_SingleFrame, 
+    .images = sImageTable_ReelTimeShadow, 
     .affineAnims = gDummySpriteAffineAnimTable, 
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gSpriteTemplate_83ED4EC =
+static const struct SpriteTemplate sSpriteTemplate_ReelTimeNumberGap =
 {
     .tileTag = 0xFFFF, 
-    .paletteTag = 4, 
-    .oam = &gUnknown_085A7A4C, 
-    .anims = gUnknown_085A7BF8, 
-    .images = gUnknown_085A7AB4, 
+    .paletteTag = PALTAG_MISC, 
+    .oam = &sOam_16x16, 
+    .anims = sAnims_SingleFrame, 
+    .images = sImageTable_ReelTimeNumberGap, 
     .affineAnims = gDummySpriteAffineAnimTable, 
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gSpriteTemplate_83ED504 =
+static const struct SpriteTemplate sSpriteTemplate_ReelTimeBolt =
 {
     .tileTag = 0xFFFF, 
-    .paletteTag = 4, 
-    .oam = &gUnknown_085A7A54, 
-    .anims = gUnknown_085A7C30, 
-    .images = gUnknown_085A7ABC, 
+    .paletteTag = PALTAG_MISC, 
+    .oam = &sOam_16x32, 
+    .anims = sAnims_ReelTimeBolt, 
+    .images = sImageTable_ReelTimeBolt, 
     .affineAnims = gDummySpriteAffineAnimTable, 
-    .callback = sub_810562C
+    .callback = SpriteCB_ReelTimeBolt
 };
 
-static const struct SpriteTemplate gSpriteTemplate_83ED51C =
+static const struct SpriteTemplate sSpriteTemplate_ReelTimePikachuAura =
 {
     .tileTag = 0xFFFF, 
-    .paletteTag = 7, 
-    .oam = &gUnknown_085A7A64, 
-    .anims = gUnknown_085A7BF8, 
-    .images = gUnknown_085A7ACC, 
+    .paletteTag = PALTAG_PIKA_AURA, 
+    .oam = &sOam_32x64, 
+    .anims = sAnims_SingleFrame, 
+    .images = sImageTable_ReelTimePikachuAura, 
     .affineAnims = gDummySpriteAffineAnimTable, 
-    .callback = sub_8105784
+    .callback = SpriteCB_ReelTimePikachuAura
 };
 
-static const struct SpriteTemplate gSpriteTemplate_83ED534 =
+static const struct SpriteTemplate sSpriteTemplate_ReelTimeExplosion =
 {
     .tileTag = 0xFFFF, 
-    .paletteTag = 5, 
-    .oam = &gUnknown_085A7A5C, 
-    .anims = gUnknown_085A7C34, 
-    .images = gUnknown_085A7AD4, 
+    .paletteTag = PALTAG_EXPLOSION, 
+    .oam = &sOam_32x32, 
+    .anims = sAnims_ReelTimeExplosion, 
+    .images = sImageTable_ReelTimeExplosion, 
     .affineAnims = gDummySpriteAffineAnimTable, 
-    .callback = sub_8105894
+    .callback = SpriteCB_ReelTimeExplosion
 };
 
-static const struct SpriteTemplate gSpriteTemplate_83ED54C =
+static const struct SpriteTemplate sSpriteTemplate_ReelTimeDuck =
 {
     .tileTag = 0xFFFF, 
-    .paletteTag = 4, 
-    .oam = &gUnknown_085A7A3C, 
-    .anims = gUnknown_085A7BFC, 
-    .images = gUnknown_085A7AE4, 
+    .paletteTag = PALTAG_MISC, 
+    .oam = &sOam_8x8, 
+    .anims = sAnims_ReelTimeDuck, 
+    .images = sImageTable_ReelTimeDuck, 
     .affineAnims = gDummySpriteAffineAnimTable, 
-    .callback = sub_810594C
+    .callback = SpriteCB_ReelTimeDuck
 };
 
-static const struct SpriteTemplate gSpriteTemplate_83ED564 =
+static const struct SpriteTemplate sSpriteTemplate_ReelTimeSmoke =
 {
     .tileTag = 0xFFFF, 
-    .paletteTag = 4, 
-    .oam = &gUnknown_085A7A4C, 
-    .anims = gUnknown_085A7BF8, 
-    .images = gUnknown_085A7AEC, 
-    .affineAnims = gUnknown_085A7C88, 
-    .callback = sub_8105A38
+    .paletteTag = PALTAG_MISC, 
+    .oam = &sOam_16x16, 
+    .anims = sAnims_SingleFrame, 
+    .images = sImageTable_ReelTimeSmoke, 
+    .affineAnims = sAffineAnims_ReelTimeSmoke, 
+    .callback = SpriteCB_ReelTimeSmoke
 };
 
-static const struct SpriteTemplate gUnknown_085A7E48 =
+static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_Reel =
 {
     .tileTag = 0xFFFF, 
-    .paletteTag = 6, 
-    .oam = &gUnknown_085A7A3C, 
-    .anims = gUnknown_085A7BF8, 
+    .paletteTag = PALTAG_DIG_DISPLAY, 
+    .oam = &sOam_8x8, 
+    .anims = sAnims_SingleFrame, 
     .images = NULL, 
     .affineAnims = gDummySpriteAffineAnimTable, 
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gUnknown_085A7E60 =
+static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_Time =
 {
     .tileTag = 0xFFFF, 
-    .paletteTag = 6, 
-    .oam = &gUnknown_085A7A3C, 
-    .anims = gUnknown_085A7BF8, 
+    .paletteTag = PALTAG_DIG_DISPLAY, 
+    .oam = &sOam_8x8, 
+    .anims = sAnims_SingleFrame, 
     .images = NULL, 
     .affineAnims = gDummySpriteAffineAnimTable, 
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gUnknown_085A7E78 =
+static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_Insert =
 {
     .tileTag = 0xFFFF, 
-    .paletteTag = 6, 
-    .oam = &gUnknown_085A7A3C, 
-    .anims = gUnknown_085A7BF8, 
+    .paletteTag = PALTAG_DIG_DISPLAY, 
+    .oam = &sOam_8x8, 
+    .anims = sAnims_SingleFrame, 
     .images = NULL, 
     .affineAnims = gDummySpriteAffineAnimTable, 
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gUnknown_085A7E90 =
+static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_Stop =
 {
     .tileTag = 18, 
-    .paletteTag = 6, 
-    .oam = &gUnknown_085A7A3C, 
-    .anims = gUnknown_085A7BF8, 
+    .paletteTag = PALTAG_DIG_DISPLAY, 
+    .oam = &sOam_8x8, 
+    .anims = sAnims_SingleFrame, 
     .images = NULL, 
     .affineAnims = gDummySpriteAffineAnimTable, 
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gUnknown_085A7EA8 =
+static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_Win =
 {
     .tileTag = 0xFFFF, 
-    .paletteTag = 6, 
-    .oam = &gUnknown_085A7A6C, 
-    .anims = gUnknown_085A7BF8, 
+    .paletteTag = PALTAG_DIG_DISPLAY, 
+    .oam = &sOam_64x32, 
+    .anims = sAnims_SingleFrame, 
     .images = NULL, 
     .affineAnims = gDummySpriteAffineAnimTable, 
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gUnknown_085A7EC0 =
+static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_Lose =
 {
     .tileTag = 0xFFFF, 
-    .paletteTag = 6, 
-    .oam = &gUnknown_085A7A6C, 
-    .anims = gUnknown_085A7BF8, 
+    .paletteTag = PALTAG_DIG_DISPLAY, 
+    .oam = &sOam_64x32, 
+    .anims = sAnims_SingleFrame, 
     .images = NULL, 
     .affineAnims = gDummySpriteAffineAnimTable, 
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gUnknown_085A7ED8 =
+static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_Bonus =
 {
     .tileTag = 19, 
-    .paletteTag = 6, 
-    .oam = &gUnknown_085A7A3C, 
-    .anims = gUnknown_085A7BF8, 
+    .paletteTag = PALTAG_DIG_DISPLAY, 
+    .oam = &sOam_8x8, 
+    .anims = sAnims_SingleFrame, 
     .images = NULL, 
     .affineAnims = gDummySpriteAffineAnimTable, 
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gUnknown_085A7EF0 =
+static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_Big =
 {
     .tileTag = 20, 
-    .paletteTag = 6, 
-    .oam = &gUnknown_085A7A3C, 
-    .anims = gUnknown_085A7BF8, 
+    .paletteTag = PALTAG_DIG_DISPLAY, 
+    .oam = &sOam_8x8, 
+    .anims = sAnims_SingleFrame, 
     .images = NULL, 
     .affineAnims = gDummySpriteAffineAnimTable, 
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gUnknown_085A7F08 =
+static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_Reg =
 {
     .tileTag = 21, 
-    .paletteTag = 6, 
-    .oam = &gUnknown_085A7A3C, 
-    .anims = gUnknown_085A7BF8, 
+    .paletteTag = PALTAG_DIG_DISPLAY, 
+    .oam = &sOam_8x8, 
+    .anims = sAnims_SingleFrame, 
     .images = NULL, 
     .affineAnims = gDummySpriteAffineAnimTable, 
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gUnknown_085A7F20 =
+static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_AButton =
 {
     .tileTag = 0xFFFF, 
-    .paletteTag = 6, 
-    .oam = &gUnknown_085A7A5C, 
-    .anims = gUnknown_085A7C38, 
+    .paletteTag = PALTAG_DIG_DISPLAY, 
+    .oam = &sOam_32x32, 
+    .anims = sAnims_DigitalDisplay_AButton, 
     .images = NULL, 
     .affineAnims = gDummySpriteAffineAnimTable, 
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gUnknown_085A7F38 =
+static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_Smoke =
 {
     .tileTag = 0xFFFF, 
-    .paletteTag = 6, 
-    .oam = &gUnknown_085A7A3C, 
-    .anims = gUnknown_085A7BF8, 
+    .paletteTag = PALTAG_DIG_DISPLAY, 
+    .oam = &sOam_8x8, 
+    .anims = sAnims_SingleFrame, 
     .images = NULL, 
     .affineAnims = gDummySpriteAffineAnimTable, 
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gUnknown_085A7F50 =
+static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_Number =
 {
     .tileTag = 0xFFFF, 
-    .paletteTag = 6, 
-    .oam = &gUnknown_085A7A4C, 
-    .anims = gUnknown_085A7C4C, 
+    .paletteTag = PALTAG_DIG_DISPLAY, 
+    .oam = &sOam_16x16, 
+    .anims = sAnims_DigitalDisplay_Number, 
     .images = NULL, 
     .affineAnims = gDummySpriteAffineAnimTable, 
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gUnknown_085A7F68 =
+static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_Pokeball =
 {
     .tileTag = 0xFFFF, 
-    .paletteTag = 6, 
-    .oam = &gUnknown_085A7A3C, 
-    .anims = gUnknown_085A7C44, 
+    .paletteTag = PALTAG_DIG_DISPLAY, 
+    .oam = &sOam_8x8, 
+    .anims = sAnims_DigitalDisplay_Pokeball, 
     .images = NULL, 
     .affineAnims = gDummySpriteAffineAnimTable, 
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gUnknown_085A7F80 =
+static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_DPad =
 {
     .tileTag = 0xFFFF, 
-    .paletteTag = 6, 
-    .oam = &gUnknown_085A7A3C, 
-    .anims = gUnknown_085A7C40, 
+    .paletteTag = PALTAG_DIG_DISPLAY, 
+    .oam = &sOam_8x8, 
+    .anims = sAnims_DigitalDisplay_DPad, 
     .images = NULL, 
     .affineAnims = gDummySpriteAffineAnimTable, 
     .callback = SpriteCallbackDummy
 };
 
-static const struct SpriteTemplate gSpriteTemplate_83ED6CC =
+static const struct SpriteTemplate sSpriteTemplate_PikaPowerBolt =
 {
     .tileTag = 0xFFFF, 
-    .paletteTag = 4, 
-    .oam = &gUnknown_085A7A3C, 
-    .anims = gUnknown_085A7BF8, 
-    .images = gUnknown_085A7AF4, 
-    .affineAnims = gUnknown_085A7CDC, 
-    .callback = sub_8105B70
+    .paletteTag = PALTAG_MISC, 
+    .oam = &sOam_8x8, 
+    .anims = sAnims_SingleFrame, 
+    .images = sImageTable_PikaPowerBolt, 
+    .affineAnims = sAffineAnims_PikaPowerBolt, 
+    .callback = SpriteCB_PikaPowerBolt
 };
 
-static const struct Subsprite gUnknown_085A7FB0[] =
+static const struct Subsprite sSubsprites_ReelBackground[] =
 {
     {
         .x = -64, 
@@ -5510,12 +5874,12 @@ static const struct Subsprite gUnknown_085A7FB0[] =
     }
 };
 
-static const struct SubspriteTable gSubspriteTables_83ED704[] =
+static const struct SubspriteTable sSubspriteTable_ReelBackground[] =
 {
-    ARRAY_COUNT(gUnknown_085A7FB0), gUnknown_085A7FB0
+    ARRAY_COUNT(sSubsprites_ReelBackground), sSubsprites_ReelBackground
 };
 
-static const struct Subsprite gUnknown_085A7FC8[] =
+static const struct Subsprite sSubsprites_ReelTimeMachineAntennae[] =
 {
     { 
         .x = -32, 
@@ -5567,12 +5931,12 @@ static const struct Subsprite gUnknown_085A7FC8[] =
     }
 };
 
-static const struct SubspriteTable gSubspriteTables_83ED73C[] =
+static const struct SubspriteTable sSubspriteTable_ReelTimeMachineAntennae[] =
 {
-    ARRAY_COUNT(gUnknown_085A7FC8), gUnknown_085A7FC8
+    ARRAY_COUNT(sSubsprites_ReelTimeMachineAntennae), sSubsprites_ReelTimeMachineAntennae
 };
 
-static const struct Subsprite gUnknown_085A7FE8[] =
+static const struct Subsprite sSubsprites_ReelTimeMachine[] =
 {
     { 
         .x = -32, 
@@ -5600,12 +5964,12 @@ static const struct Subsprite gUnknown_085A7FE8[] =
     }
 };
 
-static const struct SubspriteTable gSubspriteTables_83ED75C[] =
+static const struct SubspriteTable sSubspriteTable_ReelTimeMachine[] =
 {
-    ARRAY_COUNT(gUnknown_085A7FE8), gUnknown_085A7FE8
+    ARRAY_COUNT(sSubsprites_ReelTimeMachine), sSubsprites_ReelTimeMachine
 };
 
-static const struct Subsprite gUnknown_085A7FFC[] =
+static const struct Subsprite sSubsprites_BrokenReelTimeMachine[] =
 {
     { 
         .x = -32, 
@@ -5649,12 +6013,12 @@ static const struct Subsprite gUnknown_085A7FFC[] =
     }
 };
 
-static const struct SubspriteTable gSubspriteTables_83ED78C[] =
+static const struct SubspriteTable sSubspriteTable_BrokenReelTimeMachine[] =
 {
-    ARRAY_COUNT(gUnknown_085A7FFC), gUnknown_085A7FFC
+    ARRAY_COUNT(sSubsprites_BrokenReelTimeMachine), sSubsprites_BrokenReelTimeMachine
 };
 
-static const struct Subsprite gUnknown_085A8018[] =
+static const struct Subsprite sSubsprites_ReelTimeShadow[] =
 {
     { 
         .x = -32, 
@@ -5690,12 +6054,12 @@ static const struct Subsprite gUnknown_085A8018[] =
     }
 };
 
-static const struct SubspriteTable gSubspriteTables_83ED7B4[] =
+static const struct SubspriteTable sSubspriteTable_ReelTimeShadow[] =
 {
-    ARRAY_COUNT(gUnknown_085A8018), gUnknown_085A8018
+    ARRAY_COUNT(sSubsprites_ReelTimeShadow), sSubsprites_ReelTimeShadow
 };
 
-static const struct Subsprite gUnknown_085A8030[] =
+static const struct Subsprite sSubsprites_ReelTimeNumberGap[] =
 {
     { 
         .x = -8, 
@@ -5723,12 +6087,12 @@ static const struct Subsprite gUnknown_085A8030[] =
     }
 };
 
-static const struct SubspriteTable gSubspriteTables_83ED7D4[] =
+static const struct SubspriteTable sSubspriteTable_ReelTimeNumberGap[] =
 {
-    ARRAY_COUNT(gUnknown_085A8030), gUnknown_085A8030
+    ARRAY_COUNT(sSubsprites_ReelTimeNumberGap), sSubsprites_ReelTimeNumberGap
 };
 
-static const struct Subsprite gUnknown_085A8044[] =
+static const struct Subsprite sSubsprites_DigitalDisplay_Reel[] =
 {
     { 
         .x = -32, 
@@ -5772,12 +6136,12 @@ static const struct Subsprite gUnknown_085A8044[] =
     }
 };
 
-static const struct SubspriteTable gUnknown_085A8058[] =
+static const struct SubspriteTable sSubspriteTable_DigitalDisplay_Reel[] =
 {
-    ARRAY_COUNT(gUnknown_085A8044), gUnknown_085A8044
+    ARRAY_COUNT(sSubsprites_DigitalDisplay_Reel), sSubsprites_DigitalDisplay_Reel
 };
 
-static const struct Subsprite gUnknown_085A8060[] =
+static const struct Subsprite sSubsprites_DigitalDisplay_Time[] =
 {
     { 
         .x = -32, 
@@ -5813,12 +6177,12 @@ static const struct Subsprite gUnknown_085A8060[] =
     }
 };
 
-static const struct SubspriteTable gUnknown_085A8070[] =
+static const struct SubspriteTable sSubspriteTable_DigitalDisplay_Time[] =
 {
-    ARRAY_COUNT(gUnknown_085A8060), gUnknown_085A8060
+    ARRAY_COUNT(sSubsprites_DigitalDisplay_Time), sSubsprites_DigitalDisplay_Time
 };
 
-static const struct Subsprite gUnknown_085A8078[] =
+static const struct Subsprite sSubsprites_DigitalDisplay_Insert[] =
 {
     { 
         .x = -32, 
@@ -5854,12 +6218,12 @@ static const struct Subsprite gUnknown_085A8078[] =
     }
 };
 
-static const struct SubspriteTable gUnknown_085A8088[] =
+static const struct SubspriteTable sSubspriteTable_DigitalDisplay_Insert[] =
 {
-    ARRAY_COUNT(gUnknown_085A8078), gUnknown_085A8078
+    ARRAY_COUNT(sSubsprites_DigitalDisplay_Insert), sSubsprites_DigitalDisplay_Insert
 };
 
-static const struct Subsprite gUnknown_085A8090[] =
+static const struct Subsprite sSubsprites_DigitalDisplay_Unused1[] =
 {
     { 
         .x = -32, 
@@ -5895,12 +6259,12 @@ static const struct Subsprite gUnknown_085A8090[] =
     }
 };
 
-static const struct SubspriteTable gUnknown_085A80A0[] =
+static const struct SubspriteTable sSubspriteTable_DigitalDisplay_Unused1[] =
 {
-    ARRAY_COUNT(gUnknown_085A8090), gUnknown_085A8090
+    ARRAY_COUNT(sSubsprites_DigitalDisplay_Unused1), sSubsprites_DigitalDisplay_Unused1
 };
 
-static const struct Subsprite gUnknown_085A80A8[] =
+static const struct Subsprite sSubsprites_DigitalDisplay_Win[] =
 {
     { 
         .x = -32, 
@@ -5952,12 +6316,12 @@ static const struct Subsprite gUnknown_085A80A8[] =
     }
 };
 
-static const struct SubspriteTable gUnknown_085A80C0[] =
+static const struct SubspriteTable sSubspriteTable_DigitalDisplay_Win[] =
 {
-    ARRAY_COUNT(gUnknown_085A80A8), gUnknown_085A80A8
+    ARRAY_COUNT(sSubsprites_DigitalDisplay_Win), sSubsprites_DigitalDisplay_Win
 };
 
-static const struct Subsprite gUnknown_085A80C8[] =
+static const struct Subsprite sSubsprites_DigitalDisplay_Smoke[] =
 {
     {
         .x = -16, 
@@ -5969,7 +6333,7 @@ static const struct Subsprite gUnknown_085A80C8[] =
     }
 };
 
-static const struct Subsprite gUnknown_085A80CC[] =
+static const struct Subsprite sSubsprites_DigitalDisplay_Unused2[] =
 {
     {
         .x = -8, 
@@ -5981,17 +6345,17 @@ static const struct Subsprite gUnknown_085A80CC[] =
     }
 };
 
-static const struct SubspriteTable gUnknown_085A80D0[] =
+static const struct SubspriteTable sSubspriteTable_DigitalDisplay_Smoke[] =
 {
-    ARRAY_COUNT(gUnknown_085A80C8), gUnknown_085A80C8
+    ARRAY_COUNT(sSubsprites_DigitalDisplay_Smoke), sSubsprites_DigitalDisplay_Smoke
 };
 
-static const struct SubspriteTable gUnknown_085A80D8[] =
+static const struct SubspriteTable sSubspriteTable_DigitalDisplay_Unused2[] =
 {
-    ARRAY_COUNT(gUnknown_085A80CC), gUnknown_085A80CC
+    ARRAY_COUNT(sSubsprites_DigitalDisplay_Unused2), sSubsprites_DigitalDisplay_Unused2
 };
 
-static const struct Subsprite gUnknown_085A80E0[] =
+static const struct Subsprite sSubsprites_DigitalDisplay_Pokeball[] =
 {
     { 
         .x = -24, 
@@ -6091,12 +6455,12 @@ static const struct Subsprite gUnknown_085A80E0[] =
     }
 };
 
-static const struct SubspriteTable gUnknown_085A8110[] =
+static const struct SubspriteTable sSubspriteTable_DigitalDisplay_Pokeball[] =
 {
-    ARRAY_COUNT(gUnknown_085A80E0), gUnknown_085A80E0
+    ARRAY_COUNT(sSubsprites_DigitalDisplay_Pokeball), sSubsprites_DigitalDisplay_Pokeball
 };
 
-static const struct Subsprite gUnknown_085A8118[] =
+static const struct Subsprite sSubsprites_DigitalDisplay_DPad[] =
 {
     { 
         .x = -16, 
@@ -6124,12 +6488,12 @@ static const struct Subsprite gUnknown_085A8118[] =
     }
 };
 
-static const struct SubspriteTable gUnknown_085A8124[] =
+static const struct SubspriteTable sSubspriteTable_DigitalDisplay_DPad[] =
 {
-    ARRAY_COUNT(gUnknown_085A8118), gUnknown_085A8118
+    ARRAY_COUNT(sSubsprites_DigitalDisplay_DPad), sSubsprites_DigitalDisplay_DPad
 };
 
-static const struct Subsprite gUnknown_085A812C[] =
+static const struct Subsprite sSubsprites_DigitalDisplay_StopS[] =
 {
     { 
         .x = -8, 
@@ -6149,12 +6513,12 @@ static const struct Subsprite gUnknown_085A812C[] =
     }
 };
 
-static const struct SubspriteTable gUnknown_085A8134[] =
+static const struct SubspriteTable sSubspriteTable_DigitalDisplay_StopS[] =
 {
-    ARRAY_COUNT(gUnknown_085A812C), gUnknown_085A812C
+    ARRAY_COUNT(sSubsprites_DigitalDisplay_StopS), sSubsprites_DigitalDisplay_StopS
 };
 
-static const struct Subsprite gUnknown_085A813C[] =
+static const struct Subsprite sSubsprites_DigitalDisplay_StopT[] =
 {
     { 
         .x = -8, 
@@ -6174,12 +6538,12 @@ static const struct Subsprite gUnknown_085A813C[] =
     }
 };
 
-static const struct SubspriteTable gUnknown_085A8144[] =
+static const struct SubspriteTable sSubspriteTable_DigitalDisplay_StopT[] =
 {
-    ARRAY_COUNT(gUnknown_085A813C), gUnknown_085A813C
+    ARRAY_COUNT(sSubsprites_DigitalDisplay_StopT), sSubsprites_DigitalDisplay_StopT
 };
 
-static const struct Subsprite gUnknown_085A814C[] =
+static const struct Subsprite sSubsprites_DigitalDisplay_StopO[] =
 {
     { 
         .x = -8, 
@@ -6199,12 +6563,12 @@ static const struct Subsprite gUnknown_085A814C[] =
     }
 };
 
-static const struct SubspriteTable gUnknown_085A8154[] =
+static const struct SubspriteTable sSubspriteTable_DigitalDisplay_StopO[] =
 {
-    ARRAY_COUNT(gUnknown_085A814C), gUnknown_085A814C
+    ARRAY_COUNT(sSubsprites_DigitalDisplay_StopO), sSubsprites_DigitalDisplay_StopO
 };
 
-static const struct Subsprite gUnknown_085A815C[] =
+static const struct Subsprite sSubsprites_DigitalDisplay_StopP[] =
 {
     { 
         .x = -8, 
@@ -6224,12 +6588,12 @@ static const struct Subsprite gUnknown_085A815C[] =
     }
 };
 
-static const struct SubspriteTable gUnknown_085A8164[] =
+static const struct SubspriteTable sSubspriteTable_DigitalDisplay_StopP[] =
 {
-    ARRAY_COUNT(gUnknown_085A815C), gUnknown_085A815C
+    ARRAY_COUNT(sSubsprites_DigitalDisplay_StopP), sSubsprites_DigitalDisplay_StopP
 };
 
-static const struct Subsprite gUnknown_085A816C[] =
+static const struct Subsprite sSubsprites_DigitalDisplay_BonusB[] =
 {
     { 
         .x = -8, 
@@ -6249,12 +6613,12 @@ static const struct Subsprite gUnknown_085A816C[] =
     }
 };
 
-static const struct SubspriteTable gUnknown_085A8174[] =
+static const struct SubspriteTable sSubspriteTable_DigitalDisplay_BonusB[] =
 {
-    ARRAY_COUNT(gUnknown_085A816C), gUnknown_085A816C
+    ARRAY_COUNT(sSubsprites_DigitalDisplay_BonusB), sSubsprites_DigitalDisplay_BonusB
 };
 
-static const struct Subsprite gUnknown_085A817C[] =
+static const struct Subsprite sSubsprites_DigitalDisplay_BonusO[] =
 {
     { 
         .x = -4, 
@@ -6274,12 +6638,12 @@ static const struct Subsprite gUnknown_085A817C[] =
     }
 };
 
-static const struct SubspriteTable gUnknown_085A8184[] =
+static const struct SubspriteTable sSubspriteTable_DigitalDisplay_BonusO[] =
 {
-    ARRAY_COUNT(gUnknown_085A817C), gUnknown_085A817C
+    ARRAY_COUNT(sSubsprites_DigitalDisplay_BonusO), sSubsprites_DigitalDisplay_BonusO
 };
 
-static const struct Subsprite gUnknown_085A818C[] =
+static const struct Subsprite sSubsprites_DigitalDisplay_BonusN[] =
 {
     { 
         .x = -8, 
@@ -6299,12 +6663,12 @@ static const struct Subsprite gUnknown_085A818C[] =
     }
 };
 
-static const struct SubspriteTable gUnknown_085A8194[] =
+static const struct SubspriteTable sSubspriteTable_DigitalDisplay_BonusN[] =
 {
-    ARRAY_COUNT(gUnknown_085A818C), gUnknown_085A818C
+    ARRAY_COUNT(sSubsprites_DigitalDisplay_BonusN), sSubsprites_DigitalDisplay_BonusN
 };
 
-static const struct Subsprite gUnknown_085A819C[] =
+static const struct Subsprite sSubsprites_DigitalDisplay_BonusU[] =
 {
     { 
         .x = -4, 
@@ -6324,12 +6688,12 @@ static const struct Subsprite gUnknown_085A819C[] =
     }
 };
 
-static const struct SubspriteTable gUnknown_085A81A4[] =
+static const struct SubspriteTable sSubspriteTable_DigitalDisplay_BonusU[] =
 {
-    ARRAY_COUNT(gUnknown_085A819C), gUnknown_085A819C
+    ARRAY_COUNT(sSubsprites_DigitalDisplay_BonusU), sSubsprites_DigitalDisplay_BonusU
 };
 
-static const struct Subsprite gUnknown_085A81AC[] =
+static const struct Subsprite sSubsprites_DigitalDisplay_BonusS[] =
 {
     { 
         .x = -8, 
@@ -6349,12 +6713,12 @@ static const struct Subsprite gUnknown_085A81AC[] =
     }
 };
 
-static const struct SubspriteTable gUnknown_085A81B4[] =
+static const struct SubspriteTable sSubspriteTable_DigitalDisplay_BonusS[] =
 {
-    ARRAY_COUNT(gUnknown_085A81AC), gUnknown_085A81AC
+    ARRAY_COUNT(sSubsprites_DigitalDisplay_BonusS), sSubsprites_DigitalDisplay_BonusS
 };
 
-static const struct Subsprite gUnknown_085A81BC[] =
+static const struct Subsprite sSubsprites_DigitalDisplay_BigB[] =
 {
     { 
         .x = -12, 
@@ -6406,12 +6770,12 @@ static const struct Subsprite gUnknown_085A81BC[] =
     }
 };
 
-static const struct SubspriteTable gUnknown_085A81D4[] =
+static const struct SubspriteTable sSubspriteTable_DigitalDisplay_BigB[] =
 {
-    ARRAY_COUNT(gUnknown_085A81BC), gUnknown_085A81BC
+    ARRAY_COUNT(sSubsprites_DigitalDisplay_BigB), sSubsprites_DigitalDisplay_BigB
 };
 
-static const struct Subsprite gUnknown_085A81DC[] =
+static const struct Subsprite sSubsprites_DigitalDisplay_BigI[] =
 {
     { 
         .x = -8, 
@@ -6439,12 +6803,12 @@ static const struct Subsprite gUnknown_085A81DC[] =
     }
 };
 
-static const struct SubspriteTable gUnknown_085A81E8[] =
+static const struct SubspriteTable sSubspriteTable_DigitalDisplay_BigI[] =
 {
-    ARRAY_COUNT(gUnknown_085A81DC), gUnknown_085A81DC
+    ARRAY_COUNT(sSubsprites_DigitalDisplay_BigI), sSubsprites_DigitalDisplay_BigI
 };
 
-static const struct Subsprite gUnknown_085A81F0[] =
+static const struct Subsprite sSubsprites_DigitalDisplay_BigG[] =
 {
     { 
         .x = -12, 
@@ -6496,12 +6860,12 @@ static const struct Subsprite gUnknown_085A81F0[] =
     }
 };
 
-static const struct SubspriteTable gUnknown_085A8208[] =
+static const struct SubspriteTable sSubspriteTable_DigitalDisplay_BigG[] =
 {
-    ARRAY_COUNT(gUnknown_085A81F0), gUnknown_085A81F0
+    ARRAY_COUNT(sSubsprites_DigitalDisplay_BigG), sSubsprites_DigitalDisplay_BigG
 };
 
-static const struct Subsprite gUnknown_085A8210[] =
+static const struct Subsprite sSubsprites_DigitalDisplay_RegR[] =
 {
     { 
         .x = -12, 
@@ -6553,12 +6917,12 @@ static const struct Subsprite gUnknown_085A8210[] =
     }
 };
 
-static const struct SubspriteTable gUnknown_085A8228[] =
+static const struct SubspriteTable sSubspriteTable_DigitalDisplay_RegR[] =
 {
-    ARRAY_COUNT(gUnknown_085A8210), gUnknown_085A8210
+    ARRAY_COUNT(sSubsprites_DigitalDisplay_RegR), sSubsprites_DigitalDisplay_RegR
 };
 
-static const struct Subsprite gUnknown_085A822C[] =
+static const struct Subsprite sSubsprites_DigitalDisplay_RegE[] =
 {
     { 
         .x = -8, 
@@ -6586,12 +6950,12 @@ static const struct Subsprite gUnknown_085A822C[] =
     }
 };
 
-static const struct SubspriteTable gUnknown_085A823C[] =
+static const struct SubspriteTable sSubspriteTable_DigitalDisplay_RegE[] =
 {
-    ARRAY_COUNT(gUnknown_085A822C), gUnknown_085A822C
+    ARRAY_COUNT(sSubsprites_DigitalDisplay_RegE), sSubsprites_DigitalDisplay_RegE
 };
 
-static const struct Subsprite gUnknown_085A8244[] =
+static const struct Subsprite sSubsprites_DigitalDisplay_RegG[] =
 {
     { 
         .x = -12, 
@@ -6643,190 +7007,196 @@ static const struct Subsprite gUnknown_085A8244[] =
     }
 };
 
-static const struct SubspriteTable gUnknown_085A825C[] =
-{
-    ARRAY_COUNT(gUnknown_085A8244), gUnknown_085A8244
-};
-
-static const struct SpriteTemplate *const gUnknown_083EDB5C[] =
-{
-    &gUnknown_085A7E48,
-    &gUnknown_085A7E60,
-    &gUnknown_085A7E78,
-    &gUnknown_085A7EA8,
-    &gUnknown_085A7EC0,
-    &gUnknown_085A7F20,
-    &gUnknown_085A7F38,
-    &gUnknown_085A7F50,
-    &gUnknown_085A7F68,
-    &gUnknown_085A7F80,
-    &gUnknown_085A7E90,
-    &gUnknown_085A7E90,
-    &gUnknown_085A7E90,
-    &gUnknown_085A7E90,
-    &gUnknown_085A7ED8,
-    &gUnknown_085A7ED8,
-    &gUnknown_085A7ED8,
-    &gUnknown_085A7ED8,
-    &gUnknown_085A7ED8,
-    &gUnknown_085A7EF0,
-    &gUnknown_085A7EF0,
-    &gUnknown_085A7EF0,
-    &gUnknown_085A7F08,
-    &gUnknown_085A7F08,
-    &gUnknown_085A7F08,
-    &gDummySpriteTemplate
-};
-
-static const struct SubspriteTable *const gUnknown_083EDBC4[] =
-{
-    gUnknown_085A8058,
-    gUnknown_085A8070,
-    gUnknown_085A8088,
-    gUnknown_085A80C0,
-    NULL,
-    NULL,
-    gUnknown_085A80D0,
-    NULL,
-    gUnknown_085A8110,
-    gUnknown_085A8124,
-    gUnknown_085A8134,
-    gUnknown_085A8144,
-    gUnknown_085A8154,
-    gUnknown_085A8164,
-    gUnknown_085A8174,
-    gUnknown_085A8184,
-    gUnknown_085A8194,
-    gUnknown_085A81A4,
-    gUnknown_085A81B4,
-    gUnknown_085A81D4,
-    gUnknown_085A81E8,
-    gUnknown_085A8208,
-    gUnknown_085A8228,
-    gUnknown_085A823C,
-    gUnknown_085A825C,
-    NULL
-};
-
-static const struct SpriteSheet gSlotMachineSpriteSheets[22] =
-{
-    { .data = gSlotMachineReelSymbol1Tiles, .size = 0x200, .tag = 0 },
-    { .data = gSlotMachineReelSymbol2Tiles, .size = 0x200, .tag = 1 },
-    { .data = gSlotMachineReelSymbol3Tiles, .size = 0x200, .tag = 2 },
-    { .data = gSlotMachineReelSymbol4Tiles, .size = 0x200, .tag = 3 },
-    { .data = gSlotMachineReelSymbol5Tiles, .size = 0x200, .tag = 4 },
-    { .data = gSlotMachineReelSymbol6Tiles, .size = 0x200, .tag = 5 },
-    { .data = gSlotMachineReelSymbol7Tiles, .size = 0x200, .tag = 6 },
-    { .data = gSlotMachineNumber0Tiles, .size = 0x40, .tag = 7 },
-    { .data = gSlotMachineNumber1Tiles, .size = 0x40, .tag = 8 },
-    { .data = gSlotMachineNumber2Tiles, .size = 0x40, .tag = 9 },
-    { .data = gSlotMachineNumber3Tiles, .size = 0x40, .tag = 10 },
-    { .data = gSlotMachineNumber4Tiles, .size = 0x40, .tag = 11 },
-    { .data = gSlotMachineNumber5Tiles, .size = 0x40, .tag = 12 },
-    { .data = gSlotMachineNumber6Tiles, .size = 0x40, .tag = 13 },
-    { .data = gSlotMachineNumber7Tiles, .size = 0x40, .tag = 14 },
-    { .data = gSlotMachineNumber8Tiles, .size = 0x40, .tag = 15 },
-    { .data = gSlotMachineNumber9Tiles, .size = 0x40, .tag = 16 },
+static const struct SubspriteTable sSubspriteTable_DigitalDisplay_RegG[] =
+{
+    ARRAY_COUNT(sSubsprites_DigitalDisplay_RegG), sSubsprites_DigitalDisplay_RegG
+};
+
+static const struct SpriteTemplate *const sSpriteTemplates_DigitalDisplay[NUM_DIG_DISPLAY_SPRITES] =
+{
+    [DIG_SPRITE_REEL]      = &sSpriteTemplate_DigitalDisplay_Reel,
+    [DIG_SPRITE_TIME]      = &sSpriteTemplate_DigitalDisplay_Time,
+    [DIG_SPRITE_INSERT]    = &sSpriteTemplate_DigitalDisplay_Insert,
+    [DIG_SPRITE_WIN]       = &sSpriteTemplate_DigitalDisplay_Win,
+    [DIG_SPRITE_LOSE]      = &sSpriteTemplate_DigitalDisplay_Lose,
+    [DIG_SPRITE_A_BUTTON]  = &sSpriteTemplate_DigitalDisplay_AButton,
+    [DIG_SPRITE_SMOKE]     = &sSpriteTemplate_DigitalDisplay_Smoke,
+    [DIG_SPRITE_NUMBER]    = &sSpriteTemplate_DigitalDisplay_Number,
+    [DIG_SPRITE_POKE_BALL] = &sSpriteTemplate_DigitalDisplay_Pokeball,
+    [DIG_SPRITE_D_PAD]     = &sSpriteTemplate_DigitalDisplay_DPad,
+    [DIG_SPRITE_STOP_S]    = &sSpriteTemplate_DigitalDisplay_Stop,
+    [DIG_SPRITE_STOP_T]    = &sSpriteTemplate_DigitalDisplay_Stop,
+    [DIG_SPRITE_STOP_O]    = &sSpriteTemplate_DigitalDisplay_Stop,
+    [DIG_SPRITE_STOP_P]    = &sSpriteTemplate_DigitalDisplay_Stop,
+    [DIG_SPRITE_BONUS_B]   = &sSpriteTemplate_DigitalDisplay_Bonus,
+    [DIG_SPRITE_BONUS_O]   = &sSpriteTemplate_DigitalDisplay_Bonus,
+    [DIG_SPRITE_BONUS_N]   = &sSpriteTemplate_DigitalDisplay_Bonus,
+    [DIG_SPRITE_BONUS_U]   = &sSpriteTemplate_DigitalDisplay_Bonus,
+    [DIG_SPRITE_BONUS_S]   = &sSpriteTemplate_DigitalDisplay_Bonus,
+    [DIG_SPRITE_BIG_B]     = &sSpriteTemplate_DigitalDisplay_Big,
+    [DIG_SPRITE_BIG_I]     = &sSpriteTemplate_DigitalDisplay_Big,
+    [DIG_SPRITE_BIG_G]     = &sSpriteTemplate_DigitalDisplay_Big,
+    [DIG_SPRITE_REG_R]     = &sSpriteTemplate_DigitalDisplay_Reg,
+    [DIG_SPRITE_REG_E]     = &sSpriteTemplate_DigitalDisplay_Reg,
+    [DIG_SPRITE_REG_G]     = &sSpriteTemplate_DigitalDisplay_Reg,
+    [DIG_SPRITE_EMPTY]     = &gDummySpriteTemplate
+};
+
+static const struct SubspriteTable *const sSubspriteTables_DigitalDisplay[NUM_DIG_DISPLAY_SPRITES] =
+{
+    [DIG_SPRITE_REEL]      = sSubspriteTable_DigitalDisplay_Reel,
+    [DIG_SPRITE_TIME]      = sSubspriteTable_DigitalDisplay_Time,
+    [DIG_SPRITE_INSERT]    = sSubspriteTable_DigitalDisplay_Insert,
+    [DIG_SPRITE_WIN]       = sSubspriteTable_DigitalDisplay_Win,
+    [DIG_SPRITE_LOSE]      = NULL,
+    [DIG_SPRITE_A_BUTTON]  = NULL,
+    [DIG_SPRITE_SMOKE]     = sSubspriteTable_DigitalDisplay_Smoke,
+    [DIG_SPRITE_NUMBER]    = NULL,
+    [DIG_SPRITE_POKE_BALL] = sSubspriteTable_DigitalDisplay_Pokeball,
+    [DIG_SPRITE_D_PAD]     = sSubspriteTable_DigitalDisplay_DPad,
+    [DIG_SPRITE_STOP_S]    = sSubspriteTable_DigitalDisplay_StopS,
+    [DIG_SPRITE_STOP_T]    = sSubspriteTable_DigitalDisplay_StopT,
+    [DIG_SPRITE_STOP_O]    = sSubspriteTable_DigitalDisplay_StopO,
+    [DIG_SPRITE_STOP_P]    = sSubspriteTable_DigitalDisplay_StopP,
+    [DIG_SPRITE_BONUS_B]   = sSubspriteTable_DigitalDisplay_BonusB,
+    [DIG_SPRITE_BONUS_O]   = sSubspriteTable_DigitalDisplay_BonusO,
+    [DIG_SPRITE_BONUS_N]   = sSubspriteTable_DigitalDisplay_BonusN,
+    [DIG_SPRITE_BONUS_U]   = sSubspriteTable_DigitalDisplay_BonusU,
+    [DIG_SPRITE_BONUS_S]   = sSubspriteTable_DigitalDisplay_BonusS,
+    [DIG_SPRITE_BIG_B]     = sSubspriteTable_DigitalDisplay_BigB,
+    [DIG_SPRITE_BIG_I]     = sSubspriteTable_DigitalDisplay_BigI,
+    [DIG_SPRITE_BIG_G]     = sSubspriteTable_DigitalDisplay_BigG,
+    [DIG_SPRITE_REG_R]     = sSubspriteTable_DigitalDisplay_RegR,
+    [DIG_SPRITE_REG_E]     = sSubspriteTable_DigitalDisplay_RegE,
+    [DIG_SPRITE_REG_G]     = sSubspriteTable_DigitalDisplay_RegG,
+    [DIG_SPRITE_EMPTY]     = NULL
+};
+
+static const struct SpriteSheet sSlotMachineSpriteSheets[22] =
+{
+    { .data = gSlotMachineReelSymbol1Tiles, .size = 0x200, .tag = GFXTAG_7_RED },
+    { .data = gSlotMachineReelSymbol2Tiles, .size = 0x200, .tag = GFXTAG_7_BLUE },
+    { .data = gSlotMachineReelSymbol3Tiles, .size = 0x200, .tag = GFXTAG_AZURILL },
+    { .data = gSlotMachineReelSymbol4Tiles, .size = 0x200, .tag = GFXTAG_LOTAD },
+    { .data = gSlotMachineReelSymbol5Tiles, .size = 0x200, .tag = GFXTAG_CHERRY },
+    { .data = gSlotMachineReelSymbol6Tiles, .size = 0x200, .tag = GFXTAG_POWER },
+    { .data = gSlotMachineReelSymbol7Tiles, .size = 0x200, .tag = GFXTAG_REPLAY },
+    { .data = gSlotMachineNumber0Tiles, .size = 0x40, .tag = GFXTAG_NUM_0 },
+    { .data = gSlotMachineNumber1Tiles, .size = 0x40, .tag = GFXTAG_NUM_1 },
+    { .data = gSlotMachineNumber2Tiles, .size = 0x40, .tag = GFXTAG_NUM_2 },
+    { .data = gSlotMachineNumber3Tiles, .size = 0x40, .tag = GFXTAG_NUM_3 },
+    { .data = gSlotMachineNumber4Tiles, .size = 0x40, .tag = GFXTAG_NUM_4 },
+    { .data = gSlotMachineNumber5Tiles, .size = 0x40, .tag = GFXTAG_NUM_5 },
+    { .data = gSlotMachineNumber6Tiles, .size = 0x40, .tag = GFXTAG_NUM_6 },
+    { .data = gSlotMachineNumber7Tiles, .size = 0x40, .tag = GFXTAG_NUM_7 },
+    { .data = gSlotMachineNumber8Tiles, .size = 0x40, .tag = GFXTAG_NUM_8 },
+    { .data = gSlotMachineNumber9Tiles, .size = 0x40, .tag = GFXTAG_NUM_9 },
+    // skips GFXTAG_REEL_BG, which has its own spritesheet
     // the data for these sheets is determined at runtime
-    { .data = NULL, .size = 0x200, .tag = 18 },
-    { .data = NULL, .size = 0x200, .tag = 19 },
-    { .data = NULL, .size = 0x300, .tag = 20 },
-    { .data = NULL, .size = 0x300, .tag = 21 },
+    { .data = NULL, .size = 0x200, .tag = GFXTAG_STOP },
+    { .data = NULL, .size = 0x200, .tag = GFXTAG_BONUS },
+    { .data = NULL, .size = 0x300, .tag = GFXTAG_BIG },
+    { .data = NULL, .size = 0x300, .tag = GFXTAG_REG },
     {},
 };
 
-static const u8 *const gUnknown_083EDCDC = gUnknown_08DD19F8;
+static const u8 *const sReelBackground_Tilemap = gSlotMachineReelBackground_Tilemap;
 
-static const u8 sUnused2[][2] = 
+static const u16 sUnused[] = 
 {
-    {0x7B, 0x6F}, 
-    {0x68, 0x69}, 
-    {0xAB, 0x36}, 
-    {0xFF, 0x7F}, 
-    {0x50, 0x57}, 
-    {0xC0, 0x7E}, 
-    {0xBA, 2}, 
-    {0xBA, 2}, 
-    {0xFD, 1}, 
-    {0xFD, 1}
+    0x6F7B,
+    0x6968,
+    0x36AB,
+    0x7FFF,
+    0x5750,
+    0x7EC0,
+    0x02BA,
+    0x02BA,
+    0x01FD,
+    0x01FD,
 };
 
-static const u8 gUnknown_085A83FC[] = {0x91, 0x7F};
-static const u8 gUnknown_085A83FE[] = {0xBF, 0x43};
-static const u8 gUnknown_085A8400[] = {0xBF, 0x43};
-static const u8 gUnknown_085A8402[] = {0xBF, 0x4A};
-static const u8 gUnknown_085A8404[] = {0xBF, 0x4A};
-
-static const u8 *const gUnknown_083EDD08[] =
+// The Bet 2 and 3 match line palettes are duplicated unnecessarily
+static const u16 sMiddleRowLit_Pal[] = {RGB(17, 28, 31)};
+static const u16 sTopRowLit_Pal[]  = {RGB(31, 29, 16)};
+static const u16 sBottomRowt_Pal[] = {RGB(31, 29, 16)};
+static const u16 sNWSEDiagLit_Pal[] = {RGB(31, 21, 18)};
+static const u16 sNESWDiagLit_Pal[] = {RGB(31, 21, 18)};
+static const u16 *const sLitMatchLinePalTable[NUM_MATCH_LINES] =
 {
-    gUnknown_085A83FC,
-    gUnknown_085A83FE,
-    gUnknown_085A8400,
-    gUnknown_085A8402,
-    gUnknown_085A8404,
+    [MATCH_MIDDLE_ROW] = sMiddleRowLit_Pal,
+    [MATCH_TOP_ROW]    = sTopRowLit_Pal,
+    [MATCH_BOTTOM_ROW] = sBottomRowt_Pal,
+    [MATCH_NWSE_DIAG]  = sNWSEDiagLit_Pal,
+    [MATCH_NESW_DIAG]  = sNESWDiagLit_Pal,
 };
 
-static const u16 *const gUnknown_083EDD1C[] =
+static const u16 *const sDarkMatchLinePalTable[NUM_MATCH_LINES] =
 {
-    gSlotMachineMenu_Pal + 0x4A,
-    gSlotMachineMenu_Pal + 0x4B,
-    gSlotMachineMenu_Pal + 0x4C,
-    gSlotMachineMenu_Pal + 0x4D,
-    gSlotMachineMenu_Pal + 0x4E,
+    [MATCH_MIDDLE_ROW] = &gSlotMachineMenu_Pal[74],
+    [MATCH_TOP_ROW]    = &gSlotMachineMenu_Pal[75],
+    [MATCH_BOTTOM_ROW] = &gSlotMachineMenu_Pal[76],
+    [MATCH_NWSE_DIAG]  = &gSlotMachineMenu_Pal[77],
+    [MATCH_NESW_DIAG]  = &gSlotMachineMenu_Pal[78],
 };
 
-static const u8 gUnknown_083EDD30[] = {0x4A, 0x4B, 0x4C, 0x4E, 0x4D};
+static const u8 sMatchLinePalOffsets[NUM_MATCH_LINES] = {
+    [MATCH_MIDDLE_ROW] = 74, 
+    [MATCH_TOP_ROW]    = 75, 
+    [MATCH_BOTTOM_ROW] = 76, 
+    [MATCH_NWSE_DIAG]  = 78, // Diag colors flipped for some reason
+    [MATCH_NESW_DIAG]  = 77  // Doesn't matter as both are identical
+};
 
-static const u8 gBettingTilesId[][2] =
+static const u8 sBetToMatchLineIds[MAX_BET][2] =
 {
-    {0, 0},
-    {1, 2},
-    {3, 4},
+    {MATCH_MIDDLE_ROW, MATCH_MIDDLE_ROW}, // Bet 1
+    {MATCH_TOP_ROW, MATCH_BOTTOM_ROW},    // Bet 2
+    {MATCH_NWSE_DIAG, MATCH_NESW_DIAG},   // Bet 3
 };
 
-static const u8 gNumberBettingTiles[] = { 1, 2, 2 };
-
-static const u16 gUnknown_085A843E[] = INCBIN_U16("graphics/slot_machine/85A843E.gbapal");
-static const u16 gUnknown_085A845E[] = INCBIN_U16("graphics/slot_machine/85A845E.gbapal");
-static const u16 gUnknown_085A847E[] = INCBIN_U16("graphics/slot_machine/85A847E.gbapal");
+static const u8 sMatchLinesPerBet[MAX_BET] = { 1, 2, 2 };
 
-static const u16 *const gUnknown_083EDDA0[] =
+// Flashing lights at top of slot machine, brightest point inside light goes from toward center of machine, to middle, to toward edges
+static const u16 sFlashingLightsInside_Pal[] = INCBIN_U16("graphics/slot_machine/flashing_lights_inside.gbapal");
+static const u16 sFlashingLightsMiddle_Pal[] = INCBIN_U16("graphics/slot_machine/flashing_lights_middle.gbapal");
+static const u16 sFlashingLightsOutside_Pal[] = INCBIN_U16("graphics/slot_machine/flashing_lights_outside.gbapal");
+static const u16 *const sFlashingLightsPalTable[] =
 {
-    gUnknown_085A843E,
-    gUnknown_085A845E,
-    gUnknown_085A847E,
+    sFlashingLightsInside_Pal,
+    sFlashingLightsMiddle_Pal,
+    sFlashingLightsOutside_Pal,
 };
 
-static const u16 *const gUnknown_083EDDAC = {gSlotMachineMenu_Pal + 0x10};
-
-static const u16 gUnknown_085A84B0[] = INCBIN_U16("graphics/slot_machine/85A84B0.gbapal");
-static const u16 gUnknown_085A84D0[] = INCBIN_U16("graphics/slot_machine/85A84D0.gbapal");
-static const u16 gUnknown_085A84F0[] = INCBIN_U16("graphics/slot_machine/85A84F0.gbapal");
+static const u16 *const sSlotMachineMenu_Pal = {gSlotMachineMenu_Pal + 16};
 
-static const u16 *const gUnknown_083EDE10[] =
+static const u16 sPokeballShining0_Pal[] = INCBIN_U16("graphics/slot_machine/pokeball_shining_0.gbapal");
+static const u16 sPokeballShining1_Pal[] = INCBIN_U16("graphics/slot_machine/pokeball_shining_1.gbapal");
+static const u16 sPokeballShining2_Pal[] = INCBIN_U16("graphics/slot_machine/pokeball_shining_2.gbapal");
+static const u16 *const sPokeballShiningPalTable[] =
 {
-    gUnknown_085A84B0,
-    gUnknown_085A84D0,
-    gUnknown_085A84F0,
-    gUnknown_08DCF230,
+    sPokeballShining0_Pal,          // Streak on left side of ball
+    sPokeballShining1_Pal,          // Streak in middle of ball
+    sPokeballShining2_Pal,          // Streak on right side of ball
+    gSlotMachineDigitalDisplay_Pal, // Back to normal
 };
 
-static const u16 *const gUnknown_083EDE20 = gUnknown_08DCF230;
-static const u16 gPalette_83EDE24[] = INCBIN_U16("graphics/slot_machine/85A8524.bin");
+static const u16 *const sDigitalDisplay_Pal = gSlotMachineDigitalDisplay_Pal;
+static const u16 sUnkPalette[] = INCBIN_U16("graphics/slot_machine/85A8524.bin");
 
-static const struct SpritePalette gSlotMachineSpritePalettes[] =
+static const struct SpritePalette sSlotMachineSpritePalettes[] =
 {
-    { .data = gUnknown_08DCF170, .tag = 0},
-    { .data = gUnknown_08DCF190, .tag = 1},
-    { .data = gUnknown_08DCF1B0, .tag = 2},
-    { .data = gSlotMachineReelTime_Pal, .tag = 3},
-    { .data = gUnknown_08DCF1F0, .tag = 4},
-    { .data = gUnknown_08DCF210, .tag = 5},
-    { .data = gUnknown_08DCF230, .tag = 6},
-    { .data = gUnknown_08DCF1F0, .tag = 7},
+    { .data = gSlotMachineReelSymbols_Pal,       .tag = PALTAG_REEL},
+    { .data = gSlotMachineReelTimePikachu_Pal,   .tag = PALTAG_REEL_TIME_PIKACHU},
+    { .data = gSlotMachineReelTimeMisc_Pal,      .tag = PALTAG_REEL_TIME_MISC},
+    { .data = gSlotMachineReelTimeMachine_Pal,   .tag = PALTAG_REEL_TIME_MACHINE},
+    { .data = gSlotMachineMisc_Pal,              .tag = PALTAG_MISC},
+    { .data = gSlotMachineReelTimeExplosion_Pal, .tag = PALTAG_EXPLOSION},
+    { .data = gSlotMachineDigitalDisplay_Pal,    .tag = PALTAG_DIG_DISPLAY},
+    { .data = gSlotMachineMisc_Pal,              .tag = PALTAG_PIKA_AURA},
     {}
 };
 
-static const u32 gReelTimeGfx[] = INCBIN_U32("graphics/slot_machine/reel_time_gfx.4bpp.lz");
-static const u16 gReelTimeWindowTilemap[] = INCBIN_U16("graphics/slot_machine/85A96E0.bin");
-static const u16 gUnknown_085A9898[] =  {0};
+static const u32 sReelTimeGfx[] = INCBIN_U32("graphics/slot_machine/reel_time_gfx.4bpp.lz"); // reel_time_machine and reel_time_pikachu
+static const u16 sReelTimeWindow_Tilemap[] = INCBIN_U16("graphics/slot_machine/reel_time_window.bin");
+static const u16 sEmptyTilemap[] =  {0};
diff --git a/src/start_menu.c b/src/start_menu.c
index 88ad364c7..68a316185 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -463,7 +463,7 @@ static bool32 InitStartMenuStep(void)
         sInitStartMenuData[0]++;
         break;
     case 4:
-        if (PrintStartMenuActions(&sInitStartMenuData[1], 2))
+        if (PrintStartMenuActions((s8 *)&sInitStartMenuData[1], 2))
             sInitStartMenuData[0]++;
         break;
     case 5:
diff --git a/src/starter_choose.c b/src/starter_choose.c
index dbdb1a8b3..2585f3408 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -14,6 +14,7 @@
 #include "sound.h"
 #include "sprite.h"
 #include "starter_choose.h"
+#include "strings.h"
 #include "task.h"
 #include "text.h"
 #include "text_window.h"
@@ -27,54 +28,45 @@
 #define STARTER_MON_COUNT   3
 
 // Position of the sprite of the selected starter Pokemon
-#define STARTER_PKMN_POS_X 120
+#define STARTER_PKMN_POS_X (DISPLAY_WIDTH / 2)
 #define STARTER_PKMN_POS_Y 64
 
-// text
-extern const u8 gText_BirchInTrouble[];
-extern const u8 gText_ConfirmStarterChoice[];
-
-// this file's functions
-static void MainCallback2_StarterChoose(void);
-static void sub_8134604(void);
-static void Task_StarterChoose1(u8 taskId);
-static void Task_StarterChoose2(u8 taskId);
-static void Task_StarterChoose3(u8 taskId);
-static void Task_StarterChoose4(u8 taskId);
-static void Task_StarterChoose5(u8 taskId);
-static void Task_StarterChoose6(u8 taskId);
+#define TAG_POKEBALL_SELECT 0x1000
+#define TAG_STARTER_CIRCLE  0x1001
+
+static void CB2_StarterChoose(void);
+static void ClearStarterLabel(void);
+static void Task_StarterChoose(u8 taskId);
+static void Task_HandleStarterChooseInput(u8 taskId);
+static void Task_WaitForStarterSprite(u8 taskId);
+static void Task_AskConfirmStarter(u8 taskId);
+static void Task_HandleConfirmStarterInput(u8 taskId);
+static void Task_DeclineStarter(u8 taskId);
 static void Task_MoveStarterChooseCursor(u8 taskId);
-static void sub_8134668(u8 taskId);
+static void Task_CreateStarterLabel(u8 taskId);
 static void CreateStarterPokemonLabel(u8 selection);
 static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y);
-void sub_81346DC(struct Sprite *sprite);
-void sub_813473C(struct Sprite *sprite);
-void StarterPokemonSpriteCallback(struct Sprite *sprite);
+static void SpriteCB_SelectionHand(struct Sprite *sprite);
+static void SpriteCB_Pokeball(struct Sprite *sprite);
+static void SpriteCB_StarterPokemon(struct Sprite *sprite);
 
-static u16 sStarterChooseWindowId;
+static u16 sStarterLabelWindowId;
 
-// .rodata
 const u16 gBirchBagGrassPal[][16] =
 {
     INCBIN_U16("graphics/misc/birch_bag.gbapal"),
     INCBIN_U16("graphics/misc/birch_grass.gbapal"),
 };
 
-const u16 gBirchBallarrow_Pal[] = INCBIN_U16("graphics/misc/birch_ballarrow.gbapal");
-
-const u16 gBirchCircle_Pal[] = INCBIN_U16("graphics/misc/birch_circle.gbapal");
-
+static const u16 sPokeballSelection_Pal[] = INCBIN_U16("graphics/misc/pokeball_selection.gbapal");
+static const u16 sStarterCircle_Pal[] = INCBIN_U16("graphics/misc/starter_circle.gbapal");
 const u32 gBirchBagTilemap[] = INCBIN_U32("graphics/misc/birch_bag_map.bin.lz");
-
 const u32 gBirchGrassTilemap[] = INCBIN_U32("graphics/misc/birch_grass_map.bin.lz");
+const u32 gBirchHelpGfx[] = INCBIN_U32("graphics/misc/birch_help.4bpp.lz"); // Birch bag and grass combined
+const u32 gPokeballSelection_Gfx[] = INCBIN_U32("graphics/misc/pokeball_selection.4bpp.lz");
+static const u32 sStarterCircle_Gfx[] = INCBIN_U32("graphics/misc/starter_circle.4bpp.lz");
 
-const u32 gBirchHelpGfx[] = INCBIN_U32("graphics/misc/birch_help.4bpp.lz");
-
-const u32 gUnknown_085B18AC[] = INCBIN_U32("graphics/misc/birch_ballarrow.4bpp.lz");
-
-const u32 gUnknown_085B1BCC[] = INCBIN_U32("graphics/misc/birch_circle.4bpp.lz");
-
-static const struct WindowTemplate gUnknown_085B1DCC[] =
+static const struct WindowTemplate sWindowTemplates[] =
 {
     {
         .bg = 0,
@@ -88,7 +80,7 @@ static const struct WindowTemplate gUnknown_085B1DCC[] =
     DUMMY_WIN_TEMPLATE,
 };
 
-static const struct WindowTemplate gUnknown_085B1DDC =
+static const struct WindowTemplate sWindowTemplate_ConfirmStarter =
 {
     .bg = 0,
     .tilemapLeft = 24,
@@ -99,7 +91,7 @@ static const struct WindowTemplate gUnknown_085B1DDC =
     .baseBlock = 0x0260
 };
 
-static const struct WindowTemplate gUnknown_085B1DE4 =
+static const struct WindowTemplate sWindowTemplate_StarterLabel =
 {
     .bg = 0,
     .tilemapLeft = 0,
@@ -117,7 +109,7 @@ static const u8 sPokeballCoords[STARTER_MON_COUNT][2] =
     {180, 64},
 };
 
-static const u8 sStarterLabelCoords[][2] =
+static const u8 sStarterLabelCoords[STARTER_MON_COUNT][2] =
 {
     {0, 9},
     {16, 10},
@@ -131,7 +123,7 @@ static const u16 sStarterMon[STARTER_MON_COUNT] =
     SPECIES_MUDKIP,
 };
 
-static const struct BgTemplate gUnknown_085B1E00[3] =
+static const struct BgTemplate sBgTemplates[3] =
 {
     {
         .bg = 0,
@@ -164,7 +156,7 @@ static const struct BgTemplate gUnknown_085B1E00[3] =
 
 static const u8 sTextColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY};
 
-static const struct OamData gOamData_85B1E10 =
+static const struct OamData sOam_Hand =
 {
     .y = 160,
     .affineMode = ST_OAM_AFFINE_OFF,
@@ -181,7 +173,7 @@ static const struct OamData gOamData_85B1E10 =
     .affineParam = 0,
 };
 
-static const struct OamData gOamData_85B1E18 =
+static const struct OamData sOam_Pokeball =
 {
     .y = 160,
     .affineMode = ST_OAM_AFFINE_OFF,
@@ -198,7 +190,7 @@ static const struct OamData gOamData_85B1E18 =
     .affineParam = 0,
 };
 
-static const struct OamData gOamData_85B1E20 =
+static const struct OamData sOam_StarterCircle =
 {
     .y = 160,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -222,19 +214,19 @@ static const u8 sCursorCoords[][2] =
     {180, 32},
 };
 
-static const union AnimCmd gSpriteAnim_85B1E30[] =
+static const union AnimCmd sAnim_Hand[] =
 {
     ANIMCMD_FRAME(48, 30),
     ANIMCMD_END,
 };
 
-static const union AnimCmd gSpriteAnim_85B1E38[] =
+static const union AnimCmd sAnim_Pokeball_Still[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_END,
 };
 
-static const union AnimCmd gSpriteAnim_85B1E40[] =
+static const union AnimCmd sAnim_Pokeball_Moving[] =
 {
     ANIMCMD_FRAME(16, 4),
     ANIMCMD_FRAME(0, 4),
@@ -256,109 +248,109 @@ static const union AnimCmd gSpriteAnim_85B1E40[] =
     ANIMCMD_JUMP(0),
 };
 
-static const union AnimCmd gSpriteAnim_85B1E88[] =
+static const union AnimCmd sAnim_StarterCircle[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_END,
 };
 
-static const union AnimCmd * const gSpriteAnimTable_85B1E90[] =
+static const union AnimCmd * const sAnims_Hand[] =
 {
-    gSpriteAnim_85B1E30,
+    sAnim_Hand,
 };
 
-static const union AnimCmd * const gSpriteAnimTable_85B1E94[] =
+static const union AnimCmd * const sAnims_Pokeball[] =
 {
-    gSpriteAnim_85B1E38,
-    gSpriteAnim_85B1E40,
+    sAnim_Pokeball_Still,
+    sAnim_Pokeball_Moving,
 };
 
-static const union AnimCmd * const gSpriteAnimTable_85B1E9C[] =
+static const union AnimCmd * const sAnims_StarterCircle[] =
 {
-    gSpriteAnim_85B1E88,
+    sAnim_StarterCircle,
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_85B1EA0[] =
+static const union AffineAnimCmd sAffineAnim_StarterPokemon[] =
 {
     AFFINEANIMCMD_FRAME(16, 16, 0, 0),
     AFFINEANIMCMD_FRAME(16, 16, 0, 15),
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_85B1EB8[] =
+static const union AffineAnimCmd sAffineAnim_StarterCircle[] =
 {
     AFFINEANIMCMD_FRAME(20, 20, 0, 0),
     AFFINEANIMCMD_FRAME(20, 20, 0, 15),
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd * const gUnknown_085B1ED0 = {gSpriteAffineAnim_85B1EA0};
-static const union AffineAnimCmd * const gSpriteAffineAnimTable_85B1ED4[] = {gSpriteAffineAnim_85B1EB8};
+static const union AffineAnimCmd * const sAffineAnims_StarterPokemon = {sAffineAnim_StarterPokemon};
+static const union AffineAnimCmd * const sAffineAnims_StarterCircle[] = {sAffineAnim_StarterCircle};
 
-static const struct CompressedSpriteSheet gUnknown_085B1ED8[] =
+static const struct CompressedSpriteSheet sSpriteSheet_PokeballSelect[] =
 {
     {
-        .data = gUnknown_085B18AC,
+        .data = gPokeballSelection_Gfx,
         .size = 0x0800,
-        .tag = 0x1000
+        .tag = TAG_POKEBALL_SELECT
     },
     {}
 };
 
-static const struct CompressedSpriteSheet gUnknown_085B1EE8[] =
+static const struct CompressedSpriteSheet sSpriteSheet_StarterCircle[] =
 {
     {
-        .data = gUnknown_085B1BCC,
+        .data = sStarterCircle_Gfx,
         .size = 0x0800,
-        .tag = 0x1001
+        .tag = TAG_STARTER_CIRCLE
     },
     {}
 };
 
-static const struct SpritePalette gUnknown_085B1EF8[] =
+static const struct SpritePalette sSpritePalettes_StarterChoose[] =
 {
     {
-        .data = gBirchBallarrow_Pal,
-        .tag = 0x1000
+        .data = sPokeballSelection_Pal,
+        .tag = TAG_POKEBALL_SELECT
     },
     {
-        .data = gBirchCircle_Pal,
-        .tag = 0x1001
+        .data = sStarterCircle_Pal,
+        .tag = TAG_STARTER_CIRCLE
     },
     {},
 };
 
 static const struct SpriteTemplate sSpriteTemplate_Hand =
 {
-    .tileTag = 0x1000,
-    .paletteTag = 0x1000,
-    .oam = &gOamData_85B1E10,
-    .anims = gSpriteAnimTable_85B1E90,
+    .tileTag = TAG_POKEBALL_SELECT,
+    .paletteTag = TAG_POKEBALL_SELECT,
+    .oam = &sOam_Hand,
+    .anims = sAnims_Hand,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_81346DC
+    .callback = SpriteCB_SelectionHand
 };
 
-static const struct SpriteTemplate sSpriteTemplate_PokeBall =
+static const struct SpriteTemplate sSpriteTemplate_Pokeball =
 {
-    .tileTag = 0x1000,
-    .paletteTag = 0x1000,
-    .oam = &gOamData_85B1E18,
-    .anims = gSpriteAnimTable_85B1E94,
+    .tileTag = TAG_POKEBALL_SELECT,
+    .paletteTag = TAG_POKEBALL_SELECT,
+    .oam = &sOam_Pokeball,
+    .anims = sAnims_Pokeball,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_813473C
+    .callback = SpriteCB_Pokeball
 };
 
-static const struct SpriteTemplate gUnknown_085B1F40 =
+static const struct SpriteTemplate sSpriteTemplate_StarterCircle =
 {
-    .tileTag = 0x1001,
-    .paletteTag = 0x1001,
-    .oam = &gOamData_85B1E20,
-    .anims = gSpriteAnimTable_85B1E9C,
+    .tileTag = TAG_STARTER_CIRCLE,
+    .paletteTag = TAG_STARTER_CIRCLE,
+    .oam = &sOam_StarterCircle,
+    .anims = sAnims_StarterCircle,
     .images = NULL,
-    .affineAnims = gSpriteAffineAnimTable_85B1ED4,
-    .callback = StarterPokemonSpriteCallback
+    .affineAnims = sAffineAnims_StarterCircle,
+    .callback = SpriteCB_StarterPokemon
 };
 
 // .text
@@ -376,10 +368,15 @@ static void VblankCB_StarterChoose(void)
     TransferPlttBuffer();
 }
 
+// Data for Task_StarterChoose
 #define tStarterSelection   data[0]
 #define tPkmnSpriteId       data[1]
 #define tCircleSpriteId     data[2]
 
+// Data for sSpriteTemplate_Pokeball
+#define sTaskId data[0]
+#define sBallId data[1]
+
 void CB2_ChooseStarter(void)
 {
     u16 savedIme;
@@ -412,12 +409,12 @@ void CB2_ChooseStarter(void)
     LZ77UnCompVram(gBirchGrassTilemap, (void *)(BG_SCREEN_ADDR(7)));
 
     ResetBgsAndClearDma3BusyFlags(0);
-    InitBgsFromTemplates(0, gUnknown_085B1E00, ARRAY_COUNT(gUnknown_085B1E00));
-    InitWindows(gUnknown_085B1DCC);
+    InitBgsFromTemplates(0, sBgTemplates, ARRAY_COUNT(sBgTemplates));
+    InitWindows(sWindowTemplates);
 
     DeactivateAllTextPrinters();
     LoadUserWindowBorderGfx(0, 0x2A8, 0xD0);
-    clear_scheduled_bg_copies_to_vram();
+    ClearScheduledBgCopiesToVram();
     ScanlineEffect_Stop();
     ResetTasks();
     ResetSpriteData();
@@ -427,17 +424,17 @@ void CB2_ChooseStarter(void)
 
     LoadPalette(GetOverworldTextboxPalettePtr(), 0xE0, 0x20);
     LoadPalette(gBirchBagGrassPal, 0, 0x40);
-    LoadCompressedSpriteSheet(&gUnknown_085B1ED8[0]);
-    LoadCompressedSpriteSheet(&gUnknown_085B1EE8[0]);
-    LoadSpritePalettes(gUnknown_085B1EF8);
+    LoadCompressedSpriteSheet(&sSpriteSheet_PokeballSelect[0]);
+    LoadCompressedSpriteSheet(&sSpriteSheet_StarterCircle[0]);
+    LoadSpritePalettes(sSpritePalettes_StarterChoose);
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
 
     EnableInterrupts(DISPSTAT_VBLANK);
     SetVBlankCallback(VblankCB_StarterChoose);
-    SetMainCallback2(MainCallback2_StarterChoose);
+    SetMainCallback2(CB2_StarterChoose);
 
-    SetGpuReg(REG_OFFSET_WININ, 0x3F);
-    SetGpuReg(REG_OFFSET_WINOUT, 0x1F);
+    SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR);
+    SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ);
     SetGpuReg(REG_OFFSET_WIN0H, 0);
     SetGpuReg(REG_OFFSET_WIN0V, 0);
     SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN);
@@ -449,7 +446,7 @@ void CB2_ChooseStarter(void)
     ShowBg(2);
     ShowBg(3);
 
-    taskId = CreateTask(Task_StarterChoose1, 0);
+    taskId = CreateTask(Task_StarterChoose, 0);
     gTasks[taskId].tStarterSelection = 1;
 
     // Create hand sprite
@@ -457,95 +454,95 @@ void CB2_ChooseStarter(void)
     gSprites[spriteId].data[0] = taskId;
 
     // Create three Pokeball sprites
-    spriteId = CreateSprite(&sSpriteTemplate_PokeBall, sPokeballCoords[0][0], sPokeballCoords[0][1], 2);
-    gSprites[spriteId].data[0] = taskId;
-    gSprites[spriteId].data[1] = 0;
+    spriteId = CreateSprite(&sSpriteTemplate_Pokeball, sPokeballCoords[0][0], sPokeballCoords[0][1], 2);
+    gSprites[spriteId].sTaskId = taskId;
+    gSprites[spriteId].sBallId = 0;
 
-    spriteId = CreateSprite(&sSpriteTemplate_PokeBall, sPokeballCoords[1][0], sPokeballCoords[1][1], 2);
-    gSprites[spriteId].data[0] = taskId;
-    gSprites[spriteId].data[1] = 1;
+    spriteId = CreateSprite(&sSpriteTemplate_Pokeball, sPokeballCoords[1][0], sPokeballCoords[1][1], 2);
+    gSprites[spriteId].sTaskId = taskId;
+    gSprites[spriteId].sBallId = 1;
 
-    spriteId = CreateSprite(&sSpriteTemplate_PokeBall, sPokeballCoords[2][0], sPokeballCoords[2][1], 2);
-    gSprites[spriteId].data[0] = taskId;
-    gSprites[spriteId].data[1] = 2;
+    spriteId = CreateSprite(&sSpriteTemplate_Pokeball, sPokeballCoords[2][0], sPokeballCoords[2][1], 2);
+    gSprites[spriteId].sTaskId = taskId;
+    gSprites[spriteId].sBallId = 2;
 
-    sStarterChooseWindowId = 0xFF;
+    sStarterLabelWindowId = 0xFF;
 }
 
-static void MainCallback2_StarterChoose(void)
+static void CB2_StarterChoose(void)
 {
     RunTasks();
     AnimateSprites();
     BuildOamBuffer();
-    do_scheduled_bg_tilemap_copies_to_vram();
+    DoScheduledBgTilemapCopiesToVram();
     UpdatePaletteFade();
 }
 
-static void Task_StarterChoose1(u8 taskId)
+static void Task_StarterChoose(u8 taskId)
 {
     CreateStarterPokemonLabel(gTasks[taskId].tStarterSelection);
     DrawStdFrameWithCustomTileAndPalette(0, FALSE, 0x2A8, 0xD);
     AddTextPrinterParameterized(0, 1, gText_BirchInTrouble, 0, 1, 0, NULL);
     PutWindowTilemap(0);
     ScheduleBgCopyTilemapToVram(0);
-    gTasks[taskId].func = Task_StarterChoose2;
+    gTasks[taskId].func = Task_HandleStarterChooseInput;
 }
 
-static void Task_StarterChoose2(u8 taskId)
+static void Task_HandleStarterChooseInput(u8 taskId)
 {
     u8 selection = gTasks[taskId].tStarterSelection;
 
-    if (gMain.newKeys & A_BUTTON)
+    if (JOY_NEW(A_BUTTON))
     {
         u8 spriteId;
 
-        sub_8134604();
+        ClearStarterLabel();
 
         // Create white circle background
-        spriteId = CreateSprite(&gUnknown_085B1F40, sPokeballCoords[selection][0], sPokeballCoords[selection][1], 1);
+        spriteId = CreateSprite(&sSpriteTemplate_StarterCircle, sPokeballCoords[selection][0], sPokeballCoords[selection][1], 1);
         gTasks[taskId].tCircleSpriteId = spriteId;
 
         // Create Pokemon sprite
         spriteId = CreatePokemonFrontSprite(GetStarterPokemon(gTasks[taskId].tStarterSelection), sPokeballCoords[selection][0], sPokeballCoords[selection][1]);
-        gSprites[spriteId].affineAnims = &gUnknown_085B1ED0;
-        gSprites[spriteId].callback = StarterPokemonSpriteCallback;
+        gSprites[spriteId].affineAnims = &sAffineAnims_StarterPokemon;
+        gSprites[spriteId].callback = SpriteCB_StarterPokemon;
 
         gTasks[taskId].tPkmnSpriteId = spriteId;
-        gTasks[taskId].func = Task_StarterChoose3;
+        gTasks[taskId].func = Task_WaitForStarterSprite;
     }
-    else if ((gMain.newKeys & DPAD_LEFT) && selection > 0)
+    else if (JOY_NEW(DPAD_LEFT) && selection > 0)
     {
         gTasks[taskId].tStarterSelection--;
         gTasks[taskId].func = Task_MoveStarterChooseCursor;
     }
-    else if ((gMain.newKeys & DPAD_RIGHT) && selection < (STARTER_MON_COUNT - 1))
+    else if (JOY_NEW(DPAD_RIGHT) && selection < STARTER_MON_COUNT - 1)
     {
         gTasks[taskId].tStarterSelection++;
         gTasks[taskId].func = Task_MoveStarterChooseCursor;
     }
 }
 
-static void Task_StarterChoose3(u8 taskId)
+static void Task_WaitForStarterSprite(u8 taskId)
 {
     if (gSprites[gTasks[taskId].tCircleSpriteId].affineAnimEnded &&
-      gSprites[gTasks[taskId].tCircleSpriteId].pos1.x == STARTER_PKMN_POS_X &&
-      gSprites[gTasks[taskId].tCircleSpriteId].pos1.y == STARTER_PKMN_POS_Y)
+        gSprites[gTasks[taskId].tCircleSpriteId].pos1.x == STARTER_PKMN_POS_X &&
+        gSprites[gTasks[taskId].tCircleSpriteId].pos1.y == STARTER_PKMN_POS_Y)
     {
-        gTasks[taskId].func = Task_StarterChoose4;
+        gTasks[taskId].func = Task_AskConfirmStarter;
     }
 }
 
-static void Task_StarterChoose4(u8 taskId)
+static void Task_AskConfirmStarter(u8 taskId)
 {
     PlayCry1(GetStarterPokemon(gTasks[taskId].tStarterSelection), 0);
     FillWindowPixelBuffer(0, PIXEL_FILL(1));
     AddTextPrinterParameterized(0, 1, gText_ConfirmStarterChoice, 0, 1, 0, NULL);
     ScheduleBgCopyTilemapToVram(0);
-    CreateYesNoMenu(&gUnknown_085B1DDC, 0x2A8, 0xD, 0);
-    gTasks[taskId].func = Task_StarterChoose5;
+    CreateYesNoMenu(&sWindowTemplate_ConfirmStarter, 0x2A8, 0xD, 0);
+    gTasks[taskId].func = Task_HandleConfirmStarterInput;
 }
 
-static void Task_StarterChoose5(u8 taskId)
+static void Task_HandleConfirmStarterInput(u8 taskId)
 {
     u8 spriteId;
 
@@ -558,7 +555,7 @@ static void Task_StarterChoose5(u8 taskId)
         SetMainCallback2(gMain.savedCallback);
         break;
     case 1:  // NO
-    case -1: // B button
+    case MENU_B_PRESSED:
         PlaySE(SE_SELECT);
         spriteId = gTasks[taskId].tPkmnSpriteId;
         FreeOamMatrix(gSprites[spriteId].oam.matrixNum);
@@ -567,14 +564,14 @@ static void Task_StarterChoose5(u8 taskId)
         spriteId = gTasks[taskId].tCircleSpriteId;
         FreeOamMatrix(gSprites[spriteId].oam.matrixNum);
         DestroySprite(&gSprites[spriteId]);
-        gTasks[taskId].func = Task_StarterChoose6;
+        gTasks[taskId].func = Task_DeclineStarter;
         break;
     }
 }
 
-static void Task_StarterChoose6(u8 taskId)
+static void Task_DeclineStarter(u8 taskId)
 {
-    gTasks[taskId].func = Task_StarterChoose1;
+    gTasks[taskId].func = Task_StarterChoose;
 }
 
 static void CreateStarterPokemonLabel(u8 selection)
@@ -589,20 +586,20 @@ static void CreateStarterPokemonLabel(u8 selection)
     CopyMonCategoryText(SpeciesToNationalPokedexNum(species), categoryText);
     speciesName = gSpeciesNames[species];
 
-    winTemplate = gUnknown_085B1DE4;
+    winTemplate = sWindowTemplate_StarterLabel;
     winTemplate.tilemapLeft = sStarterLabelCoords[selection][0];
     winTemplate.tilemapTop = sStarterLabelCoords[selection][1];
 
-    sStarterChooseWindowId = AddWindow(&winTemplate);
-    FillWindowPixelBuffer(sStarterChooseWindowId, PIXEL_FILL(0));
+    sStarterLabelWindowId = AddWindow(&winTemplate);
+    FillWindowPixelBuffer(sStarterLabelWindowId, PIXEL_FILL(0));
 
     width = GetStringCenterAlignXOffset(7, categoryText, 0x68);
-    AddTextPrinterParameterized3(sStarterChooseWindowId, 7, width, 1, sTextColors, 0, categoryText);
+    AddTextPrinterParameterized3(sStarterLabelWindowId, 7, width, 1, sTextColors, 0, categoryText);
 
     width = GetStringCenterAlignXOffset(1, speciesName, 0x68);
-    AddTextPrinterParameterized3(sStarterChooseWindowId, 1, width, 0x11, sTextColors, 0, speciesName);
+    AddTextPrinterParameterized3(sStarterLabelWindowId, 1, width, 17, sTextColors, 0, speciesName);
 
-    PutWindowTilemap(sStarterChooseWindowId);
+    PutWindowTilemap(sStarterLabelWindowId);
     ScheduleBgCopyTilemapToVram(0);
 
     labelLeft = sStarterLabelCoords[selection][0] * 8 - 4;
@@ -613,12 +610,12 @@ static void CreateStarterPokemonLabel(u8 selection)
     SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(labelTop, labelBottom));
 }
 
-static void sub_8134604(void)
+static void ClearStarterLabel(void)
 {
-    FillWindowPixelBuffer(sStarterChooseWindowId, PIXEL_FILL(0));
-    ClearWindowTilemap(sStarterChooseWindowId);
-    RemoveWindow(sStarterChooseWindowId);
-    sStarterChooseWindowId = 0xFF;
+    FillWindowPixelBuffer(sStarterLabelWindowId, PIXEL_FILL(0));
+    ClearWindowTilemap(sStarterLabelWindowId);
+    RemoveWindow(sStarterLabelWindowId);
+    sStarterLabelWindowId = 0xFF;
     SetGpuReg(REG_OFFSET_WIN0H, 0);
     SetGpuReg(REG_OFFSET_WIN0V, 0);
     ScheduleBgCopyTilemapToVram(0);
@@ -626,14 +623,14 @@ static void sub_8134604(void)
 
 static void Task_MoveStarterChooseCursor(u8 taskId)
 {
-    sub_8134604();
-    gTasks[taskId].func = sub_8134668;
+    ClearStarterLabel();
+    gTasks[taskId].func = Task_CreateStarterLabel;
 }
 
-static void sub_8134668(u8 taskId)
+static void Task_CreateStarterLabel(u8 taskId)
 {
     CreateStarterPokemonLabel(gTasks[taskId].tStarterSelection);
-    gTasks[taskId].func = Task_StarterChoose2;
+    gTasks[taskId].func = Task_HandleStarterChooseInput;
 }
 
 static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y)
@@ -645,25 +642,27 @@ static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y)
     return spriteId;
 }
 
-void sub_81346DC(struct Sprite *sprite)
+static void SpriteCB_SelectionHand(struct Sprite *sprite)
 {
+    // Float up and down above selected pokeball
     sprite->pos1.x = sCursorCoords[gTasks[sprite->data[0]].tStarterSelection][0];
     sprite->pos1.y = sCursorCoords[gTasks[sprite->data[0]].tStarterSelection][1];
     sprite->pos2.y = Sin(sprite->data[1], 8);
     sprite->data[1] = (u8)(sprite->data[1]) + 4;
 }
 
-void sub_813473C(struct Sprite *sprite)
+static void SpriteCB_Pokeball(struct Sprite *sprite)
 {
-    if (gTasks[sprite->data[0]].tStarterSelection == sprite->data[1])
+    // Animate pokeball if currently selected
+    if (gTasks[sprite->sTaskId].tStarterSelection == sprite->sBallId)
         StartSpriteAnimIfDifferent(sprite, 1);
     else
         StartSpriteAnimIfDifferent(sprite, 0);
 }
 
-void StarterPokemonSpriteCallback(struct Sprite *sprite)
+static void SpriteCB_StarterPokemon(struct Sprite *sprite)
 {
-    //Move sprite to upper center of screen
+    // Move sprite to upper center of screen
     if (sprite->pos1.x > STARTER_PKMN_POS_X)
         sprite->pos1.x -= 4;
     if (sprite->pos1.x < STARTER_PKMN_POS_X)
diff --git a/src/strings.c b/src/strings.c
index 324e6098a..07361ba60 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -402,7 +402,7 @@ const u8 gText_PkmnNeedsToReplaceMove[] = _("{STR_VAR_1} wants to learn the\nmov
 const u8 gText_StopLearningMove2[] = _("Stop trying to teach\n{STR_VAR_2}?");
 const u8 gText_MoveNotLearned[] = _("{STR_VAR_1} did not learn the\nmove {STR_VAR_2}.{PAUSE_UNTIL_PRESS}");
 const u8 gText_WhichMoveToForget[] = _("Which move should be forgotten?{PAUSE_UNTIL_PRESS}");
-const u8 gText_12PoofForgotMove[] = _("1, {PAUSE 15}2, and{PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE 0x0038}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd…{PAUSE_UNTIL_PRESS}");
+const u8 gText_12PoofForgotMove[] = _("1, {PAUSE 15}2, and{PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE SE_KON}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd…{PAUSE_UNTIL_PRESS}");
 const u8 gText_PkmnAlreadyKnows[] = _("{STR_VAR_1} already knows\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}");
 const u8 gText_PkmnHPRestoredByVar2[] = _("{STR_VAR_1}'s HP was restored\nby {STR_VAR_2} point(s).{PAUSE_UNTIL_PRESS}");
 const u8 gText_PkmnCuredOfPoison[] = _("{STR_VAR_1} was cured of its\npoisoning.{PAUSE_UNTIL_PRESS}");
@@ -512,14 +512,14 @@ const u8 gText_EggWillTakeSomeTime[] = _("What will hatch from this?\nIt will ta
 const u8 gText_EggWillHatchSoon[] = _("It moves occasionally.\nIt should hatch soon.");
 const u8 gText_EggAboutToHatch[] = _("It's making sounds.\nIt's about to hatch!");
 const u8 gText_HMMovesCantBeForgotten2[] = _("HM moves can't be\nforgotten now.");
-const u8 gText_XNatureMetAtYZ[] = _("{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nmet at {LV_2}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01},\n{SPECIAL_F7 0x00}{SPECIAL_F7 0x04}{SPECIAL_F7 0x01}.");
-const u8 gText_XNatureHatchedAtYZ[] = _("{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nhatched at {LV_2}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01},\n{SPECIAL_F7 0x00}{SPECIAL_F7 0x04}{SPECIAL_F7 0x01}.");
-const u8 gText_XNatureObtainedInTrade[] = _("{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nobtained in a trade.");
-const u8 gText_XNatureFatefulEncounter[] = _("{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nobtained in a fateful\nencounter at {LV_2}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01}.");
-const u8 gText_XNatureProbablyMetAt[] = _("{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nprobably met at {LV_2}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01},\n{SPECIAL_F7 0x00}{SPECIAL_F7 0x04}{SPECIAL_F7 0x01}.");
-const u8 gText_XNature[] = _("{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature");
-const u8 gText_XNatureMetSomewhereAt[] = _("{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nmet somewhere at {LV_2}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01}.");
-const u8 gText_XNatureHatchedSomewhereAt[] = _("{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nhatched somewhere at {LV_2}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01}.");
+const u8 gText_XNatureMetAtYZ[] = _("{DYNAMIC 0}{DYNAMIC 2}{DYNAMIC 1}{DYNAMIC 5} nature,\nmet at {LV_2}{DYNAMIC 0}{DYNAMIC 3}{DYNAMIC 1},\n{DYNAMIC 0}{DYNAMIC 4}{DYNAMIC 1}.");
+const u8 gText_XNatureHatchedAtYZ[] = _("{DYNAMIC 0}{DYNAMIC 2}{DYNAMIC 1}{DYNAMIC 5} nature,\nhatched at {LV_2}{DYNAMIC 0}{DYNAMIC 3}{DYNAMIC 1},\n{DYNAMIC 0}{DYNAMIC 4}{DYNAMIC 1}.");
+const u8 gText_XNatureObtainedInTrade[] = _("{DYNAMIC 0}{DYNAMIC 2}{DYNAMIC 1}{DYNAMIC 5} nature,\nobtained in a trade.");
+const u8 gText_XNatureFatefulEncounter[] = _("{DYNAMIC 0}{DYNAMIC 2}{DYNAMIC 1}{DYNAMIC 5} nature,\nobtained in a fateful\nencounter at {LV_2}{DYNAMIC 0}{DYNAMIC 3}{DYNAMIC 1}.");
+const u8 gText_XNatureProbablyMetAt[] = _("{DYNAMIC 0}{DYNAMIC 2}{DYNAMIC 1}{DYNAMIC 5} nature,\nprobably met at {LV_2}{DYNAMIC 0}{DYNAMIC 3}{DYNAMIC 1},\n{DYNAMIC 0}{DYNAMIC 4}{DYNAMIC 1}.");
+const u8 gText_XNature[] = _("{DYNAMIC 0}{DYNAMIC 2}{DYNAMIC 1}{DYNAMIC 5} nature");
+const u8 gText_XNatureMetSomewhereAt[] = _("{DYNAMIC 0}{DYNAMIC 2}{DYNAMIC 1}{DYNAMIC 5} nature,\nmet somewhere at {LV_2}{DYNAMIC 0}{DYNAMIC 3}{DYNAMIC 1}.");
+const u8 gText_XNatureHatchedSomewhereAt[] = _("{DYNAMIC 0}{DYNAMIC 2}{DYNAMIC 1}{DYNAMIC 5} nature,\nhatched somewhere at {LV_2}{DYNAMIC 0}{DYNAMIC 3}{DYNAMIC 1}.");
 const u8 gText_OddEggFoundByCouple[] = _("An odd POKéMON EGG found\nby the DAY CARE couple.");
 const u8 gText_PeculiarEggNicePlace[] = _("A peculiar POKéMON EGG\nobtained at the nice place.");
 const u8 gText_PeculiarEggTrade[] = _("A peculiar POKéMON EGG\nobtained in a trade.");
@@ -861,14 +861,14 @@ const u8 gText_ExitFromBox[] = _("Exit from the BOX?");
 const u8 gText_WhatDoYouWantToDo[] = _("What do you want to do?");
 const u8 gText_PleasePickATheme[] = _("Please pick a theme.");
 const u8 gText_PickTheWallpaper[] = _("Pick the wallpaper.");
-const u8 gText_PkmnIsSelected[] = _("{SPECIAL_F7 0x00} is selected.");
+const u8 gText_PkmnIsSelected[] = _("{DYNAMIC 0} is selected.");
 const u8 gText_JumpToWhichBox[] = _("Jump to which BOX?");
 const u8 gText_DepositInWhichBox[] = _("Deposit in which BOX?");
-const u8 gText_PkmnWasDeposited[] = _("{SPECIAL_F7 0x00} was deposited.");
+const u8 gText_PkmnWasDeposited[] = _("{DYNAMIC 0} was deposited.");
 const u8 gText_BoxIsFull2[] = _("The BOX is full.");
 const u8 gText_ReleaseThisPokemon[] = _("Release this POKéMON?");
-const u8 gText_PkmnWasReleased[] = _("{SPECIAL_F7 0x00} was released.");
-const u8 gText_ByeByePkmn[] = _("Bye-bye, {SPECIAL_F7 0x00}!");
+const u8 gText_PkmnWasReleased[] = _("{DYNAMIC 0} was released.");
+const u8 gText_ByeByePkmn[] = _("Bye-bye, {DYNAMIC 0}!");
 const u8 gText_MarkYourPkmn[] = _("Mark your POKéMON.");
 const u8 gText_ThatsYourLastPkmn[] = _("That's your last POKéMON!");
 const u8 gText_YourPartysFull[] = _("Your party's full!");
@@ -876,7 +876,7 @@ const u8 gText_YoureHoldingAPkmn[] = _("You're holding a POKéMON!");
 const u8 gText_WhichOneWillYouTake[] = _("Which one will you take?");
 const u8 gText_YouCantReleaseAnEgg[] = _("You can't release an EGG.");
 const u8 gText_ContinueBoxOperations[] = _("Continue BOX operations?");
-const u8 gText_PkmnCameBack[] = _("{SPECIAL_F7 0x00} came back!");
+const u8 gText_PkmnCameBack[] = _("{DYNAMIC 0} came back!");
 const u8 gText_WasItWorriedAboutYou[] = _("Was it worried about you?");
 const u8 gText_FourEllipsesExclamation[] = _("… … … … !");
 const u8 gText_PleaseRemoveTheMail[] = _("Please remove the MAIL.");
@@ -884,8 +884,8 @@ const u8 gText_GiveToAPkmn[] = _("GIVE to a POKéMON?");
 const u8 gText_PlacedItemInBag[] = _("Placed item in the BAG.");
 const u8 gText_BagIsFull2[] = _("The BAG is full.");
 const u8 gText_PutItemInBag[] = _("Put this item in the BAG?");
-const u8 gText_ItemIsNowHeld[] = _("{SPECIAL_F7 0x00} is now held.");
-const u8 gText_ChangedToNewItem[] = _("Changed to {SPECIAL_F7 0x00}.");
+const u8 gText_ItemIsNowHeld[] = _("{DYNAMIC 0} is now held.");
+const u8 gText_ChangedToNewItem[] = _("Changed to {DYNAMIC 0}.");
 const u8 gText_MailCantBeStored[] = _("MAIL can't be stored!");
 const u8 gPCText_Cancel[] = _("CANCEL");
 const u8 gPCText_Store[] = _("STORE");
@@ -981,18 +981,18 @@ const u8 gText_TrainerCloseBy[] = _("That TRAINER is close by.\nTalk to the TRAI
 const u8 gText_InParty[] = _("IN PARTY");
 const u8 gText_Number2[] = _("No. ");
 const u8 gText_Ribbons[] = _("RIBBONS"); // Unused
-const u8 gText_PokemonMaleLv[] = _("{SPECIAL_F7 0x00}{COLOR_HIGHLIGHT_SHADOW LIGHT_RED WHITE GREEN}♂{COLOR_HIGHLIGHT_SHADOW DARK_GREY WHITE LIGHT_GREY}/{LV}{SPECIAL_F7 0x01}"); // Unused
-const u8 gText_PokemonFemaleLv[] = _("{SPECIAL_F7 0x00}{COLOR_HIGHLIGHT_SHADOW LIGHT_GREEN WHITE BLUE}♀{COLOR_HIGHLIGHT_SHADOW DARK_GREY WHITE LIGHT_GREY}/{LV}{SPECIAL_F7 0x01}"); // Unused
-const u8 gText_PokemonNoGenderLv[] = _("{SPECIAL_F7 0x00}/{LV}{SPECIAL_F7 0x01}"); // Unused
+const u8 gText_PokemonMaleLv[] = _("{DYNAMIC 0}{COLOR_HIGHLIGHT_SHADOW LIGHT_RED WHITE GREEN}♂{COLOR_HIGHLIGHT_SHADOW DARK_GREY WHITE LIGHT_GREY}/{LV}{DYNAMIC 1}"); // Unused
+const u8 gText_PokemonFemaleLv[] = _("{DYNAMIC 0}{COLOR_HIGHLIGHT_SHADOW LIGHT_GREEN WHITE BLUE}♀{COLOR_HIGHLIGHT_SHADOW DARK_GREY WHITE LIGHT_GREY}/{LV}{DYNAMIC 1}"); // Unused
+const u8 gText_PokemonNoGenderLv[] = _("{DYNAMIC 0}/{LV}{DYNAMIC 1}"); // Unused
 const u8 gText_Unknown[] = _("UNKNOWN");
 const u8 gText_Call[] = _("CALL");
 const u8 gText_Check[] = _("CHECK");
 const u8 gText_Cancel6[] = _("CANCEL");
-const u8 gText_NumberF700[] = _("No. {SPECIAL_F7 0x00}");
-const u8 gText_RibbonsF700[] = _("RIBBONS {SPECIAL_F7 0x00}");
-const u8 gText_PokemonMaleLv2[] = _("{SPECIAL_F7 0x00}{COLOR_HIGHLIGHT_SHADOW LIGHT_RED WHITE GREEN}♂{COLOR_HIGHLIGHT_SHADOW DARK_GREY WHITE LIGHT_GREY}/{LV}{SPECIAL_F7 0x01}{SPECIAL_F7 0x02}"); // Unused
-const u8 gText_PokemonFemaleLv2[] = _("{SPECIAL_F7 0x00}{COLOR_HIGHLIGHT_SHADOW LIGHT_GREEN WHITE BLUE}♀{COLOR_HIGHLIGHT_SHADOW DARK_GREY WHITE LIGHT_GREY}/{LV}{SPECIAL_F7 0x01}{SPECIAL_F7 0x02}"); // Unused
-const u8 gText_PokemonNoGenderLv2[] = _("{SPECIAL_F7 0x00}/{LV}{SPECIAL_F7 0x01}{SPECIAL_F7 0x02}"); // Unused
+const u8 gText_NumberF700[] = _("No. {DYNAMIC 0}");
+const u8 gText_RibbonsF700[] = _("RIBBONS {DYNAMIC 0}");
+const u8 gText_PokemonMaleLv2[] = _("{DYNAMIC 0}{COLOR_HIGHLIGHT_SHADOW LIGHT_RED WHITE GREEN}♂{COLOR_HIGHLIGHT_SHADOW DARK_GREY WHITE LIGHT_GREY}/{LV}{DYNAMIC 1}{DYNAMIC 2}"); // Unused
+const u8 gText_PokemonFemaleLv2[] = _("{DYNAMIC 0}{COLOR_HIGHLIGHT_SHADOW LIGHT_GREEN WHITE BLUE}♀{COLOR_HIGHLIGHT_SHADOW DARK_GREY WHITE LIGHT_GREY}/{LV}{DYNAMIC 1}{DYNAMIC 2}"); // Unused
+const u8 gText_PokemonNoGenderLv2[] = _("{DYNAMIC 0}/{LV}{DYNAMIC 1}{DYNAMIC 2}"); // Unused
 const u8 gText_CombineFourWordsOrPhrases[] = _("Combine four words or phrases");
 const u8 gText_AndMakeYourProfile[] = _("and make your profile.");
 const u8 gText_CombineSixWordsOrPhrases[] = _("Combine six words or phrases");
@@ -1063,7 +1063,7 @@ const u8 gText_ApprenticesPhrase[] = _("Apprentice's phrase");
 const u8 gText_Questionnaire[] = _("QUESTIONNAIRE");
 const u8 gText_YouCannotQuitHere[] = _("You cannot quit here.");
 const u8 gText_SectionMustBeCompleted[] = _("This section must be completed.");
-const u8 gText_F700sQuiz[] = _("{SPECIAL_F7 0x00}'s quiz");
+const u8 gText_F700sQuiz[] = _("{DYNAMIC 0}'s quiz");
 const u8 gText_Lady[] = _("Lady");
 const u8 gText_AfterYouHaveReadTheQuiz[] = _("After you have read the quiz");
 const u8 gText_QuestionPressTheAButton[] = _("question, press the A Button.");
@@ -1255,16 +1255,16 @@ const u8 gText_QuitChatting[] = _("Quit chatting?");
 const u8 gText_RegisterTextWhere[] = _("Register text where?");
 const u8 gText_RegisterTextHere[] = _("Register text here?");
 const u8 gText_InputText[] = _("Input text.");
-const u8 gText_F700JoinedChat[] = _("{SPECIAL_F7 0x00} joined the chat!");
-const u8 gText_F700LeftChat[] = _("{SPECIAL_F7 0x00} left the chat.");
-const u8 gJPText_PlayersXPokemon[] = _("{SPECIAL_F7 0x00}の{SPECIAL_F7 0x01}ひきめ:"); // Unused
-const u8 gJPText_PlayersXPokmonDoesNotExist[] = _("{SPECIAL_F7 0x00}の{SPECIAL_F7 0x01}ひきめは いません"); // Unused
+const u8 gText_F700JoinedChat[] = _("{DYNAMIC 0} joined the chat!");
+const u8 gText_F700LeftChat[] = _("{DYNAMIC 0} left the chat.");
+const u8 gJPText_PlayersXPokemon[] = _("{DYNAMIC 0}の{DYNAMIC 1}ひきめ:"); // Unused
+const u8 gJPText_PlayersXPokmonDoesNotExist[] = _("{DYNAMIC 0}の{DYNAMIC 1}ひきめは いません"); // Unused
 const u8 gText_ExitingChat[] = _("Exiting the chat…");
-const u8 gText_LeaderLeftEndingChat[] = _("The LEADER, {SPECIAL_F7 0x00}, has\nleft, ending the chat.");
+const u8 gText_LeaderLeftEndingChat[] = _("The LEADER, {DYNAMIC 0}, has\nleft, ending the chat.");
 const u8 gText_RegisteredTextChangedOKToSave[] = _("The registered text has been changed.\nIs it okay to save the game?");
 const u8 gText_AlreadySavedFile_Chat[] = _("There is already a saved file.\nIs it okay to overwrite it?");
 const u8 gText_SavingDontTurnOff_Chat[] = _("SAVING…\nDON'T TURN OFF THE POWER.");
-const u8 gText_PlayerSavedGame_Chat[] = _("{SPECIAL_F7 0x00} saved the game.");
+const u8 gText_PlayerSavedGame_Chat[] = _("{DYNAMIC 0} saved the game.");
 const u8 gText_IfLeaderLeavesChatEnds[] = _("If the LEADER leaves, the chat\nwill end. Is that okay?");
 const u8 gText_Hello[] = _("HELLO");
 const u8 gText_Pokemon2[] = _("POKéMON");
@@ -1301,8 +1301,8 @@ ALIGNED(4) const u8 gText_YouHaveNoBerries[] = _("You have no BERRIES.\nThe game
 ALIGNED(4) const u8 gText_MemberDroppedOut[] = _("A member dropped out.\nThe game will be canceled.");
 ALIGNED(4) const u8 gText_TimesUpNoGoodPowder[] = _("Time's up.\pGood BERRY POWDER could not be\nmade…\p");
 ALIGNED(4) const u8 gText_CommunicationStandby2[] = _("Communication standby…");
-ALIGNED(4) const u8 gText_1DotBlueF700[] = _("1. {COLOR BLUE}{SHADOW LIGHT_BLUE}{SPECIAL_F7 0x00}");
-ALIGNED(4) const u8 gText_1DotF700[] = _("1. {SPECIAL_F7 0x00}");
+ALIGNED(4) const u8 gText_1DotBlueF700[] = _("1. {COLOR BLUE}{SHADOW LIGHT_BLUE}{DYNAMIC 0}");
+ALIGNED(4) const u8 gText_1DotF700[] = _("1. {DYNAMIC 0}");
 ALIGNED(4) const u8 gText_SpaceTimes2[] = _(" time(s)");
 ALIGNED(4) const u8 gText_XDotY[] = _("{STR_VAR_1}.{STR_VAR_2}");
 ALIGNED(4) const u8 gText_Var1Berry[] = _("{STR_VAR_1} BERRY");
@@ -1375,7 +1375,7 @@ const u8 gText_2Colon[] = _("2:");
 const u8 gText_3Colon[] = _("3:");
 const u8 gText_4Colon[] = _("4:");
 const u8 gText_5Colon[] = _("5:");
-const u8 gText_FirstPlacePrize[] = _("The first-place winner gets\nthis {SPECIAL_F7 0x00}!");
+const u8 gText_FirstPlacePrize[] = _("The first-place winner gets\nthis {DYNAMIC 0}!");
 const u8 gText_CantHoldAnyMore[] = _("You can't hold any more!");
 const u8 gText_FilledStorageSpace[] = _("It filled its storage space.");
 const u8 gText_WantToPlayAgain[] = _("Want to play again?");
@@ -1388,7 +1388,7 @@ const u8 gText_PkmnJumpRecords[] = _("POKéMON JUMP RECORDS");
 const u8 gText_JumpsInARow[] = _("Jumps in a row:");
 const u8 gText_BestScore2[] = _("Best score:");
 const u8 gText_ExcellentsInARow[] = _("EXCELLENTS in a row:");
-const u8 gText_AwesomeWonF701F700[] = _("Awesome score! You've\nwon {SPECIAL_F7 0x01} {SPECIAL_F7 0x00}!");
+const u8 gText_AwesomeWonF701F700[] = _("Awesome score! You've\nwon {DYNAMIC 1} {DYNAMIC 0}!");
 const u8 gText_FilledStorageSpace2[] = _("It filled its storage space.");
 const u8 gText_CantHoldMore[] = _("You can't hold any more!");
 const u8 gText_WantToPlayAgain2[] = _("Want to play again?");
@@ -1645,10 +1645,10 @@ const u8 gText_PeopleTrading[] = _("People trading:");
 const u8 gText_PeopleBattling[] = _("People battling:");
 const u8 gText_PeopleInUnionRoom[] = _("People in the UNION ROOM:");
 const u8 gText_PeopleCommunicating[] = _("People communicating:");
-const u8 gText_F700Players[] = _("{SPECIAL_F7 0} players");
-const u8 gText_F701Players[] = _("{SPECIAL_F7 1} players");
-const u8 gText_F702Players[] = _("{SPECIAL_F7 2} players");
-const u8 gText_F703Players[] = _("{SPECIAL_F7 3} players");
+const u8 gText_F700Players[] = _("{DYNAMIC 0} players");
+const u8 gText_F701Players[] = _("{DYNAMIC 1} players");
+const u8 gText_F702Players[] = _("{DYNAMIC 2} players");
+const u8 gText_F703Players[] = _("{DYNAMIC 3} players");
 
 const u8 *const gTextTable_Players[] = {
     gText_F700Players,
@@ -1745,7 +1745,7 @@ const u8 gText_MoveRelearnerTeachMoveConfirm[] = _("Teach {STR_VAR_2}?");
 const u8 gText_MoveRelearnerPkmnLearnedMove[] = _("{STR_VAR_1} learned\n{STR_VAR_2}!");
 const u8 gText_MoveRelearnerPkmnTryingToLearnMove[] = _("{STR_VAR_1} is trying to learn\n{STR_VAR_2}.\pBut {STR_VAR_1} can't learn more\nthan four moves.\pDelete an older move to make\nroom for {STR_VAR_2}?");
 const u8 gText_MoveRelearnerStopTryingToTeachMove[] = _("Stop trying to teach\n{STR_VAR_2}?");
-const u8 gText_MoveRelearnerAndPoof[] = _("{PAUSE 32}1, {PAUSE 15}2, and {PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE 0x0038}Poof!\p");
+const u8 gText_MoveRelearnerAndPoof[] = _("{PAUSE 32}1, {PAUSE 15}2, and {PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE SE_KON}Poof!\p");
 const u8 gText_MoveRelearnerPkmnForgotMoveAndLearnedNew[] = _("{STR_VAR_1} forgot {STR_VAR_3}.\pAnd…\p{STR_VAR_1} learned {STR_VAR_2}.");
 const u8 gText_MoveRelearnedPkmnDidNotLearnMove[] = _("{STR_VAR_1} did not learn the\nmove {STR_VAR_2}."); // Unused
 const u8 gText_MoveRelearnerGiveUp[] = _("Give up trying to teach a new\nmove to {STR_VAR_1}?");
diff --git a/src/text_window.c b/src/text_window.c
index 98fc09e87..864bd0831 100644
--- a/src/text_window.c
+++ b/src/text_window.c
@@ -49,7 +49,7 @@ static const u16 sTextWindowFrame18_Pal[] = INCBIN_U16("graphics/text_window/18.
 static const u16 sTextWindowFrame19_Pal[] = INCBIN_U16("graphics/text_window/19.gbapal");
 static const u16 sTextWindowFrame20_Pal[] = INCBIN_U16("graphics/text_window/20.gbapal");
 
-static const u16 sUnknown_0851017C[][16] =
+static const u16 sTextWindowPalettes[][16] =
 {
     INCBIN_U16("graphics/text_window/message_box.gbapal"),
     INCBIN_U16("graphics/text_window/text_pal1.gbapal"),
@@ -160,7 +160,7 @@ void rbox_fill_rectangle(u8 windowId)
     FillBgTilemapBufferRect(bgLayer, 0, tilemapLeft - 1, tilemapTop - 1, width + 2, height + 2, 0x11);
 }
 
-const u16 *stdpal_get(u8 id)
+const u16 *GetTextWindowPalette(u8 id)
 {
     switch (id)
     {
@@ -182,7 +182,7 @@ const u16 *stdpal_get(u8 id)
         break;
     }
 
-    return (const u16 *)(sUnknown_0851017C) + id;
+    return (const u16 *)(sTextWindowPalettes) + id;
 }
 
 const u16 *GetOverworldTextboxPalettePtr(void)
diff --git a/src/trainer_card.c b/src/trainer_card.c
index 44b018a7b..c374fad07 100755
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -27,7 +27,6 @@
 #include "trainer_pokemon_sprites.h"
 #include "contest_util.h"
 #include "constants/songs.h"
-#include "constants/flags.h"
 #include "constants/game_stat.h"
 #include "constants/battle_frontier.h"
 #include "constants/rgb.h"
diff --git a/src/trainer_hill.c b/src/trainer_hill.c
index d6cb49837..c5aea14d9 100644
--- a/src/trainer_hill.c
+++ b/src/trainer_hill.c
@@ -64,7 +64,7 @@ static void TrainerHillSetPlayerLost(void);
 static void TrainerHillGetChallengeStatus(void);
 static void BufferChallengeTime(void);
 static void GetAllFloorsUsed(void);
-static void ClearVarResult(void);
+static void GetInEReaderMode(void);
 static void IsTrainerHillChallengeActive(void);
 static void ShowTrainerHillPostBattleText(void);
 static void SetAllTrainerFlags(void);
@@ -202,7 +202,7 @@ static const u16 *const *const sPrizeListSets[] =
     sPrizeLists2
 };
 
-static const u16 sUnknown_0862A5D4[] = INCBIN_U16("graphics/pokenav/862A5D4.gbapal");
+static const u16 sEReader_Pal[] = INCBIN_U16("graphics/misc/trainer_hill_ereader.gbapal");
 static const u8 sRecordWinColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY};
 
 static const struct TrHillTag *const sDataPerTag[] =
@@ -233,7 +233,7 @@ static void (* const sHillFunctions[])(void) =
     [TRAINER_HILL_FUNC_GET_CHALLENGE_STATUS]  = TrainerHillGetChallengeStatus,
     [TRAINER_HILL_FUNC_GET_CHALLENGE_TIME]    = BufferChallengeTime,
     [TRAINER_HILL_FUNC_GET_ALL_FLOORS_USED]   = GetAllFloorsUsed,
-    [TRAINER_HILL_FUNC_CLEAR_RESULT]          = ClearVarResult,
+    [TRAINER_HILL_FUNC_GET_IN_EREADER_MODE]   = GetInEReaderMode,
     [TRAINER_HILL_FUNC_IN_CHALLENGE]          = IsTrainerHillChallengeActive,
     [TRAINER_HILL_FUNC_POST_BATTLE_TEXT]      = ShowTrainerHillPostBattleText,
     [TRAINER_HILL_FUNC_SET_ALL_TRAINER_FLAGS] = SetAllTrainerFlags,
@@ -546,10 +546,11 @@ static void GetAllFloorsUsed(void)
 }
 
 // May have been dummied. Every time this is called a conditional for var result occurs afterwards
-static void ClearVarResult(void)
+// Relation to E-Reader is an assumption, most dummied Trainer Hill code seems to be JP E-Reader mode related
+static void GetInEReaderMode(void)
 {
     SetUpDataStruct();
-    gSpecialVar_Result = 0;
+    gSpecialVar_Result = FALSE;
     FreeDataStruct();
 }
 
@@ -997,11 +998,11 @@ static void SetAllTrainerFlags(void)
     gSaveBlock2Ptr->frontier.trainerFlags = 0xFF;
 }
 
-// Palette never loaded, sub_81D6534 always FALSE
-void sub_81D64C0(void)
+// Palette never loaded, OnTrainerHillEReaderChallengeFloor always FALSE
+void TryLoadTrainerHillEReaderPalette(void)
 {
-    if (sub_81D6534() == TRUE)
-        LoadPalette(sUnknown_0862A5D4, 0x70, 0x20);
+    if (OnTrainerHillEReaderChallengeFloor() == TRUE)
+        LoadPalette(sEReader_Pal, 0x70, 0x20);
 }
 
 static void GetGameSaved(void)
@@ -1020,13 +1021,13 @@ static void ClearGameSaved(void)
 }
 
 // Always FALSE
-bool32 sub_81D6534(void)
+bool32 OnTrainerHillEReaderChallengeFloor(void)
 {
     if (!InTrainerHillChallenge() || GetCurrentTrainerHillMapId() == TRAINER_HILL_ENTRANCE)
         return FALSE;
 
-    ClearVarResult();
-    if (gSpecialVar_Result == 0)
+    GetInEReaderMode();
+    if (gSpecialVar_Result == FALSE)
         return FALSE;
     else
         return TRUE;
diff --git a/src/trainer_see.c b/src/trainer_see.c
index 68a16e208..c37f37262 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -559,7 +559,7 @@ static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct Objec
         gFieldEffectArguments[1] = trainerObj->currentCoords.y;
         gFieldEffectArguments[2] = gSprites[trainerObj->spriteId].subpriority - 1;
         gFieldEffectArguments[3] = 2;
-        task->tOutOfAshSpriteId = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
+        task->tOutOfAshSpriteId = FieldEffectStart(FLDEFF_ASH_PUFF);
         task->tFuncId++;
     }
     return FALSE;
@@ -586,7 +586,7 @@ static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct Objec
 
 static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
 {
-    if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH))
+    if (!FieldEffectActiveListContains(FLDEFF_ASH_PUFF))
         task->tFuncId = 3;
 
     return FALSE;
@@ -603,14 +603,14 @@ static void sub_80B44C8(u8 taskId)
     struct ObjectEvent *objEvent;
 
     // another objEvent loaded into by loadword?
-    LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&objEvent);
+    LoadWordFromTwoHalfwords((u16*)&task->data[1], (u32 *)&objEvent);
     if (!task->data[7])
     {
         ObjectEventClearHeldMovement(objEvent);
         task->data[7]++;
     }
     sTrainerSeeFuncList2[task->data[0]](taskId, task, objEvent);
-    if (task->data[0] == 3 && !FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH))
+    if (task->data[0] == 3 && !FieldEffectActiveListContains(FLDEFF_ASH_PUFF))
     {
         SetTrainerMovementType(objEvent, GetTrainerFacingDirectionMovementType(objEvent->facingDirection));
         TryOverrideTemplateCoordsForObjectEvent(objEvent, GetTrainerFacingDirectionMovementType(objEvent->facingDirection));
@@ -624,7 +624,7 @@ static void sub_80B44C8(u8 taskId)
 
 void sub_80B4578(struct ObjectEvent *var)
 {
-    StoreWordInTwoHalfwords(&gTasks[CreateTask(sub_80B44C8, 0)].data[1], (u32)var);
+    StoreWordInTwoHalfwords((u16 *)&gTasks[CreateTask(sub_80B44C8, 0)].data[1], (u32)var);
 }
 
 void EndTrainerApproach(void)
diff --git a/src/tv.c b/src/tv.c
index a3458b72f..37c29ed2e 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -1836,31 +1836,25 @@ static void TryEndMassOutbreak(u16 days)
         gSaveBlock1Ptr->outbreakDaysLeft -= days;
 }
 
-void sub_80ED950(bool8 flag)
+void RecordFishingAttemptForTV(bool8 caughtFish)
 {
-    if (flag)
+    if (caughtFish)
     {
         if (sPokemonAnglerAttemptCounters >> 8 > 4)
-        {
             PutFishingAdviceShowOnTheAir();
-        }
+
         sPokemonAnglerAttemptCounters &= 0xFF;
         if (sPokemonAnglerAttemptCounters != 0xFF)
-        {
             sPokemonAnglerAttemptCounters += 0x01;
-        }
     }
     else
     {
         if ((u8)sPokemonAnglerAttemptCounters > 4)
-        {
             PutFishingAdviceShowOnTheAir();
-        }
+
         sPokemonAnglerAttemptCounters &= 0xFF00;
         if (sPokemonAnglerAttemptCounters >> 8 != 0xFF)
-        {
             sPokemonAnglerAttemptCounters += 0x0100;
-        }
     }
 }
 
@@ -1930,7 +1924,7 @@ void sub_80EDA80(void)
     }
 }
 
-void sub_80EDB44(void)
+void TryPutTodaysRivalTrainerOnAir(void)
 {
     TVShow *show;
     u32 i;
@@ -3448,7 +3442,7 @@ void ChangePokemonNickname(void)
 
     GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar3);
     GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar2);
-    DoNamingScreen(3, gStringVar2, GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_SPECIES, NULL), GetMonGender(&gPlayerParty[gSpecialVar_0x8004]), GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_PERSONALITY, NULL), ChangePokemonNickname_CB);
+    DoNamingScreen(NAMING_SCREEN_NICKNAME, gStringVar2, GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_SPECIES, NULL), GetMonGender(&gPlayerParty[gSpecialVar_0x8004]), GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_PERSONALITY, NULL), ChangePokemonNickname_CB);
 }
 
 void ChangePokemonNickname_CB(void)
@@ -3464,7 +3458,7 @@ void ChangeBoxPokemonNickname(void)
     boxMon = GetBoxedMonPtr(gSpecialVar_MonBoxId, gSpecialVar_MonBoxPos);
     GetBoxMonData(boxMon, MON_DATA_NICKNAME, gStringVar3);
     GetBoxMonData(boxMon, MON_DATA_NICKNAME, gStringVar2);
-    DoNamingScreen(3, gStringVar2, GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL), GetBoxMonGender(boxMon), GetBoxMonData(boxMon, MON_DATA_PERSONALITY, NULL), ChangeBoxPokemonNickname_CB);
+    DoNamingScreen(NAMING_SCREEN_NICKNAME, gStringVar2, GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL), GetBoxMonGender(boxMon), GetBoxMonData(boxMon, MON_DATA_PERSONALITY, NULL), ChangeBoxPokemonNickname_CB);
 }
 
 void ChangeBoxPokemonNickname_CB(void)
diff --git a/src/union_room_chat.c b/src/union_room_chat.c
index 0e7cacf31..fd2a95791 100755
--- a/src/union_room_chat.c
+++ b/src/union_room_chat.c
@@ -1646,7 +1646,7 @@ static void AppendTextToMessage(void)
         charsStr = sUnionRoomKeyboardText[sChat->currentPage][sChat->currentRow];
         for (i = 0; i < sChat->currentCol; i++)
         {
-            if (*charsStr == CHAR_SPECIAL_F9)
+            if (*charsStr == CHAR_EXTRA_SYMBOL)
                 charsStr++;
             charsStr++;
         }
@@ -1670,7 +1670,7 @@ static void AppendTextToMessage(void)
     str = GetEndOfMessagePtr();
     while (--strLength != -1 && sChat->bufferCursorPos < MAX_MESSAGE_LENGTH)
     {
-        if (*charsStr == CHAR_SPECIAL_F9)
+        if (*charsStr == CHAR_EXTRA_SYMBOL)
         {
             *str = *charsStr;
             charsStr++;
@@ -1705,7 +1705,7 @@ static void SwitchCaseOfLastMessageCharacter(void)
 
     sChat->lastBufferCursorPos = sChat->bufferCursorPos - 1;
     str = GetLastCharOfMessagePtr();
-    if (*str != CHAR_SPECIAL_F9)
+    if (*str != CHAR_EXTRA_SYMBOL)
     {
         character = sCaseToggleTable[*str];
         if (character)
@@ -1763,7 +1763,7 @@ static u8 *GetLastCharOfMessagePtr(void)
     while (*currChar != EOS)
     {
         lastChar = currChar;
-        if (*currChar == CHAR_SPECIAL_F9)
+        if (*currChar == CHAR_EXTRA_SYMBOL)
             currChar++;
         currChar++;
     }
@@ -1784,7 +1784,7 @@ static u16 GetNumOverflowCharsInMessage(void)
         strLength -= 10;
         for (i = 0; i < strLength; i++)
         {
-            if (*str == CHAR_SPECIAL_F9)
+            if (*str == CHAR_EXTRA_SYMBOL)
                 str++;
 
             str++;
@@ -1925,7 +1925,7 @@ static u8 *GetLimitedMessageStartPtr(void)
     u8 *str = sChat->messageEntryBuffer;
     for (i = 0; i < numChars; i++)
     {
-        if (*str == CHAR_SPECIAL_F9)
+        if (*str == CHAR_EXTRA_SYMBOL)
             *str++;
 
         str++;
@@ -1942,7 +1942,7 @@ static u16 GetLimitedMessageStartPos(void)
     u8 *str = sChat->messageEntryBuffer;
     for (count = 0, i = 0; i < numChars; count++, i++)
     {
-        if (*str == CHAR_SPECIAL_F9)
+        if (*str == CHAR_EXTRA_SYMBOL)
             str++;
 
         str++;
diff --git a/src/union_room_player_avatar.c b/src/union_room_player_avatar.c
index cac789685..c012fd84d 100644
--- a/src/union_room_player_avatar.c
+++ b/src/union_room_player_avatar.c
@@ -8,7 +8,6 @@
 #include "union_room.h"
 #include "constants/event_objects.h"
 #include "constants/event_object_movement.h"
-#include "constants/flags.h"
 
 #define UR_SPRITE_START_ID (MAX_SPRITES - MAX_UNION_ROOM_PLAYERS)
 #define UR_PLAYER_SPRITE_ID(playerIdx, facingDir)(5 * playerIdx + facingDir)
diff --git a/src/unk_text_util_2.c b/src/unk_text_util_2.c
index a0b1281a4..2ff8c6507 100644
--- a/src/unk_text_util_2.c
+++ b/src/unk_text_util_2.c
@@ -57,19 +57,19 @@ u16 Font6Func(struct TextPrinter *textPrinter)
                     char_ = *textPrinter->printerTemplate.currentChar++;
                     switch (char_)
                     {
-                        case 1:
+                        case EXT_CTRL_CODE_COLOR:
                             textPrinter->printerTemplate.fgColor = *textPrinter->printerTemplate.currentChar++;
                             GenerateFontHalfRowLookupTable(textPrinter->printerTemplate.fgColor, textPrinter->printerTemplate.bgColor, textPrinter->printerTemplate.shadowColor);
                             return 2;
-                        case 2:
+                        case EXT_CTRL_CODE_HIGHLIGHT:
                             textPrinter->printerTemplate.bgColor = *textPrinter->printerTemplate.currentChar++;
                             GenerateFontHalfRowLookupTable(textPrinter->printerTemplate.fgColor, textPrinter->printerTemplate.bgColor, textPrinter->printerTemplate.shadowColor);
                             return 2;
-                        case 3:
+                        case EXT_CTRL_CODE_SHADOW:
                             textPrinter->printerTemplate.shadowColor = *textPrinter->printerTemplate.currentChar++;
                             GenerateFontHalfRowLookupTable(textPrinter->printerTemplate.fgColor, textPrinter->printerTemplate.bgColor, textPrinter->printerTemplate.shadowColor);
                             return 2;
-                        case 4:
+                        case EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW:
                             textPrinter->printerTemplate.fgColor = *textPrinter->printerTemplate.currentChar;
                             textPrinter->printerTemplate.bgColor = *++textPrinter->printerTemplate.currentChar;
                             textPrinter->printerTemplate.shadowColor = *++textPrinter->printerTemplate.currentChar;
@@ -77,43 +77,43 @@ u16 Font6Func(struct TextPrinter *textPrinter)
 
                             GenerateFontHalfRowLookupTable(textPrinter->printerTemplate.fgColor, textPrinter->printerTemplate.bgColor, textPrinter->printerTemplate.shadowColor);
                             return 2;
-                        case 5:
+                        case EXT_CTRL_CODE_PALETTE:
                             textPrinter->printerTemplate.currentChar++;
                             return 2;
-                        case 6:
+                        case EXT_CTRL_CODE_SIZE:
                             subStruct->glyphId = *textPrinter->printerTemplate.currentChar;
                             textPrinter->printerTemplate.currentChar++;
                             return 2;
-                        case 7:
+                        case EXT_CTRL_CODE_RESET_SIZE:
                             return 2;
-                        case 8:
+                        case EXT_CTRL_CODE_PAUSE:
                             textPrinter->delayCounter = *textPrinter->printerTemplate.currentChar++;
                             textPrinter->state = 6;
                             return 2;
-                        case 9:
+                        case EXT_CTRL_CODE_PAUSE_UNTIL_PRESS:
                             textPrinter->state = 1;
                             if (gTextFlags.autoScroll)
                             {
                                 subStruct->autoScrollDelay = 0;
                             }
                             return 3;
-                        case 10:
+                        case EXT_CTRL_CODE_WAIT_SE:
                             textPrinter->state = 5;
                             return 3;
-                        case 11:
-                        case 16:
+                        case EXT_CTRL_CODE_PLAY_BGM:
+                        case EXT_CTRL_CODE_PLAY_SE:
                             textPrinter->printerTemplate.currentChar += 2;
                             return 2;
-                        case 12:
+                        case EXT_CTRL_CODE_ESCAPE:
                             char_ = *++textPrinter->printerTemplate.currentChar;
                             break;
-                        case 13:
+                        case EXT_CTRL_CODE_SHIFT_TEXT:
                             textPrinter->printerTemplate.currentX = textPrinter->printerTemplate.x + *textPrinter->printerTemplate.currentChar++;
                             return 2;
-                        case 14:
+                        case EXT_CTRL_CODE_SHIFT_DOWN:
                             textPrinter->printerTemplate.currentY = textPrinter->printerTemplate.y + *textPrinter->printerTemplate.currentChar++;
                             return 2;
-                        case 15:
+                        case EXT_CTRL_CODE_FILL_WINDOW:
                             FillWindowPixelBuffer(textPrinter->printerTemplate.windowId, PIXEL_FILL(textPrinter->printerTemplate.bgColor));
                             return 2;
                     }
@@ -126,10 +126,10 @@ u16 Font6Func(struct TextPrinter *textPrinter)
                     textPrinter->state = 3;
                     TextPrinterInitDownArrowCounters(textPrinter);
                     return 3;
-                case 0xF9:
+                case CHAR_EXTRA_SYMBOL:
                     char_ = *textPrinter->printerTemplate.currentChar++| 0x100;
                     break;
-                case 0xF8:
+                case CHAR_KEYPAD_ICON:
                     textPrinter->printerTemplate.currentChar++;
                     return 0;
             }
diff --git a/src/unk_transition.c b/src/unk_transition.c
deleted file mode 100644
index dff165bc9..000000000
--- a/src/unk_transition.c
+++ /dev/null
@@ -1,639 +0,0 @@
-#include "global.h"
-#include "sprite.h"
-#include "decompress.h"
-#include "unk_transition.h"
-#include "battle_transition.h"
-#include "task.h"
-#include "palette.h"
-#include "trig.h"
-#include "bg.h"
-#include "gpu_regs.h"
-#include "constants/rgb.h"
-
-typedef bool8 (*TransitionStateFunc)(struct Task *task);
-
-// this file's functions
-static void sub_81DA848(struct Sprite *sprite);
-static void sub_81DA9BC(struct Sprite *sprite);
-static bool8 sub_81DAACC(struct Task *task);
-static bool8 sub_81DAC14(struct Task *task);
-static bool8 sub_81DABBC(struct Task *task);
-static bool8 sub_81DAB4C(struct Task *task);
-static bool8 sub_81DAC80(struct Task *task);
-static bool8 sub_81DACEC(struct Task *task);
-static bool8 sub_81DAD58(struct Task *task);
-static bool8 sub_81DADC4(struct Task *task);
-static bool8 sub_81DAE44(struct Task *task);
-static bool8 sub_81DAEB0(struct Task *task);
-static bool8 sub_81DAF34(struct Task *task);
-static bool8 sub_81DAFA0(struct Task *task);
-static bool8 sub_81DB02C(struct Task *task);
-static bool8 sub_81DB098(struct Task *task);
-static bool8 sub_81DB124(struct Task *task);
-static bool8 sub_81DB190(struct Task *task);
-static bool8 sub_81DB224(struct Task *task);
-static bool8 sub_81DB290(struct Task *task);
-static bool8 sub_81DB328(struct Task *task);
-
-// const rom data
-static const u32 gUnknown_0862AD54[] = INCBIN_U32("graphics/battle_transitions/frontier_transition.4bpp.lz");
-static const u32 gUnknown_0862AF30[] = INCBIN_U32("graphics/battle_transitions/frontier_transition.bin");
-static const u32 gUnknown_0862B0DC[] = INCBIN_U32("graphics/battle_transitions/frontier_transition_circles.4bpp.lz");
-static const u16 gUnknown_0862B53C[] = INCBIN_U16("graphics/battle_transitions/frontier_transition.gbapal");
-
-// Unused Empty data.
-static const u8 sFiller[0x1C0] = {0};
-
-static const struct OamData sOamData_862B71C =
-{
-    .y = 0,
-    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = ST_OAM_OBJ_NORMAL,
-    .mosaic = 0,
-    .bpp = ST_OAM_4BPP,
-    .shape = SPRITE_SHAPE(64x64),
-    .x = 0,
-    .matrixNum = 0,
-    .size = SPRITE_SIZE(64x64),
-    .tileNum = 0,
-    .priority = 1,
-    .paletteNum = 0,
-    .affineParam = 0
-};
-
-static const struct CompressedSpriteSheet sUnknown_0862B724 =
-{
-    .data = gUnknown_0862B0DC,
-    .size = 0x1800,
-    .tag = 11920
-};
-
-static const struct SpritePalette sUnknown_0862B72C =
-{
-    .data = gUnknown_0862B53C,
-    .tag = 11920
-};
-
-static const union AnimCmd sSpriteAnim_862B734[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_862B73C[] =
-{
-    ANIMCMD_FRAME(64, 1),
-    ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_862B744[] =
-{
-    ANIMCMD_FRAME(128, 1),
-    ANIMCMD_END
-};
-
-static const union AnimCmd *const sSpriteAnimTable_862B74C[] =
-{
-    sSpriteAnim_862B734,
-    sSpriteAnim_862B73C,
-    sSpriteAnim_862B744
-};
-
-static const struct SpriteTemplate sUnknown_0862B758 =
-{
-    .tileTag = 11920,
-    .paletteTag = 11920,
-    .oam = &sOamData_862B71C,
-    .anims = sSpriteAnimTable_862B74C,
-    .images = NULL,
-    .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = SpriteCallbackDummy,
-};
-
-static const TransitionStateFunc sPhase2_34_Funcs[] =
-{
-    sub_81DAACC,
-    sub_81DAC14,
-    sub_81DABBC,
-    sub_81DAB4C,
-    sub_81DAC80
-};
-
-static const TransitionStateFunc sPhase2_35_Funcs[] =
-{
-    sub_81DAACC,
-    sub_81DACEC,
-    sub_81DABBC,
-    sub_81DAB4C,
-    sub_81DAD58
-};
-
-static const TransitionStateFunc sPhase2_36_Funcs[] =
-{
-    sub_81DAACC,
-    sub_81DADC4,
-    sub_81DABBC,
-    sub_81DAB4C,
-    sub_81DAE44
-};
-
-static const TransitionStateFunc sPhase2_37_Funcs[] =
-{
-    sub_81DAACC,
-    sub_81DAEB0,
-    sub_81DABBC,
-    sub_81DAB4C,
-    sub_81DAF34
-};
-
-static const TransitionStateFunc sPhase2_38_Funcs[] =
-{
-    sub_81DAACC,
-    sub_81DAFA0,
-    sub_81DABBC,
-    sub_81DAB4C,
-    sub_81DB02C
-};
-
-static const TransitionStateFunc sPhase2_39_Funcs[] =
-{
-    sub_81DAACC,
-    sub_81DB098,
-    sub_81DABBC,
-    sub_81DAB4C,
-    sub_81DB124
-};
-
-static const TransitionStateFunc sPhase2_40_Funcs[] =
-{
-    sub_81DAACC,
-    sub_81DB190,
-    sub_81DABBC,
-    sub_81DAB4C,
-    sub_81DB224
-};
-
-static const TransitionStateFunc sPhase2_41_Funcs[] =
-{
-    sub_81DAACC,
-    sub_81DB290,
-    sub_81DABBC,
-    sub_81DAB4C,
-    sub_81DB328
-};
-
-// code
-static void sub_81DA700(void)
-{
-    u16 *dst1, *dst2;
-
-    GetBg0TilesDst(&dst1, &dst2);
-    LZ77UnCompVram(gUnknown_0862AD54, dst2);
-    LZ77UnCompVram(gUnknown_0862AF30, dst1);
-    LoadPalette(gUnknown_0862B53C, 0xF0, 0x20);
-    LoadCompressedSpriteSheet(&sUnknown_0862B724);
-    LoadSpritePalette(&sUnknown_0862B72C);
-}
-
-static u8 sub_81DA74C(s16 x, s16 y, u8 arg2, u8 arg3, s8 arg4, s8 arg5, u8 spriteAnimNum)
-{
-    u8 spriteId = CreateSprite(&sUnknown_0862B758, x, y, 0);
-
-    switch (spriteAnimNum)
-    {
-    case 0:
-        gSprites[spriteId].data[0] = 120;
-        gSprites[spriteId].data[1] = 45;
-        break;
-    case 1:
-        gSprites[spriteId].data[0] = 89;
-        gSprites[spriteId].data[1] = 97;
-        break;
-    case 2:
-        gSprites[spriteId].data[0] = 151;
-        gSprites[spriteId].data[1] = 97;
-        break;
-    }
-
-    gSprites[spriteId].data[2] = arg4;
-    gSprites[spriteId].data[3] = arg5;
-    gSprites[spriteId].data[6] = arg2;
-    gSprites[spriteId].data[7] = arg3;
-    gSprites[spriteId].data[4] = 0;
-    gSprites[spriteId].data[5] = 0;
-
-    StartSpriteAnim(&gSprites[spriteId], spriteAnimNum);
-    gSprites[spriteId].callback = sub_81DA848;
-
-    return spriteId;
-}
-
-static void sub_81DA848(struct Sprite *sprite)
-{
-    s16 *data = sprite->data;
-
-    if (sprite->pos1.x == data[0] && sprite->pos1.y == data[1])
-    {
-        sprite->callback = SpriteCallbackDummy;
-    }
-    else
-    {
-        if (data[4] == data[6])
-        {
-            sprite->pos1.x += data[2];
-            data[4] = 0;
-        }
-        else
-        {
-            data[4]++;
-        }
-
-        if (data[5] == data[7])
-        {
-            sprite->pos1.y += data[3];
-            data[5] = 0;
-        }
-        else
-        {
-            data[5]++;
-        }
-    }
-}
-
-static u8 sub_81DA8BC(s16 x, s16 y, s16 arg2, s16 arg3, s16 arg4, s16 arg5, s16 arg6, u8 spriteAnimNum)
-{
-    u8 spriteId = CreateSprite(&sUnknown_0862B758, x, y, 0);
-
-    switch (spriteAnimNum)
-    {
-    case 0:
-        gSprites[spriteId].data[0] = 120;
-        gSprites[spriteId].data[1] = 45;
-        break;
-    case 1:
-        gSprites[spriteId].data[0] = 89;
-        gSprites[spriteId].data[1] = 97;
-        break;
-    case 2:
-        gSprites[spriteId].data[0] = 151;
-        gSprites[spriteId].data[1] = 97;
-        break;
-    }
-
-    gSprites[spriteId].data[2] = arg2;
-    gSprites[spriteId].data[3] = arg3;
-    gSprites[spriteId].data[4] = arg4;
-    gSprites[spriteId].data[5] = arg5;
-    gSprites[spriteId].data[6] = arg6;
-
-    StartSpriteAnim(&gSprites[spriteId], spriteAnimNum);
-    gSprites[spriteId].callback = sub_81DA9BC;
-
-    return spriteId;
-}
-
-static void sub_81DA9BC(struct Sprite *sprite)
-{
-    sprite->pos2.x = (Sin2(sprite->data[2]) * sprite->data[4]) >> 12; // div by 4096
-    sprite->pos2.y = (Cos2(sprite->data[2]) * sprite->data[4]) >> 12; // div by 4096
-
-    sprite->data[2] = (sprite->data[2] + sprite->data[3]) % 360;
-
-    if (sprite->data[4] != sprite->data[5])
-        sprite->data[4] += sprite->data[6];
-    else
-        sprite->callback = SpriteCallbackDummy;
-}
-
-#define tState          data[0]
-
-static void sub_81DAA20(struct Task *task)
-{
-    FreeSpriteTilesByTag(11920);
-    FreeSpritePaletteByTag(11920);
-
-    DestroySprite(&gSprites[task->data[4]]);
-    DestroySprite(&gSprites[task->data[5]]);
-    DestroySprite(&gSprites[task->data[6]]);
-}
-
-static bool8 sub_81DAA74(struct Task *task)
-{
-    if (gSprites[task->data[4]].callback == SpriteCallbackDummy
-        && gSprites[task->data[5]].callback == SpriteCallbackDummy
-        && gSprites[task->data[6]].callback == SpriteCallbackDummy)
-        return TRUE;
-    else
-        return FALSE;
-}
-
-static bool8 sub_81DAACC(struct Task *task)
-{
-    if (task->data[1] == 0)
-    {
-        ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON);
-        ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN1_ON);
-        ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG0_ON);
-
-        task->data[1]++;
-        return FALSE;
-    }
-    else
-    {
-        sub_81DA700();
-        SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL);
-        SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16));
-        ChangeBgX(0, 0, 0);
-        ChangeBgY(0, 0, 0);
-        ChangeBgY(0, 0x500, 2);
-
-        task->data[1] = 0;
-        task->tState++;
-        return TRUE;
-    }
-}
-
-static bool8 sub_81DAB4C(struct Task *task)
-{
-    if (task->data[2] == 0)
-        SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG0_ON);
-
-    if (task->data[2] == 16)
-    {
-        if (task->data[3] == 31)
-        {
-            BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 0x10, RGB_BLACK);
-            task->tState++;
-        }
-        else
-        {
-            task->data[3]++;
-        }
-    }
-    else
-    {
-        u16 blnd;
-
-        task->data[2]++;
-        blnd = task->data[2];
-        SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(blnd, 16 - blnd));
-    }
-
-    return FALSE;
-}
-
-static bool8 sub_81DABBC(struct Task *task)
-{
-    if (sub_81DAA74(task) == TRUE)
-        task->tState++;
-
-    return FALSE;
-}
-
-void Phase2Task_34(u8 taskId)
-{
-    while (sPhase2_34_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
-}
-
-static bool8 sub_81DAC14(struct Task *task)
-{
-    task->data[4] = sub_81DA74C(120, -51, 0, 0, 0,   2, 0);
-    task->data[5] = sub_81DA74C(-7,  193, 0, 0, 2,  -2, 1);
-    task->data[6] = sub_81DA74C(247, 193, 0, 0, -2, -2, 2);
-
-    task->tState++;
-    return FALSE;
-}
-
-static bool8 sub_81DAC80(struct Task *task)
-{
-    if (!gPaletteFade.active)
-    {
-        sub_81DAA20(task);
-        DestroyTask(FindTaskIdByFunc(Phase2Task_34));
-    }
-
-    return FALSE;
-}
-
-void Phase2Task_35(u8 taskId)
-{
-    while (sPhase2_35_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
-}
-
-static bool8 sub_81DACEC(struct Task *task)
-{
-    task->data[4] = sub_81DA74C(120, 197, 0, 0, 0, -4, 0);
-    task->data[5] = sub_81DA74C(241, 59,  0, 1, -4, 2, 1);
-    task->data[6] = sub_81DA74C(-1,  59,  0, 1, 4,  2, 2);
-
-    task->tState++;
-    return FALSE;
-}
-
-static bool8 sub_81DAD58(struct Task *task)
-{
-    if (!gPaletteFade.active)
-    {
-        sub_81DAA20(task);
-        DestroyTask(FindTaskIdByFunc(Phase2Task_35));
-    }
-
-    return FALSE;
-}
-
-void Phase2Task_36(u8 taskId)
-{
-    while (sPhase2_36_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
-}
-
-static bool8 sub_81DADC4(struct Task *task)
-{
-    task->data[4] = sub_81DA8BC(120, 45, 12,  4, 128, 0, -4, 0);
-    task->data[5] = sub_81DA8BC(89,  97, 252, 4, 128, 0, -4, 1);
-    task->data[6] = sub_81DA8BC(151, 97, 132, 4, 128, 0, -4, 2);
-
-    task->tState++;
-    return FALSE;
-}
-
-static bool8 sub_81DAE44(struct Task *task)
-{
-    if (!gPaletteFade.active)
-    {
-        sub_81DAA20(task);
-        DestroyTask(FindTaskIdByFunc(Phase2Task_36));
-    }
-
-    return FALSE;
-}
-
-void Phase2Task_37(u8 taskId)
-{
-    while (sPhase2_37_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
-}
-
-static bool8 sub_81DAEB0(struct Task *task)
-{
-    task->data[4] = sub_81DA8BC(120, 80, 284, 8, 131, 35, -3, 0);
-    task->data[5] = sub_81DA8BC(120, 80, 44,  8, 131, 35, -3, 1);
-    task->data[6] = sub_81DA8BC(121, 80, 164, 8, 131, 35, -3, 2);
-
-    task->tState++;
-    return FALSE;
-}
-
-static bool8 sub_81DAF34(struct Task *task)
-{
-    if (!gPaletteFade.active)
-    {
-        sub_81DAA20(task);
-        DestroyTask(FindTaskIdByFunc(Phase2Task_37));
-    }
-
-    return FALSE;
-}
-
-void Phase2Task_38(u8 taskId)
-{
-    while (sPhase2_38_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
-}
-
-static bool8 sub_81DAFA0(struct Task *task)
-{
-    if (task->data[1] == 0)
-    {
-        task->data[4] = sub_81DA74C(120, -51, 0, 0, 0, 4,  0);
-    }
-    else if (task->data[1] == 16)
-    {
-        task->data[5] = sub_81DA74C(-7,  193, 0, 0, 4, -4, 1);
-    }
-    else if (task->data[1] == 32)
-    {
-        task->data[6] = sub_81DA74C(247, 193, 0, 0, -4, -4, 2);
-        task->tState++;
-    }
-
-    task->data[1]++;
-    return FALSE;
-}
-
-static bool8 sub_81DB02C(struct Task *task)
-{
-    if (!gPaletteFade.active)
-    {
-        sub_81DAA20(task);
-        DestroyTask(FindTaskIdByFunc(Phase2Task_38));
-    }
-
-    return FALSE;
-}
-
-void Phase2Task_39(u8 taskId)
-{
-    while (sPhase2_39_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
-}
-
-static bool8 sub_81DB098(struct Task *task)
-{
-    if (task->data[1] == 0)
-    {
-        task->data[4] = sub_81DA74C(120, 197, 0, 0, 0, -8,  0);
-    }
-    else if (task->data[1] == 16)
-    {
-        task->data[5] = sub_81DA74C(241, 78,  0, 0, -8, 1,  1);
-    }
-    else if (task->data[1] == 32)
-    {
-        task->data[6] = sub_81DA74C(-1,  78,  0, 0, 8,  1,  2);
-        task->tState++;
-    }
-
-    task->data[1]++;
-    return FALSE;
-}
-
-static bool8 sub_81DB124(struct Task *task)
-{
-    if (!gPaletteFade.active)
-    {
-        sub_81DAA20(task);
-        DestroyTask(FindTaskIdByFunc(Phase2Task_39));
-    }
-
-    return FALSE;
-}
-
-void Phase2Task_40(u8 taskId)
-{
-    while (sPhase2_40_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
-}
-
-static bool8 sub_81DB190(struct Task *task)
-{
-    if (task->data[1] == 0)
-    {
-        task->data[4] = sub_81DA8BC(120, 45, 12,  4, 128, 0, -4, 0);
-    }
-    else if (task->data[1] == 16)
-    {
-        task->data[5] = sub_81DA8BC(89,  97, 252, 4, 128, 0, -4, 1);
-    }
-    else if (task->data[1] == 32)
-    {
-        task->data[6] = sub_81DA8BC(151, 97, 132, 4, 128, 0, -4, 2);
-        task->tState++;
-    }
-
-    task->data[1]++;
-    return FALSE;
-}
-
-static bool8 sub_81DB224(struct Task *task)
-{
-    if (!gPaletteFade.active)
-    {
-        sub_81DAA20(task);
-        DestroyTask(FindTaskIdByFunc(Phase2Task_40));
-    }
-
-    return FALSE;
-}
-
-void Phase2Task_41(u8 taskId)
-{
-    while (sPhase2_41_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
-}
-
-static bool8 sub_81DB290(struct Task *task)
-{
-    if (task->data[1] == 0)
-    {
-        task->data[4] = sub_81DA8BC(120, 80, 284, 8, 131, 35, -3, 0);
-    }
-    else if (task->data[1] == 16)
-    {
-        task->data[5] = sub_81DA8BC(120, 80, 44,  8, 131, 35, -3, 1);
-    }
-    else if (task->data[1] == 32)
-    {
-        task->data[6] = sub_81DA8BC(121, 80, 164, 8, 131, 35, -3, 2);
-        task->tState++;
-    }
-
-    task->data[1]++;
-    return FALSE;
-}
-
-static bool8 sub_81DB328(struct Task *task)
-{
-    if (!gPaletteFade.active)
-    {
-        sub_81DAA20(task);
-        DestroyTask(FindTaskIdByFunc(Phase2Task_41));
-    }
-
-    return FALSE;
-}
diff --git a/src/wallclock.c b/src/wallclock.c
index 00ab65817..aa2bd8019 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -660,7 +660,7 @@ static void LoadWallClockGraphics(void)
     InitWindows(gUnknown_085B21DC);
     DeactivateAllTextPrinters();
     LoadUserWindowBorderGfx(0, 0x250, 0xd0);
-    clear_scheduled_bg_copies_to_vram();
+    ClearScheduledBgCopiesToVram();
     ScanlineEffect_Stop();
     ResetTasks();
     ResetSpriteData();
@@ -780,7 +780,7 @@ static void WallClockMainCallback(void)
     RunTasks();
     AnimateSprites();
     BuildOamBuffer();
-    do_scheduled_bg_tilemap_copies_to_vram();
+    DoScheduledBgTilemapCopiesToVram();
     UpdatePaletteFade();
 }
 
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 7d20b2476..492a10101 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -185,13 +185,6 @@ static u8 ChooseWildMonIndex_WaterRock(void)
         return 4;
 }
 
-enum
-{
-    OLD_ROD,
-    GOOD_ROD,
-    SUPER_ROD
-};
-
 static u8 ChooseWildMonIndex_Fishing(u8 rod)
 {
     u8 wildMonIndex = 0;
@@ -303,29 +296,27 @@ static u8 PickWildMonNature(void)
     u8 i;
     u8 j;
     struct Pokeblock *safariPokeblock;
-    u8 natures[25];
+    u8 natures[NUM_NATURES];
 
     if (GetSafariZoneFlag() == TRUE && Random() % 100 < 80)
     {
         safariPokeblock = SafariZoneGetActivePokeblock();
         if (safariPokeblock != NULL)
         {
-            for (i = 0; i < 25; i++)
+            for (i = 0; i < NUM_NATURES; i++)
                 natures[i] = i;
-            for (i = 0; i < 24; i++)
+            for (i = 0; i < NUM_NATURES - 1; i++)
             {
-                for (j = i + 1; j < 25; j++)
+                for (j = i + 1; j < NUM_NATURES; j++)
                 {
                     if (Random() & 1)
                     {
-                        u8 temp = natures[i];
-
-                        natures[i] = natures[j];
-                        natures[j] = temp;
+                        u8 temp;
+                        SWAP(natures[i], natures[j], temp);
                     }
                 }
             }
-            for (i = 0; i < 25; i++)
+            for (i = 0; i < NUM_NATURES; i++)
             {
                 if (PokeblockGetGain(natures[i], safariPokeblock) > 0)
                     return natures[i];
@@ -337,11 +328,11 @@ static u8 PickWildMonNature(void)
         && GetMonAbility(&gPlayerParty[0]) == ABILITY_SYNCHRONIZE
         && Random() % 2 == 0)
     {
-        return GetMonData(&gPlayerParty[0], MON_DATA_PERSONALITY) % 25;
+        return GetMonData(&gPlayerParty[0], MON_DATA_PERSONALITY) % NUM_NATURES;
     }
 
     // random nature
-    return Random() % 25;
+    return Random() % NUM_NATURES;
 }
 
 static void CreateWildMon(u16 species, u8 level)