From 7a05a651ea9e5e88c9dc9df87ca6d193a81df3bc Mon Sep 17 00:00:00 2001
From: FeralChild64 <you@example.com>
Date: Sat, 9 Jan 2021 19:16:42 +0100
Subject: [PATCH] monitor memory handling improvements

---
 src/mon_m65/bsmon.s             | 7 ++-----
 src/mon_m65/mon_helper_memory.s | 1 -
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/mon_m65/bsmon.s b/src/mon_m65/bsmon.s
index 84155460..9e9f5dbd 100644
--- a/src/mon_m65/bsmon.s
+++ b/src/mon_m65/bsmon.s
@@ -391,21 +391,18 @@ Dec_LDA:
          RTS
 
 ; ****
-Fetch: ; XXX get rid of this, use helper!
+Fetch:
 ; ****
 
          PHZ
          TYA
          TAZ
-         BBS7 Long_PC+3,@banked ; trigger banked access
-         +NOP                   ; use LDA  [Long_PC],Z
-@banked  LDA  (Long_PC),Z
+         JSR  Get_From_Memory
          PLZ
          AND  #$ff
          RTS
 
 
-
 ; *********
 Print_Bits:
 ; *********
diff --git a/src/mon_m65/mon_helper_memory.s b/src/mon_m65/mon_helper_memory.s
index d6194d68..90145589 100644
--- a/src/mon_m65/mon_helper_memory.s
+++ b/src/mon_m65/mon_helper_memory.s
@@ -4,7 +4,6 @@
 
 Get_From_Memory:
 
-	; XXX consider temporarily switching off $C000-$CFFF ROM
 	; XXX consider using long mode for addresses below $8000 always
 
 	phx