diff options
| author | Kurausukun <lord.uber1@gmail.com> | 2021-03-19 14:34:58 -0400 |
|---|---|---|
| committer | Kurausukun <lord.uber1@gmail.com> | 2021-03-19 14:34:58 -0400 |
| commit | c94e5e9ab0b2b65c8c6275f84043807b2743d6f2 (patch) | |
| tree | b188427bb1942695f32e14ee3fe137855d638c8c /src/teachy_tv.c | |
| parent | 0643255c85d0ebd5212e731c9fad3b43d0d99a10 (diff) | |
| parent | ed16a7409ae9c808a110975dec1930f9f949a6d6 (diff) | |
Merge remote-tracking branch 'upstream/master' into port_matchings
Diffstat (limited to 'src/teachy_tv.c')
| -rw-r--r-- | src/teachy_tv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/teachy_tv.c b/src/teachy_tv.c index d6ce57c3d..3baaa094a 100644 --- a/src/teachy_tv.c +++ b/src/teachy_tv.c @@ -1177,9 +1177,9 @@ static void TeachyTvPrepBattle(u8 taskId) InitPokedudePartyAndOpponent(); PlayMapChosenOrBattleBGM(MUS_DUMMY); if (sStaticResources.whichScript == TTVSCR_BATTLE) - data[6] = 9; + data[6] = B_TRANSITION_WHITEFADE_IN_STRIPES; else - data[6] = 8; + data[6] = B_TRANSITION_SLICED_SCREEN; data[7] = 0; gTasks[taskId].func = TeachyTvPreBattleAnimAndSetBattleCallback; } |