ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nes: misc blah

This commit is contained in:
goyuken 2014-04-09 22:23:19 +00:00
parent 8c7b1da678
commit 29475fb24d
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TxROM.cs
View File

@ -66,10 +66,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
AssertBattery(false);
break;
case "NES-TKROM": //kirby's adventure
case "NES-TKEPROM": // kirby's adventure (proto)
case "HVC-TKROM": //Akuma No Shoutaijou (J)
AssertPrg(128, 256, 512); AssertChr(128, 256); AssertVram(0); AssertWram(8);
break;
case "NES-TKEPROM": // kirby's adventure (proto)
AssertPrg(128, 256, 512); AssertChr(128, 256); AssertVram(0); AssertWram(0, 8);
break;
case "NES-TLROM": //mega man 3
case "KONAMI-TLROM": //Super C
case "HVC-TLROM": //8 eyes (J)

14
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs
View File

@ -599,15 +599,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
}
if (boardType == null)
{
try
{
boardType = FindBoard(iNesHeaderInfo, origin, InitialMapperRegisterValues);
}
catch {}
choice = iNesHeaderInfo; // we're out of options, really
boardType = FindBoard(iNesHeaderInfo, origin, InitialMapperRegisterValues);
if (boardType == null)
LoadWriteLine("Failed to load as iNES V1");
else
choice = iNesHeaderInfo;
// do not further meddle in wram sizes. a board that is being loaded from a "MAPPERxxx"
// entry should know and handle the situation better for the individual board
@ -621,7 +616,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
//find a INESBoard to handle this
boardType = FindBoard(choice, origin, InitialMapperRegisterValues);
if (choice != null)
boardType = FindBoard(choice, origin, InitialMapperRegisterValues);
else
throw new Exception("Unable to detect ROM");
if (boardType == null)
throw new Exception("No class implements the necessary board type: " + choice.board_type);