diff --git a/demosplash/demosplash.s b/demosplash/demosplash.s index ce90fb79..a80013a0 100644 --- a/demosplash/demosplash.s +++ b/demosplash/demosplash.s @@ -13,7 +13,10 @@ demosplash2019: sta DONE_PLAYING sta FRAME_PLAY_OFFSET sta FRAME_PLAY_PAGE + sta FRAME_OFFSET + sta FRAME_PAGE jsr update_pt3_play + jsr pt3_set_pages jsr mockingboard_init jsr pt3_setup_interrupt diff --git a/demosplash/pt3_lib_write_lc.s b/demosplash/pt3_lib_write_lc.s index fee8799c..ca4d98a7 100644 --- a/demosplash/pt3_lib_write_lc.s +++ b/demosplash/pt3_lib_write_lc.s @@ -106,6 +106,7 @@ pt3_set_pages: rts +.align $100 music_table_begin: music_addr_table: @@ -113,7 +114,7 @@ music_addr_table: .byte $e6,$e7,$e8,$e9,$ea,$eb,$ec,$ed,$ee,$ef,$f0,$BB,$CC,$DD,$EE,$FF .byte $db,$dc,$dd,$de,$df,$e0,$e1,$e2,$e3,$e4,$e5,$BB,$CC,$DD,$EE,$FF .byte $d0,$d1,$d2,$d3,$d4,$d5,$d6,$d7,$d8,$d9,$da,$BB,$CC,$DD,$EE,$FF - +.byte $d0,$d1,$d2,$d3,$d4,$d5,$d6,$d7,$d8,$d9,$da,$BB,$CC,$DD,$EE,$FF music_table_end: .assert >music_table_begin = >music_table_end, error, "music_table crosses page" diff --git a/demosplash/reading.s b/demosplash/reading.s index 9db04795..3ca34d48 100644 --- a/demosplash/reading.s +++ b/demosplash/reading.s @@ -7,11 +7,9 @@ end_book: +cli ;=================== ; init screen -; jsr TEXT -; jsr HOME -; bit KEYRESET bit PAGE0 bit SET_TEXT @@ -28,7 +26,7 @@ end_book: sta FRAMEL ;=================== - ; setup grahics + ; setup graphics jsr create_update_type1 @@ -50,7 +48,17 @@ end_book: lda #200 jsr long_wait +sei + lda #0 + sta FRAME_PLAY_OFFSET + sta FRAME_PLAY_PAGE + sta FRAME_OFFSET + sta FRAME_PAGE + jsr update_pt3_play + + ; setup 4 frames + jsr pt3_write_lc_4 ;============================= @@ -148,24 +156,24 @@ book_loop: ; 4550 ; -12 -- enter/leave flip code ; -10 -- keypress code + ; -1239 ; ======= - ; 4528 cycles + ; 3289 cycles + jsr play_frame_compressed ; 6+1233 ;================================= ; do nothing ;================================= - ; and take 4528 + ; and take 3289 book_do_nothing: - ; Try X=4 Y=174 cycles=4525 R3 + ; Try X=81 Y=8 cycles=3289 - lda TEMP ; 3 - - ldy #174 ; 2 + ldy #8 ; 2 bloop1: - ldx #4 ; 2 + ldx #81 ; 2 bloop2: dex ; 2 bne bloop2 ; 2nt/3