diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-01-06 16:19:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-06 16:19:18 -0500 |
| commit | e70a084aa964a0df94c609ebfa9717089dd67639 (patch) | |
| tree | 996dc1a413c8818d6efb746ecf15c3fae28b983e /include/battle_setup.h | |
| parent | 103789770b635610ee1c04ed923fdcc7298f878e (diff) | |
| parent | 1581631e6286e0ec8178630433e8c15cd7076ead (diff) | |
Merge pull request #38 from PikalaxALT/scrcmd
scrcmd
Diffstat (limited to 'include/battle_setup.h')
| -rw-r--r-- | include/battle_setup.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/battle_setup.h b/include/battle_setup.h index 2806295ca..61395811b 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -11,11 +11,12 @@ void BattleSetup_StartWildBattle(void); void BattleSetup_StartRoamerBattle(void); u8 HasTrainerAlreadyBeenFought(u16); -void trainer_flag_set(u16); -void trainer_flag_clear(u16); +void SetTrainerFlag(u16); +void ClearTrainerFlag(u16); void BattleSetup_StartTrainerBattle(void); u8 *BattleSetup_GetScriptAddrAfterBattle(void); u8 *BattleSetup_GetTrainerPostBattleScript(void); void sub_80803FC(void); +u8 sub_8080060(void); #endif // GUARD_BATTLE_SETUP_H |