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
@@ -1192,7 +1192,7 @@ static void TeachyTvPrepBattle(u8 taskId)
    gSpecialVar_0x8004 = sStaticResources.whichScript;
    gMain.savedCallback = TeachyTvRestorePlayerPartyCallback;
    SavePlayerParty();
-    sub_8159F40();
+    InitPokedudePartyAndOpponent();
    PlayMapChosenOrBattleBGM(MUS_DUMMY);
    if (sStaticResources.whichScript == TTVSCR_BATTLE)
        data[6] = 9;