From 656c6e05859ed02c6417a14d0335b9be7aa73bcb Mon Sep 17 00:00:00 2001 From: zeromus Date: Mon, 2 Feb 2015 22:00:43 +0000 Subject: [PATCH] i knew that was too good to be true --- .../Consoles/Nintendo/N64/N64.ISettable.cs | 2 +- BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64Input.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.ISettable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.ISettable.cs index a7784312c6..48dd513c0f 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.ISettable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.ISettable.cs @@ -58,8 +58,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64 "P" + (i + 1) + " A", "P" + (i + 1) + " C Up", "P" + (i + 1) + " C Down", - "P" + (i + 1) + " C Left", "P" + (i + 1) + " C Right", + "P" + (i + 1) + " C Left", "P" + (i + 1) + " L", "P" + (i + 1) + " R", }); diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64Input.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64Input.cs index c1e1a17d73..b19f2c5bb0 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64Input.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64Input.cs @@ -18,10 +18,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64 Name = "Nintento 64 Controller", BoolButtons = { - "P1 A Up", "P1 A Down", "P1 A Left", "P1 A Right", "P1 DPad U", "P1 DPad D", "P1 DPad L", "P1 DPad R", "P1 Start", "P1 Z", "P1 B", "P1 A", "P1 C Up", "P1 C Down", "P1 C Left", "P1 C Right", "P1 L", "P1 R", - //"P2 A Up", "P2 A Down", "P2 A Left", "P2 A Right", "P2 DPad U", "P2 DPad D", "P2 DPad L", "P2 DPad R", "P2 Start", "P2 Z", "P2 B", "P2 A", "P2 C Up", "P2 C Down", "P2 C Left", "P2 C Right", "P2 L", "P2 R", - //"P3 A Up", "P3 A Down", "P3 A Left", "P3 A Right", "P3 DPad U", "P3 DPad D", "P3 DPad L", "P3 DPad R", "P3 Start", "P3 Z", "P3 B", "P3 A", "P3 C Up", "P3 C Down", "P3 C Left", "P3 C Right", "P3 L", "P3 R", - //"P4 A Up", "P4 A Down", "P4 A Left", "P4 A Right", "P4 DPad U", "P4 DPad D", "P4 DPad L", "P4 DPad R", "P4 Start", "P4 Z", "P4 B", "P4 A", "P4 C Up", "P4 C Down", "P4 C Left", "P4 C Right", "P4 L", "P4 R", + "P1 A Up", "P1 A Down", "P1 A Left", "P1 A Right", "P1 DPad U", "P1 DPad D", "P1 DPad L", "P1 DPad R", "P1 Start", "P1 Z", "P1 B", "P1 A", "P1 C Up", "P1 C Down", "P1 C Right", "P1 C Left", "P1 L", "P1 R", + //"P2 A Up", "P2 A Down", "P2 A Left", "P2 A Right", "P2 DPad U", "P2 DPad D", "P2 DPad L", "P2 DPad R", "P2 Start", "P2 Z", "P2 B", "P2 A", "P2 C Up", "P2 C Down", "P2 C Right", "P2 C Left", "P2 L", "P2 R", + //"P3 A Up", "P3 A Down", "P3 A Left", "P3 A Right", "P3 DPad U", "P3 DPad D", "P3 DPad L", "P3 DPad R", "P3 Start", "P3 Z", "P3 B", "P3 A", "P3 C Up", "P3 C Down", "P3 C Right", "P3 C Left", "P3 L", "P3 R", + //"P4 A Up", "P4 A Down", "P4 A Left", "P4 A Right", "P4 DPad U", "P4 DPad D", "P4 DPad L", "P4 DPad R", "P4 Start", "P4 Z", "P4 B", "P4 A", "P4 C Up", "P4 C Down", "P4 C Right", "P4 C Left", "P4 L", "P4 R", "Reset", "Power" }, FloatControls =