From 1c48900fdace9b2ba1cd3b93ecae8aacb1e11168 Mon Sep 17 00:00:00 2001
From: Nebuleon Fumika
Date: Sat, 5 Jan 2013 04:01:01 -0500
Subject: Sync ALL bits of the joypad again. This may make controls a bit
 slower to parse, but is required by Super Mario All-Stars at least.

---
 source/nds/entry.cpp | 3 +--
 source/ppu.cpp       | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'source')

diff --git a/source/nds/entry.cpp b/source/nds/entry.cpp
index 9928985..5573f47 100644
--- a/source/nds/entry.cpp
+++ b/source/nds/entry.cpp
@@ -1001,8 +1001,7 @@ unsigned int S9xReadJoypad (int which1)
 			key |= (inputdata.key & (1<<i)) ? keymap[i] : 0;
 		}
 
-		// return (key | 0x80000000);
-		return key; // ??? [Neb]
+		return (key | 0x80000000);
 	}
 	else
 		return 0;
diff --git a/source/ppu.cpp b/source/ppu.cpp
index 91e16a0..9a3230c 100644
--- a/source/ppu.cpp
+++ b/source/ppu.cpp
@@ -2973,7 +2973,7 @@ void S9xUpdateJoypads ()
 	{
 		IPPU.Joypads [i] = 0;
 		// Sync each key
-		for (k = SNES_TR_MASK /* lowest value */; k != SNES_B_MASK << 1 /* one bit past the highest value */; k <<= 1)
+		for (k = 1; k != 0; k <<= 1)
 		{
 			KeyValue = IPPU.JoypadsAtHBlanks[i][0] & k;
 			StartedPressed = KeyValue != 0;
-- 
cgit v1.2.3