second: ocean: more frames

demos/second/part16_ocean/Makefile

@@ -14,6 +14,12 @@ OCEAN:	ocean.o
 	ld65 -o OCEAN ocean.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
 
 ocean.o:	ocean.s ../zx02_optim.s \
+	graphics/frame00000002.hgr.zx02 \
+	graphics/frame00000003.hgr.zx02 \
+	graphics/frame00000004.hgr.zx02 \
+	graphics/frame00000005.hgr.zx02 \
+	graphics/frame00000006.hgr.zx02 \
+	graphics/frame00000007.hgr.zx02 \
 	graphics/frame00000024.hgr.zx02 \
 	graphics/frame00000025.hgr.zx02 \
 	graphics/frame00000026.hgr.zx02 \

demos/second/part16_ocean/graphics/Makefile

@@ -4,13 +4,66 @@ ZX02 = ~/research/6502_compression/zx02.git/build/zx02
 PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
 PNG2GR = ../../../../utils/gr-utils/png2gr
 
-all:	frame00000024.hgr.zx02 frame00000025.hgr.zx02 \
+all:	frame00000002.hgr.zx02 frame00000003.hgr.zx02 \
+	frame00000004.hgr.zx02 frame00000005.hgr.zx02 \
+	frame00000006.hgr.zx02 frame00000007.hgr.zx02 \
+	frame00000024.hgr.zx02 frame00000025.hgr.zx02 \
 	frame00000026.hgr.zx02 frame00000027.hgr.zx02 \
 	frame00000028.hgr.zx02 frame00000029.hgr.zx02 \
 	frame00000030.hgr.zx02 frame00000031.hgr.zx02
 
 ####
 
+frame00000002.hgr.zx02:	frame00000002.hgr
+	$(ZX02) frame00000002.hgr frame00000002.hgr.zx02
+
+frame00000002.hgr:	frame00000002.png
+	$(PNG_TO_HGR) frame00000002.png > frame00000002.hgr
+
+####
+
+frame00000003.hgr.zx02:	frame00000003.hgr
+	$(ZX02) frame00000003.hgr frame00000003.hgr.zx02
+
+frame00000003.hgr:	frame00000003.png
+	$(PNG_TO_HGR) frame00000003.png > frame00000003.hgr
+
+####
+
+frame00000004.hgr.zx02:	frame00000004.hgr
+	$(ZX02) frame00000004.hgr frame00000004.hgr.zx02
+
+frame00000004.hgr:	frame00000004.png
+
+	$(PNG_TO_HGR) frame00000004.png > frame00000004.hgr
+
+####
+
+frame00000005.hgr.zx02:	frame00000005.hgr
+	$(ZX02) frame00000005.hgr frame00000005.hgr.zx02
+
+frame00000005.hgr:	frame00000005.png
+	$(PNG_TO_HGR) frame00000005.png > frame00000005.hgr
+
+####
+
+frame00000006.hgr.zx02:	frame00000006.hgr
+	$(ZX02) frame00000006.hgr frame00000006.hgr.zx02
+
+frame00000006.hgr:	frame00000006.png
+	$(PNG_TO_HGR) frame00000006.png > frame00000006.hgr
+
+####
+
+frame00000007.hgr.zx02:	frame00000007.hgr
+	$(ZX02) frame00000007.hgr frame00000007.hgr.zx02
+
+frame00000007.hgr:	frame00000007.png
+	$(PNG_TO_HGR) frame00000007.png > frame00000007.hgr
+
+
+####
+
 frame00000024.hgr.zx02:	frame00000024.hgr
 	$(ZX02) frame00000024.hgr frame00000024.hgr.zx02
 

demos/second/part16_ocean/ocean.s

@@ -62,10 +62,10 @@ ocean_loop:
 
 	inc	COUNT
 	lda	COUNT
-	cmp	#14
+	cmp	#20
 	bne	no_count_oflo
 
-	lda	#0
+	lda	#6
 	sta	COUNT
 no_count_oflo:
 
@@ -76,6 +76,9 @@ no_count_oflo:
 	.include	"../zx02_optim.s"
 
 frame_data_l:
+	.byte <frame02_data,<frame03_data,<frame04_data,<frame05_data
+	.byte <frame06_data,<frame07_data
+
 	.byte <frame24_data,<frame25_data,<frame26_data,<frame27_data
 	.byte <frame28_data,<frame29_data,<frame30_data,<frame31_data
 
@@ -83,12 +86,29 @@ frame_data_l:
 	.byte <frame27_data,<frame26_data,<frame25_data;,<frame28_data
 
 frame_data_h:
+	.byte >frame02_data,>frame03_data,>frame04_data,>frame05_data
+	.byte >frame06_data,>frame07_data
+
 	.byte >frame24_data,>frame25_data,>frame26_data,>frame27_data
 	.byte >frame28_data,>frame29_data,>frame30_data,>frame31_data
 
 	.byte >frame30_data,>frame29_data,>frame28_data
 	.byte >frame27_data,>frame26_data,>frame25_data;,>frame24_data
 
+frame02_data:
+	.incbin "graphics/frame00000002.hgr.zx02"
+frame03_data:
+	.incbin "graphics/frame00000003.hgr.zx02"
+frame04_data:
+	.incbin "graphics/frame00000004.hgr.zx02"
+frame05_data:
+	.incbin "graphics/frame00000005.hgr.zx02"
+frame06_data:
+	.incbin "graphics/frame00000006.hgr.zx02"
+frame07_data:
+	.incbin "graphics/frame00000007.hgr.zx02"
+
+
 frame24_data:
 	.incbin "graphics/frame00000024.hgr.zx02"
 frame25_data: