From beb25ce24f43a157a3d34f2d305b5f21c3b1b912 Mon Sep 17 00:00:00 2001
From: nattthebear <goyuken@gmail.com>
Date: Sun, 11 Jun 2017 06:57:28 -0400
Subject: [PATCH] saturnus: reorder the normal controller

---
 .../Sega/Saturn/SaturnusControllerDeck.cs     | 45 +++++++++++++++++--
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/SaturnusControllerDeck.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/SaturnusControllerDeck.cs
index f1251f96b5..dbea53ddd8 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/SaturnusControllerDeck.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/SaturnusControllerDeck.cs
@@ -107,11 +107,18 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
 
 				Definition = new ControllerDefinition
 				{
-					BoolButtons = _bakedButtonNames.Where(s => s != null).ToList(),
+					BoolButtons = _bakedButtonNames
+						.Select((s, i) => new { s, i })
+						.Where(a => a.s != null)
+						.OrderBy(a => ButtonOrdinal(ButtonNames[a.i]))
+						.Select(a => a.s)
+						.ToList(),
 				};
-				Definition.FloatControls.AddRange(_bakedAnalogNames);
+				Definition.FloatControls.AddRange(_bakedAnalogNames
+					.Select((s, i) => new { s, i })
+					.OrderBy(a => AnalogOrdinal(AnalogNames[a.i]))
+					.Select(a => a.s));
 				Definition.FloatRanges.AddRange(_bakedAnalogNames.Select(s => AnalogFloatRange));
-
 			}
 
 			private readonly string[] _bakedButtonNames;
@@ -123,6 +130,15 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
 			protected virtual int AnalogByteOffset => (ButtonNames.Length + 7) / 8;
 			public ControllerDefinition Definition { get; }
 
+			protected virtual int ButtonOrdinal(string name)
+			{
+				return 0;
+			}
+			protected virtual int AnalogOrdinal(string name)
+			{
+				return 0;
+			}
+
 			private void UpdateButtons(IController controller, byte[] dest, int offset)
 			{
 				int pos = offset + ButtonByteOffset;
@@ -177,6 +193,29 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
 			};
 
 			protected override string[] ButtonNames => _buttonNames;
+
+			protected override int ButtonOrdinal(string name)
+			{
+				switch (name)
+				{
+					default:
+						return 0;
+					case "A":
+						return 1;
+					case "B":
+					case "C":
+						return 2;
+					case "X":
+						return 3;
+					case "Y":
+						return 4;
+					case "Z":
+					case "L":
+						return 5;
+					case "R":
+						return 6;
+				}
+			}
 		}
 
 		private class ThreeDeeGamepad : ButtonedDevice