--- np2/vram/palettes.c	2003/10/16 17:58:15	1.1
+++ np2/vram/palettes.c	2004/02/19 03:04:02	1.4
@@ -8,23 +8,23 @@
 
 		RGB32		np2_pal32[256];
 #if defined(SUPPORT_16BPP)
-		UINT16		np2_pal16[256];
+		RGB16		np2_pal16[256];
 #endif
 		PALEVENT	palevent;
 static	RGB32		degpal1[8];
 static	RGB32		degpal2[8];
-static	BYTE		anapal1[16];
-static	BYTE		anapal2[16];
+static	UINT8		anapal1[16];
+static	UINT8		anapal2[16];
 
 static	RGB32		lcdpal[15];
-static	BYTE		lcdtbl[0x1000];
-		BYTE		pal_monotable[16] = {0, 0, 0, 0, 1, 1, 1, 1,
+static	UINT8		lcdtbl[0x1000];
+		UINT8		pal_monotable[16] = {0, 0, 0, 0, 1, 1, 1, 1,
 											0, 0, 0, 0, 1, 1, 1, 1};
 
-static const BYTE lcdpal_a[27] = {0, 1, 2, 3, 5, 2, 4, 4, 6,
+static const UINT8 lcdpal_a[27] = {	0, 1, 2, 3, 5, 2, 4, 4, 6,
 									7, 9, 2,11,13, 2, 4, 4, 6,
 									8, 8,10, 8, 8,10,12,12,14};
-static const BYTE deftbl[4] = {0x04, 0x15, 0x26, 0x37};
+static const UINT8 deftbl[4] = {0x04, 0x15, 0x26, 0x37};
 
 
 void pal_makegrad(RGB32 *pal, int pals, UINT32 bg, UINT32 fg) {
@@ -94,6 +94,7 @@ void pal_makeskiptable(void) {
 
 	int		i;
 	RGB32	pal;
+	UINT8	ana;
 
 	for (i=0; i<8; i++) {
 		pal.p.b = (BYTE)(i & 1);
@@ -104,8 +105,9 @@ void pal_makeskiptable(void) {
 		degpal2[i].d = pal.d * np2cfg.skiplight;
 	}
 	for (i=0; i<16; i++) {
-		anapal1[i] = (BYTE)(i * 0x11);
-		anapal2[i] = (BYTE)((np2cfg.skiplight * anapal1[i]) / 255);
+		ana = (UINT8)(i * 0x11);
+		anapal1[i] = ana;
+		anapal2[i] = (UINT8)((np2cfg.skiplight * anapal1[i]) / 255);
 	}
 }
 
@@ -218,7 +220,7 @@ static void pal_makedegital_lcd(const BY
 	UINT	i;
 	UINT32	pal32;
 #if defined(SUPPORT_16BPP)
-	UINT16	pal16;
+	RGB16	pal16;
 #endif
 
 	for (i=0; i<4; i++) {
@@ -267,7 +269,7 @@ static void pal_maketext(void) {
 	UINT	j;
 	UINT	k;
 #if defined(SUPPORT_16BPP)
-	UINT16	pal16;
+	RGB16	pal16;
 #endif
 
 	k = NP2PAL_TEXT2;
@@ -301,7 +303,7 @@ static void pal_maketext_lcd(void) {
 	UINT	j;
 	UINT	k;
 #if defined(SUPPORT_16BPP)
-	UINT16	pal16;
+	RGB16	pal16;
 #endif
 
 	k = NP2PAL_TEXT2;
@@ -408,6 +410,7 @@ void pal_eventclear(void) {
 	}
 	else {
 		CopyMemory(palevent.pal, gdc.anapal, sizeof(gdc.anapal));
+		palevent.vsyncpal = 0;
 	}
 }