From 1aa1f189721ba9c21597bae047282c4a785ab400 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 3 Mar 2020 14:42:15 -0500 Subject: Sync trainer_battle.inc --- include/battle_setup.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'include/battle_setup.h') diff --git a/include/battle_setup.h b/include/battle_setup.h index 2aecbb0a4..e85ee2faf 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -18,19 +18,18 @@ 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 BattleSetup_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); -- cgit v1.2.3 From 7af1b35d17b7077b13e04c2717b48a55960fa8ce Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 3 Mar 2020 16:18:45 -0500 Subject: Sync some specials/drop unnecessary prefixes --- include/battle_setup.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'include/battle_setup.h') diff --git a/include/battle_setup.h b/include/battle_setup.h index e85ee2faf..9074c94f9 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -3,15 +3,15 @@ #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); @@ -24,8 +24,8 @@ void SetBattledTrainerFlag(void); bool8 HasTrainerBeenFought(u16 trainerId); void SetTrainerFlag(u16 trainerId); void ClearTrainerFlag(u16 trainerId); -void BattleSetup_StartTrainerBattle(void); -void BattleSetup_StartRematchBattle(void); +void StartTrainerBattle(void); +void StartRematchBattle(void); void ShowTrainerIntroSpeech(void); const u8 *BattleSetup_GetScriptAddrAfterBattle(void); const u8 *BattleSetup_GetTrainerPostBattleScript(void); -- cgit v1.2.3