--- np2/bios/bios18.c	2004/03/07 23:04:50	1.32
+++ np2/bios/bios18.c	2004/07/22 11:31:32	1.39
@@ -8,8 +8,6 @@
 #include	"font.h"
 
 
-static	int		sti_waiting = 0;
-
 typedef struct {
 	BYTE	GBON_PTN;
 	BYTE	GBBCC;
@@ -41,10 +39,10 @@ typedef struct {
 static const UINT8 modenum[4] = {3, 1, 0, 2};
 
 static const CRTDATA crtdata[7] = {
-						{0x07,	0x00, 0x07, 0x08},		// 200-20
-						{0x09,	0x1f, 0x08, 0x08},		// 200-25
-						{0x0f,	0x00, 0x0f, 0x10},		// 400-20
-						{0x13,	0x1e, 0x11, 0x10},		// 400-25
+						{0x09,	0x1f, 0x08, 0x08},		// 200-20
+						{0x07,	0x00, 0x07, 0x08},		// 200-25
+						{0x13,	0x1e, 0x11, 0x10},		// 400-20
+						{0x0f,	0x00, 0x0f, 0x10},		// 400-25
 						{0x17,	0x1c, 0x13, 0x10},		// 480-20
 						{0x12,	0x1f, 0x11, 0x10},		// 480-25
 						{0x0f,	0x00, 0x0f, 0x10}};		// 480-30
@@ -114,8 +112,8 @@ const CRTDATA	*crt;
 		gdc.mode1 |= 0x08;
 		crt += 2;
 	}
-	if (mode & 0x01) {
-		crt += 1;						// 20行
+	if (!(mode & 0x01)) {
+		crt += 1;						// 25行
 	}
 	if (mode & 0x02) {
 		gdc.mode1 |= 0x04;				// 40桁
@@ -135,6 +133,14 @@ const CRTDATA	*crt;
 	bios0x18_10(0);
 }
 
+void bios0x18_0c(void) {
+
+	if (!(gdcs.textdisp & GDCSCRN_ENABLE)) {
+		gdcs.textdisp |= GDCSCRN_ENABLE;
+		screenupdate |= 2;
+ 	}
+}
+
 static void bios0x18_0f(UINT seg, UINT off, REG8 num, REG8 cnt) {
 
 	BYTE	*p;
@@ -213,8 +219,8 @@ const BYTE	*p;
 			MEML_WRITESTR(seg, off + 2, p, 8);
 			break;
 
-		case 0x28:			// 8x16 KANJI
-		case 0x29:
+//		case 0x28:
+		case 0x29:			// 8x16 KANJI
 		case 0x2a:
 		case 0x2b:
 			size = 0x0102;
@@ -348,7 +354,7 @@ const CRTDATA	*p;
 	}
 
 	CopyMemory(gdc.m.para + GDC_SYNC, gdcmastersync[master], 8);
-	ZeroMemory(gdc.m.para + GDC_SCROLL, 8);
+	ZeroMemory(gdc.m.para + GDC_SCROLL, 4);
 	gdc.m.para[GDC_PITCH] = 80;
 
 	p = crtdata + crt;
@@ -363,11 +369,12 @@ const CRTDATA	*p;
 	crtc.reg.sdr = 0;
 
 	CopyMemory(gdc.s.para + GDC_SYNC, gdcslavesync[slave], 8);
-	ZeroMemory(gdc.s.para + GDC_SCROLL, 8);
+	ZeroMemory(gdc.s.para + GDC_SCROLL, 4);
 	if (slave & 1) {
 		gdc.s.para[GDC_PITCH] = 80;
 		gdc.clock |= 3;
 		mem[MEMB_PRXDUPD] |= 0x04;
+		gdc.s.para[GDC_SCROLL+3] = 0x40;
 	}
 	else {
 		gdc.s.para[GDC_PITCH] = 40;
@@ -468,11 +475,11 @@ void bios0x18_42(REG8 mode) {
 	scrn = bios0x18_31bh();
 	if ((mem[MEMB_CRT_BIOS] & 0x80) &&
 		(((scrn & 0x30) == 0x30) || (crtmode == 3))) {
-		bios0x18_30(rate, (crtmode << 4) + 1);
+		bios0x18_30(rate, (REG8)((crtmode << 4) + 1));
 	}
 	else {
 #endif
-		ZeroMemory(gdc.s.para + GDC_SCROLL, 8);
+		ZeroMemory(gdc.s.para + GDC_SCROLL, 4);
 		if (crtmode == 2) {							// ALL
 			crtmode = 2;
 			if ((mem[MEMB_PRXDUPD] & 0x24) == 0x20) {
@@ -503,6 +510,9 @@ void bios0x18_42(REG8 mode) {
 				gdc.s.para[GDC_SCROLL+1] = (200*40) >> 8;
 			}
 		}
+		if (mem[MEMB_PRXDUPD] & 4) {
+			gdc.s.para[GDC_SCROLL+3] = 0x40;
+		}
 		if ((crtmode == 2) || (!(mem[MEMB_PRXCRT] & 0x40))) {
 			gdc.mode1 &= ~(0x10);
 			gdc.s.para[GDC_CSRFORM] = 0;
@@ -620,7 +630,8 @@ static void bios0x18_47(void) {
 		vect.ope = 0x20 + (ucw.GBDSP & 7);
 		vect.DC[0] = ucw.GBLNG1[0];
 		vect.DC[1] = ucw.GBLNG1[1];
-		data = LOADINTELWORD(ucw.GBLNG2) - 1;
+//		data = LOADINTELWORD(ucw.GBLNG2) - 1;
+		data = LOADINTELWORD(ucw.GBCIR) - 1;
 		STOREINTELWORD(vect.D, data);
 		data >>= 1;
 		STOREINTELWORD(vect.D2, data);
@@ -760,17 +771,6 @@ void bios0x18(void) {
 							MEML_READ16(CPU_SS, CPU_SP)));
 #endif
 
-	sti_waiting ^= 1;
-	if (sti_waiting) {					// 割込み許可の遊び
-		CPU_STI;
-		if (PICEXISTINTR) {
-			CPU_IP--;
-			nevent_forceexit();
-			return;
-		}
-	}
-	sti_waiting = 0;
-
 	switch(CPU_AH) {
 		case 0x00:						// キー・データの読みだし
 			if (mem[MEMB_KB_COUNT]) {
@@ -803,7 +803,7 @@ void bios0x18(void) {
 			break;
 
    		case 0x04:						// キー入力状態のセンス
-			CPU_AH = mem[0x00052a + (CPU_AL & 0x0f)];
+			CPU_AH = mem[MEMX_KB_KY_STS + (CPU_AL & 0x0f)];
  			break;
 
    		case 0x05:						// キー入力センス
@@ -825,10 +825,7 @@ void bios0x18(void) {
  			break;
 
    		case 0x0c:						// テキスト画面の表示開始
-			if (!(gdcs.textdisp & GDCSCRN_ENABLE)) {
-				gdcs.textdisp |= GDCSCRN_ENABLE;
-				screenupdate |= 2;
- 			}
+			bios0x18_0c();
  			break;
 
    		case 0x0d:						// テキスト画面の表示終了
@@ -940,12 +937,10 @@ void bios0x18(void) {
 				if (tmp.r8 == 0x05) {
 					CPU_AL = 0;
 					CPU_BH = 0;
-					TRACEOUT(("success"));
 				}
 				else {
 					CPU_AL = 1;
 					CPU_BH = 1;
-					TRACEOUT(("failure"));
 				}
 			}
 			break;