summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/battle_setup.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/include/battle_setup.h b/include/battle_setup.h
index e599acd8a..8a362a82e 100644
--- a/include/battle_setup.h
+++ b/include/battle_setup.h
@@ -5,20 +5,20 @@
void BattleSetup_StartWildBattle(void);
void BattleSetup_StartRoamerBattle(void);
-void BattleSetup_StartOldManTutorialBattle(void);
+void ScrSpecial_StartOldManTutorialBattle(void);
void BattleSetup_StartScriptedWildBattle(void);
-void BattleSetup_StartMarowakBattle(void);
-void sub_807F998(void);
-void BattleSetup_StartLegendaryBattle(void);
-void BattleSetup_StartIceCaveBattle(void);
-void sub_807FABC(void);
+void ScrSpecial_StartMarowakBattle(void);
+void ScrSpecial_StartSouthernIslandBattle(void);
+void Special_StartLegendaryBattle(void);
+void Special_StartGroudonKyogreBattle(void);
+void Special_StartRegiBattle(void);
u8 BattleSetup_GetTerrainId(void);
u8 sub_8080060(void);
const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data);
void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerScript);
bool32 GetTrainerFlagFromScriptPointer(const u8 *data);
void SetUpTrainerMovement(void);
-u8 GetTrainerBattleMode(void);
+u8 ScrSpecial_GetTrainerBattleMode(void);
u16 sub_80803D8(void);
u16 GetTrainerFlag(void);
void SetBattledTrainerFlag(void);
@@ -26,11 +26,11 @@ bool8 HasTrainerBeenFought(u16 trainerId);
void SetTrainerFlag(u16 trainerId);
void ClearTrainerFlag(u16 trainerId);
void BattleSetup_StartTrainerBattle(void);
-void BattleSetup_StartRematchBattle(void);
-void ShowTrainerIntroSpeech(void);
+void ScrSpecial_StartTrainerEyeRematch(void);
+void ScrSpecial_ShowTrainerIntroSpeech(void);
const u8 *BattleSetup_GetScriptAddrAfterBattle(void);
const u8 *BattleSetup_GetTrainerPostBattleScript(void);
-void ShowTrainerCantBattleSpeech(void);
+void ScrSpecial_ShowTrainerNonBattlingSpeech(void);
void SetUpTrainerEncounterMusic(void);
const u8 *GetTrainerALoseText(void);
const u8 *GetTrainerWonSpeech(void);