shithub: pokecrystal

Info  •  Files  •  Log  •  Branches

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.

--- a/Makefile

+++ b/Makefile

@@ -123,8 +123,6 @@

 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/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

--- a/data/pokemon/palettes.asm

+++ b/data/pokemon/palettes.asm

@@ -1,6 +1,9 @@

 PokemonPalettes:

 ; entries correspond to Pokémon species, two apiece

+; Each normal.gbcpal is generated from front.png, and

+; only the middle two colors are included, not black or white.

+

 ; 000

 	RGB 30, 22, 17

 	RGB 16, 14, 19

@@ -8,507 +11,507 @@

 	RGB 30, 22, 17

 	RGB 16, 14, 19

-INCLUDE "gfx/pokemon/bulbasaur/normal.pal"

+INCBIN "gfx/pokemon/bulbasaur/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/bulbasaur/shiny.pal"

-INCLUDE "gfx/pokemon/ivysaur/normal.pal"

+INCBIN "gfx/pokemon/ivysaur/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/ivysaur/shiny.pal"

-INCLUDE "gfx/pokemon/venusaur/normal.pal"

+INCBIN "gfx/pokemon/venusaur/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/venusaur/shiny.pal"

-INCLUDE "gfx/pokemon/charmander/normal.pal"

+INCBIN "gfx/pokemon/charmander/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/charmander/shiny.pal"

-INCLUDE "gfx/pokemon/charmeleon/normal.pal"

+INCBIN "gfx/pokemon/charmeleon/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/charmeleon/shiny.pal"

-INCLUDE "gfx/pokemon/charizard/normal.pal"

+INCBIN "gfx/pokemon/charizard/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/charizard/shiny.pal"

-INCLUDE "gfx/pokemon/squirtle/normal.pal"

+INCBIN "gfx/pokemon/squirtle/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/squirtle/shiny.pal"

-INCLUDE "gfx/pokemon/wartortle/normal.pal"

+INCBIN "gfx/pokemon/wartortle/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/wartortle/shiny.pal"

-INCLUDE "gfx/pokemon/blastoise/normal.pal"

+INCBIN "gfx/pokemon/blastoise/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/blastoise/shiny.pal"

-INCLUDE "gfx/pokemon/caterpie/normal.pal"

+INCBIN "gfx/pokemon/caterpie/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/caterpie/shiny.pal"

-INCLUDE "gfx/pokemon/metapod/normal.pal"

+INCBIN "gfx/pokemon/metapod/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/metapod/shiny.pal"

-INCLUDE "gfx/pokemon/butterfree/normal.pal"

+INCBIN "gfx/pokemon/butterfree/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/butterfree/shiny.pal"

-INCLUDE "gfx/pokemon/weedle/normal.pal"

+INCBIN "gfx/pokemon/weedle/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/weedle/shiny.pal"

-INCLUDE "gfx/pokemon/kakuna/normal.pal"

+INCBIN "gfx/pokemon/kakuna/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/kakuna/shiny.pal"

-INCLUDE "gfx/pokemon/beedrill/normal.pal"

+INCBIN "gfx/pokemon/beedrill/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/beedrill/shiny.pal"

-INCLUDE "gfx/pokemon/pidgey/normal.pal"

+INCBIN "gfx/pokemon/pidgey/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/pidgey/shiny.pal"

-INCLUDE "gfx/pokemon/pidgeotto/normal.pal"

+INCBIN "gfx/pokemon/pidgeotto/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/pidgeotto/shiny.pal"

-INCLUDE "gfx/pokemon/pidgeot/normal.pal"

+INCBIN "gfx/pokemon/pidgeot/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/pidgeot/shiny.pal"

-INCLUDE "gfx/pokemon/rattata/normal.pal"

+INCBIN "gfx/pokemon/rattata/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/rattata/shiny.pal"

-INCLUDE "gfx/pokemon/raticate/normal.pal"

+INCBIN "gfx/pokemon/raticate/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/raticate/shiny.pal"

-INCLUDE "gfx/pokemon/spearow/normal.pal"

+INCBIN "gfx/pokemon/spearow/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/spearow/shiny.pal"

-INCLUDE "gfx/pokemon/fearow/normal.pal"

+INCBIN "gfx/pokemon/fearow/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/fearow/shiny.pal"

-INCLUDE "gfx/pokemon/ekans/normal.pal"

+INCBIN "gfx/pokemon/ekans/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/ekans/shiny.pal"

-INCLUDE "gfx/pokemon/arbok/normal.pal"

+INCBIN "gfx/pokemon/arbok/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/arbok/shiny.pal"

-INCLUDE "gfx/pokemon/pikachu/normal.pal"

+INCBIN "gfx/pokemon/pikachu/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/pikachu/shiny.pal"

-INCLUDE "gfx/pokemon/raichu/normal.pal"

+INCBIN "gfx/pokemon/raichu/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/raichu/shiny.pal"

-INCLUDE "gfx/pokemon/sandshrew/normal.pal"

+INCBIN "gfx/pokemon/sandshrew/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/sandshrew/shiny.pal"

-INCLUDE "gfx/pokemon/sandslash/normal.pal"

+INCBIN "gfx/pokemon/sandslash/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/sandslash/shiny.pal"

-INCLUDE "gfx/pokemon/nidoran_f/normal.pal"

+INCBIN "gfx/pokemon/nidoran_f/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/nidoran_f/shiny.pal"

-INCLUDE "gfx/pokemon/nidorina/normal.pal"

+INCBIN "gfx/pokemon/nidorina/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/nidorina/shiny.pal"

-INCLUDE "gfx/pokemon/nidoqueen/normal.pal"

+INCBIN "gfx/pokemon/nidoqueen/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/nidoqueen/shiny.pal"

-INCLUDE "gfx/pokemon/nidoran_m/normal.pal"

+INCBIN "gfx/pokemon/nidoran_m/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/nidoran_m/shiny.pal"

-INCLUDE "gfx/pokemon/nidorino/normal.pal"

+INCBIN "gfx/pokemon/nidorino/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/nidorino/shiny.pal"

-INCLUDE "gfx/pokemon/nidoking/normal.pal"

+INCBIN "gfx/pokemon/nidoking/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/nidoking/shiny.pal"

-INCLUDE "gfx/pokemon/clefairy/normal.pal"

+INCBIN "gfx/pokemon/clefairy/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/clefairy/shiny.pal"

-INCLUDE "gfx/pokemon/clefable/normal.pal"

+INCBIN "gfx/pokemon/clefable/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/clefable/shiny.pal"

-INCLUDE "gfx/pokemon/vulpix/normal.pal"

+INCBIN "gfx/pokemon/vulpix/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/vulpix/shiny.pal"

-INCLUDE "gfx/pokemon/ninetales/normal.pal"

+INCBIN "gfx/pokemon/ninetales/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/ninetales/shiny.pal"

-INCLUDE "gfx/pokemon/jigglypuff/normal.pal"

+INCBIN "gfx/pokemon/jigglypuff/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/jigglypuff/shiny.pal"

-INCLUDE "gfx/pokemon/wigglytuff/normal.pal"

+INCBIN "gfx/pokemon/wigglytuff/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/wigglytuff/shiny.pal"

-INCLUDE "gfx/pokemon/zubat/normal.pal"

+INCBIN "gfx/pokemon/zubat/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/zubat/shiny.pal"

-INCLUDE "gfx/pokemon/golbat/normal.pal"

+INCBIN "gfx/pokemon/golbat/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/golbat/shiny.pal"

-INCLUDE "gfx/pokemon/oddish/normal.pal"

+INCBIN "gfx/pokemon/oddish/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/oddish/shiny.pal"

-INCLUDE "gfx/pokemon/gloom/normal.pal"

+INCBIN "gfx/pokemon/gloom/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/gloom/shiny.pal"

-INCLUDE "gfx/pokemon/vileplume/normal.pal"

+INCBIN "gfx/pokemon/vileplume/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/vileplume/shiny.pal"

-INCLUDE "gfx/pokemon/paras/normal.pal"

+INCBIN "gfx/pokemon/paras/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/paras/shiny.pal"

-INCLUDE "gfx/pokemon/parasect/normal.pal"

+INCBIN "gfx/pokemon/parasect/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/parasect/shiny.pal"

-INCLUDE "gfx/pokemon/venonat/normal.pal"

+INCBIN "gfx/pokemon/venonat/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/venonat/shiny.pal"

-INCLUDE "gfx/pokemon/venomoth/normal.pal"

+INCBIN "gfx/pokemon/venomoth/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/venomoth/shiny.pal"

-INCLUDE "gfx/pokemon/diglett/normal.pal"

+INCBIN "gfx/pokemon/diglett/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/diglett/shiny.pal"

-INCLUDE "gfx/pokemon/dugtrio/normal.pal"

+INCBIN "gfx/pokemon/dugtrio/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/dugtrio/shiny.pal"

-INCLUDE "gfx/pokemon/meowth/normal.pal"

+INCBIN "gfx/pokemon/meowth/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/meowth/shiny.pal"

-INCLUDE "gfx/pokemon/persian/normal.pal"

+INCBIN "gfx/pokemon/persian/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/persian/shiny.pal"

-INCLUDE "gfx/pokemon/psyduck/normal.pal"

+INCBIN "gfx/pokemon/psyduck/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/psyduck/shiny.pal"

-INCLUDE "gfx/pokemon/golduck/normal.pal"

+INCBIN "gfx/pokemon/golduck/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/golduck/shiny.pal"

-INCLUDE "gfx/pokemon/mankey/normal.pal"

+INCBIN "gfx/pokemon/mankey/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/mankey/shiny.pal"

-INCLUDE "gfx/pokemon/primeape/normal.pal"

+INCBIN "gfx/pokemon/primeape/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/primeape/shiny.pal"

-INCLUDE "gfx/pokemon/growlithe/normal.pal"

+INCBIN "gfx/pokemon/growlithe/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/growlithe/shiny.pal"

-INCLUDE "gfx/pokemon/arcanine/normal.pal"

+INCBIN "gfx/pokemon/arcanine/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/arcanine/shiny.pal"

-INCLUDE "gfx/pokemon/poliwag/normal.pal"

+INCBIN "gfx/pokemon/poliwag/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/poliwag/shiny.pal"

-INCLUDE "gfx/pokemon/poliwhirl/normal.pal"

+INCBIN "gfx/pokemon/poliwhirl/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/poliwhirl/shiny.pal"

-INCLUDE "gfx/pokemon/poliwrath/normal.pal"

+INCBIN "gfx/pokemon/poliwrath/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/poliwrath/shiny.pal"

-INCLUDE "gfx/pokemon/abra/normal.pal"

+INCBIN "gfx/pokemon/abra/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/abra/shiny.pal"

-INCLUDE "gfx/pokemon/kadabra/normal.pal"

+INCBIN "gfx/pokemon/kadabra/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/kadabra/shiny.pal"

-INCLUDE "gfx/pokemon/alakazam/normal.pal"

+INCBIN "gfx/pokemon/alakazam/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/alakazam/shiny.pal"

-INCLUDE "gfx/pokemon/machop/normal.pal"

+INCBIN "gfx/pokemon/machop/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/machop/shiny.pal"

-INCLUDE "gfx/pokemon/machoke/normal.pal"

+INCBIN "gfx/pokemon/machoke/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/machoke/shiny.pal"

-INCLUDE "gfx/pokemon/machamp/normal.pal"

+INCBIN "gfx/pokemon/machamp/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/machamp/shiny.pal"

-INCLUDE "gfx/pokemon/bellsprout/normal.pal"

+INCBIN "gfx/pokemon/bellsprout/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/bellsprout/shiny.pal"

-INCLUDE "gfx/pokemon/weepinbell/normal.pal"

+INCBIN "gfx/pokemon/weepinbell/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/weepinbell/shiny.pal"

-INCLUDE "gfx/pokemon/victreebel/normal.pal"

+INCBIN "gfx/pokemon/victreebel/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/victreebel/shiny.pal"

-INCLUDE "gfx/pokemon/tentacool/normal.pal"

+INCBIN "gfx/pokemon/tentacool/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/tentacool/shiny.pal"

-INCLUDE "gfx/pokemon/tentacruel/normal.pal"

+INCBIN "gfx/pokemon/tentacruel/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/tentacruel/shiny.pal"

-INCLUDE "gfx/pokemon/geodude/normal.pal"

+INCBIN "gfx/pokemon/geodude/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/geodude/shiny.pal"

-INCLUDE "gfx/pokemon/graveler/normal.pal"

+INCBIN "gfx/pokemon/graveler/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/graveler/shiny.pal"

-INCLUDE "gfx/pokemon/golem/normal.pal"

+INCBIN "gfx/pokemon/golem/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/golem/shiny.pal"

-INCLUDE "gfx/pokemon/ponyta/normal.pal"

+INCBIN "gfx/pokemon/ponyta/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/ponyta/shiny.pal"

-INCLUDE "gfx/pokemon/rapidash/normal.pal"

+INCBIN "gfx/pokemon/rapidash/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/rapidash/shiny.pal"

-INCLUDE "gfx/pokemon/slowpoke/normal.pal"

+INCBIN "gfx/pokemon/slowpoke/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/slowpoke/shiny.pal"

-INCLUDE "gfx/pokemon/slowbro/normal.pal"

+INCBIN "gfx/pokemon/slowbro/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/slowbro/shiny.pal"

-INCLUDE "gfx/pokemon/magnemite/normal.pal"

+INCBIN "gfx/pokemon/magnemite/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/magnemite/shiny.pal"

-INCLUDE "gfx/pokemon/magneton/normal.pal"

+INCBIN "gfx/pokemon/magneton/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/magneton/shiny.pal"

-INCLUDE "gfx/pokemon/farfetch_d/normal.pal"

+INCBIN "gfx/pokemon/farfetch_d/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/farfetch_d/shiny.pal"

-INCLUDE "gfx/pokemon/doduo/normal.pal"

+INCBIN "gfx/pokemon/doduo/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/doduo/shiny.pal"

-INCLUDE "gfx/pokemon/dodrio/normal.pal"

+INCBIN "gfx/pokemon/dodrio/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/dodrio/shiny.pal"

-INCLUDE "gfx/pokemon/seel/normal.pal"

+INCBIN "gfx/pokemon/seel/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/seel/shiny.pal"

-INCLUDE "gfx/pokemon/dewgong/normal.pal"

+INCBIN "gfx/pokemon/dewgong/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/dewgong/shiny.pal"

-INCLUDE "gfx/pokemon/grimer/normal.pal"

+INCBIN "gfx/pokemon/grimer/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/grimer/shiny.pal"

-INCLUDE "gfx/pokemon/muk/normal.pal"

+INCBIN "gfx/pokemon/muk/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/muk/shiny.pal"

-INCLUDE "gfx/pokemon/shellder/normal.pal"

+INCBIN "gfx/pokemon/shellder/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/shellder/shiny.pal"

-INCLUDE "gfx/pokemon/cloyster/normal.pal"

+INCBIN "gfx/pokemon/cloyster/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/cloyster/shiny.pal"

-INCLUDE "gfx/pokemon/gastly/normal.pal"

+INCBIN "gfx/pokemon/gastly/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/gastly/shiny.pal"

-INCLUDE "gfx/pokemon/haunter/normal.pal"

+INCBIN "gfx/pokemon/haunter/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/haunter/shiny.pal"

-INCLUDE "gfx/pokemon/gengar/normal.pal"

+INCBIN "gfx/pokemon/gengar/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/gengar/shiny.pal"

-INCLUDE "gfx/pokemon/onix/normal.pal"

+INCBIN "gfx/pokemon/onix/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/onix/shiny.pal"

-INCLUDE "gfx/pokemon/drowzee/normal.pal"

+INCBIN "gfx/pokemon/drowzee/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/drowzee/shiny.pal"

-INCLUDE "gfx/pokemon/hypno/normal.pal"

+INCBIN "gfx/pokemon/hypno/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/hypno/shiny.pal"

-INCLUDE "gfx/pokemon/krabby/normal.pal"

+INCBIN "gfx/pokemon/krabby/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/krabby/shiny.pal"

-INCLUDE "gfx/pokemon/kingler/normal.pal"

+INCBIN "gfx/pokemon/kingler/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/kingler/shiny.pal"

-INCLUDE "gfx/pokemon/voltorb/normal.pal"

+INCBIN "gfx/pokemon/voltorb/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/voltorb/shiny.pal"

-INCLUDE "gfx/pokemon/electrode/normal.pal"

+INCBIN "gfx/pokemon/electrode/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/electrode/shiny.pal"

-INCLUDE "gfx/pokemon/exeggcute/normal.pal"

+INCBIN "gfx/pokemon/exeggcute/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/exeggcute/shiny.pal"

-INCLUDE "gfx/pokemon/exeggutor/normal.pal"

+INCBIN "gfx/pokemon/exeggutor/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/exeggutor/shiny.pal"

-INCLUDE "gfx/pokemon/cubone/normal.pal"

+INCBIN "gfx/pokemon/cubone/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/cubone/shiny.pal"

-INCLUDE "gfx/pokemon/marowak/normal.pal"

+INCBIN "gfx/pokemon/marowak/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/marowak/shiny.pal"

-INCLUDE "gfx/pokemon/hitmonlee/normal.pal"

+INCBIN "gfx/pokemon/hitmonlee/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/hitmonlee/shiny.pal"

-INCLUDE "gfx/pokemon/hitmonchan/normal.pal"

+INCBIN "gfx/pokemon/hitmonchan/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/hitmonchan/shiny.pal"

-INCLUDE "gfx/pokemon/lickitung/normal.pal"

+INCBIN "gfx/pokemon/lickitung/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/lickitung/shiny.pal"

-INCLUDE "gfx/pokemon/koffing/normal.pal"

+INCBIN "gfx/pokemon/koffing/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/koffing/shiny.pal"

-INCLUDE "gfx/pokemon/weezing/normal.pal"

+INCBIN "gfx/pokemon/weezing/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/weezing/shiny.pal"

-INCLUDE "gfx/pokemon/rhyhorn/normal.pal"

+INCBIN "gfx/pokemon/rhyhorn/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/rhyhorn/shiny.pal"

-INCLUDE "gfx/pokemon/rhydon/normal.pal"

+INCBIN "gfx/pokemon/rhydon/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/rhydon/shiny.pal"

-INCLUDE "gfx/pokemon/chansey/normal.pal"

+INCBIN "gfx/pokemon/chansey/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/chansey/shiny.pal"

-INCLUDE "gfx/pokemon/tangela/normal.pal"

+INCBIN "gfx/pokemon/tangela/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/tangela/shiny.pal"

-INCLUDE "gfx/pokemon/kangaskhan/normal.pal"

+INCBIN "gfx/pokemon/kangaskhan/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/kangaskhan/shiny.pal"

-INCLUDE "gfx/pokemon/horsea/normal.pal"

+INCBIN "gfx/pokemon/horsea/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/horsea/shiny.pal"

-INCLUDE "gfx/pokemon/seadra/normal.pal"

+INCBIN "gfx/pokemon/seadra/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/seadra/shiny.pal"

-INCLUDE "gfx/pokemon/goldeen/normal.pal"

+INCBIN "gfx/pokemon/goldeen/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/goldeen/shiny.pal"

-INCLUDE "gfx/pokemon/seaking/normal.pal"

+INCBIN "gfx/pokemon/seaking/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/seaking/shiny.pal"

-INCLUDE "gfx/pokemon/staryu/normal.pal"

+INCBIN "gfx/pokemon/staryu/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/staryu/shiny.pal"

-INCLUDE "gfx/pokemon/starmie/normal.pal"

+INCBIN "gfx/pokemon/starmie/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/starmie/shiny.pal"

-INCLUDE "gfx/pokemon/mr__mime/normal.pal"

+INCBIN "gfx/pokemon/mr__mime/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/mr__mime/shiny.pal"

-INCLUDE "gfx/pokemon/scyther/normal.pal"

+INCBIN "gfx/pokemon/scyther/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/scyther/shiny.pal"

-INCLUDE "gfx/pokemon/jynx/normal.pal"

+INCBIN "gfx/pokemon/jynx/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/jynx/shiny.pal"

-INCLUDE "gfx/pokemon/electabuzz/normal.pal"

+INCBIN "gfx/pokemon/electabuzz/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/electabuzz/shiny.pal"

-INCLUDE "gfx/pokemon/magmar/normal.pal"

+INCBIN "gfx/pokemon/magmar/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/magmar/shiny.pal"

-INCLUDE "gfx/pokemon/pinsir/normal.pal"

+INCBIN "gfx/pokemon/pinsir/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/pinsir/shiny.pal"

-INCLUDE "gfx/pokemon/tauros/normal.pal"

+INCBIN "gfx/pokemon/tauros/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/tauros/shiny.pal"

-INCLUDE "gfx/pokemon/magikarp/normal.pal"

+INCBIN "gfx/pokemon/magikarp/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/magikarp/shiny.pal"

-INCLUDE "gfx/pokemon/gyarados/normal.pal"

+INCBIN "gfx/pokemon/gyarados/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/gyarados/shiny.pal"

-INCLUDE "gfx/pokemon/lapras/normal.pal"

+INCBIN "gfx/pokemon/lapras/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/lapras/shiny.pal"

-INCLUDE "gfx/pokemon/ditto/normal.pal"

+INCBIN "gfx/pokemon/ditto/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/ditto/shiny.pal"

-INCLUDE "gfx/pokemon/eevee/normal.pal"

+INCBIN "gfx/pokemon/eevee/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/eevee/shiny.pal"

-INCLUDE "gfx/pokemon/vaporeon/normal.pal"

+INCBIN "gfx/pokemon/vaporeon/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/vaporeon/shiny.pal"

-INCLUDE "gfx/pokemon/jolteon/normal.pal"

+INCBIN "gfx/pokemon/jolteon/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/jolteon/shiny.pal"

-INCLUDE "gfx/pokemon/flareon/normal.pal"

+INCBIN "gfx/pokemon/flareon/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/flareon/shiny.pal"

-INCLUDE "gfx/pokemon/porygon/normal.pal"

+INCBIN "gfx/pokemon/porygon/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/porygon/shiny.pal"

-INCLUDE "gfx/pokemon/omanyte/normal.pal"

+INCBIN "gfx/pokemon/omanyte/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/omanyte/shiny.pal"

-INCLUDE "gfx/pokemon/omastar/normal.pal"

+INCBIN "gfx/pokemon/omastar/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/omastar/shiny.pal"

-INCLUDE "gfx/pokemon/kabuto/normal.pal"

+INCBIN "gfx/pokemon/kabuto/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/kabuto/shiny.pal"

-INCLUDE "gfx/pokemon/kabutops/normal.pal"

+INCBIN "gfx/pokemon/kabutops/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/kabutops/shiny.pal"

-INCLUDE "gfx/pokemon/aerodactyl/normal.pal"

+INCBIN "gfx/pokemon/aerodactyl/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/aerodactyl/shiny.pal"

-INCLUDE "gfx/pokemon/snorlax/normal.pal"

+INCBIN "gfx/pokemon/snorlax/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/snorlax/shiny.pal"

-INCLUDE "gfx/pokemon/articuno/normal.pal"

+INCBIN "gfx/pokemon/articuno/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/articuno/shiny.pal"

-INCLUDE "gfx/pokemon/zapdos/normal.pal"

+INCBIN "gfx/pokemon/zapdos/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/zapdos/shiny.pal"

-INCLUDE "gfx/pokemon/moltres/normal.pal"

+INCBIN "gfx/pokemon/moltres/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/moltres/shiny.pal"

-INCLUDE "gfx/pokemon/dratini/normal.pal"

+INCBIN "gfx/pokemon/dratini/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/dratini/shiny.pal"

-INCLUDE "gfx/pokemon/dragonair/normal.pal"

+INCBIN "gfx/pokemon/dragonair/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/dragonair/shiny.pal"

-INCLUDE "gfx/pokemon/dragonite/normal.pal"

+INCBIN "gfx/pokemon/dragonite/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/dragonite/shiny.pal"

-INCLUDE "gfx/pokemon/mewtwo/normal.pal"

+INCBIN "gfx/pokemon/mewtwo/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/mewtwo/shiny.pal"

-INCLUDE "gfx/pokemon/mew/normal.pal"

+INCBIN "gfx/pokemon/mew/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/mew/shiny.pal"

-INCLUDE "gfx/pokemon/chikorita/normal.pal"

+INCBIN "gfx/pokemon/chikorita/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/chikorita/shiny.pal"

-INCLUDE "gfx/pokemon/bayleef/normal.pal"

+INCBIN "gfx/pokemon/bayleef/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/bayleef/shiny.pal"

-INCLUDE "gfx/pokemon/meganium/normal.pal"

+INCBIN "gfx/pokemon/meganium/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/meganium/shiny.pal"

-INCLUDE "gfx/pokemon/cyndaquil/normal.pal"

+INCBIN "gfx/pokemon/cyndaquil/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/cyndaquil/shiny.pal"

-INCLUDE "gfx/pokemon/quilava/normal.pal"

+INCBIN "gfx/pokemon/quilava/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/quilava/shiny.pal"

-INCLUDE "gfx/pokemon/typhlosion/normal.pal"

+INCBIN "gfx/pokemon/typhlosion/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/typhlosion/shiny.pal"

-INCLUDE "gfx/pokemon/totodile/normal.pal"

+INCBIN "gfx/pokemon/totodile/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/totodile/shiny.pal"

-INCLUDE "gfx/pokemon/croconaw/normal.pal"

+INCBIN "gfx/pokemon/croconaw/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/croconaw/shiny.pal"

-INCLUDE "gfx/pokemon/feraligatr/normal.pal"

+INCBIN "gfx/pokemon/feraligatr/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/feraligatr/shiny.pal"

-INCLUDE "gfx/pokemon/sentret/normal.pal"

+INCBIN "gfx/pokemon/sentret/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/sentret/shiny.pal"

-INCLUDE "gfx/pokemon/furret/normal.pal"

+INCBIN "gfx/pokemon/furret/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/furret/shiny.pal"

-INCLUDE "gfx/pokemon/hoothoot/normal.pal"

+INCBIN "gfx/pokemon/hoothoot/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/hoothoot/shiny.pal"

-INCLUDE "gfx/pokemon/noctowl/normal.pal"

+INCBIN "gfx/pokemon/noctowl/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/noctowl/shiny.pal"

-INCLUDE "gfx/pokemon/ledyba/normal.pal"

+INCBIN "gfx/pokemon/ledyba/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/ledyba/shiny.pal"

-INCLUDE "gfx/pokemon/ledian/normal.pal"

+INCBIN "gfx/pokemon/ledian/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/ledian/shiny.pal"

-INCLUDE "gfx/pokemon/spinarak/normal.pal"

+INCBIN "gfx/pokemon/spinarak/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/spinarak/shiny.pal"

-INCLUDE "gfx/pokemon/ariados/normal.pal"

+INCBIN "gfx/pokemon/ariados/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/ariados/shiny.pal"

-INCLUDE "gfx/pokemon/crobat/normal.pal"

+INCBIN "gfx/pokemon/crobat/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/crobat/shiny.pal"

-INCLUDE "gfx/pokemon/chinchou/normal.pal"

+INCBIN "gfx/pokemon/chinchou/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/chinchou/shiny.pal"

-INCLUDE "gfx/pokemon/lanturn/normal.pal"

+INCBIN "gfx/pokemon/lanturn/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/lanturn/shiny.pal"

-INCLUDE "gfx/pokemon/pichu/normal.pal"

+INCBIN "gfx/pokemon/pichu/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/pichu/shiny.pal"

-INCLUDE "gfx/pokemon/cleffa/normal.pal"

+INCBIN "gfx/pokemon/cleffa/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/cleffa/shiny.pal"

-INCLUDE "gfx/pokemon/igglybuff/normal.pal"

+INCBIN "gfx/pokemon/igglybuff/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/igglybuff/shiny.pal"

-INCLUDE "gfx/pokemon/togepi/normal.pal"

+INCBIN "gfx/pokemon/togepi/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/togepi/shiny.pal"

-INCLUDE "gfx/pokemon/togetic/normal.pal"

+INCBIN "gfx/pokemon/togetic/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/togetic/shiny.pal"

-INCLUDE "gfx/pokemon/natu/normal.pal"

+INCBIN "gfx/pokemon/natu/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/natu/shiny.pal"

-INCLUDE "gfx/pokemon/xatu/normal.pal"

+INCBIN "gfx/pokemon/xatu/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/xatu/shiny.pal"

-INCLUDE "gfx/pokemon/mareep/normal.pal"

+INCBIN "gfx/pokemon/mareep/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/mareep/shiny.pal"

-INCLUDE "gfx/pokemon/flaaffy/normal.pal"

+INCBIN "gfx/pokemon/flaaffy/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/flaaffy/shiny.pal"

-INCLUDE "gfx/pokemon/ampharos/normal.pal"

+INCBIN "gfx/pokemon/ampharos/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/ampharos/shiny.pal"

-INCLUDE "gfx/pokemon/bellossom/normal.pal"

+INCBIN "gfx/pokemon/bellossom/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/bellossom/shiny.pal"

-INCLUDE "gfx/pokemon/marill/normal.pal"

+INCBIN "gfx/pokemon/marill/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/marill/shiny.pal"

-INCLUDE "gfx/pokemon/azumarill/normal.pal"

+INCBIN "gfx/pokemon/azumarill/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/azumarill/shiny.pal"

-INCLUDE "gfx/pokemon/sudowoodo/normal.pal"

+INCBIN "gfx/pokemon/sudowoodo/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/sudowoodo/shiny.pal"

-INCLUDE "gfx/pokemon/politoed/normal.pal"

+INCBIN "gfx/pokemon/politoed/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/politoed/shiny.pal"

-INCLUDE "gfx/pokemon/hoppip/normal.pal"

+INCBIN "gfx/pokemon/hoppip/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/hoppip/shiny.pal"

-INCLUDE "gfx/pokemon/skiploom/normal.pal"

+INCBIN "gfx/pokemon/skiploom/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/skiploom/shiny.pal"

-INCLUDE "gfx/pokemon/jumpluff/normal.pal"

+INCBIN "gfx/pokemon/jumpluff/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/jumpluff/shiny.pal"

-INCLUDE "gfx/pokemon/aipom/normal.pal"

+INCBIN "gfx/pokemon/aipom/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/aipom/shiny.pal"

-INCLUDE "gfx/pokemon/sunkern/normal.pal"

+INCBIN "gfx/pokemon/sunkern/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/sunkern/shiny.pal"

-INCLUDE "gfx/pokemon/sunflora/normal.pal"

+INCBIN "gfx/pokemon/sunflora/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/sunflora/shiny.pal"

-INCLUDE "gfx/pokemon/yanma/normal.pal"

+INCBIN "gfx/pokemon/yanma/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/yanma/shiny.pal"

-INCLUDE "gfx/pokemon/wooper/normal.pal"

+INCBIN "gfx/pokemon/wooper/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/wooper/shiny.pal"

-INCLUDE "gfx/pokemon/quagsire/normal.pal"

+INCBIN "gfx/pokemon/quagsire/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/quagsire/shiny.pal"

-INCLUDE "gfx/pokemon/espeon/normal.pal"

+INCBIN "gfx/pokemon/espeon/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/espeon/shiny.pal"

-INCLUDE "gfx/pokemon/umbreon/normal.pal"

+INCBIN "gfx/pokemon/umbreon/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/umbreon/shiny.pal"

-INCLUDE "gfx/pokemon/murkrow/normal.pal"

+INCBIN "gfx/pokemon/murkrow/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/murkrow/shiny.pal"

-INCLUDE "gfx/pokemon/slowking/normal.pal"

+INCBIN "gfx/pokemon/slowking/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/slowking/shiny.pal"

-INCLUDE "gfx/pokemon/misdreavus/normal.pal"

+INCBIN "gfx/pokemon/misdreavus/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/misdreavus/shiny.pal"

-INCLUDE "gfx/pokemon/unown/normal.pal"

+INCLUDE "gfx/pokemon/unown/normal.pal" ; not .gbcpal

 INCLUDE "gfx/pokemon/unown/shiny.pal"

-INCLUDE "gfx/pokemon/wobbuffet/normal.pal"

+INCBIN "gfx/pokemon/wobbuffet/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/wobbuffet/shiny.pal"

-INCLUDE "gfx/pokemon/girafarig/normal.pal"

+INCBIN "gfx/pokemon/girafarig/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/girafarig/shiny.pal"

-INCLUDE "gfx/pokemon/pineco/normal.pal"

+INCBIN "gfx/pokemon/pineco/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/pineco/shiny.pal"

-INCLUDE "gfx/pokemon/forretress/normal.pal"

+INCBIN "gfx/pokemon/forretress/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/forretress/shiny.pal"

-INCLUDE "gfx/pokemon/dunsparce/normal.pal"

+INCBIN "gfx/pokemon/dunsparce/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/dunsparce/shiny.pal"

-INCLUDE "gfx/pokemon/gligar/normal.pal"

+INCBIN "gfx/pokemon/gligar/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/gligar/shiny.pal"

-INCLUDE "gfx/pokemon/steelix/normal.pal"

+INCBIN "gfx/pokemon/steelix/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/steelix/shiny.pal"

-INCLUDE "gfx/pokemon/snubbull/normal.pal"

+INCBIN "gfx/pokemon/snubbull/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/snubbull/shiny.pal"

-INCLUDE "gfx/pokemon/granbull/normal.pal"

+INCBIN "gfx/pokemon/granbull/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/granbull/shiny.pal"

-INCLUDE "gfx/pokemon/qwilfish/normal.pal"

+INCBIN "gfx/pokemon/qwilfish/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/qwilfish/shiny.pal"

-INCLUDE "gfx/pokemon/scizor/normal.pal"

+INCBIN "gfx/pokemon/scizor/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/scizor/shiny.pal"

-INCLUDE "gfx/pokemon/shuckle/normal.pal"

+INCBIN "gfx/pokemon/shuckle/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/shuckle/shiny.pal"

-INCLUDE "gfx/pokemon/heracross/normal.pal"

+INCBIN "gfx/pokemon/heracross/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/heracross/shiny.pal"

-INCLUDE "gfx/pokemon/sneasel/normal.pal"

+INCBIN "gfx/pokemon/sneasel/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/sneasel/shiny.pal"

-INCLUDE "gfx/pokemon/teddiursa/normal.pal"

+INCBIN "gfx/pokemon/teddiursa/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/teddiursa/shiny.pal"

-INCLUDE "gfx/pokemon/ursaring/normal.pal"

+INCBIN "gfx/pokemon/ursaring/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/ursaring/shiny.pal"

-INCLUDE "gfx/pokemon/slugma/normal.pal"

+INCBIN "gfx/pokemon/slugma/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/slugma/shiny.pal"

-INCLUDE "gfx/pokemon/magcargo/normal.pal"

+INCBIN "gfx/pokemon/magcargo/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/magcargo/shiny.pal"

-INCLUDE "gfx/pokemon/swinub/normal.pal"

+INCBIN "gfx/pokemon/swinub/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/swinub/shiny.pal"

-INCLUDE "gfx/pokemon/piloswine/normal.pal"

+INCBIN "gfx/pokemon/piloswine/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/piloswine/shiny.pal"

-INCLUDE "gfx/pokemon/corsola/normal.pal"

+INCBIN "gfx/pokemon/corsola/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/corsola/shiny.pal"

-INCLUDE "gfx/pokemon/remoraid/normal.pal"

+INCBIN "gfx/pokemon/remoraid/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/remoraid/shiny.pal"

-INCLUDE "gfx/pokemon/octillery/normal.pal"

+INCBIN "gfx/pokemon/octillery/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/octillery/shiny.pal"

-INCLUDE "gfx/pokemon/delibird/normal.pal"

+INCBIN "gfx/pokemon/delibird/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/delibird/shiny.pal"

-INCLUDE "gfx/pokemon/mantine/normal.pal"

+INCBIN "gfx/pokemon/mantine/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/mantine/shiny.pal"

-INCLUDE "gfx/pokemon/skarmory/normal.pal"

+INCBIN "gfx/pokemon/skarmory/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/skarmory/shiny.pal"

-INCLUDE "gfx/pokemon/houndour/normal.pal"

+INCBIN "gfx/pokemon/houndour/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/houndour/shiny.pal"

-INCLUDE "gfx/pokemon/houndoom/normal.pal"

+INCBIN "gfx/pokemon/houndoom/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/houndoom/shiny.pal"

-INCLUDE "gfx/pokemon/kingdra/normal.pal"

+INCBIN "gfx/pokemon/kingdra/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/kingdra/shiny.pal"

-INCLUDE "gfx/pokemon/phanpy/normal.pal"

+INCBIN "gfx/pokemon/phanpy/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/phanpy/shiny.pal"

-INCLUDE "gfx/pokemon/donphan/normal.pal"

+INCBIN "gfx/pokemon/donphan/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/donphan/shiny.pal"

-INCLUDE "gfx/pokemon/porygon2/normal.pal"

+INCBIN "gfx/pokemon/porygon2/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/porygon2/shiny.pal"

-INCLUDE "gfx/pokemon/stantler/normal.pal"

+INCBIN "gfx/pokemon/stantler/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/stantler/shiny.pal"

-INCLUDE "gfx/pokemon/smeargle/normal.pal"

+INCBIN "gfx/pokemon/smeargle/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/smeargle/shiny.pal"

-INCLUDE "gfx/pokemon/tyrogue/normal.pal"

+INCBIN "gfx/pokemon/tyrogue/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/tyrogue/shiny.pal"

-INCLUDE "gfx/pokemon/hitmontop/normal.pal"

+INCBIN "gfx/pokemon/hitmontop/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/hitmontop/shiny.pal"

-INCLUDE "gfx/pokemon/smoochum/normal.pal"

+INCBIN "gfx/pokemon/smoochum/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/smoochum/shiny.pal"

-INCLUDE "gfx/pokemon/elekid/normal.pal"

+INCBIN "gfx/pokemon/elekid/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/elekid/shiny.pal"

-INCLUDE "gfx/pokemon/magby/normal.pal"

+INCBIN "gfx/pokemon/magby/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/magby/shiny.pal"

-INCLUDE "gfx/pokemon/miltank/normal.pal"

+INCBIN "gfx/pokemon/miltank/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/miltank/shiny.pal"

-INCLUDE "gfx/pokemon/blissey/normal.pal"

+INCBIN "gfx/pokemon/blissey/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/blissey/shiny.pal"

-INCLUDE "gfx/pokemon/raikou/normal.pal"

+INCBIN "gfx/pokemon/raikou/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/raikou/shiny.pal"

-INCLUDE "gfx/pokemon/entei/normal.pal"

+INCBIN "gfx/pokemon/entei/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/entei/shiny.pal"

-INCLUDE "gfx/pokemon/suicune/normal.pal"

+INCBIN "gfx/pokemon/suicune/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/suicune/shiny.pal"

-INCLUDE "gfx/pokemon/larvitar/normal.pal"

+INCBIN "gfx/pokemon/larvitar/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/larvitar/shiny.pal"

-INCLUDE "gfx/pokemon/pupitar/normal.pal"

+INCBIN "gfx/pokemon/pupitar/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/pupitar/shiny.pal"

-INCLUDE "gfx/pokemon/tyranitar/normal.pal"

+INCBIN "gfx/pokemon/tyranitar/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/tyranitar/shiny.pal"

-INCLUDE "gfx/pokemon/lugia/normal.pal"

+INCBIN "gfx/pokemon/lugia/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/lugia/shiny.pal"

-INCLUDE "gfx/pokemon/ho_oh/normal.pal"

+INCBIN "gfx/pokemon/ho_oh/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/ho_oh/shiny.pal"

-INCLUDE "gfx/pokemon/celebi/normal.pal"

+INCBIN "gfx/pokemon/celebi/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/celebi/shiny.pal"

 ; 252

@@ -518,7 +521,7 @@

 	RGB 30, 26, 11

 	RGB 23, 16, 00

-INCLUDE "gfx/pokemon/egg/normal.pal"

+INCBIN "gfx/pokemon/egg/normal.gbcpal", middle_colors

 INCLUDE "gfx/pokemon/egg/shiny.pal"

 ; 254

--- a/data/trainers/palettes.asm

+++ b/data/trainers/palettes.asm

@@ -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

--- a/macros/gfx.asm

+++ b/macros/gfx.asm

@@ -17,3 +17,8 @@

 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"