diff --git a/Assets/dll/mupen64plus.dll b/Assets/dll/mupen64plus.dll index 8d16d089da..ba06e09c3c 100644 Binary files a/Assets/dll/mupen64plus.dll and b/Assets/dll/mupen64plus.dll differ diff --git a/libmupen64plus/mupen64plus-core/src/main/savestates.c b/libmupen64plus/mupen64plus-core/src/main/savestates.c index 0fda5c49aa..cecbaae140 100644 --- a/libmupen64plus/mupen64plus-core/src/main/savestates.c +++ b/libmupen64plus/mupen64plus-core/src/main/savestates.c @@ -487,7 +487,7 @@ EXPORT int CALL savestates_load_bkm(char * curr) char *queue; - hasExpansion = !(ConfigGetParamInt(g_CoreConfig, "DisableExtraMem")); + hasExpansion = 1;// !(ConfigGetParamInt(g_CoreConfig, "DisableExtraMem")); savestateSize = hasExpansion ? 16788288 : 12593984; queue = curr + savestateSize; @@ -1457,7 +1457,7 @@ EXPORT int CALL savestates_save_bkm(char *curr) queuelength = save_eventqueue_infos(queue); - hasExpansion = !(ConfigGetParamInt(g_CoreConfig, "DisableExtraMem")); + hasExpansion = 1;// !(ConfigGetParamInt(g_CoreConfig, "DisableExtraMem")); // Allocate memory for the save state data if (hasExpansion) diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IStatable.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IStatable.cs index c47277536c..7902308646 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IStatable.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IStatable.cs @@ -32,7 +32,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64 public void LoadStateBinary(BinaryReader reader) { int length = reader.ReadInt32(); - if ((_disableExpansionSlot && length >= 16788288) || (!_disableExpansionSlot && length < 16788288)) + if (length < 16788288) { throw new SavestateSizeMismatchException("Wrong N64 savestate size"); }