clean up

2019-10-26 00:33:42 +08:00
parent 2f87855072
commit 1230a5c48a
16 changed files with 59 additions and 262 deletions
@@ -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);