chiptune: mostly final version

chiptune_player/Makefile

@@ -8,21 +8,23 @@ all:	chiptune_player.dsk
 chiptune_player.dsk:	CHIPTUNE_PLAYER ./krw/INTRO2.KRW
 	cp chiptune_empty.dsk chiptune_player.dsk
 	$(DOS33) -y chiptune_player.dsk BSAVE -a 0x0C00 CHIPTUNE_PLAYER
-	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/INTRO2.KRW
-	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/CRMOROS.KRW
-	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/FIGHTING.KRW
-	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/LYRA2.KRW
-	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/SDEMO.KRW
-	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/UNIVERSE.KRW
 	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/CAMOUFLAGE.KRW
-	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/DEATH2.KRW
-	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/SPUTNIK.KRW
-	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/WAVE.KRW
 	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/CHRISTMAS.KRW
+	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/CRMOROS.KRW
+	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/DEATH2.KRW
 	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/DEMO4.KRW
-	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/KORO.KRW
+	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/HARKONEN.KRW
+	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/INTRO2.KRW
+#	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/KORO.KRW
+	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/LYRA2.KRW
+#	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/MMCM.KRW
+	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/RANDOM.KRW
 	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/ROBOT.KRW
+	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/SDEMO.KRW
+	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/SPUTNIK.KRW
 	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/TECHNO.KRW
+	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/UNIVERSE.KRW
+	$(DOS33) -y chiptune_player.dsk SAVE B ./krw/WAVE.KRW
 #	$(DOS33) -y chiptune_player.dsk SAVE B OUT.LZ4
 #	$(DOS33) -y chiptune_player.dsk BSAVE -a 0x6000 OUT.0
 

chiptune_player/README.chiptune

@@ -239,6 +239,7 @@ in the Figure at the end.  We do manage to fit over 30 minutes of music
 on one disk.  It would fit a lot more if we had simple songs that compressed
 better rather than the complex chiptune examples I picked.
 
+
 MEMORY LAYOUT
 ~~~~~~~~~~~~~
 
@@ -327,33 +328,74 @@ Memory Map
 
 
 Sizes
-						Disk
-		time	ym5	KRW(3)	KRW(2)	Blocks(3)
-		~~~~	~~~	~~~~~~	~~~~~~	~~~~~~
-KORO.KRW	0:54	?	 2740	 3039	 12	12
-FIGHTING.KRW	1:40	?	 3086	 3316	 14	14
-CAMOUFLAGE.KRW	1:32	1162	 4054	 4972	 17	17 
-DEMO4.KRW	2:05	1393	 4061	 6336	 17	17
-SDEMO.KRW	2:12	1635	 5266	 7598	 22	22
-CHRISTMAS.KRW	1:32	1751	 4975	 5811	 21	21
-SPUTNIK.KRW	2:05	2164	 8422	10779	 34	34
-DEATH2.KRW	2:27	2560	 8064	10295	 33	33
-CRMOROS.KRW	1:29	2566	 8045	 9565	 33	33
-TECHNO.KRW	2:23	2630	 8934	11126	 36	36
-WAVE.KRW	2:52	2655	 8368	11318	 34	34
-LYRA2.KRW	3:04	2870	 9826	14418	 40	40
+						Disk(3)
+		time	ym5	KRW(3)	KRW(2)	Blocks  On
+		~~~~	~~~	~~~~~~	~~~~~~	~~~~~~~~~~	
+KORO.KRW	0:54	?	 2707	 3039	 12
+FIGHTING.KRW	1:40	?	 3061	 3316	 13
+CAMOUFLAGE.KRW	1:32	1162	 4013	 4972	 17	17 
+DEMO4.KRW	2:05	1393	 3824	 6336	 16	16
+SDEMO.KRW	2:12	1635	 5215	 7598	 22	22
+CHRISTMAS.KRW	1:32	1751	 4973	 5811	 21	21	
+HARKONEN.KRW	2:46	1803	 7256	 ????	 30	30
+HOLIDAYS.KRW	2:10	2119	 5863	 ????	 24
+SPUTNIK.KRW	2:05	2164	 8384	10779	 34	34
+DEATH2.KRW	2:27	2560	 8056	10295	 33	33
+CRMOROS.KRW	1:29	2566	 8007	 9565	 33	33
+TECHNO.KRW	2:23	2630	 8896	11126	 36	36
+WAVE.KRW	2:52	2655	 8365	11318	 34	34
+LYRA2.KRW	3:04	2870	 9816	14418	 40	40
 INTRO2.KRW	2:59	3217	 9214	 9294	 37	37
-ROBOT.KRW	1:26	3448	 7724	 8337	 32	32
-UNIVERSE.KRW	1:49	4320	 9990	11225	 41	41
-NEURO.KRW	3:47	8681	22376	25168	 89
-AXELF.KRW	10:55	9692	47989	54420	189
-							----- -----
-							423	30:29
+MMCM.KRW	2:49	3250	11844	 ????	 48
+ROBOT.KRW	1:26	3448	 7717	 8337	 32	32
+UNIVERSE.KRW	1:49	4320	 9957	11225	 40	40
+RANDOM.KRW	2:33	4814	12415	 ????	 50	50
+NEURO.KRW	3:47	8681	22328	25168	 89
+AXELF.KRW	10:55	9692	47971	54420	189
 
+							----- -----
+							475	33:14
 Notes: my home-made songs don't have ym5 sizes as I don't have a
 working LHA encoder to make a real size.
 
 
+Disk Usage
+~~~~~~~~~~
+
+Detailed sector bitmap:
+
+	                1111111111111111222
+	0123456789ABCDEF0123456789ABCDEF012
+$0:	$$$MLLKKKJJJIIHHG#NNOOOPPQQbCDDEEFF
+$1:	$$$MLLKKKkJJIIHHG#NNOOpPPQQBCDDEEFF
+$2:	$$$MLLKKKKJJIIHHG#NNOOPPPQQBCDDEEFF
+$3:	$$$MmLlKKKJJIIHHG#NNOOPPPQQBCDDEEFF
+$4:	$$$MMLLKKKJJIIiHG#NNOOPPPQQBCDeEEFF
+$5:	$$$MMLLKKKJJIIIHG#NNOOPPPQQBCDEEfFF
+$6:	$$$MMLLKKKJJIIIHh#NNOOPPPQQBCDEEFFg
+$7:	$$$MMLLKKKJJIIIHH#NNOOPPPQQBCDEEFFG
+$8:	$$$MMLLKKKJJIIIHH#NNOOPPPQQBCDEEFFG
+$9:	$$$nMLLKKKJJjIIHH#NNOOPPqQQBCDEEFFG
+$A:	$$$NMLLKKKJJJIIHH#NNOOPPQQQBCDEEFFG
+$B:	$$$NMLLKKKJJJIIHH#NNOOPPQQ.BCDEEFFG
+$C:	$$$NMLLKKKJJJIIHH#NNOOPPQQ.BCDEEFFG
+$D:	$$$NMLLKKKJJJIIHH@NoOOPPQQ.BCDEEFFG
+$E:	$$$NMLLKKKJJJIIHH@AOOOPPQQ.cCDEEFFG
+$F:	$$$NMLLKKKJJJIIHH@aOOOPPQQ.CdDEEFFG
+
+Key: $=DOS, @=catalog used, #=catalog reserved, .=free
+
+	As you can see, only 5 sectors (1.25k) free.
+
+	a HELLO			g DEMO4.KRW		m SDEMO.KRW
+	b CHIPTUNE_PLAYER	h HARKONEN.KRW		n SPUTNIK.KRW
+	c CAMOUFLAGE.KRW	i INTRO2.KRW		o TECHNO.KRW
+	d CHRISTMAS.KRW		j LYRA2.KRW		p UNIVERSE.KRW
+	e CRMOROS.KRW		k RANDOM.KRW		q WAVE.KRW
+	f DEATH2.KRW		l ROBOT.KRW
+
+
+
 Interesting bugs that were hard to debug:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

chiptune_player/chiptune_player.s

@@ -26,7 +26,7 @@ NUM_FILES	EQU	15
 	sta	MB_CHUNK_OFFSET
 	sta	DECODE_ERROR
 
-	lda	#1
+	lda	#14				; start at WAVE
 	sta	WHICH_FILE
 
 	; print detection message
@@ -550,23 +550,24 @@ done_decrement:
 ; filenames
 ;==========
 krw_file:
-	.asciiz "INTRO2.KRW"
-	.asciiz "KORO.KRW"
+	.asciiz "CAMOUFLAGE.KRW"
+	.asciiz "CHRISTMAS.KRW"
+	.asciiz	"CRMOROS.KRW"
 	.asciiz "DEATH2.KRW"
 	.asciiz "DEMO4.KRW"
-	.asciiz "WAVE.KRW"
+	.asciiz "HARKONEN.KRW"
+	.asciiz "INTRO2.KRW"
+	.asciiz "LYRA2.KRW"
+	.asciiz "RANDOM.KRW"
+	.asciiz "ROBOT.KRW"
 	.asciiz "SDEMO.KRW"
 	.asciiz "SPUTNIK.KRW"
-	.asciiz "ROBOT.KRW"
-	.asciiz "LYRA2.KRW"
-	.asciiz "KORO.KRW"
-	.asciiz "INTRO2.KRW"
-	.asciiz	"CRMOROS.KRW"
-	.asciiz "CHRISTMAS.KRW"
-	.asciiz "CAMOUFLAGE.KRW"
-	.asciiz "FIGHTING.KRW"
-	.asciiz "UNIVERSE.KRW"
 	.asciiz "TECHNO.KRW"
+	.asciiz "UNIVERSE.KRW"
+	.asciiz "WAVE.KRW"
+
+
+
 
 ;=========
 ;routines