ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GameBoy: Disable BIOS in Gambatte. Use GBHawk for GameBoy, Gambatte for CGB.

This commit is contained in:
alyosha-tas 2017-11-11 09:07:58 -05:00
parent 4cf9ef3f3a
commit c18298c8a5
4 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BizHawk.Client.Common/RomLoader.cs
View File

@ -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
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1.cs
View File

@ -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;

5
BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ISettable.cs
View File

@ -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,

10
BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
View File

@ -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)
{