From 1785d51c1de5f34c2290cc61429976a9e71ac95e Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Mon, 15 Nov 2021 20:54:34 +1000 Subject: [PATCH] Merge TI83 sysIDs --- src/BizHawk.Emulation.Common/Database/Database.cs | 2 +- src/BizHawk.Emulation.Common/VSystemID.cs | 1 - src/BizHawk.Emulation.Cores/Calculator/TI83.cs | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/BizHawk.Emulation.Common/Database/Database.cs b/src/BizHawk.Emulation.Common/Database/Database.cs index f2a6470bac..229d337bc7 100644 --- a/src/BizHawk.Emulation.Common/Database/Database.cs +++ b/src/BizHawk.Emulation.Common/Database/Database.cs @@ -335,7 +335,7 @@ namespace BizHawk.Emulation.Common break; case ".83P": - game.System = VSystemID.Raw.TI83P; + game.System = VSystemID.Raw.TI83; break; case ".DSK": diff --git a/src/BizHawk.Emulation.Common/VSystemID.cs b/src/BizHawk.Emulation.Common/VSystemID.cs index 157d0e05a6..3dd51d6e6e 100644 --- a/src/BizHawk.Emulation.Common/VSystemID.cs +++ b/src/BizHawk.Emulation.Common/VSystemID.cs @@ -54,7 +54,6 @@ namespace BizHawk.Emulation.Common public const string SMS = "SMS"; public const string SNES = "SNES"; public const string TI83 = "TI83"; - public const string TI83P = "TI83P"; //TODO only used for CoreConstructor, SystemId is TI83 public const string UZE = "UZE"; public const string VB = "VB"; public const string VEC = "VEC"; diff --git a/src/BizHawk.Emulation.Cores/Calculator/TI83.cs b/src/BizHawk.Emulation.Cores/Calculator/TI83.cs index f557cd723e..26d052fd71 100644 --- a/src/BizHawk.Emulation.Cores/Calculator/TI83.cs +++ b/src/BizHawk.Emulation.Cores/Calculator/TI83.cs @@ -10,7 +10,7 @@ namespace BizHawk.Emulation.Cores.Calculators [ServiceNotApplicable(new[] { typeof(IBoardInfo), typeof(IDriveLight), typeof(IRegionable), typeof(ISaveRam), typeof(ISoundProvider) })] public partial class TI83 : IEmulator, IVideoProvider, IDebuggable, IInputPollable, ISettable { - [CoreConstructor(VSystemID.Raw.TI83P)] + [CoreConstructor(VSystemID.Raw.TI83)] public TI83(CoreLoadParameters lp) { var ser = new BasicServiceProvider(this);