Use "battle_anims" and "sprite_anims" for clarity, not just "anims"

87 files changed, 44 insertions, 1336 deletions

diff --git a/gfx/anims.asm b/gfx/anims.asm
deleted file mode 100644
index 8306518cc..000000000
--- a/gfx/anims.asm
+++ /dev/null
@@ -1,41 +0,0 @@
-AnimObj00GFX: ; 84a2e
-AnimObjHitGFX:       INCBIN "gfx/anims/hit.2bpp.lz"
-AnimObjCutGFX:       INCBIN "gfx/anims/cut.2bpp.lz"
-AnimObjFireGFX:      INCBIN "gfx/anims/fire.2bpp.lz"
-AnimObjWaterGFX:     INCBIN "gfx/anims/water.2bpp.lz"
-AnimObjLightningGFX: INCBIN "gfx/anims/lightning.2bpp.lz"
-AnimObjSmokeGFX:     INCBIN "gfx/anims/smoke.2bpp.lz"
-AnimObjExplosionGFX: INCBIN "gfx/anims/explosion.2bpp.lz"
-AnimObjIceGFX:       INCBIN "gfx/anims/ice.2bpp.lz"
-AnimObjRocksGFX:     INCBIN "gfx/anims/rocks.2bpp.lz"
-AnimObjPoisonGFX:    INCBIN "gfx/anims/poison.2bpp.lz"
-AnimObjPlantGFX:     INCBIN "gfx/anims/plant.2bpp.lz"
-AnimObjPokeBallGFX:  INCBIN "gfx/anims/pokeball.2bpp.lz"
-AnimObjBubbleGFX:    INCBIN "gfx/anims/bubble.2bpp.lz"
-AnimObjNoiseGFX:     INCBIN "gfx/anims/noise.2bpp.lz"
-AnimObjReflectGFX:   INCBIN "gfx/anims/reflect.2bpp.lz"
-AnimObjPowderGFX:    INCBIN "gfx/anims/powder.2bpp.lz"
-AnimObjBeamGFX:      INCBIN "gfx/anims/beam.2bpp.lz"
-AnimObjSpeedGFX:     INCBIN "gfx/anims/speed.2bpp.lz"
-AnimObjChargeGFX:    INCBIN "gfx/anims/charge.2bpp.lz"
-AnimObjWindGFX:      INCBIN "gfx/anims/wind.2bpp.lz"
-AnimObjWhipGFX:      INCBIN "gfx/anims/whip.2bpp.lz"
-AnimObjRopeGFX:      INCBIN "gfx/anims/rope.2bpp.lz"
-AnimObjEggGFX:       INCBIN "gfx/anims/egg.2bpp.lz"
-AnimObjPsychicGFX:   INCBIN "gfx/anims/psychic.2bpp.lz"
-AnimObjSandGFX:      INCBIN "gfx/anims/sand.2bpp.lz"
-AnimObjWebGFX:       INCBIN "gfx/anims/web.2bpp.lz"
-AnimObjHazeGFX:      INCBIN "gfx/anims/haze.2bpp.lz"
-AnimObjHornGFX:      INCBIN "gfx/anims/horn.2bpp.lz"
-AnimObjFlowerGFX:    INCBIN "gfx/anims/flower.2bpp.lz"
-AnimObjMiscGFX:      INCBIN "gfx/anims/misc.2bpp.lz"
-AnimObjSkyAttackGFX: INCBIN "gfx/anims/skyattack.2bpp.lz"
-AnimObjGlobeGFX:     INCBIN "gfx/anims/globe.2bpp.lz"
-AnimObjShapesGFX:    INCBIN "gfx/anims/shapes.2bpp.lz"
-AnimObjStatusGFX:    INCBIN "gfx/anims/status.2bpp.lz"
-AnimObjObjectsGFX:   INCBIN "gfx/anims/objects.2bpp.lz"
-AnimObjShineGFX:     INCBIN "gfx/anims/shine.2bpp.lz"
-AnimObjAngelsGFX:    INCBIN "gfx/anims/angels.2bpp.lz"
-AnimObjWaveGFX:      INCBIN "gfx/anims/wave.2bpp.lz"
-AnimObjAeroblastGFX: INCBIN "gfx/anims/aeroblast.2bpp.lz"
-; 8640e
diff --git a/gfx/battle_anims.asm b/gfx/battle_anims.asm
new file mode 100644
index 000000000..52ac4e6b5
--- /dev/null
+++ b/gfx/battle_anims.asm
@@ -0,0 +1,41 @@
+AnimObj00GFX: ; 84a2e
+AnimObjHitGFX:       INCBIN "gfx/battle_anims/hit.2bpp.lz"
+AnimObjCutGFX:       INCBIN "gfx/battle_anims/cut.2bpp.lz"
+AnimObjFireGFX:      INCBIN "gfx/battle_anims/fire.2bpp.lz"
+AnimObjWaterGFX:     INCBIN "gfx/battle_anims/water.2bpp.lz"
+AnimObjLightningGFX: INCBIN "gfx/battle_anims/lightning.2bpp.lz"
+AnimObjSmokeGFX:     INCBIN "gfx/battle_anims/smoke.2bpp.lz"
+AnimObjExplosionGFX: INCBIN "gfx/battle_anims/explosion.2bpp.lz"
+AnimObjIceGFX:       INCBIN "gfx/battle_anims/ice.2bpp.lz"
+AnimObjRocksGFX:     INCBIN "gfx/battle_anims/rocks.2bpp.lz"
+AnimObjPoisonGFX:    INCBIN "gfx/battle_anims/poison.2bpp.lz"
+AnimObjPlantGFX:     INCBIN "gfx/battle_anims/plant.2bpp.lz"
+AnimObjPokeBallGFX:  INCBIN "gfx/battle_anims/pokeball.2bpp.lz"
+AnimObjBubbleGFX:    INCBIN "gfx/battle_anims/bubble.2bpp.lz"
+AnimObjNoiseGFX:     INCBIN "gfx/battle_anims/noise.2bpp.lz"
+AnimObjReflectGFX:   INCBIN "gfx/battle_anims/reflect.2bpp.lz"
+AnimObjPowderGFX:    INCBIN "gfx/battle_anims/powder.2bpp.lz"
+AnimObjBeamGFX:      INCBIN "gfx/battle_anims/beam.2bpp.lz"
+AnimObjSpeedGFX:     INCBIN "gfx/battle_anims/speed.2bpp.lz"
+AnimObjChargeGFX:    INCBIN "gfx/battle_anims/charge.2bpp.lz"
+AnimObjWindGFX:      INCBIN "gfx/battle_anims/wind.2bpp.lz"
+AnimObjWhipGFX:      INCBIN "gfx/battle_anims/whip.2bpp.lz"
+AnimObjRopeGFX:      INCBIN "gfx/battle_anims/rope.2bpp.lz"
+AnimObjEggGFX:       INCBIN "gfx/battle_anims/egg.2bpp.lz"
+AnimObjPsychicGFX:   INCBIN "gfx/battle_anims/psychic.2bpp.lz"
+AnimObjSandGFX:      INCBIN "gfx/battle_anims/sand.2bpp.lz"
+AnimObjWebGFX:       INCBIN "gfx/battle_anims/web.2bpp.lz"
+AnimObjHazeGFX:      INCBIN "gfx/battle_anims/haze.2bpp.lz"
+AnimObjHornGFX:      INCBIN "gfx/battle_anims/horn.2bpp.lz"
+AnimObjFlowerGFX:    INCBIN "gfx/battle_anims/flower.2bpp.lz"
+AnimObjMiscGFX:      INCBIN "gfx/battle_anims/misc.2bpp.lz"
+AnimObjSkyAttackGFX: INCBIN "gfx/battle_anims/skyattack.2bpp.lz"
+AnimObjGlobeGFX:     INCBIN "gfx/battle_anims/globe.2bpp.lz"
+AnimObjShapesGFX:    INCBIN "gfx/battle_anims/shapes.2bpp.lz"
+AnimObjStatusGFX:    INCBIN "gfx/battle_anims/status.2bpp.lz"
+AnimObjObjectsGFX:   INCBIN "gfx/battle_anims/objects.2bpp.lz"
+AnimObjShineGFX:     INCBIN "gfx/battle_anims/shine.2bpp.lz"
+AnimObjAngelsGFX:    INCBIN "gfx/battle_anims/angels.2bpp.lz"
+AnimObjWaveGFX:      INCBIN "gfx/battle_anims/wave.2bpp.lz"
+AnimObjAeroblastGFX: INCBIN "gfx/battle_anims/aeroblast.2bpp.lz"
+; 8640e
diff --git a/gfx/anims/aeroblast.2bpp.lz.2f07c4ea b/gfx/battle_anims/aeroblast.2bpp.lz.2f07c4ea
index 5e203cb63..5e203cb63 100644
--- a/gfx/anims/aeroblast.2bpp.lz.2f07c4ea
+++ b/gfx/battle_anims/aeroblast.2bpp.lz.2f07c4ea
diff --git a/gfx/anims/aeroblast.png b/gfx/battle_anims/aeroblast.png
index 1fdc07c2f..1fdc07c2f 100644
--- a/gfx/anims/aeroblast.png
+++ b/gfx/battle_anims/aeroblast.png
diff --git a/gfx/anims/angels.2bpp.lz.b026d81e b/gfx/battle_anims/angels.2bpp.lz.b026d81e
index 61d89d224..61d89d224 100644
--- a/gfx/anims/angels.2bpp.lz.b026d81e
+++ b/gfx/battle_anims/angels.2bpp.lz.b026d81e
diff --git a/gfx/anims/angels.png b/gfx/battle_anims/angels.png
index ef38c61d2..ef38c61d2 100644
--- a/gfx/anims/angels.png
+++ b/gfx/battle_anims/angels.png
diff --git a/gfx/anims/beam.2bpp.lz.80b6d613 b/gfx/battle_anims/beam.2bpp.lz.80b6d613
index 1ce9ab82c..1ce9ab82c 100644
--- a/gfx/anims/beam.2bpp.lz.80b6d613
+++ b/gfx/battle_anims/beam.2bpp.lz.80b6d613
diff --git a/gfx/anims/beam.png b/gfx/battle_anims/beam.png
index 32a3b1967..32a3b1967 100755
--- a/gfx/anims/beam.png
+++ b/gfx/battle_anims/beam.png
diff --git a/gfx/anims/bubble.2bpp.lz.03b8ac99 b/gfx/battle_anims/bubble.2bpp.lz.03b8ac99
index 3d546191a..3d546191a 100644
--- a/gfx/anims/bubble.2bpp.lz.03b8ac99
+++ b/gfx/battle_anims/bubble.2bpp.lz.03b8ac99
diff --git a/gfx/anims/bubble.png b/gfx/battle_anims/bubble.png
index b6febb0a8..b6febb0a8 100644
--- a/gfx/anims/bubble.png
+++ b/gfx/battle_anims/bubble.png
diff --git a/gfx/anims/charge.2bpp.lz.95d3ea98 b/gfx/battle_anims/charge.2bpp.lz.95d3ea98
index 32c82243c..32c82243c 100644
--- a/gfx/anims/charge.2bpp.lz.95d3ea98
+++ b/gfx/battle_anims/charge.2bpp.lz.95d3ea98
diff --git a/gfx/anims/charge.png b/gfx/battle_anims/charge.png
index 90cb72f9f..90cb72f9f 100644
--- a/gfx/anims/charge.png
+++ b/gfx/battle_anims/charge.png
diff --git a/gfx/anims/cut.2bpp.lz.03d343ed b/gfx/battle_anims/cut.2bpp.lz.03d343ed
index 740a48799..740a48799 100644
--- a/gfx/anims/cut.2bpp.lz.03d343ed
+++ b/gfx/battle_anims/cut.2bpp.lz.03d343ed
diff --git a/gfx/anims/cut.png b/gfx/battle_anims/cut.png
index e227ad413..e227ad413 100644
--- a/gfx/anims/cut.png
+++ b/gfx/battle_anims/cut.png
diff --git a/gfx/anims/egg.2bpp.lz.41dd1a53 b/gfx/battle_anims/egg.2bpp.lz.41dd1a53
index fb55f2edc..fb55f2edc 100644
--- a/gfx/anims/egg.2bpp.lz.41dd1a53
+++ b/gfx/battle_anims/egg.2bpp.lz.41dd1a53
diff --git a/gfx/anims/egg.png b/gfx/battle_anims/egg.png
index 38aab505d..38aab505d 100644
--- a/gfx/anims/egg.png
+++ b/gfx/battle_anims/egg.png
diff --git a/gfx/anims/explosion.2bpp.lz.55fc334f b/gfx/battle_anims/explosion.2bpp.lz.55fc334f
index 4303302a1..4303302a1 100644
--- a/gfx/anims/explosion.2bpp.lz.55fc334f
+++ b/gfx/battle_anims/explosion.2bpp.lz.55fc334f
diff --git a/gfx/anims/explosion.png b/gfx/battle_anims/explosion.png
index 0af9f1a0d..0af9f1a0d 100644
--- a/gfx/anims/explosion.png
+++ b/gfx/battle_anims/explosion.png
diff --git a/gfx/anims/fire.2bpp.lz.d7701cda b/gfx/battle_anims/fire.2bpp.lz.d7701cda
index e15e9f9bb..e15e9f9bb 100644
--- a/gfx/anims/fire.2bpp.lz.d7701cda
+++ b/gfx/battle_anims/fire.2bpp.lz.d7701cda
diff --git a/gfx/anims/fire.png b/gfx/battle_anims/fire.png
index 19f01141b..19f01141b 100644
--- a/gfx/anims/fire.png
+++ b/gfx/battle_anims/fire.png
diff --git a/gfx/anims/flower.2bpp.lz.1bc2e9d2 b/gfx/battle_anims/flower.2bpp.lz.1bc2e9d2
index ef628afb4..ef628afb4 100644
--- a/gfx/anims/flower.2bpp.lz.1bc2e9d2
+++ b/gfx/battle_anims/flower.2bpp.lz.1bc2e9d2
diff --git a/gfx/anims/flower.png b/gfx/battle_anims/flower.png
index 61b4f58ce..61b4f58ce 100644
--- a/gfx/anims/flower.png
+++ b/gfx/battle_anims/flower.png
diff --git a/gfx/anims/globe.2bpp.lz.710dbb8e b/gfx/battle_anims/globe.2bpp.lz.710dbb8e
index 99fa15c6f..99fa15c6f 100644
--- a/gfx/anims/globe.2bpp.lz.710dbb8e
+++ b/gfx/battle_anims/globe.2bpp.lz.710dbb8e
diff --git a/gfx/anims/globe.png b/gfx/battle_anims/globe.png
index 8d3a35683..8d3a35683 100644
--- a/gfx/anims/globe.png
+++ b/gfx/battle_anims/globe.png
diff --git a/gfx/anims/haze.2bpp.lz.91424607 b/gfx/battle_anims/haze.2bpp.lz.91424607
index e0cdc644c..e0cdc644c 100644
--- a/gfx/anims/haze.2bpp.lz.91424607
+++ b/gfx/battle_anims/haze.2bpp.lz.91424607
diff --git a/gfx/anims/haze.png b/gfx/battle_anims/haze.png
index 8a870ba98..8a870ba98 100644
--- a/gfx/anims/haze.png
+++ b/gfx/battle_anims/haze.png
diff --git a/gfx/anims/hit.2bpp.lz.2b3c83f2 b/gfx/battle_anims/hit.2bpp.lz.2b3c83f2
index 5d9ffbe5d..5d9ffbe5d 100644
--- a/gfx/anims/hit.2bpp.lz.2b3c83f2
+++ b/gfx/battle_anims/hit.2bpp.lz.2b3c83f2
diff --git a/gfx/anims/hit.png b/gfx/battle_anims/hit.png
index 228066331..228066331 100644
--- a/gfx/anims/hit.png
+++ b/gfx/battle_anims/hit.png
diff --git a/gfx/anims/horn.2bpp.lz.48908aae b/gfx/battle_anims/horn.2bpp.lz.48908aae
index a92f74796..a92f74796 100644
--- a/gfx/anims/horn.2bpp.lz.48908aae
+++ b/gfx/battle_anims/horn.2bpp.lz.48908aae
diff --git a/gfx/anims/horn.png b/gfx/battle_anims/horn.png
index 56e8ca241..56e8ca241 100644
--- a/gfx/anims/horn.png
+++ b/gfx/battle_anims/horn.png
diff --git a/gfx/anims/ice.2bpp.lz.664d900f b/gfx/battle_anims/ice.2bpp.lz.664d900f
index 3d059700b..3d059700b 100644
--- a/gfx/anims/ice.2bpp.lz.664d900f
+++ b/gfx/battle_anims/ice.2bpp.lz.664d900f
diff --git a/gfx/anims/ice.png b/gfx/battle_anims/ice.png
index 62a67641e..62a67641e 100644
--- a/gfx/anims/ice.png
+++ b/gfx/battle_anims/ice.png
diff --git a/gfx/anims/lightning.2bpp.lz.a88fc131 b/gfx/battle_anims/lightning.2bpp.lz.a88fc131
index 81de5850f..81de5850f 100644
--- a/gfx/anims/lightning.2bpp.lz.a88fc131
+++ b/gfx/battle_anims/lightning.2bpp.lz.a88fc131
diff --git a/gfx/anims/lightning.png b/gfx/battle_anims/lightning.png
index 6606fad12..6606fad12 100755
--- a/gfx/anims/lightning.png
+++ b/gfx/battle_anims/lightning.png
diff --git a/gfx/anims/misc.2bpp.lz.4b20c3d7 b/gfx/battle_anims/misc.2bpp.lz.4b20c3d7
index d0c5f0dfc..d0c5f0dfc 100644
--- a/gfx/anims/misc.2bpp.lz.4b20c3d7
+++ b/gfx/battle_anims/misc.2bpp.lz.4b20c3d7
diff --git a/gfx/anims/misc.png b/gfx/battle_anims/misc.png
index d7e67508e..d7e67508e 100755
--- a/gfx/anims/misc.png
+++ b/gfx/battle_anims/misc.png
diff --git a/gfx/anims/noise.2bpp.lz.acb4a76e b/gfx/battle_anims/noise.2bpp.lz.acb4a76e
index e195da453..e195da453 100644
--- a/gfx/anims/noise.2bpp.lz.acb4a76e
+++ b/gfx/battle_anims/noise.2bpp.lz.acb4a76e
diff --git a/gfx/anims/noise.png b/gfx/battle_anims/noise.png
index 17540a5e8..17540a5e8 100755
--- a/gfx/anims/noise.png
+++ b/gfx/battle_anims/noise.png
diff --git a/gfx/anims/objects.2bpp.lz.83f812de b/gfx/battle_anims/objects.2bpp.lz.83f812de
index 1a52d6350..1a52d6350 100644
--- a/gfx/anims/objects.2bpp.lz.83f812de
+++ b/gfx/battle_anims/objects.2bpp.lz.83f812de
diff --git a/gfx/anims/objects.png b/gfx/battle_anims/objects.png
index 91ea435b8..91ea435b8 100755
--- a/gfx/anims/objects.png
+++ b/gfx/battle_anims/objects.png
diff --git a/gfx/anims/plant.2bpp.lz.4a00c417 b/gfx/battle_anims/plant.2bpp.lz.4a00c417
index 589fc48b6..589fc48b6 100644
--- a/gfx/anims/plant.2bpp.lz.4a00c417
+++ b/gfx/battle_anims/plant.2bpp.lz.4a00c417
diff --git a/gfx/anims/plant.png b/gfx/battle_anims/plant.png
index ec1125054..ec1125054 100644
--- a/gfx/anims/plant.png
+++ b/gfx/battle_anims/plant.png
diff --git a/gfx/anims/poison.2bpp.lz.fc7dc9c1 b/gfx/battle_anims/poison.2bpp.lz.fc7dc9c1
index df2cbe604..df2cbe604 100644
--- a/gfx/anims/poison.2bpp.lz.fc7dc9c1
+++ b/gfx/battle_anims/poison.2bpp.lz.fc7dc9c1
diff --git a/gfx/anims/poison.png b/gfx/battle_anims/poison.png
index ebbbc52be..ebbbc52be 100755
--- a/gfx/anims/poison.png
+++ b/gfx/battle_anims/poison.png
diff --git a/gfx/anims/pokeball.2bpp.lz.c58f7e01 b/gfx/battle_anims/pokeball.2bpp.lz.c58f7e01
index e09b082db..e09b082db 100644
--- a/gfx/anims/pokeball.2bpp.lz.c58f7e01
+++ b/gfx/battle_anims/pokeball.2bpp.lz.c58f7e01
diff --git a/gfx/anims/pokeball.png b/gfx/battle_anims/pokeball.png
index 47edf2190..47edf2190 100755
--- a/gfx/anims/pokeball.png
+++ b/gfx/battle_anims/pokeball.png
diff --git a/gfx/anims/powder.2bpp.lz.bfd566bb b/gfx/battle_anims/powder.2bpp.lz.bfd566bb
index 375d0bf9c..375d0bf9c 100644
--- a/gfx/anims/powder.2bpp.lz.bfd566bb
+++ b/gfx/battle_anims/powder.2bpp.lz.bfd566bb
diff --git a/gfx/anims/powder.png b/gfx/battle_anims/powder.png
index b2cb4d459..b2cb4d459 100644
--- a/gfx/anims/powder.png
+++ b/gfx/battle_anims/powder.png
diff --git a/gfx/anims/psychic.2bpp.lz.d80f285c b/gfx/battle_anims/psychic.2bpp.lz.d80f285c
index d6402dd3d..d6402dd3d 100644
--- a/gfx/anims/psychic.2bpp.lz.d80f285c
+++ b/gfx/battle_anims/psychic.2bpp.lz.d80f285c
diff --git a/gfx/anims/psychic.png b/gfx/battle_anims/psychic.png
index a6d22db2f..a6d22db2f 100644
--- a/gfx/anims/psychic.png
+++ b/gfx/battle_anims/psychic.png
diff --git a/gfx/anims/reflect.2bpp.lz.9a9c822d b/gfx/battle_anims/reflect.2bpp.lz.9a9c822d
index a563de1a8..a563de1a8 100644
--- a/gfx/anims/reflect.2bpp.lz.9a9c822d
+++ b/gfx/battle_anims/reflect.2bpp.lz.9a9c822d
diff --git a/gfx/anims/reflect.png b/gfx/battle_anims/reflect.png
index 48fbd7d0d..48fbd7d0d 100644
--- a/gfx/anims/reflect.png
+++ b/gfx/battle_anims/reflect.png
diff --git a/gfx/anims/rocks.2bpp.lz.73d0153e b/gfx/battle_anims/rocks.2bpp.lz.73d0153e
index d5481ea6e..d5481ea6e 100644
--- a/gfx/anims/rocks.2bpp.lz.73d0153e
+++ b/gfx/battle_anims/rocks.2bpp.lz.73d0153e
diff --git a/gfx/anims/rocks.png b/gfx/battle_anims/rocks.png
index d7fe76b2f..d7fe76b2f 100755
--- a/gfx/anims/rocks.png
+++ b/gfx/battle_anims/rocks.png
diff --git a/gfx/anims/rope.2bpp.lz.209d63dd b/gfx/battle_anims/rope.2bpp.lz.209d63dd
index f7d6a480f..f7d6a480f 100644
--- a/gfx/anims/rope.2bpp.lz.209d63dd
+++ b/gfx/battle_anims/rope.2bpp.lz.209d63dd
diff --git a/gfx/anims/rope.png b/gfx/battle_anims/rope.png
index a12553c7a..a12553c7a 100644
--- a/gfx/anims/rope.png
+++ b/gfx/battle_anims/rope.png
diff --git a/gfx/anims/sand.2bpp.lz.c87c0eaa b/gfx/battle_anims/sand.2bpp.lz.c87c0eaa
index 3508a1f58..3508a1f58 100644
--- a/gfx/anims/sand.2bpp.lz.c87c0eaa
+++ b/gfx/battle_anims/sand.2bpp.lz.c87c0eaa
diff --git a/gfx/anims/sand.png b/gfx/battle_anims/sand.png
index a54db235d..a54db235d 100755
--- a/gfx/anims/sand.png
+++ b/gfx/battle_anims/sand.png
diff --git a/gfx/anims/shapes.2bpp.lz.262d77f0 b/gfx/battle_anims/shapes.2bpp.lz.262d77f0
index d7d48020f..d7d48020f 100644
--- a/gfx/anims/shapes.2bpp.lz.262d77f0
+++ b/gfx/battle_anims/shapes.2bpp.lz.262d77f0
diff --git a/gfx/anims/shapes.png b/gfx/battle_anims/shapes.png
index b99fc601a..b99fc601a 100644
--- a/gfx/anims/shapes.png
+++ b/gfx/battle_anims/shapes.png
diff --git a/gfx/anims/shine.2bpp.lz.5fb79056 b/gfx/battle_anims/shine.2bpp.lz.5fb79056
index 3e47170b1..3e47170b1 100644
--- a/gfx/anims/shine.2bpp.lz.5fb79056
+++ b/gfx/battle_anims/shine.2bpp.lz.5fb79056
diff --git a/gfx/anims/shine.png b/gfx/battle_anims/shine.png
index 1b7e9834b..1b7e9834b 100644
--- a/gfx/anims/shine.png
+++ b/gfx/battle_anims/shine.png
diff --git a/gfx/anims/skyattack.2bpp.lz.31738ab8 b/gfx/battle_anims/skyattack.2bpp.lz.31738ab8
index e0412dd81..e0412dd81 100644
--- a/gfx/anims/skyattack.2bpp.lz.31738ab8
+++ b/gfx/battle_anims/skyattack.2bpp.lz.31738ab8
diff --git a/gfx/anims/skyattack.png b/gfx/battle_anims/skyattack.png
index e731c691c..e731c691c 100644
--- a/gfx/anims/skyattack.png
+++ b/gfx/battle_anims/skyattack.png
diff --git a/gfx/anims/smoke.2bpp.lz.aa05905e b/gfx/battle_anims/smoke.2bpp.lz.aa05905e
index bf26fed2b..bf26fed2b 100644
--- a/gfx/anims/smoke.2bpp.lz.aa05905e
+++ b/gfx/battle_anims/smoke.2bpp.lz.aa05905e
diff --git a/gfx/anims/smoke.png b/gfx/battle_anims/smoke.png
index 1b09874ba..1b09874ba 100644
--- a/gfx/anims/smoke.png
+++ b/gfx/battle_anims/smoke.png
diff --git a/gfx/anims/speed.2bpp.lz.1732b364 b/gfx/battle_anims/speed.2bpp.lz.1732b364
index 5d09f9a6a..5d09f9a6a 100644
--- a/gfx/anims/speed.2bpp.lz.1732b364
+++ b/gfx/battle_anims/speed.2bpp.lz.1732b364
diff --git a/gfx/anims/speed.png b/gfx/battle_anims/speed.png
index e219b38c9..e219b38c9 100644
--- a/gfx/anims/speed.png
+++ b/gfx/battle_anims/speed.png
diff --git a/gfx/anims/status.2bpp.lz.0c0aa13e b/gfx/battle_anims/status.2bpp.lz.0c0aa13e
index e5ce7df8a..e5ce7df8a 100644
--- a/gfx/anims/status.2bpp.lz.0c0aa13e
+++ b/gfx/battle_anims/status.2bpp.lz.0c0aa13e
diff --git a/gfx/anims/status.png b/gfx/battle_anims/status.png
index cb8527963..cb8527963 100644
--- a/gfx/anims/status.png
+++ b/gfx/battle_anims/status.png
diff --git a/gfx/anims/water.2bpp.lz.7b52ed12 b/gfx/battle_anims/water.2bpp.lz.7b52ed12
index 6a81bbb65..6a81bbb65 100644
--- a/gfx/anims/water.2bpp.lz.7b52ed12
+++ b/gfx/battle_anims/water.2bpp.lz.7b52ed12
diff --git a/gfx/anims/water.png b/gfx/battle_anims/water.png
index 4e3c3b719..4e3c3b719 100644
--- a/gfx/anims/water.png
+++ b/gfx/battle_anims/water.png
diff --git a/gfx/anims/wave.2bpp.lz.bee99402 b/gfx/battle_anims/wave.2bpp.lz.bee99402
index d94a5cb35..d94a5cb35 100644
--- a/gfx/anims/wave.2bpp.lz.bee99402
+++ b/gfx/battle_anims/wave.2bpp.lz.bee99402
diff --git a/gfx/anims/wave.png b/gfx/battle_anims/wave.png
index 55d4faa5f..55d4faa5f 100644
--- a/gfx/anims/wave.png
+++ b/gfx/battle_anims/wave.png
diff --git a/gfx/anims/web.2bpp.lz.80e3d480 b/gfx/battle_anims/web.2bpp.lz.80e3d480
index 84b4018e5..84b4018e5 100644
--- a/gfx/anims/web.2bpp.lz.80e3d480
+++ b/gfx/battle_anims/web.2bpp.lz.80e3d480
diff --git a/gfx/anims/web.png b/gfx/battle_anims/web.png
index 2aeffef0e..2aeffef0e 100644
--- a/gfx/anims/web.png
+++ b/gfx/battle_anims/web.png
diff --git a/gfx/anims/whip.2bpp.lz.d80d8d6e b/gfx/battle_anims/whip.2bpp.lz.d80d8d6e
index da62ba918..da62ba918 100644
--- a/gfx/anims/whip.2bpp.lz.d80d8d6e
+++ b/gfx/battle_anims/whip.2bpp.lz.d80d8d6e
diff --git a/gfx/anims/whip.png b/gfx/battle_anims/whip.png
index 92d7ded6f..92d7ded6f 100644
--- a/gfx/anims/whip.png
+++ b/gfx/battle_anims/whip.png
diff --git a/gfx/anims/wind.2bpp.lz.5a785180 b/gfx/battle_anims/wind.2bpp.lz.5a785180
index 9c2769b83..9c2769b83 100644
--- a/gfx/anims/wind.2bpp.lz.5a785180
+++ b/gfx/battle_anims/wind.2bpp.lz.5a785180
diff --git a/gfx/anims/wind.png b/gfx/battle_anims/wind.png
index b02031392..b02031392 100644
--- a/gfx/anims/wind.png
+++ b/gfx/battle_anims/wind.png
diff --git a/gfx/icon_pointers.asm b/gfx/icon_pointers.asm
deleted file mode 100644
index bfe07abb6..000000000
--- a/gfx/icon_pointers.asm
+++ /dev/null
@@ -1,41 +0,0 @@
-IconPointers:
-; entries correspond to ICON_* constants
-	dw NullIcon
-	dw PoliwagIcon
-	dw JigglypuffIcon
-	dw DiglettIcon
-	dw PikachuIcon
-	dw StaryuIcon
-	dw FishIcon
-	dw BirdIcon
-	dw MonsterIcon
-	dw ClefairyIcon
-	dw OddishIcon
-	dw BugIcon
-	dw GhostIcon
-	dw LaprasIcon
-	dw HumanshapeIcon
-	dw FoxIcon
-	dw EquineIcon
-	dw ShellIcon
-	dw BlobIcon
-	dw SerpentIcon
-	dw VoltorbIcon
-	dw SquirtleIcon
-	dw BulbasaurIcon
-	dw CharmanderIcon
-	dw CaterpillarIcon
-	dw UnownIcon
-	dw GeodudeIcon
-	dw FighterIcon
-	dw EggIcon
-	dw JellyfishIcon
-	dw MothIcon
-	dw BatIcon
-	dw SnorlaxIcon
-	dw HoOhIcon
-	dw LugiaIcon
-	dw GyaradosIcon
-	dw SlowpokeIcon
-	dw SudowoodoIcon
-	dw BigmonIcon
diff --git a/gfx/pics.asm b/gfx/pics.asm
index f14bfa42c..37aac234e 100644
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@@ -6,17 +6,17 @@ INCLUDE "includes.asm"
 
 SECTION "Pic Pointers", ROMX
 
-INCLUDE "gfx/pokemon/pic_pointers.asm"
+INCLUDE "data/pokemon/pic_pointers.asm"
 
 
 SECTION "Unown Pic Pointers", ROMX
 
-INCLUDE "gfx/pokemon/unown_pic_pointers.asm"
+INCLUDE "data/pokemon/unown_pic_pointers.asm"
 
 
 SECTION "Trainer Pic Pointers", ROMX
 
-INCLUDE "gfx/trainer_pic_pointers.asm"
+INCLUDE "data/trainers/pic_pointers.asm"
 
 
 SECTION "Pics 1", ROMX
diff --git a/gfx/pokemon/palette_pointers.asm b/gfx/pokemon/palette_pointers.asm
deleted file mode 100644
index 4ba114413..000000000
--- a/gfx/pokemon/palette_pointers.asm
+++ /dev/null
@@ -1,541 +0,0 @@
-PokemonPalettes: ; a8ce
-
-; 000
-	RGB 30, 22, 17
-	RGB 16, 14, 19
-; 000 shiny
-	RGB 30, 22, 17
-	RGB 16, 14, 19
-
-BulbasaurPalette:       INCLUDE "gfx/pokemon/bulbasaur/normal.pal"
-BulbasaurShinyPalette:  INCLUDE "gfx/pokemon/bulbasaur/shiny.pal"
-IvysaurPalette:         INCLUDE "gfx/pokemon/ivysaur/normal.pal"
-IvysaurShinyPalette:    INCLUDE "gfx/pokemon/ivysaur/shiny.pal"
-VenusaurPalette:        INCLUDE "gfx/pokemon/venusaur/normal.pal"
-VenusaurShinyPalette:   INCLUDE "gfx/pokemon/venusaur/shiny.pal"
-CharmanderPalette:      INCLUDE "gfx/pokemon/charmander/normal.pal"
-CharmanderShinyPalette: INCLUDE "gfx/pokemon/charmander/shiny.pal"
-CharmeleonPalette:      INCLUDE "gfx/pokemon/charmeleon/normal.pal"
-CharmeleonShinyPalette: INCLUDE "gfx/pokemon/charmeleon/shiny.pal"
-CharizardPalette:       INCLUDE "gfx/pokemon/charizard/normal.pal"
-CharizardShinyPalette:  INCLUDE "gfx/pokemon/charizard/shiny.pal"
-SquirtlePalette:        INCLUDE "gfx/pokemon/squirtle/normal.pal"
-SquirtleShinyPalette:   INCLUDE "gfx/pokemon/squirtle/shiny.pal"
-WartortlePalette:       INCLUDE "gfx/pokemon/wartortle/normal.pal"
-WartortleShinyPalette:  INCLUDE "gfx/pokemon/wartortle/shiny.pal"
-BlastoisePalette:       INCLUDE "gfx/pokemon/blastoise/normal.pal"
-BlastoiseShinyPalette:  INCLUDE "gfx/pokemon/blastoise/shiny.pal"
-CaterpiePalette:        INCLUDE "gfx/pokemon/caterpie/normal.pal"
-CaterpieShinyPalette:   INCLUDE "gfx/pokemon/caterpie/shiny.pal"
-MetapodPalette:         INCLUDE "gfx/pokemon/metapod/normal.pal"
-MetapodShinyPalette:    INCLUDE "gfx/pokemon/metapod/shiny.pal"
-ButterfreePalette:      INCLUDE "gfx/pokemon/butterfree/normal.pal"
-ButterfreeShinyPalette: INCLUDE "gfx/pokemon/butterfree/shiny.pal"
-WeedlePalette:          INCLUDE "gfx/pokemon/weedle/normal.pal"
-WeedleShinyPalette:     INCLUDE "gfx/pokemon/weedle/shiny.pal"
-KakunaPalette:          INCLUDE "gfx/pokemon/kakuna/normal.pal"
-KakunaShinyPalette:     INCLUDE "gfx/pokemon/kakuna/shiny.pal"
-BeedrillPalette:        INCLUDE "gfx/pokemon/beedrill/normal.pal"
-BeedrillShinyPalette:   INCLUDE "gfx/pokemon/beedrill/shiny.pal"
-PidgeyPalette:          INCLUDE "gfx/pokemon/pidgey/normal.pal"
-PidgeyShinyPalette:     INCLUDE "gfx/pokemon/pidgey/shiny.pal"
-PidgeottoPalette:       INCLUDE "gfx/pokemon/pidgeotto/normal.pal"
-PidgeottoShinyPalette:  INCLUDE "gfx/pokemon/pidgeotto/shiny.pal"
-PidgeotPalette:         INCLUDE "gfx/pokemon/pidgeot/normal.pal"
-PidgeotShinyPalette:    INCLUDE "gfx/pokemon/pidgeot/shiny.pal"
-RattataPalette:         INCLUDE "gfx/pokemon/rattata/normal.pal"
-RattataShinyPalette:    INCLUDE "gfx/pokemon/rattata/shiny.pal"
-RaticatePalette:        INCLUDE "gfx/pokemon/raticate/normal.pal"
-RaticateShinyPalette:   INCLUDE "gfx/pokemon/raticate/shiny.pal"
-SpearowPalette:         INCLUDE "gfx/pokemon/spearow/normal.pal"
-SpearowShinyPalette:    INCLUDE "gfx/pokemon/spearow/shiny.pal"
-FearowPalette:          INCLUDE "gfx/pokemon/fearow/normal.pal"
-FearowShinyPalette:     INCLUDE "gfx/pokemon/fearow/shiny.pal"
-EkansPalette:           INCLUDE "gfx/pokemon/ekans/normal.pal"
-EkansShinyPalette:      INCLUDE "gfx/pokemon/ekans/shiny.pal"
-ArbokPalette:           INCLUDE "gfx/pokemon/arbok/normal.pal"
-ArbokShinyPalette:      INCLUDE "gfx/pokemon/arbok/shiny.pal"
-PikachuPalette:         INCLUDE "gfx/pokemon/pikachu/normal.pal"
-PikachuShinyPalette:    INCLUDE "gfx/pokemon/pikachu/shiny.pal"
-RaichuPalette:          INCLUDE "gfx/pokemon/raichu/normal.pal"
-RaichuShinyPalette:     INCLUDE "gfx/pokemon/raichu/shiny.pal"
-SandshrewPalette:       INCLUDE "gfx/pokemon/sandshrew/normal.pal"
-SandshrewShinyPalette:  INCLUDE "gfx/pokemon/sandshrew/shiny.pal"
-SandslashPalette:       INCLUDE "gfx/pokemon/sandslash/normal.pal"
-SandslashShinyPalette:  INCLUDE "gfx/pokemon/sandslash/shiny.pal"
-NidoranFPalette:        INCLUDE "gfx/pokemon/nidoran_f/normal.pal"
-NidoranFShinyPalette:   INCLUDE "gfx/pokemon/nidoran_f/shiny.pal"
-NidorinaPalette:        INCLUDE "gfx/pokemon/nidorina/normal.pal"
-NidorinaShinyPalette:   INCLUDE "gfx/pokemon/nidorina/shiny.pal"
-NidoqueenPalette:       INCLUDE "gfx/pokemon/nidoqueen/normal.pal"
-NidoqueenShinyPalette:  INCLUDE "gfx/pokemon/nidoqueen/shiny.pal"
-NidoranMPalette:        INCLUDE "gfx/pokemon/nidoran_m/normal.pal"
-NidoranMShinyPalette:   INCLUDE "gfx/pokemon/nidoran_m/shiny.pal"
-NidorinoPalette:        INCLUDE "gfx/pokemon/nidorino/normal.pal"
-NidorinoShinyPalette:   INCLUDE "gfx/pokemon/nidorino/shiny.pal"
-NidokingPalette:        INCLUDE "gfx/pokemon/nidoking/normal.pal"
-NidokingShinyPalette:   INCLUDE "gfx/pokemon/nidoking/shiny.pal"
-ClefairyPalette:        INCLUDE "gfx/pokemon/clefairy/normal.pal"
-ClefairyShinyPalette:   INCLUDE "gfx/pokemon/clefairy/shiny.pal"
-ClefablePalette:        INCLUDE "gfx/pokemon/clefable/normal.pal"
-ClefableShinyPalette:   INCLUDE "gfx/pokemon/clefable/shiny.pal"
-VulpixPalette:          INCLUDE "gfx/pokemon/vulpix/normal.pal"
-VulpixShinyPalette:     INCLUDE "gfx/pokemon/vulpix/shiny.pal"
-NinetalesPalette:       INCLUDE "gfx/pokemon/ninetales/normal.pal"
-NinetalesShinyPalette:  INCLUDE "gfx/pokemon/ninetales/shiny.pal"
-JigglypuffPalette:      INCLUDE "gfx/pokemon/jigglypuff/normal.pal"
-JigglypuffShinyPalette: INCLUDE "gfx/pokemon/jigglypuff/shiny.pal"
-WigglytuffPalette:      INCLUDE "gfx/pokemon/wigglytuff/normal.pal"
-WigglytuffShinyPalette: INCLUDE "gfx/pokemon/wigglytuff/shiny.pal"
-ZubatPalette:           INCLUDE "gfx/pokemon/zubat/normal.pal"
-ZubatShinyPalette:      INCLUDE "gfx/pokemon/zubat/shiny.pal"
-GolbatPalette:          INCLUDE "gfx/pokemon/golbat/normal.pal"
-GolbatShinyPalette:     INCLUDE "gfx/pokemon/golbat/shiny.pal"
-OddishPalette:          INCLUDE "gfx/pokemon/oddish/normal.pal"
-OddishShinyPalette:     INCLUDE "gfx/pokemon/oddish/shiny.pal"
-GloomPalette:           INCLUDE "gfx/pokemon/gloom/normal.pal"
-GloomShinyPalette:      INCLUDE "gfx/pokemon/gloom/shiny.pal"
-VileplumePalette:       INCLUDE "gfx/pokemon/vileplume/normal.pal"
-VileplumeShinyPalette:  INCLUDE "gfx/pokemon/vileplume/shiny.pal"
-ParasPalette:           INCLUDE "gfx/pokemon/paras/normal.pal"
-ParasShinyPalette:      INCLUDE "gfx/pokemon/paras/shiny.pal"
-ParasectPalette:        INCLUDE "gfx/pokemon/parasect/normal.pal"
-ParasectShinyPalette:   INCLUDE "gfx/pokemon/parasect/shiny.pal"
-VenonatPalette:         INCLUDE "gfx/pokemon/venonat/normal.pal"
-VenonatShinyPalette:    INCLUDE "gfx/pokemon/venonat/shiny.pal"
-VenomothPalette:        INCLUDE "gfx/pokemon/venomoth/normal.pal"
-VenomothShinyPalette:   INCLUDE "gfx/pokemon/venomoth/shiny.pal"
-DiglettPalette:         INCLUDE "gfx/pokemon/diglett/normal.pal"
-DiglettShinyPalette:    INCLUDE "gfx/pokemon/diglett/shiny.pal"
-DugtrioPalette:         INCLUDE "gfx/pokemon/dugtrio/normal.pal"
-DugtrioShinyPalette:    INCLUDE "gfx/pokemon/dugtrio/shiny.pal"
-MeowthPalette:          INCLUDE "gfx/pokemon/meowth/normal.pal"
-MeowthShinyPalette:     INCLUDE "gfx/pokemon/meowth/shiny.pal"
-PersianPalette:         INCLUDE "gfx/pokemon/persian/normal.pal"
-PersianShinyPalette:    INCLUDE "gfx/pokemon/persian/shiny.pal"
-PsyduckPalette:         INCLUDE "gfx/pokemon/psyduck/normal.pal"
-PsyduckShinyPalette:    INCLUDE "gfx/pokemon/psyduck/shiny.pal"
-GolduckPalette:         INCLUDE "gfx/pokemon/golduck/normal.pal"
-GolduckShinyPalette:    INCLUDE "gfx/pokemon/golduck/shiny.pal"
-MankeyPalette:          INCLUDE "gfx/pokemon/mankey/normal.pal"
-MankeyShinyPalette:     INCLUDE "gfx/pokemon/mankey/shiny.pal"
-PrimeapePalette:        INCLUDE "gfx/pokemon/primeape/normal.pal"
-PrimeapeShinyPalette:   INCLUDE "gfx/pokemon/primeape/shiny.pal"
-GrowlithePalette:       INCLUDE "gfx/pokemon/growlithe/normal.pal"
-GrowlitheShinyPalette:  INCLUDE "gfx/pokemon/growlithe/shiny.pal"
-ArcaninePalette:        INCLUDE "gfx/pokemon/arcanine/normal.pal"
-ArcanineShinyPalette:   INCLUDE "gfx/pokemon/arcanine/shiny.pal"
-PoliwagPalette:         INCLUDE "gfx/pokemon/poliwag/normal.pal"
-PoliwagShinyPalette:    INCLUDE "gfx/pokemon/poliwag/shiny.pal"
-PoliwhirlPalette:       INCLUDE "gfx/pokemon/poliwhirl/normal.pal"
-PoliwhirlShinyPalette:  INCLUDE "gfx/pokemon/poliwhirl/shiny.pal"
-PoliwrathPalette:       INCLUDE "gfx/pokemon/poliwrath/normal.pal"
-PoliwrathShinyPalette:  INCLUDE "gfx/pokemon/poliwrath/shiny.pal"
-AbraPalette:            INCLUDE "gfx/pokemon/abra/normal.pal"
-AbraShinyPalette:       INCLUDE "gfx/pokemon/abra/shiny.pal"
-KadabraPalette:         INCLUDE "gfx/pokemon/kadabra/normal.pal"
-KadabraShinyPalette:    INCLUDE "gfx/pokemon/kadabra/shiny.pal"
-AlakazamPalette:        INCLUDE "gfx/pokemon/alakazam/normal.pal"
-AlakazamShinyPalette:   INCLUDE "gfx/pokemon/alakazam/shiny.pal"
-MachopPalette:          INCLUDE "gfx/pokemon/machop/normal.pal"
-MachopShinyPalette:     INCLUDE "gfx/pokemon/machop/shiny.pal"
-MachokePalette:         INCLUDE "gfx/pokemon/machoke/normal.pal"
-MachokeShinyPalette:    INCLUDE "gfx/pokemon/machoke/shiny.pal"
-MachampPalette:         INCLUDE "gfx/pokemon/machamp/normal.pal"
-MachampShinyPalette:    INCLUDE "gfx/pokemon/machamp/shiny.pal"
-BellsproutPalette:      INCLUDE "gfx/pokemon/bellsprout/normal.pal"
-BellsproutShinyPalette: INCLUDE "gfx/pokemon/bellsprout/shiny.pal"
-WeepinbellPalette:      INCLUDE "gfx/pokemon/weepinbell/normal.pal"
-WeepinbellShinyPalette: INCLUDE "gfx/pokemon/weepinbell/shiny.pal"
-VictreebelPalette:      INCLUDE "gfx/pokemon/victreebel/normal.pal"
-VictreebelShinyPalette: INCLUDE "gfx/pokemon/victreebel/shiny.pal"
-TentacoolPalette:       INCLUDE "gfx/pokemon/tentacool/normal.pal"
-TentacoolShinyPalette:  INCLUDE "gfx/pokemon/tentacool/shiny.pal"
-TentacruelPalette:      INCLUDE "gfx/pokemon/tentacruel/normal.pal"
-TentacruelShinyPalette: INCLUDE "gfx/pokemon/tentacruel/shiny.pal"
-GeodudePalette:         INCLUDE "gfx/pokemon/geodude/normal.pal"
-GeodudeShinyPalette:    INCLUDE "gfx/pokemon/geodude/shiny.pal"
-GravelerPalette:        INCLUDE "gfx/pokemon/graveler/normal.pal"
-GravelerShinyPalette:   INCLUDE "gfx/pokemon/graveler/shiny.pal"
-GolemPalette:           INCLUDE "gfx/pokemon/golem/normal.pal"
-GolemShinyPalette:      INCLUDE "gfx/pokemon/golem/shiny.pal"
-PonytaPalette:          INCLUDE "gfx/pokemon/ponyta/normal.pal"
-PonytaShinyPalette:     INCLUDE "gfx/pokemon/ponyta/shiny.pal"
-RapidashPalette:        INCLUDE "gfx/pokemon/rapidash/normal.pal"
-RapidashShinyPalette:   INCLUDE "gfx/pokemon/rapidash/shiny.pal"
-SlowpokePalette:        INCLUDE "gfx/pokemon/slowpoke/normal.pal"
-SlowpokeShinyPalette:   INCLUDE "gfx/pokemon/slowpoke/shiny.pal"
-SlowbroPalette:         INCLUDE "gfx/pokemon/slowbro/normal.pal"
-SlowbroShinyPalette:    INCLUDE "gfx/pokemon/slowbro/shiny.pal"
-MagnemitePalette:       INCLUDE "gfx/pokemon/magnemite/normal.pal"
-MagnemiteShinyPalette:  INCLUDE "gfx/pokemon/magnemite/shiny.pal"
-MagnetonPalette:        INCLUDE "gfx/pokemon/magneton/normal.pal"
-MagnetonShinyPalette:   INCLUDE "gfx/pokemon/magneton/shiny.pal"
-FarfetchDPalette:       INCLUDE "gfx/pokemon/farfetch_d/normal.pal"
-FarfetchDShinyPalette:  INCLUDE "gfx/pokemon/farfetch_d/shiny.pal"
-DoduoPalette:           INCLUDE "gfx/pokemon/doduo/normal.pal"
-DoduoShinyPalette:      INCLUDE "gfx/pokemon/doduo/shiny.pal"
-DodrioPalette:          INCLUDE "gfx/pokemon/dodrio/normal.pal"
-DodrioShinyPalette:     INCLUDE "gfx/pokemon/dodrio/shiny.pal"
-SeelPalette:            INCLUDE "gfx/pokemon/seel/normal.pal"
-SeelShinyPalette:       INCLUDE "gfx/pokemon/seel/shiny.pal"
-DewgongPalette:         INCLUDE "gfx/pokemon/dewgong/normal.pal"
-DewgongShinyPalette:    INCLUDE "gfx/pokemon/dewgong/shiny.pal"
-GrimerPalette:          INCLUDE "gfx/pokemon/grimer/normal.pal"
-GrimerShinyPalette:     INCLUDE "gfx/pokemon/grimer/shiny.pal"
-MukPalette:             INCLUDE "gfx/pokemon/muk/normal.pal"
-MukShinyPalette:        INCLUDE "gfx/pokemon/muk/shiny.pal"
-ShellderPalette:        INCLUDE "gfx/pokemon/shellder/normal.pal"
-ShellderShinyPalette:   INCLUDE "gfx/pokemon/shellder/shiny.pal"
-CloysterPalette:        INCLUDE "gfx/pokemon/cloyster/normal.pal"
-CloysterShinyPalette:   INCLUDE "gfx/pokemon/cloyster/shiny.pal"
-GastlyPalette:          INCLUDE "gfx/pokemon/gastly/normal.pal"
-GastlyShinyPalette:     INCLUDE "gfx/pokemon/gastly/shiny.pal"
-HaunterPalette:         INCLUDE "gfx/pokemon/haunter/normal.pal"
-HaunterShinyPalette:    INCLUDE "gfx/pokemon/haunter/shiny.pal"
-GengarPalette:          INCLUDE "gfx/pokemon/gengar/normal.pal"
-GengarShinyPalette:     INCLUDE "gfx/pokemon/gengar/shiny.pal"
-OnixPalette:            INCLUDE "gfx/pokemon/onix/normal.pal"
-OnixShinyPalette:       INCLUDE "gfx/pokemon/onix/shiny.pal"
-DrowzeePalette:         INCLUDE "gfx/pokemon/drowzee/normal.pal"
-DrowzeeShinyPalette:    INCLUDE "gfx/pokemon/drowzee/shiny.pal"
-HypnoPalette:           INCLUDE "gfx/pokemon/hypno/normal.pal"
-HypnoShinyPalette:      INCLUDE "gfx/pokemon/hypno/shiny.pal"
-KrabbyPalette:          INCLUDE "gfx/pokemon/krabby/normal.pal"
-KrabbyShinyPalette:     INCLUDE "gfx/pokemon/krabby/shiny.pal"
-KinglerPalette:         INCLUDE "gfx/pokemon/kingler/normal.pal"
-KinglerShinyPalette:    INCLUDE "gfx/pokemon/kingler/shiny.pal"
-VoltorbPalette:         INCLUDE "gfx/pokemon/voltorb/normal.pal"
-VoltorbShinyPalette:    INCLUDE "gfx/pokemon/voltorb/shiny.pal"
-ElectrodePalette:       INCLUDE "gfx/pokemon/electrode/normal.pal"
-ElectrodeShinyPalette:  INCLUDE "gfx/pokemon/electrode/shiny.pal"
-ExeggcutePalette:       INCLUDE "gfx/pokemon/exeggcute/normal.pal"
-ExeggcuteShinyPalette:  INCLUDE "gfx/pokemon/exeggcute/shiny.pal"
-ExeggutorPalette:       INCLUDE "gfx/pokemon/exeggutor/normal.pal"
-ExeggutorShinyPalette:  INCLUDE "gfx/pokemon/exeggutor/shiny.pal"
-CubonePalette:          INCLUDE "gfx/pokemon/cubone/normal.pal"
-CuboneShinyPalette:     INCLUDE "gfx/pokemon/cubone/shiny.pal"
-MarowakPalette:         INCLUDE "gfx/pokemon/marowak/normal.pal"
-MarowakShinyPalette:    INCLUDE "gfx/pokemon/marowak/shiny.pal"
-HitmonleePalette:       INCLUDE "gfx/pokemon/hitmonlee/normal.pal"
-HitmonleeShinyPalette:  INCLUDE "gfx/pokemon/hitmonlee/shiny.pal"
-HitmonchanPalette:      INCLUDE "gfx/pokemon/hitmonchan/normal.pal"
-HitmonchanShinyPalette: INCLUDE "gfx/pokemon/hitmonchan/shiny.pal"
-LickitungPalette:       INCLUDE "gfx/pokemon/lickitung/normal.pal"
-LickitungShinyPalette:  INCLUDE "gfx/pokemon/lickitung/shiny.pal"
-KoffingPalette:         INCLUDE "gfx/pokemon/koffing/normal.pal"
-KoffingShinyPalette:    INCLUDE "gfx/pokemon/koffing/shiny.pal"
-WeezingPalette:         INCLUDE "gfx/pokemon/weezing/normal.pal"
-WeezingShinyPalette:    INCLUDE "gfx/pokemon/weezing/shiny.pal"
-RhyhornPalette:         INCLUDE "gfx/pokemon/rhyhorn/normal.pal"
-RhyhornShinyPalette:    INCLUDE "gfx/pokemon/rhyhorn/shiny.pal"
-RhydonPalette:          INCLUDE "gfx/pokemon/rhydon/normal.pal"
-RhydonShinyPalette:     INCLUDE "gfx/pokemon/rhydon/shiny.pal"
-ChanseyPalette:         INCLUDE "gfx/pokemon/chansey/normal.pal"
-ChanseyShinyPalette:    INCLUDE "gfx/pokemon/chansey/shiny.pal"
-TangelaPalette:         INCLUDE "gfx/pokemon/tangela/normal.pal"
-TangelaShinyPalette:    INCLUDE "gfx/pokemon/tangela/shiny.pal"
-KangaskhanPalette:      INCLUDE "gfx/pokemon/kangaskhan/normal.pal"
-KangaskhanShinyPalette: INCLUDE "gfx/pokemon/kangaskhan/shiny.pal"
-HorseaPalette:          INCLUDE "gfx/pokemon/horsea/normal.pal"
-HorseaShinyPalette:     INCLUDE "gfx/pokemon/horsea/shiny.pal"
-SeadraPalette:          INCLUDE "gfx/pokemon/seadra/normal.pal"
-SeadraShinyPalette:     INCLUDE "gfx/pokemon/seadra/shiny.pal"
-GoldeenPalette:         INCLUDE "gfx/pokemon/goldeen/normal.pal"
-GoldeenShinyPalette:    INCLUDE "gfx/pokemon/goldeen/shiny.pal"
-SeakingPalette:         INCLUDE "gfx/pokemon/seaking/normal.pal"
-SeakingShinyPalette:    INCLUDE "gfx/pokemon/seaking/shiny.pal"
-StaryuPalette:          INCLUDE "gfx/pokemon/staryu/normal.pal"
-StaryuShinyPalette:     INCLUDE "gfx/pokemon/staryu/shiny.pal"
-StarmiePalette:         INCLUDE "gfx/pokemon/starmie/normal.pal"
-StarmieShinyPalette:    INCLUDE "gfx/pokemon/starmie/shiny.pal"
-MrMimePalette:          INCLUDE "gfx/pokemon/mr__mime/normal.pal"
-MrMimeShinyPalette:     INCLUDE "gfx/pokemon/mr__mime/shiny.pal"
-ScytherPalette:         INCLUDE "gfx/pokemon/scyther/normal.pal"
-ScytherShinyPalette:    INCLUDE "gfx/pokemon/scyther/shiny.pal"
-JynxPalette:            INCLUDE "gfx/pokemon/jynx/normal.pal"
-JynxShinyPalette:       INCLUDE "gfx/pokemon/jynx/shiny.pal"
-ElectabuzzPalette:      INCLUDE "gfx/pokemon/electabuzz/normal.pal"
-ElectabuzzShinyPalette: INCLUDE "gfx/pokemon/electabuzz/shiny.pal"
-MagmarPalette:          INCLUDE "gfx/pokemon/magmar/normal.pal"
-MagmarShinyPalette:     INCLUDE "gfx/pokemon/magmar/shiny.pal"
-PinsirPalette:          INCLUDE "gfx/pokemon/pinsir/normal.pal"
-PinsirShinyPalette:     INCLUDE "gfx/pokemon/pinsir/shiny.pal"
-TaurosPalette:          INCLUDE "gfx/pokemon/tauros/normal.pal"
-TaurosShinyPalette:     INCLUDE "gfx/pokemon/tauros/shiny.pal"
-MagikarpPalette:        INCLUDE "gfx/pokemon/magikarp/normal.pal"
-MagikarpShinyPalette:   INCLUDE "gfx/pokemon/magikarp/shiny.pal"
-GyaradosPalette:        INCLUDE "gfx/pokemon/gyarados/normal.pal"
-GyaradosShinyPalette:   INCLUDE "gfx/pokemon/gyarados/shiny.pal"
-LaprasPalette:          INCLUDE "gfx/pokemon/lapras/normal.pal"
-LaprasShinyPalette:     INCLUDE "gfx/pokemon/lapras/shiny.pal"
-DittoPalette:           INCLUDE "gfx/pokemon/ditto/normal.pal"
-DittoShinyPalette:      INCLUDE "gfx/pokemon/ditto/shiny.pal"
-EeveePalette:           INCLUDE "gfx/pokemon/eevee/normal.pal"
-EeveeShinyPalette:      INCLUDE "gfx/pokemon/eevee/shiny.pal"
-VaporeonPalette:        INCLUDE "gfx/pokemon/vaporeon/normal.pal"
-VaporeonShinyPalette:   INCLUDE "gfx/pokemon/vaporeon/shiny.pal"
-JolteonPalette:         INCLUDE "gfx/pokemon/jolteon/normal.pal"
-JolteonShinyPalette:    INCLUDE "gfx/pokemon/jolteon/shiny.pal"
-FlareonPalette:         INCLUDE "gfx/pokemon/flareon/normal.pal"
-FlareonShinyPalette:    INCLUDE "gfx/pokemon/flareon/shiny.pal"
-PorygonPalette:         INCLUDE "gfx/pokemon/porygon/normal.pal"
-PorygonShinyPalette:    INCLUDE "gfx/pokemon/porygon/shiny.pal"
-OmanytePalette:         INCLUDE "gfx/pokemon/omanyte/normal.pal"
-OmanyteShinyPalette:    INCLUDE "gfx/pokemon/omanyte/shiny.pal"
-OmastarPalette:         INCLUDE "gfx/pokemon/omastar/normal.pal"
-OmastarShinyPalette:    INCLUDE "gfx/pokemon/omastar/shiny.pal"
-KabutoPalette:          INCLUDE "gfx/pokemon/kabuto/normal.pal"
-KabutoShinyPalette:     INCLUDE "gfx/pokemon/kabuto/shiny.pal"
-KabutopsPalette:        INCLUDE "gfx/pokemon/kabutops/normal.pal"
-KabutopsShinyPalette:   INCLUDE "gfx/pokemon/kabutops/shiny.pal"
-AerodactylPalette:      INCLUDE "gfx/pokemon/aerodactyl/normal.pal"
-AerodactylShinyPalette: INCLUDE "gfx/pokemon/aerodactyl/shiny.pal"
-SnorlaxPalette:         INCLUDE "gfx/pokemon/snorlax/normal.pal"
-SnorlaxShinyPalette:    INCLUDE "gfx/pokemon/snorlax/shiny.pal"
-ArticunoPalette:        INCLUDE "gfx/pokemon/articuno/normal.pal"
-ArticunoShinyPalette:   INCLUDE "gfx/pokemon/articuno/shiny.pal"
-ZapdosPalette:          INCLUDE "gfx/pokemon/zapdos/normal.pal"
-ZapdosShinyPalette:     INCLUDE "gfx/pokemon/zapdos/shiny.pal"
-MoltresPalette:         INCLUDE "gfx/pokemon/moltres/normal.pal"
-MoltresShinyPalette:    INCLUDE "gfx/pokemon/moltres/shiny.pal"
-DratiniPalette:         INCLUDE "gfx/pokemon/dratini/normal.pal"
-DratiniShinyPalette:    INCLUDE "gfx/pokemon/dratini/shiny.pal"
-DragonairPalette:       INCLUDE "gfx/pokemon/dragonair/normal.pal"
-DragonairShinyPalette:  INCLUDE "gfx/pokemon/dragonair/shiny.pal"
-DragonitePalette:       INCLUDE "gfx/pokemon/dragonite/normal.pal"
-DragoniteShinyPalette:  INCLUDE "gfx/pokemon/dragonite/shiny.pal"
-MewtwoPalette:          INCLUDE "gfx/pokemon/mewtwo/normal.pal"
-MewtwoShinyPalette:     INCLUDE "gfx/pokemon/mewtwo/shiny.pal"
-MewPalette:             INCLUDE "gfx/pokemon/mew/normal.pal"
-MewShinyPalette:        INCLUDE "gfx/pokemon/mew/shiny.pal"
-ChikoritaPalette:       INCLUDE "gfx/pokemon/chikorita/normal.pal"
-ChikoritaShinyPalette:  INCLUDE "gfx/pokemon/chikorita/shiny.pal"
-BayleefPalette:         INCLUDE "gfx/pokemon/bayleef/normal.pal"
-BayleefShinyPalette:    INCLUDE "gfx/pokemon/bayleef/shiny.pal"
-MeganiumPalette:        INCLUDE "gfx/pokemon/meganium/normal.pal"
-MeganiumShinyPalette:   INCLUDE "gfx/pokemon/meganium/shiny.pal"
-CyndaquilPalette:       INCLUDE "gfx/pokemon/cyndaquil/normal.pal"
-CyndaquilShinyPalette:  INCLUDE "gfx/pokemon/cyndaquil/shiny.pal"
-QuilavaPalette:         INCLUDE "gfx/pokemon/quilava/normal.pal"
-QuilavaShinyPalette:    INCLUDE "gfx/pokemon/quilava/shiny.pal"
-TyphlosionPalette:      INCLUDE "gfx/pokemon/typhlosion/normal.pal"
-TyphlosionShinyPalette: INCLUDE "gfx/pokemon/typhlosion/shiny.pal"
-TotodilePalette:        INCLUDE "gfx/pokemon/totodile/normal.pal"
-TotodileShinyPalette:   INCLUDE "gfx/pokemon/totodile/shiny.pal"
-CroconawPalette:        INCLUDE "gfx/pokemon/croconaw/normal.pal"
-CroconawShinyPalette:   INCLUDE "gfx/pokemon/croconaw/shiny.pal"
-FeraligatrPalette:      INCLUDE "gfx/pokemon/feraligatr/normal.pal"
-FeraligatrShinyPalette: INCLUDE "gfx/pokemon/feraligatr/shiny.pal"
-SentretPalette:         INCLUDE "gfx/pokemon/sentret/normal.pal"
-SentretShinyPalette:    INCLUDE "gfx/pokemon/sentret/shiny.pal"
-FurretPalette:          INCLUDE "gfx/pokemon/furret/normal.pal"
-FurretShinyPalette:     INCLUDE "gfx/pokemon/furret/shiny.pal"
-HoothootPalette:        INCLUDE "gfx/pokemon/hoothoot/normal.pal"
-HoothootShinyPalette:   INCLUDE "gfx/pokemon/hoothoot/shiny.pal"
-NoctowlPalette:         INCLUDE "gfx/pokemon/noctowl/normal.pal"
-NoctowlShinyPalette:    INCLUDE "gfx/pokemon/noctowl/shiny.pal"
-LedybaPalette:          INCLUDE "gfx/pokemon/ledyba/normal.pal"
-LedybaShinyPalette:     INCLUDE "gfx/pokemon/ledyba/shiny.pal"
-LedianPalette:          INCLUDE "gfx/pokemon/ledian/normal.pal"
-LedianShinyPalette:     INCLUDE "gfx/pokemon/ledian/shiny.pal"
-SpinarakPalette:        INCLUDE "gfx/pokemon/spinarak/normal.pal"
-SpinarakShinyPalette:   INCLUDE "gfx/pokemon/spinarak/shiny.pal"
-AriadosPalette:         INCLUDE "gfx/pokemon/ariados/normal.pal"
-AriadosShinyPalette:    INCLUDE "gfx/pokemon/ariados/shiny.pal"
-CrobatPalette:          INCLUDE "gfx/pokemon/crobat/normal.pal"
-CrobatShinyPalette:     INCLUDE "gfx/pokemon/crobat/shiny.pal"
-ChinchouPalette:        INCLUDE "gfx/pokemon/chinchou/normal.pal"
-ChinchouShinyPalette:   INCLUDE "gfx/pokemon/chinchou/shiny.pal"
-LanturnPalette:         INCLUDE "gfx/pokemon/lanturn/normal.pal"
-LanturnShinyPalette:    INCLUDE "gfx/pokemon/lanturn/shiny.pal"
-PichuPalette:           INCLUDE "gfx/pokemon/pichu/normal.pal"
-PichuShinyPalette:      INCLUDE "gfx/pokemon/pichu/shiny.pal"
-CleffaPalette:          INCLUDE "gfx/pokemon/cleffa/normal.pal"
-CleffaShinyPalette:     INCLUDE "gfx/pokemon/cleffa/shiny.pal"
-IgglybuffPalette:       INCLUDE "gfx/pokemon/igglybuff/normal.pal"
-IgglybuffShinyPalette:  INCLUDE "gfx/pokemon/igglybuff/shiny.pal"
-TogepiPalette:          INCLUDE "gfx/pokemon/togepi/normal.pal"
-TogepiShinyPalette:     INCLUDE "gfx/pokemon/togepi/shiny.pal"
-TogeticPalette:         INCLUDE "gfx/pokemon/togetic/normal.pal"
-TogeticShinyPalette:    INCLUDE "gfx/pokemon/togetic/shiny.pal"
-NatuPalette:            INCLUDE "gfx/pokemon/natu/normal.pal"
-NatuShinyPalette:       INCLUDE "gfx/pokemon/natu/shiny.pal"
-XatuPalette:            INCLUDE "gfx/pokemon/xatu/normal.pal"
-XatuShinyPalette:       INCLUDE "gfx/pokemon/xatu/shiny.pal"
-MareepPalette:          INCLUDE "gfx/pokemon/mareep/normal.pal"
-MareepShinyPalette:     INCLUDE "gfx/pokemon/mareep/shiny.pal"
-FlaaffyPalette:         INCLUDE "gfx/pokemon/flaaffy/normal.pal"
-FlaaffyShinyPalette:    INCLUDE "gfx/pokemon/flaaffy/shiny.pal"
-AmpharosPalette:        INCLUDE "gfx/pokemon/ampharos/normal.pal"
-AmpharosShinyPalette:   INCLUDE "gfx/pokemon/ampharos/shiny.pal"
-BellossomPalette:       INCLUDE "gfx/pokemon/bellossom/normal.pal"
-BellossomShinyPalette:  INCLUDE "gfx/pokemon/bellossom/shiny.pal"
-MarillPalette:          INCLUDE "gfx/pokemon/marill/normal.pal"
-MarillShinyPalette:     INCLUDE "gfx/pokemon/marill/shiny.pal"
-AzumarillPalette:       INCLUDE "gfx/pokemon/azumarill/normal.pal"
-AzumarillShinyPalette:  INCLUDE "gfx/pokemon/azumarill/shiny.pal"
-SudowoodoPalette:       INCLUDE "gfx/pokemon/sudowoodo/normal.pal"
-SudowoodoShinyPalette:  INCLUDE "gfx/pokemon/sudowoodo/shiny.pal"
-PolitoedPalette:        INCLUDE "gfx/pokemon/politoed/normal.pal"
-PolitoedShinyPalette:   INCLUDE "gfx/pokemon/politoed/shiny.pal"
-HoppipPalette:          INCLUDE "gfx/pokemon/hoppip/normal.pal"
-HoppipShinyPalette:     INCLUDE "gfx/pokemon/hoppip/shiny.pal"
-SkiploomPalette:        INCLUDE "gfx/pokemon/skiploom/normal.pal"
-SkiploomShinyPalette:   INCLUDE "gfx/pokemon/skiploom/shiny.pal"
-JumpluffPalette:        INCLUDE "gfx/pokemon/jumpluff/normal.pal"
-JumpluffShinyPalette:   INCLUDE "gfx/pokemon/jumpluff/shiny.pal"
-AipomPalette:           INCLUDE "gfx/pokemon/aipom/normal.pal"
-AipomShinyPalette:      INCLUDE "gfx/pokemon/aipom/shiny.pal"
-SunkernPalette:         INCLUDE "gfx/pokemon/sunkern/normal.pal"
-SunkernShinyPalette:    INCLUDE "gfx/pokemon/sunkern/shiny.pal"
-SunfloraPalette:        INCLUDE "gfx/pokemon/sunflora/normal.pal"
-SunfloraShinyPalette:   INCLUDE "gfx/pokemon/sunflora/shiny.pal"
-YanmaPalette:           INCLUDE "gfx/pokemon/yanma/normal.pal"
-YanmaShinyPalette:      INCLUDE "gfx/pokemon/yanma/shiny.pal"
-WooperPalette:          INCLUDE "gfx/pokemon/wooper/normal.pal"
-WooperShinyPalette:     INCLUDE "gfx/pokemon/wooper/shiny.pal"
-QuagsirePalette:        INCLUDE "gfx/pokemon/quagsire/normal.pal"
-QuagsireShinyPalette:   INCLUDE "gfx/pokemon/quagsire/shiny.pal"
-EspeonPalette:          INCLUDE "gfx/pokemon/espeon/normal.pal"
-EspeonShinyPalette:     INCLUDE "gfx/pokemon/espeon/shiny.pal"
-UmbreonPalette:         INCLUDE "gfx/pokemon/umbreon/normal.pal"
-UmbreonShinyPalette:    INCLUDE "gfx/pokemon/umbreon/shiny.pal"
-MurkrowPalette:         INCLUDE "gfx/pokemon/murkrow/normal.pal"
-MurkrowShinyPalette:    INCLUDE "gfx/pokemon/murkrow/shiny.pal"
-SlowkingPalette:        INCLUDE "gfx/pokemon/slowking/normal.pal"
-SlowkingShinyPalette:   INCLUDE "gfx/pokemon/slowking/shiny.pal"
-MisdreavusPalette:      INCLUDE "gfx/pokemon/misdreavus/normal.pal"
-MisdreavusShinyPalette: INCLUDE "gfx/pokemon/misdreavus/shiny.pal"
-UnownPalette:           INCLUDE "gfx/pokemon/unown/normal.pal"
-UnownShinyPalette:      INCLUDE "gfx/pokemon/unown/shiny.pal"
-WobbuffetPalette:       INCLUDE "gfx/pokemon/wobbuffet/normal.pal"
-WobbuffetShinyPalette:  INCLUDE "gfx/pokemon/wobbuffet/shiny.pal"
-GirafarigPalette:       INCLUDE "gfx/pokemon/girafarig/normal.pal"
-GirafarigShinyPalette:  INCLUDE "gfx/pokemon/girafarig/shiny.pal"
-PinecoPalette:          INCLUDE "gfx/pokemon/pineco/normal.pal"
-PinecoShinyPalette:     INCLUDE "gfx/pokemon/pineco/shiny.pal"
-ForretressPalette:      INCLUDE "gfx/pokemon/forretress/normal.pal"
-ForretressShinyPalette: INCLUDE "gfx/pokemon/forretress/shiny.pal"
-DunsparcePalette:       INCLUDE "gfx/pokemon/dunsparce/normal.pal"
-DunsparceShinyPalette:  INCLUDE "gfx/pokemon/dunsparce/shiny.pal"
-GligarPalette:          INCLUDE "gfx/pokemon/gligar/normal.pal"
-GligarShinyPalette:     INCLUDE "gfx/pokemon/gligar/shiny.pal"
-SteelixPalette:         INCLUDE "gfx/pokemon/steelix/normal.pal"
-SteelixShinyPalette:    INCLUDE "gfx/pokemon/steelix/shiny.pal"
-SnubbullPalette:        INCLUDE "gfx/pokemon/snubbull/normal.pal"
-SnubbullShinyPalette:   INCLUDE "gfx/pokemon/snubbull/shiny.pal"
-GranbullPalette:        INCLUDE "gfx/pokemon/granbull/normal.pal"
-GranbullShinyPalette:   INCLUDE "gfx/pokemon/granbull/shiny.pal"
-QwilfishPalette:        INCLUDE "gfx/pokemon/qwilfish/normal.pal"
-QwilfishShinyPalette:   INCLUDE "gfx/pokemon/qwilfish/shiny.pal"
-ScizorPalette:          INCLUDE "gfx/pokemon/scizor/normal.pal"
-ScizorShinyPalette:     INCLUDE "gfx/pokemon/scizor/shiny.pal"
-ShucklePalette:         INCLUDE "gfx/pokemon/shuckle/normal.pal"
-ShuckleShinyPalette:    INCLUDE "gfx/pokemon/shuckle/shiny.pal"
-HeracrossPalette:       INCLUDE "gfx/pokemon/heracross/normal.pal"
-HeracrossShinyPalette:  INCLUDE "gfx/pokemon/heracross/shiny.pal"
-SneaselPalette:         INCLUDE "gfx/pokemon/sneasel/normal.pal"
-SneaselShinyPalette:    INCLUDE "gfx/pokemon/sneasel/shiny.pal"
-TeddiursaPalette:       INCLUDE "gfx/pokemon/teddiursa/normal.pal"
-TeddiursaShinyPalette:  INCLUDE "gfx/pokemon/teddiursa/shiny.pal"
-UrsaringPalette:        INCLUDE "gfx/pokemon/ursaring/normal.pal"
-UrsaringShinyPalette:   INCLUDE "gfx/pokemon/ursaring/shiny.pal"
-SlugmaPalette:          INCLUDE "gfx/pokemon/slugma/normal.pal"
-SlugmaShinyPalette:     INCLUDE "gfx/pokemon/slugma/shiny.pal"
-MagcargoPalette:        INCLUDE "gfx/pokemon/magcargo/normal.pal"
-MagcargoShinyPalette:   INCLUDE "gfx/pokemon/magcargo/shiny.pal"
-SwinubPalette:          INCLUDE "gfx/pokemon/swinub/normal.pal"
-SwinubShinyPalette:     INCLUDE "gfx/pokemon/swinub/shiny.pal"
-PiloswinePalette:       INCLUDE "gfx/pokemon/piloswine/normal.pal"
-PiloswineShinyPalette:  INCLUDE "gfx/pokemon/piloswine/shiny.pal"
-CorsolaPalette:         INCLUDE "gfx/pokemon/corsola/normal.pal"
-CorsolaShinyPalette:    INCLUDE "gfx/pokemon/corsola/shiny.pal"
-RemoraidPalette:        INCLUDE "gfx/pokemon/remoraid/normal.pal"
-RemoraidShinyPalette:   INCLUDE "gfx/pokemon/remoraid/shiny.pal"
-OctilleryPalette:       INCLUDE "gfx/pokemon/octillery/normal.pal"
-OctilleryShinyPalette:  INCLUDE "gfx/pokemon/octillery/shiny.pal"
-DelibirdPalette:        INCLUDE "gfx/pokemon/delibird/normal.pal"
-DelibirdShinyPalette:   INCLUDE "gfx/pokemon/delibird/shiny.pal"
-MantinePalette:         INCLUDE "gfx/pokemon/mantine/normal.pal"
-MantineShinyPalette:    INCLUDE "gfx/pokemon/mantine/shiny.pal"
-SkarmoryPalette:        INCLUDE "gfx/pokemon/skarmory/normal.pal"
-SkarmoryShinyPalette:   INCLUDE "gfx/pokemon/skarmory/shiny.pal"
-HoundourPalette:        INCLUDE "gfx/pokemon/houndour/normal.pal"
-HoundourShinyPalette:   INCLUDE "gfx/pokemon/houndour/shiny.pal"
-HoundoomPalette:        INCLUDE "gfx/pokemon/houndoom/normal.pal"
-HoundoomShinyPalette:   INCLUDE "gfx/pokemon/houndoom/shiny.pal"
-KingdraPalette:         INCLUDE "gfx/pokemon/kingdra/normal.pal"
-KingdraShinyPalette:    INCLUDE "gfx/pokemon/kingdra/shiny.pal"
-PhanpyPalette:          INCLUDE "gfx/pokemon/phanpy/normal.pal"
-PhanpyShinyPalette:     INCLUDE "gfx/pokemon/phanpy/shiny.pal"
-DonphanPalette:         INCLUDE "gfx/pokemon/donphan/normal.pal"
-DonphanShinyPalette:    INCLUDE "gfx/pokemon/donphan/shiny.pal"
-Porygon2Palette:        INCLUDE "gfx/pokemon/porygon2/normal.pal"
-Porygon2ShinyPalette:   INCLUDE "gfx/pokemon/porygon2/shiny.pal"
-StantlerPalette:        INCLUDE "gfx/pokemon/stantler/normal.pal"
-StantlerShinyPalette:   INCLUDE "gfx/pokemon/stantler/shiny.pal"
-SmearglePalette:        INCLUDE "gfx/pokemon/smeargle/normal.pal"
-SmeargleShinyPalette:   INCLUDE "gfx/pokemon/smeargle/shiny.pal"
-TyroguePalette:         INCLUDE "gfx/pokemon/tyrogue/normal.pal"
-TyrogueShinyPalette:    INCLUDE "gfx/pokemon/tyrogue/shiny.pal"
-HitmontopPalette:       INCLUDE "gfx/pokemon/hitmontop/normal.pal"
-HitmontopShinyPalette:  INCLUDE "gfx/pokemon/hitmontop/shiny.pal"
-SmoochumPalette:        INCLUDE "gfx/pokemon/smoochum/normal.pal"
-SmoochumShinyPalette:   INCLUDE "gfx/pokemon/smoochum/shiny.pal"
-ElekidPalette:          INCLUDE "gfx/pokemon/elekid/normal.pal"
-ElekidShinyPalette:     INCLUDE "gfx/pokemon/elekid/shiny.pal"
-MagbyPalette:           INCLUDE "gfx/pokemon/magby/normal.pal"
-MagbyShinyPalette:      INCLUDE "gfx/pokemon/magby/shiny.pal"
-MiltankPalette:         INCLUDE "gfx/pokemon/miltank/normal.pal"
-MiltankShinyPalette:    INCLUDE "gfx/pokemon/miltank/shiny.pal"
-BlisseyPalette:         INCLUDE "gfx/pokemon/blissey/normal.pal"
-BlisseyShinyPalette:    INCLUDE "gfx/pokemon/blissey/shiny.pal"
-RaikouPalette:          INCLUDE "gfx/pokemon/raikou/normal.pal"
-RaikouShinyPalette:     INCLUDE "gfx/pokemon/raikou/shiny.pal"
-EnteiPalette:           INCLUDE "gfx/pokemon/entei/normal.pal"
-EnteiShinyPalette:      INCLUDE "gfx/pokemon/entei/shiny.pal"
-SuicunePalette:         INCLUDE "gfx/pokemon/suicune/normal.pal"
-SuicuneShinyPalette:    INCLUDE "gfx/pokemon/suicune/shiny.pal"
-LarvitarPalette:        INCLUDE "gfx/pokemon/larvitar/normal.pal"
-LarvitarShinyPalette:   INCLUDE "gfx/pokemon/larvitar/shiny.pal"
-PupitarPalette:         INCLUDE "gfx/pokemon/pupitar/normal.pal"
-PupitarShinyPalette:    INCLUDE "gfx/pokemon/pupitar/shiny.pal"
-TyranitarPalette:       INCLUDE "gfx/pokemon/tyranitar/normal.pal"
-TyranitarShinyPalette:  INCLUDE "gfx/pokemon/tyranitar/shiny.pal"
-LugiaPalette:           INCLUDE "gfx/pokemon/lugia/normal.pal"
-LugiaShinyPalette:      INCLUDE "gfx/pokemon/lugia/shiny.pal"
-HoOhPalette:            INCLUDE "gfx/pokemon/ho_oh/normal.pal"
-HoOhShinyPalette:       INCLUDE "gfx/pokemon/ho_oh/shiny.pal"
-CelebiPalette:          INCLUDE "gfx/pokemon/celebi/normal.pal"
-CelebiShinyPalette:     INCLUDE "gfx/pokemon/celebi/shiny.pal"
-
-; 252
-	RGB 30, 26, 11
-	RGB 23, 16, 00
-; 252 shiny
-	RGB 30, 26, 11
-	RGB 23, 16, 00
-
-; Egg
-	RGB 30, 26, 11
-	RGB 23, 16, 00
-; Egg shiny
-	RGB 30, 26, 11
-	RGB 23, 16, 00
-
-; 254
-	RGB 30, 26, 11
-	RGB 23, 16, 00
-; 254 shiny
-	RGB 30, 26, 11
-	RGB 23, 16, 00
-
-; 255
-	RGB 23, 23, 23
-	RGB 17, 17, 17
-; 255 shiny
-	RGB 23, 23, 23
-	RGB 17, 17, 17
-
-; b0ce
diff --git a/gfx/pokemon/pic_pointers.asm b/gfx/pokemon/pic_pointers.asm
deleted file mode 100644
index 58631e09a..000000000
--- a/gfx/pokemon/pic_pointers.asm
+++ /dev/null
@@ -1,511 +0,0 @@
-PicPointers::
-; entries correspond to constants/pokemon_constants.asm, two apiece
-	dba_pic BulbasaurFrontpic
-	dba_pic BulbasaurBackpic
-	dba_pic IvysaurFrontpic
-	dba_pic IvysaurBackpic
-	dba_pic VenusaurFrontpic
-	dba_pic VenusaurBackpic
-	dba_pic CharmanderFrontpic
-	dba_pic CharmanderBackpic
-	dba_pic CharmeleonFrontpic
-	dba_pic CharmeleonBackpic
-	dba_pic CharizardFrontpic
-	dba_pic CharizardBackpic
-	dba_pic SquirtleFrontpic
-	dba_pic SquirtleBackpic
-	dba_pic WartortleFrontpic
-	dba_pic WartortleBackpic
-	dba_pic BlastoiseFrontpic
-	dba_pic BlastoiseBackpic
-	dba_pic CaterpieFrontpic
-	dba_pic CaterpieBackpic
-	dba_pic MetapodFrontpic
-	dba_pic MetapodBackpic
-	dba_pic ButterfreeFrontpic
-	dba_pic ButterfreeBackpic
-	dba_pic WeedleFrontpic
-	dba_pic WeedleBackpic
-	dba_pic KakunaFrontpic
-	dba_pic KakunaBackpic
-	dba_pic BeedrillFrontpic
-	dba_pic BeedrillBackpic
-	dba_pic PidgeyFrontpic
-	dba_pic PidgeyBackpic
-	dba_pic PidgeottoFrontpic
-	dba_pic PidgeottoBackpic
-	dba_pic PidgeotFrontpic
-	dba_pic PidgeotBackpic
-	dba_pic RattataFrontpic
-	dba_pic RattataBackpic
-	dba_pic RaticateFrontpic
-	dba_pic RaticateBackpic
-	dba_pic SpearowFrontpic
-	dba_pic SpearowBackpic
-	dba_pic FearowFrontpic
-	dba_pic FearowBackpic
-	dba_pic EkansFrontpic
-	dba_pic EkansBackpic
-	dba_pic ArbokFrontpic
-	dba_pic ArbokBackpic
-	dba_pic PikachuFrontpic
-	dba_pic PikachuBackpic
-	dba_pic RaichuFrontpic
-	dba_pic RaichuBackpic
-	dba_pic SandshrewFrontpic
-	dba_pic SandshrewBackpic
-	dba_pic SandslashFrontpic
-	dba_pic SandslashBackpic
-	dba_pic NidoranFFrontpic
-	dba_pic NidoranFBackpic
-	dba_pic NidorinaFrontpic
-	dba_pic NidorinaBackpic
-	dba_pic NidoqueenFrontpic
-	dba_pic NidoqueenBackpic
-	dba_pic NidoranMFrontpic
-	dba_pic NidoranMBackpic
-	dba_pic NidorinoFrontpic
-	dba_pic NidorinoBackpic
-	dba_pic NidokingFrontpic
-	dba_pic NidokingBackpic
-	dba_pic ClefairyFrontpic
-	dba_pic ClefairyBackpic
-	dba_pic ClefableFrontpic
-	dba_pic ClefableBackpic
-	dba_pic VulpixFrontpic
-	dba_pic VulpixBackpic
-	dba_pic NinetalesFrontpic
-	dba_pic NinetalesBackpic
-	dba_pic JigglypuffFrontpic
-	dba_pic JigglypuffBackpic
-	dba_pic WigglytuffFrontpic
-	dba_pic WigglytuffBackpic
-	dba_pic ZubatFrontpic
-	dba_pic ZubatBackpic
-	dba_pic GolbatFrontpic
-	dba_pic GolbatBackpic
-	dba_pic OddishFrontpic
-	dba_pic OddishBackpic
-	dba_pic GloomFrontpic
-	dba_pic GloomBackpic
-	dba_pic VileplumeFrontpic
-	dba_pic VileplumeBackpic
-	dba_pic ParasFrontpic
-	dba_pic ParasBackpic
-	dba_pic ParasectFrontpic
-	dba_pic ParasectBackpic
-	dba_pic VenonatFrontpic
-	dba_pic VenonatBackpic
-	dba_pic VenomothFrontpic
-	dba_pic VenomothBackpic
-	dba_pic DiglettFrontpic
-	dba_pic DiglettBackpic
-	dba_pic DugtrioFrontpic
-	dba_pic DugtrioBackpic
-	dba_pic MeowthFrontpic
-	dba_pic MeowthBackpic
-	dba_pic PersianFrontpic
-	dba_pic PersianBackpic
-	dba_pic PsyduckFrontpic
-	dba_pic PsyduckBackpic
-	dba_pic GolduckFrontpic
-	dba_pic GolduckBackpic
-	dba_pic MankeyFrontpic
-	dba_pic MankeyBackpic
-	dba_pic PrimeapeFrontpic
-	dba_pic PrimeapeBackpic
-	dba_pic GrowlitheFrontpic
-	dba_pic GrowlitheBackpic
-	dba_pic ArcanineFrontpic
-	dba_pic ArcanineBackpic
-	dba_pic PoliwagFrontpic
-	dba_pic PoliwagBackpic
-	dba_pic PoliwhirlFrontpic
-	dba_pic PoliwhirlBackpic
-	dba_pic PoliwrathFrontpic
-	dba_pic PoliwrathBackpic
-	dba_pic AbraFrontpic
-	dba_pic AbraBackpic
-	dba_pic KadabraFrontpic
-	dba_pic KadabraBackpic
-	dba_pic AlakazamFrontpic
-	dba_pic AlakazamBackpic
-	dba_pic MachopFrontpic
-	dba_pic MachopBackpic
-	dba_pic MachokeFrontpic
-	dba_pic MachokeBackpic
-	dba_pic MachampFrontpic
-	dba_pic MachampBackpic
-	dba_pic BellsproutFrontpic
-	dba_pic BellsproutBackpic
-	dba_pic WeepinbellFrontpic
-	dba_pic WeepinbellBackpic
-	dba_pic VictreebelFrontpic
-	dba_pic VictreebelBackpic
-	dba_pic TentacoolFrontpic
-	dba_pic TentacoolBackpic
-	dba_pic TentacruelFrontpic
-	dba_pic TentacruelBackpic
-	dba_pic GeodudeFrontpic
-	dba_pic GeodudeBackpic
-	dba_pic GravelerFrontpic
-	dba_pic GravelerBackpic
-	dba_pic GolemFrontpic
-	dba_pic GolemBackpic
-	dba_pic PonytaFrontpic
-	dba_pic PonytaBackpic
-	dba_pic RapidashFrontpic
-	dba_pic RapidashBackpic
-	dba_pic SlowpokeFrontpic
-	dba_pic SlowpokeBackpic
-	dba_pic SlowbroFrontpic
-	dba_pic SlowbroBackpic
-	dba_pic MagnemiteFrontpic
-	dba_pic MagnemiteBackpic
-	dba_pic MagnetonFrontpic
-	dba_pic MagnetonBackpic
-	dba_pic FarfetchDFrontpic
-	dba_pic FarfetchDBackpic
-	dba_pic DoduoFrontpic
-	dba_pic DoduoBackpic
-	dba_pic DodrioFrontpic
-	dba_pic DodrioBackpic
-	dba_pic SeelFrontpic
-	dba_pic SeelBackpic
-	dba_pic DewgongFrontpic
-	dba_pic DewgongBackpic
-	dba_pic GrimerFrontpic
-	dba_pic GrimerBackpic
-	dba_pic MukFrontpic
-	dba_pic MukBackpic
-	dba_pic ShellderFrontpic
-	dba_pic ShellderBackpic
-	dba_pic CloysterFrontpic
-	dba_pic CloysterBackpic
-	dba_pic GastlyFrontpic
-	dba_pic GastlyBackpic
-	dba_pic HaunterFrontpic
-	dba_pic HaunterBackpic
-	dba_pic GengarFrontpic
-	dba_pic GengarBackpic
-	dba_pic OnixFrontpic
-	dba_pic OnixBackpic
-	dba_pic DrowzeeFrontpic
-	dba_pic DrowzeeBackpic
-	dba_pic HypnoFrontpic
-	dba_pic HypnoBackpic
-	dba_pic KrabbyFrontpic
-	dba_pic KrabbyBackpic
-	dba_pic KinglerFrontpic
-	dba_pic KinglerBackpic
-	dba_pic VoltorbFrontpic
-	dba_pic VoltorbBackpic
-	dba_pic ElectrodeFrontpic
-	dba_pic ElectrodeBackpic
-	dba_pic ExeggcuteFrontpic
-	dba_pic ExeggcuteBackpic
-	dba_pic ExeggutorFrontpic
-	dba_pic ExeggutorBackpic
-	dba_pic CuboneFrontpic
-	dba_pic CuboneBackpic
-	dba_pic MarowakFrontpic
-	dba_pic MarowakBackpic
-	dba_pic HitmonleeFrontpic
-	dba_pic HitmonleeBackpic
-	dba_pic HitmonchanFrontpic
-	dba_pic HitmonchanBackpic
-	dba_pic LickitungFrontpic
-	dba_pic LickitungBackpic
-	dba_pic KoffingFrontpic
-	dba_pic KoffingBackpic
-	dba_pic WeezingFrontpic
-	dba_pic WeezingBackpic
-	dba_pic RhyhornFrontpic
-	dba_pic RhyhornBackpic
-	dba_pic RhydonFrontpic
-	dba_pic RhydonBackpic
-	dba_pic ChanseyFrontpic
-	dba_pic ChanseyBackpic
-	dba_pic TangelaFrontpic
-	dba_pic TangelaBackpic
-	dba_pic KangaskhanFrontpic
-	dba_pic KangaskhanBackpic
-	dba_pic HorseaFrontpic
-	dba_pic HorseaBackpic
-	dba_pic SeadraFrontpic
-	dba_pic SeadraBackpic
-	dba_pic GoldeenFrontpic
-	dba_pic GoldeenBackpic
-	dba_pic SeakingFrontpic
-	dba_pic SeakingBackpic
-	dba_pic StaryuFrontpic
-	dba_pic StaryuBackpic
-	dba_pic StarmieFrontpic
-	dba_pic StarmieBackpic
-	dba_pic MrMimeFrontpic
-	dba_pic MrMimeBackpic
-	dba_pic ScytherFrontpic
-	dba_pic ScytherBackpic
-	dba_pic JynxFrontpic
-	dba_pic JynxBackpic
-	dba_pic ElectabuzzFrontpic
-	dba_pic ElectabuzzBackpic
-	dba_pic MagmarFrontpic
-	dba_pic MagmarBackpic
-	dba_pic PinsirFrontpic
-	dba_pic PinsirBackpic
-	dba_pic TaurosFrontpic
-	dba_pic TaurosBackpic
-	dba_pic MagikarpFrontpic
-	dba_pic MagikarpBackpic
-	dba_pic GyaradosFrontpic
-	dba_pic GyaradosBackpic
-	dba_pic LaprasFrontpic
-	dba_pic LaprasBackpic
-	dba_pic DittoFrontpic
-	dba_pic DittoBackpic
-	dba_pic EeveeFrontpic
-	dba_pic EeveeBackpic
-	dba_pic VaporeonFrontpic
-	dba_pic VaporeonBackpic
-	dba_pic JolteonFrontpic
-	dba_pic JolteonBackpic
-	dba_pic FlareonFrontpic
-	dba_pic FlareonBackpic
-	dba_pic PorygonFrontpic
-	dba_pic PorygonBackpic
-	dba_pic OmanyteFrontpic
-	dba_pic OmanyteBackpic
-	dba_pic OmastarFrontpic
-	dba_pic OmastarBackpic
-	dba_pic KabutoFrontpic
-	dba_pic KabutoBackpic
-	dba_pic KabutopsFrontpic
-	dba_pic KabutopsBackpic
-	dba_pic AerodactylFrontpic
-	dba_pic AerodactylBackpic
-	dba_pic SnorlaxFrontpic
-	dba_pic SnorlaxBackpic
-	dba_pic ArticunoFrontpic
-	dba_pic ArticunoBackpic
-	dba_pic ZapdosFrontpic
-	dba_pic ZapdosBackpic
-	dba_pic MoltresFrontpic
-	dba_pic MoltresBackpic
-	dba_pic DratiniFrontpic
-	dba_pic DratiniBackpic
-	dba_pic DragonairFrontpic
-	dba_pic DragonairBackpic
-	dba_pic DragoniteFrontpic
-	dba_pic DragoniteBackpic
-	dba_pic MewtwoFrontpic
-	dba_pic MewtwoBackpic
-	dba_pic MewFrontpic
-	dba_pic MewBackpic
-	dba_pic ChikoritaFrontpic
-	dba_pic ChikoritaBackpic
-	dba_pic BayleefFrontpic
-	dba_pic BayleefBackpic
-	dba_pic MeganiumFrontpic
-	dba_pic MeganiumBackpic
-	dba_pic CyndaquilFrontpic
-	dba_pic CyndaquilBackpic
-	dba_pic QuilavaFrontpic
-	dba_pic QuilavaBackpic
-	dba_pic TyphlosionFrontpic
-	dba_pic TyphlosionBackpic
-	dba_pic TotodileFrontpic
-	dba_pic TotodileBackpic
-	dba_pic CroconawFrontpic
-	dba_pic CroconawBackpic
-	dba_pic FeraligatrFrontpic
-	dba_pic FeraligatrBackpic
-	dba_pic SentretFrontpic
-	dba_pic SentretBackpic
-	dba_pic FurretFrontpic
-	dba_pic FurretBackpic
-	dba_pic HoothootFrontpic
-	dba_pic HoothootBackpic
-	dba_pic NoctowlFrontpic
-	dba_pic NoctowlBackpic
-	dba_pic LedybaFrontpic
-	dba_pic LedybaBackpic
-	dba_pic LedianFrontpic
-	dba_pic LedianBackpic
-	dba_pic SpinarakFrontpic
-	dba_pic SpinarakBackpic
-	dba_pic AriadosFrontpic
-	dba_pic AriadosBackpic
-	dba_pic CrobatFrontpic
-	dba_pic CrobatBackpic
-	dba_pic ChinchouFrontpic
-	dba_pic ChinchouBackpic
-	dba_pic LanturnFrontpic
-	dba_pic LanturnBackpic
-	dba_pic PichuFrontpic
-	dba_pic PichuBackpic
-	dba_pic CleffaFrontpic
-	dba_pic CleffaBackpic
-	dba_pic IgglybuffFrontpic
-	dba_pic IgglybuffBackpic
-	dba_pic TogepiFrontpic
-	dba_pic TogepiBackpic
-	dba_pic TogeticFrontpic
-	dba_pic TogeticBackpic
-	dba_pic NatuFrontpic
-	dba_pic NatuBackpic
-	dba_pic XatuFrontpic
-	dba_pic XatuBackpic
-	dba_pic MareepFrontpic
-	dba_pic MareepBackpic
-	dba_pic FlaaffyFrontpic
-	dba_pic FlaaffyBackpic
-	dba_pic AmpharosFrontpic
-	dba_pic AmpharosBackpic
-	dba_pic BellossomFrontpic
-	dba_pic BellossomBackpic
-	dba_pic MarillFrontpic
-	dba_pic MarillBackpic
-	dba_pic AzumarillFrontpic
-	dba_pic AzumarillBackpic
-	dba_pic SudowoodoFrontpic
-	dba_pic SudowoodoBackpic
-	dba_pic PolitoedFrontpic
-	dba_pic PolitoedBackpic
-	dba_pic HoppipFrontpic
-	dba_pic HoppipBackpic
-	dba_pic SkiploomFrontpic
-	dba_pic SkiploomBackpic
-	dba_pic JumpluffFrontpic
-	dba_pic JumpluffBackpic
-	dba_pic AipomFrontpic
-	dba_pic AipomBackpic
-	dba_pic SunkernFrontpic
-	dba_pic SunkernBackpic
-	dba_pic SunfloraFrontpic
-	dba_pic SunfloraBackpic
-	dba_pic YanmaFrontpic
-	dba_pic YanmaBackpic
-	dba_pic WooperFrontpic
-	dba_pic WooperBackpic
-	dba_pic QuagsireFrontpic
-	dba_pic QuagsireBackpic
-	dba_pic EspeonFrontpic
-	dba_pic EspeonBackpic
-	dba_pic UmbreonFrontpic
-	dba_pic UmbreonBackpic
-	dba_pic MurkrowFrontpic
-	dba_pic MurkrowBackpic
-	dba_pic SlowkingFrontpic
-	dba_pic SlowkingBackpic
-	dba_pic MisdreavusFrontpic
-	dba_pic MisdreavusBackpic
-
-	; Unown pics have their own table. See UnownPicPointers
-	dbw -1, -1
-	dbw -1, -1
-
-	dba_pic WobbuffetFrontpic
-	dba_pic WobbuffetBackpic
-	dba_pic GirafarigFrontpic
-	dba_pic GirafarigBackpic
-	dba_pic PinecoFrontpic
-	dba_pic PinecoBackpic
-	dba_pic ForretressFrontpic
-	dba_pic ForretressBackpic
-	dba_pic DunsparceFrontpic
-	dba_pic DunsparceBackpic
-	dba_pic GligarFrontpic
-	dba_pic GligarBackpic
-	dba_pic SteelixFrontpic
-	dba_pic SteelixBackpic
-	dba_pic SnubbullFrontpic
-	dba_pic SnubbullBackpic
-	dba_pic GranbullFrontpic
-	dba_pic GranbullBackpic
-	dba_pic QwilfishFrontpic
-	dba_pic QwilfishBackpic
-	dba_pic ScizorFrontpic
-	dba_pic ScizorBackpic
-	dba_pic ShuckleFrontpic
-	dba_pic ShuckleBackpic
-	dba_pic HeracrossFrontpic
-	dba_pic HeracrossBackpic
-	dba_pic SneaselFrontpic
-	dba_pic SneaselBackpic
-	dba_pic TeddiursaFrontpic
-	dba_pic TeddiursaBackpic
-	dba_pic UrsaringFrontpic
-	dba_pic UrsaringBackpic
-	dba_pic SlugmaFrontpic
-	dba_pic SlugmaBackpic
-	dba_pic MagcargoFrontpic
-	dba_pic MagcargoBackpic
-	dba_pic SwinubFrontpic
-	dba_pic SwinubBackpic
-	dba_pic PiloswineFrontpic
-	dba_pic PiloswineBackpic
-	dba_pic CorsolaFrontpic
-	dba_pic CorsolaBackpic
-	dba_pic RemoraidFrontpic
-	dba_pic RemoraidBackpic
-	dba_pic OctilleryFrontpic
-	dba_pic OctilleryBackpic
-	dba_pic DelibirdFrontpic
-	dba_pic DelibirdBackpic
-	dba_pic MantineFrontpic
-	dba_pic MantineBackpic
-	dba_pic SkarmoryFrontpic
-	dba_pic SkarmoryBackpic
-	dba_pic HoundourFrontpic
-	dba_pic HoundourBackpic
-	dba_pic HoundoomFrontpic
-	dba_pic HoundoomBackpic
-	dba_pic KingdraFrontpic
-	dba_pic KingdraBackpic
-	dba_pic PhanpyFrontpic
-	dba_pic PhanpyBackpic
-	dba_pic DonphanFrontpic
-	dba_pic DonphanBackpic
-	dba_pic Porygon2Frontpic
-	dba_pic Porygon2Backpic
-	dba_pic StantlerFrontpic
-	dba_pic StantlerBackpic
-	dba_pic SmeargleFrontpic
-	dba_pic SmeargleBackpic
-	dba_pic TyrogueFrontpic
-	dba_pic TyrogueBackpic
-	dba_pic HitmontopFrontpic
-	dba_pic HitmontopBackpic
-	dba_pic SmoochumFrontpic
-	dba_pic SmoochumBackpic
-	dba_pic ElekidFrontpic
-	dba_pic ElekidBackpic
-	dba_pic MagbyFrontpic
-	dba_pic MagbyBackpic
-	dba_pic MiltankFrontpic
-	dba_pic MiltankBackpic
-	dba_pic BlisseyFrontpic
-	dba_pic BlisseyBackpic
-	dba_pic RaikouFrontpic
-	dba_pic RaikouBackpic
-	dba_pic EnteiFrontpic
-	dba_pic EnteiBackpic
-	dba_pic SuicuneFrontpic
-	dba_pic SuicuneBackpic
-	dba_pic LarvitarFrontpic
-	dba_pic LarvitarBackpic
-	dba_pic PupitarFrontpic
-	dba_pic PupitarBackpic
-	dba_pic TyranitarFrontpic
-	dba_pic TyranitarBackpic
-	dba_pic LugiaFrontpic
-	dba_pic LugiaBackpic
-	dba_pic HoOhFrontpic
-	dba_pic HoOhBackpic
-	dba_pic CelebiFrontpic
-	dba_pic CelebiBackpic
-	dbw -1, -1 ; unused
-	dbw -1, -1 ; unused
-	dba_pic EggPic
-	dbw -1, -1 ; unused
diff --git a/gfx/pokemon/unown_pic_pointers.asm b/gfx/pokemon/unown_pic_pointers.asm
deleted file mode 100644
index 1ae0da6b6..000000000
--- a/gfx/pokemon/unown_pic_pointers.asm
+++ /dev/null
@@ -1,54 +0,0 @@
-UnownPicPointers::
-; entries correspond to Unown letters, two apiece
-	dba_pic UnownAFrontpic
-	dba_pic UnownABackpic
-	dba_pic UnownBFrontpic
-	dba_pic UnownBBackpic
-	dba_pic UnownCFrontpic
-	dba_pic UnownCBackpic
-	dba_pic UnownDFrontpic
-	dba_pic UnownDBackpic
-	dba_pic UnownEFrontpic
-	dba_pic UnownEBackpic
-	dba_pic UnownFFrontpic
-	dba_pic UnownFBackpic
-	dba_pic UnownGFrontpic
-	dba_pic UnownGBackpic
-	dba_pic UnownHFrontpic
-	dba_pic UnownHBackpic
-	dba_pic UnownIFrontpic
-	dba_pic UnownIBackpic
-	dba_pic UnownJFrontpic
-	dba_pic UnownJBackpic
-	dba_pic UnownKFrontpic
-	dba_pic UnownKBackpic
-	dba_pic UnownLFrontpic
-	dba_pic UnownLBackpic
-	dba_pic UnownMFrontpic
-	dba_pic UnownMBackpic
-	dba_pic UnownNFrontpic
-	dba_pic UnownNBackpic
-	dba_pic UnownOFrontpic
-	dba_pic UnownOBackpic
-	dba_pic UnownPFrontpic
-	dba_pic UnownPBackpic
-	dba_pic UnownQFrontpic
-	dba_pic UnownQBackpic
-	dba_pic UnownRFrontpic
-	dba_pic UnownRBackpic
-	dba_pic UnownSFrontpic
-	dba_pic UnownSBackpic
-	dba_pic UnownTFrontpic
-	dba_pic UnownTBackpic
-	dba_pic UnownUFrontpic
-	dba_pic UnownUBackpic
-	dba_pic UnownVFrontpic
-	dba_pic UnownVBackpic
-	dba_pic UnownWFrontpic
-	dba_pic UnownWBackpic
-	dba_pic UnownXFrontpic
-	dba_pic UnownXBackpic
-	dba_pic UnownYFrontpic
-	dba_pic UnownYBackpic
-	dba_pic UnownZFrontpic
-	dba_pic UnownZBackpic
diff --git a/gfx/trainer_palettes.asm b/gfx/trainer_palettes.asm
deleted file mode 100644
index c943e49d7..000000000
--- a/gfx/trainer_palettes.asm
+++ /dev/null
@@ -1,76 +0,0 @@
-TrainerPalettes: ; b0ce
-; entries correspond to trainer classes
-
-PlayerPalette: ; b0ce
-; Chris uses the same colors as Cal
-INCLUDE "gfx/trainers/cal.pal"
-KrisPalette: ; b0d0
-; 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"
-; b1de
diff --git a/gfx/trainer_pic_pointers.asm b/gfx/trainer_pic_pointers.asm
deleted file mode 100644
index 201b44200..000000000
--- a/gfx/trainer_pic_pointers.asm
+++ /dev/null
@@ -1,69 +0,0 @@
-TrainerPicPointers::
-; entries correspond to trainer classes (see constants/trainer_constants.asm)
-	dba_pic FalknerPic
-	dba_pic WhitneyPic
-	dba_pic BugsyPic
-	dba_pic MortyPic
-	dba_pic PrycePic
-	dba_pic JasminePic
-	dba_pic ChuckPic
-	dba_pic ClairPic
-	dba_pic Rival1Pic
-	dba_pic PokemonProfPic
-	dba_pic WillPic
-	dba_pic CalPic
-	dba_pic BrunoPic
-	dba_pic KarenPic
-	dba_pic KogaPic
-	dba_pic ChampionPic
-	dba_pic BrockPic
-	dba_pic MistyPic
-	dba_pic LtSurgePic
-	dba_pic ScientistPic
-	dba_pic ErikaPic
-	dba_pic YoungsterPic
-	dba_pic SchoolboyPic
-	dba_pic BirdKeeperPic
-	dba_pic LassPic
-	dba_pic JaninePic
-	dba_pic CooltrainermPic
-	dba_pic CooltrainerfPic
-	dba_pic BeautyPic
-	dba_pic PokemaniacPic
-	dba_pic GruntmPic
-	dba_pic GentlemanPic
-	dba_pic SkierPic
-	dba_pic TeacherPic
-	dba_pic SabrinaPic
-	dba_pic BugCatcherPic
-	dba_pic FisherPic
-	dba_pic SwimmermPic
-	dba_pic SwimmerfPic
-	dba_pic SailorPic
-	dba_pic SuperNerdPic
-	dba_pic Rival2Pic
-	dba_pic GuitaristPic
-	dba_pic HikerPic
-	dba_pic BikerPic
-	dba_pic BlainePic
-	dba_pic BurglarPic
-	dba_pic FirebreatherPic
-	dba_pic JugglerPic
-	dba_pic BlackbeltTPic
-	dba_pic ExecutivemPic
-	dba_pic PsychicTPic
-	dba_pic PicnickerPic
-	dba_pic CamperPic
-	dba_pic ExecutivefPic
-	dba_pic SagePic
-	dba_pic MediumPic
-	dba_pic BoarderPic
-	dba_pic PokefanmPic
-	dba_pic KimonoGirlPic
-	dba_pic TwinsPic
-	dba_pic PokefanfPic
-	dba_pic RedPic
-	dba_pic BluePic
-	dba_pic OfficerPic
-	dba_pic GruntfPic
-	dba_pic MysticalmanPic