diff --git a/Assets/dll/encore.dll b/Assets/dll/encore.dll index 1686876b33..25eb5482d4 100644 Binary files a/Assets/dll/encore.dll and b/Assets/dll/encore.dll differ diff --git a/encore/encore b/encore/encore index c34960de86..c3e7f204c1 160000 --- a/encore/encore +++ b/encore/encore @@ -1 +1 @@ -Subproject commit c34960de8689d778ecbb24c425dfa8b1c928fa42 +Subproject commit c3e7f204c1a0a2da62b280ef0a846d0264097b2a diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Encore.ISettable.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Encore.ISettable.cs index e95bc48501..7794dbc31c 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Encore.ISettable.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Encore.ISettable.cs @@ -26,8 +26,10 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS "use_virtual_sd" => _syncSettings.UseVirtualSd, "is_new_3ds" => _syncSettings.IsNew3ds, "lle_applets" => _syncSettings.LleApplets, + "allow_async_file_io" => !DeterministicEmulation && _syncSettings.AllowAsyncFileIo, "plugin_loader" => _syncSettings.PluginLoaderEnabled, "allow_plugin_loader" => _syncSettings.AllowPluginLoader, + "want_determinism" => DeterministicEmulation, "filter_mode" => _settings.FilterMode, "swap_screen" => _settings.SwapScreen, "upright_screen" => _settings.UprightScreen, @@ -44,7 +46,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS "region_value" => (ulong)_syncSettings.RegionValue, "init_clock" => _syncSettings.UseRealTime && !DeterministicEmulation ? 0UL : 1UL, "init_time" => (ulong)(_syncSettings.InitialTime - _epoch).TotalSeconds, - "init_ticks_type" => _syncSettings.RandomInitTicks && !DeterministicEmulation ? 0UL : 01UL, + "init_ticks_type" => _syncSettings.RandomInitTicks && !DeterministicEmulation ? 0UL : 1UL, "init_ticks_override" => (ulong)_syncSettings.InitTickCount, "birthmonth" => (ulong)_syncSettings.CFGBirthdayMonth, "birthday" => (ulong)_syncSettings.CFGBirthdayDay, @@ -331,6 +333,11 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS [DefaultValue(false)] public bool LleApplets { get; set; } + [DisplayName("Allow Async File I/O")] + [Description("If true, file i/o may be performed asynchronously. May reduce stutters for slow HDDs, but may result in longer load times. Ignored (set to false) when recording a movie.")] + [DefaultValue(true)] + public bool AllowAsyncFileIo { get; set; } + public enum ERegionValue { Autodetect = -1,