--- np2/io/cgrom.c	2003/11/15 07:10:02	1.3
+++ np2/io/cgrom.c	2004/02/07 21:23:22	1.8
@@ -1,5 +1,5 @@
 #include	"compiler.h"
-#include	"memory.h"
+#include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"font.h"
@@ -7,41 +7,53 @@
 
 static void cgwindowset(CGROM cr) {
 
+	UINT	low;
+	UINT	high;
 	int		code;
 
-	cgwindow.low = 0x7fff0;
 	cgwindow.writable &= ~1;
+	low = 0x7fff0;
 	if (grcg.chip >= 2) {
 		if (!(cr->code & 0xff00)) {
-			cgwindow.high = 0x80000 + (cr->code << 4);
+			high = 0x80000 + (cr->code << 4);
+			if (!(gdc.mode1 & 8)) {
+				high += 0x2000;
+			}
 		}
 		else {
 			code = cr->code & 0x007f;
-			cgwindow.high = (cr->code & 0x7f7f) << 4;
+			high = (cr->code & 0x7f7f) << 4;
 			if ((code >= 0x56) && (code < 0x58)) {
 				cgwindow.writable |= 1;
-				cgwindow.high += cr->lr;
+				high += cr->lr;
 			}
 			else if (((code >= 0x0c) && (code < 0x10)) ||
 				((code >= 0x58) && (code < 0x60))) {
-				cgwindow.high += cr->lr;
+				high += cr->lr;
 			}
 			else if ((code < 0x08) || (code >= 0x10)) {
-				cgwindow.low = cgwindow.high;
-				cgwindow.high += 0x800;
+				low = high;
+				high += 0x800;
 			}
 		}
 	}
 	else {
-		cgwindow.high = cgwindow.low;
+		high = low;
 	}
+#if !defined(CGWND_FONTPTR)
+	cgwindow.low = low;
+	cgwindow.high = high;
+#else
+	cgwindow.fontlow = fontrom + low;
+	cgwindow.fonthigh = fontrom + high;
+#endif
 }
 
 
 // ---- I/O
 
 // write charactor code low
-static void IOOUTCALL cgrom_oa1(UINT port, BYTE dat) {
+static void IOOUTCALL cgrom_oa1(UINT port, REG8 dat) {
 
 	CGROM	cr;
 
@@ -52,7 +64,7 @@ static void IOOUTCALL cgrom_oa1(UINT por
 }
 
 // write charactor code high
-static void IOOUTCALL cgrom_oa3(UINT port, BYTE dat) {
+static void IOOUTCALL cgrom_oa3(UINT port, REG8 dat) {
 
 	CGROM	cr;
 
@@ -63,7 +75,7 @@ static void IOOUTCALL cgrom_oa3(UINT por
 }
 
 // write charactor line
-static void IOOUTCALL cgrom_oa5(UINT port, BYTE dat) {
+static void IOOUTCALL cgrom_oa5(UINT port, REG8 dat) {
 
 	CGROM	cr;
 
@@ -75,20 +87,20 @@ static void IOOUTCALL cgrom_oa5(UINT por
 }
 
 // CG write pattern
-static void IOOUTCALL cgrom_oa9(UINT port, BYTE dat) {
+static void IOOUTCALL cgrom_oa9(UINT port, REG8 dat) {
 
 	CGROM	cr;
 
 	cr = &cgrom;
 	if ((cr->code & 0x007e) == 0x0056) {
 		fontrom[((cr->code & 0x7f7f) << 4) +
-							cr->lr + cr->line] = dat;
+							cr->lr + cr->line] = (UINT8)dat;
 		cgwindow.writable |= 0x80;
 	}
 	(void)port;
 }
 
-static BYTE IOINPCALL cgrom_ia9(UINT port) {
+static REG8 IOINPCALL cgrom_ia9(UINT port) {
 
 	CGROM	cr;
 const BYTE	*ptr;
@@ -124,8 +136,13 @@ void cgrom_reset(void) {
 
 	cgw = &cgwindow;
 	ZeroMemory(cgw, sizeof(cgrom));
+#if !defined(CGWND_FONTPTR)
 	cgw->low = 0x7fff0;
 	cgw->high = 0x7fff0;
+#else
+	cgw->fontlow = fontrom + 0x7fff0;
+	cgw->fonthigh = fontrom + 0x7fff0;
+#endif
 	cgw->writable = 0;
 }