--- np2/vram/palettes.h	2003/10/16 17:58:15	1.1
+++ np2/vram/palettes.h	2005/02/07 14:46:13	1.6
@@ -1,20 +1,25 @@
 // palette
-//	 00		text palette
-//	+0A		skipline palette
-//	+10		grph palette
-//	+10		text palette
-//	+09		black + text palette
-//	+80		end...
+//	 00		text palette				(NP2PAL_TEXT: pal0s + text)
+//	+0A		skipline palette			(NP2PAL_SKIP: skiplines)
+//	+10		grph palette				(NP2PAL_GRPH: grph only)
+//	+80		text+grph					(NP2PAL_TEXT2:grph+text)
+//	+0A		black + text palette		(NP2PAL_TEXT3: text/grph=black)
 
 enum {
 	NP2PALS_TXT		= 10,
 	NP2PALS_GRPH	= 16,
 
 	NP2PAL_TEXT		= 0,
-	NP2PAL_SKIP		= (NP2PALS_TXT),
+	NP2PAL_SKIP		= (NP2PAL_TEXT + NP2PALS_TXT),
 	NP2PAL_GRPH		= (NP2PAL_SKIP + NP2PALS_GRPH),
 	NP2PAL_TEXT2	= (NP2PAL_GRPH + NP2PALS_GRPH),
 	NP2PAL_TEXT3	= (NP2PAL_TEXT2 + (8 * NP2PALS_GRPH)),
+	NP2PAL_NORMAL	= (NP2PAL_TEXT3 + NP2PALS_TXT),
+
+	NP2PAL_TEXTEX	= NP2PAL_NORMAL,
+	NP2PAL_TEXTEX3	= (NP2PAL_TEXTEX + NP2PALS_TXT),
+	NP2PAL_GRPHEX	= (NP2PAL_TEXTEX3 + NP2PALS_TXT),
+	NP2PAL_EXTEND	= (NP2PAL_GRPHEX + 256),
 
 						// 8bit colorでは TEXT3は使わない筈
 	NP2PAL_TOTAL	= NP2PAL_TEXT3
@@ -25,14 +30,15 @@ enum {
 typedef struct {
 	SINT32	clock;
 	UINT16	color;
-	BYTE	value;
-	BYTE	reserve;
+	UINT8	value;
+	UINT8	reserve;
 } PAL1EVENT;
 
 typedef struct {
 	UINT16		anabit;
 	UINT16		degbit;
 	RGB32		pal[16];
+	UINT		vsyncpal;
 	UINT		events;
 	PAL1EVENT	event[PALEVENTMAX];
 } PALEVENT;
@@ -42,19 +48,19 @@ typedef struct {
 extern "C" {
 #endif
 
-extern	RGB32		np2_pal32[256];
+extern	RGB32		np2_pal32[];
 #if defined(SUPPORT_16BPP)
-extern	UINT16		np2_pal16[256];
+extern	RGB16		np2_pal16[];
 #endif
 extern	PALEVENT	palevent;
-extern	BYTE		pal_monotable[16];
+extern	UINT8		pal_monotable[16];
 
 void pal_makegrad(RGB32 *pal, int pals, UINT32 bg, UINT32 fg);
 
 void pal_initlcdtable(void);
 void pal_makelcdpal(void);
 void pal_makeskiptable(void);
-void pal_change(BYTE textpalset);
+void pal_change(UINT8 textpalset);
 
 void pal_eventclear(void);