Multiple renamings; Removed some orphaned functions

2021-10-24 17:42:24 -03:00
parent 471608b56a
commit 0cc1d8a1b5
75 changed files with 416 additions and 486 deletions
@@ -2308,22 +2308,21 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2)
    }
 }

-void sub_80730C0(u16 a, u16 *b, s32 c, u8 d)
+void RelocateBattleBgPal(u16 paletteNum, u16 *dest, s32 offset, u8 largeScreen)
 {
-    u8 i, j;   
-    u32 var;
+    u8 i, j;
+    u32 size;

-    if (d == 0)
-        var = 32;
+    if (!largeScreen)
+        size = 32;
    else
-        var = 64;
-    
-    a <<= 12;
-    for (i = 0; i < var; i++)
+        size = 64;
+    paletteNum <<= 12;
+    for (i = 0; i < size; i++)
    {
        for (j = 0; j < 32; j++)
        {
-            b[32 * i + j] = ((b[32 * i + j] & 0xFFF) | a) + c;
+            dest[j + i * 32] = ((dest[j + i * 32] & 0xFFF) | paletteNum) + offset;
        }
    }
 }
@@ -40,11 +40,11 @@ static void AnimTask_LeafBladeStep2_Callback(struct Sprite *);
 static void AnimFlyingParticleStep(struct Sprite *);
 static void AnimNeedleArmSpikeStep(struct Sprite *);
 static void AnimSliceStep(struct Sprite *);
-static void sub_80A4880(struct Sprite *);
+static void AnimCirclingMusicNote_Step(struct Sprite *);
 static void AnimProtectStep(struct Sprite *);
 static void AnimMilkBottleStep1(struct Sprite *);
 static void AnimMilkBottleStep2(struct Sprite *, int, int);
-static void sub_80A4EA0(struct Sprite *);
+static void AnimBubbleBurst_Step(struct Sprite *);
 static void AnimSleepLetterZStep(struct Sprite *);
 static void AnimLockOnTargetStep1(struct Sprite *);
 static void AnimLockOnTargetStep2(struct Sprite *);
@@ -58,7 +58,7 @@ static void AnimBowMonStep2(struct Sprite *);
 static void AnimBowMonStep3(struct Sprite *);
 static void AnimBowMonStep4(struct Sprite *);
 static void AnimBowMonStep3_Callback(struct Sprite *);
-static void sub_80A55A0(struct Sprite *);
+static void AnimTipMon_Step(struct Sprite *);
 static void AnimTask_SkullBashPositionSet(u8);
 static void AnimTask_SkullBashPositionReset(u8);
 static void AnimFalseSwipeSliceStep1(struct Sprite *);
@@ -1093,7 +1093,7 @@ static const struct SpriteTemplate sUnknown_83E3194 =
    .anims = sUnknown_83E3190,
    .images = NULL,
    .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_80A43F8,
+    .callback = AnimSlidingHit,
 };

 // Unused
@@ -1105,7 +1105,7 @@ static const struct SpriteTemplate sUnknown_83E31AC =
    .anims = sUnknown_83E3190,
    .images = NULL,
    .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_80A43F8,
+    .callback = AnimSlidingHit,
 };

 static const union AffineAnimCmd sUnknown_83E31C4[] =
@@ -1177,7 +1177,7 @@ static const struct SpriteTemplate sUnknown_83E3264 =
    .anims = gDummySpriteAnimTable,
    .images = NULL,
    .affineAnims = sUnknown_83E3244,
-    .callback = sub_80A4494,
+    .callback = AnimFlickeringPunch,
 };

 static const union AnimCmd sCuttingSliceAnimCmds[] =
@@ -1299,7 +1299,7 @@ static const struct SpriteTemplate sUnknown_83E333C =
    .anims = sUnknown_83E3314,
    .images = NULL,
    .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_80A481C,
+    .callback = AnimCirclingMusicNote,
 };

 const struct SpriteTemplate gProtectWallSpriteTemplate =
@@ -1427,7 +1427,7 @@ static const struct SpriteTemplate sUnknown_83E3474 =
    .anims = sUnknown_83E346C,
    .images = NULL,
    .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_80A4E40,
+    .callback = AnimBubbleBurst,
 };

 static const union AnimCmd sSleepLetterZAnimCmds[] =
@@ -1536,7 +1536,7 @@ static const struct SpriteTemplate sUnknown_83E3568 =
    .anims = gDummySpriteAnimTable,
    .images = NULL,
    .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_80A5590,
+    .callback = AnimTipMon,
 };

 static const union AnimCmd sSlashSliceAnimCmds1[] =
@@ -3714,7 +3714,7 @@ static void sub_80A43DC(struct Sprite* sprite)
        DestroyAnimSprite(sprite);
 }

-void sub_80A43F8(struct Sprite* sprite)
+void AnimSlidingHit(struct Sprite* sprite)
 {
    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
    {
@@ -3741,7 +3741,7 @@ void AnimWhipHit(struct Sprite* sprite)
    sprite->y += gBattleAnimArgs[1];
 }

-void sub_80A4494(struct Sprite* sprite)
+void AnimFlickeringPunch(struct Sprite* sprite)
 {
    sprite->x += gBattleAnimArgs[0];
    sprite->y += gBattleAnimArgs[1];
@@ -3890,7 +3890,7 @@ void sub_80A4738(struct Sprite* sprite)
    }
 }

-void sub_80A481C(struct Sprite* sprite)
+void AnimCirclingMusicNote(struct Sprite* sprite)
 {
    sprite->data[0] = gBattleAnimArgs[2];
    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
@@ -3902,11 +3902,11 @@ void sub_80A481C(struct Sprite* sprite)
    sprite->data[1] = -gBattleAnimArgs[3];
    sprite->y += gBattleAnimArgs[1];
    sprite->data[3] = gBattleAnimArgs[4];
-    sprite->callback = sub_80A4880;
+    sprite->callback = AnimCirclingMusicNote_Step;
    sprite->callback(sprite);
 }

-static void sub_80A4880(struct Sprite* sprite)
+static void AnimCirclingMusicNote_Step(struct Sprite* sprite)
 {
    sprite->x2 = Cos(sprite->data[0], 100);
    sprite->y2 = Sin(sprite->data[0], 20);
@@ -4148,7 +4148,7 @@ void AnimSparkingStars(struct Sprite* sprite)
    sprite->callback = TranslateSpriteLinearFixedPoint;
 }

-void sub_80A4E40(struct Sprite* sprite)
+void AnimBubbleBurst(struct Sprite* sprite)
 {
    SetSpriteCoordsToAnimAttackerCoords(sprite);
    if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
@@ -4163,10 +4163,10 @@ void sub_80A4E40(struct Sprite* sprite)
        StartSpriteAnim(sprite, 1);
    }

-    sprite->callback = sub_80A4EA0;
+    sprite->callback = AnimBubbleBurst_Step;
 }

-static void sub_80A4EA0(struct Sprite* sprite)
+static void AnimBubbleBurst_Step(struct Sprite* sprite)
 {
    if (++sprite->data[0] > 30)
    {
@@ -4491,13 +4491,13 @@ static void AnimBowMonStep4(struct Sprite* sprite)
    DestroyAnimSprite(sprite);
 }

-void sub_80A5590(struct Sprite *sprite)
+void AnimTipMon(struct Sprite *sprite)
 {
    sprite->data[0] = 0;
-    sprite->callback = sub_80A55A0;
+    sprite->callback = AnimTipMon_Step;
 }

-static void sub_80A55A0(struct Sprite *sprite)
+static void AnimTipMon_Step(struct Sprite *sprite)
 {
    switch (sprite->data[0])
    {
@@ -11,12 +11,12 @@
 #include "util.h"
 #include "constants/songs.h"

-static void sub_80A6ED8(struct Sprite *);
-static void sub_80A7058(struct Sprite *);
-static void sub_80A7080(struct Sprite *);
+static void AnimBouncingMusicNote_Step(struct Sprite *);
+static void AnimMovingClamp_Step(struct Sprite *);
+static void AnimMovingClamp_End(struct Sprite *);
 static void AnimTask_WithdrawStep(u8);
 static void AnimSwordsDanceBladeStep(struct Sprite *);
-static void sub_80A7A18(struct Sprite *);
+static void AnimVoidLines_Step(struct Sprite *);
 static void AnimFallingCoin_Step(struct Sprite *);
 static void AnimBulletSeed_Step1(struct Sprite *);
 static void AnimBulletSeed_Step2(struct Sprite *);
@@ -69,7 +69,7 @@ static const struct SpriteTemplate sUnknown_83E3ADC =
    .anims = gDummySpriteAnimTable,
    .images = NULL,
    .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_80A6E48,
+    .callback = AnimCirclingFinger,
 };

 static const union AnimCmd sUnknown_83E3AF4[] =
@@ -92,7 +92,7 @@ static const struct SpriteTemplate sUnknown_83E3B00 =
    .anims = gDummySpriteAnimTable,
    .images = NULL,
    .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_80A6E98,
+    .callback = AnimBouncingMusicNote,
 };

 // Unused
@@ -104,7 +104,7 @@ static const struct SpriteTemplate sUnknown_83E3B18 =
    .anims = gDummySpriteAnimTable,
    .images = NULL,
    .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_80A6F8C,
+    .callback = AnimVibrateBattlerBack,
 };

 // Unused
@@ -116,7 +116,7 @@ static const struct SpriteTemplate sUnknown_83E3B30 =
    .anims = gDummySpriteAnimTable,
    .images = NULL,
    .affineAnims = gAffineAnims_Bite,
-    .callback = sub_80A7020,
+    .callback = AnimMovingClamp,
 };

 static const union AnimCmd sUnknown_83E3B48[] =
@@ -324,7 +324,7 @@ static const struct SpriteTemplate sUnknown_83E3D18 =
    .anims = gDummySpriteAnimTable,
    .images = NULL,
    .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_80A79E8,
+    .callback = AnimVoidLines,
 };

 static const union AnimCmd sCoinAnimCmds[] =
@@ -1210,7 +1210,7 @@ const struct SpriteTemplate gGuardRingSpriteTemplate =
 };

 // Functions
-void sub_80A6E48(struct Sprite *sprite)
+void AnimCirclingFinger(struct Sprite *sprite)
 {
    SetSpriteCoordsToAnimAttackerCoords(sprite);
    SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]);
@@ -1224,7 +1224,7 @@ void sub_80A6E48(struct Sprite *sprite)
    sprite->callback(sprite);
 }

-void sub_80A6E98(struct Sprite *sprite)
+void AnimBouncingMusicNote(struct Sprite *sprite)
 {
    u8 battler;
    
@@ -1236,10 +1236,10 @@ void sub_80A6E98(struct Sprite *sprite)
    SetSpriteNextToMonHead(battler, sprite);
    sprite->data[0] = 0;
    sprite->data[1] = 0;
-    sprite->callback = sub_80A6ED8;
+    sprite->callback = AnimBouncingMusicNote_Step;
 }

-static void sub_80A6ED8(struct Sprite *sprite)
+static void AnimBouncingMusicNote_Step(struct Sprite *sprite)
 {
    switch (sprite->data[0])
    {
@@ -1260,10 +1260,9 @@ static void sub_80A6ED8(struct Sprite *sprite)
    }
 }

-static void sub_80A6F3C(struct Sprite *sprite)
+static void AnimVibrateBattlerBack_Step(struct Sprite *sprite)
 {
    s16 temp;
-    
    gSprites[sprite->data[2]].x2 += sprite->data[1];
    temp = sprite->data[1];
    sprite->data[1] = -temp;
@@ -1276,10 +1275,9 @@ static void sub_80A6F3C(struct Sprite *sprite)
    sprite->data[0]--;
 }

-void sub_80A6F8C(struct Sprite *sprite)
+void AnimVibrateBattlerBack(struct Sprite *sprite)
 {
    u8 spriteId;
-    
    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
    spriteId = gBattlerSpriteIds[gBattleAnimTarget];
@@ -1292,30 +1290,30 @@ void sub_80A6F8C(struct Sprite *sprite)
    sprite->data[0] = gBattleAnimArgs[2];
    sprite->data[1] = gBattleAnimArgs[3];
    sprite->data[2] = spriteId;
-    sprite->callback = sub_80A6F3C;
+    sprite->callback = AnimVibrateBattlerBack_Step;
    sprite->invisible = TRUE;
 }

-void sub_80A7020(struct Sprite *sprite)
+void AnimMovingClamp(struct Sprite *sprite)
 {
    InitSpritePosToAnimAttacker(sprite, TRUE);
    sprite->data[0] = gBattleAnimArgs[2];
    sprite->data[1] = gBattleAnimArgs[3];
    sprite->data[5] = gBattleAnimArgs[4];
    sprite->callback = WaitAnimForDuration;
-    StoreSpriteCallbackInData6(sprite, sub_80A7058);
+    StoreSpriteCallbackInData6(sprite, AnimMovingClamp_Step);
 }

-static void sub_80A7058(struct Sprite *sprite)
+static void AnimMovingClamp_Step(struct Sprite *sprite)
 {
    sprite->data[0] = sprite->data[1];
    sprite->data[2] = sprite->x;
    sprite->data[4] = sprite->y + 15;
    sprite->callback = StartAnimLinearTranslation;
-    StoreSpriteCallbackInData6(sprite, sub_80A7080);
+    StoreSpriteCallbackInData6(sprite, AnimMovingClamp_End);
 }

-static void sub_80A7080(struct Sprite *sprite)
+static void AnimMovingClamp_End(struct Sprite *sprite)
 {
    if (sprite->data[5] == 0)
        DestroyAnimSprite(sprite);
@@ -1692,14 +1690,14 @@ void AnimTask_AirCutterProjectile(u8 taskId)
    gTasks[taskId].func = AirCutterProjectileStep1;
 }

-void sub_80A79E8(struct Sprite *sprite)
+void AnimVoidLines(struct Sprite *sprite)
 {
    InitSpritePosToAnimAttacker(sprite, FALSE);
    sprite->data[0] = 0x100 + (IndexOfSpritePaletteTag(sUnknown_83E3D18.paletteTag) << 4);
-    sprite->callback = sub_80A7A18;
+    sprite->callback = AnimVoidLines_Step;
 }

-static void sub_80A7A18(struct Sprite *sprite)
+static void AnimVoidLines_Step(struct Sprite *sprite)
 {
    u16 id, val;
    int i;
@@ -3234,7 +3232,7 @@ void AnimTask_HeartsBackground(u8 taskId)
    AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnimBg_AttractGfx, animBg.tilesOffset);
    LoadCompressedPalette(gBattleAnimBg_AttractPal, animBg.paletteId * 16, 32);
    if (IsContest())
-        sub_80730C0(animBg.paletteId, animBg.bgTilemap, 0, 0);
+        RelocateBattleBgPal(animBg.paletteId, animBg.bgTilemap, 0, 0);
    
    gTasks[taskId].func = HeartsBackground_Step;
 }
@@ -3322,7 +3320,7 @@ void AnimTask_ScaryFace(u8 taskId)
    AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnim_ScaryFaceGfx, animBg.tilesOffset);
    LoadCompressedPalette(gBattleAnim_ScaryFacePal, animBg.paletteId * 16, 32);
    if (IsContest())
-        sub_80730C0(animBg.paletteId, animBg.bgTilemap, 0, 0);
+        RelocateBattleBgPal(animBg.paletteId, animBg.bgTilemap, 0, 0);
    
    gTasks[taskId].func = ScaryFace_Step;
 }
@@ -1053,7 +1053,7 @@ const struct SpriteTemplate gUnknown_83FF704 =
    .anims = gDummySpriteAnimTable,
    .images = NULL,
    .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_80E3E84,
+    .callback = AnimUnusedItemBagSteal,
 };

 static const union AnimCmd sKnockOffStrikeAnimCmds[] =    
@@ -2293,7 +2293,7 @@ void AnimTask_MorningSunLightBeam(u8 taskId)
        LoadCompressedPalette(gBattleAnim_MorningSunPal, animBg.paletteId * 16, 32);
        if (IsContest())
        {
-            sub_80730C0(animBg.paletteId, animBg.bgTilemap, 0, 0);
+            RelocateBattleBgPal(animBg.paletteId, animBg.bgTilemap, 0, 0);
            gBattle_BG1_X = -56;
            gBattle_BG1_Y = 0;
        }
@@ -2474,7 +2474,7 @@ void AnimTask_DoomDesireLightBeam(u8 taskId)
                
        if (IsContest())
        {
-            sub_80730C0(animBg.paletteId, animBg.bgTilemap, 0, 0);
+            RelocateBattleBgPal(animBg.paletteId, animBg.bgTilemap, 0, 0);
            gBattle_BG1_X = -56;
            gBattle_BG1_Y = 0;
        }
@@ -3752,7 +3752,7 @@ static void AnimTask_FacadeColorBlendStep(u8 taskId)

 void AnimTask_StatusClearedEffect(u8 taskId)
 {
-    sub_80BBA20(taskId, 0, 0x1A0, gBattleAnimAttacker, gBattleAnimArgs[0], 10, 2, 30, gCureBubblesGfx, gCureBubblesTilemap, gCureBubblesPal);
+    StartMonScrollingBgMask(taskId, 0, 0x1A0, gBattleAnimAttacker, gBattleAnimArgs[0], 10, 2, 30, gCureBubblesGfx, gCureBubblesTilemap, gCureBubblesPal);
 }

 // Moves a noise line from the mon.
@@ -4983,7 +4983,7 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId)
    }
 }

-void sub_80E3E84(struct Sprite *sprite)
+void AnimUnusedItemBagSteal(struct Sprite *sprite)
 {
    switch (sprite->data[7])
    {
@@ -503,8 +503,8 @@ void AnimTask_StatsChange(u8 taskId)
    gBattleAnimArgs[2] = 0;
    gBattleAnimArgs[3] = 0;
    gBattleAnimArgs[4] = sharply;
-    gTasks[taskId].func = sub_80BB088;
-    sub_80BB088(taskId);
+    gTasks[taskId].func = InitStatsChangeAnimation;
+    InitStatsChangeAnimation(taskId);
 }

 #undef CASE
@@ -21,10 +21,10 @@ static void AnimTask_BlendSpriteColor_Step2(u8 taskId);
 static void Task_WaitHardwarePaletteFade(u8 taskId);
 static void Task_DoCloneBattlerSpriteWithBlend(u8 taskId);
 static void Task_FinishCloneBattlerSpriteWithBlend(struct Sprite *sprite);
-static void sub_80BAF38(u8 taskId);
-static void sub_80BB0D8(u8 taskId);
-static void sub_80BB2A0(u8 taskId);
-static void sub_80BB4B8(u8 taskId);
+static void AnimTask_DrawFallingWhiteLinesOnAttacker_Step(u8 taskId);
+static void StatsChangeAnimation_Step1(u8 taskId);
+static void StatsChangeAnimation_Step2(u8 taskId);
+static void StatsChangeAnimation_Step3(u8 taskId);
 static void sub_80BB6CC(u8 taskId);
 static void sub_80BB790(u32 selectedPalettes, u16 color);
 static void sub_80BB8A4(u8 taskId);
@@ -334,17 +334,17 @@ void AnimTask_SetUpCurseBackground(u8 taskId)
    GetBattleAnimBg1Data(&animBgData);
    AnimLoadCompressedBgTilemap(animBgData.bgId, gFile_graphics_battle_anims_masks_curse_tilemap);
    if (IsContest())
-        sub_80730C0(animBgData.paletteId, animBgData.bgTilemap, 0, 0);
+        RelocateBattleBgPal(animBgData.paletteId, animBgData.bgTilemap, 0, 0);
    AnimLoadCompressedBgGfx(animBgData.bgId, gFile_graphics_battle_anims_masks_curse_sheet, animBgData.tilesOffset);
    LoadPalette(sRgbWhite, animBgData.paletteId * 16 + 1, 2);
    gBattle_BG1_X = -gSprites[spriteId].x + 32;
    gBattle_BG1_Y = -gSprites[spriteId].y + 32;
    gTasks[taskId].data[0] = newSpriteId;
    gTasks[taskId].data[6] = var0;
-    gTasks[taskId].func = sub_80BAF38;
+    gTasks[taskId].func = AnimTask_DrawFallingWhiteLinesOnAttacker_Step;
 }

-static void sub_80BAF38(u8 taskId)
+static void AnimTask_DrawFallingWhiteLinesOnAttacker_Step(u8 taskId)
 {
    struct BattleAnimBgData animBgData;
    struct Sprite *sprite;
@@ -387,17 +387,17 @@ static void sub_80BAF38(u8 taskId)
    }
 }

-void sub_80BB088(u8 taskId)
+void InitStatsChangeAnimation(u8 taskId)
 {
    u8 i;

    sAnimStatsChangeData = AllocZeroed(sizeof(struct AnimStatsChangeData));
    for (i = 0; i < 8; ++i)
        sAnimStatsChangeData->data[i] = gBattleAnimArgs[i];
-    gTasks[taskId].func = sub_80BB0D8;
+    gTasks[taskId].func = StatsChangeAnimation_Step1;
 }

-static void sub_80BB0D8(u8 taskId)
+static void StatsChangeAnimation_Step1(u8 taskId)
 {
    if (sAnimStatsChangeData->data[2] == 0)
        sAnimStatsChangeData->battler1 = gBattleAnimAttacker;
@@ -436,10 +436,10 @@ static void sub_80BB0D8(u8 taskId)
        sAnimStatsChangeData->species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[sAnimStatsChangeData->battler1]], MON_DATA_SPECIES);
    else
        sAnimStatsChangeData->species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[sAnimStatsChangeData->battler1]], MON_DATA_SPECIES);
-    gTasks[taskId].func = sub_80BB2A0;
+    gTasks[taskId].func = StatsChangeAnimation_Step2;
 }

-static void sub_80BB2A0(u8 taskId)
+static void StatsChangeAnimation_Step2(u8 taskId)
 {
    struct BattleAnimBgData animBgData;
    u8 spriteId, newSpriteId = 0;
@@ -458,7 +458,7 @@ static void sub_80BB2A0(u8 taskId)
    else
        AnimLoadCompressedBgTilemap(animBgData.bgId, gBattleStatMask2_Tilemap);
    if (IsContest())
-        sub_80730C0(animBgData.paletteId, animBgData.bgTilemap, 0, 0);
+        RelocateBattleBgPal(animBgData.paletteId, animBgData.bgTilemap, 0, 0);
    AnimLoadCompressedBgGfx(animBgData.bgId, gBattleStatMask_Gfx, animBgData.tilesOffset);
    switch (sAnimStatsChangeData->data[1])
    {
@@ -514,16 +514,17 @@ static void sub_80BB2A0(u8 taskId)
    gTasks[taskId].data[3] = newSpriteId;
    gTasks[taskId].data[6] = sAnimStatsChangeData->higherPriority;
    gTasks[taskId].data[7] = gBattlerSpriteIds[sAnimStatsChangeData->battler2];
-    gTasks[taskId].func = sub_80BB4B8;
+    gTasks[taskId].func = StatsChangeAnimation_Step3;
    if (sAnimStatsChangeData->data[0] == 0)
        PlaySE12WithPanning(SE_M_STAT_INCREASE, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER));
    else
        PlaySE12WithPanning(SE_M_STAT_DECREASE, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER));
 }

-static void sub_80BB4B8(u8 taskId)
+static void StatsChangeAnimation_Step3(u8 taskId)
 {
    gBattle_BG1_Y += gTasks[taskId].data[1];
+
    switch (gTasks[taskId].data[15])
    {
    case 0:
@@ -722,7 +723,7 @@ void AnimTask_SetAllNonAttackersInvisiblity(u8 taskId)
    DestroyAnimVisualTask(taskId);
 }

-void sub_80BBA20(u8 taskId, s32 unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u32 *gfx, const u32 *tilemap, const u32 *palette)
+void StartMonScrollingBgMask(u8 taskId, s32 unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u32 *gfx, const u32 *tilemap, const u32 *palette)
 {
    u16 species;
    u8 spriteId, newSpriteId = 0;
@@ -758,7 +759,7 @@ void sub_80BBA20(u8 taskId, s32 unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5,
    GetBattleAnimBg1Data(&animBgData);
    AnimLoadCompressedBgTilemap(animBgData.bgId, tilemap);
    if (IsContest())
-        sub_80730C0(animBgData.paletteId, animBgData.bgTilemap, 0, 0);
+        RelocateBattleBgPal(animBgData.paletteId, animBgData.bgTilemap, 0, 0);
    AnimLoadCompressedBgGfx(animBgData.bgId, gfx, animBgData.tilesOffset);
    LoadCompressedPalette(palette, animBgData.paletteId * 16, 32);
    gBattle_BG1_X = 0;
@@ -643,7 +643,7 @@ UNUSED void GetBattleTerrainGfxPtrs(u8 terrain, const u32 **tilesPtr, const u32
    *palPtr = sBattleTerrainTable[terrain].palette;
 }

-void sub_800F324(void)
+void BattleInitBgsAndWindows(void)
 {
    ResetBgsAndClearDma3BusyFlags(FALSE);
    InitBgsFromTemplates(0, gBattleBgTemplates, NELEMS(gBattleBgTemplates));
@@ -654,7 +654,7 @@ void sub_800F324(void)
 void InitBattleBgsVideo(void)
 {
    EnableInterrupts(INTR_FLAG_VBLANK | INTR_FLAG_VCOUNT | INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL);
-    sub_800F324();
+    BattleInitBgsAndWindows();
    SetGpuReg(REG_OFFSET_BLDCNT, 0);
    SetGpuReg(REG_OFFSET_BLDALPHA, 0);
    SetGpuReg(REG_OFFSET_BLDY, 0);
@@ -538,7 +538,7 @@ static void Task_HandleCopyReceivedLinkBuffersData(u8 taskId)
            if (gBattleControllerExecFlags & gBitTable[battlerId])
                return;
            memcpy(gBattleBufferA[battlerId], &gLinkBattleRecvBuffer[gTasks[taskId].data[15] + LINK_BUFF_DATA], blockSize);
-            sub_8017298(battlerId);
+            MarkBattlerReceivedLinkData(battlerId);
            if (!(gBattleTypeFlags & BATTLE_TYPE_IS_MASTER))
            {
                gBattlerAttacker = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + LINK_BUFF_ATTACKER];
@@ -118,7 +118,7 @@ void HandleIntroSlide(u8 terrain)
    gTasks[taskId].data[6] = 0;
 }

-void sub_80BC41C(u8 taskId)
+void BattleIntroSlideEnd(u8 taskId)
 {
    DestroyTask(taskId);
    gBattle_BG1_X = 0;
@@ -206,7 +206,7 @@ static void BattleIntroSlide1(u8 taskId)
        }
        break;
    case 4:
-        sub_80BC41C(taskId);
+        BattleIntroSlideEnd(taskId);
        break;
    }
 }
@@ -305,7 +305,7 @@ static void BattleIntroSlide2(u8 taskId)
        }
        break;
    case 4:
-        sub_80BC41C(taskId);
+        BattleIntroSlideEnd(taskId);
        break;
    }
    if (gTasks[taskId].data[0] != 4)
@@ -384,7 +384,7 @@ static void BattleIntroSlide3(u8 taskId)
        }
        break;
    case 4:
-        sub_80BC41C(taskId);
+        BattleIntroSlideEnd(taskId);
        break;
    }
    if (gTasks[taskId].data[0] != 4)
@@ -460,7 +460,7 @@ static void BattleIntroSlideLink(u8 taskId)
        }
        break;
    case 4:
-        sub_80BC41C(taskId);
+        BattleIntroSlideEnd(taskId);
        break;
    }
 }
@@ -174,13 +174,14 @@ void MarkBattlerForControllerExec(u8 battlerId)
        gBattleControllerExecFlags |= gBitTable[battlerId];
 }

-void sub_8017298(u8 arg0)
+void MarkBattlerReceivedLinkData(u8 battlerId)
 {
    s32 i;

    for (i = 0; i < GetLinkPlayerCount(); ++i)
-        gBattleControllerExecFlags |= gBitTable[arg0] << (i << 2);
-    gBattleControllerExecFlags &= ~(0x10000000 << arg0);
+        gBattleControllerExecFlags |= gBitTable[battlerId] << (i << 2);
+
+    gBattleControllerExecFlags &= ~(0x10000000 << battlerId);
 }

 void CancelMultiTurnMoves(u8 battler)
@@ -230,7 +231,7 @@ void ResetSentPokesToOpponentValue(void)
        gSentPokesToOpponent[(i & BIT_FLANK) >> 1] = bits;
 }

-void sub_8017434(u8 battler)
+void OpponentSwitchInResetSentPokesToOpponentValue(u8 battler)
 {
    s32 i = 0;
    u32 bits = 0;
@@ -238,8 +239,8 @@ void sub_8017434(u8 battler)
    if (GetBattlerSide(battler) == B_SIDE_OPPONENT)
    {
        u8 flank = ((battler & BIT_FLANK) >> 1);
-
        gSentPokesToOpponent[flank] = 0;
+
        for (i = 0; i < gBattlersCount; i += 2)
            if (!(gAbsentBattlerFlags & gBitTable[i]))
                bits |= gBitTable[gBattlerPartyIndexes[i]];
@@ -251,7 +252,7 @@ void UpdateSentPokesToOpponentValue(u8 battler)
 {
    if (GetBattlerSide(battler) == B_SIDE_OPPONENT)
    {
-        sub_8017434(battler);
+        OpponentSwitchInResetSentPokesToOpponentValue(battler);
    }
    else
    {
@@ -1112,7 +1113,7 @@ bool8 HandleFaintedMonActions(void)
            gBattleStruct->faintedActionsState = 3;
            break;
        case 2:
-            sub_8017434(gBattlerFainted);
+            OpponentSwitchInResetSentPokesToOpponentValue(gBattlerFainted);
            if (++gBattleStruct->faintedActionsBattlerId == gBattlersCount)
                gBattleStruct->faintedActionsState = 3;
            else
@@ -198,7 +198,7 @@ static void BikeTransition_Downhill(UNUSED u8 v)
    u8 collision = GetBikeCollision(DIR_SOUTH);

    if (collision == COLLISION_NONE)
-        sub_805C164(DIR_SOUTH);
+        PlayerGoSpeed4(DIR_SOUTH);
    else if (collision == COLLISION_LEDGE_JUMP)
        PlayerJumpLedge(DIR_SOUTH);
 }
@@ -568,7 +568,7 @@ static void Task_ReestablishLinkInCableClubRoom_2(u8 taskId)
    if (gReceivedRemoteLinkPlayers == TRUE && IsLinkPlayerDataExchangeComplete() == TRUE)
    {
        sub_800A9A4();
-        sub_8009FE8();
+        StartSendingKeysToLink();
        DestroyTask(taskId);
    }
 }
@@ -49,7 +49,7 @@ void ClearTempFieldEventData(void)
    FlagClear(FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER);
 }

-void sub_806E168(void)
+void sub_806E168(void) // Unused
 {
    u16 *ptr = GetVarPointer(VAR_0x403C);
    gSaveBlock2Ptr->pokedex.nationalMagic = 0;
@@ -65,7 +65,7 @@ void sub_806E190(void)
    FlagSet(FLAG_0x838);
 }

-bool32 sub_806E1C0(void)
+bool32 sub_806E1C0(void) // Unused
 {
    if (gSaveBlock2Ptr->pokedex.nationalMagic != 0xDA)
        return FALSE;
@@ -76,19 +76,19 @@ bool32 sub_806E1C0(void)
    return TRUE;
 }

-void sub_806E204(void)
+void DisableNationalPokedex(void)
 {
-    u16 *ptr = GetVarPointer(VAR_0x404E);
+    u16 *nationalDexVar = GetVarPointer(VAR_NATIONAL_DEX);
    gSaveBlock2Ptr->pokedex.unknown2 = 0;
-    *ptr = 0;
+    *nationalDexVar = 0;
    FlagClear(FLAG_SYS_NATIONAL_DEX);
 }

 void EnableNationalPokedex(void)
 {
-    u16 *ptr = GetVarPointer(VAR_0x404E);
+    u16 *nationalDexVar = GetVarPointer(VAR_NATIONAL_DEX);
    gSaveBlock2Ptr->pokedex.unknown2 = 0xB9;
-    *ptr = 0x6258;
+    *nationalDexVar = 0x6258;
    FlagSet(FLAG_SYS_NATIONAL_DEX);
 }

@@ -96,7 +96,7 @@ bool32 IsNationalPokedexEnabled(void)
 {
    if (gSaveBlock2Ptr->pokedex.unknown2 != 0xB9)
        return FALSE;
-    if (VarGet(VAR_0x404E) != 0x6258)
+    if (VarGet(VAR_NATIONAL_DEX) != 0x6258)
        return FALSE;
    if (!FlagGet(FLAG_SYS_NATIONAL_DEX))
        return FALSE;
@@ -120,22 +120,22 @@ bool32 IsMysteryGiftEnabled(void)

 void ResetMysteryEventFlags(void)
 {
-    FlagClear(FLAG_MYSTERY_EVENT_DONE);
-    FlagClear(FLAG_0x3D9);
-    FlagClear(FLAG_0x3DA);
-    FlagClear(FLAG_0x3DB);
-    FlagClear(FLAG_0x3DC);
-    FlagClear(FLAG_0x3DD);
-    FlagClear(FLAG_0x3DE);
-    FlagClear(FLAG_0x3DF);
-    FlagClear(FLAG_0x3E0);
-    FlagClear(FLAG_0x3E1);
-    FlagClear(FLAG_0x3E2);
-    FlagClear(FLAG_0x3E3);
-    FlagClear(FLAG_0x3E4);
-    FlagClear(FLAG_0x3E5);
-    FlagClear(FLAG_0x3E6);
-    FlagClear(FLAG_0x3E7);
+    FlagClear(FLAG_MYSTERY_GIFT_DONE);
+    FlagClear(FLAG_MYSTERY_GIFT_1);
+    FlagClear(FLAG_MYSTERY_GIFT_2);
+    FlagClear(FLAG_MYSTERY_GIFT_3);
+    FlagClear(FLAG_MYSTERY_GIFT_4);
+    FlagClear(FLAG_MYSTERY_GIFT_5);
+    FlagClear(FLAG_MYSTERY_GIFT_6);
+    FlagClear(FLAG_MYSTERY_GIFT_7);
+    FlagClear(FLAG_MYSTERY_GIFT_8);
+    FlagClear(FLAG_MYSTERY_GIFT_9);
+    FlagClear(FLAG_MYSTERY_GIFT_10);
+    FlagClear(FLAG_MYSTERY_GIFT_11);
+    FlagClear(FLAG_MYSTERY_GIFT_12);
+    FlagClear(FLAG_MYSTERY_GIFT_13);
+    FlagClear(FLAG_MYSTERY_GIFT_14);
+    FlagClear(FLAG_MYSTERY_GIFT_15);
 }

 void ResetMysteryEventVars(void)
@@ -5232,7 +5232,7 @@ dirn_to_anim(GetWalkSlowMovementAction, gUnknown_83A6500);
 dirn_to_anim(GetWalkNormalMovementAction, gUnknown_83A6505);
 dirn_to_anim(GetWalkFastMovementAction, gUnknown_83A650A);
 dirn_to_anim(sub_8063FDC, gUnknown_83A650F);
-dirn_to_anim(sub_8064008, gUnknown_83A6514);
+dirn_to_anim(GetRideWaterCurrentMovementAction, gUnknown_83A6514);
 dirn_to_anim(GetWalkFastestMovementAction, gUnknown_83A6519);
 dirn_to_anim(GetSlideMovementAction, gUnknown_83A651E);
 dirn_to_anim(GetPlayerRunMovementAction, gUnknown_83A6523);
@@ -5242,7 +5242,7 @@ dirn_to_anim(GetJump2MovementAction, gUnknown_83A6532);
 dirn_to_anim(GetJumpInPlaceMovementAction, gUnknown_83A6537);
 dirn_to_anim(GetJumpInPlaceTurnAroundMovementAction, gUnknown_83A653C);
 dirn_to_anim(GetJumpMovementAction, gUnknown_83A6541);
-dirn_to_anim(sub_80641C0, gUnknown_83A6546);
+dirn_to_anim(GetJumpSpecialMovementAction, gUnknown_83A6546);
 dirn_to_anim(sub_80641EC, gUnknown_83A654B);
 dirn_to_anim(GetStepInPlaceDelay32AnimId, gUnknown_83A6550);
 dirn_to_anim(GetWalkInPlaceNormalMovementAction, gUnknown_83A6555);
@@ -5827,12 +5827,12 @@ u8 sub_8064F3C(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 callba

 u8 sub_8065000(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
-    return sub_8064F3C(objectEvent, sprite, sub_8068D3C);
+    return sub_8064F3C(objectEvent, sprite, DoJumpSpriteMovement);
 }

 u8 sub_8065014(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
-    return sub_8064F3C(objectEvent, sprite, sub_8068DC4);
+    return sub_8064F3C(objectEvent, sprite, DoJumpSpecialSpriteMovement);
 }

 bool8 sub_8065028(struct ObjectEvent *objectEvent, struct Sprite *sprite)
@@ -7172,14 +7172,14 @@ static bool8 MovementAction_RevealTrainer_Step0(struct ObjectEvent *objectEvent,
        sprite->data[2] = 2;
        return TRUE;
    }
-    sub_80DCBB8(objectEvent);
+    StartRevealDisguise(objectEvent);
    sprite->data[2] = 1;
    return MovementAction_RevealTrainer_Step1(objectEvent, sprite);
 }

 static bool8 MovementAction_RevealTrainer_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
-    if (sub_80DCBE0(objectEvent))
+    if (UpdateRevealDisguise(objectEvent))
    {
        sprite->data[2] = 2;
        return TRUE;
@@ -9149,7 +9149,7 @@ void SetJumpSpriteData(struct Sprite *sprite, u8 direction, u8 speed, u8 height)
    sprite->tStepNo = 0;
 }

-u8 sub_8068D3C(struct Sprite *sprite)
+u8 DoJumpSpriteMovement(struct Sprite *sprite)
 {
    s16 duration[3] = {0x10, 0x10, 0x20};
    u8 shifts[3] = {0, 0, 1};
@@ -9174,7 +9174,7 @@ u8 sub_8068D3C(struct Sprite *sprite)
    return jumpPhase;
 }

-u8 sub_8068DC4(struct Sprite *sprite)
+u8 DoJumpSpecialSpriteMovement(struct Sprite *sprite)
 {
    s16 duration[3] = {0x20, 0x20, 0x40};
    u8 shifts[3] = {1, 1, 2};
@@ -431,7 +431,7 @@ void MoveCameraAndRedrawMap(int deltaX, int deltaY) // unused
    gTotalCameraPixelOffsetY -= deltaY * 16;
 }

-void sub_805ACF0(void)
+void CameraUpdateNoObjectRefresh(void)
 {
    int deltaX;
    int deltaY;
@@ -2462,13 +2462,13 @@ static void ShowMonEffect_Indoors_5(struct Task * task);
 static void ShowMonEffect_Indoors_6(struct Task * task);
 static void ShowMonEffect_Indoors_7(struct Task * task);
 static void VBlankCB_ShowMonEffect_Indoors(void);
-static void sub_8086728(struct Task * task);
-static bool8 sub_8086738(struct Task * task);
-static bool8 sub_80867F0(struct Task * task);
-static u8 sub_8086860(u32 species, u32 otId, u32 personality);
-static void sub_80868C0(struct Sprite * sprite);
-static void sub_8086904(struct Sprite * sprite);
-static void sub_8086920(struct Sprite * sprite);
+static void AnimateIndoorShowMonBg(struct Task * task);
+static bool8 SlideIndoorBannerOnscreen(struct Task * task);
+static bool8 SlideIndoorBannerOffscreen(struct Task * task);
+static u8 InitFieldMoveMonSprite(u32 species, u32 otId, u32 personality);
+static void SpriteCB_FieldMoveMonSlideOnscreen(struct Sprite * sprite);
+static void SpriteCB_FieldMoveMonWaitAfterCry(struct Sprite * sprite);
+static void SpriteCB_FieldMoveMonSlideOffscreen(struct Sprite * sprite);

 static void (*const sShowMonOutdoorsEffectFuncs[])(struct Task * task) = {
    ShowMonEffect_Outdoors_1,
@@ -2487,7 +2487,7 @@ u32 FldEff_FieldMoveShowMon(void)
        taskId = CreateTask(Task_ShowMon_Outdoors, 0xFF);
    else
        taskId = CreateTask(Task_ShowMon_Indoors, 0xFF);
-    gTasks[taskId].data[15] = sub_8086860(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+    gTasks[taskId].data[15] = InitFieldMoveMonSprite(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
    return 0;
 }

@@ -2565,7 +2565,7 @@ static void ShowMonEffect_Outdoors_3(struct Task * task)
    task->data[2] = WIN_RANGE(win0v_lo, win0v_hi);
    if (win0h_lo == 0 && win0v_lo == 0x28 && win0v_hi == 0x78)
    {
-        gSprites[task->data[15]].callback = sub_80868C0;
+        gSprites[task->data[15]].callback = SpriteCB_FieldMoveMonSlideOnscreen;
        task->data[0]++;
    }
 }
@@ -2691,21 +2691,21 @@ static void ShowMonEffect_Indoors_2(struct Task * task)

 static void ShowMonEffect_Indoors_3(struct Task * task)
 {
-    if (sub_8086738(task))
+    if (SlideIndoorBannerOnscreen(task))
    {
        task->data[5] = GetGpuReg(REG_OFFSET_WININ);
        SetGpuReg(REG_OFFSET_WININ, (task->data[5] & 0xFF) | WININ_WIN1_BG0 | WININ_WIN1_OBJ);
        SetGpuReg(REG_OFFSET_WIN1H, WIN_RANGE(0x00, 0xf0));
        SetGpuReg(REG_OFFSET_WIN1V, WIN_RANGE(0x28, 0x78));
-        gSprites[task->data[15]].callback = sub_80868C0;
+        gSprites[task->data[15]].callback = SpriteCB_FieldMoveMonSlideOnscreen;
        task->data[0]++;
    }
-    sub_8086728(task);
+    AnimateIndoorShowMonBg(task);
 }

 static void ShowMonEffect_Indoors_4(struct Task * task)
 {
-    sub_8086728(task);
+    AnimateIndoorShowMonBg(task);
    if (gSprites[task->data[15]].data[7])
    {
        task->data[0]++;
@@ -2714,7 +2714,7 @@ static void ShowMonEffect_Indoors_4(struct Task * task)

 static void ShowMonEffect_Indoors_5(struct Task * task)
 {
-    sub_8086728(task);
+    AnimateIndoorShowMonBg(task);
    task->data[3] = task->data[1] & 7;
    task->data[4] = 0;
    SetGpuReg(REG_OFFSET_WIN1H, WIN_RANGE(0xff, 0xff));
@@ -2725,8 +2725,8 @@ static void ShowMonEffect_Indoors_5(struct Task * task)

 static void ShowMonEffect_Indoors_6(struct Task * task)
 {
-    sub_8086728(task);
-    if (sub_80867F0(task))
+    AnimateIndoorShowMonBg(task);
+    if (SlideIndoorBannerOffscreen(task))
    {
        task->data[0]++;
    }
@@ -2759,13 +2759,13 @@ static void VBlankCB_ShowMonEffect_Indoors(void)
    SetGpuReg(REG_OFFSET_BG0VOFS, task->data[2]);
 }

-static void sub_8086728(struct Task * task)
+static void AnimateIndoorShowMonBg(struct Task * task)
 {
    task->data[1] -= 16;
    task->data[3] += 16;
 }

-static bool8 sub_8086738(struct Task * task)
+static bool8 SlideIndoorBannerOnscreen(struct Task * task)
 {
    u16 i;
    u16 srcOffs;
@@ -2794,7 +2794,7 @@ static bool8 sub_8086738(struct Task * task)
    return FALSE;
 }

-static bool8 sub_80867F0(struct Task * task)
+static bool8 SlideIndoorBannerOffscreen(struct Task * task)
 {
    u16 i;
    u16 dstOffs;
@@ -2818,7 +2818,7 @@ static bool8 sub_80867F0(struct Task * task)
    return FALSE;
 }

-static u8 sub_8086860(u32 species, u32 otId, u32 personality)
+static u8 InitFieldMoveMonSprite(u32 species, u32 otId, u32 personality)
 {
    bool16 playCry;
    u8 monSprite;
@@ -2834,13 +2834,13 @@ static u8 sub_8086860(u32 species, u32 otId, u32 personality)
    return monSprite;
 }

-static void sub_80868C0(struct Sprite * sprite)
+static void SpriteCB_FieldMoveMonSlideOnscreen(struct Sprite * sprite)
 {
    if ((sprite->x -= 20) <= 0x78)
    {
        sprite->x = 0x78;
        sprite->data[1] = 30;
-        sprite->callback = sub_8086904;
+        sprite->callback = SpriteCB_FieldMoveMonWaitAfterCry;
        if (sprite->data[6])
        {
            PlayCry2(sprite->data[0], 0, 0x7d, 0xa);
@@ -2852,15 +2852,15 @@ static void sub_80868C0(struct Sprite * sprite)
    }
 }

-static void sub_8086904(struct Sprite * sprite)
+static void SpriteCB_FieldMoveMonWaitAfterCry(struct Sprite * sprite)
 {
    if ((--sprite->data[1]) == 0)
    {
-        sprite->callback = sub_8086920;
+        sprite->callback = SpriteCB_FieldMoveMonSlideOffscreen;
    }
 }

-static void sub_8086920(struct Sprite * sprite)
+static void SpriteCB_FieldMoveMonSlideOffscreen(struct Sprite * sprite)
 {
    if (sprite->x < -0x40)
    {
@@ -2945,7 +2945,7 @@ static void UseSurfEffect_4(struct Task * task)
        objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
        ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_GFX_RIDE));
        ObjectEventClearHeldMovementIfFinished(objectEvent);
-        ObjectEventSetHeldMovement(objectEvent, sub_80641C0(objectEvent->movementDirection));
+        ObjectEventSetHeldMovement(objectEvent, GetJumpSpecialMovementAction(objectEvent->movementDirection));
        gFieldEffectArguments[0] = task->data[1];
        gFieldEffectArguments[1] = task->data[2];
        gFieldEffectArguments[2] = gPlayerAvatar.objectEventId;
@@ -2963,7 +2963,7 @@ static void UseSurfEffect_5(struct Task * task)
        gPlayerAvatar.preventStep = FALSE;
        gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_CONTROLLABLE;
        ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(objectEvent->movementDirection));
-        sub_80DC44C(objectEvent->fieldEffectSpriteId, 1);
+        SetSurfBlob_BobState(objectEvent->fieldEffectSpriteId, 1);
        UnfreezeObjectEvents();
        ScriptContext2_Disable();
        FieldEffectActiveListRemove(FLDEFF_USE_SURF);
@@ -3044,7 +3044,7 @@ static void UseVsSeekerEffect_4(struct Task * task)
    }
 }

-static void sub_8086D94(struct Sprite * sprite);
+static void SpriteCB_NPCFlyOut(struct Sprite * sprite);

 u8 FldEff_NpcFlyOut(void)
 {
@@ -3053,13 +3053,13 @@ u8 FldEff_NpcFlyOut(void)

    sprite->oam.paletteNum = 0;
    sprite->oam.priority = 1;
-    sprite->callback = sub_8086D94;
+    sprite->callback = SpriteCB_NPCFlyOut;
    sprite->data[1] = gFieldEffectArguments[0];
    PlaySE(SE_M_FLY);
    return spriteId;
 }

-static void sub_8086D94(struct Sprite * sprite)
+static void SpriteCB_NPCFlyOut(struct Sprite * sprite)
 {
    struct Sprite * npcSprite;

@@ -3091,12 +3091,12 @@ static void UseFlyEffect_6(struct Task * task);
 static void UseFlyEffect_7(struct Task * task);
 static void UseFlyEffect_8(struct Task * task);
 static void UseFlyEffect_9(struct Task * task);
-static u8 sub_8087168(void);
-static bool8 sub_80871AC(u8 flyBlobSpriteId);
-static void sub_80871C8(u8 flyBlobSpriteId);
-static void sub_8087204(u8 flyBlobSpriteId, u8 playerSpriteId);
-static void sub_8087220(struct Sprite * sprite);
-static void sub_80872F0(struct Sprite * sprite);
+static u8 CreateFlyBirdSprite(void);
+static bool8 GetFlyBirdAnimCompleted(u8 flyBlobSpriteId);
+static void StartFlyBirdSwoopDown(u8 flyBlobSpriteId);
+static void SetFlyBirdPlayerSpriteId(u8 flyBlobSpriteId, u8 playerSpriteId);
+static void SpriteCB_FlyBirdLeaveBall(struct Sprite * sprite);
+static void SpriteCB_FlyBirdSwoopDown(struct Sprite * sprite);
 static void sub_80877FC(struct Sprite * sprite, u8 affineAnimId);
 static void sub_8087828(struct Sprite * sprite);

@@ -3156,17 +3156,17 @@ static void UseFlyEffect_3(struct Task * task)
        struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
        if (task->data[15] & 0x08)
        {
-            sub_80DC44C(objectEvent->fieldEffectSpriteId, 2);
-            sub_80DC478(objectEvent->fieldEffectSpriteId, 0);
+            SetSurfBlob_BobState(objectEvent->fieldEffectSpriteId, 2);
+            SetSurfBlob_DontSyncAnim(objectEvent->fieldEffectSpriteId, 0);
        }
-        task->data[1] = sub_8087168();
+        task->data[1] = CreateFlyBirdSprite();
        task->data[0]++;
    }
 }

 static void UseFlyEffect_4(struct Task * task)
 {
-    if (sub_80871AC(task->data[1]))
+    if (GetFlyBirdAnimCompleted(task->data[1]))
    {
        task->data[0]++;
        task->data[2] = 16;
@@ -3182,7 +3182,7 @@ static void UseFlyEffect_5(struct Task * task)
    {
        task->data[0]++;
        PlaySE(SE_M_FLY);
-        sub_80871C8(task->data[1]);
+        StartFlyBirdSwoopDown(task->data[1]);
    }
 }

@@ -3208,7 +3208,7 @@ static void UseFlyEffect_7(struct Task * task)
        ObjectEventClearHeldMovementIfActive(objectEvent);
        objectEvent->inanimate = FALSE;
        objectEvent->hasShadow = FALSE;
-        sub_8087204(task->data[1], objectEvent->spriteId);
+        SetFlyBirdPlayerSpriteId(task->data[1], objectEvent->spriteId);
        StartSpriteAnim(&gSprites[task->data[1]], gSaveBlock2Ptr->playerGender * 2 + 1);
        sub_80877FC(&gSprites[task->data[1]], 0);
        gSprites[task->data[1]].callback = sub_8087828;
@@ -3219,7 +3219,7 @@ static void UseFlyEffect_7(struct Task * task)

 static void UseFlyEffect_8(struct Task * task)
 {
-    if (sub_80871AC(task->data[1]))
+    if (GetFlyBirdAnimCompleted(task->data[1]))
    {
        WarpFadeOutScreen();
        task->data[0]++;
@@ -3235,7 +3235,7 @@ static void UseFlyEffect_9(struct Task * task)
    }
 }

-static u8 sub_8087168(void)
+static u8 CreateFlyBirdSprite(void)
 {
    u8 spriteId;
    struct Sprite * sprite;
@@ -3243,20 +3243,20 @@ static u8 sub_8087168(void)
    sprite = &gSprites[spriteId];
    sprite->oam.paletteNum = 0;
    sprite->oam.priority = 1;
-    sprite->callback = sub_8087220;
+    sprite->callback = SpriteCB_FlyBirdLeaveBall;
    return spriteId;
 }

-static u8 sub_80871AC(u8 spriteId)
+static u8 GetFlyBirdAnimCompleted(u8 spriteId)
 {
    return gSprites[spriteId].data[7];
 }

-static void sub_80871C8(u8 spriteId)
+static void StartFlyBirdSwoopDown(u8 spriteId)
 {
    struct Sprite * sprite;
    sprite = &gSprites[spriteId];
-    sprite->callback = sub_80872F0;
+    sprite->callback = SpriteCB_FlyBirdSwoopDown;
    sprite->x = 0x78;
    sprite->y = 0x00;
    sprite->x2 = 0;
@@ -3265,9 +3265,9 @@ static void sub_80871C8(u8 spriteId)
    sprite->data[6] = 0x40;
 }

-static void sub_8087204(u8 a0, u8 a1)
+static void SetFlyBirdPlayerSpriteId(u8 flyBlobSpriteId, u8 playerSpriteId)
 {
-    gSprites[a0].data[6] = a1;
+    gSprites[flyBlobSpriteId].data[6] = playerSpriteId;
 }

 static const union AffineAnimCmd sUnknown_83CC19C[] = {
@@ -3287,7 +3287,7 @@ static const union AffineAnimCmd *const sUnknown_83CC1CC[] = {
    sUnknown_83CC1B4
 };

-static void sub_8087220(struct Sprite * sprite)
+static void SpriteCB_FlyBirdLeaveBall(struct Sprite * sprite)
 {
    if (sprite->data[7] == 0)
    {
@@ -3323,7 +3323,7 @@ static void sub_8087220(struct Sprite * sprite)
    }
 }

-static void sub_80872F0(struct Sprite * sprite)
+static void SpriteCB_FlyBirdSwoopDown(struct Sprite * sprite)
 {
    sprite->x2 = Cos(sprite->data[2], 0x8c);
    sprite->y2 = Sin(sprite->data[2], 0x48);
@@ -3343,7 +3343,7 @@ static void sub_80872F0(struct Sprite * sprite)
    }
 }

-static void sub_8087364(struct Sprite * sprite)
+static void SpriteCB_FlyBirdReturnToBall(struct Sprite * sprite)
 {
    if (sprite->data[7] == 0)
    {
@@ -3390,10 +3390,10 @@ static void sub_8087364(struct Sprite * sprite)
    }
 }

-static void sub_8087458(u8 spriteId)
+static void StartFlyBirdReturnToBall(u8 spriteId)
 {
-    sub_80871C8(spriteId);
-    gSprites[spriteId].callback = sub_8087364;
+    StartFlyBirdSwoopDown(spriteId);
+    gSprites[spriteId].callback = SpriteCB_FlyBirdReturnToBall;
 }

 static void Task_FldEffFlyIn(u8 taskId);
@@ -3440,16 +3440,16 @@ static void FlyInEffect_1(struct Task * task)
        SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ON_FOOT);
        if (task->data[15] & PLAYER_AVATAR_FLAG_SURFING)
        {
-            sub_80DC44C(objectEvent->fieldEffectSpriteId, 0);
+            SetSurfBlob_BobState(objectEvent->fieldEffectSpriteId, 0);
        }
        ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_GFX_RIDE));
        CameraObjectReset2();
        ObjectEventTurn(objectEvent, DIR_WEST);
        StartSpriteAnim(&gSprites[objectEvent->spriteId], 0x16);
        objectEvent->invisible = FALSE;
-        task->data[1] = sub_8087168();
-        sub_80871C8(task->data[1]);
-        sub_8087204(task->data[1], objectEvent->spriteId);
+        task->data[1] = CreateFlyBirdSprite();
+        StartFlyBirdSwoopDown(task->data[1]);
+        SetFlyBirdPlayerSpriteId(task->data[1], objectEvent->spriteId);
        StartSpriteAnim(&gSprites[task->data[1]], gSaveBlock2Ptr->playerGender * 2 + 2);
        sub_80877FC(&gSprites[task->data[1]], 1);
        gSprites[task->data[1]].callback = sub_8087828;
@@ -3465,7 +3465,7 @@ static void FlyInEffect_2(struct Task * task)
    {
        objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
        sprite = &gSprites[objectEvent->spriteId];
-        sub_8087204(task->data[1], 0x40);
+        SetFlyBirdPlayerSpriteId(task->data[1], 0x40);
        sprite->x += sprite->x2;
        sprite->y += sprite->y2;
        sprite->x2 = 0;
@@ -3509,7 +3509,7 @@ static void FlyInEffect_4(struct Task * task)
 {
    struct ObjectEvent * objectEvent;
    struct Sprite * sprite;
-    if (sub_80871AC(task->data[1]))
+    if (GetFlyBirdAnimCompleted(task->data[1]))
    {
        objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
        sprite = &gSprites[objectEvent->spriteId];
@@ -3529,13 +3529,13 @@ static void FlyInEffect_5(struct Task * task)
    if (ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gPlayerAvatar.objectEventId]))
    {
        task->data[0]++;
-        sub_8087458(task->data[1]);
+        StartFlyBirdReturnToBall(task->data[1]);
    }
 }

 static void FlyInEffect_6(struct Task * task)
 {
-    if (sub_80871AC(task->data[1]))
+    if (GetFlyBirdAnimCompleted(task->data[1]))
    {
        DestroySprite(&gSprites[task->data[1]]);
        task->data[0]++;
@@ -3554,7 +3554,7 @@ static void FlyInEffect_7(struct Task * task)
        if (task->data[15] & PLAYER_AVATAR_FLAG_SURFING)
        {
            state = PLAYER_AVATAR_GFX_RIDE;
-            sub_80DC44C(objectEvent->fieldEffectSpriteId, 1);
+            SetSurfBlob_BobState(objectEvent->fieldEffectSpriteId, 1);
        }
        ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(state));
        ObjectEventTurn(objectEvent, DIR_SOUTH);
@@ -3624,7 +3624,7 @@ static void sub_80878C0(struct Sprite * sprite)
            FreeOamMatrix(sprite->oam.matrixNum);
            CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, ST_OAM_AFFINE_OFF);
            StartSpriteAnim(sprite, 0);
-            sprite->callback = sub_80872F0;
+            sprite->callback = SpriteCB_FlyBirdSwoopDown;
        }
    }
 }
@@ -3695,16 +3695,16 @@ static void Task_MoveDeoxysRock_Step(u8 taskId)
    }
 }

-static void Task_FldEffUnk44(u8 taskId);
-static void Unk44Effect_0(s16 *data, u8 taskId);
-static void Unk44Effect_1(s16 *data, u8 taskId);
+static void Task_DestroyDeoxysRock(u8 taskId);
+static void DestroyDeoxysRockEffect_CameraShake(s16 *data, u8 taskId);
+static void DestroyDeoxysRockEffect_RockFragments(s16 *data, u8 taskId);
 static void Unk44Effect_2(s16 *data, u8 taskId);
-static void sub_8087CFC(struct Sprite * sprite);
+static void CreateDeoxysRockFragments(struct Sprite * sprite);
 static void SpriteCB_FldEffUnk44(struct Sprite * sprite);

 static void (*const sUnk44EffectFuncs[])(s16 *data, u8 taskId) = {
-    Unk44Effect_0,
-    Unk44Effect_1,
+    DestroyDeoxysRockEffect_CameraShake,
+    DestroyDeoxysRockEffect_RockFragments,
    Unk44Effect_2
 };

@@ -3758,7 +3758,7 @@ u32 FldEff_Unk44(void)
    u8 objectEventIdBuffer;
    if (!TryGetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &objectEventIdBuffer))
    {
-        taskId = CreateTask(Task_FldEffUnk44, 0x50);
+        taskId = CreateTask(Task_DestroyDeoxysRock, 0x50);
        gTasks[taskId].data[2] = objectEventIdBuffer;
        gTasks[taskId].data[6] = gFieldEffectArguments[0];
        gTasks[taskId].data[7] = gFieldEffectArguments[1];
@@ -3771,7 +3771,7 @@ u32 FldEff_Unk44(void)
    return FALSE;
 }

-static void sub_8087B14(u8 taskId)
+static void Task_DeoxysRockCameraShake(u8 taskId)
 {
    s16 *data = gTasks[taskId].data;
    if (data[7] != 0)
@@ -3805,12 +3805,12 @@ static void sub_8087B14(u8 taskId)
        DestroyTask(taskId);
 }

-static void sub_8087BA8(u8 taskId)
+static void StartEndingDeoxysRockCameraShake(u8 taskId)
 {
    gTasks[taskId].data[7] = 1;
 }

-static void Task_FldEffUnk44(u8 taskId)
+static void Task_DestroyDeoxysRock(u8 taskId)
 {
    s16 *data = gTasks[taskId].data;
    InstallCameraPanAheadCallback();
@@ -3818,15 +3818,15 @@ static void Task_FldEffUnk44(u8 taskId)
    sUnk44EffectFuncs[data[1]](data, taskId);
 }

-static void Unk44Effect_0(s16 *data, u8 taskId)
+static void DestroyDeoxysRockEffect_CameraShake(s16 *data, u8 taskId)
 {
-    u8 newTaskId = CreateTask(sub_8087B14, 90);
+    u8 newTaskId = CreateTask(Task_DeoxysRockCameraShake, 90);
    PlaySE(SE_THUNDER2);
    data[5] = newTaskId;
    data[1]++;
 }

-static void Unk44Effect_1(s16 *data, u8 taskId)
+static void DestroyDeoxysRockEffect_RockFragments(s16 *data, u8 taskId)
 {
    if (++data[3] > 0x78)
    {
@@ -3834,9 +3834,9 @@ static void Unk44Effect_1(s16 *data, u8 taskId)
        gObjectEvents[data[2]].invisible = TRUE;
        BlendPalettes(0x0000FFFF, 0x10, RGB_WHITE);
        BeginNormalPaletteFade(0x0000FFFF, 0, 0x10, 0, RGB_WHITE);
-        sub_8087CFC(sprite);
+        CreateDeoxysRockFragments(sprite);
        PlaySE(SE_THUNDER);
-        sub_8087BA8(data[5]);
+        StartEndingDeoxysRockCameraShake(data[5]);
        data[3] = 0;
        data[1]++;
    }
@@ -3844,7 +3844,7 @@ static void Unk44Effect_1(s16 *data, u8 taskId)

 static void Unk44Effect_2(s16 *data, u8 taskId)
 {
-    if (!gPaletteFade.active && !FuncIsActiveTask(sub_8087B14))
+    if (!gPaletteFade.active && !FuncIsActiveTask(Task_DeoxysRockCameraShake))
    {
        InstallCameraPanAheadCallback();
        RemoveObjectEventByLocalIdAndMap(data[6], data[7], data[8]);
@@ -3853,7 +3853,7 @@ static void Unk44Effect_2(s16 *data, u8 taskId)
    }
 }

-static void sub_8087CFC(struct Sprite* sprite)
+static void CreateDeoxysRockFragments(struct Sprite* sprite)
 {
    int i;
    int xPos = (s16)gTotalCameraPixelOffsetX + sprite->x + sprite->x2;
@@ -960,33 +960,33 @@ u32 FldEff_SurfBlob(void)
    return spriteId;
 }

-void sub_80DC44C(u8 spriteId, u8 value)
+void SetSurfBlob_BobState(u8 spriteId, u8 value)
 {
    gSprites[spriteId].data[0] = (gSprites[spriteId].data[0] & ~0xF) | (value & 0xF);
 }

-void sub_80DC478(u8 spriteId, u8 value)
+void SetSurfBlob_DontSyncAnim(u8 spriteId, u8 value)
 {
    gSprites[spriteId].data[0] = (gSprites[spriteId].data[0] & ~0xF0) | ((value & 0xF) << 4);
 }

-void sub_80DC4A4(u8 spriteId, u8 value, s16 data1)
+void SetSurfBlob_PlayerOffset(u8 spriteId, u8 hasOffset, s16 offset)
 {
-    gSprites[spriteId].data[0] = (gSprites[spriteId].data[0] & ~0xF00) | ((value & 0xF) << 8);
-    gSprites[spriteId].data[1] = data1;
+    gSprites[spriteId].data[0] = (gSprites[spriteId].data[0] & ~0xF00) | ((hasOffset & 0xF) << 8);
+    gSprites[spriteId].data[1] = offset;
 }

-static u8 sub_80DC4D8(struct Sprite * sprite)
+static u8 GetSurfBlob_BobState(struct Sprite * sprite)
 {
    return sprite->data[0] & 0xF;
 }

-static u8 sub_80DC4E0(struct Sprite * sprite)
+static u8 GetSurfBlob_DontSyncAnim(struct Sprite * sprite)
 {
    return (sprite->data[0] & 0xF0) >> 4;
 }

-static u8 sub_80DC4EC(struct Sprite * sprite)
+static u8 GetSurfBlob_HasPlayerOffset(struct Sprite * sprite)
 {
    return (sprite->data[0] & 0xF00) >> 8;
 }
@@ -1014,7 +1014,7 @@ static void SynchroniseSurfAnim(struct ObjectEvent * objectEvent, struct Sprite
        [DIR_EAST] = 3
    };

-    if (sub_80DC4E0(sprite) == 0)
+    if (GetSurfBlob_DontSyncAnim(sprite) == 0)
        StartSpriteAnimIfDifferent(sprite, surfBlobDirectionAnims[objectEvent->movementDirection]);
 }

@@ -1045,7 +1045,7 @@ void SynchroniseSurfPosition(struct ObjectEvent * objectEvent, struct Sprite * s
 static void CreateBobbingEffect(struct ObjectEvent * objectEvent, struct Sprite * linkedSprite, struct Sprite * sprite)
 {
    u16 unk_83FECFA[] = {7, 15};
-    u8 v0 = sub_80DC4D8(sprite);
+    u8 v0 = GetSurfBlob_BobState(sprite);
    if (v0 != 0)
    {
        if (((u16)(++ sprite->data[4]) & unk_83FECFA[sprite->data[5]]) == 0)
@@ -1058,7 +1058,7 @@ static void CreateBobbingEffect(struct ObjectEvent * objectEvent, struct Sprite
        }
        if (v0 != 2)
        {
-            if (sub_80DC4EC(sprite) == 0)
+            if (GetSurfBlob_HasPlayerOffset(sprite) == 0)
                linkedSprite->y2 = sprite->y2;
            else
                linkedSprite->y2 = sprite->data[1] + sprite->y2;
@@ -1292,7 +1292,7 @@ void UpdateDisguiseFieldEffect(struct Sprite * sprite)
    }
 }

-void sub_80DCBB8(struct ObjectEvent * objectEvent)
+void StartRevealDisguise(struct ObjectEvent * objectEvent)
 {
    if (objectEvent->directionSequenceIndex == 1)
    {
@@ -1300,7 +1300,7 @@ void sub_80DCBB8(struct ObjectEvent * objectEvent)
    }
 }

-bool8 sub_80DCBE0(struct ObjectEvent * objectEvent)
+bool8 UpdateRevealDisguise(struct ObjectEvent * objectEvent)
 {
    struct Sprite * sprite;

@@ -68,7 +68,7 @@ void WarpFadeInScreen(void)
    }
 }

-static void sub_807DBAC(void)
+static void WarpFadeInScreenWithDelay(void)
 {
    switch (MapTransitionIsExit(GetLastUsedWarpMapType(), GetCurrentMapType()))
    {
@@ -111,7 +111,7 @@ void WarpFadeOutScreen(void)
    }
 }

-static void sub_807DC70(void)
+static void sub_807DC70(void) // Unused
 {
    switch (MapTransitionIsEnter(GetCurrentMapType(), GetDestinationWarpMapHeader()->mapType))
    {
@@ -124,9 +124,9 @@ static void sub_807DC70(void)
    }
 }

-static void sub_807DCB0(bool8 arg)
+static void SetPlayerVisibility(bool8 visible)
 {
-    SetPlayerInvisibility(!arg);
+    SetPlayerInvisibility(!visible);
 }

 static void task0A_nop_for_a_while(u8 taskId)
@@ -135,7 +135,7 @@ static void task0A_nop_for_a_while(u8 taskId)
        DestroyTask(taskId);
 }

-void sub_807DCE4(void)
+void FieldCB_ContinueScriptUnionRoom(void)
 {
    ScriptContext2_Enable();
    Overworld_PlaySpecialMapMusic();
@@ -201,7 +201,7 @@ void FieldCB_ReturnToFieldCableLink(void)
    CreateTask(task_mpl_807DD60, 10);
 }

-static void sub_807DDF0(u8 taskId)
+static void Task_ReturnToFieldRecordMixing(u8 taskId)
 {
    struct Task *task = &gTasks[taskId];
    switch (task->data[0])
@@ -220,7 +220,7 @@ static void sub_807DDF0(u8 taskId)
    case 2:
        if (FieldFadeTransitionBackgroundEffectIsFinished() == TRUE)
        {
-            sub_8009FE8();
+            StartSendingKeysToLink();
            ScriptContext2_Disable();
            DestroyTask(taskId);
        }
@@ -233,7 +233,7 @@ void FieldCB_ReturnToFieldWirelessLink(void)
    ScriptContext2_Enable();
    Overworld_PlaySpecialMapMusic();
    palette_bg_faded_fill_black();
-    CreateTask(sub_807DDF0, 10);
+    CreateTask(Task_ReturnToFieldRecordMixing, 10);
 }

 static void sub_807DE78(bool8 a0)
@@ -322,17 +322,17 @@ static void sub_807DFBC(u8 taskId)
    switch (task->data[0])
    {
    case 0: // Never reached
-        sub_807DCB0(0);
+        SetPlayerVisibility(0);
        FreezeObjectEvents();
        PlayerGetDestCoords(x, y);
        FieldSetDoorOpened(*x, *y);
        task->data[0] = 1;
        break;
    case 5:
-        sub_807DCB0(0);
+        SetPlayerVisibility(0);
        FreezeObjectEvents();
        DoOutwardBarnDoorWipe();
-        sub_807DBAC();
+        WarpFadeInScreenWithDelay();
        task->data[0] = 6;
        break;
    case 6:
@@ -349,7 +349,7 @@ static void sub_807DFBC(u8 taskId)
        if (!FieldIsDoorAnimationRunning())
        {
            PlayerGetDestCoords(&task->data[12], &task->data[13]);
-            sub_807DCB0(TRUE);
+            SetPlayerVisibility(TRUE);
            ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_DOWN);
            task->data[0] = 8;
        }
@@ -373,7 +373,7 @@ static void sub_807DFBC(u8 taskId)
    case 1:
        if (FieldFadeTransitionBackgroundEffectIsFinished())
        {
-            sub_807DCB0(TRUE);
+            SetPlayerVisibility(TRUE);
            ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_DOWN);
            task->data[0] = 2;
        }
@@ -407,7 +407,7 @@ static void task_map_chg_seq_0807E20C(u8 taskId)
    switch (task->data[0])
    {
    case 0:
-        sub_807DCB0(0);
+        SetPlayerVisibility(0);
        FreezeObjectEvents();
        PlayerGetDestCoords(x, y);
        task->data[0] = 1;
@@ -415,7 +415,7 @@ static void task_map_chg_seq_0807E20C(u8 taskId)
    case 1:
        if (FieldFadeTransitionBackgroundEffectIsFinished())
        {
-            sub_807DCB0(TRUE);
+            SetPlayerVisibility(TRUE);
            ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)], GetWalkNormalMovementAction(GetPlayerFacingDirection()));
            task->data[0] = 2;
        }
@@ -763,7 +763,7 @@ static void Task_DoorWarp(u8 taskId)
        {
            task->data[1] = FieldAnimateDoorClose(*xp, *yp - 1);
            ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]);
-            sub_807DCB0(FALSE);
+            SetPlayerVisibility(FALSE);
            task->data[0] = 3;
        }
        break;
@@ -10,7 +10,7 @@ static EWRAM_DATA u8 sMessageBoxType = 0;
 static void textbox_fdecode_auto_and_task_add(const u8 *str);
 static void textbox_auto_and_task_add(void);

-void sub_8069348(void)
+void InitFieldMessageBox(void)
 {
    sMessageBoxType = 0;
    gTextFlags.canABSpeedUpPrint = FALSE;
@@ -853,10 +853,11 @@ void sub_805C134(u8 direction)

 void PlayerRideWaterCurrent(u8 direction)
 {
-    PlayerSetAnimId(sub_8064008(direction), 2);
+    PlayerSetAnimId(GetRideWaterCurrentMovementAction(direction), 2);
 }

-void sub_805C164(u8 direction)
+// fastest speed (4 speed)
+void PlayerGoSpeed4(u8 direction)
 {
    PlayerSetAnimId(GetWalkFastestMovementAction(direction), 2);
 }
@@ -1612,7 +1613,7 @@ static void Task_StopSurfingInit(u8 taskId)
        if (!ObjectEventClearHeldMovementIfFinished(playerObjEvent))
            return;
    }
-    sub_80DC44C(playerObjEvent->fieldEffectSpriteId, 2);
+    SetSurfBlob_BobState(playerObjEvent->fieldEffectSpriteId, 2);
    QL_TryRecordPlayerStepWithDuration0(playerObjEvent, sub_80641EC((u8)gTasks[taskId].data[0]));
    gTasks[taskId].func = Task_WaitStopSurfing;
 }
@@ -1861,7 +1862,7 @@ static bool8 Fishing11(struct Task *task)
            ObjectEventSetGraphicsId(playerObjEvent, task->tPlayerGfxId);
            ObjectEventTurn(playerObjEvent, playerObjEvent->movementDirection);
            if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
-                sub_80DC4A4(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0);
+                SetSurfBlob_PlayerOffset(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0);
            gSprites[gPlayerAvatar.spriteId].x2 = 0;
            gSprites[gPlayerAvatar.spriteId].y2 = 0;
            ClearDialogWindowAndFrame(0, TRUE);
@@ -1919,7 +1920,7 @@ static bool8 Fishing15(struct Task *task)
        ObjectEventSetGraphicsId(playerObjEvent, task->tPlayerGfxId);
        ObjectEventTurn(playerObjEvent, playerObjEvent->movementDirection);
        if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
-            sub_80DC4A4(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0);
+            SetSurfBlob_PlayerOffset(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0);
        gSprites[gPlayerAvatar.spriteId].x2 = 0;
        gSprites[gPlayerAvatar.spriteId].y2 = 0;
        task->tStep++;
@@ -1976,7 +1977,7 @@ void AlignFishingAnimationFrames(struct Sprite * playerSprite)
    if (animType == 10 || animType == 11)
        playerSprite->y2 = 8;
    if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
-        sub_80DC4A4(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 1, playerSprite->y2);
+        SetSurfBlob_PlayerOffset(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 1, playerSprite->y2);
 }

 #define tState data[0]
@@ -1322,7 +1322,7 @@ static void sub_80B6BE4(u8 taskId)
        GetBattleAnimBgData(&animBgData, 2);
        gMonSpritesGfxPtr->multiUseBuffer = AllocZeroed(0x2000);
        LZDecompressWram(gBattleAnimBgTilemap_ScaryFacePlayer, gMonSpritesGfxPtr->multiUseBuffer);
-        sub_80730C0(animBgData.paletteId, gMonSpritesGfxPtr->multiUseBuffer, 256, 0);
+        RelocateBattleBgPal(animBgData.paletteId, gMonSpritesGfxPtr->multiUseBuffer, 256, 0);
        CopyToBgTilemapBufferRect_ChangePalette(animBgData.bgId, gMonSpritesGfxPtr->multiUseBuffer, 0, 0, 0x20, 0x20, 0x11);
        CopyBgTilemapBufferToVram(2);
        FREE_AND_SET_NULL(gMonSpritesGfxPtr->multiUseBuffer);
@@ -946,7 +946,7 @@ void AnimTask_Haze1(u8 taskId)
    AnimLoadCompressedBgTilemap(animBg.bgId, gBattleAnimFogTilemap);
    LoadPalette(&gDefaultWeatherSpritePalette, animBg.paletteId * 16, 32);
    if (IsContest())
-        sub_80730C0(animBg.paletteId, animBg.bgTilemap, 0, 0);
+        RelocateBattleBgPal(animBg.paletteId, animBg.bgTilemap, 0, 0);
    gTasks[taskId].func = AnimTask_Haze2;
 }

@@ -1044,7 +1044,7 @@ void AnimTask_LoadMistTiles(u8 taskId)
    AnimLoadCompressedBgTilemap(animBg.bgId, gBattleAnimFogTilemap);
    LoadPalette(&gDefaultWeatherSpritePalette, animBg.paletteId * 16, 32);
    if (IsContest())
-        sub_80730C0(animBg.paletteId, animBg.bgTilemap, 0, 0);
+        RelocateBattleBgPal(animBg.paletteId, animBg.bgTilemap, 0, 0);
    gTasks[taskId].data[15] = -1;
    gTasks[taskId].func = AnimTask_OverlayFogTiles;
 }
@@ -684,7 +684,7 @@ static void BagListMenuMoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMe
    if (onInit != TRUE)
    {
        PlaySE(SE_BAG_CURSOR);
-        sub_8098580();
+        ShakeBagSprite();
    }
    if (sBagMenuDisplay->itemOriginalLocation == 0xFF)
    {
@@ -1167,7 +1167,7 @@ static void SwitchPockets(u8 taskId, s16 direction, bool16 a2)
    }
    FillBgTilemapBufferRect_Palette0(1, 0x02D, 11, 1, 18, 12);
    ScheduleBgCopyTilemapToVram(1);
-    sub_8098528(gBagMenuState.pocket + direction);
+    SetBagVisualPocketId(gBagMenuState.pocket + direction);
    SetTaskFuncWithFollowupFunc(taskId, Task_AnimateSwitchPockets, gTasks[taskId].func);
 }

@@ -9,8 +9,8 @@ static EWRAM_DATA u8 sItemMenuIconSpriteIds[12] = {0};
 static EWRAM_DATA void * sItemIconTilesBuffer = NULL;
 static EWRAM_DATA void * sItemIconTilesBufferPadded = NULL;

-static void sub_8098560(struct Sprite * sprite);
-static void sub_80985BC(struct Sprite * sprite);
+static void SpriteCB_BagVisualSwitchingPockets(struct Sprite * sprite);
+static void SpriteCB_ShakeBagSprite(struct Sprite * sprite);

 static const struct OamData sOamData_BagOrSatchel = {
    .affineMode = ST_OAM_AFFINE_NORMAL,
@@ -556,18 +556,18 @@ void ResetItemMenuIconState(void)
 void CreateBagOrSatchelSprite(u8 animNum)
 {
    sItemMenuIconSpriteIds[0] = CreateSprite(&sSpriteTemplate_BagOrSatchel, 40, 68, 0);
-    sub_8098528(animNum);
+    SetBagVisualPocketId(animNum);
 }

-void sub_8098528(u8 animNum)
+void SetBagVisualPocketId(u8 animNum)
 {
    struct Sprite * sprite = &gSprites[sItemMenuIconSpriteIds[0]];
    sprite->y2 = -5;
-    sprite->callback = sub_8098560;
+    sprite->callback = SpriteCB_BagVisualSwitchingPockets;
    StartSpriteAnim(sprite, animNum);
 }

-static void sub_8098560(struct Sprite * sprite)
+static void SpriteCB_BagVisualSwitchingPockets(struct Sprite * sprite)
 {
    if (sprite->y2 != 0)
        sprite->y2++;
@@ -575,17 +575,17 @@ static void sub_8098560(struct Sprite * sprite)
        sprite->callback = SpriteCallbackDummy;
 }

-void sub_8098580(void)
+void ShakeBagSprite(void)
 {
    struct Sprite * sprite = &gSprites[sItemMenuIconSpriteIds[0]];
    if (sprite->affineAnimEnded)
    {
        StartSpriteAffineAnim(sprite, 1);
-        sprite->callback = sub_80985BC;
+        sprite->callback = SpriteCB_ShakeBagSprite;
    }
 }

-static void sub_80985BC(struct Sprite * sprite)
+static void SpriteCB_ShakeBagSprite(struct Sprite * sprite)
 {
    if (sprite->affineAnimEnded)
    {
@@ -123,7 +123,7 @@ static void InitLocalLinkPlayer(void);
 static void sub_800978C(void);
 static void CB2_LinkTest(void);
 static void ProcessRecvCmds(u8 id);
-static void sub_800A040(void);
+static void LinkCB_SendHeldKeys(void);
 static void ResetBlockSend(void);
 static bool32 InitBlockSend(const void *src, size_t size);
 static void LinkCB_BlockSendBegin(void);
@@ -710,13 +710,13 @@ void BuildSendCmd(u16 command)
    }
 }

-void sub_8009FE8(void)
+void StartSendingKeysToLink(void)
 {
    if (gWirelessCommType)
    {
        StartSendingKeysToRfu();
    }
-    gLinkCallback = sub_800A040;
+    gLinkCallback = LinkCB_SendHeldKeys;
 }

 bool32 IsSendingKeysToLink(void)
@@ -725,14 +725,14 @@ bool32 IsSendingKeysToLink(void)
    {
        return IsSendingKeysToRfu();
    }
-    if (gLinkCallback == sub_800A040)
+    if (gLinkCallback == LinkCB_SendHeldKeys)
    {
        return TRUE;
    }
    return FALSE;
 }

-static void sub_800A040(void)
+static void LinkCB_SendHeldKeys(void)
 {
    if (gReceivedRemoteLinkPlayers == TRUE)
    {
@@ -1346,7 +1346,7 @@ static void InitOverworldBgs(void)
    SetBgTilemapBuffer(3, gBGTilemapBuffers3);
    InitStandardTextBoxWindows();
    InitTextBoxGfxAndPrinters();
-    sub_8069348();
+    InitFieldMessageBox();
 }

 static void InitOverworldBgs_NoResetHeap(void)
@@ -1364,7 +1364,7 @@ static void InitOverworldBgs_NoResetHeap(void)
    SetBgTilemapBuffer(3, gBGTilemapBuffers3);
    InitStandardTextBoxWindows();
    InitTextBoxGfxAndPrinters();
-    sub_8069348();
+    InitFieldMessageBox();
 }

 void CleanupOverworldWindowsAndTilemaps(void)
@@ -2349,7 +2349,7 @@ void Overworld_CreditsMainCB(void)
        SetVBlankCallback(NULL);
    RunTasks();
    AnimateSprites();
-    sub_805ACF0();
+    CameraUpdateNoObjectRefresh();
    UpdateCameraPanning();
    BuildOamBuffer();
    UpdatePaletteFade();
@@ -37,31 +37,31 @@
 // Function Declarations
 static void Task_DoPokeballSendOutAnim(u8 taskId);
 static void SpriteCB_TestBallThrow(struct Sprite *sprite);
-static void sub_804AC88(struct Sprite *sprite);
-static void sub_804AC94(struct Sprite *sprite);
-static void sub_804AD00(struct Sprite *sprite);
-static void sub_804AD98(struct Sprite *sprite);
-static void sub_804ADEC(struct Sprite *sprite);
-static void sub_804AEE4(struct Sprite *sprite);
-static void sub_804AF24(struct Sprite *sprite);
+static void SpriteCB_BallThrow_ReachMon(struct Sprite *sprite);
+static void SpriteCB_BallThrow_StartShrinkMon(struct Sprite *sprite);
+static void SpriteCB_BallThrow_ShrinkMon(struct Sprite *sprite);
+static void SpriteCB_BallThrow_Close(struct Sprite *sprite);
+static void SpriteCB_BallThrow_FallToGround(struct Sprite *sprite);
+static void SpriteCB_BallThrow_StartShakes(struct Sprite *sprite);
+static void SpriteCB_BallThrow_Shake(struct Sprite *sprite);
 static void Task_PlayCryWhenReleasedFromBall(u8 taskId);
 static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite);
-static void sub_804B484(struct Sprite *sprite);
+static void SpriteCB_BallThrow_StartCaptureMon(struct Sprite *sprite);
 static void HandleBallAnimEnd(struct Sprite *sprite);
-static void sub_804B5C8(struct Sprite *sprite);
+static void SpriteCB_BallThrow_CaptureMon(struct Sprite *sprite);
 static void SpriteCB_PlayerMonSendOut_1(struct Sprite *sprite);
 static void SpriteCB_PlayerMonSendOut_2(struct Sprite *sprite);
 static void SpriteCB_ReleaseMon2FromBall(struct Sprite *sprite);
 static void SpriteCB_OpponentMonSendOut(struct Sprite *sprite);
 static u8 LaunchBallStarsTaskForPokeball(u8 x, u8 y, u8 kindOfStars, u8 d);
 static u8 LaunchBallFadeMonTaskForPokeball(bool8 unFadeLater, u8 battlerId, u32 arg2);
-static void sub_804B9E8(struct Sprite *sprite);
-static void sub_804BAA4(struct Sprite *sprite);
-static void sub_804BC50(struct Sprite *sprite);
-static void sub_804BCF8(struct Sprite *sprite);
-static void sub_804BD6C(struct Sprite *sprite);
-static void sub_804BE24(struct Sprite *sprite);
-static void sub_804BE48(struct Sprite *sprite);
+static void SpriteCB_PokeballReleaseMon(struct Sprite *sprite);
+static void SpriteCB_ReleasedMonFlyOut(struct Sprite *sprite);
+static void SpriteCB_TradePokeball(struct Sprite *sprite);
+static void SpriteCB_TradePokeballSendOff(struct Sprite *sprite);
+static void SpriteCB_TradePokeballEnd(struct Sprite *sprite);
+static void SpriteCB_HealthboxSlideInDelayed(struct Sprite *sprite);
+static void SpriteCB_HealthboxSlideIn(struct Sprite *sprite);
 static void SpriteCB_HitAnimHealthoxEffect(struct Sprite *sprite);
 static u16 GetBattlerPokeballItemId(u8 battlerId);

@@ -446,7 +446,7 @@ static void SpriteCB_TestBallThrow(struct Sprite *sprite)
        sprite->sBattler = opponentBattler;
        sprite->data[7] = noOfShakes;
        DestroyTask(taskId);
-        sprite->callback = sub_804AC88;
+        sprite->callback = SpriteCB_BallThrow_ReachMon;
    }
 }

@@ -456,24 +456,24 @@ static void SpriteCB_TestBallThrow(struct Sprite *sprite)
 #undef tBattler
 #undef tOpponentBattler

-static void sub_804AC88(struct Sprite *sprite)
+static void SpriteCB_BallThrow_ReachMon(struct Sprite *sprite)
 {
-    sprite->callback = sub_804AC94;
+    sprite->callback = SpriteCB_BallThrow_StartShrinkMon;
 }

-static void sub_804AC94(struct Sprite *sprite)
+static void SpriteCB_BallThrow_StartShrinkMon(struct Sprite *sprite)
 {
    if (++sprite->data[5] == 10)
    {
        sprite->data[5] = 0;
-        sprite->callback = sub_804AD00;
+        sprite->callback = SpriteCB_BallThrow_ShrinkMon;
        StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[sprite->sBattler]], 2);
        AnimateSprite(&gSprites[gBattlerSpriteIds[sprite->sBattler]]);
        gSprites[gBattlerSpriteIds[sprite->sBattler]].data[1] = 0;
    }
 }

-static void sub_804AD00(struct Sprite *sprite)
+static void SpriteCB_BallThrow_ShrinkMon(struct Sprite *sprite)
 {
    sprite->data[5]++;
    if (sprite->data[5] == 11)
@@ -484,7 +484,7 @@ static void sub_804AD00(struct Sprite *sprite)
        StartSpriteAnim(sprite, 2);
        gSprites[gBattlerSpriteIds[sprite->sBattler]].invisible = TRUE;
        sprite->data[5] = 0;
-        sprite->callback = sub_804AD98;
+        sprite->callback = SpriteCB_BallThrow_Close;
    }
    else
    {
@@ -493,7 +493,7 @@ static void sub_804AD00(struct Sprite *sprite)
    }
 }

-static void sub_804AD98(struct Sprite *sprite)
+static void SpriteCB_BallThrow_Close(struct Sprite *sprite)
 {
    if (sprite->animEnded)
    {
@@ -505,12 +505,12 @@ static void sub_804AD98(struct Sprite *sprite)
            sprite->data[5] = 0;
            sprite->y += Cos(0, 32);
            sprite->y2 = -Cos(0, sprite->data[4]);
-            sprite->callback = sub_804ADEC;
+            sprite->callback = SpriteCB_BallThrow_FallToGround;
        }
    }
 }

-static void sub_804ADEC(struct Sprite *sprite)
+static void SpriteCB_BallThrow_FallToGround(struct Sprite *sprite)
 {
    bool8 r5 = FALSE;

@@ -563,14 +563,14 @@ static void sub_804ADEC(struct Sprite *sprite)
        }
        else
        {
-            sprite->callback = sub_804AEE4;
+            sprite->callback = SpriteCB_BallThrow_StartShakes;
            sprite->data[4] = 1;
            sprite->data[5] = 0;
        }
    }
 }

-static void sub_804AEE4(struct Sprite *sprite)
+static void SpriteCB_BallThrow_StartShakes(struct Sprite *sprite)
 {
    sprite->data[3]++;
    if (sprite->data[3] == 31)
@@ -578,12 +578,12 @@ static void sub_804AEE4(struct Sprite *sprite)
        sprite->data[3] = 0;
        sprite->affineAnimPaused = TRUE;
        StartSpriteAffineAnim(sprite, 1);
-        sprite->callback = sub_804AF24;
+        sprite->callback = SpriteCB_BallThrow_Shake;
        PlaySE(SE_BALL);
    }
 }

-static void sub_804AF24(struct Sprite *sprite)
+static void SpriteCB_BallThrow_Shake(struct Sprite *sprite)
 {
    switch (sprite->data[3] & 0xFF)
    {
@@ -626,7 +626,7 @@ static void sub_804AF24(struct Sprite *sprite)
        {
            if (sprite->data[7] == 4 && sprite->data[3] >> 8 == 3)
            {
-                sprite->callback = sub_804B484;
+                sprite->callback = SpriteCB_BallThrow_StartCaptureMon;
                sprite->affineAnimPaused = TRUE;
            }
            else
@@ -817,10 +817,10 @@ static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite)
 #undef tCryTaskFrames
 #undef tCryTaskState

-static void sub_804B484(struct Sprite *sprite)
+static void SpriteCB_BallThrow_StartCaptureMon(struct Sprite *sprite)
 {
    sprite->animPaused = TRUE;
-    sprite->callback = sub_804B5C8;
+    sprite->callback = SpriteCB_BallThrow_CaptureMon;
    sprite->data[3] = 0;
    sprite->data[4] = 0;
    sprite->data[5] = 0;
@@ -867,7 +867,7 @@ static void HandleBallAnimEnd(struct Sprite *sprite)
    }
 }

-static void sub_804B5C8(struct Sprite *sprite)
+static void SpriteCB_BallThrow_CaptureMon(struct Sprite *sprite)
 {
    u8 battlerId = sprite->sBattler;

@@ -1012,11 +1012,11 @@ void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 battlerId, u8 x, u8 y,
    gSprites[spriteId].data[3] = h;
    gSprites[spriteId].data[4] = h >> 0x10;
    gSprites[spriteId].oam.priority = oamPriority;
-    gSprites[spriteId].callback = sub_804B9E8;
+    gSprites[spriteId].callback = SpriteCB_PokeballReleaseMon;
    gSprites[monSpriteId].invisible = TRUE;
 }

-static void sub_804B9E8(struct Sprite *sprite)
+static void SpriteCB_PokeballReleaseMon(struct Sprite *sprite)
 {
    if (sprite->data[1] == 0)
    {
@@ -1033,7 +1033,7 @@ static void sub_804B9E8(struct Sprite *sprite)
        StartSpriteAnim(sprite, 1);
        LaunchBallStarsTaskForPokeball(sprite->x, sprite->y - 5, sprite->oam.priority, r5);
        sprite->data[1] = LaunchBallFadeMonTaskForPokeball(1, battlerId, r4);
-        sprite->callback = sub_804BAA4;
+        sprite->callback = SpriteCB_ReleasedMonFlyOut;
        gSprites[r7].invisible = FALSE;
        StartSpriteAffineAnim(&gSprites[r7], 1);
        AnimateSprite(&gSprites[r7]);
@@ -1046,7 +1046,7 @@ static void sub_804B9E8(struct Sprite *sprite)
    }
 }

-static void sub_804BAA4(struct Sprite *sprite)
+static void SpriteCB_ReleasedMonFlyOut(struct Sprite *sprite)
 {
    bool8 r12 = FALSE;
    bool8 r6 = FALSE;
@@ -1101,11 +1101,11 @@ u8 CreateTradePokeballSprite(u8 a, u8 b, u8 x, u8 y, u8 oamPriority, u8 subPrior
    gSprites[spriteId].data[3] = h;
    gSprites[spriteId].data[4] = h >> 16;
    gSprites[spriteId].oam.priority = oamPriority;
-    gSprites[spriteId].callback = sub_804BC50;
+    gSprites[spriteId].callback = SpriteCB_TradePokeball;
    return spriteId;
 }

-static void sub_804BC50(struct Sprite *sprite)
+static void SpriteCB_TradePokeball(struct Sprite *sprite)
 {
    if (sprite->data[1] == 0)
    {
@@ -1122,7 +1122,7 @@ static void sub_804BC50(struct Sprite *sprite)
        StartSpriteAnim(sprite, 1);
        LaunchBallStarsTaskForPokeball(sprite->x, sprite->y - 5, sprite->oam.priority, r6);
        sprite->data[1] = LaunchBallFadeMonTaskForPokeball(1, r8, r5);
-        sprite->callback = sub_804BCF8;
+        sprite->callback = SpriteCB_TradePokeballSendOff;
        StartSpriteAffineAnim(&gSprites[r7], 2);
        AnimateSprite(&gSprites[r7]);
        gSprites[r7].data[1] = 0;
@@ -1133,30 +1133,30 @@ static void sub_804BC50(struct Sprite *sprite)
    }
 }

-static void sub_804BCF8(struct Sprite *sprite)
+static void SpriteCB_TradePokeballSendOff(struct Sprite *sprite)
 {
-    u8 r1;
+    u8 monSpriteId;

    sprite->data[5]++;
    if (sprite->data[5] == 11)
        PlaySE(SE_BALL_TRADE);
    
-    r1 = sprite->data[0];
-    if (gSprites[r1].affineAnimEnded)
+    monSpriteId = sprite->data[0];
+    if (gSprites[monSpriteId].affineAnimEnded)
    {
        StartSpriteAnim(sprite, 2);
-        gSprites[r1].invisible = TRUE;
+        gSprites[monSpriteId].invisible = TRUE;
        sprite->data[5] = 0;
-        sprite->callback = sub_804BD6C;
+        sprite->callback = SpriteCB_TradePokeballEnd;
    }
    else
    {
-        gSprites[r1].data[1] += 96;
-        gSprites[r1].y2 = -gSprites[r1].data[1] >> 8;
+        gSprites[monSpriteId].data[1] += 96;
+        gSprites[monSpriteId].y2 = -gSprites[monSpriteId].data[1] >> 8;
    }
 }

-static void sub_804BD6C(struct Sprite *sprite)
+static void SpriteCB_TradePokeballEnd(struct Sprite *sprite)
 {
    if (sprite->animEnded)
        sprite->callback = SpriteCallbackDummy;
@@ -1175,7 +1175,7 @@ void StartHealthboxSlideIn(u8 battlerId)
    healthboxSprite->data[1] = 0;
    healthboxSprite->x2 = 0x73;
    healthboxSprite->y2 = 0;
-    healthboxSprite->callback = sub_804BE48;
+    healthboxSprite->callback = SpriteCB_HealthboxSlideIn;
    if (GetBattlerSide(battlerId) != B_SIDE_PLAYER)
    {
        healthboxSprite->data[0] = -healthboxSprite->data[0];
@@ -1186,20 +1186,20 @@ void StartHealthboxSlideIn(u8 battlerId)
    
    gSprites[healthboxSprite->data[5]].callback(&gSprites[healthboxSprite->data[5]]);
    if (GetBattlerPosition(battlerId) == B_POSITION_PLAYER_RIGHT)
-        healthboxSprite->callback = sub_804BE24;
+        healthboxSprite->callback = SpriteCB_HealthboxSlideInDelayed;
 }

-static void sub_804BE24(struct Sprite *sprite)
+static void SpriteCB_HealthboxSlideInDelayed(struct Sprite *sprite)
 {
    sprite->data[1]++;
    if (sprite->data[1] == 20)
    {
        sprite->data[1] = 0;
-        sprite->callback = sub_804BE48;
+        sprite->callback = SpriteCB_HealthboxSlideIn;
    }
 }

-static void sub_804BE48(struct Sprite *sprite)
+static void SpriteCB_HealthboxSlideIn(struct Sprite *sprite)
 {
    sprite->x2 -= sprite->data[0];
    sprite->y2 -= sprite->data[1];
@@ -138,9 +138,6 @@ static void UpdateTrainerFansAfterLinkBattle(struct TrainerFanClub *);
 static bool8 DidPlayerGetFirstFans(struct TrainerFanClub * );
 static void SetPlayerGotFirstFans(struct TrainerFanClub *);
 static bool8 InQuestLogDisabledLocation(void);
-static bool8 sub_8113778(u16, const u16 *);
-static bool8 sub_81137E4(u16, const u16 *);
-static u16 *sub_8113828(u16, const u16 *);
 static bool8 TrySetLinkQuestLogEvent(u16, const u16 *);
 static bool8 TrySetTrainerBattleQuestLogEvent(u16, const u16 *);

@@ -151,7 +151,7 @@ static void QL_GfxTransition_StartSurf(void)
        gFieldEffectArguments[2] = gPlayerAvatar.objectEventId;
        fieldEffectId = FieldEffectStart(FLDEFF_SURF_BLOB);
        objectEvent->fieldEffectSpriteId = fieldEffectId;
-        sub_80DC44C(fieldEffectId, 1);
+        SetSurfBlob_BobState(fieldEffectId, 1);
    }
 }

@@ -60,7 +60,7 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
    case 1:
        SetVBlankCallback(NULL);
        ScanlineEffect_Clear();
-        sub_800F324();
+        BattleInitBgsAndWindows();
        SetBgAttribute(1, BG_ATTR_CHARBASEINDEX, 0);
        SetBgAttribute(2, BG_ATTR_CHARBASEINDEX, 0);
        ShowBg(0);
@@ -412,7 +412,7 @@ void AnimTask_LoadSandstormBackground(u8 taskId)
    AnimLoadCompressedBgGfx(animBg.bgId, gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet, animBg.tilesOffset);
    LoadCompressedPalette(gBattleAnimSpritePal_FlyingDirt, animBg.paletteId * 16, 32);
    if (IsContest())
-        sub_80730C0(animBg.paletteId, animBg.bgTilemap, 0, 0);
+        RelocateBattleBgPal(animBg.paletteId, animBg.bgTilemap, 0, 0);
    if (gBattleAnimArgs[0] && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
        var0 = 1;
    gTasks[taskId].data[0] = var0;
@@ -6,7 +6,7 @@

 extern const u16 gUnknown_841F1C8[];

-void sub_814FFC4(u8 windowId, u8 frameType, u16 destOffset, u8 palIdx);
+void LoadWindowGfx(u8 windowId, u8 frameType, u16 destOffset, u8 palIdx);

 void sub_814FD04(u8 bgId, u16 destOffset, u8 palIdx)
 {
@@ -45,7 +45,7 @@ void sub_814FDF4(u8 bgId, u8 frameType, u16 destOffset, u8 palIdx)

 void LoadUserWindowBorderGfx(u8 windowId, u16 destOffset, u8 palIdx)
 {
-    sub_814FFC4(windowId, gSaveBlock2Ptr->optionsWindowFrameType, destOffset, palIdx);
+    LoadWindowGfx(windowId, gSaveBlock2Ptr->optionsWindowFrameType, destOffset, palIdx);
 }

 void sub_814FE6C(u8 windowId, u16 destOffset, u8 palIdx)
@@ -82,7 +82,7 @@ void TextWindow_LoadTilesStdFrame1(u8 windowId, u16 destOffset)
    LoadBgTiles(GetWindowAttribute(windowId, WINDOW_BG), gStdFrame1, 0x280, destOffset);
 }

-void sub_814FFC4(u8 windowId, u8 frameType, u16 destOffset, u8 palIdx)
+void LoadWindowGfx(u8 windowId, u8 frameType, u16 destOffset, u8 palIdx)
 {
    LoadBgTiles(GetWindowAttribute(windowId, WINDOW_BG), gUserFrames[frameType].tiles, 0x120, destOffset);
    LoadPalette(gUserFrames[frameType].palette, palIdx, 32);
@@ -90,7 +90,7 @@ void sub_814FFC4(u8 windowId, u8 frameType, u16 destOffset, u8 palIdx)

 void TextWindow_SetUserSelectedFrame(u8 windowId, u16 destOffset, u8 palIdx)
 {
-    sub_814FFC4(windowId, gSaveBlock2Ptr->optionsWindowFrameType, destOffset, palIdx);
+    LoadWindowGfx(windowId, gSaveBlock2Ptr->optionsWindowFrameType, destOffset, palIdx);
 }

 void DrawTextBorderOuter(u8 windowId, u16 tileNum, u8 palNum)
@@ -74,7 +74,7 @@ struct TrainerCardData
    u16 cardTiles[0x1180];
    u16 cardTilemapBuffer[0x1000];
    u16 bgTilemapBuffer[0x1000];
-    u16 var_7BCC;
+    u16 cardTop;
    bool8 timeColonNeedDraw;
    u8 language;
 }; /* size = 0x7BD0 */
@@ -96,7 +96,7 @@ static u8 GetTrainerStarCount(struct TrainerCard *trainerCard);
 static void SetPlayerCardData(struct TrainerCard *trainerCard, u8 cardType);
 static void SetDataFromTrainerCard(void);
 static void HandleGpuRegs(void);
-static void sub_8089BD8(u16 arg0);
+static void UpdateCardFlipRegs(u16 cardTop);
 static void ResetGpuRegs(void);
 static void TrainerCardNull(void);
 static void sub_8089C5C(void);
@@ -961,16 +961,16 @@ static void HandleGpuRegs(void)
 }

 // Part of animating card flip
-static void sub_8089BD8(u16 arg0)
+static void UpdateCardFlipRegs(u16 cardTop)
 {
-    s8 quotient = (arg0 + 40) / 10;
+    s8 blendY = (cardTop + 40) / 10;

-    if (quotient <= 4)
-        quotient = 0;
+    if (blendY <= 4)
+        blendY = 0;

-    sTrainerCardDataPtr->flipBlendY = quotient;
+    sTrainerCardDataPtr->flipBlendY = blendY;
    SetGpuReg(REG_OFFSET_BLDY, sTrainerCardDataPtr->flipBlendY);
-    SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(sTrainerCardDataPtr->var_7BCC, 160 - sTrainerCardDataPtr->var_7BCC));
+    SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(sTrainerCardDataPtr->cardTop, 160 - sTrainerCardDataPtr->cardTop));
 }

 static void ResetGpuRegs(void)
@@ -1673,8 +1673,8 @@ static bool8 Task_AnimateCardFlipDown(struct Task* task)
    else
        task->data[1] += 7;

-    sTrainerCardDataPtr->var_7BCC = task->data[1];
-    sub_8089BD8(task->data[1]);
+    sTrainerCardDataPtr->cardTop = task->data[1];
+    UpdateCardFlipRegs(task->data[1]);

    r7 = task->data[1];
    r9 = 160 - r7;
@@ -1799,8 +1799,8 @@ static bool8 Task_AnimateCardFlipUp(struct Task* task)
    else
        task->data[1] -= 5;

-    sTrainerCardDataPtr->var_7BCC = task->data[1];
-    sub_8089BD8(task->data[1]);
+    sTrainerCardDataPtr->cardTop = task->data[1];
+    UpdateCardFlipRegs(task->data[1]);

    r7 = task->data[1];
    r9 = 160 - r7;
@@ -241,7 +241,7 @@ u16 sub_810C050(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 pal
    return 0;
 }

-u16 sub_810C0C0(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId, bool8 isTrainer)
+u16 CreateTrainerCardSprite(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId, bool8 isTrainer)
 {
    u8 *framePics;

@@ -273,12 +273,12 @@ u16 FreeAndDestroyMonPicSprite(u16 spriteId)

 u16 LoadMonPicInWindow(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId)
 {
-    return sub_810C0C0(species, otId, personality, isFrontPic, 0, 0, paletteSlot, windowId, FALSE);
+    return CreateTrainerCardSprite(species, otId, personality, isFrontPic, 0, 0, paletteSlot, windowId, FALSE);
 }

-u16 sub_810C25C(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId)
+u16 CreateTrainerCardMonIconSprite(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId)
 {
-    return sub_810C0C0(species, otId, personality, isFrontPic, destX, destY, paletteSlot, windowId, FALSE);
+    return CreateTrainerCardSprite(species, otId, personality, isFrontPic, destX, destY, paletteSlot, windowId, FALSE);
 }

 u16 CreateTrainerPicSprite(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag)
@@ -298,7 +298,7 @@ u16 sub_810C2FC(u16 species, bool8 isFrontPic, u8 paletteSlot, u8 windowId)

 u16 CreateTrainerCardTrainerPicSprite(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId)
 {
-    return sub_810C0C0(species, 0, 0, isFrontPic, destX, destY, paletteSlot, windowId, TRUE);
+    return CreateTrainerCardSprite(species, 0, 0, isFrontPic, destX, destY, paletteSlot, windowId, TRUE);
 }

 u16 PlayerGenderToFrontTrainerPicId_Debug(u8 gender, bool8 getClass)
@@ -3276,7 +3276,7 @@ static void Task_RunUnionRoom(u8 taskId)
        if (!gPaletteFade.active)
        {
            sUnionRoomTrade.field_0 = 1;
-            gFieldCallback = sub_807DCE4;
+            gFieldCallback = FieldCB_ContinueScriptUnionRoom;
            ChooseMonForTradingBoard(PARTY_MENU_TYPE_UNION_ROOM_REGISTER, CB2_ReturnToField);
        }
        break;
@@ -3388,7 +3388,7 @@ static void Task_RunUnionRoom(u8 taskId)
            memcpy(&gPartnerTgtGnameSub, &data->field_0->arr[taskData[1]].gname_uname.gname.unk_00, sizeof(gPartnerTgtGnameSub));
            gUnionRoomRequestedMonType = data->field_0->arr[taskData[1]].gname_uname.gname.type;
            gUnionRoomOfferedSpecies = data->field_0->arr[taskData[1]].gname_uname.gname.species;
-            gFieldCallback = sub_807DCE4;
+            gFieldCallback = FieldCB_ContinueScriptUnionRoom;
            ChooseMonForTradingBoard(PARTY_MENU_TYPE_UNION_ROOM_TRADE, CB2_ReturnToField);
            BackUpURoomField0ToDecompressionBuffer(data);
            sUnionRoomTrade.field_8 = taskData[1];
@@ -115,7 +115,7 @@ static void LoadWin0(void);
 static void LoadWin2(void);
 static void LoadWin1(void);
 static void LoadWin3(void);
-static void sub_812AD50(void);
+static void InitScanlineEffect(void);
 static void FillScanlineEffectWithValue1col(s16 a0);
 static void FillScanlineEffectWithValue2col(s16 a0);

@@ -352,7 +352,7 @@ bool8 UnionRoomChat_TryAllocGraphicsWork(void)
        InitBgsFromTemplates(0, gUnknown_845AA84, NELEMS(gUnknown_845AA84));
        InitWindows(gUnknown_845AA94);
        ResetTempTileDataBuffers();
-        sub_812AD50();
+        InitScanlineEffect();
        InitWork(sWork);
        UnionRoomChat_ResetDisplaySubtasks();
        UnionRoomChat_StartDisplaySubtask(0, 0);
@@ -1312,7 +1312,7 @@ static void LoadWin3(void)
    LoadPalette(gTMCaseMainWindowPalette, 0xE0,  0x20);
 }

-static void sub_812AD50(void)
+static void InitScanlineEffect(void)
 {
    struct ScanlineEffectParams params;
    params.dmaControl = SCANLINE_EFFECT_DMACNT_16BIT;
@@ -825,7 +825,7 @@ void AnimTask_CreateSurfWave(u8 taskId)
    {
        // Changed from Emerald
        LZDecompressVram(gBattleAnimBgTilemap_SurfContest, animBg.bgTilemap);
-        sub_80730C0(animBg.paletteId, animBg.bgTilemap, 0, 1);
+        RelocateBattleBgPal(animBg.paletteId, animBg.bgTilemap, 0, 1);
    }
    AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnimBgImage_Surf, animBg.tilesOffset);
    if (gBattleAnimArgs[0] == 0)