diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs index e5c4948c6a..2f79545f90 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs @@ -262,13 +262,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk cart_RAM = new byte[0x200]; } - Console.Write("RAM: ");Console.WriteLine(cart_RAM.Length); - mapper.Core = this; mapper.Initialize(); if (cart_RAM != null) { + + Console.Write("RAM: "); Console.WriteLine(cart_RAM.Length); + if (_syncSettings.Use_SRAM) { // load cartRAM here diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1.cs index 08066f9e45..c0c46c1890 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1.cs @@ -83,7 +83,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk { if (addr < 0x2000) { - RAM_enable = ((value & 0xA) == 0xA) ? true : false; + RAM_enable = (value & 0xA) == 0xA; } else if (addr < 0x4000) {