diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/GxROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/GxROM.cs index 970ca4741e..43ac338b51 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/GxROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/GxROM.cs @@ -35,8 +35,6 @@ namespace BizHawk.Emulation.Consoles.Nintendo case "NES-MHROM": //Super Mario Bros. / Duck Hunt AssertPrg(Cart.board_type == "NES-MHROM" ? 64 : 128); AssertChr(8, 16, 32); AssertVram(0); AssertWram(0); break; - case "GXROM_HACKY": - break; default: return false; diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs index 220ac829b9..3827eacea3 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs @@ -282,7 +282,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo break; case "NES-SEROM": //lolo case "HVC-SEROM": //dr. mario - AssertPrg(32); AssertChr(32); AssertVram(0); AssertWram(0); + AssertPrg(32); AssertChr(16,32); AssertVram(0); AssertWram(0); break; case "NES-SFROM": //bubble bobble AssertPrg(128, 256); AssertChr(16, 32, 64); AssertVram(0); AssertWram(0); diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs index 06e1fa5732..6d2ab9484b 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs @@ -505,8 +505,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo throw new Exception("No class implements the necessary board type: " + choice.board_type); if (choice.DB_GameInfo != null) - if (choice.DB_GameInfo.Status == RomStatus.BadDump) - choice.bad = true; + choice.bad = choice.DB_GameInfo.IsRomStatusBad(); LoadWriteLine("Final game detection results:"); LoadWriteLine(choice);