document some symbols

25 files changed, 127 insertions, 127 deletions

diff --git a/src/battle_controller_oak_old_man.c b/src/battle_controller_oak_old_man.c
index a6730cbbb..da8530c72 100644
--- a/src/battle_controller_oak_old_man.c
+++ b/src/battle_controller_oak_old_man.c
@@ -355,7 +355,7 @@ static void OpenPartyMenuToChooseMon(void)
         caseId = gTasks[gUnknown_3004FFC[gActiveBattler]].data[0];
         DestroyTask(gUnknown_3004FFC[gActiveBattler]);
         FreeAllWindowBuffers();
-        OpenPartyMenuInBattle(caseId);
+        OpenPartyMenuInTutorialBattle(caseId);
     }
 }
 
@@ -363,8 +363,8 @@ static void WaitForMonSelection(void)
 {
     if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active)
     {
-        if (gUnknown_203B0C0 == 1)
-            BtlController_EmitChosenMonReturnValue(1, gUnknown_203B0C1, gUnknown_203B0DC);
+        if (gPartyMenuUseExitCallback == 1)
+            BtlController_EmitChosenMonReturnValue(1, gUnknown_203B0C1, gBattlePartyCurrentOrder);
         else
             BtlController_EmitChosenMonReturnValue(1, 6, NULL);
         OakOldManBufferExecCompleted();
@@ -1879,7 +1879,7 @@ static void OakOldManHandleChooseItem(void)
     gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem;
     gBattlerInMenuId = gActiveBattler;
     for (i = 0; i < 3; ++i)
-        gUnknown_203B0DC[i] = gBattleBufferA[gActiveBattler][i + 1];
+        gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][i + 1];
 }
 
 static void OakOldManHandleChoosePokemon(void)
@@ -1892,7 +1892,7 @@ static void OakOldManHandleChoosePokemon(void)
     *(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2];
     *(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3];
     for (i = 0; i < 3; ++i)
-        gUnknown_203B0DC[i] = gBattleBufferA[gActiveBattler][4 + i];
+        gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][4 + i];
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
     gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon;
     gBattlerInMenuId = gActiveBattler;
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 16bf1ec87..41d81052e 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -1305,7 +1305,7 @@ static void OpenPartyMenuToChooseMon(void)
         caseId = gTasks[gUnknown_3004FFC[gActiveBattler]].data[0];
         DestroyTask(gUnknown_3004FFC[gActiveBattler]);
         FreeAllWindowBuffers();
-        OpenPartyMenuInBattle(caseId);
+        OpenPartyMenuInTutorialBattle(caseId);
     }
 }
 
@@ -1313,8 +1313,8 @@ static void WaitForMonSelection(void)
 {
     if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active)
     {
-        if (gUnknown_203B0C0 == 1)
-            BtlController_EmitChosenMonReturnValue(1, gUnknown_203B0C1, gUnknown_203B0DC);
+        if (gPartyMenuUseExitCallback == 1)
+            BtlController_EmitChosenMonReturnValue(1, gUnknown_203B0C1, gBattlePartyCurrentOrder);
         else
             BtlController_EmitChosenMonReturnValue(1, 6, NULL);
         if ((gBattleBufferA[gActiveBattler][1] & 0xF) == 1)
@@ -2462,7 +2462,7 @@ static void PlayerHandleChooseItem(void)
     gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem;
     gBattlerInMenuId = gActiveBattler;
     for (i = 0; i < 3; ++i)
-        gUnknown_203B0DC[i] = gBattleBufferA[gActiveBattler][1 + i];
+        gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][1 + i];
 }
 
 static void PlayerHandleChoosePokemon(void)
@@ -2475,7 +2475,7 @@ static void PlayerHandleChoosePokemon(void)
     *(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2];
     *(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3];
     for (i = 0; i < 3; ++i)
-        gUnknown_203B0DC[i] = gBattleBufferA[gActiveBattler][4 + i];
+        gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][4 + i];
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
     gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon;
     gBattlerInMenuId = gActiveBattler;
diff --git a/src/battle_controller_pokedude.c b/src/battle_controller_pokedude.c
index 57a405f3c..59fda163b 100644
--- a/src/battle_controller_pokedude.c
+++ b/src/battle_controller_pokedude.c
@@ -706,7 +706,7 @@ static void OpenPartyMenuToChooseMon(void)
         gBattlerControllerFuncs[gActiveBattler] = WaitForMonSelection;
         DestroyTask(gUnknown_3004FFC[gActiveBattler]);
         FreeAllWindowBuffers();
-        sub_8127968();
+        OpenPartyMenuInBattle();
     }
 }
 
@@ -714,8 +714,8 @@ static void WaitForMonSelection(void)
 {
     if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active)
     {
-        if (gUnknown_203B0C0 == 1)
-            BtlController_EmitChosenMonReturnValue(1, gUnknown_203B0C1, gUnknown_203B0DC);
+        if (gPartyMenuUseExitCallback == 1)
+            BtlController_EmitChosenMonReturnValue(1, gUnknown_203B0C1, gBattlePartyCurrentOrder);
         else
             BtlController_EmitChosenMonReturnValue(1, 6, NULL);
         PokedudeBufferExecCompleted();
@@ -1985,7 +1985,7 @@ static void PokedudeHandleChooseItem(void)
     gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem;
     gBattlerInMenuId = gActiveBattler;
     for (i = 0; i < 3; ++i)
-        gUnknown_203B0DC[i] = gBattleBufferA[gActiveBattler][i + 1];
+        gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][i + 1];
 }
 
 static void PokedudeHandleChoosePokemon(void)
@@ -1998,7 +1998,7 @@ static void PokedudeHandleChoosePokemon(void)
     *(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2];
     *(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3];
     for (i = 0; i < 3; ++i)
-        gUnknown_203B0DC[i] = gBattleBufferA[gActiveBattler][4 + i];
+        gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][4 + i];
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
     gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon;
     gBattlerInMenuId = gActiveBattler;
diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index 6fb090307..ca2ef0b22 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -75,7 +75,7 @@ void sub_800D30C(void)
     SetBattlePartyIds();
     if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
         for (i = 0; i < gBattlersCount; ++i)
-            sub_8127DA8(i, 0);
+            BufferBattlePartyCurrentOrderBySide(i, 0);
 }
 
 static void InitSinglePlayerBtlControllers(void)
@@ -199,11 +199,11 @@ static void InitLinkBtlControllers(void)
             {
             case 0:
             case 3:
-                sub_8127DA8(gLinkPlayers[i].id, 0);
+                BufferBattlePartyCurrentOrderBySide(gLinkPlayers[i].id, 0);
                 break;
             case 1:
             case 2:
-                sub_8127DA8(gLinkPlayers[i].id, 1);
+                BufferBattlePartyCurrentOrderBySide(gLinkPlayers[i].id, 1);
                 break;
             }
             if (i == multiplayerId)
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index d2e728d0c..55d413b3b 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -620,7 +620,7 @@ bool8 BattleInitAllSprites(u8 *state, u8 *battlerId)
         break;
     case 6:
         LoadAndCreateEnemyShadowSprites();
-        sub_8127CAC();
+        BufferBattlePartyCurrentOrder();
         retVal = TRUE;
         break;
     }
diff --git a/src/battle_main.c b/src/battle_main.c
index 1125a8d2d..da9bc1a49 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -144,7 +144,7 @@ static EWRAM_DATA u32 gUnknown_2022AE8[25] = {0};
 EWRAM_DATA u32 gBattleTypeFlags = 0;
 EWRAM_DATA u8 gBattleTerrain = 0;
 EWRAM_DATA u32 gUnknown_2022B54 = 0;
-EWRAM_DATA struct UnknownPokemonStruct4 gUnknown_2022B58[3] = {0};
+EWRAM_DATA struct UnknownPokemonStruct4 gMultiPartnerParty[3] = {0};
 EWRAM_DATA u8 *gUnknown_2022BB8 = NULL;
 EWRAM_DATA u8 *gUnknown_2022BBC = NULL;
 EWRAM_DATA u16 *gUnknown_2022BC0 = NULL;
@@ -1078,16 +1078,16 @@ static void sub_80108C4(void)
 
     for (i = 0; i < 3; ++i)
     {
-        gUnknown_2022B58[i].species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES);
-        gUnknown_2022B58[i].heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM);
-        nick = gUnknown_2022B58[i].nickname;
+        gMultiPartnerParty[i].species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES);
+        gMultiPartnerParty[i].heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM);
+        nick = gMultiPartnerParty[i].nickname;
         GetMonData(&gPlayerParty[i], MON_DATA_NICKNAME, nick);
-        gUnknown_2022B58[i].level = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL);
-        gUnknown_2022B58[i].hp = GetMonData(&gPlayerParty[i], MON_DATA_HP);
-        gUnknown_2022B58[i].maxhp = GetMonData(&gPlayerParty[i], MON_DATA_MAX_HP);
-        gUnknown_2022B58[i].status = GetMonData(&gPlayerParty[i], MON_DATA_STATUS);
-        gUnknown_2022B58[i].personality = GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY);
-        gUnknown_2022B58[i].gender = GetMonGender(&gPlayerParty[i]);
+        gMultiPartnerParty[i].level = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL);
+        gMultiPartnerParty[i].hp = GetMonData(&gPlayerParty[i], MON_DATA_HP);
+        gMultiPartnerParty[i].maxhp = GetMonData(&gPlayerParty[i], MON_DATA_MAX_HP);
+        gMultiPartnerParty[i].status = GetMonData(&gPlayerParty[i], MON_DATA_STATUS);
+        gMultiPartnerParty[i].personality = GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY);
+        gMultiPartnerParty[i].gender = GetMonGender(&gPlayerParty[i]);
         StripExtCtrlCodes(nick);
         if (GetMonData(&gPlayerParty[i], MON_DATA_LANGUAGE) != LANGUAGE_JAPANESE)
         {
@@ -1098,7 +1098,7 @@ static void sub_80108C4(void)
             cur[j] = EOS;
         }
     }
-    memcpy(&gBattleStruct->field_184, gUnknown_2022B58, sizeof(gUnknown_2022B58));
+    memcpy(&gBattleStruct->field_184, gMultiPartnerParty, sizeof(gMultiPartnerParty));
 }
 
 static void CB2_PreInitMultiBattle(void)
@@ -1123,7 +1123,7 @@ static void CB2_PreInitMultiBattle(void)
         if (gReceivedRemoteLinkPlayers != 0 && IsLinkTaskFinished())
         {
             sub_80108C4();
-            SendBlock(bitmask_all_link_players_but_self(), &gBattleStruct->field_184, sizeof(gUnknown_2022B58));
+            SendBlock(bitmask_all_link_players_but_self(), &gBattleStruct->field_184, sizeof(gMultiPartnerParty));
             ++gBattleCommunication[MULTIUSE_STATE];
         }
         break;
@@ -1137,13 +1137,13 @@ static void CB2_PreInitMultiBattle(void)
                     continue;
                 if ((!(gLinkPlayers[i].id & 1) && !(gLinkPlayers[playerMultiplierId].id & 1))
                  || (gLinkPlayers[i].id & 1 && gLinkPlayers[playerMultiplierId].id & 1))
-                    memcpy(gUnknown_2022B58, gBlockRecvBuffer[i], sizeof(gUnknown_2022B58));
+                    memcpy(gMultiPartnerParty, gBlockRecvBuffer[i], sizeof(gMultiPartnerParty));
             }
             ++gBattleCommunication[MULTIUSE_STATE];
             *savedCallback = gMain.savedCallback;
             *savedBattleTypeFlags = gBattleTypeFlags;
             gMain.savedCallback = CB2_PreInitMultiBattle;
-            sub_8128198();
+            ShowPartyMenuToShowcaseMultiBattleParty();
         }
         break;
     case 2:
@@ -3004,22 +3004,22 @@ void sub_8013F6C(u8 battler)
     u8 r4, r1;
 
     for (i = 0; i < 3; ++i)
-        gUnknown_203B0DC[i] = *(battler * 3 + i + (u8 *)(gBattleStruct->field_60));
+        gBattlePartyCurrentOrder[i] = *(battler * 3 + i + (u8 *)(gBattleStruct->field_60));
     r4 = pokemon_order_func(gBattlerPartyIndexes[battler]);
     r1 = pokemon_order_func(*(gBattleStruct->monToSwitchIntoId + battler));
-    sub_8127FF4(r4, r1);
+    SwitchPartyMonSlots(r4, r1);
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
         for (i = 0; i < 3; ++i)
         {
-            *(battler * 3 + i + (u8 *)(gBattleStruct->field_60)) = gUnknown_203B0DC[i];
-            *(BATTLE_PARTNER(battler) * 3 + i + (u8 *)(gBattleStruct->field_60)) = gUnknown_203B0DC[i];
+            *(battler * 3 + i + (u8 *)(gBattleStruct->field_60)) = gBattlePartyCurrentOrder[i];
+            *(BATTLE_PARTNER(battler) * 3 + i + (u8 *)(gBattleStruct->field_60)) = gBattlePartyCurrentOrder[i];
         }
     }
     else
     {
         for (i = 0; i < 3; ++i)
-            *(battler * 3 + i + (u8 *)(gBattleStruct->field_60)) = gUnknown_203B0DC[i];
+            *(battler * 3 + i + (u8 *)(gBattleStruct->field_60)) = gBattlePartyCurrentOrder[i];
     }
 }
 
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 8a0e32ba8..c568d96f9 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -7140,8 +7140,8 @@ static void atk8F_forcerandomswitch(void)
             *(gBattleStruct->monToSwitchIntoId + gBattlerTarget) = i;
             if (!IsMultiBattle())
                 sub_8013F6C(gBattlerTarget);
-            sub_8127EC4(gBattlerTarget, i, 0);
-            sub_8127EC4(gBattlerTarget ^ 2, i, 1);
+            SwitchPartyOrderLinkMulti(gBattlerTarget, i, 0);
+            SwitchPartyOrderLinkMulti(gBattlerTarget ^ 2, i, 1);
         }
     }
     else
diff --git a/src/berry_pouch.c b/src/berry_pouch.c
index b8b66c0bc..466fe7927 100644
--- a/src/berry_pouch.c
+++ b/src/berry_pouch.c
@@ -1194,7 +1194,7 @@ static void Task_BerryPouch_Give(u8 taskId)
         Task_Give_PrintThereIsNoPokemon(taskId);
     else
     {
-        sResources->exitCallback = sub_8126EDC;
+        sResources->exitCallback = CB2_ChooseMonToGiveItem;
         gTasks[taskId].func = BerryPouch_StartFadeToExitCallback;
     }
 }
@@ -1251,7 +1251,7 @@ static void Task_ContextMenu_FromPartyGiveMenu(u8 taskId)
     }
     else
     {
-        sResources->exitCallback = c2_8123744;
+        sResources->exitCallback = CB2_GiveHoldItem;
         gTasks[taskId].func = BerryPouch_StartFadeToExitCallback;
     }
 }
diff --git a/src/daycare.c b/src/daycare.c
index f034bc220..8862dfda9 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -1582,7 +1582,7 @@ void ShowDaycareLevelMenu(void)
 
 void ChooseSendDaycareMon(void)
 {
-    sub_8128370();
+    ChooseMonForDaycare();
     gMain.savedCallback = CB2_ReturnToField;
 }
 
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index 58caad509..d6bf4ea07 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -522,7 +522,7 @@ static bool32 sub_807E40C(void)
 
 bool32 sub_807E418(void)
 {
-    if (field_weather_is_fade_finished() == TRUE && sub_80F83B0())
+    if (IsWeatherNotFadingIn() == TRUE && sub_80F83B0())
         return TRUE;
     else
         return FALSE;
diff --git a/src/field_poison.c b/src/field_poison.c
index 474fbcd69..07c2b763f 100644
--- a/src/field_poison.c
+++ b/src/field_poison.c
@@ -43,7 +43,7 @@ static void FaintFromFieldPoison(u8 partyIdx)
 static bool32 MonFaintedFromPoison(u8 partyIdx)
 {
     struct Pokemon *pokemon = gPlayerParty + partyIdx;
-    if (IsMonValidSpecies(pokemon) && !GetMonData(pokemon, MON_DATA_HP) && pokemon_ailments_get_primary(GetMonData(pokemon, MON_DATA_STATUS)) == AILMENT_PSN)
+    if (IsMonValidSpecies(pokemon) && !GetMonData(pokemon, MON_DATA_HP) && GetAilmentFromStatus(GetMonData(pokemon, MON_DATA_STATUS)) == AILMENT_PSN)
         return TRUE;
     return FALSE;
 }
@@ -97,7 +97,7 @@ s32 DoPoisonFieldEffect(void)
     u32 numFainted = 0;
     for (i = 0; i < PARTY_SIZE; i++)
     {
-        if (GetMonData(pokemon, MON_DATA_SANITY_HAS_SPECIES) && pokemon_ailments_get_primary(GetMonData(pokemon, MON_DATA_STATUS)) == AILMENT_PSN)
+        if (GetMonData(pokemon, MON_DATA_SANITY_HAS_SPECIES) && GetAilmentFromStatus(GetMonData(pokemon, MON_DATA_STATUS)) == AILMENT_PSN)
         {
             hp = GetMonData(pokemon, MON_DATA_HP);
             if (hp == 0 || --hp == 0)
diff --git a/src/field_specials.c b/src/field_specials.c
index 617faa017..374c74f3c 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -1863,7 +1863,7 @@ void sub_80CC59C(void)
         {
             if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE22) && (gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE22) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE23)))
             {
-                sp0.unk0 = get_mapheader_by_bank_and_number(sInsideOutsidePairs[r5].grp, sInsideOutsidePairs[r5].num)->regionMapSectionId;
+                sp0.unk0 = Overworld_GetMapHeaderByGroupAndId(sInsideOutsidePairs[r5].grp, sInsideOutsidePairs[r5].num)->regionMapSectionId;
                 if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE22))
                     sp0.unk1 = r5;
                 else
@@ -1875,7 +1875,7 @@ void sub_80CC59C(void)
         }
         if (gSaveBlock1Ptr->location.mapGroup == sInsideOutsidePairs[r5].grp2 && gSaveBlock1Ptr->location.mapNum == sInsideOutsidePairs[r5].num2)
         {
-            sp0.unk0 = get_mapheader_by_bank_and_number(sInsideOutsidePairs[r5].grp, sInsideOutsidePairs[r5].num)->regionMapSectionId;
+            sp0.unk0 = Overworld_GetMapHeaderByGroupAndId(sInsideOutsidePairs[r5].grp, sInsideOutsidePairs[r5].num)->regionMapSectionId;
             sp0.unk1 = r5;
             if (r5 == 22)
             {
diff --git a/src/fieldmap.c b/src/fieldmap.c
index 000b8105b..4244762c0 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -60,7 +60,7 @@ const u8 gUnknown_8352F10[] = {
 
 const struct MapHeader * mapconnection_get_mapheader(struct MapConnection * connection)
 {
-    return get_mapheader_by_bank_and_number(connection->mapGroup, connection->mapNum);
+    return Overworld_GetMapHeaderByGroupAndId(connection->mapGroup, connection->mapNum);
 }
 
 void not_trainer_hill_battle_pyramid(void)
diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c
index 400a1d382..6840df686 100644
--- a/src/fldeff_softboiled.c
+++ b/src/fldeff_softboiled.c
@@ -13,7 +13,7 @@ static void sub_80E58A0(u8 taskId);
 static void sub_80E5934(u8 taskId);
 
 extern const u8 gUnknown_84169F8[];
-extern const u8 gUnknown_8416F27[];
+extern const u8 gText_PkmnHPRestoredByVar2[];
 
 bool8 hm_prepare_dive_probably(void)
 {
@@ -26,27 +26,27 @@ bool8 hm_prepare_dive_probably(void)
         return FALSE;
 }
 
-void sub_80E56DC(u8 taskId)
+void ChooseMonForSoftboiled(u8 taskId)
 {
-    gUnknown_203B0A0.unkB = 10;
-    gUnknown_203B0A0.unkA = gUnknown_203B0A0.unk9;
-    sub_811F818(GetCursorSelectionMonId(), 1);
-    sub_8121D0C(5);
-    gTasks[taskId].func = sub_811FB28;
+    gPartyMenu.unkB = 10;
+    gPartyMenu.unkA = gPartyMenu.unk9;
+    AnimatePartySlot(GetCursorSelectionMonId(), 1);
+    DisplayPartyMenuStdMessage(5);
+    gTasks[taskId].func = Task_HandleChooseMonInput;
 }
 
 void sub_80E5724(u8 taskId)
 {
-    u8 r8 = gUnknown_203B0A0.unk9;
-    u8 r5 = gUnknown_203B0A0.unkA;
+    u8 r8 = gPartyMenu.unk9;
+    u8 r5 = gPartyMenu.unkA;
     u16 curHp;
     s16 delta;
 
     if (r5 > 6)
     {
-        gUnknown_203B0A0.unkB = 0;
-        sub_8121D0C(0);
-        gTasks[taskId].func = sub_811FB28;
+        gPartyMenu.unkB = 0;
+        DisplayPartyMenuStdMessage(0);
+        gTasks[taskId].func = Task_HandleChooseMonInput;
     }
     else
     {
@@ -58,7 +58,7 @@ void sub_80E5724(u8 taskId)
         else
         {
             PlaySE(SE_KAIFUKU);
-            sub_8120760(taskId, r8, -1, GetMonData(&gPlayerParty[r8], MON_DATA_MAX_HP) / 5, sub_80E57E8);
+            PartyMenuModifyHP(taskId, r8, -1, GetMonData(&gPlayerParty[r8], MON_DATA_MAX_HP) / 5, sub_80E57E8);
         }
     }
 }
@@ -66,46 +66,46 @@ void sub_80E5724(u8 taskId)
 static void sub_80E57E8(u8 taskId)
 {
     PlaySE(SE_KAIFUKU);
-    sub_8120760(taskId, gUnknown_203B0A0.unkA, 1, GetMonData(&gPlayerParty[gUnknown_203B0A0.unk9], MON_DATA_MAX_HP) / 5, sub_80E583C);
+    PartyMenuModifyHP(taskId, gPartyMenu.unkA, 1, GetMonData(&gPlayerParty[gPartyMenu.unk9], MON_DATA_MAX_HP) / 5, sub_80E583C);
 }
 
 static void sub_80E583C(u8 taskId)
 {
-    GetMonNickname(&gPlayerParty[gUnknown_203B0A0.unkA], gStringVar1);
-    StringExpandPlaceholders(gStringVar4, gUnknown_8416F27);
-    sub_81202F8(gStringVar4, 0);
+    GetMonNickname(&gPlayerParty[gPartyMenu.unkA], gStringVar1);
+    StringExpandPlaceholders(gStringVar4, gText_PkmnHPRestoredByVar2);
+    DisplayPartyMenuMessage(gStringVar4, 0);
     ScheduleBgCopyTilemapToVram(2);
     gTasks[taskId].func = sub_80E58A0;
 }
 
 static void sub_80E58A0(u8 taskId)
 {
-    if (sub_8120370() != TRUE)
+    if (IsPartyMenuTextPrinterActive() != TRUE)
     {
-        gUnknown_203B0A0.unkB = 0;
-        sub_811F818(gUnknown_203B0A0.unk9, 0);
-        gUnknown_203B0A0.unk9 = gUnknown_203B0A0.unkA;
-        sub_811F818(gUnknown_203B0A0.unkA, 1);
+        gPartyMenu.unkB = 0;
+        AnimatePartySlot(gPartyMenu.unk9, 0);
+        gPartyMenu.unk9 = gPartyMenu.unkA;
+        AnimatePartySlot(gPartyMenu.unkA, 1);
         ClearStdWindowAndFrameToTransparent(6, 0);
         ClearWindowTilemap(6);
-        sub_8121D0C(0);
-        gTasks[taskId].func = sub_811FB28;
+        DisplayPartyMenuStdMessage(0);
+        gTasks[taskId].func = Task_HandleChooseMonInput;
     }
 }
 
 static void sub_80E5900(u8 taskId)
 {
-    if (sub_8120370() != TRUE)
+    if (IsPartyMenuTextPrinterActive() != TRUE)
     {
-        sub_8121D0C(5);
-        gTasks[taskId].func = sub_811FB28;
+        DisplayPartyMenuStdMessage(5);
+        gTasks[taskId].func = Task_HandleChooseMonInput;
     }
 }
 
 static void sub_80E5934(u8 taskId)
 {
     PlaySE(SE_SELECT);
-    sub_81202F8(gUnknown_84169F8, 0);
+    DisplayPartyMenuMessage(gUnknown_84169F8, 0);
     ScheduleBgCopyTilemapToVram(2);
     gTasks[taskId].func = sub_80E5900;
 }
diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c
index 114bf0b57..c413f29c1 100644
--- a/src/fldeff_sweetscent.c
+++ b/src/fldeff_sweetscent.c
@@ -20,7 +20,7 @@ static void FailSweetScentEncounter(u8 taskId);
 
 static void Unused_StartSweetscentFldeff(void)
 {
-	gUnknown_203B0A0.unk9 = 0;
+	gPartyMenu.unk9 = 0;
 	FieldCallback_SweetScent();
 }
 
diff --git a/src/item_pc.c b/src/item_pc.c
index 60a74ac59..450e0d142 100644
--- a/src/item_pc.c
+++ b/src/item_pc.c
@@ -1029,8 +1029,8 @@ static void Task_ItemPcGive(u8 taskId)
 
 static void ItemPc_CB2_SwitchToPartyMenu(void)
 {
-    PartyMenuInit(0, 0, 6, 0, 6, sub_811FB28, ItemPc_CB2_ReturnFromPartyMenu);
-    gUnknown_203B0A0.unkC = ItemPc_GetItemIdBySlotId(ItemPc_GetCursorPosition());
+    InitPartyMenu(0, 0, 6, 0, 6, Task_HandleChooseMonInput, ItemPc_CB2_ReturnFromPartyMenu);
+    gPartyMenu.unkC = ItemPc_GetItemIdBySlotId(ItemPc_GetCursorPosition());
 }
 
 static void ItemPc_CB2_ReturnFromPartyMenu(void)
diff --git a/src/item_use.c b/src/item_use.c
index db0475370..73ad9a284 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -133,7 +133,7 @@ static const u8 sUnref_83E27B4[] = {
 };
 
 void (*const gUnknown_83E2954[])(void) = {
-    sub_8124C8C,
+    CB2_ShowPartyMenuForItemUse,
     CB2_ReturnToField,
     NULL,
     NULL
@@ -179,7 +179,7 @@ void sub_80A1084(void)
 
 void sub_80A109C(u8 taskId)
 {
-    if (field_weather_is_fade_finished() == TRUE)
+    if (IsWeatherNotFadingIn() == TRUE)
     {
         sItemUseOnFieldCB(taskId);
     }
@@ -234,7 +234,7 @@ bool8 sub_80A1194(void)
 
 void sub_80A11C0(u8 taskId)
 {
-    if (field_weather_is_fade_finished() == TRUE)
+    if (IsWeatherNotFadingIn() == TRUE)
     {
         UnfreezeMapObjects();
         ScriptContext2_Disable();
@@ -415,37 +415,37 @@ void sub_80A16D0(u8 taskId)
 
 void FieldUseFunc_Medicine(u8 taskId)
 {
-    gUnknown_3005E98 = sub_81252D0;
+    gItemUseCB = sub_81252D0;
     sub_80A16D0(taskId);
 }
 
 void FieldUseFunc_Ether(u8 taskId)
 {
-    gUnknown_3005E98 = ItemUseCB_PpRestore;
+    gItemUseCB = ItemUseCB_PPRecovery;
     sub_80A16D0(taskId);
 }
 
 void FieldUseFunc_PpUp(u8 taskId)
 {
-    gUnknown_3005E98 = dp05_pp_up;
+    gItemUseCB = ItemUseCB_PPUp;
     sub_80A16D0(taskId);
 }
 
 void FieldUseFunc_RareCandy(u8 taskId)
 {
-    gUnknown_3005E98 = dp05_rare_candy;
+    gItemUseCB = dp05_rare_candy;
     sub_80A16D0(taskId);
 }
 
 void FieldUseFunc_EvoItem(u8 taskId)
 {
-    gUnknown_3005E98 = sub_8126B60;
+    gItemUseCB = sub_8126B60;
     sub_80A16D0(taskId);
 }
 
 void FieldUseFunc_SacredAsh(u8 taskId)
 {
-    gUnknown_3005E98 = sub_8126894;
+    gItemUseCB = ItemUseCB_SacredAsh;
     sub_80A0FBC(taskId);
 }
 
@@ -765,7 +765,7 @@ void BattleUseFunc_GuardSpec(u8 taskId)
 {
     if (ExecuteTableBasedItemEffect(&gPlayerParty[gBattlerPartyIndexes[gBattlerInMenuId]], gSpecialVar_ItemId, gBattlerPartyIndexes[gBattlerInMenuId], 0))
     {
-        DisplayItemMessageInBag(taskId, 2, gUnknown_84169DC, sub_810A1F8);
+        DisplayItemMessageInBag(taskId, 2, gText_WontHaveEffect, sub_810A1F8);
     }
     else
     {
@@ -812,19 +812,19 @@ void ItemUse_SwitchToPartyMenuInBattle(u8 taskId)
 
 void BattleUseFunc_Medicine(u8 taskId)
 {
-    gUnknown_3005E98 = ItemUseCB_Medicine;
+    gItemUseCB = ItemUseCB_Medicine;
     ItemUse_SwitchToPartyMenuInBattle(taskId);
 }
 
 void sub_80A1FD8(u8 taskId)
 {
-    gUnknown_3005E98 = sub_8126894;
+    gItemUseCB = ItemUseCB_SacredAsh;
     ItemUse_SwitchToPartyMenuInBattle(taskId);
 }
 
 void BattleUseFunc_Ether(u8 taskId)
 {
-    gUnknown_3005E98 = ItemUseCB_PpRestore;
+    gItemUseCB = ItemUseCB_PPRecovery;
     ItemUse_SwitchToPartyMenuInBattle(taskId);
 }
 
diff --git a/src/map_preview_screen.c b/src/map_preview_screen.c
index c465a5683..0747e8ade 100644
--- a/src/map_preview_screen.c
+++ b/src/map_preview_screen.c
@@ -495,7 +495,7 @@ static void sub_80F83D0(u8 taskId)
         }
         break;
     case 2:
-        if (field_weather_is_fade_finished())
+        if (IsWeatherNotFadingIn())
         {
             Overworld_PlaySpecialMapMusic();
             data[0]++;
diff --git a/src/player_pc.c b/src/player_pc.c
index f454cd07f..c3dc81dd2 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -322,7 +322,7 @@ static void Task_DepositItem_WaitFadeAndGoToBag(u8 taskId)
     if (!gPaletteFade.active)
     {
         CleanupOverworldWindowsAndTilemaps();
-        sub_8107DB4(3, POCKET_ITEMS - 1, CB2_ReturnToField);
+        GoToBagMenu(3, POCKET_ITEMS - 1, CB2_ReturnToField);
         gFieldCallback = CB2_ReturnFromDepositMenu;
         DestroyTask(taskId);
     }
@@ -336,7 +336,7 @@ static void Task_PlayerPcDepositItem(u8 taskId)
 
 static void Task_ReturnToItemStorageSubmenu(u8 taskId)
 {
-    if (field_weather_is_fade_finished() == TRUE)
+    if (IsWeatherNotFadingIn() == TRUE)
         gTasks[taskId].func = Task_TopMenu_ItemStorageSubmenu_HandleInput;
 }
 
@@ -573,7 +573,7 @@ static void Task_WaitFadeAndReadSelectedMail(u8 taskId)
 
 static void Task_WaitFadeAndReturnToMailboxPcInputHandler(u8 taskId)
 {
-    if (field_weather_is_fade_finished() == TRUE)
+    if (IsWeatherNotFadingIn() == TRUE)
         gTasks[taskId].func = Task_MailboxPcHandleInput;
 }
 
@@ -674,7 +674,7 @@ static void Task_WaitFadeAndGoToPartyMenu(u8 taskId)
     {
         MailboxPC_DestroyListMenuBuffer();
         CleanupOverworldWindowsAndTilemaps();
-        PartyMenuInit_FromPlayerPc();
+        ChooseMonToGiveMailFromMailbox();
         DestroyTask(taskId);
     }
 }
diff --git a/src/quest_log.c b/src/quest_log.c
index d7b544882..9683d7799 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -987,7 +987,7 @@ void sub_8111708(void)
     gSaveBlock1Ptr->mapDataId = VarGet(VAR_0x40AE);
     if (gSaveBlock1Ptr->mapDataId == 0)
     {
-        sp0 = *get_mapheader_by_bank_and_number(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum);
+        sp0 = *Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum);
         gSaveBlock1Ptr->mapDataId = sp0.mapDataId;
     }
 }
@@ -1363,7 +1363,7 @@ static void sub_8111FCC(u8 taskId)
     {
         if (gUnknown_203AE94.unk_0_6 != 1)
         {
-            sub_80C4DF8(gStringVar1, gMapHeader.regionMapSectionId);
+            GetMapNameGeneric(gStringVar1, gMapHeader.regionMapSectionId);
             StringExpandPlaceholders(gStringVar4, gUnknown_841B073);
             sub_8111D10();
         }
@@ -3166,7 +3166,7 @@ static const u16 *sub_8113FBC(const u16 *a0)
         StringCopy(gStringVar1, ItemId_GetName(r5[0]));
         if (r5[0] == ITEM_ESCAPE_ROPE)
         {
-            sub_80C4DF8(gStringVar2, r5[2]);
+            GetMapNameGeneric(gStringVar2, r5[2]);
             StringExpandPlaceholders(gStringVar4, gUnknown_841AFA6);
         }
         else if (r5[1] != 0xFFFF)
@@ -3814,7 +3814,7 @@ static const u16 *sub_8114D68(const u16 *a0)
     a0 = sub_8113E88(30, a0);
     r6 = (const u8 *)a0 + 6;
     DynamicPlaceholderTextUtil_Reset();
-    sub_80C4DF8(gStringVar1, r6[0]);
+    GetMapNameGeneric(gStringVar1, r6[0]);
     DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
     DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gTrainers[a0[2]].trainerName);
     QuestLog_AutoGetSpeciesName(a0[0], 0, 2);
@@ -3855,7 +3855,7 @@ static const u16 *sub_8114E68(const u16 *a0)
 
     r6 = (const u8 *)a0 + 8;
     DynamicPlaceholderTextUtil_Reset();
-    sub_80C4DF8(gStringVar1, r6[2]);
+    GetMapNameGeneric(gStringVar1, r6[2]);
     DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
     QuestLog_AutoGetSpeciesName(a0[2], NULL, 1);
     ConvertIntToDecimalStringN(gStringVar2, r6[0], STR_CONV_MODE_LEFT_ALIGN, 3);
@@ -3983,7 +3983,7 @@ static const u16 *sub_81151DC(const u16 *a0)
     const u16 *r5 = sub_8113E88(34, a0);
     const u8 *r6 = (const u8 *)r5 + 6;
     DynamicPlaceholderTextUtil_Reset();
-    sub_80C4DF8(gStringVar1, r6[0]);
+    GetMapNameGeneric(gStringVar1, r6[0]);
     DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
     if (
             gTrainers[r5[2]].trainerClass == 0x51
@@ -4164,7 +4164,7 @@ static const u16 *sub_81152BC(const u16 *a0)
     const u16 *r5 = sub_8113E88(35, a0);
     const u8 *r5_2 = (const u8 *)r5 + 0;
     r6 = r5_2[1];
-    sub_80C4DF8(gStringVar1, r5_2[0]);
+    GetMapNameGeneric(gStringVar1, r5_2[0]);
     StringCopy(gStringVar2, gUnknown_8456AF0[r6]);
     if (gUnknown_8456BE4[r6] == 5)
     {
@@ -4238,7 +4238,7 @@ static const u16 *sub_8115460(const u16 *a0)
     const u8 *r5 = (const u8 *)r4 + 2;
     QuestLog_AutoGetSpeciesName(r4[0], gStringVar1, 0);
     if (r5[1] != 0xFF)
-        sub_80C4DF8(gStringVar2, r5[1]);
+        GetMapNameGeneric(gStringVar2, r5[1]);
     if (r5[0] == 7)
     {
         if (r5[1] == 0x58)
@@ -4270,7 +4270,7 @@ static const u16 *sub_8115518(const u16 *a0)
     const u8 *r7 = (const u8 *)r4 + 8;
     u32 r6 = (r4[2] << 16) + r4[3];
     DynamicPlaceholderTextUtil_Reset();
-    sub_80C4DF8(gStringVar1, r7[0]);
+    GetMapNameGeneric(gStringVar1, r7[0]);
     DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
     DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, ItemId_GetName(r4[0]));
     if (r4[1] < 2)
@@ -4303,7 +4303,7 @@ static const u16 *sub_81155E0(const u16 *a0) {
     const u8 *r7 = (const u8 *) r5 + 8;
     u32 r6 = (r5[2] << 16) + r5[3];
     DynamicPlaceholderTextUtil_Reset();
-    sub_80C4DF8(gStringVar1, r7[0]);
+    GetMapNameGeneric(gStringVar1, r7[0]);
     if (r7[1] == 0) {
         DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gSaveBlock2Ptr->playerName);
         DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gStringVar1);
@@ -4344,7 +4344,7 @@ static const u16 *sub_8115700(const u16 *a0)
 {
     const u16 *r4 = sub_8113E88(40, a0);
     const u8 *r5 = (const u8 *)r4 + 2;
-    sub_80C4DF8(gStringVar1, r5[0]);
+    GetMapNameGeneric(gStringVar1, r5[0]);
     StringCopy(gStringVar2, ItemId_GetName(r4[0]));
     StringExpandPlaceholders(gStringVar4, gUnknown_841B03F);
     return (const u16 *)(r5 + 2);
@@ -4420,7 +4420,7 @@ static u16 *sub_81157DC(u16 *a0, const u16 *a1)
 static const u16 *sub_8115800(const u16 *a0)
 {
     const u16 *r4 = sub_8113E88(42, a0);
-    sub_80C4DF8(gStringVar1, r4[0]);
+    GetMapNameGeneric(gStringVar1, r4[0]);
     StringExpandPlaceholders(gStringVar4, gUnknown_841B064);
     return r4 + 1;
 }
diff --git a/src/roamer.c b/src/roamer.c
index b42855644..b3cc67f85 100644
--- a/src/roamer.c
+++ b/src/roamer.c
@@ -236,5 +236,5 @@ u16 GetRoamerLocationMapSectionId(void)
     struct Roamer *roamer = &saveRoamer;
     if (!saveRoamer.active)
         return MAPSEC_NONE;
-    return get_mapheader_by_bank_and_number(sRoamerLocation[MAP_GRP], sRoamerLocation[MAP_NUM])->regionMapSectionId;
+    return Overworld_GetMapHeaderByGroupAndId(sRoamerLocation[MAP_GRP], sRoamerLocation[MAP_NUM])->regionMapSectionId;
 }
diff --git a/src/save_menu_util.c b/src/save_menu_util.c
index 195b29b0c..54073785e 100644
--- a/src/save_menu_util.c
+++ b/src/save_menu_util.c
@@ -41,7 +41,7 @@ void SaveStatToString(u8 gameStatId, u8 *dest0, u8 color)
         dest = ConvertIntToDecimalStringN(dest, gSaveBlock2Ptr->playTimeMinutes, STR_CONV_MODE_LEADING_ZEROS, 2);
         break;
     case SAVE_STAT_LOCATION:
-        sub_80C4DF8(dest, gMapHeader.regionMapSectionId);
+        GetMapNameGeneric(dest, gMapHeader.regionMapSectionId);
         break;
     case SAVE_STAT_BADGES:
         for (flagId = FLAG_BADGE01_GET, nBadges = 0; flagId < FLAG_BADGE01_GET + 8; flagId++)
diff --git a/src/tm_case.c b/src/tm_case.c
index 25fe9a72c..0734c6d24 100644
--- a/src/tm_case.c
+++ b/src/tm_case.c
@@ -848,8 +848,8 @@ static void TMHMContextMenuAction_Use(u8 taskId)
     }
     else
     {
-        gUnknown_3005E98 = sub_8125B40;
-        sTMCaseDynamicResources->savedCallback = sub_8124C8C;
+        gItemUseCB = ItemUseCB_TMHM;
+        sTMCaseDynamicResources->savedCallback = CB2_ShowPartyMenuForItemUse;
         Task_BeginFadeOutFromTMCase(taskId);
     }
 }
@@ -874,7 +874,7 @@ static void TMHMContextMenuAction_Give(u8 taskId)
         }
         else
         {
-            sTMCaseDynamicResources->savedCallback = sub_8126EDC;
+            sTMCaseDynamicResources->savedCallback = CB2_ChooseMonToGiveItem;
             Task_BeginFadeOutFromTMCase(taskId);
         }
     }
@@ -945,7 +945,7 @@ static void Task_SelectTMAction_Type1(u8 taskId)
 
     if (!itemid_is_unique(BagGetItemIdByPocketPosition(POCKET_TM_CASE, data[1])))
     {
-        sTMCaseDynamicResources->savedCallback = c2_8123744;
+        sTMCaseDynamicResources->savedCallback = CB2_GiveHoldItem;
         Task_BeginFadeOutFromTMCase(taskId);
     }
     else
@@ -1274,7 +1274,7 @@ static void Task_TMCaseDude_Playback(u8 taskId)
             sTMCaseStaticResources.scrollOffset = sPokeDudePackBackup->unk_162;
             Free(sPokeDudePackBackup);
             CpuFastCopy(gPlttBufferFaded, gPlttBufferUnfaded, 0x400);
-            sub_8108CF0();
+            CB2_SetUpReshowBattleScreenAfterMenu();
             BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, 0);
             data[8]++;
         }
diff --git a/src/trade.c b/src/trade.c
index 5151ecedd..792f1524b 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -879,11 +879,11 @@ static void sub_804C728(void)
         break;
     case 8:
         LoadHeldItemIcons();
-        sub_812256C(sTradeMenuResourcesPtr->partyCounts, sTradeMenuResourcesPtr->partyIcons, 0);
+        DrawHeldItemIconsForTrade(sTradeMenuResourcesPtr->partyCounts, sTradeMenuResourcesPtr->partyIcons, 0);
         gMain.state++;
         break;
     case 9:
-        sub_812256C(sTradeMenuResourcesPtr->partyCounts, sTradeMenuResourcesPtr->partyIcons, 1);
+        DrawHeldItemIconsForTrade(sTradeMenuResourcesPtr->partyCounts, sTradeMenuResourcesPtr->partyIcons, 1);
         gMain.state++;
         break;
     case 10:
@@ -1483,7 +1483,7 @@ static void sub_804C728(void)
                 "\tadds r0, 0x36\n"
                 "\tadds r1, 0x28\n"
                 "\tmovs r2, 0\n"
-                "\tbl sub_812256C\n"
+                "\tbl DrawHeldItemIconsForTrade\n"
                 "\tldr r1, _0804CB74 @ =gMain\n"
                 "\tmovs r5, 0x87\n"
                 "\tlsls r5, 3\n"
@@ -1499,7 +1499,7 @@ static void sub_804C728(void)
                 "\tadds r0, 0x36\n"
                 "\tadds r1, 0x28\n"
                 "\tmovs r2, 0x1\n"
-                "\tbl sub_812256C\n"
+                "\tbl DrawHeldItemIconsForTrade\n"
                 "\tldr r1, _0804CB98 @ =gMain\n"
                 "\tmovs r7, 0x87\n"
                 "\tlsls r7, 3\n"
@@ -1989,11 +1989,11 @@ void sub_804CF14(void)
         break;
     case 8:
         LoadHeldItemIcons();
-        sub_812256C(sTradeMenuResourcesPtr->partyCounts, sTradeMenuResourcesPtr->partyIcons, 0);
+        DrawHeldItemIconsForTrade(sTradeMenuResourcesPtr->partyCounts, sTradeMenuResourcesPtr->partyIcons, 0);
         gMain.state++;
         break;
     case 9:
-        sub_812256C(sTradeMenuResourcesPtr->partyCounts, sTradeMenuResourcesPtr->partyIcons, 1);
+        DrawHeldItemIconsForTrade(sTradeMenuResourcesPtr->partyCounts, sTradeMenuResourcesPtr->partyIcons, 1);
         gMain.state++;
         break;
     case 10:
@@ -2365,7 +2365,7 @@ void sub_804CF14(void)
                 "\tadds r0, 0x36\n"
                 "\tadds r1, 0x28\n"
                 "\tmovs r2, 0\n"
-                "\tbl sub_812256C\n"
+                "\tbl DrawHeldItemIconsForTrade\n"
                 "\tldr r1, _0804D174 @ =gMain\n"
                 "\tmovs r5, 0x87\n"
                 "\tlsls r5, 3\n"
@@ -2381,7 +2381,7 @@ void sub_804CF14(void)
                 "\tadds r0, 0x36\n"
                 "\tadds r1, 0x28\n"
                 "\tmovs r2, 0x1\n"
-                "\tbl sub_812256C\n"
+                "\tbl DrawHeldItemIconsForTrade\n"
                 "\tldr r1, _0804D198 @ =gMain\n"
                 "\tmovs r7, 0x87\n"
                 "\tlsls r7, 3\n"
@@ -4394,7 +4394,7 @@ static bool32 IsDeoxysOrMewUntradable(u16 species, bool8 isObedientBitSet)
     return FALSE;
 }
 
-int sub_804FBEC(struct UnkLinkRfuStruct_02022B14Substruct a0, struct UnkLinkRfuStruct_02022B14Substruct a1, u16 species1, u16 species2, u8 type, u16 species3, u8 isObedientBitSet)
+int GetUnionRoomTradeMessageId(struct UnkLinkRfuStruct_02022B14Substruct a0, struct UnkLinkRfuStruct_02022B14Substruct a1, u16 species1, u16 species2, u8 type, u16 species3, u8 isObedientBitSet)
 {
     u8 r9 = a0.unk_01_0;
     u8 r4 = a0.unk_00_7;
diff --git a/src/wild_pokemon_area.c b/src/wild_pokemon_area.c
index fc4df06ed..3c5afaf25 100644
--- a/src/wild_pokemon_area.c
+++ b/src/wild_pokemon_area.c
@@ -289,7 +289,7 @@ static bool32 PokemonInEncounterTable(const struct WildPokemonInfo * info, s32 s
 
 static u16 GetMapSecIdFromWildMonHeader(const struct WildPokemonHeader * header)
 {
-    return get_mapheader_by_bank_and_number(header->mapGroup, header->mapNum)->regionMapSectionId;
+    return Overworld_GetMapHeaderByGroupAndId(header->mapGroup, header->mapNum)->regionMapSectionId;
 }
 
 static bool32 TryGetMapSecPokedexAreaEntry(u16 mapSecId, const u16 (*lut)[2], s32 count, s32 * lutIdx_p, u16 * tableIdx_p)