Merge pull request #59 from Provenance-Emu/joematt/joystick

Joystick.c fixes

Author: inactive123

src/joystick.c

@@ -66,8 +66,9 @@ uint16_t JoystickReadWord(uint32_t offset)
 		uint8_t offset0, offset1;
 		uint16_t data = 0xFFFF;
 
-		if (!joysticksEnabled)
+        if (!joysticksEnabled) {
 			return 0xFFFF;
+        }
 
 		// Joystick data returns active low for buttons pressed, high for non-
 		// pressed.
@@ -119,14 +120,14 @@ uint16_t JoystickReadWord(uint32_t offset)
 		if (offset0 != 0xFF)
 		{
 			data &= (joypad0Buttons[mask[offset0][0]] ? 0xFFFD : 0xFFFF);
-			if (mask[offset0][1] != 0xFF)
+			if (mask[offset0][1] != 0xF)
 				data &= (joypad0Buttons[mask[offset0][1]] ? 0xFFFE : 0xFFFF);
 		}
 
 		if (offset1 != 0xFF)
 		{
 			data &= (joypad1Buttons[mask[offset1][0]] ? 0xFFF7 : 0xFFFF);
-			if (mask[offset1][1] != 0xFF)
+			if (mask[offset1][1] != 0xF)
 				data &= (joypad1Buttons[mask[offset1][1]] ? 0xFFFB : 0xFFFF);
 		}