Merge master into ObjEvent rename and prune accidental inclusions

include/field_specials.h

@@ -7,7 +7,7 @@ extern u8 gBikeCollisions;
 u8 GetLeadMonIndex(void);
 u8 IsDestinationBoxFull(void);
 u16 GetPCBoxToSendMon(void);
-bool8 InMultiBattleRoom(void);
+bool8 InMultiPartnerRoom(void);
 void UpdateTrainerFansAfterLinkBattle(void);
 void IncrementBirthIslandRockStepCount(void);
 bool8 AbnormalWeatherHasExpired(void);