From a9e78488ac120b85d1c6c8870fc994ec850464c5 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Fri, 9 Apr 2021 14:00:10 +1000 Subject: [PATCH] Add remaining cores to CoreNames, manually changing Designer files --- .../movie/import/DsmImport.cs | 3 +- .../MainForm.Designer.cs | 8 ++--- ...mstradCPCCoreEmulationSettings.Designer.cs | 4 +-- ...XSpectrumCoreEmulationSettings.Designer.cs | 4 +-- .../Arcades/MAME/MAME.cs | 2 +- .../Calculator/TI83.cs | 2 +- .../Computers/AmstradCPC/AmstradCPC.cs | 2 +- .../Computers/AppleII/AppleII.cs | 2 +- .../Computers/Commodore64/C64.cs | 2 +- .../Computers/MSX/MSX.cs | 2 +- .../Computers/SinclairSpectrum/ZXSpectrum.cs | 2 +- .../Consoles/Atari/2600/Atari2600.cs | 2 +- .../Consoles/Atari/A7800Hawk/A7800Hawk.cs | 2 +- .../Consoles/Atari/lynx/Lynx.cs | 2 +- .../Consoles/Belogic/Uzem.cs | 2 +- .../Consoles/Coleco/ColecoVision.cs | 2 +- .../Consoles/Fairchild/ChannelF/ChannelF.cs | 2 +- .../Consoles/GCE/Vectrex/VectrexHawk.cs | 2 +- .../Consoles/Intellivision/Intellivision.cs | 2 +- .../Consoles/Magnavox/Odyssey2/O2Hawk.cs | 2 +- .../Consoles/NEC/PCFX/Tst.cs | 2 +- .../Nintendo/GBHawkLink3x/GBHawkLink3x.cs | 2 +- .../Nintendo/GBHawkLink4x/GBHawkLink4x.cs | 2 +- .../Consoles/Nintendo/N64/N64.cs | 2 +- .../Consoles/Nintendo/NDS/MelonDS.cs | 2 +- .../Consoles/Nintendo/VB/VirtualBoyee.cs | 2 +- .../Consoles/SNK/NeoGeoPort.cs | 2 +- .../Consoles/Sega/GGHawkLink/GGHawkLink.cs | 2 +- .../Consoles/Sega/SMS/SMS.cs | 2 +- .../Consoles/Sega/Saturn/Saturnus.cs | 2 +- .../Consoles/Sony/PS2/DobieStation.cs | 2 +- .../Consoles/Sony/PSX/Octoshock.cs | 2 +- .../Consoles/WonderSwan/WonderSwan.cs | 2 +- src/BizHawk.Emulation.Cores/CoreNames.cs | 35 +++++++++++++++++-- .../Libretro/LibretroCore.cs | 2 +- 35 files changed, 73 insertions(+), 41 deletions(-) diff --git a/src/BizHawk.Client.Common/movie/import/DsmImport.cs b/src/BizHawk.Client.Common/movie/import/DsmImport.cs index 9b552b9e28..56b1fbe934 100644 --- a/src/BizHawk.Client.Common/movie/import/DsmImport.cs +++ b/src/BizHawk.Client.Common/movie/import/DsmImport.cs @@ -3,6 +3,7 @@ using System.Linq; using BizHawk.Common; using BizHawk.Emulation.Common; +using BizHawk.Emulation.Cores; using BizHawk.Emulation.Cores.Consoles.Nintendo.NDS; namespace BizHawk.Client.Common @@ -76,7 +77,7 @@ namespace BizHawk.Client.Common Result.Movie.SyncSettingsJson = ConfigService.SaveWithType(syncSettings); } - Result.Movie.HeaderEntries[HeaderKeys.Core] = "MelonDS"; + Result.Movie.HeaderEntries[HeaderKeys.Core] = CoreNames.MelonDS; } private readonly string[] _buttons = { "Left", "Right", "Up", "Down", "A", "B", "X", "Y", "L", "R", "Start", "Select" }; diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs index bc82110701..14e2f242c9 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs @@ -309,7 +309,7 @@ namespace BizHawk.Client.EmuHawk this.ForumsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.FeaturesMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.AboutMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.Atari7800HawkCoreMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); + this.A7800HawkCoreMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.MainStatusBar = new BizHawk.WinForms.Controls.StatusStripEx(); this.DumpStatusButton = new System.Windows.Forms.ToolStripDropDownButton(); this.EmuStatus = new BizHawk.WinForms.Controls.StatusLabelEx(); @@ -2001,9 +2001,9 @@ namespace BizHawk.Client.EmuHawk this.AboutMenuItem.Text = "&About"; this.AboutMenuItem.Click += new System.EventHandler(this.AboutMenuItem_Click); // - // Atari7800HawkCoreMenuItem + // A7800HawkCoreMenuItem // - this.Atari7800HawkCoreMenuItem.Text = "Atari7800Hawk"; + this.A7800HawkCoreMenuItem.Text = "A7800Hawk"; // // MainStatusBar // @@ -2772,7 +2772,7 @@ namespace BizHawk.Client.EmuHawk private BizHawk.WinForms.Controls.ToolStripMenuItemEx SNESControllerConfigurationMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx C64DisksSubMenu; private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator36; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx Atari7800HawkCoreMenuItem; + private BizHawk.WinForms.Controls.ToolStripMenuItemEx A7800HawkCoreMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx zXSpectrumToolStripMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx ZXSpectrumControllerConfigurationMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx ZXSpectrumCoreEmulationSettingsMenuItem; diff --git a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCCoreEmulationSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCCoreEmulationSettings.Designer.cs index fbf3e9b7b1..7db5b4e9c2 100644 --- a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCCoreEmulationSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCCoreEmulationSettings.Designer.cs @@ -104,8 +104,8 @@ this.lblAutoLoadText.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblAutoLoadText.Location = new System.Drawing.Point(155, 373); this.lblAutoLoadText.Name = "lblAutoLoadText"; - this.lblAutoLoadText.Text = "When enabled CPCHawk will automatically start and stop the tape whenever the tape" + - " motor state changes"; + this.lblAutoLoadText.Text = "When enabled, the tape will be started and stopped automatically whenever the " + + "tape motor state changes"; this.lblAutoLoadText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // autoLoadcheckBox1 diff --git a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumCoreEmulationSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumCoreEmulationSettings.Designer.cs index 66a790a7ac..9a9351941f 100644 --- a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumCoreEmulationSettings.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumCoreEmulationSettings.Designer.cs @@ -130,8 +130,8 @@ this.lblAutoLoadText.Font = new System.Drawing.Font("Courier New", 8F); this.lblAutoLoadText.Location = new System.Drawing.Point(124, 388); this.lblAutoLoadText.Name = "lblAutoLoadText"; - this.lblAutoLoadText.Text = "When enabled ZXHawk will attempt to control the tape device automatically when th" + - "e correct traps are detected"; + this.lblAutoLoadText.Text = "When enabled, will attempt to control the tape device automatically when the " + + "correct traps are detected"; this.lblAutoLoadText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // autoLoadcheckBox1 diff --git a/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs b/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs index 54780d962a..c02a765b9a 100644 --- a/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs +++ b/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs @@ -84,7 +84,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Arcades.MAME { [Core( - name: "MAME", + name: CoreNames.MAME, author: "MAMEDev", isPorted: true, isReleased: false, diff --git a/src/BizHawk.Emulation.Cores/Calculator/TI83.cs b/src/BizHawk.Emulation.Cores/Calculator/TI83.cs index 41ff2f8604..2e150e5db9 100644 --- a/src/BizHawk.Emulation.Cores/Calculator/TI83.cs +++ b/src/BizHawk.Emulation.Cores/Calculator/TI83.cs @@ -7,7 +7,7 @@ using BizHawk.Emulation.Cores.Components.Z80A; namespace BizHawk.Emulation.Cores.Calculators { [Core( - "TI83Hawk", + CoreNames.TI83Hawk, "zeromus", isPorted: false, isReleased: true)] diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.cs index 3bd307e3ea..1e0ee2c0c5 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.cs @@ -14,7 +14,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// * Main Initialization * /// [Core( - "CPCHawk", + CoreNames.CPCHawk, "Asnivor", isPorted: false, isReleased: false)] diff --git a/src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs b/src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs index baa029dc5d..3f905bcb4e 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs @@ -7,7 +7,7 @@ using Jellyfish.Virtu; namespace BizHawk.Emulation.Cores.Computers.AppleII { [Core( - "Virtu", + CoreNames.Virtu, "fool", isPorted: true, isReleased: true)] diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs b/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs index 5eb428f25c..ddfeaf2329 100644 --- a/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs +++ b/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs @@ -10,7 +10,7 @@ using BizHawk.Emulation.Cores.Computers.Commodore64.Media; namespace BizHawk.Emulation.Cores.Computers.Commodore64 { [Core( - "C64Hawk", + CoreNames.C64Hawk, "SaxxonPike", isPorted: false, isReleased: true)] diff --git a/src/BizHawk.Emulation.Cores/Computers/MSX/MSX.cs b/src/BizHawk.Emulation.Cores/Computers/MSX/MSX.cs index 7af887e84d..dec398cc72 100644 --- a/src/BizHawk.Emulation.Cores/Computers/MSX/MSX.cs +++ b/src/BizHawk.Emulation.Cores/Computers/MSX/MSX.cs @@ -4,7 +4,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Computers.MSX { - [Core("MSXHawk", "", isPorted: false, isReleased: false)] + [Core(CoreNames.MSXHawk, "", isPorted: false, isReleased: false)] [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public partial class MSX : IEmulator, IVideoProvider, ISoundProvider, ISaveRam, IInputPollable, IRegionable, ISettable { diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.cs index 70fb848ae8..57c3181759 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.cs @@ -15,7 +15,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// * Main Initialization * /// [Core( - "ZXHawk", + CoreNames.ZXHawk, "Asnivor, Alyosha", isPorted: false, isReleased: true)] diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs index 0487ca769e..4a650ffb68 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs @@ -6,7 +6,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Atari.Atari2600 { - [Core("Atari2600Hawk", "Micro500, Alyosha, adelikat, natt", isPorted: false, isReleased: true)] + [Core(CoreNames.Atari2600Hawk, "Micro500, Alyosha, adelikat, natt", isPorted: false, isReleased: true)] [ServiceNotApplicable(new[] { typeof(IDriveLight), typeof(ISaveRam) })] public partial class Atari2600 : IEmulator, IDebuggable, IInputPollable, IBoardInfo, IRomInfo, IRegionable, ICreateGameDBEntries, ISettable diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.cs index 0554e1cc10..10ca180aee 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.cs @@ -8,7 +8,7 @@ using BizHawk.Common.NumberExtensions; namespace BizHawk.Emulation.Cores.Atari.A7800Hawk { [Core( - "A7800Hawk", + CoreNames.A7800Hawk, "", isPorted: false, isReleased: true)] diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.cs index 153e7c0130..5889453798 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.cs @@ -7,7 +7,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Atari.Lynx { - [Core("Handy", "K. Wilkins, Mednafen Team", true, true, "mednafen 0-9-34-1", "http://mednafen.sourceforge.net/", false)] + [Core(CoreNames.Handy, "K. Wilkins, Mednafen Team", true, true, "mednafen 0-9-34-1", "http://mednafen.sourceforge.net/", false)] [ServiceNotApplicable(new[] { typeof(IDriveLight), typeof(IRegionable), typeof(ISettable<,>) })] public partial class Lynx : IEmulator, IVideoProvider, ISoundProvider, ISaveRam, IStatable, IInputPollable { diff --git a/src/BizHawk.Emulation.Cores/Consoles/Belogic/Uzem.cs b/src/BizHawk.Emulation.Cores/Consoles/Belogic/Uzem.cs index 0db7f3391c..b0b0aa2f6d 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Belogic/Uzem.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Belogic/Uzem.cs @@ -6,7 +6,7 @@ using BizHawk.Common; namespace BizHawk.Emulation.Cores.Consoles.Belogic { - [Core("uzem", "David Etherton", true, true, "", "", false)] + [Core(CoreNames.Uzem, "David Etherton", true, true, "", "", false)] public class Uzem : WaterboxCore { private LibUzem _uze; diff --git a/src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs b/src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs index 6acb27a847..c958fc474b 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs @@ -5,7 +5,7 @@ using System; namespace BizHawk.Emulation.Cores.ColecoVision { [Core( - "ColecoHawk", + CoreNames.ColecoHawk, "Vecna", isPorted: false, isReleased: true)] diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.cs b/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.cs index cdb0be8326..af5f457309 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.cs @@ -4,7 +4,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Consoles.ChannelF { [Core( - "ChannelFHawk", + CoreNames.ChannelFHawk, "Asnivor", isPorted: false, isReleased: false)] diff --git a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.cs b/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.cs index 7b6904568b..2d7b38f7c6 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.cs @@ -6,7 +6,7 @@ using BizHawk.Emulation.Cores.Components.MC6809; namespace BizHawk.Emulation.Cores.Consoles.Vectrex { - [Core("VectrexHawk", "", isPorted: false, isReleased: true)] + [Core(CoreNames.VectrexHawk, "", isPorted: false, isReleased: true)] [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public partial class VectrexHawk : IEmulator, ISaveRam, IDebuggable, IInputPollable, IRegionable, ISettable diff --git a/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs b/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs index 58bca3315a..aae83f66da 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs @@ -6,7 +6,7 @@ using BizHawk.Emulation.Cores.Components.CP1610; namespace BizHawk.Emulation.Cores.Intellivision { [Core( - "IntelliHawk", + CoreNames.IntelliHawk, "BrandonE, Alyosha", isPorted: false, isReleased: true)] diff --git a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.cs b/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.cs index 854dfbc0ff..dc34c3a2e1 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.cs @@ -6,7 +6,7 @@ using BizHawk.Emulation.Cores.Components.I8048; namespace BizHawk.Emulation.Cores.Consoles.O2Hawk { - [Core("O2Hawk", "", isPorted: false, isReleased: true)] + [Core(CoreNames.O2Hawk, "", isPorted: false, isReleased: true)] [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public partial class O2Hawk : IEmulator, ISaveRam, IDebuggable, IInputPollable, IRegionable, ISettable, IBoardInfo { diff --git a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs index 18bc95d981..7fc4ce16f9 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; namespace BizHawk.Emulation.Cores.Consoles.NEC.PCFX { - [Core("T. S. T.", + [Core(CoreNames.TST, author: "Mednafen Team", isPorted: true, isReleased: true, diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.cs index 6869296360..e6c2d7b126 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.cs @@ -3,7 +3,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x { - [Core("GBHawkLink3x", "", isPorted: false, isReleased: true)] + [Core(CoreNames.GBHawkLink3x, "", isPorted: false, isReleased: true)] [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public partial class GBHawkLink3x : IEmulator, ISaveRam, IDebuggable, IStatable, IInputPollable, IRegionable, ISettable diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.cs index db83d705ac..c8911c3362 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.cs @@ -3,7 +3,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x { - [Core("GBHawkLink4x", "", isPorted: false, isReleased: true)] + [Core(CoreNames.GBHawkLink4x, "", isPorted: false, isReleased: true)] [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public partial class GBHawkLink4x : IEmulator, ISaveRam, IDebuggable, IStatable, IInputPollable, IRegionable, ISettable diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs index 6b81c7d47a..afc29fc454 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs @@ -7,7 +7,7 @@ using BizHawk.Emulation.Cores.Nintendo.N64.NativeApi; namespace BizHawk.Emulation.Cores.Nintendo.N64 { [Core( - "Mupen64Plus", + CoreNames.Mupen64Plus, "", isPorted: true, isReleased: true, diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs index 6b7fd594ec..a59e28cb66 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs @@ -7,7 +7,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS { - [Core("MelonDS", "Arisotura", false, false, null, null, true)] + [Core(CoreNames.MelonDS, "Arisotura", false, false, null, null, true)] public unsafe partial class MelonDS : IEmulator { private readonly BasicServiceProvider _serviceProvider; diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/VB/VirtualBoyee.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/VB/VirtualBoyee.cs index cde605a033..de06ac2d89 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/VB/VirtualBoyee.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/VB/VirtualBoyee.cs @@ -10,7 +10,7 @@ using System.Linq; namespace BizHawk.Emulation.Cores.Consoles.Nintendo.VB { - [Core("Virtual Boyee", + [Core(CoreNames.VirtualBoyee, author: "Mednafen Team", isPorted: true, isReleased: true, diff --git a/src/BizHawk.Emulation.Cores/Consoles/SNK/NeoGeoPort.cs b/src/BizHawk.Emulation.Cores/Consoles/SNK/NeoGeoPort.cs index 4cf6ec7b8a..d961fac62c 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/SNK/NeoGeoPort.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/SNK/NeoGeoPort.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; namespace BizHawk.Emulation.Cores.Consoles.SNK { - [Core("NeoPop", + [Core(CoreNames.NeoPop, author: "Thomas Klausner, Mednafen Team", isPorted: true, isReleased: true, diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.cs b/src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.cs index acba5db322..e48d3481b6 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.cs @@ -4,7 +4,7 @@ using BizHawk.Emulation.Cores.Sega.MasterSystem; namespace BizHawk.Emulation.Cores.Sega.GGHawkLink { - [Core("GGHawkLink", "", isPorted: false, isReleased: false)] + [Core(CoreNames.GGHawkLink, "", isPorted: false, isReleased: false)] [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public partial class GGHawkLink : IEmulator, ISaveRam, IDebuggable, IStatable, IInputPollable, IRegionable, ILinkable, ISettable diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs b/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs index 232b28dbd9..0abeff4ab4 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs @@ -15,7 +15,7 @@ using BizHawk.Emulation.Cores.Components.Z80A; namespace BizHawk.Emulation.Cores.Sega.MasterSystem { [Core( - "SMSHawk", + CoreNames.SMSHawk, "Vecna", isPorted: false, isReleased: true)] diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Saturnus.cs b/src/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Saturnus.cs index 081c016ae6..660442d651 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Saturnus.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Saturnus.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn { - [Core("Saturnus", + [Core(CoreNames.Saturnus, author: "Mednafen Team", isPorted: true, isReleased: true, diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sony/PS2/DobieStation.cs b/src/BizHawk.Emulation.Cores/Consoles/Sony/PS2/DobieStation.cs index 5a2ab5d8f2..b1e6136295 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Sony/PS2/DobieStation.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Sony/PS2/DobieStation.cs @@ -7,7 +7,7 @@ using BizHawk.Emulation.DiscSystem; namespace BizHawk.Emulation.Cores.Sony.PS2 { - [Core("DobieStation", "PSI", true, false, "fa33778b056aa32", "https://github.com/PSI-Rockin/DobieStation", false)] + [Core(CoreNames.DobieStation, "PSI", true, false, "fa33778b056aa32", "https://github.com/PSI-Rockin/DobieStation", false)] public unsafe class DobieStation : WaterboxCore, ISettable { private readonly LibDobieStation _core; diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs b/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs index fbb114840b..df75dead80 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs @@ -30,7 +30,7 @@ using BizHawk.Emulation.DiscSystem; namespace BizHawk.Emulation.Cores.Sony.PSX { [Core( - "Octoshock", + CoreNames.Octoshock, "Mednafen Team", isPorted: true, isReleased: true)] diff --git a/src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs b/src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs index 87ea56f9c5..57e82bf1bd 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs @@ -6,7 +6,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.WonderSwan { - [Core("Cygne/Mednafen", "Dox, Mednafen Team", true, true, "1.24.3", "https://mednafen.github.io/releases/", false)] + [Core(CoreNames.Cygne, "Dox, Mednafen Team", true, true, "1.24.3", "https://mednafen.github.io/releases/", false)] [ServiceNotApplicable(new[] { typeof(IDriveLight), typeof(IRegionable) })] public partial class WonderSwan : IEmulator, IVideoProvider, ISoundProvider, IInputPollable, IDebuggable diff --git a/src/BizHawk.Emulation.Cores/CoreNames.cs b/src/BizHawk.Emulation.Cores/CoreNames.cs index 3bab7294cb..7af7175023 100644 --- a/src/BizHawk.Emulation.Cores/CoreNames.cs +++ b/src/BizHawk.Emulation.Cores/CoreNames.cs @@ -3,28 +3,59 @@ namespace BizHawk.Emulation.Cores { /// - /// Constant class for the names of cores, that should be used in every
- /// For now we are only including ones that can be picked as a core preference, but all cores should be included here + /// holds the names of ported and Hawk cores as consts, + /// to be used for [Core] and various front-end needs + /// (though sadly not in Designer files) /// public static class CoreNames { + public const string A7800Hawk = "A7800Hawk"; + public const string Atari2600Hawk = "Atari2600Hawk"; public const string Bsnes = "BSNES"; + public const string C64Hawk = "C64Hawk"; + public const string ChannelFHawk = "ChannelFHawk"; + public const string ColecoHawk = "ColecoHawk"; + public const string CPCHawk = "CPCHawk"; + public const string Cygne = "Cygne/Mednafen"; + public const string DobieStation = "DobieStation"; public const string DualGambatte = "DualGambatte"; public const string Faust = "Faust"; public const string Gambatte = "Gambatte"; public const string GbHawk = "GBHawk"; public const string GBHawkLink = "GBHawkLink"; + public const string GBHawkLink3x = "GBHawkLink3x"; + public const string GBHawkLink4x = "GBHawkLink4x"; + public const string GGHawkLink = "GGHawkLink"; public const string Gpgx = "Genplus-gx"; + public const string Handy = "Handy"; public const string HyperNyma = "HyperNyma"; + public const string IntelliHawk = "IntelliHawk"; + public const string Libretro = "Libretro"; + public const string MAME = "MAME"; + public const string MelonDS = "MelonDS"; public const string Mgba = "mGBA"; + public const string MSXHawk = "MSXHawk"; + public const string Mupen64Plus = "Mupen64Plus"; public const string NesHawk = "NesHawk"; + public const string NeoPop = "NeoPop"; + public const string O2Hawk = "O2Hawk"; + public const string Octoshock = "Octoshock"; public const string PceHawk = "PCEHawk"; public const string PicoDrive = "PicoDrive"; public const string QuickNes = "QuickNes"; public const string SameBoy = "SameBoy"; + public const string Saturnus = "Saturnus"; + public const string SMSHawk = "SMSHawk"; public const string Snes9X = "Snes9x"; public const string SubGbHawk = "SubGBHawk"; public const string SubNesHawk = "SubNESHawk"; + public const string TI83Hawk = "TI83Hawk"; + public const string TST = "T. S. T."; public const string TurboNyma = "TurboNyma"; + public const string Uzem = "uzem"; + public const string VectrexHawk = "VectrexHawk"; + public const string Virtu = "Virtu"; + public const string VirtualBoyee = "Virtual Boyee"; + public const string ZXHawk = "ZXHawk"; } } diff --git a/src/BizHawk.Emulation.Cores/Libretro/LibretroCore.cs b/src/BizHawk.Emulation.Cores/Libretro/LibretroCore.cs index 3d70032265..edc38608c2 100644 --- a/src/BizHawk.Emulation.Cores/Libretro/LibretroCore.cs +++ b/src/BizHawk.Emulation.Cores/Libretro/LibretroCore.cs @@ -13,7 +13,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Libretro { - [Core("Libretro", "zeromus", isPorted: false, isReleased: false)] + [Core(CoreNames.Libretro, "zeromus", isPorted: false, isReleased: false)] [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public unsafe partial class LibretroCore : IEmulator, ISettable, ISaveRam, IStatable, IVideoProvider, IInputPollable