summaryrefslogtreecommitdiff
path: root/include/battle_setup.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/battle_setup.h')
-rw-r--r--include/battle_setup.h22
1 files changed, 11 insertions, 11 deletions
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);