diff --git a/megademo/Makefile b/megademo/Makefile index 8c9bb3e8..bfb425df 100644 --- a/megademo/Makefile +++ b/megademo/Makefile @@ -19,7 +19,7 @@ MEGADEMO: megademo.o megademo.o: megademo.s \ zp.inc hardware.inc \ - c64.img.lz4 + c64_opener.s c64.img.lz4 ca65 -o megademo.o megademo.s -l megademo.lst diff --git a/megademo/c64_opener.s b/megademo/c64_opener.s index 4215aba6..bb4fc504 100644 --- a/megademo/c64_opener.s +++ b/megademo/c64_opener.s @@ -4,10 +4,11 @@ ; Apple II has a lot of trouble making clear text with bluish background ; would be a lot clearer if I used black and white +c64_opener: + ;=================== ; set graphics mode ;=================== - jsr HOME bit PAGE0 ; first graphics page bit FULLGR ; full screen graphics diff --git a/megademo/megademo.s b/megademo/megademo.s index d9f5cfff..98522e68 100644 --- a/megademo/megademo.s +++ b/megademo/megademo.s @@ -11,28 +11,18 @@ ;=================== jsr HOME - bit PAGE0 ; first graphics page - bit FULLGR ; full screen graphics - bit HIRES ; hires mode !!! - bit SET_GR ; graphics mode - lda #c64 - sta LZ4_SRC+1 + ; C64 Opening Sequence - lda #c64_end - sta LZ4_END+1 +; jsr c64_opener + ; Falling Apple II - lda #<$2000 - sta LZ4_DST - lda #>$2000 - sta LZ4_DST+1 + jsr falling_apple - jsr lz4_decode + ; Starring Screens + + ; E-mail arriving ;=================== @@ -43,11 +33,5 @@ do_nothing: .include "lz4_decode.s" + .include "c64_opener.s" - - ;=================== - ; graphics - ;=================== -c64: -.incbin "c64.img.lz4",11 -c64_end: