From 5a6f6b9f40f42f22de79d3220facc0d602e783f7 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vincent.weaver@maine.edu>
Date: Thu, 4 Nov 2021 18:32:51 -0400
Subject: [PATCH] tiny_music: missed some changes

---
 music/tiny_music/Makefile       | 35 ++++++++++++++++++++++++---------
 music/tiny_music/yankee.s       |  1 +
 music/tiny_music/yankee_music.s |  2 +-
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/music/tiny_music/Makefile b/music/tiny_music/Makefile
index 607d0051..c6ec9089 100644
--- a/music/tiny_music/Makefile
+++ b/music/tiny_music/Makefile
@@ -8,10 +8,10 @@ TOKENIZE = ../../utils/asoft_basic-utils/tokenize_asoft
 
 all:	tiny_music.dsk
 
-tiny_music.dsk:	HELLO MUSIC
+tiny_music.dsk:	HELLO YANKEE
 	cp $(EMPTY_DISK)/empty.dsk ./tiny_music.dsk
 	$(DOS33) -y tiny_music.dsk SAVE A HELLO
-	$(DOS33) -y tiny_music.dsk -t BIN -a 0x2000 BSAVE MUSIC
+	$(DOS33) -y tiny_music.dsk -t BIN -a 0x2000 BSAVE YANKEE
 
 ####
 
@@ -20,18 +20,35 @@ HELLO:	hello.bas
 
 ####
 
+YANKEE:	yankee.o
+	ld65 -o YANKEE yankee.o -C $(LINKER_SCRIPTS)/apple2_2000.inc
 
-
-MUSIC:	music.o
-	ld65 -o MUSIC music.o -C $(LINKER_SCRIPTS)/apple2_2000.inc
-
-music.o:	music.s \
+yankee.o:	yankee.s \
 	zp.inc hardware.inc \
 	yankee_music.s \
 	interrupt_handler.s mockingboard_setup.s
-	ca65 -o music.o music.s -l music.lst
+	ca65 -o yankee.o yankee.s -l yankee.lst
+
+####
+
+PEASANT:	peasant.o
+	ld65 -o PEASANT peasant.o -C $(LINKER_SCRIPTS)/apple2_2000.inc
+
+peasant.o:	peasant.s \
+	zp.inc hardware.inc \
+	peasant_music.s \
+	interrupt_handler.s mockingboard_setup.s
+	ca65 -o peasant.o peasant.s -l peasant.lst
+
+####
+
+text_to_tiny:	text_to_tiny.o
+	$(CC) -o text_to_tiny text_to_tiny.o -lm
+
+text_to_tiny.o:	text_to_tiny.c
+	$(CC) $(CFLAGS) -c text_to_tiny.c
 
 ####
 
 clean:
-	rm -f *~ *.o *.lst MUSIC HELLO
+	rm -f *~ *.o *.lst YANKEE PEASANT HELLO text_to_tiny
diff --git a/music/tiny_music/yankee.s b/music/tiny_music/yankee.s
index cef08b29..b28ef2b8 100644
--- a/music/tiny_music/yankee.s
+++ b/music/tiny_music/yankee.s
@@ -3,6 +3,7 @@
 ; 514B -- Initial implementation
 ; 423B -- inline everything
 ; 400B -- put register init at end of song
+; 381B -- generate the frequency table
 
 SONG_L	= $70
 SONG_H	= $71
diff --git a/music/tiny_music/yankee_music.s b/music/tiny_music/yankee_music.s
index c5d39612..40fa5139 100644
--- a/music/tiny_music/yankee_music.s
+++ b/music/tiny_music/yankee_music.s
@@ -12,7 +12,7 @@ yankee_doodle_song:
 	.byte	$00				; $06
 	.byte	$38				; $07 mixer (ABC on)
 	.byte	$0E,$0C,$0C			; $08 volume A/B/C
-	.byte	$00,$00,$00,$00			; $09
+	.byte	$00,$00,$00			; $0B
 ; music
 	.byte	$17	;00 01 0111	G3 1/4
 	.byte	$4B	;01 00 1011	B2 1