diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj index 65ce84c294..1e7287f8e4 100644 --- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj +++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj @@ -1818,6 +1818,7 @@ + diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs index 3ae9841418..beae142eaa 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs +++ b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs @@ -989,6 +989,16 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap psx_dualshock { + get { + object obj = ResourceManager.GetObject("psx_dualshock", 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 a084534861..7e1678853c 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.resx +++ b/BizHawk.Client.EmuHawk/Properties/Resources.resx @@ -1467,4 +1467,7 @@ ..\config\ControllerImages\Lynx.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\config\ControllerImages\psx_dualshock.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 45437cb416..f2cf229693 100644 --- a/BizHawk.Client.EmuHawk/config/ControllerConfig.cs +++ b/BizHawk.Client.EmuHawk/config/ControllerConfig.cs @@ -42,6 +42,7 @@ 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); } protected override void OnActivated(EventArgs e) diff --git a/BizHawk.Client.EmuHawk/config/ControllerImages/psx_dualshock.png b/BizHawk.Client.EmuHawk/config/ControllerImages/psx_dualshock.png new file mode 100644 index 0000000000..1ef0df1c4c Binary files /dev/null and b/BizHawk.Client.EmuHawk/config/ControllerImages/psx_dualshock.png differ