diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-31 18:40:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-31 18:40:40 -0500 |
| commit | cbc414c44115550c811d6629c23c2e749d9d7fe3 (patch) | |
| tree | 42a2274534149cb609636c3ef98a90438a11ca33 /include/battle_setup.h | |
| parent | 425cb7ec71d549bed0a73bb864c3f33a1c89f1c4 (diff) | |
| parent | bc71641386573c7e865d0cec941f84310fbd648f (diff) | |
Merge pull request #698 from Slawter666/synchronise
Synchronise with pokeemerald
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 fec5a249a..f0608cb21 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -55,9 +55,9 @@ void BattleSetup_StartScriptedWildBattle(void); s8 BattleSetup_GetTerrain(void); u8 BattleSetup_GetBattleTowerBattleTransition(void); u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data); -void TrainerWantsBattle(u8, u8 *); +void TrainerWantsBattle(u8, const u8 *); -bool32 GetTrainerFlagFromScriptPointer(u8 *data); +bool32 GetTrainerFlagFromScriptPointer(const u8 *data); //u8 ScrSpecial_GetTrainerBattleMode(void); //u8 ScrSpecial_HasTrainerBeenFought(void); //void sub_808257C(void); |