Merge branch 'master' into battle

2019-10-24 01:42:52 +08:00
parent 9a53686a4e 6e36c22920
commit 1dc0b25c1e
1127 changed files with 79056 additions and 34785 deletions
@@ -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)