From 19f3b1b1dab7f517d197c8228919614a21f233bd Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@zeromus.org>
Date: Sat, 17 May 2014 00:06:20 +0000
Subject: [PATCH] here it is, fixed another way, for the record: float ranges
 can now support inverted senses.

---
 BizHawk.Client.Common/ControllerBinding.cs           | 12 ++++++++----
 .../Consoles/Nintendo/N64/N64Input.cs                |  8 ++++----
 output/defctrl.json                                  |  8 ++++----
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/BizHawk.Client.Common/ControllerBinding.cs b/BizHawk.Client.Common/ControllerBinding.cs
index 8502075240..f8027cb3f5 100644
--- a/BizHawk.Client.Common/ControllerBinding.cs
+++ b/BizHawk.Client.Common/ControllerBinding.cs
@@ -113,14 +113,18 @@ namespace BizHawk.Client.Common
 					}
 
 					var output = (input * multiplier + 10000.0f) * (range.Max - range.Min) / 20000.0f + range.Min;
-					if (output < range.Min)
+
+					float lbound = Math.Min(range.Min, range.Max);
+					float ubound = Math.Max(range.Min, range.Max);
+
+					if (output < lbound)
 					{
-						output = range.Min;
+						output = lbound;
 					}
 
-					if (output > range.Max)
+					if (output > ubound)
 					{
-						output = range.Max;
+						output = ubound;
 					}
 
 					_floatButtons[outkey] = output;
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64Input.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64Input.cs
index 766fef63ed..dce6694d1c 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64Input.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64Input.cs
@@ -34,13 +34,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
 			FloatRanges =
 			{
 				new[] {-128.0f, 0.0f, 127.0f},
+				new[] {127.0f, 0.0f, -128.0f},
 				new[] {-128.0f, 0.0f, 127.0f},
+				new[] {127.0f, 0.0f, -128.0f},
 				new[] {-128.0f, 0.0f, 127.0f},
+				new[] {127.0f, 0.0f, -128.0f},
 				new[] {-128.0f, 0.0f, 127.0f},
-				new[] {-128.0f, 0.0f, 127.0f},
-				new[] {-128.0f, 0.0f, 127.0f},
-				new[] {-128.0f, 0.0f, 127.0f},
-				new[] {-128.0f, 0.0f, 127.0f}
+				new[] {127.0f, 0.0f, -128.0f}
 			}
 		};
 
diff --git a/output/defctrl.json b/output/defctrl.json
index 7e3c7d7324..d4363caf67 100644
--- a/output/defctrl.json
+++ b/output/defctrl.json
@@ -776,7 +776,7 @@
       },
       "P1 Y Axis": {
         "Value": "J1 Y",
-        "Mult": -1.0,
+        "Mult": 1.0,
         "Deadzone": 0.1
       },
       "P2 X Axis": {
@@ -786,7 +786,7 @@
       },
       "P2 Y Axis": {
         "Value": "",
-        "Mult": -1.0,
+        "Mult": 1.0,
         "Deadzone": 0.1
       },
       "P3 X Axis": {
@@ -796,7 +796,7 @@
       },
       "P3 Y Axis": {
         "Value": "",
-        "Mult": -1.0,
+        "Mult": 1.0,
         "Deadzone": 0.1
       },
       "P4 X Axis": {
@@ -806,7 +806,7 @@
       },
       "P4 Y Axis": {
         "Value": "",
-        "Mult": -1.0,
+        "Mult": 1.0,
         "Deadzone": 0.1
       }
     },