--- np2/io/gdc_pset.c	2005/02/07 14:46:11	1.9
+++ np2/io/gdc_pset.c	2005/02/16 09:31:55	1.11
@@ -1,8 +1,8 @@
 #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"
@@ -94,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);
 }
 
 
@@ -112,7 +112,7 @@ void MEMCALL gdcpset_prepare(GDCPSET pse
 	UINT8	*base;
 	UINT8	update;
 
-	if (vramop.operate & VOP_EGCBIT) {
+	if (vramop.operate & (1 << VOPBIT_EGC)) {
 		pset->func[0] = _nop;
 		pset->func[1] = withegc;
 		pset->base.addr = gdcplaneseg[(csrw >> 14) & 3];