diff --git a/megademo/TIMING b/megademo/TIMING new file mode 100644 index 00000000..1532cacc --- /dev/null +++ b/megademo/TIMING @@ -0,0 +1,83 @@ +Each frame of music is 256/60 = 4.27s long + 31 frames = 132s = 2min 12s? + +0: c64_opener: 0 +1: falling_apple: 1 +2: starring: 2 + starring_fs 3 + starring_d 4 + starring_lg 5 +3: e-mail: 6-? +4: leave house: +5: running bird: +6: waterfall: +7: arrival at ship +8: mode7: +9: spacebars: +10: arrive at frogysue: 31 +11: fireworks: repeat + + + + + + +e-mail notes: + +**01234567890123456** +2 RE: ViSit +3 +4 DeAteR, +5 Kommt bald. +6 Ich vermisse +7 dich. +9 +10 DEIN IMMER +11 +12 FroGGY SuE +18 /| +19 __ __/ I +20 /__I I/ +21 /_____FFFI\ +22 + +**01234567890123456** +2 DEATER, +3 +4 Wir MuSSEN +5 ZUSAMMEN SEIN. +6 +7 RAUMFAHRST DU +8 SCHNELL. +9 +10 DEIN IMMER +11 +12 FroGGY SuE +13 _ +14 [_] +15 /| |\ +16 /_|_|_\ +17 /_\ +18 /| +19 __ __/ I ]T Wir mu"ssen die Reiseschecks einlo"sen +20 /__I I/ +21 /_____FFFI\ +22 + + +DEATER IS COOL + +DAATA :S C ! " +DEATEF YS C88I U + + +Apple IIe: Apple II+ + +0 ***** +1 * ***** +2 * * +3 ***** * +4 * ***** +5 * * +6 ***** * +7 ***** diff --git a/megademo/falling_apple.s b/megademo/falling_apple.s index d0c6286d..05f5937a 100644 --- a/megademo/falling_apple.s +++ b/megademo/falling_apple.s @@ -195,7 +195,7 @@ fa_doneinc: ;==================== ; 7 cycles lda FRAMEH ; 3 - cmp #100 ; 2 + cmp #117 ; 2 beq fa_done ; 3 ; -1 diff --git a/megademo/megademo.s b/megademo/megademo.s index 9d762511..9fb5476f 100644 --- a/megademo/megademo.s +++ b/megademo/megademo.s @@ -32,8 +32,9 @@ apple_iie: ;================== lda #0 - sta MB_FRAME sta MB_PATTERN + lda #$60 + sta MB_FRAME jsr mockingboard_init @@ -97,6 +98,7 @@ apple_iie: ; jmp game_over_man +.align $100 .include "lz4_decode.s" .include "c64_opener.s" .include "falling_apple.s" diff --git a/megademo/music_1000.s b/megademo/music_1000.s index 6d03128a..cce62e28 100644 --- a/megademo/music_1000.s +++ b/megademo/music_1000.s @@ -270,45 +270,45 @@ mb_done_change: ; patterns 31 long mal_pattern: -.byte >mal00,>mal00,>mal02,>mal02,>mal02,>mal02,>mal02,>mal02 +.byte >mal00,>mal00,>mal00,>mal02,>mal02,>mal02,>mal02,>mal02,>mal02 .byte >mal02,>mal02,>mal02,>mal02,>mal02,>mal02,>mal02,>mal02 .byte >mal02,>mal02,>mal02,>mal02,>mal02,>mal02,>mal02,>mal02 -.byte >mal02,>mal02,>mal02,>mal02,>mal02,>mal02,>mal02,>mal00 +.byte >mal02,>mal02,>mal02,>mal02,>mal02,>mal02,>mal02 mah_pattern: -.byte >mal00,>mal00,>mah02,>mah03,>mah04,>mah05,>mah04,>mah07 +.byte >mal00,>mal00,>mal00,>mah02,>mah03,>mah04,>mah05,>mah04,>mah07 .byte >mah04,>mah05,>mah10,>mah11,>mah04,>mah05,>mah04,>mah07 .byte >mah04,>mah05,>mah10,>mah11,>mah04,>mah05,>mah04,>mah07 -.byte >mah04,>mah05,>mah10,>mah11,>mah10,>mah11,>mah30,>mal00 +.byte >mah04,>mah05,>mah10,>mah11,>mah10,>mah11,>mah30 mbl_pattern: -.byte >mbl00,>mbl01,>mbl02,>mbl01,>mbl00,>mbl01,>mbl00,>mbl07 +.byte >mal00,>mbl00,>mbl01,>mbl02,>mbl01,>mbl00,>mbl01,>mbl00,>mbl07 .byte >mbl00,>mbl01,>mbl10,>mbl11,>mbl00,>mbl01,>mbl00,>mbl07 .byte >mbl00,>mbl01,>mbl10,>mbl11,>mbl00,>mbl01,>mbl22,>mbl23 -.byte >mbl00,>mbl01,>mbl10,>mbl11,>mbl10,>mbl11,>mbl01,>mbl00 +.byte >mbl00,>mbl01,>mbl10,>mbl11,>mbl10,>mbl11,>mbl01 mbh_pattern: -.byte >mbh00,>mbh01,>mbh00,>mbh01,>mbh04,>mbh05,>mbh04,>mbh07 +.byte >mal00,>mbh00,>mbh01,>mbh00,>mbh01,>mbh04,>mbh05,>mbh04,>mbh07 .byte >mbh08,>mbh05,>mbh10,>mbh11,>mbh04,>mbh05,>mbh04,>mbh07 .byte >mbh08,>mbh05,>mbh10,>mbh11,>mbh04,>mbh05,>mbh22,>mbh23 -.byte >mbh08,>mbh05,>mbh10,>mbh11,>mbh10,>mbh11,>mbh30,>mal00 +.byte >mbh08,>mbh05,>mbh10,>mbh11,>mbh10,>mbh11,>mbh30 mcl_pattern: -.byte >mal00,>mal00,>mal00,>mcl03,>mcl04,>mcl05,>mcl04,>mcl07 +.byte >mal00,>mal00,>mal00,>mal00,>mcl03,>mcl04,>mcl05,>mcl04,>mcl07 .byte >mcl08,>mcl09,>mcl10,>mcl11,>mcl04,>mcl05,>mcl04,>mcl07 .byte >mcl08,>mcl09,>mcl10,>mcl11,>mcl04,>mcl05,>mcl22,>mcl23 -.byte >mcl08,>mcl09,>mcl10,>mcl11,>mcl10,>mcl11,>mcl30,>mal00 +.byte >mcl08,>mcl09,>mcl10,>mcl11,>mcl10,>mcl11,>mcl30 mch_pattern: -.byte >mal00,>mal00,>mal00,>mch03,>mch04,>mch05,>mch04,>mch07 +.byte >mal00,>mal00,>mal00,>mal00,>mch03,>mch04,>mch05,>mch04,>mch07 .byte >mch08,>mch09,>mch10,>mch11,>mch04,>mch05,>mch04,>mch07 .byte >mch08,>mch09,>mch10,>mch11,>mch04,>mch05,>mch22,>mch23 -.byte >mch08,>mch09,>mch10,>mch11,>mch10,>mch11,>mch30,>mal00 +.byte >mch08,>mch09,>mch10,>mch11,>mch10,>mch11,>mch30 mnl_pattern: -.byte >mal00,>mal00,>mal00,>mnl03,>mnl04,>mnl05,>mnl04,>mnl07 +.byte >mal00,>mal00,>mal00,>mal00,>mnl03,>mnl04,>mnl05,>mnl04,>mnl07 .byte >mnl04,>mnl05,>mnl10,>mnl11,>mnl04,>mnl05,>mnl04,>mnl07 .byte >mnl04,>mnl05,>mnl10,>mnl11,>mnl04,>mnl05,>mnl04,>mnl07 -.byte >mnl04,>mnl05,>mnl10,>mnl11,>mnl10,>mnl11,>mnl30,>mal00 +.byte >mnl04,>mnl05,>mnl10,>mnl11,>mnl10,>mnl11,>mnl30 mnh_pattern: -.byte >mnh00,>mnh01,>mnh02,>mnh03,>mnh04,>mnh05,>mnh04,>mnh07 +.byte >mal00,>mnh00,>mnh01,>mnh02,>mnh03,>mnh04,>mnh05,>mnh04,>mnh07 .byte >mnh08,>mnh09,>mnh10,>mnh11,>mnh04,>mnh05,>mnh04,>mnh07 .byte >mnh08,>mnh09,>mnh10,>mnh11,>mnh04,>mnh05,>mnh04,>mnh23 -.byte >mnh08,>mnh09,>mnh10,>mnh11,>mnh10,>mnh11,>mnh30,>mal00 +.byte >mnh08,>mnh09,>mnh10,>mnh11,>mnh10,>mnh11,>mnh30 .align $100 diff --git a/megademo/starring.s b/megademo/starring.s index 8446ed81..6d2e5e89 100644 --- a/megademo/starring.s +++ b/megademo/starring.s @@ -232,7 +232,7 @@ st_wrap_done: ;============== st_timeout: lda FRAMEH ; 3 - cmp #6 ; 2 + cmp #5 ; 2 beq st_done ; 3 ; -1 ;============ diff --git a/megademo/starring_people.s b/megademo/starring_people.s index e6d8e56d..1a563ff3 100644 --- a/megademo/starring_people.s +++ b/megademo/starring_people.s @@ -273,7 +273,7 @@ sp_wrap_done: ; 7 cycles sp_timeout: lda FRAMEH ; 3 - cmp #75 ; 2 + cmp #62 ; 2 beq sp_done ; 3 ; -1