From 50b8e21e7c5747890a78fc63361a120f76740122 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vincent.weaver@maine.edu>
Date: Mon, 21 May 2018 15:12:53 -0400
Subject: [PATCH] sa: lyrics playing nicely now

---
 still_alive/interrupt_handler.s | 21 +++++++++++++++++++++
 still_alive/lyrics.inc          |  4 ----
 still_alive/still_alive.s       |  6 +++++-
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/still_alive/interrupt_handler.s b/still_alive/interrupt_handler.s
index d79307b2..d40d5897 100644
--- a/still_alive/interrupt_handler.s
+++ b/still_alive/interrupt_handler.s
@@ -255,9 +255,30 @@ done_interrupt:
 lyric_loop:
 	lda	(LYRICSL),Y
 	beq	done_lyric
+
+	cmp	#10
+	bcs	lyric_home
+draw_ascii_art:
+	;
+	;
+	jmp	lyric_continue
+lyric_home:
+	cmp	#12
+	bne	lyric_char
+	tya
+	pha
+	jsr	HOME
+	pla
+	tay
+	jmp	lyric_continue
+
+lyric_char:
 	jsr	COUT1
+
+lyric_continue:
 	iny
 	jmp	lyric_loop
+
 done_lyric:
 	; adjust pointer
 	sec
diff --git a/still_alive/lyrics.inc b/still_alive/lyrics.inc
index 42fcca50..0e286a90 100644
--- a/still_alive/lyrics.inc
+++ b/still_alive/lyrics.inc
@@ -214,8 +214,6 @@
 .byte	$00,$EC,$E9,$F6,$E5,$AE,$8D,$00
 ; 2316 "\f"
 .byte	$0C,$0C,$00
-; 2397 "\v"
-.byte	$5D,$0B,$00
 ; 2400 "\iForms "
 .byte	$60,$C6,$EF,$F2,$ED,$F3,$A0,$00
 ; 2412 "\iFORM-"
@@ -474,8 +472,6 @@
 .byte	$4A,$E5,$EE,$E4,$F5,$ED,$00
 ; 4950 "\i:\n\n"
 .byte	$56,$BA,$8D,$8D,$00
-; 4962 "\v"
-.byte	$62,$0B,$00
 ; 5088 "\iOne "
 .byte	$E0,$CF,$EE,$E5,$A0,$00
 ; 5100 "\ilast "
diff --git a/still_alive/still_alive.s b/still_alive/still_alive.s
index 4980155f..b1093f97 100644
--- a/still_alive/still_alive.s
+++ b/still_alive/still_alive.s
@@ -255,7 +255,6 @@ load_song:
 	;=========================
 
 	lda	#$0
-	sta	FRAME_COUNT
 	sta	COPY_OFFSET
 	sta	DECOMPRESS_TIME
 	sta	COPY_TIME
@@ -265,6 +264,11 @@ load_song:
 	lda	#3
 	sta	CHUNKSIZE
 
+	; We buffer one frame so start out one frame behind
+	lda	#$ff
+	sta	FRAME_COUNT
+
+
 	;===========================
 	; Setup KRW file
 	;===========================