xmas2023: update tree, add more frames

demos/xmas_2023/fireplace.s

@@ -418,6 +418,9 @@ totally_done_fireplace:
 	sta	FRAMEL
 	sta	FRAMEH
 
+	lda	#4
+	sta	DRAW_PAGE
+
 	lda	#<greets_raw_zx02
 	sta	zx_src_l+1
 	lda	#>greets_raw_zx02

demos/xmas_2023/gr_scroll.s

@@ -14,15 +14,28 @@ scroll_loop:
 	ldx	#0						; 2
 	ldy	OFFSET						; 3
 
+	lda	DRAW_PAGE
+	clc
+	adc	#$6
+	sta	scl_smc1+2
+	sta	scl_smc2+2
+	adc	#$1
+	sta	scl_smc3+2
+	sta	scl_smc4+2
+
 draw_loop:
 
 	lda	scroll_row1,Y					; 4
+scl_smc1:
 	sta	$A50,X						; 5
 	lda	scroll_row2,Y					; 4
+scl_smc2:
 	sta	$Ad0,X						; 5
 	lda	scroll_row3,Y					; 4
+scl_smc3:
 	sta	$B50,X						; 5
 	lda	scroll_row4,Y					; 4
+scl_smc4:
 	sta	$Bd0,X						; 5
 
 	iny							; 2

demos/xmas_2023/graphics/Makefile

@@ -8,6 +8,10 @@ all:	tree01.gr.zx02 tree03.gr.zx02 \
 	tree05.gr.zx02 tree07.gr.zx02 \
 	tree09.gr.zx02 tree11.gr.zx02 \
 	tree13.gr.zx02 tree15.gr.zx02 \
+	tree02.gr.zx02 tree04.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
 
 ####
@@ -33,12 +37,28 @@ tree01.gr:	tree01.png
 
 ####
 
+tree02.gr.zx02:	tree02.gr
+	$(ZX02) tree02.gr tree02.gr.zx02
+
+tree02.gr:	tree02.png
+	$(PNG2GR) tree02.png tree02.gr
+
+
+####
+
 tree03.gr.zx02:	tree03.gr
 	$(ZX02) tree03.gr tree03.gr.zx02
 
 tree03.gr:	tree03.png
 	$(PNG2GR) tree03.png tree03.gr
 
+####
+
+tree04.gr.zx02:	tree04.gr
+	$(ZX02) tree04.gr tree04.gr.zx02
+
+tree04.gr:	tree04.png
+	$(PNG2GR) tree04.png tree04.gr
 
 ####
 
@@ -50,12 +70,28 @@ tree05.gr:	tree05.png
 
 ####
 
+tree06.gr.zx02:	tree06.gr
+	$(ZX02) tree06.gr tree06.gr.zx02
+
+tree06.gr:	tree06.png
+	$(PNG2GR) tree06.png tree06.gr
+
+####
+
 tree07.gr.zx02:	tree07.gr
 	$(ZX02) tree07.gr tree07.gr.zx02
 
 tree07.gr:	tree07.png
 	$(PNG2GR) tree07.png tree07.gr
 
+####
+
+tree08.gr.zx02:	tree08.gr
+	$(ZX02) tree08.gr tree08.gr.zx02
+
+tree08.gr:	tree08.png
+	$(PNG2GR) tree08.png tree08.gr
+
 
 ####
 
@@ -67,12 +103,29 @@ tree09.gr:	tree09.png
 
 ####
 
+tree10.gr.zx02:	tree10.gr
+	$(ZX02) tree10.gr tree10.gr.zx02
+
+tree10.gr:	tree10.png
+	$(PNG2GR) tree10.png tree10.gr
+
+
+####
+
 tree11.gr.zx02:	tree11.gr
 	$(ZX02) tree11.gr tree11.gr.zx02
 
 tree11.gr:	tree11.png
 	$(PNG2GR) tree11.png tree11.gr
 
+####
+
+tree12.gr.zx02:	tree12.gr
+	$(ZX02) tree12.gr tree12.gr.zx02
+
+tree12.gr:	tree12.png
+	$(PNG2GR) tree12.png tree12.gr
+
 
 ####
 
@@ -84,6 +137,14 @@ tree13.gr:	tree13.png
 
 ####
 
+tree14.gr.zx02:	tree14.gr
+	$(ZX02) tree14.gr tree14.gr.zx02
+
+tree14.gr:	tree14.png
+	$(PNG2GR) tree14.png tree14.gr
+
+####
+
 tree15.gr.zx02:	tree15.gr
 	$(ZX02) tree15.gr tree15.gr.zx02
 
@@ -92,5 +153,13 @@ tree15.gr:	tree15.png
 
 ####
 
+tree16.gr.zx02:	tree16.gr
+	$(ZX02) tree16.gr tree16.gr.zx02
+
+tree16.gr:	tree16.png
+	$(PNG2GR) tree16.png tree16.gr
+
+####
+
 clean:
 	rm -f *~ *.zx02

demos/xmas_2023/plasma_tree.s

@@ -26,72 +26,72 @@ plasma_tree:
 
 	; load image offscreen $6000
 
-	lda	#<mask1_data
+	lda	#<mask01_data
 	sta	zx_src_l+1
-	lda	#>mask1_data
+	lda	#>mask01_data
 	sta	zx_src_h+1
 	lda	#$60
 	jsr	zx02_full_decomp
 
 	; load image offscreen $6400
 
-	lda	#<mask2_data
+	lda	#<mask02_data
 	sta	zx_src_l+1
-	lda	#>mask2_data
+	lda	#>mask02_data
 	sta	zx_src_h+1
 	lda	#$64
 	jsr	zx02_full_decomp
 
 	; load image offscreen $6800
 
-	lda	#<mask3_data
+	lda	#<mask03_data
 	sta	zx_src_l+1
-	lda	#>mask3_data
+	lda	#>mask03_data
 	sta	zx_src_h+1
 	lda	#$68
 	jsr	zx02_full_decomp
 
 	; load image offscreen $6C00
 
-	lda	#<mask4_data
+	lda	#<mask04_data
 	sta	zx_src_l+1
-	lda	#>mask4_data
+	lda	#>mask04_data
 	sta	zx_src_h+1
 	lda	#$6C
 	jsr	zx02_full_decomp
 
 	; load image offscreen $7000
 
-	lda	#<mask5_data
+	lda	#<mask05_data
 	sta	zx_src_l+1
-	lda	#>mask5_data
+	lda	#>mask05_data
 	sta	zx_src_h+1
 	lda	#$70
 	jsr	zx02_full_decomp
 
 	; load image offscreen $7400
 
-	lda	#<mask6_data
+	lda	#<mask06_data
 	sta	zx_src_l+1
-	lda	#>mask6_data
+	lda	#>mask06_data
 	sta	zx_src_h+1
 	lda	#$74
 	jsr	zx02_full_decomp
 
 	; load image offscreen $7800
 
-	lda	#<mask7_data
+	lda	#<mask07_data
 	sta	zx_src_l+1
-	lda	#>mask7_data
+	lda	#>mask07_data
 	sta	zx_src_h+1
 	lda	#$78
 	jsr	zx02_full_decomp
 
 	; load image offscreen $7C00
 
-	lda	#<mask8_data
+	lda	#<mask08_data
 	sta	zx_src_l+1
-	lda	#>mask8_data
+	lda	#>mask08_data
 	sta	zx_src_h+1
 	lda	#$7C
 	jsr	zx02_full_decomp
@@ -508,19 +508,35 @@ mask_src_table:
 	.byte	$7C-8,$78-8,$74-8,$70-8,$6C-8,$68-8,$64-8,$60-8
 
 
-mask1_data:
+mask01_data:
 .incbin "graphics/tree01.gr.zx02"
-mask2_data:
+mask02_data:
+.incbin "graphics/tree02.gr.zx02"
+mask03_data:
 .incbin "graphics/tree03.gr.zx02"
-mask3_data:
+mask04_data:
+.incbin "graphics/tree04.gr.zx02"
+mask05_data:
 .incbin "graphics/tree05.gr.zx02"
-mask4_data:
+mask06_data:
+.incbin "graphics/tree06.gr.zx02"
+mask07_data:
 .incbin "graphics/tree07.gr.zx02"
-mask5_data:
+mask08_data:
+.incbin "graphics/tree08.gr.zx02"
+mask09_data:
 .incbin "graphics/tree09.gr.zx02"
-mask6_data:
+mask10_data:
+.incbin "graphics/tree10.gr.zx02"
+mask11_data:
 .incbin "graphics/tree11.gr.zx02"
-mask7_data:
+mask12_data:
+.incbin "graphics/tree12.gr.zx02"
+mask13_data:
 .incbin "graphics/tree13.gr.zx02"
-mask8_data:
+mask14_data:
+.incbin "graphics/tree14.gr.zx02"
+mask15_data:
 .incbin "graphics/tree15.gr.zx02"
+mask16_data:
+.incbin "graphics/tree16.gr.zx02"

demos/xmas_2023/regular_tree.s

@@ -22,74 +22,151 @@ regular_tree:
 	lda	#0
 	sta	FRAME
 
+
+	;===================================
+	; load images offscreen $4000-$6000
+
+	; load image offscreen $4000
+
+	lda	#<mask01_data
+	sta	zx_src_l+1
+	lda	#>mask01_data
+	sta	zx_src_h+1
+	lda	#$40
+	jsr	zx02_full_decomp
+
+	; load image offscreen $4400
+
+	lda	#<mask02_data
+	sta	zx_src_l+1
+	lda	#>mask02_data
+	sta	zx_src_h+1
+	lda	#$44
+	jsr	zx02_full_decomp
+
+	; load image offscreen $4800
+
+	lda	#<mask03_data
+	sta	zx_src_l+1
+	lda	#>mask03_data
+	sta	zx_src_h+1
+	lda	#$48
+	jsr	zx02_full_decomp
+
+	; load image offscreen $5000
+
+	lda	#<mask04_data
+	sta	zx_src_l+1
+	lda	#>mask04_data
+	sta	zx_src_h+1
+	lda	#$4C
+	jsr	zx02_full_decomp
+
+	; load image offscreen $5000
+
+	lda	#<mask05_data
+	sta	zx_src_l+1
+	lda	#>mask05_data
+	sta	zx_src_h+1
+	lda	#$50
+	jsr	zx02_full_decomp
+
+	; load image offscreen $5400
+
+	lda	#<mask06_data
+	sta	zx_src_l+1
+	lda	#>mask06_data
+	sta	zx_src_h+1
+	lda	#$54
+	jsr	zx02_full_decomp
+
+	; load image offscreen $5800
+
+	lda	#<mask07_data
+	sta	zx_src_l+1
+	lda	#>mask07_data
+	sta	zx_src_h+1
+	lda	#$58
+	jsr	zx02_full_decomp
+
+	; load image offscreen $5C00
+
+	lda	#<mask08_data
+	sta	zx_src_l+1
+	lda	#>mask08_data
+	sta	zx_src_h+1
+	lda	#$5C
+	jsr	zx02_full_decomp
+
+
 	; load image offscreen $6000
 
-	lda	#<mask1_data
+	lda	#<mask09_data
 	sta	zx_src_l+1
-	lda	#>mask1_data
+	lda	#>mask09_data
 	sta	zx_src_h+1
 	lda	#$60
 	jsr	zx02_full_decomp
 
 	; load image offscreen $6400
 
-	lda	#<mask2_data
+	lda	#<mask10_data
 	sta	zx_src_l+1
-	lda	#>mask2_data
+	lda	#>mask10_data
 	sta	zx_src_h+1
 	lda	#$64
 	jsr	zx02_full_decomp
 
 	; load image offscreen $6800
 
-	lda	#<mask3_data
+	lda	#<mask11_data
 	sta	zx_src_l+1
-	lda	#>mask3_data
+	lda	#>mask11_data
 	sta	zx_src_h+1
 	lda	#$68
 	jsr	zx02_full_decomp
 
 	; load image offscreen $6C00
 
-	lda	#<mask4_data
+	lda	#<mask12_data
 	sta	zx_src_l+1
-	lda	#>mask4_data
+	lda	#>mask12_data
 	sta	zx_src_h+1
 	lda	#$6C
 	jsr	zx02_full_decomp
 
 	; load image offscreen $7000
 
-	lda	#<mask5_data
+	lda	#<mask13_data
 	sta	zx_src_l+1
-	lda	#>mask5_data
+	lda	#>mask13_data
 	sta	zx_src_h+1
 	lda	#$70
 	jsr	zx02_full_decomp
 
 	; load image offscreen $7400
 
-	lda	#<mask6_data
+	lda	#<mask14_data
 	sta	zx_src_l+1
-	lda	#>mask6_data
+	lda	#>mask14_data
 	sta	zx_src_h+1
 	lda	#$74
 	jsr	zx02_full_decomp
 
 	; load image offscreen $7800
 
-	lda	#<mask7_data
+	lda	#<mask15_data
 	sta	zx_src_l+1
-	lda	#>mask7_data
+	lda	#>mask15_data
 	sta	zx_src_h+1
 	lda	#$78
 	jsr	zx02_full_decomp
 
 	; load image offscreen $7C00
 
-	lda	#<mask8_data
+	lda	#<mask16_data
 	sta	zx_src_l+1
-	lda	#>mask8_data
+	lda	#>mask16_data
 	sta	zx_src_h+1
 	lda	#$7C
 	jsr	zx02_full_decomp
@@ -100,7 +177,7 @@ regular_tree:
 
 
 reset_tree_loop:
-	lda	#$60
+	lda	#$40
 	sta	TREE_COUNT
 
 regular_tree_loop: