Merge branch 'master' into event_object_movement

1 files changed, 14 insertions, 15 deletions

diff --git a/include/battle_setup.h b/include/battle_setup.h
index 2aecbb0a4..9074c94f9 100644
--- a/include/battle_setup.h
+++ b/include/battle_setup.h
@@ -3,34 +3,33 @@
 
 #include "global.h"
 
-void BattleSetup_StartWildBattle(void);
-void BattleSetup_StartRoamerBattle(void);
-void ScrSpecial_StartOldManTutorialBattle(void);
-void BattleSetup_StartScriptedWildBattle(void);
-void ScrSpecial_StartMarowakBattle(void);
-void ScrSpecial_StartSouthernIslandBattle(void);
-void Special_StartLegendaryBattle(void);
-void Special_StartGroudonKyogreBattle(void);
-void Special_StartRegiBattle(void);
+void StartWildBattle(void);
+void StartRoamerBattle(void);
+void StartOldManTutorialBattle(void);
+void StartScriptedWildBattle(void);
+void StartMarowakBattle(void);
+void StartSouthernIslandBattle(void);
+void StartLegendaryBattle(void);
+void StartGroudonKyogreBattle(void);
+void StartRegiBattle(void);
 u8 BattleSetup_GetTerrainId(void);
 u8 BattleSetup_GetBattleTowerBattleTransition(void);
 const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data);
 void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerScript);
 bool32 GetTrainerFlagFromScriptPointer(const u8 *data);
 void SetUpTrainerMovement(void);
-u8 ScrSpecial_GetTrainerBattleMode(void);
+u8 GetTrainerBattleMode(void);
 u16 GetRivalBattleFlags(void);
-u16 ScrSpecial_HasTrainerBeenFought(void);
 void SetBattledTrainerFlag(void);
 bool8 HasTrainerBeenFought(u16 trainerId);
 void SetTrainerFlag(u16 trainerId);
 void ClearTrainerFlag(u16 trainerId);
-void BattleSetup_StartTrainerBattle(void);
-void ScrSpecial_StartTrainerEyeRematch(void);
-void ScrSpecial_ShowTrainerIntroSpeech(void);
+void StartTrainerBattle(void);
+void StartRematchBattle(void);
+void ShowTrainerIntroSpeech(void);
 const u8 *BattleSetup_GetScriptAddrAfterBattle(void);
 const u8 *BattleSetup_GetTrainerPostBattleScript(void);
-void ScrSpecial_ShowTrainerNonBattlingSpeech(void);
+void ShowTrainerCantBattleSpeech(void);
 void PlayTrainerEncounterMusic(void);
 const u8 *GetTrainerALoseText(void);
 const u8 *GetTrainerWonSpeech(void);