diff options
author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-26 00:33:42 +0800 |
---|---|---|
committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-26 01:31:50 +0800 |
commit | 1230a5c48a465d42ae7035ca9c1a6e2152c54d1a (patch) | |
tree | 8fc6f5b6bb323f408a4f0c117f89fd66b7161440 /include/battle_setup.h | |
parent | 2f87855072fb4fdca6ce22d60bfb1b7fdc000134 (diff) |
clean up
Diffstat (limited to 'include/battle_setup.h')
-rw-r--r-- | include/battle_setup.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/battle_setup.h b/include/battle_setup.h index 8a362a82e..809806e9b 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -20,7 +20,7 @@ bool32 GetTrainerFlagFromScriptPointer(const u8 *data); void SetUpTrainerMovement(void); u8 ScrSpecial_GetTrainerBattleMode(void); u16 sub_80803D8(void); -u16 GetTrainerFlag(void); +u16 ScrSpecial_HasTrainerBeenFought(void); void SetBattledTrainerFlag(void); bool8 HasTrainerBeenFought(u16 trainerId); void SetTrainerFlag(u16 trainerId); @@ -31,7 +31,7 @@ void ScrSpecial_ShowTrainerIntroSpeech(void); const u8 *BattleSetup_GetScriptAddrAfterBattle(void); const u8 *BattleSetup_GetTrainerPostBattleScript(void); void ScrSpecial_ShowTrainerNonBattlingSpeech(void); -void SetUpTrainerEncounterMusic(void); +void PlayTrainerEncounterMusic(void); const u8 *GetTrainerALoseText(void); const u8 *GetTrainerWonSpeech(void); |