From 423ee588528e036d1f1dba8a9261e48d025c4644 Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Fri, 4 Mar 2011 03:41:39 +0000 Subject: [PATCH] NES - SC1ROM implemented (same config as SCROM), untested though since I could not find a game that uses it. SEROM implemented & Adventures of Lolo working. --- BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs | 9 +++++++-- BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs | 2 ++ BizHawk.MultiClient/output/gamedb.txt | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs index 3a53c92053..1c0df3881b 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs @@ -190,7 +190,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo.Boards { base.Initialize(romInfo, nes); - Debug.Assert(RomInfo.PRG_Size == 1 |RomInfo.PRG_Size == 4 | RomInfo.PRG_Size == 8 || RomInfo.PRG_Size == 16); + Debug.Assert(RomInfo.PRG_Size == 1 || RomInfo.PRG_Size == 2 || RomInfo.PRG_Size == 4 || RomInfo.PRG_Size == 8 || RomInfo.PRG_Size == 16); prg_mask = RomInfo.PRG_Size - 1; Debug.Assert(RomInfo.CRAM_Size == -1, "don't specify in gamedb, it is redundant"); @@ -202,7 +202,6 @@ namespace BizHawk.Emulation.Consoles.Nintendo.Boards { case "SAROM": romInfo.CRAM_Size = 0; - RomInfo.PRAM_Size = 0; RomInfo.PRAM_Size = 8; RomInfo.PRG_Size = 4; break; @@ -212,11 +211,17 @@ namespace BizHawk.Emulation.Consoles.Nintendo.Boards RomInfo.PRG_Size = 4; break; case "SCROM": + case "SC1ROM": romInfo.CRAM_Size = 0; RomInfo.PRAM_Size = 0; RomInfo.PRG_Size = 4; RomInfo.CHR_Size = 16; break; + case "SEROM": + romInfo.CRAM_Size = 0; + RomInfo.PRAM_Size = 0; + romInfo.PRG_Size = 2; + break; case "SGROM": Debug.Assert(RomInfo.CHR_Size == -1, "don't specify in gamedb, it is redundant"); romInfo.CHR_Size = 0; diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs index 27aae49a5f..0c20bfa4f5 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs @@ -676,6 +676,8 @@ namespace BizHawk.Emulation.Consoles.Nintendo case "SAROM": board = new Boards.SxROM("SAROM"); break; case "SBROM": board = new Boards.SxROM("SBROM"); break; case "SCROM": board = new Boards.SxROM("SCROM"); break; + case "SC1ROM": board = new Boards.SxROM("SC1ROM"); break; + case "SEROM": board = new Boards.SxROM("SEROM"); break; case "SGROM": board = new Boards.SxROM("SGROM"); break; case "SNROM": board = new Boards.SxROM("SNROM"); break; case "SKROM": board = new Boards.SxROM("SKROM"); break; diff --git a/BizHawk.MultiClient/output/gamedb.txt b/BizHawk.MultiClient/output/gamedb.txt index d2aeb7f5b4..701c35d2e1 100644 --- a/BizHawk.MultiClient/output/gamedb.txt +++ b/BizHawk.MultiClient/output/gamedb.txt @@ -2325,6 +2325,7 @@ E7D7225DAD044B624FBAD9C9CA96E835 Wrecking Crew (JUE) NES board=NROM;mirror=H;P ;SxROM BB9F640237A953B4753DF9D2A8DC31B3 720 (U) NES board=SNROM;PRG=8 +BD377B49DCC269C6270EC0EA6336BAF5 Adventures of Lolo (U) NES board=SEROM;PRG=2;CHR=4 A4309FA076EBEDDCB28A25F53746D4DC Bard's Tale, The Tales of the Unknown (U) NES board=SNROM;PRG=8;bat 12B0DBC4F2B22A50D0BB53C4929217F0 Blaster Master (U) NES board=SL2ROM;PRG=8;CHR=16 FFCC592A3F063C1DCC87CB5E0F81C8AF Bomberman II (U) NES board=SNROM;PRG=8