From 7919bb8647fa7b41f2bcdc62c78f3aaf52dd7397 Mon Sep 17 00:00:00 2001 From: zeromus Date: Wed, 2 Mar 2011 02:41:03 +0000 Subject: [PATCH] [NES] remove some redundant and misleading information (CHR sizes =0 and mirror types =X) from gamedb --- .../Consoles/Nintendo/NES/Boards/SxROM.cs | 1 + .../Consoles/Nintendo/NES/NES.cs | 3 +- BizHawk.MultiClient/output/gamedb.txt | 30 +++++++++---------- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs index 447b54cb09..42933fb6b6 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs @@ -189,6 +189,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo.Boards Debug.Assert(RomInfo.CRAM_Size == -1, "don't specify in gamedb, it is redundant"); Debug.Assert(RomInfo.PRAM_Size == -1, "don't specify in gamedb, it is redundant"); + Debug.Assert(RomInfo.MirrorType == NES.EMirrorType.External, "don't specify in gamedb, it is redundant"); //analyze board type switch (type) diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs index dbc4b66ff0..2e0df4caff 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs @@ -625,7 +625,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo var dict = gi.ParseOptionsDictionary(); if (dict.ContainsKey("board")) romInfo.BoardName = dict["board"]; - if(dict.ContainsKey("mirror")) + if (dict.ContainsKey("mirror")) switch (dict["mirror"]) { case "V": romInfo.MirrorType = EMirrorType.Vertical; break; @@ -633,6 +633,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo case "X": romInfo.MirrorType = EMirrorType.External; break; default: throw new InvalidOperationException(); } + else romInfo.MirrorType = EMirrorType.External; if (dict.ContainsKey("PRG")) romInfo.PRG_Size = int.Parse(dict["PRG"]); diff --git a/BizHawk.MultiClient/output/gamedb.txt b/BizHawk.MultiClient/output/gamedb.txt index 193e4c08de..f29e10aa91 100644 --- a/BizHawk.MultiClient/output/gamedb.txt +++ b/BizHawk.MultiClient/output/gamedb.txt @@ -2324,21 +2324,21 @@ E7D7225DAD044B624FBAD9C9CA96E835 Wrecking Crew (JUE) NES board=NROM;mirror=H;P 7A528FA727623BA7704FDBB519F3419F Xevious (U) NES board=NROM;mirror=H;PRG=2;CHR=1 ;SxROM -BB9F640237A953B4753DF9D2A8DC31B3 720 (U) NES board=SNROM;mirror=H;PRG=8 -A4309FA076EBEDDCB28A25F53746D4DC Bard's Tale, The Tales of the Unknown (U) NES board=SNROM;mirror=H;PRG=8;bat +BB9F640237A953B4753DF9D2A8DC31B3 720 (U) NES board=SNROM;PRG=8 +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;mirror=H;PRG=8 -755F9086B0567243B3CE25CC8A6DFD17 Castlevania II - Simon's Quest (U) NES board=SL2ROM;mirror=H;PRG=8;CHR=16 -CCDB4563C9004d862DCF3A98C7937C22 Dragon Warrior 2 (U) NES board=SNROM;PRG=16;mirror=H;bat +FFCC592A3F063C1DCC87CB5E0F81C8AF Bomberman II (U) NES board=SNROM;PRG=8 +755F9086B0567243B3CE25CC8A6DFD17 Castlevania II - Simon's Quest (U) NES board=SL2ROM;PRG=8;CHR=16 +CCDB4563C9004d862DCF3A98C7937C22 Dragon Warrior 2 (U) NES board=SNROM;PRG=16;bat 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 D9A1631D5C32D35594B9484862A26CBA Legend of Zelda, The (Rev 0) (U) NES board=SNROM;PRG=8;bat 0527A0EE512F69E08B8DB6DC97964632 Mega Man 2 (U) NES board=SGROM;PRG=16 B2D2D9ED68B3E5E0D29053EA525BD37C Metroid (U) NES board=SNROM;PRG=8 -E12F3FD85F96F9A61FE38626A1B5CEFA Spot (J) NES board=SNROM;PRG=8;mirror=H -44F5B716CF5EE0164C151106D0E68DCE Spot (U) NES board=SNROM;PRG=8;mirror=H -88C0493FB1146834836C0FF4F3E06E45 Zelda II - The Adventure of Link (U) NES board=SL2ROM;mirror=H;PRG=8;CHR=16 +E12F3FD85F96F9A61FE38626A1B5CEFA Spot (J) NES board=SNROM;PRG=8 +44F5B716CF5EE0164C151106D0E68DCE Spot (U) NES board=SNROM;PRG=8 +88C0493FB1146834836C0FF4F3E06E45 Zelda II - The Adventure of Link (U) NES board=SL2ROM;PRG=8;CHR=16 ;UNROM 29E5E1A5F8B400773EF9D959044456B2 3-D Battles of World Running (U) NES board=UNROM;mirror=V;PRG=8 @@ -2371,17 +2371,17 @@ C2E8AD9E054DD3AF022404856DC8916F ASO - Armored Scrum Object (J) NES board=CNRO 5DB8BC3BD36484BB164EEA6097A1E313 Cybernoid - The Fighting Machine (U) NES board=CNROM;mirror=V;PRG=2;CHR=4 ;ANROM 8,0 -81706ABDAE6D1D11B0C8986FC4383EC0 Marble Madness (U) NES board=ANROM;mirror=X;PRG=8;CHR=0 -5D50D8F9CF3D6D311A2AC7F010D83BE0 Marble Madness (E) NES board=ANROM;mirror=X;PRG=8;CHR=0 +81706ABDAE6D1D11B0C8986FC4383EC0 Marble Madness (U) NES board=ANROM;PRG=8 +5D50D8F9CF3D6D311A2AC7F010D83BE0 Marble Madness (E) NES board=ANROM;PRG=8 ;AOROM 8,0 -C6809FA829814A356446CE0B36F60EBF Time Lord (E) NES board=AOROM;mirror=X;PRG=8;CHR=0 -8B179585FD5D6D7F4ECAA9196381A46D Time Lord (U) NES board=AOROM;mirror=X;PRG=8;CHR=0 +C6809FA829814A356446CE0B36F60EBF Time Lord (E) NES board=AOROM;PRG=8 +8B179585FD5D6D7F4ECAA9196381A46D Time Lord (U) NES board=AOROM;PRG=8 ;AOROM 16,0 -DBF8909B943AB0F7ED0F210CE85FAFAF Battletoads (E) NES board=AOROM;mirror=X;PRG=16;CHR=0 -318D9C03FB183F6F8CD2FC89FDD0DBB2 Battletoads (J) NES board=AOROM;mirror=X;PRG=16;CHR=0 -EEFAC97AC3B85048F3685E1623210EFB Battletoads (U) NES board=AOROM;mirror=X;PRG=16;CHR=0 +DBF8909B943AB0F7ED0F210CE85FAFAF Battletoads (E) NES board=AOROM;PRG=16 +318D9C03FB183F6F8CD2FC89FDD0DBB2 Battletoads (J) NES board=AOROM;PRG=16 +EEFAC97AC3B85048F3685E1623210EFB Battletoads (U) NES board=AOROM;PRG=16 ;COLORDREAMS 2,4 (mapper 11) 2956B171112843033E608A152DE6297B Metal Fighter (U) NES board=Discrete_74x377;mirror=V;PRG=2;CHR=4