diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj index dd4ef680c6..66a3055d42 100644 --- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj +++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj @@ -1463,6 +1463,10 @@ + + + + diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs index c03f0fe9e7..7ee9b033f4 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs +++ b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs @@ -1388,5 +1388,45 @@ namespace BizHawk.Client.EmuHawk.Properties { return ((System.Drawing.Bitmap)(obj)); } } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap YellowDown { + get { + object obj = ResourceManager.GetObject("YellowDown", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap YellowLeft { + get { + object obj = ResourceManager.GetObject("YellowLeft", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap YellowRight { + get { + object obj = ResourceManager.GetObject("YellowRight", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap YellowUp { + get { + object obj = ResourceManager.GetObject("YellowUp", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.resx b/BizHawk.Client.EmuHawk/Properties/Resources.resx index 5c7c37f4e0..536c64885f 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.resx +++ b/BizHawk.Client.EmuHawk/Properties/Resources.resx @@ -942,4 +942,16 @@ ..\images\user_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\YellowDown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\YellowLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\YellowRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\YellowUp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/images/YellowDown.png b/BizHawk.Client.EmuHawk/images/YellowDown.png new file mode 100644 index 0000000000..1cd3bf0a29 Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/YellowDown.png differ diff --git a/BizHawk.Client.EmuHawk/images/YellowLeft.png b/BizHawk.Client.EmuHawk/images/YellowLeft.png new file mode 100644 index 0000000000..517ab4c4e6 Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/YellowLeft.png differ diff --git a/BizHawk.Client.EmuHawk/images/YellowRight.png b/BizHawk.Client.EmuHawk/images/YellowRight.png new file mode 100644 index 0000000000..61ad1e11b5 Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/YellowRight.png differ diff --git a/BizHawk.Client.EmuHawk/images/YellowUp.png b/BizHawk.Client.EmuHawk/images/YellowUp.png new file mode 100644 index 0000000000..9674f6782e Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/YellowUp.png differ diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs index 7250f92666..2d400ebee9 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs @@ -114,29 +114,29 @@ namespace BizHawk.Client.EmuHawk new PadSchema.ButtonScema { Name = "P" + controller + " C Up", - DisplayName = "cU", + Icon = Properties.Resources.YellowUp, Location = new Point(147, 235), Type = PadSchema.PadInputType.Boolean }, new PadSchema.ButtonScema { Name = "P" + controller + " C Down", - DisplayName = "cD", - Location = new Point(147, 281), + Icon = Properties.Resources.YellowDown, + Location = new Point(147, 256), Type = PadSchema.PadInputType.Boolean }, new PadSchema.ButtonScema { Name = "P" + controller + " C Left", - DisplayName = "cL", - Location = new Point(129, 258), + Icon = Properties.Resources.YellowLeft, + Location = new Point(126, 249), Type = PadSchema.PadInputType.Boolean }, new PadSchema.ButtonScema { Name = "P" + controller + " C Right", - DisplayName = "cR", - Location = new Point(164, 258), + Icon = Properties.Resources.YellowRight, + Location = new Point(168, 249), Type = PadSchema.PadInputType.Boolean } }