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

wonderswan: change pad names for fun and profit. breaks controller config. does not break existing mooovies

This commit is contained in:
goyuken 2014-06-07 01:26:16 +00:00
parent abff21a450
commit 11af441464
4 changed files with 89 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
BizHawk.Client.Common/movie/MovieMnemonics.cs
View File

@ -197,26 +197,26 @@ namespace BizHawk.Client.Common
public static Tuple<string, char>[] WSMnemonic = new[]
{
new Tuple<string, char>(null, '|'),
new Tuple<string, char>("P1 Up X", 'U'),
new Tuple<string, char>("P1 Down X", 'D'),
new Tuple<string, char>("P1 Left X", 'L'),
new Tuple<string, char>("P1 Right X", 'R'),
new Tuple<string, char>("P1 Up Y", 'U'),
new Tuple<string, char>("P1 Down Y", 'D'),
new Tuple<string, char>("P1 Left Y", 'L'),
new Tuple<string, char>("P1 Right Y", 'R'),
new Tuple<string, char>("P1 X1", '1'),
new Tuple<string, char>("P1 X3", '3'),
new Tuple<string, char>("P1 X4", '4'),
new Tuple<string, char>("P1 X2", '2'),
new Tuple<string, char>("P1 Y1", '1'),
new Tuple<string, char>("P1 Y3", '3'),
new Tuple<string, char>("P1 Y4", '4'),
new Tuple<string, char>("P1 Y2", '2'),
new Tuple<string, char>("P1 Start", 'S'),
new Tuple<string, char>("P1 B", 'B'),
new Tuple<string, char>("P1 A", 'A'),
new Tuple<string, char>(null, '|'),
new Tuple<string, char>("P2 Up X", 'U'),
new Tuple<string, char>("P2 Down X", 'D'),
new Tuple<string, char>("P2 Left X", 'L'),
new Tuple<string, char>("P2 Right X", 'R'),
new Tuple<string, char>("P2 Up Y", 'U'),
new Tuple<string, char>("P2 Down Y", 'D'),
new Tuple<string, char>("P2 Left Y", 'L'),
new Tuple<string, char>("P2 Right Y", 'R'),
new Tuple<string, char>("P2 X1", '1'),
new Tuple<string, char>("P2 X3", '3'),
new Tuple<string, char>("P2 X4", '4'),
new Tuple<string, char>("P2 X2", '2'),
new Tuple<string, char>("P2 Y1", '1'),
new Tuple<string, char>("P2 Y3", '3'),
new Tuple<string, char>("P2 Y4", '4'),
new Tuple<string, char>("P2 Y2", '2'),
new Tuple<string, char>("P2 Start", 'S'),
new Tuple<string, char>("P2 B", 'B'),
new Tuple<string, char>("P2 A", 'A'),

46
BizHawk.Emulation.Cores/Consoles/WonderSwan/BizSwan.cs
View File

@ -160,31 +160,31 @@ namespace BizHawk.Emulation.Cores.WonderSwan
[Flags]
public enum Buttons : uint
{
UpX = 0x00000001,
RightX = 0x00000002,
DownX = 0x00000004,
LeftX = 0x00000008,
UpY = 0x00000010,
RightY = 0x00000020,
DownY = 0x00000040,
LeftY = 0x00000080,
Start = 0x00000100,
A = 0x00000200,
B = 0x00000400,
X1 = 0x00000001,
X2 = 0x00000002,
X3 = 0x00000004,
X4 = 0x00000008,
Y1 = 0x00000010,
Y2 = 0x00000020,
Y3 = 0x00000040,
Y4 = 0x00000080,
Start = 0x00000100,
A = 0x00000200,
B = 0x00000400,
R_UpX = 0x00010000,
R_RightX = 0x00020000,
R_DownX = 0x00040000,
R_LeftX = 0x00080000,
R_UpY = 0x00100000,
R_RightY = 0x00200000,
R_DownY = 0x00400000,
R_LeftY = 0x00800000,
R_Start = 0x01000000,
R_A = 0x02000000,
R_B = 0x04000000,
R_X1 = 0x00010000,
R_X2 = 0x00020000,
R_X3 = 0x00040000,
R_X4 = 0x00080000,
R_Y1 = 0x00100000,
R_Y2 = 0x00200000,
R_Y3 = 0x00400000,
R_Y4 = 0x00800000,
R_Start = 0x01000000,
R_A = 0x02000000,
R_B = 0x04000000,
Rotate = 0x80000000,
Rotate = 0x80000000,
}
public enum Language : uint

64
BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs
View File

@ -21,26 +21,26 @@ namespace BizHawk.Emulation.Cores.WonderSwan
Name = "WonderSwan Controller",
BoolButtons =
{
"P1 Up X",
"P1 Down X",
"P1 Left X",
"P1 Right X",
"P1 Up Y",
"P1 Down Y",
"P1 Left Y",
"P1 Right Y",
"P1 X1",
"P1 X2",
"P1 X3",
"P1 X4",
"P1 Y1",
"P1 Y2",
"P1 Y3",
"P1 Y4",
"P1 Start",
"P1 B",
"P1 A",
"P2 Up X",
"P2 Down X",
"P2 Left X",
"P2 Right X",
"P2 Up Y",
"P2 Down Y",
"P2 Left Y",
"P2 Right Y",
"P2 X1",
"P2 X2",
"P2 X3",
"P2 X4",
"P2 Y1",
"P2 Y2",
"P2 Y3",
"P2 Y4",
"P2 Start",
"P2 B",
"P2 A",
@ -55,26 +55,26 @@ namespace BizHawk.Emulation.Cores.WonderSwan
BizSwan.Buttons GetButtons()
{
BizSwan.Buttons ret = 0;
if (Controller["P1 Up X"]) ret |= BizSwan.Buttons.UpX;
if (Controller["P1 Down X"]) ret |= BizSwan.Buttons.DownX;
if (Controller["P1 Left X"]) ret |= BizSwan.Buttons.LeftX;
if (Controller["P1 Right X"]) ret |= BizSwan.Buttons.RightX;
if (Controller["P1 Up Y"]) ret |= BizSwan.Buttons.UpY;
if (Controller["P1 Down Y"]) ret |= BizSwan.Buttons.DownY;
if (Controller["P1 Left Y"]) ret |= BizSwan.Buttons.LeftY;
if (Controller["P1 Right Y"]) ret |= BizSwan.Buttons.RightY;
if (Controller["P1 X1"]) ret |= BizSwan.Buttons.X1;
if (Controller["P1 X2"]) ret |= BizSwan.Buttons.X2;
if (Controller["P1 X3"]) ret |= BizSwan.Buttons.X3;
if (Controller["P1 X4"]) ret |= BizSwan.Buttons.X4;
if (Controller["P1 Y1"]) ret |= BizSwan.Buttons.Y1;
if (Controller["P1 Y2"]) ret |= BizSwan.Buttons.Y2;
if (Controller["P1 Y3"]) ret |= BizSwan.Buttons.Y3;
if (Controller["P1 Y4"]) ret |= BizSwan.Buttons.Y4;
if (Controller["P1 Start"]) ret |= BizSwan.Buttons.Start;
if (Controller["P1 B"]) ret |= BizSwan.Buttons.B;
if (Controller["P1 A"]) ret |= BizSwan.Buttons.A;
if (Controller["P2 Up X"]) ret |= BizSwan.Buttons.R_UpX;
if (Controller["P2 Down X"]) ret |= BizSwan.Buttons.R_DownX;
if (Controller["P2 Left X"]) ret |= BizSwan.Buttons.R_LeftX;
if (Controller["P2 Right X"]) ret |= BizSwan.Buttons.R_RightX;
if (Controller["P2 Up Y"]) ret |= BizSwan.Buttons.R_UpY;
if (Controller["P2 Down Y"]) ret |= BizSwan.Buttons.R_DownY;
if (Controller["P2 Left Y"]) ret |= BizSwan.Buttons.R_LeftY;
if (Controller["P2 Right Y"]) ret |= BizSwan.Buttons.R_RightY;
if (Controller["P2 X1"]) ret |= BizSwan.Buttons.R_X1;
if (Controller["P2 X2"]) ret |= BizSwan.Buttons.R_X2;
if (Controller["P2 X3"]) ret |= BizSwan.Buttons.R_X3;
if (Controller["P2 X4"]) ret |= BizSwan.Buttons.R_X4;
if (Controller["P2 Y1"]) ret |= BizSwan.Buttons.R_Y1;
if (Controller["P2 Y2"]) ret |= BizSwan.Buttons.R_Y2;
if (Controller["P2 Y3"]) ret |= BizSwan.Buttons.R_Y3;
if (Controller["P2 Y4"]) ret |= BizSwan.Buttons.R_Y4;
if (Controller["P2 Start"]) ret |= BizSwan.Buttons.R_Start;
if (Controller["P2 B"]) ret |= BizSwan.Buttons.R_B;
if (Controller["P2 A"]) ret |= BizSwan.Buttons.R_A;

36
output/defctrl.json
View File

@ -558,26 +558,26 @@
"Reset": ""
},
"WonderSwan Controller": {
"P1 Up X": "UpArrow, J1 POV1U, X1 DpadUp, X1 LStickUp",
"P1 Down X": "DownArrow, J1 POV1D, X1 DpadDown, X1 LStickDown",
"P1 Left X": "LeftArrow, J1 POV1L, X1 DpadLeft, X1 LStickLeft",
"P1 Right X": "RightArrow, J1 POV1R, X1 DpadRight, X1 LStickRight",
"P1 Up Y": "NumberPad8, J1 RotationZ-, X1 RStickUp",
"P1 Down Y": "NumberPad2, J1 RotationZ+, X1 RStickDown",
"P1 Left Y": "NumberPad4, J1 Z-, X1 RStickLeft",
"P1 Right Y": "NumberPad6, J1 Z+, X1 RStickRight",
"P1 X1": "UpArrow, J1 POV1U, X1 DpadUp, X1 LStickUp",
"P1 X3": "DownArrow, J1 POV1D, X1 DpadDown, X1 LStickDown",
"P1 X4": "LeftArrow, J1 POV1L, X1 DpadLeft, X1 LStickLeft",
"P1 X2": "RightArrow, J1 POV1R, X1 DpadRight, X1 LStickRight",
"P1 Y1": "NumberPad8, J1 RotationZ-, X1 RStickUp",
"P1 Y3": "NumberPad2, J1 RotationZ+, X1 RStickDown",
"P1 Y4": "NumberPad4, J1 Z-, X1 RStickLeft",
"P1 Y2": "NumberPad6, J1 Z+, X1 RStickRight",
"P1 Start": "Return, J1 B10, X1 Start",
"P1 B": "Z, J1 B1, X1 X",
"P1 A": "X, J1 B2, X1 A",
"P2 Up X": "",
"P2 Down X": "X, J1 B2, X1 A",
"P2 Left X": "Z, J1 B1, X1 X",
"P2 Right X": "",
"P2 Up Y": "LeftArrow, J1 POV1L, X1 DpadLeft, X1 LStickLeft",
"P2 Down Y": "RightArrow, J1 POV1R, X1 DpadRight, X1 LStickRight",
"P2 Left Y": "DownArrow, J1 POV1D, X1 DpadDown, X1 LStickDown",
"P2 Right Y": "UpArrow, J1 POV1U, X1 DpadUp, X1 LStickUp",
"P2 X1": "",
"P2 X3": "X, J1 B2, X1 A",
"P2 X4": "Z, J1 B1, X1 X",
"P2 X2": "",
"P2 Y1": "LeftArrow, J1 POV1L, X1 DpadLeft, X1 LStickLeft",
"P2 Y3": "RightArrow, J1 POV1R, X1 DpadRight, X1 LStickRight",
"P2 Y4": "DownArrow, J1 POV1D, X1 DpadDown, X1 LStickDown",
"P2 Y2": "UpArrow, J1 POV1U, X1 DpadUp, X1 LStickUp",
"P2 Start": "Return, J1 B10, X1 Start",
"P2 B": "",
"P2 A": "",
@ -751,8 +751,8 @@
"WonderSwan Controller": {
"P1 B": "A",
"P1 A": "S",
"P2 Left X": "A",
"P2 Down X": "S",
"P2 X4": "A",
"P2 X3": "S",
"Power": ""
}
},