From b7f24da63d3b2bf1aef8d972338dd4cd95e92518 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 11 May 2014 16:32:17 +0000 Subject: [PATCH] More fixing of default joypad buttons --- output/defctrl.json | 111 +++++++++++++++++++++++++------------------- 1 file changed, 62 insertions(+), 49 deletions(-) diff --git a/output/defctrl.json b/output/defctrl.json index 3224db9259..a5e48f289c 100644 --- a/output/defctrl.json +++ b/output/defctrl.json @@ -7,8 +7,8 @@ "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": "Z, X1 A", - "P1 A": "X, X1 B", + "P1 B": "Z, J1 B1, X1 A", + "P1 A": "X, J1 B2, X1 B", "P2 Up": "", "P2 Down": "", "P2 Left": "", @@ -165,15 +165,15 @@ "A": "X, J1 B2, X1 B", "Power": "" }, - "GBAController": { + "GBA Controller": { "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 A", - "A": "X, X1 B", + "B": "Z, J1 B1, X1 A", + "A": "X, J1 B2, X1 B", "L": "W, J1 B5, X1 LeftTrigger", "R": "E, J1 B6, X1 RightTrigger", "Power": "" @@ -333,15 +333,15 @@ "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 X": "D, J1 B4", - "P1 Y": "S, J1 B5", - "P1 Z": "A, J1 B6", + "P1 Start": "Return, J1 B10, X1 Start", + "P1 X": "D, J1 B3", + "P1 Y": "S, J1 B11", + "P1 Z": "A, J1 B12", "P1 A": "C, J1 B1", "P1 B": "X, J1 B2", - "P1 C": "Z, J1 B5", - "P1 L": "Q", - "P1 R": "W", + "P1 C": "Z, J1 B4", + "P1 L": "Q, J1 B5", + "P1 R": "W, J1 B6", "P2 Up": "", "P2 Down": "", "P2 Left": "", @@ -366,7 +366,7 @@ "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", + "P1 Run": "C, J1 B10, X1 Start", "P2 Up": "", "P2 Down": "", "P2 Left": "", @@ -405,20 +405,20 @@ "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 B2", - "P1 Key1": "NumberPad1", - "P1 Key2": "NumberPad2", - "P1 Key3": "NumberPad3", - "P1 Key4": "NumberPad4", - "P1 Key5": "NumberPad5", - "P1 Key6": "NumberPad6", - "P1 Key7": "NumberPad7", - "P1 Key8": "NumberPad8", - "P1 Key9": "NumberPad9", - "P1 Star": "NumberPadEnter", - "P1 Key0": "NumberPad0", - "P1 Pound": "NumberPadPeriod", + "P1 L": "Z, J1 B5", + "P1 R": "X, J1 B6", + "P1 Key1": "NumberPad1, J1 B1", + "P1 Key2": "NumberPad2, J1 B2", + "P1 Key3": "NumberPad3, J1 B3", + "P1 Key4": "NumberPad4, J1 B4", + "P1 Key5": "NumberPad5, J1 RotationZ-", + "P1 Key6": "NumberPad6, J1 RotationZ+", + "P1 Key7": "NumberPad7, J1 Z-", + "P1 Key8": "NumberPad8, J1 Z+", + "P1 Key9": "NumberPad9, J1 B11", + "P1 Star": "NumberPadEnter, J1 B9", + "P1 Key0": "NumberPad0, J1 B12", + "P1 Pound": "NumberPadPeriod, J1 B10", "P2 Up": "", "P2 Down": "", "P2 Left": "", @@ -445,7 +445,7 @@ "P1 Right": "RightArrow, J1 POV1R, X1 DpadRight, X1 LStickRight", "P1 B1": "Z, J1 B1, X1 B", "P1 B2": "X, J1 B2, X1 A", - "Reset": "", + "Reset": "J1 B9", "Pause": "J1 B10", "P2 Up": "", "P2 Down": "", @@ -456,14 +456,14 @@ }, "Genesis 3-Button Controller": { "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 A": "Z, J1 B1, X1 A", - "P1 B": "X, J1 B1, X1 B", + "P1 B": "X, J1 B2, X1 B", "P1 C": "C, J1 B4, X1 X", - "P1 Start": "Return, X1 J1 B10, X1 Start" + "P1 Start": "Return, J1 B10, X1 Start" }, "Dual Gameboy Controller": { "P1 Up": "UpArrow, J1 POV1U, X1 DpadUp, X1 LStickUp", @@ -475,12 +475,12 @@ "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 Up": "NumberPad8, J1 RotationZ-", + "P2 Down": "NumberPad2, J1 RotationZ+", + "P2 Left": "NumberPad4, J1 Z-", + "P2 Right": "NumberPad6, J1 Z+", + "P2 Start": "RightBracket, J1 B5", + "P2 Select": "LeftBracket, J1 B6", "P2 B": "V, J1 B4", "P2 A": "C, J1 B3", "P2 Power": "" @@ -539,14 +539,14 @@ "COMMA": "Comma" }, "GPGX Genesis 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 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 A": "Z, J1 B1, X1 A", - "P1 B": "X, J1 B1, X1 B", + "P1 B": "X, J1 B2, X1 B", "P1 C": "C, J1 B4, X1 X", - "P1 Start": "Return, X1 J1 B10, X1 Start", + "P1 Start": "Return, J1 B10, X1 Start", "P1 X": "A", "P1 Y": "S", "P1 Z": "D", @@ -634,8 +634,8 @@ "P1 Down": "", "P1 Left": "", "P1 Right": "", - "P1 B2": "A, J1 B3", - "P1 B1": "S, J1 B4", + "P1 B2": "A, J1 B4", + "P1 B1": "S, J1 B3", "P1 Select": "", "P1 Run": "", "P2 Up": "", @@ -714,7 +714,20 @@ "P2 Mode": "", "Power": "", "Reset": "" - } + }, + "GBA Controller": { + "Up": "", + "Down": "", + "Left": "", + "Right": "", + "Start": "", + "Select": "", + "B": "J1 B4", + "A": "J1 B3", + "L": "", + "R": "", + "Power": "" + }, }, "AllTrollersAnalog": { "Nintento 64 Controller": {