Merge conflict resolves into review changes

1 files changed, 5 insertions, 4 deletions

diff --git a/include/party_menu.h b/include/party_menu.h
index 84b6c1ad8..a26cdb4cd 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -38,17 +38,17 @@ u8 GetCursorSelectionMonId(void);
 u8 sub_81B1360(void);
 void sub_81B1370(u8 taskId);
 u8* GetMonNickname(struct Pokemon *mon, u8 *dest);
-u8 sub_81B1B5C(const u8* str, u8 b);
+u8 DisplayPartyMenuMessage(const u8* str, u8 b);
 bool8 sub_81B1BD4(void);
 void sub_81B1F18(u8 taskId, u8 slot, s8 c, s16 HPDifference, TaskFunc func);
 u8 pokemon_ailments_get_primary(u32 status);
 u8 GetMonAilment(struct Pokemon *mon);
-void display_pokemon_menu_message(u32 stringID);
+void DisplayPartyMenuStdMessage(u32 stringID);
 void sub_81B47E0(u8 taskId);
 bool8 FieldCallback_PrepareFadeInFromMenu(void);
 void sub_81B58A8(void);
 void LoadHeldItemIcons(void);
-void sub_81B5D4C(u8 *a, u8 *b, u8 c);
+void DrawHeldItemIconsForTrade(u8 *a, u8 *b, u8 c);
 void sub_81B617C(void);
 void ItemUseCB_Medicine(u8 taskId, TaskFunc task);
 void sub_81B67C8(u8 taskId, TaskFunc task);
@@ -69,7 +69,8 @@ void InitChooseHalfPartyForBattle(u8 unused);
 void sub_81B8558(void);
 void sub_81B8904(u8 initArg, MainCallback callback);
 void OpenPartyMenuForMoveTutor(void);
-void sub_81B8958(void);
+void ChooseMonForWirelessMinigame(void);
+void ChooseMonForWirelessMinigame(void);
 void OpenPartyMenuInBattle(u8 arg);
 void sub_81B89F0(void);
 void sub_81B8C68(void);