From c27b51e8ab2aea821d3bb8a45d2316159d66cbb9 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sat, 13 Oct 2018 17:13:09 -0400 Subject: [PATCH] megademo: waterfall now exits, so can watch whole thing --- megademo/waterfall.s | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/megademo/waterfall.s b/megademo/waterfall.s index 1996853a..e1b51ff2 100644 --- a/megademo/waterfall.s +++ b/megademo/waterfall.s @@ -293,15 +293,19 @@ convoluted: is_it_left: ; 5 cmp #$8 ; left arrow ; 2 - beq is_left - ; 2 - nop ; 2 - lda YPOS ; 3-cycle nop + beq is_left ; 3 + + ; -1 + cmp #0 ; space? ; 2 + bne not_space ; 3 + rts +; nop ; 2 +; lda YPOS ; 3-cycle nop ; 3 +not_space: jmp convoluted ; 3 ; ------ 20 if neither is_left: - ; 3 dec XPOS ; 5 ; 20 if left lda #1 ; 2 sta BIRD_DIR ; 3 @@ -315,6 +319,7 @@ adjust_xpos: jmp wf_display_loop ; 3 + .align $100 .include "gr_unrolled_copy.s" @@ -616,6 +621,6 @@ ground_loop_done: jmp wf_display_loop_return ; 3 - +; Moved to megademo.s ;.include "waterfall_page1.inc" ;.include "waterfall_page2.inc"