From 5e9e52e3a95f4d7301565ad86084907f2d8a94e6 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 9 Sep 2017 22:04:01 -0500 Subject: more renaming/refactoring --- include/battle_setup.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'include/battle_setup.h') diff --git a/include/battle_setup.h b/include/battle_setup.h index 1aa195d92..e3fa3bb88 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -40,12 +40,6 @@ struct TrainerPartyMember3 u16 moves[4]; }; -struct TrainerBattleSpec -{ - void *ptr; - u8 ptrType; -}; - struct TrainerEyeTrainer { u16 trainerNums[5]; @@ -75,7 +69,7 @@ s8 GetBattleTerrain(void); u8 GetWildBattleTransition(void); u8 GetTrainerBattleTransition(void); u8 GetBattleTowerBattleTransition(void); -//void ChooseStarter(void); +//void ScrSpecial_ChooseStarter(void); void CB2_GiveStarter(void); void CB2_StartFirstBattle(void); void HandleFirstBattleEnd(void); @@ -103,8 +97,8 @@ void sub_808260C(void); void do_choose_name_or_words_screen(void); //void sub_80826B0(void); //void sub_80826D8(void); -u8 *sub_80826E8(void); -u8 *sub_8082700(void); +u8 *BattleSetup_GetScriptAddrAfterBattle(void); +u8 *BattleSetup_GetTrainerPostBattleScript(void); //void sub_8082718(void); //void PlayTrainerEncounterMusic(void); //u8 *SanitizeString(u8 *str); -- cgit v1.2.3