diff --git a/Assets/dll/encore.dll b/Assets/dll/encore.dll index 9a53da9b73..c0bc83617c 100644 Binary files a/Assets/dll/encore.dll and b/Assets/dll/encore.dll differ diff --git a/encore/encore b/encore/encore index dcc66239fa..361ec298fb 160000 --- a/encore/encore +++ b/encore/encore @@ -1 +1 @@ -Subproject commit dcc66239fafafbf596436758b714798e0960c507 +Subproject commit 361ec298fb82399b8bd4b3d6fbc32d87398035c7 diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Encore.IEmulator.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Encore.IEmulator.cs index 83e0a796f4..e7cd7bf60e 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Encore.IEmulator.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Encore.IEmulator.cs @@ -33,7 +33,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS WireMemoryDomains(); } - _core.Encore_RunFrame(_context); + IsLagFrame = _core.Encore_RunFrame(_context); OnVideoRefresh(); diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/LibEncore.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/LibEncore.cs index bca1f9214b..0cc9e25e23 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/LibEncore.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/LibEncore.cs @@ -116,7 +116,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS public abstract bool Encore_LoadROM(IntPtr context, string romPath, byte[] errorMessageBuffer, int errorMessageBufferLen); [BizImport(cc)] - public abstract void Encore_RunFrame(IntPtr context); + public abstract bool Encore_RunFrame(IntPtr context); [BizImport(cc)] public abstract void Encore_Reset(IntPtr context);