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

nes hard reset no longer crashes. instead, certain sound channels stop playing (?)

This commit is contained in:
goyuken 2012-11-06 01:41:22 +00:00
parent 7110cf928b
commit e06a9218b8
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs
View File

@ -131,7 +131,8 @@ namespace BizHawk.Emulation.Consoles.Nintendo
ports[1] = new JoypadPortDevice(this, 1); ports[1] = new JoypadPortDevice(this, 1);
apu = new APU(this); apu = new APU(this);
if (magicSoundProvider != null) magicSoundProvider.Dispose(); // don't replace the magicSoundProvider on reset, as it's not needed
// if (magicSoundProvider != null) magicSoundProvider.Dispose();
// set up region // set up region
switch (cart.system) switch (cart.system)
@ -143,20 +144,23 @@ namespace BizHawk.Emulation.Consoles.Nintendo
CoreOutputComm.VsyncNum = 50; CoreOutputComm.VsyncNum = 50;
CoreOutputComm.VsyncDen = 1; CoreOutputComm.VsyncDen = 1;
cpu_sequence = cpu_sequence_PAL; cpu_sequence = cpu_sequence_PAL;
magicSoundProvider = new MagicSoundProvider(this, 1662607); if (magicSoundProvider == null)
magicSoundProvider = new MagicSoundProvider(this, 1662607);
break; break;
case "NES-NTSC": case "NES-NTSC":
case "Famicom": case "Famicom":
ppu.region = PPU.Region.NTSC; ppu.region = PPU.Region.NTSC;
cpu_sequence = cpu_sequence_NTSC; cpu_sequence = cpu_sequence_NTSC;
magicSoundProvider = new MagicSoundProvider(this, 1789773); if (magicSoundProvider == null)
magicSoundProvider = new MagicSoundProvider(this, 1789773);
break; break;
// there's no official name for these in bootgod, not sure what we should use // there's no official name for these in bootgod, not sure what we should use
//case "PC10"://TODO //case "PC10"://TODO
case "VS": case "VS":
ppu.region = PPU.Region.RGB; ppu.region = PPU.Region.RGB;
cpu_sequence = cpu_sequence_NTSC; cpu_sequence = cpu_sequence_NTSC;
magicSoundProvider = new MagicSoundProvider(this, 1789773); if (magicSoundProvider == null)
magicSoundProvider = new MagicSoundProvider(this, 1789773);
vs_io = true; vs_io = true;
break; break;
// this is in bootgod, but not used at all // this is in bootgod, but not used at all
@ -165,7 +169,8 @@ namespace BizHawk.Emulation.Consoles.Nintendo
CoreOutputComm.VsyncNum = 50; CoreOutputComm.VsyncNum = 50;
CoreOutputComm.VsyncDen = 1; CoreOutputComm.VsyncDen = 1;
cpu_sequence = cpu_sequence_NTSC; cpu_sequence = cpu_sequence_NTSC;
magicSoundProvider = new MagicSoundProvider(this, 1773448); if (magicSoundProvider == null)
magicSoundProvider = new MagicSoundProvider(this, 1773448);
break; break;
case null: case null:
Console.WriteLine("Unknown NES system! Defaulting to NTSC."); Console.WriteLine("Unknown NES system! Defaulting to NTSC.");