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

N64 - oops

This commit is contained in:
adelikat 2014-06-28 12:58:13 +00:00
parent 88d4a2a5a8
commit 9378dc5921
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs
View File

@ -33,6 +33,9 @@ namespace BizHawk.Client.EmuHawk
case LibGPGX.INPUT_DEVICE.DEVICE_MOUSE: case LibGPGX.INPUT_DEVICE.DEVICE_MOUSE:
yield return Mouse(player); yield return Mouse(player);
break; break;
case LibGPGX.INPUT_DEVICE.DEVICE_XE_A1P:
// TO DO
break;
} }
player++; player++;

36
BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
View File

@ -556,24 +556,24 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
{ {
ControllerDefinition.BoolButtons.AddRange(new [] ControllerDefinition.BoolButtons.AddRange(new []
{ {
"P" + (i + 1) + "A Up", "P" + (i + 1) + " A Up",
"P" + (i + 1) + "A Down", "P" + (i + 1) + " A Down",
"P" + (i + 1) + "A Left", "P" + (i + 1) + " A Left",
"P" + (i + 1) + "A Right", "P" + (i + 1) + " A Right",
"P" + (i + 1) + "DPad U", "P" + (i + 1) + " DPad U",
"P" + (i + 1) + "DPad D", "P" + (i + 1) + " DPad D",
"P" + (i + 1) + "DPad L", "P" + (i + 1) + " DPad L",
"P" + (i + 1) + "DPad R", "P" + (i + 1) + " DPad R",
"P" + (i + 1) + "Start", "P" + (i + 1) + " Start",
"P" + (i + 1) + "Z", "P" + (i + 1) + " Z",
"P" + (i + 1) + "B", "P" + (i + 1) + " B",
"P" + (i + 1) + "A", "P" + (i + 1) + " A",
"P" + (i + 1) + "C Up", "P" + (i + 1) + " C Up",
"P" + (i + 1) + "C Down", "P" + (i + 1) + " C Down",
"P" + (i + 1) + "C Right", "P" + (i + 1) + " C Right",
"P" + (i + 1) + "C Left", "P" + (i + 1) + " C Left",
"P" + (i + 1) + "L", "P" + (i + 1) + " L",
"P" + (i + 1) + "R", "P" + (i + 1) + " R",
}); });
ControllerDefinition.FloatControls.AddRange(new[] ControllerDefinition.FloatControls.AddRange(new[]