Add Pokemon pic pngs.

Copies of the matching compressed files are kept, so files with a matching hash will use the matching compressed file instead.

This is the best that can be done until the compressor is fixed, which may never happen.

Makefile

@@ -38,7 +38,7 @@ clean:
 compare: pokecrystal.gbc pokecrystal11.gbc
 	@$(MD5) roms.md5
 
-tools: tools/lzcomp tools/png_dimensions tools/scan_includes tools/palette tools/pokemon_animation tools/pokemon_animation_graphics
+tools: tools/lzcomp tools/png_dimensions tools/scan_includes tools/palette tools/pokemon_animation tools/pokemon_animation_graphics ;
 
 tools/%: tools/%.c
 	$(CC) -o $@ $<
@@ -68,22 +68,39 @@ pokecrystal.gbc: $(crystal_obj)
 	rgbgfx -o $@ $<
 %.1bpp: %.png
 	rgbgfx -d1 -o $@ $<
+%.tilemap: %.png
+	rgbgfx -t $@ $<
+%.gbcpal: %.png
+	rgbgfx -p $@ $<
+
+
+define LOUD
+echo "$1"; $1
+endef
+
+# For files that the compressor can't match, there will be a .lz file suffixed with the hash of the correct uncompressed file.
+# If the hash of the uncompressed file matches, use this .lz instead.
+# This allows pngs to be used for compressed graphics and still match.
+
+%.lz: hash = $(shell md5sum $(*D)/$(*F) | sed "s/\(.\{8\}\).*/\1/")
 %.lz: %
-	tools/lzcomp $< $@
+	$(eval filename := $@.$(hash))
+	@if [ -f $(filename) ]; then \
+		$(call LOUD, cp $(filename) $@); \
+	else \
+		$(call LOUD, tools/lzcomp $< $@); \
+	fi
+
+
+# Pokemon pic graphics rules
 
 %.dimensions: %.png
 	tools/png_dimensions $< $@
-%.tilemap: %.png
+%.pal: %.gbcpal
-	rgbgfx -t $@ $<
-%.pal: %.pal.bin
 	tools/palette $< > $@
-%.pal.bin: %.png
-	rgbgfx -p $@ $<
 
-gfx/pics/%/normal.pal: gfx/pics/%/normal.pal.bin
+gfx/pics/%/normal.pal: gfx/pics/%/normal.gbcpal
 	tools/palette -p $< > $@
-gfx/pics/%/normal.pal.bin: gfx/pics/%/front.png
-	rgbgfx -p $@ $<
 gfx/pics/%/back.2bpp: gfx/pics/%/back.png
 	rgbgfx -h -o $@ $<
 gfx/pics/%/bitmask.asm: gfx/pics/%/front.animated.tilemap gfx/pics/%/front.dimensions
@@ -97,12 +114,11 @@ gfx/pics/%/front.animated.tilemap: gfx/pics/%/front.2bpp gfx/pics/%/front.dimens
 # Don't use -h, pokemon_animation_graphics takes care of it
 #gfx/pics/%/front.2bpp: gfx/pics/%/front.png
 #	rgbgfx -o $@ $<
-gfx/pics/%/front.2bpp.lz: gfx/pics/%/front.animated.2bpp
-	tools/lzcomp $< $@
 
-gfx/shrink1.2bpp: gfx/shrink1.png
+
-	rgbgfx -h -o $@ $<
+# Misc file-specific graphics rules
-gfx/shrink2.2bpp: gfx/shrink2.png
+
+gfx/shrink%.2bpp: gfx/shrink%.png
 	rgbgfx -h -o $@ $<
 
 gfx/trainers/%.2bpp: gfx/trainers/%.png

gfx/pics.asm

@@ -17,279 +17,279 @@ TrainerPicPointers:: INCLUDE "gfx/pics/trainer_pic_pointers.asm"
 
 SECTION "Pics 1", ROMX, BANK[PICS_1]
 
-HoOhFrontpic:        INCBIN "gfx/pics/ho_oh/front.2bpp.lz"
+HoOhFrontpic:        INCBIN "gfx/pics/ho_oh/front.animated.2bpp.lz"
-MachampFrontpic:     INCBIN "gfx/pics/machamp/front.2bpp.lz"
+MachampFrontpic:     INCBIN "gfx/pics/machamp/front.animated.2bpp.lz"
-NinetalesFrontpic:   INCBIN "gfx/pics/ninetales/front.2bpp.lz"
+NinetalesFrontpic:   INCBIN "gfx/pics/ninetales/front.animated.2bpp.lz"
-FeraligatrFrontpic:  INCBIN "gfx/pics/feraligatr/front.2bpp.lz"
+FeraligatrFrontpic:  INCBIN "gfx/pics/feraligatr/front.animated.2bpp.lz"
-NidokingFrontpic:    INCBIN "gfx/pics/nidoking/front.2bpp.lz"
+NidokingFrontpic:    INCBIN "gfx/pics/nidoking/front.animated.2bpp.lz"
-RaikouFrontpic:      INCBIN "gfx/pics/raikou/front.2bpp.lz"
+RaikouFrontpic:      INCBIN "gfx/pics/raikou/front.animated.2bpp.lz"
-LugiaFrontpic:       INCBIN "gfx/pics/lugia/front.2bpp.lz"
+LugiaFrontpic:       INCBIN "gfx/pics/lugia/front.animated.2bpp.lz"
-ArticunoFrontpic:    INCBIN "gfx/pics/articuno/front.2bpp.lz"
+ArticunoFrontpic:    INCBIN "gfx/pics/articuno/front.animated.2bpp.lz"
-TaurosFrontpic:      INCBIN "gfx/pics/tauros/front.2bpp.lz"
+TaurosFrontpic:      INCBIN "gfx/pics/tauros/front.animated.2bpp.lz"
-VenusaurFrontpic:    INCBIN "gfx/pics/venusaur/front.2bpp.lz"
+VenusaurFrontpic:    INCBIN "gfx/pics/venusaur/front.animated.2bpp.lz"
-EnteiFrontpic:       INCBIN "gfx/pics/entei/front.2bpp.lz"
+EnteiFrontpic:       INCBIN "gfx/pics/entei/front.animated.2bpp.lz"
-SuicuneFrontpic:     INCBIN "gfx/pics/suicune/front.2bpp.lz"
+SuicuneFrontpic:     INCBIN "gfx/pics/suicune/front.animated.2bpp.lz"
-TyphlosionFrontpic:  INCBIN "gfx/pics/typhlosion/front.2bpp.lz"
+TyphlosionFrontpic:  INCBIN "gfx/pics/typhlosion/front.animated.2bpp.lz"
 ; 123ffa
 
 
 SECTION "Pics 2", ROMX, BANK[PICS_2]
 
-BlastoiseFrontpic:   INCBIN "gfx/pics/blastoise/front.2bpp.lz"
+BlastoiseFrontpic:   INCBIN "gfx/pics/blastoise/front.animated.2bpp.lz"
-RapidashFrontpic:    INCBIN "gfx/pics/rapidash/front.2bpp.lz"
+RapidashFrontpic:    INCBIN "gfx/pics/rapidash/front.animated.2bpp.lz"
-MeganiumFrontpic:    INCBIN "gfx/pics/meganium/front.2bpp.lz"
+MeganiumFrontpic:    INCBIN "gfx/pics/meganium/front.animated.2bpp.lz"
-NidoqueenFrontpic:   INCBIN "gfx/pics/nidoqueen/front.2bpp.lz"
+NidoqueenFrontpic:   INCBIN "gfx/pics/nidoqueen/front.animated.2bpp.lz"
-HitmonleeFrontpic:   INCBIN "gfx/pics/hitmonlee/front.2bpp.lz"
+HitmonleeFrontpic:   INCBIN "gfx/pics/hitmonlee/front.animated.2bpp.lz"
-ScizorFrontpic:      INCBIN "gfx/pics/scizor/front.2bpp.lz"
+ScizorFrontpic:      INCBIN "gfx/pics/scizor/front.animated.2bpp.lz"
-BeedrillFrontpic:    INCBIN "gfx/pics/beedrill/front.2bpp.lz"
+BeedrillFrontpic:    INCBIN "gfx/pics/beedrill/front.animated.2bpp.lz"
-ArcanineFrontpic:    INCBIN "gfx/pics/arcanine/front.2bpp.lz"
+ArcanineFrontpic:    INCBIN "gfx/pics/arcanine/front.animated.2bpp.lz"
-TyranitarFrontpic:   INCBIN "gfx/pics/tyranitar/front.2bpp.lz"
+TyranitarFrontpic:   INCBIN "gfx/pics/tyranitar/front.animated.2bpp.lz"
-MoltresFrontpic:     INCBIN "gfx/pics/moltres/front.2bpp.lz"
+MoltresFrontpic:     INCBIN "gfx/pics/moltres/front.animated.2bpp.lz"
-ZapdosFrontpic:      INCBIN "gfx/pics/zapdos/front.2bpp.lz"
+ZapdosFrontpic:      INCBIN "gfx/pics/zapdos/front.animated.2bpp.lz"
-ArbokFrontpic:       INCBIN "gfx/pics/arbok/front.2bpp.lz"
+ArbokFrontpic:       INCBIN "gfx/pics/arbok/front.animated.2bpp.lz"
-MewtwoFrontpic:      INCBIN "gfx/pics/mewtwo/front.2bpp.lz"
+MewtwoFrontpic:      INCBIN "gfx/pics/mewtwo/front.animated.2bpp.lz"
-FearowFrontpic:      INCBIN "gfx/pics/fearow/front.2bpp.lz"
+FearowFrontpic:      INCBIN "gfx/pics/fearow/front.animated.2bpp.lz"
-CharizardFrontpic:   INCBIN "gfx/pics/charizard/front.2bpp.lz"
+CharizardFrontpic:   INCBIN "gfx/pics/charizard/front.animated.2bpp.lz"
-QuilavaFrontpic:     INCBIN "gfx/pics/quilava/front.2bpp.lz"
+QuilavaFrontpic:     INCBIN "gfx/pics/quilava/front.animated.2bpp.lz"
 ; 127ffe
 
 
 SECTION "Pics 3", ROMX, BANK[PICS_3]
 
-SteelixFrontpic:     INCBIN "gfx/pics/steelix/front.2bpp.lz"
+SteelixFrontpic:     INCBIN "gfx/pics/steelix/front.animated.2bpp.lz"
-AlakazamFrontpic:    INCBIN "gfx/pics/alakazam/front.2bpp.lz"
+AlakazamFrontpic:    INCBIN "gfx/pics/alakazam/front.animated.2bpp.lz"
-GyaradosFrontpic:    INCBIN "gfx/pics/gyarados/front.2bpp.lz"
+GyaradosFrontpic:    INCBIN "gfx/pics/gyarados/front.animated.2bpp.lz"
-KangaskhanFrontpic:  INCBIN "gfx/pics/kangaskhan/front.2bpp.lz"
+KangaskhanFrontpic:  INCBIN "gfx/pics/kangaskhan/front.animated.2bpp.lz"
-RhydonFrontpic:      INCBIN "gfx/pics/rhydon/front.2bpp.lz"
+RhydonFrontpic:      INCBIN "gfx/pics/rhydon/front.animated.2bpp.lz"
-GolduckFrontpic:     INCBIN "gfx/pics/golduck/front.2bpp.lz"
+GolduckFrontpic:     INCBIN "gfx/pics/golduck/front.animated.2bpp.lz"
-RhyhornFrontpic:     INCBIN "gfx/pics/rhyhorn/front.2bpp.lz"
+RhyhornFrontpic:     INCBIN "gfx/pics/rhyhorn/front.animated.2bpp.lz"
-PidgeotFrontpic:     INCBIN "gfx/pics/pidgeot/front.2bpp.lz"
+PidgeotFrontpic:     INCBIN "gfx/pics/pidgeot/front.animated.2bpp.lz"
-SlowbroFrontpic:     INCBIN "gfx/pics/slowbro/front.2bpp.lz"
+SlowbroFrontpic:     INCBIN "gfx/pics/slowbro/front.animated.2bpp.lz"
-ButterfreeFrontpic:  INCBIN "gfx/pics/butterfree/front.2bpp.lz"
+ButterfreeFrontpic:  INCBIN "gfx/pics/butterfree/front.animated.2bpp.lz"
-WeezingFrontpic:     INCBIN "gfx/pics/weezing/front.2bpp.lz"
+WeezingFrontpic:     INCBIN "gfx/pics/weezing/front.animated.2bpp.lz"
-CloysterFrontpic:    INCBIN "gfx/pics/cloyster/front.2bpp.lz"
+CloysterFrontpic:    INCBIN "gfx/pics/cloyster/front.animated.2bpp.lz"
-SkarmoryFrontpic:    INCBIN "gfx/pics/skarmory/front.2bpp.lz"
+SkarmoryFrontpic:    INCBIN "gfx/pics/skarmory/front.animated.2bpp.lz"
-DewgongFrontpic:     INCBIN "gfx/pics/dewgong/front.2bpp.lz"
+DewgongFrontpic:     INCBIN "gfx/pics/dewgong/front.animated.2bpp.lz"
-VictreebelFrontpic:  INCBIN "gfx/pics/victreebel/front.2bpp.lz"
+VictreebelFrontpic:  INCBIN "gfx/pics/victreebel/front.animated.2bpp.lz"
-RaichuFrontpic:      INCBIN "gfx/pics/raichu/front.2bpp.lz"
+RaichuFrontpic:      INCBIN "gfx/pics/raichu/front.animated.2bpp.lz"
-PrimeapeFrontpic:    INCBIN "gfx/pics/primeape/front.2bpp.lz"
+PrimeapeFrontpic:    INCBIN "gfx/pics/primeape/front.animated.2bpp.lz"
 OmastarBackpic:      INCBIN "gfx/pics/omastar/back.2bpp.lz"
 ; 12bffe
 
 
 SECTION "Pics 4", ROMX, BANK[PICS_4]
 
-DodrioFrontpic:      INCBIN "gfx/pics/dodrio/front.2bpp.lz"
+DodrioFrontpic:      INCBIN "gfx/pics/dodrio/front.animated.2bpp.lz"
-SlowkingFrontpic:    INCBIN "gfx/pics/slowking/front.2bpp.lz"
+SlowkingFrontpic:    INCBIN "gfx/pics/slowking/front.animated.2bpp.lz"
-HitmontopFrontpic:   INCBIN "gfx/pics/hitmontop/front.2bpp.lz"
+HitmontopFrontpic:   INCBIN "gfx/pics/hitmontop/front.animated.2bpp.lz"
-OnixFrontpic:        INCBIN "gfx/pics/onix/front.2bpp.lz"
+OnixFrontpic:        INCBIN "gfx/pics/onix/front.animated.2bpp.lz"
-BlisseyFrontpic:     INCBIN "gfx/pics/blissey/front.2bpp.lz"
+BlisseyFrontpic:     INCBIN "gfx/pics/blissey/front.animated.2bpp.lz"
-MachokeFrontpic:     INCBIN "gfx/pics/machoke/front.2bpp.lz"
+MachokeFrontpic:     INCBIN "gfx/pics/machoke/front.animated.2bpp.lz"
-DragoniteFrontpic:   INCBIN "gfx/pics/dragonite/front.2bpp.lz"
+DragoniteFrontpic:   INCBIN "gfx/pics/dragonite/front.animated.2bpp.lz"
-PoliwrathFrontpic:   INCBIN "gfx/pics/poliwrath/front.2bpp.lz"
+PoliwrathFrontpic:   INCBIN "gfx/pics/poliwrath/front.animated.2bpp.lz"
-ScytherFrontpic:     INCBIN "gfx/pics/scyther/front.2bpp.lz"
+ScytherFrontpic:     INCBIN "gfx/pics/scyther/front.animated.2bpp.lz"
-AerodactylFrontpic:  INCBIN "gfx/pics/aerodactyl/front.2bpp.lz"
+AerodactylFrontpic:  INCBIN "gfx/pics/aerodactyl/front.animated.2bpp.lz"
-SeakingFrontpic:     INCBIN "gfx/pics/seaking/front.2bpp.lz"
+SeakingFrontpic:     INCBIN "gfx/pics/seaking/front.animated.2bpp.lz"
-MukFrontpic:         INCBIN "gfx/pics/muk/front.2bpp.lz"
+MukFrontpic:         INCBIN "gfx/pics/muk/front.animated.2bpp.lz"
-CroconawFrontpic:    INCBIN "gfx/pics/croconaw/front.2bpp.lz"
+CroconawFrontpic:    INCBIN "gfx/pics/croconaw/front.animated.2bpp.lz"
-HypnoFrontpic:       INCBIN "gfx/pics/hypno/front.2bpp.lz"
+HypnoFrontpic:       INCBIN "gfx/pics/hypno/front.animated.2bpp.lz"
-NidorinoFrontpic:    INCBIN "gfx/pics/nidorino/front.2bpp.lz"
+NidorinoFrontpic:    INCBIN "gfx/pics/nidorino/front.animated.2bpp.lz"
-SandslashFrontpic:   INCBIN "gfx/pics/sandslash/front.2bpp.lz"
+SandslashFrontpic:   INCBIN "gfx/pics/sandslash/front.animated.2bpp.lz"
-JolteonFrontpic:     INCBIN "gfx/pics/jolteon/front.2bpp.lz"
+JolteonFrontpic:     INCBIN "gfx/pics/jolteon/front.animated.2bpp.lz"
-DonphanFrontpic:     INCBIN "gfx/pics/donphan/front.2bpp.lz"
+DonphanFrontpic:     INCBIN "gfx/pics/donphan/front.animated.2bpp.lz"
-PinsirFrontpic:      INCBIN "gfx/pics/pinsir/front.2bpp.lz"
+PinsirFrontpic:      INCBIN "gfx/pics/pinsir/front.animated.2bpp.lz"
-UnownEFrontpic:      INCBIN "gfx/pics/unown_e/front.2bpp.lz"
+UnownEFrontpic:      INCBIN "gfx/pics/unown_e/front.animated.2bpp.lz"
 ; 130000
 
 
 SECTION "Pics 5", ROMX, BANK[PICS_5]
 
-GolbatFrontpic:      INCBIN "gfx/pics/golbat/front.2bpp.lz"
+GolbatFrontpic:      INCBIN "gfx/pics/golbat/front.animated.2bpp.lz"
-KinglerFrontpic:     INCBIN "gfx/pics/kingler/front.2bpp.lz"
+KinglerFrontpic:     INCBIN "gfx/pics/kingler/front.animated.2bpp.lz"
-ExeggcuteFrontpic:   INCBIN "gfx/pics/exeggcute/front.2bpp.lz"
+ExeggcuteFrontpic:   INCBIN "gfx/pics/exeggcute/front.animated.2bpp.lz"
-MagcargoFrontpic:    INCBIN "gfx/pics/magcargo/front.2bpp.lz"
+MagcargoFrontpic:    INCBIN "gfx/pics/magcargo/front.animated.2bpp.lz"
-PersianFrontpic:     INCBIN "gfx/pics/persian/front.2bpp.lz"
+PersianFrontpic:     INCBIN "gfx/pics/persian/front.animated.2bpp.lz"
-StantlerFrontpic:    INCBIN "gfx/pics/stantler/front.2bpp.lz"
+StantlerFrontpic:    INCBIN "gfx/pics/stantler/front.animated.2bpp.lz"
-RaticateFrontpic:    INCBIN "gfx/pics/raticate/front.2bpp.lz"
+RaticateFrontpic:    INCBIN "gfx/pics/raticate/front.animated.2bpp.lz"
-VenomothFrontpic:    INCBIN "gfx/pics/venomoth/front.2bpp.lz"
+VenomothFrontpic:    INCBIN "gfx/pics/venomoth/front.animated.2bpp.lz"
-PolitoedFrontpic:    INCBIN "gfx/pics/politoed/front.2bpp.lz"
+PolitoedFrontpic:    INCBIN "gfx/pics/politoed/front.animated.2bpp.lz"
-ElectabuzzFrontpic:  INCBIN "gfx/pics/electabuzz/front.2bpp.lz"
+ElectabuzzFrontpic:  INCBIN "gfx/pics/electabuzz/front.animated.2bpp.lz"
-MantineFrontpic:     INCBIN "gfx/pics/mantine/front.2bpp.lz"
+MantineFrontpic:     INCBIN "gfx/pics/mantine/front.animated.2bpp.lz"
-LickitungFrontpic:   INCBIN "gfx/pics/lickitung/front.2bpp.lz"
+LickitungFrontpic:   INCBIN "gfx/pics/lickitung/front.animated.2bpp.lz"
-KingdraFrontpic:     INCBIN "gfx/pics/kingdra/front.2bpp.lz"
+KingdraFrontpic:     INCBIN "gfx/pics/kingdra/front.animated.2bpp.lz"
-CharmeleonFrontpic:  INCBIN "gfx/pics/charmeleon/front.2bpp.lz"
+CharmeleonFrontpic:  INCBIN "gfx/pics/charmeleon/front.animated.2bpp.lz"
-KadabraFrontpic:     INCBIN "gfx/pics/kadabra/front.2bpp.lz"
+KadabraFrontpic:     INCBIN "gfx/pics/kadabra/front.animated.2bpp.lz"
-ExeggutorFrontpic:   INCBIN "gfx/pics/exeggutor/front.2bpp.lz"
+ExeggutorFrontpic:   INCBIN "gfx/pics/exeggutor/front.animated.2bpp.lz"
-GastlyFrontpic:      INCBIN "gfx/pics/gastly/front.2bpp.lz"
+GastlyFrontpic:      INCBIN "gfx/pics/gastly/front.animated.2bpp.lz"
-AzumarillFrontpic:   INCBIN "gfx/pics/azumarill/front.2bpp.lz"
+AzumarillFrontpic:   INCBIN "gfx/pics/azumarill/front.animated.2bpp.lz"
-ParasectFrontpic:    INCBIN "gfx/pics/parasect/front.2bpp.lz"
+ParasectFrontpic:    INCBIN "gfx/pics/parasect/front.animated.2bpp.lz"
-MrMimeFrontpic:      INCBIN "gfx/pics/mr__mime/front.2bpp.lz"
+MrMimeFrontpic:      INCBIN "gfx/pics/mr__mime/front.animated.2bpp.lz"
-HeracrossFrontpic:   INCBIN "gfx/pics/heracross/front.2bpp.lz"
+HeracrossFrontpic:   INCBIN "gfx/pics/heracross/front.animated.2bpp.lz"
 ; 133fff
 
 
 SECTION "Pics 6", ROMX, BANK[PICS_6]
 
-AriadosFrontpic:     INCBIN "gfx/pics/ariados/front.2bpp.lz"
+AriadosFrontpic:     INCBIN "gfx/pics/ariados/front.animated.2bpp.lz"
-NoctowlFrontpic:     INCBIN "gfx/pics/noctowl/front.2bpp.lz"
+NoctowlFrontpic:     INCBIN "gfx/pics/noctowl/front.animated.2bpp.lz"
-WartortleFrontpic:   INCBIN "gfx/pics/wartortle/front.2bpp.lz"
+WartortleFrontpic:   INCBIN "gfx/pics/wartortle/front.animated.2bpp.lz"
-LaprasFrontpic:      INCBIN "gfx/pics/lapras/front.2bpp.lz"
+LaprasFrontpic:      INCBIN "gfx/pics/lapras/front.animated.2bpp.lz"
-GolemFrontpic:       INCBIN "gfx/pics/golem/front.2bpp.lz"
+GolemFrontpic:       INCBIN "gfx/pics/golem/front.animated.2bpp.lz"
-PoliwhirlFrontpic:   INCBIN "gfx/pics/poliwhirl/front.2bpp.lz"
+PoliwhirlFrontpic:   INCBIN "gfx/pics/poliwhirl/front.animated.2bpp.lz"
-UrsaringFrontpic:    INCBIN "gfx/pics/ursaring/front.2bpp.lz"
+UrsaringFrontpic:    INCBIN "gfx/pics/ursaring/front.animated.2bpp.lz"
-HoundoomFrontpic:    INCBIN "gfx/pics/houndoom/front.2bpp.lz"
+HoundoomFrontpic:    INCBIN "gfx/pics/houndoom/front.animated.2bpp.lz"
-KabutopsFrontpic:    INCBIN "gfx/pics/kabutops/front.2bpp.lz"
+KabutopsFrontpic:    INCBIN "gfx/pics/kabutops/front.animated.2bpp.lz"
-AmpharosFrontpic:    INCBIN "gfx/pics/ampharos/front.2bpp.lz"
+AmpharosFrontpic:    INCBIN "gfx/pics/ampharos/front.animated.2bpp.lz"
-NidorinaFrontpic:    INCBIN "gfx/pics/nidorina/front.2bpp.lz"
+NidorinaFrontpic:    INCBIN "gfx/pics/nidorina/front.animated.2bpp.lz"
-FlareonFrontpic:     INCBIN "gfx/pics/flareon/front.2bpp.lz"
+FlareonFrontpic:     INCBIN "gfx/pics/flareon/front.animated.2bpp.lz"
-FarfetchDFrontpic:   INCBIN "gfx/pics/farfetch_d/front.2bpp.lz"
+FarfetchDFrontpic:   INCBIN "gfx/pics/farfetch_d/front.animated.2bpp.lz"
-VileplumeFrontpic:   INCBIN "gfx/pics/vileplume/front.2bpp.lz"
+VileplumeFrontpic:   INCBIN "gfx/pics/vileplume/front.animated.2bpp.lz"
-BayleefFrontpic:     INCBIN "gfx/pics/bayleef/front.2bpp.lz"
+BayleefFrontpic:     INCBIN "gfx/pics/bayleef/front.animated.2bpp.lz"
-MagmarFrontpic:      INCBIN "gfx/pics/magmar/front.2bpp.lz"
+MagmarFrontpic:      INCBIN "gfx/pics/magmar/front.animated.2bpp.lz"
-TentacruelFrontpic:  INCBIN "gfx/pics/tentacruel/front.2bpp.lz"
+TentacruelFrontpic:  INCBIN "gfx/pics/tentacruel/front.animated.2bpp.lz"
-ElekidFrontpic:      INCBIN "gfx/pics/elekid/front.2bpp.lz"
+ElekidFrontpic:      INCBIN "gfx/pics/elekid/front.animated.2bpp.lz"
-JumpluffFrontpic:    INCBIN "gfx/pics/jumpluff/front.2bpp.lz"
+JumpluffFrontpic:    INCBIN "gfx/pics/jumpluff/front.animated.2bpp.lz"
-MarowakFrontpic:     INCBIN "gfx/pics/marowak/front.2bpp.lz"
+MarowakFrontpic:     INCBIN "gfx/pics/marowak/front.animated.2bpp.lz"
-VulpixFrontpic:      INCBIN "gfx/pics/vulpix/front.2bpp.lz"
+VulpixFrontpic:      INCBIN "gfx/pics/vulpix/front.animated.2bpp.lz"
-GligarFrontpic:      INCBIN "gfx/pics/gligar/front.2bpp.lz"
+GligarFrontpic:      INCBIN "gfx/pics/gligar/front.animated.2bpp.lz"
-DunsparceFrontpic:   INCBIN "gfx/pics/dunsparce/front.2bpp.lz"
+DunsparceFrontpic:   INCBIN "gfx/pics/dunsparce/front.animated.2bpp.lz"
 ; 137fff
 
 
 SECTION "Pics 7", ROMX, BANK[PICS_7]
 
-VaporeonFrontpic:    INCBIN "gfx/pics/vaporeon/front.2bpp.lz"
+VaporeonFrontpic:    INCBIN "gfx/pics/vaporeon/front.animated.2bpp.lz"
-GirafarigFrontpic:   INCBIN "gfx/pics/girafarig/front.2bpp.lz"
+GirafarigFrontpic:   INCBIN "gfx/pics/girafarig/front.animated.2bpp.lz"
-DrowzeeFrontpic:     INCBIN "gfx/pics/drowzee/front.2bpp.lz"
+DrowzeeFrontpic:     INCBIN "gfx/pics/drowzee/front.animated.2bpp.lz"
-SneaselFrontpic:     INCBIN "gfx/pics/sneasel/front.2bpp.lz"
+SneaselFrontpic:     INCBIN "gfx/pics/sneasel/front.animated.2bpp.lz"
-BellossomFrontpic:   INCBIN "gfx/pics/bellossom/front.2bpp.lz"
+BellossomFrontpic:   INCBIN "gfx/pics/bellossom/front.animated.2bpp.lz"
-SnorlaxFrontpic:     INCBIN "gfx/pics/snorlax/front.2bpp.lz"
+SnorlaxFrontpic:     INCBIN "gfx/pics/snorlax/front.animated.2bpp.lz"
-WigglytuffFrontpic:  INCBIN "gfx/pics/wigglytuff/front.2bpp.lz"
+WigglytuffFrontpic:  INCBIN "gfx/pics/wigglytuff/front.animated.2bpp.lz"
-YanmaFrontpic:       INCBIN "gfx/pics/yanma/front.2bpp.lz"
+YanmaFrontpic:       INCBIN "gfx/pics/yanma/front.animated.2bpp.lz"
-SmeargleFrontpic:    INCBIN "gfx/pics/smeargle/front.2bpp.lz"
+SmeargleFrontpic:    INCBIN "gfx/pics/smeargle/front.animated.2bpp.lz"
-ClefableFrontpic:    INCBIN "gfx/pics/clefable/front.2bpp.lz"
+ClefableFrontpic:    INCBIN "gfx/pics/clefable/front.animated.2bpp.lz"
-PonytaFrontpic:      INCBIN "gfx/pics/ponyta/front.2bpp.lz"
+PonytaFrontpic:      INCBIN "gfx/pics/ponyta/front.animated.2bpp.lz"
-MurkrowFrontpic:     INCBIN "gfx/pics/murkrow/front.2bpp.lz"
+MurkrowFrontpic:     INCBIN "gfx/pics/murkrow/front.animated.2bpp.lz"
-GravelerFrontpic:    INCBIN "gfx/pics/graveler/front.2bpp.lz"
+GravelerFrontpic:    INCBIN "gfx/pics/graveler/front.animated.2bpp.lz"
-StarmieFrontpic:     INCBIN "gfx/pics/starmie/front.2bpp.lz"
+StarmieFrontpic:     INCBIN "gfx/pics/starmie/front.animated.2bpp.lz"
-PidgeottoFrontpic:   INCBIN "gfx/pics/pidgeotto/front.2bpp.lz"
+PidgeottoFrontpic:   INCBIN "gfx/pics/pidgeotto/front.animated.2bpp.lz"
-LedybaFrontpic:      INCBIN "gfx/pics/ledyba/front.2bpp.lz"
+LedybaFrontpic:      INCBIN "gfx/pics/ledyba/front.animated.2bpp.lz"
-GengarFrontpic:      INCBIN "gfx/pics/gengar/front.2bpp.lz"
+GengarFrontpic:      INCBIN "gfx/pics/gengar/front.animated.2bpp.lz"
-OmastarFrontpic:     INCBIN "gfx/pics/omastar/front.2bpp.lz"
+OmastarFrontpic:     INCBIN "gfx/pics/omastar/front.animated.2bpp.lz"
-PiloswineFrontpic:   INCBIN "gfx/pics/piloswine/front.2bpp.lz"
+PiloswineFrontpic:   INCBIN "gfx/pics/piloswine/front.animated.2bpp.lz"
-DugtrioFrontpic:     INCBIN "gfx/pics/dugtrio/front.2bpp.lz"
+DugtrioFrontpic:     INCBIN "gfx/pics/dugtrio/front.animated.2bpp.lz"
-MagnetonFrontpic:    INCBIN "gfx/pics/magneton/front.2bpp.lz"
+MagnetonFrontpic:    INCBIN "gfx/pics/magneton/front.animated.2bpp.lz"
-DragonairFrontpic:   INCBIN "gfx/pics/dragonair/front.2bpp.lz"
+DragonairFrontpic:   INCBIN "gfx/pics/dragonair/front.animated.2bpp.lz"
-ForretressFrontpic:  INCBIN "gfx/pics/forretress/front.2bpp.lz"
+ForretressFrontpic:  INCBIN "gfx/pics/forretress/front.animated.2bpp.lz"
-TogeticFrontpic:     INCBIN "gfx/pics/togetic/front.2bpp.lz"
+TogeticFrontpic:     INCBIN "gfx/pics/togetic/front.animated.2bpp.lz"
 KangaskhanBackpic:   INCBIN "gfx/pics/kangaskhan/back.2bpp.lz"
 ; 13c000
 
 
 SECTION "Pics 8", ROMX, BANK[PICS_8]
 
-SeelFrontpic:        INCBIN "gfx/pics/seel/front.2bpp.lz"
+SeelFrontpic:        INCBIN "gfx/pics/seel/front.animated.2bpp.lz"
-CrobatFrontpic:      INCBIN "gfx/pics/crobat/front.2bpp.lz"
+CrobatFrontpic:      INCBIN "gfx/pics/crobat/front.animated.2bpp.lz"
-ChanseyFrontpic:     INCBIN "gfx/pics/chansey/front.2bpp.lz"
+ChanseyFrontpic:     INCBIN "gfx/pics/chansey/front.animated.2bpp.lz"
-TangelaFrontpic:     INCBIN "gfx/pics/tangela/front.2bpp.lz"
+TangelaFrontpic:     INCBIN "gfx/pics/tangela/front.animated.2bpp.lz"
-SnubbullFrontpic:    INCBIN "gfx/pics/snubbull/front.2bpp.lz"
+SnubbullFrontpic:    INCBIN "gfx/pics/snubbull/front.animated.2bpp.lz"
-GranbullFrontpic:    INCBIN "gfx/pics/granbull/front.2bpp.lz"
+GranbullFrontpic:    INCBIN "gfx/pics/granbull/front.animated.2bpp.lz"
-MiltankFrontpic:     INCBIN "gfx/pics/miltank/front.2bpp.lz"
+MiltankFrontpic:     INCBIN "gfx/pics/miltank/front.animated.2bpp.lz"
-HaunterFrontpic:     INCBIN "gfx/pics/haunter/front.2bpp.lz"
+HaunterFrontpic:     INCBIN "gfx/pics/haunter/front.animated.2bpp.lz"
-SunfloraFrontpic:    INCBIN "gfx/pics/sunflora/front.2bpp.lz"
+SunfloraFrontpic:    INCBIN "gfx/pics/sunflora/front.animated.2bpp.lz"
-UmbreonFrontpic:     INCBIN "gfx/pics/umbreon/front.2bpp.lz"
+UmbreonFrontpic:     INCBIN "gfx/pics/umbreon/front.animated.2bpp.lz"
-ChikoritaFrontpic:   INCBIN "gfx/pics/chikorita/front.2bpp.lz"
+ChikoritaFrontpic:   INCBIN "gfx/pics/chikorita/front.animated.2bpp.lz"
-GoldeenFrontpic:     INCBIN "gfx/pics/goldeen/front.2bpp.lz"
+GoldeenFrontpic:     INCBIN "gfx/pics/goldeen/front.animated.2bpp.lz"
-EspeonFrontpic:      INCBIN "gfx/pics/espeon/front.2bpp.lz"
+EspeonFrontpic:      INCBIN "gfx/pics/espeon/front.animated.2bpp.lz"
-XatuFrontpic:        INCBIN "gfx/pics/xatu/front.2bpp.lz"
+XatuFrontpic:        INCBIN "gfx/pics/xatu/front.animated.2bpp.lz"
-MewFrontpic:         INCBIN "gfx/pics/mew/front.2bpp.lz"
+MewFrontpic:         INCBIN "gfx/pics/mew/front.animated.2bpp.lz"
-OctilleryFrontpic:   INCBIN "gfx/pics/octillery/front.2bpp.lz"
+OctilleryFrontpic:   INCBIN "gfx/pics/octillery/front.animated.2bpp.lz"
-JynxFrontpic:        INCBIN "gfx/pics/jynx/front.2bpp.lz"
+JynxFrontpic:        INCBIN "gfx/pics/jynx/front.animated.2bpp.lz"
-WobbuffetFrontpic:   INCBIN "gfx/pics/wobbuffet/front.2bpp.lz"
+WobbuffetFrontpic:   INCBIN "gfx/pics/wobbuffet/front.animated.2bpp.lz"
-DelibirdFrontpic:    INCBIN "gfx/pics/delibird/front.2bpp.lz"
+DelibirdFrontpic:    INCBIN "gfx/pics/delibird/front.animated.2bpp.lz"
-LedianFrontpic:      INCBIN "gfx/pics/ledian/front.2bpp.lz"
+LedianFrontpic:      INCBIN "gfx/pics/ledian/front.animated.2bpp.lz"
-GloomFrontpic:       INCBIN "gfx/pics/gloom/front.2bpp.lz"
+GloomFrontpic:       INCBIN "gfx/pics/gloom/front.animated.2bpp.lz"
-FlaaffyFrontpic:     INCBIN "gfx/pics/flaaffy/front.2bpp.lz"
+FlaaffyFrontpic:     INCBIN "gfx/pics/flaaffy/front.animated.2bpp.lz"
-IvysaurFrontpic:     INCBIN "gfx/pics/ivysaur/front.2bpp.lz"
+IvysaurFrontpic:     INCBIN "gfx/pics/ivysaur/front.animated.2bpp.lz"
-FurretFrontpic:      INCBIN "gfx/pics/furret/front.2bpp.lz"
+FurretFrontpic:      INCBIN "gfx/pics/furret/front.animated.2bpp.lz"
-CyndaquilFrontpic:   INCBIN "gfx/pics/cyndaquil/front.2bpp.lz"
+CyndaquilFrontpic:   INCBIN "gfx/pics/cyndaquil/front.animated.2bpp.lz"
-HitmonchanFrontpic:  INCBIN "gfx/pics/hitmonchan/front.2bpp.lz"
+HitmonchanFrontpic:  INCBIN "gfx/pics/hitmonchan/front.animated.2bpp.lz"
-QuagsireFrontpic:    INCBIN "gfx/pics/quagsire/front.2bpp.lz"
+QuagsireFrontpic:    INCBIN "gfx/pics/quagsire/front.animated.2bpp.lz"
 ; 13fff7
 
 
 SECTION "Pics 9", ROMX, BANK[PICS_9]
 
-EkansFrontpic:       INCBIN "gfx/pics/ekans/front.2bpp.lz"
+EkansFrontpic:       INCBIN "gfx/pics/ekans/front.animated.2bpp.lz"
-SudowoodoFrontpic:   INCBIN "gfx/pics/sudowoodo/front.2bpp.lz"
+SudowoodoFrontpic:   INCBIN "gfx/pics/sudowoodo/front.animated.2bpp.lz"
-PikachuFrontpic:     INCBIN "gfx/pics/pikachu/front.2bpp.lz"
+PikachuFrontpic:     INCBIN "gfx/pics/pikachu/front.animated.2bpp.lz"
-SeadraFrontpic:      INCBIN "gfx/pics/seadra/front.2bpp.lz"
+SeadraFrontpic:      INCBIN "gfx/pics/seadra/front.animated.2bpp.lz"
-MagbyFrontpic:       INCBIN "gfx/pics/magby/front.2bpp.lz"
+MagbyFrontpic:       INCBIN "gfx/pics/magby/front.animated.2bpp.lz"
-WeepinbellFrontpic:  INCBIN "gfx/pics/weepinbell/front.2bpp.lz"
+WeepinbellFrontpic:  INCBIN "gfx/pics/weepinbell/front.animated.2bpp.lz"
-TotodileFrontpic:    INCBIN "gfx/pics/totodile/front.2bpp.lz"
+TotodileFrontpic:    INCBIN "gfx/pics/totodile/front.animated.2bpp.lz"
-CorsolaFrontpic:     INCBIN "gfx/pics/corsola/front.2bpp.lz"
+CorsolaFrontpic:     INCBIN "gfx/pics/corsola/front.animated.2bpp.lz"
 FirebreatherPic:     INCBIN "gfx/trainers/firebreather.2bpp.lz"
-MachopFrontpic:      INCBIN "gfx/pics/machop/front.2bpp.lz"
+MachopFrontpic:      INCBIN "gfx/pics/machop/front.animated.2bpp.lz"
-ChinchouFrontpic:    INCBIN "gfx/pics/chinchou/front.2bpp.lz"
+ChinchouFrontpic:    INCBIN "gfx/pics/chinchou/front.animated.2bpp.lz"
-RattataFrontpic:     INCBIN "gfx/pics/rattata/front.2bpp.lz"
+RattataFrontpic:     INCBIN "gfx/pics/rattata/front.animated.2bpp.lz"
 ChampionPic:         INCBIN "gfx/trainers/champion.2bpp.lz"
-SpearowFrontpic:     INCBIN "gfx/pics/spearow/front.2bpp.lz"
+SpearowFrontpic:     INCBIN "gfx/pics/spearow/front.animated.2bpp.lz"
-MagikarpFrontpic:    INCBIN "gfx/pics/magikarp/front.2bpp.lz"
+MagikarpFrontpic:    INCBIN "gfx/pics/magikarp/front.animated.2bpp.lz"
-CharmanderFrontpic:  INCBIN "gfx/pics/charmander/front.2bpp.lz"
+CharmanderFrontpic:  INCBIN "gfx/pics/charmander/front.animated.2bpp.lz"
-CuboneFrontpic:      INCBIN "gfx/pics/cubone/front.2bpp.lz"
+CuboneFrontpic:      INCBIN "gfx/pics/cubone/front.animated.2bpp.lz"
 BlackbeltTPic:       INCBIN "gfx/trainers/blackbelt_t.2bpp.lz"
 BikerPic:            INCBIN "gfx/trainers/biker.2bpp.lz"
-NidoranMFrontpic:    INCBIN "gfx/pics/nidoran_m/front.2bpp.lz"
+NidoranMFrontpic:    INCBIN "gfx/pics/nidoran_m/front.animated.2bpp.lz"
-PorygonFrontpic:     INCBIN "gfx/pics/porygon/front.2bpp.lz"
+PorygonFrontpic:     INCBIN "gfx/pics/porygon/front.animated.2bpp.lz"
 BrunoPic:            INCBIN "gfx/trainers/bruno.2bpp.lz"
-GrimerFrontpic:      INCBIN "gfx/pics/grimer/front.2bpp.lz"
+GrimerFrontpic:      INCBIN "gfx/pics/grimer/front.animated.2bpp.lz"
-StaryuFrontpic:      INCBIN "gfx/pics/staryu/front.2bpp.lz"
+StaryuFrontpic:      INCBIN "gfx/pics/staryu/front.animated.2bpp.lz"
 HikerPic:            INCBIN "gfx/trainers/hiker.2bpp.lz"
-MeowthFrontpic:      INCBIN "gfx/pics/meowth/front.2bpp.lz"
+MeowthFrontpic:      INCBIN "gfx/pics/meowth/front.animated.2bpp.lz"
-Porygon2Frontpic:    INCBIN "gfx/pics/porygon2/front.2bpp.lz"
+Porygon2Frontpic:    INCBIN "gfx/pics/porygon2/front.animated.2bpp.lz"
-SandshrewFrontpic:   INCBIN "gfx/pics/sandshrew/front.2bpp.lz"
+SandshrewFrontpic:   INCBIN "gfx/pics/sandshrew/front.animated.2bpp.lz"
-NidoranFFrontpic:    INCBIN "gfx/pics/nidoran_f/front.2bpp.lz"
+NidoranFFrontpic:    INCBIN "gfx/pics/nidoran_f/front.animated.2bpp.lz"
-PidgeyFrontpic:      INCBIN "gfx/pics/pidgey/front.2bpp.lz"
+PidgeyFrontpic:      INCBIN "gfx/pics/pidgey/front.animated.2bpp.lz"
 ParasectBackpic:     INCBIN "gfx/pics/parasect/back.2bpp.lz"
 ; 144000
 
 
 SECTION "Pics 10", ROMX, BANK[PICS_10]
 
-MisdreavusFrontpic:  INCBIN "gfx/pics/misdreavus/front.2bpp.lz"
+MisdreavusFrontpic:  INCBIN "gfx/pics/misdreavus/front.animated.2bpp.lz"
-HoundourFrontpic:    INCBIN "gfx/pics/houndour/front.2bpp.lz"
+HoundourFrontpic:    INCBIN "gfx/pics/houndour/front.animated.2bpp.lz"
-MankeyFrontpic:      INCBIN "gfx/pics/mankey/front.2bpp.lz"
+MankeyFrontpic:      INCBIN "gfx/pics/mankey/front.animated.2bpp.lz"
-CelebiFrontpic:      INCBIN "gfx/pics/celebi/front.2bpp.lz"
+CelebiFrontpic:      INCBIN "gfx/pics/celebi/front.animated.2bpp.lz"
 MediumPic:           INCBIN "gfx/trainers/medium.2bpp.lz"
-PinecoFrontpic:      INCBIN "gfx/pics/pineco/front.2bpp.lz"
+PinecoFrontpic:      INCBIN "gfx/pics/pineco/front.animated.2bpp.lz"
-KrabbyFrontpic:      INCBIN "gfx/pics/krabby/front.2bpp.lz"
+KrabbyFrontpic:      INCBIN "gfx/pics/krabby/front.animated.2bpp.lz"
 FisherPic:           INCBIN "gfx/trainers/fisher.2bpp.lz"
-JigglypuffFrontpic:  INCBIN "gfx/pics/jigglypuff/front.2bpp.lz"
+JigglypuffFrontpic:  INCBIN "gfx/pics/jigglypuff/front.animated.2bpp.lz"
-ParasFrontpic:       INCBIN "gfx/pics/paras/front.2bpp.lz"
+ParasFrontpic:       INCBIN "gfx/pics/paras/front.animated.2bpp.lz"
 NidokingBackpic:     INCBIN "gfx/pics/nidoking/back.2bpp.lz"
 PokefanmPic:         INCBIN "gfx/trainers/pokefan_m.2bpp.lz"
 BoarderPic:          INCBIN "gfx/trainers/boarder.2bpp.lz"
-PsyduckFrontpic:     INCBIN "gfx/pics/psyduck/front.2bpp.lz"
+PsyduckFrontpic:     INCBIN "gfx/pics/psyduck/front.animated.2bpp.lz"
-SquirtleFrontpic:    INCBIN "gfx/pics/squirtle/front.2bpp.lz"
+SquirtleFrontpic:    INCBIN "gfx/pics/squirtle/front.animated.2bpp.lz"
 MachampBackpic:      INCBIN "gfx/pics/machamp/back.2bpp.lz"
-KoffingFrontpic:     INCBIN "gfx/pics/koffing/front.2bpp.lz"
+KoffingFrontpic:     INCBIN "gfx/pics/koffing/front.animated.2bpp.lz"
-VenonatFrontpic:     INCBIN "gfx/pics/venonat/front.2bpp.lz"
+VenonatFrontpic:     INCBIN "gfx/pics/venonat/front.animated.2bpp.lz"
 ExeggutorBackpic:    INCBIN "gfx/pics/exeggutor/back.2bpp.lz"
-LanturnFrontpic:     INCBIN "gfx/pics/lanturn/front.2bpp.lz"
+LanturnFrontpic:     INCBIN "gfx/pics/lanturn/front.animated.2bpp.lz"
-TyrogueFrontpic:     INCBIN "gfx/pics/tyrogue/front.2bpp.lz"
+TyrogueFrontpic:     INCBIN "gfx/pics/tyrogue/front.animated.2bpp.lz"
-SkiploomFrontpic:    INCBIN "gfx/pics/skiploom/front.2bpp.lz"
+SkiploomFrontpic:    INCBIN "gfx/pics/skiploom/front.animated.2bpp.lz"
-MareepFrontpic:      INCBIN "gfx/pics/mareep/front.2bpp.lz"
+MareepFrontpic:      INCBIN "gfx/pics/mareep/front.animated.2bpp.lz"
 ChuckPic:            INCBIN "gfx/trainers/chuck.2bpp.lz"
-EeveeFrontpic:       INCBIN "gfx/pics/eevee/front.2bpp.lz"
+EeveeFrontpic:       INCBIN "gfx/pics/eevee/front.animated.2bpp.lz"
 ButterfreeBackpic:   INCBIN "gfx/pics/butterfree/back.2bpp.lz"
-ZubatFrontpic:       INCBIN "gfx/pics/zubat/front.2bpp.lz"
+ZubatFrontpic:       INCBIN "gfx/pics/zubat/front.animated.2bpp.lz"
 KimonoGirlPic:       INCBIN "gfx/trainers/kimono_girl.2bpp.lz"
 AlakazamBackpic:     INCBIN "gfx/pics/alakazam/back.2bpp.lz"
-AipomFrontpic:       INCBIN "gfx/pics/aipom/front.2bpp.lz"
+AipomFrontpic:       INCBIN "gfx/pics/aipom/front.animated.2bpp.lz"
-AbraFrontpic:        INCBIN "gfx/pics/abra/front.2bpp.lz"
+AbraFrontpic:        INCBIN "gfx/pics/abra/front.animated.2bpp.lz"
 HitmontopBackpic:    INCBIN "gfx/pics/hitmontop/back.2bpp.lz"
 CloysterBackpic:     INCBIN "gfx/pics/cloyster/back.2bpp.lz"
-HoothootFrontpic:    INCBIN "gfx/pics/hoothoot/front.2bpp.lz"
+HoothootFrontpic:    INCBIN "gfx/pics/hoothoot/front.animated.2bpp.lz"
 UnownFBackpic:       INCBIN "gfx/pics/unown_f/back.2bpp.lz"
 ; 148000
 
@@ -297,36 +297,36 @@ UnownFBackpic:       INCBIN "gfx/pics/unown_f/back.2bpp.lz"
 SECTION "Pics 11", ROMX, BANK[PICS_11]
 
 DodrioBackpic:       INCBIN "gfx/pics/dodrio/back.2bpp.lz"
-ClefairyFrontpic:    INCBIN "gfx/pics/clefairy/front.2bpp.lz"
+ClefairyFrontpic:    INCBIN "gfx/pics/clefairy/front.animated.2bpp.lz"
-SlugmaFrontpic:      INCBIN "gfx/pics/slugma/front.2bpp.lz"
+SlugmaFrontpic:      INCBIN "gfx/pics/slugma/front.animated.2bpp.lz"
-GrowlitheFrontpic:   INCBIN "gfx/pics/growlithe/front.2bpp.lz"
+GrowlitheFrontpic:   INCBIN "gfx/pics/growlithe/front.animated.2bpp.lz"
-SlowpokeFrontpic:    INCBIN "gfx/pics/slowpoke/front.2bpp.lz"
+SlowpokeFrontpic:    INCBIN "gfx/pics/slowpoke/front.animated.2bpp.lz"
-SmoochumFrontpic:    INCBIN "gfx/pics/smoochum/front.2bpp.lz"
+SmoochumFrontpic:    INCBIN "gfx/pics/smoochum/front.animated.2bpp.lz"
 JugglerPic:          INCBIN "gfx/trainers/juggler.2bpp.lz"
-MarillFrontpic:      INCBIN "gfx/pics/marill/front.2bpp.lz"
+MarillFrontpic:      INCBIN "gfx/pics/marill/front.animated.2bpp.lz"
 GuitaristPic:        INCBIN "gfx/trainers/guitarist.2bpp.lz"
 PokefanfPic:         INCBIN "gfx/trainers/pokefan_f.2bpp.lz"
 VenomothBackpic:     INCBIN "gfx/pics/venomoth/back.2bpp.lz"
 ClairPic:            INCBIN "gfx/trainers/clair.2bpp.lz"
 PokemaniacPic:       INCBIN "gfx/trainers/pokemaniac.2bpp.lz"
-OmanyteFrontpic:     INCBIN "gfx/pics/omanyte/front.2bpp.lz"
+OmanyteFrontpic:     INCBIN "gfx/pics/omanyte/front.animated.2bpp.lz"
 SkierPic:            INCBIN "gfx/trainers/skier.2bpp.lz"
-PupitarFrontpic:     INCBIN "gfx/pics/pupitar/front.2bpp.lz"
+PupitarFrontpic:     INCBIN "gfx/pics/pupitar/front.animated.2bpp.lz"
-BellsproutFrontpic:  INCBIN "gfx/pics/bellsprout/front.2bpp.lz"
+BellsproutFrontpic:  INCBIN "gfx/pics/bellsprout/front.animated.2bpp.lz"
-ShellderFrontpic:    INCBIN "gfx/pics/shellder/front.2bpp.lz"
+ShellderFrontpic:    INCBIN "gfx/pics/shellder/front.animated.2bpp.lz"
-TentacoolFrontpic:   INCBIN "gfx/pics/tentacool/front.2bpp.lz"
+TentacoolFrontpic:   INCBIN "gfx/pics/tentacool/front.animated.2bpp.lz"
-CleffaFrontpic:      INCBIN "gfx/pics/cleffa/front.2bpp.lz"
+CleffaFrontpic:      INCBIN "gfx/pics/cleffa/front.animated.2bpp.lz"
 GyaradosBackpic:     INCBIN "gfx/pics/gyarados/back.2bpp.lz"
 NinetalesBackpic:    INCBIN "gfx/pics/ninetales/back.2bpp.lz"
 YanmaBackpic:        INCBIN "gfx/pics/yanma/back.2bpp.lz"
 PinsirBackpic:       INCBIN "gfx/pics/pinsir/back.2bpp.lz"
 LassPic:             INCBIN "gfx/trainers/lass.2bpp.lz"
 ClefableBackpic:     INCBIN "gfx/pics/clefable/back.2bpp.lz"
-DoduoFrontpic:       INCBIN "gfx/pics/doduo/front.2bpp.lz"
+DoduoFrontpic:       INCBIN "gfx/pics/doduo/front.animated.2bpp.lz"
 FeraligatrBackpic:   INCBIN "gfx/pics/feraligatr/back.2bpp.lz"
-DratiniFrontpic:     INCBIN "gfx/pics/dratini/front.2bpp.lz"
+DratiniFrontpic:     INCBIN "gfx/pics/dratini/front.animated.2bpp.lz"
 MagnetonBackpic:     INCBIN "gfx/pics/magneton/back.2bpp.lz"
-QwilfishFrontpic:    INCBIN "gfx/pics/qwilfish/front.2bpp.lz"
+QwilfishFrontpic:    INCBIN "gfx/pics/qwilfish/front.animated.2bpp.lz"
 SuicuneBackpic:      INCBIN "gfx/pics/suicune/back.2bpp.lz"
 SlowkingBackpic:     INCBIN "gfx/pics/slowking/back.2bpp.lz"
 ElekidBackpic:       INCBIN "gfx/pics/elekid/back.2bpp.lz"
@@ -342,9 +342,9 @@ SECTION "Pics 12", ROMX, BANK[PICS_12]
 VenusaurBackpic:     INCBIN "gfx/pics/venusaur/back.2bpp.lz"
 MoltresBackpic:      INCBIN "gfx/pics/moltres/back.2bpp.lz"
 SunfloraBackpic:     INCBIN "gfx/pics/sunflora/back.2bpp.lz"
-PhanpyFrontpic:      INCBIN "gfx/pics/phanpy/front.2bpp.lz"
+PhanpyFrontpic:      INCBIN "gfx/pics/phanpy/front.animated.2bpp.lz"
 RhydonBackpic:       INCBIN "gfx/pics/rhydon/back.2bpp.lz"
-LarvitarFrontpic:    INCBIN "gfx/pics/larvitar/front.2bpp.lz"
+LarvitarFrontpic:    INCBIN "gfx/pics/larvitar/front.animated.2bpp.lz"
 TyranitarBackpic:    INCBIN "gfx/pics/tyranitar/back.2bpp.lz"
 SandslashBackpic:    INCBIN "gfx/pics/sandslash/back.2bpp.lz"
 SeadraBackpic:       INCBIN "gfx/pics/seadra/back.2bpp.lz"
@@ -354,10 +354,10 @@ NidoranMBackpic:     INCBIN "gfx/pics/nidoran_m/back.2bpp.lz"
 LedybaBackpic:       INCBIN "gfx/pics/ledyba/back.2bpp.lz"
 CyndaquilBackpic:    INCBIN "gfx/pics/cyndaquil/back.2bpp.lz"
 BayleefBackpic:      INCBIN "gfx/pics/bayleef/back.2bpp.lz"
-OddishFrontpic:      INCBIN "gfx/pics/oddish/front.2bpp.lz"
+OddishFrontpic:      INCBIN "gfx/pics/oddish/front.animated.2bpp.lz"
 RapidashBackpic:     INCBIN "gfx/pics/rapidash/back.2bpp.lz"
 DoduoBackpic:        INCBIN "gfx/pics/doduo/back.2bpp.lz"
-HoppipFrontpic:      INCBIN "gfx/pics/hoppip/front.2bpp.lz"
+HoppipFrontpic:      INCBIN "gfx/pics/hoppip/front.animated.2bpp.lz"
 MankeyBackpic:       INCBIN "gfx/pics/mankey/back.2bpp.lz"
 MagmarBackpic:       INCBIN "gfx/pics/magmar/back.2bpp.lz"
 HypnoBackpic:        INCBIN "gfx/pics/hypno/back.2bpp.lz"
@@ -368,7 +368,7 @@ SailorPic:           INCBIN "gfx/trainers/sailor.2bpp.lz"
 BeautyPic:           INCBIN "gfx/trainers/beauty.2bpp.lz"
 ShellderBackpic:     INCBIN "gfx/pics/shellder/back.2bpp.lz"
 ZubatBackpic:        INCBIN "gfx/pics/zubat/back.2bpp.lz"
-TeddiursaFrontpic:   INCBIN "gfx/pics/teddiursa/front.2bpp.lz"
+TeddiursaFrontpic:   INCBIN "gfx/pics/teddiursa/front.animated.2bpp.lz"
 CuboneBackpic:       INCBIN "gfx/pics/cubone/back.2bpp.lz"
 GruntmPic:           INCBIN "gfx/trainers/grunt_m.2bpp.lz"
 GloomBackpic:        INCBIN "gfx/pics/gloom/back.2bpp.lz"
@@ -378,7 +378,7 @@ BeedrillBackpic:     INCBIN "gfx/pics/beedrill/back.2bpp.lz"
 ArcanineBackpic:     INCBIN "gfx/pics/arcanine/back.2bpp.lz"
 FlareonBackpic:      INCBIN "gfx/pics/flareon/back.2bpp.lz"
 GoldeenBackpic:      INCBIN "gfx/pics/goldeen/back.2bpp.lz"
-BulbasaurFrontpic:   INCBIN "gfx/pics/bulbasaur/front.2bpp.lz"
+BulbasaurFrontpic:   INCBIN "gfx/pics/bulbasaur/front.animated.2bpp.lz"
 StarmieBackpic:      INCBIN "gfx/pics/starmie/back.2bpp.lz"
 ; 150000
 
@@ -393,23 +393,23 @@ GligarBackpic:       INCBIN "gfx/pics/gligar/back.2bpp.lz"
 TyphlosionBackpic:   INCBIN "gfx/pics/typhlosion/back.2bpp.lz"
 CharmeleonBackpic:   INCBIN "gfx/pics/charmeleon/back.2bpp.lz"
 NidoqueenBackpic:    INCBIN "gfx/pics/nidoqueen/back.2bpp.lz"
-PichuFrontpic:       INCBIN "gfx/pics/pichu/front.2bpp.lz"
+PichuFrontpic:       INCBIN "gfx/pics/pichu/front.animated.2bpp.lz"
 ElectabuzzBackpic:   INCBIN "gfx/pics/electabuzz/back.2bpp.lz"
 LedianBackpic:       INCBIN "gfx/pics/ledian/back.2bpp.lz"
 PupitarBackpic:      INCBIN "gfx/pics/pupitar/back.2bpp.lz"
 HeracrossBackpic:    INCBIN "gfx/pics/heracross/back.2bpp.lz"
-UnownDFrontpic:      INCBIN "gfx/pics/unown_d/front.2bpp.lz"
+UnownDFrontpic:      INCBIN "gfx/pics/unown_d/front.animated.2bpp.lz"
 MiltankBackpic:      INCBIN "gfx/pics/miltank/back.2bpp.lz"
 SteelixBackpic:      INCBIN "gfx/pics/steelix/back.2bpp.lz"
 PersianBackpic:      INCBIN "gfx/pics/persian/back.2bpp.lz"
 LtSurgePic:          INCBIN "gfx/trainers/lt_surge.2bpp.lz"
 TeacherPic:          INCBIN "gfx/trainers/teacher.2bpp.lz"
-EggPic:              INCBIN "gfx/pics/egg/front.2bpp.lz"
+EggPic:              INCBIN "gfx/pics/egg/front.animated.2bpp.lz"
 EeveeBackpic:        INCBIN "gfx/pics/eevee/back.2bpp.lz"
-ShuckleFrontpic:     INCBIN "gfx/pics/shuckle/front.2bpp.lz"
+ShuckleFrontpic:     INCBIN "gfx/pics/shuckle/front.animated.2bpp.lz"
 PonytaBackpic:       INCBIN "gfx/pics/ponyta/back.2bpp.lz"
-RemoraidFrontpic:    INCBIN "gfx/pics/remoraid/front.2bpp.lz"
+RemoraidFrontpic:    INCBIN "gfx/pics/remoraid/front.animated.2bpp.lz"
-PoliwagFrontpic:     INCBIN "gfx/pics/poliwag/front.2bpp.lz"
+PoliwagFrontpic:     INCBIN "gfx/pics/poliwag/front.animated.2bpp.lz"
 OnixBackpic:         INCBIN "gfx/pics/onix/back.2bpp.lz"
 KoffingBackpic:      INCBIN "gfx/pics/koffing/back.2bpp.lz"
 BirdKeeperPic:       INCBIN "gfx/trainers/bird_keeper.2bpp.lz"
@@ -423,11 +423,11 @@ MachokeBackpic:      INCBIN "gfx/pics/machoke/back.2bpp.lz"
 RaichuBackpic:       INCBIN "gfx/pics/raichu/back.2bpp.lz"
 PoliwrathBackpic:    INCBIN "gfx/pics/poliwrath/back.2bpp.lz"
 SwimmermPic:         INCBIN "gfx/trainers/swimmer_m.2bpp.lz"
-SunkernFrontpic:     INCBIN "gfx/pics/sunkern/front.2bpp.lz"
+SunkernFrontpic:     INCBIN "gfx/pics/sunkern/front.animated.2bpp.lz"
 NidorinoBackpic:     INCBIN "gfx/pics/nidorino/back.2bpp.lz"
 MysticalmanPic:      INCBIN "gfx/trainers/mysticalman.2bpp.lz"
 CooltrainerfPic:     INCBIN "gfx/trainers/cooltrainer_f.2bpp.lz"
-ElectrodeFrontpic:   INCBIN "gfx/pics/electrode/front.2bpp.lz"
+ElectrodeFrontpic:   INCBIN "gfx/pics/electrode/front.animated.2bpp.lz"
 ; 153fe3
 
 
@@ -435,7 +435,7 @@ SECTION "Pics 14", ROMX, BANK[PICS_14]
 
 SudowoodoBackpic:    INCBIN "gfx/pics/sudowoodo/back.2bpp.lz"
 FlaaffyBackpic:      INCBIN "gfx/pics/flaaffy/back.2bpp.lz"
-SentretFrontpic:     INCBIN "gfx/pics/sentret/front.2bpp.lz"
+SentretFrontpic:     INCBIN "gfx/pics/sentret/front.animated.2bpp.lz"
 TogeticBackpic:      INCBIN "gfx/pics/togetic/back.2bpp.lz"
 BugsyPic:            INCBIN "gfx/trainers/bugsy.2bpp.lz"
 MarowakBackpic:      INCBIN "gfx/pics/marowak/back.2bpp.lz"
@@ -448,7 +448,7 @@ CooltrainermPic:     INCBIN "gfx/trainers/cooltrainer_m.2bpp.lz"
 BlastoiseBackpic:    INCBIN "gfx/pics/blastoise/back.2bpp.lz"
 MisdreavusBackpic:   INCBIN "gfx/pics/misdreavus/back.2bpp.lz"
 TyrogueBackpic:      INCBIN "gfx/pics/tyrogue/back.2bpp.lz"
-GeodudeFrontpic:     INCBIN "gfx/pics/geodude/front.2bpp.lz"
+GeodudeFrontpic:     INCBIN "gfx/pics/geodude/front.animated.2bpp.lz"
 ScizorBackpic:       INCBIN "gfx/pics/scizor/back.2bpp.lz"
 GirafarigBackpic:    INCBIN "gfx/pics/girafarig/back.2bpp.lz"
 StantlerBackpic:     INCBIN "gfx/pics/stantler/back.2bpp.lz"
@@ -459,7 +459,7 @@ PrimeapeBackpic:     INCBIN "gfx/pics/primeape/back.2bpp.lz"
 FurretBackpic:       INCBIN "gfx/pics/furret/back.2bpp.lz"
 WartortleBackpic:    INCBIN "gfx/pics/wartortle/back.2bpp.lz"
 ExeggcuteBackpic:    INCBIN "gfx/pics/exeggcute/back.2bpp.lz"
-IgglybuffFrontpic:   INCBIN "gfx/pics/igglybuff/front.2bpp.lz"
+IgglybuffFrontpic:   INCBIN "gfx/pics/igglybuff/front.animated.2bpp.lz"
 RaticateBackpic:     INCBIN "gfx/pics/raticate/back.2bpp.lz"
 VulpixBackpic:       INCBIN "gfx/pics/vulpix/back.2bpp.lz"
 EkansBackpic:        INCBIN "gfx/pics/ekans/back.2bpp.lz"
@@ -467,13 +467,13 @@ SeakingBackpic:      INCBIN "gfx/pics/seaking/back.2bpp.lz"
 BurglarPic:          INCBIN "gfx/trainers/burglar.2bpp.lz"
 PsyduckBackpic:      INCBIN "gfx/pics/psyduck/back.2bpp.lz"
 PikachuBackpic:      INCBIN "gfx/pics/pikachu/back.2bpp.lz"
-KabutoFrontpic:      INCBIN "gfx/pics/kabuto/front.2bpp.lz"
+KabutoFrontpic:      INCBIN "gfx/pics/kabuto/front.animated.2bpp.lz"
 MareepBackpic:       INCBIN "gfx/pics/mareep/back.2bpp.lz"
 RemoraidBackpic:     INCBIN "gfx/pics/remoraid/back.2bpp.lz"
-DittoFrontpic:       INCBIN "gfx/pics/ditto/front.2bpp.lz"
+DittoFrontpic:       INCBIN "gfx/pics/ditto/front.animated.2bpp.lz"
 KingdraBackpic:      INCBIN "gfx/pics/kingdra/back.2bpp.lz"
 CamperPic:           INCBIN "gfx/trainers/camper.2bpp.lz"
-WooperFrontpic:      INCBIN "gfx/pics/wooper/front.2bpp.lz"
+WooperFrontpic:      INCBIN "gfx/pics/wooper/front.animated.2bpp.lz"
 ClefairyBackpic:     INCBIN "gfx/pics/clefairy/back.2bpp.lz"
 VenonatBackpic:      INCBIN "gfx/pics/venonat/back.2bpp.lz"
 BellossomBackpic:    INCBIN "gfx/pics/bellossom/back.2bpp.lz"
@@ -488,7 +488,7 @@ MewtwoBackpic:       INCBIN "gfx/pics/mewtwo/back.2bpp.lz"
 PokemonProfPic:      INCBIN "gfx/trainers/oak.2bpp.lz"
 CalPic:              INCBIN "gfx/trainers/cal.2bpp.lz"
 SwimmerfPic:         INCBIN "gfx/trainers/swimmer_f.2bpp.lz"
-DiglettFrontpic:     INCBIN "gfx/pics/diglett/front.2bpp.lz"
+DiglettFrontpic:     INCBIN "gfx/pics/diglett/front.animated.2bpp.lz"
 OfficerPic:          INCBIN "gfx/trainers/officer.2bpp.lz"
 MukBackpic:          INCBIN "gfx/pics/muk/back.2bpp.lz"
 DelibirdBackpic:     INCBIN "gfx/pics/delibird/back.2bpp.lz"
@@ -505,7 +505,7 @@ GolduckBackpic:      INCBIN "gfx/pics/golduck/back.2bpp.lz"
 WeezingBackpic:      INCBIN "gfx/pics/weezing/back.2bpp.lz"
 EnteiBackpic:        INCBIN "gfx/pics/entei/back.2bpp.lz"
 GruntfPic:           INCBIN "gfx/trainers/grunt_f.2bpp.lz"
-HorseaFrontpic:      INCBIN "gfx/pics/horsea/front.2bpp.lz"
+HorseaFrontpic:      INCBIN "gfx/pics/horsea/front.animated.2bpp.lz"
 PidgeotBackpic:      INCBIN "gfx/pics/pidgeot/back.2bpp.lz"
 HoOhBackpic:         INCBIN "gfx/pics/ho_oh/back.2bpp.lz"
 PoliwhirlBackpic:    INCBIN "gfx/pics/poliwhirl/back.2bpp.lz"
@@ -513,14 +513,14 @@ MewBackpic:          INCBIN "gfx/pics/mew/back.2bpp.lz"
 MachopBackpic:       INCBIN "gfx/pics/machop/back.2bpp.lz"
 AbraBackpic:         INCBIN "gfx/pics/abra/back.2bpp.lz"
 AerodactylBackpic:   INCBIN "gfx/pics/aerodactyl/back.2bpp.lz"
-KakunaFrontpic:      INCBIN "gfx/pics/kakuna/front.2bpp.lz"
+KakunaFrontpic:      INCBIN "gfx/pics/kakuna/front.animated.2bpp.lz"
 DugtrioBackpic:      INCBIN "gfx/pics/dugtrio/back.2bpp.lz"
 WeepinbellBackpic:   INCBIN "gfx/pics/weepinbell/back.2bpp.lz"
 NidoranFBackpic:     INCBIN "gfx/pics/nidoran_f/back.2bpp.lz"
 GravelerBackpic:     INCBIN "gfx/pics/graveler/back.2bpp.lz"
 AipomBackpic:        INCBIN "gfx/pics/aipom/back.2bpp.lz"
 EspeonBackpic:       INCBIN "gfx/pics/espeon/back.2bpp.lz"
-WeedleFrontpic:      INCBIN "gfx/pics/weedle/front.2bpp.lz"
+WeedleFrontpic:      INCBIN "gfx/pics/weedle/front.animated.2bpp.lz"
 TotodileBackpic:     INCBIN "gfx/pics/totodile/back.2bpp.lz"
 SnubbullBackpic:     INCBIN "gfx/pics/snubbull/back.2bpp.lz"
 KinglerBackpic:      INCBIN "gfx/pics/kingler/back.2bpp.lz"
@@ -529,7 +529,7 @@ RattataBackpic:      INCBIN "gfx/pics/rattata/back.2bpp.lz"
 YoungsterPic:        INCBIN "gfx/trainers/youngster.2bpp.lz"
 WillPic:             INCBIN "gfx/trainers/will.2bpp.lz"
 SchoolboyPic:        INCBIN "gfx/trainers/schoolboy.2bpp.lz"
-MagnemiteFrontpic:   INCBIN "gfx/pics/magnemite/front.2bpp.lz"
+MagnemiteFrontpic:   INCBIN "gfx/pics/magnemite/front.animated.2bpp.lz"
 ErikaPic:            INCBIN "gfx/trainers/erika.2bpp.lz"
 JaninePic:           INCBIN "gfx/trainers/janine.2bpp.lz"
 MagnemiteBackpic:    INCBIN "gfx/pics/magnemite/back.2bpp.lz"
@@ -548,7 +548,7 @@ MeowthBackpic:       INCBIN "gfx/pics/meowth/back.2bpp.lz"
 MeganiumBackpic:     INCBIN "gfx/pics/meganium/back.2bpp.lz"
 PicnickerPic:        INCBIN "gfx/trainers/picnicker.2bpp.lz"
 LickitungBackpic:    INCBIN "gfx/pics/lickitung/back.2bpp.lz"
-TogepiFrontpic:      INCBIN "gfx/pics/togepi/front.2bpp.lz"
+TogepiFrontpic:      INCBIN "gfx/pics/togepi/front.animated.2bpp.lz"
 SuperNerdPic:        INCBIN "gfx/trainers/super_nerd.2bpp.lz"
 HaunterBackpic:      INCBIN "gfx/pics/haunter/back.2bpp.lz"
 XatuBackpic:         INCBIN "gfx/pics/xatu/back.2bpp.lz"
@@ -556,12 +556,12 @@ RedPic:              INCBIN "gfx/trainers/red.2bpp.lz"
 Porygon2Backpic:     INCBIN "gfx/pics/porygon2/back.2bpp.lz"
 JasminePic:          INCBIN "gfx/trainers/jasmine.2bpp.lz"
 PinecoBackpic:       INCBIN "gfx/pics/pineco/back.2bpp.lz"
-MetapodFrontpic:     INCBIN "gfx/pics/metapod/front.2bpp.lz"
+MetapodFrontpic:     INCBIN "gfx/pics/metapod/front.animated.2bpp.lz"
 SeelBackpic:         INCBIN "gfx/pics/seel/back.2bpp.lz"
 QuagsireBackpic:     INCBIN "gfx/pics/quagsire/back.2bpp.lz"
 WhitneyPic:          INCBIN "gfx/trainers/whitney.2bpp.lz"
 JolteonBackpic:      INCBIN "gfx/pics/jolteon/back.2bpp.lz"
-CaterpieFrontpic:    INCBIN "gfx/pics/caterpie/front.2bpp.lz"
+CaterpieFrontpic:    INCBIN "gfx/pics/caterpie/front.animated.2bpp.lz"
 HoppipBackpic:       INCBIN "gfx/pics/hoppip/back.2bpp.lz"
 BluePic:             INCBIN "gfx/trainers/blue.2bpp.lz"
 GranbullBackpic:     INCBIN "gfx/pics/granbull/back.2bpp.lz"
@@ -578,16 +578,16 @@ CorsolaBackpic:      INCBIN "gfx/pics/corsola/back.2bpp.lz"
 ChinchouBackpic:     INCBIN "gfx/pics/chinchou/back.2bpp.lz"
 ChanseyBackpic:      INCBIN "gfx/pics/chansey/back.2bpp.lz"
 SkiploomBackpic:     INCBIN "gfx/pics/skiploom/back.2bpp.lz"
-SpinarakFrontpic:    INCBIN "gfx/pics/spinarak/front.2bpp.lz"
+SpinarakFrontpic:    INCBIN "gfx/pics/spinarak/front.animated.2bpp.lz"
 Rival2Pic:           INCBIN "gfx/trainers/rival2.2bpp.lz"
-UnownWFrontpic:      INCBIN "gfx/pics/unown_w/front.2bpp.lz"
+UnownWFrontpic:      INCBIN "gfx/pics/unown_w/front.animated.2bpp.lz"
 CharmanderBackpic:   INCBIN "gfx/pics/charmander/back.2bpp.lz"
 RhyhornBackpic:      INCBIN "gfx/pics/rhyhorn/back.2bpp.lz"
-UnownCFrontpic:      INCBIN "gfx/pics/unown_c/front.2bpp.lz"
+UnownCFrontpic:      INCBIN "gfx/pics/unown_c/front.animated.2bpp.lz"
 MistyPic:            INCBIN "gfx/trainers/misty.2bpp.lz"
 BlainePic:           INCBIN "gfx/trainers/blaine.2bpp.lz"
-UnownZFrontpic:      INCBIN "gfx/pics/unown_z/front.2bpp.lz"
+UnownZFrontpic:      INCBIN "gfx/pics/unown_z/front.animated.2bpp.lz"
-SwinubFrontpic:      INCBIN "gfx/pics/swinub/front.2bpp.lz"
+SwinubFrontpic:      INCBIN "gfx/pics/swinub/front.animated.2bpp.lz"
 LarvitarBackpic:     INCBIN "gfx/pics/larvitar/back.2bpp.lz"
 PorygonBackpic:      INCBIN "gfx/pics/porygon/back.2bpp.lz"
 UnownHBackpic:       INCBIN "gfx/pics/unown_h/back.2bpp.lz"
@@ -611,21 +611,21 @@ PidgeottoBackpic:    INCBIN "gfx/pics/pidgeotto/back.2bpp.lz"
 StaryuBackpic:       INCBIN "gfx/pics/staryu/back.2bpp.lz"
 MrMimeBackpic:       INCBIN "gfx/pics/mr__mime/back.2bpp.lz"
 CaterpieBackpic:     INCBIN "gfx/pics/caterpie/back.2bpp.lz"
-VoltorbFrontpic:     INCBIN "gfx/pics/voltorb/front.2bpp.lz"
+VoltorbFrontpic:     INCBIN "gfx/pics/voltorb/front.animated.2bpp.lz"
 LugiaBackpic:        INCBIN "gfx/pics/lugia/back.2bpp.lz"
 PrycePic:            INCBIN "gfx/trainers/pryce.2bpp.lz"
 BrockPic:            INCBIN "gfx/trainers/brock.2bpp.lz"
-UnownGFrontpic:      INCBIN "gfx/pics/unown_g/front.2bpp.lz"
+UnownGFrontpic:      INCBIN "gfx/pics/unown_g/front.animated.2bpp.lz"
 ArbokBackpic:        INCBIN "gfx/pics/arbok/back.2bpp.lz"
 PolitoedBackpic:     INCBIN "gfx/pics/politoed/back.2bpp.lz"
 DragoniteBackpic:    INCBIN "gfx/pics/dragonite/back.2bpp.lz"
 HitmonleeBackpic:    INCBIN "gfx/pics/hitmonlee/back.2bpp.lz"
-NatuFrontpic:        INCBIN "gfx/pics/natu/front.2bpp.lz"
+NatuFrontpic:        INCBIN "gfx/pics/natu/front.animated.2bpp.lz"
 UrsaringBackpic:     INCBIN "gfx/pics/ursaring/back.2bpp.lz"
 SagePic:             INCBIN "gfx/trainers/sage.2bpp.lz"
 TeddiursaBackpic:    INCBIN "gfx/pics/teddiursa/back.2bpp.lz"
 PhanpyBackpic:       INCBIN "gfx/pics/phanpy/back.2bpp.lz"
-UnownVFrontpic:      INCBIN "gfx/pics/unown_v/front.2bpp.lz"
+UnownVFrontpic:      INCBIN "gfx/pics/unown_v/front.animated.2bpp.lz"
 KakunaBackpic:       INCBIN "gfx/pics/kakuna/back.2bpp.lz"
 WobbuffetBackpic:    INCBIN "gfx/pics/wobbuffet/back.2bpp.lz"
 TogepiBackpic:       INCBIN "gfx/pics/togepi/back.2bpp.lz"
@@ -635,16 +635,16 @@ AmpharosBackpic:     INCBIN "gfx/pics/ampharos/back.2bpp.lz"
 IgglybuffBackpic:    INCBIN "gfx/pics/igglybuff/back.2bpp.lz"
 AzumarillBackpic:    INCBIN "gfx/pics/azumarill/back.2bpp.lz"
 OctilleryBackpic:    INCBIN "gfx/pics/octillery/back.2bpp.lz"
-UnownSFrontpic:      INCBIN "gfx/pics/unown_s/front.2bpp.lz"
+UnownSFrontpic:      INCBIN "gfx/pics/unown_s/front.animated.2bpp.lz"
 HorseaBackpic:       INCBIN "gfx/pics/horsea/back.2bpp.lz"
 SentretBackpic:      INCBIN "gfx/pics/sentret/back.2bpp.lz"
-UnownOFrontpic:      INCBIN "gfx/pics/unown_o/front.2bpp.lz"
+UnownOFrontpic:      INCBIN "gfx/pics/unown_o/front.animated.2bpp.lz"
-UnownTFrontpic:      INCBIN "gfx/pics/unown_t/front.2bpp.lz"
+UnownTFrontpic:      INCBIN "gfx/pics/unown_t/front.animated.2bpp.lz"
 WigglytuffBackpic:   INCBIN "gfx/pics/wigglytuff/back.2bpp.lz"
 ArticunoBackpic:     INCBIN "gfx/pics/articuno/back.2bpp.lz"
 DittoBackpic:        INCBIN "gfx/pics/ditto/back.2bpp.lz"
 WeedleBackpic:       INCBIN "gfx/pics/weedle/back.2bpp.lz"
-UnownHFrontpic:      INCBIN "gfx/pics/unown_h/front.2bpp.lz"
+UnownHFrontpic:      INCBIN "gfx/pics/unown_h/front.animated.2bpp.lz"
 CleffaBackpic:       INCBIN "gfx/pics/cleffa/back.2bpp.lz"
 DrowzeeBackpic:      INCBIN "gfx/pics/drowzee/back.2bpp.lz"
 GastlyBackpic:       INCBIN "gfx/pics/gastly/back.2bpp.lz"
@@ -664,45 +664,45 @@ SECTION "Pics 18", ROMX, BANK[PICS_18]
 
 SpinarakBackpic:     INCBIN "gfx/pics/spinarak/back.2bpp.lz"
 RaikouBackpic:       INCBIN "gfx/pics/raikou/back.2bpp.lz"
-UnownKFrontpic:      INCBIN "gfx/pics/unown_k/front.2bpp.lz"
+UnownKFrontpic:      INCBIN "gfx/pics/unown_k/front.animated.2bpp.lz"
 HoundourBackpic:     INCBIN "gfx/pics/houndour/back.2bpp.lz"
 PoliwagBackpic:      INCBIN "gfx/pics/poliwag/back.2bpp.lz"
 SquirtleBackpic:     INCBIN "gfx/pics/squirtle/back.2bpp.lz"
 ShuckleBackpic:      INCBIN "gfx/pics/shuckle/back.2bpp.lz"
 DewgongBackpic:      INCBIN "gfx/pics/dewgong/back.2bpp.lz"
-UnownBFrontpic:      INCBIN "gfx/pics/unown_b/front.2bpp.lz"
+UnownBFrontpic:      INCBIN "gfx/pics/unown_b/front.animated.2bpp.lz"
 SlowpokeBackpic:     INCBIN "gfx/pics/slowpoke/back.2bpp.lz"
 DunsparceBackpic:    INCBIN "gfx/pics/dunsparce/back.2bpp.lz"
 DonphanBackpic:      INCBIN "gfx/pics/donphan/back.2bpp.lz"
 WooperBackpic:       INCBIN "gfx/pics/wooper/back.2bpp.lz"
 TaurosBackpic:       INCBIN "gfx/pics/tauros/back.2bpp.lz"
-UnownXFrontpic:      INCBIN "gfx/pics/unown_x/front.2bpp.lz"
+UnownXFrontpic:      INCBIN "gfx/pics/unown_x/front.animated.2bpp.lz"
-UnownNFrontpic:      INCBIN "gfx/pics/unown_n/front.2bpp.lz"
+UnownNFrontpic:      INCBIN "gfx/pics/unown_n/front.animated.2bpp.lz"
 TangelaBackpic:      INCBIN "gfx/pics/tangela/back.2bpp.lz"
 VoltorbBackpic:      INCBIN "gfx/pics/voltorb/back.2bpp.lz"
-UnownJFrontpic:      INCBIN "gfx/pics/unown_j/front.2bpp.lz"
+UnownJFrontpic:      INCBIN "gfx/pics/unown_j/front.animated.2bpp.lz"
 MantineBackpic:      INCBIN "gfx/pics/mantine/back.2bpp.lz"
-UnownLFrontpic:      INCBIN "gfx/pics/unown_l/front.2bpp.lz"
+UnownLFrontpic:      INCBIN "gfx/pics/unown_l/front.animated.2bpp.lz"
 PiloswineBackpic:    INCBIN "gfx/pics/piloswine/back.2bpp.lz"
-UnownMFrontpic:      INCBIN "gfx/pics/unown_m/front.2bpp.lz"
+UnownMFrontpic:      INCBIN "gfx/pics/unown_m/front.animated.2bpp.lz"
-UnownFFrontpic:      INCBIN "gfx/pics/unown_f/front.2bpp.lz"
+UnownFFrontpic:      INCBIN "gfx/pics/unown_f/front.animated.2bpp.lz"
 NatuBackpic:         INCBIN "gfx/pics/natu/back.2bpp.lz"
-UnownAFrontpic:      INCBIN "gfx/pics/unown_a/front.2bpp.lz"
+UnownAFrontpic:      INCBIN "gfx/pics/unown_a/front.animated.2bpp.lz"
 GolemBackpic:        INCBIN "gfx/pics/golem/back.2bpp.lz"
-UnownUFrontpic:      INCBIN "gfx/pics/unown_u/front.2bpp.lz"
+UnownUFrontpic:      INCBIN "gfx/pics/unown_u/front.animated.2bpp.lz"
 DiglettBackpic:      INCBIN "gfx/pics/diglett/back.2bpp.lz"
-UnownQFrontpic:      INCBIN "gfx/pics/unown_q/front.2bpp.lz"
+UnownQFrontpic:      INCBIN "gfx/pics/unown_q/front.animated.2bpp.lz"
-UnownPFrontpic:      INCBIN "gfx/pics/unown_p/front.2bpp.lz"
+UnownPFrontpic:      INCBIN "gfx/pics/unown_p/front.animated.2bpp.lz"
 UnownCBackpic:       INCBIN "gfx/pics/unown_c/back.2bpp.lz"
 JynxBackpic:         INCBIN "gfx/pics/jynx/back.2bpp.lz"
 GolbatBackpic:       INCBIN "gfx/pics/golbat/back.2bpp.lz"
-UnownYFrontpic:      INCBIN "gfx/pics/unown_y/front.2bpp.lz"
+UnownYFrontpic:      INCBIN "gfx/pics/unown_y/front.animated.2bpp.lz"
 UnownGBackpic:       INCBIN "gfx/pics/unown_g/back.2bpp.lz"
-UnownIFrontpic:      INCBIN "gfx/pics/unown_i/front.2bpp.lz"
+UnownIFrontpic:      INCBIN "gfx/pics/unown_i/front.animated.2bpp.lz"
 UnownVBackpic:       INCBIN "gfx/pics/unown_v/back.2bpp.lz"
 ForretressBackpic:   INCBIN "gfx/pics/forretress/back.2bpp.lz"
 UnownSBackpic:       INCBIN "gfx/pics/unown_s/back.2bpp.lz"
-UnownRFrontpic:      INCBIN "gfx/pics/unown_r/front.2bpp.lz"
+UnownRFrontpic:      INCBIN "gfx/pics/unown_r/front.animated.2bpp.lz"
 UnownEBackpic:       INCBIN "gfx/pics/unown_e/back.2bpp.lz"
 UnownJBackpic:       INCBIN "gfx/pics/unown_j/back.2bpp.lz"
 UnownBBackpic:       INCBIN "gfx/pics/unown_b/back.2bpp.lz"
@@ -731,45 +731,45 @@ SECTION "Pics 19", ROMX, BANK[PICS_19]
 
 INCBIN "gfx/pics/spinarak/back.2bpp.lz"
 INCBIN "gfx/pics/raikou/back.2bpp.lz"
-INCBIN "gfx/pics/unown_k/front.2bpp.lz"
+INCBIN "gfx/pics/unown_k/front.animated.2bpp.lz"
 INCBIN "gfx/pics/houndour/back.2bpp.lz"
 INCBIN "gfx/pics/poliwag/back.2bpp.lz"
 INCBIN "gfx/pics/squirtle/back.2bpp.lz"
 INCBIN "gfx/pics/shuckle/back.2bpp.lz"
 INCBIN "gfx/pics/dewgong/back.2bpp.lz"
-INCBIN "gfx/pics/unown_b/front.2bpp.lz"
+INCBIN "gfx/pics/unown_b/front.animated.2bpp.lz"
 INCBIN "gfx/pics/slowpoke/back.2bpp.lz"
 INCBIN "gfx/pics/dunsparce/back.2bpp.lz"
 INCBIN "gfx/pics/donphan/back.2bpp.lz"
 INCBIN "gfx/pics/wooper/back.2bpp.lz"
 INCBIN "gfx/pics/tauros/back.2bpp.lz"
-INCBIN "gfx/pics/unown_x/front.2bpp.lz"
+INCBIN "gfx/pics/unown_x/front.animated.2bpp.lz"
-INCBIN "gfx/pics/unown_n/front.2bpp.lz"
+INCBIN "gfx/pics/unown_n/front.animated.2bpp.lz"
 INCBIN "gfx/pics/tangela/back.2bpp.lz"
 INCBIN "gfx/pics/voltorb/back.2bpp.lz"
-INCBIN "gfx/pics/unown_j/front.2bpp.lz"
+INCBIN "gfx/pics/unown_j/front.animated.2bpp.lz"
 INCBIN "gfx/pics/mantine/back.2bpp.lz"
-INCBIN "gfx/pics/unown_l/front.2bpp.lz"
+INCBIN "gfx/pics/unown_l/front.animated.2bpp.lz"
 INCBIN "gfx/pics/piloswine/back.2bpp.lz"
-INCBIN "gfx/pics/unown_m/front.2bpp.lz"
+INCBIN "gfx/pics/unown_m/front.animated.2bpp.lz"
-INCBIN "gfx/pics/unown_f/front.2bpp.lz"
+INCBIN "gfx/pics/unown_f/front.animated.2bpp.lz"
 INCBIN "gfx/pics/natu/back.2bpp.lz"
-INCBIN "gfx/pics/unown_a/front.2bpp.lz"
+INCBIN "gfx/pics/unown_a/front.animated.2bpp.lz"
 INCBIN "gfx/pics/golem/back.2bpp.lz"
-INCBIN "gfx/pics/unown_u/front.2bpp.lz"
+INCBIN "gfx/pics/unown_u/front.animated.2bpp.lz"
 INCBIN "gfx/pics/diglett/back.2bpp.lz"
-INCBIN "gfx/pics/unown_q/front.2bpp.lz"
+INCBIN "gfx/pics/unown_q/front.animated.2bpp.lz"
-INCBIN "gfx/pics/unown_p/front.2bpp.lz"
+INCBIN "gfx/pics/unown_p/front.animated.2bpp.lz"
 INCBIN "gfx/pics/unown_c/back.2bpp.lz"
 INCBIN "gfx/pics/jynx/back.2bpp.lz"
 INCBIN "gfx/pics/golbat/back.2bpp.lz"
-INCBIN "gfx/pics/unown_y/front.2bpp.lz"
+INCBIN "gfx/pics/unown_y/front.animated.2bpp.lz"
 INCBIN "gfx/pics/unown_g/back.2bpp.lz"
-INCBIN "gfx/pics/unown_i/front.2bpp.lz"
+INCBIN "gfx/pics/unown_i/front.animated.2bpp.lz"
 INCBIN "gfx/pics/unown_v/back.2bpp.lz"
 INCBIN "gfx/pics/forretress/back.2bpp.lz"
 INCBIN "gfx/pics/unown_s/back.2bpp.lz"
-INCBIN "gfx/pics/unown_r/front.2bpp.lz"
+INCBIN "gfx/pics/unown_r/front.animated.2bpp.lz"
 INCBIN "gfx/pics/unown_e/back.2bpp.lz"
 INCBIN "gfx/pics/unown_j/back.2bpp.lz"
 INCBIN "gfx/pics/unown_b/back.2bpp.lz"

gfx/pics/abra/normal.pal

@@ -1,4 +0,0 @@
-
-	RGB 28, 19, 03
-	RGB 12, 08, 10
-

gfx/pics/aerodactyl/normal.pal

@@ -1,4 +0,0 @@
-
-	RGB 19, 19, 15
-	RGB 12, 11, 11
-

gfx/pics/aipom/normal.pal

@@ -1,4 +0,0 @@
-
-	RGB 29, 23, 12
-	RGB 12, 04, 14
-

gfx/pics/alakazam/normal.pal

@@ -1,4 +0,0 @@
-
-	RGB 28, 19, 03
-	RGB 12, 08, 10
-

gfx/pics/ampharos/normal.pal

@@ -1,4 +0,0 @@
-
-	RGB 31, 31, 02
-	RGB 21, 10, 01
-

gfx/pics/arbok/normal.pal

@@ -1,4 +0,0 @@
-
-	RGB 18, 08, 19
-	RGB 22, 04, 09
-

gfx/pics/arcanine/normal.pal

@@ -1,4 +0,0 @@
-
-	RGB 31, 23, 07
-	RGB 24, 06, 03
-

gfx/pics/ariados/normal.pal

@@ -1,4 +0,0 @@
-
-	RGB 27, 10, 08
-	RGB 14, 06, 20
-

gfx/pics/articuno/normal.pal

@@ -1,4 +0,0 @@
-
-	RGB 11, 21, 31
-	RGB 08, 11, 16
-

gfx/pics/azumarill/normal.pal

@@ -1,4 +0,0 @@
-
-	RGB 10, 15, 24
-	RGB 22, 07, 04
-

gfx/pics/bayleef/normal.pal

@@ -1,4 +0,0 @@
-
-	RGB 27, 25, 06
-	RGB 11, 16, 02
-

gfx/pics/beedrill/normal.pal

@@ -1,4 +0,0 @@
-
-	RGB 31, 19, 04
-	RGB 30, 04, 01
-

gfx/pics/bellossom/normal.pal

@@ -1,4 +0,0 @@
-
-	RGB 27, 08, 06
-	RGB 06, 17, 08
-

gfx/pics/bellsprout/normal.pal

@@ -1,4 +0,0 @@
-
-	RGB 20, 31, 07
-	RGB 27, 10, 09
-

gfx/pics/blastoise/normal.pal

@@ -1,4 +0,0 @@
-
-	RGB 24, 20, 03
-	RGB 08, 11, 31
-

gfx/pics/blissey/normal.pal

@@ -1,4 +0,0 @@
-
-	RGB 28, 12, 14
-	RGB 18, 05, 08
-

gfx/pics/bulbasaur/normal.pal

@@ -1,4 +0,0 @@
-
-	RGB 12, 31, 11
-	RGB 31, 10, 06
-

gfx/pics/butterfree/normal.pal

@@ -1,4 +0,0 @@
-
-	RGB 18, 25, 31
-	RGB 26, 05, 13
-

gfx/pics/caterpie/normal.pal

@@ -1,4 +0,0 @@
-
-	RGB 12, 22, 06
-	RGB 31, 09, 15
-