diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj index 5d432280f2..104f8a45d0 100644 --- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj +++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj @@ -1492,6 +1492,7 @@ + diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index e5285d9b27..5f7c800dc9 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -2374,11 +2374,14 @@ namespace BizHawk.Client.EmuHawk { CoreNameStatusBarButton.Image = BizHawk.Client.EmuHawk.Properties.Resources.ppsspp; } - - // TODO: other icons - // unknown - // mupen64plus, - // gambattte, + else if (Global.Emulator is Gameboy) + { + CoreNameStatusBarButton.Image = BizHawk.Client.EmuHawk.Properties.Resources.gambatte; + } + else + { + CoreNameStatusBarButton.Image = null; + } } } diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs index 37c366d5eb..518294ca30 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs +++ b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs @@ -490,6 +490,16 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap gambatte { + get { + object obj = ResourceManager.GetObject("gambatte", 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 746954c37e..df718e5064 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.resx +++ b/BizHawk.Client.EmuHawk/Properties/Resources.resx @@ -909,6 +909,9 @@ ..\images\emu7800.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\gambatte.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\images\genplus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/BizHawk.Client.EmuHawk/images/gambatte.png b/BizHawk.Client.EmuHawk/images/gambatte.png new file mode 100644 index 0000000000..7a3de1551d Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/gambatte.png differ diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs index f315bf52f9..9b4aae3ad8 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs @@ -12,7 +12,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA "Meteor", "blastrock", isPorted: true, - isReleased: true + isReleased: false )] public class GBA : IEmulator, IVideoProvider, ISyncSoundProvider { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs index 01ecac99d8..ba6aba84ed 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs @@ -14,7 +14,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy "Gambatte", "sinamas", isPorted: true, - isReleased: false + isReleased: true )] public class Gameboy : IEmulator, IVideoProvider, ISyncSoundProvider {