--- np2/i286x/memory.x86	2004/01/25 05:41:29	1.9
+++ np2/i286x/memory.x86	2004/01/31 08:34:41	1.11
@@ -82,10 +82,10 @@ section .text
 
 
 %if USE_EGCASM
-	extern	_egca_read
-	extern	_egca_read_w
-	extern	_egca_write
-	extern	_egca_write_w
+	extern	egc_read
+	extern	egc_read_w
+	extern	egc_write
+	extern	egc_write_w
 %else
 	extern	@egc_read@4
 	extern	@egc_read_w@4
@@ -120,6 +120,8 @@ wtram_a:			cmp		ecx, 000a3fe0h
 					jc		short wtram_m
 					cmp		ecx, 000a4000h
 					jnc		wcgwindow_s
+					test	ecx, 2
+					je		short wtram_m
 					cmp		byte [_gdcs + gdcs_t.msw_accessable], 0
 					je		short wtram_e
 wtram_m:			shr		ebx, 1
@@ -262,7 +264,7 @@ grcgtdw_end:		pop		ecx
 @egc_wt:			VRAMTRACE
 					pop		ebx
 %if USE_EGCASM
-					jmp		_egca_write
+					jmp		egc_write
 %else
 					pushad
 					call	@egc_write@8
@@ -383,7 +385,7 @@ grcgtcr_end:		not		al
 					align	16
 @egc_rd:			pop		ebx
 %if USE_EGCASM
-					jmp		_egca_read
+					jmp		egc_read
 %else
 					pushad
 					call	@egc_read@4
@@ -452,6 +454,8 @@ wtramw_a:			je		short wword_a1fffh
 					jc		short wtramw_m
 					cmp		ecx, 000a3fffh
 					jnc		wcgwindoww_s
+					test	ecx, 2
+					je		short wtramw_m
 					cmp		byte [_gdcs + gdcs_t.msw_accessable], 0
 					je		short wtramw_e
 wtramw_m:			and		ebx, 1fffh
@@ -615,7 +619,7 @@ grcgwtdw_end:		pop		ecx
 @egcw_wt:			VRAMTRACE_W
 					pop		ebx
 %if USE_EGCASM
-					jmp		_egca_write_w
+					jmp		egc_write_w
 %else
 					test	ecx, 1
 					jne		short egcw_wtodd
@@ -777,7 +781,7 @@ grcgwtcr_end:		not		ax
 					test	ecx, 1
 					jne		short egcw_rdodd
 %if USE_EGCASM
-					jmp		_egca_read_w
+					jmp		egc_read_w
 %else
 					pushad
 					call	@egc_read_w@4
@@ -789,10 +793,10 @@ grcgwtcr_end:		not		ax
 egcw_rdodd:
 %if USE_EGCASM
 					inc		ecx
-					call	_egca_read
+					call	egc_read
 					mov		ah, al
 					dec		ecx
-					jmp		_egca_read
+					jmp		egc_read
 %else
 					pushad
 					push	ecx