diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj index 12ebcde275..7786d5a67c 100644 --- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj +++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj @@ -1840,6 +1840,7 @@ + diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs index bdb927c541..b0608d0ff0 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs +++ b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs @@ -1029,6 +1029,16 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap PSX_Original_Controller { + get { + object obj = ResourceManager.GetObject("PSX_Original_Controller", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.resx b/BizHawk.Client.EmuHawk/Properties/Resources.resx index 5c8b9dd3f6..d2fe882e70 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.resx +++ b/BizHawk.Client.EmuHawk/Properties/Resources.resx @@ -1485,4 +1485,7 @@ ..\images\Triangle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\config\ControllerImages\PSX-Original-Controller.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/config/ControllerConfig.cs b/BizHawk.Client.EmuHawk/config/ControllerConfig.cs index 005a8de1f1..1718b59d06 100644 --- a/BizHawk.Client.EmuHawk/config/ControllerConfig.cs +++ b/BizHawk.Client.EmuHawk/config/ControllerConfig.cs @@ -42,7 +42,9 @@ namespace BizHawk.Client.EmuHawk ControllerImages.Add("WonderSwan Controller", Properties.Resources.WonderSwanColor); ControllerImages.Add("Lynx Controller", Properties.Resources.Lynx); - ControllerImages.Add("DualShock Controller", Properties.Resources.psx_dualshock); + ControllerImages.Add("PSX Gamepad Controller", Properties.Resources.PSX_Original_Controller); + ControllerImages.Add("PSX DualShock Controller", Properties.Resources.psx_dualshock); + } protected override void OnActivated(EventArgs e) diff --git a/BizHawk.Client.EmuHawk/config/ControllerImages/PSX-Original-Controller.png b/BizHawk.Client.EmuHawk/config/ControllerImages/PSX-Original-Controller.png new file mode 100644 index 0000000000..6dd8398dae Binary files /dev/null and b/BizHawk.Client.EmuHawk/config/ControllerImages/PSX-Original-Controller.png differ