From 06116cd0eef68cb01f56ae4237fda89d635066ec Mon Sep 17 00:00:00 2001
From: FeralChild64 <you@example.com>
Date: Sat, 23 Jan 2021 20:09:44 +0100
Subject: [PATCH] better MONITOR -> DOS Wedge integration

---
 src/basic/wedge/wedge_dos.s |  1 +
 src/mon_m65/bsmon.s         | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/basic/wedge/wedge_dos.s b/src/basic/wedge/wedge_dos.s
index e41f6f5b..77449da0 100644
--- a/src/basic/wedge/wedge_dos.s
+++ b/src/basic/wedge/wedge_dos.s
@@ -471,6 +471,7 @@ wedge_dos_wrapper_error_common:
 	; Print error - within the MONITOR
 
 	jsr do_error_print_only
+	jsr print_return
 	bra wedge_dos_wrapper_exit_nocheck
 
 wedge_dos_SYNTAX_error:
diff --git a/src/mon_m65/bsmon.s b/src/mon_m65/bsmon.s
index 14ae4cda..ab1b3750 100644
--- a/src/mon_m65/bsmon.s
+++ b/src/mon_m65/bsmon.s
@@ -1599,9 +1599,25 @@ Print_BCD:
 Mon_DOS:
 ; ******
 
-         JSR  Print_CR
+; Shift BUF content so that '@' is first character
+
+@lp1     LDA  BUF
+         CMP  #'@'
+         BEQ  @wedge
+         LDX  #01
+@lp2     LDA  BUF,x
+         DEX
+         STA  BUF,x
+         INX
+         INX
+         CPX  #80
+         BNE  @lp2
+         BRA  @lp1
+
+; Launch DOS Wedge
+
+@wedge   JSR  Print_CR
          JSR  wedge_dos_monitor
-         JSR  Print_CR
          JMP  Main