From e0ffd459837ecced7f15e5727eff8b9df746abfe Mon Sep 17 00:00:00 2001
From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com>
Date: Sun, 21 Nov 2021 17:21:13 -0800
Subject: [PATCH] remove some DGB/GB3x/GB4x remnants
---
BizHawk.sln.DotSettings | 2 +-
ExternalToolProjects/DATParser/DATParserBase.cs | 4 +---
src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj | 6 +++---
src/BizHawk.Client.EmuHawk/MainForm.Events.cs | 2 +-
.../GB/{DGBPrefs.Designer.cs => GBLPrefs.Designer.cs} | 6 +++---
.../config/GB/{DGBPrefs.cs => GBLPrefs.cs} | 8 ++++----
.../config/GB/{DGBPrefs.resx => GBLPrefs.resx} | 0
.../Consoles/Nintendo/Gameboy/GambatteLink.IStatable.cs | 8 ++++----
8 files changed, 17 insertions(+), 19 deletions(-)
rename src/BizHawk.Client.EmuHawk/config/GB/{DGBPrefs.Designer.cs => GBLPrefs.Designer.cs} (96%)
rename src/BizHawk.Client.EmuHawk/config/GB/{DGBPrefs.cs => GBLPrefs.cs} (89%)
rename src/BizHawk.Client.EmuHawk/config/GB/{DGBPrefs.resx => GBLPrefs.resx} (100%)
diff --git a/BizHawk.sln.DotSettings b/BizHawk.sln.DotSettings
index 1bfd3018f5..4e1c1b41d0 100644
--- a/BizHawk.sln.DotSettings
+++ b/BizHawk.sln.DotSettings
@@ -78,13 +78,13 @@
CRC
DB
DC
- DGB
DMG
DS
DX
GB
GBA
GBC
+ GBL
GG
GL
GPGX
diff --git a/ExternalToolProjects/DATParser/DATParserBase.cs b/ExternalToolProjects/DATParser/DATParserBase.cs
index 14944cb155..7656f1fe16 100644
--- a/ExternalToolProjects/DATParser/DATParserBase.cs
+++ b/ExternalToolProjects/DATParser/DATParserBase.cs
@@ -189,7 +189,7 @@ namespace BizHawk.DATTool
PCFX,
PCECD,
GB,
- DGB,
+ GBL,
AppleII,
C64,
ZXSpectrum,
@@ -215,8 +215,6 @@ namespace BizHawk.DATTool
NGP,
ChannelF,
VEC,
- GB3x,
- GB4x,
O2,
MSX,
NDS
diff --git a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 0ab7a768c5..fc4356980f 100755
--- a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -135,9 +135,9 @@
-
-
-
+
+
+
diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs
index c5b04160f2..8ef432e1cb 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -1749,7 +1749,7 @@ namespace BizHawk.Client.EmuHawk
{
if (Emulator is GambatteLink gambatte)
{
- DGBPrefs.DoDGBPrefsDialog(this, Config, Game, MovieSession, gambatte);
+ GBLPrefs.DoGBLPrefsDialog(this, Config, Game, MovieSession, gambatte);
}
}
diff --git a/src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.Designer.cs b/src/BizHawk.Client.EmuHawk/config/GB/GBLPrefs.Designer.cs
similarity index 96%
rename from src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.Designer.cs
rename to src/BizHawk.Client.EmuHawk/config/GB/GBLPrefs.Designer.cs
index b9dcce34ed..63725767f6 100644
--- a/src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.Designer.cs
+++ b/src/BizHawk.Client.EmuHawk/config/GB/GBLPrefs.Designer.cs
@@ -1,6 +1,6 @@
namespace BizHawk.Client.EmuHawk
{
- partial class DGBPrefs
+ partial class GBLPrefs
{
///
/// Required designer variable.
@@ -163,7 +163,7 @@
this.buttonOK.Text = "OK";
this.buttonOK.UseVisualStyleBackColor = true;
//
- // DGBPrefs
+ // GBLPrefs
//
this.AcceptButton = this.buttonOK;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -173,7 +173,7 @@
this.Controls.Add(this.buttonOK);
this.Controls.Add(this.buttonCancel);
this.Controls.Add(this.tabControl1);
- this.Name = "DGBPrefs";
+ this.Name = "GBLPrefs";
this.Text = "Gameboy Link Settings";
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
diff --git a/src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.cs b/src/BizHawk.Client.EmuHawk/config/GB/GBLPrefs.cs
similarity index 89%
rename from src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.cs
rename to src/BizHawk.Client.EmuHawk/config/GB/GBLPrefs.cs
index 9d4375964d..557baea642 100644
--- a/src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.cs
+++ b/src/BizHawk.Client.EmuHawk/config/GB/GBLPrefs.cs
@@ -5,7 +5,7 @@ using BizHawk.Emulation.Cores.Nintendo.Gameboy;
namespace BizHawk.Client.EmuHawk
{
- public partial class DGBPrefs : Form, IDialogParent
+ public partial class GBLPrefs : Form, IDialogParent
{
private readonly Config _config;
private readonly IGameInfo _game;
@@ -13,7 +13,7 @@ namespace BizHawk.Client.EmuHawk
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 @@ namespace BizHawk.Client.EmuHawk
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);
diff --git a/src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.resx b/src/BizHawk.Client.EmuHawk/config/GB/GBLPrefs.resx
similarity index 100%
rename from src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.resx
rename to src/BizHawk.Client.EmuHawk/config/GB/GBLPrefs.resx
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IStatable.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IStatable.cs
index c06a69ecb2..bf850d5382 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IStatable.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IStatable.cs
@@ -11,12 +11,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
{
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 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
private readonly JsonSerializer ser = new JsonSerializer { Formatting = Formatting.Indented };
- private class DGBSerialized
+ private class GBLSerialized
{
public int NumCores;
public TextState[] LinkedStates;
@@ -103,7 +103,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
public bool LinkSpaced;
public bool LinkSpaceSignal;
- public DGBSerialized(GambatteLink linkcore)
+ public GBLSerialized(GambatteLink linkcore)
{
if (linkcore == null)
{