From e3e78fbb2709ec3d2309cbf8b9726e7f589f69d8 Mon Sep 17 00:00:00 2001 From: MysterD Date: Thu, 8 Oct 2020 20:57:11 -0700 Subject: [PATCH] Disable force-synchronizing of TTM slide --- src/game/level_update.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/game/level_update.c b/src/game/level_update.c index f566f370..a29e2243 100644 --- a/src/game/level_update.c +++ b/src/game/level_update.c @@ -599,7 +599,10 @@ void check_instant_warp(void) { warp_camera(warp->displacement[0], warp->displacement[1], warp->displacement[2]); gMarioStates[0].area->camera->yaw = cameraAngle; - if (changeOfArea) { + // don't force synchronize the slide in TTM + u8 ignoreSyncingArea = (gCurrLevelNum == LEVEL_TTM && (gCurrAreaIndex == 3 || gCurrAreaIndex == 4)); + + if (changeOfArea && !ignoreSyncingArea) { set_play_mode(PLAY_MODE_SYNC_LEVEL); network_send_instant_warp(); }