From 0c4aac3da9b26aece7c8c68d5a7a981ef4797cb2 Mon Sep 17 00:00:00 2001
From: Martin Haye <m1@snyder-haye.com>
Date: Sun, 28 Jun 2015 09:26:52 -0700
Subject: [PATCH] Added aux mem check, and fixed bug in CROSS_WEST.

---
 Platform/Apple/virtual/src/core/mem.s  | 18 ++++++++++++++++++
 Platform/Apple/virtual/src/tile/tile.s |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/Platform/Apple/virtual/src/core/mem.s b/Platform/Apple/virtual/src/core/mem.s
index dd01d546..91afa088 100644
--- a/Platform/Apple/virtual/src/core/mem.s
+++ b/Platform/Apple/virtual/src/core/mem.s
@@ -768,6 +768,24 @@ init: !zone
 ; put something interesting on the screen :)
 	jsr home
 	+prStr : !text "Welcome to Mythos.",0
+; verify that aux mem exists
+	sta clrAuxWr
+	lda #1
+	sta $2000
+	sta setAuxWr
+	lda #2
+	sta $2000
+	sta clrAuxWr
+	sta setAuxRd
+	lda $2000
+	sta clrAuxRd
+	cmp #1
+	beq +
+	ldx #<.auxMsg
+	ldy #>.auxMsg
+	jmp fatalError
+.auxMsg	!text "Aux mem required",0
++
 ; close all files
 	lda #0
 	jsr closeFile
diff --git a/Platform/Apple/virtual/src/tile/tile.s b/Platform/Apple/virtual/src/tile/tile.s
index dfcbba00..346b504f 100644
--- a/Platform/Apple/virtual/src/tile/tile.s
+++ b/Platform/Apple/virtual/src/tile/tile.s
@@ -540,7 +540,7 @@ CROSS_WEST
 	CPY #NOT_LOADED
 	BEQ .gotNW
 	LDY #WEST
-	LDA (NE_MAP_LOC),Y
+	LDA (NW_MAP_LOC),Y
 	TAX
 .gotNW	LDA #NOT_LOADED
 	LDY SW_MAP_ID