summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-06-27 16:27:30 -0400
committerRangi <35663410+Rangi42@users.noreply.github.com>2020-06-27 21:43:32 -0400
commitd5089d3c623e2b147b035cf12569810d604bf47d (patch)
tree9d64a8943a11fef8a2b1afe0c4c8eda29e4ecfe1 /Makefile
parent4b853ad676e061a6c4b0fcc030855a2705776864 (diff)
Organize gfx/
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile23
1 files changed, 14 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 59e593e8..2b077082 100644
--- a/Makefile
+++ b/Makefile
@@ -83,17 +83,22 @@ pokeblue_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON BLUE"
### Misc file-specific graphics rules
-gfx/blue/intro_purin_1.2bpp: $(RGBGFX) += -h
-gfx/blue/intro_purin_2.2bpp: $(RGBGFX) += -h
-gfx/blue/intro_purin_3.2bpp: $(RGBGFX) += -h
-gfx/red/intro_nido_1.2bpp: $(RGBGFX) += -h
-gfx/red/intro_nido_2.2bpp: $(RGBGFX) += -h
-gfx/red/intro_nido_3.2bpp: $(RGBGFX) += -h
-
-gfx/game_boy.2bpp: tools/gfx += --remove-duplicates
-gfx/theend.2bpp: tools/gfx += --interleave --png=$<
+gfx/battle/attack_anim_1.2bpp: tools/gfx += --trim-whitespace
+gfx/battle/attack_anim_2.2bpp: tools/gfx += --trim-whitespace
+
+gfx/intro_credits/blue_jigglypuff_1.2bpp: $(RGBGFX) += -h
+gfx/intro_credits/blue_jigglypuff_2.2bpp: $(RGBGFX) += -h
+gfx/intro_credits/blue_jigglypuff_3.2bpp: $(RGBGFX) += -h
+gfx/intro_credits/red_nidorino_1.2bpp: $(RGBGFX) += -h
+gfx/intro_credits/red_nidorino_2.2bpp: $(RGBGFX) += -h
+gfx/intro_credits/red_nidorino_3.2bpp: $(RGBGFX) += -h
+
+gfx/intro_credits/the_end.2bpp: tools/gfx += --interleave --png=$<
+
gfx/tilesets/%.2bpp: tools/gfx += --trim-whitespace
+gfx/trade/game_boy.2bpp: tools/gfx += --remove-duplicates
+
### Catch-all graphics rules