From c18298c8a5915abc5abefb3fb2420259e464cead Mon Sep 17 00:00:00 2001 From: alyosha-tas Date: Sat, 11 Nov 2017 09:07:58 -0500 Subject: [PATCH] GameBoy: Disable BIOS in Gambatte. Use GBHawk for GameBoy, Gambatte for CGB. --- BizHawk.Client.Common/RomLoader.cs | 7 ++++--- .../Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1.cs | 2 +- .../Consoles/Nintendo/Gameboy/Gambatte.ISettable.cs | 5 ----- .../Consoles/Nintendo/Gameboy/Gambatte.cs | 10 +--------- 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/BizHawk.Client.Common/RomLoader.cs b/BizHawk.Client.Common/RomLoader.cs index d89deccc64..6a9c8b68d7 100644 --- a/BizHawk.Client.Common/RomLoader.cs +++ b/BizHawk.Client.Common/RomLoader.cs @@ -936,11 +936,12 @@ namespace BizHawk.Client.Common break; case "GB": + core = CoreInventory.Instance["GB", "GBHawk"]; + break; case "GBC": if (!Global.Config.GB_AsSGB) - { - core = CoreInventory.Instance["GB", "GBHawk"]; - //core = CoreInventory.Instance["GB", "Gambatte"]; + { + core = CoreInventory.Instance["GBC", "Gambatte"]; } else { 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 2bdbff79f6..c61133bdcd 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1.cs @@ -110,7 +110,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk { sel_mode = (value & 1) > 0; - if (sel_mode) + if (sel_mode && Core.cart_RAM != null) { ROM_bank &= 0x1F; ROM_bank &= ROM_mask; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ISettable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ISettable.cs index fb41292935..7e2ba05432 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ISettable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ISettable.cs @@ -80,11 +80,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy public class GambatteSyncSettings { - [DisplayName("Enable BIOS: WARNING: File must exist!")] - [Description("Boots game using system BIOS. Should be used for TASing")] - [DefaultValue(false)] - public bool EnableBIOS { get; set; } - public enum ConsoleModeType { Auto, diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs index fcfa9a0486..f4e67dae32 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs @@ -99,16 +99,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy break; } - if (_syncSettings.EnableBIOS && BiosRom == null) - { - throw new MissingFirmwareException("Boot Rom not found"); - } - // to disable BIOS loading into gambatte, just set bios_length to 0 - if (!_syncSettings.EnableBIOS) - { - bios_length = 0; - } + bios_length = 0; if (_syncSettings.GBACGB) {