Merge branch 'master' into slot_machine

1 files changed, 9 insertions, 14 deletions

diff --git a/include/battle_setup.h b/include/battle_setup.h
index 444ab5467..8423a6e6e 100644
--- a/include/battle_setup.h
+++ b/include/battle_setup.h
@@ -56,16 +56,15 @@ u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data);
 void TrainerWantsBattle(u8, u8 *);
 
 bool32 GetTrainerFlagFromScriptPointer(u8 *data);
-//void sub_8082524(void);
 //u8 ScrSpecial_GetTrainerBattleMode(void);
 //u8 ScrSpecial_HasTrainerBeenFought(void);
 //void sub_808257C(void);
 //void unref_sub_8082590(void); // unused
 u8 HasTrainerAlreadyBeenFought(u16);
-void trainer_flag_set(u16);
-void trainer_flag_clear(u16);
+void SetTrainerFlag(u16);
+void ClearTrainerFlag(u16);
 void BattleSetup_StartTrainerBattle(void);
-void sub_808260C(void);
+void CB2_EndTrainerBattle(void);
 void do_choose_name_or_words_screen(void);
 //void ScrSpecial_StartTrainerEyeRematch(void);
 //void ScrSpecial_ShowTrainerIntroSpeech(void);
@@ -74,10 +73,8 @@ u8 *BattleSetup_GetTrainerPostBattleScript(void);
 //void ScrSpecial_ShowTrainerNonBattlingSpeech(void);
 //void PlayTrainerEncounterMusic(void);
 //u8 *SanitizeString(u8 *str);
-u8 *sub_808281C(void);
-u8 *sub_8082830(void);
+u8 *GetTrainerLoseText(void);
 //u8 *unref_sub_808286C(void);
-u8 *sub_8082880(void);
 //s32 sub_8082894(const struct TrainerEyeTrainer *trainers, u16 trainerNum);
 //s32 sub_80828B8(const struct TrainerEyeTrainer *trainers, u16 trainerNum);
 //bool32 sub_80828FC(const struct TrainerEyeTrainer *trainers, u16 mapGroup, u16 mapNum);
@@ -89,14 +86,12 @@ u8 *sub_8082880(void);
 //void sub_8082AE4(const struct TrainerEyeTrainer *trainers, u16 trainerNum);
 //bool8 sub_8082B10(const struct TrainerEyeTrainer *trainers, u16 trainerNum);
 //bool32 sub_8082B44(void);
-void sub_8082B78(void);
+void IncrementRematchStepCounter(void);
 //bool32 sub_8082BA4(void);
-void sub_8082BD0(u16, u16);
-s32 sub_8082C0C(u16 mapGroup, u16 mapNum);
-s32 unref_sub_8082C2C(u16 mapGroup, u16 mapNum);
-u16 sub_8082C4C(u16 a1);
-//s32 sub_8082C68(void);
+void TryUpdateRandomTrainerRematches(u16, u16);
+s32 DoesSomeoneWantRematchIn(u16 mapGroup, u16 mapNum);
+s32 IsRematchTrainerIn(u16 mapGroup, u16 mapNum);
+u16 GetRematchTrainerId(u16 a1);
 //u8 ScrSpecial_GetTrainerEyeRematchFlag(void);
-void sub_8082CB8(void);
 
 #endif // GUARD_BATTLE_SETUP_H