Merge branch 'master' into 8bitsound

Conflicts:
	source/nds/entry.cpp

1 files changed, 0 insertions, 33 deletions

diff --git a/source/ppu.cpp b/source/ppu.cpp
index ad937c4..179838d 100644
--- a/source/ppu.cpp
+++ b/source/ppu.cpp
@@ -2853,43 +2853,10 @@ void S9xUpdateJoypads ()
 {
     uint32 i;
 
-#ifdef SYNC_JOYPAD_AT_HBLANK
-	uint32 j, k, KeyValue;
-	bool8 StartedPressed;
-
-	// For each joypad
-	for (i = 0; i < 5; i++)
-	{
-		IPPU.Joypads [i] = 0;
-		// Sync each key
-		for (k = 1; k != 0; k <<= 1)
-		{
-			KeyValue = IPPU.JoypadsAtHBlanks[i][0] & k;
-			StartedPressed = KeyValue != 0;
-			// from each line.
-			// If, initially, the key is NOT pressed, one line of it being
-			// pressed means that the key MUST be pressed.
-			// Otherwise, the key MUST be depressed if it starts pressed.
-			for (j = 1; j < (Settings.PAL ? SNES_MAX_PAL_VCOUNTER : SNES_MAX_NTSC_VCOUNTER); j++)
-			{
-				if ((StartedPressed) && ((IPPU.JoypadsAtHBlanks[i][j] & k) == 0)) {
-					KeyValue = 0;
-					break;
-				}
-				else if ((!StartedPressed) && ((IPPU.JoypadsAtHBlanks[i][j] & k) != 0)) {
-					KeyValue = k;
-					break;
-				}
-			}
-			IPPU.Joypads [i] |= KeyValue;
-		}
-	}
-#else
 	for (i = 0; i < 5; i++)
 	{
 		IPPU.Joypads [i] = S9xReadJoypad (i);
 	}
-#endif
 
 //	S9xMovieUpdate();