diff --git a/014.lace_mode/Makefile b/014.lace_mode/Makefile index f274b5d..192efa9 100644 --- a/014.lace_mode/Makefile +++ b/014.lace_mode/Makefile @@ -2,19 +2,27 @@ INTERLACE=1 MODULE=lace_mode.s FLOPPY=bin/lace_mode.adf IMAGEDATA=out/image-palette.s out/image-ham.bin +IMAGEFILE=../assets/gigi_full.png +SIZED_IMAGEFILE=out/image.png + ifeq ($(INTERLACE),1) -IMAGEFILE=../assets/gigi_320x512.png +FLAGS=--height=512 --interlaced else -IMAGEFILE=../assets/gigi.png +FLAGS=--height=256 endif + EXTRA=$(IMAGEDATA) $(BOB_IMAGEDATA) init.s utils.s constants.i Makefile -BASE_ADDRESS=40000 # The extra data in a 512 row bitplane dataset caused the original base (0x70000) to crash into something bad +BASE_ADDRESS=40000 VASM_EXTRA_ARGS=-DINTERLACE=$(INTERLACE) USE_PALETTE=--use-palette gigi.pal DITHER=--dither include ../shared/base.mk -$(IMAGEDATA): $(IMAGECON) $(IMAGEFILE) Makefile - $(IMAGECON) --input $(IMAGEFILE) --output out/image --ham --output-bitplanes --output-palette-asm $(USE_PALETTE) --output-palette $(DITHER) +$(SIZED_IMAGEFILE): $(IMAGEFILE) $(RESIZE) Makefile + $(RESIZE) --width=320 $(FLAGS) --blur=0.75 --input=$(IMAGEFILE) --output=$(SIZED_IMAGEFILE) + +$(IMAGEDATA): $(IMAGECON) $(SIZED_IMAGEFILE) Makefile + $(IMAGECON) --input $(SIZED_IMAGEFILE) --output out/image --ham --output-bitplanes --output-palette-asm $(USE_PALETTE) --output-palette $(DITHER) + diff --git a/assets/gigi_full.png b/assets/gigi_full.png new file mode 100644 index 0000000..6ff89a4 Binary files /dev/null and b/assets/gigi_full.png differ