diff --git a/027.game1/Makefile b/027.game1/Makefile index e5d5a4f..63d3950 100644 --- a/027.game1/Makefile +++ b/027.game1/Makefile @@ -38,6 +38,8 @@ out/foreground.bin: assets/tilemap.png out/background.bin: assets/tilemap.png $(IMAGECON) --use-palette=assets/background.pal --input $< $(IMAGECON_ARGS) --colors $(NUM_COLORS) --output-bitplanes --output-palette --full-color-palette-file --output-palette-asm --output-grey-palette --output-palette --output-png --output out/background +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 out/foreground-map.s: foreground.tmx ../tools/mapgen/out/mapgen --depth=3 --input=foreground.tmx @@ -48,5 +50,5 @@ out/background-map.s: background.tmx mv background-map.s out out/blit.o: constants.i macros.i -out/main.o: out/background-map.s out/foreground-map.s $(TILEMAPDATA) $(IMAGEDATA) constants.i macros.i Makefile link.script.x assets/palette.pal +out/main.o: out/background-map.s out/foreground-map.s $(TILEMAPDATA) $(IMAGEDATA) constants.i macros.i Makefile link.script.x assets/palette.pal out/tilemap-palette.s out/init.o: constants.i Makefile \ No newline at end of file diff --git a/027.game1/palette.s b/027.game1/palette.s deleted file mode 100644 index 940489d..0000000 --- a/027.game1/palette.s +++ /dev/null @@ -1,53 +0,0 @@ - movem.l d0-a6,-(sp) - lea CUSTOM,a6 - lea COLOR00(a6),a0 - move.w #$000,(a0) - lea COLOR01(a6),a0 - move.w #$500,(a0) - lea COLOR02(a6),a0 - move.w #$801,(a0) - lea COLOR03(a6),a0 - move.w #$d30,(a0) - lea COLOR04(a6),a0 - move.w #$d72,(a0) - lea COLOR05(a6),a0 - move.w #$fa1,(a0) - lea COLOR06(a6),a0 - move.w #$ed6,(a0) - lea COLOR07(a6),a0 - move.w #$18e,(a0) - lea COLOR08(a6),a0 - move.w #$000,(a0) - lea COLOR09(a6),a0 - move.w #$1cf,(a0) - lea COLOR10(a6),a0 - move.w #$7ef,(a0) - lea COLOR11(a6),a0 - move.w #$4ac,(a0) - lea COLOR12(a6),a0 - move.w #$ddd,(a0) - lea COLOR13(a6),a0 - move.w #$d02,(a0) - lea COLOR14(a6),a0 - move.w #$999,(a0) - lea COLOR15(a6),a0 - move.w #$000,(a0) - lea COLOR16(a6),a0 - move.w #$ea6,(a0) - lea COLOR17(a6),a0 - move.w #$f76,(a0) - lea COLOR18(a6),a0 - move.w #$a31,(a0) - lea COLOR19(a6),a0 - move.w #$037,(a0) - lea COLOR20(a6),a0 - move.w #$19a,(a0) - lea COLOR21(a6),a0 - move.w #$1ef,(a0) - lea COLOR22(a6),a0 - move.w #$f70,(a0) - lea COLOR23(a6),a0 - move.w #$ff0,(a0) - lea COLOR24(a6),a0 - move.w #$fff,(a0) - movem.l (sp)+,d0-a6 diff --git a/027.game1/tile_hscroll.s b/027.game1/tile_hscroll.s index 357f3a2..4e12c32 100644 --- a/027.game1/tile_hscroll.s +++ b/027.game1/tile_hscroll.s @@ -237,7 +237,7 @@ copperListBplPtr: endif InstallPalette: - include "palette.s" + include "out/tilemap-palette.s" rts onscreen: