From 02bd94e902301b463ee6b3cdb958c70e5a4b5d6b Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Mon, 29 Oct 2018 01:38:13 -0400 Subject: [PATCH] megademo: more music fine tuning --- megademo/arrival.s | 5 ++++- megademo/bird_mountain.s | 6 ++++-- megademo/check_email.s | 34 ++++++++++++++++++++++++++++++++-- megademo/fireworks.s | 1 + megademo/hgr.s | 6 +++--- megademo/leaving.s | 3 +++ megademo/letters.s | 4 ++-- megademo/mode7.s | 4 ++-- megademo/music_1000.s | 4 ++-- megademo/space_bars.s | 3 +++ megademo/takeoff.s | 3 +++ megademo/waterfall.s | 3 +++ 12 files changed, 62 insertions(+), 14 deletions(-) diff --git a/megademo/arrival.s b/megademo/arrival.s index 7ec22d66..149f850a 100644 --- a/megademo/arrival.s +++ b/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 diff --git a/megademo/bird_mountain.s b/megademo/bird_mountain.s index 289f3d84..11c5d5a1 100644 --- a/megademo/bird_mountain.s +++ b/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 ;=========================================================== ;=========================================================== diff --git a/megademo/check_email.s b/megademo/check_email.s index 433dfe3b..882c95e8 100644 --- a/megademo/check_email.s +++ b/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" diff --git a/megademo/fireworks.s b/megademo/fireworks.s index 5c0d77b6..b1cd7b7a 100644 --- a/megademo/fireworks.s +++ b/megademo/fireworks.s @@ -112,6 +112,7 @@ init_letters: ; jsr wait_until_keypressed + sei ; disable interrupt music ;============================== ; setup graphics for vapor lock diff --git a/megademo/hgr.s b/megademo/hgr.s index 835bd407..36509011 100644 --- a/megademo/hgr.s +++ b/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 TXTCLR +; lda HIRES +; lda TXTCLR hclr: lda #0 ; black background sta HGR_BITS diff --git a/megademo/leaving.s b/megademo/leaving.s index a50ea099..3eba569b 100644 --- a/megademo/leaving.s +++ b/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 diff --git a/megademo/letters.s b/megademo/letters.s index f75cc99c..19e814fc 100644 --- a/megademo/letters.s +++ b/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 diff --git a/megademo/mode7.s b/megademo/mode7.s index cae88932..18f3eac5 100644 --- a/megademo/mode7.s +++ b/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: diff --git a/megademo/music_1000.s b/megademo/music_1000.s index cce62e28..2e25ce8f 100644 --- a/megademo/music_1000.s +++ b/megademo/music_1000.s @@ -90,8 +90,8 @@ play_music: and #$1f ; 2 tay ; 2 - ; if > 16 use $D000 PAGE2 of language card - cpy #16 ; 2 + ; if > 17 use $D000 PAGE2 of language card + cpy #17 ; 2 bcs use_page2 ; 3 use_page1: ; turn on language card ; -1 diff --git a/megademo/space_bars.s b/megademo/space_bars.s index 883f99dc..64bd4d39 100644 --- a/megademo/space_bars.s +++ b/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 diff --git a/megademo/takeoff.s b/megademo/takeoff.s index b9e16193..e050a45c 100644 --- a/megademo/takeoff.s +++ b/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 diff --git a/megademo/waterfall.s b/megademo/waterfall.s index 63cecac6..8aa5e2ff 100644 --- a/megademo/waterfall.s +++ b/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