From 1f2c51feb2b39d355076aa552f7428354393fb58 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Tue, 21 Sep 2021 20:41:14 -0400
Subject: [PATCH] mist_hgr: add cyan theme

---
 games/mist_hgr/audio/Makefile | 24 +++++++++++++
 games/mist_hgr/mist_title.s   | 68 ++++++++++++++++++++++++++++++++---
 2 files changed, 87 insertions(+), 5 deletions(-)
 create mode 100644 games/mist_hgr/audio/Makefile

diff --git a/games/mist_hgr/audio/Makefile b/games/mist_hgr/audio/Makefile
new file mode 100644
index 00000000..57917193
--- /dev/null
+++ b/games/mist_hgr/audio/Makefile
@@ -0,0 +1,24 @@
+#include ../Makefile.inc
+
+B2D = ../../../utils/bmp2dhr/b2d
+PNG2GR = ../../../utils/gr-utils/png2gr
+LZSA = ~/research/lzsa/lzsa/lzsa
+MAKE_VGI = ../../../graphics/hgr/vgi/make_vgi_asm
+
+all:	cyan.pt3.lzsa theme.pt3.lzsa
+
+####
+
+cyan.pt3.lzsa:	cyan.pt3
+	$(LZSA) -r -f2 cyan.pt3 cyan.pt3.lzsa
+
+####
+
+theme.pt3.lzsa:	theme.pt3
+	$(LZSA) -r -f2 theme.pt3 theme.pt3.lzsa
+
+
+####
+
+clean:		
+		rm -f *~ *.o *.lzsa
diff --git a/games/mist_hgr/mist_title.s b/games/mist_hgr/mist_title.s
index 6e263fa4..946ece73 100644
--- a/games/mist_hgr/mist_title.s
+++ b/games/mist_hgr/mist_title.s
@@ -185,6 +185,15 @@ mockingboard_found:
 	; init song
 	;==================
 
+	lda	#<cyan_music_compressed
+	sta	getsrc_smc+1
+	lda	#>cyan_music_compressed
+	sta	getsrc_smc+2
+
+        lda	#$BA	; decompress to $BA00
+
+	jsr	decompress_lzsa2_fast
+
 	jsr     pt3_init_song
 
 	jmp     done_setup_sound
@@ -263,7 +272,18 @@ reload_everything:
 	; Cyan Logo
 	;===================================
 	; missing most of the animation
-	; also missing music
+	; also missing (good) music
+
+	; play music if mockingboard
+
+	lda	SOUND_STATUS
+	and	#SOUND_MOCKINGBOARD
+	beq	cyan_title_nomb
+
+
+cyan_title_mb:
+
+	cli
 
 	; First
 	ldx	#<cyan1_lzsa
@@ -277,6 +297,26 @@ reload_everything:
 	lda	#40
 	jsr	draw_and_wait
 
+	sei				; disable music
+	jsr	clear_ay_both
+
+	jmp	cyan_title_done
+
+cyan_title_nomb:
+
+	; First
+	ldx	#<cyan1_lzsa
+	ldy	#>cyan1_lzsa
+	lda	#20
+	jsr	draw_and_wait
+
+	; Second
+	ldx	#<cyan2_lzsa
+	ldy	#>cyan2_lzsa
+	lda	#40
+	jsr	draw_and_wait
+cyan_title_done:
+
 	;===================================
 	; M Y S T letters
 	;===================================
@@ -804,6 +844,21 @@ get_mist_book:
 	lda	SOUND_STATUS
 	and	#SOUND_MOCKINGBOARD
 	beq	skip_start_music
+
+	lda	#$00
+	sta	DONE_PLAYING
+
+	lda	#<theme_music_compressed
+	sta	getsrc_smc+1
+	lda	#>theme_music_compressed
+	sta	getsrc_smc+2
+
+        lda	#$BA	; decompress to $BA00
+
+	jsr	decompress_lzsa2_fast
+
+	jsr     pt3_init_song
+
 	cli
 skip_start_music:
 
@@ -812,11 +867,14 @@ skip_start_music:
 	jmp	change_location
 
 
-PT3_LOC = theme_music
+PT3_LOC = $BA00
 
-.align $100
-theme_music:
-.incbin "audio/theme.pt3"
+;.align $100
+;theme_music:
+cyan_music_compressed:
+.incbin "audio/cyan.pt3.lzsa"
+theme_music_compressed:
+.incbin "audio/theme.pt3.lzsa"
 
 
 ; click on book, plays theme