remove some DGB/GB3x/GB4x remnants

BizHawk.sln.DotSettings

@@ -78,13 +78,13 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CRC/@EntryIndexedValue">CRC</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DB/@EntryIndexedValue">DB</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DC/@EntryIndexedValue">DC</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DGB/@EntryIndexedValue">DGB</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DMG/@EntryIndexedValue">DMG</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DS/@EntryIndexedValue">DS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DX/@EntryIndexedValue">DX</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GB/@EntryIndexedValue">GB</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GBA/@EntryIndexedValue">GBA</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GBC/@EntryIndexedValue">GBC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GBL/@EntryIndexedValue">GBL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GG/@EntryIndexedValue">GG</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GPGX/@EntryIndexedValue">GPGX</s:String>

ExternalToolProjects/DATParser/DATParserBase.cs

@@ -189,7 +189,7 @@ public enum SystemType
 		PCFX,
 		PCECD,
 		GB,
-		DGB,
+		GBL,
 		AppleII,
 		C64,
 		ZXSpectrum,
@@ -215,8 +215,6 @@ public enum SystemType
 		NGP,
 		ChannelF,
 		VEC,
-		GB3x,
-		GB4x,
 		O2,
 		MSX,
 		NDS

src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj

@@ -135,9 +135,9 @@
 		<Compile Update="config/GB/ColorChooserForm.cs" SubType="Form" />
 		<Compile Update="config/GB/ColorChooserForm.Designer.cs" DependentUpon="ColorChooserForm.cs" />
 		<EmbeddedResource Update="config/GB/ColorChooserForm.resx" DependentUpon="ColorChooserForm.cs" />
-		<Compile Update="config/GB/DGBPrefs.cs" SubType="Form" />
-		<Compile Update="config/GB/DGBPrefs.Designer.cs" DependentUpon="DGBPrefs.cs" />
-		<EmbeddedResource Update="config/GB/DGBPrefs.resx" DependentUpon="DGBPrefs.cs" />
+		<Compile Update="config\GB\GBLPrefs.cs" SubType="Form" />
+		<Compile Update="config\GB\GBLPrefs.Designer.cs" DependentUpon="GBLPrefs.cs" />
+		<EmbeddedResource Update="config\GB\GBLPrefs.resx" DependentUpon="GBLPrefs.cs" />
 		<Compile Update="config/GB/GBPrefControl.cs" SubType="UserControl" />
 		<Compile Update="config/GB/GBPrefControl.Designer.cs" DependentUpon="GBPrefControl.cs" />
 		<EmbeddedResource Update="config/GB/GBPrefControl.resx" DependentUpon="GBPrefControl.cs" />

src/BizHawk.Client.EmuHawk/MainForm.Events.cs

@@ -1749,7 +1749,7 @@ private void DgbSettingsMenuItem_Click(object sender, EventArgs e)
 		{
 			if (Emulator is GambatteLink gambatte)
 			{
-				DGBPrefs.DoDGBPrefsDialog(this, Config, Game, MovieSession, gambatte);
+				GBLPrefs.DoGBLPrefsDialog(this, Config, Game, MovieSession, gambatte);
 			}
 		}
 

src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.cs → src/BizHawk.Client.EmuHawk/config/GB/GBLPrefs.cs

@@ -5,15 +5,15 @@
 
 namespace BizHawk.Client.EmuHawk
 {
-	public partial class DGBPrefs : Form, IDialogParent
+	public partial class GBLPrefs : Form, IDialogParent
 	{
 		private readonly Config _config;
 		private readonly IGameInfo _game;
 		private readonly IMovieSession _movieSession;
 
 		public IDialogController DialogController { get; }
 
-		private DGBPrefs(IDialogController dialogController, Config config, IGameInfo game, IMovieSession movieSession)
+		private GBLPrefs(IDialogController dialogController, Config config, IGameInfo game, IMovieSession movieSession)
 		{
 			_config = config;
 			_game = game;
@@ -48,12 +48,12 @@ private void GetSettings(out GambatteLink.GambatteLinkSettings s, out GambatteLi
 
 		private bool SyncSettingsChanged => gbPrefControl1.SyncSettingsChanged || gbPrefControl2.SyncSettingsChanged || gbPrefControl3.SyncSettingsChanged || gbPrefControl4.SyncSettingsChanged;
 
-		public static void DoDGBPrefsDialog(IMainFormForConfig mainForm, Config config, IGameInfo game, IMovieSession movieSession, GambatteLink gambatte)
+		public static void DoGBLPrefsDialog(IMainFormForConfig mainForm, Config config, IGameInfo game, IMovieSession movieSession, GambatteLink gambatte)
 		{
 			var s = gambatte.GetSettings();
 			var ss = gambatte.GetSyncSettings();
 
-			using var dlg = new DGBPrefs(mainForm.DialogController, config, game, movieSession);
+			using var dlg = new GBLPrefs(mainForm.DialogController, config, game, movieSession);
 			dlg.PutSettings(s, ss);
 
 			dlg.gbPrefControl1.ColorGameBoy = gambatte.IsCGBMode(0);

src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IStatable.cs

@@ -11,12 +11,12 @@ public partial class GambatteLink : ITextStatable
 	{
 		public void SaveStateText(TextWriter writer)
 		{
-			ser.Serialize(writer, new DGBSerialized(this));
+			ser.Serialize(writer, new GBLSerialized(this));
 		}
 
 		public void LoadStateText(TextReader reader)
 		{
-			var s = (DGBSerialized)ser.Deserialize(reader, typeof(DGBSerialized));
+			var s = (GBLSerialized)ser.Deserialize(reader, typeof(GBLSerialized));
 			if (s.NumCores != _numCores)
 			{
 				throw new InvalidOperationException("Core number mismatch!");
@@ -86,7 +86,7 @@ public void LoadStateBinary(BinaryReader reader)
 
 		private readonly JsonSerializer ser = new JsonSerializer { Formatting = Formatting.Indented };
 
-		private class DGBSerialized
+		private class GBLSerialized
 		{
 			public int NumCores;
 			public TextState<Gameboy.TextStateData>[] LinkedStates;
@@ -103,7 +103,7 @@ private class DGBSerialized
 			public bool LinkSpaced;
 			public bool LinkSpaceSignal;
 
-			public DGBSerialized(GambatteLink linkcore)
+			public GBLSerialized(GambatteLink linkcore)
 			{
 				if (linkcore == null)
 				{