diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-20 18:02:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-20 18:02:50 -0400 |
| commit | aeeff84462973b267e62031a945603d96afed716 (patch) | |
| tree | 046ce2a73b467844e95a490b1cfa9cdda5e5f4df /include/battle_setup.h | |
| parent | d3bfb6cfc63f9f64295cbd864f98df9cf4c643b4 (diff) | |
| parent | f0bf1e641cb8532611c97354beaf46afaca7c417 (diff) | |
Merge pull request #780 from GriffinRichards/sync-scripts
Sync some scripts with pokeemerald
Diffstat (limited to 'include/battle_setup.h')
| -rw-r--r-- | include/battle_setup.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/battle_setup.h b/include/battle_setup.h index f0608cb21..1676ddde1 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -59,7 +59,6 @@ void TrainerWantsBattle(u8, const u8 *); bool32 GetTrainerFlagFromScriptPointer(const u8 *data); //u8 ScrSpecial_GetTrainerBattleMode(void); -//u8 ScrSpecial_HasTrainerBeenFought(void); //void sub_808257C(void); //void unref_sub_8082590(void); // unused u8 HasTrainerAlreadyBeenFought(u16); @@ -68,8 +67,6 @@ void ClearTrainerFlag(u16); void BattleSetup_StartTrainerBattle(void); void CB2_EndTrainerBattle(void); void do_choose_name_or_words_screen(void); -//void ScrSpecial_StartTrainerEyeRematch(void); -//void ScrSpecial_ShowTrainerIntroSpeech(void); u8 *BattleSetup_GetScriptAddrAfterBattle(void); u8 *BattleSetup_GetTrainerPostBattleScript(void); //void ScrSpecial_ShowTrainerNonBattlingSpeech(void); @@ -94,6 +91,5 @@ void TryUpdateRandomTrainerRematches(u16, u16); s32 DoesSomeoneWantRematchIn(u16 mapGroup, u16 mapNum); s32 IsRematchTrainerIn(u16 mapGroup, u16 mapNum); u16 GetRematchTrainerId(u16 a1); -//u8 ScrSpecial_GetTrainerEyeRematchFlag(void); #endif // GUARD_BATTLE_SETUP_H |