From a8e02ec815ac7094638bbc791da8ba3be493cc79 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Fri, 8 Nov 2019 20:07:02 -0500 Subject: [PATCH] ds: oh so close --- demosplash/credits.s | 2 ++ demosplash/demosplash.s | 27 ++++++++++++++++++++++----- demosplash/reading.s | 20 +++++++++++++------- 3 files changed, 37 insertions(+), 12 deletions(-) diff --git a/demosplash/credits.s b/demosplash/credits.s index b4eb41b4..8fd93461 100644 --- a/demosplash/credits.s +++ b/demosplash/credits.s @@ -16,6 +16,8 @@ credits: sta FRAME_PLAY_PAGE jsr update_pt3_play + jsr pt3_write_lc_4 + lda #credits_text diff --git a/demosplash/demosplash.s b/demosplash/demosplash.s index 6a4d33ef..b482d459 100644 --- a/demosplash/demosplash.s +++ b/demosplash/demosplash.s @@ -53,37 +53,54 @@ demosplash2019: ; apple II intro ;============================ +; nop +; nop +; nop jsr appleII_intro ;=========================== ; missing scene ;=========================== - jsr missing_intro + nop + nop + nop +; jsr missing_intro ;======================== ; start irq music ;======================== - cli ; enable interrupts + nop + +; cli ; enable interrupts ;=========================== ; opening book scene ;============================ - jsr open_book + nop + nop + nop + +; jsr open_book ;=========================== ; starbase scene ;=========================== - jsr starbase + nop + nop + nop + +; jsr starbase ;============================ ; disable irq music - sei + nop +; sei ;=========================== diff --git a/demosplash/reading.s b/demosplash/reading.s index 6d02d61b..fb77695f 100644 --- a/demosplash/reading.s +++ b/demosplash/reading.s @@ -7,7 +7,8 @@ end_book: -cli + cli + ;=================== ; init screen @@ -48,7 +49,7 @@ cli lda #200 jsr long_wait -sei + sei lda #0 sta FRAME_PLAY_OFFSET @@ -57,8 +58,8 @@ sei sta FRAME_PAGE jsr update_pt3_play - ; setup 4 frames - jsr pt3_write_lc_4 + ; setup 1 frame + jsr pt3_write_lc_1 ;============================= @@ -181,9 +182,14 @@ bloop2: dey ; 2 bne bloop1 ; 2nt/3 - dec FRAMEL ; 5 - nop ; 2 - bne book_loop ; 3 + lda FRAME_PLAY_PAGE ; 3 + nop + nop + beq book_loop ; 3 + +; dec FRAMEL ; 5 +; nop ; 2 +; bne book_loop ; 3 ; lda TEMP ; 3 ; lda KEYPRESS ; 4