diff --git a/games/riven_hgr/disk00_files/cyan.s b/games/riven_hgr/disk00_files/cyan.s index ca85c6e8..b4c08ddb 100644 --- a/games/riven_hgr/disk00_files/cyan.s +++ b/games/riven_hgr/disk00_files/cyan.s @@ -6,7 +6,9 @@ .include "../hardware.inc" .include "../qload.inc" -NUM_SCENES = 18 +.include "disk00_defines.inc" + +NUM_SCENES = 20 ;=================== ; notes for cyan opening @@ -35,17 +37,6 @@ cyan_opener: ;=============================== cyan_loop: - ; clear bottom text - -; jsr clear_bottom - - ; show full screen for last image (book) - -; lda SCENE_COUNT -; cmp #10 -; bne not_at_end -; bit FULLGR -;not_at_end: ; decompress graphics @@ -58,11 +49,13 @@ cyan_loop: lda #$20 ; hgr page1 jsr full_decomp + ldx #10 + jsr wait_50xms + + ; exit early if keypress -wait_for_key: lda KEYPRESS - bpl wait_for_key - bit KEYRESET + bmi early_exit inc SCENE_COUNT @@ -71,6 +64,29 @@ wait_for_key: bne cyan_loop +early_exit: + bit KEYRESET + +; ldy #4 +lurk_at_logo: + +; ldx #10 +; jsr wait_50xms + +; lda KEYPRESS +; bmi really_exit + +; dey +; bpl lurk_at_logo + +; bit KEYRESET + +really_exit: + lda #LOAD_ATRUS + sta WHICH_LOAD + + lda #$1 + sta LEVEL_OVER rts @@ -82,20 +98,22 @@ frames_l: .byte cyan01_zx02 @@ -105,7 +123,7 @@ frames_h: .byte >cyan05_zx02 .byte >cyan06_zx02 .byte >cyan07_zx02 - .byte >cyan08_zx02 +; .byte >cyan08_zx02 .byte >cyan09_zx02 .byte >cyan10_zx02 .byte >cyan11_zx02 @@ -116,6 +134,9 @@ frames_h: .byte >cyan16_zx02 .byte >cyan17_zx02 .byte >cyan18_zx02 + .byte >cyan19_zx02 + .byte >cyan20_zx02 + .byte >cyan21_zx02 cyan_graphics: diff --git a/games/riven_hgr/disk00_files/graphics_cyan/Makefile b/games/riven_hgr/disk00_files/graphics_cyan/Makefile index 230c04f6..36ee0366 100644 --- a/games/riven_hgr/disk00_files/graphics_cyan/Makefile +++ b/games/riven_hgr/disk00_files/graphics_cyan/Makefile @@ -23,7 +23,10 @@ cyan_graphics.inc: \ cyan15_iipix.hgr.zx02 \ cyan16_iipix.hgr.zx02 \ cyan17_iipix.hgr.zx02 \ - cyan18_iipix.hgr.zx02 + cyan18_iipix.hgr.zx02 \ + cyan19_iipix.hgr.zx02 \ + cyan20_iipix.hgr.zx02 \ + cyan21_iipix.hgr.zx02 echo "cyan01_zx02: .incbin \"cyan01_iipix.hgr.zx02\"" > cyan_graphics.inc echo "cyan02_zx02: .incbin \"cyan02_iipix.hgr.zx02\"" >> cyan_graphics.inc echo "cyan03_zx02: .incbin \"cyan03_iipix.hgr.zx02\"" >> cyan_graphics.inc @@ -31,7 +34,7 @@ cyan_graphics.inc: \ echo "cyan05_zx02: .incbin \"cyan05_iipix.hgr.zx02\"" >> cyan_graphics.inc echo "cyan06_zx02: .incbin \"cyan06_iipix.hgr.zx02\"" >> cyan_graphics.inc echo "cyan07_zx02: .incbin \"cyan07_iipix.hgr.zx02\"" >> cyan_graphics.inc - echo "cyan08_zx02: .incbin \"cyan08_iipix.hgr.zx02\"" >> cyan_graphics.inc +# echo "cyan08_zx02: .incbin \"cyan08_iipix.hgr.zx02\"" >> cyan_graphics.inc echo "cyan09_zx02: .incbin \"cyan09_iipix.hgr.zx02\"" >> cyan_graphics.inc echo "cyan10_zx02: .incbin \"cyan10_iipix.hgr.zx02\"" >> cyan_graphics.inc echo "cyan11_zx02: .incbin \"cyan11_iipix.hgr.zx02\"" >> cyan_graphics.inc @@ -42,6 +45,10 @@ cyan_graphics.inc: \ echo "cyan16_zx02: .incbin \"cyan16_iipix.hgr.zx02\"" >> cyan_graphics.inc echo "cyan17_zx02: .incbin \"cyan17_iipix.hgr.zx02\"" >> cyan_graphics.inc echo "cyan18_zx02: .incbin \"cyan18_iipix.hgr.zx02\"" >> cyan_graphics.inc + echo "cyan19_zx02: .incbin \"cyan19_iipix.hgr.zx02\"" >> cyan_graphics.inc + echo "cyan20_zx02: .incbin \"cyan20_iipix.hgr.zx02\"" >> cyan_graphics.inc + echo "cyan21_zx02: .incbin \"cyan21_iipix.hgr.zx02\"" >> cyan_graphics.inc +