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

NESHawk: move defining controller out of hardreset, fixes loading subneshawk

This commit is contained in:
alyosha-tas 2021-12-09 15:47:49 -05:00
parent 6d81cd30bd
commit 967ef7c995
3 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.Core.cs
View File

@ -88,6 +88,41 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
public bool CanProvideAsync => false; public bool CanProvideAsync => false;
public void ResetControllerDefinition()
{
ControllerDefinition = null;
ControllerDeck = ControllerSettings.Instantiate(ppu.LightGunCallback);
ControllerDefinition = ControllerDeck.ControllerDef;
// controls other than the deck
ControllerDefinition.BoolButtons.Add("Power");
ControllerDefinition.BoolButtons.Add("Reset");
if (Board is FDS b)
{
ControllerDefinition.BoolButtons.Add("FDS Eject");
for (int i = 0; i < b.NumSides; i++)
{
ControllerDefinition.BoolButtons.Add("FDS Insert " + i);
}
}
if (_isVS)
{
ControllerDefinition.BoolButtons.Add("Insert Coin P1");
ControllerDefinition.BoolButtons.Add("Insert Coin P2");
ControllerDefinition.BoolButtons.Add("Service Switch");
}
// Add in the reset timing axis for subneshawk
if (using_reset_timing && ControllerDefinition.Axes.Count == 0)
{
ControllerDefinition.AddAxis("Reset Cycle", 0.RangeTo(500000), 0);
}
ControllerDefinition.MakeImmutable();
}
public void SetSyncMode(SyncSoundMode mode) public void SetSyncMode(SyncSoundMode mode)
{ {
if (mode != SyncSoundMode.Sync) if (mode != SyncSoundMode.Sync)
@ -145,40 +180,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
ram = new byte[0x800]; ram = new byte[0x800];
CIRAM = new byte[0x800]; CIRAM = new byte[0x800];
// set controller definition first time only
if (ControllerDefinition == null)
{
ControllerDeck = ControllerSettings.Instantiate(ppu.LightGunCallback); // this assignment was outside the conditional for some reason? --yoshi
ControllerDefinition = ControllerDeck.ControllerDef;
// controls other than the deck
ControllerDefinition.BoolButtons.Add("Power");
ControllerDefinition.BoolButtons.Add("Reset");
if (Board is FDS b)
{
ControllerDefinition.BoolButtons.Add("FDS Eject");
for (int i = 0; i < b.NumSides; i++)
{
ControllerDefinition.BoolButtons.Add("FDS Insert " + i);
}
}
if (_isVS)
{
ControllerDefinition.BoolButtons.Add("Insert Coin P1");
ControllerDefinition.BoolButtons.Add("Insert Coin P2");
ControllerDefinition.BoolButtons.Add("Service Switch");
}
}
// Add in the reset timing axis for subneshawk
if (using_reset_timing && ControllerDefinition.Axes.Count == 0)
{
ControllerDefinition.AddAxis("Reset Cycle", 0.RangeTo(500000), 0);
}
ControllerDefinition.MakeImmutable();
// don't replace the magicSoundProvider on reset, as it's not needed // don't replace the magicSoundProvider on reset, as it's not needed
// if (magicSoundProvider != null) magicSoundProvider.Dispose(); // if (magicSoundProvider != null) magicSoundProvider.Dispose();

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

@ -70,6 +70,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
ser.Register(reader); ser.Register(reader);
} }
} }
ResetControllerDefinition();
} }
private static readonly bool USE_DATABASE = true; private static readonly bool USE_DATABASE = true;

3
src/BizHawk.Emulation.Cores/Consoles/Nintendo/SubNESHawk/SubNESHawk.cs
View File

@ -19,6 +19,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.SubNESHawk
using_reset_timing = true using_reset_timing = true
}; };
// Adds Reset timing control to controller definition
_nesCore.ResetControllerDefinition();
HardReset(); HardReset();
current_cycle = 0; current_cycle = 0;
_nesCore.cpu.ext_ppu_cycle = current_cycle; _nesCore.cpu.ext_ppu_cycle = current_cycle;