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

control name fix

This commit is contained in:
YoshiRulz 2022-01-27 19:55:43 +10:00
parent 68d79b69b9
commit a3cae89b18
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/defctrl.json
View File

@ -866,16 +866,12 @@
},
"PSX Front Panel": {
"P1 Up": "X1 DpadUp, Up",
"P1 D-Pad Up": "X1 DpadUp, Up",
"P1 Thumbstick Up": "X1 DpadUp, Up",
"P1 Down": "X1 DpadDown, Down",
"P1 D-Pad Down": "X1 DpadDown, Down",
"P1 Thumbstick Down": "X1 DpadDown, Down",
"P1 Left": "X1 DpadLeft, Left",
"P1 D-Pad Left": "X1 DpadLeft, Left",
"P1 Thumbstick Left": "X1 DpadLeft, Left",
"P1 Right": "X1 DpadRight, Right",
"P1 D-Pad Right": "X1 DpadRight, Right",
"P1 Thumbstick Right": "X1 DpadRight, Right",
"P1 Select": "X1 Back, Space",
"P1 Start": "X1 Start, Enter",
@ -892,9 +888,7 @@
"P1 L2": "X1 LeftTrigger, E",
"P1 R2": "X1 RightTrigger, R",
"P1 L3": "X1 LeftThumb, T",
"P1 Left Stick, Button": "X1 LeftThumb, T",
"P1 R3": "X1 RightThumb, Y",
"P1 Right Stick, Button": "X1 RightThumb, Y",
"P1 MODE": "D",
"P1 Analog": "D",
},

12
src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.ButtonNameOverrides.cs
View File

@ -13,7 +13,17 @@ namespace BizHawk.Emulation.Cores.Waterbox
private static readonly Dictionary<string, string> ButtonNameOverrides = new Dictionary<string, string>
{
["Left Shoulder"] = "L",
["Right Shoulder"] = "R"
["Right Shoulder"] = "R",
["Left Stick, Button"] = "L3",
["Right Stick, Button"] = "R3",
["Left Stick"] = "LStick",
["Right Stick"] = "RStick",
["Up/ Down"] = "Y", // space after Up is removed by regex replace
["Left/ Right"] = "X",
["D-Pad Up"] = "Up", // to match Octoshock
["D-Pad Down"] = "Down",
["D-Pad Left"] = "Left",
["D-Pad Right"] = "Right",
};
/// <summary>

4
src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.cs
View File

@ -176,7 +176,7 @@ namespace BizHawk.Emulation.Cores.Waterbox
case InputType.Axis:
{
var data = input.Extra.AsAxis();
var fullName = $"{name} {overrideName(data.NameNeg)} / {overrideName(data.NamePos)}";
var fullName = $"{name} {overrideName($"{data.NameNeg} / {data.NamePos}")}";
ret.AddAxis(fullName, 0.RangeTo(0xFFFF), 0x8000, (input.Flags & AxisFlags.InvertCo) != 0);
ret.CategoryLabels[fullName] = category;
@ -191,7 +191,7 @@ namespace BizHawk.Emulation.Cores.Waterbox
case InputType.AxisRel:
{
var data = input.Extra.AsAxis();
var fullName = $"{name} {input.Extra.AsAxis().NameNeg} / {input.Extra.AsAxis().NamePos}";
var fullName = $"{name} {overrideName($"{data.NameNeg} / {data.NamePos}")}";
// TODO: Mednafen docs say this range should be [-32768, 32767], and inspecting the code
// reveals that a 16 bit value is read, but using anywhere near this full range makes