diff --git a/megademo/Makefile b/megademo/Makefile index 572bccc5..613d447b 100644 --- a/megademo/Makefile +++ b/megademo/Makefile @@ -26,7 +26,7 @@ megademo.o: megademo.s \ gr_hline.s gr_offsets.s vapor_lock.s delay_a.s wait_keypress.s \ c64_opener.s c64.img.lz4 \ falling_apple.s apple_40_96.inc \ - starring.s starring1.inc starring2.inc \ + starring.s starring1.inc starring2.inc starring3.img.lz4\ check_email.s email_40_96.inc \ bird_mountain.s \ fireworks.s fw_background.inc fw_state_machine.s fw.s \ @@ -53,15 +53,17 @@ starring2.inc: ./starring_2.png $(PNG_TO_RLE) asm ./starring_2.png starring2 > starring2.inc +starring3.img.lz4: starring3.img + lz4 -f -16 starring3.img +starring3.img: ./starring_3_hgr.png + ../hgr-utils/png2hgr starring_3_hgr.png > starring3.img #### c64.img.lz4: c64.img lz4 -f -16 c64.img -#### - c64.img: c64_updated.png ../hgr-utils/png2hgr c64_updated.png > c64.img diff --git a/megademo/starring.s b/megademo/starring.s index 1e63ff52..14538975 100644 --- a/megademo/starring.s +++ b/megademo/starring.s @@ -19,6 +19,27 @@ starring: sta FRAME sta DRAW_PAGE + ;============================= + ; Load graphic hgr + + lda #starring3 + sta LZ4_SRC+1 + + lda #<(starring3_end-8) ; skip checksum at end + sta LZ4_END + lda #>(starring3_end-8) ; skip checksum at end + sta LZ4_END+1 + + lda #<$2000 + sta LZ4_DST + lda #>$2000 + sta LZ4_DST+1 + + jsr lz4_decode + + ;============================= ; Load graphic page0 @@ -218,3 +239,6 @@ st_start_over: .include "starring1.inc" .include "starring2.inc" +starring3: +.incbin "starring3.img.lz4",11 +starring3_end: diff --git a/megademo/starring_1.png b/megademo/starring_1.png index a36c0023..6e1374f6 100644 Binary files a/megademo/starring_1.png and b/megademo/starring_1.png differ diff --git a/megademo/starring_2.png b/megademo/starring_2.png index 9870974d..21dd8d32 100644 Binary files a/megademo/starring_2.png and b/megademo/starring_2.png differ diff --git a/megademo/starring_3_hgr.png b/megademo/starring_3_hgr.png new file mode 100644 index 00000000..4ec8fa41 Binary files /dev/null and b/megademo/starring_3_hgr.png differ