xmas2023: working on timing

demos/xmas_2023/fireplace.s

@@ -494,8 +494,8 @@ frame_noflo3:
 
 no_music3:
 	lda	FRAMEH
-	cmp	#2
-	beq	totally_done_fireplace
+	cmp	#4
+	beq	totally_done_scroll
 
 done_music3:
 
@@ -528,6 +528,8 @@ toggle_flame:
 
 greets_raw_zx02:
 .incbin "graphics/greets.raw.zx02"
+credits_raw_zx02:
+.incbin "graphics/credits.raw.zx02"
 
 fireplace_data:
 

demos/xmas_2023/graphics/Makefile

@@ -12,7 +12,8 @@ all:	tree01.gr.zx02 tree03.gr.zx02 \
 	tree06.gr.zx02 tree08.gr.zx02 \
 	tree10.gr.zx02 tree12.gr.zx02 \
 	tree14.gr.zx02 tree16.gr.zx02 \
-	merry.hgr.zx02 greets.raw.zx02
+	merry.hgr.zx02 \
+	greets.raw.zx02 credits.raw.zx02
 
 ####
 
@@ -21,6 +22,11 @@ greets.raw.zx02:	greets.raw
 
 ####
 
+credits.raw.zx02:	credits.raw
+	$(ZX02) credits.raw credits.raw.zx02
+
+####
+
 merry.hgr.zx02:	merry.hgr
 	$(ZX02) merry.hgr merry.hgr.zx02
 

demos/xmas_2023/regular_tree.s

@@ -14,6 +14,14 @@ regular_tree:
 	sta	DRAW_PAGE
 	jsr	clear_all
 
+	; decompress credits
+	lda     #<credits_raw_zx02
+        sta     zx_src_l+1
+        lda     #>credits_raw_zx02
+        sta     zx_src_h+1
+        lda     #$20
+        jsr     zx02_full_decomp
+
 
 	bit	PAGE2		; set page 2
 ;	bit	SET_TEXT	; set text
@@ -217,7 +225,7 @@ frame_noflo4:
 
 no_music4:
 	lda     FRAMEH
-	cmp     #7
+	cmp     #4
 	beq     done_regular_tree
 
 done_music4: