nes: clean up region detect code a bits

This commit is contained in:
goyuken 2012-10-31 18:48:06 +00:00
parent bc22049a19
commit e487e39c9e
1 changed files with 41 additions and 52 deletions

View File

@ -128,11 +128,8 @@ namespace BizHawk.Emulation.Consoles.Nintendo
apu = new APU(this);
if (magicSoundProvider != null) magicSoundProvider.Dispose();
//magicSoundProvider = new MagicSoundProvider(this);
// set up region
if (!string.IsNullOrEmpty(cart.system))
{
switch (cart.system)
{
case "NES-PAL":
@ -165,20 +162,12 @@ namespace BizHawk.Emulation.Consoles.Nintendo
cpu_sequence = cpu_sequence_NTSC;
magicSoundProvider = new MagicSoundProvider(this, 1773448);
break;
case null:
Console.WriteLine("Unknown NES system! Defaulting to NTSC.");
goto case "NES-NTSC";
default:
Console.WriteLine("Unrecognized NES region \"{0}\"! Defaulting to NTSC.");
ppu.region = PPU.Region.NTSC;
cpu_sequence = cpu_sequence_NTSC;
magicSoundProvider = new MagicSoundProvider(this, 1789773);
break;
}
}
else
{
Console.WriteLine("Unknown NES region! Defaulting to NTSC.");
ppu.region = PPU.Region.NTSC;
cpu_sequence = cpu_sequence_NTSC;
magicSoundProvider = new MagicSoundProvider(this, 1789773);
Console.WriteLine("Unrecognized NES system \"{0}\"! Defaulting to NTSC.", cart.system);
goto case "NES-NTSC";
}
//fceux uses this technique, which presumably tricks some games into thinking the memory is randomized