MEGA65 banner cleanup, fix for native mode autoswitch screen garbage

src/basic/init/e422.initmsg.jmp.s

@@ -16,8 +16,15 @@ INITMSG:
 
 	jsr map_BASIC_1
 	jsr_ind VB1__INITMSG
+!:
 	jmp map_NORMAL
 
+INITMSG_autoswitch:
+
+	jsr map_BASIC_1
+	jsr_ind VB1__INITMSG_autoswitch
+	bra !-
+
 #else
 
 	jmp initmsg_real

src/basic/init/initmsg_m65.s

@@ -9,16 +9,7 @@
 
 INITMSG:
 
-	// Clear the screen first, some cartridges (like IEEE-488) are leaving a mess on the screen
-
-	lda #147
-	jsr JCHROUT
-
-	// Display main banner
-
-	lda #<startup_banner
-	ldy #>startup_banner
-	jsr STROUT
+	jsr INITMSG_main_banner
 
 	// Display additional information, depending on the mode
 
@@ -27,34 +18,12 @@ INITMSG:
 
 	// Legacy C64 compatibility mode
 
-	ldx #$02
-	ldy #$21
-	jsr plot_set
+	jsr INITMSG_partial
 
-	lda #<startup_banner_legacy
-	ldy #>startup_banner_legacy
-	jsr STROUT
-
-	// Legacy mode - display revision and available memory
-
-	ldx #$05
-	ldy #$00
-	jsr plot_set
-
-	lda #<rom_revision_basic_string
-	ldy #>rom_revision_basic_string
-	jsr STROUT
-
-	ldx #$05
-	ldy #$12
-	jsr plot_set
-
-	jsr initmsg_bytes_free
-
-	ldx #$07
-	ldy #$00
-	jmp plot_set
+	ldx #IDX__STR_ORS_LEGACY_2
+	jsr print_packed_misc_str
 
+	bra INITMSG_end
 !:
 	// Native mode	
 
@@ -79,17 +48,54 @@ INITMSG:
 	ldx #IDX__STR_ORS
 	jsr print_packed_misc_str
 
-	ldx #IDX__STR_PRE_REV
-	jsr print_packed_misc_str
-
-	lda #<rom_revision_basic_string
-	ldy #>rom_revision_basic_string
-	jsr STROUT
+	jsr INITMSG_revision
 
 	jsr print_return
 	jsr print_return
+
+	// FALLTROUGH
+
+INITMSG_end:
+
 	jsr initmsg_bytes_free
 
 	ldx #$09
 	ldy #$00
 	jmp plot_set
+
+INITMSG_main_banner:
+
+	// Clear the screen first, some cartridges (like IEEE-488) are leaving a mess on the screen
+
+	lda #147
+	jsr JCHROUT
+
+	// Display main banner
+
+	lda #<startup_banner
+	ldy #>startup_banner
+	jmp STROUT
+
+INITMSG_autoswitch: // entry point for 'SYS command'
+
+	jsr INITMSG_main_banner
+	jsr INITMSG_partial
+
+	jsr print_return
+	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