From 62dbc4af2b05ef04a239b56fd4094a76e3c7cf41 Mon Sep 17 00:00:00 2001
From: FeralChild64 <you@example.com>
Date: Fri, 28 Aug 2020 20:23:57 +0200
Subject: [PATCH] MEGA65 related DOS Wedge fixes

---
 src/basic/board_m65/4000.mega65_vectable_basic_1.s | 2 +-
 src/basic/board_m65/mega65_proxies.s               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/basic/board_m65/4000.mega65_vectable_basic_1.s b/src/basic/board_m65/4000.mega65_vectable_basic_1.s
index c81cea55..e135eda1 100644
--- a/src/basic/board_m65/4000.mega65_vectable_basic_1.s
+++ b/src/basic/board_m65/4000.mega65_vectable_basic_1.s
@@ -27,7 +27,7 @@
 	.label VB1__helper_ask_if_sure       = $4000 + 2 * 12
 
 #if CONFIG_DOS_WEDGE
-	.label VB1__wedge_dos                = $4000 + 2 * 12      
+	.label VB1__wedge_dos                = $4000 + 2 * 13      
 #endif
 
 #else
diff --git a/src/basic/board_m65/mega65_proxies.s b/src/basic/board_m65/mega65_proxies.s
index 46391cb9..bfed1e2a 100644
--- a/src/basic/board_m65/mega65_proxies.s
+++ b/src/basic/board_m65/mega65_proxies.s
@@ -120,6 +120,6 @@ proxy_B1_fetch_uint8:
 proxy_B1_shell_main_loop:
 
 	jsr map_NORMAL
-	jmp_8 !-
+	jmp shell_main_loop
 
 #endif