diff --git a/Assets/dll/libgambatte.dll b/Assets/dll/libgambatte.dll
index 1d2b139125..5c655225a3 100644
Binary files a/Assets/dll/libgambatte.dll and b/Assets/dll/libgambatte.dll differ
diff --git a/Assets/dll/libgambatte.exp b/Assets/dll/libgambatte.exp
new file mode 100644
index 0000000000..e125fcef7d
Binary files /dev/null and b/Assets/dll/libgambatte.exp differ
diff --git a/Assets/dll/libgambatte.iobj b/Assets/dll/libgambatte.iobj
new file mode 100644
index 0000000000..511e51859a
Binary files /dev/null and b/Assets/dll/libgambatte.iobj differ
diff --git a/Assets/dll/libgambatte.ipdb b/Assets/dll/libgambatte.ipdb
new file mode 100644
index 0000000000..b019ec54f3
Binary files /dev/null and b/Assets/dll/libgambatte.ipdb differ
diff --git a/Assets/dll/libgambatte.lib b/Assets/dll/libgambatte.lib
new file mode 100644
index 0000000000..5d203e6e25
Binary files /dev/null and b/Assets/dll/libgambatte.lib differ
diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs b/src/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
index b4100b0a66..938ae8f2ea 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
@@ -697,30 +697,51 @@ namespace BizHawk.Client.EmuHawk
 				case "GB Toggle BG":
 					if (Emulator is Gameboy gb)
 					{
-						var s = gb.GetSettings();
-						s.DisplayBG ^= true;
-						gb.PutSettings(s);
-						AddOnScreenMessage($"BG toggled {(s.DisplayBG ? "on" : "off")}");
+						if (!gb.DeterministicEmulation)
+						{
+							var ss = gb.GetSyncSettings();
+							ss.DisplayBG ^= true;
+							gb.PutSyncSettings(ss);
+							AddOnScreenMessage($"BG toggled {(ss.DisplayBG ? "on" : "off")}");
+						}
+						else
+						{
+							AddOnScreenMessage($"BG cannot be toggled during movie recording.");
+						}
 					}
 
 					break;
 				case "GB Toggle Obj":
 					if (Emulator is Gameboy gb2)
 					{
-						var s = gb2.GetSettings();
-						s.DisplayOBJ ^= true;
-						gb2.PutSettings(s);
-						AddOnScreenMessage($"OBJ toggled {(s.DisplayOBJ ? "on" : "off")}");
+						if (!gb2.DeterministicEmulation)
+						{
+							var ss = gb2.GetSyncSettings();
+							ss.DisplayOBJ ^= true;
+							gb2.PutSyncSettings(ss);
+							AddOnScreenMessage($"OBJ toggled {(ss.DisplayOBJ ? "on" : "off")}");
+						}
+						else
+						{
+							AddOnScreenMessage($"OBJ cannot be toggled during movie recording.");
+						}
 					}
 
 					break;
 				case "GB Toggle Window":
 					if (Emulator is Gameboy gb3)
 					{
-						var s = gb3.GetSettings();
-						s.DisplayWindow ^= true;
-						gb3.PutSettings(s);
-						AddOnScreenMessage($"WIN toggled {(s.DisplayWindow ? "on" : "off")}");
+						if (!gb3.DeterministicEmulation)
+						{
+							var ss = gb3.GetSyncSettings();
+							ss.DisplayWindow ^= true;
+							gb3.PutSyncSettings(ss);
+							AddOnScreenMessage($"WIN toggled {(ss.DisplayWindow ? "on" : "off")}");
+						}
+						else
+						{
+							AddOnScreenMessage($"WIN cannot be toggled during movie recording.");
+						}
 					}
 
 					break;
diff --git a/src/BizHawk.Client.EmuHawk/config/GB/GBPrefControl.Designer.cs b/src/BizHawk.Client.EmuHawk/config/GB/GBPrefControl.Designer.cs
index 4a116a5454..0c40230bd6 100644
--- a/src/BizHawk.Client.EmuHawk/config/GB/GBPrefControl.Designer.cs
+++ b/src/BizHawk.Client.EmuHawk/config/GB/GBPrefControl.Designer.cs
@@ -32,9 +32,6 @@
 			this.buttonDefaults = new System.Windows.Forms.Button();
 			this.buttonPalette = new System.Windows.Forms.Button();
 			this.checkBoxMuted = new System.Windows.Forms.CheckBox();
-			this.cbDisplayBG = new System.Windows.Forms.CheckBox();
-			this.cbDisplayOBJ = new System.Windows.Forms.CheckBox();
-			this.cbDisplayWIN = new System.Windows.Forms.CheckBox();
 			this.SuspendLayout();
 			// 
 			// propertyGrid1
@@ -84,48 +81,9 @@
 			this.checkBoxMuted.UseVisualStyleBackColor = true;
 			this.checkBoxMuted.CheckedChanged += new System.EventHandler(this.CheckBoxMuted_CheckedChanged);
 			// 
-			// cbDisplayBG
-			// 
-			this.cbDisplayBG.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.cbDisplayBG.AutoSize = true;
-			this.cbDisplayBG.Location = new System.Drawing.Point(130, 292);
-			this.cbDisplayBG.Name = "cbDisplayBG";
-			this.cbDisplayBG.Size = new System.Drawing.Size(41, 17);
-			this.cbDisplayBG.TabIndex = 4;
-			this.cbDisplayBG.Text = "BG";
-			this.cbDisplayBG.UseVisualStyleBackColor = true;
-			this.cbDisplayBG.CheckedChanged += new System.EventHandler(this.CbDisplayBG_CheckedChanged);
-			// 
-			// cbDisplayOBJ
-			// 
-			this.cbDisplayOBJ.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.cbDisplayOBJ.AutoSize = true;
-			this.cbDisplayOBJ.Location = new System.Drawing.Point(171, 292);
-			this.cbDisplayOBJ.Name = "cbDisplayOBJ";
-			this.cbDisplayOBJ.Size = new System.Drawing.Size(46, 17);
-			this.cbDisplayOBJ.TabIndex = 5;
-			this.cbDisplayOBJ.Text = "OBJ";
-			this.cbDisplayOBJ.UseVisualStyleBackColor = true;
-			this.cbDisplayOBJ.CheckedChanged += new System.EventHandler(this.CbDisplayOBJ_CheckedChanged);
-			// 
-			// cbDisplayWIN
-			// 
-			this.cbDisplayWIN.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.cbDisplayWIN.AutoSize = true;
-			this.cbDisplayWIN.Location = new System.Drawing.Point(218, 292);
-			this.cbDisplayWIN.Name = "cbDisplayWIN";
-			this.cbDisplayWIN.Size = new System.Drawing.Size(48, 17);
-			this.cbDisplayWIN.TabIndex = 6;
-			this.cbDisplayWIN.Text = "WIN";
-			this.cbDisplayWIN.UseVisualStyleBackColor = true;
-			this.cbDisplayWIN.CheckedChanged += new System.EventHandler(this.CbDisplayWin_CheckedChanged);
-			// 
 			// GBPrefControl
 			// 
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
-			this.Controls.Add(this.cbDisplayWIN);
-			this.Controls.Add(this.cbDisplayOBJ);
-			this.Controls.Add(this.cbDisplayBG);
 			this.Controls.Add(this.checkBoxMuted);
 			this.Controls.Add(this.buttonPalette);
 			this.Controls.Add(this.buttonDefaults);
@@ -143,8 +101,5 @@
 		private System.Windows.Forms.Button buttonDefaults;
 		private System.Windows.Forms.Button buttonPalette;
 		private System.Windows.Forms.CheckBox checkBoxMuted;
-		private System.Windows.Forms.CheckBox cbDisplayBG;
-		private System.Windows.Forms.CheckBox cbDisplayOBJ;
-		private System.Windows.Forms.CheckBox cbDisplayWIN;
 	}
 }
diff --git a/src/BizHawk.Client.EmuHawk/config/GB/GBPrefControl.cs b/src/BizHawk.Client.EmuHawk/config/GB/GBPrefControl.cs
index 966d57900c..96259caaaf 100644
--- a/src/BizHawk.Client.EmuHawk/config/GB/GBPrefControl.cs
+++ b/src/BizHawk.Client.EmuHawk/config/GB/GBPrefControl.cs
@@ -42,9 +42,6 @@ namespace BizHawk.Client.EmuHawk
 			propertyGrid1.SelectedObject = _ss;
 			propertyGrid1.Enabled = movieSession.Movie.NotActive();
 			checkBoxMuted.Checked = _s.Muted;
-			cbDisplayBG.Checked = _s.DisplayBG;
-			cbDisplayOBJ.Checked = _s.DisplayOBJ;
-			cbDisplayWIN.Checked = _s.DisplayWindow;
 		}
 
 		public void GetSettings(out Gameboy.GambatteSettings s, out Gameboy.GambatteSyncSettings ss)
@@ -83,20 +80,5 @@ namespace BizHawk.Client.EmuHawk
 		{
 			_s.Muted = ((CheckBox)sender).Checked;
 		}
-
-		private void CbDisplayBG_CheckedChanged(object sender, EventArgs e)
-		{
-			_s.DisplayBG = ((CheckBox)sender).Checked;
-		}
-
-		private void CbDisplayOBJ_CheckedChanged(object sender, EventArgs e)
-		{
-			_s.DisplayOBJ = ((CheckBox)sender).Checked;
-		}
-
-		private void CbDisplayWin_CheckedChanged(object sender, EventArgs e)
-		{
-			_s.DisplayWindow = ((CheckBox)sender).Checked;
-		}
 	}
 }
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ISettable.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ISettable.cs
index 4aed0ee735..597a732225 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ISettable.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ISettable.cs
@@ -64,7 +64,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
 
 			public int[] GBPalette;
 			public GBColors.ColorType CGBColors;
-			public bool DisplayBG = true, DisplayOBJ = true, DisplayWindow = true;
 
 			/// <summary>
 			/// true to mute all audio
@@ -130,6 +129,21 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
 				set => _equalLengthFrames = value;
 			}
 
+			[DisplayName("Display BG")]
+			[Description("Display background")]
+			[DefaultValue(true)]
+			public bool DisplayBG { get; set; }
+
+			[DisplayName("Display OBJ")]
+			[Description("Display objects")]
+			[DefaultValue(true)]
+			public bool DisplayOBJ { get; set; }
+
+			[DisplayName("Display Window")]
+			[Description("Display window")]
+			[DefaultValue(true)]
+			public bool DisplayWindow { get; set; }
+
 			[JsonIgnore]
 			[DeepEqualsIgnore]
 			private bool _equalLengthFrames;
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
index 55d732f2eb..304a258cc3 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
@@ -286,7 +286,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
 
 			LibGambatte.gambatte_settracecallback(GambatteState, _tracecb);
 
-			LibGambatte.gambatte_setlayers(GambatteState, (_settings.DisplayBG ? 1 : 0) | (_settings.DisplayOBJ ? 2 : 0) | (_settings.DisplayWindow ? 4 : 0));
+			LibGambatte.gambatte_setlayers(GambatteState, (_syncSettings.DisplayBG ? 1 : 0) | (_syncSettings.DisplayOBJ ? 2 : 0) | (_syncSettings.DisplayWindow ? 4 : 0));
 		}
 
 		internal void FrameAdvancePost()
diff --git a/submodules/gambatte b/submodules/gambatte
index abe916f213..3ac46735fe 160000
--- a/submodules/gambatte
+++ b/submodules/gambatte
@@ -1 +1 @@
-Subproject commit abe916f213eb2f6f07f34d6cdd7ac5426e10a590
+Subproject commit 3ac46735febd8933f3be808db6b8759495932371