From 967ae76dfd6cc22bf85f6536bf609f7491ca943b Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz+git@gmail.com>
Date: Sat, 11 Jan 2025 01:55:29 +1000
Subject: [PATCH] Make SNES layer hotkeys work for new BSNES

---
 src/BizHawk.Client.EmuHawk/MainForm.VSystem.cs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/BizHawk.Client.EmuHawk/MainForm.VSystem.cs b/src/BizHawk.Client.EmuHawk/MainForm.VSystem.cs
index e19f339305..89c318de10 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.VSystem.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.VSystem.cs
@@ -859,7 +859,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (layer is < 1 or > 4) return; // should this throw?
 			bool result = false;
-			if (Emulator is LibsnesCore bsnes)
+			if (Emulator is BsnesCore bsnes)
 			{
 				var s = bsnes.GetSettings();
 				result = layer switch
@@ -873,6 +873,20 @@ namespace BizHawk.Client.EmuHawk
 				bsnes.PutSettings(s);
 				AddOnScreenMessage($"Obj {layer} Layer {(result ? "On" : "Off")}");
 			}
+			else if (Emulator is LibsnesCore bsnes1)
+			{
+				var s = bsnes1.GetSettings();
+				result = layer switch
+				{
+					1 => s.ShowOBJ_0 = !s.ShowOBJ_0,
+					2 => s.ShowOBJ_1 = !s.ShowOBJ_1,
+					3 => s.ShowOBJ_2 = !s.ShowOBJ_2,
+					4 => s.ShowOBJ_3 = !s.ShowOBJ_3,
+					_ => result,
+				};
+				bsnes1.PutSettings(s);
+				AddOnScreenMessage($"Obj {layer} Layer {(result ? "On" : "Off")}");
+			}
 			else if (Emulator is Snes9x snes9X)
 			{
 				var s = snes9X.GetSettings();