diff --git a/demosplash/appleII_intro.s b/demosplash/appleII_intro.s index c814da61..5554b2b9 100644 --- a/demosplash/appleII_intro.s +++ b/demosplash/appleII_intro.s @@ -159,9 +159,9 @@ page1_loop: ; delay 115+(7 loop)+4 (bit)+4(extra) ; -1174 ; -7 (keypress) ; -3 (jump) - ; -1239 (play_music) + ; -1243 (play_music) ; ===== - ; 2126 2179 + ; 2122 2179 jsr do_nothing ; 6 @@ -419,7 +419,7 @@ intro_wipe_done: no_keypress2: - jsr play_frame_compressed ; 6+1233 + jsr play_frame_compressed ; 6+1237 jmp display_loop ; 3 @@ -431,12 +431,9 @@ appleii_done: ;================================= ; do nothing ;================================= - ; and take 2126-12 = 2114 cycles to do it + ; and take 2122-12 = 2110 cycles to do it do_nothing: - ; Try X=21 Y=19 cycles=2110R4 - - nop - nop + ; Try X=21 Y=19 cycles=2110 ldy #19 ; 2 loop1: ldx #21 ; 2 diff --git a/demosplash/pt3_lib_play_frame.s b/demosplash/pt3_lib_play_frame.s index ae940705..bcb960ee 100644 --- a/demosplash/pt3_lib_play_frame.s +++ b/demosplash/pt3_lib_play_frame.s @@ -14,7 +14,7 @@ ;DA00 ;a $AE00,$AF00,$B000 = ENV high (r12) ; 3+ 72 + 72 + 83 + 74 + 72 + 77 + 19 + 70 + 74 + 72 + - ; 77 + 18 + 82 + 85 + 72 + 72 + 10 + 123 + 6 = 1233 /////1180 + ; 77 + 18 + 82 + 85 + 72 + 72 + 10 + 127 + 6 = 1237 /////1180 play_frame_compressed: @@ -194,9 +194,9 @@ r12_smc: no_frame_wrap: ; -1 - ; delay 123+1-3=121 - lda #94 ; 2 - jsr delay_a ; 121-2-25=94 + ; delay 127+1-3=125 + lda #98 ; 2 + jsr delay_a ; 125-2-25=98 jmp done_frame_wrap ; 3 frame_wrap: @@ -204,9 +204,9 @@ frame_wrap: sta FRAME_PLAY_OFFSET ; 3 inc FRAME_PLAY_PAGE ; 5 - jsr update_pt3_play ; 6+107 + jsr update_pt3_play ; 6+111 ;===== - ; 123 + ; 127 done_frame_wrap: @@ -250,7 +250,7 @@ play_mb_write: ;=========================== ; update the SMC counters - ; 13+88+6=107 + ; 13+92+6=111 update_pt3_play: lda FRAME_PLAY_PAGE ; 3 @@ -296,6 +296,6 @@ update_pt3_play: lda music_addr_table+10,Y ; 4 ; DA sta r12_smc+2 ; 4 ;========== - ; 11*8 = 88 + ; 11*8+4 = 92 rts ; 6