diff --git a/BizHawk.MultiClient/Input/ControllerBinding.cs b/BizHawk.MultiClient/Input/ControllerBinding.cs index c4c2d6b812..6dc0d98704 100644 --- a/BizHawk.MultiClient/Input/ControllerBinding.cs +++ b/BizHawk.MultiClient/Input/ControllerBinding.cs @@ -169,8 +169,8 @@ namespace BizHawk.MultiClient input.Append(IsPressed("P1 Right") ? "R" : "."); input.Append(IsPressed("P1 B1") ? "1" : "."); input.Append(IsPressed("P1 B2") ? "2" : "."); - input.Append(IsPressed("P1 Select") ? "S" : "."); input.Append(IsPressed("P1 Run") ? "R" : "."); + input.Append(IsPressed("P1 Select") ? "S" : "."); input.Append("|"); input.Append(IsPressed("P2 Up") ? "U" : "."); @@ -179,8 +179,8 @@ namespace BizHawk.MultiClient input.Append(IsPressed("P2 Right") ? "R" : "."); input.Append(IsPressed("P2 B1") ? "1" : "."); input.Append(IsPressed("P2 B2") ? "2" : "."); - input.Append(IsPressed("P2 Select") ? "S" : "."); input.Append(IsPressed("P2 Run") ? "R" : "."); + input.Append(IsPressed("P2 Select") ? "S" : "."); input.Append("|"); input.Append(IsPressed("P3 Up") ? "U" : "."); @@ -189,8 +189,8 @@ namespace BizHawk.MultiClient input.Append(IsPressed("P3 Right") ? "R" : "."); input.Append(IsPressed("P3 B1") ? "1" : "."); input.Append(IsPressed("P3 B2") ? "2" : "."); - input.Append(IsPressed("P3 Select") ? "S" : "."); input.Append(IsPressed("P3 Run") ? "R" : "."); + input.Append(IsPressed("P3 Select") ? "S" : "."); input.Append("|"); input.Append(IsPressed("P4 Up") ? "U" : "."); @@ -199,8 +199,8 @@ namespace BizHawk.MultiClient input.Append(IsPressed("P4 Right") ? "R" : "."); input.Append(IsPressed("P4 B1") ? "1" : "."); input.Append(IsPressed("P4 B2") ? "2" : "."); - input.Append(IsPressed("P4 Select") ? "S" : "."); input.Append(IsPressed("P4 Run") ? "R" : "."); + input.Append(IsPressed("P4 Select") ? "S" : "."); input.Append("|"); input.Append(IsPressed("P5 Up") ? "U" : "."); @@ -209,8 +209,8 @@ namespace BizHawk.MultiClient input.Append(IsPressed("P5 Right") ? "R" : "."); input.Append(IsPressed("P5 B1") ? "1" : "."); input.Append(IsPressed("P5 B2") ? "2" : "."); - input.Append(IsPressed("P5 Select") ? "S" : "."); input.Append(IsPressed("P5 Run") ? "R" : "."); + input.Append(IsPressed("P5 Select") ? "S" : "."); input.Append("|"); return input.ToString(); @@ -268,8 +268,8 @@ namespace BizHawk.MultiClient if (mnemonic[4] != '.') programmaticallyPressedButtons.Add("P1 Right"); if (mnemonic[5] != '.') programmaticallyPressedButtons.Add("P1 B1"); if (mnemonic[6] != '.') programmaticallyPressedButtons.Add("P1 B2"); - if (mnemonic[7] != '.') programmaticallyPressedButtons.Add("P1 Select"); - if (mnemonic[8] != '.') programmaticallyPressedButtons.Add("P1 Run"); + if (mnemonic[7] != '.') programmaticallyPressedButtons.Add("P1 Run"); + if (mnemonic[8] != '.') programmaticallyPressedButtons.Add("P1 Select"); if (mnemonic[10] != '.') programmaticallyPressedButtons.Add("P2 Up"); if (mnemonic[11] != '.') programmaticallyPressedButtons.Add("P2 Down"); @@ -277,8 +277,8 @@ namespace BizHawk.MultiClient if (mnemonic[13] != '.') programmaticallyPressedButtons.Add("P2 Right"); if (mnemonic[14] != '.') programmaticallyPressedButtons.Add("P2 B1"); if (mnemonic[15] != '.') programmaticallyPressedButtons.Add("P2 B2"); - if (mnemonic[16] != '.') programmaticallyPressedButtons.Add("P2 Select"); - if (mnemonic[17] != '.') programmaticallyPressedButtons.Add("P2 Run"); + if (mnemonic[16] != '.') programmaticallyPressedButtons.Add("P2 Run"); + if (mnemonic[17] != '.') programmaticallyPressedButtons.Add("P2 Select"); if (mnemonic[19] != '.') programmaticallyPressedButtons.Add("P3 Up"); if (mnemonic[20] != '.') programmaticallyPressedButtons.Add("P3 Down"); @@ -286,8 +286,8 @@ namespace BizHawk.MultiClient if (mnemonic[22] != '.') programmaticallyPressedButtons.Add("P3 Right"); if (mnemonic[23] != '.') programmaticallyPressedButtons.Add("P3 B1"); if (mnemonic[24] != '.') programmaticallyPressedButtons.Add("P3 B2"); - if (mnemonic[25] != '.') programmaticallyPressedButtons.Add("P3 Select"); - if (mnemonic[26] != '.') programmaticallyPressedButtons.Add("P3 Run"); + if (mnemonic[25] != '.') programmaticallyPressedButtons.Add("P3 Run"); + if (mnemonic[26] != '.') programmaticallyPressedButtons.Add("P3 Select"); if (mnemonic[28] != '.') programmaticallyPressedButtons.Add("P4 Up"); if (mnemonic[29] != '.') programmaticallyPressedButtons.Add("P4 Down"); @@ -295,8 +295,8 @@ namespace BizHawk.MultiClient if (mnemonic[31] != '.') programmaticallyPressedButtons.Add("P4 Right"); if (mnemonic[32] != '.') programmaticallyPressedButtons.Add("P4 B1"); if (mnemonic[33] != '.') programmaticallyPressedButtons.Add("P4 B2"); - if (mnemonic[34] != '.') programmaticallyPressedButtons.Add("P4 Select"); - if (mnemonic[35] != '.') programmaticallyPressedButtons.Add("P4 Run"); + if (mnemonic[34] != '.') programmaticallyPressedButtons.Add("P4 Run"); + if (mnemonic[35] != '.') programmaticallyPressedButtons.Add("P4 Select"); if (mnemonic[37] != '.') programmaticallyPressedButtons.Add("P5 Up"); if (mnemonic[38] != '.') programmaticallyPressedButtons.Add("P5 Down"); @@ -304,8 +304,8 @@ namespace BizHawk.MultiClient if (mnemonic[40] != '.') programmaticallyPressedButtons.Add("P5 Right"); if (mnemonic[41] != '.') programmaticallyPressedButtons.Add("P5 B1"); if (mnemonic[42] != '.') programmaticallyPressedButtons.Add("P5 B2"); - if (mnemonic[43] != '.') programmaticallyPressedButtons.Add("P5 Select"); - if (mnemonic[44] != '.') programmaticallyPressedButtons.Add("P5 Run"); + if (mnemonic[43] != '.') programmaticallyPressedButtons.Add("P5 Run"); + if (mnemonic[44] != '.') programmaticallyPressedButtons.Add("P5 Select"); } if (type.Name == "NES Controls")