--- np2/io/gdc_pset.c	2004/02/09 20:39:39	1.6
+++ np2/io/gdc_pset.c	2005/02/08 09:19:00	1.10
@@ -1,8 +1,9 @@
 #include	"compiler.h"
 #include	"cpucore.h"
-#include	"egcmem.h"
 #include	"pccore.h"
 #include	"iocore.h"
+#include	"memegc.h"
+#include	"gdc_sub.h"
 #include	"gdc_pset.h"
 #include	"vram.h"
 
@@ -49,7 +50,7 @@ static void MEMCALL _set(GDCPSET pset, U
 
 static void MEMCALL withtdw(GDCPSET pset, UINT addr, UINT bit) {
 
-	BYTE	*ptr;
+	UINT8	*ptr;
 
 	addr &= ~1;
 	*(UINT16 *)(vramupdate + addr) |= pset->update.w;
@@ -63,9 +64,9 @@ static void MEMCALL withtdw(GDCPSET pset
 
 static void MEMCALL withrmw(GDCPSET pset, UINT addr, UINT bit) {
 
-	BYTE	*ptr;
-	BYTE	data;
-	BYTE	mask;
+	UINT8	*ptr;
+	UINT8	data;
+	UINT8	mask;
 
 	vramupdate[addr] |= pset->update.b[0];
 	ptr = pset->base.ptr + addr;
@@ -93,7 +94,7 @@ static void MEMCALL withegc(GDCPSET pset
 		addr &= ~1;
 		data <<= 8;
 	}
-	egc_write_w(pset->base.addr + addr, data);
+	memegc_wr16(pset->base.addr + addr, data);
 }
 
 
@@ -108,13 +109,13 @@ static const GDCPFN psettbl[4][2] = {
 
 void MEMCALL gdcpset_prepare(GDCPSET pset, UINT32 csrw, REG16 pat, REG8 op) {
 
-	BYTE	*base;
-	BYTE	update;
+	UINT8	*base;
+	UINT8	update;
 
 	if (vramop.operate & VOP_EGCBIT) {
 		pset->func[0] = _nop;
 		pset->func[1] = withegc;
-		pset->base.addr = vramplaneseg[(csrw >> 14) & 3];
+		pset->base.addr = gdcplaneseg[(csrw >> 14) & 3];
 	}
 	else {
 		base = mem;
@@ -129,7 +130,7 @@ void MEMCALL gdcpset_prepare(GDCPSET pse
 		if (!(grcg.gdcwithgrcg & 0x8)) {
 			pset->func[0] = psettbl[op][0];
 			pset->func[1] = psettbl[op][1];
-			pset->base.ptr = base + vramplaneseg[(csrw >> 14) & 3];
+			pset->base.ptr = base + gdcplaneseg[(csrw >> 14) & 3];
 		}
 		else {
 			pset->func[0] = _nop;