diff --git a/demos/second/part09_leaves/graphics/Makefile b/demos/second/part09_leaves/graphics/Makefile index 285c781e..1e15fb0c 100644 --- a/demos/second/part09_leaves/graphics/Makefile +++ b/demos/second/part09_leaves/graphics/Makefile @@ -4,7 +4,17 @@ ZX02 = ~/research/6502_compression/zx02.git/build/zx02 PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr PNG2GR = ../../../../utils/gr-utils/png2gr -all: final3.hgr.zx02 +all: final3.hgr.zx02 leaves1.hgr.zx02 leaves2.hgr.zx02 \ + leaves_combined.hgr.zx02 + +#### + +leaves_combined.hgr: leaves1.hgr leaves2.hgr + cat leaves1.hgr > leaves_combined.hgr + cat leaves2.hgr >> leaves_combined.hgr + +leaves_combined.hgr.zx02: leaves_combined.hgr + $(ZX02) leaves_combined.hgr leaves_combined.hgr.zx02 #### @@ -14,7 +24,25 @@ final3.hgr: final3.png final3.hgr.zx02: final3.hgr $(ZX02) final3.hgr final3.hgr.zx02 +#### + +leaves1.hgr: leaves1.png + $(PNG_TO_HGR) leaves1.png > leaves1.hgr + +leaves1.hgr.zx02: leaves1.hgr + $(ZX02) leaves1.hgr leaves1.hgr.zx02 + +#### + +leaves2.hgr: leaves2.png + $(PNG_TO_HGR) leaves2.png > leaves2.hgr + +leaves2.hgr.zx02: leaves2.hgr + $(ZX02) leaves2.hgr leaves2.hgr.zx02 + + + #### clean: - rm -f *~ + rm -f *~ *.zx02 diff --git a/demos/second/part09_leaves/graphics/leaves1.png b/demos/second/part09_leaves/graphics/leaves1.png new file mode 100644 index 00000000..ffb9eea4 Binary files /dev/null and b/demos/second/part09_leaves/graphics/leaves1.png differ diff --git a/demos/second/part09_leaves/graphics/leaves2.png b/demos/second/part09_leaves/graphics/leaves2.png new file mode 100644 index 00000000..a1105e41 Binary files /dev/null and b/demos/second/part09_leaves/graphics/leaves2.png differ diff --git a/demos/second/part09_leaves/leaves.s b/demos/second/part09_leaves/leaves.s index 3e309719..4e646617 100644 --- a/demos/second/part09_leaves/leaves.s +++ b/demos/second/part09_leaves/leaves.s @@ -48,31 +48,37 @@ leaves_start: sta zx_src_l+1 lda #>leaves_data sta zx_src_h+1 - lda #$60 + lda #$20 jsr zx02_full_decomp - lda #0 - sta COUNT - sta DRAW_PAGE +; lda #0 +; sta COUNT +; sta DRAW_PAGE -ship_sprite_loop: - lda #$60 - jsr hgr_copy +; lda #$60 +; jsr hgr_copy - bit PAGE1 +; bit PAGE1 ; jsr wait_until_keypress leaves_loop: + bit PAGE1 + + lda #25 + jsr wait_ticks + + bit PAGE2 + + lda #25 + jsr wait_ticks + lda #34 jsr wait_for_pattern bcc leaves_loop - - - leaves_done: rts @@ -85,6 +91,6 @@ leaves_done: .include "../hgr_copy_fast.s" leaves_data: - .incbin "graphics/final3.hgr.zx02" + .incbin "graphics/leaves_combined.hgr.zx02" .include "../irq_wait.s"