Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generate Unown sprite palette based on all front+back sprites #1146

Merged
merged 1 commit into from
Oct 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -225,10 +225,14 @@ gfx/trainers/%.2bpp: gfx/trainers/%.png gfx/trainers/%.gbcpal
gfx/pokemon/egg/front.2bpp: gfx/pokemon/egg/front.png gfx/pokemon/egg/front.gbcpal
gfx/pokemon/egg/front.2bpp: rgbgfx += --colors gbc:$(word 2,$^)

# Unown letters share one normal.pal, so they don't already build each normal.gbcpal
$(foreach png, $(wildcard gfx/pokemon/unown_*/front.png),\
$(eval $(png:.png=.2bpp): $(png) $(png:front.png=normal.gbcpal)))
gfx/pokemon/unown_%/front.2bpp: rgbgfx += --colors gbc:$(@:front.2bpp=normal.gbcpal)
# Unown letters share one normal.gbcpal
unown_pngs := $(wildcard gfx/pokemon/unown_*/front.png) $(wildcard gfx/pokemon/unown_*/back.png)
$(foreach png, $(unown_pngs),\
$(eval $(png:.png=.2bpp): $(png) gfx/pokemon/unown/normal.gbcpal))
gfx/pokemon/unown_%/back.2bpp: rgbgfx += --colors gbc:$(word 2,$^)
gfx/pokemon/unown_%/front.2bpp: rgbgfx += --colors gbc:$(word 2,$^)
gfx/pokemon/unown/normal.gbcpal: $(subst .png,.gbcpal,$(unown_pngs))
tools/gbcpal $(tools/gbcpal) $@ $^


### Misc file-specific graphics rules
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/palettes.asm
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ INCBIN "gfx/pokemon/slowking/normal.gbcpal", middle_colors
INCLUDE "gfx/pokemon/slowking/shiny.pal"
INCBIN "gfx/pokemon/misdreavus/normal.gbcpal", middle_colors
INCLUDE "gfx/pokemon/misdreavus/shiny.pal"
INCLUDE "gfx/pokemon/unown/normal.pal" ; not normal.gbcpal
INCBIN "gfx/pokemon/unown/normal.gbcpal", middle_colors
INCLUDE "gfx/pokemon/unown/shiny.pal"
INCBIN "gfx/pokemon/wobbuffet/normal.gbcpal", middle_colors
INCLUDE "gfx/pokemon/wobbuffet/shiny.pal"
Expand Down