diff --git a/demosplash/demosplash.s b/demosplash/demosplash.s index 7e2a95bb..6f71982b 100644 --- a/demosplash/demosplash.s +++ b/demosplash/demosplash.s @@ -50,21 +50,15 @@ demosplash2019: ; Setup pages (is this necessary?) ;=========================== - lda #0 - sta DRAW_PAGE - lda #1 - sta DISP_PAGE - +; lda #0 +; sta DRAW_PAGE +; lda #1 +; sta DISP_PAGE ;=========================== ; apple II intro ;============================ - nop - nop - nop - - jsr appleII_intro @@ -72,10 +66,6 @@ demosplash2019: ; missing scene ;=========================== -; nop -; nop -; nop - jsr missing_intro @@ -83,7 +73,6 @@ demosplash2019: ; start irq music ;======================== -nop ; cli ; enable interrupts ;=========================== @@ -208,6 +197,7 @@ wait_until_keypressed: ; Pictures (no need to align) .include "appleII_40_96.inc" +.include "k_40_48d.inc" .include "graphics/book_open/book_open.inc" .include "graphics/starbase/starbase.inc" .include "graphics/starbase/ship_flames.inc" diff --git a/demosplash/missing.s b/demosplash/missing.s index 770558a7..b0729ee2 100644 --- a/demosplash/missing.s +++ b/demosplash/missing.s @@ -144,42 +144,43 @@ missing_display_loop: ; do_nothing should be ; 4550 ; -12 jsr/ret to update_type1 - ; - 7 check keypress - ; - 3 jmp loop + ; - 8 check keypress + ; -1239 ;============= - ; 4528 + ; 3291 ; blah, current code the tight loops are right at a page boundary + jsr play_frame_compressed ; 6+1233 + do_nothing_missing: - ; want 4528 + ; want 3291 - ; Try X=4 Y=174 cycles=4525 R3 + ; Try X=163 Y=4 cycles=3285R6 - lda TEMP ; nop 3 + lda TEMP + lda TEMP - ldy #174 ; 2 -gloop1: ldx #4 ; 2 + ldy #4 ; 2 +gloop1: ldx #163 ; 2 gloop2: dex ; 2 bne gloop2 ; 2nt/3 dey ; 2 bne gloop1 ; 2nt/3 - lda KEYPRESS ; 4 - bpl missing_no_keypress ; 3 + lda FRAME_PLAY_PAGE ; 3 + cmp #4 ; 2 + bne missing_display_loop ; 3 + +; lda KEYPRESS ; 4 +; bpl missing_no_keypress ; 3 rts -missing_no_keypress: - - jmp missing_display_loop ; 3 - -.align $100 - - -.include "k_40_48d.inc" +;.align $100 +;.include "k_40_48d.inc"