--- np2/io/cgrom.c	2003/12/19 23:16:06	1.6
+++ np2/io/cgrom.c	2004/02/07 21:23:22	1.8
@@ -16,6 +16,9 @@ static void cgwindowset(CGROM cr) {
 	if (grcg.chip >= 2) {
 		if (!(cr->code & 0xff00)) {
 			high = 0x80000 + (cr->code << 4);
+			if (!(gdc.mode1 & 8)) {
+				high += 0x2000;
+			}
 		}
 		else {
 			code = cr->code & 0x007f;
@@ -37,11 +40,12 @@ static void cgwindowset(CGROM cr) {
 	else {
 		high = low;
 	}
+#if !defined(CGWND_FONTPTR)
 	cgwindow.low = low;
 	cgwindow.high = high;
-#if defined(CPUSTRUC_FONTPTR)
-	FONTPTR_LOW = fontrom + low;
-	FONTPTR_HIGH = fontrom + high;
+#else
+	cgwindow.fontlow = fontrom + low;
+	cgwindow.fonthigh = fontrom + high;
 #endif
 }
 
@@ -132,11 +136,12 @@ void cgrom_reset(void) {
 
 	cgw = &cgwindow;
 	ZeroMemory(cgw, sizeof(cgrom));
+#if !defined(CGWND_FONTPTR)
 	cgw->low = 0x7fff0;
 	cgw->high = 0x7fff0;
-#if defined(CPUSTRUC_FONTPTR)
-	FONTPTR_LOW = fontrom + 0x7fff0;
-	FONTPTR_HIGH = fontrom + 0x7fff0;
+#else
+	cgw->fontlow = fontrom + 0x7fff0;
+	cgw->fonthigh = fontrom + 0x7fff0;
 #endif
 	cgw->writable = 0;
 }