From af861b64750f1d60702627712ece00f72c56806a Mon Sep 17 00:00:00 2001 From: zeromus Date: Mon, 28 Feb 2011 08:19:06 +0000 Subject: [PATCH] [NES] add UOROM --- BizHawk.Emulation/Consoles/Nintendo/NES/BoardDetector.cs | 3 ++- BizHawk.Emulation/Consoles/Nintendo/NES/Boards/UxROM.cs | 2 +- BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs | 1 + BizHawk.MultiClient/output/gamedb.txt | 3 +++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/BoardDetector.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/BoardDetector.cs index 2ed85ee0d8..a9a3871f0b 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/BoardDetector.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/BoardDetector.cs @@ -40,7 +40,8 @@ namespace BizHawk.Emulation.Consoles.Nintendo static string ClassifyTable = @" NROM 0 1 1 NROM 0 2 1 -UXROM 2 8 0 +UNROM 2 8 0 +UOROM 2 16 0 "; } diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/UxROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/UxROM.cs index 9f0edd4eca..1c0a2e19bc 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/UxROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/UxROM.cs @@ -17,7 +17,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo.Boards if (type == "UNROM") pagemask = 7; else if (type == "UOROM") pagemask = 15; - else throw new InvalidOperationException("Invalid UXROM type"); + else throw new InvalidOperationException("Invalid UxROM type"); //guess CRAM size (this is a very confident guess!) if (RomInfo.CRAM_Size == -1) RomInfo.CRAM_Size = 8; diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs index 18311b1970..4071b7125a 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs @@ -610,6 +610,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo { case "NROM": board = new Boards.NROM(); break; case "UNROM": board = new Boards.UxROM("UNROM"); break; + case "UOROM": board = new Boards.UxROM("UOROM"); break; } if (board == null) throw new InvalidOperationException("Couldn't classify NES rom"); diff --git a/BizHawk.MultiClient/output/gamedb.txt b/BizHawk.MultiClient/output/gamedb.txt index 2a10df42dc..a090c15b58 100644 --- a/BizHawk.MultiClient/output/gamedb.txt +++ b/BizHawk.MultiClient/output/gamedb.txt @@ -2332,5 +2332,8 @@ E7D7225DAD044B624FBAD9C9CA96E835 Wrecking Crew (JUE) NES board=NROM;mirror=H;P 5A5C2F4F1CAFB1F55A8DC0D5AD4550E5 Contra (U) NES board=UNROM;mirror=V;PRG=8;CHR=0;CRAM=8 B480855FFF883B20BA403A2009A7F13C Duck Tales (U) NES board=UNROM;mirror=V;PRG=8;CHR=0;CRAM=8 +;UOROM +C0C74CC78E6CD34775A83CC21A0C75B5 Paperboy 2 (U) NES board=UOROM;mirror=H;PRG=16;CHR=0;CRAM=8 + ;mapper66? mhrom? wtf?? ;27100B746D50E6AE6FBAE2C794173240 Metal Gear (U) NES board=UXROM;mirror=H;PRG=8;CHR=0;CRAM=8;bug=1