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

Get VS Zapper working 

Now Duck Hunt and Gumshoe work, and other VS Zapper games hsould as well.
Hurray!
This commit is contained in:
alyosha-tas 2016-10-31 22:09:26 -04:00 committed by GitHub
parent 88589cb59b
commit d1b1f1a5ac
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NESControllers.cs
View File

@ -607,6 +607,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
/// </summary /// </summary
public Func<int, int, bool> PPUCallback { get; set; } public Func<int, int, bool> PPUCallback { get; set; }
bool resetting = false;
uint latchedvalue = 0;
static ControllerDefinition Definition = new ControllerDefinition static ControllerDefinition Definition = new ControllerDefinition
{ {
BoolButtons = { "0Fire" }, BoolButtons = { "0Fire" },
@ -614,18 +617,34 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
FloatRanges = { new[] { 0.0f, 128.0f, 255.0f }, new[] { 0.0f, 120.0f, 239.0f } } FloatRanges = { new[] { 0.0f, 128.0f, 255.0f }, new[] { 0.0f, 120.0f, 239.0f } }
}; };
void Latch(IController c)
{
byte ret = 0;
if (c["0Fire"])
ret |= 0x80;
if (PPUCallback((int)c.GetFloat("0Zapper X"), (int)c.GetFloat("0Zapper Y")))
ret |= 0x40;
ret |= 0x10; // always 1
latchedvalue = ret;
latchedvalue |= 0xFFFFFF00;
}
public void Strobe(StrobeInfo s, IController c) public void Strobe(StrobeInfo s, IController c)
{ {
resetting = s.OUT0 != 0;
if (s.OUT0 < s.OUT0old)
Latch(c);
} }
// NES controller port interface // NES controller port interface
public byte Read(IController c) public byte Read(IController c)
{ {
byte ret = 0; if (resetting)
if (c["0Fire"]) Latch(c);
ret |= 0x10; byte ret = (byte)(latchedvalue & 1);
if (!PPUCallback((int)c.GetFloat("0Zapper X"), (int)c.GetFloat("0Zapper Y"))) if (!resetting)
ret |= 0x08; latchedvalue >>= 1; // ASR not LSR, so endless stream of 1s after data
return ret; return ret;
} }
@ -636,6 +655,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
public void SyncState(Serializer ser) public void SyncState(Serializer ser)
{ {
ser.Sync("restting", ref resetting);
ser.Sync("latchedvalue", ref latchedvalue);
} }
// famicom expansion hookups // famicom expansion hookups