From 1a511c6f263d556cea9f7f8ac83196f95eb664d4 Mon Sep 17 00:00:00 2001 From: alpine9000 Date: Sat, 16 Apr 2016 12:50:16 +1000 Subject: [PATCH] fixed up border colors --- 028.game2/Makefile | 2 +- 028.game2/assets/panel.pal | 13 +++++++++++++ 028.game2/game1.s | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 028.game2/assets/panel.pal diff --git a/028.game2/Makefile b/028.game2/Makefile index 6b49486..8c0979c 100644 --- a/028.game2/Makefile +++ b/028.game2/Makefile @@ -38,7 +38,7 @@ out/tilemap-palette.s: assets/tilemap.png $(IMAGECON) --use-palette=assets/palette.pal --full-color-palette-file --input=assets/tilemap.png --output-palette-asm --output=out/tilemap --output-copperlist out/panel.bin: assets/panel.png - $(IMAGECON) --input $< $(IMAGECON_ARGS) --colors 16 --output-bitplanes --output-palette --full-color-palette-file --output-palette-asm --output-palette --output-png --output-copperlist --output out/panel + $(IMAGECON) --input $< $(IMAGECON_ARGS) --colors 16 --output-bitplanes --output-palette --full-color-palette-file --output-palette-asm --output-palette --output-png --output-copperlist --output out/panel --use-palette=assets/panel.pal out/foreground-map.s: foreground.tmx diff --git a/028.game2/assets/panel.pal b/028.game2/assets/panel.pal new file mode 100644 index 0000000..8d338cf --- /dev/null +++ b/028.game2/assets/panel.pal @@ -0,0 +1,13 @@ +000 153 238 255 +255 255 204 255 +238 187 153 255 +051 136 136 255 +255 238 187 255 +068 187 170 255 +170 238 238 255 +255 221 000 255 +255 255 255 255 +255 136 000 255 +000 068 119 255 +085 221 204 255 +170 187 153 255 diff --git a/028.game2/game1.s b/028.game2/game1.s index 4f2c334..f0e7e31 100644 --- a/028.game2/game1.s +++ b/028.game2/game1.s @@ -340,7 +340,7 @@ panelCopperListBpl1Ptr: dc.w BPL1MOD,SCREEN_WIDTH_BYTES*4-SCREEN_WIDTH_BYTES dc.w BPL2MOD,SCREEN_WIDTH_BYTES*4-SCREEN_WIDTH_BYTES include "out/panel-copper-list.s" - DC.W $5bd1,$fffe + dc.W $5bd1,$fffe dc.w BPL1MOD,BITPLANE_WIDTH_BYTES*SCREEN_BIT_DEPTH-SCREEN_WIDTH_BYTES-2