--- np2/io/egc.c	2003/10/20 06:36:33	1.3
+++ np2/io/egc.c	2004/01/23 15:05:05	1.6
@@ -1,5 +1,5 @@
 #include	"compiler.h"
-#include	"memory.h"
+#include	"cpucore.h"
 #include	"egcmem.h"
 #include	"pccore.h"
 #include	"iocore.h"
@@ -19,7 +19,7 @@ static const UINT16 maskword[16][4] = {
 				{0x0000,0xffff,0xffff,0xffff}, {0xffff,0xffff,0xffff,0xffff}};
 
 
-static void IOOUTCALL egc_o4a0(UINT port, BYTE value) {
+static void IOOUTCALL egc_o4a0(UINT port, REG8 value) {
 
 	if (!(vramop.operate & VOP_EGCBIT)) {
 		return;
@@ -67,12 +67,12 @@ static void IOOUTCALL egc_o4a0(UINT port
 
 		case 0x08:
 			if (!(egc.fgbg & 0x6000)) {
-				egc.mask._b[EGCADDR_L] = value;
+				egc.mask._b[0] = value;
 			}
 			break;
 		case 0x09:
 			if (!(egc.fgbg & 0x6000)) {
-				egc.mask._b[EGCADDR_H] = value;
+				egc.mask._b[1] = value;
 			}
 			break;
 
@@ -130,7 +130,7 @@ void egc_bind(void) {
 	}
 }
 
-void IOOUTCALL egc_w16(UINT port, UINT16 value) {
+void IOOUTCALL egc_w16(UINT port, REG16 value) {
 
 	if (!(vramop.operate & VOP_EGCBIT)) {
 		return;