From 80d588a0022a19db57999ec658be6cec0aeee0cd Mon Sep 17 00:00:00 2001
From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com>
Date: Sun, 21 Nov 2021 17:25:59 -0800
Subject: [PATCH] remove some more remnants

---
 .../MainForm.Designer.cs                      | 24 +++++++++----------
 src/BizHawk.Client.EmuHawk/MainForm.Events.cs |  2 +-
 src/BizHawk.Client.EmuHawk/MainForm.cs        |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs
index df01d161b4..60012fa172 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs
@@ -266,8 +266,8 @@ namespace BizHawk.Client.EmuHawk
 			this.N64CircularAnalogRangeMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.MupenStyleLagMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.N64ExpansionSlotMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-			this.DGBSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-			this.DGBsettingsToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.GBLSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.GBLsettingsToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.AppleSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.AppleDisksSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.toolStripSeparator31 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
@@ -395,7 +395,7 @@ namespace BizHawk.Client.EmuHawk
 			this.SNESSubMenu,
 			this.ColecoSubMenu,
 			this.N64SubMenu,
-			this.DGBSubMenu,
+			this.GBLSubMenu,
 			this.AppleSubMenu,
 			this.C64SubMenu,
 			this.IntvSubMenu,
@@ -1750,16 +1750,16 @@ namespace BizHawk.Client.EmuHawk
 			this.N64ExpansionSlotMenuItem.Text = "&Use Expansion Slot";
 			this.N64ExpansionSlotMenuItem.Click += new System.EventHandler(this.N64ExpansionSlotMenuItem_Click);
 			// 
-			// DGBSubMenu
+			// GBLSubMenu
 			// 
-			this.DGBSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-			this.DGBsettingsToolStripMenuItem});
-			this.DGBSubMenu.Text = "&GB Link";
+			this.GBLSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.GBLsettingsToolStripMenuItem});
+			this.GBLSubMenu.Text = "&GB Link";
 			// 
-			// DGBsettingsToolStripMenuItem
+			// GBLsettingsToolStripMenuItem
 			// 
-			this.DGBsettingsToolStripMenuItem.Text = "Settings...";
-			this.DGBsettingsToolStripMenuItem.Click += new System.EventHandler(this.DgbSettingsMenuItem_Click);
+			this.GBLsettingsToolStripMenuItem.Text = "Settings...";
+			this.GBLsettingsToolStripMenuItem.Click += new System.EventHandler(this.GblSettingsMenuItem_Click);
 			// 
 			// AppleSubMenu
 			// 
@@ -2649,8 +2649,8 @@ namespace BizHawk.Client.EmuHawk
 		private BizHawk.WinForms.Controls.ToolStripSeparatorEx ShowMenuContextMenuSeparator;
 		private BizHawk.WinForms.Controls.ToolStripMenuItemEx StopAVContextMenuItem;
 		private BizHawk.WinForms.Controls.ToolStripMenuItemEx FdsEjectDiskMenuItem;
-		private BizHawk.WinForms.Controls.ToolStripMenuItemEx DGBSubMenu;
-		private BizHawk.WinForms.Controls.ToolStripMenuItemEx DGBsettingsToolStripMenuItem;
+		private BizHawk.WinForms.Controls.ToolStripMenuItemEx GBLSubMenu;
+		private BizHawk.WinForms.Controls.ToolStripMenuItemEx GBLsettingsToolStripMenuItem;
 		private BizHawk.WinForms.Controls.ToolStripMenuItemEx GenericCoreSubMenu;
 		private BizHawk.WinForms.Controls.ToolStripMenuItemEx A7800ControllerSettingsMenuItem;
 		private BizHawk.WinForms.Controls.ToolStripMenuItemEx A7800FilterSettingsMenuItem;
diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 8ef432e1cb..d836b90f0e 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -1745,7 +1745,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private void DgbSettingsMenuItem_Click(object sender, EventArgs e)
+		private void GblSettingsMenuItem_Click(object sender, EventArgs e)
 		{
 			if (Emulator is GambatteLink gambatte)
 			{
diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index 338be96e54..efdecd15e5 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -1953,7 +1953,7 @@ namespace BizHawk.Client.EmuHawk
 			PSXSubMenu.Visible = false;
 			ColecoSubMenu.Visible = false;
 			N64SubMenu.Visible = false;
-			DGBSubMenu.Visible = false;
+			GBLSubMenu.Visible = false;
 			AppleSubMenu.Visible = false;
 			C64SubMenu.Visible = false;
 			IntvSubMenu.Visible = false;
@@ -1998,7 +1998,7 @@ namespace BizHawk.Client.EmuHawk
 					zXSpectrumToolStripMenuItem.Visible = true;
 					break;
 				case VSystemID.Raw.GBL when Emulator is GambatteLink:
-					DGBSubMenu.Visible = true;
+					GBLSubMenu.Visible = true;
 					break;
 				case VSystemID.Raw.GB:
 				case VSystemID.Raw.GBC: