From b9f4d20de9730cc0175b00f1c251b34a8c0859c0 Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 28 Oct 2016 16:52:29 -0500 Subject: [PATCH] NES - support 800-in-1 --- Assets/gamedb/gamedb.txt | 3 ++- .../Consoles/Nintendo/NES/Boards/Mapper236.cs | 3 ++- BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Assets/gamedb/gamedb.txt b/Assets/gamedb/gamedb.txt index 307dd01bd9..57faaaa342 100644 --- a/Assets/gamedb/gamedb.txt +++ b/Assets/gamedb/gamedb.txt @@ -196,7 +196,8 @@ sha1:43E3ED6480E7BF32FFAF1AEBC7F534E0A9B775E6 T Super Mario Bros 2 (Lost Levels) sha1:F32E366828DCA94A612DD39613858DD8E26FA2DC T Thunder & Lightning (U) [t1] NES board=MAPPER066;WRAM=0 sha1:8554112E83B5978F5D4EC6E4551F390D5F698E00 B U-Force Power Games (U) (Prototype2) (Defaced by NA) [b1] NES board=NES-GNROM;WRAM=0 sha1:A6A0A3DC8438558FA5DA3AF8D3349AA8CF080404 Xi You Ji Hou Zhuan (Ch) NES board=MAPPER162 - +sha1:BC1734BEE472D34F489A6F5F2530A019F28055B7 B 800-in-1 [p1][b1] NES board=MAPPER236 +sha1:BC1734BEE472D34F489A6F5F2530A019F28055B7 G 800-in-1 [p1][U] NES board=MAPPER236;VRAM=8 ;;;;;;;;;;;;;;;;;;;----------------------------------------------------------------------- ;;;;;;;;;;;;;;;;;;;----------------------------------------------------------------------- diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper236.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper236.cs index 75aba05481..f08add262c 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper236.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper236.cs @@ -21,10 +21,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { switch (Cart.board_type) { - //case "MAPPER236": // Nestopia classifies both boards as MAPPER236, but I have yet to a see a ROM iwth this iNES header, and how would we determine which one it was? + case "UNIF_BMC-70in1": isLargeBanks = false; break; + case "MAPPER236": case "UNIF_BMC-70in1B": isLargeBanks = true; break; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs index 8c32a75e3b..986db1f423 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs @@ -582,7 +582,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES "F9E1C94C16AE4196BC8814AB2A32F6156AE46C82", // NEStronome by Ernesto Borio (2009) (PD) "B0F9A7BDE0A4AEAD2847679662D68F2471875EEB", // Parasol Stars - The Story of Bubble Bobble 3 (E) [t1] "004B1CCEBA54E4192EE8789B9A6AD131E56DD241", // rNES_demo by Ernesto Borio (2009) (PD) - "986F02624DB41425D89D8C8632F77F2FFC860D04" // Radac Tailor-Made (J) (Sample) + "986F02624DB41425D89D8C8632F77F2FFC860D04", // Radac Tailor-Made (J) (Sample) + "BC1734BEE472D34F489A6F5F2530A019F28055B7" // 800-in-1 [p1][b1] }; #endregion