8 files changed, 38 insertions, 38 deletions
diff --git a/include/battle.h b/include/battle.h
index 00f7dcea9..0298dd265 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -712,7 +712,7 @@ extern u16 gLastPrintedMoves[MAX_BATTLERS_COUNT];
 extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT];
 extern u8 gChosenActionByBattler[MAX_BATTLERS_COUNT];
 extern u8 gBattleTerrain;
-extern struct UnknownPokemonStruct4 gUnknown_2022B58[3];
+extern struct UnknownPokemonStruct4 gMultiPartnerParty[3];
 extern u16 *gUnknown_2022BC0;
 extern u16 gRandomTurnNumber;
 
diff --git a/include/field_weather.h b/include/field_weather.h
index 96c1ce7cb..2709a7298 100644
--- a/include/field_weather.h
+++ b/include/field_weather.h
@@ -13,7 +13,7 @@ void DoCurrentWeather(void);
 void SetSav1WeatherFromCurrMapHeader(void);
 void sub_807B0C4(u16 *, u16 *, u32);
 void PlayRainStoppingSoundEffect(void);
-bool8 field_weather_is_fade_finished(void);
+bool8 IsWeatherNotFadingIn(void);
 void SetWeatherScreenFadeOut(void);
 void sub_807B070(void);
 u8 GetCurrentWeather(void);
diff --git a/include/fldeff.h b/include/fldeff.h
index 25d5b8d43..690d5f953 100644
--- a/include/fldeff.h
+++ b/include/fldeff.h
@@ -44,7 +44,7 @@ bool8 FldEff_UseTeleport(void);
 
 // softboiled
 bool8 hm_prepare_dive_probably(void);
-void sub_80E56DC(u8 taskId);
+void ChooseMonForSoftboiled(u8 taskId);
 void sub_80E5724(u8 taskId);
 
 // sweetscent
diff --git a/include/item_menu.h b/include/item_menu.h
index d12b9f394..187674e83 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -25,7 +25,7 @@ extern u16 gSpecialVar_ItemId;
 // Exported ROM declarations
 void sub_81AAC50(void);
 void sub_81AAC70(void);
-void sub_8108CF0(void);
+void CB2_SetUpReshowBattleScreenAfterMenu(void);
 void sub_81089BC(void);
 void sub_810B108(u8);
 void CB2_BagMenuFromStartMenu(void);
@@ -39,6 +39,6 @@ void sub_8107ECC(void);
 void sub_810AF74(void);
 void sub_8108DC8(u8 pocketId);
 void sub_81089F4(u8 pocketId);
-void sub_8107DB4(u8 menuType, u8 pocket, MainCallback callback);
+void GoToBagMenu(u8 menuType, u8 pocket, MainCallback callback);
 
 #endif //GUARD_ITEM_MENU_H
diff --git a/include/overworld.h b/include/overworld.h
index 36c890eb5..d893899eb 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -72,7 +72,7 @@ void Overworld_ChangeMusicTo(u16);
 bool32 IsUpdateLinkStateCBActive(void);
 
 void strange_npc_table_clear(void);
-const struct MapHeader *get_mapheader_by_bank_and_number(u16, u16);
+const struct MapHeader *Overworld_GetMapHeaderByGroupAndId(u16, u16);
 void FieldObjectMoveDestCoords(struct MapObject *, u32, s16 *, s16 *);
 void sub_8086230(void);
 void CB2_ReturnToField(void);
diff --git a/include/party_menu.h b/include/party_menu.h
index 19cdda1dc..6e96c47ee 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -40,55 +40,55 @@ struct Struct203B0A0
     s16 unk10;
 };
 
-extern struct Struct203B0A0 gUnknown_203B0A0;
-extern u8 gUnknown_203B0C0;
+extern struct Struct203B0A0 gPartyMenu;
+extern u8 gPartyMenuUseExitCallback;
 extern u8 gUnknown_203B0C1;
-extern u8 gUnknown_203B0DC[3];
-extern void (*gUnknown_3005E98)(u8 taskId, TaskFunc func);
+extern u8 gBattlePartyCurrentOrder[3];
+extern void (*gItemUseCB)(u8 taskId, TaskFunc func);
 extern u8 gSelectedOrderFromParty[3];
 
 bool8 FieldCallback_PrepareFadeInFromMenu(void);
 bool8 MonKnowsMove(struct Pokemon *, u16);
 void sub_81B58A8(void);
 void DoWallyTutorialBagMenu(void);
-u8 pokemon_ailments_get_primary(u32 status);
+u8 GetAilmentFromStatus(u32 status);
 u16 ItemIdToBattleMoveId(u16 itemId);
-void sub_8125B40(u8 taskId, TaskFunc func);
-void sub_8124C8C(void);
-void sub_8126EDC(void);
-void c2_8123744(void);
+void ItemUseCB_TMHM(u8 taskId, TaskFunc func);
+void CB2_ShowPartyMenuForItemUse(void);
+void CB2_ChooseMonToGiveItem(void);
+void CB2_GiveHoldItem(void);
 u8 GetCursorSelectionMonId(void);
-void sub_8128370(void);
-void sub_811F818(u8 monId, u8 a1);
-void sub_8121D0C(u8);
-void sub_811FB28(u8 taskId);
-void sub_8120760(u8 taskId, u8 a1, s8 a2, s16 amount, TaskFunc followupFunc);
+void ChooseMonForDaycare(void);
+void AnimatePartySlot(u8 monId, u8 a1);
+void DisplayPartyMenuStdMessage(u8);
+void Task_HandleChooseMonInput(u8 taskId);
+void PartyMenuModifyHP(u8 taskId, u8 a1, s8 a2, s16 amount, TaskFunc followupFunc);
 void GetMonNickname(const struct Pokemon * mon, u8 * dest);
-void sub_81202F8(const u8 * src, u8 a1);
-bool8 sub_8120370(void);
-void PartyMenuInit(u8 a, u8 b, u8 c, u8 d, u8 messageId, TaskFunc task, MainCallback callback);
+void DisplayPartyMenuMessage(const u8 * src, u8 a1);
+bool8 IsPartyMenuTextPrinterActive(void);
+void InitPartyMenu(u8 a, u8 b, u8 c, u8 d, u8 messageId, TaskFunc task, MainCallback callback);
 void sub_81252D0(u8 taskId, TaskFunc followUpFunc);
-void ItemUseCB_PpRestore(u8 taskId, TaskFunc followUpFunc);
-void dp05_pp_up(u8 taskId, TaskFunc followUpFunc);
+void ItemUseCB_PPRecovery(u8 taskId, TaskFunc followUpFunc);
+void ItemUseCB_PPUp(u8 taskId, TaskFunc followUpFunc);
 void dp05_rare_candy(u8 taskId, TaskFunc followUpFunc);
 void sub_8126B60(u8 taskId, TaskFunc followUpFunc);
-void sub_8126894(u8 taskId, TaskFunc followUpFunc);
+void ItemUseCB_SacredAsh(u8 taskId, TaskFunc followUpFunc);
 void sub_81279E0(void);
 void ItemUseCB_Medicine(u8 taskId, TaskFunc followUpFunc);
 u8 GetItemEffectType(u16 itemId);
 u8 pokemon_order_func(u8);
-void sub_8127CAC(void);
-void sub_8127DA8(u8 battlerId, u8 multiplayerFlag);
-void OpenPartyMenuInBattle(u8 arg);
-void sub_8127EC4(u8 battlerId, u8 unk, u8 arrayIndex);
+void BufferBattlePartyCurrentOrder(void);
+void BufferBattlePartyCurrentOrderBySide(u8 battlerId, u8 multiplayerFlag);
+void OpenPartyMenuInBattle(void);
+void SwitchPartyOrderLinkMulti(u8 battlerId, u8 unk, u8 arrayIndex);
 bool8 IsMultiBattle(void);
-void sub_8126EDC(void);
-void sub_812256C(u8 *partyCount, u8 (*icons)[6], u8 side);
-void PartyMenuInit_FromPlayerPc(void);
+void CB2_ChooseMonToGiveItem(void);
+void DrawHeldItemIconsForTrade(u8 *partyCount, u8 (*icons)[6], u8 side);
+void ChooseMonToGiveMailFromMailbox(void);
 void CB2_PartyMenuFromStartMenu(void);
-void sub_8128198(void);
-void sub_8127FF4(u8 slot, u8 slot2);
+void ShowPartyMenuToShowcaseMultiBattleParty(void);
+void SwitchPartyMonSlots(u8 slot, u8 slot2);
 void LoadHeldItemIcons(void);
-void sub_8127968(void);
+void OpenPartyMenuInTutorialBattle(u8 partyAction);
 
 #endif // GUARD_PARTY_MENU_H
diff --git a/include/region_map.h b/include/region_map.h
index 394fee469..8d609f104 100644
--- a/include/region_map.h
+++ b/include/region_map.h
@@ -94,7 +94,7 @@ void CreateRegionMapPlayerIcon(u16 x, u16 y);
 void CreateRegionMapCursor(u16 tileTag, u16 paletteTag);
 u8 *GetMapName(u8 *, u16, u16);
 bool32 sub_8124668(u8 mapSecId);
-void sub_80C4DF8(u8 *, u8);
+void GetMapNameGeneric(u8 *, u8);
 void sub_80BFF50(u8 a0, void (*a1)(void));
 
 #endif //GUARD_REGION_MAP_H
diff --git a/include/strings.h b/include/strings.h
index 7750b271c..f5dc759e6 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -181,7 +181,7 @@ extern const u8 gUnknown_8416644[];
 extern const u8 gUnknown_841665C[];
 extern const u8 gUnknown_8416690[];
 extern const u8 gUnknown_84166A7[];
-extern const u8 gUnknown_84169DC[];
+extern const u8 gText_WontHaveEffect[];
 extern const u8 gUnknown_841623D[];
 extern const u8 gUnknown_84162BD[];
 extern const u8 gUnknown_841D148[];