From 95001d0baa71720d7c386e754f4ea73a83955062 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Thu, 26 Jan 2023 14:55:27 +1000
Subject: [PATCH] Hack to fix Nymashock analog stick range (see #3528)

---
 .../Consoles/Sony/PSX/Nymashock.cs            | 24 +++++++++++++
 .../Waterbox/NymaCore.Controller.cs           | 34 +++++++++++++++----
 .../vpads_schemata/PSXSchema.cs               |  2 +-
 3 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Nymashock.cs b/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Nymashock.cs
index a9155574bc..22612b2dc4 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Nymashock.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Nymashock.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 
+using BizHawk.Common;
 using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Cores.Waterbox;
 
@@ -9,6 +10,29 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
 	[PortedCore(CoreNames.Nymashock, "Mednafen Team", "1.29.0", "https://mednafen.github.io/releases/")]
 	public class Nymashock : NymaCore, IRegionable, ICycleTiming
 	{
+		protected override void AddAxis(
+			ControllerDefinition ret,
+			string name,
+			bool isReversed,
+			ref ControllerThunk thunk,
+			int thunkWriteOffset)
+		{
+			if (name.EndsWith(" Left Stick Up / Down") || name.EndsWith(" Left Stick Left / Right")
+				|| name.EndsWith(" Right Stick Up / Down") || name.EndsWith(" Right Stick Left / Right"))
+			{
+				ret.AddAxis(name, 0.RangeTo(0xFF), 0x80, isReversed);
+				thunk = (c, b) =>
+				{
+					b[thunkWriteOffset] = 0;
+					b[thunkWriteOffset + 1] = (byte) c.AxisValue(name);
+				};
+			}
+			else
+			{
+				base.AddAxis(ret, name, isReversed: isReversed, ref thunk, thunkWriteOffset);
+			}
+		}
+
 		private Nymashock(CoreComm comm)
 			: base(comm, VSystemID.Raw.NULL, null, null, null)
 		{
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.cs b/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.cs
index 3befb73dcc..d3e2c49b60 100644
--- a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.cs
+++ b/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.cs
@@ -19,10 +19,31 @@ namespace BizHawk.Emulation.Cores.Waterbox
 		private readonly byte[] _inputPortData = new byte[MAX_INPUT_DATA];
 		private readonly string _controllerDeckName;
 
+		protected delegate void AddAxisHook(
+			ControllerDefinition ret,
+			string name,
+			bool isReversed,
+			ref ControllerThunk thunk,
+			int thunkWriteOffset);
+
+		protected virtual void AddAxis(
+			ControllerDefinition ret,
+			string name,
+			bool isReversed,
+			ref ControllerThunk thunk,
+			int thunkWriteOffset)
+				=> ret.AddAxis(name, 0.RangeTo(0xFFFF), 0x8000, isReversed);
+
 		private void InitControls(List<NPortInfoT> allPorts, int numCds, ref SystemInfo si)
 		{
 			_controllerAdapter = new ControllerAdapter(
-				allPorts, _syncSettingsActual.PortDevices, OverrideButtonName, numCds, ref si, ComputeHiddenPorts(),
+				allPorts,
+				_syncSettingsActual.PortDevices,
+				OverrideButtonName,
+				numCds,
+				ref si,
+				ComputeHiddenPorts(),
+				AddAxis,
 				_controllerDeckName);
 			_nyma.SetInputDevices(_controllerAdapter.Devices);
 			ControllerDefinition = _controllerAdapter.Definition;
@@ -45,6 +66,7 @@ namespace BizHawk.Emulation.Cores.Waterbox
 				int numCds,
 				ref SystemInfo systemInfo,
 				HashSet<string> hiddenPorts,
+				AddAxisHook addAxisHook,
 				string controllerDeckName)
 			{
 				ControllerDefinition ret = new(controllerDeckName)
@@ -178,15 +200,15 @@ namespace BizHawk.Emulation.Cores.Waterbox
 							{
 								var data = input.Extra.AsAxis();
 								var fullName = $"{name} {overrideName(data.NameNeg)} / {overrideName(data.NamePos)}";
-
-								ret.AddAxis(fullName, 0.RangeTo(0xFFFF), 0x8000, (input.Flags & AxisFlags.InvertCo) != 0);
-								ret.CategoryLabels[fullName] = category;
-								_thunks.Add((c, b) =>
+								ControllerThunk thunk = (c, b) =>
 								{
 									var val = c.AxisValue(fullName);
 									b[byteStart] = (byte)val;
 									b[byteStart + 1] = (byte)(val >> 8);
-								});
+								};
+								addAxisHook(ret, fullName, (input.Flags & AxisFlags.InvertCo) is not 0, ref thunk, byteStart);
+								ret.CategoryLabels[fullName] = category;
+								_thunks.Add(thunk);
 								break;
 							}
 							case InputType.AxisRel:
diff --git a/src/BizHawk.Emulation.Cores/vpads_schemata/PSXSchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/PSXSchema.cs
index b2b7a8f92b..f2eb13e5d7 100644
--- a/src/BizHawk.Emulation.Cores/vpads_schemata/PSXSchema.cs
+++ b/src/BizHawk.Emulation.Cores/vpads_schemata/PSXSchema.cs
@@ -111,7 +111,7 @@ namespace BizHawk.Emulation.Cores
 
 		private static PadSchema NymaDualShockController(int controller)
 		{
-			var stickRanges = new[] { new AxisSpec(0.RangeTo(0xFFFF), 0x8000), new AxisSpec(0.RangeTo(0xFFFF), 0x8000, isReversed: true) };
+			var stickRanges = new[] { new AxisSpec(0.RangeTo(0xFF), 0x80), new AxisSpec(0.RangeTo(0xFF), 0x80, isReversed: true) };
 			return new PadSchema
 			{
 				Size = new Size(500, 290),