diff options
author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-24 01:42:52 +0800 |
---|---|---|
committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-24 01:42:52 +0800 |
commit | 1dc0b25c1e58e422883e16ce7fb4f6bea1e9a0bb (patch) | |
tree | 867d72df6ebe9b2d1f3ff72503879640322ec224 /src/teachy_tv.c | |
parent | 9a53686a4eb595c288758486af5fea9b7805283f (diff) | |
parent | 6e36c229200e083ca005cbc448e99210d111f3b2 (diff) |
Merge branch 'master' into battle
Diffstat (limited to 'src/teachy_tv.c')
-rw-r--r-- | src/teachy_tv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/teachy_tv.c b/src/teachy_tv.c index 7369bf03a..e33cb9d2e 100644 --- a/src/teachy_tv.c +++ b/src/teachy_tv.c @@ -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; |