diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-03-03 14:42:15 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-03-03 14:52:32 -0500 |
| commit | 1aa1f189721ba9c21597bae047282c4a785ab400 (patch) | |
| tree | e00282ff363683a18872eaea167febace9bb83ec /include | |
| parent | 4c4b19da7e2f6f71a13f92068f395894c53798fd (diff) | |
Sync trainer_battle.inc
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_setup.h | 9 | ||||
| -rw-r--r-- | include/event_scripts.h | 4 |
2 files changed, 6 insertions, 7 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); diff --git a/include/event_scripts.h b/include/event_scripts.h index 9c1a2003d..3fda94a5f 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1155,12 +1155,12 @@ extern const u8 SafariZone_EventScript_OutOfBalls[]; extern const u8 EventScript_ItemfinderDigUpUnderfootItem[]; // battle_setup -extern const u8 EventScript_DoTrainerBattle[]; +extern const u8 EventScript_DoNoIntroTrainerBattle[]; extern const u8 EventScript_TryDoDoubleTrainerBattle[]; extern const u8 EventScript_TryDoNormalTrainerBattle[]; extern const u8 EventScript_TryDoDoubleRematchBattle[]; extern const u8 EventScript_TryDoRematchBattle[]; -extern const u8 gUnknown_81A4EB4[]; +extern const u8 EventScript_DoTrainerBattleFromApproach[]; extern const u8 Test_EventScript_Sign[]; // new_game |