--- np2/vram/scrndraw.c	2005/02/04 05:32:24	1.7
+++ np2/vram/scrndraw.c	2011/01/15 18:04:43	1.10
@@ -8,9 +8,9 @@
 #include	"palettes.h"
 
 
-	BYTE	renewal_line[SURFACE_HEIGHT];
-	BYTE	np2_tram[SURFACE_SIZE];
-	BYTE	np2_vram[2][SURFACE_SIZE];
+	UINT8	renewal_line[SURFACE_HEIGHT];
+	UINT8	np2_tram[SURFACE_SIZE];
+	UINT8	np2_vram[2][SURFACE_SIZE];
 
 
 static void updateallline(UINT32 update) {
@@ -44,10 +44,10 @@ void scrndraw_changepalette(void) {
 	updateallline(0x80808080);
 }
 
-static BYTE rasterdraw(SDRAWFN sdrawfn, SDRAW sdraw, int maxy) {
+static UINT8 rasterdraw(SDRAWFN sdrawfn, SDRAW sdraw, int maxy) {
 
 	RGB32		pal[16];
-	SINT32		clock;
+	SINT32		clk;
 	PAL1EVENT	*event;
 	PAL1EVENT	*eventterm;
 	int			nextupdate;
@@ -55,12 +55,12 @@ static BYTE rasterdraw(SDRAWFN sdrawfn, 
 
 	TRACEOUT(("rasterdraw: maxy = %d", maxy));
 	CopyMemory(pal, palevent.pal, sizeof(pal));
-	clock = maxy;
-	clock += 2;
-	clock += np2cfg.realpal;
-	clock -= 32;
-	clock += (gdc.m.para[GDC_SYNC + 5] >> 2) & 0x3f;
-	clock *= gdc.rasterclock;
+	clk = maxy;
+	clk += 2;
+	clk += np2cfg.realpal;
+	clk -= 32;
+	clk += (gdc.m.para[GDC_SYNC + 5] >> 2) & 0x3f;
+	clk *= gdc.rasterclock;
 	event = palevent.event;
 	eventterm = event + palevent.events;
 	nextupdate = 0;
@@ -69,7 +69,7 @@ static BYTE rasterdraw(SDRAWFN sdrawfn, 
 			break;
 		}
 		// お弁当はあった？
-		if (clock < event->clock) {
+		if (clk < event->clock) {
 			if (!(np2cfg.LCD_MODE & 1)) {
 				pal_makeanalog(pal, 0xffff);
 			}
@@ -85,15 +85,15 @@ static BYTE rasterdraw(SDRAWFN sdrawfn, 
 			(*sdrawfn)(sdraw, y);
 			nextupdate = y;
 			// お弁当を食べる
-			while(clock < event->clock) {
-				((BYTE *)pal)[event->color] = event->value;
+			while(clk < event->clock) {
+				((UINT8 *)pal)[event->color] = event->value;
 				event++;
 				if (event >= eventterm) {
 					break;
 				}
 			}
 		}
-		clock -= 2 * gdc.rasterclock;
+		clk -= 2 * gdc.rasterclock;
 	}
 	if (nextupdate < maxy) {
 		if (!(np2cfg.LCD_MODE & 1)) {
@@ -124,13 +124,13 @@ static BYTE rasterdraw(SDRAWFN sdrawfn, 
 	}
 }
 
-BYTE scrndraw_draw(BYTE redraw) {
+UINT8 scrndraw_draw(UINT8 redraw) {
 
-	BYTE		ret;
+	UINT8		ret;
 const SCRNSURF	*surf;
 const SDRAWFN	*sdrawfn;
 	_SDRAW		sdraw;
-	BYTE		bit;
+	UINT8		bit;
 	int			i;
 	int			height;
 
@@ -156,13 +156,13 @@ const SDRAWFN	*sdrawfn;
 
 	bit = 0;
 	if (gdc.mode1 & 0x80) {						// ver0.28
+		if (gdcs.grphdisp & 0x80) {
 #if defined(SUPPORT_PC9821)
-		if ((gdc.analog & 6) == 6) {
-			bit |= 0x01;
-		}
-		else
+			if ((gdc.analog & 6) == 6) {
+				bit |= 0x01;
+			}
+			else
 #endif
-		if (gdcs.grphdisp & 0x80) {
 			bit |= (1 << gdcs.disp);
 		}
 		if (gdcs.textdisp & 0x80) {