From cd94519dab9ee159f5b6e648ab0da29261f55037 Mon Sep 17 00:00:00 2001
From: FeralChild64 <you@example.com>
Date: Tue, 22 Dec 2020 23:02:05 +0100
Subject: [PATCH] startup tweaks

---
 src/basic/init/initmsg_m65.s | 54 +++++++++++++++---------------------
 tools/generate_strings.cc    |  3 +-
 2 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/src/basic/init/initmsg_m65.s b/src/basic/init/initmsg_m65.s
index f0fa4b64..e36672d7 100644
--- a/src/basic/init/initmsg_m65.s
+++ b/src/basic/init/initmsg_m65.s
@@ -11,20 +11,24 @@ INITMSG:
 
 	jsr INITMSG_main_banner
 
-	; Display additional information, depending on the mode
-
 	jsr M65_MODEGET
-	bcc @1
+	bcc INITMSG_native
+
+INITMSG_legacy:
 
 	; Legacy C64 compatibility mode
 
-	jsr INITMSG_partial
-
-	ldx #IDX__STR_ORS_LEGACY_2
+	ldx #IDX__STR_ORS_LEGACY
 	jsr print_packed_misc_str
 
-	bra INITMSG_end
-@1:
+	jsr initmsg_bytes_free
+
+	ldx #$07
+	ldy #$00
+	jmp plot_set
+
+INITMSG_native:
+
 	; Native mode	
 
 	ldx #48
@@ -48,15 +52,16 @@ INITMSG:
 	ldx #IDX__STR_ORS
 	jsr print_packed_misc_str
 
-	jsr INITMSG_revision
+	ldx #IDX__STR_PRE_REV
+	jsr print_packed_misc_str
+
+	lda #<rom_revision_basic_string
+	ldy #>rom_revision_basic_string
+	jsr STROUT
 
 	jsr print_return
 	jsr print_return
 
-	; FALLTROUGH
-
-INITMSG_end:
-
 	jsr initmsg_bytes_free
 
 !ifdef HAS_NOLGPL3_WARN {
@@ -85,26 +90,11 @@ INITMSG_main_banner:
 	ldy #>startup_banner
 	jmp STROUT
 
-INITMSG_autoswitch: ; entry point for 'SYS command'
+INITMSG_autoswitch:
 
 	jsr INITMSG_main_banner
-	jsr INITMSG_partial
 
-	jsr print_return
+	ldx #IDX__STR_ORS_LEGACY
+	jsr print_packed_misc_str
+
 	jmp print_return
-
-INITMSG_partial:
-
-	ldx #IDX__STR_ORS_LEGACY_1
-	jsr print_packed_misc_str
-
-	; FALLTROUGH
-
-INITMSG_revision:
-
-	ldx #IDX__STR_PRE_REV
-	jsr print_packed_misc_str
-
-	lda #<rom_revision_basic_string
-	ldy #>rom_revision_basic_string
-	jmp STROUT
diff --git a/tools/generate_strings.cc b/tools/generate_strings.cc
index 835b0b07..00407a18 100644
--- a/tools/generate_strings.cc
+++ b/tools/generate_strings.cc
@@ -294,8 +294,7 @@ const StringEntryList GLOBAL_MiscStrings =  { ListType::STRINGS_BASIC, "misc",
     { true,  true,  true,  true,  true,  "STR_BRK_AT",       "\rBRK AT $"         },
 
     { false, false, true,  false, false, "STR_ORS",          "OPEN ROMS BASIC & KERNAL\r" },
-    { false, false, true,  false, false, "STR_ORS_LEGACY_1", "OPEN ROMS "         },
-    { false, false, true,  false, false, "STR_ORS_LEGACY_2", "\r\rLEGACY MODE   " },
+    { false, false, true,  false, false, "STR_ORS_LEGACY",   "(LEGACY MODE)     " },
 
     { false, true,  true,  false, false, "STR_MEM_HDR",      "\r\x12 AREA   START   SIZE  \r" },
     { false, true,  true,  false, false, "STR_MEM_1",        "   $"               },