pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #560 from Rangi42/master

Browse Source 
Fix #537: Palettes generated from PNGs use .gbcpal directly.
This commit is contained in:
Rangi 2018-09-01 20:58:23 -04:00 committed by GitHub
commit 963026695d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 348 additions and 346 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Makefile
View File

@ -99,6 +99,18 @@ pokecrystal11.gbc: $(crystal11_obj) pokecrystal.link
tools/lzcomp -- $< $@)
### Pokemon pic animation rules
gfx/pokemon/%/front.animated.2bpp: gfx/pokemon/%/front.2bpp gfx/pokemon/%/front.dimensions
tools/pokemon_animation_graphics -o $@ $^
gfx/pokemon/%/front.animated.tilemap: gfx/pokemon/%/front.2bpp gfx/pokemon/%/front.dimensions
tools/pokemon_animation_graphics -t $@ $^
gfx/pokemon/%/bitmask.asm: gfx/pokemon/%/front.animated.tilemap gfx/pokemon/%/front.dimensions
tools/pokemon_animation -b $^ > $@
gfx/pokemon/%/frames.asm: gfx/pokemon/%/front.animated.tilemap gfx/pokemon/%/front.dimensions
tools/pokemon_animation -f $^ > $@
### Terrible hacks to match animations. Delete these rules if you don't care about matching.
# Dewgong has an unused tile id in its last frame. The tile itself is missing.
@ -119,37 +131,15 @@ gfx/pokemon/girafarig/front.animated.tilemap: gfx/pokemon/girafarig/front.2bpp g
tools/pokemon_animation_graphics --girafarig -t $@ $^
### Pokemon pic graphics rules
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
$(RGBGFX) -h -o $@ $<
gfx/pokemon/%/bitmask.asm: gfx/pokemon/%/front.animated.tilemap gfx/pokemon/%/front.dimensions
tools/pokemon_animation -b $^ > $@
gfx/pokemon/%/frames.asm: gfx/pokemon/%/front.animated.tilemap gfx/pokemon/%/front.dimensions
tools/pokemon_animation -f $^ > $@
gfx/pokemon/%/front.animated.2bpp: gfx/pokemon/%/front.2bpp gfx/pokemon/%/front.dimensions
tools/pokemon_animation_graphics -o $@ $^
gfx/pokemon/%/front.animated.tilemap: gfx/pokemon/%/front.2bpp gfx/pokemon/%/front.dimensions
tools/pokemon_animation_graphics -t $@ $^
### Misc file-specific graphics rules
gfx/pokemon/%/back.2bpp: rgbgfx += -h
gfx/trainers/%.2bpp: rgbgfx += -h
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
gfx/mail/surf_mail_border.1bpp: tools/gfx += --remove-whitespace

508
data/pokemon/palettes.asm
View File

File diff suppressed because it is too large Load Diff

139
data/trainers/palettes.asm
View File

@ -1,73 +1,76 @@
TrainerPalettes:
; entries correspond to trainer classes
; Each .gbcpal is generated from the corresponding .png, and
; only the middle two colors are included, not black or white.
PlayerPalette: ; Chris uses the same colors as Cal
INCLUDE "gfx/trainers/cal.pal"
INCBIN "gfx/trainers/cal.gbcpal", middle_colors
KrisPalette: ; Kris shares Falkner's palette
INCLUDE "gfx/trainers/falkner.pal"
INCLUDE "gfx/trainers/whitney.pal"
INCLUDE "gfx/trainers/bugsy.pal"
INCLUDE "gfx/trainers/morty.pal"
INCLUDE "gfx/trainers/pryce.pal"
INCLUDE "gfx/trainers/jasmine.pal"
INCLUDE "gfx/trainers/chuck.pal"
INCLUDE "gfx/trainers/clair.pal"
INCLUDE "gfx/trainers/rival1.pal"
INCLUDE "gfx/trainers/oak.pal"
INCLUDE "gfx/trainers/will.pal"
INCLUDE "gfx/trainers/cal.pal"
INCLUDE "gfx/trainers/bruno.pal"
INCLUDE "gfx/trainers/karen.pal"
INCLUDE "gfx/trainers/koga.pal"
INCLUDE "gfx/trainers/champion.pal"
INCLUDE "gfx/trainers/brock.pal"
INCLUDE "gfx/trainers/misty.pal"
INCLUDE "gfx/trainers/lt_surge.pal"
INCLUDE "gfx/trainers/scientist.pal"
INCLUDE "gfx/trainers/erika.pal"
INCLUDE "gfx/trainers/youngster.pal"
INCLUDE "gfx/trainers/schoolboy.pal"
INCLUDE "gfx/trainers/bird_keeper.pal"
INCLUDE "gfx/trainers/lass.pal"
INCLUDE "gfx/trainers/janine.pal"
INCLUDE "gfx/trainers/cooltrainer_m.pal"
INCLUDE "gfx/trainers/cooltrainer_f.pal"
INCLUDE "gfx/trainers/beauty.pal"
INCLUDE "gfx/trainers/pokemaniac.pal"
INCLUDE "gfx/trainers/grunt_m.pal"
INCLUDE "gfx/trainers/gentleman.pal"
INCLUDE "gfx/trainers/skier.pal"
INCLUDE "gfx/trainers/teacher.pal"
INCLUDE "gfx/trainers/sabrina.pal"
INCLUDE "gfx/trainers/bug_catcher.pal"
INCLUDE "gfx/trainers/fisher.pal"
INCLUDE "gfx/trainers/swimmer_m.pal"
INCLUDE "gfx/trainers/swimmer_f.pal"
INCLUDE "gfx/trainers/sailor.pal"
INCLUDE "gfx/trainers/super_nerd.pal"
INCLUDE "gfx/trainers/rival2.pal"
INCLUDE "gfx/trainers/guitarist.pal"
INCLUDE "gfx/trainers/hiker.pal"
INCLUDE "gfx/trainers/biker.pal"
INCLUDE "gfx/trainers/blaine.pal"
INCLUDE "gfx/trainers/burglar.pal"
INCLUDE "gfx/trainers/firebreather.pal"
INCLUDE "gfx/trainers/juggler.pal"
INCLUDE "gfx/trainers/blackbelt_t.pal"
INCLUDE "gfx/trainers/executive_m.pal"
INCLUDE "gfx/trainers/psychic_t.pal"
INCLUDE "gfx/trainers/picnicker.pal"
INCLUDE "gfx/trainers/camper.pal"
INCLUDE "gfx/trainers/executive_f.pal"
INCLUDE "gfx/trainers/sage.pal"
INCLUDE "gfx/trainers/medium.pal"
INCLUDE "gfx/trainers/boarder.pal"
INCLUDE "gfx/trainers/pokefan_m.pal"
INCLUDE "gfx/trainers/kimono_girl.pal"
INCLUDE "gfx/trainers/twins.pal"
INCLUDE "gfx/trainers/pokefan_f.pal"
INCLUDE "gfx/trainers/red.pal"
INCLUDE "gfx/trainers/blue.pal"
INCLUDE "gfx/trainers/officer.pal"
INCLUDE "gfx/trainers/grunt_f.pal"
INCLUDE "gfx/trainers/mysticalman.pal"
INCBIN "gfx/trainers/falkner.gbcpal", middle_colors
INCBIN "gfx/trainers/whitney.gbcpal", middle_colors
INCBIN "gfx/trainers/bugsy.gbcpal", middle_colors
INCBIN "gfx/trainers/morty.gbcpal", middle_colors
INCBIN "gfx/trainers/pryce.gbcpal", middle_colors
INCBIN "gfx/trainers/jasmine.gbcpal", middle_colors
INCBIN "gfx/trainers/chuck.gbcpal", middle_colors
INCBIN "gfx/trainers/clair.gbcpal", middle_colors
INCBIN "gfx/trainers/rival1.gbcpal", middle_colors
INCBIN "gfx/trainers/oak.gbcpal", middle_colors
INCBIN "gfx/trainers/will.gbcpal", middle_colors
INCBIN "gfx/trainers/cal.gbcpal", middle_colors
INCBIN "gfx/trainers/bruno.gbcpal", middle_colors
INCBIN "gfx/trainers/karen.gbcpal", middle_colors
INCBIN "gfx/trainers/koga.gbcpal", middle_colors
INCBIN "gfx/trainers/champion.gbcpal", middle_colors
INCBIN "gfx/trainers/brock.gbcpal", middle_colors
INCBIN "gfx/trainers/misty.gbcpal", middle_colors
INCBIN "gfx/trainers/lt_surge.gbcpal", middle_colors
INCBIN "gfx/trainers/scientist.gbcpal", middle_colors
INCBIN "gfx/trainers/erika.gbcpal", middle_colors
INCBIN "gfx/trainers/youngster.gbcpal", middle_colors
INCBIN "gfx/trainers/schoolboy.gbcpal", middle_colors
INCBIN "gfx/trainers/bird_keeper.gbcpal", middle_colors
INCBIN "gfx/trainers/lass.gbcpal", middle_colors
INCBIN "gfx/trainers/janine.gbcpal", middle_colors
INCBIN "gfx/trainers/cooltrainer_m.gbcpal", middle_colors
INCBIN "gfx/trainers/cooltrainer_f.gbcpal", middle_colors
INCBIN "gfx/trainers/beauty.gbcpal", middle_colors
INCBIN "gfx/trainers/pokemaniac.gbcpal", middle_colors
INCBIN "gfx/trainers/grunt_m.gbcpal", middle_colors
INCBIN "gfx/trainers/gentleman.gbcpal", middle_colors
INCBIN "gfx/trainers/skier.gbcpal", middle_colors
INCBIN "gfx/trainers/teacher.gbcpal", middle_colors
INCBIN "gfx/trainers/sabrina.gbcpal", middle_colors
INCBIN "gfx/trainers/bug_catcher.gbcpal", middle_colors
INCBIN "gfx/trainers/fisher.gbcpal", middle_colors
INCBIN "gfx/trainers/swimmer_m.gbcpal", middle_colors
INCBIN "gfx/trainers/swimmer_f.gbcpal", middle_colors
INCBIN "gfx/trainers/sailor.gbcpal", middle_colors
INCBIN "gfx/trainers/super_nerd.gbcpal", middle_colors
INCBIN "gfx/trainers/rival2.gbcpal", middle_colors
INCBIN "gfx/trainers/guitarist.gbcpal", middle_colors
INCBIN "gfx/trainers/hiker.gbcpal", middle_colors
INCBIN "gfx/trainers/biker.gbcpal", middle_colors
INCBIN "gfx/trainers/blaine.gbcpal", middle_colors
INCBIN "gfx/trainers/burglar.gbcpal", middle_colors
INCBIN "gfx/trainers/firebreather.gbcpal", middle_colors
INCBIN "gfx/trainers/juggler.gbcpal", middle_colors
INCBIN "gfx/trainers/blackbelt_t.gbcpal", middle_colors
INCBIN "gfx/trainers/executive_m.gbcpal", middle_colors
INCBIN "gfx/trainers/psychic_t.gbcpal", middle_colors
INCBIN "gfx/trainers/picnicker.gbcpal", middle_colors
INCBIN "gfx/trainers/camper.gbcpal", middle_colors
INCBIN "gfx/trainers/executive_f.gbcpal", middle_colors
INCBIN "gfx/trainers/sage.gbcpal", middle_colors
INCBIN "gfx/trainers/medium.gbcpal", middle_colors
INCBIN "gfx/trainers/boarder.gbcpal", middle_colors
INCBIN "gfx/trainers/pokefan_m.gbcpal", middle_colors
INCBIN "gfx/trainers/kimono_girl.gbcpal", middle_colors
INCBIN "gfx/trainers/twins.gbcpal", middle_colors
INCBIN "gfx/trainers/pokefan_f.gbcpal", middle_colors
INCBIN "gfx/trainers/red.gbcpal", middle_colors
INCBIN "gfx/trainers/blue.gbcpal", middle_colors
INCBIN "gfx/trainers/officer.gbcpal", middle_colors
INCBIN "gfx/trainers/grunt_f.gbcpal", middle_colors
INCBIN "gfx/trainers/mysticalman.gbcpal", middle_colors

5
macros/gfx.asm
View File

@ -17,3 +17,8 @@ color EQUS "+ PAL_COLOR_SIZE *"
tiles EQUS "* LEN_2BPP_TILE"
tile EQUS "+ LEN_2BPP_TILE *"
; extracts the middle two colors from a 2bpp binary palette
; example usage:
; INCBIN "foo.gbcpal", middle_colors
middle_colors EQUS "PAL_COLOR_SIZE, PAL_COLOR_SIZE * 2"