diff --git a/BizHawk.Emulation/Consoles/Nintendo/GBA/Meteor.cs b/BizHawk.Emulation/Consoles/Nintendo/GBA/Meteor.cs index 502af50c67..ffa8b9fe88 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/GBA/Meteor.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/GBA/Meteor.cs @@ -13,7 +13,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo.GBA Name = "GBA Controller", BoolButtons = { - "Up", "Down", "Left", "Right", "Select", "Start", "B", "A", "L", "R", "Power" + "Up", "Down", "Left", "Right", "Start", "Select", "B", "A", "L", "R", "Power" } }; public ControllerDefinition ControllerDefinition { get { return GBAController; } } diff --git a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs b/BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs index 9d0245f35f..b819c85a39 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs @@ -102,7 +102,7 @@ namespace BizHawk.Emulation.Consoles.GB Name = "Gameboy Controller", BoolButtons = { - "Up", "Down", "Left", "Right", "A", "B", "Select", "Start", "Power" + "Up", "Down", "Left", "Right", "Start", "Select", "B", "A", "Power" } }; diff --git a/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs b/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs index fe6e20d0a1..e4937f7175 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs @@ -37,10 +37,10 @@ namespace BizHawk.Emulation.Consoles.Nintendo.N64 Name = "Nintento 64 Controller", BoolButtons = { - "P1 DPad R", "P1 DPad L", "P1 DPad D", "P1 DPad U", "P1 Start", "P1 Z", "P1 B", "P1 A", "P1 C Right", "P1 C Left", "P1 C Down", "P1 C Up", "P1 R", "P1 L", "P1 A Up", "P1 A Down", "P1 A Left", "P1 A Right", - "P2 DPad R", "P2 DPad L", "P2 DPad D", "P2 DPad U", "P2 Start", "P2 Z", "P2 B", "P2 A", "P2 C Right", "P2 C Left", "P2 C Down", "P2 C Up", "P2 R", "P2 L", "P2 A Up", "P2 A Down", "P2 A Left", "P2 A Right", - "P3 DPad R", "P3 DPad L", "P3 DPad D", "P3 DPad U", "P3 Start", "P3 Z", "P3 B", "P3 A", "P3 C Right", "P3 C Left", "P3 C Down", "P3 C Up", "P3 R", "P3 L", "P3 A Up", "P3 A Down", "P3 A Left", "P3 A Right", - "P4 DPad R", "P4 DPad L", "P4 DPad D", "P4 DPad U", "P4 Start", "P4 Z", "P4 B", "P4 A", "P4 C Right", "P4 C Left", "P4 C Down", "P4 C Up", "P4 R", "P4 L", "P4 A Up", "P4 A Down", "P4 A Left", "P4 A Right", + "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 = diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs index 9144146790..bc5e7415c1 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs @@ -273,8 +273,8 @@ 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", "Power", - "P2 Up", "P2 Down", "P2 Left", "P2 Right", "P2 Select", "P2 Start", "P2 B", "P2 A" + "P1 Up", "P1 Down", "P1 Left", "P1 Right", "P1 Start", "P1 Select", "P1 B", "P1 A", "Reset", "Power", + "P2 Up", "P2 Down", "P2 Left", "P2 Right", "P2 Start", "P2 Select", "P2 B", "P2 A" } }; diff --git a/BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs b/BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs index ae152e15ce..489cc0ea2f 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs @@ -517,10 +517,11 @@ namespace BizHawk.Emulation.Consoles.Nintendo.SNES { Name = "SNES Controller", BoolButtons = { - "P1 Up", "P1 Down", "P1 Left", "P1 Right", "P1 Select", "P1 Start", "P1 B", "P1 A", "P1 X", "P1 Y", "P1 L", "P1 R", "Reset", "Power", - "P2 Up", "P2 Down", "P2 Left", "P2 Right", "P2 Select", "P2 Start", "P2 B", "P2 A", "P2 X", "P2 Y", "P2 L", "P2 R", - "P3 Up", "P3 Down", "P3 Left", "P3 Right", "P3 Select", "P3 Start", "P3 B", "P3 A", "P3 X", "P3 Y", "P3 L", "P3 R", - "P4 Up", "P4 Down", "P4 Left", "P4 Right", "P4 Select", "P4 Start", "P4 B", "P4 A", "P4 X", "P4 Y", "P4 L", "P4 R", + "Reset", "Power", + "P1 Up", "P1 Down", "P1 Left", "P1 Right", "P1 Select", "P1 Start", "P1 Y", "P1 X", "P1 B", "P1 A", "P1 L", "P1 R", + "P2 Up", "P2 Down", "P2 Left", "P2 Right", "P2 Select", "P2 Start", "P2 Y", "P2 X", "P2 B", "P2 A", "P2 L", "P2 R", + "P3 Up", "P3 Down", "P3 Left", "P3 Right", "P3 Select", "P3 Start", "P3 Y", "P3 X", "P3 B", "P3 A", "P3 L", "P3 R", + "P4 Up", "P4 Down", "P4 Left", "P4 Right", "P4 Select", "P4 Start", "P4 Y", "P4 X", "P4 B", "P4 A", "P4 L", "P4 R", } }; diff --git a/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs b/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs index a4b1e65ff3..82b427435a 100644 --- a/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs +++ b/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs @@ -133,7 +133,7 @@ namespace BizHawk.MultiClient for (int i = 0; i < buttons.Count; i++) { y += Spacing; - if (y > (_panelSize.Height - 23)) + if (y > (_panelSize.Height)) { y = MarginTop; x += ColumnWidth; diff --git a/BizHawk.MultiClient/output/defctrl.json b/BizHawk.MultiClient/output/defctrl.json index 814d2b2753..06625964e5 100644 --- a/BizHawk.MultiClient/output/defctrl.json +++ b/BizHawk.MultiClient/output/defctrl.json @@ -1,44 +1,12 @@ { "AllTrollers": { - "Atari 2600 Basic Controller": { - "Reset": "", - "Select": "", - "P1 Up": "UpArrow, X1 DpadUp, X1 LStickUp", - "P1 Down": "DownArrow, X1 DpadDown, X1 LStickDown", - "P1 Left": "LeftArrow, X1 DpadLeft, X1 LStickLeft", - "P1 Right": "RightArrow, X1 DpadRight, X1 LStickRight", - "P1 Button": "Z, X1 A", - "P2 Up": "", - "P2 Down": "", - "P2 Left": "", - "P2 Right": "", - "P2 Button": "", - }, - "Atari 7800 ProLine Joystick Controller": { - "Power": "", - "Reset": "", - "Select": "", - "Pause": "", - "P1 Up": "UpArrow, X1 DpadUp, X1 LStickUp", - "P1 Down": "DownArrow, X1 DpadDown, X1 LStickDown", - "P1 Left": "LeftArrow, X1 DpadLeft, X1 LStickLeft", - "P1 Right": "RightArrow, X1 DpadRight, X1 LStickRight", - "P1 Trigger 1": "Z, X1 A", - "P1 Trigger 2": "X, X1 X", - "P2 Up": "", - "P2 Down": "", - "P2 Left": "", - "P2 Right": "", - "P2 Trigger 1": "", - "P2 Trigger 2": "", - }, - "NES Controller": { - "P1 Up": "UpArrow, X1 DpadUp, X1 LStickUp", - "P1 Down": "DownArrow, X1 DpadDown, X1 LStickDown", - "P1 Left": "LeftArrow, X1 DpadLeft, X1 LStickLeft", - "P1 Right": "RightArrow, X1 DpadRight, X1 LStickRight", - "P1 Select": "Space, X1 Back", - "P1 Start": "Return, X1 Start", + "NES Controller": { + "P1 Up": "UpArrow,J1 POV1U, X1 DpadUp, X1 LStickUp", + "P1 Down": "DownArrow,J1 POV1D, X1 DpadDown, X1 LStickDown", + "P1 Left": "LeftArrow,J1 POV1L, X1 DpadLeft, X1 LStickLeft", + "P1 Right": "RightArrow,J1 POV1R, X1 DpadRight, X1 LStickRight", + "P1 Start": "Return, J1 B10, X1 Start", + "P1 Select": "Space, J1 B9, X1 Back", "P1 B": "X, X1 B", "P1 A": "Z, X1 A", "Reset": "", @@ -47,48 +15,48 @@ "P2 Down": "", "P2 Left": "", "P2 Right": "", + "P2 Start": "", + "P2 Select": "", + "P2 B": "", + "P2 A": "" + }, + "SNES Controller": { + "Reset": "", + "Power": "", + "P1 Up": "UpArrow,J1 POV1U, X1 DpadUp, X1 LStickUp", + "P1 Down": "DownArrow,J1 POV1D, X1 DpadDown, X1 LStickDown", + "P1 Left": "LeftArrow,J1 POV1L, X1 DpadLeft, X1 LStickLeft", + "P1 Right": "RightArrow,J1 POV1R, X1 DpadRight, X1 LStickRight", + "P1 Select": "Space, J9, X1 Back", + "P1 Start": "Return, J10, X1 Start", + "P1 Y": "A, J1 B1, X1 X", + "P1 X": "S, J1 B4, X1 Y", + "P1 B": "X, J1 B2, X1 B", + "P1 A": "Z, J1 B3, X1 A", + "P1 L": "W, J1 B5, X1 Left Trigger", + "P1 R": "E, J1 B6, X1 Right Trigger", + "P2 Up": "", + "P2 Down": "", + "P2 Left": "", + "P2 Right": "", "P2 Select": "", "P2 Start": "", + "P2 Y": "", + "P2 X": "", "P2 B": "", - "P2 A": "" - }, - "SNES Controller": { - "P1 Up": "UpArrow, X1 DpadUp, X1 LStickUp", - "P1 Down": "DownArrow, X1 DpadDown, X1 LStickDown", - "P1 Left": "LeftArrow, X1 DpadLeft, X1 LStickLeft", - "P1 Right": "RightArrow, X1 DpadRight, X1 LStickRight", - "P1 Select": "Space, X1 Back", - "P1 Start": "Return, X1 Start", - "P1 B": "X, X1 B", - "P1 A": "Z, X1 A", - "P1 X": "S, X1 Y", - "P1 Y": "A, X1 X", - "P1 L": "W, X1 Left Trigger", - "P1 R": "E, X1 Right Trigger", - "Reset": "", - "Power": "", + "P2 A": "", + "P2 L": "", + "P2 R": "", "P3 Up": "", "P3 Down": "", "P3 Left": "", "P3 Right": "", "P3 Select": "", "P3 Start": "", + "P3 Y": "", + "P3 X": "", "P3 B": "", "P3 A": "", - "P3 X": "", - "P3 Y": "", - "P3 L": "", - "P3 R": "", - "P3 Up": "", - "P3 Down": "", - "P3 Left": "", - "P3 Right": "", - "P3 Select": "", - "P3 Start": "", - "P3 B": "", - "P3 A": "", - "P3 X": "", - "P3 Y": "", "P3 L": "", "P3 R": "", "P4 Up": "", @@ -97,43 +65,159 @@ "P4 Right": "", "P4 Select": "", "P4 Start": "", + "P4 Y": "", + "P4 X": "", "P4 B": "", "P4 A": "", - "P4 X": "", - "P4 Y": "", "P4 L": "", "P4 R": "", }, + "Nintento 64 Controller": { + "P1 X Axis": "J1 X", + "P1 Y Axis": "J1 Y", + "P1 A Up": "UpArrow, J1 POV1U, X1 DpadUp, X1 LStickUp", + "P1 A Down": "DownArrow, J1 POV1D, X1 DpadDown, X1 LStickDown", + "P1 A Left": "LeftArrow, J1 POV1L, X1 DpadLeft, X1 LStickLeft", + "P1 A Right": "RightArrow, J1 POV1R, X1 DpadRight, X1 LStickRight", + "P1 DPad U": "", + "P1 DPad D": "", + "P1 DPad L": "", + "P1 DPad R": "", + "P1 Start": "Return, J1 B10, X1 Start", + "P1 Z": "D, J1 B3", + "P1 B": "S, J1 B1, X1 B", + "P1 A": "A, J1 B2, X1 A", + "P1 C Up": "NumberPad8, J1 RotationZ-", + "P1 C Down": "NumberPad2, J1 RotationZ+", + "P1 C Left": "NumberPad4, J1 Z-", + "P1 C Right": "NumberPad6, J1 Z+", + "P1 L": "Q, J1 B5", + "P1 R": "W, J1 B6", + "P2 X Axis": "", + "P2 Y Axis": "", + "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 X Axis": "", + "P3 Y Axis": "", + "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 X Axis": "", + "P4 Y Axis": "", + "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": "", + "Reset": "", + "Power": "" + }, "Gameboy Controller": { - "Up": "UpArrow, X1 DpadUp, X1 LStickUp", - "Down": "DownArrow, X1 DpadDown, X1 LStickDown", - "Left": "LeftArrow, X1 DpadLeft, X1 LStickLeft", - "Right": "RightArrow, X1 DpadRight, X1 LStickRight", - "A": "X, X1 B", - "B": "Z, X1 A", - "Select": "Space, X1 Back", - "Start": "Return, X1 Start", + "Up": "UpArrow, J1 POV1U, X1 DpadUp, X1 LStickUp", + "Down": "DownArrow, J1 POV1D, X1 DpadDown, X1 LStickDown", + "Left": "LeftArrow, J1 POV1L, X1 DpadLeft, X1 LStickLeft", + "Right": "RightArrow, J1 POV1R, X1 DpadRight, X1 LStickRight", + "Start": "Return, J1 B10, X1 Start", + "Select": "Space, J1 B9, X1 Back", + "B": "Z, J1 B1, X1 B", + "A": "X, J1 B2, X1 A", "Power": "", }, "GBAController": { - "Up": "UpArrow, X1 DpadUp, X1 LStickUp", - "Down": "DownArrow, X1 DpadDown, X1 LStickDown", - "Left": "LeftArrow, X1 DpadLeft, X1 LStickLeft", - "Right": "RightArrow, X1 DpadRight, X1 LStickRight", - "A": "X, X1 B", - "B": "Z, X1 A", - "Start": "Return, X1 Start", - "Select": "Space, X1 Back", - "L": "W, X1 LeftTrigger", - "R": "E, X1 RightTrigger", + "Up": "UpArrow, J1 POV1U, X1 DpadUp, X1 LStickUp", + "Down": "DownArrow, J1 POV1D, X1 DpadDown, X1 LStickDown", + "Left": "LeftArrow, J1 POV1L, X1 DpadLeft, X1 LStickLeft", + "Right": "RightArrow, J1 POV1R, X1 DpadRight, X1 LStickRight", + "Start": "Return, J1 B10, X1 Start", + "Select": "Space, J1 B9, X1 Back", + "B": "Z, X1 B", + "A": "X, X1 A", + "L": "W, J1 B5, X1 LeftTrigger", + "R": "E, J1 B6, X1 RightTrigger", "Power": "", }, + "Atari 2600 Basic Controller": { + "Reset": "", + "Select": "", + "P1 Up": "UpArrow, J1 POV1U, X1 DpadUp, X1 LStickUp", + "P1 Down": "DownArrow, J1 POV1D, X1 DpadDown, X1 LStickDown", + "P1 Left": "LeftArrow,J1 POV1L, X1 DpadLeft, X1 LStickLeft", + "P1 Right": "RightArrow,J1 POV1R, X1 DpadRight, X1 LStickRight", + "P1 Button": "Z, J1 B1, X1 A", + "P2 Up": "NumberPad8, J1 RotationZ-", + "P2 Down": "NumberPad2, J1 RotationZ+", + "P2 Left": "NumberPad4, J1 Z-", + "P2 Right": "NumberPad6, J1 Z+", + "P2 Button": "NumberPad1, J1 B4", + }, + "Atari 7800 ProLine Joystick Controller": { + "Power": "", + "Reset": "", + "Select": "", + "Pause": "", + "P1 Up": "UpArrow, J1 POV1U, X1 DpadUp, X1 LStickUp", + "P1 Down": "DownArrow, J1 POV1D X1 DpadDown, X1 LStickDown", + "P1 Left": "LeftArrow, J1 POV1L X1 DpadLeft, X1 LStickLeft", + "P1 Right": "RightArrow, J1 POV1R X1 DpadRight, X1 LStickRight", + "P1 Trigger 1": "Z, J1 B1, X1 A", + "P1 Trigger 2": "X, J1 B1, X1 X", + "P2 Up": "NumberPad8, J1 RotationZ-", + "P2 Down": "NumberPad2, J1 RotationZ+", + "P2 Left": "NumberPad4, J1 Z-", + "P2 Right": "NumberPad6, J1 Z+", + "P2 Trigger 1": "NumberPad1, J1 B4", + "P2 Trigger 2": "NumberPad3, B1 B3", + }, "Commodore 64 Controller": { - "P1 Up": "NumberPad8, X1 DpadUp, X1 LStickUp", - "P1 Down": "NumberPad2, X1 DpadDown, X1 LStickDown", - "P1 Left": "NumberPad4, X1 DpadLeft, X1 LStickLeft", - "P1 Right": "NumberPad6, X1 DpadRight, X1 LStickRight", - "P1 Button": "NumberPad8, X1 A", + "P1 Up": "NumberPad8, J1 POV1U, X1 DpadUp, X1 LStickUp", + "P1 Down": "NumberPad2, J1 POV1D X1 DpadDown, X1 LStickDown", + "P1 Left": "NumberPad4, J1 POV1L X1 DpadLeft, X1 LStickLeft", + "P1 Right": "NumberPad6, J1 POV1R X1 DpadRight, X1 LStickRight", + "P1 Button": "NumberPad1, J1 B1, X1 A", "P2 Up": "", "P2 Down": "", "P2 Left": "", @@ -208,12 +292,12 @@ "Key Space": "Space", }, "Intellivision Controller": { - "P1 Up": "UpArrow, X1 DpadUp", - "P1 Down": "DownArrow, X1 DpadDown", - "P1 Left": "LeftArrow, X1 DpadLeft", - "P1 Right": "RightArrow, X1 DpadRight", - "P1 L": "Z, J1 B1", - "P1 R": "X, J1 B2", + "P1 Up": "UpArrow, J1 POV1U, X1 DpadUp, X1 LStickUp", + "P1 Down": "DownArrow, J1 POV1D, X1 DpadDown, X1 LStickDown", + "P1 Left": "LeftArrow, J1 POV1L, X1 DpadLeft, X1 LStickLeft", + "P1 Right": "RightArrow, J1 POV1R, X1 DpadRight, X1 LStickRight", + "P1 L": "Z, J1 B1, X1 B", + "P1 R": "X, J1 B2, X1 A", "P1 Key0": "NumberPad0", "P1 Key1": "NumberPad1", "P1 Key2": "NumberPad2", @@ -248,17 +332,17 @@ "Saturn Controller": { "Power": "", "Reset": "", - "P1 Up": "UpArrow, X1 DpadUp, X1 LStickUp", - "P1 Down": "DownArrow, X1 DpadDown, X1 LStickDown", - "P1 Left": "LeftArrow, X1 DpadLeft, X1 LStickLeft", - "P1 Right": "RightArrow, X1 DpadRight, X1 LStickRight", + "P1 Up": "UpArrow, J1 POV1U, X1 DpadUp, X1 LStickUp", + "P1 Down": "DownArrow, J1 POV1D, X1 DpadDown, X1 LStickDown", + "P1 Left": "LeftArrow, J1 POV1L, X1 DpadLeft, X1 LStickLeft", + "P1 Right": "RightArrow, J1 POV1R, X1 DpadRight, X1 LStickRight", "P1 Start": "Return, X1 Start", - "P1 Z": "A", - "P1 Y": "S", - "P1 X": "D", - "P1 C": "Z", - "P1 B": "X", - "P1 A": "C", + "P1 X": "D, J1 B4", + "P1 Y": "S, J1 B5", + "P1 Z": "A, J1 B6", + "P1 A": "C, J1 B1", + "P1 B": "X, J1 B2", + "P1 C": "Z, J1 B5", "P1 L": "Q", "P1 R": "W", "P2 Up": "", @@ -278,14 +362,14 @@ "PC Engine Controller": { "Reset": "", "Power": "", - "P1 Up": "UpArrow, X1 DpadUp, X1 LStickUp", - "P1 Down": "DownArrow, X1 DpadDown, X1 LStickDown", - "P1 Left": "LeftArrow, X1 DpadLeft, X1 LStickLeft", - "P1 Right": "RightArrow, X1 DpadRight, X1 LStickRight", - "P1 B1": "Z, X1 B", - "P1 B2": "X, X1 A", - "P1 Select": "V, X1 Back", - "P1 Run": "C, X1 Start", + "P1 Up": "UpArrow, J1 POV1U, X1 DpadUp, X1 LStickUp", + "P1 Down": "DownArrow, J1 POV1D, X1 DpadDown, X1 LStickDown", + "P1 Left": "LeftArrow, J1 POV1L, X1 DpadLeft, X1 LStickLeft", + "P1 Right": "RightArrow, J1 POV1R, X1 DpadRight, X1 LStickRight", + "P1 B2": "X, J1 B1, X1 A", + "P1 B1": "Z, J1 B2, X1 B", + "P1 Select": "V, J1 B9, X1 Back", + "P1 Run": "C, X1 J1 B10, X1 Start", "P2 Up": "", "P2 Down": "", "P2 Left": "", @@ -320,12 +404,12 @@ "P5 Run": "", }, "ColecoVision Basic Controller": { - "P1 Up": "UpArrow, X1 DpadUp, X1 LStickUp", - "P1 Down": "DownArrow, X1 DpadDown, X1 LStickDown", - "P1 Left": "LeftArrow, X1 DpadLeft, X1 LStickLeft", - "P1 Right": "RightArrow, X1 DpadRight, X1 LStickRight", + "P1 Up": "UpArrow, J1 POV1U, X1 DpadUp, X1 LStickUp", + "P1 Down": "DownArrow, J1 POV1D, X1 DpadDown, X1 LStickDown", + "P1 Left": "LeftArrow, J1 POV1L, X1 DpadLeft, X1 LStickLeft", + "P1 Right": "RightArrow, J1 POV1R, X1 DpadRight, X1 LStickRight", "P1 L": "Z, J1 B1", - "P1 R": "X, J1 B1", + "P1 R": "X, J1 B2", "P1 Key1": "NumberPad1", "P1 Key2": "NumberPad2", "P1 Key3": "NumberPad3", @@ -362,8 +446,8 @@ "P1 Down": "DownArrow, X1 DpadDown, X1 LStickDown", "P1 Left": "LeftArrow, X1 DpadLeft, X1 LStickLeft", "P1 Right": "RightArrow, X1 DpadRight, X1 LStickRight", - "P1 B1": "Z, X1 A", - "P1 B2": "X, X1 B", + "P1 B1": "Z, J1 B1, X1 B", + "P1 B2": "X, J1 B2, X1 A", "Reset": "", "Pause": "", "P2 Up": "", @@ -374,24 +458,24 @@ "P2 B2": "", }, "Dual Gameboy Controller": { - "P1_Up": "UpArrow, X1 DpadUp, X1 LStickUp", - "P1_Down": "DownArrow, X1 DpadDown, X1 LStickDown", - "P1_Left": "LeftArrow, X1 DpadLeft, X1 LStickLeft", - "P1_Right": "RightArrow, X1 DpadRight, X1 LStickRight", - "P1_A": "X, X1 B", - "P1_B": "Z, X1 A", - "P1_Select": "Space, X1 Back", - "P1_Start": "Return, X1 Start", - "P1_Power": "", - "P2_Up": "NumberPad8", - "P2_Down": "NumberPad2", - "P2_Left": "NumberPad4", - "P2_Right": "NumberPad6", - "P2_A": "C", - "P2_B": "V", - "P2_Select": "", - "P2_Start": "", - "P2_Power": "" + "P1 Up": "UpArrow, J1 POV1U, X1 DpadUp, X1 LStickUp", + "P1 Down": "DownArrow, J1 POV1D, X1 DpadDown, X1 LStickDown", + "P1 Left": "LeftArrow, J1 POV1L, X1 DpadLeft, X1 LStickLeft", + "P1 Right": "RightArrow, J1 POV1R, X1 DpadRight, X1 LStickRight", + "P1 Start": "Return, J1 B9, X1 Start", + "P1 Select": "Space, J1 B10, X1 Back", + "P1 B": "Z, J1 B1, X1 A", + "P1 A": "X, J1 B2, X1 B", + "P1 Power": "", + "P2 Up": "NumberPad8", + "P2 Down": "NumberPad2", + "P2 Left": "NumberPad4", + "P2 Right": "NumberPad6", + "P2 Start": "", + "P2 Select": "", + "P2 B": "V, J1 B4", + "P2 A": "C, J1 B3", + "P2 Power": "" }, "Null Controller": {}, "TI83 Controller": { @@ -446,66 +530,6 @@ "DEL": "Delete", "COMMA": "Comma", }, - "Nintento 64 Controller": { - "P1 DPad R": "RightArrow, X1 DpadRight, X1 LStickRight", - "P1 DPad L": "LeftArrow, X1 DpadLeft, X1 LStickLeft", - "P1 DPad D": "DownArrow, X1 DpadDown, X1 LStickDown", - "P1 DPad U": "UpArrow, X1 DpadUp, X1 LStickUp", - "P1 Start": "Return, X1 Start", - "P1 Z": "D", - "P1 B": "S", - "P1 A": "A", - "P1 C Right": "", - "P1 C Left": "", - "P1 C Down": "", - "P1 C Up": "", - "P1 R": "W", - "P1 L": "Q", - "P2 DPad R": "", - "P2 DPad L": "", - "P2 DPad D": "", - "P2 DPad U": "", - "P2 Start": "", - "P2 Z": "", - "P2 B": "", - "P2 A": "", - "P2 C Right": "", - "P2 C Left": "", - "P2 C Down": "", - "P2 C Up": "", - "P2 R": "", - "P2 L": "", - "P3 DPad R": "", - "P3 DPad L": "", - "P3 DPad D": "", - "P3 DPad U": "", - "P3 Start": "", - "P3 Z": "", - "P3 B": "", - "P3 A": "", - "P3 C Right": "", - "P3 C Left": "", - "P3 C Down": "", - "P3 C Up": "", - "P3 R": "", - "P3 L": "", - "P4 DPad R": "", - "P4 DPad L": "", - "P4 DPad D": "", - "P4 DPad U": "", - "P4 Start": "", - "P4 Z": "", - "P4 B": "", - "P4 A": "", - "P4 C Right": "", - "P4 C Left": "", - "P4 C Down": "", - "P4 C Up": "", - "P4 R": "", - "P4 L": "", - "Reset": "", - "Power": "" - } }, "AllTrollersAutoFire": { "NES Controller": { @@ -513,18 +537,18 @@ "P1 Down": "", "P1 Left": "", "P1 Right": "", - "P1 Select": "", "P1 Start": "", - "P1 B": "", - "P1 A": "", + "P1 Select": "", + "P1 B": "A, J1 B4", + "P1 A": "S, J1 B3", "Reset": "", "Power": "", "P2 Up": "", "P2 Down": "", "P2 Left": "", "P2 Right": "", - "P2 Select": "", "P2 Start": "", + "P2 Select": "", "P2 B": "", "P2 A": "" }, @@ -533,174 +557,99 @@ "Down": "", "Left": "", "Right": "", - "A": "", - "B": "", - "Select": "", "Start": "", - "Power": "" - }, - "Saturn Controller": { + "Select": "", + "B": "A, J1 B4", + "A": "S, J1 B3", "Power": "", + }, + "GBAController": { + "Up": "", + "Down": "", + "Left": "", + "Right": "", + "Start": "", + "Select": "", + "B": "A, J1 B4", + "A": "S, J1 B3", + "L": "", + "R": "", + "Power": "", + }, + "Atari 2600 Basic Controller": { "Reset": "", + "Select": "", "P1 Up": "", "P1 Down": "", "P1 Left": "", "P1 Right": "", - "P1 Start": "", - "P1 Z": "", - "P1 Y": "", - "P1 X": "", - "P1 C": "", - "P1 B": "", - "P1 A": "", - "P1 L": "", - "P1 R": "", + "P1 Button": "A, J1 B4", "P2 Up": "", "P2 Down": "", "P2 Left": "", "P2 Right": "", - "P2 Start": "", - "P2 Z": "", - "P2 Y": "", - "P2 X": "", - "P2 C": "", - "P2 B": "", - "P2 A": "", - "P2 L": "", - "P2 R": "" - }, - "Dual Gameboy Controller": { - "P1 Up": "", - "P1 Down": "", - "P1 Left": "", - "P1 Right": "", - "P1 A": "", - "P1 B": "", - "P1 Select": "", - "P1 Start": "", - "P1 Power": "", - "P2 Up": "", - "P2 Down": "", - "P2 Left": "", - "P2 Right": "", - "P2 A": "", - "P2 B": "", - "P2 Select": "", - "P2 Start": "", - "P2 Power": "" - }, + "P2 Button": "S, J1 B3", + }, "Null Controller": {}, - "TI83 Controller": { - "0": "", - "1": "", - "2": "", - "3": "", - "4": "", - "5": "", - "6": "", - "7": "", - "8": "", - "9": "", - "DOT": "", - "ON": "", - "ENTER": "", - "DOWN": "", - "LEFT": "", - "UP": "", - "RIGHT": "", - "PLUS": "", - "MINUS": "", - "MULTIPLY": "", - "DIVIDE": "", - "CLEAR": "", - "EXP": "", - "DASH": "", - "PARACLOSE": "", - "TAN": "", - "VARS": "", - "PARAOPEN": "", - "COS": "", - "PRGM": "", - "STAT": "", - "COMMA": "", - "SIN": "", - "MATRIX": "", - "X": "", - "STO": "", - "LN": "", - "LOG": "", - "SQUARED": "", - "NEG1": "", - "MATH": "", - "ALPHA": "", - "GRAPH": "", - "TRACE": "", - "ZOOM": "", - "WINDOW": "", - "Y": "", - "2ND": "", - "MODE": "", - "DEL": "" - }, - "Nintento 64 Controller": { - "P1 DPad R": "", - "P1 DPad L": "", - "P1 DPad D": "", - "P1 DPad U": "", - "P1 Start": "", - "P1 Z": "", - "P1 B": "", - "P1 A": "", - "P1 C Right": "", - "P1 C Left": "", - "P1 C Down": "", - "P1 C Up": "", - "P1 R": "", - "P1 L": "", - "P2 DPad R": "", - "P2 DPad L": "", - "P2 DPad D": "", - "P2 DPad U": "", - "P2 Start": "", - "P2 Z": "", - "P2 B": "", - "P2 A": "", - "P2 C Right": "", - "P2 C Left": "", - "P2 C Down": "", - "P2 C Up": "", - "P2 R": "", - "P2 L": "", - "P3 DPad R": "", - "P3 DPad L": "", - "P3 DPad D": "", - "P3 DPad U": "", - "P3 Start": "", - "P3 Z": "", - "P3 B": "", - "P3 A": "", - "P3 C Right": "", - "P3 C Left": "", - "P3 C Down": "", - "P3 C Up": "", - "P3 R": "", - "P3 L": "", - "P4 DPad R": "", - "P4 DPad L": "", - "P4 DPad D": "", - "P4 DPad U": "", - "P4 Start": "", - "P4 Z": "", - "P4 B": "", - "P4 A": "", - "P4 C Right": "", - "P4 C Left": "", - "P4 C Down": "", - "P4 C Up": "", - "P4 R": "", - "P4 L": "", + }, + "PC Engine Controller": { "Reset": "", - "Power": "" + "Power": "", + "P1 Up": "", + "P1 Down": "", + "P1 Left": "", + "P1 Right": "", + "P1 B2": "S, J1 B3", + "P1 B1": "A, J1 B4", + "P1 Select": "", + "P1 Run": "", + "P2 Up": "", + "P2 Down": "", + "P2 Left": "", + "P2 Right": "", + "P2 B2": "", + "P2 B1": "", + "P2 Select": "", + "P2 Run": "", + "P3 Up": "", + "P3 Down": "", + "P3 Left": "", + "P3 Right": "", + "P3 B2": "", + "P3 B1": "", + "P3 Select": "", + "P3 Run": "", + "P4 Up": "", + "P4 Down": "", + "P4 Left": "", + "P4 Right": "", + "P4 B2": "", + "P4 B1": "", + "P4 Select": "", + "P4 Run": "", + "P5 Up": "", + "P5 Down": "", + "P5 Left": "", + "P5 Right": "", + "P5 B2": "", + "P5 B1": "", + "P5 Select": "", + "P5 Run": "", + }, + "SMS Controller": { + "P1 Up": "", + "P1 Down": "", + "P1 Left": "", + "P1 Right": "", + "P1 B1": "S, J1 B3", + "P1 B2": "A, J1 B4", + "Reset": "", + "Pause": "", + "P2 Up": "", + "P2 Down": "", + "P2 Left": "", + "P2 Right": "", + "P2 B1": "", + "P2 B2": "", } - } } \ No newline at end of file