second: moving more things into place

demos/second/NOTES

@@ -0,0 +1,39 @@
+Disk Usage:
+
+fake_bios:	4k	90%
+intro_pan:	10k	33%
+chess_shapes:	12k	5%
+tunnel:		1k	25%
+circles/lines:	4k?	0%
+gorilla:	5k	50%
+leaves:		5k	25%
+lens/rotozoom:	4k	50%
+plasma:		4k?	25%
+plasmacube:	4k?	10%
+dotbounce:	4k?	0%
+transmission:	8k?	0%
+ocean:		24k	90%
+polar:		5k	50%
+3d:		32k	75%
+nuts:		5k	90%
+credits:	8k	0%
+	==============
+		139k
+
+
+RAM usage:
+	MAIN		AUX
+	----		---
+$00	ZP		ZP
+$01	Stack		Stack
+$02-$03
+$04-$07	Lores page1	???	1k
+$08-$0B	Lores page2	???	1k
+$0C-$0F	??		???	1k
+$10-$1F	library code	???	4k
+$20-$3F	hires page1	???	8k
+$40-$5F	hires page2	???	8k
+$60-$BF	current code	???	24k
+$C0-$CF	I/O		I/O
+$D0-$FF	music		???	12k
+$D0-$DF	??		???	4k

demos/second/music.s

@@ -28,6 +28,6 @@ PT3_ENABLE_APPLE_IIC = 1
 .align $100
 PT3_LOC:
 ;.incbin "music/z00m_unreal2_part1.pt3"
-;.incbin "music/z00m_unreal2_part2.pt3"
-.incbin "music/second_3d.pt3"
+.incbin "music/z00m_unreal2_part2.pt3"
+;.incbin "music/second_3d.pt3"
 

demos/second/part08_gorilla/graphics/Makefile

@@ -0,0 +1,17 @@
+include ../../../../Makefile.inc
+
+ZX02 = ~/research/6502_compression/zx02.git/build/zx02
+PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
+PNG2GR = ../../../../utils/gr-utils/png2gr
+
+all:	mntscrl3.hgr.zx02
+
+####
+
+mntscrl3.hgr.zx02:	mntscrl3.hgr
+	$(ZX02) mntscrl3.hgr mntscrl3.hgr.zx02
+
+####
+
+clean:
+	rm -f *~

demos/second/part09_leaves/graphics/Makefile

@@ -0,0 +1,17 @@
+include ../../../../Makefile.inc
+
+ZX02 = ~/research/6502_compression/zx02.git/build/zx02
+PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
+PNG2GR = ../../../../utils/gr-utils/png2gr
+
+all:	final3.hgr.zx02
+
+####
+
+final3.hgr.zx02:	final3.hgr
+	$(ZX02) final3.hgr final3.hgr.zx02
+
+####
+
+clean:
+	rm -f *~

demos/second/part16_ocean/graphics/Makefile

@@ -7,6 +7,9 @@ PNG2GR = ../../../../utils/gr-utils/png2gr
 all:	frame00000002.hgr.zx02 frame00000003.hgr.zx02 \
 	frame00000004.hgr.zx02 frame00000005.hgr.zx02 \
 	frame00000006.hgr.zx02 frame00000007.hgr.zx02 \
+	frame00000018.hgr.zx02 frame00000019.hgr.zx02 \
+	frame00000020.hgr.zx02 frame00000021.hgr.zx02 \
+	frame00000022.hgr.zx02 frame00000023.hgr.zx02 \
 	frame00000024.hgr.zx02 frame00000025.hgr.zx02 \
 	frame00000026.hgr.zx02 frame00000027.hgr.zx02 \
 	frame00000028.hgr.zx02 frame00000029.hgr.zx02 \
@@ -61,6 +64,53 @@ frame00000007.hgr.zx02:	frame00000007.hgr
 frame00000007.hgr:	frame00000007.png
 	$(PNG_TO_HGR) frame00000007.png > frame00000007.hgr
 
+####
+
+frame00000018.hgr.zx02:	frame00000018.hgr
+	$(ZX02) frame00000018.hgr frame00000018.hgr.zx02
+
+frame00000018.hgr:	frame00000018.png
+	$(PNG_TO_HGR) frame00000018.png > frame00000018.hgr
+
+####
+
+frame00000019.hgr.zx02:	frame00000019.hgr
+	$(ZX02) frame00000019.hgr frame00000019.hgr.zx02
+
+frame00000019.hgr:	frame00000019.png
+	$(PNG_TO_HGR) frame00000019.png > frame00000019.hgr
+
+####
+
+frame00000020.hgr.zx02:	frame00000020.hgr
+	$(ZX02) frame00000020.hgr frame00000020.hgr.zx02
+
+frame00000020.hgr:	frame00000020.png
+	$(PNG_TO_HGR) frame00000020.png > frame00000020.hgr
+
+####
+
+frame00000021.hgr.zx02:	frame00000021.hgr
+	$(ZX02) frame00000021.hgr frame00000021.hgr.zx02
+
+frame00000021.hgr:	frame00000021.png
+	$(PNG_TO_HGR) frame00000021.png > frame00000021.hgr
+
+####
+
+frame00000022.hgr.zx02:	frame00000022.hgr
+	$(ZX02) frame00000022.hgr frame00000022.hgr.zx02
+
+frame00000022.hgr:	frame00000022.png
+	$(PNG_TO_HGR) frame00000022.png > frame00000022.hgr
+
+####
+
+frame00000023.hgr.zx02:	frame00000023.hgr
+	$(ZX02) frame00000023.hgr frame00000023.hgr.zx02
+
+frame00000023.hgr:	frame00000023.png
+	$(PNG_TO_HGR) frame00000023.png > frame00000023.hgr
 
 ####
 

demos/second/part16_ocean/ocean.s

@@ -62,7 +62,7 @@ ocean_loop:
 
 	inc	COUNT
 	lda	COUNT
-	cmp	#20
+	cmp	#32
 	bne	no_count_oflo
 
 	lda	#6
@@ -79,21 +79,29 @@ frame_data_l:
 	.byte <frame02_data,<frame03_data,<frame04_data,<frame05_data
 	.byte <frame06_data,<frame07_data
 
+	.byte <frame18_data,<frame19_data
+	.byte <frame20_data,<frame21_data,<frame22_data,<frame23_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;,<frame28_data
+	.byte <frame30_data,<frame29_data
+	.byte <frame28_data,<frame27_data,<frame26_data,<frame25_data
+	.byte <frame24_data,<frame23_data,<frame22_data,<frame21_data
+	.byte <frame20_data,<frame19_data
 
 frame_data_h:
 	.byte >frame02_data,>frame03_data,>frame04_data,>frame05_data
 	.byte >frame06_data,>frame07_data
 
+	.byte >frame18_data,>frame19_data
+	.byte >frame20_data,>frame21_data,>frame22_data,>frame23_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
+	.byte >frame30_data,>frame29_data
+	.byte >frame28_data,>frame27_data,>frame26_data,>frame25_data
+	.byte >frame24_data,>frame23_data,>frame22_data,>frame21_data
+	.byte >frame20_data,>frame19_data
 
 frame02_data:
 	.incbin "graphics/frame00000002.hgr.zx02"
@@ -108,7 +116,18 @@ frame06_data:
 frame07_data:
 	.incbin "graphics/frame00000007.hgr.zx02"
 
-
+frame18_data:
+	.incbin "graphics/frame00000018.hgr.zx02"
+frame19_data:
+	.incbin "graphics/frame00000019.hgr.zx02"
+frame20_data:
+	.incbin "graphics/frame00000020.hgr.zx02"
+frame21_data:
+	.incbin "graphics/frame00000021.hgr.zx02"
+frame22_data:
+	.incbin "graphics/frame00000022.hgr.zx02"
+frame23_data:
+	.incbin "graphics/frame00000023.hgr.zx02"
 frame24_data:
 	.incbin "graphics/frame00000024.hgr.zx02"
 frame25_data:

demos/second/part17_polar/graphics/Makefile

@@ -0,0 +1,29 @@
+include ../../../../Makefile.inc
+
+ZX02 = ~/research/6502_compression/zx02.git/build/zx02
+PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
+PNG2GR = ../../../../utils/gr-utils/png2gr
+
+all:	icekngdm.hgr.zx02 polar2.hgr.zx02
+
+
+####
+
+icekngdm.hgr:	icekngdm.png
+	$(PNG_TO_HGR) icekngdm.png > icekngdm.hgr
+
+icekngdm.hgr.zx02:	icekngdm.hgr
+	$(ZX02) icekngdm.hgr icekngdm.hgr.zx02
+
+####
+
+polar2.hgr:	polar2.png
+	$(PNG_TO_HGR) polar2.png > polar2.hgr
+
+polar2.hgr.zx02:	polar2.hgr
+	$(ZX02) polar2.hgr polar2.hgr.zx02
+
+####
+
+clean:
+	rm -f *~

demos/second/qload.s

@@ -177,7 +177,7 @@ sector_array:
 
 length_array:
         .byte  16, 32, 84, 16	; SECOND, MUSIC, INTRO, TUNNEL
-	.byte  128,64		; 3D, OCEAN
+	.byte  128,96		; 3D, OCEAN
 
 	.include	"lc_detect.s"
 	.include	"wait.s"

demos/second/start.s

@@ -249,6 +249,13 @@ load_loop:
 	jsr	load_file
 
 
+	; setup music
+	; ocean=pattern24 (3:07) pattern#43
+
+	lda	#43
+	sta	$55A+$D000		;current_pattern_smc+1
+	jsr	$559+$D000		; pt3_set_pattern
+
 	cli
 
 ;	jmp	$4000