diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs index 92452c7df0..3c9140dda4 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs @@ -308,6 +308,8 @@ namespace BizHawk.Emulation.Consoles.Nintendo case "HVC-SNROM": AssertPrg(128, 256); AssertChr(0); AssertVram(8); AssertWram(8); break; + case "SxROM-JUNK": + break; default: return false; } diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/iNES.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/iNES.cs index b966856120..baf78c2836 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/iNES.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/iNES.cs @@ -24,10 +24,12 @@ namespace BizHawk.Emulation.Consoles.Nintendo { //if it didnt work, try again with a different wram size. because iNES is weird that way key = string.Format("{0} {1} {2} {3} {4}", cartInfo.mapper, cartInfo.prg_size, cartInfo.chr_size, 8, cartInfo.vram_size); - Table.TryGetValue(key, out board); - //if it still didnt work, look for one with empty keys, to detect purely based on mapper - key = string.Format("{0} {1} {2} {3} {4}", cartInfo.mapper, -1,-1,-1,-1); - Table.TryGetValue(key, out board); + if (!Table.TryGetValue(key, out board)) + { + //if it still didnt work, look for one with empty keys, to detect purely based on mapper + key = string.Format("{0} {1} {2} {3} {4}", cartInfo.mapper, -1, -1, -1, -1); + Table.TryGetValue(key, out board); + } } return board; } @@ -73,6 +75,7 @@ static string ClassifyTable = @" 0 16 0 8 8 NROM-HOMEBREW; some of blargg's test (sprite tests) 0 16 8 8 0 NES-NROM-128; balloon fight, but its broken right now 0 32 8 8 0 NES-NROM-256; super mario bros +1 32 128 8 0 SxROM-JUNK; 'goodnes' tetris dump 1 32 32 8 0 NES-SEROM; lolo 1 128 0 8 0 NES-SNROM; zelda 1 128 128 8 0 NES-SKROM; zelda 2