--- np2/io/gdc_pset.c	2004/02/05 11:34:43	1.5
+++ np2/io/gdc_pset.c	2005/03/11 15:12:57	1.12
@@ -1,13 +1,18 @@
 #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"
 
 
 static void MEMCALL _nop(GDCPSET pset, UINT addr, UINT bit) {
+
+	(void)pset;
+	(void)addr;
+	(void)bit;
 }
 
 static void MEMCALL _replace0(GDCPSET pset, UINT addr, UINT bit) {
@@ -45,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;
@@ -59,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;
@@ -89,11 +94,11 @@ static void MEMCALL withegc(GDCPSET pset
 		addr &= ~1;
 		data <<= 8;
 	}
-	egc_write_w(pset->base.addr + addr, data);
+	egc_writeword(pset->base.addr + addr, data);
 }
 
 
-static const GDCPSFN psettbl[4][2] = {
+static const GDCPFN psettbl[4][2] = {
 				{_replace0,	_replace1},
 				{_nop,		_complemnt},
 				{_nop,		_clear},
@@ -104,13 +109,13 @@ static const GDCPSFN 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) {
+	if (vramop.operate & (1 << VOPBIT_EGC)) {
 		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;
@@ -125,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;
@@ -142,13 +147,15 @@ void MEMCALL gdcpset_prepare(GDCPSET pse
 	pset->dots = 0;
 }
 
-void MEMCALL gdcpset(GDCPSET pset, UINT16 x, UINT16 y) {
+void MEMCALL gdcpset(GDCPSET pset, REG16 x, REG16 y) {
 
 	UINT	dot;
 
 	dot = pset->pattern & 1;
 	pset->pattern = (pset->pattern >> 1) + (dot << 15);
 	pset->dots++;
+	x = LOW16(x);
+	y = LOW16(y);
 	if (y > 409) {
 		return;
 	}