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

NES Core - implement Hard Reset, currently crashes though

This commit is contained in:
adelikat 2012-11-06 00:40:51 +00:00
parent aba91a6a73
commit 5764b222ab
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,6 +188,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
}
bool resetSignal;
bool hardResetSignal;
public void FrameAdvance(bool render, bool rendersound)
{
lagged = true;
@ -198,11 +199,16 @@ namespace BizHawk.Emulation.Consoles.Nintendo
apu.NESSoftReset();
//need to study what happens to ppu and apu and stuff..
}
else if (hardResetSignal)
{
HardReset();
}
Controller.UpdateControls(Frame++);
//if (resetSignal)
//Controller.UnpressButton("Reset"); TODO fix this
resetSignal = Controller["Reset"];
hardResetSignal = Controller["Power"];
if (board is FDS)
{

2
BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs
View File

@ -230,7 +230,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
{
Name = "NES Controller",
BoolButtons = {
"P1 Up", "P1 Down", "P1 Left", "P1 Right", "P1 Select", "P1 Start", "P1 B", "P1 A", "Reset",
"P1 Up", "P1 Down", "P1 Left", "P1 Right", "P1 Select", "P1 Start", "P1 B", "P1 A", "Reset", "Power",
"P2 Up", "P2 Down", "P2 Left", "P2 Right", "P2 Select", "P2 Start", "P2 B", "P2 A"
}
};

2
BizHawk.MultiClient/MainForm.MenuItems.cs
View File

@ -412,7 +412,7 @@ namespace BizHawk.MultiClient
private void controllersToolStripMenuItem_Click(object sender, EventArgs e)
{
if (false)
if (true)
{
ControllerConfig c = new ControllerConfig();
c.ShowDialog();