diff --git a/desmume/src/NDSSystem.h b/desmume/src/NDSSystem.h index 7adb300af..6bcf13de6 100644 --- a/desmume/src/NDSSystem.h +++ b/desmume/src/NDSSystem.h @@ -500,7 +500,7 @@ extern struct TCommonSettings { , GFX3D_Zelda_Shadow_Depth_Hack(0) , GFX3D_Renderer_Multisample(false) , jit_max_block_size(100) - , loadToMemory(true) + , loadToMemory(false) , UseExtBIOS(false) , SWIFromBIOS(false) , PatchSWI3(false) diff --git a/desmume/src/commandline.cpp b/desmume/src/commandline.cpp index 2be2e2deb..dbd68b7ec 100644 --- a/desmume/src/commandline.cpp +++ b/desmume/src/commandline.cpp @@ -84,7 +84,7 @@ void CommandLine::loadCommonOptions() //but also see the gtk port for an example of how to combine this with other options //(you may need to use ifdefs to cause options to be entered in the desired order) static const GOptionEntry options[] = { - { "load-type", 0, 0, G_OPTION_ARG_INT, &_load_to_memory, "ROM loading method, 0 - stream from disk (like an iso), 1 - load entirely to RAM (default 1)", "LOAD_TYPE"}, + { "load-type", 0, 0, G_OPTION_ARG_INT, &_load_to_memory, "ROM loading method, 0 - stream from disk (like an iso), 1 - load entirely to RAM (default 0)", "LOAD_TYPE"}, { "load-slot", 0, 0, G_OPTION_ARG_INT, &load_slot, "Loads savestate from slot NUM", "NUM"}, { "play-movie", 0, 0, G_OPTION_ARG_FILENAME, &_play_movie_file, "Specifies a dsm format movie to play", "PATH_TO_PLAY_MOVIE"}, { "record-movie", 0, 0, G_OPTION_ARG_FILENAME, &_record_movie_file, "Specifies a path to a new dsm format movie", "PATH_TO_RECORD_MOVIE"}, diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp index b3cf9fe42..29fffc456 100644 --- a/desmume/src/windows/main.cpp +++ b/desmume/src/windows/main.cpp @@ -2937,7 +2937,7 @@ int _main() path.ReadPathSettings(); - CommonSettings.loadToMemory = GetPrivateProfileBool("General", "loadType", true, IniName); + CommonSettings.loadToMemory = GetPrivateProfileBool("General", "ROM Loading Mode", false, IniName); CommonSettings.cheatsDisable = GetPrivateProfileBool("General", "cheatsDisable", false, IniName); CommonSettings.autodetectBackupMethod = GetPrivateProfileInt("General", "autoDetectMethod", 0, IniName); CommonSettings.backupSave = GetPrivateProfileBool("General", "backupSave", false, IniName); @@ -5826,12 +5826,12 @@ DOKEYDOWN: case ID_STREAMFROMDISK: CommonSettings.loadToMemory = false; - WritePrivateProfileBool("General", "loadType", CommonSettings.loadToMemory, IniName); + WritePrivateProfileBool("General", "ROM Loading Mode", CommonSettings.loadToMemory, IniName); return 0; case ID_LOADTORAM: CommonSettings.loadToMemory = true; - WritePrivateProfileBool("General", "loadType", CommonSettings.loadToMemory, IniName); + WritePrivateProfileBool("General", "ROM Loading Mode", CommonSettings.loadToMemory, IniName); return 0; case IDM_3DCONFIG: