From 4edf6e78cd997fd5d948b7b53b020322155fa5cf Mon Sep 17 00:00:00 2001 From: alpine9000 Date: Thu, 3 Mar 2016 16:17:11 +1100 Subject: [PATCH] Fixed some tests, renamed override-palette option in imagecon --- 006.simple_blit/Makefile | 4 +- 006.simple_blit/bin/blit.adf | Bin 901120 -> 901120 bytes Makefile | 10 ++++- tools/imagecon/Makefile | 37 +++++++++++++++--- tools/imagecon/README.md | 8 ++-- tools/imagecon/imagecon.c | 10 +++-- .../imagecon/reference/mission-beach-mask.bin | 1 + tools/imagecon/reference/shared-copper-list.s | 32 +++++++++++++++ tools/imagecon/reference/shared.bin | Bin 0 -> 64000 bytes tools/imagecon/reference/shared.pal | 32 +++++++++++++++ 10 files changed, 118 insertions(+), 16 deletions(-) create mode 100644 tools/imagecon/reference/mission-beach-mask.bin create mode 100644 tools/imagecon/reference/shared-copper-list.s create mode 100644 tools/imagecon/reference/shared.bin create mode 100644 tools/imagecon/reference/shared.pal diff --git a/006.simple_blit/Makefile b/006.simple_blit/Makefile index 3731873..81e4eef 100644 --- a/006.simple_blit/Makefile +++ b/006.simple_blit/Makefile @@ -14,7 +14,7 @@ $(SHARED_PALETTE): $(IMAGEFILE) $(TC_IMAGEFILE) $(IMAGECON) --input $(IMAGEFILE),$(TC_IMAGEFILE) --output $(SHARED_PALETTE_BASE) --colors 32 --quantize --output-palette $(IMAGEDATA): $(IMAGECON) $(IMAGEFILE) $(SHARED_PALETTE) - $(IMAGECON) --input $(IMAGEFILE) --output out/image --output-bitplanes --output-copperlist --override-palette $(SHARED_PALETTE) + $(IMAGECON) --input $(IMAGEFILE) --output out/image --output-bitplanes --output-copperlist --use-palette $(SHARED_PALETTE) $(TC_IMAGEDATA): $(IMAGECON) $(TC_IMAGEFILE) $(SHARED_PALETTE) - $(IMAGECON) --input $(TC_IMAGEFILE) --output out/tc --output-bitplanes --output-mask --output-copperlist --override-palette $(SHARED_PALETTE) + $(IMAGECON) --input $(TC_IMAGEFILE) --output out/tc --output-bitplanes --output-mask --output-copperlist --use-palette $(SHARED_PALETTE) diff --git a/006.simple_blit/bin/blit.adf b/006.simple_blit/bin/blit.adf index fb36b0e5143e5f0b722e8509c6fa84d494aa95e8..10c7d361ba2feca01f7161be45cacad9147e7dba 100644 GIT binary patch literal 901120 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