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

remove empty controller mappings from defctrl, also remove duplicates that caused it to be invalid json (.net happily was deserilizing it anyway), don't save empty mappings when saving from the ui

This commit is contained in:
adelikat 2020-06-22 19:54:36 -05:00
parent 93c47b87b9
commit c13430896f
3 changed files with 31 additions and 543 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

562
Assets/defctrl.json
View File

@ -13,36 +13,12 @@
"P1 RetroPad A": "X, J1 B3, X1 B", "P1 RetroPad A": "X, J1 B3, X1 B",
"P1 RetroPad L": "W, J1 B5, X1 LeftShoulder", "P1 RetroPad L": "W, J1 B5, X1 LeftShoulder",
"P1 RetroPad R": "E, J1 B6, X1 RightShoulder", "P1 RetroPad R": "E, J1 B6, X1 RightShoulder",
"P2 RetroPad Up": "",
"P2 RetroPad Down": "",
"P2 RetroPad Left": "",
"P2 RetroPad Right": "",
"P2 RetroPad Select": "",
"P2 RetroPad Start": "",
"P2 RetroPad Y": "",
"P2 RetroPad B": "",
"P2 RetroPad X": "",
"P2 RetroPad A": "",
"P2 RetroPad L": "",
"P2 RetroPad R": "",
"Pointer Pressed": "WMouse L", "Pointer Pressed": "WMouse L",
"Key Backspace": "BackSpace", "Key Backspace": "BackSpace",
"Key Tab": "Tab", "Key Tab": "Tab",
"Key Clear": "",
"Key Return": "Enter", "Key Return": "Enter",
"Key Pause": "",
"Key Escape": "Escape", "Key Escape": "Escape",
"Key Space": "Space", "Key Space": "Space",
"Key Exclaim": "",
"Key QuoteDbl": "",
"Key Hash": "",
"Key Dollar": "",
"Key Ampersand": "",
"Key Quote": "",
"Key LeftParen": "",
"Key RightParen": "",
"Key Asterisk": "",
"Key Plus": "",
"Key Comma": "Comma", "Key Comma": "Comma",
"Key Minus": "Minus", "Key Minus": "Minus",
"Key Period": "Period", "Key Period": "Period",
@ -57,18 +33,11 @@
"Key 7": "Number7", "Key 7": "Number7",
"Key 8": "Number8", "Key 8": "Number8",
"Key 9": "Number9", "Key 9": "Number9",
"Key Colon": "",
"Key Semicolon": "Semicolon", "Key Semicolon": "Semicolon",
"Key Less": "",
"Key Equals": "Plus", "Key Equals": "Plus",
"Key Greater": "",
"Key Question": "",
"Key At": "",
"Key LeftBracket": "BracketLeft", "Key LeftBracket": "BracketLeft",
"Key Backslash": "BackSlash", "Key Backslash": "BackSlash",
"Key RightBracket": "BracketRight", "Key RightBracket": "BracketRight",
"Key Caret": "",
"Key Underscore": "",
"Key Backquote": "Tilde", "Key Backquote": "Tilde",
"Key A": "A", "Key A": "A",
"Key B": "B", "Key B": "B",
@ -113,7 +82,6 @@
"Key KP_Minus": "KeypadSubtract", "Key KP_Minus": "KeypadSubtract",
"Key KP_Plus": "KeypadAdd", "Key KP_Plus": "KeypadAdd",
"Key KP_Enter": "KeypadEnter", "Key KP_Enter": "KeypadEnter",
"Key KP_Equals": "",
"Key Up": "Up", "Key Up": "Up",
"Key Down": "Down", "Key Down": "Down",
"Key Left": "Left", "Key Left": "Left",
@ -134,9 +102,6 @@
"Key F10": "F10", "Key F10": "F10",
"Key F11": "F11", "Key F11": "F11",
"Key F12": "F12", "Key F12": "F12",
"Key F13": "",
"Key F14": "",
"Key F15": "",
"Key NumLock": "NumberLock", "Key NumLock": "NumberLock",
"Key CapsLock": "CapsLock", "Key CapsLock": "CapsLock",
"Key ScrollLock": "ScrollLock", "Key ScrollLock": "ScrollLock",
@ -146,20 +111,7 @@
"Key LCtrl": "ControlLeft", "Key LCtrl": "ControlLeft",
"Key RAlt": "AltRight", "Key RAlt": "AltRight",
"Key LAlt": "AltLeft", "Key LAlt": "AltLeft",
"Key RMeta": "",
"Key LMeta": "",
"Key LSuper": "",
"Key RSuper": "",
"Key Mode": "",
"Key Compose": "",
"Key Help": "",
"Key Print": "",
"Key SysReq": "",
"Key Break": "",
"Key Menu": "Applications", "Key Menu": "Applications",
"Key Power": "",
"Key Euro": "",
"Key Undo": "",
"Key Right": "Right" "Key Right": "Right"
}, },
"NES Controller": { "NES Controller": {
@ -171,23 +123,10 @@
"P1 Select": "Space, J1 B9, X1 Back", "P1 Select": "Space, J1 B9, X1 Back",
"P1 B": "Z, J1 B1, X1 X", "P1 B": "Z, J1 B1, X1 X",
"P1 A": "X, J1 B2, X1 A", "P1 A": "X, J1 B2, X1 A",
"P2 Up": "",
"P2 Down": "",
"P2 Left": "",
"P2 Right": "",
"P2 Start": "",
"P2 Select": "",
"P2 B": "",
"P2 A": "",
"P2 Fire": "WMouse L", "P2 Fire": "WMouse L",
"P2 Microphone": "", "P3 Fire": "WMouse L"
"P3 Fire": "WMouse L",
"Reset": "",
"Power": ""
}, },
"SNES Controller": { "SNES Controller": {
"Reset": "",
"Power": "",
"P1 Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp", "P1 Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp",
"P1 Down": "Down, J1 POV1D, X1 DpadDown, X1 LStickDown", "P1 Down": "Down, J1 POV1D, X1 DpadDown, X1 LStickDown",
"P1 Left": "Left, J1 POV1L, X1 DpadLeft, X1 LStickLeft", "P1 Left": "Left, J1 POV1L, X1 DpadLeft, X1 LStickLeft",
@ -225,69 +164,7 @@
"P1 C Left": "Keypad4, J1 Z-, X1 RStickLeft", "P1 C Left": "Keypad4, J1 Z-, X1 RStickLeft",
"P1 C Right": "Keypad6, J1 Z+, X1 RStickRight", "P1 C Right": "Keypad6, J1 Z+, X1 RStickRight",
"P1 L": "Q, J1 B5, X1 LeftShoulder", "P1 L": "Q, J1 B5, X1 LeftShoulder",
"P1 R": "W, J1 B6, X1 RightShoulder", "P1 R": "W, J1 B6, X1 RightShoulder"
"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": { "Gameboy Controller": {
"Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp", "Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp",
@ -298,7 +175,6 @@
"Select": "Space, J1 B9, X1 Back", "Select": "Space, J1 B9, X1 Back",
"B": "Z, J1 B1, X1 X", "B": "Z, J1 B1, X1 X",
"A": "X, J1 B2, X1 A", "A": "X, J1 B2, X1 A",
"Power": "",
"P1 Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp", "P1 Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp",
"P1 Down": "Down, J1 POV1D, X1 DpadDown, X1 LStickDown", "P1 Down": "Down, J1 POV1D, X1 DpadDown, X1 LStickDown",
"P1 Left": "Left, J1 POV1L, X1 DpadLeft, X1 LStickLeft", "P1 Left": "Left, J1 POV1L, X1 DpadLeft, X1 LStickLeft",
@ -317,7 +193,6 @@
"Select": "Space, J1 B9, X1 Back", "Select": "Space, J1 B9, X1 Back",
"B": "Z, J1 B1, X1 X", "B": "Z, J1 B1, X1 X",
"A": "X, J1 B2, X1 A", "A": "X, J1 B2, X1 A",
"Power": "",
"P1 Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp", "P1 Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp",
"P1 Down": "Down, J1 POV1D, X1 DpadDown, X1 LStickDown", "P1 Down": "Down, J1 POV1D, X1 DpadDown, X1 LStickDown",
"P1 Left": "Left, J1 POV1L, X1 DpadLeft, X1 LStickLeft", "P1 Left": "Left, J1 POV1L, X1 DpadLeft, X1 LStickLeft",
@ -337,8 +212,7 @@
"B": "Z, J1 B1, X1 X", "B": "Z, J1 B1, X1 X",
"A": "X, J1 B2, X1 A", "A": "X, J1 B2, X1 A",
"L": "W, J1 B5, X1 LeftShoulder", "L": "W, J1 B5, X1 LeftShoulder",
"R": "E, J1 B6, X1 RightShoulder", "R": "E, J1 B6, X1 RightShoulder"
"Power": ""
}, },
"NDS Controller": { "NDS Controller": {
"A": "X, J1 B3, X1 B", "A": "X, J1 B3, X1 B",
@ -353,7 +227,6 @@
"R": "E, J1 B6, X1 RightShoulder", "R": "E, J1 B6, X1 RightShoulder",
"Select": "Space, J1 B9, X1 Back", "Select": "Space, J1 B9, X1 Back",
"Start": "Return, J1 B10, X1 Start", "Start": "Return, J1 B10, X1 Start",
"Lid": "",
"Touch": "WMouse L" "Touch": "WMouse L"
}, },
"Atari 2600 Basic Controller": { "Atari 2600 Basic Controller": {
@ -371,10 +244,8 @@
"P2 Button": "Keypad1, J1 B2, X1 A" "P2 Button": "Keypad1, J1 B2, X1 A"
}, },
"Atari 7800 ProLine Joystick Controller": { "Atari 7800 ProLine Joystick Controller": {
"Power": "",
"Reset": "D, J1 B9, X1 Back", "Reset": "D, J1 B9, X1 Back",
"Select": "S, J1 B10, X1 Start", "Select": "S, J1 B10, X1 Start",
"Pause": "",
"P1 Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp", "P1 Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp",
"P1 Down": "Down, J1 POV1D, X1 DpadDown, X1 LStickDown", "P1 Down": "Down, J1 POV1D, X1 DpadDown, X1 LStickDown",
"P1 Left": "Left, J1 POV1L, X1 DpadLeft, X1 LStickLeft", "P1 Left": "Left, J1 POV1L, X1 DpadLeft, X1 LStickLeft",
@ -389,10 +260,8 @@
"P2 Trigger 2": "Keypad3, J1 B3, X1 B" "P2 Trigger 2": "Keypad3, J1 B3, X1 B"
}, },
"Atari 7800 Joystick Controller": { "Atari 7800 Joystick Controller": {
"Power": "",
"Reset": "D, J1 B9, X1 Back", "Reset": "D, J1 B9, X1 Back",
"Select": "S, J1 B10, X1 Start", "Select": "S, J1 B10, X1 Start",
"Pause": "",
"P1 Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp", "P1 Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp",
"P1 Down": "Down, J1 POV1D, X1 DpadDown, X1 LStickDown", "P1 Down": "Down, J1 POV1D, X1 DpadDown, X1 LStickDown",
"P1 Left": "Left, J1 POV1L, X1 DpadLeft, X1 LStickLeft", "P1 Left": "Left, J1 POV1L, X1 DpadLeft, X1 LStickLeft",
@ -406,17 +275,13 @@
"P2 Trigger": "Keypad1, J1 B4, X1 Y" "P2 Trigger": "Keypad1, J1 B4, X1 Y"
}, },
"Atari 7800 Light Gun Controller": { "Atari 7800 Light Gun Controller": {
"Power": "",
"Reset": "D, J1 B9, X1 Back", "Reset": "D, J1 B9, X1 Back",
"Select": "S, J1 B10, X1 Start", "Select": "S, J1 B10, X1 Start",
"Pause": "",
"P1 Trigger": "WMouse L" "P1 Trigger": "WMouse L"
}, },
"Atari 7800 Paddle Controller": { "Atari 7800 Paddle Controller": {
"Power": "",
"Reset": "D, J1 B9, X1 Back", "Reset": "D, J1 B9, X1 Back",
"Select": "S, J1 B10, X1 Start", "Select": "S, J1 B10, X1 Start",
"Pause": "",
"P2 Trigger": "Keypad1, J1 B4, X1 Y" "P2 Trigger": "Keypad1, J1 B4, X1 Y"
}, },
"Commodore 64 Controller": { "Commodore 64 Controller": {
@ -425,11 +290,6 @@
"P1 Left": "Keypad4, J1 POV1L, X1 DpadLeft, X1 LStickLeft", "P1 Left": "Keypad4, J1 POV1L, X1 DpadLeft, X1 LStickLeft",
"P1 Right": "Keypad6, J1 POV1R, X1 DpadRight, X1 LStickRight", "P1 Right": "Keypad6, J1 POV1R, X1 DpadRight, X1 LStickRight",
"P1 Button": "Keypad1, J1 B1, X1 X", "P1 Button": "Keypad1, J1 B1, X1 X",
"P2 Up": "",
"P2 Down": "",
"P2 Left": "",
"P2 Right": "",
"P2 Button": "",
"Key F1": "F1", "Key F1": "F1",
"Key F3": "F3", "Key F3": "F3",
"Key F5": "F5", "Key F5": "F5",
@ -464,9 +324,7 @@
"Key At": "BracketLeft", "Key At": "BracketLeft",
"Key Asterisk": "BracketRight", "Key Asterisk": "BracketRight",
"Key Up Arrow": "BackSlash", "Key Up Arrow": "BackSlash",
"Key Restore": "",
"Key Run/Stop": "CapsLock", "Key Run/Stop": "CapsLock",
"Key Lck": "",
"Key A": "A", "Key A": "A",
"Key S": "S", "Key S": "S",
"Key D": "D", "Key D": "D",
@ -503,8 +361,6 @@
"P1 Left": "Keypad4, J1 POV1L, X1 DpadLeft, X1 LStickLeft", "P1 Left": "Keypad4, J1 POV1L, X1 DpadLeft, X1 LStickLeft",
"P1 Right": "Keypad6, J1 POV1R, X1 DpadRight, X1 LStickRight", "P1 Right": "Keypad6, J1 POV1R, X1 DpadRight, X1 LStickRight",
"P1 Button": "Keypad1, J1 B1, X1 X", "P1 Button": "Keypad1, J1 B1, X1 X",
"Key True Video": "",
"Key Inv Video": "",
"Key 1": "Number1", "Key 1": "Number1",
"Key 2": "Number2", "Key 2": "Number2",
"Key 3": "Number3", "Key 3": "Number3",
@ -517,7 +373,6 @@
"Key 0": "Number0", "Key 0": "Number0",
"Key Break": "Delete", "Key Break": "Delete",
"Key Delete": "BackSpace", "Key Delete": "BackSpace",
"Key Graph": "",
"Key Q": "Q", "Key Q": "Q",
"Key W": "W", "Key W": "W",
"Key E": "E", "Key E": "E",
@ -528,8 +383,6 @@
"Key I": "I", "Key I": "I",
"Key O": "O", "Key O": "O",
"Key P": "P", "Key P": "P",
"Key Extend Mode": "",
"Key Edit": "",
"Key A": "A", "Key A": "A",
"Key S": "S", "Key S": "S",
"Key D": "D", "Key D": "D",
@ -541,7 +394,6 @@
"Key L": "L", "Key L": "L",
"Key Return": "Enter", "Key Return": "Enter",
"Key Caps Shift": "ShiftLeft, ShiftRight", "Key Caps Shift": "ShiftLeft, ShiftRight",
"Key Caps Lock": "",
"Key Z": "Z", "Key Z": "Z",
"Key X": "X", "Key X": "X",
"Key C": "C", "Key C": "C",
@ -552,7 +404,6 @@
"Key Period": "Period", "Key Period": "Period",
"Key Symbol Shift": "ControlLeft, ControlRight", "Key Symbol Shift": "ControlLeft, ControlRight",
"Key Semi-Colon": "Semicolon", "Key Semi-Colon": "Semicolon",
"Key Inverted-Comma": "",
"Key Left Cursor": "Left", "Key Left Cursor": "Left",
"Key Right Cursor": "Right", "Key Right Cursor": "Right",
"Key Space": "Space", "Key Space": "Space",
@ -562,7 +413,6 @@
"Play Tape": "F1", "Play Tape": "F1",
"Stop Tape": "F2", "Stop Tape": "F2",
"RTZ Tape": "F3", "RTZ Tape": "F3",
"Record Tape": "",
"Key Quote": "Shift+Number2", "Key Quote": "Shift+Number2",
"Insert Next Tape": "F6", "Insert Next Tape": "F6",
"Insert Previous Tape": "F5", "Insert Previous Tape": "F5",
@ -591,25 +441,7 @@
"P1 Key8": "Keypad9", "P1 Key8": "Keypad9",
"P1 Key9": "Keypad9", "P1 Key9": "Keypad9",
"P1 Enter": "KeypadEnter", "P1 Enter": "KeypadEnter",
"P1 Clear": "KeypadDecimal", "P1 Clear": "KeypadDecimal"
"P2 Up": "",
"P2 Down": "",
"P2 Left": "",
"P2 Right": "",
"P2 L": "",
"P2 R": "",
"P2 Key0": "",
"P2 Key1": "",
"P2 Key2": "",
"P2 Key3": "",
"P2 Key4": "",
"P2 Key5": "",
"P2 Key6": "",
"P2 Key7": "",
"P2 Key8": "",
"P2 Key9": "",
"P2 Enter": "",
"P2 Clear": ""
}, },
"PC-FX Controller": { "PC-FX Controller": {
"P1 Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp", "P1 Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp",
@ -624,20 +456,10 @@
"P1 VI": "A, J1 B12, X1 X", "P1 VI": "A, J1 B12, X1 X",
"P1 Select": "Space, J1 B9, X1 Back", "P1 Select": "Space, J1 B9, X1 Back",
"P1 Run": "Enter, J1 B10, X1 Start", "P1 Run": "Enter, J1 B10, X1 Start",
"P1 Mode 1": "",
"P1 Mode 2": "",
"P2 Mouse Left": "Keypad1",
"P2 Mouse Right": "Keypad2",
"Power": "",
"Reset": "",
"Previous Disk": "",
"Next Disk": "",
"P2 Mouse Left": "WMouse L", "P2 Mouse Left": "WMouse L",
"P2 Mouse Right": "WMouse R" "P2 Mouse Right": "WMouse R"
}, },
"Saturn Controller": { "Saturn Controller": {
"Power": "",
"Reset": "",
"P1 Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp", "P1 Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp",
"P1 Down": "Down, J1 POV1D, X1 DpadDown, X1 LStickDown", "P1 Down": "Down, J1 POV1D, X1 DpadDown, X1 LStickDown",
"P1 Left": "Left, J1 POV1L, X1 DpadLeft, X1 LStickLeft", "P1 Left": "Left, J1 POV1L, X1 DpadLeft, X1 LStickLeft",
@ -725,7 +547,6 @@
"P1 Space": "Space", "P1 Space": "Space",
"P1 RightAlt": "AltRight", "P1 RightAlt": "AltRight",
"P1 RightCtrl": "ControlRight", "P1 RightCtrl": "ControlRight",
"P1 PrintScreen": "",
"P1 ScrollLock": "ScrollLock", "P1 ScrollLock": "ScrollLock",
"P1 Pause": "Pause", "P1 Pause": "Pause",
"P1 Insert": "Insert", "P1 Insert": "Insert",
@ -734,10 +555,7 @@
"P1 End": "End", "P1 End": "End",
"P1 PageUp": "PageUp", "P1 PageUp": "PageUp",
"P1 PageDown": "PageDown", "P1 PageDown": "PageDown",
"P1 Up": "Up",
"P1 Down": "Down",
"P1 CursorLeft": "Left", "P1 CursorLeft": "Left",
"P1 Right": "Right",
"P1 NumLock": "NumberLock", "P1 NumLock": "NumberLock",
"P1 KeypadSlash(Divide)": "KeypadDivide", "P1 KeypadSlash(Divide)": "KeypadDivide",
"P1 KeypadAsterisk(Multiply)": "KeypadMultiply", "P1 KeypadAsterisk(Multiply)": "KeypadMultiply",
@ -757,8 +575,6 @@
"P1 KeypadDelete": "KeypadDecimal" "P1 KeypadDelete": "KeypadDecimal"
}, },
"PC Engine Controller": { "PC Engine Controller": {
"Reset": "",
"Power": "",
"P1 Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp", "P1 Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp",
"P1 Down": "Down, J1 POV1D, X1 DpadDown, X1 LStickDown", "P1 Down": "Down, J1 POV1D, X1 DpadDown, X1 LStickDown",
"P1 Left": "Left, J1 POV1L, X1 DpadLeft, X1 LStickLeft", "P1 Left": "Left, J1 POV1L, X1 DpadLeft, X1 LStickLeft",
@ -794,25 +610,7 @@
"P1 Key 9": "Keypad9, J1 B11, X1 LeftThumb", "P1 Key 9": "Keypad9, J1 B11, X1 LeftThumb",
"P1 Star": "KeypadEnter, J1 B9, X1 Back", "P1 Star": "KeypadEnter, J1 B9, X1 Back",
"P1 Key 0": "Keypad0, J1 B12, X1 RightThumb", "P1 Key 0": "Keypad0, J1 B12, X1 RightThumb",
"P1 Pound": "KeypadDecimal, J1 B10, X1 Start", "P1 Pound": "KeypadDecimal, J1 B10, X1 Start"
"P2 Up": "",
"P2 Down": "",
"P2 Left": "",
"P2 Right": "",
"P2 L": "",
"P2 R": "",
"P2 Key1": "",
"P2 Key2": "",
"P2 Key3": "",
"P2 Key4": "",
"P2 Key5": "",
"P2 Key6": "",
"P2 Key7": "",
"P2 Key8": "",
"P2 Key9": "",
"P2 Star": "",
"P2 Key0": "",
"P2 Pound": ""
}, },
"SMS Controller": { "SMS Controller": {
"P1 Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp", "P1 Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp",
@ -822,13 +620,7 @@
"P1 B1": "Z, J1 B1, X1 X", "P1 B1": "Z, J1 B1, X1 X",
"P1 B2": "X, J1 B2, X1 A", "P1 B2": "X, J1 B2, X1 A",
"Reset": "J1 B9, X1 Back", "Reset": "J1 B9, X1 Back",
"Pause": "J1 B10, X1 Start", "Pause": "J1 B10, X1 Start"
"P2 Up": "",
"P2 Down": "",
"P2 Left": "",
"P2 Right": "",
"P2 B1": "",
"P2 B2": ""
}, },
"SMS Paddle Controller": { "SMS Paddle Controller": {
"P1 Left": "Left, J1 POV1L", "P1 Left": "Left, J1 POV1L",
@ -850,13 +642,7 @@
"P1 B1": "Z, J1 B1, X1 X", "P1 B1": "Z, J1 B1, X1 X",
"P1 B2": "X, J1 B2, X1 A", "P1 B2": "X, J1 B2, X1 A",
"Reset": "J1 B9, X1 Back", "Reset": "J1 B9, X1 Back",
"Pause": "J1 B10, X1 Start", "Pause": "J1 B10, X1 Start"
"P2 Up": "",
"P2 Down": "",
"P2 Left": "",
"P2 Right": "",
"P2 B1": "",
"P2 B2": ""
}, },
"SMS Keyboard Controller": { "SMS Keyboard Controller": {
"Key 1": "Number1", "Key 1": "Number1",
@ -873,7 +659,6 @@
"Key Caret": "Plus", "Key Caret": "Plus",
"Key Yen": "BackSpace", "Key Yen": "BackSpace",
"Key Break": "Delete", "Key Break": "Delete",
"Key Function": "Tab", "Key Function": "Tab",
"Key Q": "Q", "Key Q": "Q",
"Key W": "W", "Key W": "W",
@ -889,7 +674,6 @@
"Key Left Bracket": "BracketRight", "Key Left Bracket": "BracketRight",
"Key Return": "Enter", "Key Return": "Enter",
"Key Up Arrow": "Up", "Key Up Arrow": "Up",
"Key Control": "CapsLock", "Key Control": "CapsLock",
"Key A": "A", "Key A": "A",
"Key S": "S", "Key S": "S",
@ -905,7 +689,6 @@
"Key Right Bracket": "BackSlash", "Key Right Bracket": "BackSlash",
"Key Left Arrow": "Left", "Key Left Arrow": "Left",
"Key Right Arrow": "Right", "Key Right Arrow": "Right",
"Key Shift": "ShiftLeft", "Key Shift": "ShiftLeft",
"Key Z": "Z", "Key Z": "Z",
"Key X": "X", "Key X": "X",
@ -919,13 +702,11 @@
"Key Slash": "Slash", "Key Slash": "Slash",
"Key PI": "ShiftRight", "Key PI": "ShiftRight",
"Key Down Arrow": "Down", "Key Down Arrow": "Down",
"Key Graph": "PageUp", "Key Graph": "PageUp",
"Key Kana": "PageDown", "Key Kana": "PageDown",
"Key Space": "Space", "Key Space": "Space",
"Key Home/Clear": "Home", "Key Home/Clear": "Home",
"Key Insert/Delete": "Insert", "Key Insert/Delete": "Insert",
"P1 Up": "J1 POV1U, X1 DpadUp, X1 LStickUp", "P1 Up": "J1 POV1U, X1 DpadUp, X1 LStickUp",
"P1 Down": "J1 POV1D, X1 DpadDown, X1 LStickDown", "P1 Down": "J1 POV1D, X1 DpadDown, X1 LStickDown",
"P1 Left": "J1 POV1L, X1 DpadLeft, X1 LStickLeft", "P1 Left": "J1 POV1L, X1 DpadLeft, X1 LStickLeft",
@ -933,13 +714,7 @@
"P1 B1": "J1 B1, X1 X", "P1 B1": "J1 B1, X1 X",
"P1 B2": "J1 B2, X1 A", "P1 B2": "J1 B2, X1 A",
"Reset": "J1 B9, X1 Back", "Reset": "J1 B9, X1 Back",
"Pause": "J1 B10, X1 Start", "Pause": "J1 B10, X1 Start"
"P2 Up": "",
"P2 Down": "",
"P2 Left": "",
"P2 Right": "",
"P2 B1": "",
"P2 B2": ""
}, },
"GG Controller": { "GG Controller": {
"P1 Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp", "P1 Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp",
@ -960,7 +735,6 @@
"P1 Select": "Space, J1 B9, X1 Space", "P1 Select": "Space, J1 B9, X1 Space",
"P1 B": "Z, J1 B1, X1 X", "P1 B": "Z, J1 B1, X1 X",
"P1 A": "X, J1 B2, X1 A", "P1 A": "X, J1 B2, X1 A",
"P1 Power": "",
"P2 Up": "Keypad8, J1 RotationZ-, X1 RStickUp", "P2 Up": "Keypad8, J1 RotationZ-, X1 RStickUp",
"P2 Down": "Keypad2, J1 RotationZ+, X1 RStickDown", "P2 Down": "Keypad2, J1 RotationZ+, X1 RStickDown",
"P2 Left": "Keypad4, J1 Z-, X1 RStickLeft", "P2 Left": "Keypad4, J1 Z-, X1 RStickLeft",
@ -968,8 +742,7 @@
"P2 Start": "BracketRight, J1 B5, X1 LeftShoulder", "P2 Start": "BracketRight, J1 B5, X1 LeftShoulder",
"P2 Select": "BracketLeft, J1 B6, X1 RightShoulder", "P2 Select": "BracketLeft, J1 B6, X1 RightShoulder",
"P2 B": "C, J1 B4, X1 Y", "P2 B": "C, J1 B4, X1 Y",
"P2 A": "V, J1 B3, X1 B", "P2 A": "V, J1 B3, X1 B"
"P2 Power": ""
}, },
"TI83 Controller": { "TI83 Controller": {
"0": "Keypad0", "0": "Keypad0",
@ -1036,26 +809,12 @@
"P1 Y": "S, J1 B5, X1 LeftShoulder", "P1 Y": "S, J1 B5, X1 LeftShoulder",
"P1 Z": "D, J1 B6, X1 RightShoulder", "P1 Z": "D, J1 B6, X1 RightShoulder",
"P1 Mode": "E, J1 B9, X1 Back", "P1 Mode": "E, J1 B9, X1 Back",
"P2 Up": "",
"P2 Down": "",
"P2 Left": "",
"P2 Right": "",
"P2 A": "",
"P2 B": "",
"P2 C": "",
"P2 Start": "",
"P2 X": "",
"P2 Y": "",
"P2 Z": "",
"P2 Mode": "",
"P2 Lightgun Trigger": "WMouse L", "P2 Lightgun Trigger": "WMouse L",
"P2 Lightgun Start": "Keypad5", "P2 Lightgun Start": "Keypad5",
"P2 Mouse Left": "WMouse L", "P2 Mouse Left": "WMouse L",
"P2 Mouse Center": "WMouse M", "P2 Mouse Center": "WMouse M",
"P2 Mouse Right": "WMouse R", "P2 Mouse Right": "WMouse R",
"P2 Mouse Start": "Keypad5", "P2 Mouse Start": "Keypad5"
"Power": "",
"Reset": ""
}, },
"PicoDrive Genesis Controller": { "PicoDrive Genesis Controller": {
"P1 Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp", "P1 Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp",
@ -1069,21 +828,7 @@
"P1 X": "A, J1 B3, X1 B", "P1 X": "A, J1 B3, X1 B",
"P1 Y": "S, J1 B5, X1 LeftShoulder", "P1 Y": "S, J1 B5, X1 LeftShoulder",
"P1 Z": "D, J1 B6, X1 RightShoulder", "P1 Z": "D, J1 B6, X1 RightShoulder",
"P1 Mode": "E, J1 B9, X1 Back", "P1 Mode": "E, J1 B9, X1 Back"
"P2 Up": "",
"P2 Down": "",
"P2 Left": "",
"P2 Right": "",
"P2 A": "",
"P2 B": "",
"P2 C": "",
"P2 Start": "",
"P2 X": "",
"P2 Y": "",
"P2 Z": "",
"P2 Mode": "",
"Power": "",
"Reset": ""
}, },
"WonderSwan Controller": { "WonderSwan Controller": {
"P1 X1": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp", "P1 X1": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp",
@ -1097,18 +842,13 @@
"P1 Start": "Enter, J1 B10, X1 Start", "P1 Start": "Enter, J1 B10, X1 Start",
"P1 B": "Z, J1 B1, X1 X", "P1 B": "Z, J1 B1, X1 X",
"P1 A": "X, J1 B2, X1 A", "P1 A": "X, J1 B2, X1 A",
"P2 X1": "",
"P2 X3": "X, J1 B2, X1 A", "P2 X3": "X, J1 B2, X1 A",
"P2 X4": "Z, J1 B1, X1 X", "P2 X4": "Z, J1 B1, X1 X",
"P2 X2": "",
"P2 Y1": "Left, J1 POV1L, X1 DpadLeft, X1 LStickLeft", "P2 Y1": "Left, J1 POV1L, X1 DpadLeft, X1 LStickLeft",
"P2 Y3": "Right, J1 POV1R, X1 DpadRight, X1 LStickRight", "P2 Y3": "Right, J1 POV1R, X1 DpadRight, X1 LStickRight",
"P2 Y4": "Down, J1 POV1D, X1 DpadDown, X1 LStickDown", "P2 Y4": "Down, J1 POV1D, X1 DpadDown, X1 LStickDown",
"P2 Y2": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp", "P2 Y2": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp",
"P2 Start": "Enter, J1 B10, X1 Start", "P2 Start": "Enter, J1 B10, X1 Start"
"P2 B": "",
"P2 A": "",
"Power": ""
}, },
"PSX DualShock Controller": { "PSX DualShock Controller": {
"P1 Up": "X1 DpadUp, Up", "P1 Up": "X1 DpadUp, Up",
@ -1138,8 +878,7 @@
"B": "Z", "B": "Z",
"Option 1": "A", "Option 1": "A",
"Option 2": "S", "Option 2": "S",
"Pause": "Enter", "Pause": "Enter"
"Power": ""
}, },
"Apple IIe Keyboard": { "Apple IIe Keyboard": {
"Delete": "Delete", "Delete": "Delete",
@ -1149,7 +888,6 @@
"Up": "Up", "Up": "Up",
"Return": "Enter", "Return": "Enter",
"Right": "Right", "Right": "Right",
"Escape": "",
"Space": "Space", "Space": "Space",
"'": "Quote", "'": "Quote",
",": "Comma", ",": "Comma",
@ -1200,9 +938,7 @@
"Z": "Z", "Z": "Z",
"Control": "ControlRight", "Control": "ControlRight",
"Shift": "ShiftRight", "Shift": "ShiftRight",
"Caps Lock": "CapsLock", "Caps Lock": "CapsLock"
"Previous Disk": "",
"Next Disk": ""
}, },
"VirtualBoy Controller": { "VirtualBoy Controller": {
"L_Up": "Up, X1 DpadUp, X1 LStickUp", "L_Up": "Up, X1 DpadUp, X1 LStickUp",
@ -1218,8 +954,7 @@
"R": "W, X1 LeftShoulder", "R": "W, X1 LeftShoulder",
"L": "E, X1 RightShoulder", "L": "E, X1 RightShoulder",
"Select": "Space, X1 Back", "Select": "Space, X1 Back",
"Start": "Enter, X1 Start", "Start": "Enter, X1 Start"
"Power": ""
}, },
"NeoGeo Portable Controller": { "NeoGeo Portable Controller": {
"P1 Up": "Up, X1 DpadUp, X1 LStickUp", "P1 Up": "Up, X1 DpadUp, X1 LStickUp",
@ -1228,12 +963,9 @@
"P1 Right": "Right, X1 DpadRight, X1 LStickRight", "P1 Right": "Right, X1 DpadRight, X1 LStickRight",
"P1 B": "Z, J1 B1, X1 X", "P1 B": "Z, J1 B1, X1 X",
"P1 A": "X, J1 B2, X1 A", "P1 A": "X, J1 B2, X1 A",
"P1 Option": "Enter, J1 B10, X1 Start", "P1 Option": "Enter, J1 B10, X1 Start"
"Power": ""
}, },
"Vectrex Digital Controller": { "Vectrex Digital Controller": {
"Reset": "",
"Power": "",
"P1 Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp", "P1 Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp",
"P1 Down": "Down, J1 POV1D, X1 DpadDown, X1 LStickDown", "P1 Down": "Down, J1 POV1D, X1 DpadDown, X1 LStickDown",
"P1 Left": "Left, J1 POV1L, X1 DpadLeft, X1 LStickLeft", "P1 Left": "Left, J1 POV1L, X1 DpadLeft, X1 LStickLeft",
@ -1244,8 +976,6 @@
"P1 Button 4": "S, J1 B4, X1 Y" "P1 Button 4": "S, J1 B4, X1 Y"
}, },
"Vectrex Analog Controller": { "Vectrex Analog Controller": {
"Reset": "",
"Power": "",
"P1 Button 1": "Z, J1 B2, X1 A", "P1 Button 1": "Z, J1 B2, X1 A",
"P1 Button 2": "X, J1 B3, X1 B", "P1 Button 2": "X, J1 B3, X1 B",
"P1 Button 3": "A, J1 B1, X1 X", "P1 Button 3": "A, J1 B1, X1 X",
@ -1274,286 +1004,46 @@
}, },
"AllTrollersAutoFire": { "AllTrollersAutoFire": {
"NES Controller": { "NES Controller": {
"P1 Up": "",
"P1 Down": "",
"P1 Left": "",
"P1 Right": "",
"P1 Start": "",
"P1 Select": "",
"P1 B": "A", "P1 B": "A",
"P1 A": "S", "P1 A": "S"
"P2 Up": "",
"P2 Down": "",
"P2 Left": "",
"P2 Right": "",
"P2 Start": "",
"P2 Select": "",
"P2 B": "",
"P2 A": "",
"P2 Fire": "",
"P2 Microphone": "",
"P3 Fire": "",
"Reset": "",
"Power": ""
}, },
"Gameboy Controller": { "Gameboy Controller": {
"Up": "",
"Down": "",
"Left": "",
"Right": "",
"Start": "",
"Select": "",
"B": "A", "B": "A",
"A": "S", "A": "S"
"Power": ""
}, },
"Gameboy Controller H": { "Gameboy Controller H": {
"Up": "",
"Down": "",
"Left": "",
"Right": "",
"Start": "",
"Select": "",
"B": "A", "B": "A",
"A": "S", "A": "S"
"Power": ""
}, },
"GBAController": { "GBAController": {
"Up": "",
"Down": "",
"Left": "",
"Right": "",
"Start": "",
"Select": "",
"B": "A", "B": "A",
"A": "S", "A": "S"
"L": "",
"R": "",
"Power": ""
}, },
"Atari 2600 Basic Controller": { "Atari 2600 Basic Controller": {
"Reset": "",
"Select": "",
"P1 Up": "",
"P1 Down": "",
"P1 Left": "",
"P1 Right": "",
"P1 Button": "A", "P1 Button": "A",
"P2 Up": "",
"P2 Down": "",
"P2 Left": "",
"P2 Right": "",
"P2 Button": "S" "P2 Button": "S"
}, },
"PC Engine Controller": { "PC Engine Controller": {
"Reset": "",
"Power": "",
"P1 Up": "",
"P1 Down": "",
"P1 Left": "",
"P1 Right": "",
"P1 B2": "A", "P1 B2": "A",
"P1 B1": "S", "P1 B1": "S"
"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": { "SMS Controller": {
"P1 Up": "",
"P1 Down": "",
"P1 Left": "",
"P1 Right": "",
"P1 B1": "A", "P1 B1": "A",
"P1 B2": "S", "P1 B2": "S"
"Reset": "",
"Pause": "",
"P2 Up": "",
"P2 Down": "",
"P2 Left": "",
"P2 Right": "",
"P2 B1": "",
"P2 B2": ""
},
"GPGX Genesis Controller": {
"P1 Up": "",
"P1 Down": "",
"P1 Left": "",
"P1 Right": "",
"P1 A": "",
"P1 B": "",
"P1 C": "",
"P1 Start": "",
"P1 X": "",
"P1 Y": "",
"P1 Z": "",
"P1 Mode": "",
"P2 Up": "",
"P2 Down": "",
"P2 Left": "",
"P2 Right": "",
"P2 A": "",
"P2 B": "",
"P2 C": "",
"P2 Start": "",
"P2 X": "",
"P2 Y": "",
"P2 Z": "",
"P2 Mode": "",
"Power": "",
"Reset": ""
}, },
"GPGX Genesis Controller": { },
"GBA Controller": { "GBA Controller": {
"Up": "",
"Down": "",
"Left": "",
"Right": "",
"Start": "",
"Select": "",
"B": "A", "B": "A",
"A": "S", "A": "S"
"L": "",
"R": "",
"Power": ""
}, },
"WonderSwan Controller": { "WonderSwan Controller": {
"P1 B": "A", "P1 B": "A",
"P1 A": "S", "P1 A": "S",
"P2 X4": "A", "P2 X4": "A",
"P2 X3": "S", "P2 X3": "S"
"Power": ""
},
"Lynx Controller": {
"Up": "",
"Down": "",
"Left": "",
"Right": "",
"A": "",
"B": "",
"Option 1": "",
"Option 2": "",
"Pause": "",
"Power": ""
}, },
"Apple IIe Keyboard": { "Apple IIe Keyboard": {
"Delete": "", "Return": "Enter"
"Left": "",
"Tab": "",
"Down": "",
"Up": "",
"Return": "Enter",
"Right": "",
"Escape": "",
"Space": "",
"'": "",
",": "",
"-": "",
".": "",
"/": "",
"0": "",
"1": "",
"2": "",
"3": "",
"4": "",
"5": "",
"6": "",
"7": "",
"8": "",
"9": "",
";": "",
"=": "",
"[": "",
"\\": "",
"]": "",
"`": "",
"A": "",
"B": "",
"C": "",
"D": "",
"E": "",
"F": "",
"G": "",
"H": "",
"I": "",
"J": "",
"K": "",
"L": "",
"M": "",
"N": "",
"O": "",
"P": "",
"Q": "",
"R": "",
"S": "",
"T": "",
"U": "",
"V": "",
"W": "",
"X": "",
"Y": "",
"Z": "",
"Control": "",
"Shift": "",
"Caps Lock": "",
"Previous Disk": "",
"Next Disk": ""
},
"VirtualBoy Controller": {
"L_Up": "",
"L_Down": "",
"L_Left": "",
"L_Right": "",
"R_Up": "",
"R_Down": "",
"R_Left": "",
"R_Right": "",
"B": "",
"A": "",
"R": "",
"L": "",
"Select": "",
"Start": "",
"Power": ""
},
"NeoGeo Portable Controller": {
"Up": "",
"Down": "",
"Left": "",
"Right": "",
"B": "",
"A": "",
"Option": "",
"Power": ""
} }
}, },
"AllTrollersAnalog": { "AllTrollersAnalog": {

2
src/BizHawk.Client.EmuHawk/config/ControllerConfig/ControllerConfigPanel.Designer.cs generated
View File

@ -55,10 +55,8 @@
this.ContextMenuStrip = this.contextMenuStrip1; this.ContextMenuStrip = this.contextMenuStrip1;
this.Name = "ControllerConfigPanel"; this.Name = "ControllerConfigPanel";
this.Size = new System.Drawing.Size(203, 292); this.Size = new System.Drawing.Size(203, 292);
this.Load += new System.EventHandler(this.ControllerConfigPanel_Load);
this.contextMenuStrip1.ResumeLayout(false); this.contextMenuStrip1.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);
} }
#endregion #endregion

10
src/BizHawk.Client.EmuHawk/config/ControllerConfig/ControllerConfigPanel.cs
View File

@ -38,10 +38,6 @@ namespace BizHawk.Client.EmuHawk
InitializeComponent(); InitializeComponent();
} }
private void ControllerConfigPanel_Load(object sender, EventArgs e)
{
}
private void ClearAll() private void ClearAll()
{ {
_inputs.ForEach(x => x.Clear()); _inputs.ForEach(x => x.Clear());
@ -56,7 +52,11 @@ namespace BizHawk.Client.EmuHawk
var saveTo = saveConfigObject ?? _realConfigObject; var saveTo = saveConfigObject ?? _realConfigObject;
for (int button = 0; button < _buttons.Count; button++) for (int button = 0; button < _buttons.Count; button++)
{ {
saveTo[_buttons[button]] = _inputs[button].Bindings; var bindings = _inputs[button].Bindings;
if (!string.IsNullOrWhiteSpace(bindings))
{
saveTo[_buttons[button]] = bindings;
}
} }
} }