--- xmil/z80c/z80mem.c	2004/08/08 14:00:56	1.3
+++ xmil/z80c/z80mem.c	2004/08/20 23:01:16	1.4
@@ -6,30 +6,30 @@
 REG8 MEMCALL mem_read8(UINT addr) {
 
 	if (addr & 0x8000) {
-		return(mMAIN[addr]);
+		return(mainmem[addr]);
 	}
 	else {
-		return(RAM0r[addr]);
+		return(z80core.e.memread[addr]);
 	}
 }
 
 SINT MEMCALL mem_read8s(UINT addr) {
 
 	if (addr & 0x8000) {
-		return((SINT)(SINT8)mMAIN[addr]);
+		return((SINT)(SINT8)mainmem[addr]);
 	}
 	else {
-		return((SINT)(SINT8)RAM0r[addr]);
+		return((SINT)(SINT8)z80core.e.memread[addr]);
 	}
 }
 
 void MEMCALL mem_write8(UINT addr, REG8 value) {
 
 	if (addr & 0x8000) {
-		mMAIN[addr] = (UINT8)value;
+		mainmem[addr] = (UINT8)value;
 	}
 	else {
-		RAM0w[addr] = (UINT8)value;
+		z80core.e.memwrite[addr] = (UINT8)value;
 	}
 }
 
@@ -37,10 +37,10 @@ REG16 MEMCALL mem_read16(UINT addr) {
 
 	if ((addr & 0x7fff) != 0x7fff) {
 		if (addr & 0x8000) {
-			return(LOADINTELWORD(mMAIN + addr));
+			return(LOADINTELWORD(mainmem + addr));
 		}
 		else {
-			return(LOADINTELWORD(RAM0r + addr));
+			return(LOADINTELWORD(z80core.e.memread + addr));
 		}
 	}
 	else {
@@ -52,10 +52,10 @@ void MEMCALL mem_write16(UINT addr, REG1
 
 	if ((addr & 0x7fff) != 0x7fff) {
 		if (addr & 0x8000) {
-			STOREINTELWORD(mMAIN + addr, value);
+			STOREINTELWORD(mainmem + addr, value);
 		}
 		else {
-			STOREINTELWORD(RAM0w + addr, value);
+			STOREINTELWORD(z80core.e.memwrite + addr, value);
 		}
 	}
 	else {