X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=ppu.h;h=4cde0e62f043058946cc28f1ccbd7c9b018cce77;hb=9902256814785f0b3f08d336a98c481c296ac7e5;hp=61d98650ebdfb1969e48d9a38d9576071c30f332;hpb=3ddd6d5ea2811b783bf349c8947cf1bbaaf3c8b9;p=drnoksnes

diff --git a/ppu.h b/ppu.h
index 61d9865..4cde0e6 100644
--- a/ppu.h
+++ b/ppu.h
@@ -237,6 +237,8 @@ struct SDMA {
 };
 
 START_EXTERN_C
+void S9xNextController ();
+
 void S9xUpdateScreen ();
 void S9xResetPPU ();
 void S9xFixColourBrightness ();
@@ -279,8 +281,8 @@ STATIC INLINE uint8 REGISTER_4212()
 
 STATIC INLINE void FLUSH_REDRAW ()
 {
-    if (IPPU.PreviousLine != IPPU.CurrentLine)
-	S9xUpdateScreen ();
+	if (IPPU.PreviousLine != IPPU.CurrentLine)
+		S9xUpdateScreen();
 }
 
 STATIC INLINE void REGISTER_2104 (uint8 byte)
@@ -484,22 +486,18 @@ STATIC INLINE void REGISTER_2122(uint8 Byte)
     {
 	if ((Byte & 0x7f) != (PPU.CGDATA[PPU.CGADD] >> 8))
 	{
-	    if (Settings.SixteenBit&& !(Settings.os9x_hack&PPU_IGNORE_PALWRITE)){
+	    if (!(Settings.os9x_hack&PPU_IGNORE_PALWRITE)){
 		FLUSH_REDRAW ();
 			}
 	    PPU.CGDATA[PPU.CGADD] &= 0x00FF;
 	    PPU.CGDATA[PPU.CGADD] |= (Byte & 0x7f) << 8;
 	    IPPU.ColorsChanged = TRUE;
-#ifndef _SNESPPC
-	    if (Settings.SixteenBit)
-#endif
-		{
+
 		IPPU.Blue [PPU.CGADD] = IPPU.XB [(Byte >> 2) & 0x1f];
 		IPPU.Green [PPU.CGADD] = IPPU.XB [(PPU.CGDATA[PPU.CGADD] >> 5) & 0x1f];
 		IPPU.ScreenColors [PPU.CGADD] = (uint16) BUILD_PIXEL (IPPU.Red [PPU.CGADD],
 							     IPPU.Green [PPU.CGADD],
 							     IPPU.Blue [PPU.CGADD]);
-	    }
 	}
 	PPU.CGADD++;
     }
@@ -507,22 +505,18 @@ STATIC INLINE void REGISTER_2122(uint8 Byte)
     {
 	if (Byte != (uint8) (PPU.CGDATA[PPU.CGADD] & 0xff))
 	{
-	    if (Settings.SixteenBit&& !(Settings.os9x_hack&PPU_IGNORE_PALWRITE)){
+	    if (!(Settings.os9x_hack&PPU_IGNORE_PALWRITE)){
 		FLUSH_REDRAW ();
 			}
 	    PPU.CGDATA[PPU.CGADD] &= 0x7F00;
 	    PPU.CGDATA[PPU.CGADD] |= Byte;
 	    IPPU.ColorsChanged = TRUE;
-#ifndef _SNESPPC
-	    if (Settings.SixteenBit)
-#endif
-	    {
+
 		IPPU.Red [PPU.CGADD] = IPPU.XB [Byte & 0x1f];
 		IPPU.Green [PPU.CGADD] = IPPU.XB [(PPU.CGDATA[PPU.CGADD] >> 5) & 0x1f];
 		IPPU.ScreenColors [PPU.CGADD] = (uint16) BUILD_PIXEL (IPPU.Red [PPU.CGADD],
 							     IPPU.Green [PPU.CGADD],
 							     IPPU.Blue [PPU.CGADD]);
-	    }
 	}
     }
     PPU.CGFLIP ^= 1;