--- np2/lio/gput1.c	2004/06/04 13:01:31	1.13
+++ np2/lio/gput1.c	2005/05/20 13:59:47	1.17
@@ -5,39 +5,38 @@
 #include	"bios.h"
 #include	"lio.h"
 #include	"vram.h"
-#include	"liofont.res"
 
 
 typedef struct {
-	BYTE	x1[2];
-	BYTE	y1[2];
-	BYTE	x2[2];
-	BYTE	y2[2];
-	BYTE	off[2];
-	BYTE	seg[2];
-	BYTE	leng[2];
+	UINT8	x1[2];
+	UINT8	y1[2];
+	UINT8	x2[2];
+	UINT8	y2[2];
+	UINT8	off[2];
+	UINT8	seg[2];
+	UINT8	leng[2];
 } GGET;
 
 typedef struct {
-	BYTE	x[2];
-	BYTE	y[2];
-	BYTE	off[2];
-	BYTE	seg[2];
-	BYTE	leng[2];
-	BYTE	mode;
-	BYTE	colorsw;
-	BYTE	fg;
-	BYTE	bg;
+	UINT8	x[2];
+	UINT8	y[2];
+	UINT8	off[2];
+	UINT8	seg[2];
+	UINT8	leng[2];
+	UINT8	mode;
+	UINT8	colorsw;
+	UINT8	fg;
+	UINT8	bg;
 } GPUT1;
 
 typedef struct {
-	BYTE	x[2];
-	BYTE	y[2];
-	BYTE	chr[2];
-	BYTE	mode;
-	BYTE	colorsw;
-	BYTE	fg;
-	BYTE	bg;
+	UINT8	x[2];
+	UINT8	y[2];
+	UINT8	chr[2];
+	UINT8	mode;
+	UINT8	colorsw;
+	UINT8	fg;
+	UINT8	bg;
 } GPUT2;
 
 typedef struct {
@@ -54,7 +53,7 @@ typedef struct {
 } LIOPUT;
 
 typedef struct {
-	BYTE	*baseptr;
+	UINT8	*baseptr;
 	UINT	addr;
 	UINT	sft;
 	UINT	width;
@@ -62,7 +61,7 @@ typedef struct {
 } GETCNTX;
 
 typedef struct {
-	BYTE	*baseptr;
+	UINT8	*baseptr;
 	UINT	addr;
 	UINT	sft;
 	UINT	width;
@@ -70,13 +69,13 @@ typedef struct {
 	UINT8	maskr;
 	UINT8	masklr;
 	UINT8	mask;
-	BYTE	pat[84];
+	UINT8	pat[84];
 } PUTCNTX;
 
 
-static void getvram(const GETCNTX *gt, BYTE *dst) {
+static void getvram(const GETCNTX *gt, UINT8 *dst) {
 
-	BYTE	*baseptr;
+	UINT8	*baseptr;
 	UINT	addr;
 	UINT	width;
 	UINT	dat;
@@ -117,9 +116,9 @@ static void setdirty(UINT addr, UINT wid
 
 static void putor(const PUTCNTX *pt) {
 
-	BYTE	*baseptr;
+	UINT8	*baseptr;
 	UINT	addr;
-const BYTE	*src;
+const UINT8	*src;
 	UINT	width;
 	UINT	dat;
 
@@ -151,9 +150,9 @@ const BYTE	*src;
 
 static void putorn(const PUTCNTX *pt) {
 
-	BYTE	*baseptr;
+	UINT8	*baseptr;
 	UINT	addr;
-const BYTE	*src;
+const UINT8	*src;
 	UINT	width;
 	UINT	dat;
 
@@ -185,9 +184,9 @@ const BYTE	*src;
 
 static void putand(const PUTCNTX *pt) {
 
-	BYTE	*baseptr;
+	UINT8	*baseptr;
 	UINT	addr;
-const BYTE	*src;
+const UINT8	*src;
 	UINT	width;
 	UINT	dat;
 
@@ -219,9 +218,9 @@ const BYTE	*src;
 
 static void putandn(const PUTCNTX *pt) {
 
-	BYTE	*baseptr;
+	UINT8	*baseptr;
 	UINT	addr;
-const BYTE	*src;
+const UINT8	*src;
 	UINT	width;
 	UINT	dat;
 
@@ -253,9 +252,9 @@ const BYTE	*src;
 
 static void putxor(const PUTCNTX *pt) {
 
-	BYTE	*baseptr;
+	UINT8	*baseptr;
 	UINT	addr;
-const BYTE	*src;
+const UINT8	*src;
 	UINT	width;
 	UINT	dat;
 
@@ -287,9 +286,9 @@ const BYTE	*src;
 
 static void putxorn(const PUTCNTX *pt) {
 
-	BYTE	*baseptr;
+	UINT8	*baseptr;
 	UINT	addr;
-const BYTE	*src;
+const UINT8	*src;
 	UINT	width;
 	UINT	dat;
 
@@ -372,7 +371,7 @@ static REG8 putsub(GLIO lio, const LIOPU
 			flag >>= 1;
 			if (flag & 8) {
 				pt.baseptr = mem + lio->draw.base + lioplaneadrs[pl];
-				MEML_READSTR(lput->seg, off, pt.pat, datacnt);
+				MEMR_READS(lput->seg, off, pt.pat, datacnt);
 				if (lput->sw) {
 					off += datacnt;
 				}
@@ -470,11 +469,11 @@ REG8 lio_gget(GLIO lio) {
 	UINT	datacnt;
 	UINT	mask;
 	GETCNTX	gt;
-	BYTE	pat[84];
+	UINT8	pat[84];
 	UINT	pl;
 
 	lio_updatedraw(lio);
-	MEML_READSTR(CPU_DS, CPU_BX, &dat, sizeof(dat));
+	MEMR_READS(CPU_DS, CPU_BX, &dat, sizeof(dat));
 	x = (SINT16)LOADINTELWORD(dat.x1);
 	y = (SINT16)LOADINTELWORD(dat.y1);
 	x2 = (SINT16)LOADINTELWORD(dat.x2);
@@ -510,8 +509,8 @@ REG8 lio_gget(GLIO lio) {
 	if (leng < (size + 4)) {
 		return(LIO_ILLEGALFUNC);
 	}
-	MEML_WRITE16(seg, off, (REG16)x2);
-	MEML_WRITE16(seg, off+2, (REG16)y2);
+	MEMR_WRITE16(seg, off, (REG16)x2);
+	MEMR_WRITE16(seg, off+2, (REG16)y2);
 	off += 4;
 	gt.addr = (x >> 3) + (y * 80);
 	if (lio->draw.flag & LIODRAW_UPPER) {
@@ -527,7 +526,7 @@ REG8 lio_gget(GLIO lio) {
 			if (mask & 8) {
 				gt.baseptr = mem + lio->draw.base + lioplaneadrs[pl];
 				getvram(&gt, pat);
-				MEML_WRITESTR(seg, off, pat, datacnt);
+				MEMR_WRITES(seg, off, pat, datacnt);
 				off += datacnt;
 			}
 		}
@@ -548,15 +547,15 @@ REG8 lio_gput1(GLIO lio) {
 	UINT	size;
 
 	lio_updatedraw(lio);
-	MEML_READSTR(CPU_DS, CPU_BX, &dat, sizeof(dat));
+	MEMR_READS(CPU_DS, CPU_BX, &dat, sizeof(dat));
 	lput.x = (SINT16)LOADINTELWORD(dat.x);
 	lput.y = (SINT16)LOADINTELWORD(dat.y);
 	lput.off = (UINT16)(LOADINTELWORD(dat.off) + 4);
 	lput.seg = LOADINTELWORD(dat.seg);
 	lput.mode = dat.mode;
 	leng = LOADINTELWORD(dat.leng);
-	lput.width = MEML_READ16(lput.seg, lput.off - 4);
-	lput.height = MEML_READ16(lput.seg, lput.off - 2);
+	lput.width = MEMR_READ16(lput.seg, lput.off - 4);
+	lput.height = MEMR_READ16(lput.seg, lput.off - 2);
 	size = ((lput.width + 7) >> 3) * lput.height;
 	if (leng < (size + 4)) {
 		return(LIO_ILLEGALFUNC);
@@ -595,26 +594,51 @@ REG8 lio_gput2(GLIO lio) {
 	GPUT2	dat;
 	LIOPUT	lput;
 	UINT16	jis;
+	int		pat;
 	REG16	size;
 
 	lio_updatedraw(lio);
-	MEML_READSTR(CPU_DS, CPU_BX, &dat, sizeof(dat));
+	MEMR_READS(CPU_DS, CPU_BX, &dat, sizeof(dat));
 	lput.x = (SINT16)LOADINTELWORD(dat.x);
 	lput.y = (SINT16)LOADINTELWORD(dat.y);
+	lput.off = 0x104e;
+	lput.seg = CPU_DS;
 	jis = LOADINTELWORD(dat.chr);
-	if (jis & 0xff00) {
-		lput.off = 0x104e;
-		lput.seg = CPU_DS;
-		if (jis < 0x200) {			// 1/4ANK
+	pat = 0;
+	if (jis < 0x200) {
+		if (jis < 0x80) {
+			if (jis == 0x7c) {
+				pat = 1;
+			}
+			else if (jis == 0x7e) {
+				pat = 2;
+			}
+			else {
+				jis += 0x2900;
+			}
+		}
+		else if (jis < 0x100) {
+			if ((jis - 0x20) & 0x40) {
+				pat = (jis & 0x3f) + 3;
+			}
+			else {
+				jis += 0x2980;
+			}
+		}
+		else {
 			jis &= 0xff;
 		}
+	}
+	if (!pat) {
 		size = bios0x18_14(lput.seg, 0x104c, jis);
-		lput.width = (size & 0xff00) >> (8 - 3);
-		lput.height = (size & 0xff) << 3;
 	}
 	else {
-		return(0);
+		MEMR_WRITES(lput.seg, lput.off, mem + (LIO_SEGMENT << 4) +
+										LIO_FONT + ((pat - 1) << 4), 0x10);
+		size = 0x0102;
 	}
+	lput.width = (size & 0xff00) >> (8 - 3);
+	lput.height = (size & 0xff) << 3;
 	lput.mode = dat.mode;
 	lput.sw = 0;
 	if (dat.colorsw) {