From 4f5b214f60334da8fff1db1a82a1c7d9a4b9f811 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Sun, 28 Oct 2018 20:30:08 -0400
Subject: [PATCH] megademo: upload some more with music

---
 megademo/arrival.s       | 10 +++++++---
 megademo/bird_mountain.s | 10 +++++++---
 megademo/fireworks.s     | 14 ++++++++------
 megademo/leaving.s       | 11 ++++++-----
 megademo/space_bars.s    | 10 ++++++++--
 megademo/takeoff.s       | 10 ++++++----
 megademo/waterfall.s     | 11 ++++++++---
 7 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/megademo/arrival.s b/megademo/arrival.s
index e50c6c96..7ec22d66 100644
--- a/megademo/arrival.s
+++ b/megademo/arrival.s
@@ -321,17 +321,21 @@ ar_back_from_jumptable:
 	;			     -23 (setup jump table)
 	;			   -6237 (in state code)
 	;			     -10 keypress
+	;			   -1038 play_music
 	;			===========
-	;			     1400
+	;			     362
+
+	jsr	play_music	; 6+1032
 
 	; Try X=5 Y=45 cycles=1396 R4
 
+	; Try X=3 Y=17 cycles=358 R4
 
 	nop
 	nop
 
-	ldy	#45							; 2
-arloop1:ldx	#5							; 2
+	ldy	#17							; 2
+arloop1:ldx	#3							; 2
 arloop2:dex								; 2
 	bne	arloop2							; 2nt/3
 	dey								; 2
diff --git a/megademo/bird_mountain.s b/megademo/bird_mountain.s
index 1d16ef8b..289f3d84 100644
--- a/megademo/bird_mountain.s
+++ b/megademo/bird_mountain.s
@@ -438,16 +438,20 @@ bmloop6:dex								; 2
 
 	; Blanking time:	 4550
 	; move_letters		 -132
+	; play_music		-1038
 	; check keypress	   -7
 	; JMP at end		   -3
-	;========================4408 cycles
+	;========================3370 cycles
+
+	jsr	play_music	; 6+1032
 
 	; Try X=175 Y=5 cycles=4406 R2
+	; Try X=17 Y=37 cycles=3368 R2
 
 	nop								; 2
 
-	ldy	#5							; 2
-bmloop7:ldx	#175							; 2
+	ldy	#37							; 2
+bmloop7:ldx	#17							; 2
 bmloop8:dex								; 2
 	bne	bmloop8							; 2nt/3
 	dey								; 2
diff --git a/megademo/fireworks.s b/megademo/fireworks.s
index 7646690e..5c0d77b6 100644
--- a/megademo/fireworks.s
+++ b/megademo/fireworks.s
@@ -176,7 +176,9 @@ fw_display_loop:
 	;	      -12 for HIRES/PAGE0 at top
 	;	       -5 for LORES+ldy+br fallthrough at bottom
 	;	     -132 for move_letters
-	;	     9731
+	;           -1038 for music
+	;===================================
+	;	     8693
 
 	bit	HIRES						; 4
 	bit	PAGE0						; 4
@@ -185,13 +187,13 @@ fw_display_loop:
 							;	 12
 	jsr	move_letters					; 6+126
 
+	jsr	play_music					; 6+1032
+
 	; Try X=242 Y=8 cycles=9729 R2
+	; Try X=20 Y=82 cycles=8693
 
-	nop							; 2
-
-
-	ldy	#8							; 2
-hgloop1:ldx	#242							; 2
+	ldy	#82							; 2
+hgloop1:ldx	#20							; 2
 hgloop2:dex								; 2
 	bne	hgloop2							; 2nt/3
 	dey								; 2
diff --git a/megademo/leaving.s b/megademo/leaving.s
index 63e8f1ca..a50ea099 100644
--- a/megademo/leaving.s
+++ b/megademo/leaving.s
@@ -126,8 +126,9 @@ lv_begin_loop:
 	;  -17	set state
 	;  -11  move
 	;   -8	check if done
+	;-1038  play music
 	;=======
-	; 3055
+	; 2017
 
 	bit	SET_TEXT						; 4
 
@@ -212,13 +213,13 @@ lv_move:
 lv_done_move:
 
 
+	jsr	play_music
 
-
+	; Try X=10 Y=36 cycles=2017
 	; Try X=86 Y=7 cycles=3053 R2
-	nop
 
-	ldy	#7							; 2
-lvloop8:ldx	#86							; 2
+	ldy	#36							; 2
+lvloop8:ldx	#10							; 2
 lvloop9:dex								; 2
 	bne	lvloop9							; 2nt/3
 	dey								; 2
diff --git a/megademo/space_bars.s b/megademo/space_bars.s
index 7739c244..883f99dc 100644
--- a/megademo/space_bars.s
+++ b/megademo/space_bars.s
@@ -175,6 +175,9 @@ sb_hgr_loop:
 	;		     -8
 	;=========================
 	;		3011
+	;	       -1038 play_music
+	;================================
+	;               1973
 
 	bit	SET_GR				; 4
 	bit	HIRES				; 4
@@ -192,11 +195,14 @@ sb_hgr_loop:
 								; 2180
 
 
+	jsr	play_music		; 6+1032
+
+	; Try X=196 Y=2 cycles=1973
 
 	; Try X=59 Y=10 cycles=3011
 
-	ldy	#10							; 2
-sbloopC:ldx	#59							; 2
+	ldy	#2							; 2
+sbloopC:ldx	#196							; 2
 sbloopD:dex								; 2
 	bne	sbloopD							; 2nt/3
 	dey								; 2
diff --git a/megademo/takeoff.s b/megademo/takeoff.s
index 4ce38f52..e68ef030 100644
--- a/megademo/takeoff.s
+++ b/megademo/takeoff.s
@@ -138,12 +138,14 @@ to_begin_loop:
 
 	bit	HIRES			; 4
 
+	; 3116 - 1038 (music) = 2078
+
+
+	; Try X=5 Y=67 cycles=2078
 	; Try X=11 Y=51 cycles=3112 R4
 
-	nop
-	nop
-	ldy	#51							; 2
-toloop8:ldx	#11							; 2
+	ldy	#67							; 2
+toloop8:ldx	#5							; 2
 toloop9:dex								; 2
 	bne	toloop9							; 2nt/3
 	dey								; 2
diff --git a/megademo/waterfall.s b/megademo/waterfall.s
index b26a658a..63cecac6 100644
--- a/megademo/waterfall.s
+++ b/megademo/waterfall.s
@@ -151,15 +151,20 @@ vblank:
 	;				-49 check for keypress
 	;			       -578 copy screen
 	;			      -2231 draw sprite
+	;			      -1038 play music
 	;			=============
-	;			      1662 cycles
+	;			        624 cycles
+
+	jsr	play_music	; 6+1032
 
 	; Try X=29 Y=11 cycles=1662
 
+	; Try X=123 Y=1 cycles=622 R2
 
+	nop
 
-	ldy	#11							; 2
-wfloopY:ldx	#29							; 2
+	ldy	#1							; 2
+wfloopY:ldx	#123							; 2
 wfloopZ:dex								; 2
         bne	wfloopZ							; 2nt/3
         dey								; 2