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 /src/battle/battle_setup.c | |
| parent | 425cb7ec71d549bed0a73bb864c3f33a1c89f1c4 (diff) | |
| parent | bc71641386573c7e865d0cec941f84310fbd648f (diff) | |
Merge pull request #698 from Slawter666/synchronise
Synchronise with pokeemerald
Diffstat (limited to 'src/battle/battle_setup.c')
| -rw-r--r-- | src/battle/battle_setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c index fc929eb4d..c457cc8ec 100644 --- a/src/battle/battle_setup.c +++ b/src/battle/battle_setup.c @@ -627,7 +627,7 @@ static void CB2_EndWildBattle(void) } else { - SetMainCallback2(c2_exit_to_overworld_2_switch); + SetMainCallback2(CB2_ReturnToField); gFieldCallback = sub_8080E44; } } @@ -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); |