diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-01-07 18:39:27 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-01-07 18:39:27 -0500 |
| commit | f7eef0735bb70a7fed17b6fabb15f30c092209bc (patch) | |
| tree | 17f9256f07ff23163cf13af85fdc36847549cbbe /include/battle_setup.h | |
| parent | f50bc217ae5daeb2c2788f502f604e3684249256 (diff) | |
| parent | 8f7400809626c0f72dfe751665126f94181fd7c1 (diff) | |
Merge branch 'master' into trainer_tower
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 86a84f471..61395811b 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -11,8 +11,8 @@ 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); |