diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchemaControl.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchemaControl.cs index dbceab1594..6c06972718 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchemaControl.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchemaControl.cs @@ -59,19 +59,6 @@ namespace BizHawk.Client.EmuHawk public static ButtonSchema Right(int x, int y, int controller) => new ButtonSchema(x, y, controller, "Right") { Icon = Resources.Forward }; - - // Nyma has its own conventions - public static ButtonSchema NymaUp(int x, int y, int controller) - => new ButtonSchema(x, y, controller, "UP ↑") { Icon = Resources.BlueUp }; - - public static ButtonSchema NymaDown(int x, int y, int controller) - => new ButtonSchema(x, y, controller, "DOWN ↓") { Icon = Resources.BlueDown }; - - public static ButtonSchema NymaLeft(int x, int y, int controller) - => new ButtonSchema(x, y, controller, "LEFT ←") { Icon = Resources.Back }; - - public static ButtonSchema NymaRight(int x, int y, int controller) - => new ButtonSchema(x, y, controller, "RIGHT →") { Icon = Resources.Forward }; } /// A single analog control (e.g. pressure sensitive button) diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs index 0c0b8f5a05..44aa2f417a 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs @@ -118,10 +118,10 @@ namespace BizHawk.Client.EmuHawk Size = new Size(230, 100), Buttons = new[] { - ButtonSchema.NymaUp(14, 12, controller), - ButtonSchema.NymaDown(14, 56, controller), - ButtonSchema.NymaLeft(2, 34, controller), - ButtonSchema.NymaRight(24, 34, controller), + ButtonSchema.Up(14, 12, controller), + ButtonSchema.Down(14, 56, controller), + ButtonSchema.Left(2, 34, controller), + ButtonSchema.Right(24, 34, controller), new ButtonSchema(77, 17, controller, "Mode: Set 2-button") { DisplayName = "2 Btn" }, new ButtonSchema(77, 40, controller, "Mode: Set 6-button") { DisplayName = "6 Btn" }, new ButtonSchema(140, 63, controller, "IV"), diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs index 8ae66432ca..1a653f5b10 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs @@ -45,10 +45,10 @@ namespace BizHawk.Client.EmuHawk Size = new Size(230, 100), Buttons = new[] { - ButtonSchema.NymaUp(14, 12, controller), - ButtonSchema.NymaDown(14, 56, controller), - ButtonSchema.NymaLeft(2, 34, controller), - ButtonSchema.NymaRight(24, 34, controller), + ButtonSchema.Up(14, 12, controller), + ButtonSchema.Down(14, 56, controller), + ButtonSchema.Left(2, 34, controller), + ButtonSchema.Right(24, 34, controller), new ButtonSchema(72, 17, controller, "MODE 1: Set A") { DisplayName = "1A" }, new ButtonSchema(72, 40, controller, "MODE 2: Set A") { DisplayName = "2A" }, new ButtonSchema(102, 17, controller, "MODE 1: Set B") { DisplayName = "1B" },