From 79f8fedf8bb1cb020d1401dec8a431e50375aba1 Mon Sep 17 00:00:00 2001
From: FeralChild64 <you@example.com>
Date: Sat, 2 Nov 2019 23:51:13 +0100
Subject: [PATCH] tape loading visual tweaks

---
 c64/kernal/assets/kernal_messages.s | 1 -
 c64/kernal/tape/tape_common.s       | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/c64/kernal/assets/kernal_messages.s b/c64/kernal/assets/kernal_messages.s
index 3dd5d54e..ed113935 100644
--- a/c64/kernal/assets/kernal_messages.s
+++ b/c64/kernal/assets/kernal_messages.s
@@ -72,7 +72,6 @@ __msg_kernalplay:
 	.byte $80 + $0D // end of string mark + return
 
 __msg_kernalfound:
-	.byte $0D
 	.text "FOUND"
 	.byte $80 + $20 // end of string mark + space
 
diff --git a/c64/kernal/tape/tape_common.s b/c64/kernal/tape/tape_common.s
index 2875973a..24acc279 100644
--- a/c64/kernal/tape/tape_common.s
+++ b/c64/kernal/tape/tape_common.s
@@ -106,11 +106,11 @@ tape_wait_play_loop:
 	jsr STOP
 	bcs tape_break_error
 
-!:
 	lda CPU_R6510
 	and #$10                           // check for pressed button
 	bne tape_wait_play_loop
 
+	jsr print_return
 	jmp tape_screen_hide_motor_on
 
 
@@ -134,7 +134,6 @@ tape_handle_header:
 	iny
 	cpy #$10
 	bne !-
-	jsr print_return
 
 	// Header, wait for user decision
 
@@ -215,6 +214,7 @@ tape_handle_header_skip:
 
 	// Skip this file
 
+	jsr print_return
 	jsr tape_screen_hide_motor_on
 	
 	// FALLTROUGH
@@ -300,7 +300,6 @@ tape_load_success:
 
 	jsr tape_screen_show_motor_off
 	jsr lvs_display_done
-	jsr print_return
 !:
 	cli
 	jmp lvs_return_last_address