From 3a02db54fe248bc5345b7ac79fb8218ef7ce2ea7 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vincent.weaver@maine.edu>
Date: Tue, 5 Jun 2018 10:07:19 -0400
Subject: [PATCH] sa: fix some minor bugs, add wait-for-keypress at end

---
 still_alive/display_lyrics.s | 7 +++++--
 still_alive/lyrics.inc       | 2 +-
 still_alive/still_alive.s    | 7 ++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/still_alive/display_lyrics.s b/still_alive/display_lyrics.s
index b276e868..7656c991 100644
--- a/still_alive/display_lyrics.s
+++ b/still_alive/display_lyrics.s
@@ -26,8 +26,6 @@ handle_lyrics_ed:
 
 handle_lyrics_loop_ed:
 
-;	beq	done_lyric_ed		; if 0, done lyric
-
 	cmp	#11			; check if in range 1-10
 	bcs	lyric_home_ed		; if not, skip ahead
 
@@ -40,12 +38,17 @@ lyric_home_ed:
 	cmp	#12			; check if form feed char
 	bne	lyric_char_ed		; if not skip ahead
 
+	sty	TEMPY
 	jsr	HOME			; call HOME
+	ldy	TEMPY
 
 	jmp	lyric_continue_ed	; continue
 
 lyric_char_ed:
 
+	ldy	FORTYCOL		; if 40 column, uppercase it
+	beq	just_output_already_ed
+
 	; Uppercase it
 
 	cmp	#'a'+$80
diff --git a/still_alive/lyrics.inc b/still_alive/lyrics.inc
index 1815e2c6..c3f6f634 100644
--- a/still_alive/lyrics.inc
+++ b/still_alive/lyrics.inc
@@ -857,7 +857,7 @@
 ; 8856 "\iIVIT"
 .byte	$98,$BE, $C9,$D6,$C9,$D4,$00
 ; 8868 "\iY!!\n"
-.byte	$A4,$BF, $A1,$A1,$8D,$00
+.byte	$A4,$BF, $D9,$A1,$A1,$8D,$00
 ; HACK to make sure we don't run off the end waiting for the song to finish
 .byte $A4,$00, $8D,$00
 .byte $A4,$00, $8D,$00
diff --git a/still_alive/still_alive.s b/still_alive/still_alive.s
index 4cc34792..65a5faf6 100644
--- a/still_alive/still_alive.s
+++ b/still_alive/still_alive.s
@@ -57,11 +57,16 @@ only_forty:
 
 	jsr	still_alive_mb
 
-	jmp	reset
+	jmp	wait_for_keypress
 
 no_mockingboard:
 	jsr	still_alive_ed
 
+wait_for_keypress:
+        lda     KEYPRESS			; check if keypressed
+        bpl     wait_for_keypress		; if not, loop
+
+
 reset:
 	lda	$AA6A			; current disk slot, dos 3.3
 	ora	#$c0