diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/AVE-NINA.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/AVE-NINA.cs index 227d37a529..29a61de7b5 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/AVE-NINA.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/AVE-NINA.cs @@ -122,6 +122,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES case "AVE-NINA-06": //Blackjack (U) case "AVE-NINA-03": //F-15 City War (U) case "AVE-MB-91": //Deathbots (U) + if (Cart.chips.Count == 0) // some boards had no mapper chips on them + return false; AssertPrg(32, 64); AssertChr(32, 64); AssertWram(0); AssertVram(0); break; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Camerica.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Camerica.cs index 60418cd8e7..88f092359b 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Camerica.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Camerica.cs @@ -120,7 +120,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES case "MAPPER232": break; case "CAMERICA-ALGQ": //Quattro Adventure (U) - case "CAMERICA-9096": //Quattro Arcade (U) + case "CAMERICA-BF9096": //Quattro Arcade (U) AssertPrg(256); AssertChr(0); AssertWram(0); AssertVram(8); break; default: diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs index d3eef28a95..7cd054c94a 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs @@ -114,6 +114,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES case "NES-ETROM": case "HVC-ETROM": break; + case "NES-EWROM": + case "HVC-EWROM": + break; default: return false; } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper069.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper069.cs index e84a71de02..7f0547adbf 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper069.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper069.cs @@ -98,7 +98,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES //configure switch (Cart.board_type) { - case "NES-JLROM": //mr gimmick! + case "NES-JLROM": // Mr Gimmick AssertPrg(256); AssertChr(128); AssertWram(0); AssertVram(0); AssertBattery(false); break; case "NES-JSROM": // batman(E) @@ -110,10 +110,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES AssertPrg(128); AssertChr(128); AssertWram(0); AssertVram(0); AssertBattery(false); break; case "SUNSOFT-FME-7": //Barcode World (J) - AssertPrg(128,256); AssertChr(128,256); AssertWram(0,8); AssertVram(0); + AssertPrg(128, 256); AssertChr(128, 256); AssertWram(0, 8); AssertVram(0); break; - case "NES-BTR": //Batman - Return of the Joker (U) - AssertPrg(128); AssertChr(256); AssertWram(8); AssertVram(0); AssertBattery(false); + case "NES-BTR": //Batman - Return of the Joker (U), Mr Gimmick (Proto) + AssertPrg(128, 256); AssertChr(128, 256); AssertWram(0, 8); AssertVram(0); AssertBattery(false); break; default: return false; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NROM.cs index d9e3a1f265..341e32d877 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NROM.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NROM.cs @@ -39,9 +39,18 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES case "HVC-SROM": case "SETA-NROM-128": case "BANDAI-NROM-128": + case "JALECO-JF-03": + case "NAMCOT-3305": + case "SUNSOFT-NROM-256": AssertPrg(8, 16, 32); AssertChr(8); AssertVram(0); AssertWram(0, 8); break; + case "AVE-NINA-03": + if (Cart.chips.Count != 0) + return false; + AssertPrg(8, 16, 32); + AssertChr(8); AssertVram(0); AssertWram(0); + break; default: return false; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/PxROM_FxROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/PxROM_FxROM.cs index ace49f9bc0..dc5fb3a644 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/PxROM_FxROM.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/PxROM_FxROM.cs @@ -47,6 +47,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES case "NES-PNROM": //punch-out!! case "HVC-PEEOROM": + case "NES-PEEOROM": AssertPrg(128); AssertChr(128); AssertWram(0); AssertVram(0); break; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SxROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SxROM.cs index 70e7d745ca..9e642d3f05 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SxROM.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SxROM.cs @@ -388,6 +388,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES break; case "NES-SNROM": //dragon warrior 2 case "HVC-SNROM": + case "VIRGIN-SNROM": AssertPrg(128, 256); AssertChr(0); AssertVram(8); AssertWram(8); break; case "SxROM-JUNK":