summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-08-31 21:39:17 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2018-08-31 21:39:17 -0400
commit36b21b39d8854ea4d808146938a75233b003f2a7 (patch)
treefcd54aa0fe5e795fd95cfe1d71ac59375b278cfe /Makefile
parenta71b28e5b724564fe19f329f5cbb474f8b111acb (diff)
Fix #537: Palettes generated from PNGs use .gbcpal directly.
This avoids overwriting a .pal file from a .png with the same name. It also prevents people from trying to edit generated .pal files.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 0 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 140fec646..99013ca06 100644
--- a/Makefile
+++ b/Makefile
@@ -123,8 +123,6 @@ gfx/pokemon/girafarig/front.animated.tilemap: gfx/pokemon/girafarig/front.2bpp g
gfx/pokemon/%/front.dimensions: gfx/pokemon/%/front.png
tools/png_dimensions $< $@
-gfx/pokemon/%/normal.pal: gfx/pokemon/%/normal.gbcpal
- tools/palette -p $< > $@
gfx/pokemon/%/normal.gbcpal: gfx/pokemon/%/front.png
$(RGBGFX) -p $@ $<
gfx/pokemon/%/back.2bpp: gfx/pokemon/%/back.png
@@ -145,10 +143,6 @@ gfx/new_game/shrink1.2bpp: rgbgfx += -h
gfx/new_game/shrink2.2bpp: rgbgfx += -h
gfx/trainers/%.2bpp: rgbgfx += -h
-gfx/trainers/%.pal: gfx/trainers/%.gbcpal
- tools/palette -p $< > $@
-gfx/trainers/%.gbcpal: gfx/trainers/%.png
- $(RGBGFX) -p $@ $<
gfx/mail/dragonite.1bpp: tools/gfx += --remove-whitespace
gfx/mail/large_note.1bpp: tools/gfx += --remove-whitespace