--- np2/io/cgrom.c	2003/12/12 01:04:40	1.5
+++ np2/io/cgrom.c	2004/03/28 19:50:25	1.9
@@ -7,34 +7,51 @@
 
 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 >= 0x08) && (code < 0x0c)) {
+				if (cr->lr) {
+					high = low;
+				}
 			}
 			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;
+			else {
+				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
 }
 
 
@@ -68,7 +85,7 @@ static void IOOUTCALL cgrom_oa5(UINT por
 	CGROM	cr;
 
 	cr = &cgrom;
-	cr->line = dat & 0x0f;
+	cr->line = dat & 0x1f;
 	cr->lr = ((~dat) & 0x20) << 6;
 	cgwindowset(cr);
 	(void)port;
@@ -82,7 +99,7 @@ static void IOOUTCALL cgrom_oa9(UINT por
 	cr = &cgrom;
 	if ((cr->code & 0x007e) == 0x0056) {
 		fontrom[((cr->code & 0x7f7f) << 4) +
-							cr->lr + cr->line] = (UINT8)dat;
+							cr->lr + (cr->line & 0x0f)] = (UINT8)dat;
 		cgwindow.writable |= 0x80;
 	}
 	(void)port;
@@ -95,16 +112,25 @@ const BYTE	*ptr;
 
 	cr = &cgrom;
 	ptr = fontrom;
-	if (cr->code & 0xff00) {
+	TRACEOUT(("read code = %.4x", cr->code));
+	if ((cr->code & 0x00fc) == 0x0008) {
+		if (cr->lr) {
+			ptr += (cr->code & 0x7f7f) << 4;
+			return(ptr[cr->line & 0x0f]);
+		}
+	}
+	else if (cr->code & 0xff00) {
 		ptr += (cr->code & 0x7f7f) << 4;
 		ptr += cr->lr;
+		return(ptr[cr->line & 0x0f]);
 	}
-	else {
+	else if (!(cr->line & 0x10)) {		// Ⱦ³Ñ
 		ptr += 0x80000;
 		ptr += cr->code << 4;
+		return(ptr[cr->line]);
 	}
 	(void)port;
-	return(ptr[cr->line]);
+	return(0);
 }
 
 
@@ -124,8 +150,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;
 }