diff --git a/Assets/dll/libgambatte.dll b/Assets/dll/libgambatte.dll index 66d4f1042b..a043013748 100644 Binary files a/Assets/dll/libgambatte.dll and b/Assets/dll/libgambatte.dll differ diff --git a/Assets/dll/libgambatte.so b/Assets/dll/libgambatte.so index 10fb840baf..bd2179364b 100644 Binary files a/Assets/dll/libgambatte.so and b/Assets/dll/libgambatte.so differ diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs index 97d16d8f1b..43ac148422 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs @@ -427,6 +427,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy 0x06 => "MBC2 ROM+BATTERY", 0x08 => "Plain ROM+RAM", 0x09 => "Plain ROM+RAM+BATTERY", + 0x0B => "MMM01 ROM", // fixme: mmm01's proper header is at the end of the rom! + 0x0C => "MMM01 ROM+RAM", + 0x0D => "MMM01 ROM+BATTERY", 0x0F => "MBC3 ROM+TIMER+BATTERY", 0x10 => "MBC3 ROM+TIMER+RAM+BATTERY", 0x11 => "MBC3 ROM", @@ -466,9 +469,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy case 0x08: break; case 0x09: break; - case 0x0B: throw new UnsupportedGameException("\"MM01\" Mapper not supported!"); - case 0x0C: throw new UnsupportedGameException("\"MM01\" Mapper not supported!"); - case 0x0D: throw new UnsupportedGameException("\"MM01\" Mapper not supported!"); + case 0x0B: break; + case 0x0C: break; + case 0x0D: break; case 0x0F: break; case 0x10: break; diff --git a/submodules/gambatte b/submodules/gambatte index 8b4278807f..1988f6d45b 160000 --- a/submodules/gambatte +++ b/submodules/gambatte @@ -1 +1 @@ -Subproject commit 8b4278807f622eac13155ab999b9bcffeb9e73fe +Subproject commit 1988f6d45b0778c00fb7b48b46585412d9f28fd0