diff --git a/tools/imagecon/Makefile b/tools/imagecon/Makefile index 6861253..58232ea 100644 --- a/tools/imagecon/Makefile +++ b/tools/imagecon/Makefile @@ -8,7 +8,6 @@ LIBS=-lpng -limagequant OUTPUT_BASE=out/mission-beach REFERENCE_BASE=reference/mission-beach TEST_IMAGE=../../assets/mission-beach.png -TEST_IMAGE2=../../assets/tc.png BOB_IMAGE=../../assets/emoji.png SHARED_BASE=out/shared BOB_BASE=out/bob @@ -35,11 +34,12 @@ bin: mkdir bin $(USED_PALETTE): $(SHARED_PALETTE) - $(IMAGECON) --input $(TEST_IMAGE),$(TEST_IMAGE2) --output $(SHARED_BASE) --use-palette $(SHARED_PALETTE) --output-bitplanes --output-copperlist + @echo "testing use-palette" + $(IMAGECON) --input $(TEST_IMAGE),$(BOB_IMAGE) --output $(SHARED_BASE) --use-palette $(SHARED_PALETTE) --output-bitplanes --output-copperlist $(SHARED_PALETTE): $(IMAGECON) -rm -f $(SHARED_PALETTE) - $(IMAGECON) --input $(TEST_IMAGE),$(TEST_IMAGE2) --output $(SHARED_BASE) --colors 32 --quantize --output-palette + $(IMAGECON) --input $(TEST_IMAGE),$(BOB_IMAGE) --output $(SHARED_BASE) --colors 32 --quantize --output-palette $(OUTPUT_BASE).bin: $(IMAGECON) -rm -f $(OUTPUT_BASE).bin $(OUTPUT_BASE)-copper-list.s $(OUTPUT_BASE)-palette.s diff --git a/tools/imagecon/reference/shared-copper-list.s b/tools/imagecon/reference/shared-copper-list.s index 0153eb7..9629241 100644 --- a/tools/imagecon/reference/shared-copper-list.s +++ b/tools/imagecon/reference/shared-copper-list.s @@ -1,32 +1,32 @@ - dc.w $180,$36b - dc.w $182,$feb - dc.w $184,$353 - dc.w $186,$ffd - dc.w $188,$332 - dc.w $18a,$222 - dc.w $18c,$421 - dc.w $18e,$0 - dc.w $190,$211 - dc.w $192,$37b - dc.w $194,$443 - dc.w $196,$463 - dc.w $198,$b95 - dc.w $19a,$48c - dc.w $19c,$eda - dc.w $19e,$da6 - dc.w $1a0,$cde - dc.w $1a2,$684 - dc.w $1a4,$9aa - dc.w $1a6,$eff - dc.w $1a8,$9bd - dc.w $1aa,$898 - dc.w $1ac,$dc8 - dc.w $1ae,$aa8 - dc.w $1b0,$bcc - dc.w $1b2,$665 - dc.w $1b4,$6ad - dc.w $1b6,$375 - dc.w $1b8,$a64 - dc.w $1ba,$8a4 - dc.w $1bc,$743 + dc.w $180,$474 + dc.w $182,$111 + dc.w $184,$feb + dc.w $186,$b85 + dc.w $188,$37b + dc.w $18a,$343 + dc.w $18c,$222 + dc.w $18e,$b85 + dc.w $190,$b85 + dc.w $192,$36b + dc.w $194,$ffd + dc.w $196,$353 + dc.w $198,$48c + dc.w $19a,$ca5 + dc.w $19c,$543 + dc.w $19e,$574 + dc.w $1a0,$abc + dc.w $1a2,$fe9 + dc.w $1a4,$684 + dc.w $1a6,$eca + dc.w $1a8,$bdd + dc.w $1aa,$9aa + dc.w $1ac,$cef + dc.w $1ae,$ba8 + dc.w $1b0,$898 + dc.w $1b2,$fff + dc.w $1b4,$db7 + dc.w $1b6,$765 + dc.w $1b8,$375 + dc.w $1ba,$6ad + dc.w $1bc,$8a4 dc.w $1be,$587 diff --git a/tools/imagecon/reference/shared.bin b/tools/imagecon/reference/shared.bin index c3a7352..ff91fd7 100644 Binary files a/tools/imagecon/reference/shared.bin and b/tools/imagecon/reference/shared.bin differ diff --git a/tools/imagecon/reference/shared.pal b/tools/imagecon/reference/shared.pal index de91aba..7a99fc4 100644 --- a/tools/imagecon/reference/shared.pal +++ b/tools/imagecon/reference/shared.pal @@ -1,32 +1,32 @@ -36b +474 +111 feb -353 -ffd -332 -222 -421 -000 -211 +b85 37b -443 -463 -b95 +343 +222 +b85 +b85 +36b +ffd +353 48c -eda -da6 -cde +ca5 +543 +574 +abc +fe9 684 +eca +bdd 9aa -eff -9bd +cef +ba8 898 -dc8 -aa8 -bcc -665 -6ad +fff +db7 +765 375 -a64 +6ad 8a4 -743 587