--- np2/bios/bios18.c	2004/03/04 15:20:13	1.30
+++ np2/bios/bios18.c	2004/03/07 23:04:50	1.32
@@ -167,10 +167,10 @@ static void bios0x18_0f(UINT seg, UINT o
 #endif
 
 	while((cnt--) && (p < (gdc.m.para + GDC_SCROLL + 0x10))) {
-		t = i286_memword_read(seg, off);
+		t = MEML_READ16(seg, off);
 		t >>= 1;
 		STOREINTELWORD(p, t);
-		t = i286_memword_read(seg, off + 2);
+		t = MEML_READ16(seg, off + 2);
 		t *= raster;
 		STOREINTELWORD(p + 2, t);
 		off += 4;
@@ -208,9 +208,9 @@ const BYTE	*p;
 	switch(code >> 8) {
 		case 0x00:			// 8x8
 			size = 0x0101;
-			i286_memword_write(seg, off, 0x0101);
+			MEML_WRITE16(seg, off, 0x0101);
 			p = fontrom + 0x82000 + ((code & 0xff) << 4);
-			i286_memstr_write(seg, off + 2, p, 8);
+			MEML_WRITESTR(seg, off + 2, p, 8);
 			break;
 
 		case 0x28:			// 8x16 KANJI
@@ -218,17 +218,17 @@ const BYTE	*p;
 		case 0x2a:
 		case 0x2b:
 			size = 0x0102;
-			i286_memword_write(seg, off, 0x0102);
+			MEML_WRITE16(seg, off, 0x0102);
 			p = fontrom;
 			p += (code & 0x7f) << 12;
 			p += (((code >> 8) - 0x20) & 0x7f) << 4;
-			i286_memstr_write(seg, off + 2, p, 16);
+			MEML_WRITESTR(seg, off + 2, p, 16);
 			break;
 
 		case 0x80:			// 8x16 ANK
 			size = 0x0102;
 			p = fontrom + 0x80000 + ((code & 0xff) << 4);
-			i286_memstr_write(seg, off + 2, p, 16);
+			MEML_WRITESTR(seg, off + 2, p, 16);
 			break;
 
 		default:
@@ -240,10 +240,10 @@ const BYTE	*p;
 				buf[i*2+0] = *p;
 				buf[i*2+1] = *(p+0x800);
 			}
-			i286_memstr_write(seg, off + 2, buf, 32);
+			MEML_WRITESTR(seg, off + 2, buf, 32);
 			break;
 	}
-	i286_memword_write(seg, off, size);
+	MEML_WRITE16(seg, off, size);
 	return(size);
 }
 
@@ -254,7 +254,7 @@ static void bios0x18_1a(REG16 seg, REG16
 	UINT	i;
 
 	if (((code >> 8) & 0x7e) == 0x76) {
-		i286_memstr_read(seg, off + 2, buf, 32);
+		MEML_READSTR(seg, off + 2, buf, 32);
 		p = fontrom;
 		p += (code & 0x7f) << 12;
 		p += (((code >> 8) - 0x20) & 0x7f) << 4;
@@ -561,7 +561,7 @@ static void bios0x18_47(void) {
 	SINT16		dy;
 
 	gdc_forceready(GDCWORK_SLAVE);
-	i286_memstr_read(CPU_DS, CPU_BX, &ucw, sizeof(ucw));
+	MEML_READSTR(CPU_DS, CPU_BX, &ucw, sizeof(ucw));
 	GBSX1 = LOADINTELWORD(ucw.GBSX1);
 	GBSY1 = LOADINTELWORD(ucw.GBSY1);
 	GBSX2 = LOADINTELWORD(ucw.GBSX2);
@@ -672,7 +672,7 @@ static void bios0x18_49(void) {
 
 	gdc_forceready(GDCWORK_SLAVE);
 
-	i286_memstr_read(CPU_DS, CPU_BX, &ucw, sizeof(ucw));
+	MEML_READSTR(CPU_DS, CPU_BX, &ucw, sizeof(ucw));
 	for (i=0; i<8; i++) {
 		mem[MEMW_PRXGLS + i] = ucw.GBMDOTI[i];
 		pat[i] = GDCPATREVERSE(ucw.GBMDOTI[i]);
@@ -756,8 +756,8 @@ void bios0x18(void) {
 
 #if 0
 	TRACEOUT(("int18 AX=%.4x %.4x:%.4x", CPU_AX,
-							i286_memword_read(CPU_SS, CPU_SP+2),
-							i286_memword_read(CPU_SS, CPU_SP)));
+							MEML_READ16(CPU_SS, CPU_SP+2),
+							MEML_READ16(CPU_SS, CPU_SP)));
 #endif
 
 	sti_waiting ^= 1;
@@ -970,7 +970,7 @@ void bios0x18(void) {
  			break;
 
 		case 0x43:						// パレットの設定
-			i286_memstr_read(CPU_DS, CPU_BX + offsetof(UCWTBL, GBCPC),
+			MEML_READSTR(CPU_DS, CPU_BX + offsetof(UCWTBL, GBCPC),
 																tmp.col, 4);
 			for (i=0; i<4; i++) {
 				gdc_setdegitalpal(6 - (i*2), (REG8)(tmp.col[i] >> 4));
@@ -980,7 +980,7 @@ void bios0x18(void) {
 
 		case 0x44:						// ボーダカラーの設定
 //			if (!(mem[MEMB_PRXCRT] & 0x40)) {
-//				color = i286_membyte_read(CPU_DS, CPU_BX + 1);
+//				color = MEML_READ8(CPU_DS, CPU_BX + 1);
 //			}
 			break;