4 files changed, 22 insertions, 6 deletions
diff --git a/include/battle.h b/include/battle.h
index 6e941191f..fba5fb460 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -177,7 +177,7 @@ struct ProtectStruct
     /* field_0 */
     u32 protected:1;
     u32 endured:1;
-    u32 onlyStruggle:1;
+    u32 noValidMoves:1;
     u32 helpingHand:1;
     u32 bounceMove:1;
     u32 stealMove:1;
@@ -456,7 +456,7 @@ struct BattleStruct
     u8 field_46;
     u8 field_47;
     u8 focusPunchBattlerId;
-    u8 field_49;
+    u8 battlerPreventingSwitchout;
     u8 moneyMultiplier;
     u8 savedTurnActionNumber;
     u8 switchInAbilitiesCounter;
@@ -509,7 +509,7 @@ struct BattleStruct
     u8 field_A7;
     u16 hpOnSwitchout[2];
     u32 savedBattleTypeFlags;
-    u8 field_B0;
+    u8 abilityPreventingSwitchout;
     u8 hpScale;
     u8 synchronizeMoveEffect;
     bool8 anyMonHasTransformed;
diff --git a/include/battle_controllers.h b/include/battle_controllers.h
index 61e2935b7..8ba45fad1 100644
--- a/include/battle_controllers.h
+++ b/include/battle_controllers.h
@@ -65,6 +65,8 @@ enum
     REQUEST_TOUGH_RIBBON_BATTLE,
 };
 
+// Special arguments for Battle Controller functions.
+
 #define RESET_ACTION_MOVE_SELECTION     0
 #define RESET_ACTION_SELECTION          1
 #define RESET_MOVE_SELECTION            2
@@ -76,10 +78,11 @@ enum
 #define BALL_3_SHAKES_SUCCESS   4
 #define BALL_TRAINER_BLOCK      5
 
-#define RET_VALUE_LEVELLED_UP   11
-
 #define INSTANT_HP_BAR_DROP     32767
 
+// Special return values in gBattleBufferB from Battle Controller functions.
+#define RET_VALUE_LEVELLED_UP   11
+
 struct UnusedControllerStruct
 {
     u8 field_0:7;
diff --git a/include/party_menu.h b/include/party_menu.h
index 2cf17f1e4..fd52f8d4d 100644
--- a/include/party_menu.h
+++ b/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];
@@ -38,5 +50,6 @@ void sub_81B1F18(u8 taskId, u8 pokemonIdx, s8 a, s16 hp, TaskFunc func);
 void sub_81B1B5C(void *a, u8 b);
 u8 sub_81B1BD4();
 void sub_81B8448();
+void OpenPartyMenuInBattle(u8 caseId);
 
 #endif // GUARD_PARTY_MENU_H
diff --git a/include/pokemon.h b/include/pokemon.h
index f36284f12..a60ad66be 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -593,7 +593,7 @@ bool8 IsTradedMon(struct Pokemon *mon);
 bool8 IsOtherTrainer(u32 otId, u8 *otName);
 void MonRestorePP(struct Pokemon *mon);
 void BoxMonRestorePP(struct BoxPokemon *boxMon);
-void sub_806E994(void);
+void SetMonPreventsSwitchingString(void);
 void SetWildMonHeldItem(void);
 bool8 IsMonShiny(struct Pokemon *mon);
 bool8 IsShinyOtIdPersonality(u32 otId, u32 personality);