From 53c2318b567e0a019765d12005585bff1e58b6d0 Mon Sep 17 00:00:00 2001
From: nattthebear <goyuken@gmail.com>
Date: Sun, 21 Jun 2020 16:55:41 -0400
Subject: [PATCH] nyma - activate controller deck names

---
 .../Consoles/Nintendo/Faust/Faust.cs                      | 2 +-
 .../Waterbox/NymaCore.Controller.cs                       | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Faust/Faust.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Faust/Faust.cs
index 4274c6ecba..ee0327b79b 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Faust/Faust.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Faust/Faust.cs
@@ -10,7 +10,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.Faust
 		[CoreConstructor("SNES")]
 		public Faust(GameInfo game, byte[] rom, CoreComm comm, string extension,
 			NymaSettings settings, NymaSyncSettings syncSettings, bool deterministic)
-			: base(comm, "SNES", "I don't think anything uses this parameter", settings, syncSettings)
+			: base(comm, "SNES", "SNES Controller", settings, syncSettings)
 		{
 			if (deterministic)
 				// force ST renderer
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.cs b/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.cs
index 1998a6cd5b..780a83d147 100644
--- a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.cs
+++ b/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.cs
@@ -19,7 +19,8 @@ namespace BizHawk.Emulation.Cores.Waterbox
 		private void InitControls(List<NPortInfoT> allPorts, bool hasCds, ref SystemInfo si)
 		{
 			_controllerAdapter = new ControllerAdapter(
-				allPorts, _syncSettingsActual.PortDevices, OverrideButtonName, hasCds, ref si, ComputeHiddenPorts());
+				allPorts, _syncSettingsActual.PortDevices, OverrideButtonName, hasCds, ref si, ComputeHiddenPorts(),
+				_controllerDeckName);
 			_nyma.SetInputDevices(_controllerAdapter.Devices);
 			ControllerDefinition = _controllerAdapter.Definition;
 		}
@@ -39,11 +40,12 @@ namespace BizHawk.Emulation.Cores.Waterbox
 				Func<string, string> overrideName,
 				bool hasCds,
 				ref SystemInfo systemInfo,
-				HashSet<string> hiddenPorts)
+				HashSet<string> hiddenPorts,
+				string controllerDeckName)
 			{
 				var ret = new ControllerDefinition
 				{
-					Name = "Mednafen Controller",
+					Name = controllerDeckName,
 					CategoryLabels =
 					{
 						{ "Power", "System" },