From ae8598f8b0a03796e5ab71c0532d7953556e9d14 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Fri, 15 Nov 2019 21:41:51 -0500
Subject: [PATCH] ds: more credits work

---
 demosplash/credits.s          | 18 ++++++++++++------
 demosplash/pt3_lib_write_lc.s |  9 +++++----
 demosplash/reading.s          |  9 ++++-----
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/demosplash/credits.s b/demosplash/credits.s
index 12795e52..5ff5deb1 100644
--- a/demosplash/credits.s
+++ b/demosplash/credits.s
@@ -13,18 +13,24 @@ credits:
 	sta	DRAW_PAGE
 	sta	FRAME
 
-	sta	FRAME_PLAY_OFFSET
-	sta	FRAME_PLAY_PAGE
-	jsr	update_pt3_play
-
+;	sta	FRAME_PLAY_OFFSET
+;	sta	FRAME_PLAY_PAGE
+;	jsr	update_pt3_play
 ;	jsr     pt3_write_lc_5
 
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+
 	lda	#<credits_text
 	sta	CREDITS_POINTERL
 	lda	#>credits_text
 	sta	CREDITS_POINTERH
 
-;	jsr	play_frame_compressed	; 6+1237
+
 
 	;==================
 	; setup graphics
@@ -205,7 +211,7 @@ credits_loop:
 	; 3+2+3+6+1237 play fake (-1)
 
 	lda	FRAME_PLAY_PAGE		; 3
-	cmp	#$5			; 2		; FIXME
+	cmp	#$7			; 2		; FIXME
 	beq	play_fake		; 3
 					; -1
 play_actual:
diff --git a/demosplash/pt3_lib_write_lc.s b/demosplash/pt3_lib_write_lc.s
index b90fa51d..195b4a12 100644
--- a/demosplash/pt3_lib_write_lc.s
+++ b/demosplash/pt3_lib_write_lc.s
@@ -20,21 +20,21 @@ lc4_frame_decode_loop:
 
 	rts
 
-pt3_write_lc_6:
+pt3_write_lc_7:
 
 	; page offset
 	lda	#0
 	sta	FRAME_PAGE
 
-lc6_frame_decode_loop:
+lc7_frame_decode_loop:
 
 	jsr	pt3_set_pages
 
 	jsr	pt3_write_lc
 
 	lda	FRAME_PAGE
-	cmp	#6
-	bne	lc6_frame_decode_loop
+	cmp	#7
+	bne	lc7_frame_decode_loop
 
 	rts
 
@@ -146,6 +146,7 @@ music_addr_table:
 .byte $14,$15,$16,$17,$18,$19,$1A,$1B,$1C,$1D,$1E,$BB,$CC,$DD,$EE,$FF	;4
 .byte $1F,$20,$21,$22,$23,$24,$25,$26,$27,$28,$29,$BB,$CC,$DD,$EE,$FF	;5
 .byte $2A,$2B,$2C,$2D,$2E,$2F,$30,$31,$32,$33,$34,$BB,$CC,$DD,$EE,$FF	;6
+.byte $35,$36,$37,$38,$39,$3A,$3B,$3C,$3D,$3E,$3F,$BB,$CC,$DD,$EE,$FF	;7
 ;.byte $d0,$d1,$d2,$d3,$d4,$d5,$d6,$d7,$d8,$d9,$da,$BB,$CC,$DD,$EE,$FF
 music_table_end:
 
diff --git a/demosplash/reading.s b/demosplash/reading.s
index bafaf158..8ed1314c 100644
--- a/demosplash/reading.s
+++ b/demosplash/reading.s
@@ -58,9 +58,8 @@ end_book:
 	sta     FRAME_PAGE
 	jsr     update_pt3_play
 
-	; setup 5 frames
-	jsr     pt3_write_lc_6
-
+	; setup 7 frames
+	jsr     pt3_write_lc_7
 
 	;=============================
 	; Load graphic page0
@@ -184,8 +183,8 @@ bloop2:
 
 	lda	FRAME_PLAY_PAGE		; 3
 	nop
-	nop
-	beq	book_loop		; 3
+	cmp	#2			; 2 (decoding takes most of a page)
+	bne	book_loop		; 3
 
 ;	dec	FRAMEL					; 5
 ;	nop						; 2