diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ButtonSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ButtonSchema.cs index b99f3a4d2f..ce9fbbeef8 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ButtonSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ButtonSchema.cs @@ -1,6 +1,6 @@ using System.Drawing; using System.Windows.Forms; - +using BizHawk.Client.EmuHawk.Properties; using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk @@ -52,50 +52,50 @@ namespace BizHawk.Client.EmuHawk public static ButtonSchema Up(int x, int y, string name = null) => new ButtonSchema(x, y, name ?? "Up") { - Icon = Properties.Resources.BlueUp + Icon = Resources.BlueUp }; public static ButtonSchema Up(int x, int y, int controller) => new ButtonSchema(x, y, controller, "Up") { - Icon = Properties.Resources.BlueUp + Icon = Resources.BlueUp }; public static ButtonSchema Down(int x, int y, string name = null) => new ButtonSchema(x, y, name ?? "Down") { - Icon = Properties.Resources.BlueDown + Icon = Resources.BlueDown }; public static ButtonSchema Down(int x, int y, int controller) => new ButtonSchema(x, y, controller, "Down") { - Icon = Properties.Resources.BlueDown + Icon = Resources.BlueDown }; public static ButtonSchema Left(int x, int y, string name = null) => new ButtonSchema(x, y, name ?? "Left") { - Icon = Properties.Resources.Back + Icon = Resources.Back }; public static ButtonSchema Left(int x, int y, int controller) => new ButtonSchema(x, y, controller, "Left") { - Icon = Properties.Resources.Back + Icon = Resources.Back }; public static ButtonSchema Right(int x, int y, string name = null) => new ButtonSchema(x, y, name ?? "Right") { - Icon = Properties.Resources.Forward + Icon = Resources.Forward }; public static ButtonSchema Right(int x, int y, int controller) => new ButtonSchema(x, y, controller, "Right") { - Icon = Properties.Resources.Forward + Icon = Resources.Forward }; } diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs index 29b344680d..94e48bc8fe 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; +using BizHawk.Client.EmuHawk.Properties; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Consoles.Sega.gpgx; @@ -184,14 +185,14 @@ namespace BizHawk.Client.EmuHawk Size = new Size(110, 110), Buttons = new[] { - new ButtonSchema(15, 43, controller, "1U") { Icon = Properties.Resources.Back }, - new ButtonSchema(22, 20, controller, "2U") { Icon = Properties.Resources.NW }, - new ButtonSchema(47, 10, controller, "3U") { Icon = Properties.Resources.BlueUp }, - new ButtonSchema(70, 20, controller, "4U") { Icon = Properties.Resources.NE }, - new ButtonSchema(80, 43, controller, "5U") { Icon = Properties.Resources.Forward }, - new ButtonSchema(70, 65, controller, "6U") { Icon = Properties.Resources.SE }, - new ButtonSchema(47, 73, controller, "7U") { Icon = Properties.Resources.BlueDown }, - new ButtonSchema(22, 65, controller, "8U") { Icon = Properties.Resources.SW } + new ButtonSchema(15, 43, controller, "1U") { Icon = Resources.Back }, + new ButtonSchema(22, 20, controller, "2U") { Icon = Resources.NW }, + new ButtonSchema(47, 10, controller, "3U") { Icon = Resources.BlueUp }, + new ButtonSchema(70, 20, controller, "4U") { Icon = Resources.NE }, + new ButtonSchema(80, 43, controller, "5U") { Icon = Resources.Forward }, + new ButtonSchema(70, 65, controller, "6U") { Icon = Resources.SE }, + new ButtonSchema(47, 73, controller, "7U") { Icon = Resources.BlueDown }, + new ButtonSchema(22, 65, controller, "8U") { Icon = Resources.SW } } }; } diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs index 9f2eb83b9d..0b09807c0b 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; +using BizHawk.Client.EmuHawk.Properties; using BizHawk.Common.ReflectionExtensions; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Intellivision; @@ -47,70 +48,22 @@ namespace BizHawk.Client.EmuHawk Size = new Size(148, 332), Buttons = StandardButtons(controller).Concat(new[] { - new ButtonSchema(51, 124, controller, "N") - { - Icon = Properties.Resources.BlueUp - }, - new ButtonSchema(63, 145, controller, "NNE") - { - Icon = Properties.Resources.NNE - }, - new ButtonSchema(39, 145, controller, "NNW") - { - Icon = Properties.Resources.NNW - }, - new ButtonSchema(75, 166, controller, "NE") - { - Icon = Properties.Resources.NE - }, - new ButtonSchema(27, 166, controller, "NW") - { - Icon = Properties.Resources.NW - }, - new ButtonSchema(87, 187, controller, "ENE") - { - Icon = Properties.Resources.ENE - }, - new ButtonSchema(15, 187, controller, "WNW") - { - Icon = Properties.Resources.WNW - }, - new ButtonSchema(99, 208, controller, "E") - { - Icon = Properties.Resources.Forward - }, - new ButtonSchema(3, 208, controller, "W") - { - Icon = Properties.Resources.Back - }, - new ButtonSchema(87, 229, controller, "ESE") - { - Icon = Properties.Resources.ESE - }, - new ButtonSchema(15, 229, controller, "WSW") - { - Icon = Properties.Resources.WSW - }, - new ButtonSchema(75, 250, controller, "SE") - { - Icon = Properties.Resources.SE - }, - new ButtonSchema(27, 250, controller, "SW") - { - Icon = Properties.Resources.SW - }, - new ButtonSchema(63, 271, controller, "SSE") - { - Icon = Properties.Resources.SSE - }, - new ButtonSchema(39, 271, controller, "SSW") - { - Icon = Properties.Resources.SSW - }, - new ButtonSchema(51, 292, controller, "S") - { - Icon = Properties.Resources.BlueDown - } + new ButtonSchema(51, 124, controller, "N") { Icon = Resources.BlueUp }, + new ButtonSchema(63, 145, controller, "NNE") { Icon = Resources.NNE }, + new ButtonSchema(39, 145, controller, "NNW") { Icon = Resources.NNW }, + new ButtonSchema(75, 166, controller, "NE") { Icon = Resources.NE }, + new ButtonSchema(27, 166, controller, "NW") { Icon = Resources.NW }, + new ButtonSchema(87, 187, controller, "ENE") { Icon = Resources.ENE }, + new ButtonSchema(15, 187, controller, "WNW") { Icon = Resources.WNW }, + new ButtonSchema(99, 208, controller, "E") { Icon = Resources.Forward }, + new ButtonSchema(3, 208, controller, "W") { Icon = Resources.Back }, + new ButtonSchema(87, 229, controller, "ESE") { Icon = Resources.ESE }, + new ButtonSchema(15, 229, controller, "WSW") { Icon = Resources.WSW }, + new ButtonSchema(75, 250, controller, "SE") { Icon = Resources.SE }, + new ButtonSchema(27, 250, controller, "SW") { Icon = Resources.SW }, + new ButtonSchema(63, 271, controller, "SSE") { Icon = Resources.SSE }, + new ButtonSchema(39, 271, controller, "SSW") { Icon = Resources.SSW }, + new ButtonSchema(51, 292, controller, "S") { Icon = Resources.BlueDown } }) }; } diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs index 44bc0b8a0e..b7cfcf5e93 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs @@ -113,7 +113,7 @@ namespace BizHawk.Client.EmuHawk { SecondaryNames = new[] { $"P{controller} Stick Vertical" }, AxisRange = axisRanges[0], - SecondaryAxisRange = axisRanges[1], + SecondaryAxisRange = axisRanges[1] }, new SingleFloatSchema(8, 12, controller, "Left Shoulder") {