diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs index ef4a0dc35b..ee25e2b9b4 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs @@ -212,6 +212,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo.Boards break; case "SCROM": case "SC1ROM": + Debug.Assert(RomInfo.CHR_Size == -1, "don't specify in gamedb, it is redundant"); romInfo.CRAM_Size = 0; RomInfo.PRAM_Size = 0; RomInfo.PRG_Size = 4; @@ -232,6 +233,13 @@ namespace BizHawk.Emulation.Consoles.Nintendo.Boards RomInfo.CRAM_Size = 8; romInfo.PRAM_Size = 0; break; + case "SHROM": + Debug.Assert(RomInfo.CHR_Size == -1, "don't specify in gamedb, it is redundant"); + romInfo.PRG_Size = 2; + RomInfo.PRAM_Size = 0; + RomInfo.CRAM_Size = 0; + romInfo.CHR_Size = 16; + break; case "SNROM": 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 ca4ac5dd52..8cbbb72ad0 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs @@ -17,6 +17,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo //Zelda II (U) - Black screen only //Bard's Tale - The Tales of the Unkown (U) - Black screen only //Dragon Warrior (SBROM) - Black screen only + //Family Feud - Fails to get past intro screen //the main rom class that contains all information necessary for the board to operate @@ -680,6 +681,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo case "SEROM": board = new Boards.SxROM("SEROM"); break; case "SFROM": board = new Boards.SxROM("SFROM"); break; case "SGROM": board = new Boards.SxROM("SGROM"); break; + case "SHROM": board = new Boards.SxROM("SHROM"); break; case "SNROM": board = new Boards.SxROM("SNROM"); break; case "SKROM": board = new Boards.SxROM("SKROM"); break; case "SL2ROM": board = new Boards.SxROM("SL2ROM"); break; diff --git a/BizHawk.MultiClient/output/gamedb.txt b/BizHawk.MultiClient/output/gamedb.txt index ba2c4d077d..a20a5a3b59 100644 --- a/BizHawk.MultiClient/output/gamedb.txt +++ b/BizHawk.MultiClient/output/gamedb.txt @@ -2334,6 +2334,7 @@ FFCC592A3F063C1DCC87CB5E0F81C8AF Bomberman II (U) NES board=SNROM;PRG=8 755F9086B0567243B3CE25CC8A6DFD17 Castlevania II - Simon's Quest (U) NES board=SL2ROM;PRG=8;CHR=16 E8382F82570BC616B0BCC02C843C1B79 Dragon Warrior (U) NES board=SAROM;CHR=2;PRG=4 CCDB4563C9004d862DCF3A98C7937C22 Dragon Warrior 2 (U) NES board=SNROM;PRG=16;bat +E2297D6FBD42A09b162E84507ACF4C04 Family Feud (U) NES board=SHROM;PRG=2 24AE5EDF8375162F91A6846D3202E3D6 Final Fantasy (U) NES board=SNROM;PRG=16;bat 881ECC27F0D3B10ED63DCC68C2B20ADC Final Fantasy (J) NES board=SNROM;PRG=16;bat 9A857B52042A11D021D596E5EE528585 Kid Icarus (UE) NES board=SNROM;PRG=8