--- np2/lio/gpset.c	2004/02/22 00:05:56	1.10
+++ np2/lio/gpset.c	2005/02/07 14:46:12	1.12
@@ -4,14 +4,14 @@
 
 
 typedef struct {
-	BYTE	x[2];
-	BYTE	y[2];
-	BYTE	pal;
+	UINT8	x[2];
+	UINT8	y[2];
+	UINT8	pal;
 } GPSET;
 
 typedef struct {
-	BYTE	x[2];
-	BYTE	y[2];
+	UINT8	x[2];
+	UINT8	y[2];
 } GPOINT2;
 
 
@@ -24,7 +24,7 @@ REG8 lio_gpset(GLIO lio) {
 	SINT16	y;
 
 	lio_updatedraw(lio);
-	i286_memstr_read(CPU_DS, CPU_BX, &dat, sizeof(dat));
+	MEML_READSTR(CPU_DS, CPU_BX, &dat, sizeof(dat));
 	x = (SINT16)LOADINTELWORD(dat.x);
 	y = (SINT16)LOADINTELWORD(dat.y);
 	if (dat.pal == 0xff) {
@@ -51,10 +51,10 @@ REG8 lio_gpoint2(GLIO lio) {
 	UINT32	addr;
 	UINT	sft;
 	UINT	pl;
-const BYTE	*ptr;
+const UINT8	*ptr;
 
 	lio_updatedraw(lio);
-	i286_memstr_read(CPU_DS, CPU_BX, &dat, sizeof(dat));
+	MEML_READSTR(CPU_DS, CPU_BX, &dat, sizeof(dat));
 	x = (SINT16)LOADINTELWORD(dat.x);
 	y = (SINT16)LOADINTELWORD(dat.y);
 	if ((lio->draw.x1 > x) || (lio->draw.x2 < x) ||