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

Fix defctrl.json json parse error, Saturn keyboard - change names of keyboard R and L to not collide with the controller button names

This commit is contained in:
adelikat 2017-06-19 12:49:13 -05:00
parent f5883d8332
commit 810979dab2
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/defctrl.json
View File

@ -543,7 +543,7 @@
"P1 Q": "Q", "P1 Q": "Q",
"P1 W": "W", "P1 W": "W",
"P1 E": "E", "P1 E": "E",
"P1 R": "R", "P1 R(Key)": "R",
"P1 T": "T", "P1 T": "T",
"P1 Y(Key)": "Y", "P1 Y(Key)": "Y",
"P1 U": "U", "P1 U": "U",
@ -562,7 +562,7 @@
"P1 H": "H", "P1 H": "H",
"P1 J": "J", "P1 J": "J",
"P1 K": "K", "P1 K": "K",
"P1 L": "L", "P1 L(Key)": "L",
"P1 Semicolon;": "Semicolon", "P1 Semicolon;": "Semicolon",
"P1 Quote'": "Apostrophe", "P1 Quote'": "Apostrophe",
"P1 LeftShift": "LeftShift", "P1 LeftShift": "LeftShift",
@ -1495,5 +1495,6 @@
"Mult": 1.0, "Mult": 1.0,
"Deadzone": 0.1 "Deadzone": 0.1
} }
}
} }
} }

8
BizHawk.Emulation.Cores/Consoles/Sega/Saturn/SaturnusControllerDeck.cs
View File

@ -452,7 +452,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
"V", "V",
"F", "F",
"T", "T",
"R", "R(Key)",
"5", "5",
null, null,
null, null,
@ -482,7 +482,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
null, null,
"Period.", "Period.",
"Slash/", "Slash/",
"L", "L(Key)",
"Semicolon;", "Semicolon;",
"P", "P",
"Minus-", "Minus-",
@ -592,7 +592,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
case "Q": return 201; case "Q": return 201;
case "W": return 202; case "W": return 202;
case "E": return 203; case "E": return 203;
case "R": return 204; case "R(Key)": return 204;
case "T": return 205; case "T": return 205;
case "Y(Key)": return 206; case "Y(Key)": return 206;
case "U": return 207; case "U": return 207;
@ -612,7 +612,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
case "H": return 306; case "H": return 306;
case "J": return 307; case "J": return 307;
case "K": return 308; case "K": return 308;
case "L": return 309; case "L(Key)": return 309;
case "Semicolon;": return 310; case "Semicolon;": return 310;
case "Quote'": return 311; case "Quote'": return 311;