diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs index 182f578c83..06de09f7a4 100644 --- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs +++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs @@ -135,11 +135,11 @@ namespace BizHawk.Client.Common private bool N64CoreTypeDynarec() { - if ((Emulator as N64)?.GetSyncSettings().Core == N64SyncSettings.CoreType.Dynarec) - { - Log("N64 Error: Memory callbacks are not implemented for Dynamic Recompiler core type\nUse Interpreter or Pure Interpreter\n"); - return true; - } + //if ((Emulator as N64)?.GetSyncSettings().Core == N64SyncSettings.CoreType.Dynarec) + //{ + // Log("N64 Error: Memory callbacks are not implemented for Dynamic Recompiler core type\nUse Interpreter or Pure Interpreter\n"); + // return true; + //} return false; } diff --git a/BizHawk.Client.EmuHawk/config/ProfileConfig.cs b/BizHawk.Client.EmuHawk/config/ProfileConfig.cs index b2dee08ac5..7330456ba5 100644 --- a/BizHawk.Client.EmuHawk/config/ProfileConfig.cs +++ b/BizHawk.Client.EmuHawk/config/ProfileConfig.cs @@ -87,7 +87,8 @@ namespace BizHawk.Client.EmuHawk // N64 var n64Settings = GetSyncSettings(); n64Settings.Rsp = N64SyncSettings.RspType.Rsp_Hle; - n64Settings.Core = N64SyncSettings.CoreType.Dynarec; + //n64Settings.Core = N64SyncSettings.CoreType.Dynarec; + n64Settings.Core = N64SyncSettings.CoreType.Interpret; Global.Config.N64UseCircularAnalogConstraint = true; PutSyncSettings(n64Settings); diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs index 130084f1cd..41cd314c7a 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs @@ -129,7 +129,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64 api.AttachPlugin(mupen64plusApi.m64p_plugin_type.M64PLUGIN_RSP, rsp); InitMemoryDomains(); - if (_syncSettings.Core != N64SyncSettings.CoreType.Dynarec) + //if (_syncSettings.Core != N64SyncSettings.CoreType.Dynarec) { ConnectTracer(); SetBreakpointHandler(); diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.cs index 9fb404d051..93bdb5b00a 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.cs @@ -90,8 +90,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64 [Description("Interpreter")] Interpret = 1, - [Description("DynaRec")] - Dynarec = 2, + //[Description("DynaRec")] + //Dynarec = 2, } public enum RspType