merge union room with master

include/party_menu.h

@@ -1,6 +1,8 @@
 #ifndef GUARD_PARTY_MENU_H
 #define GUARD_PARTY_MENU_H
+
 #include "task.h"
+
 enum
 {
     AILMENT_NONE,
@@ -11,6 +13,16 @@ enum
     AILMENT_BRN
 };
 
+enum
+{
+    PARTY_CHOOSE_MON,
+    PARTY_MUST_CHOOSE_MON,
+    PARTY_CANT_SWITCH,
+    PARTY_USE_ITEM_ON,
+    PARTY_ABILITY_PREVENTS,
+    PARTY_GIVE_ITEM,
+};
+
 struct Struct203CEC8
 {
     u8 filler[0x9];
@@ -28,7 +40,7 @@ void DoWallyTutorialBagMenu(void);
 u8 pokemon_ailments_get_primary(u32 status);
 u8 *GetMonNickname(struct Pokemon *mon, u8 *dst);
 u8 GetCursorSelectionMonId(void);
-bool8 FieldCallback_Teleport(void);
+bool8 FieldCallback_PrepareFadeInFromMenu(void);
 void sub_81B7F60(void);
 
 void sub_81B0FCC(u8 partyIdx, u8 a);
@@ -41,5 +53,6 @@ void sub_81B8448();
 void sub_81B8518(u8 unused);
 u8 sub_81B1360(void);
 void sub_81B8904(u8 arg0, void (*callback)(void));
+void OpenPartyMenuInBattle(u8 caseId);
 
 #endif // GUARD_PARTY_MENU_H