diff --git a/megademo/check_email.s b/megademo/check_email.s index 146b5fb6..0defe218 100644 --- a/megademo/check_email.s +++ b/megademo/check_email.s @@ -212,15 +212,18 @@ ce_patch: ; -10 keypress ; -2 ldy at top ; -132 move letters + ; -1038 play_music ; =========== - ; 4377 + ; 3339 - ; Try X=96 Y=9 cycles=4375 R2 + jsr play_music ; 6+1032 + + ; Try X=110 Y=6 cycles=3337 R2 nop ; 2 - ldy #9 ; 2 -emloop1:ldx #96 ; 2 + ldy #6 ; 2 +emloop1:ldx #110 ; 2 emloop2:dex ; 2 bne emloop2 ; 2nt/3 dey ; 2 diff --git a/megademo/falling_apple.s b/megademo/falling_apple.s index e91b9e71..d0c6286d 100644 --- a/megademo/falling_apple.s +++ b/megademo/falling_apple.s @@ -151,13 +151,16 @@ page1_loop: ; delay 115+(7 loop)+4 (bit)+4(extra) ; -25 inc framecount ; -7 see if timeout ; -10 keypress + ;-1038 music ;================ - ; 4507 + ; 3469 - ; Try X=149 Y=6 cycles=4507 + jsr play_music ; 6+1032 - ldy #6 ; 2 -faloop1:ldx #149 ; 2 + ; Try X=230 Y=3 cycles=3469 + + ldy #3 ; 2 +faloop1:ldx #230 ; 2 faloop2:dex ; 2 bne faloop2 ; 2nt/3 dey ; 2 diff --git a/megademo/starring.s b/megademo/starring.s index 5ba7727c..8446ed81 100644 --- a/megademo/starring.s +++ b/megademo/starring.s @@ -238,20 +238,24 @@ st_timeout: ;============ ; 7 - ; do_nothing should be 4550 + ; 4550 ; -13 wrap ; -7 timeout ; -10 keypress ; -30 page flipping + ; -1038 music ; =========== - ; 4484 + ; 3446 - ; Try X=178 Y=5 cycles=4481 R3 + jsr play_music ; 6+1032 - lda $0 + ; Try X=21 Y=31 cycles=3442 R4 - ldy #5 ; 2 -stloop1:ldx #178 ; 2 + nop + nop + + ldy #31 ; 2 +stloop1:ldx #21 ; 2 stloop2:dex ; 2 bne stloop2 ; 2nt/3 dey ; 2 diff --git a/megademo/starring_people.s b/megademo/starring_people.s index 3a3275e8..e6d8e56d 100644 --- a/megademo/starring_people.s +++ b/megademo/starring_people.s @@ -181,8 +181,9 @@ sp_outer_loop: ; -8 pause a bit ; -32 draw yellow ; -49 wipe + ; -1038 music ; =========== - ; 7276 + ; 6238 lda FRAMEH ; 3 cmp #15 ; 2 @@ -276,12 +277,14 @@ sp_timeout: beq sp_done ; 3 ; -1 + jsr play_music ; 6+1032 ; Try X=17 Y=80 cycles=7281 R3 ; Try X=57 Y=25 cycles=7276 + ; Try X=45 Y=27 cycles=6238 - ldy #25 ; 2 -sploop1:ldx #57 ; 2 + ldy #27 ; 2 +sploop1:ldx #45 ; 2 sploop2:dex ; 2 bne sploop2 ; 2nt/3 dey ; 2