--- xmil/io/crtc.c	2004/08/08 16:39:03	1.7
+++ xmil/io/crtc.c	2004/08/12 17:57:36	1.9
@@ -25,12 +25,12 @@ static const CRTCSTAT crtcdefault = {
 				0,							// SCRN_BITS
 				0,							// CRTC_NUM
 
-				8,							// FNT_YL
+				7,							// _FNT_YL
 				40,							// TXT_XL
 				25,							// TXT_YL
 				28,							// TXT_YS
 
-				200,						// CRT_YL
+//				200,						// CRT_YL
 //				232,						// CRT_VS
 //				266,						// CRT_VL
 
@@ -38,7 +38,7 @@ static const CRTCSTAT crtcdefault = {
 				10,							// TXT_VLA
 
 				0,							// TXT_TOP
-				8,							// fnty
+//				8,							// fnty
 
 				0,							// lastpal
 
@@ -49,7 +49,7 @@ static const CRTCSTAT crtcdefault = {
 	};
 
 
-void vrambank_patch(void) {
+void crtc_bankupdate(void) {
 
 	UINT	updatemask;
 	UINT8	dispmode;
@@ -57,11 +57,11 @@ void vrambank_patch(void) {
 	UINT8	pal_disp;
 
 	if (crtc.s.SCRN_BITS & 0x10) {
-		crtc.e.gram = GRP_RAM + GRAM_BANK1;
+		crtc.e.gram = gram + GRAM_BANK1;
 		crtc.e.updatebit = UPDATE_VRAM1;
 	}
 	else {
-		crtc.e.gram = GRP_RAM + GRAM_BANK0;
+		crtc.e.gram = gram + GRAM_BANK0;
 		crtc.e.updatebit = UPDATE_VRAM0;
 	}
 	dispmode = (crtc.s.SCRN_BITS & SCRN_DISPVRAM)?SCRN_BANK1:SCRN_BANK0;
@@ -173,23 +173,21 @@ void vrambank_patch(void) {
 	crtc.e.pal_disp = pal_disp;
 }
 
-static void crtc_updt(void) {
+void crtc_regupdate(void) {
 
+	UINT	fonty;
+
+	fonty = crtc.s._FNT_YL;
 	if (crtc.s.SCRN_BITS & SCRN_24KHZ) {
-		crtc.s.fnty = (crtc.s.FNT_YL >> 1) & 0xfffe;
-	}
-	else {
-		crtc.s.fnty = crtc.s.FNT_YL & 0xfffe;
-	}
-	if (crtc.s.TXT_YL) {
-		crtc.s.CRT_YL = crtc.s.fnty * crtc.s.TXT_YL;
-	}
-	else {
-		crtc.s.CRT_YL = crtc.s.fnty * 1;
+		fonty >>= 1;
 	}
-	crtc.e.vs = crtc.s.fnty * (crtc.s.TXT_YS + 1);
-	crtc.e.vl = (crtc.s.TXT_VL + 1) * crtc.s.fnty + crtc.s.TXT_VLA;
-//	TRACEOUT(("set> %d / %d / %d", crtc.s.CRT_YL, crtc.s.CRT_VS, crtc.s.CRT_VL));
+	fonty += 1;
+	crtc.e.fonty = fonty;
+	crtc.e.yl = (crtc.s.TXT_YL & 0x7f);
+
+	crtc.e.dl = fonty * crtc.e.yl;
+	crtc.e.vs = fonty * ((crtc.s.TXT_YS & 0x7f) + 1);
+	crtc.e.vl = fonty * ((crtc.s.TXT_VL & 0x7f) + 1) + (crtc.s.TXT_VLA & 0x1f);
 }
 
 
@@ -210,7 +208,7 @@ void IOOUTCALL crtc_o(UINT port, REG8 va
 				else {
 					crtc.s.TXT_XL = 80;
 				}
-				vrambank_patch();
+				crtc_bankupdate();
 				break;
 
 			case 0x04:
@@ -230,7 +228,7 @@ void IOOUTCALL crtc_o(UINT port, REG8 va
 				break;
 
 			case 0x09:
-				crtc.s.FNT_YL = (WORD)value+1;
+				crtc.s._FNT_YL = value;
 				break;
 
 			case 0x0c:
@@ -250,7 +248,7 @@ void IOOUTCALL crtc_o(UINT port, REG8 va
 		}
 //		crtc.s.GRP_XL = crtc.s.TXT_XL << 3;
 //		crtc.s.GRP_YL = 200;
-		crtc_updt();
+		crtc_regupdate();
 		scrnallflash = 1;								/* 990220 puni */
 	}
 }
@@ -268,9 +266,9 @@ void IOOUTCALL scrn_o(UINT port, REG8 va
 //		pal_reset();					// ¤Ê¤ó¤Ç¡©
 		scrnallflash = 1;
 		makescrn.palandply = 1;
-		crtc_updt();
+		crtc_regupdate();
 	}
-	vrambank_patch();
+	crtc_bankupdate();
 	(void)port;
 }
 
@@ -396,7 +394,7 @@ REG8 IOINPCALL palette_i(UINT port) {
 void IOOUTCALL extpal_o(UINT port, REG8 value) {
 
 	crtc.s.EXTPALMODE = value;
-	vrambank_patch();
+	crtc_bankupdate();
 	(void)port;
 }
 
@@ -442,7 +440,7 @@ REG8 IOINPCALL exttextpal_i(UINT port) {
 void IOOUTCALL exttextdisp_o(UINT port, REG8 value) {
 
 	crtc.s.ZPRY = value;
-	vrambank_patch();
+	crtc_bankupdate();
 	(void)port;
 }
 
@@ -496,14 +494,20 @@ void crtc_reset(void) {
 	}
 	if ((pccore.ROM_TYPE >= 2) && (!(pccore.DIP_SW & 1))) {
 		crtc.s.SCRN_BITS = SCRN_200LINE;
-		crtc.s.FNT_YL = 16;
+		crtc.s._FNT_YL = 15;
 	}
 
 	pal_reset();
-	crtc_updt();
-
-	vrambank_patch();
+	crtc_bankupdate();
+	crtc_regupdate();
 	makescrn.palandply = 1;
 	scrnallflash = 1;
 }
 
+void crtc_forcesetwidth(REG8 width) {
+
+	crtc.s.TXT_XL = (UINT8)width;
+	crtc_bankupdate();
+	scrnallflash = 1;
+}
+