Merge remote-tracking branch 'upstream' into tustin2121-patch-5

1 files changed, 17 insertions, 17 deletions

diff --git a/include/field_specials.h b/include/field_specials.h
index b1a50c811..faf71e9c0 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -5,31 +5,31 @@ extern bool8 gBikeCyclingChallenge;
 extern u8 gBikeCollisions;
 
 u8 GetLeadMonIndex(void);
-u8 sub_813B260(void);
-u16 get_unknown_box_id(void);
-bool8 InMultiBattleRoom(void);
-void sub_813BF10(void);
+u8 IsDestinationBoxFull(void);
+u16 GetPCBoxToSendMon(void);
+bool8 InMultiPartnerRoom(void);
+void UpdateTrainerFansAfterLinkBattle(void);
 void IncrementBirthIslandRockStepCount(void);
-bool8 UnusualWeatherHasExpired(void);
+bool8 AbnormalWeatherHasExpired(void);
 bool8 ShouldDoBrailleRegicePuzzle(void);
 bool32 ShouldDoWallyCall(void);
-bool32 ShouldDoWinonaCall(void);
-bool32 ShouldDoScottCall(void);
+bool32 ShouldDoScottFortreeCall(void);
+bool32 ShouldDoScottBattleFrontierCall(void);
 bool32 ShouldDoRoxanneCall(void);
 bool32 ShouldDoRivalRayquazaCall(void);
 bool32 CountSSTidalStep(u16 delta);
 u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y);
-void sub_813A128(void);
-void sub_813A878(u8 a0);
-u8 sub_813BADC(u8 a0);
-bool8 sub_813B9C0(void);
-void SetShoalItemFlag(u16 v0);
-void UpdateFrontierManiac(u16 a0);
-void UpdateFrontierGambler(u16 a0);
+void ShowScrollableMultichoice(void);
+void FrontierGamblerSetWonOrLost(bool8 won);
+u8 TryGainNewFanFromCounter(u8 incrementId);
+bool8 InPokemonCenter(void);
+void SetShoalItemFlag(u16 unused);
+void UpdateFrontierManiac(u16 daysSince);
+void UpdateFrontierGambler(u16 daysSince);
 void ResetCyclingRoadChallengeData(void);
-bool8 warp0_in_pokecenter(void);
+bool8 UsedPokemonCenterWarp(void);
 void ResetFanClub(void);
-bool8 sub_813B21C(void);
-void set_unknown_box_id(u8 id);
+bool8 ShouldShowBoxWasFullMessage(void);
+void SetPCBoxToSendMon(u8 boxId);
 
 #endif // GUARD_FIELD_SPECIALS_H