diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-10-20 21:01:15 +0100 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-10-20 21:01:15 +0100 |
| commit | bc71641386573c7e865d0cec941f84310fbd648f (patch) | |
| tree | 028717e7f893a18d77b7d24e693eaf2abd0d2c49 /src/battle/battle_setup.c | |
| parent | 164e2ea8eb5501eed7a8b641c3cb97b7e1992e0d (diff) | |
Continue synchronising
Diffstat (limited to 'src/battle/battle_setup.c')
| -rw-r--r-- | src/battle/battle_setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c index c0d89c70f..c457cc8ec 100644 --- a/src/battle/battle_setup.c +++ b/src/battle/battle_setup.c @@ -1038,7 +1038,7 @@ u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) } } -void TrainerWantsBattle(u8 trainerEventObjId, u8 *trainerScript) +void TrainerWantsBattle(u8 trainerEventObjId, const u8 *trainerScript) { gSelectedEventObject = trainerEventObjId; gSpecialVar_LastTalked = gEventObjects[trainerEventObjId].localId; @@ -1047,7 +1047,7 @@ void TrainerWantsBattle(u8 trainerEventObjId, u8 *trainerScript) ScriptContext2_Enable(); } -bool32 GetTrainerFlagFromScriptPointer(u8 *data) +bool32 GetTrainerFlagFromScriptPointer(const u8 *data) { u32 flag = TrainerBattleLoadArg16(data + 2); return FlagGet(TRAINER_FLAG_START + flag); |