diff --git a/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs b/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs index 95c170a3f6..94876b9051 100644 --- a/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs +++ b/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs @@ -8,6 +8,7 @@ using BizHawk.Emulation.Cores.Nintendo.Gameboy; using BizHawk.Emulation.Cores.Nintendo.SNES9X; using BizHawk.Emulation.Cores.Consoles.Sega.gpgx; using BizHawk.Emulation.Cores.Arcades.MAME; +using BizHawk.Emulation.Cores.Consoles.Nintendo.NDS; using BizHawk.Emulation.Cores.Nintendo.GBA; using BizHawk.Emulation.Cores.Sega.MasterSystem; @@ -33,6 +34,7 @@ namespace BizHawk.Client.EmuHawk.CoreExtensions Snes9x _ => Properties.Resources.snes9x, MAME _ => Properties.Resources.mame, MGBAHawk _ => Properties.Resources.mGba, + MelonDS _ => Properties.Resources.melonDS, _ => null }; } diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.cs b/BizHawk.Client.EmuHawk/Properties/Resources.cs index 44cb718b44..867947777a 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.cs +++ b/BizHawk.Client.EmuHawk/Properties/Resources.cs @@ -35,6 +35,7 @@ namespace BizHawk.Client.EmuHawk.Properties { internal static readonly Bitmap BlueUp = ReadEmbeddedBitmap("BlueUp"); internal static readonly Bitmap Both = ReadEmbeddedBitmap("Both"); internal static readonly Bitmap bsnes = ReadEmbeddedBitmap("bsnes"); + internal static readonly Bitmap melonDS = ReadEmbeddedBitmap("melonDS"); internal static readonly Icon Bug_MultiSize = ReadEmbeddedIcon("Bug"); internal static readonly Bitmap Bug = ReadEmbeddedBitmap("Bug"); internal static readonly Icon calculator_MultiSize = ReadEmbeddedIcon("calculator"); diff --git a/BizHawk.Client.EmuHawk/images/melonDS.png b/BizHawk.Client.EmuHawk/images/melonDS.png new file mode 100644 index 0000000000..68a3855aa6 Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/melonDS.png differ diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs index b79bee44de..2b916624af 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs @@ -6,7 +6,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS { - [Core("MelonDS", "Arisotura", false, false, null, null, true)] + [Core("MelonDS", "Arisotura", true, false, null, null, true)] public unsafe partial class MelonDS : IEmulator { private readonly BasicServiceProvider _serviceProvider;