From b02574829d12555a55d14d2af0218ffb79deaebe Mon Sep 17 00:00:00 2001
From: goyuken <goyuken@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Fri, 14 Mar 2014 23:03:03 +0000
Subject: [PATCH] nes: fix vaus controller

---
 .../Consoles/Nintendo/NES/NESControllers.cs    | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NESControllers.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NESControllers.cs
index a06ef8c35c..81feca5a3e 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NESControllers.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NESControllers.cs
@@ -219,7 +219,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
 	{
 		int shiftidx = 0;
 		bool resetting = false;
-		byte latchedvalue = 0x54;
+		byte latchedvalue = 0x54 ^ 0xff;
 
 		static ControllerDefinition Definition = new ControllerDefinition
 		{
@@ -234,7 +234,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
 			if (resetting)
 				shiftidx = 0;
 			if (s.OUT0 > s.OUT0old)
+			{
 				latchedvalue = (byte)(0x54 + (int)c.GetFloat("0Paddle"));
+				latchedvalue ^= 0xff;
+			}
 		}
 
 		public byte Read(IController c)
@@ -244,8 +247,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
 				return ret;
 
 			byte value = latchedvalue;
-			value >>= (3 - shiftidx);
-			ret |= (byte)(value & 0x10);
+			value <<= shiftidx;
+			ret |= (byte)(value >> 3 & 0x10);
 			shiftidx++;
 			return ret;
 		}
@@ -494,7 +497,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
 	{
 		int shiftidx = 0;
 		bool resetting = false;
-		byte latchedvalue = 0x54;
+		byte latchedvalue = 0x54 ^ 0xff;
 
 		static ControllerDefinition Definition = new ControllerDefinition
 		{
@@ -509,7 +512,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
 			if (resetting)
 				shiftidx = 0;
 			if (s.OUT0 > s.OUT0old)
+			{
 				latchedvalue = (byte)(0x54 + (int)c.GetFloat("0Paddle"));
+				latchedvalue ^= 0xff;
+			}
 		}
 
 		public byte ReadA(IController c)
@@ -524,8 +530,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
 				return ret;
 
 			byte value = latchedvalue;
-			value >>= (6 - shiftidx);
-			ret |= (byte)(value & 0x02);
+			value <<= shiftidx;
+			ret |= (byte)(value >> 6 & 0x02);
 			shiftidx++;
 			return ret;
 		}