From a932cce63691aa3fc6a1ef97b728fb70c11e0c61 Mon Sep 17 00:00:00 2001 From: TiKevin83 Date: Sat, 26 Sep 2020 19:14:20 -0400 Subject: [PATCH] Revert "initial attempt at a firmware fallback for Gambatte's clean room patch" This reverts commit be25ad0bc8bf3d6dbf2993e9c51b5daa268be244. Meant to push this to a different branch for PR --- .../Consoles/Nintendo/Gameboy/Gambatte.cs | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs index 68362f8b4c..2eed6763c6 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs @@ -103,19 +103,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy if (_syncSettings.EnableBIOS) { - try { - bios = comm.CoreFileProvider.GetFirmware(biosSystemId, biosId, true, "BIOS Not Found, Cannot Load. Change SyncSettings to run without BIOS."); - } catch (MissingFirmwareException) { - if (_syncSettings.GBACGB && IsCgb) { - bios = comm.CoreFileProvider.GetFirmware(biosSystemId, "World", true, "BIOS Not Found, Cannot Load. Change SyncSettings to run without BIOS."); - byte[] agbOverride = { 0xFF, 0x00, 0xCD, 0x03, 0x35, 0xAA, 0x31, 0x90, 0x94, 0x00, 0x00, 0x00, 0x00 }; - for (int i = 0xF3; i < 0x100; i++) { - bios[i] = (byte)((agbOverride[i - 0xF3] + bios[i]) & 0xFF); - } - } else { - bios = comm.CoreFileProvider.GetFirmware(biosSystemId, biosId, true, "BIOS Not Found, Cannot Load. Change SyncSettings to run without BIOS."); - } - } + bios = comm.CoreFileProvider.GetFirmware(biosSystemId, biosId, true, "BIOS Not Found, Cannot Load. Change SyncSettings to run without BIOS."); } else {