more monitor bugfixes

src/mon_m65/imports.s

@@ -22,10 +22,8 @@
 ;; #ALIAS# monitor_jmpout              = KERNAL_0.proxy_M1_jmpout
 ;; #ALIAS# monitor_jmpout_ret          = KERNAL_0.proxy_M1_jmpout_ret
 
-;; #ALIAS# m65_shadow_BZP              = KERNAL_0.m65_shadow_BZP
-
 ;; #ALIAS# wedge_dos_monitor           = BASIC_0.wedge_dos_monitor
-;; #ALIAS# do_mon_kernal_error         = BASIC_0.proxy_B1_do_mon_kernal_error
+;; #ALIAS# print_kernal_error          = BASIC_0.proxy_M1_print_kernal_error
 
 
 ; 'Print immediate', original implementation by Mike Barry, adapted to 65CE02, modified to preserve .Y

src/mon_m65/mon_command_jmp_jsr.s

@@ -66,13 +66,10 @@ Mon_Go_JSR_comon:
 	lda  ZR
 	pha
 
-	jsr  m65_shadow_BZP
 	jmp  monitor_jmpout
 
 Mon_JSR_ret:
 
-	jsr  m65_shadow_BZP
-
 	; Retrieve registers
 
 	pha

src/mon_m65/mon_command_load_save.s

@@ -83,8 +83,9 @@ Mon_Load_Verify:
 @load:
 
    sta  SA
+
+   jsr  Print_CR
    lda  VERCKK
-   jsr  m65_shadow_BZP
    jsr  LOAD
    bra  Mon_Load_Save_Common
 
@@ -123,22 +124,25 @@ Mon_Save:
    ldx  Long_AC+0
    ldy  Long_AC+1
 
-   jsr  m65_shadow_BZP
    pla                       ; set start address for SAVE            
    sta  TXTTAB+0
    pla
    sta  TXTTAB+1
-   lda  #TXTTAB
 
+   jsr  Print_CR
+   lda  #TXTTAB
    jsr  SAVE
 
    ; FALLTROUGH
 
 Mon_Load_Save_Common:
 
-   jsr  m65_shadow_BZP
    bcc  @end
-   jsr  do_mon_kernal_error
+   pha
+   jsr  Print_CR
+   pla
+   jsr  print_kernal_error
+   jsr  Print_CR
 
 @end: