diff --git a/src/pc/djui/djui_panel_host_message.c b/src/pc/djui/djui_panel_host_message.c index 092bb68b0..325606f50 100644 --- a/src/pc/djui/djui_panel_host_message.c +++ b/src/pc/djui/djui_panel_host_message.c @@ -28,6 +28,10 @@ void djui_panel_do_host(bool reconnecting, bool playSound) { network_set_system(configNetworkSystem); network_init(NT_SERVER, reconnecting); + fake_lvl_init_from_save_file(); + + extern s16 gChangeLevelTransition; + gChangeLevelTransition = gLevelValues.entryLevel; if (gMarioState->marioObj) vec3f_copy(gMarioState->marioObj->header.gfx.cameraToObject, gGlobalSoundSource); if (playSound) { gDelayedInitSound = CHAR_SOUND_OKEY_DOKEY; } diff --git a/src/pc/network/network.c b/src/pc/network/network.c index bad063917..a0245fe10 100644 --- a/src/pc/network/network.c +++ b/src/pc/network/network.c @@ -170,15 +170,15 @@ bool network_init(enum NetworkType inNetworkType, bool reconnecting) { djui_chat_box_create(); djui_panel_shutdown(); - fake_lvl_init_from_save_file(); - mods_activate(&gLocalMods); djui_panel_modlist_create(NULL); smlua_init(); dynos_behavior_hook_all_custom_behaviors(); - extern s16 gChangeLevelTransition; - gChangeLevelTransition = gLevelValues.entryLevel; + if (gCurrLevelNum != (s16)gLevelValues.entryLevel) { + extern s16 gChangeLevelTransition; + gChangeLevelTransition = gLevelValues.entryLevel; + } } configfile_save(configfile_name());