--- np2/i386c/memory.c	2004/04/14 20:39:12	1.26
+++ np2/i386c/memory.c	2005/02/08 09:19:00	1.27
@@ -3,10 +3,10 @@
 #ifndef NP2_MEMORY_ASM
 
 #include	"cpucore.h"
-#include	"egcmem.h"
 #include	"mem9821.h"
 #include	"pccore.h"
 #include	"iocore.h"
+#include	"memegc.h"
 #include	"vram.h"
 #include	"font.h"
 
@@ -178,7 +178,7 @@ static void MEMCALL grcg_tdw1(UINT32 add
 static void MEMCALL egc_wt(UINT32 address, REG8 value) {		// VRAM
 
 	CPU_REMCLOCK -= MEMWAIT_GRCG;
-	egc_write(address, value);
+	memegc_wr8(address, value);
 }
 
 static void MEMCALL emmc_wt(UINT32 address, REG8 value) {		// EMS
@@ -290,7 +290,7 @@ const BYTE	*vram;
 static REG8 MEMCALL egc_rd(UINT32 address) {					// VRAM
 
 	CPU_REMCLOCK -= MEMWAIT_GRCG;
-	return(egc_read(address));
+	return(memegc_rd8(address));
 }
 
 static REG8 MEMCALL emmc_rd(UINT32 address) {					// EMS
@@ -455,7 +455,7 @@ static void MEMCALL grcgw_tdw1(UINT32 ad
 static void MEMCALL egcw_wt(UINT32 address, REG16 value) {
 
 	CPU_REMCLOCK -= MEMWAIT_GRCG;
-	egc_write_w(address, value);
+	memegc_wr16(address, value);
 }
 
 static void MEMCALL emmcw_wt(UINT32 address, REG16 value) {
@@ -609,7 +609,7 @@ static REG16 MEMCALL grcgw_tcr1(UINT32 a
 static REG16 MEMCALL egcw_rd(UINT32 address) {
 
 	CPU_REMCLOCK -= MEMWAIT_GRCG;
-	return(egc_read_w(address));
+	return(memegc_rd16(address));
 }
 
 static REG16 MEMCALL emmcw_rd(UINT32 address) {