diff --git a/003.music/Makefile b/003.music/Makefile index 07dfc75..74c0484 100644 --- a/003.music/Makefile +++ b/003.music/Makefile @@ -1,10 +1,11 @@ MAKEADF=../tools/makeadf -FLOPPY=bin/music.adf -EXTRA=out/image-copper.s out/image-data.bin +FLOPPY=bin/image.adf +EXTRA=out/image-copper-list.s out/image.bin +IMAGEFILE=../assets/hello.png + MODULE=music.s include ../base.mk - -$(EXTRA): ../assets/hello.png ../tools/bitplanify.py - ../tools/bitplanify.py ../assets/hello.png --copper $(EXTRA) +$(EXTRA): $(IMAGECON) $(IMAGEFILE) + $(IMAGECON) $(IMAGEFILE) out/image diff --git a/003.music/music.s b/003.music/music.s index 57a0a76..05861b7 100644 --- a/003.music/music.s +++ b/003.music/music.s @@ -73,8 +73,8 @@ copper: dc.w BPL1MOD,SCREEN_WIDTH_BYTES*SCREEN_BIT_DEPTH-SCREEN_WIDTH_BYTES dc.w BPL2MOD,SCREEN_WIDTH_BYTES*SCREEN_BIT_DEPTH-SCREEN_WIDTH_BYTES - include "out/image-copper.s" - + include "out/image-copper-list.s" + dc.l $fffffffe Playrtn: @@ -84,5 +84,5 @@ Module1: incbin "../assets/P61.sowhat-intro" ;usecode $9410 bitplanes: - incbin "out/image-data.bin" + incbin "out/image.bin" \ No newline at end of file