Add analog keybinds for Ares64 (squashed PR #4611)

* Add analog key support for Ares64

* Refactor stick reading into a static helper method

* Fix casing for GetStickValues return names

* Update doc comments

Author: rjgabel

src/BizHawk.Emulation.Cores/Consoles/Nintendo/Ares64/Ares64.cs

@@ -5,6 +5,7 @@
 using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Cores.Properties;
 using BizHawk.Emulation.Cores.Waterbox;
+using BizHawk.Emulation.Cores.Nintendo.N64;
 
 namespace BizHawk.Emulation.Cores.Consoles.Nintendo.Ares64
 {
@@ -215,6 +216,10 @@ private static ControllerDefinition CreateControllerDefinition(LibAres64.Control
 				}
 				else if (controllerSettings[i] != LibAres64.ControllerType.Unplugged)
 				{
+					ret.BoolButtons.Add($"P{i + 1} A Up");
+					ret.BoolButtons.Add($"P{i + 1} A Down");
+					ret.BoolButtons.Add($"P{i + 1} A Left");
+					ret.BoolButtons.Add($"P{i + 1} A Right");
 					ret.BoolButtons.Add($"P{i + 1} DPad U");
 					ret.BoolButtons.Add($"P{i + 1} DPad D");
 					ret.BoolButtons.Add($"P{i + 1} DPad L");
@@ -299,8 +304,7 @@ protected override LibWaterboxCore.FrameInfo FrameAdvancePrep(IController contro
 					controller.SetHapticChannelStrength($"P{num} Rumble Pak", _core.GetRumbleStatus(i) ? int.MaxValue : 0);
 				}
 				var buttonsState = GetButtons(controller, num);
-				var stickXState = unchecked((short) controller.AxisValue($"P{num} X Axis"));
-				var stickYState = unchecked((short) controller.AxisValue($"P{num} Y Axis"));
+				(short stickXState, short stickYState) = N64Input.GetStickValues(controller, num);
 				switch (num)
 				{
 					case 1:

src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64Input.cs

@@ -39,19 +39,12 @@ public void ShiftInputPolledBools()
 		private const sbyte _maxAnalogY = 127;
 		private const sbyte _minAnalogY = -128;
 
-		/// <summary>
-		/// Translates controller input from EmuHawk into
-		/// N64 controller data
-		/// </summary>
-		/// <param name="i">Id of controller to update and shove</param>
-		public int GetControllerInput(int i)
+		/// <param name="i">player number (from 1)</param>
+		public static (sbyte X, sbyte Y) GetStickValues(IController Controller, int i)
 		{
-			_emuCore.InputCallbacks.Call();
-			ThisFrameInputPolled = true;
-
 			// Analog stick right = +X
 			// Analog stick up = +Y
-			string p = "P" + (i + 1);
+			string p = "P" + i;
 			sbyte x;
 			if (Controller.IsPressed(p + " A Left"))
 			{
@@ -80,6 +73,21 @@ public int GetControllerInput(int i)
 				y = (sbyte)Controller.AxisValue(p + " Y Axis");
 			}
 
+			return (x, y);
+		}
+
+		/// <summary>
+		/// Translates controller input from EmuHawk into
+		/// N64 controller data
+		/// </summary>
+		/// <param name="i">index (from 0) of controller to update and shove</param>
+		public int GetControllerInput(int i)
+		{
+			_emuCore.InputCallbacks.Call();
+			ThisFrameInputPolled = true;
+
+			(sbyte x, sbyte y) = GetStickValues(Controller, i + 1);
+
 			int value = ReadController(i + 1);
 			value |= (x & 0xFF) << 16;
 			value |= (y & 0xFF) << 24;