Merge branch 'master' into battle

1 files changed, 3 insertions, 3 deletions

diff --git a/src/battle_setup.c b/src/battle_setup.c
index 5aff0acb3..4e2e48f3b 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -405,7 +405,7 @@ static void sub_807FB08(void)
     sub_805C780();
     gMain.savedCallback = sub_807FAF8;
     SavePlayerParty();
-    sub_8159F40();
+    InitPokedudePartyAndOpponent();
     CreateBattleStartTask(GetWildBattleTransition(), 0);
 }
 
@@ -977,7 +977,7 @@ const u8 *BattleSetup_GetScriptAddrAfterBattle(void)
     if (sTrainerBattleEndScript != NULL)
         return sTrainerBattleEndScript;
     else
-        return gUnknown_81C555B;
+        return EventScript_1C555B;
 }
 
 const u8 *BattleSetup_GetTrainerPostBattleScript(void)
@@ -985,7 +985,7 @@ const u8 *BattleSetup_GetTrainerPostBattleScript(void)
     if (sTrainerABattleScriptRetAddr != NULL)
         return sTrainerABattleScriptRetAddr;
     else
-        return gUnknown_81C555B;
+        return EventScript_1C555B;
 }
 
 void ShowTrainerCantBattleSpeech(void)