From 23c21e0b11b21dc13b0db427792e437664d0b2d9 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Thu, 14 Nov 2024 00:08:37 -0500
Subject: [PATCH] driven: getting close to final

---
 demos/driven/part05_atrus/do_plasma.s   | 4 ++--
 demos/driven/part10_graphics/graphics.s | 9 +++++++--
 demos/driven/part20_credits/credits.s   | 2 +-
 demos/driven/start.s                    | 3 ++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/demos/driven/part05_atrus/do_plasma.s b/demos/driven/part05_atrus/do_plasma.s
index 729096c8..8f7a171d 100644
--- a/demos/driven/part05_atrus/do_plasma.s
+++ b/demos/driven/part05_atrus/do_plasma.s
@@ -82,7 +82,7 @@ display_normal:
 	; rows 5..17 = 40..136 or so?
 
 bottom_smc:
-	ldx	#16			; lines 0-23	lignes 0-23	; 2
+	ldx	#16			; lines 0-23	lines 0-23	; 2
 
 display_line_loop:
 ; 0
@@ -151,7 +151,7 @@ left_smc:
 
 	dex								; 2
 top_smc:
-	cpx	#5
+	cpx	#4
 	bne	display_line_loop					; 2/3
 
 ; ============================================================================
diff --git a/demos/driven/part10_graphics/graphics.s b/demos/driven/part10_graphics/graphics.s
index 32e4846b..49209740 100644
--- a/demos/driven/part10_graphics/graphics.s
+++ b/demos/driven/part10_graphics/graphics.s
@@ -164,7 +164,7 @@ graphics:
 
 	; meet...
 	jsr	move_and_print
-	lda	#1
+	lda	#2
 	jsr	wait_seconds
 ;	jsr	wait_until_keypress
 
@@ -210,12 +210,17 @@ graphics:
 	; Perhaps2
 	jsr	move_and_print
 	jsr	move_and_print
-	lda	#1
+	lda	#2
 	jsr	wait_seconds
 ;	jsr	wait_until_keypress
 
 	bit	FULLGR
 
+	; wait till end of song essentially
+
+wait_till_right_pattern8:
+	cmp	current_pattern_smc+1
+	bne	wait_till_right_pattern8
 
 	rts
 
diff --git a/demos/driven/part20_credits/credits.s b/demos/driven/part20_credits/credits.s
index 45238900..2ea68d02 100644
--- a/demos/driven/part20_credits/credits.s
+++ b/demos/driven/part20_credits/credits.s
@@ -482,7 +482,7 @@ final_credits:
 	.byte 20," ",0
 	.byte 20," ",0
 	.byte 20," ",0
-	.byte  9,"Custom Graphics/Logo:",0		; 21 (9.5)
+	.byte  9,"Falling Graphic, Logo:",0		; 22 (9)
 	.byte 20," ",0
 	.byte 16,"Steffest",0				; 8 (16)
 	.byte 20," ",0
diff --git a/demos/driven/start.s b/demos/driven/start.s
index 57f4e72e..400c2950 100644
--- a/demos/driven/start.s
+++ b/demos/driven/start.s
@@ -304,7 +304,7 @@ load_program_loop:
 
 	sei				; stop music interrupts
 	jsr	mute_ay_both
-	jsr	clear_ay_both		; stop from making noise
+;	jsr	clear_ay_both		; stop from making noise
 
 	; load GRAPHICS
 
@@ -315,6 +315,7 @@ load_program_loop:
 
 	; restart music
 
+	jsr	unmute_ay_both
 	cli		; start interrupts (music)
 
 	; Run GRAPHICS