megademo: more music fine tuning

megademo/arrival.s

@@ -14,7 +14,7 @@ arriving_there:
 
 	;===================
 	; init screen
-	bit	KEYRESET
+
 
 setup_arrival:
 
@@ -66,6 +66,8 @@ setup_arrival:
 
 	bit	PAGE0
 
+	sei		; disable interrupt music
+
 	;==============================
 	; setup graphics for vapor lock
 	;==============================
@@ -351,6 +353,7 @@ ar_no_keypress:
 
 ar_all_done:
 	bit	KEYRESET	; clear keypress	; 4
+	cli			; re-enable interrupt music
 	rts						; 6
 
 

megademo/bird_mountain.s

@@ -80,6 +80,7 @@ bird_mountain:
 
 	jsr	lz4_decode
 
+	sei				; disable interrupt music
 
 	;=====================================================
 	; attempt vapor lock
@@ -316,7 +317,7 @@ bm_noflo:
 bm_check_done:
 	; finish after so many cycles
 	lda	FRAMEH							; 3
-	cmp	#30							; 2
+	cmp	#23							; 2
 	beq	bm_done							; 3
 									; -1
 
@@ -468,7 +469,8 @@ bm_no_keypress:
 
 bm_done:
 	bit	KEYRESET	; clear keypress			; 4
-        rts								; 6
+	cli		; re-enable interrupt music
+	rts								; 6
 
 ;===========================================================
 ;===========================================================

megademo/check_email.s

@@ -259,7 +259,7 @@ em_wrap_done:
 	; 7 cycles
 em_timeout:
 	lda	FRAMEH							; 3
-	cmp	#34							; 2
+	cmp	#27							; 2
 	beq	em_done							; 3
 									; -1
 
@@ -283,6 +283,7 @@ em_no_keypress:
 
 em_done:
 	bit	KEYRESET	; clear keypress	; 4
+	cli			; enable interrupt music
 	rts						; 6
 
 
@@ -369,7 +370,36 @@ draw_line_p2:
 							;	32
 
 
+em_letters:
+	; note it is y,x
+;       .byte	4,4,
+	.byte	        "RE: VISIT",128		; RE: VISIT
+	.byte	4+128,4,"RE: VISIT",128
 
+	.byte	6,4,	"DA LA , K MML",128	; DEATER, KOMMT
+	.byte	6+128,4,"DE&FEF, K8MMF",128
+
+	.byte	7,4,    " L !J, ICL",128	; BALD, ICH
+	.byte	7+128,4," 8&I8, ICH",128
+
+	.byte	8,4,    " A M SSA J CL",128	; VERMISSE DICH.
+	.byte	8+128,4,"VEFMISSE 8ICH.",128
+
+	.byte	10,4,    "  F  GGYS A",128
+	.byte	10+128,4,"  FF8GGYSUE",128	; FROGGYSUE
+
+	.byte	13,10,          "  /I",128
+	.byte	13+128,10,      "  /Y",128
+	.byte	14,10,          " /_I",128
+	.byte	14+128,4,"  __ __/_Y", 128
+	.byte	15,4,    " /__]    I/",128
+	.byte	15+128,4," /__]    Y/",128
+	.byte	16,4,    "/_____   I\",128
+	.byte	16+128,4,"/_____EEEE\"
+	.byte	255
+
+
+.if 0
 em_letters:
 	; note it is y,x
 ;       .byte	4,4,
@@ -429,7 +459,7 @@ em_letters:
 ;	.byte	15+128,4,"/_____EEEE\"
 ;	.byte	255
 
-
+.endif
 ;.include "email_40_96.inc"
 
 

megademo/fireworks.s

@@ -112,6 +112,7 @@ init_letters:
 
 ;	jsr	wait_until_keypressed
 
+	sei	; disable interrupt music
 
 	;==============================
 	; setup graphics for vapor lock

megademo/hgr.s

@@ -38,12 +38,12 @@ hgr:
 	; F3E2
 	lda	#$20		; HIRES Page 1 at $2000
 	bit	LOWSCR		; BIT SW.LOWSCR Use PAGE1 ($C054)
-	bit	MIXSET		;  BIT SW.MIXSET (Mixed text)
+;	bit	MIXSET		;  BIT SW.MIXSET (Mixed text)
 sethpg:
 	; F3EA
 	sta	HGR_PAGE
-	lda	HIRES
+;	lda	HIRES
-	lda	TXTCLR
+;	lda	TXTCLR
 hclr:
 	lda	#0			; black background
 	sta	HGR_BITS

megademo/leaving.s

@@ -63,6 +63,8 @@ setup_leaving:
 
 	bit	PAGE0
 
+	sei	; disable interrupt music
+
 	;==============================
 	; setup graphics for vapor lock
 	;==============================
@@ -306,6 +308,7 @@ lv_no_keypress:
 
 lv_all_done:
 	bit	KEYRESET	; clear keypress	; 4
+	cli			; re-enable interrupt music
 	rts						; 6
 
 

megademo/letters.s

@@ -14,9 +14,9 @@ letters_bm:
 	.byte	3,17,"DEATER",150
 	.byte	1,19," ",128
 	.byte	3,17," ",128
-	.byte	1,16,"MUSIC BY",128
+	.byte	1,17,"MUSIC",128
 	.byte	3,17,"DASCON",150
-	.byte	1,16," ",128
+	.byte	1,17," ",128
 	.byte	3,17," ",128
 	.byte	1,16,"LZ4+DISK",128
 	.byte	3,17,"QKUMBA",150

megademo/mode7.s

@@ -62,7 +62,7 @@ island_flying_directions:
 
 mode7_flying:
 
-	cli	; enable interrupts (play music)
+;	cli	; enable interrupts (play music)
 
 	;================================
 	; one-time setup
@@ -155,7 +155,7 @@ done_key:
 done_mode7:
 	bit	KEYRESET
 	; done
-	sei			; disable interrupts
+;	sei			; disable interrupts
 	rts
 
 check_up:

megademo/music_1000.s

@@ -90,8 +90,8 @@ play_music:
 	and	#$1f		; 2
 	tay			; 2
 
-	; if > 16 use $D000 PAGE2 of language card
+	; if > 17 use $D000 PAGE2 of language card
-	cpy	#16		; 2
+	cpy	#17		; 2
 	bcs	use_page2	; 3
 use_page1:
 	; turn on language card	; -1

megademo/space_bars.s

@@ -86,6 +86,7 @@ space_bars:
 	; GR part
 	bit	PAGE0
 
+	sei	; disable interrupt music
 
 	;==============================
 	; setup graphics for vapor lock
@@ -366,6 +367,8 @@ sb_check_right:
 
 
 sb_exit:
+	bit	KEYRESET
+	cli		; re-enable interrupt music
 	rts						; 6
 
 

megademo/takeoff.s

@@ -85,6 +85,8 @@ setup_rocket:
 
 	bit	PAGE0
 
+	sei		; disable interrupt music
+
 	;==============================
 	; setup graphics for vapor lock
 	;==============================
@@ -257,6 +259,7 @@ to_no_keypress:
 
 to_exit:
 	bit	KEYRESET	; clear keypress	; 4
+	cli			; re-enable interrupt music
 	rts						; 6
 
 

megademo/waterfall.s

@@ -63,6 +63,8 @@ waterfall:
 	sta	GBASH
 	jsr	load_rle_gr
 
+	sei	; disable interrupt music
+
 	;==============================
 	; setup graphics for vapor lock
 	;==============================
@@ -341,6 +343,7 @@ is_it_left:
 
 wf_exit:
 	bit	KEYRESET
+	cli		; re-enable interrupt music
 	rts
 
 ;	nop						; 2