summaryrefslogtreecommitdiff
path: root/include/battle_setup.h
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-03-03 14:42:15 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-03-03 14:52:32 -0500
commit1aa1f189721ba9c21597bae047282c4a785ab400 (patch)
treee00282ff363683a18872eaea167febace9bb83ec /include/battle_setup.h
parent4c4b19da7e2f6f71a13f92068f395894c53798fd (diff)
Sync trainer_battle.inc
Diffstat (limited to 'include/battle_setup.h')
-rw-r--r--include/battle_setup.h9
1 files changed, 4 insertions, 5 deletions
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);