From bb72dcf19dc13d07234b50fbaabb7e5f74f1ac63 Mon Sep 17 00:00:00 2001
From: Slawter666 <38655737+Slawter666@users.noreply.github.com>
Date: Wed, 17 Oct 2018 02:53:05 +0100
Subject: Further synchronisation

---
 src/battle/battle_setup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/battle/battle_setup.c')

diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c
index fc929eb4d..c0d89c70f 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;
     }
 }
-- 
cgit v1.2.3


From bc71641386573c7e865d0cec941f84310fbd648f Mon Sep 17 00:00:00 2001
From: Slawter666 <38655737+Slawter666@users.noreply.github.com>
Date: Sat, 20 Oct 2018 21:01:15 +0100
Subject: Continue synchronising

---
 src/battle/battle_setup.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/battle/battle_setup.c')

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);
-- 
cgit v1.2.3