6 files changed, 37 insertions, 15 deletions
diff --git a/include/battle_party_menu.h b/include/battle_party_menu.h
index c3bebbcd4..200b0c653 100644
--- a/include/battle_party_menu.h
+++ b/include/battle_party_menu.h
@@ -4,7 +4,7 @@
 extern u8 unk_2000000[];
 #define EWRAM_1609D unk_2000000[0x1609D]
 
-void SetUpBattlePokemonMenu(u8);
+void HandleBattlePartyMenu(u8);
 bool8 SetUpBattlePartyMenu(void);
 
 #endif
diff --git a/include/choose_party.h b/include/choose_party.h
index e31aa3c02..853202a89 100644
--- a/include/choose_party.h
+++ b/include/choose_party.h
@@ -3,11 +3,11 @@
 
 void sub_8121E10(void);
 void sub_8121E34(void);
-bool8 sub_8121E78(void);
-void sub_81222B0(u8 taskId);
-bool8 sub_8122854(void);
-void sub_8122A48(u8 taskId);
-void sub_8122E0C(u8 taskId);
+bool8 SetupBattleTowerPartyMenu(void);
+void HandleBattleTowerPartyMenu(u8 taskId);
+bool8 SetupLinkMultiBattlePartyMenu(void);
+void HandleLinkMultiBattlePartyMenu(u8 taskId);
+void HandleDaycarePartyMenu(u8 taskId);
 void sub_8123138(u8 taskId);
 
 #endif // GUARD_CHOOSE_PARTY_H
diff --git a/include/party_menu.h b/include/party_menu.h
index 6f0077f8c..6bb9b87f8 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -4,6 +4,28 @@
 #include "menu.h"
 #include "task.h"
 
+
+enum
+{
+    PARTY_MENU_TYPE_STANDARD,
+    PARTY_MENU_TYPE_BATTLE,
+    PARTY_MENU_TYPE_CONTEST,
+    PARTY_MENU_TYPE_IN_GAME_TRADE,
+    PARTY_MENU_TYPE_BATTLE_TOWER,
+    PARTY_MENU_TYPE_LINK_MULTI_BATTLE,
+    PARTY_MENU_TYPE_DAYCARE,
+    PARTY_MENU_TYPE_MOVE_TUTOR,
+};
+
+// The party menu screen is presented differently depending on which menu layout is set.
+enum
+{
+    PARTY_MENU_LAYOUT_STANDARD,
+    PARTY_MENU_LAYOUT_DOUBLE_BATTLE,
+    PARTY_MENU_LAYOUT_LINK_DOUBLE_BATTLE,
+    PARTY_MENU_LAYOUT_MULTI_BATTLE,
+};
+
 struct PartyPopupMenu
 {
     /*0x0*/u8 numChoices; // number of menu choices
@@ -71,10 +93,10 @@ extern u8 ewram[];
 #define ewram1B000_alt (*(struct Struct201B000 *)(ewram + 0x1B000))
 #define EWRAM_1B000 ewram1B000_alt
 
+void CB2_PartyMenuMain(void);
 void sub_806C658(u8 taskId, s8 directionPressed);
-void sub_806AEDC(void);
 void sub_806AF4C(u8 a, u8 battleFlags, TaskFunc func, u8 d);
-void OpenPartyMenu(u8 a, u8 b);
+void OpenPartyMenu(u8 menuType, u8 battleFlags);
 bool8 InitPartyMenu(void);
 bool8 IsLinkDoubleBattle(void);
 u8 sub_806B58C(u8);
diff --git a/include/pokemon_menu.h b/include/pokemon_menu.h
index 5cac57d5d..9566a7173 100644
--- a/include/pokemon_menu.h
+++ b/include/pokemon_menu.h
@@ -36,7 +36,7 @@ enum
 extern u8 gLastFieldPokeMenuOpened;
 extern void (*gUnknown_03005CE4)(void);
 
-void sub_8089CD4(u8 taskID);
+void HandleDefaultPartyMenu(u8 taskID);
 void sub_808B5B4(u32 taskID);
 void sub_8089A70(void);
 void sub_8089C50(u8 arg0, u8 arg1, u8 arg2, u8 noOfOptions, const struct MenuAction2 *menuActions, const u8 *order);
diff --git a/include/script_pokemon_80F9.h b/include/script_pokemon_80F9.h
index 7124c1916..fa5d57f0e 100644
--- a/include/script_pokemon_80F9.h
+++ b/include/script_pokemon_80F9.h
@@ -9,13 +9,13 @@ struct UnknownStruct2018000
 
 extern struct UnknownStruct2018000 unk_2018000;
 
-void sub_80F9A8C(u8);
+void OpenPartyMenuFromScriptContext(u8 taskId);
 void sub_80F9C00(void);
 void sub_80F9E1C(void);
 void sub_80F99CC(void);
-void sub_80F9C6C(u8 var);
-bool8 sub_80F9ACC(void);
-void sub_80F9E64(u8 var);
-bool8 sub_80F9CE8(void);
+void HandleSelectPartyMenu(u8 taskId);
+bool8 SetupContestPartyMenu(void);
+void HandleMoveTutorPartyMenu(u8 taskId);
+bool8 SetupMoveTutorPartyMenu(void);
 
 #endif
diff --git a/include/sprite.h b/include/sprite.h
index 54ea02816..769e1584d 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -257,7 +257,7 @@ void FreeSpriteTiles(struct Sprite *sprite);
 void FreeSpritePalette(struct Sprite *sprite);
 void FreeSpriteOamMatrix(struct Sprite *sprite);
 void DestroySpriteAndFreeResources(struct Sprite *sprite);
-void sub_800142C(u32 a1, u32 a2, const u16 *a3, u16 a4, u32 a5);
+void DrawPartyMenuMonText(u32 a1, u32 a2, const u16 *a3, u16 a4, u32 a5);
 void AnimateSprite(struct Sprite *sprite);
 void StartSpriteAnim(struct Sprite *sprite, u8 animNum);
 void StartSpriteAnimIfDifferent(struct Sprite *sprite, u8 animNum);