Merge pull request #437 from roukaour/master

Reorganize battle/; rename most "header" misnomers; gfx/pics → gfx/pokemon
author: yenatch <yenatch@gmail.com> 2017-12-28 01:30:36 -0500
committer: GitHub <noreply@github.com> 2017-12-28 01:30:36 -0500
commit: da28d1a84b0499bead314e17ae2ff0d13eb03196 (patch)
tree: c212adfc53d1996c06f2e4be1d6e480e687a2ad8
parent: bad9e33530af8cdc29ce5629df682fc7915bfff0 (diff)
parent: 2c4777f3363cd64d05fb00084fd83dff8ac31674 (diff)
2598 files changed, 9742 insertions, 9748 deletions
diff --git a/.gitignore b/.gitignore
index 85a07e345..d3dfbf82b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,6 @@ pokecrystal.txt
 *.lz
 *.pal
 *.animated.tilemap
-gfx/pics/*/bitmask.asm
-gfx/pics/*/frames.asm
-!gfx/pics/*/shiny.pal
+gfx/pokemon/*/bitmask.asm
+gfx/pokemon/*/frames.asm
+!gfx/pokemon/*/shiny.pal
diff --git a/Makefile b/Makefile
index 4a4c640f9..2a746f2ca 100644
--- a/Makefile
+++ b/Makefile
@@ -100,41 +100,41 @@ pokecrystal.gbc: $(crystal_obj) pokecrystal.link
 ### Terrible hacks to match animations. Delete these rules if you don't care about matching.
 
 # Dewgong has an unused tile id in its last frame. The tile itself is missing.
-gfx/pics/dewgong/frames.asm: gfx/pics/dewgong/front.animated.tilemap gfx/pics/dewgong/front.dimensions
+gfx/pokemon/dewgong/frames.asm: gfx/pokemon/dewgong/front.animated.tilemap gfx/pokemon/dewgong/front.dimensions
 	tools/pokemon_animation -f $^ > $@
 	echo "	db \$$4d" >> $@
 
 # Lugia has two unused tile ids in its last frame. The tiles themselves are missing.
-gfx/pics/lugia/frames.asm: gfx/pics/lugia/front.animated.tilemap gfx/pics/lugia/front.dimensions
+gfx/pokemon/lugia/frames.asm: gfx/pokemon/lugia/front.animated.tilemap gfx/pokemon/lugia/front.dimensions
 	tools/pokemon_animation -f $^ > $@
 	echo "	db \$$5e, \$$59" >> $@
 
 # Girafarig has a redundant tile after the end. It is used in two frames, so it must be injected into the generated graphics.
 # This is more involved, so it's hacked into pokemon_animation_graphics.
-gfx/pics/girafarig/front.animated.2bpp: gfx/pics/girafarig/front.2bpp gfx/pics/girafarig/front.dimensions
+gfx/pokemon/girafarig/front.animated.2bpp: gfx/pokemon/girafarig/front.2bpp gfx/pokemon/girafarig/front.dimensions
 	tools/pokemon_animation_graphics --girafarig -o $@ $^
-gfx/pics/girafarig/front.animated.tilemap: gfx/pics/girafarig/front.2bpp gfx/pics/girafarig/front.dimensions
+gfx/pokemon/girafarig/front.animated.tilemap: gfx/pokemon/girafarig/front.2bpp gfx/pokemon/girafarig/front.dimensions
 	tools/pokemon_animation_graphics --girafarig -t $@ $^
 
 
 ### Pokemon pic graphics rules
 
-gfx/pics/%/normal.gbcpal: gfx/pics/%/front.png
+gfx/pokemon/%/normal.gbcpal: gfx/pokemon/%/front.png
 	$(RGBGFX) -p $@ $<
-gfx/pics/%/normal.pal: gfx/pics/%/normal.gbcpal
+gfx/pokemon/%/normal.pal: gfx/pokemon/%/normal.gbcpal
 	tools/palette -p $< > $@
-gfx/pics/%/back.2bpp: gfx/pics/%/back.png
+gfx/pokemon/%/back.2bpp: gfx/pokemon/%/back.png
 	$(RGBGFX) -h -o $@ $<
-gfx/pics/%/bitmask.asm: gfx/pics/%/front.animated.tilemap gfx/pics/%/front.dimensions
+gfx/pokemon/%/bitmask.asm: gfx/pokemon/%/front.animated.tilemap gfx/pokemon/%/front.dimensions
 	tools/pokemon_animation -b $^ > $@
-gfx/pics/%/frames.asm: gfx/pics/%/front.animated.tilemap gfx/pics/%/front.dimensions
+gfx/pokemon/%/frames.asm: gfx/pokemon/%/front.animated.tilemap gfx/pokemon/%/front.dimensions
 	tools/pokemon_animation -f $^ > $@
-gfx/pics/%/front.animated.2bpp: gfx/pics/%/front.2bpp gfx/pics/%/front.dimensions
+gfx/pokemon/%/front.animated.2bpp: gfx/pokemon/%/front.2bpp gfx/pokemon/%/front.dimensions
 	tools/pokemon_animation_graphics -o $@ $^
-gfx/pics/%/front.animated.tilemap: gfx/pics/%/front.2bpp gfx/pics/%/front.dimensions
+gfx/pokemon/%/front.animated.tilemap: gfx/pokemon/%/front.2bpp gfx/pokemon/%/front.dimensions
 	tools/pokemon_animation_graphics -t $@ $^
 # Don't use -h, pokemon_animation_graphics takes care of it
-#gfx/pics/%/front.2bpp: gfx/pics/%/front.png
+#gfx/pokemon/%/front.2bpp: gfx/pokemon/%/front.png
 #	$(RGBGFX) -o $@ $<
 
 
@@ -147,11 +147,11 @@ gfx/trainers/%.2bpp: rgbgfx += -h
 gfx/trainers/%.pal: gfx/trainers/%.gbcpal
 	tools/palette -p $< > $@
 
-gfx/mail/0b9b46.1bpp: tools/gfx += --remove-whitespace
-gfx/mail/0b9d46.1bpp: tools/gfx += --remove-whitespace
-gfx/mail/0b9d86.1bpp: tools/gfx += --remove-whitespace
-gfx/mail/0b9dc6.1bpp: tools/gfx += --remove-whitespace
-gfx/mail/0b9cfe.1bpp: tools/gfx += --remove-whitespace
+gfx/mail/dragonite.1bpp: tools/gfx += --remove-whitespace
+gfx/mail/large_note.1bpp: tools/gfx += --remove-whitespace
+gfx/mail/surf_mail_border.1bpp: tools/gfx += --remove-whitespace
+gfx/mail/flower_mail_border.1bpp: tools/gfx += --remove-whitespace
+gfx/mail/litebluemail_border.1bpp: tools/gfx += --remove-whitespace
 
 gfx/pokedex/pokedex.2bpp: tools/gfx += --trim-whitespace
 gfx/pokedex/sgb.2bpp: tools/gfx += --trim-whitespace
@@ -169,23 +169,23 @@ gfx/slots/slots_3.2bpp: tools/gfx += --interleave --png=$< --remove-duplicates -
 
 gfx/card_flip/card_flip_2.2bpp: tools/gfx += --remove-whitespace
 
-gfx/fx/angels.2bpp: tools/gfx += --trim-whitespace
-gfx/fx/beam.2bpp: tools/gfx += --remove-xflip --remove-yflip --remove-whitespace
-gfx/fx/bubble.2bpp: tools/gfx += --trim-whitespace
-gfx/fx/charge.2bpp: tools/gfx += --trim-whitespace
-gfx/fx/egg.2bpp: tools/gfx += --remove-whitespace
-gfx/fx/explosion.2bpp: tools/gfx += --remove-whitespace
-gfx/fx/hit.2bpp: tools/gfx += --remove-whitespace
-gfx/fx/horn.2bpp: tools/gfx += --remove-whitespace
-gfx/fx/lightning.2bpp: tools/gfx += --remove-whitespace
-gfx/fx/misc.2bpp: tools/gfx += --remove-duplicates --remove-xflip
-gfx/fx/noise.2bpp: tools/gfx += --remove-whitespace
-gfx/fx/objects.2bpp: tools/gfx += --remove-whitespace --remove-xflip
-gfx/fx/pokeball.2bpp: tools/gfx += --remove-xflip --keep-whitespace
-gfx/fx/reflect.2bpp: tools/gfx += --remove-whitespace
-gfx/fx/rocks.2bpp: tools/gfx += --remove-whitespace
-gfx/fx/skyattack.2bpp: tools/gfx += --remove-whitespace
-gfx/fx/status.2bpp: tools/gfx += --remove-whitespace
+gfx/battle_anims/angels.2bpp: tools/gfx += --trim-whitespace
+gfx/battle_anims/beam.2bpp: tools/gfx += --remove-xflip --remove-yflip --remove-whitespace
+gfx/battle_anims/bubble.2bpp: tools/gfx += --trim-whitespace
+gfx/battle_anims/charge.2bpp: tools/gfx += --trim-whitespace
+gfx/battle_anims/egg.2bpp: tools/gfx += --remove-whitespace
+gfx/battle_anims/explosion.2bpp: tools/gfx += --remove-whitespace
+gfx/battle_anims/hit.2bpp: tools/gfx += --remove-whitespace
+gfx/battle_anims/horn.2bpp: tools/gfx += --remove-whitespace
+gfx/battle_anims/lightning.2bpp: tools/gfx += --remove-whitespace
+gfx/battle_anims/misc.2bpp: tools/gfx += --remove-duplicates --remove-xflip
+gfx/battle_anims/noise.2bpp: tools/gfx += --remove-whitespace
+gfx/battle_anims/objects.2bpp: tools/gfx += --remove-whitespace --remove-xflip
+gfx/battle_anims/pokeball.2bpp: tools/gfx += --remove-xflip --keep-whitespace
+gfx/battle_anims/reflect.2bpp: tools/gfx += --remove-whitespace
+gfx/battle_anims/rocks.2bpp: tools/gfx += --remove-whitespace
+gfx/battle_anims/skyattack.2bpp: tools/gfx += --remove-whitespace
+gfx/battle_anims/status.2bpp: tools/gfx += --remove-whitespace
 
 gfx/player/chris.2bpp: rgbgfx += -h
 gfx/player/chris_back.2bpp: rgbgfx += -h
diff --git a/audio.asm b/audio.asm
index c358e4d9b..196b5a4c8 100644
--- a/audio.asm
+++ b/audio.asm
@@ -157,6 +157,6 @@ INCLUDE "audio/sfx_crystal.asm"
 
 SECTION "Cries", ROMX
 
-INCLUDE "data/pokemon/cry_headers.asm"
+INCLUDE "data/pokemon/cries.asm"
 
 INCLUDE "audio/cries.asm"
diff --git a/audio/wave_samples.asm b/audio/wave_samples.asm
index 8c5bafa75..d48259888 100644
--- a/audio/wave_samples.asm
+++ b/audio/wave_samples.asm
@@ -1,14 +1,14 @@
 WaveSamples: ; e8db2
 	; these are streams of 32 4-bit values used as wavepatterns
 	; nothing interesting here!
-	dn 0, 2, 4, 6, 8, 10, 12, 14, 15, 15, 15, 14, 14, 13, 13, 12, 12, 11, 10, 9, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 1, 1
-	dn 0, 2, 4, 6, 8, 10, 12, 14, 14, 15, 15, 15, 15, 14, 14, 14, 13, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 2, 1, 1
-	dn 1, 3, 6, 9, 11, 13, 14, 14, 14, 14, 15, 15, 15, 15, 14, 13, 13, 14, 15, 15, 15, 15, 14, 14, 14, 14, 13, 11, 9, 6, 3, 1
-	dn 0, 2, 4, 6, 8, 10, 12, 13, 14, 15, 15, 14, 13, 14, 15, 15, 14, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0
-	dn 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 13, 14, 14, 15, 7, 7, 15, 14, 14, 13, 12, 10, 8, 7, 6, 5, 4, 3, 2, 1, 0
-	dn 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 3, 3, 2, 2, 1, 1, 15, 15, 14, 14, 12, 12, 10, 10, 8, 8, 10, 10, 12, 12, 14, 14
-	dn 0, 2, 4, 6, 8, 10, 12, 14, 12, 11, 10, 9, 8, 7, 6, 5, 15, 15, 15, 14, 14, 13, 13, 12, 4, 4, 3, 3, 2, 2, 1, 1
-	dn 12, 0, 10, 9, 8, 7, 15, 5, 15, 15, 15, 14, 14, 13, 13, 12, 4, 4, 3, 3, 2, 2, 15, 1, 0, 2, 4, 6, 8, 10, 12, 14
-	dn 4, 4, 3, 3, 2, 2, 1, 15, 0, 0, 4, 6, 8, 10, 12, 14, 15, 8, 15, 14, 14, 13, 13, 12, 12, 11, 10, 9, 8, 7, 6, 5
-	dn 1, 1, 0, 0, 0, 0, 0, 8, 0, 0, 1, 3, 5, 7, 9, 10, 11, 4, 11, 10, 10, 9, 9, 8, 8, 7, 6, 5, 4, 3, 2, 1
+	dn  0,  2,  4,  6,  8, 10, 12, 14, 15, 15, 15, 14, 14, 13, 13, 12, 12, 11, 10,  9,  8,  7,  6,  5,  4,  4,  3,  3,  2,  2,  1,  1
+	dn  0,  2,  4,  6,  8, 10, 12, 14, 14, 15, 15, 15, 15, 14, 14, 14, 13, 13, 12, 11, 10,  9,  8,  7,  6,  5,  4,  3,  2,  2,  1,  1
+	dn  1,  3,  6,  9, 11, 13, 14, 14, 14, 14, 15, 15, 15, 15, 14, 13, 13, 14, 15, 15, 15, 15, 14, 14, 14, 14, 13, 11,  9,  6,  3,  1
+	dn  0,  2,  4,  6,  8, 10, 12, 13, 14, 15, 15, 14, 13, 14, 15, 15, 14, 14, 13, 12, 11, 10,  9,  8,  7,  6,  5,  4,  3,  2,  1,  0
+	dn  0,  1,  2,  3,  4,  5,  6,  7,  8, 10, 12, 13, 14, 14, 15,  7,  7, 15, 14, 14, 13, 12, 10,  8,  7,  6,  5,  4,  3,  2,  1,  0
+	dn  0,  0,  1,  1,  2,  2,  3,  3,  4,  4,  3,  3,  2,  2,  1,  1, 15, 15, 14, 14, 12, 12, 10, 10,  8,  8, 10, 10, 12, 12, 14, 14
+	dn  0,  2,  4,  6,  8, 10, 12, 14, 12, 11, 10,  9,  8,  7,  6,  5, 15, 15, 15, 14, 14, 13, 13, 12,  4,  4,  3,  3,  2,  2,  1,  1
+	dn 12,  0, 10,  9,  8,  7, 15,  5, 15, 15, 15, 14, 14, 13, 13, 12,  4,  4,  3,  3,  2,  2, 15,  1,  0,  2,  4,  6,  8, 10, 12, 14
+	dn  4,  4,  3,  3,  2,  2,  1, 15,  0,  0,  4,  6,  8, 10, 12, 14, 15,  8, 15, 14, 14, 13, 13, 12, 12, 11, 10,  9,  8,  7,  6,  5
+	dn  1,  1,  0,  0,  0,  0,  0,  8,  0,  0,  1,  3,  5,  7,  9, 10, 11,  4, 11, 10, 10,  9,  9,  8,  8,  7,  6,  5,  4,  3,  2,  1
 ; e8e52
diff --git a/battle/anim_gfx.asm b/battle/anim_gfx.asm
deleted file mode 100644
index da6614980..000000000
--- a/battle/anim_gfx.asm
+++ /dev/null
@@ -1,41 +0,0 @@
-AnimObj00GFX: ; 84a2e
-AnimObjHitGFX:       INCBIN "gfx/fx/hit.2bpp.lz"
-AnimObjCutGFX:       INCBIN "gfx/fx/cut.2bpp.lz"
-AnimObjFireGFX:      INCBIN "gfx/fx/fire.2bpp.lz"
-AnimObjWaterGFX:     INCBIN "gfx/fx/water.2bpp.lz"
-AnimObjLightningGFX: INCBIN "gfx/fx/lightning.2bpp.lz"
-AnimObjSmokeGFX:     INCBIN "gfx/fx/smoke.2bpp.lz"
-AnimObjExplosionGFX: INCBIN "gfx/fx/explosion.2bpp.lz"
-AnimObjIceGFX:       INCBIN "gfx/fx/ice.2bpp.lz"
-AnimObjRocksGFX:     INCBIN "gfx/fx/rocks.2bpp.lz"
-AnimObjPoisonGFX:    INCBIN "gfx/fx/poison.2bpp.lz"
-AnimObjPlantGFX:     INCBIN "gfx/fx/plant.2bpp.lz"
-AnimObjPokeBallGFX:  INCBIN "gfx/fx/pokeball.2bpp.lz"
-AnimObjBubbleGFX:    INCBIN "gfx/fx/bubble.2bpp.lz"
-AnimObjNoiseGFX:     INCBIN "gfx/fx/noise.2bpp.lz"
-AnimObjReflectGFX:   INCBIN "gfx/fx/reflect.2bpp.lz"
-AnimObjPowderGFX:    INCBIN "gfx/fx/powder.2bpp.lz"
-AnimObjBeamGFX:      INCBIN "gfx/fx/beam.2bpp.lz"
-AnimObjSpeedGFX:     INCBIN "gfx/fx/speed.2bpp.lz"
-AnimObjChargeGFX:    INCBIN "gfx/fx/charge.2bpp.lz"
-AnimObjWindGFX:      INCBIN "gfx/fx/wind.2bpp.lz"
-AnimObjWhipGFX:      INCBIN "gfx/fx/whip.2bpp.lz"
-AnimObjRopeGFX:      INCBIN "gfx/fx/rope.2bpp.lz"
-AnimObjEggGFX:       INCBIN "gfx/fx/egg.2bpp.lz"
-AnimObjPsychicGFX:   INCBIN "gfx/fx/psychic.2bpp.lz"
-AnimObjSandGFX:      INCBIN "gfx/fx/sand.2bpp.lz"
-AnimObjWebGFX:       INCBIN "gfx/fx/web.2bpp.lz"
-AnimObjHazeGFX:      INCBIN "gfx/fx/haze.2bpp.lz"
-AnimObjHornGFX:      INCBIN "gfx/fx/horn.2bpp.lz"
-AnimObjFlowerGFX:    INCBIN "gfx/fx/flower.2bpp.lz"
-AnimObjMiscGFX:      INCBIN "gfx/fx/misc.2bpp.lz"
-AnimObjSkyAttackGFX: INCBIN "gfx/fx/skyattack.2bpp.lz"
-AnimObjGlobeGFX:     INCBIN "gfx/fx/globe.2bpp.lz"
-AnimObjShapesGFX:    INCBIN "gfx/fx/shapes.2bpp.lz"
-AnimObjStatusGFX:    INCBIN "gfx/fx/status.2bpp.lz"
-AnimObjObjectsGFX:   INCBIN "gfx/fx/objects.2bpp.lz"
-AnimObjShineGFX:     INCBIN "gfx/fx/shine.2bpp.lz"
-AnimObjAngelsGFX:    INCBIN "gfx/fx/angels.2bpp.lz"
-AnimObjWaveGFX:      INCBIN "gfx/fx/wave.2bpp.lz"
-AnimObjAeroblastGFX: INCBIN "gfx/fx/aeroblast.2bpp.lz"
-; 8640e
diff --git a/battle/anim_objects.asm b/battle/anim_objects.asm
deleted file mode 100644
index 786a035bf..000000000
--- a/battle/anim_objects.asm
+++ /dev/null
@@ -1,9 +0,0 @@
-; Objects used in battle animations.
-
-INCLUDE "battle/objects/engine.asm"
-INCLUDE "battle/objects/data.asm"
-INCLUDE "battle/objects/functions.asm"
-INCLUDE "battle/objects/helpers.asm"
-INCLUDE "battle/objects/framesets.asm"
-INCLUDE "battle/objects/oam.asm"
-INCLUDE "battle/objects/gfx_headers.asm"
diff --git a/battle/objects/framesets.asm b/battle/objects/framesets.asm
deleted file mode 100755
index 3e4186aed..000000000
--- a/battle/objects/framesets.asm
+++ /dev/null
@@ -1,1270 +0,0 @@
-BattleAnimFrameData: ; ce85e
-	dw .Frameset_00 ; 00
-	dw .Frameset_01 ; 01
-	dw .Frameset_02 ; 02
-	dw .Frameset_03 ; 03
-	dw .Frameset_04 ; 04
-	dw .Frameset_05 ; 05
-	dw .Frameset_06 ; 06
-	dw .Frameset_07 ; 07
-	dw .Frameset_08 ; 08
-	dw .Frameset_09 ; 09
-	dw .Frameset_0a ; 0a
-	dw .Frameset_0b ; 0b
-	dw .Frameset_0c ; 0c
-	dw .Frameset_0d ; 0d
-	dw .Frameset_0e ; 0e
-	dw .Frameset_0f ; 0f
-	dw .Frameset_10 ; 10
-	dw .Frameset_11 ; 11
-	dw .Frameset_12 ; 12
-	dw .Frameset_13 ; 13
-	dw .Frameset_14 ; 14
-	dw .Frameset_15 ; 15
-	dw .Frameset_16 ; 16
-	dw .Frameset_17 ; 17
-	dw .Frameset_18 ; 18
-	dw .Frameset_19 ; 19
-	dw .Frameset_1a ; 1a
-	dw .Frameset_1b ; 1b
-	dw .Frameset_1c ; 1c
-	dw .Frameset_1d ; 1d
-	dw .Frameset_1e ; 1e
-	dw .Frameset_1f ; 1f
-	dw .Frameset_20 ; 20
-	dw .Frameset_21 ; 21
-	dw .Frameset_22 ; 22
-	dw .Frameset_23 ; 23
-	dw .Frameset_24 ; 24
-	dw .Frameset_25 ; 25
-	dw .Frameset_26 ; 26
-	dw .Frameset_27 ; 27
-	dw .Frameset_28 ; 28
-	dw .Frameset_29 ; 29
-	dw .Frameset_2a ; 2a
-	dw .Frameset_2b ; 2b
-	dw .Frameset_2c ; 2c
-	dw .Frameset_2d ; 2d
-	dw .Frameset_2e ; 2e
-	dw .Frameset_2f ; 2f
-	dw .Frameset_30 ; 30
-	dw .Frameset_31 ; 31
-	dw .Frameset_32 ; 32
-	dw .Frameset_33 ; 33
-	dw .Frameset_34 ; 34
-	dw .Frameset_35 ; 35
-	dw .Frameset_36 ; 36
-	dw .Frameset_37 ; 37
-	dw .Frameset_38 ; 38
-	dw .Frameset_39 ; 39
-	dw .Frameset_3a ; 3a
-	dw .Frameset_3b ; 3b
-	dw .Frameset_3c ; 3c
-	dw .Frameset_3d ; 3d
-	dw .Frameset_3e ; 3e
-	dw .Frameset_3f ; 3f
-	dw .Frameset_40 ; 40
-	dw .Frameset_41 ; 41
-	dw .Frameset_42 ; 42
-	dw .Frameset_43 ; 43
-	dw .Frameset_44 ; 44
-	dw .Frameset_45 ; 45
-	dw .Frameset_46 ; 46
-	dw .Frameset_47 ; 47
-	dw .Frameset_48 ; 48
-	dw .Frameset_49 ; 49
-	dw .Frameset_4a ; 4a
-	dw .Frameset_4b ; 4b
-	dw .Frameset_4c ; 4c
-	dw .Frameset_4d ; 4d
-	dw .Frameset_4e ; 4e
-	dw .Frameset_4f ; 4f
-	dw .Frameset_50 ; 50
-	dw .Frameset_51 ; 51
-	dw .Frameset_52 ; 52
-	dw .Frameset_53 ; 53
-	dw .Frameset_54 ; 54
-	dw .Frameset_55 ; 55
-	dw .Frameset_56 ; 56
-	dw .Frameset_57 ; 57
-	dw .Frameset_58 ; 58
-	dw .Frameset_59 ; 59
-	dw .Frameset_5a ; 5a
-	dw .Frameset_5b ; 5b
-	dw .Frameset_5c ; 5c
-	dw .Frameset_5d ; 5d
-	dw .Frameset_5e ; 5e
-	dw .Frameset_5f ; 5f
-	dw .Frameset_60 ; 60
-	dw .Frameset_61 ; 61
-	dw .Frameset_62 ; 62
-	dw .Frameset_63 ; 63
-	dw .Frameset_64 ; 64
-	dw .Frameset_65 ; 65
-	dw .Frameset_66 ; 66
-	dw .Frameset_67 ; 67
-	dw .Frameset_68 ; 68
-	dw .Frameset_69 ; 69
-	dw .Frameset_6a ; 6a
-	dw .Frameset_6b ; 6b
-	dw .Frameset_6c ; 6c
-	dw .Frameset_6d ; 6d
-	dw .Frameset_6e ; 6e
-	dw .Frameset_6f ; 6f
-	dw .Frameset_70 ; 70
-	dw .Frameset_71 ; 71
-	dw .Frameset_72 ; 72
-	dw .Frameset_73 ; 73
-	dw .Frameset_74 ; 74
-	dw .Frameset_75 ; 75
-	dw .Frameset_76 ; 76
-	dw .Frameset_77 ; 77
-	dw .Frameset_78 ; 78
-	dw .Frameset_79 ; 79
-	dw .Frameset_7a ; 7a
-	dw .Frameset_7b ; 7b
-	dw .Frameset_7c ; 7c
-	dw .Frameset_7d ; 7d
-	dw .Frameset_7e ; 7e
-	dw .Frameset_7f ; 7f
-	dw .Frameset_80 ; 80
-	dw .Frameset_81 ; 81
-	dw .Frameset_82 ; 82
-	dw .Frameset_83 ; 83
-	dw .Frameset_84 ; 84
-	dw .Frameset_85 ; 85
-	dw .Frameset_86 ; 86
-	dw .Frameset_87 ; 87
-	dw .Frameset_88 ; 88
-	dw .Frameset_89 ; 89
-	dw .Frameset_8a ; 8a
-	dw .Frameset_8b ; 8b
-	dw .Frameset_8c ; 8c
-	dw .Frameset_8d ; 8d
-	dw .Frameset_8e ; 8e
-	dw .Frameset_8f ; 8f
-	dw .Frameset_90 ; 90
-	dw .Frameset_91 ; 91
-	dw .Frameset_92 ; 92
-	dw .Frameset_93 ; 93
-	dw .Frameset_94 ; 94
-	dw .Frameset_95 ; 95
-	dw .Frameset_96 ; 96
-	dw .Frameset_97 ; 97
-	dw .Frameset_98 ; 98
-	dw .Frameset_99 ; 99
-	dw .Frameset_9a ; 9a
-	dw .Frameset_9b ; 9b
-	dw .Frameset_9c ; 9c
-	dw .Frameset_9d ; 9d
-	dw .Frameset_9e ; 9e
-	dw .Frameset_9f ; 9f
-	dw .Frameset_a0 ; a0
-	dw .Frameset_a1 ; a1
-	dw .Frameset_a2 ; a2
-	dw .Frameset_a3 ; a3
-	dw .Frameset_a4 ; a4
-	dw .Frameset_a5 ; a5
-	dw .Frameset_a6 ; a6
-	dw .Frameset_a7 ; a7
-	dw .Frameset_a8 ; a8
-	dw .Frameset_a9 ; a9
-	dw .Frameset_aa ; aa
-	dw .Frameset_ab ; ab
-	dw .Frameset_ac ; ac
-	dw .Frameset_ad ; ad
-	dw .Frameset_ae ; ae
-	dw .Frameset_af ; af
-	dw .Frameset_b0 ; b0
-	dw .Frameset_b1 ; b1
-	dw .Frameset_b2 ; b2
-	dw .Frameset_b3 ; b3
-	dw .Frameset_b4 ; b4
-	dw .Frameset_b5 ; b5
-	dw .Frameset_b6 ; b6
-	dw .Frameset_b7 ; b7
-	dw .Frameset_b8 ; b8
-
-     ; OAM index (see battle/objects/oam.asm), flip flags / duration
-.Frameset_00:
-	db BATTLEANIMOAMSET_00, $06
-	db -4
-
-.Frameset_01:
-	db BATTLEANIMOAMSET_01, $06
-	db -4
-
-.Frameset_02:
-	db BATTLEANIMOAMSET_02, $06
-	db -4
-
-.Frameset_03:
-	db BATTLEANIMOAMSET_03, $06
-	db -4
-
-.Frameset_04:
-	db BATTLEANIMOAMSET_04, $06
-	db -4
-
-.Frameset_05:
-	db BATTLEANIMOAMSET_05, $06
-	db -4
-
-.Frameset_06:
-	db BATTLEANIMOAMSET_06, $06
-	db -4
-
-.Frameset_07:
-	db BATTLEANIMOAMSET_03, $04
-	db BATTLEANIMOAMSET_01, $01
-	db BATTLEANIMOAMSET_03, $04
-	db BATTLEANIMOAMSET_01, $01
-	db BATTLEANIMOAMSET_03, $04
-	db BATTLEANIMOAMSET_01, $01
-	db BATTLEANIMOAMSET_03, $04
-	db BATTLEANIMOAMSET_01, $01
-	db -4
-
-.Frameset_3e:
-	db BATTLEANIMOAMSET_4B, $02
-	db BATTLEANIMOAMSET_4C, $02
-	db BATTLEANIMOAMSET_4D, $04
-	db BATTLEANIMOAMSET_4E, $02
-	db -3, $02
-	db BATTLEANIMOAMSET_4E, $02
-	db -3, $02
-	db BATTLEANIMOAMSET_4E, $02
-	db -3, $02
-	db BATTLEANIMOAMSET_4E, $02
-	db -4
-
-.Frameset_3f:
-	db BATTLEANIMOAMSET_4B, $42
-	db BATTLEANIMOAMSET_4C, $42
-	db BATTLEANIMOAMSET_4D, $44
-	db BATTLEANIMOAMSET_4E, $42
-	db -3, $02
-	db BATTLEANIMOAMSET_4E, $42
-	db -3, $02
-	db BATTLEANIMOAMSET_4E, $42
-	db -3, $02
-	db BATTLEANIMOAMSET_4E, $42
-	db -4
-
-.Frameset_40:
-	db BATTLEANIMOAMSET_4B, $c2
-	db BATTLEANIMOAMSET_4C, $c2
-	db BATTLEANIMOAMSET_4D, $c4
-	db BATTLEANIMOAMSET_4E, $c2
-	db -3, $02
-	db BATTLEANIMOAMSET_4E, $c2
-	db -3, $02
-	db BATTLEANIMOAMSET_4E, $c2
-	db -3, $02
-	db BATTLEANIMOAMSET_4E, $c2
-	db -4
-
-.Frameset_41:
-	db BATTLEANIMOAMSET_4B, $01
-	db BATTLEANIMOAMSET_4C, $01
-	db BATTLEANIMOAMSET_4D, $01
-	db BATTLEANIMOAMSET_4F, $01
-	db BATTLEANIMOAMSET_50, $01
-	db BATTLEANIMOAMSET_51, $01
-	db BATTLEANIMOAMSET_52, $02
-	db -3, $02
-	db BATTLEANIMOAMSET_52, $02
-	db -3, $02
-	db BATTLEANIMOAMSET_52, $02
-	db -3, $02
-	db BATTLEANIMOAMSET_52, $02
-	db -4
-
-.Frameset_42:
-	db BATTLEANIMOAMSET_4B, $41
-	db BATTLEANIMOAMSET_4C, $41
-	db BATTLEANIMOAMSET_4D, $41
-	db BATTLEANIMOAMSET_4F, $41
-	db BATTLEANIMOAMSET_50, $41
-	db BATTLEANIMOAMSET_51, $41
-	db BATTLEANIMOAMSET_52, $42
-	db -3, $02
-	db BATTLEANIMOAMSET_52, $42
-	db -3, $02
-	db BATTLEANIMOAMSET_52, $42
-	db -3, $02
-	db BATTLEANIMOAMSET_52, $42
-	db -4
-
-.Frameset_08:
-	db BATTLEANIMOAMSET_00, $03
-	db BATTLEANIMOAMSET_07, $03
-	db BATTLEANIMOAMSET_08, $03
-	db BATTLEANIMOAMSET_09, $03
-	db -4
-
-.Frameset_09:
-	db BATTLEANIMOAMSET_0A, $07
-	db BATTLEANIMOAMSET_0B, $07
-	db BATTLEANIMOAMSET_0A, $07
-	db BATTLEANIMOAMSET_0B, $47
-	db -2
-
-.Frameset_0a:
-	db BATTLEANIMOAMSET_0C, $08
-	db -1
-
-.Frameset_0b:
-	db BATTLEANIMOAMSET_0D, $08
-	db -1
-
-.Frameset_0c:
-	db BATTLEANIMOAMSET_0A, $08
-	db -1
-
-.Frameset_0d:
-	db BATTLEANIMOAMSET_0A, $07
-	db BATTLEANIMOAMSET_0B, $07
-	db BATTLEANIMOAMSET_0A, $07
-	db BATTLEANIMOAMSET_0B, $47
-	db BATTLEANIMOAMSET_0A, $07
-	db -1
-
-.Frameset_0e:
-	db BATTLEANIMOAMSET_0A, $08
-	db -1
-
-.Frameset_0f:
-	db BATTLEANIMOAMSET_0A, $04
-	db BATTLEANIMOAMSET_0E, $04
-	db -2
-
-.Frameset_10:
-	db BATTLEANIMOAMSET_0F, $04
-	db BATTLEANIMOAMSET_10, $04
-	db -2
-
-.Frameset_11:
-	db BATTLEANIMOAMSET_10, $04
-	db BATTLEANIMOAMSET_0F, $04
-	db BATTLEANIMOAMSET_0E, $04
-	db BATTLEANIMOAMSET_0A, $04
-	db BATTLEANIMOAMSET_0E, $04
-	db BATTLEANIMOAMSET_0A, $04
-	db BATTLEANIMOAMSET_0E, $04
-	db BATTLEANIMOAMSET_0A, $04
-	db -4
-
-.Frameset_12:
-	db BATTLEANIMOAMSET_10, $01
-	db BATTLEANIMOAMSET_0F, $01
-	db BATTLEANIMOAMSET_12, $01
-	db BATTLEANIMOAMSET_11, $01
-	db BATTLEANIMOAMSET_12, $01
-	db BATTLEANIMOAMSET_0F, $01
-	db -2
-
-.Frameset_13:
-	db BATTLEANIMOAMSET_10, $03
-	db BATTLEANIMOAMSET_0F, $03
-	db BATTLEANIMOAMSET_12, $01
-	db -3, $01
-	db BATTLEANIMOAMSET_12, $01
-	db -3, $01
-	db BATTLEANIMOAMSET_12, $01
-	db -3, $01
-	db BATTLEANIMOAMSET_12, $01
-	db -3, $01
-	db BATTLEANIMOAMSET_12, $03
-	db -4
-
-.Frameset_14:
-	db BATTLEANIMOAMSET_13, $14
-	db -4
-
-.Frameset_15:
-	db BATTLEANIMOAMSET_10, $01
-	db BATTLEANIMOAMSET_0F, $01
-	db -2
-
-.Frameset_16:
-	db BATTLEANIMOAMSET_14, $08
-	db -1
-
-.Frameset_17:
-	db BATTLEANIMOAMSET_17, $04
-	db BATTLEANIMOAMSET_16, $08
-	db BATTLEANIMOAMSET_15, $08
-	db BATTLEANIMOAMSET_16, $08
-	db BATTLEANIMOAMSET_17, $04
-	db BATTLEANIMOAMSET_17, $04
-	db BATTLEANIMOAMSET_16, $48
-	db BATTLEANIMOAMSET_15, $48
-	db BATTLEANIMOAMSET_16, $48
-	db BATTLEANIMOAMSET_17, $04
-	db -2
-
-.Frameset_56:
-	db BATTLEANIMOAMSET_69, $08
-	db -1
-
-.Frameset_57:
-	db BATTLEANIMOAMSET_69, $20
-	db BATTLEANIMOAMSET_6A, $04
-	db BATTLEANIMOAMSET_6B, $04
-	db BATTLEANIMOAMSET_6D, $04
-	db BATTLEANIMOAMSET_6C, $04
-	db -1
-
-.Frameset_58:
-	db BATTLEANIMOAMSET_6C, $08
-	db BATTLEANIMOAMSET_6D, $08
-	db -2
-
-.Frameset_18:
-	db BATTLEANIMOAMSET_18, $04
-	db BATTLEANIMOAMSET_19, $04
-	db BATTLEANIMOAMSET_1A, $04
-	db -4
-
-.Frameset_19:
-	db BATTLEANIMOAMSET_1B, $08
-	db -1
-
-.Frameset_1a:
-	db BATTLEANIMOAMSET_0F, $08
-	db -1
-
-.Frameset_1b:
-	db BATTLEANIMOAMSET_1C, $08
-	db -1
-
-.Frameset_1c:
-	db BATTLEANIMOAMSET_0A, $08
-	db -4
-
-.Frameset_1d:
-	db BATTLEANIMOAMSET_1D, $08
-	db -1
-
-.Frameset_1e:
-	db BATTLEANIMOAMSET_17, $08
-	db -1
-
-.Frameset_1f:
-	db BATTLEANIMOAMSET_0F, $03
-	db BATTLEANIMOAMSET_10, $03
-	db BATTLEANIMOAMSET_1E, $03
-	db -1
-
-.Frameset_20:
-	db BATTLEANIMOAMSET_1F, $10
-	db BATTLEANIMOAMSET_20, $03
-	db -4
-
-.Frameset_21:
-	db BATTLEANIMOAMSET_20, $08
-	db -1
-
-.Frameset_22:
-	db BATTLEANIMOAMSET_20, $08
-	db BATTLEANIMOAMSET_21, $08
-	db BATTLEANIMOAMSET_1B, $08
-	db BATTLEANIMOAMSET_21, $08
-	db -2
-
-.Frameset_23:
-	db BATTLEANIMOAMSET_22, $08
-	db -1
-
-.Frameset_24:
-	db BATTLEANIMOAMSET_1B, $08
-	db -1
-
-.Frameset_25:
-	db BATTLEANIMOAMSET_23, $08
-	db -1
-
-.Frameset_26:
-	db BATTLEANIMOAMSET_24, $08
-	db -1
-
-.Frameset_27:
-	db BATTLEANIMOAMSET_25, $08
-	db -1
-
-.Frameset_28:
-	db BATTLEANIMOAMSET_26, $08
-	db BATTLEANIMOAMSET_27, $08
-	db -1
-
-.Frameset_29:
-	db BATTLEANIMOAMSET_28, $08
-	db BATTLEANIMOAMSET_29, $08
-	db -4
-
-.Frameset_2a:
-	db BATTLEANIMOAMSET_2A, $01
-	db BATTLEANIMOAMSET_2B, $01
-	db BATTLEANIMOAMSET_2C, $01
-	db BATTLEANIMOAMSET_2D, $01
-	db BATTLEANIMOAMSET_2E, $01
-	db BATTLEANIMOAMSET_2D, $01
-	db BATTLEANIMOAMSET_2C, $01
-	db BATTLEANIMOAMSET_2B, $01
-	db BATTLEANIMOAMSET_2A, $01
-	db -4
-
-.Frameset_2b:
-	db BATTLEANIMOAMSET_14, $01
-	db BATTLEANIMOAMSET_15, $01
-	db -2
-
-.Frameset_2c:
-	db BATTLEANIMOAMSET_2F, $04
-	db BATTLEANIMOAMSET_30, $28
-	db -4
-
-.Frameset_2d:
-	db BATTLEANIMOAMSET_31, $08
-	db -1
-
-.Frameset_2e:
-	db BATTLEANIMOAMSET_32, $20
-	db BATTLEANIMOAMSET_33, $20
-	db BATTLEANIMOAMSET_34, $20
-	db BATTLEANIMOAMSET_35, $20 ; fallthrough
-.Frameset_2f:
-	db -3, $02
-	db BATTLEANIMOAMSET_35, $04
-	db -3, $02
-	db BATTLEANIMOAMSET_35, $04
-	db -3, $02
-	db BATTLEANIMOAMSET_35, $04
-	db -3, $02
-	db BATTLEANIMOAMSET_35, $04
-	db -4
-
-.Frameset_30:
-	db BATTLEANIMOAMSET_14, $04
-	db BATTLEANIMOAMSET_15, $04
-	db -2
-
-.Frameset_31:
-	db BATTLEANIMOAMSET_36, $02
-	db BATTLEANIMOAMSET_37, $02
-	db BATTLEANIMOAMSET_38, $02
-	db BATTLEANIMOAMSET_39, $20
-	db -4
-
-.Frameset_32:
-	db BATTLEANIMOAMSET_3A, $02
-	db BATTLEANIMOAMSET_3B, $02
-	db BATTLEANIMOAMSET_3C, $02
-	db BATTLEANIMOAMSET_3D, $20
-	db -4
-
-.Frameset_33:
-	db BATTLEANIMOAMSET_3A, $42
-	db BATTLEANIMOAMSET_3B, $42
-	db BATTLEANIMOAMSET_3C, $42
-	db BATTLEANIMOAMSET_3D, $60
-	db -4
-
-.Frameset_34:
-	db BATTLEANIMOAMSET_3E, $08
-	db BATTLEANIMOAMSET_3F, $08
-	db BATTLEANIMOAMSET_40, $08
-	db -1
-
-.Frameset_35:
-	db BATTLEANIMOAMSET_40, $02
-	db -3, $02
-	db BATTLEANIMOAMSET_40, $02
-	db -3, $02
-	db BATTLEANIMOAMSET_41, $02
-	db -3, $02
-	db BATTLEANIMOAMSET_41, $02
-	db -3, $02
-	db -2
-
-.Frameset_36:
-	db BATTLEANIMOAMSET_42, $02
-	db BATTLEANIMOAMSET_43, $02
-	db BATTLEANIMOAMSET_44, $02
-	db BATTLEANIMOAMSET_45, $02
-	db -2
-
-.Frameset_37:
-	db BATTLEANIMOAMSET_19, $02
-	db -3, $02
-	db -2
-
-.Frameset_38:
-	db BATTLEANIMOAMSET_46, $04
-	db BATTLEANIMOAMSET_47, $04
-	db -2
-
-.Frameset_39:
-	db BATTLEANIMOAMSET_18, $02
-	db -3, $02
-	db -2
-
-.Frameset_3a:
-	db BATTLEANIMOAMSET_48, $08
-	db -1
-
-.Frameset_3b:
-	db BATTLEANIMOAMSET_48, $48
-	db -1
-
-.Frameset_3c:
-	db BATTLEANIMOAMSET_49, $08
-	db -1
-
-.Frameset_3d:
-	db BATTLEANIMOAMSET_4A, $08
-	db -1
-
-.Frameset_43:
-	db BATTLEANIMOAMSET_20, $10
-	db BATTLEANIMOAMSET_1F, $10
-	db BATTLEANIMOAMSET_1E, $10
-	db -1
-
-.Frameset_4c:
-	db BATTLEANIMOAMSET_20, $08
-	db BATTLEANIMOAMSET_1F, $08
-	db BATTLEANIMOAMSET_1E, $08
-	db -1
-
-.Frameset_44:
-	db -3, $14
-	db BATTLEANIMOAMSET_55, $28
-	db BATTLEANIMOAMSET_54, $28
-	db BATTLEANIMOAMSET_53, $14
-	db -3, $04
-	db BATTLEANIMOAMSET_53, $04
-	db -3, $04
-	db BATTLEANIMOAMSET_53, $04
-	db -3, $04
-	db BATTLEANIMOAMSET_53, $04
-	db -4
-
-.Frameset_7e:
-	db BATTLEANIMOAMSET_1E, $08
-	db BATTLEANIMOAMSET_1F, $08
-	db BATTLEANIMOAMSET_20, $08
-	db -4
-
-.Frameset_45:
-	db -3, $00
-	db BATTLEANIMOAMSET_14, $00
-	db BATTLEANIMOAMSET_15, $00
-	db BATTLEANIMOAMSET_14, $40
-	db -3, $00
-	db BATTLEANIMOAMSET_16, $40
-	db BATTLEANIMOAMSET_15, $00
-	db BATTLEANIMOAMSET_16, $00
-	db -2
-
-.Frameset_46:
-	db BATTLEANIMOAMSET_56, $02
-	db BATTLEANIMOAMSET_57, $04
-	db -4
-
-.Frameset_47:
-	db BATTLEANIMOAMSET_56, $c2
-	db BATTLEANIMOAMSET_57, $c4
-	db -4
-
-.Frameset_48:
-	db BATTLEANIMOAMSET_56, $01
-	db BATTLEANIMOAMSET_57, $01
-	db BATTLEANIMOAMSET_58, $01
-	db BATTLEANIMOAMSET_57, $c1
-	db BATTLEANIMOAMSET_58, $c1
-	db BATTLEANIMOAMSET_57, $02
-	db -4
-
-.Frameset_49:
-	db BATTLEANIMOAMSET_56, $c1
-	db BATTLEANIMOAMSET_57, $c1
-	db BATTLEANIMOAMSET_58, $c1
-	db BATTLEANIMOAMSET_57, $01
-	db BATTLEANIMOAMSET_58, $01
-	db BATTLEANIMOAMSET_57, $c2
-	db -4
-
-.Frameset_4a:
-	db BATTLEANIMOAMSET_57, $c1
-	db BATTLEANIMOAMSET_58, $c1
-	db BATTLEANIMOAMSET_57, $01
-	db BATTLEANIMOAMSET_58, $01
-	db -2
-
-.Frameset_4b:
-	db BATTLEANIMOAMSET_59, $01
-	db BATTLEANIMOAMSET_5A, $01
-	db BATTLEANIMOAMSET_5B, $01
-	db BATTLEANIMOAMSET_5C, $02
-	db -4
-
-.Frameset_4d:
-	db BATTLEANIMOAMSET_0A, $0a
-	db BATTLEANIMOAMSET_0B, $43
-	db BATTLEANIMOAMSET_5D, $43
-	db BATTLEANIMOAMSET_0B, $c3
-	db BATTLEANIMOAMSET_0A, $82
-	db BATTLEANIMOAMSET_0B, $81
-	db BATTLEANIMOAMSET_5D, $01
-	db BATTLEANIMOAMSET_0B, $01
-	db -2
-
-.Frameset_4e:
-	db BATTLEANIMOAMSET_0A, $03
-	db BATTLEANIMOAMSET_0B, $47
-	db BATTLEANIMOAMSET_0A, $07
-	db BATTLEANIMOAMSET_0B, $07
-	db BATTLEANIMOAMSET_0A, $03
-	db -2
-
-.Frameset_4f:
-	db BATTLEANIMOAMSET_5E, $20
-	db BATTLEANIMOAMSET_5E, $20
-	db -4
-
-.Frameset_50:
-	db BATTLEANIMOAMSET_5F, $20
-	db BATTLEANIMOAMSET_5F, $20
-	db -4
-
-.Frameset_51:
-	db BATTLEANIMOAMSET_60, $08
-	db -1
-
-.Frameset_52:
-	db BATTLEANIMOAMSET_61, $01
-	db BATTLEANIMOAMSET_62, $01
-	db BATTLEANIMOAMSET_63, $01
-	db -1
-
-.Frameset_53:
-	db BATTLEANIMOAMSET_63, $07
-	db BATTLEANIMOAMSET_64, $07
-	db -2
-
-.Frameset_54:
-	db BATTLEANIMOAMSET_65, $01
-	db BATTLEANIMOAMSET_66, $01
-	db BATTLEANIMOAMSET_67, $01
-	db -1
-
-.Frameset_55:
-	db BATTLEANIMOAMSET_67, $07
-	db BATTLEANIMOAMSET_68, $07
-	db -2
-
-.Frameset_59:
-	db BATTLEANIMOAMSET_6E, $08
-	db -1
-
-.Frameset_5a:
-	db BATTLEANIMOAMSET_6F, $08
-	db -1
-
-.Frameset_5b:
-	db BATTLEANIMOAMSET_6E, $88
-	db -1
-
-.Frameset_5c:
-	db BATTLEANIMOAMSET_18, $04
-	db BATTLEANIMOAMSET_70, $04
-	db BATTLEANIMOAMSET_71, $04
-	db BATTLEANIMOAMSET_72, $04
-	db BATTLEANIMOAMSET_73, $04
-	db -4
-
-.Frameset_5d:
-	db BATTLEANIMOAMSET_74, $04
-	db BATTLEANIMOAMSET_75, $04
-	db -2
-
-.Frameset_5e:
-	db BATTLEANIMOAMSET_14, $08
-	db -1
-
-.Frameset_7a:
-	db BATTLEANIMOAMSET_74, $03
-	db BATTLEANIMOAMSET_14, $03
-	db BATTLEANIMOAMSET_15, $03
-	db BATTLEANIMOAMSET_14, $03
-	db BATTLEANIMOAMSET_15, $03
-	db -4
-
-.Frameset_af:
-	db BATTLEANIMOAMSET_14, $00
-	db BATTLEANIMOAMSET_15, $00
-	db BATTLEANIMOAMSET_14, $00
-	db BATTLEANIMOAMSET_15, $00
-	db BATTLEANIMOAMSET_74, $0c
-	db -4
-
-.Frameset_5f:
-	db BATTLEANIMOAMSET_76, $08
-	db -1
-
-.Frameset_60:
-	db BATTLEANIMOAMSET_77, $01
-	db BATTLEANIMOAMSET_78, $01
-	db BATTLEANIMOAMSET_79, $01
-	db BATTLEANIMOAMSET_7A, $01
-	db BATTLEANIMOAMSET_7B, $01
-	db BATTLEANIMOAMSET_7C, $01
-	db BATTLEANIMOAMSET_7D, $01
-	db BATTLEANIMOAMSET_7C, $c1
-	db BATTLEANIMOAMSET_7B, $c1
-	db BATTLEANIMOAMSET_7A, $c1
-	db BATTLEANIMOAMSET_79, $c1
-	db BATTLEANIMOAMSET_78, $c1
-	db BATTLEANIMOAMSET_77, $c1
-	db -4
-
-.Frameset_61:
-	db BATTLEANIMOAMSET_1B, $04
-	db BATTLEANIMOAMSET_7E, $04
-	db -2
-
-.Frameset_62:
-	db BATTLEANIMOAMSET_1B, $44
-	db BATTLEANIMOAMSET_7E, $44
-	db -2
-
-.Frameset_63:
-	db BATTLEANIMOAMSET_7F, $08
-	db -1
-
-.Frameset_64:
-	db BATTLEANIMOAMSET_25, $08
-	db -1
-
-.Frameset_65:
-	db BATTLEANIMOAMSET_80, $08
-	db -1
-
-.Frameset_66:
-	db BATTLEANIMOAMSET_83, $07
-	db BATTLEANIMOAMSET_82, $07
-	db BATTLEANIMOAMSET_81, $07
-	db BATTLEANIMOAMSET_82, $07
-	db BATTLEANIMOAMSET_83, $07
-	db BATTLEANIMOAMSET_82, $07
-	db BATTLEANIMOAMSET_81, $07
-	db -4
-
-.Frameset_67:
-	db BATTLEANIMOAMSET_1B, $10
-	db -4
-
-.Frameset_68:
-	db -3, $0f
-	db BATTLEANIMOAMSET_84, $0f
-	db BATTLEANIMOAMSET_85, $0f
-	db BATTLEANIMOAMSET_29, $0f
-	db BATTLEANIMOAMSET_28, $0f
-	db BATTLEANIMOAMSET_86, $20
-	db -4
-
-.Frameset_69:
-	db BATTLEANIMOAMSET_1B, $03
-	db BATTLEANIMOAMSET_87, $03
-	db BATTLEANIMOAMSET_88, $03
-	db BATTLEANIMOAMSET_89, $03
-	db -4
-
-.Frameset_6a:
-	db BATTLEANIMOAMSET_8A, $02
-	db BATTLEANIMOAMSET_8B, $02
-	db BATTLEANIMOAMSET_8C, $02
-	db BATTLEANIMOAMSET_8D, $02
-	db -4
-
-.Frameset_6b:
-	db BATTLEANIMOAMSET_61, $02
-	db BATTLEANIMOAMSET_62, $02
-	db BATTLEANIMOAMSET_63, $02
-	db -1
-
-.Frameset_6c:
-	db BATTLEANIMOAMSET_65, $02
-	db BATTLEANIMOAMSET_66, $02
-	db BATTLEANIMOAMSET_67, $02
-	db -1
-
-.Frameset_6d:
-	db BATTLEANIMOAMSET_8E, $08
-	db -1
-
-.Frameset_6e:
-	db BATTLEANIMOAMSET_8E, $48
-	db -1
-
-.Frameset_6f:
-	db BATTLEANIMOAMSET_8F, $10
-	db BATTLEANIMOAMSET_90, $10
-	db -2
-
-.Frameset_70:
-	db BATTLEANIMOAMSET_91, $10
-	db BATTLEANIMOAMSET_92, $10
-	db -2
-
-.Frameset_71:
-	db BATTLEANIMOAMSET_93, $08
-	db -1
-
-.Frameset_72:
-	db BATTLEANIMOAMSET_1E, $08
-	db -1
-
-.Frameset_73:
-	db BATTLEANIMOAMSET_1B, $07
-	db BATTLEANIMOAMSET_94, $07
-	db -2
-
-.Frameset_74:
-	db BATTLEANIMOAMSET_95, $08
-	db -1
-
-.Frameset_75:
-	db BATTLEANIMOAMSET_96, $08
-	db -1
-
-.Frameset_76:
-	db BATTLEANIMOAMSET_95, $08
-	db -1
-
-.Frameset_77:
-	db BATTLEANIMOAMSET_97, $01
-	db BATTLEANIMOAMSET_97, $41
-	db -2
-
-.Frameset_78:
-	db BATTLEANIMOAMSET_98, $08
-	db -1
-
-.Frameset_79:
-	db BATTLEANIMOAMSET_99, $20
-	db BATTLEANIMOAMSET_99, $20
-	db BATTLEANIMOAMSET_99, $20
-	db BATTLEANIMOAMSET_99, $20
-	db BATTLEANIMOAMSET_99, $20
-	db BATTLEANIMOAMSET_9A, $08
-	db -1
-
-.Frameset_7b:
-	db BATTLEANIMOAMSET_9B, $08
-	db -1
-
-.Frameset_7c:
-	db BATTLEANIMOAMSET_9C, $02
-	db BATTLEANIMOAMSET_9D, $02
-	db BATTLEANIMOAMSET_9E, $08
-	db -3, $02
-	db BATTLEANIMOAMSET_9E, $02
-	db -3, $02
-	db BATTLEANIMOAMSET_9E, $02
-	db -3, $02
-	db BATTLEANIMOAMSET_9E, $02
-	db -4
-
-.Frameset_7d:
-	db BATTLEANIMOAMSET_9F, $08
-	db -1
-
-.Frameset_7f:
-	db BATTLEANIMOAMSET_0F, $08
-	db -1
-
-.Frameset_80:
-	db BATTLEANIMOAMSET_6B, $18
-	db -4
-
-.Frameset_81:
-	db BATTLEANIMOAMSET_A0, $01 ; fallthrough
-.Frameset_82:
-	db BATTLEANIMOAMSET_A1, $01 ; fallthrough
-.Frameset_83:
-	db BATTLEANIMOAMSET_A2, $01
-	db -4
-
-.Frameset_84:
-	db BATTLEANIMOAMSET_A3, $08
-	db -1
-
-.Frameset_85:
-	db BATTLEANIMOAMSET_A4, $04
-	db BATTLEANIMOAMSET_A5, $04
-	db BATTLEANIMOAMSET_A6, $04
-	db BATTLEANIMOAMSET_A7, $04
-	db BATTLEANIMOAMSET_A6, $44
-	db BATTLEANIMOAMSET_A5, $44
-	db -2
-
-.Frameset_86:
-	db BATTLEANIMOAMSET_A8, $04
-	db BATTLEANIMOAMSET_A9, $04
-	db BATTLEANIMOAMSET_AA, $04
-	db BATTLEANIMOAMSET_AB, $04
-	db BATTLEANIMOAMSET_AA, $44
-	db BATTLEANIMOAMSET_A9, $44
-	db -2
-
-.Frameset_87:
-	db BATTLEANIMOAMSET_1B, $08
-	db -1
-
-.Frameset_88:
-	db BATTLEANIMOAMSET_AC, $08
-	db -1
-
-.Frameset_89:
-	db BATTLEANIMOAMSET_AD, $08
-	db -1
-
-.Frameset_8a:
-	db BATTLEANIMOAMSET_AE, $08
-	db -1
-
-.Frameset_8b:
-	db BATTLEANIMOAMSET_AF, $08
-	db -1
-
-.Frameset_8c:
-	db BATTLEANIMOAMSET_B0, $20
-	db -4
-
-.Frameset_8d:
-	db BATTLEANIMOAMSET_B1, $07
-	db BATTLEANIMOAMSET_B1, $47
-	db -2
-
-.Frameset_8e:
-	db BATTLEANIMOAMSET_B2, $08
-	db -1
-
-.Frameset_8f:
-	db BATTLEANIMOAMSET_B3, $08
-	db -1
-
-.Frameset_90:
-	db BATTLEANIMOAMSET_B3, $48
-	db -1
-
-.Frameset_91:
-	db BATTLEANIMOAMSET_B3, $88
-	db -1
-
-.Frameset_92:
-	db BATTLEANIMOAMSET_B3, $c8
-	db -1
-
-.Frameset_93:
-	db BATTLEANIMOAMSET_B5, $08
-	db -1
-
-.Frameset_94:
-	db BATTLEANIMOAMSET_B5, $48
-	db -1
-
-.Frameset_95:
-	db BATTLEANIMOAMSET_B5, $88
-	db -1
-
-.Frameset_96:
-	db BATTLEANIMOAMSET_B5, $c8
-	db -1
-
-.Frameset_97:
-	db BATTLEANIMOAMSET_B4, $08
-	db -1
-
-.Frameset_98:
-	db BATTLEANIMOAMSET_6B, $08
-	db -1
-
-.Frameset_99:
-	db BATTLEANIMOAMSET_B6, $08
-	db -1
-
-.Frameset_9a:
-	db BATTLEANIMOAMSET_B7, $20
-	db -1
-
-.Frameset_9b:
-	db BATTLEANIMOAMSET_1B, $20
-	db -1
-
-.Frameset_9c:
-	db BATTLEANIMOAMSET_B8, $20
-	db -1
-
-.Frameset_9d:
-	db BATTLEANIMOAMSET_B8, $60
-	db -1
-
-.Frameset_9e:
-	db BATTLEANIMOAMSET_B9, $20
-	db -1
-
-.Frameset_9f:
-	db BATTLEANIMOAMSET_BA, $20
-	db -1
-
-.Frameset_a0:
-	db BATTLEANIMOAMSET_BB, $60
-	db -1
-
-.Frameset_a1:
-	db BATTLEANIMOAMSET_BB, $20
-	db -1
-
-.Frameset_a2:
-	db BATTLEANIMOAMSET_BC, $20
-	db -1
-
-.Frameset_a3:
-	db BATTLEANIMOAMSET_BD, $0b
-	db BATTLEANIMOAMSET_BE, $0b
-	db BATTLEANIMOAMSET_1B, $0b
-	db -4
-
-.Frameset_a4:
-	db BATTLEANIMOAMSET_BF, $04
-	db BATTLEANIMOAMSET_C0, $04
-	db BATTLEANIMOAMSET_C1, $04
-	db -4
-
-.Frameset_a5:
-	db BATTLEANIMOAMSET_C2, $20
-	db BATTLEANIMOAMSET_C2, $20
-	db -4
-
-.Frameset_a6:
-	db BATTLEANIMOAMSET_4B, $02
-	db BATTLEANIMOAMSET_4C, $02
-	db BATTLEANIMOAMSET_4D, $20
-	db BATTLEANIMOAMSET_4D, $20
-	db BATTLEANIMOAMSET_4D, $20
-	db BATTLEANIMOAMSET_4F, $01
-	db BATTLEANIMOAMSET_50, $01
-	db BATTLEANIMOAMSET_51, $01
-	db BATTLEANIMOAMSET_52, $02
-	db -3, $02
-	db BATTLEANIMOAMSET_52, $02
-	db -3, $02
-	db BATTLEANIMOAMSET_52, $02
-	db -3, $02
-	db BATTLEANIMOAMSET_52, $02
-	db -4
-
-.Frameset_a7:
-	db BATTLEANIMOAMSET_4B, $c2
-	db BATTLEANIMOAMSET_4C, $c2
-	db BATTLEANIMOAMSET_4D, $e0
-	db BATTLEANIMOAMSET_4D, $e0
-	db BATTLEANIMOAMSET_4D, $e0
-	db BATTLEANIMOAMSET_4F, $c1
-	db BATTLEANIMOAMSET_50, $c1
-	db BATTLEANIMOAMSET_51, $c1
-	db BATTLEANIMOAMSET_52, $c2
-	db -3, $02
-	db BATTLEANIMOAMSET_52, $c2
-	db -3, $02
-	db BATTLEANIMOAMSET_52, $c2
-	db -3, $02
-	db BATTLEANIMOAMSET_52, $c2
-	db -4
-
-.Frameset_a8:
-	db BATTLEANIMOAMSET_C3, $01
-	db BATTLEANIMOAMSET_C3, $c1
-	db -2
-
-.Frameset_a9:
-	db BATTLEANIMOAMSET_C4, $20
-	db -1
-
-.Frameset_aa:
-	db BATTLEANIMOAMSET_C5, $04
-	db BATTLEANIMOAMSET_C6, $04
-	db BATTLEANIMOAMSET_C7, $04
-	db -4
-
-.Frameset_ab:
-	db BATTLEANIMOAMSET_C8, $01
-	db BATTLEANIMOAMSET_C8, $41
-	db -2
-
-.Frameset_ac:
-	db BATTLEANIMOAMSET_C9, $03
-	db BATTLEANIMOAMSET_05, $03
-	db -4
-
-.Frameset_ad:
-	db BATTLEANIMOAMSET_CA, $20
-	db BATTLEANIMOAMSET_CB, $03
-	db BATTLEANIMOAMSET_CA, $03
-	db BATTLEANIMOAMSET_CB, $03
-	db -2
-
-.Frameset_ae:
-	db BATTLEANIMOAMSET_03, $a0
-	db -1
-
-.Frameset_b0:
-	db BATTLEANIMOAMSET_CC, $20
-	db -1
-
-.Frameset_b1:
-	db BATTLEANIMOAMSET_7F, $02
-	db BATTLEANIMOAMSET_25, $02
-	db BATTLEANIMOAMSET_80, $02
-	db BATTLEANIMOAMSET_25, $02
-	db -2
-
-.Frameset_b2:
-	db BATTLEANIMOAMSET_CD, $04
-	db BATTLEANIMOAMSET_CE, $04
-	db BATTLEANIMOAMSET_CD, $c4
-	db BATTLEANIMOAMSET_CE, $c4
-	db -2
-
-.Frameset_b3:
-	db BATTLEANIMOAMSET_CF, $04
-	db BATTLEANIMOAMSET_D0, $04
-	db BATTLEANIMOAMSET_D1, $04
-	db BATTLEANIMOAMSET_D2, $04
-	db -4
-
-.Frameset_b4:
-	db BATTLEANIMOAMSET_D3, $20
-	db -1
-
-.Frameset_b5:
-	db BATTLEANIMOAMSET_D4, $08
-	db -1
-
-.Frameset_b6:
-	db BATTLEANIMOAMSET_D5, $08
-	db -1
-
-.Frameset_b7:
-	db BATTLEANIMOAMSET_D6, $08
-	db -1
-
-.Frameset_b8:
-	db BATTLEANIMOAMSET_D7, $08
-	db -1
-
-; ceeae
diff --git a/battle/objects/gfx_headers.asm b/battle/objects/gfx_headers.asm
deleted file mode 100755
index 901144ec7..000000000
--- a/battle/objects/gfx_headers.asm
+++ /dev/null
@@ -1,51 +0,0 @@
-object_gfx: MACRO
-; # tiles, label
-	db  \1
-	dba \2
-ENDM
-
-AnimObjGFX: ; cfcf6
-; entries correspond to ANIM_GFX_* constants
-	object_gfx  0, AnimObj00GFX
-	object_gfx 21, AnimObjHitGFX
-	object_gfx  6, AnimObjCutGFX
-	object_gfx  6, AnimObjFireGFX
-	object_gfx 20, AnimObjWaterGFX
-	object_gfx 26, AnimObjLightningGFX
-	object_gfx 18, AnimObjPlantGFX
-	object_gfx 12, AnimObjSmokeGFX
-	object_gfx  9, AnimObjExplosionGFX
-	object_gfx 17, AnimObjRocksGFX
-	object_gfx  6, AnimObjIceGFX
-	object_gfx 10, AnimObjPokeBallGFX
-	object_gfx  9, AnimObjPoisonGFX
-	object_gfx 13, AnimObjBubbleGFX
-	object_gfx 16, AnimObjNoiseGFX
-	object_gfx  2, AnimObjPowderGFX
-	object_gfx 11, AnimObjBeamGFX
-	object_gfx  9, AnimObjSpeedGFX
-	object_gfx  9, AnimObjChargeGFX
-	object_gfx 19, AnimObjWindGFX
-	object_gfx 10, AnimObjWhipGFX
-	object_gfx 12, AnimObjEggGFX
-	object_gfx 18, AnimObjRopeGFX
-	object_gfx 13, AnimObjPsychicGFX
-	object_gfx 10, AnimObjReflectGFX
-	object_gfx 27, AnimObjStatusGFX
-	object_gfx 12, AnimObjSandGFX
-	object_gfx 14, AnimObjWebGFX
-	object_gfx 16, AnimObjHazeGFX
-	object_gfx  7, AnimObjHornGFX
-	object_gfx  8, AnimObjFlowerGFX
-	object_gfx 40, AnimObjMiscGFX
-	object_gfx 36, AnimObjSkyAttackGFX
-	object_gfx 16, AnimObjGlobeGFX
-	object_gfx 48, AnimObjShapesGFX
-	object_gfx 18, AnimObjObjectsGFX
-	object_gfx 38, AnimObjShineGFX
-	object_gfx 35, AnimObjAngelsGFX
-	object_gfx 18, AnimObjWaveGFX
-	object_gfx 24, AnimObjAeroblastGFX
-	object_gfx  1, NULL
-	object_gfx  1, NULL
-; cfd9e
diff --git a/battle/objects/oam.asm b/battle/objects/oam.asm
deleted file mode 100755
index 8ae6651a4..000000000
--- a/battle/objects/oam.asm
+++ /dev/null
@@ -1,1086 +0,0 @@
-
-BattleAnimOAMData: ; ceeae
-; vtile offset (?), length, address
-	dbbw $00, 16, .OAMData_00 ; 00
-	dbbw $04,  9, .OAMData_01 ; 01
-	dbbw $08,  4, .OAMData_02 ; 02
-	dbbw $09,  4, .OAMData_03 ; 03
-	dbbw $0d,  4, .OAMData_04 ; 04
-	dbbw $0f,  4, .OAMData_03 ; 05
-	dbbw $13,  4, .OAMData_04 ; 06
-	dbbw $04, 16, .OAMData_00 ; 07
-	dbbw $08, 16, .OAMData_00 ; 08
-	dbbw $08, 16, .OAMData_09 ; 09
-	dbbw $00,  4, .OAMData_04 ; 0a
-	dbbw $02,  4, .OAMData_03 ; 0b
-	dbbw $06,  2, .OAMData_0c ; 0c
-	dbbw $07,  2, .OAMData_0c ; 0d
-	dbbw $02,  4, .OAMData_04 ; 0e
-	dbbw $04,  1, .OAMData_0f ; 0f
-	dbbw $05,  1, .OAMData_0f ; 10
-	dbbw $00,  2, .OAMData_11 ; 11
-	dbbw $02,  2, .OAMData_11 ; 12
-	dbbw $00,  4, .OAMData_13 ; 13
-	dbbw $00,  1, .OAMData_0f ; 14
-	dbbw $01,  1, .OAMData_0f ; 15
-	dbbw $02,  1, .OAMData_0f ; 16
-	dbbw $03,  1, .OAMData_0f ; 17
-	dbbw $00,  4, .OAMData_02 ; 18
-	dbbw $01, 16, .OAMData_00 ; 19
-	dbbw $05, 16, .OAMData_00 ; 1a
-	dbbw $00,  4, .OAMData_03 ; 1b
-	dbbw $05, 12, .OAMData_1c ; 1c
-	dbbw $02,  4, .OAMData_02 ; 1d
-	dbbw $06,  1, .OAMData_0f ; 1e
-	dbbw $07,  1, .OAMData_0f ; 1f
-	dbbw $08,  1, .OAMData_0f ; 20
-	dbbw $04,  4, .OAMData_03 ; 21
-	dbbw $09, 22, .OAMData_22 ; 22
-	dbbw $04,  2, .OAMData_11 ; 23
-	dbbw $06,  2, .OAMData_11 ; 24
-	dbbw $0c,  1, .OAMData_0f ; 25
-	dbbw $0a,  1, .OAMData_0f ; 26
-	dbbw $0b,  4, .OAMData_02 ; 27
-	dbbw $08,  4, .OAMData_04 ; 28
-	dbbw $06,  4, .OAMData_04 ; 29
-	dbbw $00,  5, .OAMData_2a ; 2a
-	dbbw $03,  6, .OAMData_2b ; 2b
-	dbbw $00,  7, .OAMData_2c ; 2c
-	dbbw $03,  8, .OAMData_2d ; 2d
-	dbbw $00,  9, .OAMData_2e ; 2e
-	dbbw $00,  4, .OAMData_2f ; 2f
-	dbbw $02,  4, .OAMData_30 ; 30
-	dbbw $04,  6, .OAMData_31 ; 31
-	dbbw $00,  2, .OAMData_32 ; 32
-	dbbw $00,  7, .OAMData_33 ; 33
-	dbbw $00, 14, .OAMData_32 ; 34
-	dbbw $00, 21, .OAMData_33 ; 35
-	dbbw $00,  2, .OAMData_36 ; 36
-	dbbw $00,  6, .OAMData_36 ; 37
-	dbbw $00, 10, .OAMData_36 ; 38
-	dbbw $00, 14, .OAMData_36 ; 39
-	dbbw $00,  2, .OAMData_3a ; 3a
-	dbbw $00,  6, .OAMData_3a ; 3b
-	dbbw $00, 10, .OAMData_3a ; 3c
-	dbbw $00, 14, .OAMData_3a ; 3d
-	dbbw $00,  4, .OAMData_3e ; 3e
-	dbbw $00, 16, .OAMData_3e ; 3f
-	dbbw $00, 26, .OAMData_3e ; 40
-	dbbw $00, 26, .OAMData_41 ; 41
-	dbbw $0e,  4, .OAMData_42 ; 42
-	dbbw $0e,  8, .OAMData_42 ; 43
-	dbbw $0e,  4, .OAMData_44 ; 44
-	dbbw $0e,  8, .OAMData_44 ; 45
-	dbbw $0e,  4, .OAMData_46 ; 46
-	dbbw $0e,  4, .OAMData_47 ; 47
-	dbbw $00,  6, .OAMData_48 ; 48
-	dbbw $03,  4, .OAMData_49 ; 49
-	dbbw $03,  2, .OAMData_4a ; 4a
-	dbbw $01,  5, .OAMData_0f ; 4b
-	dbbw $01,  6, .OAMData_4c ; 4c
-	dbbw $01,  7, .OAMData_4d ; 4d
-	dbbw $01,  3, .OAMData_4d ; 4e
-	dbbw $01,  8, .OAMData_4f ; 4f
-	dbbw $01,  9, .OAMData_50 ; 50
-	dbbw $01, 10, .OAMData_51 ; 51
-	dbbw $01,  6, .OAMData_51 ; 52
-	dbbw $00,  9, .OAMData_01 ; 53
-	dbbw $04,  4, .OAMData_02 ; 54
-	dbbw $05,  4, .OAMData_02 ; 55
-	dbbw $00,  2, .OAMData_56 ; 56
-	dbbw $02,  2, .OAMData_56 ; 57
-	dbbw $04,  2, .OAMData_56 ; 58
-	dbbw $02,  4, .OAMData_59 ; 59
-	dbbw $02,  4, .OAMData_5a ; 5a
-	dbbw $02,  2, .OAMData_0c ; 5b
-	dbbw $04,  2, .OAMData_0c ; 5c
-	dbbw $06,  4, .OAMData_5d ; 5d
-	dbbw $08,  2, .OAMData_0c ; 5e
-	dbbw $09,  2, .OAMData_0c ; 5f
-	dbbw $05,  2, .OAMData_60 ; 60
-	dbbw $00,  2, .OAMData_61 ; 61
-	dbbw $00,  5, .OAMData_61 ; 62
-	dbbw $00,  9, .OAMData_61 ; 63
-	dbbw $09,  9, .OAMData_61 ; 64
-	dbbw $00,  4, .OAMData_65 ; 65
-	dbbw $00,  7, .OAMData_65 ; 66
-	dbbw $00,  9, .OAMData_65 ; 67
-	dbbw $09,  9, .OAMData_65 ; 68
-	dbbw $04,  1, .OAMData_69 ; 69
-	dbbw $05,  2, .OAMData_6a ; 6a
-	dbbw $06,  4, .OAMData_03 ; 6b
-	dbbw $0a,  4, .OAMData_03 ; 6c
-	dbbw $0e,  4, .OAMData_03 ; 6d
-	dbbw $08,  5, .OAMData_6e ; 6e
-	dbbw $0d,  3, .OAMData_6f ; 6f
-	dbbw $01,  8, .OAMData_70 ; 70
-	dbbw $03,  8, .OAMData_70 ; 71
-	dbbw $05,  8, .OAMData_70 ; 72
-	dbbw $07,  8, .OAMData_70 ; 73
-	dbbw $06,  4, .OAMData_02 ; 74
-	dbbw $07,  4, .OAMData_02 ; 75
-	dbbw $0a,  2, .OAMData_76 ; 76
-	dbbw $00,  1, .OAMData_77 ; 77
-	dbbw $00,  3, .OAMData_78 ; 78
-	dbbw $00,  6, .OAMData_79 ; 79
-	dbbw $00,  9, .OAMData_7a ; 7a
-	dbbw $00, 12, .OAMData_7b ; 7b
-	dbbw $00, 14, .OAMData_7c ; 7c
-	dbbw $00, 15, .OAMData_7d ; 7d
-	dbbw $04,  4, .OAMData_03 ; 7e
-	dbbw $08,  4, .OAMData_03 ; 7f
-	dbbw $0d,  1, .OAMData_0f ; 80
-	dbbw $0e,  4, .OAMData_81 ; 81
-	dbbw $10,  1, .OAMData_0f ; 82
-	dbbw $11,  1, .OAMData_0f ; 83
-	dbbw $04,  2, .OAMData_6a ; 84
-	dbbw $05,  2, .OAMData_6a ; 85
-	dbbw $0a,  4, .OAMData_04 ; 86
-	dbbw $00,  8, .OAMData_87 ; 87
-	dbbw $00, 12, .OAMData_88 ; 88
-	dbbw $00, 16, .OAMData_87 ; 89
-	dbbw $09,  2, .OAMData_8a ; 8a
-	dbbw $09,  4, .OAMData_8a ; 8b
-	dbbw $09,  6, .OAMData_8a ; 8c
-	dbbw $09,  8, .OAMData_8a ; 8d
-	dbbw $12,  5, .OAMData_8e ; 8e
-	dbbw $00,  4, .OAMData_8f ; 8f
-	dbbw $04,  4, .OAMData_8f ; 90
-	dbbw $08,  4, .OAMData_8f ; 91
-	dbbw $0c,  4, .OAMData_8f ; 92
-	dbbw $00,  6, .OAMData_93 ; 93
-	dbbw $04,  4, .OAMData_03 ; 94
-	dbbw $0a,  4, .OAMData_04 ; 95
-	dbbw $15,  4, .OAMData_30 ; 96
-	dbbw $04,  4, .OAMData_30 ; 97
-	dbbw $0c,  4, .OAMData_04 ; 98
-	dbbw $0a,  4, .OAMData_99 ; 99
-	dbbw $0c,  4, .OAMData_03 ; 9a
-	dbbw $00, 36, .OAMData_9b ; 9b
-	dbbw $0d,  2, .OAMData_9c ; 9c
-	dbbw $0d,  4, .OAMData_9c ; 9d
-	dbbw $0d,  6, .OAMData_9c ; 9e
-	dbbw $02,  8, .OAMData_9f ; 9f
-	dbbw $08,  7, .OAMData_a0 ; a0
-	dbbw $08,  5, .OAMData_a0 ; a1
-	dbbw $08,  3, .OAMData_a0 ; a2
-	dbbw $00, 16, .OAMData_1c ; a3
-	dbbw $00,  9, .OAMData_a4 ; a4
-	dbbw $06,  9, .OAMData_a4 ; a5
-	dbbw $0c,  9, .OAMData_a4 ; a6
-	dbbw $12,  9, .OAMData_a4 ; a7
-	dbbw $18,  9, .OAMData_a4 ; a8
-	dbbw $1e,  9, .OAMData_a4 ; a9
-	dbbw $24,  9, .OAMData_a4 ; aa
-	dbbw $2a,  9, .OAMData_a4 ; ab
-	dbbw $03,  4, .OAMData_ac ; ac
-	dbbw $12,  4, .OAMData_03 ; ad
-	dbbw $10,  4, .OAMData_04 ; ae
-	dbbw $16,  1, .OAMData_0f ; af
-	dbbw $17,  4, .OAMData_02 ; b0
-	dbbw $18,  4, .OAMData_03 ; b1
-	dbbw $1c,  4, .OAMData_03 ; b2
-	dbbw $20,  3, .OAMData_03 ; b3
-	dbbw $23,  4, .OAMData_04 ; b4
-	dbbw $25,  3, .OAMData_03 ; b5
-	dbbw $17,  4, .OAMData_03 ; b6
-	dbbw $0a, 16, .OAMData_00 ; b7
-	dbbw $10, 16, .OAMData_1c ; b8
-	dbbw $00, 16, .OAMData_1c ; b9
-	dbbw $04,  4, .OAMData_03 ; ba
-	dbbw $08,  2, .OAMData_11 ; bb
-	dbbw $20,  6, .OAMData_bc ; bc
-	dbbw $08,  1, .OAMData_0f ; bd
-	dbbw $04,  4, .OAMData_03 ; be
-	dbbw $1a,  4, .OAMData_30 ; bf
-	dbbw $16,  9, .OAMData_01 ; c0
-	dbbw $10, 16, .OAMData_c1 ; c1
-	dbbw $09,  6, .OAMData_c2 ; c2
-	dbbw $11,  9, .OAMData_c3 ; c3
-	dbbw $0e,  4, .OAMData_03 ; c4
-	dbbw $0b,  4, .OAMData_30 ; c5
-	dbbw $1c,  6, .OAMData_02 ; c6
-	dbbw $20, 16, .OAMData_c1 ; c7
-	dbbw $05,  6, .OAMData_c8 ; c8
-	dbbw $0b,  4, .OAMData_03 ; c9
-	dbbw $09,  4, .OAMData_ca ; ca
-	dbbw $0b,  4, .OAMData_04 ; cb
-	dbbw $11, 13, .OAMData_cc ; cc
-	dbbw $00,  9, .OAMData_c3 ; cd
-	dbbw $09,  9, .OAMData_c3 ; ce
-	dbbw $00, 12, .OAMData_cf ; cf
-	dbbw $06, 12, .OAMData_cf ; d0
-	dbbw $0c, 12, .OAMData_cf ; d1
-	dbbw $12, 12, .OAMData_cf ; d2
-	dbbw $00, 13, .OAMData_cc ; d3
-	dbbw $00,  7, .OAMData_d4 ; d4
-	dbbw $00,  6, .OAMData_d5 ; d5
-	dbbw $00, 14, .OAMData_d6 ; d6
-	dbbw $00, 12, .OAMData_d7 ; d7
-
-.OAMData_11:
-	dsprite  -1, 0,  -1, 4, $00, $00
-	dsprite   0, 0,  -1, 4, $01, $00
-
-.OAMData_56:
-	dsprite  -1, 4,  -1, 0, $00, $00
-	dsprite  -1, 4,   0, 0, $01, $00
-
-.OAMData_03:
-	dsprite  -1, 0,  -1, 0, $00, $00
-	dsprite  -1, 0,   0, 0, $01, $00
-	dsprite   0, 0,  -1, 0, $02, $00
-	dsprite   0, 0,   0, 0, $03, $00
-
-.OAMData_02:
-	dsprite  -1, 0,  -1, 0, $00, $00
-	dsprite  -1, 0,   0, 0, $00, $20
-	dsprite   0, 0,  -1, 0, $00, $40
-	dsprite   0, 0,   0, 0, $00, $60
-
-.OAMData_c3:
-	dsprite  -2, 4,  -2, 4, $00, $00
-	dsprite  -2, 4,  -1, 4, $01, $00
-	dsprite  -2, 4,   0, 4, $02, $00
-	dsprite  -1, 4,  -2, 4, $03, $00
-	dsprite  -1, 4,  -1, 4, $04, $00
-	dsprite  -1, 4,   0, 4, $05, $00
-	dsprite   0, 4,  -2, 4, $06, $00
-	dsprite   0, 4,  -1, 4, $07, $00
-	dsprite   0, 4,   0, 4, $08, $00
-
-.OAMData_01:
-	dsprite  -2, 4,  -2, 4, $00, $00
-	dsprite  -2, 4,  -1, 4, $01, $00
-	dsprite  -2, 4,   0, 4, $00, $20
-	dsprite  -1, 4,  -2, 4, $02, $00
-	dsprite  -1, 4,  -1, 4, $03, $00
-	dsprite  -1, 4,   0, 4, $02, $60
-	dsprite   0, 4,  -2, 4, $00, $40
-	dsprite   0, 4,  -1, 4, $01, $60
-	dsprite   0, 4,   0, 4, $00, $60
-
-.OAMData_cf:
-	dsprite  -2, 0,  -2, 4, $00, $00
-	dsprite  -2, 0,  -1, 4, $01, $00
-	dsprite  -2, 0,   0, 4, $02, $00
-	dsprite  -1, 0,  -2, 4, $03, $00
-	dsprite  -1, 0,  -1, 4, $04, $00
-	dsprite  -1, 0,   0, 4, $05, $00
-	dsprite   0, 0,  -2, 4, $05, $60
-	dsprite   0, 0,  -1, 4, $04, $60
-	dsprite   0, 0,   0, 4, $03, $60
-	dsprite   1, 0,  -2, 4, $02, $60
-	dsprite   1, 0,  -1, 4, $01, $60
-	dsprite   1, 0,   0, 4, $00, $60
-
-.OAMData_1c:
-	dsprite  -2, 0,  -2, 0, $00, $00
-	dsprite  -2, 0,  -1, 0, $01, $00
-	dsprite  -2, 0,   0, 0, $02, $00
-	dsprite  -2, 0,   1, 0, $03, $00
-	dsprite  -1, 0,  -2, 0, $04, $00
-	dsprite  -1, 0,  -1, 0, $05, $00
-	dsprite  -1, 0,   0, 0, $06, $00
-	dsprite  -1, 0,   1, 0, $07, $00
-	dsprite   0, 0,  -2, 0, $08, $00
-	dsprite   0, 0,  -1, 0, $09, $00
-	dsprite   0, 0,   0, 0, $0a, $00
-	dsprite   0, 0,   1, 0, $0b, $00
-	dsprite   1, 0,  -2, 0, $0c, $00
-	dsprite   1, 0,  -1, 0, $0d, $00
-	dsprite   1, 0,   0, 0, $0e, $00
-	dsprite   1, 0,   1, 0, $0f, $00
-
-.OAMData_00:
-	dsprite  -2, 0,  -2, 0, $00, $00
-	dsprite  -2, 0,  -1, 0, $01, $00
-	dsprite  -1, 0,  -2, 0, $02, $00
-	dsprite  -1, 0,  -1, 0, $03, $00
-	dsprite  -2, 0,   0, 0, $01, $20
-	dsprite  -2, 0,   1, 0, $00, $20
-	dsprite  -1, 0,   0, 0, $03, $20
-	dsprite  -1, 0,   1, 0, $02, $20
-	dsprite   0, 0,  -2, 0, $02, $40
-	dsprite   0, 0,  -1, 0, $03, $40
-	dsprite   1, 0,  -2, 0, $00, $40
-	dsprite   1, 0,  -1, 0, $01, $40
-	dsprite   0, 0,   0, 0, $03, $60
-	dsprite   0, 0,   1, 0, $02, $60
-	dsprite   1, 0,   0, 0, $01, $60
-	dsprite   1, 0,   1, 0, $00, $60
-
-.OAMData_09:
-	dsprite  -3, 4,  -3, 4, $00, $00
-	dsprite  -3, 4,  -2, 4, $01, $00
-	dsprite  -2, 4,  -3, 4, $02, $00
-	dsprite  -2, 4,  -2, 4, $03, $00
-	dsprite  -3, 4,   0, 4, $01, $20
-	dsprite  -3, 4,   1, 4, $00, $20
-	dsprite  -2, 4,   0, 4, $03, $20
-	dsprite  -2, 4,   1, 4, $02, $20
-	dsprite   0, 4,  -3, 4, $02, $40
-	dsprite   0, 4,  -2, 4, $03, $40
-	dsprite   1, 4,  -3, 4, $00, $40
-	dsprite   1, 4,  -2, 4, $01, $40
-	dsprite   0, 4,   0, 4, $03, $60
-	dsprite   0, 4,   1, 4, $02, $60
-	dsprite   1, 4,   0, 4, $01, $60
-	dsprite   1, 4,   1, 4, $00, $60
-
-.OAMData_0c:
-	dsprite  -1, 4,  -1, 0, $00, $00
-	dsprite  -1, 4,   0, 0, $00, $20
-
-.OAMData_6a:
-	dsprite   0, 0,  -1, 0, $00, $00
-	dsprite   0, 0,   0, 0, $00, $20
-
-.OAMData_04:
-	dsprite  -1, 0,  -1, 0, $00, $00
-	dsprite  -1, 0,   0, 0, $00, $20
-	dsprite   0, 0,  -1, 0, $01, $00
-	dsprite   0, 0,   0, 0, $01, $20
-
-.OAMData_5d:
-	dsprite  -1, 0,  -1, 0, $00, $00
-	dsprite  -1, 0,   0, 0, $01, $00
-	dsprite   0, 0,  -1, 0, $00, $40
-	dsprite   0, 0,   0, 0, $01, $40
-
-.OAMData_13:
-	dsprite  -1, 2,  -1, 0, $02, $00
-	dsprite   0, 2,  -1, 0, $03, $00
-	dsprite  -2, 6,   0, 0, $02, $00
-	dsprite  -1, 6,   0, 0, $03, $00
-
-.OAMData_22:
-	dsprite   1, 0, -11, 0, $01, $00
-	dsprite   0, 0, -10, 0, $02, $00
-	dsprite   0, 0,  -9, 0, $03, $00
-	dsprite   0, 0,  -8, 0, $00, $00
-	dsprite   0, 0,  -7, 0, $03, $00
-	dsprite   0, 0,  -6, 0, $00, $00
-	dsprite   0, 0,  -5, 0, $03, $00
-	dsprite   0, 0,  -4, 0, $00, $00
-	dsprite   0, 0,  -3, 0, $03, $00
-	dsprite   0, 0,  -2, 0, $00, $00
-	dsprite   0, 0,  -1, 0, $01, $00
-	dsprite  -1, 0,   0, 0, $02, $00
-	dsprite  -1, 0,   1, 0, $03, $00
-	dsprite  -1, 0,   2, 0, $00, $00
-	dsprite  -1, 0,   3, 0, $03, $00
-	dsprite  -1, 0,   4, 0, $00, $00
-	dsprite  -1, 0,   5, 0, $03, $00
-	dsprite  -1, 0,   6, 0, $00, $00
-	dsprite  -1, 0,   7, 0, $03, $00
-	dsprite  -1, 0,   8, 0, $00, $00
-	dsprite  -1, 0,   9, 0, $01, $00
-	dsprite  -2, 0,  10, 0, $02, $00
-
-.OAMData_2a:
-	dsprite  -3, 4,  -1, 0, $00, $00
-	dsprite  -3, 4,   0, 0, $00, $20
-	dsprite  -2, 4,  -1, 0, $01, $00
-	dsprite  -2, 4,   0, 0, $01, $20
-	dsprite  -1, 4,  -1, 4, $02, $00
-
-.OAMData_2b:
-	dsprite  -4, 4,  -1, 0, $00, $00
-	dsprite  -4, 4,   0, 0, $00, $20
-	dsprite  -3, 4,  -1, 0, $01, $00
-	dsprite  -3, 4,   0, 0, $01, $20
-	dsprite  -2, 4,  -1, 4, $02, $00
-	dsprite  -1, 4,  -1, 4, $02, $00
-
-.OAMData_2c:
-	dsprite  -5, 4,  -1, 0, $00, $00
-	dsprite  -5, 4,   0, 0, $00, $20
-	dsprite  -4, 4,  -1, 0, $01, $00
-	dsprite  -4, 4,   0, 0, $01, $20
-	dsprite  -3, 4,  -1, 4, $02, $00
-	dsprite  -2, 4,  -1, 4, $02, $00
-	dsprite  -1, 4,  -1, 4, $02, $00
-
-.OAMData_2d:
-	dsprite  -6, 4,  -1, 0, $00, $00
-	dsprite  -6, 4,   0, 0, $00, $20
-	dsprite  -5, 4,  -1, 0, $01, $00
-	dsprite  -5, 4,   0, 0, $01, $20
-	dsprite  -4, 4,  -1, 4, $02, $00
-	dsprite  -3, 4,  -1, 4, $02, $00
-	dsprite  -2, 4,  -1, 4, $02, $00
-	dsprite  -1, 4,  -1, 4, $02, $00
-
-.OAMData_2e:
-	dsprite  -7, 4,  -1, 0, $00, $00
-	dsprite  -7, 4,   0, 0, $00, $20
-	dsprite  -6, 4,  -1, 0, $01, $00
-	dsprite  -6, 4,   0, 0, $01, $20
-	dsprite  -5, 4,  -1, 4, $02, $00
-	dsprite  -4, 4,  -1, 4, $02, $00
-	dsprite  -3, 4,  -1, 4, $02, $00
-	dsprite  -2, 4,  -1, 4, $02, $00
-	dsprite  -1, 4,  -1, 4, $02, $00
-
-.OAMData_2f:
-	dsprite  -1, 0,  -1, 0, $00, $00
-	dsprite  -1, 0,   0, 0, $00, $20
-	dsprite   0, 0,  -1, 0, $01, $00
-	dsprite   0, 0,   0, 0, $00, $60
-
-.OAMData_30:
-	dsprite  -1, 0,  -1, 0, $00, $00
-	dsprite  -1, 0,   0, 0, $01, $00
-	dsprite   0, 0,  -1, 0, $01, $60
-	dsprite   0, 0,   0, 0, $00, $60
-
-.OAMData_31:
-	dsprite  -2, 4,  -1, 0, $00, $00
-	dsprite  -2, 4,   0, 0, $01, $00
-	dsprite  -1, 4,  -1, 0, $02, $00
-	dsprite  -1, 4,   0, 0, $03, $00
-	dsprite   0, 4,  -1, 0, $04, $00
-	dsprite   0, 4,   0, 0, $05, $00
-
-.OAMData_76:
-	dsprite  -1, 5,  -1, 0, $00, $00
-	dsprite  -1, 1,   0, 0, $00, $00
-
-.OAMData_32:
-	dsprite  -1, 0,  -2, 4, $00, $00
-	dsprite  -1, 0,   0, 4, $00, $00
-	dsprite  -3, 0,  -2, 4, $00, $00
-	dsprite  -3, 0,   0, 4, $00, $00
-	dsprite  -2, 0,  -3, 4, $00, $00
-	dsprite  -2, 0,  -2, 4, $01, $00
-	dsprite  -2, 0,  -1, 4, $00, $00
-	dsprite  -2, 0,   0, 4, $01, $00
-	dsprite  -2, 0,   1, 4, $00, $00
-	dsprite  -1, 0,  -4, 4, $00, $00
-	dsprite  -1, 0,  -3, 4, $01, $00
-	dsprite  -1, 0,  -1, 4, $01, $00
-	dsprite  -1, 0,   1, 4, $01, $00
-	dsprite  -1, 0,   2, 4, $00, $00
-
-.OAMData_33:
-	dsprite  -2, 0,  -2, 4, $00, $00
-	dsprite  -2, 0,   0, 4, $00, $00
-	dsprite  -1, 0,  -3, 4, $00, $00
-	dsprite  -1, 0,  -2, 4, $01, $00
-	dsprite  -1, 0,  -1, 4, $00, $00
-	dsprite  -1, 0,   0, 4, $01, $00
-	dsprite  -1, 0,   1, 4, $00, $00
-	dsprite  -4, 0,  -2, 4, $00, $00
-	dsprite  -4, 0,   0, 4, $00, $00
-	dsprite  -3, 0,  -3, 4, $00, $00
-	dsprite  -3, 0,  -2, 4, $01, $00
-	dsprite  -3, 0,  -1, 4, $00, $00
-	dsprite  -3, 0,   0, 4, $01, $00
-	dsprite  -3, 0,   1, 4, $00, $00
-	dsprite  -2, 0,  -4, 4, $00, $00
-	dsprite  -2, 0,  -3, 4, $01, $00
-	dsprite  -2, 0,  -1, 4, $01, $00
-	dsprite  -2, 0,   1, 4, $01, $00
-	dsprite  -2, 0,   2, 4, $00, $00
-	dsprite  -1, 0,  -4, 4, $01, $00
-	dsprite  -1, 0,   2, 4, $01, $00
-
-.OAMData_36:
-	dsprite  -7, 4,  -1, 0, $00, $00
-	dsprite  -7, 4,   0, 0, $01, $00
-	dsprite  -6, 4,  -1, 0, $02, $00
-	dsprite  -6, 4,   0, 0, $03, $00
-	dsprite  -5, 4,  -1, 0, $04, $00
-	dsprite  -5, 4,   0, 0, $05, $00
-	dsprite  -4, 4,  -1, 0, $06, $00
-	dsprite  -4, 4,   0, 0, $07, $00
-	dsprite  -3, 4,  -1, 0, $08, $00
-	dsprite  -3, 4,   0, 0, $09, $00
-	dsprite  -2, 4,  -1, 0, $0a, $00
-	dsprite  -2, 4,   0, 0, $0b, $00
-	dsprite  -1, 4,  -1, 0, $0c, $00
-	dsprite  -1, 4,   0, 0, $0d, $00
-
-.OAMData_3a:
-	dsprite  -7, 4,  -1, 0, $0c, $00
-	dsprite  -7, 4,   0, 0, $0d, $00
-	dsprite  -6, 4,  -1, 0, $08, $00
-	dsprite  -6, 4,   0, 0, $09, $00
-	dsprite  -5, 4,  -1, 0, $04, $00
-	dsprite  -5, 4,   0, 0, $05, $00
-	dsprite  -4, 4,  -1, 0, $00, $00
-	dsprite  -4, 4,   0, 0, $01, $00
-	dsprite  -3, 4,  -1, 0, $02, $00
-	dsprite  -3, 4,   0, 0, $03, $00
-	dsprite  -2, 4,   0, 0, $02, $00
-	dsprite  -2, 4,   1, 0, $03, $00
-	dsprite  -1, 4,   0, 0, $0a, $00
-	dsprite  -1, 4,   1, 0, $0b, $00
-
-.OAMData_3e:
-	dsprite   1, 4,  -2, 0, $00, $40
-	dsprite   1, 4,  -1, 0, $02, $40
-	dsprite   1, 4,   0, 0, $02, $60
-	dsprite   1, 4,   1, 0, $00, $60
-	dsprite  -1, 4,  -3, 0, $09, $20
-	dsprite  -1, 4,  -2, 0, $08, $20
-	dsprite  -1, 4,  -1, 0, $06, $00
-	dsprite  -1, 4,   0, 0, $07, $00
-	dsprite  -1, 4,   1, 0, $08, $00
-	dsprite  -1, 4,   2, 0, $09, $00
-	dsprite   0, 4,  -3, 0, $01, $20
-	dsprite   0, 4,  -2, 0, $00, $20
-	dsprite   0, 4,  -1, 0, $0c, $00
-	dsprite   0, 4,   0, 0, $0d, $00
-	dsprite   0, 4,   1, 0, $00, $00
-	dsprite   0, 4,   2, 0, $01, $00
-	dsprite  -3, 4,  -2, 0, $00, $00
-	dsprite  -3, 4,  -1, 0, $02, $00
-	dsprite  -3, 4,   0, 0, $02, $20
-	dsprite  -3, 4,   1, 0, $00, $20
-	dsprite  -2, 4,  -3, 0, $03, $20
-	dsprite  -2, 4,  -2, 0, $02, $20
-	dsprite  -2, 4,  -1, 0, $04, $00
-	dsprite  -2, 4,   0, 0, $05, $00
-	dsprite  -2, 4,   1, 0, $02, $00
-	dsprite  -2, 4,   2, 0, $03, $00
-
-.OAMData_41:
-	dsprite  -3, 4,  -2, 0, $00, $00
-	dsprite  -3, 4,  -1, 0, $02, $00
-	dsprite  -3, 4,   0, 0, $02, $20
-	dsprite  -3, 4,   1, 0, $00, $20
-	dsprite  -2, 4,  -3, 4, $00, $00
-	dsprite  -2, 4,  -2, 4, $01, $00
-	dsprite  -2, 4,  -1, 0, $05, $20
-	dsprite  -2, 4,   0, 0, $04, $20
-	dsprite  -2, 4,   0, 4, $01, $20
-	dsprite  -2, 4,   1, 4, $00, $20
-	dsprite  -1, 4,  -3, 4, $02, $00
-	dsprite  -1, 4,  -2, 4, $03, $00
-	dsprite  -1, 4,  -1, 0, $07, $20
-	dsprite  -1, 4,   0, 0, $06, $20
-	dsprite  -1, 4,   0, 4, $03, $20
-	dsprite  -1, 4,   1, 4, $02, $20
-	dsprite   0, 4,  -3, 4, $04, $00
-	dsprite   0, 4,  -2, 4, $05, $00
-	dsprite   0, 4,  -1, 0, $0d, $20
-	dsprite   0, 4,   0, 0, $0c, $20
-	dsprite   0, 4,   0, 4, $05, $20
-	dsprite   0, 4,   1, 4, $04, $20
-	dsprite   1, 4,  -2, 0, $00, $40
-	dsprite   1, 4,  -1, 0, $02, $40
-	dsprite   1, 4,   0, 0, $02, $60
-	dsprite   1, 4,   1, 0, $00, $60
-
-.OAMData_42:
-	dsprite  -3, 0,  -1, 4, $02, $00
-	dsprite   2, 0,  -1, 4, $02, $60
-	dsprite  -1, 4,  -3, 0, $01, $00
-	dsprite  -1, 4,   2, 0, $01, $60
-	dsprite  -4, 0,  -1, 4, $02, $00
-	dsprite   3, 0,  -1, 4, $02, $60
-	dsprite  -1, 4,  -4, 0, $01, $00
-	dsprite  -1, 4,   3, 0, $01, $60
-
-.OAMData_44:
-	dsprite  -3, 5,  -3, 5, $00, $20
-	dsprite  -3, 5,   1, 3, $00, $00
-	dsprite   1, 3,  -3, 5, $00, $60
-	dsprite   1, 3,   1, 3, $00, $40
-	dsprite  -4, 5,  -4, 5, $00, $20
-	dsprite  -4, 5,   2, 3, $00, $00
-	dsprite   2, 3,  -4, 5, $00, $60
-	dsprite   2, 3,   2, 3, $00, $40
-
-.OAMData_46:
-	dsprite  -3, 4,  -1, 4, $02, $00
-	dsprite   1, 4,  -1, 4, $02, $60
-	dsprite  -1, 4,  -3, 4, $01, $00
-	dsprite  -1, 4,   1, 4, $01, $60
-
-.OAMData_47:
-	dsprite  -2, 0,  -2, 0, $00, $20
-	dsprite  -2, 0,   1, 0, $00, $00
-	dsprite   1, 0,  -2, 0, $00, $60
-	dsprite   1, 0,   1, 0, $00, $40
-
-.OAMData_48:
-	dsprite  -3, 0,  -1, 4, $00, $00
-	dsprite  -2, 0,  -1, 2, $00, $00
-	dsprite  -1, 0,  -1, 0, $00, $00
-	dsprite   0, 0,  -1, 0, $00, $00
-	dsprite   1, 0,  -1, 2, $00, $00
-	dsprite   2, 0,  -1, 4, $00, $00
-
-.OAMData_49:
-	dsprite  -1, 4,  -2, 0, $00, $20
-	dsprite  -1, 2,  -1, 0, $00, $20
-	dsprite  -1, 2,   0, 0, $00, $00
-	dsprite  -1, 4,   1, 0, $00, $00
-
-.OAMData_4a:
-	dsprite  -1, 4,  -1, 0, $00, $60
-	dsprite  -1, 4,   0, 0, $00, $40
-
-.OAMData_0f:
-	dsprite  -1, 4,  -1, 4, $00, $00
-	dsprite  -1, 4,  -2, 4, $01, $00
-	dsprite  -1, 4,  -1, 4, $01, $20
-	dsprite   0, 4,  -2, 4, $01, $40
-	dsprite   0, 4,  -1, 4, $01, $60
-
-.OAMData_4c:
-	dsprite  -1, 4,  -1, 4, $00, $00
-	dsprite   0, 2,  -2, 6, $00, $00
-	dsprite   0, 2,  -3, 6, $01, $00
-	dsprite   0, 2,  -2, 6, $01, $20
-	dsprite   1, 2,  -3, 6, $01, $40
-	dsprite   1, 2,  -2, 6, $01, $60
-
-.OAMData_4d:
-	dsprite  -1, 4,  -1, 4, $00, $00
-	dsprite   0, 2,  -2, 6, $00, $00
-	dsprite   1, 0,  -2, 0, $00, $00
-	dsprite   1, 0,  -3, 0, $01, $00
-	dsprite   1, 0,  -2, 0, $01, $20
-	dsprite   2, 0,  -3, 0, $01, $40
-	dsprite   2, 0,  -2, 0, $01, $60
-
-.OAMData_4f:
-	dsprite  -1, 4,  -1, 4, $00, $00
-	dsprite   0, 2,  -2, 6, $00, $00
-	dsprite   1, 0,  -2, 0, $00, $00
-	dsprite   1, 6,  -3, 2, $00, $00
-	dsprite   1, 6,  -4, 2, $01, $00
-	dsprite   1, 6,  -3, 2, $01, $20
-	dsprite   2, 6,  -4, 2, $01, $40
-	dsprite   2, 6,  -3, 2, $01, $60
-
-.OAMData_50:
-	dsprite  -1, 4,  -1, 4, $00, $00
-	dsprite   0, 2,  -2, 6, $00, $00
-	dsprite   1, 0,  -2, 0, $00, $00
-	dsprite   1, 6,  -3, 2, $00, $00
-	dsprite   2, 4,  -4, 4, $00, $00
-	dsprite   2, 4,  -5, 4, $01, $00
-	dsprite   2, 4,  -4, 4, $01, $20
-	dsprite   3, 4,  -5, 4, $01, $40
-	dsprite   3, 4,  -4, 4, $01, $60
-
-.OAMData_51:
-	dsprite  -1, 4,  -1, 4, $00, $00
-	dsprite   0, 2,  -2, 6, $00, $00
-	dsprite   1, 0,  -2, 0, $00, $00
-	dsprite   1, 6,  -3, 2, $00, $00
-	dsprite   2, 4,  -4, 4, $00, $00
-	dsprite   3, 2,  -5, 6, $00, $00
-	dsprite   3, 2,  -6, 6, $01, $00
-	dsprite   3, 2,  -5, 6, $01, $20
-	dsprite   4, 2,  -6, 6, $01, $40
-	dsprite   4, 2,  -5, 6, $01, $60
-
-.OAMData_59:
-	dsprite  -1, 4,  -2, 0, $00, $00
-	dsprite  -1, 4,  -1, 0, $01, $00
-	dsprite  -1, 4,   0, 0, $01, $20
-	dsprite  -1, 4,   1, 0, $00, $20
-
-.OAMData_5a:
-	dsprite  -1, 4,  -2, 0, $02, $00
-	dsprite  -1, 4,  -1, 0, $01, $00
-	dsprite  -1, 4,   0, 0, $01, $20
-	dsprite  -1, 4,   1, 0, $02, $20
-
-.OAMData_60:
-	dsprite  -1, 0,  -1, 4, $00, $00
-
-.OAMData_69:
-	dsprite   0, 0,  -1, 4, $00, $00
-
-.OAMData_61:
-	dsprite  -1, 4,  -4, 4, $00, $00
-	dsprite  -1, 4,  -3, 4, $01, $00
-	dsprite  -1, 4,  -2, 4, $02, $00
-	dsprite  -1, 4,  -1, 4, $03, $00
-	dsprite  -1, 4,   0, 4, $04, $00
-	dsprite  -1, 4,   1, 4, $05, $00
-	dsprite  -1, 4,   2, 4, $06, $00
-	dsprite  -2, 4,   1, 4, $07, $00
-	dsprite  -2, 4,   2, 4, $08, $00
-
-.OAMData_65:
-	dsprite  -2, 4,  -4, 4, $08, $20
-	dsprite  -2, 4,  -3, 4, $07, $20
-	dsprite  -1, 4,  -4, 4, $06, $20
-	dsprite  -1, 4,  -3, 4, $05, $20
-	dsprite  -1, 4,  -2, 4, $04, $20
-	dsprite  -1, 4,  -1, 4, $03, $20
-	dsprite  -1, 4,   0, 4, $02, $20
-	dsprite  -1, 4,   1, 4, $01, $20
-	dsprite  -1, 4,   2, 4, $00, $20
-
-.OAMData_d4:
-	dsprite   0, 0,  -4, 4, $00, $10
-	dsprite   0, 0,  -3, 4, $01, $10
-	dsprite   0, 0,  -2, 4, $02, $10
-	dsprite   0, 0,  -1, 4, $03, $10
-	dsprite   0, 0,   0, 4, $04, $10
-	dsprite   0, 0,   1, 4, $05, $10
-	dsprite   0, 0,   2, 4, $06, $10
-
-.OAMData_d6:
-	dsprite  -1, 0,  -4, 4, $00, $10
-	dsprite   0, 0,  -4, 4, $01, $10
-	dsprite  -1, 0,  -3, 4, $02, $10
-	dsprite   0, 0,  -3, 4, $03, $10
-	dsprite  -1, 0,  -2, 4, $04, $10
-	dsprite   0, 0,  -2, 4, $05, $10
-	dsprite  -1, 0,  -1, 4, $06, $10
-	dsprite   0, 0,  -1, 4, $07, $10
-	dsprite  -1, 0,   0, 4, $08, $10
-	dsprite   0, 0,   0, 4, $09, $10
-	dsprite  -1, 0,   1, 4, $0a, $10
-	dsprite   0, 0,   1, 4, $0b, $10
-	dsprite  -1, 0,   2, 4, $0c, $10
-	dsprite   0, 0,   2, 4, $0d, $10
-
-.OAMData_d5:
-	dsprite   0, 0,  -3, 0, $00, $11
-	dsprite   0, 0,  -2, 0, $01, $11
-	dsprite   0, 0,  -1, 0, $02, $11
-	dsprite   0, 0,   0, 0, $03, $11
-	dsprite   0, 0,   1, 0, $04, $11
-	dsprite   0, 0,   2, 0, $05, $11
-
-.OAMData_d7:
-	dsprite   0, 0,  -3, 0, $00, $11
-	dsprite   1, 0,  -3, 0, $01, $11
-	dsprite   0, 0,  -2, 0, $02, $11
-	dsprite   1, 0,  -2, 0, $03, $11
-	dsprite   0, 0,  -1, 0, $04, $11
-	dsprite   1, 0,  -1, 0, $05, $11
-	dsprite   0, 0,   0, 0, $06, $11
-	dsprite   1, 0,   0, 0, $07, $11
-	dsprite   0, 0,   1, 0, $08, $11
-	dsprite   1, 0,   1, 0, $09, $11
-	dsprite   0, 0,   2, 0, $0a, $11
-	dsprite   1, 0,   2, 0, $0b, $11
-
-.OAMData_6e:
-	dsprite  -2, 4,   0, 4, $00, $00
-	dsprite  -1, 4,  -2, 4, $01, $00
-	dsprite  -1, 4,  -1, 4, $02, $00
-	dsprite  -1, 4,   0, 4, $03, $00
-	dsprite   0, 4,  -2, 4, $04, $00
-
-.OAMData_6f:
-	dsprite  -1, 4,  -2, 4, $00, $00
-	dsprite  -1, 4,  -1, 4, $01, $00
-	dsprite  -1, 4,   0, 4, $02, $00
-
-.OAMData_77:
-	dsprite  -4, 4,   1, 4, $01, $60
-
-.OAMData_78:
-	dsprite  -4, 4,   1, 4, $00, $00
-	dsprite  -4, 4,   0, 4, $01, $60
-	dsprite  -3, 4,   1, 4, $01, $60
-
-.OAMData_79:
-	dsprite  -4, 4,   1, 4, $01, $00
-	dsprite  -4, 4,   0, 4, $00, $00
-	dsprite  -4, 4,  -1, 4, $01, $60
-	dsprite  -3, 4,   1, 4, $00, $00
-	dsprite  -3, 4,   0, 4, $01, $60
-	dsprite  -2, 4,   1, 4, $01, $60
-
-.OAMData_7a:
-	dsprite  -4, 4,  -2, 4, $01, $60
-	dsprite  -4, 4,  -1, 4, $00, $00
-	dsprite  -4, 4,   0, 4, $01, $00
-	dsprite  -3, 4,  -1, 4, $01, $60
-	dsprite  -3, 4,   0, 4, $00, $00
-	dsprite  -3, 4,   1, 4, $01, $00
-	dsprite  -2, 4,   0, 4, $01, $60
-	dsprite  -2, 4,   1, 4, $00, $00
-	dsprite  -1, 4,   1, 4, $01, $60
-
-.OAMData_7b:
-	dsprite  -4, 4,  -3, 4, $01, $60
-	dsprite  -4, 4,  -2, 4, $00, $00
-	dsprite  -4, 4,  -1, 4, $01, $00
-	dsprite  -3, 4,  -2, 4, $01, $60
-	dsprite  -3, 4,  -1, 4, $00, $00
-	dsprite  -3, 4,   0, 4, $01, $00
-	dsprite  -2, 4,  -1, 4, $01, $60
-	dsprite  -2, 4,   0, 4, $00, $00
-	dsprite  -2, 4,   1, 4, $01, $00
-	dsprite  -1, 4,   0, 4, $01, $60
-	dsprite  -1, 4,   1, 4, $00, $00
-	dsprite   0, 4,   1, 4, $01, $60
-
-.OAMData_7c:
-	dsprite  -4, 4,  -3, 4, $00, $00
-	dsprite  -4, 4,  -2, 4, $01, $00
-	dsprite  -3, 4,  -3, 4, $01, $60
-	dsprite  -3, 4,  -2, 4, $00, $00
-	dsprite  -3, 4,  -1, 4, $01, $00
-	dsprite  -2, 4,  -2, 4, $01, $60
-	dsprite  -2, 4,  -1, 4, $00, $00
-	dsprite  -2, 4,   0, 4, $01, $00
-	dsprite  -1, 4,  -1, 4, $01, $60
-	dsprite  -1, 4,   0, 4, $00, $00
-	dsprite  -1, 4,   1, 4, $01, $00
-	dsprite   0, 4,   0, 4, $01, $60
-	dsprite   0, 4,   1, 4, $00, $00
-	dsprite   1, 4,   1, 4, $01, $60
-
-.OAMData_7d:
-	dsprite  -4, 4,  -3, 4, $01, $00
-	dsprite  -3, 4,  -3, 4, $00, $00
-	dsprite  -3, 4,  -2, 4, $01, $00
-	dsprite  -2, 4,  -3, 4, $01, $60
-	dsprite  -2, 4,  -2, 4, $00, $00
-	dsprite  -2, 4,  -1, 4, $01, $00
-	dsprite  -1, 4,  -2, 4, $01, $60
-	dsprite  -1, 4,  -1, 4, $00, $00
-	dsprite  -1, 4,   0, 4, $01, $00
-	dsprite   0, 4,  -1, 4, $01, $60
-	dsprite   0, 4,   0, 4, $00, $00
-	dsprite   0, 4,   1, 4, $01, $00
-	dsprite   1, 4,   0, 4, $01, $60
-	dsprite   1, 4,   1, 4, $00, $00
-	dsprite   2, 4,   1, 4, $01, $60
-
-.OAMData_70:
-	dsprite  -2, 0,  -1, 0, $00, $00
-	dsprite  -1, 0,  -1, 0, $01, $00
-	dsprite  -2, 0,   0, 0, $00, $20
-	dsprite  -1, 0,   0, 0, $01, $20
-	dsprite   0, 0,  -1, 0, $01, $40
-	dsprite   1, 0,  -1, 0, $00, $40
-	dsprite   0, 0,   0, 0, $01, $60
-	dsprite   1, 0,   0, 0, $00, $60
-
-.OAMData_81:
-	dsprite  -1, 0,  -1, 0, $00, $00
-	dsprite  -1, 0,   0, 0, $01, $00
-	dsprite   0, 0,  -1, 0, $01, $60
-	dsprite   0, 0,   0, 0, $00, $60
-
-.OAMData_87:
-	dsprite  -2, 4,  -1, 0, $00, $00
-	dsprite  -2, 4,   0, 0, $01, $00
-	dsprite  -1, 4,  -1, 0, $02, $00
-	dsprite  -1, 4,   0, 0, $03, $00
-	dsprite  -1, 4,  -1, 0, $00, $00
-	dsprite  -1, 4,   0, 0, $01, $00
-	dsprite   0, 4,  -1, 0, $02, $00
-	dsprite   0, 4,   0, 0, $03, $00
-	dsprite  -3, 4,  -1, 0, $00, $00
-	dsprite  -3, 4,   0, 0, $01, $00
-	dsprite  -2, 4,  -1, 0, $02, $00
-	dsprite  -2, 4,   0, 0, $03, $00
-	dsprite   0, 4,  -1, 0, $00, $00
-	dsprite   0, 4,   0, 0, $01, $00
-	dsprite   1, 4,  -1, 0, $02, $00
-	dsprite   1, 4,   0, 0, $03, $00
-
-.OAMData_88:
-	dsprite  -2, 0,  -1, 0, $00, $00
-	dsprite  -2, 0,   0, 0, $01, $00
-	dsprite  -1, 0,  -1, 0, $02, $00
-	dsprite  -1, 0,   0, 0, $03, $00
-	dsprite  -1, 0,  -1, 0, $00, $00
-	dsprite  -1, 0,   0, 0, $01, $00
-	dsprite   0, 0,  -1, 0, $02, $00
-	dsprite   0, 0,   0, 0, $03, $00
-	dsprite   0, 0,  -1, 0, $00, $00
-	dsprite   0, 0,   0, 0, $01, $00
-	dsprite   1, 0,  -1, 0, $02, $00
-	dsprite   1, 0,   0, 0, $03, $00
-
-.OAMData_8a:
-	dsprite  -1, 4,  -1, 4, $00, $00
-	dsprite  -1, 0,   0, 4, $00, $00
-	dsprite  -2, 4,   1, 4, $00, $00
-	dsprite  -2, 0,   2, 4, $00, $00
-	dsprite  -3, 4,   3, 4, $00, $00
-	dsprite  -3, 0,   4, 4, $00, $00
-	dsprite  -4, 0,   5, 4, $00, $00
-	dsprite  -5, 4,   6, 4, $00, $00
-
-.OAMData_8e:
-	dsprite  -3, 4,  -1, 4, $00, $00
-	dsprite  -2, 4,  -1, 4, $01, $00
-	dsprite  -1, 4,  -1, 4, $02, $00
-	dsprite   0, 4,  -1, 4, $01, $40
-	dsprite   1, 4,  -1, 4, $00, $40
-
-.OAMData_8f:
-	dsprite  -1, 4,  -2, 0, $00, $00
-	dsprite  -1, 4,  -1, 0, $01, $00
-	dsprite  -1, 4,   0, 0, $02, $00
-	dsprite  -1, 4,   1, 0, $03, $00
-
-.OAMData_93:
-	dsprite  -1, 0,  -2, 4, $00, $00
-	dsprite  -1, 0,  -1, 4, $01, $00
-	dsprite  -1, 0,   0, 4, $02, $00
-	dsprite   0, 0,  -2, 4, $03, $00
-	dsprite   0, 0,  -1, 4, $04, $00
-	dsprite   0, 0,   0, 4, $05, $00
-
-.OAMData_99:
-	dsprite  -1, 0,  -1, 0, $00, $00
-	dsprite  -1, 0,   0, 0, $05, $00
-	dsprite   0, 0,  -1, 0, $01, $00
-	dsprite   0, 0,   0, 0, $05, $00
-
-.OAMData_9b:
-	dsprite  -4, 4,   1, 0, $00, $00
-	dsprite  -4, 4,   2, 0, $01, $00
-	dsprite  -3, 4,  -1, 0, $02, $00
-	dsprite  -3, 4,   0, 0, $03, $00
-	dsprite  -3, 4,   1, 0, $04, $00
-	dsprite  -3, 4,   2, 0, $05, $00
-	dsprite  -3, 4,   3, 0, $06, $00
-	dsprite  -2, 4,  -2, 0, $07, $00
-	dsprite  -2, 4,  -1, 0, $08, $00
-	dsprite  -2, 4,   0, 0, $09, $00
-	dsprite  -2, 4,   1, 0, $0a, $00
-	dsprite  -2, 4,   2, 0, $0b, $00
-	dsprite  -2, 4,   3, 0, $0c, $00
-	dsprite  -2, 4,   4, 0, $0d, $00
-	dsprite  -1, 4,  -3, 0, $0e, $00
-	dsprite  -1, 4,  -2, 0, $0f, $00
-	dsprite  -1, 4,  -1, 0, $10, $00
-	dsprite  -1, 4,   0, 0, $11, $00
-	dsprite  -1, 4,   1, 0, $12, $00
-	dsprite  -1, 4,   2, 0, $13, $00
-	dsprite   0, 4,  -5, 0, $14, $00
-	dsprite   0, 4,  -4, 0, $15, $00
-	dsprite   0, 4,  -3, 0, $16, $00
-	dsprite   0, 4,  -2, 0, $17, $00
-	dsprite   0, 4,  -1, 0, $18, $00
-	dsprite   0, 4,   0, 0, $19, $00
-	dsprite   0, 4,   1, 0, $1a, $00
-	dsprite   0, 4,   2, 0, $1b, $00
-	dsprite   0, 4,   3, 0, $1c, $00
-	dsprite   1, 4,  -5, 0, $1d, $00
-	dsprite   1, 4,  -4, 0, $1e, $00
-	dsprite   1, 4,  -2, 0, $1f, $00
-	dsprite   1, 4,  -1, 0, $20, $00
-	dsprite   1, 4,   0, 0, $21, $00
-	dsprite   1, 4,   1, 0, $22, $00
-	dsprite   2, 4,   0, 0, $23, $00
-
-.OAMData_9c:
-	dsprite   0, 4,  -1, 0, $02, $00
-	dsprite   0, 4,   0, 0, $03, $00
-	dsprite  -1, 4,  -1, 0, $01, $00
-	dsprite  -1, 4,   0, 0, $01, $20
-	dsprite  -2, 4,  -1, 0, $00, $00
-	dsprite  -2, 4,   0, 0, $00, $20
-
-.OAMData_9f:
-	dsprite  -1, 0,  -2, 0, $00, $00
-	dsprite  -1, 0,  -1, 0, $01, $00
-	dsprite  -1, 0,   0, 0, $02, $00
-	dsprite  -1, 0,   1, 0, $03, $00
-	dsprite   0, 0,  -2, 0, $04, $00
-	dsprite   0, 0,  -1, 0, $05, $00
-	dsprite   0, 0,   0, 0, $06, $00
-	dsprite   0, 0,   1, 0, $07, $00
-
-.OAMData_a0:
-	dsprite  -2, 4,  -1, 4, $00, $00
-	dsprite  -1, 4,  -1, 4, $00, $00
-	dsprite   0, 4,  -1, 4, $00, $00
-	dsprite  -3, 4,  -1, 4, $00, $00
-	dsprite   1, 4,  -1, 4, $00, $00
-	dsprite  -4, 4,  -1, 4, $00, $00
-	dsprite   2, 4,  -1, 4, $00, $00
-
-.OAMData_a4:
-	dsprite  -2, 4,  -2, 4, $00, $00
-	dsprite  -2, 4,  -1, 4, $01, $00
-	dsprite  -2, 4,   0, 4, $02, $00
-	dsprite  -1, 4,  -2, 4, $03, $00
-	dsprite  -1, 4,  -1, 4, $04, $00
-	dsprite  -1, 4,   0, 4, $05, $00
-	dsprite   0, 4,  -2, 4, $00, $40
-	dsprite   0, 4,  -1, 4, $01, $40
-	dsprite   0, 4,   0, 4, $02, $40
-
-.OAMData_ac:
-	dsprite  -1, 4,  -2, 0, $00, $00
-	dsprite  -1, 4,  -1, 0, $01, $00
-	dsprite  -1, 4,   0, 0, $01, $20
-	dsprite  -1, 4,   1, 0, $00, $20
-
-.OAMData_bc:
-	dsprite  -1, 4,  -3, 0, $00, $00
-	dsprite  -1, 4,  -2, 0, $01, $00
-	dsprite  -1, 4,  -1, 0, $02, $00
-	dsprite  -1, 4,   0, 0, $02, $20
-	dsprite  -1, 4,   1, 0, $01, $20
-	dsprite  -1, 4,   2, 0, $00, $20
-
-.OAMData_c1:
-	dsprite  -2, 0,  -2, 0, $00, $00
-	dsprite  -2, 0,  -1, 0, $01, $00
-	dsprite  -2, 0,   0, 0, $02, $00
-	dsprite  -2, 0,   1, 0, $00, $20
-	dsprite  -1, 0,  -2, 0, $03, $00
-	dsprite  -1, 0,  -1, 0, $04, $00
-	dsprite  -1, 0,   0, 0, $04, $20
-	dsprite  -1, 0,   1, 0, $05, $00
-	dsprite   0, 0,  -2, 0, $05, $60
-	dsprite   0, 0,  -1, 0, $04, $40
-	dsprite   0, 0,   0, 0, $04, $60
-	dsprite   0, 0,   1, 0, $03, $60
-	dsprite   1, 0,  -2, 0, $00, $40
-	dsprite   1, 0,  -1, 0, $02, $60
-	dsprite   1, 0,   0, 0, $01, $60
-	dsprite   1, 0,   1, 0, $00, $60
-
-.OAMData_c2:
-	dsprite  -1, 0,  -2, 0, $00, $00
-	dsprite  -1, 0,  -1, 0, $01, $00
-	dsprite  -1, 0,   0, 0, $00, $60
-	dsprite   0, 0,  -1, 0, $00, $00
-	dsprite   0, 0,   0, 0, $01, $00
-	dsprite   0, 0,   1, 0, $00, $60
-
-.OAMData_c8:
-	dsprite  -1, 0,   1, 4, $00, $00
-	dsprite  -1, 0,   2, 4, $01, $00
-	dsprite   0, 0,  -1, 4, $02, $00
-	dsprite   0, 0,   0, 4, $03, $00
-	dsprite   0, 0,   1, 4, $04, $00
-	dsprite   0, 0,   2, 4, $05, $00
-
-.OAMData_ca:
-	dsprite  -1, 0,  -1, 0, $00, $00
-	dsprite  -1, 0,   0, 0, $01, $60
-	dsprite   0, 0,  -1, 0, $01, $00
-	dsprite   0, 0,   0, 0, $01, $20
-
-.OAMData_cc:
-	dsprite  -2, 0, -13, 4, $00, $00
-	dsprite  -4, 0, -11, 4, $00, $00
-	dsprite  -1, 0,  -9, 4, $00, $00
-	dsprite  -5, 0,  -7, 4, $00, $00
-	dsprite  -3, 0,  -5, 4, $00, $00
-	dsprite  -5, 0,  -3, 4, $00, $00
-	dsprite  -3, 0,  -1, 4, $00, $00
-	dsprite  -3, 0,   0, 4, $00, $00
-	dsprite  -5, 0,   2, 4, $00, $00
-	dsprite   0, 0,   4, 4, $00, $00
-	dsprite  -2, 0,   6, 4, $00, $00
-	dsprite  -4, 0,   8, 4, $00, $00
-	dsprite  -2, 0,  10, 4, $00, $00
-; cfcf6
diff --git a/constants.asm b/constants.asm
index b8c38cc46..7de20dfe2 100644
--- a/constants.asm
+++ b/constants.asm
@@ -7,26 +7,31 @@ INCLUDE "constants/wram_constants.asm"
 INCLUDE "constants/pokemon_constants.asm"
 INCLUDE "constants/type_constants.asm"
 INCLUDE "constants/move_constants.asm"
+INCLUDE "constants/move_effect_constants.asm"
 INCLUDE "constants/battle_constants.asm"
-INCLUDE "constants/map_dimension_constants.asm"
+INCLUDE "constants/battle_anim_constants.asm"
 INCLUDE "constants/map_constants.asm"
+INCLUDE "constants/map_data_constants.asm"
 INCLUDE "constants/map_setup_constants.asm"
 INCLUDE "constants/landmark_constants.asm"
 INCLUDE "constants/item_constants.asm"
+INCLUDE "constants/item_data_constants.asm"
 INCLUDE "constants/trainer_constants.asm"
+INCLUDE "constants/trainer_data_constants.asm"
 INCLUDE "constants/script_constants.asm"
 INCLUDE "constants/event_flags.asm"
 INCLUDE "constants/engine_flags.asm"
 INCLUDE "constants/music_constants.asm"
 INCLUDE "constants/sfx_constants.asm"
-INCLUDE "constants/animation_constants.asm"
 INCLUDE "constants/phone_constants.asm"
 INCLUDE "constants/credits_constants.asm"
 INCLUDE "constants/gfx_constants.asm"
 INCLUDE "constants/input_constants.asm"
 INCLUDE "constants/pokemon_data_constants.asm"
+INCLUDE "constants/icon_constants.asm"
 INCLUDE "constants/serial_constants.asm"
 INCLUDE "constants/mobile_constants.asm"
+INCLUDE "constants/text_constants.asm"
 INCLUDE "constants/misc_constants.asm"
 INCLUDE "constants/std_constants.asm"
 INCLUDE "constants/deco_constants.asm"
@@ -34,6 +39,7 @@ INCLUDE "constants/radio_constants.asm"
 INCLUDE "constants/npctrade_constants.asm"
 INCLUDE "constants/sprite_constants.asm"
 INCLUDE "constants/sprite_data_constants.asm"
+INCLUDE "constants/sprite_anim_constants.asm"
 INCLUDE "constants/tileset_constants.asm"
 INCLUDE "constants/collision_constants.asm"
 INCLUDE "constants/cgb_constants.asm"
diff --git a/constants/animation_constants.asm b/constants/battle_anim_constants.asm
index e7c844c12..0170d5700 100644
--- a/constants/animation_constants.asm
+++ b/constants/battle_anim_constants.asm
@@ -26,7 +26,7 @@
 	const BATTLEANIMSTRUCT_17
 BATTLEANIMSTRUCT_LENGTH EQU const_value
 
-; BattleAnimObjects indexes (see battle/objects/data.asm)
+; BattleAnimObjects indexes (see data/battle_anims/objects.asm)
 	const_def
 	const ANIM_OBJ_00
 	const ANIM_OBJ_01
@@ -217,7 +217,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
 	const ANIM_OBJ_BA
 	const ANIM_OBJ_BB
 
-; DoBattleAnimFrame arguments (see battle/objects/functions.asm)
+; DoBattleAnimFrame arguments (see engine/battle_anims/functions.asm)
 	const_def
 	const BATTLEANIMFUNC_00
 	const BATTLEANIMFUNC_01
@@ -300,7 +300,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
 	const BATTLEANIMFUNC_4E
 	const BATTLEANIMFUNC_4F
 
-; BattleAnimFrameData indexes (see battle/objects/framesets.asm)
+; BattleAnimFrameData indexes (see data/battle_anims/framesets.asm)
 	const_def
 	const BATTLEANIMFRAMESET_00
 	const BATTLEANIMFRAMESET_01
@@ -488,7 +488,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
 	const BATTLEANIMFRAMESET_B7
 	const BATTLEANIMFRAMESET_B8
 
-; BattleAnimOAMData indexes (see battle/objects/oam.asm)
+; BattleAnimOAMData indexes (see data/battle_anims/oam.asm)
 	const_def
 	const BATTLEANIMOAMSET_00
 	const BATTLEANIMOAMSET_01
@@ -707,7 +707,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
 	const BATTLEANIMOAMSET_D6
 	const BATTLEANIMOAMSET_D7
 
-; BattleBGEffects indexes (see battle/bg_effects.asm)
+; BattleBGEffects indexes (see engine/battle_anims/bg_effects.asm)
 const_value SET 1
 	const ANIM_BG_FLASH_INVERTED
 	const ANIM_BG_FLASH_WHITE
@@ -763,19 +763,7 @@ const_value SET 1
 	const ANIM_BG_WOBBLE_MON
 	const ANIM_BG_35
 
-; PokeAnims indexes (see gfx/pics/animation.asm)
-	const_def
-	const ANIM_MON_SLOW
-	const ANIM_MON_NORMAL
-	const ANIM_MON_MENU
-	const ANIM_MON_TRADE
-	const ANIM_MON_EVOLVE
-	const ANIM_MON_HATCH
-	const ANIM_MON_UNUSED
-	const ANIM_MON_EGG1
-	const ANIM_MON_EGG2
-
-; AnimObjGFX indexes (see battle/objects/gfx_headers.asm)
+; AnimObjGFX indexes (see data/battle_anims/object_gfx.asm)
 const_value SET 1
 	const ANIM_GFX_HIT
 	const ANIM_GFX_CUT
diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm
index e9d393fcc..2b1fec155 100644
--- a/constants/battle_constants.asm
+++ b/constants/battle_constants.asm
@@ -30,16 +30,16 @@ TREEMON_SLEEP_TURNS EQU 7
 	const ABILITY ; used for BattleCommand_Curse
 NUM_LEVEL_STATS EQU const_value
 
-; move struct members (see battle/moves/moves.asm)
+; move struct members (see data/moves/moves.asm)
 	const_def
-	const MOVE_ANIM
-	const MOVE_EFFECT
-	const MOVE_POWER
-	const MOVE_TYPE
-	const MOVE_ACC
-	const MOVE_PP
-	const MOVE_CHANCE
-	const MOVE_LENGTH
+	const MOVE_ANIM   ; 0
+	const MOVE_EFFECT ; 1
+	const MOVE_POWER  ; 2
+	const MOVE_TYPE   ; 3
+	const MOVE_ACC    ; 4
+	const MOVE_PP     ; 5
+	const MOVE_CHANCE ; 6
+MOVE_LENGTH EQU const_value
 
 ; stat constants
 ; indexes for:
@@ -213,166 +213,6 @@ SUBSTATUS_CURLED EQU 0
 	const WEATHER_SUN_END
 	const WEATHER_SANDSTORM_END
 
-; MoveEffectsPointers indexes (see battle/moves/move_effects_pointers.asm)
-	const_def
-	const EFFECT_NORMAL_HIT
-	const EFFECT_SLEEP
-	const EFFECT_POISON_HIT
-	const EFFECT_LEECH_HIT
-	const EFFECT_BURN_HIT
-	const EFFECT_FREEZE_HIT
-	const EFFECT_PARALYZE_HIT
-	const EFFECT_SELFDESTRUCT
-	const EFFECT_DREAM_EATER
-	const EFFECT_MIRROR_MOVE
-	const EFFECT_ATTACK_UP
-	const EFFECT_DEFENSE_UP
-	const EFFECT_SPEED_UP
-	const EFFECT_SP_ATK_UP
-	const EFFECT_SP_DEF_UP
-	const EFFECT_ACCURACY_UP
-	const EFFECT_EVASION_UP
-	const EFFECT_ALWAYS_HIT
-	const EFFECT_ATTACK_DOWN
-	const EFFECT_DEFENSE_DOWN
-	const EFFECT_SPEED_DOWN
-	const EFFECT_SP_ATK_DOWN
-	const EFFECT_SP_DEF_DOWN
-	const EFFECT_ACCURACY_DOWN
-	const EFFECT_EVASION_DOWN
-	const EFFECT_RESET_STATS
-	const EFFECT_BIDE
-	const EFFECT_RAMPAGE
-	const EFFECT_FORCE_SWITCH
-	const EFFECT_MULTI_HIT
-	const EFFECT_CONVERSION
-	const EFFECT_FLINCH_HIT
-	const EFFECT_HEAL
-	const EFFECT_TOXIC
-	const EFFECT_PAY_DAY
-	const EFFECT_LIGHT_SCREEN
-	const EFFECT_TRI_ATTACK
-	const EFFECT_UNUSED_25
-	const EFFECT_OHKO
-	const EFFECT_RAZOR_WIND
-	const EFFECT_SUPER_FANG
-	const EFFECT_STATIC_DAMAGE
-	const EFFECT_TRAP_TARGET
-	const EFFECT_UNUSED_2B
-	const EFFECT_DOUBLE_HIT
-	const EFFECT_JUMP_KICK
-	const EFFECT_MIST
-	const EFFECT_FOCUS_ENERGY
-	const EFFECT_RECOIL_HIT
-	const EFFECT_CONFUSE
-	const EFFECT_ATTACK_UP_2
-	const EFFECT_DEFENSE_UP_2
-	const EFFECT_SPEED_UP_2
-	const EFFECT_SP_ATK_UP_2
-	const EFFECT_SP_DEF_UP_2
-	const EFFECT_ACCURACY_UP_2
-	const EFFECT_EVASION_UP_2
-	const EFFECT_TRANSFORM
-	const EFFECT_ATTACK_DOWN_2
-	const EFFECT_DEFENSE_DOWN_2
-	const EFFECT_SPEED_DOWN_2
-	const EFFECT_SP_ATK_DOWN_2
-	const EFFECT_SP_DEF_DOWN_2
-	const EFFECT_ACCURACY_DOWN_2
-	const EFFECT_EVASION_DOWN_2
-	const EFFECT_REFLECT
-	const EFFECT_POISON
-	const EFFECT_PARALYZE
-	const EFFECT_ATTACK_DOWN_HIT
-	const EFFECT_DEFENSE_DOWN_HIT
-	const EFFECT_SPEED_DOWN_HIT
-	const EFFECT_SP_ATK_DOWN_HIT
-	const EFFECT_SP_DEF_DOWN_HIT
-	const EFFECT_ACCURACY_DOWN_HIT
-	const EFFECT_EVASION_DOWN_HIT
-	const EFFECT_SKY_ATTACK
-	const EFFECT_CONFUSE_HIT
-	const EFFECT_POISON_MULTI_HIT
-	const EFFECT_UNUSED_4E
-	const EFFECT_SUBSTITUTE
-	const EFFECT_HYPER_BEAM
-	const EFFECT_RAGE
-	const EFFECT_MIMIC
-	const EFFECT_METRONOME
-	const EFFECT_LEECH_SEED
-	const EFFECT_SPLASH
-	const EFFECT_DISABLE
-	const EFFECT_LEVEL_DAMAGE
-	const EFFECT_PSYWAVE
-	const EFFECT_COUNTER
-	const EFFECT_ENCORE
-	const EFFECT_PAIN_SPLIT
-	const EFFECT_SNORE
-	const EFFECT_CONVERSION2
-	const EFFECT_LOCK_ON
-	const EFFECT_SKETCH
-	const EFFECT_DEFROST_OPPONENT
-	const EFFECT_SLEEP_TALK
-	const EFFECT_DESTINY_BOND
-	const EFFECT_REVERSAL
-	const EFFECT_SPITE
-	const EFFECT_FALSE_SWIPE
-	const EFFECT_HEAL_BELL
-	const EFFECT_PRIORITY_HIT
-	const EFFECT_TRIPLE_KICK
-	const EFFECT_THIEF
-	const EFFECT_MEAN_LOOK
-	const EFFECT_NIGHTMARE
-	const EFFECT_FLAME_WHEEL
-	const EFFECT_CURSE
-	const EFFECT_UNUSED_6E
-	const EFFECT_PROTECT
-	const EFFECT_SPIKES
-	const EFFECT_FORESIGHT
-	const EFFECT_PERISH_SONG
-	const EFFECT_SANDSTORM
-	const EFFECT_ENDURE
-	const EFFECT_ROLLOUT
-	const EFFECT_SWAGGER
-	const EFFECT_FURY_CUTTER
-	const EFFECT_ATTRACT
-	const EFFECT_RETURN
-	const EFFECT_PRESENT
-	const EFFECT_FRUSTRATION
-	const EFFECT_SAFEGUARD
-	const EFFECT_SACRED_FIRE
-	const EFFECT_MAGNITUDE
-	const EFFECT_BATON_PASS
-	const EFFECT_PURSUIT
-	const EFFECT_RAPID_SPIN
-	const EFFECT_UNUSED_82
-	const EFFECT_UNUSED_83
-	const EFFECT_MORNING_SUN
-	const EFFECT_SYNTHESIS
-	const EFFECT_MOONLIGHT
-	const EFFECT_HIDDEN_POWER
-	const EFFECT_RAIN_DANCE
-	const EFFECT_SUNNY_DAY
-	const EFFECT_DEFENSE_UP_HIT
-	const EFFECT_ATTACK_UP_HIT
-	const EFFECT_ALL_UP_HIT
-	const EFFECT_FAKE_OUT
-	const EFFECT_BELLY_DRUM
-	const EFFECT_PSYCH_UP
-	const EFFECT_MIRROR_COAT
-	const EFFECT_SKULL_BASH
-	const EFFECT_TWISTER
-	const EFFECT_EARTHQUAKE
-	const EFFECT_FUTURE_SIGHT
-	const EFFECT_GUST
-	const EFFECT_STOMP
-	const EFFECT_SOLARBEAM
-	const EFFECT_THUNDER
-	const EFFECT_TELEPORT
-	const EFFECT_BEAT_UP
-	const EFFECT_FLY
-	const EFFECT_DEFENSE_CURL
-
 ; wBattleAction
 	const_def
 	const BATTLEACTION_MOVE1
diff --git a/constants/deco_constants.asm b/constants/deco_constants.asm
index 433b11e25..7546d9e1f 100644
--- a/constants/deco_constants.asm
+++ b/constants/deco_constants.asm
@@ -7,7 +7,7 @@ const_value = 1
 	const DECO_DOLL
 	const DECO_BIGDOLL
 
-; DecorationNames indexes (see engine/decorations.asm)
+; DecorationNames indexes (see data/decorations/names.asm)
 const_value = 1
 	const PUT_IT_AWAY
 	const MAGNAPLANT
@@ -35,7 +35,7 @@ const_value = 1
 	const YELLOW_CARPET
 	const GREEN_CARPET
 
-; DoDecorationAction2 arguments (see engine/decorations.asm)
+; DoDecorationAction2.DecoActions indexes (see engine/decorations.asm)
 const_value = 1
 	const SET_UP_BED
 	const PUT_AWAY_BED
@@ -59,43 +59,46 @@ deco: MACRO
 	enum DECOFLAG_\1
 endm
 
-; decorations (see data/decoration_attribute.asm)
+; decorations:
+; - DecorationAttributes (see data/decorations/attributes.asm)
+; - DecorationIDs (see data/decorations/decorations.asm)
 const_value = 1
 __enum__ = 0
+; FindOwnedBeds.beds values (see engine/decorations.asm)
 	const BEDS
 	deco  FEATHERY_BED
 	deco  PINK_BED
 	deco  POLKADOT_BED
 	deco  PIKACHU_BED
-
+; FindOwnedCarpets.carpets values (see engine/decorations.asm)
 	const CARPETS
 	deco  RED_CARPET
 	deco  BLUE_CARPET
 	deco  YELLOW_CARPET
 	deco  GREEN_CARPET
-
+; FindOwnedPlants.plants values (see engine/decorations.asm)
 	const PLANTS
 	deco  MAGNAPLANT
 	deco  TROPICPLANT
 	deco  JUMBOPLANT
-
+; FindOwnedPosters.posters values (see engine/decorations.asm)
 	const POSTERS
 	deco  TOWN_MAP
 	deco  PIKACHU_POSTER
 	deco  CLEFAIRY_POSTER
 	deco  JIGGLYPUFF_POSTER
-
+; FindOwnedConsoles.consoles values (see engine/decorations.asm)
 	const CONSOLES
 	deco  FAMICOM
 	deco  SNES
 	deco  N64
 	deco  VIRTUAL_BOY
-
+; FindOwnedBigDolls.big_dolls values (see engine/decorations.asm)
 	const BIG_DOLLS
 	deco  BIG_SNORLAX_DOLL
 	deco  BIG_ONIX_DOLL
 	deco  BIG_LAPRAS_DOLL
-
+; FindOwnedOrnaments.ornaments values (see engine/decorations.asm)
 	const DOLLS
 	deco  PIKACHU_DOLL
 	deco  SURF_PIKACHU_DOLL
diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm
index 4c3b23fc9..ca468f477 100644
--- a/constants/gfx_constants.asm
+++ b/constants/gfx_constants.asm
@@ -20,5 +20,4 @@ HP_BAR_LENGTH_PX EQU HP_BAR_LENGTH * TILE_WIDTH ; pixels
 EXP_BAR_LENGTH EQU 8 ; tiles
 EXP_BAR_LENGTH_PX EQU EXP_BAR_LENGTH * TILE_WIDTH ; pixels
 
-
 PALPACKET_LENGTH EQU $10
diff --git a/constants/hardware_constants.asm b/constants/hardware_constants.asm
index ae2e97a6b..9cb278622 100644
--- a/constants/hardware_constants.asm
+++ b/constants/hardware_constants.asm
@@ -1,4 +1,19 @@
-; Graciously aped from http://nocash.emubase.de/pandocs.htm .
+; Graciously aped from:
+; http://nocash.emubase.de/pandocs.htm
+; http://gameboy.mongenel.com/dmg/asmmemmap.html
+
+; memory map
+VRAM_Begin  EQU $8000
+VRAM_End    EQU $a000
+SRAM_Begin  EQU $a000
+SRAM_End    EQU $c000
+WRAM0_Begin EQU $c000
+WRAM0_End   EQU $d000
+WRAM1_Begin EQU $d000
+WRAM1_End   EQU $e000
+; hardware registers $ff00-$ff80 (see below)
+HRAM_Begin  EQU $ff80
+HRAM_End    EQU $ffff
 
 ; MBC3
 MBC3SRamEnable EQU $0000
diff --git a/constants/icon_constants.asm b/constants/icon_constants.asm
new file mode 100644
index 000000000..2b0456c1d
--- /dev/null
+++ b/constants/icon_constants.asm
@@ -0,0 +1,41 @@
+; IconPointers indexes (see data/icon_pointers.asm)
+	const_def
+	const ICON_NULL
+	const ICON_POLIWAG
+	const ICON_JIGGLYPUFF
+	const ICON_DIGLETT
+	const ICON_PIKACHU
+	const ICON_STARYU
+	const ICON_FISH
+	const ICON_BIRD
+	const ICON_MONSTER
+	const ICON_CLEFAIRY
+	const ICON_ODDISH
+	const ICON_BUG
+	const ICON_GHOST
+	const ICON_LAPRAS
+	const ICON_HUMANSHAPE
+	const ICON_FOX
+	const ICON_EQUINE
+	const ICON_SHELL
+	const ICON_BLOB
+	const ICON_SERPENT
+	const ICON_VOLTORB
+	const ICON_SQUIRTLE
+	const ICON_BULBASAUR
+	const ICON_CHARMANDER
+	const ICON_CATERPILLAR
+	const ICON_UNOWN
+	const ICON_GEODUDE
+	const ICON_FIGHTER
+	const ICON_EGG
+	const ICON_JELLYFISH
+	const ICON_MOTH
+	const ICON_BAT
+	const ICON_SNORLAX
+	const ICON_HO_OH
+	const ICON_LUGIA
+	const ICON_GYARADOS
+	const ICON_SLOWPOKE
+	const ICON_SUDOWOODO
+	const ICON_BIGMON
diff --git a/constants/item_constants.asm b/constants/item_constants.asm
index 5dc506604..c1079e82d 100644
--- a/constants/item_constants.asm
+++ b/constants/item_constants.asm
@@ -1,9 +1,9 @@
 ; item ids
 ; indexes for:
-; - ItemAttributes (see data/items/item_attributes.asm)
-; - ItemDescriptions (see data/items/item_descriptions.asm)
+; - ItemNames (see data/items/names.asm)
+; - ItemDescriptions (see data/items/descriptions.asm)
+; - ItemAttributes (see data/items/attributes.asm)
 ; - ItemEffects (see engine/item_effects.asm)
-; - ItemNames (see data/items/item_names.asm)
 	const_def
 	const NO_ITEM      ; $00
 	const MASTER_BALL  ; $01
@@ -197,7 +197,7 @@
 	const MIRAGE_MAIL  ; $BD
 	const ITEM_BE      ; $BE
 
-; see data/tmhm_moves.asm for moves
+; see data/moves/tmhm_moves.asm for moves
 	add_tm DYNAMICPUNCH ; $BF
 	add_tm HEADBUTT     ; $C0
 	add_tm CURSE        ; $C1
@@ -273,189 +273,3 @@ ITEM_FROM_MEM EQU $FF
 SAFARI_BALL    EQU $08 ; MOON_STONE
 MOON_STONE_RED EQU $0A ; BURN_HEAL
 FULL_HEAL_RED  EQU $34 ; X_SPEED
-
-; mail
-MAIL_MSG_LENGTH    EQU $20
-MAILBOX_CAPACITY   EQU 10
-MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct
-
-; pack pockets
-ITEM     EQU 1
-KEY_ITEM EQU 2
-BALL     EQU 3
-TM_HM    EQU 4
-
-; pack pocket sizes
-MAX_ITEMS     EQU 20
-MAX_KEY_ITEMS EQU 25
-MAX_BALLS     EQU 12
-MAX_PC_ITEMS  EQU 50
-
-; item actions
-CANT_SELECT EQU 1 << 6
-CANT_TOSS   EQU 1 << 7
-
-
-; held item effects
-	const_def
-	const HELD_NONE
-	const HELD_BERRY
-	const HELD_2
-	const HELD_LEFTOVERS
-	const HELD_4
-	const HELD_5
-	const HELD_RESTORE_PP
-	const HELD_7
-	const HELD_CLEANSE_TAG
-
-const_value SET 10
-	const HELD_HEAL_POISON
-	const HELD_HEAL_FREEZE
-	const HELD_HEAL_BURN
-	const HELD_HEAL_SLEEP
-	const HELD_HEAL_PARALYZE
-	const HELD_HEAL_STATUS
-	const HELD_HEAL_CONFUSION
-
-const_value SET 20
-	const HELD_PREVENT_POISON
-	const HELD_PREVENT_BURN
-	const HELD_PREVENT_FREEZE
-	const HELD_PREVENT_SLEEP
-	const HELD_PREVENT_PARALYZE
-	const HELD_PREVENT_CONFUSE
-
-const_value SET 30
-	const HELD_30
-	const HELD_ATTACK_UP
-	const HELD_DEFENSE_UP
-	const HELD_SPEED_UP
-	const HELD_SP_ATTACK_UP
-	const HELD_SP_DEFENSE_UP
-	const HELD_ACCURACY_UP
-	const HELD_EVASION_UP
-	const HELD_38
-
-const_value SET 40
-	const HELD_40
-	const HELD_41
-	const HELD_METAL_POWDER
-
-const_value SET 50
-	const HELD_NORMAL_BOOST
-	const HELD_FIGHTING_BOOST
-	const HELD_FLYING_BOOST
-	const HELD_POISON_BOOST
-	const HELD_GROUND_BOOST
-	const HELD_ROCK_BOOST
-	const HELD_BUG_BOOST
-	const HELD_GHOST_BOOST
-	const HELD_FIRE_BOOST
-	const HELD_WATER_BOOST
-	const HELD_GRASS_BOOST
-	const HELD_ELECTRIC_BOOST
-	const HELD_PSYCHIC_BOOST
-	const HELD_ICE_BOOST
-	const HELD_DRAGON_BOOST
-	const HELD_DARK_BOOST
-	const HELD_STEEL_BOOST
-
-const_value SET 70
-	const HELD_CATCH_CHANCE
-	const HELD_71
-	const HELD_ESCAPE
-	const HELD_CRITICAL_UP
-	const HELD_QUICK_CLAW
-	const HELD_FLINCH
-	const HELD_AMULET_COIN
-	const HELD_BRIGHTPOWDER
-	const HELD_78
-	const HELD_FOCUS_BAND
-
-; item_attribute struct members (see data/items/item_attributes.asm)
-	const_def
-	const ITEMATTR_PRICE
-	const ITEMATTR_PRICE_HI
-	const ITEMATTR_EFFECT
-	const ITEMATTR_PARAM
-	const ITEMATTR_PERMISSIONS
-	const ITEMATTR_POCKET
-	const ITEMATTR_HELP
-ITEMATTR_STRUCT_LENGTH EQU const_value
-
-; item menu types
-ITEMMENU_NOUSE   EQU 0
-ITEMMENU_CURRENT EQU 4
-ITEMMENU_PARTY   EQU 5
-ITEMMENU_CLOSE   EQU 6
-
-; mart types (see engine/mart.asm)
-	const_def
-	const MARTTYPE_STANDARD
-	const MARTTYPE_BITTER
-	const MARTTYPE_BARGAIN
-	const MARTTYPE_PHARMACY
-	const MARTTYPE_ROOFTOP
-
-; Marts indexes (see data/items/marts.asm)
-	const_def
-	const MART_CHERRYGROVE
-	const MART_CHERRYGROVE_DEX
-	const MART_VIOLET
-	const MART_AZALEA
-	const MART_CIANWOOD
-	const MART_GOLDENROD_2F_1
-	const MART_GOLDENROD_2F_2
-	const MART_GOLDENROD_3F
-	const MART_GOLDENROD_4F
-	const MART_GOLDENROD_5F_1
-	const MART_GOLDENROD_5F_2
-	const MART_GOLDENROD_5F_3
-	const MART_GOLDENROD_5F_4
-	const MART_OLIVINE
-	const MART_ECRUTEAK
-	const MART_MAHOGANY_1
-	const MART_MAHOGANY_2
-	const MART_BLACKTHORN
-	const MART_VIRIDIAN
-	const MART_PEWTER
-	const MART_CERULEAN
-	const MART_LAVENDER
-	const MART_VERMILION
-	const MART_CELADON_2F_1
-	const MART_CELADON_2F_2
-	const MART_CELADON_3F
-	const MART_CELADON_4F
-	const MART_CELADON_5F_1
-	const MART_CELADON_5F_2
-	const MART_FUCHSIA
-	const MART_SAFFRON
-	const MART_MT_MOON
-	const MART_INDIGO_PLATEAU
-	const MART_UNDERGROUND
-
-; PartyMenuActionText values
-; GetPartyMenuTilemapPointers arguments (see engine/party_menu.asm)
-	const_def
-	const PARTYMENUACTION_CHOOSE_POKEMON
-	const PARTYMENUACTION_HEALING_ITEM
-	const PARTYMENUACTION_SWITCH
-	const PARTYMENUACTION_TEACH_TMHM
-	const PARTYMENUACTION_MOVE
-	const PARTYMENUACTION_EVO_STONE
-	const PARTYMENUACTION_GIVE_MON
-	const PARTYMENUACTION_GIVE_MON_FEMALE ; unused
-	const PARTYMENUACTION_GIVE_ITEM
-	const PARTYMENUACTION_MOBILE ; mobile
-; PrintPartyMenuActionText arguments (see engine/party_menu.asm)
-const_value set $f0
-	const PARTYMENUTEXT_HEAL_PSN
-	const PARTYMENUTEXT_HEAL_BRN
-	const PARTYMENUTEXT_HEAL_FRZ
-	const PARTYMENUTEXT_HEAL_SLP
-	const PARTYMENUTEXT_HEAL_PAR
-	const PARTYMENUTEXT_HEAL_HP
-	const PARTYMENUTEXT_HEAL_ALL
-	const PARTYMENUTEXT_REVIVE
-	const PARTYMENUTEXT_LEVEL_UP
-	const PARTYMENUTEXT_HEAL_CONFUSION
diff --git a/constants/item_data_constants.asm b/constants/item_data_constants.asm
new file mode 100644
index 000000000..4ef221840
--- /dev/null
+++ b/constants/item_data_constants.asm
@@ -0,0 +1,190 @@
+; item_attributes struct members (see data/items/attributes.asm)
+	const_def
+	const ITEMATTR_PRICE
+	const ITEMATTR_PRICE_HI
+	const ITEMATTR_EFFECT
+	const ITEMATTR_PARAM
+	const ITEMATTR_PERMISSIONS
+	const ITEMATTR_POCKET
+	const ITEMATTR_HELP
+ITEMATTR_STRUCT_LENGTH EQU const_value
+
+
+; pack pockets
+ITEM     EQU 1
+KEY_ITEM EQU 2
+BALL     EQU 3
+TM_HM    EQU 4
+
+; pack pocket sizes
+MAX_ITEMS     EQU 20
+MAX_KEY_ITEMS EQU 25
+MAX_BALLS     EQU 12
+MAX_PC_ITEMS  EQU 50
+
+
+; item menu types
+ITEMMENU_NOUSE   EQU 0
+ITEMMENU_CURRENT EQU 4
+ITEMMENU_PARTY   EQU 5
+ITEMMENU_CLOSE   EQU 6
+
+; item actions
+CANT_SELECT EQU 1 << 6
+CANT_TOSS   EQU 1 << 7
+
+
+; mail
+MAIL_MSG_LENGTH    EQU $20
+MAILBOX_CAPACITY   EQU 10
+MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct
+
+
+; held item effects
+	const_def
+	const HELD_NONE
+	const HELD_BERRY
+	const HELD_2
+	const HELD_LEFTOVERS
+	const HELD_4
+	const HELD_5
+	const HELD_RESTORE_PP
+	const HELD_7
+	const HELD_CLEANSE_TAG
+
+const_value SET 10
+	const HELD_HEAL_POISON
+	const HELD_HEAL_FREEZE
+	const HELD_HEAL_BURN
+	const HELD_HEAL_SLEEP
+	const HELD_HEAL_PARALYZE
+	const HELD_HEAL_STATUS
+	const HELD_HEAL_CONFUSION
+
+const_value SET 20
+	const HELD_PREVENT_POISON
+	const HELD_PREVENT_BURN
+	const HELD_PREVENT_FREEZE
+	const HELD_PREVENT_SLEEP
+	const HELD_PREVENT_PARALYZE
+	const HELD_PREVENT_CONFUSE
+
+const_value SET 30
+	const HELD_30
+	const HELD_ATTACK_UP
+	const HELD_DEFENSE_UP
+	const HELD_SPEED_UP
+	const HELD_SP_ATTACK_UP
+	const HELD_SP_DEFENSE_UP
+	const HELD_ACCURACY_UP
+	const HELD_EVASION_UP
+	const HELD_38
+
+const_value SET 40
+	const HELD_40
+	const HELD_41
+	const HELD_METAL_POWDER
+
+const_value SET 50
+	const HELD_NORMAL_BOOST
+	const HELD_FIGHTING_BOOST
+	const HELD_FLYING_BOOST
+	const HELD_POISON_BOOST
+	const HELD_GROUND_BOOST
+	const HELD_ROCK_BOOST
+	const HELD_BUG_BOOST
+	const HELD_GHOST_BOOST
+	const HELD_FIRE_BOOST
+	const HELD_WATER_BOOST
+	const HELD_GRASS_BOOST
+	const HELD_ELECTRIC_BOOST
+	const HELD_PSYCHIC_BOOST
+	const HELD_ICE_BOOST
+	const HELD_DRAGON_BOOST
+	const HELD_DARK_BOOST
+	const HELD_STEEL_BOOST
+
+const_value SET 70
+	const HELD_CATCH_CHANCE
+	const HELD_71
+	const HELD_ESCAPE
+	const HELD_CRITICAL_UP
+	const HELD_QUICK_CLAW
+	const HELD_FLINCH
+	const HELD_AMULET_COIN
+	const HELD_BRIGHTPOWDER
+	const HELD_78
+	const HELD_FOCUS_BAND
+
+
+; mart types (see engine/mart.asm)
+	const_def
+	const MARTTYPE_STANDARD
+	const MARTTYPE_BITTER
+	const MARTTYPE_BARGAIN
+	const MARTTYPE_PHARMACY
+	const MARTTYPE_ROOFTOP
+
+; Marts indexes (see data/items/marts.asm)
+	const_def
+	const MART_CHERRYGROVE
+	const MART_CHERRYGROVE_DEX
+	const MART_VIOLET
+	const MART_AZALEA
+	const MART_CIANWOOD
+	const MART_GOLDENROD_2F_1
+	const MART_GOLDENROD_2F_2
+	const MART_GOLDENROD_3F
+	const MART_GOLDENROD_4F
+	const MART_GOLDENROD_5F_1
+	const MART_GOLDENROD_5F_2
+	const MART_GOLDENROD_5F_3
+	const MART_GOLDENROD_5F_4
+	const MART_OLIVINE
+	const MART_ECRUTEAK
+	const MART_MAHOGANY_1
+	const MART_MAHOGANY_2
+	const MART_BLACKTHORN
+	const MART_VIRIDIAN
+	const MART_PEWTER
+	const MART_CERULEAN
+	const MART_LAVENDER
+	const MART_VERMILION
+	const MART_CELADON_2F_1
+	const MART_CELADON_2F_2
+	const MART_CELADON_3F
+	const MART_CELADON_4F
+	const MART_CELADON_5F_1
+	const MART_CELADON_5F_2
+	const MART_FUCHSIA
+	const MART_SAFFRON
+	const MART_MT_MOON
+	const MART_INDIGO_PLATEAU
+	const MART_UNDERGROUND
+
+
+; PartyMenuActionText values
+; GetPartyMenuTilemapPointers arguments (see engine/party_menu.asm)
+	const_def
+	const PARTYMENUACTION_CHOOSE_POKEMON
+	const PARTYMENUACTION_HEALING_ITEM
+	const PARTYMENUACTION_SWITCH
+	const PARTYMENUACTION_TEACH_TMHM
+	const PARTYMENUACTION_MOVE
+	const PARTYMENUACTION_EVO_STONE
+	const PARTYMENUACTION_GIVE_MON
+	const PARTYMENUACTION_GIVE_MON_FEMALE ; unused
+	const PARTYMENUACTION_GIVE_ITEM
+	const PARTYMENUACTION_MOBILE ; mobile
+; PrintPartyMenuActionText arguments (see engine/party_menu.asm)
+const_value set $f0
+	const PARTYMENUTEXT_HEAL_PSN
+	const PARTYMENUTEXT_HEAL_BRN
+	const PARTYMENUTEXT_HEAL_FRZ
+	const PARTYMENUTEXT_HEAL_SLP
+	const PARTYMENUTEXT_HEAL_PAR
+	const PARTYMENUTEXT_HEAL_HP
+	const PARTYMENUTEXT_HEAL_ALL
+	const PARTYMENUTEXT_REVIVE
+	const PARTYMENUTEXT_LEVEL_UP
+	const PARTYMENUTEXT_HEAL_CONFUSION
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index 1af4215a1..7e3a628b1 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -1,287 +1,488 @@
-GROUP_N_A  EQU -1
-MAP_N_A    EQU -1
-GROUP_NONE EQU 0
-MAP_NONE   EQU 0
+newgroup: macro
+const_value = const_value + 1
+	enum_start 1
+endm
 
-; map header fields (see maps/map_headers.asm)
-	const_def
-	const MAPHEADER_MAPHEADER2_BANK ; 0
-	const MAPHEADER_TILESET         ; 1
-	const MAPHEADER_ENVIRONMENT     ; 2
-	const MAPHEADER_MAPHEADER2      ; 3
-	const MAPHEADER_MAPHEADER2_HI   ; 4
-	const MAPHEADER_LOCATION        ; 5
-	const MAPHEADER_MUSIC           ; 6
-	const MAPHEADER_PALETTE         ; 7
-	const MAPHEADER_FISHGROUP       ; 8
-NUM_MAPHEADER_ATTRIBUTES EQU const_value
-
-; map environments (wEnvironment)
-const_value SET 1
-	const TOWN
-	const ROUTE
-	const INDOOR
-	const CAVE
-	const ENVIRONMENT_5
-	const GATE
-	const DUNGEON
-
-; map palettes (wEnvironment)
-	const_def
-	const PALETTE_AUTO
-	const PALETTE_DAY
-	const PALETTE_NITE
-	const PALETTE_MORN
-	const PALETTE_DARK
+mapgroup: macro
+;\1: map id
+;\2: height: in blocks
+;\3: width: in blocks
+GROUP_\1 EQU const_value
+	enum MAP_\1
+\1_HEIGHT EQU \2
+\1_WIDTH EQU \3
+endm
 
-; fish groups 
+; map group ids
+; `newgroup` indexes are for:
+; - MapGroupPointers (see maps/map_headers.asm)
+; - MapGroupRoofs (see data/maps/roofs.asm)
+; - OutdoorSprites (see data/maps/outdoor_sprites.asm)
+; `mapgroup` indexes are for the sub-tables of MapGroupPointers (see maps/map_headers.asm)
 	const_def
-	const FISHGROUP_NONE
-	const FISHGROUP_SHORE
-	const FISHGROUP_OCEAN
-	const FISHGROUP_LAKE
-	const FISHGROUP_POND
-	const FISHGROUP_DRATINI
-	const FISHGROUP_QWILFISH_SWARM
-	const FISHGROUP_REMORAID_SWARM
-	const FISHGROUP_GYARADOS
-	const FISHGROUP_DRATINI_2
-	const FISHGROUP_WHIRL_ISLANDS
-	const FISHGROUP_QWILFISH
-	const FISHGROUP_REMORAID
-	const FISHGROUP_QWILFISH_NO_SWARM
-
-
-; connection directions
-	const_def
-	const EAST_F
-	const WEST_F
-	const SOUTH_F
-	const NORTH_F
 
-; MapConnections
-	const_def
-	shift_const EAST
-	shift_const WEST
-	shift_const SOUTH
-	shift_const NORTH
+	newgroup                                                    ;  1
 
+	mapgroup OLIVINE_POKECENTER_1F,                        4,  5 ;  1
+	mapgroup OLIVINE_GYM,                                  8,  5 ;  2
+	mapgroup OLIVINE_TIMS_HOUSE,                           4,  4 ;  3
+	mapgroup OLIVINE_HOUSE_BETA,                           4,  4 ;  4
+	mapgroup OLIVINE_PUNISHMENT_SPEECH_HOUSE,              4,  4 ;  5
+	mapgroup OLIVINE_GOOD_ROD_HOUSE,                       4,  4 ;  6
+	mapgroup OLIVINE_CAFE,                                 4,  4 ;  7
+	mapgroup OLIVINE_MART,                                 4,  6 ;  8
+	mapgroup ROUTE_38_ECRUTEAK_GATE,                       4,  5 ;  9
+	mapgroup ROUTE_39_BARN,                                4,  4 ; 10
+	mapgroup ROUTE_39_FARMHOUSE,                           4,  4 ; 11
+	mapgroup ROUTE_38,                                     9, 20 ; 12
+	mapgroup ROUTE_39,                                    18, 10 ; 13
+	mapgroup OLIVINE_CITY,                                18, 20 ; 14
 
-; object_struct members (see macros/wram.asm)
-	const_def
-	const OBJECT_SPRITE              ; 00
-	const OBJECT_MAP_OBJECT_INDEX    ; 01
-	const OBJECT_SPRITE_TILE         ; 02
-	const OBJECT_MOVEMENTTYPE        ; 03
-	const OBJECT_FLAGS1              ; 04
-	const OBJECT_FLAGS2              ; 05
-	const OBJECT_PALETTE             ; 06
-	const OBJECT_DIRECTION_WALKING   ; 07
-	const OBJECT_FACING              ; 08
-	const OBJECT_STEP_TYPE           ; 09
-	const OBJECT_STEP_DURATION       ; 0a
-	const OBJECT_ACTION              ; 0b
-	const OBJECT_STEP_FRAME          ; 0c
-	const OBJECT_FACING_STEP         ; 0d
-	const OBJECT_NEXT_TILE           ; 0e
-	const OBJECT_STANDING_TILE       ; 0f
-	const OBJECT_NEXT_MAP_X          ; 10
-	const OBJECT_NEXT_MAP_Y          ; 11
-	const OBJECT_MAP_X               ; 12
-	const OBJECT_MAP_Y               ; 13
-	const OBJECT_INIT_X              ; 14
-	const OBJECT_INIT_Y              ; 15
-	const OBJECT_RADIUS              ; 16
-	const OBJECT_SPRITE_X            ; 17
-	const OBJECT_SPRITE_Y            ; 18
-	const OBJECT_SPRITE_X_OFFSET     ; 19
-	const OBJECT_SPRITE_Y_OFFSET     ; 1a
-	const OBJECT_MOVEMENT_BYTE_INDEX ; 1b
-	const OBJECT_28                  ; 1c
-	const OBJECT_29                  ; 1d
-	const OBJECT_30                  ; 1e
-	const OBJECT_31                  ; 1f
-	const OBJECT_RANGE               ; 20
-; 33-39 are not used
-
-; map_object struct members (see macros/wram.asm)
-	const_def
-	const MAPOBJECT_OBJECT_STRUCT_ID ; 0
-	const MAPOBJECT_SPRITE ; 1
-	const MAPOBJECT_Y_COORD ; 2
-	const MAPOBJECT_X_COORD ; 3
-	const MAPOBJECT_MOVEMENT ; 4
-	const MAPOBJECT_RADIUS ; 5
-	const MAPOBJECT_HOUR ; 6
-	const MAPOBJECT_TIMEOFDAY ; 7
-	const MAPOBJECT_COLOR ; 8
-	const MAPOBJECT_RANGE ; 9
-	const MAPOBJECT_SCRIPT_POINTER ; a
-	const MAPOBJECT_POINTER_HI ; b
-	const MAPOBJECT_EVENT_FLAG ; c
-	const MAPOBJECT_FLAG_HI ; d
-	const MAPOBJECT_E ; unused
-	const MAPOBJECT_F ; unused
-OBJECT_LENGTH EQU const_value
-
-MAPOBJECT_SCREEN_HEIGHT EQU 11
-MAPOBJECT_SCREEN_WIDTH EQU 12
-
-; object_struct OBJECT_FACING values
-OW_DOWN  EQU DOWN  << 2
-OW_UP    EQU UP    << 2
-OW_LEFT  EQU LEFT  << 2
-OW_RIGHT EQU RIGHT << 2
-
-; object_struct OBJECT_FLAGS1 bit flags
-INVISIBLE    EQU 0
-FIXED_FACING EQU 2
-SLIDING      EQU 3
-EMOTE_OBJECT EQU 7
-
-
-; SpawnPoints indexes (see data/maps/spawn_points.asm)
-const_value = -1
-	const SPAWN_N_A
-	const SPAWN_HOME
-	const SPAWN_DEBUG
-; kanto
-	const SPAWN_PALLET
-	const SPAWN_VIRIDIAN
-	const SPAWN_PEWTER
-	const SPAWN_CERULEAN
-	const SPAWN_ROCK_TUNNEL
-	const SPAWN_VERMILION
-	const SPAWN_LAVENDER
-	const SPAWN_SAFFRON
-	const SPAWN_CELADON
-	const SPAWN_FUCHSIA
-	const SPAWN_CINNABAR
-	const SPAWN_INDIGO
-; johto
-	const SPAWN_NEW_BARK
-	const SPAWN_CHERRYGROVE
-	const SPAWN_VIOLET
-	const SPAWN_UNION_CAVE
-	const SPAWN_AZALEA
-	const SPAWN_CIANWOOD
-	const SPAWN_GOLDENROD
-	const SPAWN_OLIVINE
-	const SPAWN_ECRUTEAK
-	const SPAWN_MAHOGANY
-	const SPAWN_LAKE
-	const SPAWN_BLACKTHORN
-	const SPAWN_MT_SILVER
-	const SPAWN_FAST_SHIP
-NUM_SPAWNS EQU const_value
-
-
-; TryBGEvent arguments (see engine/events.asm)
-	const_def
-	const BGEVENT_READ
-	const BGEVENT_UP
-	const BGEVENT_DOWN
-	const BGEVENT_RIGHT
-	const BGEVENT_LEFT
-	const BGEVENT_IFSET
-	const BGEVENT_IFNOTSET
-	const BGEVENT_ITEM
-	const BGEVENT_COPY
-
-; object_event types
-; TryObjectEvent arguments (see engine/events.asm)
-	const_def
-	const OBJECTTYPE_SCRIPT
-	const OBJECTTYPE_ITEMBALL
-	const OBJECTTYPE_TRAINER
-	const OBJECTTYPE_3
-	const OBJECTTYPE_4
-	const OBJECTTYPE_5
-	const OBJECTTYPE_6
+	newgroup                                                    ;  2
 
+	mapgroup MAHOGANY_RED_GYARADOS_SPEECH_HOUSE,           4,  4 ;  1
+	mapgroup MAHOGANY_GYM,                                 9,  5 ;  2
+	mapgroup MAHOGANY_POKECENTER_1F,                       4,  5 ;  3
+	mapgroup ROUTE_42_ECRUTEAK_GATE,                       4,  5 ;  4
+	mapgroup ROUTE_42,                                     9, 30 ;  5
+	mapgroup ROUTE_44,                                     9, 30 ;  6
+	mapgroup MAHOGANY_TOWN,                                9, 10 ;  7
 
-; EmotesPointers indexes (see engine/overworld.asm)
-	const_def
-	const EMOTE_SHOCK ; 0
-	const EMOTE_QUESTION ; 1
-	const EMOTE_HAPPY ; 2
-	const EMOTE_SAD ; 3
-	const EMOTE_HEART ; 4
-	const EMOTE_BOLT ; 5
-	const EMOTE_SLEEP ; 6
-	const EMOTE_FISH ; 7
-	const EMOTE_SHADOW ; 8
-	const EMOTE_ROD ; 9
-	const EMOTE_BOULDER_DUST ; 10
-	const EMOTE_GRASS_RUSTLE ; 11
-EMOTE_MEM EQU -1
-
-; FruitTreeItems indexes (see data/items/fruit_trees.asm)
-const_value SET 1
-	const FRUITTREE_ROUTE_29      ; 01
-	const FRUITTREE_ROUTE_30_1    ; 02
-	const FRUITTREE_ROUTE_38      ; 03
-	const FRUITTREE_ROUTE_46_1    ; 04
-	const FRUITTREE_ROUTE_30_2    ; 05
-	const FRUITTREE_ROUTE_33      ; 06
-	const FRUITTREE_ROUTE_31      ; 07
-	const FRUITTREE_ROUTE_43      ; 08
-	const FRUITTREE_VIOLET_CITY   ; 09
-	const FRUITTREE_ROUTE_46_2    ; 0a
-	const FRUITTREE_ROUTE_35      ; 0b
-	const FRUITTREE_ROUTE_45      ; 0c
-	const FRUITTREE_ROUTE_36      ; 0d
-	const FRUITTREE_ROUTE_26      ; 0e
-	const FRUITTREE_ROUTE_39      ; 0f
-	const FRUITTREE_ROUTE_44      ; 10
-	const FRUITTREE_ROUTE_37_1    ; 11
-	const FRUITTREE_ROUTE_37_2    ; 12
-	const FRUITTREE_ROUTE_37_3    ; 13
-	const FRUITTREE_AZALEA_TOWN   ; 14
-	const FRUITTREE_ROUTE_42_1    ; 15
-	const FRUITTREE_ROUTE_42_2    ; 16
-	const FRUITTREE_ROUTE_42_3    ; 17
-	const FRUITTREE_ROUTE_11      ; 18
-	const FRUITTREE_ROUTE_2       ; 19
-	const FRUITTREE_ROUTE_1       ; 1a
-	const FRUITTREE_ROUTE_8       ; 1b
-	const FRUITTREE_PEWTER_CITY_1 ; 1c
-	const FRUITTREE_PEWTER_CITY_2 ; 1d
-	const FRUITTREE_FUCHSIA_CITY  ; 1e
-NUM_FRUIT_TREES EQU const_value +- 1
-
-; elevator floors
-; used by `elevfloor`
-	const_def
-	const FLOOR_B4F
-	const FLOOR_B3F
-	const FLOOR_B2F
-	const FLOOR_B1F
-	const FLOOR_1F
-	const FLOOR_2F
-	const FLOOR_3F
-	const FLOOR_4F
-	const FLOOR_5F
-	const FLOOR_6F
-	const FLOOR_7F
-	const FLOOR_8F
-	const FLOOR_9F
-	const FLOOR_10F
-	const FLOOR_11F
-	const FLOOR_ROOF
-
-; command queue members
-CMDQUEUE_TYPE  EQU 0
-CMDQUEUE_ADDR  EQU 1
-CMDQUEUE_03    EQU 3
-CMDQUEUE_04    EQU 4
-CMDQUEUE_05    EQU 5
-CMDQUEUE_ENTRY_SIZE EQU 6
-CMDQUEUE_CAPACITY EQU 4
-
-; command queue types
-CMDQUEUE_STONETABLE EQU 2
-
-; see engine/overworld.asm
-MAX_OUTDOOR_SPRITES EQU 23
-SPRITE_GFX_LIST_CAPACITY EQU $20
+	newgroup                                                    ;  3
+
+	mapgroup SPROUT_TOWER_1F,                              8, 10 ;  1
+	mapgroup SPROUT_TOWER_2F,                              8, 10 ;  2
+	mapgroup SPROUT_TOWER_3F,                              8, 10 ;  3
+	mapgroup TIN_TOWER_1F,                                 9, 10 ;  4
+	mapgroup TIN_TOWER_2F,                                 9, 10 ;  5
+	mapgroup TIN_TOWER_3F,                                 9, 10 ;  6
+	mapgroup TIN_TOWER_4F,                                 9, 10 ;  7
+	mapgroup TIN_TOWER_5F,                                 9, 10 ;  8
+	mapgroup TIN_TOWER_6F,                                 9, 10 ;  9
+	mapgroup TIN_TOWER_7F,                                 9, 10 ; 10
+	mapgroup TIN_TOWER_8F,                                 9, 10 ; 11
+	mapgroup TIN_TOWER_9F,                                 9, 10 ; 12
+	mapgroup BURNED_TOWER_1F,                              9, 10 ; 13
+	mapgroup BURNED_TOWER_B1F,                             9, 10 ; 14
+	mapgroup NATIONAL_PARK,                               27, 20 ; 15
+	mapgroup NATIONAL_PARK_BUG_CONTEST,                   27, 20 ; 16
+	mapgroup RADIO_TOWER_1F,                               4,  9 ; 17
+	mapgroup RADIO_TOWER_2F,                               4,  9 ; 18
+	mapgroup RADIO_TOWER_3F,                               4,  9 ; 19
+	mapgroup RADIO_TOWER_4F,                               4,  9 ; 20
+	mapgroup RADIO_TOWER_5F,                               4,  9 ; 21
+	mapgroup RUINS_OF_ALPH_OUTSIDE,                       18, 10 ; 22
+	mapgroup RUINS_OF_ALPH_HO_OH_CHAMBER,                  5,  4 ; 23
+	mapgroup RUINS_OF_ALPH_KABUTO_CHAMBER,                 5,  4 ; 24
+	mapgroup RUINS_OF_ALPH_OMANYTE_CHAMBER,                5,  4 ; 25
+	mapgroup RUINS_OF_ALPH_AERODACTYL_CHAMBER,             5,  4 ; 26
+	mapgroup RUINS_OF_ALPH_INNER_CHAMBER,                 14, 10 ; 27
+	mapgroup RUINS_OF_ALPH_RESEARCH_CENTER,                4,  4 ; 28
+	mapgroup RUINS_OF_ALPH_HO_OH_ITEM_ROOM,                5,  4 ; 29
+	mapgroup RUINS_OF_ALPH_KABUTO_ITEM_ROOM,               5,  4 ; 30
+	mapgroup RUINS_OF_ALPH_OMANYTE_ITEM_ROOM,              5,  4 ; 31
+	mapgroup RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM,           5,  4 ; 32
+	mapgroup RUINS_OF_ALPH_HO_OH_WORD_ROOM,               12, 10 ; 33
+	mapgroup RUINS_OF_ALPH_KABUTO_WORD_ROOM,               7, 10 ; 34
+	mapgroup RUINS_OF_ALPH_OMANYTE_WORD_ROOM,              8, 10 ; 35
+	mapgroup RUINS_OF_ALPH_AERODACTYL_WORD_ROOM,           7, 10 ; 36
+	mapgroup UNION_CAVE_1F,                               18, 10 ; 37
+	mapgroup UNION_CAVE_B1F,                              18, 10 ; 38
+	mapgroup UNION_CAVE_B2F,                              18, 10 ; 39
+	mapgroup SLOWPOKE_WELL_B1F,                            9, 10 ; 40
+	mapgroup SLOWPOKE_WELL_B2F,                            9, 10 ; 41
+	mapgroup OLIVINE_LIGHTHOUSE_1F,                        9, 10 ; 42
+	mapgroup OLIVINE_LIGHTHOUSE_2F,                        9, 10 ; 43
+	mapgroup OLIVINE_LIGHTHOUSE_3F,                        9, 10 ; 44
+	mapgroup OLIVINE_LIGHTHOUSE_4F,                        9, 10 ; 45
+	mapgroup OLIVINE_LIGHTHOUSE_5F,                        9, 10 ; 46
+	mapgroup OLIVINE_LIGHTHOUSE_6F,                        9, 10 ; 47
+	mapgroup MAHOGANY_MART_1F,                             4,  4 ; 48
+	mapgroup TEAM_ROCKET_BASE_B1F,                         9, 15 ; 49
+	mapgroup TEAM_ROCKET_BASE_B2F,                         9, 15 ; 50
+	mapgroup TEAM_ROCKET_BASE_B3F,                         9, 15 ; 51
+	mapgroup ILEX_FOREST,                                 27, 15 ; 52
+	mapgroup GOLDENROD_UNDERGROUND,                       18, 15 ; 53
+	mapgroup GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 18, 15 ; 54
+	mapgroup GOLDENROD_DEPT_STORE_B1F,                     9, 10 ; 55
+	mapgroup GOLDENROD_UNDERGROUND_WAREHOUSE,              9, 10 ; 56
+	mapgroup MOUNT_MORTAR_1F_OUTSIDE,                     18, 20 ; 57
+	mapgroup MOUNT_MORTAR_1F_INSIDE,                      27, 20 ; 58
+	mapgroup MOUNT_MORTAR_2F_INSIDE,                      18, 20 ; 59
+	mapgroup MOUNT_MORTAR_B1F,                            18, 20 ; 60
+	mapgroup ICE_PATH_1F,                                 18, 20 ; 61
+	mapgroup ICE_PATH_B1F,                                18, 10 ; 62
+	mapgroup ICE_PATH_B2F_MAHOGANY_SIDE,                   9, 10 ; 63
+	mapgroup ICE_PATH_B2F_BLACKTHORN_SIDE,                 9,  5 ; 64
+	mapgroup ICE_PATH_B3F,                                 9, 10 ; 65
+	mapgroup WHIRL_ISLAND_NW,                              9,  5 ; 66
+	mapgroup WHIRL_ISLAND_NE,                              9, 10 ; 67
+	mapgroup WHIRL_ISLAND_SW,                              9, 10 ; 68
+	mapgroup WHIRL_ISLAND_CAVE,                            9,  5 ; 69
+	mapgroup WHIRL_ISLAND_SE,                              9,  5 ; 70
+	mapgroup WHIRL_ISLAND_B1F,                            18, 20 ; 71
+	mapgroup WHIRL_ISLAND_B2F,                            18, 10 ; 72
+	mapgroup WHIRL_ISLAND_LUGIA_CHAMBER,                   9, 10 ; 73
+	mapgroup SILVER_CAVE_ROOM_1,                          18, 10 ; 74
+	mapgroup SILVER_CAVE_ROOM_2,                          18, 15 ; 75
+	mapgroup SILVER_CAVE_ROOM_3,                          18, 10 ; 76
+	mapgroup SILVER_CAVE_ITEM_ROOMS,                       9, 10 ; 77
+	mapgroup DARK_CAVE_VIOLET_ENTRANCE,                   18, 20 ; 78
+	mapgroup DARK_CAVE_BLACKTHORN_ENTRANCE,               18, 15 ; 79
+	mapgroup DRAGONS_DEN_1F,                               9,  5 ; 80
+	mapgroup DRAGONS_DEN_B1F,                             18, 20 ; 81
+	mapgroup DRAGON_SHRINE,                                5,  5 ; 82
+	mapgroup TOHJO_FALLS,                                  9, 15 ; 83
+	mapgroup DIGLETTS_CAVE,                               18, 10 ; 84
+	mapgroup MOUNT_MOON,                                   9, 15 ; 85
+	mapgroup UNDERGROUND_PATH,                            14,  3 ; 86
+	mapgroup ROCK_TUNNEL_1F,                              18, 15 ; 87
+	mapgroup ROCK_TUNNEL_B1F,                             18, 15 ; 88
+	mapgroup SAFARI_ZONE_FUCHSIA_GATE_BETA,                4,  5 ; 89
+	mapgroup SAFARI_ZONE_BETA,                            18, 10 ; 90
+	mapgroup VICTORY_ROAD,                                36, 10 ; 91
+
+	newgroup                                                    ;  4
+
+	mapgroup ECRUTEAK_HOUSE,                               9, 10 ;  1
+	mapgroup WISE_TRIOS_ROOM,                              4,  4 ;  2
+	mapgroup ECRUTEAK_POKECENTER_1F,                       4,  5 ;  3
+	mapgroup ECRUTEAK_LUGIA_SPEECH_HOUSE,                  4,  4 ;  4
+	mapgroup DANCE_THEATRE,                                7,  6 ;  5
+	mapgroup ECRUTEAK_MART,                                4,  6 ;  6
+	mapgroup ECRUTEAK_GYM,                                 9,  5 ;  7
+	mapgroup ECRUTEAK_ITEMFINDER_HOUSE,                    4,  4 ;  8
+	mapgroup ECRUTEAK_CITY,                               18, 20 ;  9
+
+	newgroup                                                    ;  5
+
+	mapgroup BLACKTHORN_GYM_1F,                            9,  5 ;  1
+	mapgroup BLACKTHORN_GYM_2F,                            9,  5 ;  2
+	mapgroup BLACKTHORN_DRAGON_SPEECH_HOUSE,               4,  4 ;  3
+	mapgroup BLACKTHORN_EMYS_HOUSE,                        4,  4 ;  4
+	mapgroup BLACKTHORN_MART,                              4,  6 ;  5
+	mapgroup BLACKTHORN_POKECENTER_1F,                     4,  5 ;  6
+	mapgroup MOVE_DELETERS_HOUSE,                          4,  4 ;  7
+	mapgroup ROUTE_45,                                    45, 10 ;  8
+	mapgroup ROUTE_46,                                    18, 10 ;  9
+	mapgroup BLACKTHORN_CITY,                             18, 20 ; 10
+
+	newgroup                                                    ;  6
+
+	mapgroup CINNABAR_POKECENTER_1F,                       4,  5 ;  1
+	mapgroup CINNABAR_POKECENTER_2F_BETA,                  4,  8 ;  2
+	mapgroup ROUTE_19___FUCHSIA_GATE,                      4,  5 ;  3
+	mapgroup SEAFOAM_GYM,                                  4,  5 ;  4
+	mapgroup ROUTE_19,                                    18, 10 ;  5
+	mapgroup ROUTE_20,                                     9, 30 ;  6
+	mapgroup ROUTE_21,                                    18, 10 ;  7
+	mapgroup CINNABAR_ISLAND,                              9, 10 ;  8
+
+	newgroup                                                    ;  7
+
+	mapgroup CERULEAN_GYM_BADGE_SPEECH_HOUSE,              4,  4 ;  1
+	mapgroup CERULEAN_POLICE_STATION,                      4,  4 ;  2
+	mapgroup CERULEAN_TRADE_SPEECH_HOUSE,                  4,  4 ;  3
+	mapgroup CERULEAN_POKECENTER_1F,                       4,  5 ;  4
+	mapgroup CERULEAN_POKECENTER_2F_BETA,                  4,  8 ;  5
+	mapgroup CERULEAN_GYM,                                 8,  5 ;  6
+	mapgroup CERULEAN_MART,                                4,  6 ;  7
+	mapgroup ROUTE_10_POKECENTER_1F,                       4,  5 ;  8
+	mapgroup ROUTE_10_POKECENTER_2F_BETA,                  4,  8 ;  9
+	mapgroup POWER_PLANT,                                  9, 10 ; 10
+	mapgroup BILLS_HOUSE,                                  4,  4 ; 11
+	mapgroup ROUTE_4,                                      9, 20 ; 12
+	mapgroup ROUTE_9,                                      9, 30 ; 13
+	mapgroup ROUTE_10_NORTH,                               9, 10 ; 14
+	mapgroup ROUTE_24,                                     9, 10 ; 15
+	mapgroup ROUTE_25,                                     9, 30 ; 16
+	mapgroup CERULEAN_CITY,                               18, 20 ; 17
+
+	newgroup                                                    ;  8
+
+	mapgroup AZALEA_POKECENTER_1F,                         4,  5 ;  1
+	mapgroup CHARCOAL_KILN,                                4,  4 ;  2
+	mapgroup AZALEA_MART,                                  4,  6 ;  3
+	mapgroup KURTS_HOUSE,                                  4,  8 ;  4
+	mapgroup AZALEA_GYM,                                   8,  5 ;  5
+	mapgroup ROUTE_33,                                     9, 10 ;  6
+	mapgroup AZALEA_TOWN,                                  9, 20 ;  7
+
+	newgroup                                                    ;  9
+
+	mapgroup LAKE_OF_RAGE_HIDDEN_POWER_HOUSE,              4,  4 ;  1
+	mapgroup LAKE_OF_RAGE_MAGIKARP_HOUSE,                  4,  4 ;  2
+	mapgroup ROUTE_43_MAHOGANY_GATE,                       4,  5 ;  3
+	mapgroup ROUTE_43_GATE,                                4,  5 ;  4
+	mapgroup ROUTE_43,                                    27, 10 ;  5
+	mapgroup LAKE_OF_RAGE,                                18, 20 ;  6
+
+	newgroup                                                    ; 10
+
+	mapgroup ROUTE_32,                                    45, 10 ;  1
+	mapgroup ROUTE_35,                                    18, 10 ;  2
+	mapgroup ROUTE_36,                                     9, 30 ;  3
+	mapgroup ROUTE_37,                                     9, 10 ;  4
+	mapgroup VIOLET_CITY,                                 18, 20 ;  5
+	mapgroup VIOLET_MART,                                  4,  6 ;  6
+	mapgroup VIOLET_GYM,                                   8,  5 ;  7
+	mapgroup EARLS_POKEMON_ACADEMY,                        8,  4 ;  8
+	mapgroup VIOLET_NICKNAME_SPEECH_HOUSE,                 4,  4 ;  9
+	mapgroup VIOLET_POKECENTER_1F,                         4,  5 ; 10
+	mapgroup VIOLET_KYLES_HOUSE,                           4,  4 ; 11
+	mapgroup ROUTE_32_RUINS_OF_ALPH_GATE,                  4,  5 ; 12
+	mapgroup ROUTE_32_POKECENTER_1F,                       4,  5 ; 13
+	mapgroup ROUTE_35_GOLDENROD_GATE,                      4,  5 ; 14
+	mapgroup ROUTE_35_NATIONAL_PARK_GATE,                  4,  4 ; 15
+	mapgroup ROUTE_36_RUINS_OF_ALPH_GATE,                  4,  5 ; 16
+	mapgroup ROUTE_36_NATIONAL_PARK_GATE,                  4,  5 ; 17
+
+	newgroup                                                    ; 11
+
+	mapgroup ROUTE_34,                                    27, 10 ;  1
+	mapgroup GOLDENROD_CITY,                              18, 20 ;  2
+	mapgroup GOLDENROD_GYM,                                9, 10 ;  3
+	mapgroup GOLDENROD_BIKE_SHOP,                          4,  4 ;  4
+	mapgroup GOLDENROD_HAPPINESS_RATER,                    4,  4 ;  5
+	mapgroup GOLDENROD_BILLS_HOUSE,                        4,  4 ;  6
+	mapgroup GOLDENROD_MAGNET_TRAIN_STATION,               9, 10 ;  7
+	mapgroup GOLDENROD_FLOWER_SHOP,                        4,  4 ;  8
+	mapgroup GOLDENROD_PP_SPEECH_HOUSE,                    4,  4 ;  9
+	mapgroup GOLDENROD_NAME_RATER,                         4,  4 ; 10
+	mapgroup GOLDENROD_DEPT_STORE_1F,                      4,  8 ; 11
+	mapgroup GOLDENROD_DEPT_STORE_2F,                      4,  8 ; 12
+	mapgroup GOLDENROD_DEPT_STORE_3F,                      4,  8 ; 13
+	mapgroup GOLDENROD_DEPT_STORE_4F,                      4,  8 ; 14
+	mapgroup GOLDENROD_DEPT_STORE_5F,                      4,  8 ; 15
+	mapgroup GOLDENROD_DEPT_STORE_6F,                      4,  8 ; 16
+	mapgroup GOLDENROD_DEPT_STORE_ELEVATOR,                2,  2 ; 17
+	mapgroup GOLDENROD_DEPT_STORE_ROOF,                    4,  8 ; 18
+	mapgroup GOLDENROD_GAME_CORNER,                        7, 10 ; 19
+	mapgroup GOLDENROD_POKECENTER_1F,                      4,  5 ; 20
+	mapgroup GOLDENROD_POKECOM_CENTER_2F_MOBILE,          16, 16 ; 21
+	mapgroup ILEX_FOREST_AZALEA_GATE,                      4,  5 ; 22
+	mapgroup ROUTE_34_ILEX_FOREST_GATE,                    4,  5 ; 23
+	mapgroup DAY_CARE,                                     4,  5 ; 24
+
+	newgroup                                                    ; 12
+
+	mapgroup ROUTE_6,                                      9, 10 ;  1
+	mapgroup ROUTE_11,                                     9, 20 ;  2
+	mapgroup VERMILION_CITY,                              18, 20 ;  3
+	mapgroup VERMILION_HOUSE_FISHING_SPEECH_HOUSE,         4,  4 ;  4
+	mapgroup VERMILION_POKECENTER_1F,                      4,  5 ;  5
+	mapgroup VERMILION_POKECENTER_2F_BETA,                 4,  8 ;  6
+	mapgroup POKEMON_FAN_CLUB,                             4,  5 ;  7
+	mapgroup VERMILION_MAGNET_TRAIN_SPEECH_HOUSE,          4,  4 ;  8
+	mapgroup VERMILION_MART,                               4,  6 ;  9
+	mapgroup VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE,   4,  4 ; 10
+	mapgroup VERMILION_GYM,                                9,  5 ; 11
+	mapgroup ROUTE_6_SAFFRON_GATE,                         4,  5 ; 12
+	mapgroup ROUTE_6_UNDERGROUND_PATH_ENTRANCE,            4,  4 ; 13
+
+	newgroup                                                    ; 13
+
+	mapgroup ROUTE_1,                                     18, 10 ;  1
+	mapgroup PALLET_TOWN,                                  9, 10 ;  2
+	mapgroup REDS_HOUSE_1F,                                4,  4 ;  3
+	mapgroup REDS_HOUSE_2F,                                4,  4 ;  4
+	mapgroup BLUES_HOUSE,                                  4,  4 ;  5
+	mapgroup OAKS_LAB,                                     6,  5 ;  6
+
+	newgroup                                                    ; 14
+
+	mapgroup ROUTE_3,                                      9, 30 ;  1
+	mapgroup PEWTER_CITY,                                 18, 20 ;  2
+	mapgroup PEWTER_NIDORAN_SPEECH_HOUSE,                  4,  4 ;  3
+	mapgroup PEWTER_GYM,                                   7,  5 ;  4
+	mapgroup PEWTER_MART,                                  4,  6 ;  5
+	mapgroup PEWTER_POKECENTER_1F,                         4,  5 ;  6
+	mapgroup PEWTER_POKECENTER_2F_BETA,                    4,  8 ;  7
+	mapgroup PEWTER_SNOOZE_SPEECH_HOUSE,                   4,  4 ;  8
+
+	newgroup                                                    ; 15
+
+	mapgroup OLIVINE_PORT,                                18, 10 ;  1
+	mapgroup VERMILION_PORT,                              18, 10 ;  2
+	mapgroup FAST_SHIP_1F,                                 9, 16 ;  3
+	mapgroup FAST_SHIP_CABINS_NNW_NNE_NE,                 16,  4 ;  4
+	mapgroup FAST_SHIP_CABINS_SW_SSW_NW,                  16,  4 ;  5
+	mapgroup FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN,      17,  5 ;  6
+	mapgroup FAST_SHIP_B1F,                                8, 16 ;  7
+	mapgroup OLIVINE_PORT_PASSAGE,                         9, 10 ;  8
+	mapgroup VERMILION_PORT_PASSAGE,                       9, 10 ;  9
+	mapgroup MOUNT_MOON_SQUARE,                            9, 15 ; 10
+	mapgroup MOUNT_MOON_GIFT_SHOP,                         4,  4 ; 11
+	mapgroup TIN_TOWER_ROOF,                               9, 10 ; 12
+
+	newgroup                                                    ; 16
+
+	mapgroup ROUTE_23,                                     9, 10 ;  1
+	mapgroup INDIGO_PLATEAU_POKECENTER_1F,                 7,  9 ;  2
+	mapgroup WILLS_ROOM,                                   9,  5 ;  3
+	mapgroup KOGAS_ROOM,                                   9,  5 ;  4
+	mapgroup BRUNOS_ROOM,                                  9,  5 ;  5
+	mapgroup KARENS_ROOM,                                  9,  5 ;  6
+	mapgroup LANCES_ROOM,                                 12,  5 ;  7
+	mapgroup HALL_OF_FAME,                                 7,  5 ;  8
+
+	newgroup                                                    ; 17
+
+	mapgroup ROUTE_13,                                     9, 30 ;  1
+	mapgroup ROUTE_14,                                    18, 10 ;  2
+	mapgroup ROUTE_15,                                     9, 20 ;  3
+	mapgroup ROUTE_18,                                     9, 10 ;  4
+	mapgroup FUCHSIA_CITY,                                18, 20 ;  5
+	mapgroup FUCHSIA_MART,                                 4,  6 ;  6
+	mapgroup SAFARI_ZONE_MAIN_OFFICE,                      4,  4 ;  7
+	mapgroup FUCHSIA_GYM,                                  9,  5 ;  8
+	mapgroup FUCHSIA_BILL_SPEECH_HOUSE,                    4,  4 ;  9
+	mapgroup FUCHSIA_POKECENTER_1F,                        4,  5 ; 10
+	mapgroup FUCHSIA_POKECENTER_2F_BETA,                   4,  8 ; 11
+	mapgroup SAFARI_ZONE_WARDENS_HOME,                     4,  5 ; 12
+	mapgroup ROUTE_15_FUCHSIA_GATE,                        4,  5 ; 13
+
+	newgroup                                                    ; 18
+
+	mapgroup ROUTE_8,                                      9, 20 ;  1
+	mapgroup ROUTE_12,                                    27, 10 ;  2
+	mapgroup ROUTE_10_SOUTH,                               9, 10 ;  3
+	mapgroup LAVENDER_TOWN,                                9, 10 ;  4
+	mapgroup LAVENDER_POKECENTER_1F,                       4,  5 ;  5
+	mapgroup LAVENDER_POKECENTER_2F_BETA,                  4,  8 ;  6
+	mapgroup MR_FUJIS_HOUSE,                               4,  5 ;  7
+	mapgroup LAVENDER_TOWN_SPEECH_HOUSE,                   4,  4 ;  8
+	mapgroup LAVENDER_NAME_RATER,                          4,  4 ;  9
+	mapgroup LAVENDER_MART,                                4,  6 ; 10
+	mapgroup SOUL_HOUSE,                                   4,  5 ; 11
+	mapgroup LAV_RADIO_TOWER_1F,                           4, 10 ; 12
+	mapgroup ROUTE_8_SAFFRON_GATE,                         4,  5 ; 13
+	mapgroup ROUTE_12_SUPER_ROD_HOUSE,                     4,  4 ; 14
+
+	newgroup                                                    ; 19
+
+	mapgroup ROUTE_28,                                     9, 20 ;  1
+	mapgroup SILVER_CAVE_OUTSIDE,                         18, 20 ;  2
+	mapgroup SILVER_CAVE_POKECENTER_1F,                    4,  5 ;  3
+	mapgroup ROUTE_28_FAMOUS_SPEECH_HOUSE,                 4,  4 ;  4
+
+	newgroup                                                    ; 20
+
+	mapgroup POKECENTER_2F,                                4,  8 ;  1
+	mapgroup TRADE_CENTER,                                 4,  5 ;  2
+	mapgroup COLOSSEUM,                                    4,  5 ;  3
+	mapgroup TIME_CAPSULE,                                 4,  5 ;  4
+	mapgroup MOBILE_TRADE_ROOM_MOBILE,                     4,  5 ;  5
+	mapgroup MOBILE_BATTLE_ROOM,                           4,  5 ;  6
+
+	newgroup                                                    ; 21
+
+	mapgroup ROUTE_7,                                      9, 10 ;  1
+	mapgroup ROUTE_16,                                     9, 10 ;  2
+	mapgroup ROUTE_17,                                    45, 10 ;  3
+	mapgroup CELADON_CITY,                                18, 20 ;  4
+	mapgroup CELADON_DEPT_STORE_1F,                        4,  8 ;  5
+	mapgroup CELADON_DEPT_STORE_2F,                        4,  8 ;  6
+	mapgroup CELADON_DEPT_STORE_3F,                        4,  8 ;  7
+	mapgroup CELADON_DEPT_STORE_4F,                        4,  8 ;  8
+	mapgroup CELADON_DEPT_STORE_5F,                        4,  8 ;  9
+	mapgroup CELADON_DEPT_STORE_6F,                        4,  8 ; 10
+	mapgroup CELADON_DEPT_STORE_ELEVATOR,                  2,  2 ; 11
+	mapgroup CELADON_MANSION_1F,                           5,  4 ; 12
+	mapgroup CELADON_MANSION_2F,                           5,  4 ; 13
+	mapgroup CELADON_MANSION_3F,                           5,  4 ; 14
+	mapgroup CELADON_MANSION_ROOF,                         5,  4 ; 15
+	mapgroup CELADON_MANSION_ROOF_HOUSE,                   4,  4 ; 16
+	mapgroup CELADON_POKECENTER_1F,                        4,  5 ; 17
+	mapgroup CELADON_POKECENTER_2F_BETA,                   4,  8 ; 18
+	mapgroup CELADON_GAME_CORNER,                          7, 10 ; 19
+	mapgroup CELADON_GAME_CORNER_PRIZE_ROOM,               3,  3 ; 20
+	mapgroup CELADON_GYM,                                  9,  5 ; 21
+	mapgroup CELADON_CAFE,                                 4,  6 ; 22
+	mapgroup ROUTE_16_FUCHSIA_SPEECH_HOUSE,                4,  4 ; 23
+	mapgroup ROUTE_16_GATE,                                4,  5 ; 24
+	mapgroup ROUTE_7_SAFFRON_GATE,                         4,  5 ; 25
+	mapgroup ROUTE_17_18_GATE,                             4,  5 ; 26
+
+	newgroup                                                    ; 22
+
+	mapgroup ROUTE_40,                                    18, 10 ;  1
+	mapgroup ROUTE_41,                                    27, 25 ;  2
+	mapgroup CIANWOOD_CITY,                               27, 15 ;  3
+	mapgroup MANIAS_HOUSE,                                 4,  4 ;  4
+	mapgroup CIANWOOD_GYM,                                 9,  5 ;  5
+	mapgroup CIANWOOD_POKECENTER_1F,                       4,  5 ;  6
+	mapgroup CIANWOOD_PHARMACY,                            4,  4 ;  7
+	mapgroup CIANWOOD_CITY_PHOTO_STUDIO,                   4,  4 ;  8
+	mapgroup CIANWOOD_LUGIA_SPEECH_HOUSE,                  4,  4 ;  9
+	mapgroup POKE_SEERS_HOUSE,                             4,  4 ; 10
+	mapgroup BATTLE_TOWER_1F,                              5,  8 ; 11
+	mapgroup BATTLE_TOWER_BATTLE_ROOM,                     4,  4 ; 12
+	mapgroup BATTLE_TOWER_ELEVATOR,                        2,  2 ; 13
+	mapgroup BATTLE_TOWER_HALLWAY,                         2, 11 ; 14
+	mapgroup ROUTE_40_BATTLE_TOWER_GATE,                   4,  5 ; 15
+	mapgroup BATTLE_TOWER_OUTSIDE,                        14, 10 ; 16
+
+	newgroup                                                    ; 23
+
+	mapgroup ROUTE_2,                                     27, 10 ;  1
+	mapgroup ROUTE_22,                                     9, 20 ;  2
+	mapgroup VIRIDIAN_CITY,                               18, 20 ;  3
+	mapgroup VIRIDIAN_GYM,                                 9,  5 ;  4
+	mapgroup VIRIDIAN_NICKNAME_SPEECH_HOUSE,               4,  4 ;  5
+	mapgroup TRAINER_HOUSE_1F,                             7,  5 ;  6
+	mapgroup TRAINER_HOUSE_B1F,                            8,  5 ;  7
+	mapgroup VIRIDIAN_MART,                                4,  6 ;  8
+	mapgroup VIRIDIAN_POKECENTER_1F,                       4,  5 ;  9
+	mapgroup VIRIDIAN_POKECENTER_2F_BETA,                  4,  8 ; 10
+	mapgroup ROUTE_2_NUGGET_SPEECH_HOUSE,                  4,  4 ; 11
+	mapgroup ROUTE_2_GATE,                                 4,  5 ; 12
+	mapgroup VICTORY_ROAD_GATE,                            9, 10 ; 13
+
+	newgroup                                                    ; 24
+
+	mapgroup ROUTE_26,                                    54, 10 ;  1
+	mapgroup ROUTE_27,                                     9, 40 ;  2
+	mapgroup ROUTE_29,                                     9, 30 ;  3
+	mapgroup NEW_BARK_TOWN,                                9, 10 ;  4
+	mapgroup ELMS_LAB,                                     6,  5 ;  5
+	mapgroup KRISS_HOUSE_1F,                               4,  5 ;  6
+	mapgroup KRISS_HOUSE_2F,                               3,  4 ;  7
+	mapgroup KRISS_NEIGHBORS_HOUSE,                        4,  4 ;  8
+	mapgroup ELMS_HOUSE,                                   4,  4 ;  9
+	mapgroup ROUTE_26_HEAL_SPEECH_HOUSE,                   4,  4 ; 10
+	mapgroup ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE,          4,  4 ; 11
+	mapgroup ROUTE_27_SANDSTORM_HOUSE,                     4,  4 ; 12
+	mapgroup ROUTE_29_46_GATE,                             4,  5 ; 13
+
+	newgroup                                                    ; 25
+
+	mapgroup ROUTE_5,                                      9, 10 ;  1
+	mapgroup SAFFRON_CITY,                                18, 20 ;  2
+	mapgroup FIGHTING_DOJO,                                6,  5 ;  3
+	mapgroup SAFFRON_GYM,                                  9, 10 ;  4
+	mapgroup SAFFRON_MART,                                 4,  6 ;  5
+	mapgroup SAFFRON_POKECENTER_1F,                        4,  5 ;  6
+	mapgroup SAFFRON_POKECENTER_2F_BETA,                   4,  8 ;  7
+	mapgroup MR_PSYCHICS_HOUSE,                            4,  4 ;  8
+	mapgroup SAFFRON_TRAIN_STATION,                        9, 10 ;  9
+	mapgroup SILPH_CO_1F,                                  4,  8 ; 10
+	mapgroup COPYCATS_HOUSE_1F,                            4,  4 ; 11
+	mapgroup COPYCATS_HOUSE_2F,                            3,  5 ; 12
+	mapgroup ROUTE_5_UNDERGROUND_PATH_ENTRANCE,            4,  4 ; 13
+	mapgroup ROUTE_5_SAFFRON_CITY_GATE,                    4,  5 ; 14
+	mapgroup ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE,             4,  4 ; 15
+
+	newgroup                                                    ; 26
+
+	mapgroup ROUTE_30,                                    27, 10 ;  1
+	mapgroup ROUTE_31,                                     9, 20 ;  2
+	mapgroup CHERRYGROVE_CITY,                             9, 20 ;  3
+	mapgroup CHERRYGROVE_MART,                             4,  6 ;  4
+	mapgroup CHERRYGROVE_POKECENTER_1F,                    4,  5 ;  5
+	mapgroup CHERRYGROVE_GYM_SPEECH_HOUSE,                 4,  4 ;  6
+	mapgroup GUIDE_GENTS_HOUSE,                            4,  4 ;  7
+	mapgroup CHERRYGROVE_EVOLUTION_SPEECH_HOUSE,           4,  4 ;  8
+	mapgroup ROUTE_30_BERRY_SPEECH_HOUSE,                  4,  4 ;  9
+	mapgroup MR_POKEMONS_HOUSE,                            4,  4 ; 10
+	mapgroup ROUTE_31_VIOLET_GATE,                         4,  5 ; 11
diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm
new file mode 100644
index 000000000..5d3f23c08
--- /dev/null
+++ b/constants/map_data_constants.asm
@@ -0,0 +1,288 @@
+GROUP_N_A  EQU -1
+MAP_N_A    EQU -1
+GROUP_NONE EQU 0
+MAP_NONE   EQU 0
+
+; map header struct members (see maps/map_headers.asm)
+	const_def
+	const MAPHEADER_MAPHEADER2_BANK ; 0
+	const MAPHEADER_TILESET         ; 1
+	const MAPHEADER_ENVIRONMENT     ; 2
+	const MAPHEADER_MAPHEADER2      ; 3
+	const MAPHEADER_MAPHEADER2_HI   ; 4
+	const MAPHEADER_LOCATION        ; 5
+	const MAPHEADER_MUSIC           ; 6
+	const MAPHEADER_PALETTE         ; 7
+	const MAPHEADER_FISHGROUP       ; 8
+NUM_MAPHEADER_ATTRIBUTES EQU const_value
+
+; map environments (wEnvironment)
+const_value SET 1
+	const TOWN
+	const ROUTE
+	const INDOOR
+	const CAVE
+	const ENVIRONMENT_5
+	const GATE
+	const DUNGEON
+
+; map palettes (wEnvironment)
+	const_def
+	const PALETTE_AUTO
+	const PALETTE_DAY
+	const PALETTE_NITE
+	const PALETTE_MORN
+	const PALETTE_DARK
+
+; fish groups 
+	const_def
+	const FISHGROUP_NONE
+	const FISHGROUP_SHORE
+	const FISHGROUP_OCEAN
+	const FISHGROUP_LAKE
+	const FISHGROUP_POND
+	const FISHGROUP_DRATINI
+	const FISHGROUP_QWILFISH_SWARM
+	const FISHGROUP_REMORAID_SWARM
+	const FISHGROUP_GYARADOS
+	const FISHGROUP_DRATINI_2
+	const FISHGROUP_WHIRL_ISLANDS
+	const FISHGROUP_QWILFISH
+	const FISHGROUP_REMORAID
+	const FISHGROUP_QWILFISH_NO_SWARM
+
+
+; connection directions
+	const_def
+	const EAST_F
+	const WEST_F
+	const SOUTH_F
+	const NORTH_F
+
+; MapConnections
+	const_def
+	shift_const EAST
+	shift_const WEST
+	shift_const SOUTH
+	shift_const NORTH
+
+
+; object_struct members (see macros/wram.asm)
+	const_def
+	const OBJECT_SPRITE              ; 00
+	const OBJECT_MAP_OBJECT_INDEX    ; 01
+	const OBJECT_SPRITE_TILE         ; 02
+	const OBJECT_MOVEMENTTYPE        ; 03
+	const OBJECT_FLAGS1              ; 04
+	const OBJECT_FLAGS2              ; 05
+	const OBJECT_PALETTE             ; 06
+	const OBJECT_DIRECTION_WALKING   ; 07
+	const OBJECT_FACING              ; 08
+	const OBJECT_STEP_TYPE           ; 09
+	const OBJECT_STEP_DURATION       ; 0a
+	const OBJECT_ACTION              ; 0b
+	const OBJECT_STEP_FRAME          ; 0c
+	const OBJECT_FACING_STEP         ; 0d
+	const OBJECT_NEXT_TILE           ; 0e
+	const OBJECT_STANDING_TILE       ; 0f
+	const OBJECT_NEXT_MAP_X          ; 10
+	const OBJECT_NEXT_MAP_Y          ; 11
+	const OBJECT_MAP_X               ; 12
+	const OBJECT_MAP_Y               ; 13
+	const OBJECT_INIT_X              ; 14
+	const OBJECT_INIT_Y              ; 15
+	const OBJECT_RADIUS              ; 16
+	const OBJECT_SPRITE_X            ; 17
+	const OBJECT_SPRITE_Y            ; 18
+	const OBJECT_SPRITE_X_OFFSET     ; 19
+	const OBJECT_SPRITE_Y_OFFSET     ; 1a
+	const OBJECT_MOVEMENT_BYTE_INDEX ; 1b
+	const OBJECT_28                  ; 1c
+	const OBJECT_29                  ; 1d
+	const OBJECT_30                  ; 1e
+	const OBJECT_31                  ; 1f
+	const OBJECT_RANGE               ; 20
+; 33-39 are not used
+
+; map_object struct members (see macros/wram.asm)
+	const_def
+	const MAPOBJECT_OBJECT_STRUCT_ID ; 0
+	const MAPOBJECT_SPRITE ; 1
+	const MAPOBJECT_Y_COORD ; 2
+	const MAPOBJECT_X_COORD ; 3
+	const MAPOBJECT_MOVEMENT ; 4
+	const MAPOBJECT_RADIUS ; 5
+	const MAPOBJECT_HOUR ; 6
+	const MAPOBJECT_TIMEOFDAY ; 7
+	const MAPOBJECT_COLOR ; 8
+	const MAPOBJECT_RANGE ; 9
+	const MAPOBJECT_SCRIPT_POINTER ; a
+	const MAPOBJECT_POINTER_HI ; b
+	const MAPOBJECT_EVENT_FLAG ; c
+	const MAPOBJECT_FLAG_HI ; d
+	const MAPOBJECT_E ; unused
+	const MAPOBJECT_F ; unused
+OBJECT_LENGTH EQU const_value
+
+MAPOBJECT_SCREEN_HEIGHT EQU 11
+MAPOBJECT_SCREEN_WIDTH EQU 12
+
+; object_struct OBJECT_FACING values
+OW_DOWN  EQU DOWN  << 2
+OW_UP    EQU UP    << 2
+OW_LEFT  EQU LEFT  << 2
+OW_RIGHT EQU RIGHT << 2
+
+; object_struct OBJECT_FLAGS1 bit flags
+INVISIBLE    EQU 0
+FIXED_FACING EQU 2
+SLIDING      EQU 3
+EMOTE_OBJECT EQU 7
+
+
+; SpawnPoints indexes (see data/maps/spawn_points.asm)
+const_value = -1
+	const SPAWN_N_A
+	const SPAWN_HOME
+	const SPAWN_DEBUG
+; kanto
+	const SPAWN_PALLET
+	const SPAWN_VIRIDIAN
+	const SPAWN_PEWTER
+	const SPAWN_CERULEAN
+	const SPAWN_ROCK_TUNNEL
+	const SPAWN_VERMILION
+	const SPAWN_LAVENDER
+	const SPAWN_SAFFRON
+	const SPAWN_CELADON
+	const SPAWN_FUCHSIA
+	const SPAWN_CINNABAR
+	const SPAWN_INDIGO
+; johto
+	const SPAWN_NEW_BARK
+	const SPAWN_CHERRYGROVE
+	const SPAWN_VIOLET
+	const SPAWN_UNION_CAVE
+	const SPAWN_AZALEA
+	const SPAWN_CIANWOOD
+	const SPAWN_GOLDENROD
+	const SPAWN_OLIVINE
+	const SPAWN_ECRUTEAK
+	const SPAWN_MAHOGANY
+	const SPAWN_LAKE
+	const SPAWN_BLACKTHORN
+	const SPAWN_MT_SILVER
+	const SPAWN_FAST_SHIP
+NUM_SPAWNS EQU const_value
+
+
+; TryBGEvent arguments (see engine/events.asm)
+	const_def
+	const BGEVENT_READ
+	const BGEVENT_UP
+	const BGEVENT_DOWN
+	const BGEVENT_RIGHT
+	const BGEVENT_LEFT
+	const BGEVENT_IFSET
+	const BGEVENT_IFNOTSET
+	const BGEVENT_ITEM
+	const BGEVENT_COPY
+
+; object_event types
+; TryObjectEvent arguments (see engine/events.asm)
+	const_def
+	const OBJECTTYPE_SCRIPT
+	const OBJECTTYPE_ITEMBALL
+	const OBJECTTYPE_TRAINER
+	const OBJECTTYPE_3
+	const OBJECTTYPE_4
+	const OBJECTTYPE_5
+	const OBJECTTYPE_6
+
+
+; Emotes indexes (see data/emotes.asm)
+	const_def
+	const EMOTE_SHOCK ; 0
+	const EMOTE_QUESTION ; 1
+	const EMOTE_HAPPY ; 2
+	const EMOTE_SAD ; 3
+	const EMOTE_HEART ; 4
+	const EMOTE_BOLT ; 5
+	const EMOTE_SLEEP ; 6
+	const EMOTE_FISH ; 7
+	const EMOTE_SHADOW ; 8
+	const EMOTE_ROD ; 9
+	const EMOTE_BOULDER_DUST ; 10
+	const EMOTE_GRASS_RUSTLE ; 11
+EMOTE_MEM EQU -1
+
+; FruitTreeItems indexes (see data/items/fruit_trees.asm)
+const_value SET 1
+	const FRUITTREE_ROUTE_29      ; 01
+	const FRUITTREE_ROUTE_30_1    ; 02
+	const FRUITTREE_ROUTE_38      ; 03
+	const FRUITTREE_ROUTE_46_1    ; 04
+	const FRUITTREE_ROUTE_30_2    ; 05
+	const FRUITTREE_ROUTE_33      ; 06
+	const FRUITTREE_ROUTE_31      ; 07
+	const FRUITTREE_ROUTE_43      ; 08
+	const FRUITTREE_VIOLET_CITY   ; 09
+	const FRUITTREE_ROUTE_46_2    ; 0a
+	const FRUITTREE_ROUTE_35      ; 0b
+	const FRUITTREE_ROUTE_45      ; 0c
+	const FRUITTREE_ROUTE_36      ; 0d
+	const FRUITTREE_ROUTE_26      ; 0e
+	const FRUITTREE_ROUTE_39      ; 0f
+	const FRUITTREE_ROUTE_44      ; 10
+	const FRUITTREE_ROUTE_37_1    ; 11
+	const FRUITTREE_ROUTE_37_2    ; 12
+	const FRUITTREE_ROUTE_37_3    ; 13
+	const FRUITTREE_AZALEA_TOWN   ; 14
+	const FRUITTREE_ROUTE_42_1    ; 15
+	const FRUITTREE_ROUTE_42_2    ; 16
+	const FRUITTREE_ROUTE_42_3    ; 17
+	const FRUITTREE_ROUTE_11      ; 18
+	const FRUITTREE_ROUTE_2       ; 19
+	const FRUITTREE_ROUTE_1       ; 1a
+	const FRUITTREE_ROUTE_8       ; 1b
+	const FRUITTREE_PEWTER_CITY_1 ; 1c
+	const FRUITTREE_PEWTER_CITY_2 ; 1d
+	const FRUITTREE_FUCHSIA_CITY  ; 1e
+NUM_FRUIT_TREES EQU const_value +- 1
+
+
+; elevator floors
+; used by `elevfloor`
+	const_def
+	const FLOOR_B4F
+	const FLOOR_B3F
+	const FLOOR_B2F
+	const FLOOR_B1F
+	const FLOOR_1F
+	const FLOOR_2F
+	const FLOOR_3F
+	const FLOOR_4F
+	const FLOOR_5F
+	const FLOOR_6F
+	const FLOOR_7F
+	const FLOOR_8F
+	const FLOOR_9F
+	const FLOOR_10F
+	const FLOOR_11F
+	const FLOOR_ROOF
+
+; command queue members
+CMDQUEUE_TYPE  EQU 0
+CMDQUEUE_ADDR  EQU 1
+CMDQUEUE_03    EQU 3
+CMDQUEUE_04    EQU 4
+CMDQUEUE_05    EQU 5
+CMDQUEUE_ENTRY_SIZE EQU 6
+CMDQUEUE_CAPACITY EQU 4
+
+; command queue types
+CMDQUEUE_STONETABLE EQU 2
+
+; see engine/overworld.asm
+MAX_OUTDOOR_SPRITES EQU 23
+SPRITE_GFX_LIST_CAPACITY EQU $20
diff --git a/constants/map_dimension_constants.asm b/constants/map_dimension_constants.asm
deleted file mode 100644
index be12cca02..000000000
--- a/constants/map_dimension_constants.asm
+++ /dev/null
@@ -1,488 +0,0 @@
-newgroup: macro
-const_value = const_value + 1
-	enum_start 1
-endm
-
-mapgroup: macro
-;\1: map id
-;\2: height: in blocks
-;\3: width: in blocks
-GROUP_\1 EQU const_value
-	enum MAP_\1
-\1_HEIGHT EQU \2
-\1_WIDTH EQU \3
-endm
-
-; map group ids
-; `newgroup` indexes are for:
-; - MapGroupPointers (see maps/map_headers.asm)
-; - OutdoorSprites (see data/maps/outdoor_sprites.asm)
-; - MapGroupRoofs (see data/maps/mapgroup_roofs.asm)
-; `mapgroup` indexes are for the sub-tables of MapGroupPointers (see maps/map_headers.asm)
-	const_def
-
-	newgroup                                                    ;  1
-
-	mapgroup OLIVINE_POKECENTER_1F,                        4,  5 ;  1
-	mapgroup OLIVINE_GYM,                                  8,  5 ;  2
-	mapgroup OLIVINE_TIMS_HOUSE,                           4,  4 ;  3
-	mapgroup OLIVINE_HOUSE_BETA,                           4,  4 ;  4
-	mapgroup OLIVINE_PUNISHMENT_SPEECH_HOUSE,              4,  4 ;  5
-	mapgroup OLIVINE_GOOD_ROD_HOUSE,                       4,  4 ;  6
-	mapgroup OLIVINE_CAFE,                                 4,  4 ;  7
-	mapgroup OLIVINE_MART,                                 4,  6 ;  8
-	mapgroup ROUTE_38_ECRUTEAK_GATE,                       4,  5 ;  9
-	mapgroup ROUTE_39_BARN,                                4,  4 ; 10
-	mapgroup ROUTE_39_FARMHOUSE,                           4,  4 ; 11
-	mapgroup ROUTE_38,                                     9, 20 ; 12
-	mapgroup ROUTE_39,                                    18, 10 ; 13
-	mapgroup OLIVINE_CITY,                                18, 20 ; 14
-
-	newgroup                                                    ;  2
-
-	mapgroup MAHOGANY_RED_GYARADOS_SPEECH_HOUSE,           4,  4 ;  1
-	mapgroup MAHOGANY_GYM,                                 9,  5 ;  2
-	mapgroup MAHOGANY_POKECENTER_1F,                       4,  5 ;  3
-	mapgroup ROUTE_42_ECRUTEAK_GATE,                       4,  5 ;  4
-	mapgroup ROUTE_42,                                     9, 30 ;  5
-	mapgroup ROUTE_44,                                     9, 30 ;  6
-	mapgroup MAHOGANY_TOWN,                                9, 10 ;  7
-
-	newgroup                                                    ;  3
-
-	mapgroup SPROUT_TOWER_1F,                              8, 10 ;  1
-	mapgroup SPROUT_TOWER_2F,                              8, 10 ;  2
-	mapgroup SPROUT_TOWER_3F,                              8, 10 ;  3
-	mapgroup TIN_TOWER_1F,                                 9, 10 ;  4
-	mapgroup TIN_TOWER_2F,                                 9, 10 ;  5
-	mapgroup TIN_TOWER_3F,                                 9, 10 ;  6
-	mapgroup TIN_TOWER_4F,                                 9, 10 ;  7
-	mapgroup TIN_TOWER_5F,                                 9, 10 ;  8
-	mapgroup TIN_TOWER_6F,                                 9, 10 ;  9
-	mapgroup TIN_TOWER_7F,                                 9, 10 ; 10
-	mapgroup TIN_TOWER_8F,                                 9, 10 ; 11
-	mapgroup TIN_TOWER_9F,                                 9, 10 ; 12
-	mapgroup BURNED_TOWER_1F,                              9, 10 ; 13
-	mapgroup BURNED_TOWER_B1F,                             9, 10 ; 14
-	mapgroup NATIONAL_PARK,                               27, 20 ; 15
-	mapgroup NATIONAL_PARK_BUG_CONTEST,                   27, 20 ; 16
-	mapgroup RADIO_TOWER_1F,                               4,  9 ; 17
-	mapgroup RADIO_TOWER_2F,                               4,  9 ; 18
-	mapgroup RADIO_TOWER_3F,                               4,  9 ; 19
-	mapgroup RADIO_TOWER_4F,                               4,  9 ; 20
-	mapgroup RADIO_TOWER_5F,                               4,  9 ; 21
-	mapgroup RUINS_OF_ALPH_OUTSIDE,                       18, 10 ; 22
-	mapgroup RUINS_OF_ALPH_HO_OH_CHAMBER,                  5,  4 ; 23
-	mapgroup RUINS_OF_ALPH_KABUTO_CHAMBER,                 5,  4 ; 24
-	mapgroup RUINS_OF_ALPH_OMANYTE_CHAMBER,                5,  4 ; 25
-	mapgroup RUINS_OF_ALPH_AERODACTYL_CHAMBER,             5,  4 ; 26
-	mapgroup RUINS_OF_ALPH_INNER_CHAMBER,                 14, 10 ; 27
-	mapgroup RUINS_OF_ALPH_RESEARCH_CENTER,                4,  4 ; 28
-	mapgroup RUINS_OF_ALPH_HO_OH_ITEM_ROOM,                5,  4 ; 29
-	mapgroup RUINS_OF_ALPH_KABUTO_ITEM_ROOM,               5,  4 ; 30
-	mapgroup RUINS_OF_ALPH_OMANYTE_ITEM_ROOM,              5,  4 ; 31
-	mapgroup RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM,           5,  4 ; 32
-	mapgroup RUINS_OF_ALPH_HO_OH_WORD_ROOM,               12, 10 ; 33
-	mapgroup RUINS_OF_ALPH_KABUTO_WORD_ROOM,               7, 10 ; 34
-	mapgroup RUINS_OF_ALPH_OMANYTE_WORD_ROOM,              8, 10 ; 35
-	mapgroup RUINS_OF_ALPH_AERODACTYL_WORD_ROOM,           7, 10 ; 36
-	mapgroup UNION_CAVE_1F,                               18, 10 ; 37
-	mapgroup UNION_CAVE_B1F,                              18, 10 ; 38
-	mapgroup UNION_CAVE_B2F,                              18, 10 ; 39
-	mapgroup SLOWPOKE_WELL_B1F,                            9, 10 ; 40
-	mapgroup SLOWPOKE_WELL_B2F,                            9, 10 ; 41
-	mapgroup OLIVINE_LIGHTHOUSE_1F,                        9, 10 ; 42
-	mapgroup OLIVINE_LIGHTHOUSE_2F,                        9, 10 ; 43
-	mapgroup OLIVINE_LIGHTHOUSE_3F,                        9, 10 ; 44
-	mapgroup OLIVINE_LIGHTHOUSE_4F,                        9, 10 ; 45
-	mapgroup OLIVINE_LIGHTHOUSE_5F,                        9, 10 ; 46
-	mapgroup OLIVINE_LIGHTHOUSE_6F,                        9, 10 ; 47
-	mapgroup MAHOGANY_MART_1F,                             4,  4 ; 48
-	mapgroup TEAM_ROCKET_BASE_B1F,                         9, 15 ; 49
-	mapgroup TEAM_ROCKET_BASE_B2F,                         9, 15 ; 50
-	mapgroup TEAM_ROCKET_BASE_B3F,                         9, 15 ; 51
-	mapgroup ILEX_FOREST,                                 27, 15 ; 52
-	mapgroup GOLDENROD_UNDERGROUND,                       18, 15 ; 53
-	mapgroup GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 18, 15 ; 54
-	mapgroup GOLDENROD_DEPT_STORE_B1F,                     9, 10 ; 55
-	mapgroup GOLDENROD_UNDERGROUND_WAREHOUSE,              9, 10 ; 56
-	mapgroup MOUNT_MORTAR_1F_OUTSIDE,                     18, 20 ; 57
-	mapgroup MOUNT_MORTAR_1F_INSIDE,                      27, 20 ; 58
-	mapgroup MOUNT_MORTAR_2F_INSIDE,                      18, 20 ; 59
-	mapgroup MOUNT_MORTAR_B1F,                            18, 20 ; 60
-	mapgroup ICE_PATH_1F,                                 18, 20 ; 61
-	mapgroup ICE_PATH_B1F,                                18, 10 ; 62
-	mapgroup ICE_PATH_B2F_MAHOGANY_SIDE,                   9, 10 ; 63
-	mapgroup ICE_PATH_B2F_BLACKTHORN_SIDE,                 9,  5 ; 64
-	mapgroup ICE_PATH_B3F,                                 9, 10 ; 65
-	mapgroup WHIRL_ISLAND_NW,                              9,  5 ; 66
-	mapgroup WHIRL_ISLAND_NE,                              9, 10 ; 67
-	mapgroup WHIRL_ISLAND_SW,                              9, 10 ; 68
-	mapgroup WHIRL_ISLAND_CAVE,                            9,  5 ; 69
-	mapgroup WHIRL_ISLAND_SE,                              9,  5 ; 70
-	mapgroup WHIRL_ISLAND_B1F,                            18, 20 ; 71
-	mapgroup WHIRL_ISLAND_B2F,                            18, 10 ; 72
-	mapgroup WHIRL_ISLAND_LUGIA_CHAMBER,                   9, 10 ; 73
-	mapgroup SILVER_CAVE_ROOM_1,                          18, 10 ; 74
-	mapgroup SILVER_CAVE_ROOM_2,                          18, 15 ; 75
-	mapgroup SILVER_CAVE_ROOM_3,                          18, 10 ; 76
-	mapgroup SILVER_CAVE_ITEM_ROOMS,                       9, 10 ; 77
-	mapgroup DARK_CAVE_VIOLET_ENTRANCE,                   18, 20 ; 78
-	mapgroup DARK_CAVE_BLACKTHORN_ENTRANCE,               18, 15 ; 79
-	mapgroup DRAGONS_DEN_1F,                               9,  5 ; 80
-	mapgroup DRAGONS_DEN_B1F,                             18, 20 ; 81
-	mapgroup DRAGON_SHRINE,                                5,  5 ; 82
-	mapgroup TOHJO_FALLS,                                  9, 15 ; 83
-	mapgroup DIGLETTS_CAVE,                               18, 10 ; 84
-	mapgroup MOUNT_MOON,                                   9, 15 ; 85
-	mapgroup UNDERGROUND_PATH,                            14,  3 ; 86
-	mapgroup ROCK_TUNNEL_1F,                              18, 15 ; 87
-	mapgroup ROCK_TUNNEL_B1F,                             18, 15 ; 88
-	mapgroup SAFARI_ZONE_FUCHSIA_GATE_BETA,                4,  5 ; 89
-	mapgroup SAFARI_ZONE_BETA,                            18, 10 ; 90
-	mapgroup VICTORY_ROAD,                                36, 10 ; 91
-
-	newgroup                                                    ;  4
-
-	mapgroup ECRUTEAK_HOUSE,                               9, 10 ;  1
-	mapgroup WISE_TRIOS_ROOM,                              4,  4 ;  2
-	mapgroup ECRUTEAK_POKECENTER_1F,                       4,  5 ;  3
-	mapgroup ECRUTEAK_LUGIA_SPEECH_HOUSE,                  4,  4 ;  4
-	mapgroup DANCE_THEATRE,                                7,  6 ;  5
-	mapgroup ECRUTEAK_MART,                                4,  6 ;  6
-	mapgroup ECRUTEAK_GYM,                                 9,  5 ;  7
-	mapgroup ECRUTEAK_ITEMFINDER_HOUSE,                    4,  4 ;  8
-	mapgroup ECRUTEAK_CITY,                               18, 20 ;  9
-
-	newgroup                                                    ;  5
-
-	mapgroup BLACKTHORN_GYM_1F,                            9,  5 ;  1
-	mapgroup BLACKTHORN_GYM_2F,                            9,  5 ;  2
-	mapgroup BLACKTHORN_DRAGON_SPEECH_HOUSE,               4,  4 ;  3
-	mapgroup BLACKTHORN_EMYS_HOUSE,                        4,  4 ;  4
-	mapgroup BLACKTHORN_MART,                              4,  6 ;  5
-	mapgroup BLACKTHORN_POKECENTER_1F,                     4,  5 ;  6
-	mapgroup MOVE_DELETERS_HOUSE,                          4,  4 ;  7
-	mapgroup ROUTE_45,                                    45, 10 ;  8
-	mapgroup ROUTE_46,                                    18, 10 ;  9
-	mapgroup BLACKTHORN_CITY,                             18, 20 ; 10
-
-	newgroup                                                    ;  6
-
-	mapgroup CINNABAR_POKECENTER_1F,                       4,  5 ;  1
-	mapgroup CINNABAR_POKECENTER_2F_BETA,                  4,  8 ;  2
-	mapgroup ROUTE_19___FUCHSIA_GATE,                      4,  5 ;  3
-	mapgroup SEAFOAM_GYM,                                  4,  5 ;  4
-	mapgroup ROUTE_19,                                    18, 10 ;  5
-	mapgroup ROUTE_20,                                     9, 30 ;  6
-	mapgroup ROUTE_21,                                    18, 10 ;  7
-	mapgroup CINNABAR_ISLAND,                              9, 10 ;  8
-
-	newgroup                                                    ;  7
-
-	mapgroup CERULEAN_GYM_BADGE_SPEECH_HOUSE,              4,  4 ;  1
-	mapgroup CERULEAN_POLICE_STATION,                      4,  4 ;  2
-	mapgroup CERULEAN_TRADE_SPEECH_HOUSE,                  4,  4 ;  3
-	mapgroup CERULEAN_POKECENTER_1F,                       4,  5 ;  4
-	mapgroup CERULEAN_POKECENTER_2F_BETA,                  4,  8 ;  5
-	mapgroup CERULEAN_GYM,                                 8,  5 ;  6
-	mapgroup CERULEAN_MART,                                4,  6 ;  7
-	mapgroup ROUTE_10_POKECENTER_1F,                       4,  5 ;  8
-	mapgroup ROUTE_10_POKECENTER_2F_BETA,                  4,  8 ;  9
-	mapgroup POWER_PLANT,                                  9, 10 ; 10
-	mapgroup BILLS_HOUSE,                                  4,  4 ; 11
-	mapgroup ROUTE_4,                                      9, 20 ; 12
-	mapgroup ROUTE_9,                                      9, 30 ; 13
-	mapgroup ROUTE_10_NORTH,                               9, 10 ; 14
-	mapgroup ROUTE_24,                                     9, 10 ; 15
-	mapgroup ROUTE_25,                                     9, 30 ; 16
-	mapgroup CERULEAN_CITY,                               18, 20 ; 17
-
-	newgroup                                                    ;  8
-
-	mapgroup AZALEA_POKECENTER_1F,                         4,  5 ;  1
-	mapgroup CHARCOAL_KILN,                                4,  4 ;  2
-	mapgroup AZALEA_MART,                                  4,  6 ;  3
-	mapgroup KURTS_HOUSE,                                  4,  8 ;  4
-	mapgroup AZALEA_GYM,                                   8,  5 ;  5
-	mapgroup ROUTE_33,                                     9, 10 ;  6
-	mapgroup AZALEA_TOWN,                                  9, 20 ;  7
-
-	newgroup                                                    ;  9
-
-	mapgroup LAKE_OF_RAGE_HIDDEN_POWER_HOUSE,              4,  4 ;  1
-	mapgroup LAKE_OF_RAGE_MAGIKARP_HOUSE,                  4,  4 ;  2
-	mapgroup ROUTE_43_MAHOGANY_GATE,                       4,  5 ;  3
-	mapgroup ROUTE_43_GATE,                                4,  5 ;  4
-	mapgroup ROUTE_43,                                    27, 10 ;  5
-	mapgroup LAKE_OF_RAGE,                                18, 20 ;  6
-
-	newgroup                                                    ; 10
-
-	mapgroup ROUTE_32,                                    45, 10 ;  1
-	mapgroup ROUTE_35,                                    18, 10 ;  2
-	mapgroup ROUTE_36,                                     9, 30 ;  3
-	mapgroup ROUTE_37,                                     9, 10 ;  4
-	mapgroup VIOLET_CITY,                                 18, 20 ;  5
-	mapgroup VIOLET_MART,                                  4,  6 ;  6
-	mapgroup VIOLET_GYM,                                   8,  5 ;  7
-	mapgroup EARLS_POKEMON_ACADEMY,                        8,  4 ;  8
-	mapgroup VIOLET_NICKNAME_SPEECH_HOUSE,                 4,  4 ;  9
-	mapgroup VIOLET_POKECENTER_1F,                         4,  5 ; 10
-	mapgroup VIOLET_KYLES_HOUSE,                           4,  4 ; 11
-	mapgroup ROUTE_32_RUINS_OF_ALPH_GATE,                  4,  5 ; 12
-	mapgroup ROUTE_32_POKECENTER_1F,                       4,  5 ; 13
-	mapgroup ROUTE_35_GOLDENROD_GATE,                      4,  5 ; 14
-	mapgroup ROUTE_35_NATIONAL_PARK_GATE,                  4,  4 ; 15
-	mapgroup ROUTE_36_RUINS_OF_ALPH_GATE,                  4,  5 ; 16
-	mapgroup ROUTE_36_NATIONAL_PARK_GATE,                  4,  5 ; 17
-
-	newgroup                                                    ; 11
-
-	mapgroup ROUTE_34,                                    27, 10 ;  1
-	mapgroup GOLDENROD_CITY,                              18, 20 ;  2
-	mapgroup GOLDENROD_GYM,                                9, 10 ;  3
-	mapgroup GOLDENROD_BIKE_SHOP,                          4,  4 ;  4
-	mapgroup GOLDENROD_HAPPINESS_RATER,                    4,  4 ;  5
-	mapgroup GOLDENROD_BILLS_HOUSE,                        4,  4 ;  6
-	mapgroup GOLDENROD_MAGNET_TRAIN_STATION,               9, 10 ;  7
-	mapgroup GOLDENROD_FLOWER_SHOP,                        4,  4 ;  8
-	mapgroup GOLDENROD_PP_SPEECH_HOUSE,                    4,  4 ;  9
-	mapgroup GOLDENROD_NAME_RATER,                         4,  4 ; 10
-	mapgroup GOLDENROD_DEPT_STORE_1F,                      4,  8 ; 11
-	mapgroup GOLDENROD_DEPT_STORE_2F,                      4,  8 ; 12
-	mapgroup GOLDENROD_DEPT_STORE_3F,                      4,  8 ; 13
-	mapgroup GOLDENROD_DEPT_STORE_4F,                      4,  8 ; 14
-	mapgroup GOLDENROD_DEPT_STORE_5F,                      4,  8 ; 15
-	mapgroup GOLDENROD_DEPT_STORE_6F,                      4,  8 ; 16
-	mapgroup GOLDENROD_DEPT_STORE_ELEVATOR,                2,  2 ; 17
-	mapgroup GOLDENROD_DEPT_STORE_ROOF,                    4,  8 ; 18
-	mapgroup GOLDENROD_GAME_CORNER,                        7, 10 ; 19
-	mapgroup GOLDENROD_POKECENTER_1F,                      4,  5 ; 20
-	mapgroup GOLDENROD_POKECOM_CENTER_2F_MOBILE,          16, 16 ; 21
-	mapgroup ILEX_FOREST_AZALEA_GATE,                      4,  5 ; 22
-	mapgroup ROUTE_34_ILEX_FOREST_GATE,                    4,  5 ; 23
-	mapgroup DAY_CARE,                                     4,  5 ; 24
-
-	newgroup                                                    ; 12
-
-	mapgroup ROUTE_6,                                      9, 10 ;  1
-	mapgroup ROUTE_11,                                     9, 20 ;  2
-	mapgroup VERMILION_CITY,                              18, 20 ;  3
-	mapgroup VERMILION_HOUSE_FISHING_SPEECH_HOUSE,         4,  4 ;  4
-	mapgroup VERMILION_POKECENTER_1F,                      4,  5 ;  5
-	mapgroup VERMILION_POKECENTER_2F_BETA,                 4,  8 ;  6
-	mapgroup POKEMON_FAN_CLUB,                             4,  5 ;  7
-	mapgroup VERMILION_MAGNET_TRAIN_SPEECH_HOUSE,          4,  4 ;  8
-	mapgroup VERMILION_MART,                               4,  6 ;  9
-	mapgroup VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE,   4,  4 ; 10
-	mapgroup VERMILION_GYM,                                9,  5 ; 11
-	mapgroup ROUTE_6_SAFFRON_GATE,                         4,  5 ; 12
-	mapgroup ROUTE_6_UNDERGROUND_PATH_ENTRANCE,            4,  4 ; 13
-
-	newgroup                                                    ; 13
-
-	mapgroup ROUTE_1,                                     18, 10 ;  1
-	mapgroup PALLET_TOWN,                                  9, 10 ;  2
-	mapgroup REDS_HOUSE_1F,                                4,  4 ;  3
-	mapgroup REDS_HOUSE_2F,                                4,  4 ;  4
-	mapgroup BLUES_HOUSE,                                  4,  4 ;  5
-	mapgroup OAKS_LAB,                                     6,  5 ;  6
-
-	newgroup                                                    ; 14
-
-	mapgroup ROUTE_3,                                      9, 30 ;  1
-	mapgroup PEWTER_CITY,                                 18, 20 ;  2
-	mapgroup PEWTER_NIDORAN_SPEECH_HOUSE,                  4,  4 ;  3
-	mapgroup PEWTER_GYM,                                   7,  5 ;  4
-	mapgroup PEWTER_MART,                                  4,  6 ;  5
-	mapgroup PEWTER_POKECENTER_1F,                         4,  5 ;  6
-	mapgroup PEWTER_POKECENTER_2F_BETA,                    4,  8 ;  7
-	mapgroup PEWTER_SNOOZE_SPEECH_HOUSE,                   4,  4 ;  8
-
-	newgroup                                                    ; 15
-
-	mapgroup OLIVINE_PORT,                                18, 10 ;  1
-	mapgroup VERMILION_PORT,                              18, 10 ;  2
-	mapgroup FAST_SHIP_1F,                                 9, 16 ;  3
-	mapgroup FAST_SHIP_CABINS_NNW_NNE_NE,                 16,  4 ;  4
-	mapgroup FAST_SHIP_CABINS_SW_SSW_NW,                  16,  4 ;  5
-	mapgroup FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN,      17,  5 ;  6
-	mapgroup FAST_SHIP_B1F,                                8, 16 ;  7
-	mapgroup OLIVINE_PORT_PASSAGE,                         9, 10 ;  8
-	mapgroup VERMILION_PORT_PASSAGE,                       9, 10 ;  9
-	mapgroup MOUNT_MOON_SQUARE,                            9, 15 ; 10
-	mapgroup MOUNT_MOON_GIFT_SHOP,                         4,  4 ; 11
-	mapgroup TIN_TOWER_ROOF,                               9, 10 ; 12
-
-	newgroup                                                    ; 16
-
-	mapgroup ROUTE_23,                                     9, 10 ;  1
-	mapgroup INDIGO_PLATEAU_POKECENTER_1F,                 7,  9 ;  2
-	mapgroup WILLS_ROOM,                                   9,  5 ;  3
-	mapgroup KOGAS_ROOM,                                   9,  5 ;  4
-	mapgroup BRUNOS_ROOM,                                  9,  5 ;  5
-	mapgroup KARENS_ROOM,                                  9,  5 ;  6
-	mapgroup LANCES_ROOM,                                 12,  5 ;  7
-	mapgroup HALL_OF_FAME,                                 7,  5 ;  8
-
-	newgroup                                                    ; 17
-
-	mapgroup ROUTE_13,                                     9, 30 ;  1
-	mapgroup ROUTE_14,                                    18, 10 ;  2
-	mapgroup ROUTE_15,                                     9, 20 ;  3
-	mapgroup ROUTE_18,                                     9, 10 ;  4
-	mapgroup FUCHSIA_CITY,                                18, 20 ;  5
-	mapgroup FUCHSIA_MART,                                 4,  6 ;  6
-	mapgroup SAFARI_ZONE_MAIN_OFFICE,                      4,  4 ;  7
-	mapgroup FUCHSIA_GYM,                                  9,  5 ;  8
-	mapgroup FUCHSIA_BILL_SPEECH_HOUSE,                    4,  4 ;  9
-	mapgroup FUCHSIA_POKECENTER_1F,                        4,  5 ; 10
-	mapgroup FUCHSIA_POKECENTER_2F_BETA,                   4,  8 ; 11
-	mapgroup SAFARI_ZONE_WARDENS_HOME,                     4,  5 ; 12
-	mapgroup ROUTE_15_FUCHSIA_GATE,                        4,  5 ; 13
-
-	newgroup                                                    ; 18
-
-	mapgroup ROUTE_8,                                      9, 20 ;  1
-	mapgroup ROUTE_12,                                    27, 10 ;  2
-	mapgroup ROUTE_10_SOUTH,                               9, 10 ;  3
-	mapgroup LAVENDER_TOWN,                                9, 10 ;  4
-	mapgroup LAVENDER_POKECENTER_1F,                       4,  5 ;  5
-	mapgroup LAVENDER_POKECENTER_2F_BETA,                  4,  8 ;  6
-	mapgroup MR_FUJIS_HOUSE,                               4,  5 ;  7
-	mapgroup LAVENDER_TOWN_SPEECH_HOUSE,                   4,  4 ;  8
-	mapgroup LAVENDER_NAME_RATER,                          4,  4 ;  9
-	mapgroup LAVENDER_MART,                                4,  6 ; 10
-	mapgroup SOUL_HOUSE,                                   4,  5 ; 11
-	mapgroup LAV_RADIO_TOWER_1F,                           4, 10 ; 12
-	mapgroup ROUTE_8_SAFFRON_GATE,                         4,  5 ; 13
-	mapgroup ROUTE_12_SUPER_ROD_HOUSE,                     4,  4 ; 14
-
-	newgroup                                                    ; 19
-
-	mapgroup ROUTE_28,                                     9, 20 ;  1
-	mapgroup SILVER_CAVE_OUTSIDE,                         18, 20 ;  2
-	mapgroup SILVER_CAVE_POKECENTER_1F,                    4,  5 ;  3
-	mapgroup ROUTE_28_FAMOUS_SPEECH_HOUSE,                 4,  4 ;  4
-
-	newgroup                                                    ; 20
-
-	mapgroup POKECENTER_2F,                                4,  8 ;  1
-	mapgroup TRADE_CENTER,                                 4,  5 ;  2
-	mapgroup COLOSSEUM,                                    4,  5 ;  3
-	mapgroup TIME_CAPSULE,                                 4,  5 ;  4
-	mapgroup MOBILE_TRADE_ROOM_MOBILE,                     4,  5 ;  5
-	mapgroup MOBILE_BATTLE_ROOM,                           4,  5 ;  6
-
-	newgroup                                                    ; 21
-
-	mapgroup ROUTE_7,                                      9, 10 ;  1
-	mapgroup ROUTE_16,                                     9, 10 ;  2
-	mapgroup ROUTE_17,                                    45, 10 ;  3
-	mapgroup CELADON_CITY,                                18, 20 ;  4
-	mapgroup CELADON_DEPT_STORE_1F,                        4,  8 ;  5
-	mapgroup CELADON_DEPT_STORE_2F,                        4,  8 ;  6
-	mapgroup CELADON_DEPT_STORE_3F,                        4,  8 ;  7
-	mapgroup CELADON_DEPT_STORE_4F,                        4,  8 ;  8
-	mapgroup CELADON_DEPT_STORE_5F,                        4,  8 ;  9
-	mapgroup CELADON_DEPT_STORE_6F,                        4,  8 ; 10
-	mapgroup CELADON_DEPT_STORE_ELEVATOR,                  2,  2 ; 11
-	mapgroup CELADON_MANSION_1F,                           5,  4 ; 12
-	mapgroup CELADON_MANSION_2F,                           5,  4 ; 13
-	mapgroup CELADON_MANSION_3F,                           5,  4 ; 14
-	mapgroup CELADON_MANSION_ROOF,                         5,  4 ; 15
-	mapgroup CELADON_MANSION_ROOF_HOUSE,                   4,  4 ; 16
-	mapgroup CELADON_POKECENTER_1F,                        4,  5 ; 17
-	mapgroup CELADON_POKECENTER_2F_BETA,                   4,  8 ; 18
-	mapgroup CELADON_GAME_CORNER,                          7, 10 ; 19
-	mapgroup CELADON_GAME_CORNER_PRIZE_ROOM,               3,  3 ; 20
-	mapgroup CELADON_GYM,                                  9,  5 ; 21
-	mapgroup CELADON_CAFE,                                 4,  6 ; 22
-	mapgroup ROUTE_16_FUCHSIA_SPEECH_HOUSE,                4,  4 ; 23
-	mapgroup ROUTE_16_GATE,                                4,  5 ; 24
-	mapgroup ROUTE_7_SAFFRON_GATE,                         4,  5 ; 25
-	mapgroup ROUTE_17_18_GATE,                             4,  5 ; 26
-
-	newgroup                                                    ; 22
-
-	mapgroup ROUTE_40,                                    18, 10 ;  1
-	mapgroup ROUTE_41,                                    27, 25 ;  2
-	mapgroup CIANWOOD_CITY,                               27, 15 ;  3
-	mapgroup MANIAS_HOUSE,                                 4,  4 ;  4
-	mapgroup CIANWOOD_GYM,                                 9,  5 ;  5
-	mapgroup CIANWOOD_POKECENTER_1F,                       4,  5 ;  6
-	mapgroup CIANWOOD_PHARMACY,                            4,  4 ;  7
-	mapgroup CIANWOOD_CITY_PHOTO_STUDIO,                   4,  4 ;  8
-	mapgroup CIANWOOD_LUGIA_SPEECH_HOUSE,                  4,  4 ;  9
-	mapgroup POKE_SEERS_HOUSE,                             4,  4 ; 10
-	mapgroup BATTLE_TOWER_1F,                              5,  8 ; 11
-	mapgroup BATTLE_TOWER_BATTLE_ROOM,                     4,  4 ; 12
-	mapgroup BATTLE_TOWER_ELEVATOR,                        2,  2 ; 13
-	mapgroup BATTLE_TOWER_HALLWAY,                         2, 11 ; 14
-	mapgroup ROUTE_40_BATTLE_TOWER_GATE,                   4,  5 ; 15
-	mapgroup BATTLE_TOWER_OUTSIDE,                        14, 10 ; 16
-
-	newgroup                                                    ; 23
-
-	mapgroup ROUTE_2,                                     27, 10 ;  1
-	mapgroup ROUTE_22,                                     9, 20 ;  2
-	mapgroup VIRIDIAN_CITY,                               18, 20 ;  3
-	mapgroup VIRIDIAN_GYM,                                 9,  5 ;  4
-	mapgroup VIRIDIAN_NICKNAME_SPEECH_HOUSE,               4,  4 ;  5
-	mapgroup TRAINER_HOUSE_1F,                             7,  5 ;  6
-	mapgroup TRAINER_HOUSE_B1F,                            8,  5 ;  7
-	mapgroup VIRIDIAN_MART,                                4,  6 ;  8
-	mapgroup VIRIDIAN_POKECENTER_1F,                       4,  5 ;  9
-	mapgroup VIRIDIAN_POKECENTER_2F_BETA,                  4,  8 ; 10
-	mapgroup ROUTE_2_NUGGET_SPEECH_HOUSE,                  4,  4 ; 11
-	mapgroup ROUTE_2_GATE,                                 4,  5 ; 12
-	mapgroup VICTORY_ROAD_GATE,                            9, 10 ; 13
-
-	newgroup                                                    ; 24
-
-	mapgroup ROUTE_26,                                    54, 10 ;  1
-	mapgroup ROUTE_27,                                     9, 40 ;  2
-	mapgroup ROUTE_29,                                     9, 30 ;  3
-	mapgroup NEW_BARK_TOWN,                                9, 10 ;  4
-	mapgroup ELMS_LAB,                                     6,  5 ;  5
-	mapgroup KRISS_HOUSE_1F,                               4,  5 ;  6
-	mapgroup KRISS_HOUSE_2F,                               3,  4 ;  7
-	mapgroup KRISS_NEIGHBORS_HOUSE,                        4,  4 ;  8
-	mapgroup ELMS_HOUSE,                                   4,  4 ;  9
-	mapgroup ROUTE_26_HEAL_SPEECH_HOUSE,                   4,  4 ; 10
-	mapgroup ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE,          4,  4 ; 11
-	mapgroup ROUTE_27_SANDSTORM_HOUSE,                     4,  4 ; 12
-	mapgroup ROUTE_29_46_GATE,                             4,  5 ; 13
-
-	newgroup                                                    ; 25
-
-	mapgroup ROUTE_5,                                      9, 10 ;  1
-	mapgroup SAFFRON_CITY,                                18, 20 ;  2
-	mapgroup FIGHTING_DOJO,                                6,  5 ;  3
-	mapgroup SAFFRON_GYM,                                  9, 10 ;  4
-	mapgroup SAFFRON_MART,                                 4,  6 ;  5
-	mapgroup SAFFRON_POKECENTER_1F,                        4,  5 ;  6
-	mapgroup SAFFRON_POKECENTER_2F_BETA,                   4,  8 ;  7
-	mapgroup MR_PSYCHICS_HOUSE,                            4,  4 ;  8
-	mapgroup SAFFRON_TRAIN_STATION,                        9, 10 ;  9
-	mapgroup SILPH_CO_1F,                                  4,  8 ; 10
-	mapgroup COPYCATS_HOUSE_1F,                            4,  4 ; 11
-	mapgroup COPYCATS_HOUSE_2F,                            3,  5 ; 12
-	mapgroup ROUTE_5_UNDERGROUND_PATH_ENTRANCE,            4,  4 ; 13
-	mapgroup ROUTE_5_SAFFRON_CITY_GATE,                    4,  5 ; 14
-	mapgroup ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE,             4,  4 ; 15
-
-	newgroup                                                    ; 26
-
-	mapgroup ROUTE_30,                                    27, 10 ;  1
-	mapgroup ROUTE_31,                                     9, 20 ;  2
-	mapgroup CHERRYGROVE_CITY,                             9, 20 ;  3
-	mapgroup CHERRYGROVE_MART,                             4,  6 ;  4
-	mapgroup CHERRYGROVE_POKECENTER_1F,                    4,  5 ;  5
-	mapgroup CHERRYGROVE_GYM_SPEECH_HOUSE,                 4,  4 ;  6
-	mapgroup GUIDE_GENTS_HOUSE,                            4,  4 ;  7
-	mapgroup CHERRYGROVE_EVOLUTION_SPEECH_HOUSE,           4,  4 ;  8
-	mapgroup ROUTE_30_BERRY_SPEECH_HOUSE,                  4,  4 ;  9
-	mapgroup MR_POKEMONS_HOUSE,                            4,  4 ; 10
-	mapgroup ROUTE_31_VIOLET_GATE,                         4,  5 ; 11
diff --git a/constants/map_setup_constants.asm b/constants/map_setup_constants.asm
index 0dcc2b941..20448f2fb 100644
--- a/constants/map_setup_constants.asm
+++ b/constants/map_setup_constants.asm
@@ -1,26 +1,18 @@
 ; hMapEntryMethod values
-; MapSetupScripts indexes (see engine/map_setup.asm)
+; MapSetupScripts indexes (see data/maps/setup_scripts.asm)
 const_value SET $f1
-	const MAPSETUP_WARP
-	const MAPSETUP_CONTINUE
-	const MAPSETUP_RELOADMAP
-	const MAPSETUP_TELEPORT
-	const MAPSETUP_DOOR
-	const MAPSETUP_FALL
-	const MAPSETUP_CONNECTION
-	const MAPSETUP_LINKRETURN
-	const MAPSETUP_TRAIN
-	const MAPSETUP_SUBMENU
-	const MAPSETUP_BADWARP
-	const MAPSETUP_FLY
-
-; callback types
-const_value SET 1
-	const MAPCALLBACK_TILES
-	const MAPCALLBACK_OBJECTS
-	const MAPCALLBACK_CMDQUEUE
-	const MAPCALLBACK_SPRITES
-	const MAPCALLBACK_NEWMAP
+	const MAPSETUP_WARP       ; f1
+	const MAPSETUP_CONTINUE   ; f2
+	const MAPSETUP_RELOADMAP  ; f3
+	const MAPSETUP_TELEPORT   ; f4
+	const MAPSETUP_DOOR       ; f5
+	const MAPSETUP_FALL       ; f6
+	const MAPSETUP_CONNECTION ; f7
+	const MAPSETUP_LINKRETURN ; f8
+	const MAPSETUP_TRAIN      ; f9
+	const MAPSETUP_SUBMENU    ; fa
+	const MAPSETUP_BADWARP    ; fb
+	const MAPSETUP_FLY        ; fc
 
 ; MapSetupCommands indexes (see engine/map_setup.asm)
 ; Names taken from Condensation water's scripting compendium
@@ -41,7 +33,7 @@ const_value SET 1
 	const map_save_screen         ; 0c
 	const map_buffer_screen       ; 0d
 	const map_load_graphics       ; 0e
-	const map_load_tileset_header ; 0f
+	const map_load_tileset        ; 0f
 	const map_time_of_day         ; 10
 	const map_palettes            ; 11
 	const map_wildmons            ; 12
@@ -73,3 +65,11 @@ const_value SET 1
 	const map_text_scroll_off     ; 2c
 	const map_stop_script         ; 2d
 map_end EQU -1
+
+; callback types
+const_value SET 1
+	const MAPCALLBACK_TILES
+	const MAPCALLBACK_OBJECTS
+	const MAPCALLBACK_CMDQUEUE
+	const MAPCALLBACK_SPRITES
+	const MAPCALLBACK_NEWMAP
diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm
index 88ae90c89..6289b610c 100644
--- a/constants/misc_constants.asm
+++ b/constants/misc_constants.asm
@@ -16,39 +16,13 @@ HP_GREEN  EQU 0
 HP_YELLOW EQU 1
 HP_RED    EQU 2
 
+; save file corruption check values
+SAVE_CHECK_VALUE_1 EQU 99
+SAVE_CHECK_VALUE_2 EQU 127
 
-; name lengths
-NAME_LENGTH        EQU 11
-PLAYER_NAME_LENGTH EQU 8
-BOX_NAME_LENGTH    EQU 9
-PKMN_NAME_LENGTH   EQU 11
-MOVE_NAME_LENGTH   EQU 13
-ITEM_NAME_LENGTH   EQU 13
-TRAINER_CLASS_NAME_LENGTH EQU 13
-NAME_LENGTH_JAPANESE EQU 6
-
-; GetName types (see home/names.asm)
-PKMN_NAME     EQU 1
-MOVE_NAME     EQU 2
-; dummied out EQU 3
-ITEM_NAME     EQU 4
-PARTY_OT_NAME EQU 5
-ENEMY_OT_NAME EQU 6
-TRAINER_NAME  EQU 7
-; broken ptr  EQU 8
-
-
-; printing text
-const_value set 5
-	const PRINTNUM_MONEY_F        ; 5
-	const PRINTNUM_RIGHTALIGN_F   ; 6
-	const PRINTNUM_LEADINGZEROS_F ; 7
-
-; PrintNum arguments (see engine/printnum.asm)
-PRINTNUM_MONEY          EQU 1 << PRINTNUM_MONEY_F
-PRINTNUM_RIGHTALIGN     EQU 1 << PRINTNUM_RIGHTALIGN_F
-PRINTNUM_LEADINGZEROS   EQU 1 << PRINTNUM_LEADINGZEROS_F
-
+; hMenuReturn
+HMENURETURN_SCRIPT EQU %10000000
+HMENURETURN_ASM    EQU %11111111
 
 ; DoPlayerMovement.DoStep arguments (see engine/player_movement.asm)
 	const_def
@@ -61,17 +35,6 @@ PRINTNUM_LEADINGZEROS   EQU 1 << PRINTNUM_LEADINGZEROS_F
 	const STEP_BACK_LEDGE    ; 6
 	const STEP_WALK_IN_PLACE ; 7
 
-
-; hMenuReturn
-HMENURETURN_SCRIPT EQU %10000000
-HMENURETURN_ASM    EQU %11111111
-
-
-; save file corruption check values
-SAVE_CHECK_VALUE_1 EQU 99
-SAVE_CHECK_VALUE_2 EQU 127
-
-
 ; time of day boundaries
 MORN_HOUR EQU 4  ; 4 AM
 DAY_HOUR  EQU 10 ; 10 AM
@@ -79,7 +42,6 @@ NITE_HOUR EQU 18 ; 6 PM
 NOON_HOUR EQU 12 ; 12 PM
 MAX_HOUR  EQU 24 ; 12 AM
 
-
 ; boxes
 MONS_PER_BOX EQU 20
 NUM_BOXES    EQU 14
@@ -91,14 +53,12 @@ NUM_HOF_TEAMS = 30
 
 MAX_LINK_RECORD EQU 9999
 
-
 ; significant money values
 START_MONEY EQU 3000
 MOM_MONEY   EQU 2300
 MAX_MONEY   EQU 999999
 MAX_COINS   EQU 9999
 
-
 ; ChangeHappiness arguments (see data/happiness_changes.asm)
 const_value = 1
 	const HAPPINESS_GAINLEVEL         ; 01
@@ -121,4 +81,5 @@ const_value = 1
 	const HAPPINESS_MASSAGE           ; 12
 	const HAPPINESS_GAINLEVELATHOME   ; 13
 
+; day-care
 MAX_DAY_CARE_EXP EQU $500000
diff --git a/constants/move_constants.asm b/constants/move_constants.asm
index a4b1a0ba8..472ff2d0b 100644
--- a/constants/move_constants.asm
+++ b/constants/move_constants.asm
@@ -1,9 +1,9 @@
 ; move ids
 ; indexes for:
-; - MoveDescriptions (see battle/moves/move_descriptions.asm)
-; - Moves (see battle/moves/moves.asm)
-; - MoveNames (see battle/move_names.asm)
-; - BattleAnimations (see battle/anims.asm)
+; - Moves (see data/moves/moves.asm)
+; - MoveNames (see data/moves/names.asm)
+; - MoveDescriptions (see data/moves/descriptions.asm)
+; - BattleAnimations (see data/moves/animations.asm)
 	const_def
 	const NO_MOVE      ; 00
 	const POUND        ; 01
diff --git a/constants/move_effect_constants.asm b/constants/move_effect_constants.asm
new file mode 100644
index 000000000..0ca97f380
--- /dev/null
+++ b/constants/move_effect_constants.asm
@@ -0,0 +1,159 @@
+; MoveEffectsPointers indexes (see data/moves/effects_pointers.asm)
+	const_def
+	const EFFECT_NORMAL_HIT
+	const EFFECT_SLEEP
+	const EFFECT_POISON_HIT
+	const EFFECT_LEECH_HIT
+	const EFFECT_BURN_HIT
+	const EFFECT_FREEZE_HIT
+	const EFFECT_PARALYZE_HIT
+	const EFFECT_SELFDESTRUCT
+	const EFFECT_DREAM_EATER
+	const EFFECT_MIRROR_MOVE
+	const EFFECT_ATTACK_UP
+	const EFFECT_DEFENSE_UP
+	const EFFECT_SPEED_UP
+	const EFFECT_SP_ATK_UP
+	const EFFECT_SP_DEF_UP
+	const EFFECT_ACCURACY_UP
+	const EFFECT_EVASION_UP
+	const EFFECT_ALWAYS_HIT
+	const EFFECT_ATTACK_DOWN
+	const EFFECT_DEFENSE_DOWN
+	const EFFECT_SPEED_DOWN
+	const EFFECT_SP_ATK_DOWN
+	const EFFECT_SP_DEF_DOWN
+	const EFFECT_ACCURACY_DOWN
+	const EFFECT_EVASION_DOWN
+	const EFFECT_RESET_STATS
+	const EFFECT_BIDE
+	const EFFECT_RAMPAGE
+	const EFFECT_FORCE_SWITCH
+	const EFFECT_MULTI_HIT
+	const EFFECT_CONVERSION
+	const EFFECT_FLINCH_HIT
+	const EFFECT_HEAL
+	const EFFECT_TOXIC
+	const EFFECT_PAY_DAY
+	const EFFECT_LIGHT_SCREEN
+	const EFFECT_TRI_ATTACK
+	const EFFECT_UNUSED_25
+	const EFFECT_OHKO
+	const EFFECT_RAZOR_WIND
+	const EFFECT_SUPER_FANG
+	const EFFECT_STATIC_DAMAGE
+	const EFFECT_TRAP_TARGET
+	const EFFECT_UNUSED_2B
+	const EFFECT_DOUBLE_HIT
+	const EFFECT_JUMP_KICK
+	const EFFECT_MIST
+	const EFFECT_FOCUS_ENERGY
+	const EFFECT_RECOIL_HIT
+	const EFFECT_CONFUSE
+	const EFFECT_ATTACK_UP_2
+	const EFFECT_DEFENSE_UP_2
+	const EFFECT_SPEED_UP_2
+	const EFFECT_SP_ATK_UP_2
+	const EFFECT_SP_DEF_UP_2
+	const EFFECT_ACCURACY_UP_2
+	const EFFECT_EVASION_UP_2
+	const EFFECT_TRANSFORM
+	const EFFECT_ATTACK_DOWN_2
+	const EFFECT_DEFENSE_DOWN_2
+	const EFFECT_SPEED_DOWN_2
+	const EFFECT_SP_ATK_DOWN_2
+	const EFFECT_SP_DEF_DOWN_2
+	const EFFECT_ACCURACY_DOWN_2
+	const EFFECT_EVASION_DOWN_2
+	const EFFECT_REFLECT
+	const EFFECT_POISON
+	const EFFECT_PARALYZE
+	const EFFECT_ATTACK_DOWN_HIT
+	const EFFECT_DEFENSE_DOWN_HIT
+	const EFFECT_SPEED_DOWN_HIT
+	const EFFECT_SP_ATK_DOWN_HIT
+	const EFFECT_SP_DEF_DOWN_HIT
+	const EFFECT_ACCURACY_DOWN_HIT
+	const EFFECT_EVASION_DOWN_HIT
+	const EFFECT_SKY_ATTACK
+	const EFFECT_CONFUSE_HIT
+	const EFFECT_POISON_MULTI_HIT
+	const EFFECT_UNUSED_4E
+	const EFFECT_SUBSTITUTE
+	const EFFECT_HYPER_BEAM
+	const EFFECT_RAGE
+	const EFFECT_MIMIC
+	const EFFECT_METRONOME
+	const EFFECT_LEECH_SEED
+	const EFFECT_SPLASH
+	const EFFECT_DISABLE
+	const EFFECT_LEVEL_DAMAGE
+	const EFFECT_PSYWAVE
+	const EFFECT_COUNTER
+	const EFFECT_ENCORE
+	const EFFECT_PAIN_SPLIT
+	const EFFECT_SNORE
+	const EFFECT_CONVERSION2
+	const EFFECT_LOCK_ON
+	const EFFECT_SKETCH
+	const EFFECT_DEFROST_OPPONENT
+	const EFFECT_SLEEP_TALK
+	const EFFECT_DESTINY_BOND
+	const EFFECT_REVERSAL
+	const EFFECT_SPITE
+	const EFFECT_FALSE_SWIPE
+	const EFFECT_HEAL_BELL
+	const EFFECT_PRIORITY_HIT
+	const EFFECT_TRIPLE_KICK
+	const EFFECT_THIEF
+	const EFFECT_MEAN_LOOK
+	const EFFECT_NIGHTMARE
+	const EFFECT_FLAME_WHEEL
+	const EFFECT_CURSE
+	const EFFECT_UNUSED_6E
+	const EFFECT_PROTECT
+	const EFFECT_SPIKES
+	const EFFECT_FORESIGHT
+	const EFFECT_PERISH_SONG
+	const EFFECT_SANDSTORM
+	const EFFECT_ENDURE
+	const EFFECT_ROLLOUT
+	const EFFECT_SWAGGER
+	const EFFECT_FURY_CUTTER
+	const EFFECT_ATTRACT
+	const EFFECT_RETURN
+	const EFFECT_PRESENT
+	const EFFECT_FRUSTRATION
+	const EFFECT_SAFEGUARD
+	const EFFECT_SACRED_FIRE
+	const EFFECT_MAGNITUDE
+	const EFFECT_BATON_PASS
+	const EFFECT_PURSUIT
+	const EFFECT_RAPID_SPIN
+	const EFFECT_UNUSED_82
+	const EFFECT_UNUSED_83
+	const EFFECT_MORNING_SUN
+	const EFFECT_SYNTHESIS
+	const EFFECT_MOONLIGHT
+	const EFFECT_HIDDEN_POWER
+	const EFFECT_RAIN_DANCE
+	const EFFECT_SUNNY_DAY
+	const EFFECT_DEFENSE_UP_HIT
+	const EFFECT_ATTACK_UP_HIT
+	const EFFECT_ALL_UP_HIT
+	const EFFECT_FAKE_OUT
+	const EFFECT_BELLY_DRUM
+	const EFFECT_PSYCH_UP
+	const EFFECT_MIRROR_COAT
+	const EFFECT_SKULL_BASH
+	const EFFECT_TWISTER
+	const EFFECT_EARTHQUAKE
+	const EFFECT_FUTURE_SIGHT
+	const EFFECT_GUST
+	const EFFECT_STOMP
+	const EFFECT_SOLARBEAM
+	const EFFECT_THUNDER
+	const EFFECT_TELEPORT
+	const EFFECT_BEAT_UP
+	const EFFECT_FLY
+	const EFFECT_DEFENSE_CURL
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
index 13cb577bb..91ff79f2b 100644
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -1,21 +1,22 @@
 ; pokemon ids
 ; indexes for:
-; - CryHeaders (see data/pokemon/cry_headers.asm)
+; - PokemonNames (see data/pokemon/names.asm)
 ; - BaseData (see data/pokemon/base_stats.asm)
-; - EggMovePointers (see data/pokemon/egg_move_pointers.asm)
 ; - EvosAttacksPointers (see data/pokemon/evos_attacks_pointers.asm)
-; - PokemonNames (see data/pokemon/pokemon_names.asm)
+; - EggMovePointers (see data/pokemon/egg_move_pointers.asm)
+; - PokemonCries (see data/pokemon/cries.asm)
+; - MonMenuIcons (see data/pokemon/menu_icons.asm)
+; - PokemonPicPointers (see data/pokemon/pic_pointers.asm)
+; - PokemonPalettes (see data/pokemon/palettes.asm)
 ; - PokedexDataPointerTable (see data/pokemon/dex_entry_pointers.asm)
-; - AnimationPointers (see gfx/pics/anim_pointers.asm)
-; - BitmasksPointers (see gfx/pics/bitmask_pointers.asm)
-; - AnimationExtraPointers (see gfx/pics/extra_pointers.asm)
-; - FramesPointers (see gfx/pics/frame_pointers.asm)
-; - PokemonPalettes (see gfx/pics/palette_pointers.asm)
-; - PicPointers (see gfx/pics/pic_pointers.asm)
 ; - AlphabeticalPokedexOrder (see data/pokemon/dex_order_alpha.asm)
 ; - NewPokedexOrder (see data/pokemon/dex_order_new.asm)
-; - MonMenuIcons (see data/pokemon/menu_icons.asm)
 ; - Pokered_MonIndices (see data/time_capsule/mon_order.asm)
+; - AnimationPointers (see gfx/pokemon/anim_pointers.asm)
+; - AnimationExtraPointers (see gfx/pokemon/extra_pointers.asm)
+; - BitmasksPointers (see gfx/pokemon/bitmask_pointers.asm)
+; - FramesPointers (see gfx/pokemon/frame_pointers.asm)
+; - Footprints (see gfx/footprints.asm)
 ; - SortedPokemon (see mobile/fixed_words.asm)
 const_value set 1
 	const BULBASAUR  ; 01
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
index 4093adfa9..c9eb84041 100644
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -102,49 +102,6 @@ REDMON_STRUCT_LENGTH EQU 44
 PARTY_LENGTH EQU 6
 
 
-; IconPointers indexes (see gfx/icon_pointers.asm)
-	const_def
-	const ICON_NULL
-	const ICON_POLIWAG
-	const ICON_JIGGLYPUFF
-	const ICON_DIGLETT
-	const ICON_PIKACHU
-	const ICON_STARYU
-	const ICON_FISH
-	const ICON_BIRD
-	const ICON_MONSTER
-	const ICON_CLEFAIRY
-	const ICON_ODDISH
-	const ICON_BUG
-	const ICON_GHOST
-	const ICON_LAPRAS
-	const ICON_HUMANSHAPE
-	const ICON_FOX
-	const ICON_EQUINE
-	const ICON_SHELL
-	const ICON_BLOB
-	const ICON_SERPENT
-	const ICON_VOLTORB
-	const ICON_SQUIRTLE
-	const ICON_BULBASAUR
-	const ICON_CHARMANDER
-	const ICON_CATERPILLAR
-	const ICON_UNOWN
-	const ICON_GEODUDE
-	const ICON_FIGHTER
-	const ICON_EGG
-	const ICON_JELLYFISH
-	const ICON_MOTH
-	const ICON_BAT
-	const ICON_SNORLAX
-	const ICON_HO_OH
-	const ICON_LUGIA
-	const ICON_GYARADOS
-	const ICON_SLOWPOKE
-	const ICON_SUDOWOODO
-	const ICON_BIGMON
-
-
 ; evolution types (used in data/pokemon/evos_attacks.asm)
 const_value SET 1
 	const EVOLVE_LEVEL
@@ -192,6 +149,18 @@ FISHSWARM_QWILFISH EQU 1
 FISHSWARM_REMORAID EQU 2
 
 
+; PokeAnims indexes (see engine/pic_animation.asm)
+	const_def
+	const ANIM_MON_SLOW
+	const ANIM_MON_NORMAL
+	const ANIM_MON_MENU
+	const ANIM_MON_TRADE
+	const ANIM_MON_EVOLVE
+	const ANIM_MON_HATCH
+	const ANIM_MON_UNUSED
+	const ANIM_MON_EGG1
+	const ANIM_MON_EGG2
+
 ; MonMenuOptions indexes (see engine/mon_menu.asm)
 const_value SET 1
 ; moves
diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm
new file mode 100644
index 000000000..8bb2aed35
--- /dev/null
+++ b/constants/sprite_anim_constants.asm
@@ -0,0 +1,316 @@
+; sprite_anim_struct members (see macros/wram.asm)
+	const_def
+	const SPRITEANIMSTRUCT_INDEX           ; 0
+	const SPRITEANIMSTRUCT_FRAMESET_ID     ; 1
+	const SPRITEANIMSTRUCT_ANIM_SEQ_ID     ; 2
+	const SPRITEANIMSTRUCT_TILE_ID         ; 3
+	const SPRITEANIMSTRUCT_XCOORD          ; 4
+	const SPRITEANIMSTRUCT_YCOORD          ; 5
+	const SPRITEANIMSTRUCT_XOFFSET         ; 6
+	const SPRITEANIMSTRUCT_YOFFSET         ; 7
+	const SPRITEANIMSTRUCT_DURATION        ; 8
+	const SPRITEANIMSTRUCT_DURATIONOFFSET  ; 9
+	const SPRITEANIMSTRUCT_FRAME           ; a
+	const SPRITEANIMSTRUCT_JUMPTABLE_INDEX ; b
+	const SPRITEANIMSTRUCT_0C              ; c
+	const SPRITEANIMSTRUCT_0D              ; d
+	const SPRITEANIMSTRUCT_0E              ; e
+	const SPRITEANIMSTRUCT_0F              ; f
+
+; SpriteAnimSeqData indexes (see data/sprite_anims/sequences.asm)
+	const_def
+	const SPRITE_ANIM_INDEX_PARTY_MON               ; 00
+	const SPRITE_ANIM_INDEX_GS_TITLE_TRAIL          ; 01
+	const SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR    ; 02
+	const SPRITE_ANIM_INDEX_GAMEFREAK_LOGO          ; 03
+	const SPRITE_ANIM_INDEX_GS_INTRO_STAR           ; 04
+	const SPRITE_ANIM_INDEX_GS_INTRO_SPARKLE        ; 05
+	const SPRITE_ANIM_INDEX_SLOTS_GOLEM             ; 06
+	const SPRITE_ANIM_INDEX_SLOTS_CHANSEY           ; 07
+	const SPRITE_ANIM_INDEX_SLOTS_EGG               ; 08
+	const SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR     ; 09
+	const SPRITE_ANIM_INDEX_RED_WALK                ; 0a
+	const SPRITE_ANIM_INDEX_UNUSED_CURSOR           ; 0b
+	const SPRITE_ANIM_INDEX_DUMMY_GAME              ; 0c
+	const SPRITE_ANIM_INDEX_POKEGEAR_ARROW          ; 0d
+	const SPRITE_ANIM_INDEX_TRADE_POKE_BALL         ; 0e
+	const SPRITE_ANIM_INDEX_TRADE_POOF              ; 0f
+	const SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE        ; 10
+	const SPRITE_ANIM_INDEX_TRADEMON_ICON           ; 11
+	const SPRITE_ANIM_INDEX_TRADEMON_BUBBLE         ; 12
+	const SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT ; 13
+	const SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB       ; 14
+	const SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED        ; 15
+	const SPRITE_ANIM_INDEX_LEAF                    ; 16
+	const SPRITE_ANIM_INDEX_CUT_TREE                ; 17
+	const SPRITE_ANIM_INDEX_FLY_LEAF                ; 18
+	const SPRITE_ANIM_INDEX_EGG_CRACK               ; 19
+	const SPRITE_ANIM_INDEX_1A                      ; 1a
+	const SPRITE_ANIM_INDEX_HEADBUTT                ; 1b
+	const SPRITE_ANIM_INDEX_EGG_HATCH               ; 1c
+	const SPRITE_ANIM_INDEX_1D                      ; 1d
+	const SPRITE_ANIM_INDEX_BLUE_WALK               ; 1e
+	const SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE       ; 1f
+	const SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL  ; 20
+	const SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL    ; 21
+	const SPRITE_ANIM_INDEX_MOBILE_22               ; 22
+	const SPRITE_ANIM_INDEX_MOBILE_23               ; 23
+	const SPRITE_ANIM_INDEX_MOBILE_24               ; 24
+	const SPRITE_ANIM_INDEX_MOBILE_25               ; 25
+	const SPRITE_ANIM_INDEX_INTRO_SUICUNE           ; 26
+	const SPRITE_ANIM_INDEX_INTRO_PICHU             ; 27
+	const SPRITE_ANIM_INDEX_INTRO_WOOPER            ; 28
+	const SPRITE_ANIM_INDEX_INTRO_UNOWN             ; 29
+	const SPRITE_ANIM_INDEX_INTRO_UNOWN_F           ; 2a
+	const SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY      ; 2b
+	const SPRITE_ANIM_INDEX_CELEBI                  ; 2c
+
+; DoAnimFrame.Jumptable indexes (see engine/sprite_anims.asm)
+	const_def
+	const SPRITE_ANIM_SEQ_NULL                 ; 00
+	const SPRITE_ANIM_SEQ_PARTY_MON            ; 01
+	const SPRITE_ANIM_SEQ_PARTY_MON_SWITCH     ; 02
+	const SPRITE_ANIM_SEQ_PARTY_MON_SELECTED   ; 03
+	const SPRITE_ANIM_SEQ_GS_TITLE_TRAIL       ; 04
+	const SPRITE_ANIM_SEQ_NAMING_SCREEN_CURSOR ; 05
+	const SPRITE_ANIM_SEQ_GAMEFREAK_LOGO       ; 06
+	const SPRITE_ANIM_SEQ_GS_INTRO_STAR        ; 07
+	const SPRITE_ANIM_SEQ_GS_INTRO_SPARKLE     ; 08
+	const SPRITE_ANIM_SEQ_SLOTS_GOLEM          ; 09
+	const SPRITE_ANIM_SEQ_SLOTS_CHANSEY        ; 0a
+	const SPRITE_ANIM_SEQ_SLOTS_EGG            ; 0b
+	const SPRITE_ANIM_SEQ_MAIL_CURSOR          ; 0c
+	const SPRITE_ANIM_SEQ_FOR_UNUSED_CURSOR    ; 0d
+	const SPRITE_ANIM_SEQ_DUMMY_GAME_CURSOR    ; 0e
+	const SPRITE_ANIM_SEQ_POKEGEAR_ARROW       ; 0f
+	const SPRITE_ANIM_SEQ_TRADE_POKE_BALL      ; 10
+	const SPRITE_ANIM_SEQ_TRADE_TUBE_BULGE     ; 11
+	const SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE     ; 12
+	const SPRITE_ANIM_SEQ_REVEAL_NEW_MON       ; 13
+	const SPRITE_ANIM_SEQ_RADIO_TUNING_KNOB    ; 14
+	const SPRITE_ANIM_SEQ_CUT_LEAVES           ; 15
+	const SPRITE_ANIM_SEQ_FLY_FROM             ; 16
+	const SPRITE_ANIM_SEQ_FLY_LEAF             ; 17
+	const SPRITE_ANIM_SEQ_FLY_TO               ; 18
+	const SPRITE_ANIM_SEQ_19                   ; 19
+	const SPRITE_ANIM_SEQ_1A                   ; 1a
+	const SPRITE_ANIM_SEQ_FOR_MOBILE_23        ; 1b
+	const SPRITE_ANIM_SEQ_FOR_MOBILE_24        ; 1c
+	const SPRITE_ANIM_SEQ_INTRO_SUICUNE        ; 1d
+	const SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER   ; 1e
+	const SPRITE_ANIM_SEQ_CELEBI               ; 1f
+	const SPRITE_ANIM_SEQ_INTRO_UNOWN          ; 20
+	const SPRITE_ANIM_SEQ_INTRO_UNOWN_F        ; 21
+	const SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY   ; 22
+
+; SpriteAnimFrameData indexes (see data/sprite_anims/framesets.asm)
+	const_def
+	const SPRITE_ANIM_FRAMESET_00
+	const SPRITE_ANIM_FRAMESET_PARTY_MON ; 01
+	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_MAIL ; 02
+	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_ITEM ; 03
+	const SPRITE_ANIM_FRAMESET_PARTY_MON_FAST ; 04
+	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_MAIL_FAST ; 05
+	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_ITEM_FAST ; 06
+	const SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL ; 07
+	const SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR ; 08
+	const SPRITE_ANIM_FRAMESET_09
+	const SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO ; 0a
+	const SPRITE_ANIM_FRAMESET_GS_INTRO_STAR ; 0b
+	const SPRITE_ANIM_FRAMESET_GS_INTRO_SPARKLE ; 0c
+	const SPRITE_ANIM_FRAMESET_SLOTS_GOLEM ; 0d
+	const SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY ; 0e
+	const SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY_2 ; 0f
+	const SPRITE_ANIM_FRAMESET_SLOTS_EGG ; 10
+	const SPRITE_ANIM_FRAMESET_RED_WALK ; 11
+	const SPRITE_ANIM_FRAMESET_STILL_CURSOR ; 12
+	const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL ; 13
+	const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_0 ; 14
+	const SPRITE_ANIM_FRAMESET_TRADE_POOF ; 15
+	const SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE ; 16
+	const SPRITE_ANIM_FRAMESET_TRADEMON_ICON ; 17
+	const SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE ; 18
+	const SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT ; 19
+	const SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB ; 1a
+	const SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED ; 1b
+	const SPRITE_ANIM_FRAMESET_1C
+	const SPRITE_ANIM_FRAMESET_LEAF ; 1d
+	const SPRITE_ANIM_FRAMESET_CUT_TREE ; 1e
+	const SPRITE_ANIM_FRAMESET_EGG_CRACK ; 1f
+	const SPRITE_ANIM_FRAMESET_EGG_HATCH ; 20
+	const SPRITE_ANIM_FRAMESET_21
+	const SPRITE_ANIM_FRAMESET_22
+	const SPRITE_ANIM_FRAMESET_23
+	const SPRITE_ANIM_FRAMESET_24
+	const SPRITE_ANIM_FRAMESET_HEADBUTT ; 25
+	const SPRITE_ANIM_FRAMESET_26
+	const SPRITE_ANIM_FRAMESET_27
+	const SPRITE_ANIM_FRAMESET_28
+	const SPRITE_ANIM_FRAMESET_29
+	const SPRITE_ANIM_FRAMESET_2A
+	const SPRITE_ANIM_FRAMESET_2B
+	const SPRITE_ANIM_FRAMESET_2C
+	const SPRITE_ANIM_FRAMESET_BLUE_WALK ; 2d
+	const SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BLUE ; 2e
+	const SPRITE_ANIM_FRAMESET_MOBILE_TRADE_SENT_BALL ; 2f
+	const SPRITE_ANIM_FRAMESET_MOBILE_TRADE_OT_BALL ; 30
+	const SPRITE_ANIM_FRAMESET_FOR_MOBILE_22 ; 31
+	const SPRITE_ANIM_FRAMESET_FOR_MOBILE_23 ; 32
+	const SPRITE_ANIM_FRAMESET_FOR_MOBILE_24 ; 33
+	const SPRITE_ANIM_FRAMESET_FOR_MOBILE_25 ; 34
+	const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE ; 35
+	const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_2 ; 36
+	const SPRITE_ANIM_FRAMESET_INTRO_PICHU ; 37
+	const SPRITE_ANIM_FRAMESET_INTRO_WOOPER ; 38
+	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_1 ; 39
+	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_2 ; 3a
+	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_3 ; 3b
+	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_4 ; 3c
+	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F_2 ; 3d
+	const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY ; 3e
+	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F ; 3f
+	const SPRITE_ANIM_FRAMESET_CELEBI_LEFT ; 40
+	const SPRITE_ANIM_FRAMESET_CELEBI_RIGHT ; 41
+
+; SpriteAnimOAMData indexes (see data/sprite_anims/oam.asm)
+	const_def
+	const SPRITE_ANIM_OAMSET_RED_WALK_1 ; 00
+	const SPRITE_ANIM_OAMSET_RED_WALK_2 ; 01
+	const SPRITE_ANIM_OAMSET_02
+	const SPRITE_ANIM_OAMSET_03
+	const SPRITE_ANIM_OAMSET_04
+	const SPRITE_ANIM_OAMSET_05
+	const SPRITE_ANIM_OAMSET_06
+	const SPRITE_ANIM_OAMSET_07
+	const SPRITE_ANIM_OAMSET_08
+	const SPRITE_ANIM_OAMSET_09
+	const SPRITE_ANIM_OAMSET_0A
+	const SPRITE_ANIM_OAMSET_0B
+	const SPRITE_ANIM_OAMSET_0C
+	const SPRITE_ANIM_OAMSET_0D
+	const SPRITE_ANIM_OAMSET_0E
+	const SPRITE_ANIM_OAMSET_0F
+	const SPRITE_ANIM_OAMSET_10
+	const SPRITE_ANIM_OAMSET_11
+	const SPRITE_ANIM_OAMSET_12
+	const SPRITE_ANIM_OAMSET_13
+	const SPRITE_ANIM_OAMSET_14
+	const SPRITE_ANIM_OAMSET_15
+	const SPRITE_ANIM_OAMSET_16
+	const SPRITE_ANIM_OAMSET_17
+	const SPRITE_ANIM_OAMSET_18
+	const SPRITE_ANIM_OAMSET_19
+	const SPRITE_ANIM_OAMSET_1A
+	const SPRITE_ANIM_OAMSET_1B
+	const SPRITE_ANIM_OAMSET_1C
+	const SPRITE_ANIM_OAMSET_1D
+	const SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_1 ; 1e
+	const SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_2 ; 1f
+	const SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR ; 20
+	const SPRITE_ANIM_OAMSET_FOR_FRAMESET_09 ; 21
+	const SPRITE_ANIM_OAMSET_22
+	const SPRITE_ANIM_OAMSET_GS_INTRO_STAR ; 23
+	const SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_1 ; 24
+	const SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_2 ; 25
+	const SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_3 ; 26
+	const SPRITE_ANIM_OAMSET_SLOTS_GOLEM_1 ; 27
+	const SPRITE_ANIM_OAMSET_SLOTS_GOLEM_2 ; 28
+	const SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_1 ; 29
+	const SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_2 ; 2a
+	const SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_3 ; 2b
+	const SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_4 ; 2c
+	const SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_5 ; 2d
+	const SPRITE_ANIM_OAMSET_SLOTS_EGG ; 2e
+	const SPRITE_ANIM_OAMSET_STILL_CURSOR ; 2f
+	const SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1 ; 30
+	const SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2 ; 31
+	const SPRITE_ANIM_OAMSET_TRADE_POOF_1 ; 32
+	const SPRITE_ANIM_OAMSET_TRADE_POOF_2 ; 33
+	const SPRITE_ANIM_OAMSET_TRADE_POOF_3 ; 34
+	const SPRITE_ANIM_OAMSET_35
+	const SPRITE_ANIM_OAMSET_36
+	const SPRITE_ANIM_OAMSET_TRADEMON_ICON_1 ; 37
+	const SPRITE_ANIM_OAMSET_TRADEMON_ICON_2 ; 38
+	const SPRITE_ANIM_OAMSET_TRADEMON_BUBBLE ; 39
+	const SPRITE_ANIM_OAMSET_EVOLUTION_BALL_OF_LIGHT_1 ; 3a
+	const SPRITE_ANIM_OAMSET_EVOLUTION_BALL_OF_LIGHT_2 ; 3b
+	const SPRITE_ANIM_OAMSET_RADIO_TUNING_KNOB ; 3c
+	const SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_1 ; 3d
+	const SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_2 ; 3e
+	const SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_1 ; 3f
+	const SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_2 ; 40
+	const SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_1 ; 41
+	const SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_2 ; 42
+	const SPRITE_ANIM_OAMSET_43
+	const SPRITE_ANIM_OAMSET_44
+	const SPRITE_ANIM_OAMSET_45
+	const SPRITE_ANIM_OAMSET_46
+	const SPRITE_ANIM_OAMSET_47
+	const SPRITE_ANIM_OAMSET_48
+	const SPRITE_ANIM_OAMSET_49
+	const SPRITE_ANIM_OAMSET_4A
+	const SPRITE_ANIM_OAMSET_4B
+	const SPRITE_ANIM_OAMSET_4C
+	const SPRITE_ANIM_OAMSET_4D
+	const SPRITE_ANIM_OAMSET_4E
+	const SPRITE_ANIM_OAMSET_LEAF ; 4f
+	const SPRITE_ANIM_OAMSET_TREE_1 ; 50
+	const SPRITE_ANIM_OAMSET_CUT_TREE_2 ; 51
+	const SPRITE_ANIM_OAMSET_CUT_TREE_3 ; 52
+	const SPRITE_ANIM_OAMSET_CUT_TREE_4 ; 53
+	const SPRITE_ANIM_OAMSET_EGG_CRACK ; 54
+	const SPRITE_ANIM_OAMSET_55
+	const SPRITE_ANIM_OAMSET_56
+	const SPRITE_ANIM_OAMSET_57
+	const SPRITE_ANIM_OAMSET_58
+	const SPRITE_ANIM_OAMSET_59
+	const SPRITE_ANIM_OAMSET_5A
+	const SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2 ; 5b
+	const SPRITE_ANIM_OAMSET_5C
+	const SPRITE_ANIM_OAMSET_5D
+	const SPRITE_ANIM_OAMSET_5E
+	const SPRITE_ANIM_OAMSET_5F
+	const SPRITE_ANIM_OAMSET_60
+	const SPRITE_ANIM_OAMSET_61
+	const SPRITE_ANIM_OAMSET_62
+	const SPRITE_ANIM_OAMSET_BLUE_WALK_1 ; 63
+	const SPRITE_ANIM_OAMSET_BLUE_WALK_2 ; 64
+	const SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_1 ; 65
+	const SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_2 ; 66
+	const SPRITE_ANIM_OAMSET_FOR_MOBILE_22_1 ; 67
+	const SPRITE_ANIM_OAMSET_FOR_MOBILE_22_2 ; 68
+	const SPRITE_ANIM_OAMSET_FOR_MOBILE_25_1 ; 69
+	const SPRITE_ANIM_OAMSET_FOR_MOBILE_25_2 ; 6a
+	const SPRITE_ANIM_OAMSET_FOR_MOBILE_25_3 ; 6b
+	const SPRITE_ANIM_OAMSET_FOR_MOBILE_23 ; 6c
+	const SPRITE_ANIM_OAMSET_FOR_MOBILE_24 ; 6d
+	const SPRITE_ANIM_OAMSET_INTRO_SUICUNE_1 ; 6e
+	const SPRITE_ANIM_OAMSET_INTRO_SUICUNE_2 ; 6f
+	const SPRITE_ANIM_OAMSET_INTRO_SUICUNE_3 ; 70
+	const SPRITE_ANIM_OAMSET_INTRO_SUICUNE_4 ; 71
+	const SPRITE_ANIM_OAMSET_INTRO_PICHU_1 ; 72
+	const SPRITE_ANIM_OAMSET_INTRO_PICHU_2 ; 73
+	const SPRITE_ANIM_OAMSET_INTRO_PICHU_3 ; 74
+	const SPRITE_ANIM_OAMSET_INTRO_WOOPER ; 75
+	const SPRITE_ANIM_OAMSET_INTRO_UNOWN_1 ; 76
+	const SPRITE_ANIM_OAMSET_INTRO_UNOWN_2 ; 77
+	const SPRITE_ANIM_OAMSET_INTRO_UNOWN_3 ; 78
+	const SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_1 ; 79
+	const SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_2 ; 7a
+	const SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_3 ; 7b
+	const SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_4 ; 7c
+	const SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_5 ; 7d
+	const SPRITE_ANIM_OAMSET_INTRO_SUICUNE_AWAY ; 7e
+	const SPRITE_ANIM_OAMSET_CELEBI_1 ; 7f
+	const SPRITE_ANIM_OAMSET_CELEBI_2 ; 80
+	const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_1 ; 81
+	const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_2 ; 82
+	const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_3 ; 83
+	const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_4 ; 84
+	const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_5 ; 85
+	const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_6 ; 86
+	const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_7 ; 87
+	const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_8 ; 88
+	const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_9 ; 89
+	const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_10 ; 8A
+	const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_11 ; 8B
diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm
index b008ac6c2..9e4b57c27 100644
--- a/constants/sprite_constants.asm
+++ b/constants/sprite_constants.asm
@@ -1,5 +1,5 @@
 ; sprite ids
-; SpriteHeaders indexes (see gfx/sprite_headers.asm)
+; OverworldSprites indexes (see gfx/sprite_data.asm)
 	const_def
 	const SPRITE_NONE ; 00
 	const SPRITE_CHRIS ; 01
diff --git a/constants/sprite_data_constants.asm b/constants/sprite_data_constants.asm
index 77d9e3975..43a3843fc 100644
--- a/constants/sprite_data_constants.asm
+++ b/constants/sprite_data_constants.asm
@@ -1,12 +1,12 @@
-; sprite_header struct members (see gfx/sprite_headers.asm)
+; overworld_sprite struct members (see gfx/sprite_data.asm)
 	const_def
-	const SPRITEHEADER_ADDR_LO ; 0
-	const SPRITEHEADER_ADDR_HI ; 1
-	const SPRITEHEADER_SIZE    ; 2
-	const SPRITEHEADER_BANK    ; 3
-	const SPRITEHEADER_TYPE    ; 4
-	const SPRITEHEADER_PALETTE ; 5
-NUM_SPRITEHEADER_FIELDS EQU const_value
+	const SPRITEDATA_ADDR    ; 0
+	const SPRITEDATA_ADDR_HI ; 1
+	const SPRITEDATA_SIZE    ; 2
+	const SPRITEDATA_BANK    ; 3
+	const SPRITEDATA_TYPE    ; 4
+	const SPRITEDATA_PALETTE ; 5
+NUM_SPRITEDATA_FIELDS EQU const_value
 
 ; sprite types
 const_value SET 1
@@ -192,320 +192,3 @@ SPRITEMOVEDATA_FIELDS EQU 6
 	const FACING_BOULDER_DUST_2 ; 1d
 	const FACING_GRASS_1        ; 1e
 	const FACING_GRASS_2        ; 1f
-
-; sprite_anim_struct members (see macros/wram.asm)
-	const_def
-	const SPRITEANIMSTRUCT_INDEX           ; 0
-	const SPRITEANIMSTRUCT_FRAMESET_ID     ; 1
-	const SPRITEANIMSTRUCT_ANIM_SEQ_ID     ; 2
-	const SPRITEANIMSTRUCT_TILE_ID         ; 3
-	const SPRITEANIMSTRUCT_XCOORD          ; 4
-	const SPRITEANIMSTRUCT_YCOORD          ; 5
-	const SPRITEANIMSTRUCT_XOFFSET         ; 6
-	const SPRITEANIMSTRUCT_YOFFSET         ; 7
-	const SPRITEANIMSTRUCT_DURATION        ; 8
-	const SPRITEANIMSTRUCT_DURATIONOFFSET  ; 9
-	const SPRITEANIMSTRUCT_FRAME           ; a
-	const SPRITEANIMSTRUCT_JUMPTABLE_INDEX ; b
-	const SPRITEANIMSTRUCT_0C              ; c
-	const SPRITEANIMSTRUCT_0D              ; d
-	const SPRITEANIMSTRUCT_0E              ; e
-	const SPRITEANIMSTRUCT_0F              ; f
-
-; SpriteAnimSeqData indexes (see data/sprite_anim_seqs.asm)
-	const_def
-	const SPRITE_ANIM_INDEX_PARTY_MON               ; 00
-	const SPRITE_ANIM_INDEX_GS_TITLE_TRAIL          ; 01
-	const SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR    ; 02
-	const SPRITE_ANIM_INDEX_GAMEFREAK_LOGO          ; 03
-	const SPRITE_ANIM_INDEX_GS_INTRO_STAR           ; 04
-	const SPRITE_ANIM_INDEX_GS_INTRO_SPARKLE        ; 05
-	const SPRITE_ANIM_INDEX_SLOTS_GOLEM             ; 06
-	const SPRITE_ANIM_INDEX_SLOTS_CHANSEY           ; 07
-	const SPRITE_ANIM_INDEX_SLOTS_EGG               ; 08
-	const SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR     ; 09
-	const SPRITE_ANIM_INDEX_RED_WALK                ; 0a
-	const SPRITE_ANIM_INDEX_UNUSED_CURSOR           ; 0b
-	const SPRITE_ANIM_INDEX_DUMMY_GAME              ; 0c
-	const SPRITE_ANIM_INDEX_POKEGEAR_ARROW          ; 0d
-	const SPRITE_ANIM_INDEX_TRADE_POKE_BALL         ; 0e
-	const SPRITE_ANIM_INDEX_TRADE_POOF              ; 0f
-	const SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE        ; 10
-	const SPRITE_ANIM_INDEX_TRADEMON_ICON           ; 11
-	const SPRITE_ANIM_INDEX_TRADEMON_BUBBLE         ; 12
-	const SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT ; 13
-	const SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB       ; 14
-	const SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED        ; 15
-	const SPRITE_ANIM_INDEX_LEAF                    ; 16
-	const SPRITE_ANIM_INDEX_CUT_TREE                ; 17
-	const SPRITE_ANIM_INDEX_FLY_LEAF                ; 18
-	const SPRITE_ANIM_INDEX_EGG_CRACK               ; 19
-	const SPRITE_ANIM_INDEX_1A                      ; 1a
-	const SPRITE_ANIM_INDEX_HEADBUTT                ; 1b
-	const SPRITE_ANIM_INDEX_EGG_HATCH               ; 1c
-	const SPRITE_ANIM_INDEX_1D                      ; 1d
-	const SPRITE_ANIM_INDEX_BLUE_WALK               ; 1e
-	const SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE       ; 1f
-	const SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL  ; 20
-	const SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL    ; 21
-	const SPRITE_ANIM_INDEX_MOBILE_22               ; 22
-	const SPRITE_ANIM_INDEX_MOBILE_23               ; 23
-	const SPRITE_ANIM_INDEX_MOBILE_24               ; 24
-	const SPRITE_ANIM_INDEX_MOBILE_25               ; 25
-	const SPRITE_ANIM_INDEX_INTRO_SUICUNE           ; 26
-	const SPRITE_ANIM_INDEX_INTRO_PICHU             ; 27
-	const SPRITE_ANIM_INDEX_INTRO_WOOPER            ; 28
-	const SPRITE_ANIM_INDEX_INTRO_UNOWN             ; 29
-	const SPRITE_ANIM_INDEX_INTRO_UNOWN_F           ; 2a
-	const SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY      ; 2b
-	const SPRITE_ANIM_INDEX_CELEBI                  ; 2c
-
-; DoAnimFrame.Jumptable indexes (see engine/sprite_anims.asm)
-	const_def
-	const SPRITE_ANIM_SEQ_NULL                 ; 00
-	const SPRITE_ANIM_SEQ_PARTY_MON            ; 01
-	const SPRITE_ANIM_SEQ_PARTY_MON_SWITCH     ; 02
-	const SPRITE_ANIM_SEQ_PARTY_MON_SELECTED   ; 03
-	const SPRITE_ANIM_SEQ_GS_TITLE_TRAIL       ; 04
-	const SPRITE_ANIM_SEQ_NAMING_SCREEN_CURSOR ; 05
-	const SPRITE_ANIM_SEQ_GAMEFREAK_LOGO       ; 06
-	const SPRITE_ANIM_SEQ_GS_INTRO_STAR        ; 07
-	const SPRITE_ANIM_SEQ_GS_INTRO_SPARKLE     ; 08
-	const SPRITE_ANIM_SEQ_SLOTS_GOLEM          ; 09
-	const SPRITE_ANIM_SEQ_SLOTS_CHANSEY        ; 0a
-	const SPRITE_ANIM_SEQ_SLOTS_EGG            ; 0b
-	const SPRITE_ANIM_SEQ_MAIL_CURSOR          ; 0c
-	const SPRITE_ANIM_SEQ_FOR_UNUSED_CURSOR    ; 0d
-	const SPRITE_ANIM_SEQ_DUMMY_GAME_CURSOR    ; 0e
-	const SPRITE_ANIM_SEQ_POKEGEAR_ARROW       ; 0f
-	const SPRITE_ANIM_SEQ_TRADE_POKE_BALL      ; 10
-	const SPRITE_ANIM_SEQ_TRADE_TUBE_BULGE     ; 11
-	const SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE     ; 12
-	const SPRITE_ANIM_SEQ_REVEAL_NEW_MON       ; 13
-	const SPRITE_ANIM_SEQ_RADIO_TUNING_KNOB    ; 14
-	const SPRITE_ANIM_SEQ_CUT_LEAVES           ; 15
-	const SPRITE_ANIM_SEQ_FLY_FROM             ; 16
-	const SPRITE_ANIM_SEQ_FLY_LEAF             ; 17
-	const SPRITE_ANIM_SEQ_FLY_TO               ; 18
-	const SPRITE_ANIM_SEQ_19                   ; 19
-	const SPRITE_ANIM_SEQ_1A                   ; 1a
-	const SPRITE_ANIM_SEQ_FOR_MOBILE_23        ; 1b
-	const SPRITE_ANIM_SEQ_FOR_MOBILE_24        ; 1c
-	const SPRITE_ANIM_SEQ_INTRO_SUICUNE        ; 1d
-	const SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER   ; 1e
-	const SPRITE_ANIM_SEQ_CELEBI               ; 1f
-	const SPRITE_ANIM_SEQ_INTRO_UNOWN          ; 20
-	const SPRITE_ANIM_SEQ_INTRO_UNOWN_F        ; 21
-	const SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY   ; 22
-
-; SpriteAnimFrameData indexes (see data/sprite_anim_frames.asm)
-	const_def
-	const SPRITE_ANIM_FRAMESET_00
-	const SPRITE_ANIM_FRAMESET_PARTY_MON ; 01
-	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_MAIL ; 02
-	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_ITEM ; 03
-	const SPRITE_ANIM_FRAMESET_PARTY_MON_FAST ; 04
-	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_MAIL_FAST ; 05
-	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_ITEM_FAST ; 06
-	const SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL ; 07
-	const SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR ; 08
-	const SPRITE_ANIM_FRAMESET_09
-	const SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO ; 0a
-	const SPRITE_ANIM_FRAMESET_GS_INTRO_STAR ; 0b
-	const SPRITE_ANIM_FRAMESET_GS_INTRO_SPARKLE ; 0c
-	const SPRITE_ANIM_FRAMESET_SLOTS_GOLEM ; 0d
-	const SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY ; 0e
-	const SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY_2 ; 0f
-	const SPRITE_ANIM_FRAMESET_SLOTS_EGG ; 10
-	const SPRITE_ANIM_FRAMESET_RED_WALK ; 11
-	const SPRITE_ANIM_FRAMESET_STILL_CURSOR ; 12
-	const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL ; 13
-	const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_0 ; 14
-	const SPRITE_ANIM_FRAMESET_TRADE_POOF ; 15
-	const SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE ; 16
-	const SPRITE_ANIM_FRAMESET_TRADEMON_ICON ; 17
-	const SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE ; 18
-	const SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT ; 19
-	const SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB ; 1a
-	const SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED ; 1b
-	const SPRITE_ANIM_FRAMESET_1C
-	const SPRITE_ANIM_FRAMESET_LEAF ; 1d
-	const SPRITE_ANIM_FRAMESET_CUT_TREE ; 1e
-	const SPRITE_ANIM_FRAMESET_EGG_CRACK ; 1f
-	const SPRITE_ANIM_FRAMESET_EGG_HATCH ; 20
-	const SPRITE_ANIM_FRAMESET_21
-	const SPRITE_ANIM_FRAMESET_22
-	const SPRITE_ANIM_FRAMESET_23
-	const SPRITE_ANIM_FRAMESET_24
-	const SPRITE_ANIM_FRAMESET_HEADBUTT ; 25
-	const SPRITE_ANIM_FRAMESET_26
-	const SPRITE_ANIM_FRAMESET_27
-	const SPRITE_ANIM_FRAMESET_28
-	const SPRITE_ANIM_FRAMESET_29
-	const SPRITE_ANIM_FRAMESET_2A
-	const SPRITE_ANIM_FRAMESET_2B
-	const SPRITE_ANIM_FRAMESET_2C
-	const SPRITE_ANIM_FRAMESET_BLUE_WALK ; 2d
-	const SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BLUE ; 2e
-	const SPRITE_ANIM_FRAMESET_MOBILE_TRADE_SENT_BALL ; 2f
-	const SPRITE_ANIM_FRAMESET_MOBILE_TRADE_OT_BALL ; 30
-	const SPRITE_ANIM_FRAMESET_FOR_MOBILE_22 ; 31
-	const SPRITE_ANIM_FRAMESET_FOR_MOBILE_23 ; 32
-	const SPRITE_ANIM_FRAMESET_FOR_MOBILE_24 ; 33
-	const SPRITE_ANIM_FRAMESET_FOR_MOBILE_25 ; 34
-	const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE ; 35
-	const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_2 ; 36
-	const SPRITE_ANIM_FRAMESET_INTRO_PICHU ; 37
-	const SPRITE_ANIM_FRAMESET_INTRO_WOOPER ; 38
-	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_1 ; 39
-	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_2 ; 3a
-	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_3 ; 3b
-	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_4 ; 3c
-	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F_2 ; 3d
-	const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY ; 3e
-	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F ; 3f
-	const SPRITE_ANIM_FRAMESET_CELEBI_LEFT ; 40
-	const SPRITE_ANIM_FRAMESET_CELEBI_RIGHT ; 41
-
-; SpriteAnimOAMData indexes (see data/sprite_anim_oam.asm)
-	const_def
-	const SPRITE_ANIM_FRAME_IDX_RED_WALK_1 ; 00
-	const SPRITE_ANIM_FRAME_IDX_RED_WALK_2 ; 01
-	const SPRITE_ANIM_FRAME_IDX_02
-	const SPRITE_ANIM_FRAME_IDX_03
-	const SPRITE_ANIM_FRAME_IDX_04
-	const SPRITE_ANIM_FRAME_IDX_05
-	const SPRITE_ANIM_FRAME_IDX_06
-	const SPRITE_ANIM_FRAME_IDX_07
-	const SPRITE_ANIM_FRAME_IDX_08
-	const SPRITE_ANIM_FRAME_IDX_09
-	const SPRITE_ANIM_FRAME_IDX_0A
-	const SPRITE_ANIM_FRAME_IDX_0B
-	const SPRITE_ANIM_FRAME_IDX_0C
-	const SPRITE_ANIM_FRAME_IDX_0D
-	const SPRITE_ANIM_FRAME_IDX_0E
-	const SPRITE_ANIM_FRAME_IDX_0F
-	const SPRITE_ANIM_FRAME_IDX_10
-	const SPRITE_ANIM_FRAME_IDX_11
-	const SPRITE_ANIM_FRAME_IDX_12
-	const SPRITE_ANIM_FRAME_IDX_13
-	const SPRITE_ANIM_FRAME_IDX_14
-	const SPRITE_ANIM_FRAME_IDX_15
-	const SPRITE_ANIM_FRAME_IDX_16
-	const SPRITE_ANIM_FRAME_IDX_17
-	const SPRITE_ANIM_FRAME_IDX_18
-	const SPRITE_ANIM_FRAME_IDX_19
-	const SPRITE_ANIM_FRAME_IDX_1A
-	const SPRITE_ANIM_FRAME_IDX_1B
-	const SPRITE_ANIM_FRAME_IDX_1C
-	const SPRITE_ANIM_FRAME_IDX_1D
-	const SPRITE_ANIM_FRAME_IDX_GS_TITLE_TRAIL_1 ; 1e
-	const SPRITE_ANIM_FRAME_IDX_GS_TITLE_TRAIL_2 ; 1f
-	const SPRITE_ANIM_FRAME_IDX_TEXT_ENTRY_CURSOR ; 20
-	const SPRITE_ANIM_FRAME_IDX_FOR_FRAMESET_09 ; 21
-	const SPRITE_ANIM_FRAME_IDX_22
-	const SPRITE_ANIM_FRAME_IDX_GS_INTRO_STAR ; 23
-	const SPRITE_ANIM_FRAME_IDX_GS_INTRO_SPARKLE_1 ; 24
-	const SPRITE_ANIM_FRAME_IDX_GS_INTRO_SPARKLE_2 ; 25
-	const SPRITE_ANIM_FRAME_IDX_GS_INTRO_SPARKLE_3 ; 26
-	const SPRITE_ANIM_FRAME_IDX_SLOTS_GOLEM_1 ; 27
-	const SPRITE_ANIM_FRAME_IDX_SLOTS_GOLEM_2 ; 28
-	const SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_1 ; 29
-	const SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_2 ; 2a
-	const SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_3 ; 2b
-	const SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_4 ; 2c
-	const SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_5 ; 2d
-	const SPRITE_ANIM_FRAME_IDX_SLOTS_EGG ; 2e
-	const SPRITE_ANIM_FRAME_IDX_STILL_CURSOR ; 2f
-	const SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1 ; 30
-	const SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2 ; 31
-	const SPRITE_ANIM_FRAME_IDX_TRADE_POOF_1 ; 32
-	const SPRITE_ANIM_FRAME_IDX_TRADE_POOF_2 ; 33
-	const SPRITE_ANIM_FRAME_IDX_TRADE_POOF_3 ; 34
-	const SPRITE_ANIM_FRAME_IDX_35
-	const SPRITE_ANIM_FRAME_IDX_36
-	const SPRITE_ANIM_FRAME_IDX_TRADEMON_ICON_1 ; 37
-	const SPRITE_ANIM_FRAME_IDX_TRADEMON_ICON_2 ; 38
-	const SPRITE_ANIM_FRAME_IDX_TRADEMON_BUBBLE ; 39
-	const SPRITE_ANIM_FRAME_IDX_EVOLUTION_BALL_OF_LIGHT_1 ; 3a
-	const SPRITE_ANIM_FRAME_IDX_EVOLUTION_BALL_OF_LIGHT_2 ; 3b
-	const SPRITE_ANIM_FRAME_IDX_RADIO_TUNING_KNOB ; 3c
-	const SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_1 ; 3d
-	const SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_2 ; 3e
-	const SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_1 ; 3f
-	const SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_2 ; 40
-	const SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_1 ; 41
-	const SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_2 ; 42
-	const SPRITE_ANIM_FRAME_IDX_43
-	const SPRITE_ANIM_FRAME_IDX_44
-	const SPRITE_ANIM_FRAME_IDX_45
-	const SPRITE_ANIM_FRAME_IDX_46
-	const SPRITE_ANIM_FRAME_IDX_47
-	const SPRITE_ANIM_FRAME_IDX_48
-	const SPRITE_ANIM_FRAME_IDX_49
-	const SPRITE_ANIM_FRAME_IDX_4A
-	const SPRITE_ANIM_FRAME_IDX_4B
-	const SPRITE_ANIM_FRAME_IDX_4C
-	const SPRITE_ANIM_FRAME_IDX_4D
-	const SPRITE_ANIM_FRAME_IDX_4E
-	const SPRITE_ANIM_FRAME_IDX_LEAF ; 4f
-	const SPRITE_ANIM_FRAME_IDX_TREE_1 ; 50
-	const SPRITE_ANIM_FRAME_IDX_CUT_TREE_2 ; 51
-	const SPRITE_ANIM_FRAME_IDX_CUT_TREE_3 ; 52
-	const SPRITE_ANIM_FRAME_IDX_CUT_TREE_4 ; 53
-	const SPRITE_ANIM_FRAME_IDX_EGG_CRACK ; 54
-	const SPRITE_ANIM_FRAME_IDX_55
-	const SPRITE_ANIM_FRAME_IDX_56
-	const SPRITE_ANIM_FRAME_IDX_57
-	const SPRITE_ANIM_FRAME_IDX_58
-	const SPRITE_ANIM_FRAME_IDX_59
-	const SPRITE_ANIM_FRAME_IDX_5A
-	const SPRITE_ANIM_FRAME_IDX_HEADBUTT_TREE_2 ; 5b
-	const SPRITE_ANIM_FRAME_IDX_5C
-	const SPRITE_ANIM_FRAME_IDX_5D
-	const SPRITE_ANIM_FRAME_IDX_5E
-	const SPRITE_ANIM_FRAME_IDX_5F
-	const SPRITE_ANIM_FRAME_IDX_60
-	const SPRITE_ANIM_FRAME_IDX_61
-	const SPRITE_ANIM_FRAME_IDX_62
-	const SPRITE_ANIM_FRAME_IDX_BLUE_WALK_1 ; 63
-	const SPRITE_ANIM_FRAME_IDX_BLUE_WALK_2 ; 64
-	const SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_BLUE_1 ; 65
-	const SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_BLUE_2 ; 66
-	const SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_22_1 ; 67
-	const SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_22_2 ; 68
-	const SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_1 ; 69
-	const SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_2 ; 6a
-	const SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_3 ; 6b
-	const SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_23 ; 6c
-	const SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_24 ; 6d
-	const SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_1 ; 6e
-	const SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_2 ; 6f
-	const SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_3 ; 70
-	const SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_4 ; 71
-	const SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_1 ; 72
-	const SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_2 ; 73
-	const SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_3 ; 74
-	const SPRITE_ANIM_FRAME_IDX_INTRO_WOOPER ; 75
-	const SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_1 ; 76
-	const SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_2 ; 77
-	const SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_3 ; 78
-	const SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_1 ; 79
-	const SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_2 ; 7a
-	const SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_3 ; 7b
-	const SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_4 ; 7c
-	const SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_5 ; 7d
-	const SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_AWAY ; 7e
-	const SPRITE_ANIM_FRAME_IDX_CELEBI_1 ; 7f
-	const SPRITE_ANIM_FRAME_IDX_CELEBI_2 ; 80
-	const SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_1 ; 81
-	const SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_2 ; 82
-	const SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_3 ; 83
-	const SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_4 ; 84
-	const SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_5 ; 85
-	const SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_6 ; 86
-	const SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_7 ; 87
-	const SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_8 ; 88
-	const SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_9 ; 89
-	const SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_10 ; 8A
-	const SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_11 ; 8B
diff --git a/constants/std_constants.asm b/constants/std_constants.asm
index 21fb6791f..06b0b4f2d 100644
--- a/constants/std_constants.asm
+++ b/constants/std_constants.asm
@@ -1,4 +1,4 @@
-; StdScripts indexes (see engine/std_scripts.asm)
+; StdScripts indexes (see engine/events/std_scripts.asm)
 ; also used in TileCollisionStdScripts (see data/collision_stdscripts.asm)
 	enum_start
 	enum pokecenternurse
diff --git a/constants/text_constants.asm b/constants/text_constants.asm
new file mode 100644
index 000000000..d867c77f7
--- /dev/null
+++ b/constants/text_constants.asm
@@ -0,0 +1,41 @@
+; name lengths
+NAME_LENGTH        EQU 11
+PLAYER_NAME_LENGTH EQU 8
+BOX_NAME_LENGTH    EQU 9
+PKMN_NAME_LENGTH   EQU 11
+MOVE_NAME_LENGTH   EQU 13
+ITEM_NAME_LENGTH   EQU 13
+TRAINER_CLASS_NAME_LENGTH EQU 13
+NAME_LENGTH_JAPANESE EQU 6
+
+; GetName types (see home/names.asm)
+PKMN_NAME     EQU 1
+MOVE_NAME     EQU 2
+; dummied out EQU 3
+ITEM_NAME     EQU 4
+PARTY_OT_NAME EQU 5
+ENEMY_OT_NAME EQU 6
+TRAINER_NAME  EQU 7
+; broken ptr  EQU 8
+
+; see home/text.asm
+BORDER_WIDTH   EQU 2
+TEXTBOX_WIDTH  EQU SCREEN_WIDTH
+TEXTBOX_INNERW EQU TEXTBOX_WIDTH - BORDER_WIDTH
+TEXTBOX_HEIGHT EQU 6
+TEXTBOX_INNERH EQU TEXTBOX_HEIGHT - BORDER_WIDTH
+TEXTBOX_X      EQU 0
+TEXTBOX_INNERX EQU TEXTBOX_X + 1
+TEXTBOX_Y      EQU SCREEN_HEIGHT - TEXTBOX_HEIGHT
+TEXTBOX_INNERY EQU TEXTBOX_Y + 2
+
+; PrintNum bit flags
+const_value set 5
+	const PRINTNUM_MONEY_F        ; 5
+	const PRINTNUM_RIGHTALIGN_F   ; 6
+	const PRINTNUM_LEADINGZEROS_F ; 7
+
+; PrintNum arguments (see engine/printnum.asm)
+PRINTNUM_MONEY          EQU 1 << PRINTNUM_MONEY_F
+PRINTNUM_RIGHTALIGN     EQU 1 << PRINTNUM_RIGHTALIGN_F
+PRINTNUM_LEADINGZEROS   EQU 1 << PRINTNUM_LEADINGZEROS_F
diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm
index 6a73f61d9..722de0c2b 100644
--- a/constants/tileset_constants.asm
+++ b/constants/tileset_constants.asm
@@ -1,4 +1,4 @@
-; Tilesets indexes (see tilesets/tileset_headers.asm)
+; Tilesets indexes (see tilesets/tilesets.asm)
 const_value SET 1
 	const TILESET_JOHTO_1              ; 01
 	const TILESET_JOHTO_2              ; 02
diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm
index c41a6ed58..2590ed34e 100644
--- a/constants/trainer_constants.asm
+++ b/constants/trainer_constants.asm
@@ -5,12 +5,14 @@ ENDM
 
 ; trainer class ids
 ; `trainerclass` indexes are for:
-; - TrainerClassAttributes (see data/trainers/trainer_attributes.asm)
-; - TrainerClassDVs (see data/trainers/trainer_dvs.asm)
-; - TrainerClassNames (see data/trainers/trainer_class_names.asm)
-; - TrainerEncounterMusic (see data/trainers/encounter_music.asm)
+; - TrainerClassNames (see data/trainers/class_names.asm)
+; - TrainerClassAttributes (see data/trainers/attributes.asm)
+; - TrainerClassDVs (see data/trainers/dvs.asm)
 ; - TrainerGroups (see data/trainers/party_pointers.asm)
-; - BTTrainerClassGenders (see data/trainers/gendered_trainers.asm)
+; - TrainerEncounterMusic (see data/trainers/encounter_music.asm)
+; - TrainerPicPointers (see data/trainers/pic_pointers.asm)
+; - TrainerPalettes (see data/trainers/palettes.asm)
+; - BTTrainerClassGenders (see data/trainers/genders.asm)
 ; trainer constants are Trainers indexes, for the sub-tables of TrainerGroups (see data/trainers/parties.asm)
 	enum_start
 CHRIS EQU __enum__
@@ -677,57 +679,3 @@ KRIS EQU __enum__
 	const EUSINE
 
 NUM_TRAINER_CLASSES EQU __enum__
-
-; TrainerClassAttributes fields (see data/trainers/trainer_attributes.asm)
-	const_def
-	const TRNATTR_ITEM1           ; 0
-	const TRNATTR_ITEM2           ; 1
-	const TRNATTR_BASEMONEY       ; 2
-	const TRNATTR_AI_MOVE_WEIGHTS ; 3
-	const TRNATTR_AI2             ; 4
-	const TRNATTR_AI_ITEM_SWITCH  ; 5
-	const TRNATTR_AI4             ; 6
-NUM_TRAINER_ATTRIBUTES EQU const_value
-
-; TRNATTR_AI_MOVE_WEIGHTS bit flags (wEnemyTrainerAIFlags)
-	const_def
-	const       NO_AI
-const_value = 0
-	shift_const AI_BASIC
-	shift_const AI_SETUP
-	shift_const AI_TYPES
-	shift_const AI_OFFENSIVE
-	shift_const AI_SMART
-	shift_const AI_OPPORTUNIST
-	shift_const AI_AGGRESSIVE
-	shift_const AI_CAUTIOUS
-	shift_const AI_STATUS
-	shift_const AI_RISKY
-	shift_const AI_10
-	shift_const AI_11
-	shift_const AI_12
-	shift_const AI_13
-	shift_const AI_14
-	shift_const AI_15
-
-; TRNATTR_AI_ITEM_SWITCH bit flags
-CONTEXT_USE_F      EQU 6
-UNKNOWN_USE_F      EQU 5
-ALWAYS_USE_F       EQU 4
-SWITCH_SOMETIMES_F EQU 2
-SWITCH_RARELY_F    EQU 1
-SWITCH_OFTEN_F     EQU 0
-
-CONTEXT_USE        EQU 1 << CONTEXT_USE_F
-UNKNOWN_USE        EQU 1 << UNKNOWN_USE_F
-ALWAYS_USE         EQU 1 << ALWAYS_USE_F
-SWITCH_SOMETIMES   EQU 1 << SWITCH_SOMETIMES_F
-SWITCH_RARELY      EQU 1 << SWITCH_RARELY_F
-SWITCH_OFTEN       EQU 1 << SWITCH_OFTEN_F
-
-; TrainerTypes indexes (see trainers/read_party.asm)
-	const_def
-	const TRAINERTYPE_NORMAL
-	const TRAINERTYPE_MOVES
-	const TRAINERTYPE_ITEM
-	const TRAINERTYPE_ITEM_MOVES
diff --git a/constants/trainer_data_constants.asm b/constants/trainer_data_constants.asm
new file mode 100644
index 000000000..2d87d8764
--- /dev/null
+++ b/constants/trainer_data_constants.asm
@@ -0,0 +1,53 @@
+; TrainerClassAttributes struct members (see data/trainers/attributes.asm)
+	const_def
+	const TRNATTR_ITEM1           ; 0
+	const TRNATTR_ITEM2           ; 1
+	const TRNATTR_BASEMONEY       ; 2
+	const TRNATTR_AI_MOVE_WEIGHTS ; 3
+	const TRNATTR_AI2             ; 4
+	const TRNATTR_AI_ITEM_SWITCH  ; 5
+	const TRNATTR_AI4             ; 6
+NUM_TRAINER_ATTRIBUTES EQU const_value
+
+; TRNATTR_AI_MOVE_WEIGHTS bit flags (wEnemyTrainerAIFlags)
+	const_def
+	const       NO_AI
+const_value = 0
+	shift_const AI_BASIC
+	shift_const AI_SETUP
+	shift_const AI_TYPES
+	shift_const AI_OFFENSIVE
+	shift_const AI_SMART
+	shift_const AI_OPPORTUNIST
+	shift_const AI_AGGRESSIVE
+	shift_const AI_CAUTIOUS
+	shift_const AI_STATUS
+	shift_const AI_RISKY
+	shift_const AI_10
+	shift_const AI_11
+	shift_const AI_12
+	shift_const AI_13
+	shift_const AI_14
+	shift_const AI_15
+
+; TRNATTR_AI_ITEM_SWITCH bit flags
+CONTEXT_USE_F      EQU 6
+UNKNOWN_USE_F      EQU 5
+ALWAYS_USE_F       EQU 4
+SWITCH_SOMETIMES_F EQU 2
+SWITCH_RARELY_F    EQU 1
+SWITCH_OFTEN_F     EQU 0
+
+CONTEXT_USE        EQU 1 << CONTEXT_USE_F
+UNKNOWN_USE        EQU 1 << UNKNOWN_USE_F
+ALWAYS_USE         EQU 1 << ALWAYS_USE_F
+SWITCH_SOMETIMES   EQU 1 << SWITCH_SOMETIMES_F
+SWITCH_RARELY      EQU 1 << SWITCH_RARELY_F
+SWITCH_OFTEN       EQU 1 << SWITCH_OFTEN_F
+
+; TrainerTypes indexes (see engine/battle/read_trainer_party.asm)
+	const_def
+	const TRAINERTYPE_NORMAL
+	const TRAINERTYPE_MOVES
+	const TRAINERTYPE_ITEM
+	const TRAINERTYPE_ITEM_MOVES
diff --git a/constants/type_constants.asm b/constants/type_constants.asm
index 6f389617b..c2cf2d709 100644
--- a/constants/type_constants.asm
+++ b/constants/type_constants.asm
@@ -1,6 +1,6 @@
-; TypeNames indexes (see text/types.asm)
+; TypeNames indexes (see data/type_names.asm)
 ; also used in:
-; - TypeMatchup (see battle.type_matchup.asm)
+; - TypeMatchups (see data/type_matchups.asm)
 ; - Pokedex_SearchForMons.TypeConversionTable and Pokedex_PlaceSearchScreenTypeStrings.TypeStrings (see engine/pokedex.asm)
 	const_def
 
diff --git a/data/battle/ball_colors.asm b/data/battle_anims/ball_colors.asm
index c3ba9d2b4..c3ba9d2b4 100644
--- a/data/battle/ball_colors.asm
+++ b/data/battle_anims/ball_colors.asm
diff --git a/data/battle_anims/framesets.asm b/data/battle_anims/framesets.asm
new file mode 100755
index 000000000..905597cfa
--- /dev/null
+++ b/data/battle_anims/framesets.asm
@@ -0,0 +1,1270 @@
+BattleAnimFrameData: ; ce85e
+; entries correspond to BATTLEANIMFRAMESET_* constants
+	dw .Frameset_00 ; BATTLEANIMFRAMESET_00
+	dw .Frameset_01 ; BATTLEANIMFRAMESET_01
+	dw .Frameset_02 ; BATTLEANIMFRAMESET_02
+	dw .Frameset_03 ; BATTLEANIMFRAMESET_03
+	dw .Frameset_04 ; BATTLEANIMFRAMESET_04
+	dw .Frameset_05 ; BATTLEANIMFRAMESET_05
+	dw .Frameset_06 ; BATTLEANIMFRAMESET_06
+	dw .Frameset_07 ; BATTLEANIMFRAMESET_07
+	dw .Frameset_08 ; BATTLEANIMFRAMESET_08
+	dw .Frameset_09 ; BATTLEANIMFRAMESET_09
+	dw .Frameset_0a ; BATTLEANIMFRAMESET_0A
+	dw .Frameset_0b ; BATTLEANIMFRAMESET_0B
+	dw .Frameset_0c ; BATTLEANIMFRAMESET_0C
+	dw .Frameset_0d ; BATTLEANIMFRAMESET_0D
+	dw .Frameset_0e ; BATTLEANIMFRAMESET_0E
+	dw .Frameset_0f ; BATTLEANIMFRAMESET_0F
+	dw .Frameset_10 ; BATTLEANIMFRAMESET_10
+	dw .Frameset_11 ; BATTLEANIMFRAMESET_11
+	dw .Frameset_12 ; BATTLEANIMFRAMESET_12
+	dw .Frameset_13 ; BATTLEANIMFRAMESET_13
+	dw .Frameset_14 ; BATTLEANIMFRAMESET_14
+	dw .Frameset_15 ; BATTLEANIMFRAMESET_15
+	dw .Frameset_16 ; BATTLEANIMFRAMESET_16
+	dw .Frameset_17 ; BATTLEANIMFRAMESET_17
+	dw .Frameset_18 ; BATTLEANIMFRAMESET_18
+	dw .Frameset_19 ; BATTLEANIMFRAMESET_19
+	dw .Frameset_1a ; BATTLEANIMFRAMESET_1A
+	dw .Frameset_1b ; BATTLEANIMFRAMESET_1B
+	dw .Frameset_1c ; BATTLEANIMFRAMESET_1C
+	dw .Frameset_1d ; BATTLEANIMFRAMESET_1D
+	dw .Frameset_1e ; BATTLEANIMFRAMESET_1E
+	dw .Frameset_1f ; BATTLEANIMFRAMESET_1F
+	dw .Frameset_20 ; BATTLEANIMFRAMESET_20
+	dw .Frameset_21 ; BATTLEANIMFRAMESET_21
+	dw .Frameset_22 ; BATTLEANIMFRAMESET_22
+	dw .Frameset_23 ; BATTLEANIMFRAMESET_23
+	dw .Frameset_24 ; BATTLEANIMFRAMESET_24
+	dw .Frameset_25 ; BATTLEANIMFRAMESET_25
+	dw .Frameset_26 ; BATTLEANIMFRAMESET_26
+	dw .Frameset_27 ; BATTLEANIMFRAMESET_27
+	dw .Frameset_28 ; BATTLEANIMFRAMESET_28
+	dw .Frameset_29 ; BATTLEANIMFRAMESET_29
+	dw .Frameset_2a ; BATTLEANIMFRAMESET_2A
+	dw .Frameset_2b ; BATTLEANIMFRAMESET_2B
+	dw .Frameset_2c ; BATTLEANIMFRAMESET_2C
+	dw .Frameset_2d ; BATTLEANIMFRAMESET_2D
+	dw .Frameset_2e ; BATTLEANIMFRAMESET_2E
+	dw .Frameset_2f ; BATTLEANIMFRAMESET_2F
+	dw .Frameset_30 ; BATTLEANIMFRAMESET_30
+	dw .Frameset_31 ; BATTLEANIMFRAMESET_31
+	dw .Frameset_32 ; BATTLEANIMFRAMESET_32
+	dw .Frameset_33 ; BATTLEANIMFRAMESET_33
+	dw .Frameset_34 ; BATTLEANIMFRAMESET_34
+	dw .Frameset_35 ; BATTLEANIMFRAMESET_35
+	dw .Frameset_36 ; BATTLEANIMFRAMESET_36
+	dw .Frameset_37 ; BATTLEANIMFRAMESET_37
+	dw .Frameset_38 ; BATTLEANIMFRAMESET_38
+	dw .Frameset_39 ; BATTLEANIMFRAMESET_39
+	dw .Frameset_3a ; BATTLEANIMFRAMESET_3A
+	dw .Frameset_3b ; BATTLEANIMFRAMESET_3B
+	dw .Frameset_3c ; BATTLEANIMFRAMESET_3C
+	dw .Frameset_3d ; BATTLEANIMFRAMESET_3D
+	dw .Frameset_3e ; BATTLEANIMFRAMESET_3E
+	dw .Frameset_3f ; BATTLEANIMFRAMESET_3F
+	dw .Frameset_40 ; BATTLEANIMFRAMESET_40
+	dw .Frameset_41 ; BATTLEANIMFRAMESET_41
+	dw .Frameset_42 ; BATTLEANIMFRAMESET_42
+	dw .Frameset_43 ; BATTLEANIMFRAMESET_43
+	dw .Frameset_44 ; BATTLEANIMFRAMESET_44
+	dw .Frameset_45 ; BATTLEANIMFRAMESET_45
+	dw .Frameset_46 ; BATTLEANIMFRAMESET_46
+	dw .Frameset_47 ; BATTLEANIMFRAMESET_47
+	dw .Frameset_48 ; BATTLEANIMFRAMESET_48
+	dw .Frameset_49 ; BATTLEANIMFRAMESET_49
+	dw .Frameset_4a ; BATTLEANIMFRAMESET_4A
+	dw .Frameset_4b ; BATTLEANIMFRAMESET_4B
+	dw .Frameset_4c ; BATTLEANIMFRAMESET_4C
+	dw .Frameset_4d ; BATTLEANIMFRAMESET_4D
+	dw .Frameset_4e ; BATTLEANIMFRAMESET_4E
+	dw .Frameset_4f ; BATTLEANIMFRAMESET_4F
+	dw .Frameset_50 ; BATTLEANIMFRAMESET_50
+	dw .Frameset_51 ; BATTLEANIMFRAMESET_51
+	dw .Frameset_52 ; BATTLEANIMFRAMESET_52
+	dw .Frameset_53 ; BATTLEANIMFRAMESET_53
+	dw .Frameset_54 ; BATTLEANIMFRAMESET_54
+	dw .Frameset_55 ; BATTLEANIMFRAMESET_55
+	dw .Frameset_56 ; BATTLEANIMFRAMESET_56
+	dw .Frameset_57 ; BATTLEANIMFRAMESET_57
+	dw .Frameset_58 ; BATTLEANIMFRAMESET_58
+	dw .Frameset_59 ; BATTLEANIMFRAMESET_59
+	dw .Frameset_5a ; BATTLEANIMFRAMESET_5A
+	dw .Frameset_5b ; BATTLEANIMFRAMESET_5B
+	dw .Frameset_5c ; BATTLEANIMFRAMESET_5C
+	dw .Frameset_5d ; BATTLEANIMFRAMESET_5D
+	dw .Frameset_5e ; BATTLEANIMFRAMESET_5E
+	dw .Frameset_5f ; BATTLEANIMFRAMESET_5F
+	dw .Frameset_60 ; BATTLEANIMFRAMESET_60
+	dw .Frameset_61 ; BATTLEANIMFRAMESET_61
+	dw .Frameset_62 ; BATTLEANIMFRAMESET_62
+	dw .Frameset_63 ; BATTLEANIMFRAMESET_63
+	dw .Frameset_64 ; BATTLEANIMFRAMESET_64
+	dw .Frameset_65 ; BATTLEANIMFRAMESET_65
+	dw .Frameset_66 ; BATTLEANIMFRAMESET_66
+	dw .Frameset_67 ; BATTLEANIMFRAMESET_67
+	dw .Frameset_68 ; BATTLEANIMFRAMESET_68
+	dw .Frameset_69 ; BATTLEANIMFRAMESET_69
+	dw .Frameset_6a ; BATTLEANIMFRAMESET_6A
+	dw .Frameset_6b ; BATTLEANIMFRAMESET_6B
+	dw .Frameset_6c ; BATTLEANIMFRAMESET_6C
+	dw .Frameset_6d ; BATTLEANIMFRAMESET_6D
+	dw .Frameset_6e ; BATTLEANIMFRAMESET_6E
+	dw .Frameset_6f ; BATTLEANIMFRAMESET_6F
+	dw .Frameset_70 ; BATTLEANIMFRAMESET_70
+	dw .Frameset_71 ; BATTLEANIMFRAMESET_71
+	dw .Frameset_72 ; BATTLEANIMFRAMESET_72
+	dw .Frameset_73 ; BATTLEANIMFRAMESET_73
+	dw .Frameset_74 ; BATTLEANIMFRAMESET_74
+	dw .Frameset_75 ; BATTLEANIMFRAMESET_75
+	dw .Frameset_76 ; BATTLEANIMFRAMESET_76
+	dw .Frameset_77 ; BATTLEANIMFRAMESET_77
+	dw .Frameset_78 ; BATTLEANIMFRAMESET_78
+	dw .Frameset_79 ; BATTLEANIMFRAMESET_79
+	dw .Frameset_7a ; BATTLEANIMFRAMESET_7A
+	dw .Frameset_7b ; BATTLEANIMFRAMESET_7B
+	dw .Frameset_7c ; BATTLEANIMFRAMESET_7C
+	dw .Frameset_7d ; BATTLEANIMFRAMESET_7D
+	dw .Frameset_7e ; BATTLEANIMFRAMESET_7E
+	dw .Frameset_7f ; BATTLEANIMFRAMESET_7F
+	dw .Frameset_80 ; BATTLEANIMFRAMESET_80
+	dw .Frameset_81 ; BATTLEANIMFRAMESET_81
+	dw .Frameset_82 ; BATTLEANIMFRAMESET_82
+	dw .Frameset_83 ; BATTLEANIMFRAMESET_83
+	dw .Frameset_84 ; BATTLEANIMFRAMESET_84
+	dw .Frameset_85 ; BATTLEANIMFRAMESET_85
+	dw .Frameset_86 ; BATTLEANIMFRAMESET_86
+	dw .Frameset_87 ; BATTLEANIMFRAMESET_87
+	dw .Frameset_88 ; BATTLEANIMFRAMESET_88
+	dw .Frameset_89 ; BATTLEANIMFRAMESET_89
+	dw .Frameset_8a ; BATTLEANIMFRAMESET_8A
+	dw .Frameset_8b ; BATTLEANIMFRAMESET_8B
+	dw .Frameset_8c ; BATTLEANIMFRAMESET_8C
+	dw .Frameset_8d ; BATTLEANIMFRAMESET_8D
+	dw .Frameset_8e ; BATTLEANIMFRAMESET_8E
+	dw .Frameset_8f ; BATTLEANIMFRAMESET_8F
+	dw .Frameset_90 ; BATTLEANIMFRAMESET_90
+	dw .Frameset_91 ; BATTLEANIMFRAMESET_91
+	dw .Frameset_92 ; BATTLEANIMFRAMESET_92
+	dw .Frameset_93 ; BATTLEANIMFRAMESET_93
+	dw .Frameset_94 ; BATTLEANIMFRAMESET_94
+	dw .Frameset_95 ; BATTLEANIMFRAMESET_95
+	dw .Frameset_96 ; BATTLEANIMFRAMESET_96
+	dw .Frameset_97 ; BATTLEANIMFRAMESET_97
+	dw .Frameset_98 ; BATTLEANIMFRAMESET_98
+	dw .Frameset_99 ; BATTLEANIMFRAMESET_99
+	dw .Frameset_9a ; BATTLEANIMFRAMESET_9A
+	dw .Frameset_9b ; BATTLEANIMFRAMESET_9B
+	dw .Frameset_9c ; BATTLEANIMFRAMESET_9C
+	dw .Frameset_9d ; BATTLEANIMFRAMESET_9D
+	dw .Frameset_9e ; BATTLEANIMFRAMESET_9E
+	dw .Frameset_9f ; BATTLEANIMFRAMESET_9F
+	dw .Frameset_a0 ; BATTLEANIMFRAMESET_A0
+	dw .Frameset_a1 ; BATTLEANIMFRAMESET_A1
+	dw .Frameset_a2 ; BATTLEANIMFRAMESET_A2
+	dw .Frameset_a3 ; BATTLEANIMFRAMESET_A3
+	dw .Frameset_a4 ; BATTLEANIMFRAMESET_A4
+	dw .Frameset_a5 ; BATTLEANIMFRAMESET_A5
+	dw .Frameset_a6 ; BATTLEANIMFRAMESET_A6
+	dw .Frameset_a7 ; BATTLEANIMFRAMESET_A7
+	dw .Frameset_a8 ; BATTLEANIMFRAMESET_A8
+	dw .Frameset_a9 ; BATTLEANIMFRAMESET_A9
+	dw .Frameset_aa ; BATTLEANIMFRAMESET_AA
+	dw .Frameset_ab ; BATTLEANIMFRAMESET_AB
+	dw .Frameset_ac ; BATTLEANIMFRAMESET_AC
+	dw .Frameset_ad ; BATTLEANIMFRAMESET_AD
+	dw .Frameset_ae ; BATTLEANIMFRAMESET_AE
+	dw .Frameset_af ; BATTLEANIMFRAMESET_AF
+	dw .Frameset_b0 ; BATTLEANIMFRAMESET_B0
+	dw .Frameset_b1 ; BATTLEANIMFRAMESET_B1
+	dw .Frameset_b2 ; BATTLEANIMFRAMESET_B2
+	dw .Frameset_b3 ; BATTLEANIMFRAMESET_B3
+	dw .Frameset_b4 ; BATTLEANIMFRAMESET_B4
+	dw .Frameset_b5 ; BATTLEANIMFRAMESET_B5
+	dw .Frameset_b6 ; BATTLEANIMFRAMESET_B6
+	dw .Frameset_b7 ; BATTLEANIMFRAMESET_B7
+	dw .Frameset_b8 ; BATTLEANIMFRAMESET_B8
+
+.Frameset_00:
+	frame BATTLEANIMOAMSET_00,  6
+	delanim
+
+.Frameset_01:
+	frame BATTLEANIMOAMSET_01,  6
+	delanim
+
+.Frameset_02:
+	frame BATTLEANIMOAMSET_02,  6
+	delanim
+
+.Frameset_03:
+	frame BATTLEANIMOAMSET_03,  6
+	delanim
+
+.Frameset_04:
+	frame BATTLEANIMOAMSET_04,  6
+	delanim
+
+.Frameset_05:
+	frame BATTLEANIMOAMSET_05,  6
+	delanim
+
+.Frameset_06:
+	frame BATTLEANIMOAMSET_06,  6
+	delanim
+
+.Frameset_07:
+	frame BATTLEANIMOAMSET_03,  4
+	frame BATTLEANIMOAMSET_01,  1
+	frame BATTLEANIMOAMSET_03,  4
+	frame BATTLEANIMOAMSET_01,  1
+	frame BATTLEANIMOAMSET_03,  4
+	frame BATTLEANIMOAMSET_01,  1
+	frame BATTLEANIMOAMSET_03,  4
+	frame BATTLEANIMOAMSET_01,  1
+	delanim
+
+.Frameset_3e:
+	frame BATTLEANIMOAMSET_4B,  2
+	frame BATTLEANIMOAMSET_4C,  2
+	frame BATTLEANIMOAMSET_4D,  4
+	frame BATTLEANIMOAMSET_4E,  2
+	dorepeat 2
+	frame BATTLEANIMOAMSET_4E,  2
+	dorepeat 2
+	frame BATTLEANIMOAMSET_4E,  2
+	dorepeat 2
+	frame BATTLEANIMOAMSET_4E,  2
+	delanim
+
+.Frameset_3f:
+	frame BATTLEANIMOAMSET_4B,  2, OAM_X_FLIP
+	frame BATTLEANIMOAMSET_4C,  2, OAM_X_FLIP
+	frame BATTLEANIMOAMSET_4D,  4, OAM_X_FLIP
+	frame BATTLEANIMOAMSET_4E,  2, OAM_X_FLIP
+	dorepeat 2
+	frame BATTLEANIMOAMSET_4E,  2, OAM_X_FLIP
+	dorepeat 2
+	frame BATTLEANIMOAMSET_4E,  2, OAM_X_FLIP
+	dorepeat 2
+	frame BATTLEANIMOAMSET_4E,  2, OAM_X_FLIP
+	delanim
+
+.Frameset_40:
+	frame BATTLEANIMOAMSET_4B,  2, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_4C,  2, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_4D,  4, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_4E,  2, OAM_X_FLIP, OAM_Y_FLIP
+	dorepeat 2
+	frame BATTLEANIMOAMSET_4E,  2, OAM_X_FLIP, OAM_Y_FLIP
+	dorepeat 2
+	frame BATTLEANIMOAMSET_4E,  2, OAM_X_FLIP, OAM_Y_FLIP
+	dorepeat 2
+	frame BATTLEANIMOAMSET_4E,  2, OAM_X_FLIP, OAM_Y_FLIP
+	delanim
+
+.Frameset_41:
+	frame BATTLEANIMOAMSET_4B,  1
+	frame BATTLEANIMOAMSET_4C,  1
+	frame BATTLEANIMOAMSET_4D,  1
+	frame BATTLEANIMOAMSET_4F,  1
+	frame BATTLEANIMOAMSET_50,  1
+	frame BATTLEANIMOAMSET_51,  1
+	frame BATTLEANIMOAMSET_52,  2
+	dorepeat 2
+	frame BATTLEANIMOAMSET_52,  2
+	dorepeat 2
+	frame BATTLEANIMOAMSET_52,  2
+	dorepeat 2
+	frame BATTLEANIMOAMSET_52,  2
+	delanim
+
+.Frameset_42:
+	frame BATTLEANIMOAMSET_4B,  1, OAM_X_FLIP
+	frame BATTLEANIMOAMSET_4C,  1, OAM_X_FLIP
+	frame BATTLEANIMOAMSET_4D,  1, OAM_X_FLIP
+	frame BATTLEANIMOAMSET_4F,  1, OAM_X_FLIP
+	frame BATTLEANIMOAMSET_50,  1, OAM_X_FLIP
+	frame BATTLEANIMOAMSET_51,  1, OAM_X_FLIP
+	frame BATTLEANIMOAMSET_52,  2, OAM_X_FLIP
+	dorepeat 2
+	frame BATTLEANIMOAMSET_52,  2, OAM_X_FLIP
+	dorepeat 2
+	frame BATTLEANIMOAMSET_52,  2, OAM_X_FLIP
+	dorepeat 2
+	frame BATTLEANIMOAMSET_52,  2, OAM_X_FLIP
+	delanim
+
+.Frameset_08:
+	frame BATTLEANIMOAMSET_00,  3
+	frame BATTLEANIMOAMSET_07,  3
+	frame BATTLEANIMOAMSET_08,  3
+	frame BATTLEANIMOAMSET_09,  3
+	delanim
+
+.Frameset_09:
+	frame BATTLEANIMOAMSET_0A,  7
+	frame BATTLEANIMOAMSET_0B,  7
+	frame BATTLEANIMOAMSET_0A,  7
+	frame BATTLEANIMOAMSET_0B,  7, OAM_X_FLIP
+	dorestart
+
+.Frameset_0a:
+	frame BATTLEANIMOAMSET_0C,  8
+	endanim
+
+.Frameset_0b:
+	frame BATTLEANIMOAMSET_0D,  8
+	endanim
+
+.Frameset_0c:
+	frame BATTLEANIMOAMSET_0A,  8
+	endanim
+
+.Frameset_0d:
+	frame BATTLEANIMOAMSET_0A,  7
+	frame BATTLEANIMOAMSET_0B,  7
+	frame BATTLEANIMOAMSET_0A,  7
+	frame BATTLEANIMOAMSET_0B,  7, OAM_X_FLIP
+	frame BATTLEANIMOAMSET_0A,  7
+	endanim
+
+.Frameset_0e:
+	frame BATTLEANIMOAMSET_0A,  8
+	endanim
+
+.Frameset_0f:
+	frame BATTLEANIMOAMSET_0A,  4
+	frame BATTLEANIMOAMSET_0E,  4
+	dorestart
+
+.Frameset_10:
+	frame BATTLEANIMOAMSET_0F,  4
+	frame BATTLEANIMOAMSET_10,  4
+	dorestart
+
+.Frameset_11:
+	frame BATTLEANIMOAMSET_10,  4
+	frame BATTLEANIMOAMSET_0F,  4
+	frame BATTLEANIMOAMSET_0E,  4
+	frame BATTLEANIMOAMSET_0A,  4
+	frame BATTLEANIMOAMSET_0E,  4
+	frame BATTLEANIMOAMSET_0A,  4
+	frame BATTLEANIMOAMSET_0E,  4
+	frame BATTLEANIMOAMSET_0A,  4
+	delanim
+
+.Frameset_12:
+	frame BATTLEANIMOAMSET_10,  1
+	frame BATTLEANIMOAMSET_0F,  1
+	frame BATTLEANIMOAMSET_12,  1
+	frame BATTLEANIMOAMSET_11,  1
+	frame BATTLEANIMOAMSET_12,  1
+	frame BATTLEANIMOAMSET_0F,  1
+	dorestart
+
+.Frameset_13:
+	frame BATTLEANIMOAMSET_10,  3
+	frame BATTLEANIMOAMSET_0F,  3
+	frame BATTLEANIMOAMSET_12,  1
+	dorepeat 1
+	frame BATTLEANIMOAMSET_12,  1
+	dorepeat 1
+	frame BATTLEANIMOAMSET_12,  1
+	dorepeat 1
+	frame BATTLEANIMOAMSET_12,  1
+	dorepeat 1
+	frame BATTLEANIMOAMSET_12,  3
+	delanim
+
+.Frameset_14:
+	frame BATTLEANIMOAMSET_13, 20
+	delanim
+
+.Frameset_15:
+	frame BATTLEANIMOAMSET_10,  1
+	frame BATTLEANIMOAMSET_0F,  1
+	dorestart
+
+.Frameset_16:
+	frame BATTLEANIMOAMSET_14,  8
+	endanim
+
+.Frameset_17:
+	frame BATTLEANIMOAMSET_17,  4
+	frame BATTLEANIMOAMSET_16,  8
+	frame BATTLEANIMOAMSET_15,  8
+	frame BATTLEANIMOAMSET_16,  8
+	frame BATTLEANIMOAMSET_17,  4
+	frame BATTLEANIMOAMSET_17,  4
+	frame BATTLEANIMOAMSET_16,  8, OAM_X_FLIP
+	frame BATTLEANIMOAMSET_15,  8, OAM_X_FLIP
+	frame BATTLEANIMOAMSET_16,  8, OAM_X_FLIP
+	frame BATTLEANIMOAMSET_17,  4
+	dorestart
+
+.Frameset_56:
+	frame BATTLEANIMOAMSET_69,  8
+	endanim
+
+.Frameset_57:
+	frame BATTLEANIMOAMSET_69, 32
+	frame BATTLEANIMOAMSET_6A,  4
+	frame BATTLEANIMOAMSET_6B,  4
+	frame BATTLEANIMOAMSET_6D,  4
+	frame BATTLEANIMOAMSET_6C,  4
+	endanim
+
+.Frameset_58:
+	frame BATTLEANIMOAMSET_6C,  8
+	frame BATTLEANIMOAMSET_6D,  8
+	dorestart
+
+.Frameset_18:
+	frame BATTLEANIMOAMSET_18,  4
+	frame BATTLEANIMOAMSET_19,  4
+	frame BATTLEANIMOAMSET_1A,  4
+	delanim
+
+.Frameset_19:
+	frame BATTLEANIMOAMSET_1B,  8
+	endanim
+
+.Frameset_1a:
+	frame BATTLEANIMOAMSET_0F,  8
+	endanim
+
+.Frameset_1b:
+	frame BATTLEANIMOAMSET_1C,  8
+	endanim
+
+.Frameset_1c:
+	frame BATTLEANIMOAMSET_0A,  8
+	delanim
+
+.Frameset_1d:
+	frame BATTLEANIMOAMSET_1D,  8
+	endanim
+
+.Frameset_1e:
+	frame BATTLEANIMOAMSET_17,  8
+	endanim
+
+.Frameset_1f:
+	frame BATTLEANIMOAMSET_0F,  3
+	frame BATTLEANIMOAMSET_10,  3
+	frame BATTLEANIMOAMSET_1E,  3
+	endanim
+
+.Frameset_20:
+	frame BATTLEANIMOAMSET_1F, 16
+	frame BATTLEANIMOAMSET_20,  3
+	delanim
+
+.Frameset_21:
+	frame BATTLEANIMOAMSET_20,  8
+	endanim
+
+.Frameset_22:
+	frame BATTLEANIMOAMSET_20,  8
+	frame BATTLEANIMOAMSET_21,  8
+	frame BATTLEANIMOAMSET_1B,  8
+	frame BATTLEANIMOAMSET_21,  8
+	dorestart
+
+.Frameset_23:
+	frame BATTLEANIMOAMSET_22,  8
+	endanim
+
+.Frameset_24:
+	frame BATTLEANIMOAMSET_1B,  8
+	endanim
+
+.Frameset_25:
+	frame BATTLEANIMOAMSET_23,  8
+	endanim
+
+.Frameset_26:
+	frame BATTLEANIMOAMSET_24,  8
+	endanim
+
+.Frameset_27:
+	frame BATTLEANIMOAMSET_25,  8
+	endanim
+
+.Frameset_28:
+	frame BATTLEANIMOAMSET_26,  8
+	frame BATTLEANIMOAMSET_27,  8
+	endanim
+
+.Frameset_29:
+	frame BATTLEANIMOAMSET_28,  8
+	frame BATTLEANIMOAMSET_29,  8
+	delanim
+
+.Frameset_2a:
+	frame BATTLEANIMOAMSET_2A,  1
+	frame BATTLEANIMOAMSET_2B,  1
+	frame BATTLEANIMOAMSET_2C,  1
+	frame BATTLEANIMOAMSET_2D,  1
+	frame BATTLEANIMOAMSET_2E,  1
+	frame BATTLEANIMOAMSET_2D,  1
+	frame BATTLEANIMOAMSET_2C,  1
+	frame BATTLEANIMOAMSET_2B,  1
+	frame BATTLEANIMOAMSET_2A,  1
+	delanim
+
+.Frameset_2b:
+	frame BATTLEANIMOAMSET_14,  1
+	frame BATTLEANIMOAMSET_15,  1
+	dorestart
+
+.Frameset_2c:
+	frame BATTLEANIMOAMSET_2F,  4
+	frame BATTLEANIMOAMSET_30, 40
+	delanim
+
+.Frameset_2d:
+	frame BATTLEANIMOAMSET_31,  8
+	endanim
+
+.Frameset_2e:
+	frame BATTLEANIMOAMSET_32, 32
+	frame BATTLEANIMOAMSET_33, 32
+	frame BATTLEANIMOAMSET_34, 32
+	frame BATTLEANIMOAMSET_35, 32 ; fallthrough
+.Frameset_2f:
+	dorepeat 2
+	frame BATTLEANIMOAMSET_35,  4
+	dorepeat 2
+	frame BATTLEANIMOAMSET_35,  4
+	dorepeat 2
+	frame BATTLEANIMOAMSET_35,  4
+	dorepeat 2
+	frame BATTLEANIMOAMSET_35,  4
+	delanim
+
+.Frameset_30:
+	frame BATTLEANIMOAMSET_14,  4
+	frame BATTLEANIMOAMSET_15,  4
+	dorestart
+
+.Frameset_31:
+	frame BATTLEANIMOAMSET_36,  2
+	frame BATTLEANIMOAMSET_37,  2
+	frame BATTLEANIMOAMSET_38,  2
+	frame BATTLEANIMOAMSET_39, 32
+	delanim
+
+.Frameset_32:
+	frame BATTLEANIMOAMSET_3A,  2
+	frame BATTLEANIMOAMSET_3B,  2
+	frame BATTLEANIMOAMSET_3C,  2
+	frame BATTLEANIMOAMSET_3D, 32
+	delanim
+
+.Frameset_33:
+	frame BATTLEANIMOAMSET_3A,  2, OAM_X_FLIP
+	frame BATTLEANIMOAMSET_3B,  2, OAM_X_FLIP
+	frame BATTLEANIMOAMSET_3C,  2, OAM_X_FLIP
+	frame BATTLEANIMOAMSET_3D, 32, OAM_X_FLIP
+	delanim
+
+.Frameset_34:
+	frame BATTLEANIMOAMSET_3E,  8
+	frame BATTLEANIMOAMSET_3F,  8
+	frame BATTLEANIMOAMSET_40,  8
+	endanim
+
+.Frameset_35:
+	frame BATTLEANIMOAMSET_40,  2
+	dorepeat 2
+	frame BATTLEANIMOAMSET_40,  2
+	dorepeat 2
+	frame BATTLEANIMOAMSET_41,  2
+	dorepeat 2
+	frame BATTLEANIMOAMSET_41,  2
+	dorepeat 2
+	dorestart
+
+.Frameset_36:
+	frame BATTLEANIMOAMSET_42,  2
+	frame BATTLEANIMOAMSET_43,  2
+	frame BATTLEANIMOAMSET_44,  2
+	frame BATTLEANIMOAMSET_45,  2
+	dorestart
+
+.Frameset_37:
+	frame BATTLEANIMOAMSET_19,  2
+	dorepeat 2
+	dorestart
+
+.Frameset_38:
+	frame BATTLEANIMOAMSET_46,  4
+	frame BATTLEANIMOAMSET_47,  4
+	dorestart
+
+.Frameset_39:
+	frame BATTLEANIMOAMSET_18,  2
+	dorepeat 2
+	dorestart
+
+.Frameset_3a:
+	frame BATTLEANIMOAMSET_48,  8
+	endanim
+
+.Frameset_3b:
+	frame BATTLEANIMOAMSET_48,  8, OAM_X_FLIP
+	endanim
+
+.Frameset_3c:
+	frame BATTLEANIMOAMSET_49,  8
+	endanim
+
+.Frameset_3d:
+	frame BATTLEANIMOAMSET_4A,  8
+	endanim
+
+.Frameset_43:
+	frame BATTLEANIMOAMSET_20, 16
+	frame BATTLEANIMOAMSET_1F, 16
+	frame BATTLEANIMOAMSET_1E, 16
+	endanim
+
+.Frameset_4c:
+	frame BATTLEANIMOAMSET_20,  8
+	frame BATTLEANIMOAMSET_1F,  8
+	frame BATTLEANIMOAMSET_1E,  8
+	endanim
+
+.Frameset_44:
+	dorepeat 20
+	frame BATTLEANIMOAMSET_55, 40
+	frame BATTLEANIMOAMSET_54, 40
+	frame BATTLEANIMOAMSET_53, 20
+	dorepeat 4
+	frame BATTLEANIMOAMSET_53,  4
+	dorepeat 4
+	frame BATTLEANIMOAMSET_53,  4
+	dorepeat 4
+	frame BATTLEANIMOAMSET_53,  4
+	delanim
+
+.Frameset_7e:
+	frame BATTLEANIMOAMSET_1E,  8
+	frame BATTLEANIMOAMSET_1F,  8
+	frame BATTLEANIMOAMSET_20,  8
+	delanim
+
+.Frameset_45:
+	dorepeat 0
+	frame BATTLEANIMOAMSET_14,  0
+	frame BATTLEANIMOAMSET_15,  0
+	frame BATTLEANIMOAMSET_14,  0, OAM_X_FLIP
+	dorepeat 0
+	frame BATTLEANIMOAMSET_16,  0, OAM_X_FLIP
+	frame BATTLEANIMOAMSET_15,  0
+	frame BATTLEANIMOAMSET_16,  0
+	dorestart
+
+.Frameset_46:
+	frame BATTLEANIMOAMSET_56,  2
+	frame BATTLEANIMOAMSET_57,  4
+	delanim
+
+.Frameset_47:
+	frame BATTLEANIMOAMSET_56,  2, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_57,  4, OAM_X_FLIP, OAM_Y_FLIP
+	delanim
+
+.Frameset_48:
+	frame BATTLEANIMOAMSET_56,  1
+	frame BATTLEANIMOAMSET_57,  1
+	frame BATTLEANIMOAMSET_58,  1
+	frame BATTLEANIMOAMSET_57,  1, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_58,  1, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_57,  2
+	delanim
+
+.Frameset_49:
+	frame BATTLEANIMOAMSET_56,  1, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_57,  1, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_58,  1, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_57,  1
+	frame BATTLEANIMOAMSET_58,  1
+	frame BATTLEANIMOAMSET_57,  2, OAM_X_FLIP, OAM_Y_FLIP
+	delanim
+
+.Frameset_4a:
+	frame BATTLEANIMOAMSET_57,  1, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_58,  1, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_57,  1
+	frame BATTLEANIMOAMSET_58,  1
+	dorestart
+
+.Frameset_4b:
+	frame BATTLEANIMOAMSET_59,  1
+	frame BATTLEANIMOAMSET_5A,  1
+	frame BATTLEANIMOAMSET_5B,  1
+	frame BATTLEANIMOAMSET_5C,  2
+	delanim
+
+.Frameset_4d:
+	frame BATTLEANIMOAMSET_0A, 10
+	frame BATTLEANIMOAMSET_0B,  3, OAM_X_FLIP
+	frame BATTLEANIMOAMSET_5D,  3, OAM_X_FLIP
+	frame BATTLEANIMOAMSET_0B,  3, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_0A,  2, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_0B,  1, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_5D,  1
+	frame BATTLEANIMOAMSET_0B,  1
+	dorestart
+
+.Frameset_4e:
+	frame BATTLEANIMOAMSET_0A,  3
+	frame BATTLEANIMOAMSET_0B,  7, OAM_X_FLIP
+	frame BATTLEANIMOAMSET_0A,  7
+	frame BATTLEANIMOAMSET_0B,  7
+	frame BATTLEANIMOAMSET_0A,  3
+	dorestart
+
+.Frameset_4f:
+	frame BATTLEANIMOAMSET_5E, 32
+	frame BATTLEANIMOAMSET_5E, 32
+	delanim
+
+.Frameset_50:
+	frame BATTLEANIMOAMSET_5F, 32
+	frame BATTLEANIMOAMSET_5F, 32
+	delanim
+
+.Frameset_51:
+	frame BATTLEANIMOAMSET_60,  8
+	endanim
+
+.Frameset_52:
+	frame BATTLEANIMOAMSET_61,  1
+	frame BATTLEANIMOAMSET_62,  1
+	frame BATTLEANIMOAMSET_63,  1
+	endanim
+
+.Frameset_53:
+	frame BATTLEANIMOAMSET_63,  7
+	frame BATTLEANIMOAMSET_64,  7
+	dorestart
+
+.Frameset_54:
+	frame BATTLEANIMOAMSET_65,  1
+	frame BATTLEANIMOAMSET_66,  1
+	frame BATTLEANIMOAMSET_67,  1
+	endanim
+
+.Frameset_55:
+	frame BATTLEANIMOAMSET_67,  7
+	frame BATTLEANIMOAMSET_68,  7
+	dorestart
+
+.Frameset_59:
+	frame BATTLEANIMOAMSET_6E,  8
+	endanim
+
+.Frameset_5a:
+	frame BATTLEANIMOAMSET_6F,  8
+	endanim
+
+.Frameset_5b:
+	frame BATTLEANIMOAMSET_6E,  8, OAM_Y_FLIP
+	endanim
+
+.Frameset_5c:
+	frame BATTLEANIMOAMSET_18,  4
+	frame BATTLEANIMOAMSET_70,  4
+	frame BATTLEANIMOAMSET_71,  4
+	frame BATTLEANIMOAMSET_72,  4
+	frame BATTLEANIMOAMSET_73,  4
+	delanim
+
+.Frameset_5d:
+	frame BATTLEANIMOAMSET_74,  4
+	frame BATTLEANIMOAMSET_75,  4
+	dorestart
+
+.Frameset_5e:
+	frame BATTLEANIMOAMSET_14,  8
+	endanim
+
+.Frameset_7a:
+	frame BATTLEANIMOAMSET_74,  3
+	frame BATTLEANIMOAMSET_14,  3
+	frame BATTLEANIMOAMSET_15,  3
+	frame BATTLEANIMOAMSET_14,  3
+	frame BATTLEANIMOAMSET_15,  3
+	delanim
+
+.Frameset_af:
+	frame BATTLEANIMOAMSET_14,  0
+	frame BATTLEANIMOAMSET_15,  0
+	frame BATTLEANIMOAMSET_14,  0
+	frame BATTLEANIMOAMSET_15,  0
+	frame BATTLEANIMOAMSET_74, 12
+	delanim
+
+.Frameset_5f:
+	frame BATTLEANIMOAMSET_76,  8
+	endanim
+
+.Frameset_60:
+	frame BATTLEANIMOAMSET_77,  1
+	frame BATTLEANIMOAMSET_78,  1
+	frame BATTLEANIMOAMSET_79,  1
+	frame BATTLEANIMOAMSET_7A,  1
+	frame BATTLEANIMOAMSET_7B,  1
+	frame BATTLEANIMOAMSET_7C,  1
+	frame BATTLEANIMOAMSET_7D,  1
+	frame BATTLEANIMOAMSET_7C,  1, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_7B,  1, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_7A,  1, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_79,  1, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_78,  1, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_77,  1, OAM_X_FLIP, OAM_Y_FLIP
+	delanim
+
+.Frameset_61:
+	frame BATTLEANIMOAMSET_1B,  4
+	frame BATTLEANIMOAMSET_7E,  4
+	dorestart
+
+.Frameset_62:
+	frame BATTLEANIMOAMSET_1B,  4, OAM_X_FLIP
+	frame BATTLEANIMOAMSET_7E,  4, OAM_X_FLIP
+	dorestart
+
+.Frameset_63:
+	frame BATTLEANIMOAMSET_7F,  8
+	endanim
+
+.Frameset_64:
+	frame BATTLEANIMOAMSET_25,  8
+	endanim
+
+.Frameset_65:
+	frame BATTLEANIMOAMSET_80,  8
+	endanim
+
+.Frameset_66:
+	frame BATTLEANIMOAMSET_83,  7
+	frame BATTLEANIMOAMSET_82,  7
+	frame BATTLEANIMOAMSET_81,  7
+	frame BATTLEANIMOAMSET_82,  7
+	frame BATTLEANIMOAMSET_83,  7
+	frame BATTLEANIMOAMSET_82,  7
+	frame BATTLEANIMOAMSET_81,  7
+	delanim
+
+.Frameset_67:
+	frame BATTLEANIMOAMSET_1B, 16
+	delanim
+
+.Frameset_68:
+	dorepeat 15
+	frame BATTLEANIMOAMSET_84, 15
+	frame BATTLEANIMOAMSET_85, 15
+	frame BATTLEANIMOAMSET_29, 15
+	frame BATTLEANIMOAMSET_28, 15
+	frame BATTLEANIMOAMSET_86, 32
+	delanim
+
+.Frameset_69:
+	frame BATTLEANIMOAMSET_1B,  3
+	frame BATTLEANIMOAMSET_87,  3
+	frame BATTLEANIMOAMSET_88,  3
+	frame BATTLEANIMOAMSET_89,  3
+	delanim
+
+.Frameset_6a:
+	frame BATTLEANIMOAMSET_8A,  2
+	frame BATTLEANIMOAMSET_8B,  2
+	frame BATTLEANIMOAMSET_8C,  2
+	frame BATTLEANIMOAMSET_8D,  2
+	delanim
+
+.Frameset_6b:
+	frame BATTLEANIMOAMSET_61,  2
+	frame BATTLEANIMOAMSET_62,  2
+	frame BATTLEANIMOAMSET_63,  2
+	endanim
+
+.Frameset_6c:
+	frame BATTLEANIMOAMSET_65,  2
+	frame BATTLEANIMOAMSET_66,  2
+	frame BATTLEANIMOAMSET_67,  2
+	endanim
+
+.Frameset_6d:
+	frame BATTLEANIMOAMSET_8E,  8
+	endanim
+
+.Frameset_6e:
+	frame BATTLEANIMOAMSET_8E,  8, OAM_X_FLIP
+	endanim
+
+.Frameset_6f:
+	frame BATTLEANIMOAMSET_8F, 16
+	frame BATTLEANIMOAMSET_90, 16
+	dorestart
+
+.Frameset_70:
+	frame BATTLEANIMOAMSET_91, 16
+	frame BATTLEANIMOAMSET_92, 16
+	dorestart
+
+.Frameset_71:
+	frame BATTLEANIMOAMSET_93,  8
+	endanim
+
+.Frameset_72:
+	frame BATTLEANIMOAMSET_1E,  8
+	endanim
+
+.Frameset_73:
+	frame BATTLEANIMOAMSET_1B,  7
+	frame BATTLEANIMOAMSET_94,  7
+	dorestart
+
+.Frameset_74:
+	frame BATTLEANIMOAMSET_95,  8
+	endanim
+
+.Frameset_75:
+	frame BATTLEANIMOAMSET_96,  8
+	endanim
+
+.Frameset_76:
+	frame BATTLEANIMOAMSET_95,  8
+	endanim
+
+.Frameset_77:
+	frame BATTLEANIMOAMSET_97,  1
+	frame BATTLEANIMOAMSET_97,  1, OAM_X_FLIP
+	dorestart
+
+.Frameset_78:
+	frame BATTLEANIMOAMSET_98,  8
+	endanim
+
+.Frameset_79:
+	frame BATTLEANIMOAMSET_99, 32
+	frame BATTLEANIMOAMSET_99, 32
+	frame BATTLEANIMOAMSET_99, 32
+	frame BATTLEANIMOAMSET_99, 32
+	frame BATTLEANIMOAMSET_99, 32
+	frame BATTLEANIMOAMSET_9A,  8
+	endanim
+
+.Frameset_7b:
+	frame BATTLEANIMOAMSET_9B,  8
+	endanim
+
+.Frameset_7c:
+	frame BATTLEANIMOAMSET_9C,  2
+	frame BATTLEANIMOAMSET_9D,  2
+	frame BATTLEANIMOAMSET_9E,  8
+	dorepeat 2
+	frame BATTLEANIMOAMSET_9E,  2
+	dorepeat 2
+	frame BATTLEANIMOAMSET_9E,  2
+	dorepeat 2
+	frame BATTLEANIMOAMSET_9E,  2
+	delanim
+
+.Frameset_7d:
+	frame BATTLEANIMOAMSET_9F,  8
+	endanim
+
+.Frameset_7f:
+	frame BATTLEANIMOAMSET_0F,  8
+	endanim
+
+.Frameset_80:
+	frame BATTLEANIMOAMSET_6B, 24
+	delanim
+
+.Frameset_81:
+	frame BATTLEANIMOAMSET_A0,  1 ; fallthrough
+.Frameset_82:
+	frame BATTLEANIMOAMSET_A1,  1 ; fallthrough
+.Frameset_83:
+	frame BATTLEANIMOAMSET_A2,  1
+	delanim
+
+.Frameset_84:
+	frame BATTLEANIMOAMSET_A3,  8
+	endanim
+
+.Frameset_85:
+	frame BATTLEANIMOAMSET_A4,  4
+	frame BATTLEANIMOAMSET_A5,  4
+	frame BATTLEANIMOAMSET_A6,  4
+	frame BATTLEANIMOAMSET_A7,  4
+	frame BATTLEANIMOAMSET_A6,  4, OAM_X_FLIP
+	frame BATTLEANIMOAMSET_A5,  4, OAM_X_FLIP
+	dorestart
+
+.Frameset_86:
+	frame BATTLEANIMOAMSET_A8,  4
+	frame BATTLEANIMOAMSET_A9,  4
+	frame BATTLEANIMOAMSET_AA,  4
+	frame BATTLEANIMOAMSET_AB,  4
+	frame BATTLEANIMOAMSET_AA,  4, OAM_X_FLIP
+	frame BATTLEANIMOAMSET_A9,  4, OAM_X_FLIP
+	dorestart
+
+.Frameset_87:
+	frame BATTLEANIMOAMSET_1B,  8
+	endanim
+
+.Frameset_88:
+	frame BATTLEANIMOAMSET_AC,  8
+	endanim
+
+.Frameset_89:
+	frame BATTLEANIMOAMSET_AD,  8
+	endanim
+
+.Frameset_8a:
+	frame BATTLEANIMOAMSET_AE,  8
+	endanim
+
+.Frameset_8b:
+	frame BATTLEANIMOAMSET_AF,  8
+	endanim
+
+.Frameset_8c:
+	frame BATTLEANIMOAMSET_B0, 32
+	delanim
+
+.Frameset_8d:
+	frame BATTLEANIMOAMSET_B1,  7
+	frame BATTLEANIMOAMSET_B1,  7, OAM_X_FLIP
+	dorestart
+
+.Frameset_8e:
+	frame BATTLEANIMOAMSET_B2,  8
+	endanim
+
+.Frameset_8f:
+	frame BATTLEANIMOAMSET_B3,  8
+	endanim
+
+.Frameset_90:
+	frame BATTLEANIMOAMSET_B3,  8, OAM_X_FLIP
+	endanim
+
+.Frameset_91:
+	frame BATTLEANIMOAMSET_B3,  8, OAM_Y_FLIP
+	endanim
+
+.Frameset_92:
+	frame BATTLEANIMOAMSET_B3,  8, OAM_X_FLIP, OAM_Y_FLIP
+	endanim
+
+.Frameset_93:
+	frame BATTLEANIMOAMSET_B5,  8
+	endanim
+
+.Frameset_94:
+	frame BATTLEANIMOAMSET_B5,  8, OAM_X_FLIP
+	endanim
+
+.Frameset_95:
+	frame BATTLEANIMOAMSET_B5,  8, OAM_Y_FLIP
+	endanim
+
+.Frameset_96:
+	frame BATTLEANIMOAMSET_B5,  8, OAM_X_FLIP, OAM_Y_FLIP
+	endanim
+
+.Frameset_97:
+	frame BATTLEANIMOAMSET_B4,  8
+	endanim
+
+.Frameset_98:
+	frame BATTLEANIMOAMSET_6B,  8
+	endanim
+
+.Frameset_99:
+	frame BATTLEANIMOAMSET_B6,  8
+	endanim
+
+.Frameset_9a:
+	frame BATTLEANIMOAMSET_B7, 32
+	endanim
+
+.Frameset_9b:
+	frame BATTLEANIMOAMSET_1B, 32
+	endanim
+
+.Frameset_9c:
+	frame BATTLEANIMOAMSET_B8, 32
+	endanim
+
+.Frameset_9d:
+	frame BATTLEANIMOAMSET_B8, 32, OAM_X_FLIP
+	endanim
+
+.Frameset_9e:
+	frame BATTLEANIMOAMSET_B9, 32
+	endanim
+
+.Frameset_9f:
+	frame BATTLEANIMOAMSET_BA, 32
+	endanim
+
+.Frameset_a0:
+	frame BATTLEANIMOAMSET_BB, 32, OAM_X_FLIP
+	endanim
+
+.Frameset_a1:
+	frame BATTLEANIMOAMSET_BB, 32
+	endanim
+
+.Frameset_a2:
+	frame BATTLEANIMOAMSET_BC, 32
+	endanim
+
+.Frameset_a3:
+	frame BATTLEANIMOAMSET_BD, 11
+	frame BATTLEANIMOAMSET_BE, 11
+	frame BATTLEANIMOAMSET_1B, 11
+	delanim
+
+.Frameset_a4:
+	frame BATTLEANIMOAMSET_BF,  4
+	frame BATTLEANIMOAMSET_C0,  4
+	frame BATTLEANIMOAMSET_C1,  4
+	delanim
+
+.Frameset_a5:
+	frame BATTLEANIMOAMSET_C2, 32
+	frame BATTLEANIMOAMSET_C2, 32
+	delanim
+
+.Frameset_a6:
+	frame BATTLEANIMOAMSET_4B,  2
+	frame BATTLEANIMOAMSET_4C,  2
+	frame BATTLEANIMOAMSET_4D, 32
+	frame BATTLEANIMOAMSET_4D, 32
+	frame BATTLEANIMOAMSET_4D, 32
+	frame BATTLEANIMOAMSET_4F,  1
+	frame BATTLEANIMOAMSET_50,  1
+	frame BATTLEANIMOAMSET_51,  1
+	frame BATTLEANIMOAMSET_52,  2
+	dorepeat 2
+	frame BATTLEANIMOAMSET_52,  2
+	dorepeat 2
+	frame BATTLEANIMOAMSET_52,  2
+	dorepeat 2
+	frame BATTLEANIMOAMSET_52,  2
+	delanim
+
+.Frameset_a7:
+	frame BATTLEANIMOAMSET_4B,  2, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_4C,  2, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_4D, 32, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_4D, 32, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_4D, 32, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_4F,  1, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_50,  1, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_51,  1, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_52,  2, OAM_X_FLIP, OAM_Y_FLIP
+	dorepeat 2
+	frame BATTLEANIMOAMSET_52,  2, OAM_X_FLIP, OAM_Y_FLIP
+	dorepeat 2
+	frame BATTLEANIMOAMSET_52,  2, OAM_X_FLIP, OAM_Y_FLIP
+	dorepeat 2
+	frame BATTLEANIMOAMSET_52,  2, OAM_X_FLIP, OAM_Y_FLIP
+	delanim
+
+.Frameset_a8:
+	frame BATTLEANIMOAMSET_C3,  1
+	frame BATTLEANIMOAMSET_C3,  1, OAM_X_FLIP, OAM_Y_FLIP
+	dorestart
+
+.Frameset_a9:
+	frame BATTLEANIMOAMSET_C4, 32
+	endanim
+
+.Frameset_aa:
+	frame BATTLEANIMOAMSET_C5,  4
+	frame BATTLEANIMOAMSET_C6,  4
+	frame BATTLEANIMOAMSET_C7,  4
+	delanim
+
+.Frameset_ab:
+	frame BATTLEANIMOAMSET_C8,  1
+	frame BATTLEANIMOAMSET_C8,  1, OAM_X_FLIP
+	dorestart
+
+.Frameset_ac:
+	frame BATTLEANIMOAMSET_C9,  3
+	frame BATTLEANIMOAMSET_05,  3
+	delanim
+
+.Frameset_ad:
+	frame BATTLEANIMOAMSET_CA, 32
+	frame BATTLEANIMOAMSET_CB,  3
+	frame BATTLEANIMOAMSET_CA,  3
+	frame BATTLEANIMOAMSET_CB,  3
+	dorestart
+
+.Frameset_ae:
+	frame BATTLEANIMOAMSET_03, 32, OAM_Y_FLIP
+	endanim
+
+.Frameset_b0:
+	frame BATTLEANIMOAMSET_CC, 32
+	endanim
+
+.Frameset_b1:
+	frame BATTLEANIMOAMSET_7F,  2
+	frame BATTLEANIMOAMSET_25,  2
+	frame BATTLEANIMOAMSET_80,  2
+	frame BATTLEANIMOAMSET_25,  2
+	dorestart
+
+.Frameset_b2:
+	frame BATTLEANIMOAMSET_CD,  4
+	frame BATTLEANIMOAMSET_CE,  4
+	frame BATTLEANIMOAMSET_CD,  4, OAM_X_FLIP, OAM_Y_FLIP
+	frame BATTLEANIMOAMSET_CE,  4, OAM_X_FLIP, OAM_Y_FLIP
+	dorestart
+
+.Frameset_b3:
+	frame BATTLEANIMOAMSET_CF,  4
+	frame BATTLEANIMOAMSET_D0,  4
+	frame BATTLEANIMOAMSET_D1,  4
+	frame BATTLEANIMOAMSET_D2,  4
+	delanim
+
+.Frameset_b4:
+	frame BATTLEANIMOAMSET_D3, 32
+	endanim
+
+.Frameset_b5:
+	frame BATTLEANIMOAMSET_D4,  8
+	endanim
+
+.Frameset_b6:
+	frame BATTLEANIMOAMSET_D5,  8
+	endanim
+
+.Frameset_b7:
+	frame BATTLEANIMOAMSET_D6,  8
+	endanim
+
+.Frameset_b8:
+	frame BATTLEANIMOAMSET_D7,  8
+	endanim
+
+; ceeae
diff --git a/data/battle_anims/oam.asm b/data/battle_anims/oam.asm
new file mode 100755
index 000000000..d4b0b6978
--- /dev/null
+++ b/data/battle_anims/oam.asm
@@ -0,0 +1,1086 @@
+BattleAnimOAMData: ; ceeae
+; entries correspond to BATTLEANIMOAMSET_* constants
+	; vtile offset, length, pointer
+	dbbw $00, 16, .OAMData_00 ; BATTLEANIMOAMSET_00
+	dbbw $04,  9, .OAMData_01 ; BATTLEANIMOAMSET_01
+	dbbw $08,  4, .OAMData_02 ; BATTLEANIMOAMSET_02
+	dbbw $09,  4, .OAMData_03 ; BATTLEANIMOAMSET_03
+	dbbw $0d,  4, .OAMData_04 ; BATTLEANIMOAMSET_04
+	dbbw $0f,  4, .OAMData_03 ; BATTLEANIMOAMSET_05
+	dbbw $13,  4, .OAMData_04 ; BATTLEANIMOAMSET_06
+	dbbw $04, 16, .OAMData_00 ; BATTLEANIMOAMSET_07
+	dbbw $08, 16, .OAMData_00 ; BATTLEANIMOAMSET_08
+	dbbw $08, 16, .OAMData_09 ; BATTLEANIMOAMSET_09
+	dbbw $00,  4, .OAMData_04 ; BATTLEANIMOAMSET_0A
+	dbbw $02,  4, .OAMData_03 ; BATTLEANIMOAMSET_0B
+	dbbw $06,  2, .OAMData_0c ; BATTLEANIMOAMSET_0C
+	dbbw $07,  2, .OAMData_0c ; BATTLEANIMOAMSET_0D
+	dbbw $02,  4, .OAMData_04 ; BATTLEANIMOAMSET_0E
+	dbbw $04,  1, .OAMData_0f ; BATTLEANIMOAMSET_0F
+	dbbw $05,  1, .OAMData_0f ; BATTLEANIMOAMSET_10
+	dbbw $00,  2, .OAMData_11 ; BATTLEANIMOAMSET_11
+	dbbw $02,  2, .OAMData_11 ; BATTLEANIMOAMSET_12
+	dbbw $00,  4, .OAMData_13 ; BATTLEANIMOAMSET_13
+	dbbw $00,  1, .OAMData_0f ; BATTLEANIMOAMSET_14
+	dbbw $01,  1, .OAMData_0f ; BATTLEANIMOAMSET_15
+	dbbw $02,  1, .OAMData_0f ; BATTLEANIMOAMSET_16
+	dbbw $03,  1, .OAMData_0f ; BATTLEANIMOAMSET_17
+	dbbw $00,  4, .OAMData_02 ; BATTLEANIMOAMSET_18
+	dbbw $01, 16, .OAMData_00 ; BATTLEANIMOAMSET_19
+	dbbw $05, 16, .OAMData_00 ; BATTLEANIMOAMSET_1A
+	dbbw $00,  4, .OAMData_03 ; BATTLEANIMOAMSET_1B
+	dbbw $05, 12, .OAMData_1c ; BATTLEANIMOAMSET_1C
+	dbbw $02,  4, .OAMData_02 ; BATTLEANIMOAMSET_1D
+	dbbw $06,  1, .OAMData_0f ; BATTLEANIMOAMSET_1E
+	dbbw $07,  1, .OAMData_0f ; BATTLEANIMOAMSET_1F
+	dbbw $08,  1, .OAMData_0f ; BATTLEANIMOAMSET_20
+	dbbw $04,  4, .OAMData_03 ; BATTLEANIMOAMSET_21
+	dbbw $09, 22, .OAMData_22 ; BATTLEANIMOAMSET_22
+	dbbw $04,  2, .OAMData_11 ; BATTLEANIMOAMSET_23
+	dbbw $06,  2, .OAMData_11 ; BATTLEANIMOAMSET_24
+	dbbw $0c,  1, .OAMData_0f ; BATTLEANIMOAMSET_25
+	dbbw $0a,  1, .OAMData_0f ; BATTLEANIMOAMSET_26
+	dbbw $0b,  4, .OAMData_02 ; BATTLEANIMOAMSET_27
+	dbbw $08,  4, .OAMData_04 ; BATTLEANIMOAMSET_28
+	dbbw $06,  4, .OAMData_04 ; BATTLEANIMOAMSET_29
+	dbbw $00,  5, .OAMData_2a ; BATTLEANIMOAMSET_2A
+	dbbw $03,  6, .OAMData_2b ; BATTLEANIMOAMSET_2B
+	dbbw $00,  7, .OAMData_2c ; BATTLEANIMOAMSET_2C
+	dbbw $03,  8, .OAMData_2d ; BATTLEANIMOAMSET_2D
+	dbbw $00,  9, .OAMData_2e ; BATTLEANIMOAMSET_2E
+	dbbw $00,  4, .OAMData_2f ; BATTLEANIMOAMSET_2F
+	dbbw $02,  4, .OAMData_30 ; BATTLEANIMOAMSET_30
+	dbbw $04,  6, .OAMData_31 ; BATTLEANIMOAMSET_31
+	dbbw $00,  2, .OAMData_32 ; BATTLEANIMOAMSET_32
+	dbbw $00,  7, .OAMData_33 ; BATTLEANIMOAMSET_33
+	dbbw $00, 14, .OAMData_32 ; BATTLEANIMOAMSET_34
+	dbbw $00, 21, .OAMData_33 ; BATTLEANIMOAMSET_35
+	dbbw $00,  2, .OAMData_36 ; BATTLEANIMOAMSET_36
+	dbbw $00,  6, .OAMData_36 ; BATTLEANIMOAMSET_37
+	dbbw $00, 10, .OAMData_36 ; BATTLEANIMOAMSET_38
+	dbbw $00, 14, .OAMData_36 ; BATTLEANIMOAMSET_39
+	dbbw $00,  2, .OAMData_3a ; BATTLEANIMOAMSET_3A
+	dbbw $00,  6, .OAMData_3a ; BATTLEANIMOAMSET_3B
+	dbbw $00, 10, .OAMData_3a ; BATTLEANIMOAMSET_3C
+	dbbw $00, 14, .OAMData_3a ; BATTLEANIMOAMSET_3D
+	dbbw $00,  4, .OAMData_3e ; BATTLEANIMOAMSET_3E
+	dbbw $00, 16, .OAMData_3e ; BATTLEANIMOAMSET_3F
+	dbbw $00, 26, .OAMData_3e ; BATTLEANIMOAMSET_40
+	dbbw $00, 26, .OAMData_41 ; BATTLEANIMOAMSET_41
+	dbbw $0e,  4, .OAMData_42 ; BATTLEANIMOAMSET_42
+	dbbw $0e,  8, .OAMData_42 ; BATTLEANIMOAMSET_43
+	dbbw $0e,  4, .OAMData_44 ; BATTLEANIMOAMSET_44
+	dbbw $0e,  8, .OAMData_44 ; BATTLEANIMOAMSET_45
+	dbbw $0e,  4, .OAMData_46 ; BATTLEANIMOAMSET_46
+	dbbw $0e,  4, .OAMData_47 ; BATTLEANIMOAMSET_47
+	dbbw $00,  6, .OAMData_48 ; BATTLEANIMOAMSET_48
+	dbbw $03,  4, .OAMData_49 ; BATTLEANIMOAMSET_49
+	dbbw $03,  2, .OAMData_4a ; BATTLEANIMOAMSET_4A
+	dbbw $01,  5, .OAMData_0f ; BATTLEANIMOAMSET_4B
+	dbbw $01,  6, .OAMData_4c ; BATTLEANIMOAMSET_4C
+	dbbw $01,  7, .OAMData_4d ; BATTLEANIMOAMSET_4D
+	dbbw $01,  3, .OAMData_4d ; BATTLEANIMOAMSET_4E
+	dbbw $01,  8, .OAMData_4f ; BATTLEANIMOAMSET_4F
+	dbbw $01,  9, .OAMData_50 ; BATTLEANIMOAMSET_50
+	dbbw $01, 10, .OAMData_51 ; BATTLEANIMOAMSET_51
+	dbbw $01,  6, .OAMData_51 ; BATTLEANIMOAMSET_52
+	dbbw $00,  9, .OAMData_01 ; BATTLEANIMOAMSET_53
+	dbbw $04,  4, .OAMData_02 ; BATTLEANIMOAMSET_54
+	dbbw $05,  4, .OAMData_02 ; BATTLEANIMOAMSET_55
+	dbbw $00,  2, .OAMData_56 ; BATTLEANIMOAMSET_56
+	dbbw $02,  2, .OAMData_56 ; BATTLEANIMOAMSET_57
+	dbbw $04,  2, .OAMData_56 ; BATTLEANIMOAMSET_58
+	dbbw $02,  4, .OAMData_59 ; BATTLEANIMOAMSET_59
+	dbbw $02,  4, .OAMData_5a ; BATTLEANIMOAMSET_5A
+	dbbw $02,  2, .OAMData_0c ; BATTLEANIMOAMSET_5B
+	dbbw $04,  2, .OAMData_0c ; BATTLEANIMOAMSET_5C
+	dbbw $06,  4, .OAMData_5d ; BATTLEANIMOAMSET_5D
+	dbbw $08,  2, .OAMData_0c ; BATTLEANIMOAMSET_5E
+	dbbw $09,  2, .OAMData_0c ; BATTLEANIMOAMSET_5F
+	dbbw $05,  2, .OAMData_60 ; BATTLEANIMOAMSET_60
+	dbbw $00,  2, .OAMData_61 ; BATTLEANIMOAMSET_61
+	dbbw $00,  5, .OAMData_61 ; BATTLEANIMOAMSET_62
+	dbbw $00,  9, .OAMData_61 ; BATTLEANIMOAMSET_63
+	dbbw $09,  9, .OAMData_61 ; BATTLEANIMOAMSET_64
+	dbbw $00,  4, .OAMData_65 ; BATTLEANIMOAMSET_65
+	dbbw $00,  7, .OAMData_65 ; BATTLEANIMOAMSET_66
+	dbbw $00,  9, .OAMData_65 ; BATTLEANIMOAMSET_67
+	dbbw $09,  9, .OAMData_65 ; BATTLEANIMOAMSET_68
+	dbbw $04,  1, .OAMData_69 ; BATTLEANIMOAMSET_69
+	dbbw $05,  2, .OAMData_6a ; BATTLEANIMOAMSET_6A
+	dbbw $06,  4, .OAMData_03 ; BATTLEANIMOAMSET_6B
+	dbbw $0a,  4, .OAMData_03 ; BATTLEANIMOAMSET_6C
+	dbbw $0e,  4, .OAMData_03 ; BATTLEANIMOAMSET_6D
+	dbbw $08,  5, .OAMData_6e ; BATTLEANIMOAMSET_6E
+	dbbw $0d,  3, .OAMData_6f ; BATTLEANIMOAMSET_6F
+	dbbw $01,  8, .OAMData_70 ; BATTLEANIMOAMSET_70
+	dbbw $03,  8, .OAMData_70 ; BATTLEANIMOAMSET_71
+	dbbw $05,  8, .OAMData_70 ; BATTLEANIMOAMSET_72
+	dbbw $07,  8, .OAMData_70 ; BATTLEANIMOAMSET_73
+	dbbw $06,  4, .OAMData_02 ; BATTLEANIMOAMSET_74
+	dbbw $07,  4, .OAMData_02 ; BATTLEANIMOAMSET_75
+	dbbw $0a,  2, .OAMData_76 ; BATTLEANIMOAMSET_76
+	dbbw $00,  1, .OAMData_77 ; BATTLEANIMOAMSET_77
+	dbbw $00,  3, .OAMData_78 ; BATTLEANIMOAMSET_78
+	dbbw $00,  6, .OAMData_79 ; BATTLEANIMOAMSET_79
+	dbbw $00,  9, .OAMData_7a ; BATTLEANIMOAMSET_7A
+	dbbw $00, 12, .OAMData_7b ; BATTLEANIMOAMSET_7B
+	dbbw $00, 14, .OAMData_7c ; BATTLEANIMOAMSET_7C
+	dbbw $00, 15, .OAMData_7d ; BATTLEANIMOAMSET_7D
+	dbbw $04,  4, .OAMData_03 ; BATTLEANIMOAMSET_7E
+	dbbw $08,  4, .OAMData_03 ; BATTLEANIMOAMSET_7F
+	dbbw $0d,  1, .OAMData_0f ; BATTLEANIMOAMSET_80
+	dbbw $0e,  4, .OAMData_81 ; BATTLEANIMOAMSET_81
+	dbbw $10,  1, .OAMData_0f ; BATTLEANIMOAMSET_82
+	dbbw $11,  1, .OAMData_0f ; BATTLEANIMOAMSET_83
+	dbbw $04,  2, .OAMData_6a ; BATTLEANIMOAMSET_84
+	dbbw $05,  2, .OAMData_6a ; BATTLEANIMOAMSET_85
+	dbbw $0a,  4, .OAMData_04 ; BATTLEANIMOAMSET_86
+	dbbw $00,  8, .OAMData_87 ; BATTLEANIMOAMSET_87
+	dbbw $00, 12, .OAMData_88 ; BATTLEANIMOAMSET_88
+	dbbw $00, 16, .OAMData_87 ; BATTLEANIMOAMSET_89
+	dbbw $09,  2, .OAMData_8a ; BATTLEANIMOAMSET_8A
+	dbbw $09,  4, .OAMData_8a ; BATTLEANIMOAMSET_8B
+	dbbw $09,  6, .OAMData_8a ; BATTLEANIMOAMSET_8C
+	dbbw $09,  8, .OAMData_8a ; BATTLEANIMOAMSET_8D
+	dbbw $12,  5, .OAMData_8e ; BATTLEANIMOAMSET_8E
+	dbbw $00,  4, .OAMData_8f ; BATTLEANIMOAMSET_8F
+	dbbw $04,  4, .OAMData_8f ; BATTLEANIMOAMSET_90
+	dbbw $08,  4, .OAMData_8f ; BATTLEANIMOAMSET_91
+	dbbw $0c,  4, .OAMData_8f ; BATTLEANIMOAMSET_92
+	dbbw $00,  6, .OAMData_93 ; BATTLEANIMOAMSET_93
+	dbbw $04,  4, .OAMData_03 ; BATTLEANIMOAMSET_94
+	dbbw $0a,  4, .OAMData_04 ; BATTLEANIMOAMSET_95
+	dbbw $15,  4, .OAMData_30 ; BATTLEANIMOAMSET_96
+	dbbw $04,  4, .OAMData_30 ; BATTLEANIMOAMSET_97
+	dbbw $0c,  4, .OAMData_04 ; BATTLEANIMOAMSET_98
+	dbbw $0a,  4, .OAMData_99 ; BATTLEANIMOAMSET_99
+	dbbw $0c,  4, .OAMData_03 ; BATTLEANIMOAMSET_9A
+	dbbw $00, 36, .OAMData_9b ; BATTLEANIMOAMSET_9B
+	dbbw $0d,  2, .OAMData_9c ; BATTLEANIMOAMSET_9C
+	dbbw $0d,  4, .OAMData_9c ; BATTLEANIMOAMSET_9D
+	dbbw $0d,  6, .OAMData_9c ; BATTLEANIMOAMSET_9E
+	dbbw $02,  8, .OAMData_9f ; BATTLEANIMOAMSET_9F
+	dbbw $08,  7, .OAMData_a0 ; BATTLEANIMOAMSET_A0
+	dbbw $08,  5, .OAMData_a0 ; BATTLEANIMOAMSET_A1
+	dbbw $08,  3, .OAMData_a0 ; BATTLEANIMOAMSET_A2
+	dbbw $00, 16, .OAMData_1c ; BATTLEANIMOAMSET_A3
+	dbbw $00,  9, .OAMData_a4 ; BATTLEANIMOAMSET_A4
+	dbbw $06,  9, .OAMData_a4 ; BATTLEANIMOAMSET_A5
+	dbbw $0c,  9, .OAMData_a4 ; BATTLEANIMOAMSET_A6
+	dbbw $12,  9, .OAMData_a4 ; BATTLEANIMOAMSET_A7
+	dbbw $18,  9, .OAMData_a4 ; BATTLEANIMOAMSET_A8
+	dbbw $1e,  9, .OAMData_a4 ; BATTLEANIMOAMSET_A9
+	dbbw $24,  9, .OAMData_a4 ; BATTLEANIMOAMSET_AA
+	dbbw $2a,  9, .OAMData_a4 ; BATTLEANIMOAMSET_AB
+	dbbw $03,  4, .OAMData_ac ; BATTLEANIMOAMSET_AC
+	dbbw $12,  4, .OAMData_03 ; BATTLEANIMOAMSET_AD
+	dbbw $10,  4, .OAMData_04 ; BATTLEANIMOAMSET_AE
+	dbbw $16,  1, .OAMData_0f ; BATTLEANIMOAMSET_AF
+	dbbw $17,  4, .OAMData_02 ; BATTLEANIMOAMSET_B0
+	dbbw $18,  4, .OAMData_03 ; BATTLEANIMOAMSET_B1
+	dbbw $1c,  4, .OAMData_03 ; BATTLEANIMOAMSET_B2
+	dbbw $20,  3, .OAMData_03 ; BATTLEANIMOAMSET_B3
+	dbbw $23,  4, .OAMData_04 ; BATTLEANIMOAMSET_B4
+	dbbw $25,  3, .OAMData_03 ; BATTLEANIMOAMSET_B5
+	dbbw $17,  4, .OAMData_03 ; BATTLEANIMOAMSET_B6
+	dbbw $0a, 16, .OAMData_00 ; BATTLEANIMOAMSET_B7
+	dbbw $10, 16, .OAMData_1c ; BATTLEANIMOAMSET_B8
+	dbbw $00, 16, .OAMData_1c ; BATTLEANIMOAMSET_B9
+	dbbw $04,  4, .OAMData_03 ; BATTLEANIMOAMSET_BA
+	dbbw $08,  2, .OAMData_11 ; BATTLEANIMOAMSET_BB
+	dbbw $20,  6, .OAMData_bc ; BATTLEANIMOAMSET_BC
+	dbbw $08,  1, .OAMData_0f ; BATTLEANIMOAMSET_BD
+	dbbw $04,  4, .OAMData_03 ; BATTLEANIMOAMSET_BE
+	dbbw $1a,  4, .OAMData_30 ; BATTLEANIMOAMSET_BF
+	dbbw $16,  9, .OAMData_01 ; BATTLEANIMOAMSET_C0
+	dbbw $10, 16, .OAMData_c1 ; BATTLEANIMOAMSET_C1
+	dbbw $09,  6, .OAMData_c2 ; BATTLEANIMOAMSET_C2
+	dbbw $11,  9, .OAMData_c3 ; BATTLEANIMOAMSET_C3
+	dbbw $0e,  4, .OAMData_03 ; BATTLEANIMOAMSET_C4
+	dbbw $0b,  4, .OAMData_30 ; BATTLEANIMOAMSET_C5
+	dbbw $1c,  6, .OAMData_02 ; BATTLEANIMOAMSET_C6
+	dbbw $20, 16, .OAMData_c1 ; BATTLEANIMOAMSET_C7
+	dbbw $05,  6, .OAMData_c8 ; BATTLEANIMOAMSET_C8
+	dbbw $0b,  4, .OAMData_03 ; BATTLEANIMOAMSET_C9
+	dbbw $09,  4, .OAMData_ca ; BATTLEANIMOAMSET_CA
+	dbbw $0b,  4, .OAMData_04 ; BATTLEANIMOAMSET_CB
+	dbbw $11, 13, .OAMData_cc ; BATTLEANIMOAMSET_CC
+	dbbw $00,  9, .OAMData_c3 ; BATTLEANIMOAMSET_CD
+	dbbw $09,  9, .OAMData_c3 ; BATTLEANIMOAMSET_CE
+	dbbw $00, 12, .OAMData_cf ; BATTLEANIMOAMSET_CF
+	dbbw $06, 12, .OAMData_cf ; BATTLEANIMOAMSET_D0
+	dbbw $0c, 12, .OAMData_cf ; BATTLEANIMOAMSET_D1
+	dbbw $12, 12, .OAMData_cf ; BATTLEANIMOAMSET_D2
+	dbbw $00, 13, .OAMData_cc ; BATTLEANIMOAMSET_D3
+	dbbw $00,  7, .OAMData_d4 ; BATTLEANIMOAMSET_D4
+	dbbw $00,  6, .OAMData_d5 ; BATTLEANIMOAMSET_D5
+	dbbw $00, 14, .OAMData_d6 ; BATTLEANIMOAMSET_D6
+	dbbw $00, 12, .OAMData_d7 ; BATTLEANIMOAMSET_D7
+
+.OAMData_11:
+	dsprite  -1, 0,  -1, 4, $00, $0
+	dsprite   0, 0,  -1, 4, $01, $0
+
+.OAMData_56:
+	dsprite  -1, 4,  -1, 0, $00, $0
+	dsprite  -1, 4,   0, 0, $01, $0
+
+.OAMData_03:
+	dsprite  -1, 0,  -1, 0, $00, $0
+	dsprite  -1, 0,   0, 0, $01, $0
+	dsprite   0, 0,  -1, 0, $02, $0
+	dsprite   0, 0,   0, 0, $03, $0
+
+.OAMData_02:
+	dsprite  -1, 0,  -1, 0, $00, $0
+	dsprite  -1, 0,   0, 0, $00, X_FLIP
+	dsprite   0, 0,  -1, 0, $00, Y_FLIP
+	dsprite   0, 0,   0, 0, $00, X_FLIP | Y_FLIP
+
+.OAMData_c3:
+	dsprite  -2, 4,  -2, 4, $00, $0
+	dsprite  -2, 4,  -1, 4, $01, $0
+	dsprite  -2, 4,   0, 4, $02, $0
+	dsprite  -1, 4,  -2, 4, $03, $0
+	dsprite  -1, 4,  -1, 4, $04, $0
+	dsprite  -1, 4,   0, 4, $05, $0
+	dsprite   0, 4,  -2, 4, $06, $0
+	dsprite   0, 4,  -1, 4, $07, $0
+	dsprite   0, 4,   0, 4, $08, $0
+
+.OAMData_01:
+	dsprite  -2, 4,  -2, 4, $00, $0
+	dsprite  -2, 4,  -1, 4, $01, $0
+	dsprite  -2, 4,   0, 4, $00, X_FLIP
+	dsprite  -1, 4,  -2, 4, $02, $0
+	dsprite  -1, 4,  -1, 4, $03, $0
+	dsprite  -1, 4,   0, 4, $02, X_FLIP | Y_FLIP
+	dsprite   0, 4,  -2, 4, $00, Y_FLIP
+	dsprite   0, 4,  -1, 4, $01, X_FLIP | Y_FLIP
+	dsprite   0, 4,   0, 4, $00, X_FLIP | Y_FLIP
+
+.OAMData_cf:
+	dsprite  -2, 0,  -2, 4, $00, $0
+	dsprite  -2, 0,  -1, 4, $01, $0
+	dsprite  -2, 0,   0, 4, $02, $0
+	dsprite  -1, 0,  -2, 4, $03, $0
+	dsprite  -1, 0,  -1, 4, $04, $0
+	dsprite  -1, 0,   0, 4, $05, $0
+	dsprite   0, 0,  -2, 4, $05, X_FLIP | Y_FLIP
+	dsprite   0, 0,  -1, 4, $04, X_FLIP | Y_FLIP
+	dsprite   0, 0,   0, 4, $03, X_FLIP | Y_FLIP
+	dsprite   1, 0,  -2, 4, $02, X_FLIP | Y_FLIP
+	dsprite   1, 0,  -1, 4, $01, X_FLIP | Y_FLIP
+	dsprite   1, 0,   0, 4, $00, X_FLIP | Y_FLIP
+
+.OAMData_1c:
+	dsprite  -2, 0,  -2, 0, $00, $0
+	dsprite  -2, 0,  -1, 0, $01, $0
+	dsprite  -2, 0,   0, 0, $02, $0
+	dsprite  -2, 0,   1, 0, $03, $0
+	dsprite  -1, 0,  -2, 0, $04, $0
+	dsprite  -1, 0,  -1, 0, $05, $0
+	dsprite  -1, 0,   0, 0, $06, $0
+	dsprite  -1, 0,   1, 0, $07, $0
+	dsprite   0, 0,  -2, 0, $08, $0
+	dsprite   0, 0,  -1, 0, $09, $0
+	dsprite   0, 0,   0, 0, $0a, $0
+	dsprite   0, 0,   1, 0, $0b, $0
+	dsprite   1, 0,  -2, 0, $0c, $0
+	dsprite   1, 0,  -1, 0, $0d, $0
+	dsprite   1, 0,   0, 0, $0e, $0
+	dsprite   1, 0,   1, 0, $0f, $0
+
+.OAMData_00:
+	dsprite  -2, 0,  -2, 0, $00, $0
+	dsprite  -2, 0,  -1, 0, $01, $0
+	dsprite  -1, 0,  -2, 0, $02, $0
+	dsprite  -1, 0,  -1, 0, $03, $0
+	dsprite  -2, 0,   0, 0, $01, X_FLIP
+	dsprite  -2, 0,   1, 0, $00, X_FLIP
+	dsprite  -1, 0,   0, 0, $03, X_FLIP
+	dsprite  -1, 0,   1, 0, $02, X_FLIP
+	dsprite   0, 0,  -2, 0, $02, Y_FLIP
+	dsprite   0, 0,  -1, 0, $03, Y_FLIP
+	dsprite   1, 0,  -2, 0, $00, Y_FLIP
+	dsprite   1, 0,  -1, 0, $01, Y_FLIP
+	dsprite   0, 0,   0, 0, $03, X_FLIP | Y_FLIP
+	dsprite   0, 0,   1, 0, $02, X_FLIP | Y_FLIP
+	dsprite   1, 0,   0, 0, $01, X_FLIP | Y_FLIP
+	dsprite   1, 0,   1, 0, $00, X_FLIP | Y_FLIP
+
+.OAMData_09:
+	dsprite  -3, 4,  -3, 4, $00, $0
+	dsprite  -3, 4,  -2, 4, $01, $0
+	dsprite  -2, 4,  -3, 4, $02, $0
+	dsprite  -2, 4,  -2, 4, $03, $0
+	dsprite  -3, 4,   0, 4, $01, X_FLIP
+	dsprite  -3, 4,   1, 4, $00, X_FLIP
+	dsprite  -2, 4,   0, 4, $03, X_FLIP
+	dsprite  -2, 4,   1, 4, $02, X_FLIP
+	dsprite   0, 4,  -3, 4, $02, Y_FLIP
+	dsprite   0, 4,  -2, 4, $03, Y_FLIP
+	dsprite   1, 4,  -3, 4, $00, Y_FLIP
+	dsprite   1, 4,  -2, 4, $01, Y_FLIP
+	dsprite   0, 4,   0, 4, $03, X_FLIP | Y_FLIP
+	dsprite   0, 4,   1, 4, $02, X_FLIP | Y_FLIP
+	dsprite   1, 4,   0, 4, $01, X_FLIP | Y_FLIP
+	dsprite   1, 4,   1, 4, $00, X_FLIP | Y_FLIP
+
+.OAMData_0c:
+	dsprite  -1, 4,  -1, 0, $00, $0
+	dsprite  -1, 4,   0, 0, $00, X_FLIP
+
+.OAMData_6a:
+	dsprite   0, 0,  -1, 0, $00, $0
+	dsprite   0, 0,   0, 0, $00, X_FLIP
+
+.OAMData_04:
+	dsprite  -1, 0,  -1, 0, $00, $0
+	dsprite  -1, 0,   0, 0, $00, X_FLIP
+	dsprite   0, 0,  -1, 0, $01, $0
+	dsprite   0, 0,   0, 0, $01, X_FLIP
+
+.OAMData_5d:
+	dsprite  -1, 0,  -1, 0, $00, $0
+	dsprite  -1, 0,   0, 0, $01, $0
+	dsprite   0, 0,  -1, 0, $00, Y_FLIP
+	dsprite   0, 0,   0, 0, $01, Y_FLIP
+
+.OAMData_13:
+	dsprite  -1, 2,  -1, 0, $02, $0
+	dsprite   0, 2,  -1, 0, $03, $0
+	dsprite  -2, 6,   0, 0, $02, $0
+	dsprite  -1, 6,   0, 0, $03, $0
+
+.OAMData_22:
+	dsprite   1, 0, -11, 0, $01, $0
+	dsprite   0, 0, -10, 0, $02, $0
+	dsprite   0, 0,  -9, 0, $03, $0
+	dsprite   0, 0,  -8, 0, $00, $0
+	dsprite   0, 0,  -7, 0, $03, $0
+	dsprite   0, 0,  -6, 0, $00, $0
+	dsprite   0, 0,  -5, 0, $03, $0
+	dsprite   0, 0,  -4, 0, $00, $0
+	dsprite   0, 0,  -3, 0, $03, $0
+	dsprite   0, 0,  -2, 0, $00, $0
+	dsprite   0, 0,  -1, 0, $01, $0
+	dsprite  -1, 0,   0, 0, $02, $0
+	dsprite  -1, 0,   1, 0, $03, $0
+	dsprite  -1, 0,   2, 0, $00, $0
+	dsprite  -1, 0,   3, 0, $03, $0
+	dsprite  -1, 0,   4, 0, $00, $0
+	dsprite  -1, 0,   5, 0, $03, $0
+	dsprite  -1, 0,   6, 0, $00, $0
+	dsprite  -1, 0,   7, 0, $03, $0
+	dsprite  -1, 0,   8, 0, $00, $0
+	dsprite  -1, 0,   9, 0, $01, $0
+	dsprite  -2, 0,  10, 0, $02, $0
+
+.OAMData_2a:
+	dsprite  -3, 4,  -1, 0, $00, $0
+	dsprite  -3, 4,   0, 0, $00, X_FLIP
+	dsprite  -2, 4,  -1, 0, $01, $0
+	dsprite  -2, 4,   0, 0, $01, X_FLIP
+	dsprite  -1, 4,  -1, 4, $02, $0
+
+.OAMData_2b:
+	dsprite  -4, 4,  -1, 0, $00, $0
+	dsprite  -4, 4,   0, 0, $00, X_FLIP
+	dsprite  -3, 4,  -1, 0, $01, $0
+	dsprite  -3, 4,   0, 0, $01, X_FLIP
+	dsprite  -2, 4,  -1, 4, $02, $0
+	dsprite  -1, 4,  -1, 4, $02, $0
+
+.OAMData_2c:
+	dsprite  -5, 4,  -1, 0, $00, $0
+	dsprite  -5, 4,   0, 0, $00, X_FLIP
+	dsprite  -4, 4,  -1, 0, $01, $0
+	dsprite  -4, 4,   0, 0, $01, X_FLIP
+	dsprite  -3, 4,  -1, 4, $02, $0
+	dsprite  -2, 4,  -1, 4, $02, $0
+	dsprite  -1, 4,  -1, 4, $02, $0
+
+.OAMData_2d:
+	dsprite  -6, 4,  -1, 0, $00, $0
+	dsprite  -6, 4,   0, 0, $00, X_FLIP
+	dsprite  -5, 4,  -1, 0, $01, $0
+	dsprite  -5, 4,   0, 0, $01, X_FLIP
+	dsprite  -4, 4,  -1, 4, $02, $0
+	dsprite  -3, 4,  -1, 4, $02, $0
+	dsprite  -2, 4,  -1, 4, $02, $0
+	dsprite  -1, 4,  -1, 4, $02, $0
+
+.OAMData_2e:
+	dsprite  -7, 4,  -1, 0, $00, $0
+	dsprite  -7, 4,   0, 0, $00, X_FLIP
+	dsprite  -6, 4,  -1, 0, $01, $0
+	dsprite  -6, 4,   0, 0, $01, X_FLIP
+	dsprite  -5, 4,  -1, 4, $02, $0
+	dsprite  -4, 4,  -1, 4, $02, $0
+	dsprite  -3, 4,  -1, 4, $02, $0
+	dsprite  -2, 4,  -1, 4, $02, $0
+	dsprite  -1, 4,  -1, 4, $02, $0
+
+.OAMData_2f:
+	dsprite  -1, 0,  -1, 0, $00, $0
+	dsprite  -1, 0,   0, 0, $00, X_FLIP
+	dsprite   0, 0,  -1, 0, $01, $0
+	dsprite   0, 0,   0, 0, $00, X_FLIP | Y_FLIP
+
+.OAMData_30:
+	dsprite  -1, 0,  -1, 0, $00, $0
+	dsprite  -1, 0,   0, 0, $01, $0
+	dsprite   0, 0,  -1, 0, $01, X_FLIP | Y_FLIP
+	dsprite   0, 0,   0, 0, $00, X_FLIP | Y_FLIP
+
+.OAMData_31:
+	dsprite  -2, 4,  -1, 0, $00, $0
+	dsprite  -2, 4,   0, 0, $01, $0
+	dsprite  -1, 4,  -1, 0, $02, $0
+	dsprite  -1, 4,   0, 0, $03, $0
+	dsprite   0, 4,  -1, 0, $04, $0
+	dsprite   0, 4,   0, 0, $05, $0
+
+.OAMData_76:
+	dsprite  -1, 5,  -1, 0, $00, $0
+	dsprite  -1, 1,   0, 0, $00, $0
+
+.OAMData_32:
+	dsprite  -1, 0,  -2, 4, $00, $0
+	dsprite  -1, 0,   0, 4, $00, $0
+	dsprite  -3, 0,  -2, 4, $00, $0
+	dsprite  -3, 0,   0, 4, $00, $0
+	dsprite  -2, 0,  -3, 4, $00, $0
+	dsprite  -2, 0,  -2, 4, $01, $0
+	dsprite  -2, 0,  -1, 4, $00, $0
+	dsprite  -2, 0,   0, 4, $01, $0
+	dsprite  -2, 0,   1, 4, $00, $0
+	dsprite  -1, 0,  -4, 4, $00, $0
+	dsprite  -1, 0,  -3, 4, $01, $0
+	dsprite  -1, 0,  -1, 4, $01, $0
+	dsprite  -1, 0,   1, 4, $01, $0
+	dsprite  -1, 0,   2, 4, $00, $0
+
+.OAMData_33:
+	dsprite  -2, 0,  -2, 4, $00, $0
+	dsprite  -2, 0,   0, 4, $00, $0
+	dsprite  -1, 0,  -3, 4, $00, $0
+	dsprite  -1, 0,  -2, 4, $01, $0
+	dsprite  -1, 0,  -1, 4, $00, $0
+	dsprite  -1, 0,   0, 4, $01, $0
+	dsprite  -1, 0,   1, 4, $00, $0
+	dsprite  -4, 0,  -2, 4, $00, $0
+	dsprite  -4, 0,   0, 4, $00, $0
+	dsprite  -3, 0,  -3, 4, $00, $0
+	dsprite  -3, 0,  -2, 4, $01, $0
+	dsprite  -3, 0,  -1, 4, $00, $0
+	dsprite  -3, 0,   0, 4, $01, $0
+	dsprite  -3, 0,   1, 4, $00, $0
+	dsprite  -2, 0,  -4, 4, $00, $0
+	dsprite  -2, 0,  -3, 4, $01, $0
+	dsprite  -2, 0,  -1, 4, $01, $0
+	dsprite  -2, 0,   1, 4, $01, $0
+	dsprite  -2, 0,   2, 4, $00, $0
+	dsprite  -1, 0,  -4, 4, $01, $0
+	dsprite  -1, 0,   2, 4, $01, $0
+
+.OAMData_36:
+	dsprite  -7, 4,  -1, 0, $00, $0
+	dsprite  -7, 4,   0, 0, $01, $0
+	dsprite  -6, 4,  -1, 0, $02, $0
+	dsprite  -6, 4,   0, 0, $03, $0
+	dsprite  -5, 4,  -1, 0, $04, $0
+	dsprite  -5, 4,   0, 0, $05, $0
+	dsprite  -4, 4,  -1, 0, $06, $0
+	dsprite  -4, 4,   0, 0, $07, $0
+	dsprite  -3, 4,  -1, 0, $08, $0
+	dsprite  -3, 4,   0, 0, $09, $0
+	dsprite  -2, 4,  -1, 0, $0a, $0
+	dsprite  -2, 4,   0, 0, $0b, $0
+	dsprite  -1, 4,  -1, 0, $0c, $0
+	dsprite  -1, 4,   0, 0, $0d, $0
+
+.OAMData_3a:
+	dsprite  -7, 4,  -1, 0, $0c, $0
+	dsprite  -7, 4,   0, 0, $0d, $0
+	dsprite  -6, 4,  -1, 0, $08, $0
+	dsprite  -6, 4,   0, 0, $09, $0
+	dsprite  -5, 4,  -1, 0, $04, $0
+	dsprite  -5, 4,   0, 0, $05, $0
+	dsprite  -4, 4,  -1, 0, $00, $0
+	dsprite  -4, 4,   0, 0, $01, $0
+	dsprite  -3, 4,  -1, 0, $02, $0
+	dsprite  -3, 4,   0, 0, $03, $0
+	dsprite  -2, 4,   0, 0, $02, $0
+	dsprite  -2, 4,   1, 0, $03, $0
+	dsprite  -1, 4,   0, 0, $0a, $0
+	dsprite  -1, 4,   1, 0, $0b, $0
+
+.OAMData_3e:
+	dsprite   1, 4,  -2, 0, $00, Y_FLIP
+	dsprite   1, 4,  -1, 0, $02, Y_FLIP
+	dsprite   1, 4,   0, 0, $02, X_FLIP | Y_FLIP
+	dsprite   1, 4,   1, 0, $00, X_FLIP | Y_FLIP
+	dsprite  -1, 4,  -3, 0, $09, X_FLIP
+	dsprite  -1, 4,  -2, 0, $08, X_FLIP
+	dsprite  -1, 4,  -1, 0, $06, $0
+	dsprite  -1, 4,   0, 0, $07, $0
+	dsprite  -1, 4,   1, 0, $08, $0
+	dsprite  -1, 4,   2, 0, $09, $0
+	dsprite   0, 4,  -3, 0, $01, X_FLIP
+	dsprite   0, 4,  -2, 0, $00, X_FLIP
+	dsprite   0, 4,  -1, 0, $0c, $0
+	dsprite   0, 4,   0, 0, $0d, $0
+	dsprite   0, 4,   1, 0, $00, $0
+	dsprite   0, 4,   2, 0, $01, $0
+	dsprite  -3, 4,  -2, 0, $00, $0
+	dsprite  -3, 4,  -1, 0, $02, $0
+	dsprite  -3, 4,   0, 0, $02, X_FLIP
+	dsprite  -3, 4,   1, 0, $00, X_FLIP
+	dsprite  -2, 4,  -3, 0, $03, X_FLIP
+	dsprite  -2, 4,  -2, 0, $02, X_FLIP
+	dsprite  -2, 4,  -1, 0, $04, $0
+	dsprite  -2, 4,   0, 0, $05, $0
+	dsprite  -2, 4,   1, 0, $02, $0
+	dsprite  -2, 4,   2, 0, $03, $0
+
+.OAMData_41:
+	dsprite  -3, 4,  -2, 0, $00, $0
+	dsprite  -3, 4,  -1, 0, $02, $0
+	dsprite  -3, 4,   0, 0, $02, X_FLIP
+	dsprite  -3, 4,   1, 0, $00, X_FLIP
+	dsprite  -2, 4,  -3, 4, $00, $0
+	dsprite  -2, 4,  -2, 4, $01, $0
+	dsprite  -2, 4,  -1, 0, $05, X_FLIP
+	dsprite  -2, 4,   0, 0, $04, X_FLIP
+	dsprite  -2, 4,   0, 4, $01, X_FLIP
+	dsprite  -2, 4,   1, 4, $00, X_FLIP
+	dsprite  -1, 4,  -3, 4, $02, $0
+	dsprite  -1, 4,  -2, 4, $03, $0
+	dsprite  -1, 4,  -1, 0, $07, X_FLIP
+	dsprite  -1, 4,   0, 0, $06, X_FLIP
+	dsprite  -1, 4,   0, 4, $03, X_FLIP
+	dsprite  -1, 4,   1, 4, $02, X_FLIP
+	dsprite   0, 4,  -3, 4, $04, $0
+	dsprite   0, 4,  -2, 4, $05, $0
+	dsprite   0, 4,  -1, 0, $0d, X_FLIP
+	dsprite   0, 4,   0, 0, $0c, X_FLIP
+	dsprite   0, 4,   0, 4, $05, X_FLIP
+	dsprite   0, 4,   1, 4, $04, X_FLIP
+	dsprite   1, 4,  -2, 0, $00, Y_FLIP
+	dsprite   1, 4,  -1, 0, $02, Y_FLIP
+	dsprite   1, 4,   0, 0, $02, X_FLIP | Y_FLIP
+	dsprite   1, 4,   1, 0, $00, X_FLIP | Y_FLIP
+
+.OAMData_42:
+	dsprite  -3, 0,  -1, 4, $02, $0
+	dsprite   2, 0,  -1, 4, $02, X_FLIP | Y_FLIP
+	dsprite  -1, 4,  -3, 0, $01, $0
+	dsprite  -1, 4,   2, 0, $01, X_FLIP | Y_FLIP
+	dsprite  -4, 0,  -1, 4, $02, $0
+	dsprite   3, 0,  -1, 4, $02, X_FLIP | Y_FLIP
+	dsprite  -1, 4,  -4, 0, $01, $0
+	dsprite  -1, 4,   3, 0, $01, X_FLIP | Y_FLIP
+
+.OAMData_44:
+	dsprite  -3, 5,  -3, 5, $00, X_FLIP
+	dsprite  -3, 5,   1, 3, $00, $0
+	dsprite   1, 3,  -3, 5, $00, X_FLIP | Y_FLIP
+	dsprite   1, 3,   1, 3, $00, Y_FLIP
+	dsprite  -4, 5,  -4, 5, $00, X_FLIP
+	dsprite  -4, 5,   2, 3, $00, $0
+	dsprite   2, 3,  -4, 5, $00, X_FLIP | Y_FLIP
+	dsprite   2, 3,   2, 3, $00, Y_FLIP
+
+.OAMData_46:
+	dsprite  -3, 4,  -1, 4, $02, $0
+	dsprite   1, 4,  -1, 4, $02, X_FLIP | Y_FLIP
+	dsprite  -1, 4,  -3, 4, $01, $0
+	dsprite  -1, 4,   1, 4, $01, X_FLIP | Y_FLIP
+
+.OAMData_47:
+	dsprite  -2, 0,  -2, 0, $00, X_FLIP
+	dsprite  -2, 0,   1, 0, $00, $0
+	dsprite   1, 0,  -2, 0, $00, X_FLIP | Y_FLIP
+	dsprite   1, 0,   1, 0, $00, Y_FLIP
+
+.OAMData_48:
+	dsprite  -3, 0,  -1, 4, $00, $0
+	dsprite  -2, 0,  -1, 2, $00, $0
+	dsprite  -1, 0,  -1, 0, $00, $0
+	dsprite   0, 0,  -1, 0, $00, $0
+	dsprite   1, 0,  -1, 2, $00, $0
+	dsprite   2, 0,  -1, 4, $00, $0
+
+.OAMData_49:
+	dsprite  -1, 4,  -2, 0, $00, X_FLIP
+	dsprite  -1, 2,  -1, 0, $00, X_FLIP
+	dsprite  -1, 2,   0, 0, $00, $0
+	dsprite  -1, 4,   1, 0, $00, $0
+
+.OAMData_4a:
+	dsprite  -1, 4,  -1, 0, $00, X_FLIP | Y_FLIP
+	dsprite  -1, 4,   0, 0, $00, Y_FLIP
+
+.OAMData_0f:
+	dsprite  -1, 4,  -1, 4, $00, $0
+	dsprite  -1, 4,  -2, 4, $01, $0
+	dsprite  -1, 4,  -1, 4, $01, X_FLIP
+	dsprite   0, 4,  -2, 4, $01, Y_FLIP
+	dsprite   0, 4,  -1, 4, $01, X_FLIP | Y_FLIP
+
+.OAMData_4c:
+	dsprite  -1, 4,  -1, 4, $00, $0
+	dsprite   0, 2,  -2, 6, $00, $0
+	dsprite   0, 2,  -3, 6, $01, $0
+	dsprite   0, 2,  -2, 6, $01, X_FLIP
+	dsprite   1, 2,  -3, 6, $01, Y_FLIP
+	dsprite   1, 2,  -2, 6, $01, X_FLIP | Y_FLIP
+
+.OAMData_4d:
+	dsprite  -1, 4,  -1, 4, $00, $0
+	dsprite   0, 2,  -2, 6, $00, $0
+	dsprite   1, 0,  -2, 0, $00, $0
+	dsprite   1, 0,  -3, 0, $01, $0
+	dsprite   1, 0,  -2, 0, $01, X_FLIP
+	dsprite   2, 0,  -3, 0, $01, Y_FLIP
+	dsprite   2, 0,  -2, 0, $01, X_FLIP | Y_FLIP
+
+.OAMData_4f:
+	dsprite  -1, 4,  -1, 4, $00, $0
+	dsprite   0, 2,  -2, 6, $00, $0
+	dsprite   1, 0,  -2, 0, $00, $0
+	dsprite   1, 6,  -3, 2, $00, $0
+	dsprite   1, 6,  -4, 2, $01, $0
+	dsprite   1, 6,  -3, 2, $01, X_FLIP
+	dsprite   2, 6,  -4, 2, $01, Y_FLIP
+	dsprite   2, 6,  -3, 2, $01, X_FLIP | Y_FLIP
+
+.OAMData_50:
+	dsprite  -1, 4,  -1, 4, $00, $0
+	dsprite   0, 2,  -2, 6, $00, $0
+	dsprite   1, 0,  -2, 0, $00, $0
+	dsprite   1, 6,  -3, 2, $00, $0
+	dsprite   2, 4,  -4, 4, $00, $0
+	dsprite   2, 4,  -5, 4, $01, $0
+	dsprite   2, 4,  -4, 4, $01, X_FLIP
+	dsprite   3, 4,  -5, 4, $01, Y_FLIP
+	dsprite   3, 4,  -4, 4, $01, X_FLIP | Y_FLIP
+
+.OAMData_51:
+	dsprite  -1, 4,  -1, 4, $00, $0
+	dsprite   0, 2,  -2, 6, $00, $0
+	dsprite   1, 0,  -2, 0, $00, $0
+	dsprite   1, 6,  -3, 2, $00, $0
+	dsprite   2, 4,  -4, 4, $00, $0
+	dsprite   3, 2,  -5, 6, $00, $0
+	dsprite   3, 2,  -6, 6, $01, $0
+	dsprite   3, 2,  -5, 6, $01, X_FLIP
+	dsprite   4, 2,  -6, 6, $01, Y_FLIP
+	dsprite   4, 2,  -5, 6, $01, X_FLIP | Y_FLIP
+
+.OAMData_59:
+	dsprite  -1, 4,  -2, 0, $00, $0
+	dsprite  -1, 4,  -1, 0, $01, $0
+	dsprite  -1, 4,   0, 0, $01, X_FLIP
+	dsprite  -1, 4,   1, 0, $00, X_FLIP
+
+.OAMData_5a:
+	dsprite  -1, 4,  -2, 0, $02, $0
+	dsprite  -1, 4,  -1, 0, $01, $0
+	dsprite  -1, 4,   0, 0, $01, X_FLIP
+	dsprite  -1, 4,   1, 0, $02, X_FLIP
+
+.OAMData_60:
+	dsprite  -1, 0,  -1, 4, $00, $0
+
+.OAMData_69:
+	dsprite   0, 0,  -1, 4, $00, $0
+
+.OAMData_61:
+	dsprite  -1, 4,  -4, 4, $00, $0
+	dsprite  -1, 4,  -3, 4, $01, $0
+	dsprite  -1, 4,  -2, 4, $02, $0
+	dsprite  -1, 4,  -1, 4, $03, $0
+	dsprite  -1, 4,   0, 4, $04, $0
+	dsprite  -1, 4,   1, 4, $05, $0
+	dsprite  -1, 4,   2, 4, $06, $0
+	dsprite  -2, 4,   1, 4, $07, $0
+	dsprite  -2, 4,   2, 4, $08, $0
+
+.OAMData_65:
+	dsprite  -2, 4,  -4, 4, $08, X_FLIP
+	dsprite  -2, 4,  -3, 4, $07, X_FLIP
+	dsprite  -1, 4,  -4, 4, $06, X_FLIP
+	dsprite  -1, 4,  -3, 4, $05, X_FLIP
+	dsprite  -1, 4,  -2, 4, $04, X_FLIP
+	dsprite  -1, 4,  -1, 4, $03, X_FLIP
+	dsprite  -1, 4,   0, 4, $02, X_FLIP
+	dsprite  -1, 4,   1, 4, $01, X_FLIP
+	dsprite  -1, 4,   2, 4, $00, X_FLIP
+
+.OAMData_d4:
+	dsprite   0, 0,  -4, 4, $00, OBP_NUM
+	dsprite   0, 0,  -3, 4, $01, OBP_NUM
+	dsprite   0, 0,  -2, 4, $02, OBP_NUM
+	dsprite   0, 0,  -1, 4, $03, OBP_NUM
+	dsprite   0, 0,   0, 4, $04, OBP_NUM
+	dsprite   0, 0,   1, 4, $05, OBP_NUM
+	dsprite   0, 0,   2, 4, $06, OBP_NUM
+
+.OAMData_d6:
+	dsprite  -1, 0,  -4, 4, $00, OBP_NUM
+	dsprite   0, 0,  -4, 4, $01, OBP_NUM
+	dsprite  -1, 0,  -3, 4, $02, OBP_NUM
+	dsprite   0, 0,  -3, 4, $03, OBP_NUM
+	dsprite  -1, 0,  -2, 4, $04, OBP_NUM
+	dsprite   0, 0,  -2, 4, $05, OBP_NUM
+	dsprite  -1, 0,  -1, 4, $06, OBP_NUM
+	dsprite   0, 0,  -1, 4, $07, OBP_NUM
+	dsprite  -1, 0,   0, 4, $08, OBP_NUM
+	dsprite   0, 0,   0, 4, $09, OBP_NUM
+	dsprite  -1, 0,   1, 4, $0a, OBP_NUM
+	dsprite   0, 0,   1, 4, $0b, OBP_NUM
+	dsprite  -1, 0,   2, 4, $0c, OBP_NUM
+	dsprite   0, 0,   2, 4, $0d, OBP_NUM
+
+.OAMData_d5:
+	dsprite   0, 0,  -3, 0, $00, $1 | OBP_NUM
+	dsprite   0, 0,  -2, 0, $01, $1 | OBP_NUM
+	dsprite   0, 0,  -1, 0, $02, $1 | OBP_NUM
+	dsprite   0, 0,   0, 0, $03, $1 | OBP_NUM
+	dsprite   0, 0,   1, 0, $04, $1 | OBP_NUM
+	dsprite   0, 0,   2, 0, $05, $1 | OBP_NUM
+
+.OAMData_d7:
+	dsprite   0, 0,  -3, 0, $00, $1 | OBP_NUM
+	dsprite   1, 0,  -3, 0, $01, $1 | OBP_NUM
+	dsprite   0, 0,  -2, 0, $02, $1 | OBP_NUM
+	dsprite   1, 0,  -2, 0, $03, $1 | OBP_NUM
+	dsprite   0, 0,  -1, 0, $04, $1 | OBP_NUM
+	dsprite   1, 0,  -1, 0, $05, $1 | OBP_NUM
+	dsprite   0, 0,   0, 0, $06, $1 | OBP_NUM
+	dsprite   1, 0,   0, 0, $07, $1 | OBP_NUM
+	dsprite   0, 0,   1, 0, $08, $1 | OBP_NUM
+	dsprite   1, 0,   1, 0, $09, $1 | OBP_NUM
+	dsprite   0, 0,   2, 0, $0a, $1 | OBP_NUM
+	dsprite   1, 0,   2, 0, $0b, $1 | OBP_NUM
+
+.OAMData_6e:
+	dsprite  -2, 4,   0, 4, $00, $0
+	dsprite  -1, 4,  -2, 4, $01, $0
+	dsprite  -1, 4,  -1, 4, $02, $0
+	dsprite  -1, 4,   0, 4, $03, $0
+	dsprite   0, 4,  -2, 4, $04, $0
+
+.OAMData_6f:
+	dsprite  -1, 4,  -2, 4, $00, $0
+	dsprite  -1, 4,  -1, 4, $01, $0
+	dsprite  -1, 4,   0, 4, $02, $0
+
+.OAMData_77:
+	dsprite  -4, 4,   1, 4, $01, X_FLIP | Y_FLIP
+
+.OAMData_78:
+	dsprite  -4, 4,   1, 4, $00, $0
+	dsprite  -4, 4,   0, 4, $01, X_FLIP | Y_FLIP
+	dsprite  -3, 4,   1, 4, $01, X_FLIP | Y_FLIP
+
+.OAMData_79:
+	dsprite  -4, 4,   1, 4, $01, $0
+	dsprite  -4, 4,   0, 4, $00, $0
+	dsprite  -4, 4,  -1, 4, $01, X_FLIP | Y_FLIP
+	dsprite  -3, 4,   1, 4, $00, $0
+	dsprite  -3, 4,   0, 4, $01, X_FLIP | Y_FLIP
+	dsprite  -2, 4,   1, 4, $01, X_FLIP | Y_FLIP
+
+.OAMData_7a:
+	dsprite  -4, 4,  -2, 4, $01, X_FLIP | Y_FLIP
+	dsprite  -4, 4,  -1, 4, $00, $0
+	dsprite  -4, 4,   0, 4, $01, $0
+	dsprite  -3, 4,  -1, 4, $01, X_FLIP | Y_FLIP
+	dsprite  -3, 4,   0, 4, $00, $0
+	dsprite  -3, 4,   1, 4, $01, $0
+	dsprite  -2, 4,   0, 4, $01, X_FLIP | Y_FLIP
+	dsprite  -2, 4,   1, 4, $00, $0
+	dsprite  -1, 4,   1, 4, $01, X_FLIP | Y_FLIP
+
+.OAMData_7b:
+	dsprite  -4, 4,  -3, 4, $01, X_FLIP | Y_FLIP
+	dsprite  -4, 4,  -2, 4, $00, $0
+	dsprite  -4, 4,  -1, 4, $01, $0
+	dsprite  -3, 4,  -2, 4, $01, X_FLIP | Y_FLIP
+	dsprite  -3, 4,  -1, 4, $00, $0
+	dsprite  -3, 4,   0, 4, $01, $0
+	dsprite  -2, 4,  -1, 4, $01, X_FLIP | Y_FLIP
+	dsprite  -2, 4,   0, 4, $00, $0
+	dsprite  -2, 4,   1, 4, $01, $0
+	dsprite  -1, 4,   0, 4, $01, X_FLIP | Y_FLIP
+	dsprite  -1, 4,   1, 4, $00, $0
+	dsprite   0, 4,   1, 4, $01, X_FLIP | Y_FLIP
+
+.OAMData_7c:
+	dsprite  -4, 4,  -3, 4, $00, $0
+	dsprite  -4, 4,  -2, 4, $01, $0
+	dsprite  -3, 4,  -3, 4, $01, X_FLIP | Y_FLIP
+	dsprite  -3, 4,  -2, 4, $00, $0
+	dsprite  -3, 4,  -1, 4, $01, $0
+	dsprite  -2, 4,  -2, 4, $01, X_FLIP | Y_FLIP
+	dsprite  -2, 4,  -1, 4, $00, $0
+	dsprite  -2, 4,   0, 4, $01, $0
+	dsprite  -1, 4,  -1, 4, $01, X_FLIP | Y_FLIP
+	dsprite  -1, 4,   0, 4, $00, $0
+	dsprite  -1, 4,   1, 4, $01, $0
+	dsprite   0, 4,   0, 4, $01, X_FLIP | Y_FLIP
+	dsprite   0, 4,   1, 4, $00, $0
+	dsprite   1, 4,   1, 4, $01, X_FLIP | Y_FLIP
+
+.OAMData_7d:
+	dsprite  -4, 4,  -3, 4, $01, $0
+	dsprite  -3, 4,  -3, 4, $00, $0
+	dsprite  -3, 4,  -2, 4, $01, $0
+	dsprite  -2, 4,  -3, 4, $01, X_FLIP | Y_FLIP
+	dsprite  -2, 4,  -2, 4, $00, $0
+	dsprite  -2, 4,  -1, 4, $01, $0
+	dsprite  -1, 4,  -2, 4, $01, X_FLIP | Y_FLIP
+	dsprite  -1, 4,  -1, 4, $00, $0
+	dsprite  -1, 4,   0, 4, $01, $0
+	dsprite   0, 4,  -1, 4, $01, X_FLIP | Y_FLIP
+	dsprite   0, 4,   0, 4, $00, $0
+	dsprite   0, 4,   1, 4, $01, $0
+	dsprite   1, 4,   0, 4, $01, X_FLIP | Y_FLIP
+	dsprite   1, 4,   1, 4, $00, $0
+	dsprite   2, 4,   1, 4, $01, X_FLIP | Y_FLIP
+
+.OAMData_70:
+	dsprite  -2, 0,  -1, 0, $00, $0
+	dsprite  -1, 0,  -1, 0, $01, $0
+	dsprite  -2, 0,   0, 0, $00, X_FLIP
+	dsprite  -1, 0,   0, 0, $01, X_FLIP
+	dsprite   0, 0,  -1, 0, $01, Y_FLIP
+	dsprite   1, 0,  -1, 0, $00, Y_FLIP
+	dsprite   0, 0,   0, 0, $01, X_FLIP | Y_FLIP
+	dsprite   1, 0,   0, 0, $00, X_FLIP | Y_FLIP
+
+.OAMData_81:
+	dsprite  -1, 0,  -1, 0, $00, $0
+	dsprite  -1, 0,   0, 0, $01, $0
+	dsprite   0, 0,  -1, 0, $01, X_FLIP | Y_FLIP
+	dsprite   0, 0,   0, 0, $00, X_FLIP | Y_FLIP
+
+.OAMData_87:
+	dsprite  -2, 4,  -1, 0, $00, $0
+	dsprite  -2, 4,   0, 0, $01, $0
+	dsprite  -1, 4,  -1, 0, $02, $0
+	dsprite  -1, 4,   0, 0, $03, $0
+	dsprite  -1, 4,  -1, 0, $00, $0
+	dsprite  -1, 4,   0, 0, $01, $0
+	dsprite   0, 4,  -1, 0, $02, $0
+	dsprite   0, 4,   0, 0, $03, $0
+	dsprite  -3, 4,  -1, 0, $00, $0
+	dsprite  -3, 4,   0, 0, $01, $0
+	dsprite  -2, 4,  -1, 0, $02, $0
+	dsprite  -2, 4,   0, 0, $03, $0
+	dsprite   0, 4,  -1, 0, $00, $0
+	dsprite   0, 4,   0, 0, $01, $0
+	dsprite   1, 4,  -1, 0, $02, $0
+	dsprite   1, 4,   0, 0, $03, $0
+
+.OAMData_88:
+	dsprite  -2, 0,  -1, 0, $00, $0
+	dsprite  -2, 0,   0, 0, $01, $0
+	dsprite  -1, 0,  -1, 0, $02, $0
+	dsprite  -1, 0,   0, 0, $03, $0
+	dsprite  -1, 0,  -1, 0, $00, $0
+	dsprite  -1, 0,   0, 0, $01, $0
+	dsprite   0, 0,  -1, 0, $02, $0
+	dsprite   0, 0,   0, 0, $03, $0
+	dsprite   0, 0,  -1, 0, $00, $0
+	dsprite   0, 0,   0, 0, $01, $0
+	dsprite   1, 0,  -1, 0, $02, $0
+	dsprite   1, 0,   0, 0, $03, $0
+
+.OAMData_8a:
+	dsprite  -1, 4,  -1, 4, $00, $0
+	dsprite  -1, 0,   0, 4, $00, $0
+	dsprite  -2, 4,   1, 4, $00, $0
+	dsprite  -2, 0,   2, 4, $00, $0
+	dsprite  -3, 4,   3, 4, $00, $0
+	dsprite  -3, 0,   4, 4, $00, $0
+	dsprite  -4, 0,   5, 4, $00, $0
+	dsprite  -5, 4,   6, 4, $00, $0
+
+.OAMData_8e:
+	dsprite  -3, 4,  -1, 4, $00, $0
+	dsprite  -2, 4,  -1, 4, $01, $0
+	dsprite  -1, 4,  -1, 4, $02, $0
+	dsprite   0, 4,  -1, 4, $01, Y_FLIP
+	dsprite   1, 4,  -1, 4, $00, Y_FLIP
+
+.OAMData_8f:
+	dsprite  -1, 4,  -2, 0, $00, $0
+	dsprite  -1, 4,  -1, 0, $01, $0
+	dsprite  -1, 4,   0, 0, $02, $0
+	dsprite  -1, 4,   1, 0, $03, $0
+
+.OAMData_93:
+	dsprite  -1, 0,  -2, 4, $00, $0
+	dsprite  -1, 0,  -1, 4, $01, $0
+	dsprite  -1, 0,   0, 4, $02, $0
+	dsprite   0, 0,  -2, 4, $03, $0
+	dsprite   0, 0,  -1, 4, $04, $0
+	dsprite   0, 0,   0, 4, $05, $0
+
+.OAMData_99:
+	dsprite  -1, 0,  -1, 0, $00, $0
+	dsprite  -1, 0,   0, 0, $05, $0
+	dsprite   0, 0,  -1, 0, $01, $0
+	dsprite   0, 0,   0, 0, $05, $0
+
+.OAMData_9b:
+	dsprite  -4, 4,   1, 0, $00, $0
+	dsprite  -4, 4,   2, 0, $01, $0
+	dsprite  -3, 4,  -1, 0, $02, $0
+	dsprite  -3, 4,   0, 0, $03, $0
+	dsprite  -3, 4,   1, 0, $04, $0
+	dsprite  -3, 4,   2, 0, $05, $0
+	dsprite  -3, 4,   3, 0, $06, $0
+	dsprite  -2, 4,  -2, 0, $07, $0
+	dsprite  -2, 4,  -1, 0, $08, $0
+	dsprite  -2, 4,   0, 0, $09, $0
+	dsprite  -2, 4,   1, 0, $0a, $0
+	dsprite  -2, 4,   2, 0, $0b, $0
+	dsprite  -2, 4,   3, 0, $0c, $0
+	dsprite  -2, 4,   4, 0, $0d, $0
+	dsprite  -1, 4,  -3, 0, $0e, $0
+	dsprite  -1, 4,  -2, 0, $0f, $0
+	dsprite  -1, 4,  -1, 0, $10, $0
+	dsprite  -1, 4,   0, 0, $11, $0
+	dsprite  -1, 4,   1, 0, $12, $0
+	dsprite  -1, 4,   2, 0, $13, $0
+	dsprite   0, 4,  -5, 0, $14, $0
+	dsprite   0, 4,  -4, 0, $15, $0
+	dsprite   0, 4,  -3, 0, $16, $0
+	dsprite   0, 4,  -2, 0, $17, $0
+	dsprite   0, 4,  -1, 0, $18, $0
+	dsprite   0, 4,   0, 0, $19, $0
+	dsprite   0, 4,   1, 0, $1a, $0
+	dsprite   0, 4,   2, 0, $1b, $0
+	dsprite   0, 4,   3, 0, $1c, $0
+	dsprite   1, 4,  -5, 0, $1d, $0
+	dsprite   1, 4,  -4, 0, $1e, $0
+	dsprite   1, 4,  -2, 0, $1f, $0
+	dsprite   1, 4,  -1, 0, $20, $0
+	dsprite   1, 4,   0, 0, $21, $0
+	dsprite   1, 4,   1, 0, $22, $0
+	dsprite   2, 4,   0, 0, $23, $0
+
+.OAMData_9c:
+	dsprite   0, 4,  -1, 0, $02, $0
+	dsprite   0, 4,   0, 0, $03, $0
+	dsprite  -1, 4,  -1, 0, $01, $0
+	dsprite  -1, 4,   0, 0, $01, X_FLIP
+	dsprite  -2, 4,  -1, 0, $00, $0
+	dsprite  -2, 4,   0, 0, $00, X_FLIP
+
+.OAMData_9f:
+	dsprite  -1, 0,  -2, 0, $00, $0
+	dsprite  -1, 0,  -1, 0, $01, $0
+	dsprite  -1, 0,   0, 0, $02, $0
+	dsprite  -1, 0,   1, 0, $03, $0
+	dsprite   0, 0,  -2, 0, $04, $0
+	dsprite   0, 0,  -1, 0, $05, $0
+	dsprite   0, 0,   0, 0, $06, $0
+	dsprite   0, 0,   1, 0, $07, $0
+
+.OAMData_a0:
+	dsprite  -2, 4,  -1, 4, $00, $0
+	dsprite  -1, 4,  -1, 4, $00, $0
+	dsprite   0, 4,  -1, 4, $00, $0
+	dsprite  -3, 4,  -1, 4, $00, $0
+	dsprite   1, 4,  -1, 4, $00, $0
+	dsprite  -4, 4,  -1, 4, $00, $0
+	dsprite   2, 4,  -1, 4, $00, $0
+
+.OAMData_a4:
+	dsprite  -2, 4,  -2, 4, $00, $0
+	dsprite  -2, 4,  -1, 4, $01, $0
+	dsprite  -2, 4,   0, 4, $02, $0
+	dsprite  -1, 4,  -2, 4, $03, $0
+	dsprite  -1, 4,  -1, 4, $04, $0
+	dsprite  -1, 4,   0, 4, $05, $0
+	dsprite   0, 4,  -2, 4, $00, Y_FLIP
+	dsprite   0, 4,  -1, 4, $01, Y_FLIP
+	dsprite   0, 4,   0, 4, $02, Y_FLIP
+
+.OAMData_ac:
+	dsprite  -1, 4,  -2, 0, $00, $0
+	dsprite  -1, 4,  -1, 0, $01, $0
+	dsprite  -1, 4,   0, 0, $01, X_FLIP
+	dsprite  -1, 4,   1, 0, $00, X_FLIP
+
+.OAMData_bc:
+	dsprite  -1, 4,  -3, 0, $00, $0
+	dsprite  -1, 4,  -2, 0, $01, $0
+	dsprite  -1, 4,  -1, 0, $02, $0
+	dsprite  -1, 4,   0, 0, $02, X_FLIP
+	dsprite  -1, 4,   1, 0, $01, X_FLIP
+	dsprite  -1, 4,   2, 0, $00, X_FLIP
+
+.OAMData_c1:
+	dsprite  -2, 0,  -2, 0, $00, $0
+	dsprite  -2, 0,  -1, 0, $01, $0
+	dsprite  -2, 0,   0, 0, $02, $0
+	dsprite  -2, 0,   1, 0, $00, X_FLIP
+	dsprite  -1, 0,  -2, 0, $03, $0
+	dsprite  -1, 0,  -1, 0, $04, $0
+	dsprite  -1, 0,   0, 0, $04, X_FLIP
+	dsprite  -1, 0,   1, 0, $05, $0
+	dsprite   0, 0,  -2, 0, $05, X_FLIP | Y_FLIP
+	dsprite   0, 0,  -1, 0, $04, Y_FLIP
+	dsprite   0, 0,   0, 0, $04, X_FLIP | Y_FLIP
+	dsprite   0, 0,   1, 0, $03, X_FLIP | Y_FLIP
+	dsprite   1, 0,  -2, 0, $00, Y_FLIP
+	dsprite   1, 0,  -1, 0, $02, X_FLIP | Y_FLIP
+	dsprite   1, 0,   0, 0, $01, X_FLIP | Y_FLIP
+	dsprite   1, 0,   1, 0, $00, X_FLIP | Y_FLIP
+
+.OAMData_c2:
+	dsprite  -1, 0,  -2, 0, $00, $0
+	dsprite  -1, 0,  -1, 0, $01, $0
+	dsprite  -1, 0,   0, 0, $00, X_FLIP | Y_FLIP
+	dsprite   0, 0,  -1, 0, $00, $0
+	dsprite   0, 0,   0, 0, $01, $0
+	dsprite   0, 0,   1, 0, $00, X_FLIP | Y_FLIP
+
+.OAMData_c8:
+	dsprite  -1, 0,   1, 4, $00, $0
+	dsprite  -1, 0,   2, 4, $01, $0
+	dsprite   0, 0,  -1, 4, $02, $0
+	dsprite   0, 0,   0, 4, $03, $0
+	dsprite   0, 0,   1, 4, $04, $0
+	dsprite   0, 0,   2, 4, $05, $0
+
+.OAMData_ca:
+	dsprite  -1, 0,  -1, 0, $00, $0
+	dsprite  -1, 0,   0, 0, $01, X_FLIP | Y_FLIP
+	dsprite   0, 0,  -1, 0, $01, $0
+	dsprite   0, 0,   0, 0, $01, X_FLIP
+
+.OAMData_cc:
+	dsprite  -2, 0, -13, 4, $00, $0
+	dsprite  -4, 0, -11, 4, $00, $0
+	dsprite  -1, 0,  -9, 4, $00, $0
+	dsprite  -5, 0,  -7, 4, $00, $0
+	dsprite  -3, 0,  -5, 4, $00, $0
+	dsprite  -5, 0,  -3, 4, $00, $0
+	dsprite  -3, 0,  -1, 4, $00, $0
+	dsprite  -3, 0,   0, 4, $00, $0
+	dsprite  -5, 0,   2, 4, $00, $0
+	dsprite   0, 0,   4, 4, $00, $0
+	dsprite  -2, 0,   6, 4, $00, $0
+	dsprite  -4, 0,   8, 4, $00, $0
+	dsprite  -2, 0,  10, 4, $00, $0
+; cfcf6
diff --git a/data/battle_anims/object_gfx.asm b/data/battle_anims/object_gfx.asm
new file mode 100755
index 000000000..133298d13
--- /dev/null
+++ b/data/battle_anims/object_gfx.asm
@@ -0,0 +1,51 @@
+anim_obj_gfx: MACRO
+; # tiles, label
+	db  \1
+	dba \2
+ENDM
+
+AnimObjGFX: ; cfcf6
+; entries correspond to ANIM_GFX_* constants
+	anim_obj_gfx  0, AnimObj00GFX
+	anim_obj_gfx 21, AnimObjHitGFX
+	anim_obj_gfx  6, AnimObjCutGFX
+	anim_obj_gfx  6, AnimObjFireGFX
+	anim_obj_gfx 20, AnimObjWaterGFX
+	anim_obj_gfx 26, AnimObjLightningGFX
+	anim_obj_gfx 18, AnimObjPlantGFX
+	anim_obj_gfx 12, AnimObjSmokeGFX
+	anim_obj_gfx  9, AnimObjExplosionGFX
+	anim_obj_gfx 17, AnimObjRocksGFX
+	anim_obj_gfx  6, AnimObjIceGFX
+	anim_obj_gfx 10, AnimObjPokeBallGFX
+	anim_obj_gfx  9, AnimObjPoisonGFX
+	anim_obj_gfx 13, AnimObjBubbleGFX
+	anim_obj_gfx 16, AnimObjNoiseGFX
+	anim_obj_gfx  2, AnimObjPowderGFX
+	anim_obj_gfx 11, AnimObjBeamGFX
+	anim_obj_gfx  9, AnimObjSpeedGFX
+	anim_obj_gfx  9, AnimObjChargeGFX
+	anim_obj_gfx 19, AnimObjWindGFX
+	anim_obj_gfx 10, AnimObjWhipGFX
+	anim_obj_gfx 12, AnimObjEggGFX
+	anim_obj_gfx 18, AnimObjRopeGFX
+	anim_obj_gfx 13, AnimObjPsychicGFX
+	anim_obj_gfx 10, AnimObjReflectGFX
+	anim_obj_gfx 27, AnimObjStatusGFX
+	anim_obj_gfx 12, AnimObjSandGFX
+	anim_obj_gfx 14, AnimObjWebGFX
+	anim_obj_gfx 16, AnimObjHazeGFX
+	anim_obj_gfx  7, AnimObjHornGFX
+	anim_obj_gfx  8, AnimObjFlowerGFX
+	anim_obj_gfx 40, AnimObjMiscGFX
+	anim_obj_gfx 36, AnimObjSkyAttackGFX
+	anim_obj_gfx 16, AnimObjGlobeGFX
+	anim_obj_gfx 48, AnimObjShapesGFX
+	anim_obj_gfx 18, AnimObjObjectsGFX
+	anim_obj_gfx 38, AnimObjShineGFX
+	anim_obj_gfx 35, AnimObjAngelsGFX
+	anim_obj_gfx 18, AnimObjWaveGFX
+	anim_obj_gfx 24, AnimObjAeroblastGFX
+	anim_obj_gfx  1, NULL
+	anim_obj_gfx  1, NULL
+; cfd9e
diff --git a/battle/objects/data.asm b/data/battle_anims/objects.asm
index 8117d8495..8117d8495 100755
--- a/battle/objects/data.asm
+++ b/data/battle_anims/objects.asm
diff --git a/battle/effect_command_pointers.asm b/data/battle_command_pointers.asm
index 5dd6be786..38a3c1eb8 100644
--- a/battle/effect_command_pointers.asm
+++ b/data/battle_command_pointers.asm
@@ -1,7 +1,7 @@
 	dw 0 ; padding
 
 BattleCommandPointers: ; 3fd28
-; entries correspond to macros/scripts/effect_commands.asm
+; entries correspond to macros/scripts/battle_commands.asm
 	dw BattleCommand_CheckTurn ; 34084
 	dw BattleCommand_CheckObedience ; 343db
 	dw BattleCommand_UsedMoveText ; 34541
diff --git a/data/decoration_attributes.asm b/data/decorations/attributes.asm
index 209662a6f..209662a6f 100644
--- a/data/decoration_attributes.asm
+++ b/data/decorations/attributes.asm
diff --git a/data/decorations/decorations.asm b/data/decorations/decorations.asm
new file mode 100644
index 000000000..7b76b8f6a
--- /dev/null
+++ b/data/decorations/decorations.asm
@@ -0,0 +1,55 @@
+DecorationIDs: ; 26f2b
+; see constants/deco_constants.asm
+	db DECO_FEATHERY_BED ; 2
+	db DECO_PINK_BED ; 3
+	db DECO_POLKADOT_BED ; 4
+	db DECO_PIKACHU_BED ; 5
+
+	db DECO_RED_CARPET ; 7
+	db DECO_BLUE_CARPET ; 8
+	db DECO_YELLOW_CARPET ; 9
+	db DECO_GREEN_CARPET ; a
+
+	db DECO_MAGNAPLANT ; c
+	db DECO_TROPICPLANT ; d
+	db DECO_JUMBOPLANT ; e
+
+	db DECO_TOWN_MAP ; 10
+	db DECO_PIKACHU_POSTER ; 11
+	db DECO_CLEFAIRY_POSTER ; 12
+	db DECO_JIGGLYPUFF_POSTER ; 13
+
+	db DECO_FAMICOM ; 15
+	db DECO_SNES ; 16
+	db DECO_N64 ; 17
+	db DECO_VIRTUAL_BOY ; 18
+
+	db DECO_PIKACHU_DOLL ; 1e
+	db DECO_SURF_PIKACHU_DOLL ; 1f
+	db DECO_CLEFAIRY_DOLL ; 20
+	db DECO_JIGGLYPUFF_DOLL ; 21
+	db DECO_BULBASAUR_DOLL ; 22
+	db DECO_CHARMANDER_DOLL ; 23
+	db DECO_SQUIRTLE_DOLL ; 24
+	db DECO_POLIWAG_DOLL ; 25
+	db DECO_DIGLETT_DOLL ; 26
+	db DECO_STARMIE_DOLL ; 27
+	db DECO_MAGIKARP_DOLL ; 28
+	db DECO_ODDISH_DOLL ; 29
+	db DECO_GENGAR_DOLL ; 2a
+	db DECO_SHELLDER_DOLL ; 2b
+	db DECO_GRIMER_DOLL ; 2c
+	db DECO_VOLTORB_DOLL ; 2d
+	db DECO_WEEDLE_DOLL ; 2e
+	db DECO_UNOWN_DOLL ; 2f
+	db DECO_GEODUDE_DOLL ; 30
+	db DECO_MACHOP_DOLL ; 31
+	db DECO_TENTACOOL_DOLL ; 32
+	db DECO_BIG_SNORLAX_DOLL ; 1a
+	db DECO_BIG_ONIX_DOLL ; 1b
+	db DECO_BIG_LAPRAS_DOLL ; 1c
+TrophyIDs:
+	db DECO_GOLD_TROPHY_DOLL ; 33
+	db DECO_SILVER_TROPHY_DOLL ; 34
+	db -1
+; 26f59
diff --git a/data/decorations/names.asm b/data/decorations/names.asm
new file mode 100644
index 000000000..21f7eb2a0
--- /dev/null
+++ b/data/decorations/names.asm
@@ -0,0 +1,29 @@
+DecorationNames: ; 26b8d
+; entries correspond to constants/deco_constants.asm
+	db "CANCEL@"
+	db "PUT IT AWAY@"
+	db "MAGNAPLANT@"
+	db "TROPICPLANT@"
+	db "JUMBOPLANT@"
+	db "TOWN MAP@"
+	db "NES@"
+	db "SUPER NES@"
+	db "NINTENDO 64@"
+	db "VIRTUAL BOY@"
+	db "GOLD TROPHY@"
+	db "SILVER TROPHY@"
+	db "SURF PIKACHU DOLL@"
+	db " BED@"
+	db " CARPET@"
+	db " POSTER@"
+	db " DOLL@"
+	db "BIG @"
+	db "FEATHERY@"
+	db "PIKACHU@"
+	db "PINK@"
+	db "POLKADOT@"
+	db "RED@"
+	db "BLUE@"
+	db "YELLOW@"
+	db "GREEN@"
+; 26c72
diff --git a/data/default_names.asm b/data/default_names.asm
new file mode 100644
index 000000000..87c341652
--- /dev/null
+++ b/data/default_names.asm
@@ -0,0 +1,39 @@
+ChrisNameMenuHeader: ; 882b5
+	db $40 ; flags
+	db 00, 00 ; start coords
+	db 11, 10 ; end coords
+	dw .MaleNames
+	db 1 ; ????
+	db 0 ; default option
+
+.MaleNames: ; 882be
+	db $91 ; flags
+	db 5 ; items
+	db "NEW NAME@"
+MalePlayerNameArray: ; 882c9
+	db "CHRIS@"
+	db "MAT@"
+	db "ALLAN@"
+	db "JON@"
+	db 2 ; displacement
+	db " NAME @" ; title
+
+KrisNameMenuHeader: ; 882e5
+	db $40 ; flags
+	db 00, 00 ; start coords
+	db 11, 10 ; end coords
+	dw .FemaleNames
+	db 1 ; ????
+	db 0 ; default option
+
+.FemaleNames: ; 882ee
+	db $91 ; flags
+	db 5 ; items
+	db "NEW NAME@"
+FemalePlayerNameArray: ; 882f9
+	db "KRIS@"
+	db "AMANDA@"
+	db "JUANA@"
+	db "JODI@"
+	db 2 ; displacement
+	db " NAME @" ; title
diff --git a/data/emote_headers.asm b/data/emote_headers.asm
deleted file mode 100644
index 2618d3b0a..000000000
--- a/data/emote_headers.asm
+++ /dev/null
@@ -1,22 +0,0 @@
-emote_header: MACRO
-; graphics pointer, length, starting tile
-	dw \1
-	db \2 tiles, BANK(\1)
-	dw VTiles1 tile \3
-ENDM
-
-EmotesPointers: ; 144d
-; entries correspond to EMOTE_* constants
-	emote_header ShockEmote,     4, $78
-	emote_header QuestionEmote,  4, $78
-	emote_header HappyEmote,     4, $78
-	emote_header SadEmote,       4, $78
-	emote_header HeartEmote,     4, $78
-	emote_header BoltEmote,      4, $78
-	emote_header SleepEmote,     4, $78
-	emote_header FishEmote,      4, $78
-	emote_header JumpShadowGFX,  1, $7c
-	emote_header FishingRodGFX,  2, $7c
-	emote_header BoulderDustGFX, 2, $7e
-	emote_header GrassRustleGFX, 1, $7e
-; 14495
diff --git a/data/emotes.asm b/data/emotes.asm
new file mode 100644
index 000000000..af16a61c6
--- /dev/null
+++ b/data/emotes.asm
@@ -0,0 +1,22 @@
+emote: MACRO
+; graphics pointer, length, starting tile
+	dw \1
+	db \2 tiles, BANK(\1)
+	dw VTiles1 tile \3
+ENDM
+
+Emotes: ; 144d
+; entries correspond to EMOTE_* constants
+	emote ShockEmote,     4, $78
+	emote QuestionEmote,  4, $78
+	emote HappyEmote,     4, $78
+	emote SadEmote,       4, $78
+	emote HeartEmote,     4, $78
+	emote BoltEmote,      4, $78
+	emote SleepEmote,     4, $78
+	emote FishEmote,      4, $78
+	emote JumpShadowGFX,  1, $7c
+	emote FishingRodGFX,  2, $7c
+	emote BoulderDustGFX, 2, $7e
+	emote GrassRustleGFX, 1, $7e
+; 14495
diff --git a/gfx/icon_pointers.asm b/data/icon_pointers.asm
index bfe07abb6..bfe07abb6 100644
--- a/gfx/icon_pointers.asm
+++ b/data/icon_pointers.asm
diff --git a/data/items/item_attributes.asm b/data/items/attributes.asm
index dc2842760..dc2842760 100644
--- a/data/items/item_attributes.asm
+++ b/data/items/attributes.asm
diff --git a/data/items/buena_prizes.asm b/data/items/buena_prizes.asm
index 8aecf2bd0..d0a0e6b88 100644
--- a/data/items/buena_prizes.asm
+++ b/data/items/buena_prizes.asm
@@ -1,5 +1,5 @@
 BuenaPrizeItems: ; 8b15e
-; there are NUM_BUENA_PRIZES items (see event/buena.asm)
+; there are NUM_BUENA_PRIZES items (see engine/events/buena.asm)
 	db ULTRA_BALL,   2
 	db FULL_RESTORE, 2
 	db NUGGET,       3
diff --git a/data/items/item_descriptions.asm b/data/items/descriptions.asm
index e5b01e8fd..e5b01e8fd 100644
--- a/data/items/item_descriptions.asm
+++ b/data/items/descriptions.asm
diff --git a/data/items/mail_items.asm b/data/items/mail_items.asm
new file mode 100644
index 000000000..64b4216ca
--- /dev/null
+++ b/data/items/mail_items.asm
@@ -0,0 +1,13 @@
+MailItems: ; b9e80
+	db FLOWER_MAIL
+	db SURF_MAIL
+	db LITEBLUEMAIL
+	db PORTRAITMAIL
+	db LOVELY_MAIL
+	db EON_MAIL
+	db MORPH_MAIL
+	db BLUESKY_MAIL
+	db MUSIC_MAIL
+	db MIRAGE_MAIL
+	db -1
+; b9e8b
diff --git a/data/items/item_names.asm b/data/items/names.asm
index f44100ab3..f44100ab3 100644
--- a/data/items/item_names.asm
+++ b/data/items/names.asm
diff --git a/data/map_objects.asm b/data/map_objects.asm
index 09de8dc52..af8b6d623 100755
--- a/data/map_objects.asm
+++ b/data/map_objects.asm
@@ -6,42 +6,42 @@ endm
 SpriteMovementData:: ; 4273
 ; entries correspond to SPRITEMOVEDATA_* constants
 	; function,                                              facing, action,                  flags1, flags2, palette flags
-	sprite_movement_data SPRITEMOVEFN_00,                    DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; 00
-	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,        $0c,    $00,    %0000 ; 01
-	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY,        DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 02
-	sprite_movement_data SPRITEMOVEFN_SLOW_RANDOM_SPIN,      DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 03
-	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_Y,         DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 04
-	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_X,         DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 05
-	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 06
-	sprite_movement_data SPRITEMOVEFN_STANDING,              UP,     OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 07
-	sprite_movement_data SPRITEMOVEFN_STANDING,              LEFT,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 08
-	sprite_movement_data SPRITEMOVEFN_STANDING,              RIGHT,  OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 09
-	sprite_movement_data SPRITEMOVEFN_FAST_RANDOM_SPIN,      DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 0a
-	sprite_movement_data SPRITEMOVEFN_OBEY_DPAD,             DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; 0b
-	sprite_movement_data SPRITEMOVEFN_08,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 0c
-	sprite_movement_data SPRITEMOVEFN_09,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 0d
-	sprite_movement_data SPRITEMOVEFN_0A,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 0e
-	sprite_movement_data SPRITEMOVEFN_0B,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 0f
-	sprite_movement_data SPRITEMOVEFN_0C,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 10
-	sprite_movement_data SPRITEMOVEFN_0D,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 11
-	sprite_movement_data SPRITEMOVEFN_0E,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 12
-	sprite_movement_data SPRITEMOVEFN_FOLLOW,                DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; 13
-	sprite_movement_data SPRITEMOVEFN_SCRIPTED,              DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; 14
-	sprite_movement_data SPRITEMOVEFN_BIG_SNORLAX,           DOWN,   OBJECT_ACTION_BIG_SNORLAX,  $2e,    $01,    %1100 ; 15
-	sprite_movement_data SPRITEMOVEFN_BOUNCE,                DOWN,   OBJECT_ACTION_BOUNCE,       $2e,    $00,    %0000 ; 16
-	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,        $0c,    $00,    %0000 ; 17
-	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,        $2e,    $10,    %0000 ; 18
-	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   OBJECT_ACTION_STAND,        $2e,    $00,    %0100 ; 19
-	sprite_movement_data SPRITEMOVEFN_FOLLOWNOTEXACT,        DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; 1a
-	sprite_movement_data SPRITEMOVEFN_SHADOW,                DOWN,   OBJECT_ACTION_00,           $8e,    $01,    %0000 ; 1b
-	sprite_movement_data SPRITEMOVEFN_EMOTE,                 DOWN,   OBJECT_ACTION_EMOTE,        $8e,    $02,    %0000 ; 1c
-	sprite_movement_data SPRITEMOVEFN_SCREENSHAKE,           DOWN,   OBJECT_ACTION_00,           $82,    $00,    %0000 ; 1d
-	sprite_movement_data SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE, LEFT,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 1e
-	sprite_movement_data SPRITEMOVEFN_SPIN_CLOCKWISE,        RIGHT,  OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 1f
-	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   OBJECT_ACTION_BIG_LAPRAS,   $2e,    $01,    %1100 ; 20
-	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   OBJECT_ACTION_BIG_DOLL,     $2e,    $01,    %1100 ; 21
-	sprite_movement_data SPRITEMOVEFN_BOULDERDUST,           DOWN,   OBJECT_ACTION_BOULDER_DUST, $8e,    $01,    %0000 ; 22
-	sprite_movement_data SPRITEMOVEFN_GRASS,                 DOWN,   OBJECT_ACTION_GRASS_SHAKE,  $8e,    $02,    %0000 ; 23
-	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY,        DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0010 ; 24
+	sprite_movement_data SPRITEMOVEFN_00,                    DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; SPRITEMOVEDATA_00
+	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,        $0c,    $00,    %0000 ; SPRITEMOVEDATA_ITEM_TREE
+	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY,        DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_WANDER
+	sprite_movement_data SPRITEMOVEFN_SLOW_RANDOM_SPIN,      DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_SPINRANDOM_SLOW
+	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_Y,         DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_WALK_UP_DOWN
+	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_X,         DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_WALK_LEFT_RIGHT
+	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_STANDING_DOWN
+	sprite_movement_data SPRITEMOVEFN_STANDING,              UP,     OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_STANDING_UP
+	sprite_movement_data SPRITEMOVEFN_STANDING,              LEFT,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_STANDING_LEFT
+	sprite_movement_data SPRITEMOVEFN_STANDING,              RIGHT,  OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_STANDING_RIGHT
+	sprite_movement_data SPRITEMOVEFN_FAST_RANDOM_SPIN,      DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_SPINRANDOM_FAST
+	sprite_movement_data SPRITEMOVEFN_OBEY_DPAD,             DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; SPRITEMOVEDATA_PLAYER
+	sprite_movement_data SPRITEMOVEFN_08,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_0C
+	sprite_movement_data SPRITEMOVEFN_09,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_0D
+	sprite_movement_data SPRITEMOVEFN_0A,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_0E
+	sprite_movement_data SPRITEMOVEFN_0B,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_0F
+	sprite_movement_data SPRITEMOVEFN_0C,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_10
+	sprite_movement_data SPRITEMOVEFN_0D,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_11
+	sprite_movement_data SPRITEMOVEFN_0E,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_12
+	sprite_movement_data SPRITEMOVEFN_FOLLOW,                DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; SPRITEMOVEDATA_FOLLOWING
+	sprite_movement_data SPRITEMOVEFN_SCRIPTED,              DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; SPRITEMOVEDATA_SCRIPTED
+	sprite_movement_data SPRITEMOVEFN_BIG_SNORLAX,           DOWN,   OBJECT_ACTION_BIG_SNORLAX,  $2e,    $01,    %1100 ; SPRITEMOVEDATA_SNORLAX
+	sprite_movement_data SPRITEMOVEFN_BOUNCE,                DOWN,   OBJECT_ACTION_BOUNCE,       $2e,    $00,    %0000 ; SPRITEMOVEDATA_POKEMON
+	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,        $0c,    $00,    %0000 ; SPRITEMOVEDATA_SUDOWOODO
+	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,        $2e,    $10,    %0000 ; SPRITEMOVEDATA_SMASHABLE_ROCK
+	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   OBJECT_ACTION_STAND,        $2e,    $00,    %0100 ; SPRITEMOVEDATA_STRENGTH_BOULDER
+	sprite_movement_data SPRITEMOVEFN_FOLLOWNOTEXACT,        DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; SPRITEMOVEDATA_FOLLOWNOTEXACT
+	sprite_movement_data SPRITEMOVEFN_SHADOW,                DOWN,   OBJECT_ACTION_00,           $8e,    $01,    %0000 ; SPRITEMOVEDATA_SHADOW
+	sprite_movement_data SPRITEMOVEFN_EMOTE,                 DOWN,   OBJECT_ACTION_EMOTE,        $8e,    $02,    %0000 ; SPRITEMOVEDATA_EMOTE
+	sprite_movement_data SPRITEMOVEFN_SCREENSHAKE,           DOWN,   OBJECT_ACTION_00,           $82,    $00,    %0000 ; SPRITEMOVEDATA_SCREENSHAKE
+	sprite_movement_data SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE, LEFT,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE
+	sprite_movement_data SPRITEMOVEFN_SPIN_CLOCKWISE,        RIGHT,  OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_SPINCLOCKWISE
+	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   OBJECT_ACTION_BIG_LAPRAS,   $2e,    $01,    %1100 ; SPRITEMOVEDATA_20
+	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   OBJECT_ACTION_BIG_DOLL,     $2e,    $01,    %1100 ; SPRITEMOVEDATA_BIGDOLL
+	sprite_movement_data SPRITEMOVEFN_BOULDERDUST,           DOWN,   OBJECT_ACTION_BOULDER_DUST, $8e,    $01,    %0000 ; SPRITEMOVEDATA_BOULDERDUST
+	sprite_movement_data SPRITEMOVEFN_GRASS,                 DOWN,   OBJECT_ACTION_GRASS_SHAKE,  $8e,    $02,    %0000 ; SPRITEMOVEDATA_GRASS
+	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY,        DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0010 ; SPRITEMOVEDATA_LAPRAS
 	sprite_movement_data SPRITEMOVEFN_00,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 25
 ; 4357
diff --git a/data/maps/environment_colors.asm b/data/maps/environment_colors.asm
index 92d788fe1..aeddb83bc 100644
--- a/data/maps/environment_colors.asm
+++ b/data/maps/environment_colors.asm
@@ -1,5 +1,5 @@
 EnvironmentColorsPointers:
-; entries correspond to environment constants (see constants/map_constants.asm)
+; entries correspond to environment constants (see constants/map_data_constants.asm)
 	dw .OutdoorColors ; unused
 	dw .OutdoorColors ; TOWN
 	dw .OutdoorColors ; ROUTE
diff --git a/data/flypoints.asm b/data/maps/flypoints.asm
index b41db0ea1..b41db0ea1 100644
--- a/data/flypoints.asm
+++ b/data/maps/flypoints.asm
diff --git a/data/maps/mapgroup_roofs.asm b/data/maps/roofs.asm
index 8c79e6f82..8c79e6f82 100644
--- a/data/maps/mapgroup_roofs.asm
+++ b/data/maps/roofs.asm
diff --git a/data/maps/map_scenes.asm b/data/maps/scenes.asm
index 3d9600407..3d9600407 100644
--- a/data/maps/map_scenes.asm
+++ b/data/maps/scenes.asm
diff --git a/data/maps/setup_scripts.asm b/data/maps/setup_scripts.asm
new file mode 100644
index 000000000..47895b609
--- /dev/null
+++ b/data/maps/setup_scripts.asm
@@ -0,0 +1,177 @@
+MapSetupScripts: ; 15377
+; entries correspond to MAPSETUP_* constants (see constants/map_setup_constants.asm)
+	dw MapSetupScript_Warp
+	dw MapSetupScript_Continue
+	dw MapSetupScript_ReloadMap
+	dw MapSetupScript_Teleport
+	dw MapSetupScript_Door
+	dw MapSetupScript_Fall
+	dw MapSetupScript_Connection
+	dw MapSetupScript_LinkReturn
+	dw MapSetupScript_Train
+	dw MapSetupScript_Submenu
+	dw MapSetupScript_BadWarp
+	dw MapSetupScript_Fly
+; 1538f
+
+MapSetupScript_Teleport: ; 1538f
+	db map_prolong_sprites
+MapSetupScript_Fly: ; 15390
+	db map_fade_out_palettes
+	db map_keep_roam
+MapSetupScript_Warp: ; 15392
+	db map_lcd_off
+	db map_sound_off
+	db map_load_spawn
+	db map_attributes
+	db map_change_callback
+	db map_spawn_coord
+	db map_player_coord
+	db map_anchor_screen
+	db map_load_blocks
+	db map_buffer_screen
+	db map_load_graphics
+	db map_time_of_day
+	db map_load_objects
+	db map_lcd_on
+	db map_palettes
+	db map_face_down
+	db map_sprites
+	db map_bike_music
+	db map_max_volume
+	db map_fade_in_palettes
+	db map_animations_on
+	db map_wildmons
+	db map_end
+
+MapSetupScript_BadWarp: ; 153a9
+	db map_load_spawn
+	db map_attributes
+	db map_change_callback
+	db map_spawn_coord
+	db map_player_coord
+	db map_anchor_screen
+	db map_load_blocks
+	db map_buffer_screen
+	db map_lcd_off
+	db map_load_graphics
+	db map_time_of_day
+	db map_fade_out_music
+	db map_lcd_on
+	db map_load_objects
+	db map_palettes
+	db map_face_down
+	db map_sprites
+	db map_fade_music
+	db map_fade_in_palettes
+	db map_animations_on
+	db map_wildmons
+	db map_end
+
+MapSetupScript_Connection: ; 153bf
+	db map_animations_off
+	db map_load_connection
+	db map_attributes
+	db map_change_callback
+	db map_player_coord
+	db map_load_blocks
+	db map_load_tileset
+	db map_save_screen
+	db map_load_objects
+	db map_fade_music
+	db map_palettes
+	db map_stop_script
+	db map_keep_palettes
+	db map_wildmons
+	db map_update_roam
+	db map_animations_on
+	db map_end
+
+MapSetupScript_Fall: ; 153d0
+	db map_prolong_sprites
+MapSetupScript_Door: ; 153d1
+	db map_fade_out_palettes
+MapSetupScript_Train: ; 153d2
+	db map_load_warp
+	db map_attributes
+	db map_warp_face
+	db map_change_callback
+	db map_player_coord
+	db map_load_blocks
+	db map_buffer_screen
+	db map_lcd_off
+	db map_load_graphics
+	db map_time_of_day
+	db map_fade_out_music
+	db map_lcd_on
+	db map_load_objects
+	db map_palettes
+	db map_sprites
+	db map_fade_music
+	db map_fade_in_palettes
+	db map_animations_on
+	db map_wildmons
+	db map_update_roam
+	db map_end
+
+MapSetupScript_ReloadMap: ; 153e7
+	db map_fade
+	db map_clear_bg_palettes
+	db map_lcd_off
+	db map_sound_off
+	db map_load_blocks
+	db map_connection_blocks
+	db map_load_graphics
+	db map_time_of_day
+	db map_lcd_on
+	db map_palettes
+	db map_sprites
+	db map_music_force
+	db map_fade_in_palettes
+	db map_animations_on
+	db map_wildmons
+	db map_end
+
+MapSetupScript_LinkReturn: ; 153f7
+	db map_fade
+	db map_lcd_off
+	db map_sound_off
+	db map_change_callback
+	db map_load_blocks
+	db map_buffer_screen
+	db map_load_graphics
+	db map_time_of_day
+	db map_lcd_on
+	db map_palettes
+	db map_sprites
+	db map_bike_music
+	db map_fade_in_palettes
+	db map_animations_on
+	db map_wildmons
+	db map_text_scroll_off
+	db map_end
+
+MapSetupScript_Continue: ; 15408
+	db map_lcd_off
+	db map_sound_off
+	db map_attributes_2
+	db map_anchor_screen
+	db map_start_callback
+	db map_load_blocks
+	db map_connection_blocks
+	db map_buffer_screen
+	db map_load_graphics
+	db map_time_of_day
+	db map_lcd_on
+	db map_palettes
+	db map_sprites
+	db map_bike_music
+	db map_fade_in_palettes
+	db map_animations_on
+	db map_wildmons
+	db map_end
+
+MapSetupScript_Submenu: ; 1541a
+	db map_load_blocks
+	db map_connection_blocks
+	db map_end
diff --git a/battle/anims.asm b/data/moves/animations.asm
index e0b7f0014..e28a2e62d 100644
--- a/battle/anims.asm
+++ b/data/moves/animations.asm
@@ -1,4 +1,5 @@
 BattleAnimations:: ; c906f
+; entries correspond to constants/move_constants.asm
 	dw BattleAnim_0
 	dw BattleAnim_Pound
 	dw BattleAnim_KarateChop
diff --git a/battle/moves/move_descriptions.asm b/data/moves/descriptions.asm
index d86ceea37..d86ceea37 100644
--- a/battle/moves/move_descriptions.asm
+++ b/data/moves/descriptions.asm
diff --git a/battle/moves/move_effects.asm b/data/moves/effects.asm
index c56ff2560..c56ff2560 100644
--- a/battle/moves/move_effects.asm
+++ b/data/moves/effects.asm
diff --git a/battle/moves/move_effects_pointers.asm b/data/moves/effects_pointers.asm
index a12092881..a12092881 100644
--- a/battle/moves/move_effects_pointers.asm
+++ b/data/moves/effects_pointers.asm
diff --git a/battle/moves/moves.asm b/data/moves/moves.asm
index b576fbaff..b576fbaff 100644
--- a/battle/moves/moves.asm
+++ b/data/moves/moves.asm
diff --git a/battle/move_names.asm b/data/moves/names.asm
index cfc7ac54f..cfc7ac54f 100644
--- a/battle/move_names.asm
+++ b/data/moves/names.asm
diff --git a/data/tmhm_moves.asm b/data/moves/tmhm_moves.asm
index c1af85ec5..fea29780c 100644
--- a/data/tmhm_moves.asm
+++ b/data/moves/tmhm_moves.asm
@@ -50,7 +50,6 @@ TMHMMoves: ; 1167a
 	db FIRE_PUNCH
 	db FURY_CUTTER
 	db NIGHTMARE
-
 ; HMs
 	db CUT
 	db FLY
@@ -59,11 +58,9 @@ TMHMMoves: ; 1167a
 	db FLASH
 	db WHIRLPOOL
 	db WATERFALL
-
 ; Move tutor
 	db FLAMETHROWER
 	db THUNDERBOLT
 	db ICE_BEAM
-
 	db 0 ; end
 ; 116b7
diff --git a/data/mystery_gift/decos.asm b/data/mystery_gift_decos.asm
index bdd4694c6..bdd4694c6 100644
--- a/data/mystery_gift/decos.asm
+++ b/data/mystery_gift_decos.asm
diff --git a/data/mystery_gift/items.asm b/data/mystery_gift_items.asm
index b2379071e..b2379071e 100644
--- a/data/mystery_gift/items.asm
+++ b/data/mystery_gift_items.asm
diff --git a/tilesets/palettes/battle_tower.pal b/data/palettes/tilesets/battle_tower.pal
index 4e71a5575..4e71a5575 100644
--- a/tilesets/palettes/battle_tower.pal
+++ b/data/palettes/tilesets/battle_tower.pal
diff --git a/tilesets/palettes/house_1.pal b/data/palettes/tilesets/house_1.pal
index a9f8b74b6..a9f8b74b6 100644
--- a/tilesets/palettes/house_1.pal
+++ b/data/palettes/tilesets/house_1.pal
diff --git a/tilesets/palettes/ice_path.pal b/data/palettes/tilesets/ice_path.pal
index cb7659f50..cb7659f50 100644
--- a/tilesets/palettes/ice_path.pal
+++ b/data/palettes/tilesets/ice_path.pal
diff --git a/tilesets/palettes/pokecom_center.pal b/data/palettes/tilesets/pokecom_center.pal
index 9fe7b765a..9fe7b765a 100644
--- a/tilesets/palettes/pokecom_center.pal
+++ b/data/palettes/tilesets/pokecom_center.pal
diff --git a/tilesets/palettes/radio_tower.pal b/data/palettes/tilesets/radio_tower.pal
index 5799b6f77..5799b6f77 100644
--- a/tilesets/palettes/radio_tower.pal
+++ b/data/palettes/tilesets/radio_tower.pal
diff --git a/data/pokemon/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm
index 5167eb5cc..d7824f196 100644
--- a/data/pokemon/base_stats/abra.asm
+++ b/data/pokemon/base_stats/abra.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/abra/front.dimensions"
+	INCBIN "gfx/pokemon/abra/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/pokemon/base_stats/aerodactyl.asm b/data/pokemon/base_stats/aerodactyl.asm
index 897311399..26eac4ded 100644
--- a/data/pokemon/base_stats/aerodactyl.asm
+++ b/data/pokemon/base_stats/aerodactyl.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 35 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/aerodactyl/front.dimensions"
+	INCBIN "gfx/pokemon/aerodactyl/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/pokemon/base_stats/aipom.asm b/data/pokemon/base_stats/aipom.asm
index 839bff358..0bd6954f4 100644
--- a/data/pokemon/base_stats/aipom.asm
+++ b/data/pokemon/base_stats/aipom.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/aipom/front.dimensions"
+	INCBIN "gfx/pokemon/aipom/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm
index 594d6241d..35ebdf9af 100644
--- a/data/pokemon/base_stats/alakazam.asm
+++ b/data/pokemon/base_stats/alakazam.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/alakazam/front.dimensions"
+	INCBIN "gfx/pokemon/alakazam/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/pokemon/base_stats/ampharos.asm b/data/pokemon/base_stats/ampharos.asm
index ec361a08d..b391238d3 100644
--- a/data/pokemon/base_stats/ampharos.asm
+++ b/data/pokemon/base_stats/ampharos.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/ampharos/front.dimensions"
+	INCBIN "gfx/pokemon/ampharos/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.asm
index ed84e5dc8..52341c37d 100644
--- a/data/pokemon/base_stats/arbok.asm
+++ b/data/pokemon/base_stats/arbok.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/arbok/front.dimensions"
+	INCBIN "gfx/pokemon/arbok/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, REPTILE ; egg groups
diff --git a/data/pokemon/base_stats/arcanine.asm b/data/pokemon/base_stats/arcanine.asm
index d543bb8da..299086c9d 100644
--- a/data/pokemon/base_stats/arcanine.asm
+++ b/data/pokemon/base_stats/arcanine.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/arcanine/front.dimensions"
+	INCBIN "gfx/pokemon/arcanine/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/ariados.asm b/data/pokemon/base_stats/ariados.asm
index 7b77b1afd..78697127c 100644
--- a/data/pokemon/base_stats/ariados.asm
+++ b/data/pokemon/base_stats/ariados.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/ariados/front.dimensions"
+	INCBIN "gfx/pokemon/ariados/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/pokemon/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm
index ddf85599b..e637c47f4 100644
--- a/data/pokemon/base_stats/articuno.asm
+++ b/data/pokemon/base_stats/articuno.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 80 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/articuno/front.dimensions"
+	INCBIN "gfx/pokemon/articuno/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/pokemon/base_stats/azumarill.asm b/data/pokemon/base_stats/azumarill.asm
index c4286ad5d..1681d3be2 100644
--- a/data/pokemon/base_stats/azumarill.asm
+++ b/data/pokemon/base_stats/azumarill.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/azumarill/front.dimensions"
+	INCBIN "gfx/pokemon/azumarill/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn AMPHIBIAN, FAIRY ; egg groups
diff --git a/data/pokemon/base_stats/bayleef.asm b/data/pokemon/base_stats/bayleef.asm
index 82caf4ae7..50ee3044c 100644
--- a/data/pokemon/base_stats/bayleef.asm
+++ b/data/pokemon/base_stats/bayleef.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/bayleef/front.dimensions"
+	INCBIN "gfx/pokemon/bayleef/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, PLANT ; egg groups
diff --git a/data/pokemon/base_stats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm
index c76accff8..3fa11d8eb 100644
--- a/data/pokemon/base_stats/beedrill.asm
+++ b/data/pokemon/base_stats/beedrill.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/beedrill/front.dimensions"
+	INCBIN "gfx/pokemon/beedrill/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/pokemon/base_stats/bellossom.asm b/data/pokemon/base_stats/bellossom.asm
index 9131b2b38..3f3f06870 100644
--- a/data/pokemon/base_stats/bellossom.asm
+++ b/data/pokemon/base_stats/bellossom.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/bellossom/front.dimensions"
+	INCBIN "gfx/pokemon/bellossom/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn PLANT, PLANT ; egg groups
diff --git a/data/pokemon/base_stats/bellsprout.asm b/data/pokemon/base_stats/bellsprout.asm
index 94a8ded6b..5e75e6e89 100644
--- a/data/pokemon/base_stats/bellsprout.asm
+++ b/data/pokemon/base_stats/bellsprout.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/bellsprout/front.dimensions"
+	INCBIN "gfx/pokemon/bellsprout/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn PLANT, PLANT ; egg groups
diff --git a/data/pokemon/base_stats/blastoise.asm b/data/pokemon/base_stats/blastoise.asm
index 7bb267d72..7e2f1697e 100644
--- a/data/pokemon/base_stats/blastoise.asm
+++ b/data/pokemon/base_stats/blastoise.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/blastoise/front.dimensions"
+	INCBIN "gfx/pokemon/blastoise/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, AMPHIBIAN ; egg groups
diff --git a/data/pokemon/base_stats/blissey.asm b/data/pokemon/base_stats/blissey.asm
index d1da5ea85..789649a40 100644
--- a/data/pokemon/base_stats/blissey.asm
+++ b/data/pokemon/base_stats/blissey.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 40 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/blissey/front.dimensions"
+	INCBIN "gfx/pokemon/blissey/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn FAIRY, FAIRY ; egg groups
diff --git a/data/pokemon/base_stats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm
index bc843bcd3..2795d8035 100644
--- a/data/pokemon/base_stats/bulbasaur.asm
+++ b/data/pokemon/base_stats/bulbasaur.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/bulbasaur/front.dimensions"
+	INCBIN "gfx/pokemon/bulbasaur/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, PLANT ; egg groups
diff --git a/data/pokemon/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm
index 2392f4139..1feee4f58 100644
--- a/data/pokemon/base_stats/butterfree.asm
+++ b/data/pokemon/base_stats/butterfree.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/butterfree/front.dimensions"
+	INCBIN "gfx/pokemon/butterfree/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/pokemon/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm
index cdac5bf26..a10790541 100644
--- a/data/pokemon/base_stats/caterpie.asm
+++ b/data/pokemon/base_stats/caterpie.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/caterpie/front.dimensions"
+	INCBIN "gfx/pokemon/caterpie/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/pokemon/base_stats/celebi.asm b/data/pokemon/base_stats/celebi.asm
index 986ebcc83..aabadba4f 100644
--- a/data/pokemon/base_stats/celebi.asm
+++ b/data/pokemon/base_stats/celebi.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 120 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/celebi/front.dimensions"
+	INCBIN "gfx/pokemon/celebi/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/pokemon/base_stats/chansey.asm b/data/pokemon/base_stats/chansey.asm
index aeb4aa1d5..d51f67d4f 100644
--- a/data/pokemon/base_stats/chansey.asm
+++ b/data/pokemon/base_stats/chansey.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 40 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/chansey/front.dimensions"
+	INCBIN "gfx/pokemon/chansey/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn FAIRY, FAIRY ; egg groups
diff --git a/data/pokemon/base_stats/charizard.asm b/data/pokemon/base_stats/charizard.asm
index 8d32f3f91..d978c6ad5 100644
--- a/data/pokemon/base_stats/charizard.asm
+++ b/data/pokemon/base_stats/charizard.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/charizard/front.dimensions"
+	INCBIN "gfx/pokemon/charizard/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, REPTILE ; egg groups
diff --git a/data/pokemon/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm
index 98383865c..2fa9b9526 100644
--- a/data/pokemon/base_stats/charmander.asm
+++ b/data/pokemon/base_stats/charmander.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/charmander/front.dimensions"
+	INCBIN "gfx/pokemon/charmander/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, REPTILE ; egg groups
diff --git a/data/pokemon/base_stats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm
index 9f7f32b51..5d86b975b 100644
--- a/data/pokemon/base_stats/charmeleon.asm
+++ b/data/pokemon/base_stats/charmeleon.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/charmeleon/front.dimensions"
+	INCBIN "gfx/pokemon/charmeleon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, REPTILE ; egg groups
diff --git a/data/pokemon/base_stats/chikorita.asm b/data/pokemon/base_stats/chikorita.asm
index fdf120402..0476ba558 100644
--- a/data/pokemon/base_stats/chikorita.asm
+++ b/data/pokemon/base_stats/chikorita.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/chikorita/front.dimensions"
+	INCBIN "gfx/pokemon/chikorita/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, PLANT ; egg groups
diff --git a/data/pokemon/base_stats/chinchou.asm b/data/pokemon/base_stats/chinchou.asm
index caa5d06e1..a5b3ded3a 100644
--- a/data/pokemon/base_stats/chinchou.asm
+++ b/data/pokemon/base_stats/chinchou.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/chinchou/front.dimensions"
+	INCBIN "gfx/pokemon/chinchou/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FISH, FISH ; egg groups
diff --git a/data/pokemon/base_stats/clefable.asm b/data/pokemon/base_stats/clefable.asm
index 6e72b9614..4da3c73df 100644
--- a/data/pokemon/base_stats/clefable.asm
+++ b/data/pokemon/base_stats/clefable.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 10 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/clefable/front.dimensions"
+	INCBIN "gfx/pokemon/clefable/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn FAIRY, FAIRY ; egg groups
diff --git a/data/pokemon/base_stats/clefairy.asm b/data/pokemon/base_stats/clefairy.asm
index 53688a158..5e4def0ca 100644
--- a/data/pokemon/base_stats/clefairy.asm
+++ b/data/pokemon/base_stats/clefairy.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 10 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/clefairy/front.dimensions"
+	INCBIN "gfx/pokemon/clefairy/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn FAIRY, FAIRY ; egg groups
diff --git a/data/pokemon/base_stats/cleffa.asm b/data/pokemon/base_stats/cleffa.asm
index c431ae2bf..89fa91a45 100644
--- a/data/pokemon/base_stats/cleffa.asm
+++ b/data/pokemon/base_stats/cleffa.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 10 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/cleffa/front.dimensions"
+	INCBIN "gfx/pokemon/cleffa/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/pokemon/base_stats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm
index 4119dbec2..3f3c13b6a 100644
--- a/data/pokemon/base_stats/cloyster.asm
+++ b/data/pokemon/base_stats/cloyster.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/cloyster/front.dimensions"
+	INCBIN "gfx/pokemon/cloyster/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn INVERTEBRATE, INVERTEBRATE ; egg groups
diff --git a/data/pokemon/base_stats/corsola.asm b/data/pokemon/base_stats/corsola.asm
index 5c559c64b..8f1e836ff 100644
--- a/data/pokemon/base_stats/corsola.asm
+++ b/data/pokemon/base_stats/corsola.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/corsola/front.dimensions"
+	INCBIN "gfx/pokemon/corsola/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn AMPHIBIAN, INVERTEBRATE ; egg groups
diff --git a/data/pokemon/base_stats/crobat.asm b/data/pokemon/base_stats/crobat.asm
index 71c012079..34d7d10c5 100644
--- a/data/pokemon/base_stats/crobat.asm
+++ b/data/pokemon/base_stats/crobat.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/crobat/front.dimensions"
+	INCBIN "gfx/pokemon/crobat/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/pokemon/base_stats/croconaw.asm b/data/pokemon/base_stats/croconaw.asm
index 8dbd57632..6c76b19b1 100644
--- a/data/pokemon/base_stats/croconaw.asm
+++ b/data/pokemon/base_stats/croconaw.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/croconaw/front.dimensions"
+	INCBIN "gfx/pokemon/croconaw/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, AMPHIBIAN ; egg groups
diff --git a/data/pokemon/base_stats/cubone.asm b/data/pokemon/base_stats/cubone.asm
index dc15c8773..451f52133 100644
--- a/data/pokemon/base_stats/cubone.asm
+++ b/data/pokemon/base_stats/cubone.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/cubone/front.dimensions"
+	INCBIN "gfx/pokemon/cubone/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn MONSTER, MONSTER ; egg groups
diff --git a/data/pokemon/base_stats/cyndaquil.asm b/data/pokemon/base_stats/cyndaquil.asm
index 137e8c78d..a1b07cb91 100644
--- a/data/pokemon/base_stats/cyndaquil.asm
+++ b/data/pokemon/base_stats/cyndaquil.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/cyndaquil/front.dimensions"
+	INCBIN "gfx/pokemon/cyndaquil/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/delibird.asm b/data/pokemon/base_stats/delibird.asm
index 8ddb23e7c..0b38e8b97 100644
--- a/data/pokemon/base_stats/delibird.asm
+++ b/data/pokemon/base_stats/delibird.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/delibird/front.dimensions"
+	INCBIN "gfx/pokemon/delibird/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn AMPHIBIAN, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm
index 951a1e87e..ae6aa1941 100644
--- a/data/pokemon/base_stats/dewgong.asm
+++ b/data/pokemon/base_stats/dewgong.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/dewgong/front.dimensions"
+	INCBIN "gfx/pokemon/dewgong/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/diglett.asm b/data/pokemon/base_stats/diglett.asm
index b93947622..1153cbcac 100644
--- a/data/pokemon/base_stats/diglett.asm
+++ b/data/pokemon/base_stats/diglett.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/diglett/front.dimensions"
+	INCBIN "gfx/pokemon/diglett/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/ditto.asm b/data/pokemon/base_stats/ditto.asm
index b88780bed..89d92ab7a 100644
--- a/data/pokemon/base_stats/ditto.asm
+++ b/data/pokemon/base_stats/ditto.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/ditto/front.dimensions"
+	INCBIN "gfx/pokemon/ditto/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn LADIES_MAN, LADIES_MAN ; egg groups
diff --git a/data/pokemon/base_stats/dodrio.asm b/data/pokemon/base_stats/dodrio.asm
index 6f8463663..9065dcbde 100644
--- a/data/pokemon/base_stats/dodrio.asm
+++ b/data/pokemon/base_stats/dodrio.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/dodrio/front.dimensions"
+	INCBIN "gfx/pokemon/dodrio/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/pokemon/base_stats/doduo.asm b/data/pokemon/base_stats/doduo.asm
index 1ef229455..f844ccb07 100644
--- a/data/pokemon/base_stats/doduo.asm
+++ b/data/pokemon/base_stats/doduo.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/doduo/front.dimensions"
+	INCBIN "gfx/pokemon/doduo/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/pokemon/base_stats/donphan.asm b/data/pokemon/base_stats/donphan.asm
index ee0418de0..a5995c3fb 100644
--- a/data/pokemon/base_stats/donphan.asm
+++ b/data/pokemon/base_stats/donphan.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/donphan/front.dimensions"
+	INCBIN "gfx/pokemon/donphan/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm
index e0ca4b8e9..0478bd6a1 100644
--- a/data/pokemon/base_stats/dragonair.asm
+++ b/data/pokemon/base_stats/dragonair.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 40 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/dragonair/front.dimensions"
+	INCBIN "gfx/pokemon/dragonair/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn AMPHIBIAN, REPTILE ; egg groups
diff --git a/data/pokemon/base_stats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm
index 8ca777e96..d8ae9add9 100644
--- a/data/pokemon/base_stats/dragonite.asm
+++ b/data/pokemon/base_stats/dragonite.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 40 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/dragonite/front.dimensions"
+	INCBIN "gfx/pokemon/dragonite/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn AMPHIBIAN, REPTILE ; egg groups
diff --git a/data/pokemon/base_stats/dratini.asm b/data/pokemon/base_stats/dratini.asm
index c1c173c86..0d5ccd5fd 100644
--- a/data/pokemon/base_stats/dratini.asm
+++ b/data/pokemon/base_stats/dratini.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 40 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/dratini/front.dimensions"
+	INCBIN "gfx/pokemon/dratini/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn AMPHIBIAN, REPTILE ; egg groups
diff --git a/data/pokemon/base_stats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm
index 0a456e8b8..7dd4855a3 100644
--- a/data/pokemon/base_stats/drowzee.asm
+++ b/data/pokemon/base_stats/drowzee.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/drowzee/front.dimensions"
+	INCBIN "gfx/pokemon/drowzee/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/pokemon/base_stats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.asm
index e245f8320..9430a6669 100644
--- a/data/pokemon/base_stats/dugtrio.asm
+++ b/data/pokemon/base_stats/dugtrio.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/dugtrio/front.dimensions"
+	INCBIN "gfx/pokemon/dugtrio/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/dunsparce.asm b/data/pokemon/base_stats/dunsparce.asm
index 5cbdb5807..8eef16241 100644
--- a/data/pokemon/base_stats/dunsparce.asm
+++ b/data/pokemon/base_stats/dunsparce.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/dunsparce/front.dimensions"
+	INCBIN "gfx/pokemon/dunsparce/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/eevee.asm b/data/pokemon/base_stats/eevee.asm
index 79bbafbcf..95f67cf2b 100644
--- a/data/pokemon/base_stats/eevee.asm
+++ b/data/pokemon/base_stats/eevee.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 35 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/eevee/front.dimensions"
+	INCBIN "gfx/pokemon/eevee/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/ekans.asm b/data/pokemon/base_stats/ekans.asm
index 0aa84fde2..feed64b34 100644
--- a/data/pokemon/base_stats/ekans.asm
+++ b/data/pokemon/base_stats/ekans.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/ekans/front.dimensions"
+	INCBIN "gfx/pokemon/ekans/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, REPTILE ; egg groups
diff --git a/data/pokemon/base_stats/electabuzz.asm b/data/pokemon/base_stats/electabuzz.asm
index a787adcb2..472e4487c 100644
--- a/data/pokemon/base_stats/electabuzz.asm
+++ b/data/pokemon/base_stats/electabuzz.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/electabuzz/front.dimensions"
+	INCBIN "gfx/pokemon/electabuzz/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/pokemon/base_stats/electrode.asm b/data/pokemon/base_stats/electrode.asm
index 44d92de66..72bc666e9 100644
--- a/data/pokemon/base_stats/electrode.asm
+++ b/data/pokemon/base_stats/electrode.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/electrode/front.dimensions"
+	INCBIN "gfx/pokemon/electrode/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INANIMATE, INANIMATE ; egg groups
diff --git a/data/pokemon/base_stats/elekid.asm b/data/pokemon/base_stats/elekid.asm
index 999a85103..e53dcc23c 100644
--- a/data/pokemon/base_stats/elekid.asm
+++ b/data/pokemon/base_stats/elekid.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/elekid/front.dimensions"
+	INCBIN "gfx/pokemon/elekid/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/pokemon/base_stats/entei.asm b/data/pokemon/base_stats/entei.asm
index 63f5f0af6..4e4b7b3f8 100644
--- a/data/pokemon/base_stats/entei.asm
+++ b/data/pokemon/base_stats/entei.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 80 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/entei/front.dimensions"
+	INCBIN "gfx/pokemon/entei/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/pokemon/base_stats/espeon.asm b/data/pokemon/base_stats/espeon.asm
index 626b5bdd9..0bc50fb6d 100644
--- a/data/pokemon/base_stats/espeon.asm
+++ b/data/pokemon/base_stats/espeon.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 35 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/espeon/front.dimensions"
+	INCBIN "gfx/pokemon/espeon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/exeggcute.asm b/data/pokemon/base_stats/exeggcute.asm
index 8c9cadc43..0547333ad 100644
--- a/data/pokemon/base_stats/exeggcute.asm
+++ b/data/pokemon/base_stats/exeggcute.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/exeggcute/front.dimensions"
+	INCBIN "gfx/pokemon/exeggcute/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn PLANT, PLANT ; egg groups
diff --git a/data/pokemon/base_stats/exeggutor.asm b/data/pokemon/base_stats/exeggutor.asm
index 259a1014e..409eb8a1d 100644
--- a/data/pokemon/base_stats/exeggutor.asm
+++ b/data/pokemon/base_stats/exeggutor.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/exeggutor/front.dimensions"
+	INCBIN "gfx/pokemon/exeggutor/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn PLANT, PLANT ; egg groups
diff --git a/data/pokemon/base_stats/farfetch_d.asm b/data/pokemon/base_stats/farfetch_d.asm
index 8da2b08a4..35d76b0a9 100644
--- a/data/pokemon/base_stats/farfetch_d.asm
+++ b/data/pokemon/base_stats/farfetch_d.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/farfetch_d/front.dimensions"
+	INCBIN "gfx/pokemon/farfetch_d/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AVIAN, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/fearow.asm b/data/pokemon/base_stats/fearow.asm
index 2ce86b1bf..7ef9936d8 100644
--- a/data/pokemon/base_stats/fearow.asm
+++ b/data/pokemon/base_stats/fearow.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/fearow/front.dimensions"
+	INCBIN "gfx/pokemon/fearow/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/pokemon/base_stats/feraligatr.asm b/data/pokemon/base_stats/feraligatr.asm
index c59ca6ffb..41efb2edd 100644
--- a/data/pokemon/base_stats/feraligatr.asm
+++ b/data/pokemon/base_stats/feraligatr.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/feraligatr/front.dimensions"
+	INCBIN "gfx/pokemon/feraligatr/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, AMPHIBIAN ; egg groups
diff --git a/data/pokemon/base_stats/flaaffy.asm b/data/pokemon/base_stats/flaaffy.asm
index 2cf5e15bc..b20dc4774 100644
--- a/data/pokemon/base_stats/flaaffy.asm
+++ b/data/pokemon/base_stats/flaaffy.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/flaaffy/front.dimensions"
+	INCBIN "gfx/pokemon/flaaffy/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/flareon.asm b/data/pokemon/base_stats/flareon.asm
index 00faecec6..f1d4c8a69 100644
--- a/data/pokemon/base_stats/flareon.asm
+++ b/data/pokemon/base_stats/flareon.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 35 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/flareon/front.dimensions"
+	INCBIN "gfx/pokemon/flareon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/forretress.asm b/data/pokemon/base_stats/forretress.asm
index 08fec2745..9c5a885aa 100644
--- a/data/pokemon/base_stats/forretress.asm
+++ b/data/pokemon/base_stats/forretress.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/forretress/front.dimensions"
+	INCBIN "gfx/pokemon/forretress/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/pokemon/base_stats/furret.asm b/data/pokemon/base_stats/furret.asm
index 3e3b7a656..b26a82e2e 100644
--- a/data/pokemon/base_stats/furret.asm
+++ b/data/pokemon/base_stats/furret.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/furret/front.dimensions"
+	INCBIN "gfx/pokemon/furret/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/gastly.asm b/data/pokemon/base_stats/gastly.asm
index 8b0547b6a..7e46be055 100644
--- a/data/pokemon/base_stats/gastly.asm
+++ b/data/pokemon/base_stats/gastly.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/gastly/front.dimensions"
+	INCBIN "gfx/pokemon/gastly/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn AMORPHOUS, AMORPHOUS ; egg groups
diff --git a/data/pokemon/base_stats/gengar.asm b/data/pokemon/base_stats/gengar.asm
index a152f7e43..4176aa330 100644
--- a/data/pokemon/base_stats/gengar.asm
+++ b/data/pokemon/base_stats/gengar.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/gengar/front.dimensions"
+	INCBIN "gfx/pokemon/gengar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn AMORPHOUS, AMORPHOUS ; egg groups
diff --git a/data/pokemon/base_stats/geodude.asm b/data/pokemon/base_stats/geodude.asm
index 86b627107..35e5d22a7 100644
--- a/data/pokemon/base_stats/geodude.asm
+++ b/data/pokemon/base_stats/geodude.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/geodude/front.dimensions"
+	INCBIN "gfx/pokemon/geodude/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn INANIMATE, INANIMATE ; egg groups
diff --git a/data/pokemon/base_stats/girafarig.asm b/data/pokemon/base_stats/girafarig.asm
index f832b2c28..7e67b19a6 100644
--- a/data/pokemon/base_stats/girafarig.asm
+++ b/data/pokemon/base_stats/girafarig.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/girafarig/front.dimensions"
+	INCBIN "gfx/pokemon/girafarig/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/gligar.asm b/data/pokemon/base_stats/gligar.asm
index 5bb7fdca8..e16bf7043 100644
--- a/data/pokemon/base_stats/gligar.asm
+++ b/data/pokemon/base_stats/gligar.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/gligar/front.dimensions"
+	INCBIN "gfx/pokemon/gligar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/pokemon/base_stats/gloom.asm b/data/pokemon/base_stats/gloom.asm
index 33cea01f2..128b1fe81 100644
--- a/data/pokemon/base_stats/gloom.asm
+++ b/data/pokemon/base_stats/gloom.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/gloom/front.dimensions"
+	INCBIN "gfx/pokemon/gloom/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn PLANT, PLANT ; egg groups
diff --git a/data/pokemon/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.asm
index 06769b880..2de7278ca 100644
--- a/data/pokemon/base_stats/golbat.asm
+++ b/data/pokemon/base_stats/golbat.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/golbat/front.dimensions"
+	INCBIN "gfx/pokemon/golbat/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/pokemon/base_stats/goldeen.asm b/data/pokemon/base_stats/goldeen.asm
index 314852a3e..bc165c7a5 100644
--- a/data/pokemon/base_stats/goldeen.asm
+++ b/data/pokemon/base_stats/goldeen.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/goldeen/front.dimensions"
+	INCBIN "gfx/pokemon/goldeen/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FISH, FISH ; egg groups
diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm
index 9c4dbb5f5..e3e5ea1aa 100644
--- a/data/pokemon/base_stats/golduck.asm
+++ b/data/pokemon/base_stats/golduck.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/golduck/front.dimensions"
+	INCBIN "gfx/pokemon/golduck/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/golem.asm b/data/pokemon/base_stats/golem.asm
index 9a9f04451..bda102404 100644
--- a/data/pokemon/base_stats/golem.asm
+++ b/data/pokemon/base_stats/golem.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/golem/front.dimensions"
+	INCBIN "gfx/pokemon/golem/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn INANIMATE, INANIMATE ; egg groups
diff --git a/data/pokemon/base_stats/granbull.asm b/data/pokemon/base_stats/granbull.asm
index 088e17dd8..9c572cf7b 100644
--- a/data/pokemon/base_stats/granbull.asm
+++ b/data/pokemon/base_stats/granbull.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/granbull/front.dimensions"
+	INCBIN "gfx/pokemon/granbull/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn FIELD, FAIRY ; egg groups
diff --git a/data/pokemon/base_stats/graveler.asm b/data/pokemon/base_stats/graveler.asm
index dfbeb770c..b6be8cb5c 100644
--- a/data/pokemon/base_stats/graveler.asm
+++ b/data/pokemon/base_stats/graveler.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/graveler/front.dimensions"
+	INCBIN "gfx/pokemon/graveler/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn INANIMATE, INANIMATE ; egg groups
diff --git a/data/pokemon/base_stats/grimer.asm b/data/pokemon/base_stats/grimer.asm
index 86dacd1e6..b1536bb3c 100644
--- a/data/pokemon/base_stats/grimer.asm
+++ b/data/pokemon/base_stats/grimer.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/grimer/front.dimensions"
+	INCBIN "gfx/pokemon/grimer/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMORPHOUS, AMORPHOUS ; egg groups
diff --git a/data/pokemon/base_stats/growlithe.asm b/data/pokemon/base_stats/growlithe.asm
index ef5cc53b3..e3cfa7faa 100644
--- a/data/pokemon/base_stats/growlithe.asm
+++ b/data/pokemon/base_stats/growlithe.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/growlithe/front.dimensions"
+	INCBIN "gfx/pokemon/growlithe/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/gyarados.asm b/data/pokemon/base_stats/gyarados.asm
index 1bdceff88..eb4f51f08 100644
--- a/data/pokemon/base_stats/gyarados.asm
+++ b/data/pokemon/base_stats/gyarados.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 5 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/gyarados/front.dimensions"
+	INCBIN "gfx/pokemon/gyarados/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FISH, REPTILE ; egg groups
diff --git a/data/pokemon/base_stats/haunter.asm b/data/pokemon/base_stats/haunter.asm
index c0a192d67..5c31fd2a9 100644
--- a/data/pokemon/base_stats/haunter.asm
+++ b/data/pokemon/base_stats/haunter.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/haunter/front.dimensions"
+	INCBIN "gfx/pokemon/haunter/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn AMORPHOUS, AMORPHOUS ; egg groups
diff --git a/data/pokemon/base_stats/heracross.asm b/data/pokemon/base_stats/heracross.asm
index 1f81d9c7b..f27efbe0d 100644
--- a/data/pokemon/base_stats/heracross.asm
+++ b/data/pokemon/base_stats/heracross.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/heracross/front.dimensions"
+	INCBIN "gfx/pokemon/heracross/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/pokemon/base_stats/hitmonchan.asm b/data/pokemon/base_stats/hitmonchan.asm
index 3eeb23dd4..b8e7da73b 100644
--- a/data/pokemon/base_stats/hitmonchan.asm
+++ b/data/pokemon/base_stats/hitmonchan.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/hitmonchan/front.dimensions"
+	INCBIN "gfx/pokemon/hitmonchan/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/pokemon/base_stats/hitmonlee.asm b/data/pokemon/base_stats/hitmonlee.asm
index a31352209..a5759f92d 100644
--- a/data/pokemon/base_stats/hitmonlee.asm
+++ b/data/pokemon/base_stats/hitmonlee.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/hitmonlee/front.dimensions"
+	INCBIN "gfx/pokemon/hitmonlee/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/pokemon/base_stats/hitmontop.asm b/data/pokemon/base_stats/hitmontop.asm
index 532b8a6d8..a36b7fc58 100644
--- a/data/pokemon/base_stats/hitmontop.asm
+++ b/data/pokemon/base_stats/hitmontop.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/hitmontop/front.dimensions"
+	INCBIN "gfx/pokemon/hitmontop/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/pokemon/base_stats/ho_oh.asm b/data/pokemon/base_stats/ho_oh.asm
index f0792d427..910ea5a9f 100644
--- a/data/pokemon/base_stats/ho_oh.asm
+++ b/data/pokemon/base_stats/ho_oh.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 120 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/ho_oh/front.dimensions"
+	INCBIN "gfx/pokemon/ho_oh/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/pokemon/base_stats/hoothoot.asm b/data/pokemon/base_stats/hoothoot.asm
index 0442fe414..b52e929e9 100644
--- a/data/pokemon/base_stats/hoothoot.asm
+++ b/data/pokemon/base_stats/hoothoot.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/hoothoot/front.dimensions"
+	INCBIN "gfx/pokemon/hoothoot/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/pokemon/base_stats/hoppip.asm b/data/pokemon/base_stats/hoppip.asm
index b1918d699..c6e1a86dc 100644
--- a/data/pokemon/base_stats/hoppip.asm
+++ b/data/pokemon/base_stats/hoppip.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/hoppip/front.dimensions"
+	INCBIN "gfx/pokemon/hoppip/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn FAIRY, PLANT ; egg groups
diff --git a/data/pokemon/base_stats/horsea.asm b/data/pokemon/base_stats/horsea.asm
index 3296f52af..c3d75a927 100644
--- a/data/pokemon/base_stats/horsea.asm
+++ b/data/pokemon/base_stats/horsea.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/horsea/front.dimensions"
+	INCBIN "gfx/pokemon/horsea/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, REPTILE ; egg groups
diff --git a/data/pokemon/base_stats/houndoom.asm b/data/pokemon/base_stats/houndoom.asm
index 234832675..1f3b4f903 100644
--- a/data/pokemon/base_stats/houndoom.asm
+++ b/data/pokemon/base_stats/houndoom.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/houndoom/front.dimensions"
+	INCBIN "gfx/pokemon/houndoom/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/houndour.asm b/data/pokemon/base_stats/houndour.asm
index f743cd81e..b064b3e0d 100644
--- a/data/pokemon/base_stats/houndour.asm
+++ b/data/pokemon/base_stats/houndour.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/houndour/front.dimensions"
+	INCBIN "gfx/pokemon/houndour/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/hypno.asm b/data/pokemon/base_stats/hypno.asm
index 25aea318a..83aab91c8 100644
--- a/data/pokemon/base_stats/hypno.asm
+++ b/data/pokemon/base_stats/hypno.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/hypno/front.dimensions"
+	INCBIN "gfx/pokemon/hypno/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/pokemon/base_stats/igglybuff.asm b/data/pokemon/base_stats/igglybuff.asm
index c8c7ca7bf..8745ecafb 100644
--- a/data/pokemon/base_stats/igglybuff.asm
+++ b/data/pokemon/base_stats/igglybuff.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 10 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/igglybuff/front.dimensions"
+	INCBIN "gfx/pokemon/igglybuff/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/pokemon/base_stats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm
index 7d98b4b6d..8e7c7c9c4 100644
--- a/data/pokemon/base_stats/ivysaur.asm
+++ b/data/pokemon/base_stats/ivysaur.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/ivysaur/front.dimensions"
+	INCBIN "gfx/pokemon/ivysaur/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, PLANT ; egg groups
diff --git a/data/pokemon/base_stats/jigglypuff.asm b/data/pokemon/base_stats/jigglypuff.asm
index 09b3a7dbb..f785f0228 100644
--- a/data/pokemon/base_stats/jigglypuff.asm
+++ b/data/pokemon/base_stats/jigglypuff.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 10 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/jigglypuff/front.dimensions"
+	INCBIN "gfx/pokemon/jigglypuff/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn FAIRY, FAIRY ; egg groups
diff --git a/data/pokemon/base_stats/jolteon.asm b/data/pokemon/base_stats/jolteon.asm
index 665a40d1d..a6636ebba 100644
--- a/data/pokemon/base_stats/jolteon.asm
+++ b/data/pokemon/base_stats/jolteon.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 35 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/jolteon/front.dimensions"
+	INCBIN "gfx/pokemon/jolteon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/jumpluff.asm b/data/pokemon/base_stats/jumpluff.asm
index 623fbe82d..c40d2c559 100644
--- a/data/pokemon/base_stats/jumpluff.asm
+++ b/data/pokemon/base_stats/jumpluff.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/jumpluff/front.dimensions"
+	INCBIN "gfx/pokemon/jumpluff/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn FAIRY, PLANT ; egg groups
diff --git a/data/pokemon/base_stats/jynx.asm b/data/pokemon/base_stats/jynx.asm
index 3018dfa8e..5696b83ee 100644
--- a/data/pokemon/base_stats/jynx.asm
+++ b/data/pokemon/base_stats/jynx.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/jynx/front.dimensions"
+	INCBIN "gfx/pokemon/jynx/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/pokemon/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm
index 9a38cbcba..60022586f 100644
--- a/data/pokemon/base_stats/kabuto.asm
+++ b/data/pokemon/base_stats/kabuto.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 30 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/kabuto/front.dimensions"
+	INCBIN "gfx/pokemon/kabuto/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, INVERTEBRATE ; egg groups
diff --git a/data/pokemon/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm
index b8de99fa1..b56cb1db8 100644
--- a/data/pokemon/base_stats/kabutops.asm
+++ b/data/pokemon/base_stats/kabutops.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 30 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/kabutops/front.dimensions"
+	INCBIN "gfx/pokemon/kabutops/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, INVERTEBRATE ; egg groups
diff --git a/data/pokemon/base_stats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm
index a32a0c5a9..e3ce05321 100644
--- a/data/pokemon/base_stats/kadabra.asm
+++ b/data/pokemon/base_stats/kadabra.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/kadabra/front.dimensions"
+	INCBIN "gfx/pokemon/kadabra/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/pokemon/base_stats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm
index 83241fbcd..4c8304dd2 100644
--- a/data/pokemon/base_stats/kakuna.asm
+++ b/data/pokemon/base_stats/kakuna.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/kakuna/front.dimensions"
+	INCBIN "gfx/pokemon/kakuna/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/pokemon/base_stats/kangaskhan.asm b/data/pokemon/base_stats/kangaskhan.asm
index 21af227f0..3724e29eb 100644
--- a/data/pokemon/base_stats/kangaskhan.asm
+++ b/data/pokemon/base_stats/kangaskhan.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/kangaskhan/front.dimensions"
+	INCBIN "gfx/pokemon/kangaskhan/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn MONSTER, MONSTER ; egg groups
diff --git a/data/pokemon/base_stats/kingdra.asm b/data/pokemon/base_stats/kingdra.asm
index e62d0f23e..d217fa612 100644
--- a/data/pokemon/base_stats/kingdra.asm
+++ b/data/pokemon/base_stats/kingdra.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/kingdra/front.dimensions"
+	INCBIN "gfx/pokemon/kingdra/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, REPTILE ; egg groups
diff --git a/data/pokemon/base_stats/kingler.asm b/data/pokemon/base_stats/kingler.asm
index 01ac23a99..82549ca88 100644
--- a/data/pokemon/base_stats/kingler.asm
+++ b/data/pokemon/base_stats/kingler.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/kingler/front.dimensions"
+	INCBIN "gfx/pokemon/kingler/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INVERTEBRATE, INVERTEBRATE ; egg groups
diff --git a/data/pokemon/base_stats/koffing.asm b/data/pokemon/base_stats/koffing.asm
index 70e8bd114..8408f4ad8 100644
--- a/data/pokemon/base_stats/koffing.asm
+++ b/data/pokemon/base_stats/koffing.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/koffing/front.dimensions"
+	INCBIN "gfx/pokemon/koffing/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMORPHOUS, AMORPHOUS ; egg groups
diff --git a/data/pokemon/base_stats/krabby.asm b/data/pokemon/base_stats/krabby.asm
index 60ce4c7f4..f4d78962a 100644
--- a/data/pokemon/base_stats/krabby.asm
+++ b/data/pokemon/base_stats/krabby.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/krabby/front.dimensions"
+	INCBIN "gfx/pokemon/krabby/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INVERTEBRATE, INVERTEBRATE ; egg groups
diff --git a/data/pokemon/base_stats/lanturn.asm b/data/pokemon/base_stats/lanturn.asm
index f5b747fad..ea97a9722 100644
--- a/data/pokemon/base_stats/lanturn.asm
+++ b/data/pokemon/base_stats/lanturn.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/lanturn/front.dimensions"
+	INCBIN "gfx/pokemon/lanturn/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FISH, FISH ; egg groups
diff --git a/data/pokemon/base_stats/lapras.asm b/data/pokemon/base_stats/lapras.asm
index e6ccec359..4ba001dfd 100644
--- a/data/pokemon/base_stats/lapras.asm
+++ b/data/pokemon/base_stats/lapras.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 40 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/lapras/front.dimensions"
+	INCBIN "gfx/pokemon/lapras/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn MONSTER, AMPHIBIAN ; egg groups
diff --git a/data/pokemon/base_stats/larvitar.asm b/data/pokemon/base_stats/larvitar.asm
index 7de66ca7f..d9c18d1bc 100644
--- a/data/pokemon/base_stats/larvitar.asm
+++ b/data/pokemon/base_stats/larvitar.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 40 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/larvitar/front.dimensions"
+	INCBIN "gfx/pokemon/larvitar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn MONSTER, MONSTER ; egg groups
diff --git a/data/pokemon/base_stats/ledian.asm b/data/pokemon/base_stats/ledian.asm
index 84a06c092..1f0cb4fd9 100644
--- a/data/pokemon/base_stats/ledian.asm
+++ b/data/pokemon/base_stats/ledian.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/ledian/front.dimensions"
+	INCBIN "gfx/pokemon/ledian/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/pokemon/base_stats/ledyba.asm b/data/pokemon/base_stats/ledyba.asm
index 68a20d1ea..e78d4efe4 100644
--- a/data/pokemon/base_stats/ledyba.asm
+++ b/data/pokemon/base_stats/ledyba.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/ledyba/front.dimensions"
+	INCBIN "gfx/pokemon/ledyba/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/pokemon/base_stats/lickitung.asm b/data/pokemon/base_stats/lickitung.asm
index 0f8f351da..43d60ec6c 100644
--- a/data/pokemon/base_stats/lickitung.asm
+++ b/data/pokemon/base_stats/lickitung.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/lickitung/front.dimensions"
+	INCBIN "gfx/pokemon/lickitung/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn MONSTER, MONSTER ; egg groups
diff --git a/data/pokemon/base_stats/lugia.asm b/data/pokemon/base_stats/lugia.asm
index 6649c9954..7ad2f23a1 100644
--- a/data/pokemon/base_stats/lugia.asm
+++ b/data/pokemon/base_stats/lugia.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 120 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/lugia/front.dimensions"
+	INCBIN "gfx/pokemon/lugia/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/pokemon/base_stats/machamp.asm b/data/pokemon/base_stats/machamp.asm
index bb716cf25..41b168234 100644
--- a/data/pokemon/base_stats/machamp.asm
+++ b/data/pokemon/base_stats/machamp.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/machamp/front.dimensions"
+	INCBIN "gfx/pokemon/machamp/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/pokemon/base_stats/machoke.asm b/data/pokemon/base_stats/machoke.asm
index 79caf8c70..8b98ea1de 100644
--- a/data/pokemon/base_stats/machoke.asm
+++ b/data/pokemon/base_stats/machoke.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/machoke/front.dimensions"
+	INCBIN "gfx/pokemon/machoke/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/pokemon/base_stats/machop.asm b/data/pokemon/base_stats/machop.asm
index 6b0cbaab7..cb1b2f7c5 100644
--- a/data/pokemon/base_stats/machop.asm
+++ b/data/pokemon/base_stats/machop.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/machop/front.dimensions"
+	INCBIN "gfx/pokemon/machop/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/pokemon/base_stats/magby.asm b/data/pokemon/base_stats/magby.asm
index d593d0272..132387f32 100644
--- a/data/pokemon/base_stats/magby.asm
+++ b/data/pokemon/base_stats/magby.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/magby/front.dimensions"
+	INCBIN "gfx/pokemon/magby/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/pokemon/base_stats/magcargo.asm b/data/pokemon/base_stats/magcargo.asm
index 45493135b..aa2008cd1 100644
--- a/data/pokemon/base_stats/magcargo.asm
+++ b/data/pokemon/base_stats/magcargo.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/magcargo/front.dimensions"
+	INCBIN "gfx/pokemon/magcargo/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMORPHOUS, AMORPHOUS ; egg groups
diff --git a/data/pokemon/base_stats/magikarp.asm b/data/pokemon/base_stats/magikarp.asm
index 2519b475b..e5524543f 100644
--- a/data/pokemon/base_stats/magikarp.asm
+++ b/data/pokemon/base_stats/magikarp.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 5 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/magikarp/front.dimensions"
+	INCBIN "gfx/pokemon/magikarp/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FISH, REPTILE ; egg groups
diff --git a/data/pokemon/base_stats/magmar.asm b/data/pokemon/base_stats/magmar.asm
index 899b3f39f..595df7ab7 100644
--- a/data/pokemon/base_stats/magmar.asm
+++ b/data/pokemon/base_stats/magmar.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/magmar/front.dimensions"
+	INCBIN "gfx/pokemon/magmar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/pokemon/base_stats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm
index 19a85a9a1..42bdc18a7 100644
--- a/data/pokemon/base_stats/magnemite.asm
+++ b/data/pokemon/base_stats/magnemite.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/magnemite/front.dimensions"
+	INCBIN "gfx/pokemon/magnemite/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INANIMATE, INANIMATE ; egg groups
diff --git a/data/pokemon/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm
index 5fdbe68f4..5cac867be 100644
--- a/data/pokemon/base_stats/magneton.asm
+++ b/data/pokemon/base_stats/magneton.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/magneton/front.dimensions"
+	INCBIN "gfx/pokemon/magneton/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INANIMATE, INANIMATE ; egg groups
diff --git a/data/pokemon/base_stats/mankey.asm b/data/pokemon/base_stats/mankey.asm
index 77cc260d4..41aaac8a9 100644
--- a/data/pokemon/base_stats/mankey.asm
+++ b/data/pokemon/base_stats/mankey.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/mankey/front.dimensions"
+	INCBIN "gfx/pokemon/mankey/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/mantine.asm b/data/pokemon/base_stats/mantine.asm
index bfe113428..bec060cb6 100644
--- a/data/pokemon/base_stats/mantine.asm
+++ b/data/pokemon/base_stats/mantine.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/mantine/front.dimensions"
+	INCBIN "gfx/pokemon/mantine/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn AMPHIBIAN, AMPHIBIAN ; egg groups
diff --git a/data/pokemon/base_stats/mareep.asm b/data/pokemon/base_stats/mareep.asm
index cc190b664..8388d7f8c 100644
--- a/data/pokemon/base_stats/mareep.asm
+++ b/data/pokemon/base_stats/mareep.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/mareep/front.dimensions"
+	INCBIN "gfx/pokemon/mareep/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/marill.asm b/data/pokemon/base_stats/marill.asm
index 73708d1df..b6fcc62e5 100644
--- a/data/pokemon/base_stats/marill.asm
+++ b/data/pokemon/base_stats/marill.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/marill/front.dimensions"
+	INCBIN "gfx/pokemon/marill/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn AMPHIBIAN, FAIRY ; egg groups
diff --git a/data/pokemon/base_stats/marowak.asm b/data/pokemon/base_stats/marowak.asm
index 3e04b9697..cc03dc697 100644
--- a/data/pokemon/base_stats/marowak.asm
+++ b/data/pokemon/base_stats/marowak.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/marowak/front.dimensions"
+	INCBIN "gfx/pokemon/marowak/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn MONSTER, MONSTER ; egg groups
diff --git a/data/pokemon/base_stats/meganium.asm b/data/pokemon/base_stats/meganium.asm
index cf1125003..eaca626d4 100644
--- a/data/pokemon/base_stats/meganium.asm
+++ b/data/pokemon/base_stats/meganium.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/meganium/front.dimensions"
+	INCBIN "gfx/pokemon/meganium/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, PLANT ; egg groups
diff --git a/data/pokemon/base_stats/meowth.asm b/data/pokemon/base_stats/meowth.asm
index f177f0efd..114f76899 100644
--- a/data/pokemon/base_stats/meowth.asm
+++ b/data/pokemon/base_stats/meowth.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/meowth/front.dimensions"
+	INCBIN "gfx/pokemon/meowth/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/metapod.asm b/data/pokemon/base_stats/metapod.asm
index e26e31fc5..f2b33f831 100644
--- a/data/pokemon/base_stats/metapod.asm
+++ b/data/pokemon/base_stats/metapod.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/metapod/front.dimensions"
+	INCBIN "gfx/pokemon/metapod/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/pokemon/base_stats/mew.asm b/data/pokemon/base_stats/mew.asm
index 1961cef4e..4d70413d0 100644
--- a/data/pokemon/base_stats/mew.asm
+++ b/data/pokemon/base_stats/mew.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 120 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/mew/front.dimensions"
+	INCBIN "gfx/pokemon/mew/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/pokemon/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm
index 748a1c3fb..0e9636223 100644
--- a/data/pokemon/base_stats/mewtwo.asm
+++ b/data/pokemon/base_stats/mewtwo.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 120 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/mewtwo/front.dimensions"
+	INCBIN "gfx/pokemon/mewtwo/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/pokemon/base_stats/miltank.asm b/data/pokemon/base_stats/miltank.asm
index 63ed422bc..c751a2f9c 100644
--- a/data/pokemon/base_stats/miltank.asm
+++ b/data/pokemon/base_stats/miltank.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/miltank/front.dimensions"
+	INCBIN "gfx/pokemon/miltank/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/misdreavus.asm b/data/pokemon/base_stats/misdreavus.asm
index 11c5f239d..d1824eaa2 100644
--- a/data/pokemon/base_stats/misdreavus.asm
+++ b/data/pokemon/base_stats/misdreavus.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/misdreavus/front.dimensions"
+	INCBIN "gfx/pokemon/misdreavus/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn AMORPHOUS, AMORPHOUS ; egg groups
diff --git a/data/pokemon/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm
index bf70c2821..22157c073 100644
--- a/data/pokemon/base_stats/moltres.asm
+++ b/data/pokemon/base_stats/moltres.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 80 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/moltres/front.dimensions"
+	INCBIN "gfx/pokemon/moltres/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/pokemon/base_stats/mr__mime.asm b/data/pokemon/base_stats/mr__mime.asm
index 9728c296f..1abc9995f 100644
--- a/data/pokemon/base_stats/mr__mime.asm
+++ b/data/pokemon/base_stats/mr__mime.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/mr__mime/front.dimensions"
+	INCBIN "gfx/pokemon/mr__mime/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/pokemon/base_stats/muk.asm b/data/pokemon/base_stats/muk.asm
index 30c6414fd..a25d85605 100644
--- a/data/pokemon/base_stats/muk.asm
+++ b/data/pokemon/base_stats/muk.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/muk/front.dimensions"
+	INCBIN "gfx/pokemon/muk/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMORPHOUS, AMORPHOUS ; egg groups
diff --git a/data/pokemon/base_stats/murkrow.asm b/data/pokemon/base_stats/murkrow.asm
index 7f459e8aa..2fada2697 100644
--- a/data/pokemon/base_stats/murkrow.asm
+++ b/data/pokemon/base_stats/murkrow.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/murkrow/front.dimensions"
+	INCBIN "gfx/pokemon/murkrow/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/pokemon/base_stats/natu.asm b/data/pokemon/base_stats/natu.asm
index 54ef8af58..b9bde658a 100644
--- a/data/pokemon/base_stats/natu.asm
+++ b/data/pokemon/base_stats/natu.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/natu/front.dimensions"
+	INCBIN "gfx/pokemon/natu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/pokemon/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm
index 316f71e87..3d7205af5 100644
--- a/data/pokemon/base_stats/nidoking.asm
+++ b/data/pokemon/base_stats/nidoking.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/nidoking/front.dimensions"
+	INCBIN "gfx/pokemon/nidoking/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm
index e9d2ae611..4c5ca110e 100644
--- a/data/pokemon/base_stats/nidoqueen.asm
+++ b/data/pokemon/base_stats/nidoqueen.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/nidoqueen/front.dimensions"
+	INCBIN "gfx/pokemon/nidoqueen/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/pokemon/base_stats/nidoran_f.asm b/data/pokemon/base_stats/nidoran_f.asm
index 1cd53b17a..77925f1df 100644
--- a/data/pokemon/base_stats/nidoran_f.asm
+++ b/data/pokemon/base_stats/nidoran_f.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/nidoran_f/front.dimensions"
+	INCBIN "gfx/pokemon/nidoran_f/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/nidoran_m.asm b/data/pokemon/base_stats/nidoran_m.asm
index cf0c1e1b2..0f25712dd 100644
--- a/data/pokemon/base_stats/nidoran_m.asm
+++ b/data/pokemon/base_stats/nidoran_m.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/nidoran_m/front.dimensions"
+	INCBIN "gfx/pokemon/nidoran_m/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm
index 42b3aebf8..2385f82ec 100644
--- a/data/pokemon/base_stats/nidorina.asm
+++ b/data/pokemon/base_stats/nidorina.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/nidorina/front.dimensions"
+	INCBIN "gfx/pokemon/nidorina/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/pokemon/base_stats/nidorino.asm b/data/pokemon/base_stats/nidorino.asm
index f31e8df3d..9c94ea824 100644
--- a/data/pokemon/base_stats/nidorino.asm
+++ b/data/pokemon/base_stats/nidorino.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/nidorino/front.dimensions"
+	INCBIN "gfx/pokemon/nidorino/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm
index 5fd84b886..f23d2e384 100644
--- a/data/pokemon/base_stats/ninetales.asm
+++ b/data/pokemon/base_stats/ninetales.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/ninetales/front.dimensions"
+	INCBIN "gfx/pokemon/ninetales/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/noctowl.asm b/data/pokemon/base_stats/noctowl.asm
index e2c8565bd..030dec08e 100644
--- a/data/pokemon/base_stats/noctowl.asm
+++ b/data/pokemon/base_stats/noctowl.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/noctowl/front.dimensions"
+	INCBIN "gfx/pokemon/noctowl/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/pokemon/base_stats/octillery.asm b/data/pokemon/base_stats/octillery.asm
index 80b5ad97a..6bc2f7d46 100644
--- a/data/pokemon/base_stats/octillery.asm
+++ b/data/pokemon/base_stats/octillery.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/octillery/front.dimensions"
+	INCBIN "gfx/pokemon/octillery/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, FISH ; egg groups
diff --git a/data/pokemon/base_stats/oddish.asm b/data/pokemon/base_stats/oddish.asm
index df75f6485..98f8c96f9 100644
--- a/data/pokemon/base_stats/oddish.asm
+++ b/data/pokemon/base_stats/oddish.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/oddish/front.dimensions"
+	INCBIN "gfx/pokemon/oddish/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn PLANT, PLANT ; egg groups
diff --git a/data/pokemon/base_stats/omanyte.asm b/data/pokemon/base_stats/omanyte.asm
index 6278f4e3c..70b88df38 100644
--- a/data/pokemon/base_stats/omanyte.asm
+++ b/data/pokemon/base_stats/omanyte.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 30 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/omanyte/front.dimensions"
+	INCBIN "gfx/pokemon/omanyte/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, INVERTEBRATE ; egg groups
diff --git a/data/pokemon/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm
index d3f3b15e1..659ecc825 100644
--- a/data/pokemon/base_stats/omastar.asm
+++ b/data/pokemon/base_stats/omastar.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 30 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/omastar/front.dimensions"
+	INCBIN "gfx/pokemon/omastar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, INVERTEBRATE ; egg groups
diff --git a/data/pokemon/base_stats/onix.asm b/data/pokemon/base_stats/onix.asm
index 2fc5bd175..befd53abf 100644
--- a/data/pokemon/base_stats/onix.asm
+++ b/data/pokemon/base_stats/onix.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/onix/front.dimensions"
+	INCBIN "gfx/pokemon/onix/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INANIMATE, INANIMATE ; egg groups
diff --git a/data/pokemon/base_stats/paras.asm b/data/pokemon/base_stats/paras.asm
index d86a51765..46687f928 100644
--- a/data/pokemon/base_stats/paras.asm
+++ b/data/pokemon/base_stats/paras.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/paras/front.dimensions"
+	INCBIN "gfx/pokemon/paras/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, PLANT ; egg groups
diff --git a/data/pokemon/base_stats/parasect.asm b/data/pokemon/base_stats/parasect.asm
index 5c4320fd3..d40dd4fd9 100644
--- a/data/pokemon/base_stats/parasect.asm
+++ b/data/pokemon/base_stats/parasect.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/parasect/front.dimensions"
+	INCBIN "gfx/pokemon/parasect/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, PLANT ; egg groups
diff --git a/data/pokemon/base_stats/persian.asm b/data/pokemon/base_stats/persian.asm
index fd2677e16..bbfd9beec 100644
--- a/data/pokemon/base_stats/persian.asm
+++ b/data/pokemon/base_stats/persian.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/persian/front.dimensions"
+	INCBIN "gfx/pokemon/persian/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/phanpy.asm b/data/pokemon/base_stats/phanpy.asm
index 93a26d43c..27794e0b5 100644
--- a/data/pokemon/base_stats/phanpy.asm
+++ b/data/pokemon/base_stats/phanpy.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/phanpy/front.dimensions"
+	INCBIN "gfx/pokemon/phanpy/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/pichu.asm b/data/pokemon/base_stats/pichu.asm
index da497bdf8..35d6a105a 100644
--- a/data/pokemon/base_stats/pichu.asm
+++ b/data/pokemon/base_stats/pichu.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 10 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/pichu/front.dimensions"
+	INCBIN "gfx/pokemon/pichu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/pokemon/base_stats/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm
index 35222d2be..2d117b955 100644
--- a/data/pokemon/base_stats/pidgeot.asm
+++ b/data/pokemon/base_stats/pidgeot.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/pidgeot/front.dimensions"
+	INCBIN "gfx/pokemon/pidgeot/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/pokemon/base_stats/pidgeotto.asm b/data/pokemon/base_stats/pidgeotto.asm
index 13b2d8e0c..8e263c4b3 100644
--- a/data/pokemon/base_stats/pidgeotto.asm
+++ b/data/pokemon/base_stats/pidgeotto.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/pidgeotto/front.dimensions"
+	INCBIN "gfx/pokemon/pidgeotto/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/pokemon/base_stats/pidgey.asm b/data/pokemon/base_stats/pidgey.asm
index 0290f1717..123b95d7d 100644
--- a/data/pokemon/base_stats/pidgey.asm
+++ b/data/pokemon/base_stats/pidgey.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/pidgey/front.dimensions"
+	INCBIN "gfx/pokemon/pidgey/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/pokemon/base_stats/pikachu.asm b/data/pokemon/base_stats/pikachu.asm
index cd998aead..78204ff78 100644
--- a/data/pokemon/base_stats/pikachu.asm
+++ b/data/pokemon/base_stats/pikachu.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 10 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/pikachu/front.dimensions"
+	INCBIN "gfx/pokemon/pikachu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FAIRY ; egg groups
diff --git a/data/pokemon/base_stats/piloswine.asm b/data/pokemon/base_stats/piloswine.asm
index dd8bf950b..3e48aa4c9 100644
--- a/data/pokemon/base_stats/piloswine.asm
+++ b/data/pokemon/base_stats/piloswine.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/piloswine/front.dimensions"
+	INCBIN "gfx/pokemon/piloswine/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/pineco.asm b/data/pokemon/base_stats/pineco.asm
index 2c27a9913..5754c49a2 100644
--- a/data/pokemon/base_stats/pineco.asm
+++ b/data/pokemon/base_stats/pineco.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/pineco/front.dimensions"
+	INCBIN "gfx/pokemon/pineco/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/pokemon/base_stats/pinsir.asm b/data/pokemon/base_stats/pinsir.asm
index 697bba44c..55927c918 100644
--- a/data/pokemon/base_stats/pinsir.asm
+++ b/data/pokemon/base_stats/pinsir.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/pinsir/front.dimensions"
+	INCBIN "gfx/pokemon/pinsir/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/pokemon/base_stats/politoed.asm b/data/pokemon/base_stats/politoed.asm
index b3dc1e98a..6ad959406 100644
--- a/data/pokemon/base_stats/politoed.asm
+++ b/data/pokemon/base_stats/politoed.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/politoed/front.dimensions"
+	INCBIN "gfx/pokemon/politoed/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn AMPHIBIAN, AMPHIBIAN ; egg groups
diff --git a/data/pokemon/base_stats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm
index 00e328990..3a4d8c051 100644
--- a/data/pokemon/base_stats/poliwag.asm
+++ b/data/pokemon/base_stats/poliwag.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/poliwag/front.dimensions"
+	INCBIN "gfx/pokemon/poliwag/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn AMPHIBIAN, AMPHIBIAN ; egg groups
diff --git a/data/pokemon/base_stats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm
index f62849cc9..d28964ebd 100644
--- a/data/pokemon/base_stats/poliwhirl.asm
+++ b/data/pokemon/base_stats/poliwhirl.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/poliwhirl/front.dimensions"
+	INCBIN "gfx/pokemon/poliwhirl/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn AMPHIBIAN, AMPHIBIAN ; egg groups
diff --git a/data/pokemon/base_stats/poliwrath.asm b/data/pokemon/base_stats/poliwrath.asm
index 04f74c42a..3b142e061 100644
--- a/data/pokemon/base_stats/poliwrath.asm
+++ b/data/pokemon/base_stats/poliwrath.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/poliwrath/front.dimensions"
+	INCBIN "gfx/pokemon/poliwrath/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn AMPHIBIAN, AMPHIBIAN ; egg groups
diff --git a/data/pokemon/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm
index 5c1f77c98..2c3c3f9cf 100644
--- a/data/pokemon/base_stats/ponyta.asm
+++ b/data/pokemon/base_stats/ponyta.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/ponyta/front.dimensions"
+	INCBIN "gfx/pokemon/ponyta/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.asm
index ecec59045..c034acdfb 100644
--- a/data/pokemon/base_stats/porygon.asm
+++ b/data/pokemon/base_stats/porygon.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/porygon/front.dimensions"
+	INCBIN "gfx/pokemon/porygon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INANIMATE, INANIMATE ; egg groups
diff --git a/data/pokemon/base_stats/porygon2.asm b/data/pokemon/base_stats/porygon2.asm
index 6bd464d3c..1e9625509 100644
--- a/data/pokemon/base_stats/porygon2.asm
+++ b/data/pokemon/base_stats/porygon2.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/porygon2/front.dimensions"
+	INCBIN "gfx/pokemon/porygon2/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INANIMATE, INANIMATE ; egg groups
diff --git a/data/pokemon/base_stats/primeape.asm b/data/pokemon/base_stats/primeape.asm
index 249f9bee4..a7d1ee74a 100644
--- a/data/pokemon/base_stats/primeape.asm
+++ b/data/pokemon/base_stats/primeape.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/primeape/front.dimensions"
+	INCBIN "gfx/pokemon/primeape/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm
index 261fdde99..d2901750b 100644
--- a/data/pokemon/base_stats/psyduck.asm
+++ b/data/pokemon/base_stats/psyduck.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/psyduck/front.dimensions"
+	INCBIN "gfx/pokemon/psyduck/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/pupitar.asm b/data/pokemon/base_stats/pupitar.asm
index 63c0a41a7..7ff381195 100644
--- a/data/pokemon/base_stats/pupitar.asm
+++ b/data/pokemon/base_stats/pupitar.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 40 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/pupitar/front.dimensions"
+	INCBIN "gfx/pokemon/pupitar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn MONSTER, MONSTER ; egg groups
diff --git a/data/pokemon/base_stats/quagsire.asm b/data/pokemon/base_stats/quagsire.asm
index 0f49866e7..75a1d24be 100644
--- a/data/pokemon/base_stats/quagsire.asm
+++ b/data/pokemon/base_stats/quagsire.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/quagsire/front.dimensions"
+	INCBIN "gfx/pokemon/quagsire/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/quilava.asm b/data/pokemon/base_stats/quilava.asm
index efadeda06..4cb388301 100644
--- a/data/pokemon/base_stats/quilava.asm
+++ b/data/pokemon/base_stats/quilava.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/quilava/front.dimensions"
+	INCBIN "gfx/pokemon/quilava/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/qwilfish.asm b/data/pokemon/base_stats/qwilfish.asm
index 70648e5fd..0cfe4e2d8 100644
--- a/data/pokemon/base_stats/qwilfish.asm
+++ b/data/pokemon/base_stats/qwilfish.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/qwilfish/front.dimensions"
+	INCBIN "gfx/pokemon/qwilfish/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FISH, FISH ; egg groups
diff --git a/data/pokemon/base_stats/raichu.asm b/data/pokemon/base_stats/raichu.asm
index cdc5193cd..b6723ac0f 100644
--- a/data/pokemon/base_stats/raichu.asm
+++ b/data/pokemon/base_stats/raichu.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 10 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/raichu/front.dimensions"
+	INCBIN "gfx/pokemon/raichu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FAIRY ; egg groups
diff --git a/data/pokemon/base_stats/raikou.asm b/data/pokemon/base_stats/raikou.asm
index a68f16181..47f4f9da3 100644
--- a/data/pokemon/base_stats/raikou.asm
+++ b/data/pokemon/base_stats/raikou.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 80 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/raikou/front.dimensions"
+	INCBIN "gfx/pokemon/raikou/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/pokemon/base_stats/rapidash.asm b/data/pokemon/base_stats/rapidash.asm
index 0167e7439..291b129f2 100644
--- a/data/pokemon/base_stats/rapidash.asm
+++ b/data/pokemon/base_stats/rapidash.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/rapidash/front.dimensions"
+	INCBIN "gfx/pokemon/rapidash/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/raticate.asm b/data/pokemon/base_stats/raticate.asm
index 1cfc65906..1424f3ffb 100644
--- a/data/pokemon/base_stats/raticate.asm
+++ b/data/pokemon/base_stats/raticate.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/raticate/front.dimensions"
+	INCBIN "gfx/pokemon/raticate/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/rattata.asm b/data/pokemon/base_stats/rattata.asm
index 13c21e889..71498aeac 100644
--- a/data/pokemon/base_stats/rattata.asm
+++ b/data/pokemon/base_stats/rattata.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/rattata/front.dimensions"
+	INCBIN "gfx/pokemon/rattata/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/remoraid.asm b/data/pokemon/base_stats/remoraid.asm
index 10ae15479..8dabbb0a4 100644
--- a/data/pokemon/base_stats/remoraid.asm
+++ b/data/pokemon/base_stats/remoraid.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/remoraid/front.dimensions"
+	INCBIN "gfx/pokemon/remoraid/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, FISH ; egg groups
diff --git a/data/pokemon/base_stats/rhydon.asm b/data/pokemon/base_stats/rhydon.asm
index cdcfb4cad..e885edd75 100644
--- a/data/pokemon/base_stats/rhydon.asm
+++ b/data/pokemon/base_stats/rhydon.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/rhydon/front.dimensions"
+	INCBIN "gfx/pokemon/rhydon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn MONSTER, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/rhyhorn.asm b/data/pokemon/base_stats/rhyhorn.asm
index 67d438751..f15f73719 100644
--- a/data/pokemon/base_stats/rhyhorn.asm
+++ b/data/pokemon/base_stats/rhyhorn.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/rhyhorn/front.dimensions"
+	INCBIN "gfx/pokemon/rhyhorn/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn MONSTER, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/sandshrew.asm b/data/pokemon/base_stats/sandshrew.asm
index cc0a4c492..7b172a120 100644
--- a/data/pokemon/base_stats/sandshrew.asm
+++ b/data/pokemon/base_stats/sandshrew.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/sandshrew/front.dimensions"
+	INCBIN "gfx/pokemon/sandshrew/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/sandslash.asm b/data/pokemon/base_stats/sandslash.asm
index 75f66b363..d850c9697 100644
--- a/data/pokemon/base_stats/sandslash.asm
+++ b/data/pokemon/base_stats/sandslash.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/sandslash/front.dimensions"
+	INCBIN "gfx/pokemon/sandslash/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/scizor.asm b/data/pokemon/base_stats/scizor.asm
index 127110c7a..c841c6301 100644
--- a/data/pokemon/base_stats/scizor.asm
+++ b/data/pokemon/base_stats/scizor.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/scizor/front.dimensions"
+	INCBIN "gfx/pokemon/scizor/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/pokemon/base_stats/scyther.asm b/data/pokemon/base_stats/scyther.asm
index 4c4779f0f..ea7c7cd33 100644
--- a/data/pokemon/base_stats/scyther.asm
+++ b/data/pokemon/base_stats/scyther.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/scyther/front.dimensions"
+	INCBIN "gfx/pokemon/scyther/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/pokemon/base_stats/seadra.asm b/data/pokemon/base_stats/seadra.asm
index b4dc47c20..3ba5687ce 100644
--- a/data/pokemon/base_stats/seadra.asm
+++ b/data/pokemon/base_stats/seadra.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/seadra/front.dimensions"
+	INCBIN "gfx/pokemon/seadra/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, REPTILE ; egg groups
diff --git a/data/pokemon/base_stats/seaking.asm b/data/pokemon/base_stats/seaking.asm
index 4d6d2f91e..70bee646a 100644
--- a/data/pokemon/base_stats/seaking.asm
+++ b/data/pokemon/base_stats/seaking.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/seaking/front.dimensions"
+	INCBIN "gfx/pokemon/seaking/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FISH, FISH ; egg groups
diff --git a/data/pokemon/base_stats/seel.asm b/data/pokemon/base_stats/seel.asm
index 39b44fad8..13edf89bc 100644
--- a/data/pokemon/base_stats/seel.asm
+++ b/data/pokemon/base_stats/seel.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/seel/front.dimensions"
+	INCBIN "gfx/pokemon/seel/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/sentret.asm b/data/pokemon/base_stats/sentret.asm
index 12e120087..c3802fa63 100644
--- a/data/pokemon/base_stats/sentret.asm
+++ b/data/pokemon/base_stats/sentret.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/sentret/front.dimensions"
+	INCBIN "gfx/pokemon/sentret/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/shellder.asm b/data/pokemon/base_stats/shellder.asm
index fb60ff262..9ca88a03d 100644
--- a/data/pokemon/base_stats/shellder.asm
+++ b/data/pokemon/base_stats/shellder.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/shellder/front.dimensions"
+	INCBIN "gfx/pokemon/shellder/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn INVERTEBRATE, INVERTEBRATE ; egg groups
diff --git a/data/pokemon/base_stats/shuckle.asm b/data/pokemon/base_stats/shuckle.asm
index 7cd31ad79..ec3a3b410 100644
--- a/data/pokemon/base_stats/shuckle.asm
+++ b/data/pokemon/base_stats/shuckle.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/shuckle/front.dimensions"
+	INCBIN "gfx/pokemon/shuckle/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/pokemon/base_stats/skarmory.asm b/data/pokemon/base_stats/skarmory.asm
index cf271b39f..4d0b5f3de 100644
--- a/data/pokemon/base_stats/skarmory.asm
+++ b/data/pokemon/base_stats/skarmory.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/skarmory/front.dimensions"
+	INCBIN "gfx/pokemon/skarmory/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/pokemon/base_stats/skiploom.asm b/data/pokemon/base_stats/skiploom.asm
index 46bbc8a8c..29a7be748 100644
--- a/data/pokemon/base_stats/skiploom.asm
+++ b/data/pokemon/base_stats/skiploom.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/skiploom/front.dimensions"
+	INCBIN "gfx/pokemon/skiploom/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn FAIRY, PLANT ; egg groups
diff --git a/data/pokemon/base_stats/slowbro.asm b/data/pokemon/base_stats/slowbro.asm
index a6b3a47b3..a9fc61e3a 100644
--- a/data/pokemon/base_stats/slowbro.asm
+++ b/data/pokemon/base_stats/slowbro.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/slowbro/front.dimensions"
+	INCBIN "gfx/pokemon/slowbro/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn MONSTER, AMPHIBIAN ; egg groups
diff --git a/data/pokemon/base_stats/slowking.asm b/data/pokemon/base_stats/slowking.asm
index e60da7fd6..59d6c83e4 100644
--- a/data/pokemon/base_stats/slowking.asm
+++ b/data/pokemon/base_stats/slowking.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/slowking/front.dimensions"
+	INCBIN "gfx/pokemon/slowking/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn MONSTER, AMPHIBIAN ; egg groups
diff --git a/data/pokemon/base_stats/slowpoke.asm b/data/pokemon/base_stats/slowpoke.asm
index a987d9bfa..cb9bc813b 100644
--- a/data/pokemon/base_stats/slowpoke.asm
+++ b/data/pokemon/base_stats/slowpoke.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/slowpoke/front.dimensions"
+	INCBIN "gfx/pokemon/slowpoke/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn MONSTER, AMPHIBIAN ; egg groups
diff --git a/data/pokemon/base_stats/slugma.asm b/data/pokemon/base_stats/slugma.asm
index a760dd40e..234e844b9 100644
--- a/data/pokemon/base_stats/slugma.asm
+++ b/data/pokemon/base_stats/slugma.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/slugma/front.dimensions"
+	INCBIN "gfx/pokemon/slugma/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMORPHOUS, AMORPHOUS ; egg groups
diff --git a/data/pokemon/base_stats/smeargle.asm b/data/pokemon/base_stats/smeargle.asm
index d80443acf..2373cb0f0 100644
--- a/data/pokemon/base_stats/smeargle.asm
+++ b/data/pokemon/base_stats/smeargle.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/smeargle/front.dimensions"
+	INCBIN "gfx/pokemon/smeargle/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/smoochum.asm b/data/pokemon/base_stats/smoochum.asm
index b3c6fdda0..f8f5e22f6 100644
--- a/data/pokemon/base_stats/smoochum.asm
+++ b/data/pokemon/base_stats/smoochum.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/smoochum/front.dimensions"
+	INCBIN "gfx/pokemon/smoochum/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/pokemon/base_stats/sneasel.asm b/data/pokemon/base_stats/sneasel.asm
index 3abea4b7a..4e24a8ada 100644
--- a/data/pokemon/base_stats/sneasel.asm
+++ b/data/pokemon/base_stats/sneasel.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/sneasel/front.dimensions"
+	INCBIN "gfx/pokemon/sneasel/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/snorlax.asm b/data/pokemon/base_stats/snorlax.asm
index 0d5a4c813..9a9e426e9 100644
--- a/data/pokemon/base_stats/snorlax.asm
+++ b/data/pokemon/base_stats/snorlax.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 40 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/snorlax/front.dimensions"
+	INCBIN "gfx/pokemon/snorlax/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn MONSTER, MONSTER ; egg groups
diff --git a/data/pokemon/base_stats/snubbull.asm b/data/pokemon/base_stats/snubbull.asm
index 00d94a3cb..6dbca375e 100644
--- a/data/pokemon/base_stats/snubbull.asm
+++ b/data/pokemon/base_stats/snubbull.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/snubbull/front.dimensions"
+	INCBIN "gfx/pokemon/snubbull/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn FIELD, FAIRY ; egg groups
diff --git a/data/pokemon/base_stats/spearow.asm b/data/pokemon/base_stats/spearow.asm
index b94e3559c..a55e8a17c 100644
--- a/data/pokemon/base_stats/spearow.asm
+++ b/data/pokemon/base_stats/spearow.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/spearow/front.dimensions"
+	INCBIN "gfx/pokemon/spearow/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/pokemon/base_stats/spinarak.asm b/data/pokemon/base_stats/spinarak.asm
index 5a19ec797..fb2fbb7f3 100644
--- a/data/pokemon/base_stats/spinarak.asm
+++ b/data/pokemon/base_stats/spinarak.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/spinarak/front.dimensions"
+	INCBIN "gfx/pokemon/spinarak/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/pokemon/base_stats/squirtle.asm b/data/pokemon/base_stats/squirtle.asm
index 1d9faa25d..6582f88a8 100644
--- a/data/pokemon/base_stats/squirtle.asm
+++ b/data/pokemon/base_stats/squirtle.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/squirtle/front.dimensions"
+	INCBIN "gfx/pokemon/squirtle/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, AMPHIBIAN ; egg groups
diff --git a/data/pokemon/base_stats/stantler.asm b/data/pokemon/base_stats/stantler.asm
index 762b2f26b..a8537a1e0 100644
--- a/data/pokemon/base_stats/stantler.asm
+++ b/data/pokemon/base_stats/stantler.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/stantler/front.dimensions"
+	INCBIN "gfx/pokemon/stantler/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/starmie.asm b/data/pokemon/base_stats/starmie.asm
index 55b6ed63c..55c5fcc99 100644
--- a/data/pokemon/base_stats/starmie.asm
+++ b/data/pokemon/base_stats/starmie.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/starmie/front.dimensions"
+	INCBIN "gfx/pokemon/starmie/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn INVERTEBRATE, INVERTEBRATE ; egg groups
diff --git a/data/pokemon/base_stats/staryu.asm b/data/pokemon/base_stats/staryu.asm
index 40700a47e..d702faaf2 100644
--- a/data/pokemon/base_stats/staryu.asm
+++ b/data/pokemon/base_stats/staryu.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/staryu/front.dimensions"
+	INCBIN "gfx/pokemon/staryu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn INVERTEBRATE, INVERTEBRATE ; egg groups
diff --git a/data/pokemon/base_stats/steelix.asm b/data/pokemon/base_stats/steelix.asm
index df5d8940c..6931418c8 100644
--- a/data/pokemon/base_stats/steelix.asm
+++ b/data/pokemon/base_stats/steelix.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/steelix/front.dimensions"
+	INCBIN "gfx/pokemon/steelix/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INANIMATE, INANIMATE ; egg groups
diff --git a/data/pokemon/base_stats/sudowoodo.asm b/data/pokemon/base_stats/sudowoodo.asm
index 1c6c33984..40726999d 100644
--- a/data/pokemon/base_stats/sudowoodo.asm
+++ b/data/pokemon/base_stats/sudowoodo.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/sudowoodo/front.dimensions"
+	INCBIN "gfx/pokemon/sudowoodo/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INANIMATE, INANIMATE ; egg groups
diff --git a/data/pokemon/base_stats/suicune.asm b/data/pokemon/base_stats/suicune.asm
index 04ece5516..b199eddd7 100644
--- a/data/pokemon/base_stats/suicune.asm
+++ b/data/pokemon/base_stats/suicune.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 80 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/suicune/front.dimensions"
+	INCBIN "gfx/pokemon/suicune/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/pokemon/base_stats/sunflora.asm b/data/pokemon/base_stats/sunflora.asm
index 97974939c..ec39d0932 100644
--- a/data/pokemon/base_stats/sunflora.asm
+++ b/data/pokemon/base_stats/sunflora.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/sunflora/front.dimensions"
+	INCBIN "gfx/pokemon/sunflora/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn PLANT, PLANT ; egg groups
diff --git a/data/pokemon/base_stats/sunkern.asm b/data/pokemon/base_stats/sunkern.asm
index 054625425..7e502900c 100644
--- a/data/pokemon/base_stats/sunkern.asm
+++ b/data/pokemon/base_stats/sunkern.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/sunkern/front.dimensions"
+	INCBIN "gfx/pokemon/sunkern/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn PLANT, PLANT ; egg groups
diff --git a/data/pokemon/base_stats/swinub.asm b/data/pokemon/base_stats/swinub.asm
index 37f1dd67d..ee6bd783a 100644
--- a/data/pokemon/base_stats/swinub.asm
+++ b/data/pokemon/base_stats/swinub.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/swinub/front.dimensions"
+	INCBIN "gfx/pokemon/swinub/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/tangela.asm b/data/pokemon/base_stats/tangela.asm
index 9bb27ffca..a2b5b06a0 100644
--- a/data/pokemon/base_stats/tangela.asm
+++ b/data/pokemon/base_stats/tangela.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/tangela/front.dimensions"
+	INCBIN "gfx/pokemon/tangela/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn PLANT, PLANT ; egg groups
diff --git a/data/pokemon/base_stats/tauros.asm b/data/pokemon/base_stats/tauros.asm
index 553458e83..936d60a4d 100644
--- a/data/pokemon/base_stats/tauros.asm
+++ b/data/pokemon/base_stats/tauros.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/tauros/front.dimensions"
+	INCBIN "gfx/pokemon/tauros/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/teddiursa.asm b/data/pokemon/base_stats/teddiursa.asm
index d636aed87..18c4ede7a 100644
--- a/data/pokemon/base_stats/teddiursa.asm
+++ b/data/pokemon/base_stats/teddiursa.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/teddiursa/front.dimensions"
+	INCBIN "gfx/pokemon/teddiursa/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/tentacool.asm b/data/pokemon/base_stats/tentacool.asm
index b13879b47..94dcb42b0 100644
--- a/data/pokemon/base_stats/tentacool.asm
+++ b/data/pokemon/base_stats/tentacool.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/tentacool/front.dimensions"
+	INCBIN "gfx/pokemon/tentacool/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn INVERTEBRATE, INVERTEBRATE ; egg groups
diff --git a/data/pokemon/base_stats/tentacruel.asm b/data/pokemon/base_stats/tentacruel.asm
index a678d13a8..e922c5938 100644
--- a/data/pokemon/base_stats/tentacruel.asm
+++ b/data/pokemon/base_stats/tentacruel.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/tentacruel/front.dimensions"
+	INCBIN "gfx/pokemon/tentacruel/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn INVERTEBRATE, INVERTEBRATE ; egg groups
diff --git a/data/pokemon/base_stats/togepi.asm b/data/pokemon/base_stats/togepi.asm
index 82f549e9a..0f22863e5 100644
--- a/data/pokemon/base_stats/togepi.asm
+++ b/data/pokemon/base_stats/togepi.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 10 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/togepi/front.dimensions"
+	INCBIN "gfx/pokemon/togepi/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/pokemon/base_stats/togetic.asm b/data/pokemon/base_stats/togetic.asm
index cec61edb3..ef2f94305 100644
--- a/data/pokemon/base_stats/togetic.asm
+++ b/data/pokemon/base_stats/togetic.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 10 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/togetic/front.dimensions"
+	INCBIN "gfx/pokemon/togetic/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn AVIAN, FAIRY ; egg groups
diff --git a/data/pokemon/base_stats/totodile.asm b/data/pokemon/base_stats/totodile.asm
index 1753d5af0..49c7603f6 100644
--- a/data/pokemon/base_stats/totodile.asm
+++ b/data/pokemon/base_stats/totodile.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/totodile/front.dimensions"
+	INCBIN "gfx/pokemon/totodile/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, AMPHIBIAN ; egg groups
diff --git a/data/pokemon/base_stats/typhlosion.asm b/data/pokemon/base_stats/typhlosion.asm
index 698a4e0a0..ed6fcf198 100644
--- a/data/pokemon/base_stats/typhlosion.asm
+++ b/data/pokemon/base_stats/typhlosion.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/typhlosion/front.dimensions"
+	INCBIN "gfx/pokemon/typhlosion/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/tyranitar.asm b/data/pokemon/base_stats/tyranitar.asm
index b695007f1..b6ed98dd7 100644
--- a/data/pokemon/base_stats/tyranitar.asm
+++ b/data/pokemon/base_stats/tyranitar.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 40 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/tyranitar/front.dimensions"
+	INCBIN "gfx/pokemon/tyranitar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn MONSTER, MONSTER ; egg groups
diff --git a/data/pokemon/base_stats/tyrogue.asm b/data/pokemon/base_stats/tyrogue.asm
index 4e5e7ee43..026aab404 100644
--- a/data/pokemon/base_stats/tyrogue.asm
+++ b/data/pokemon/base_stats/tyrogue.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/tyrogue/front.dimensions"
+	INCBIN "gfx/pokemon/tyrogue/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/pokemon/base_stats/umbreon.asm b/data/pokemon/base_stats/umbreon.asm
index 75e3700da..0382e69e2 100644
--- a/data/pokemon/base_stats/umbreon.asm
+++ b/data/pokemon/base_stats/umbreon.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 35 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/umbreon/front.dimensions"
+	INCBIN "gfx/pokemon/umbreon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/unown.asm b/data/pokemon/base_stats/unown.asm
index 0b13f3eca..ef67b1ce1 100644
--- a/data/pokemon/base_stats/unown.asm
+++ b/data/pokemon/base_stats/unown.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 40 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/unown_a/front.dimensions"
+	INCBIN "gfx/pokemon/unown_a/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/pokemon/base_stats/ursaring.asm b/data/pokemon/base_stats/ursaring.asm
index 7aa8a4265..8f2031c77 100644
--- a/data/pokemon/base_stats/ursaring.asm
+++ b/data/pokemon/base_stats/ursaring.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/ursaring/front.dimensions"
+	INCBIN "gfx/pokemon/ursaring/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/vaporeon.asm b/data/pokemon/base_stats/vaporeon.asm
index 0e55a1946..083a67499 100644
--- a/data/pokemon/base_stats/vaporeon.asm
+++ b/data/pokemon/base_stats/vaporeon.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 35 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/vaporeon/front.dimensions"
+	INCBIN "gfx/pokemon/vaporeon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/venomoth.asm b/data/pokemon/base_stats/venomoth.asm
index b34581360..c92c7fbff 100644
--- a/data/pokemon/base_stats/venomoth.asm
+++ b/data/pokemon/base_stats/venomoth.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/venomoth/front.dimensions"
+	INCBIN "gfx/pokemon/venomoth/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/pokemon/base_stats/venonat.asm b/data/pokemon/base_stats/venonat.asm
index 4a6a568f3..40a9639b8 100644
--- a/data/pokemon/base_stats/venonat.asm
+++ b/data/pokemon/base_stats/venonat.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/venonat/front.dimensions"
+	INCBIN "gfx/pokemon/venonat/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/pokemon/base_stats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm
index f5d6a3a33..465b3d0fc 100644
--- a/data/pokemon/base_stats/venusaur.asm
+++ b/data/pokemon/base_stats/venusaur.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/venusaur/front.dimensions"
+	INCBIN "gfx/pokemon/venusaur/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, PLANT ; egg groups
diff --git a/data/pokemon/base_stats/victreebel.asm b/data/pokemon/base_stats/victreebel.asm
index 0efade3ad..e4e1a24e5 100644
--- a/data/pokemon/base_stats/victreebel.asm
+++ b/data/pokemon/base_stats/victreebel.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/victreebel/front.dimensions"
+	INCBIN "gfx/pokemon/victreebel/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn PLANT, PLANT ; egg groups
diff --git a/data/pokemon/base_stats/vileplume.asm b/data/pokemon/base_stats/vileplume.asm
index 12170e167..3f0d0b996 100644
--- a/data/pokemon/base_stats/vileplume.asm
+++ b/data/pokemon/base_stats/vileplume.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/vileplume/front.dimensions"
+	INCBIN "gfx/pokemon/vileplume/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn PLANT, PLANT ; egg groups
diff --git a/data/pokemon/base_stats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm
index 7c2255729..2767568fa 100644
--- a/data/pokemon/base_stats/voltorb.asm
+++ b/data/pokemon/base_stats/voltorb.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/voltorb/front.dimensions"
+	INCBIN "gfx/pokemon/voltorb/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INANIMATE, INANIMATE ; egg groups
diff --git a/data/pokemon/base_stats/vulpix.asm b/data/pokemon/base_stats/vulpix.asm
index 9cea11f93..e012402a0 100644
--- a/data/pokemon/base_stats/vulpix.asm
+++ b/data/pokemon/base_stats/vulpix.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/vulpix/front.dimensions"
+	INCBIN "gfx/pokemon/vulpix/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/wartortle.asm b/data/pokemon/base_stats/wartortle.asm
index 437342a8b..7df729f3f 100644
--- a/data/pokemon/base_stats/wartortle.asm
+++ b/data/pokemon/base_stats/wartortle.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/wartortle/front.dimensions"
+	INCBIN "gfx/pokemon/wartortle/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, AMPHIBIAN ; egg groups
diff --git a/data/pokemon/base_stats/weedle.asm b/data/pokemon/base_stats/weedle.asm
index b47a720ec..520109245 100644
--- a/data/pokemon/base_stats/weedle.asm
+++ b/data/pokemon/base_stats/weedle.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/weedle/front.dimensions"
+	INCBIN "gfx/pokemon/weedle/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/pokemon/base_stats/weepinbell.asm b/data/pokemon/base_stats/weepinbell.asm
index 4a70c5bb2..3dbd2595e 100644
--- a/data/pokemon/base_stats/weepinbell.asm
+++ b/data/pokemon/base_stats/weepinbell.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/weepinbell/front.dimensions"
+	INCBIN "gfx/pokemon/weepinbell/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn PLANT, PLANT ; egg groups
diff --git a/data/pokemon/base_stats/weezing.asm b/data/pokemon/base_stats/weezing.asm
index 49161c69b..41c1d4f5d 100644
--- a/data/pokemon/base_stats/weezing.asm
+++ b/data/pokemon/base_stats/weezing.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/weezing/front.dimensions"
+	INCBIN "gfx/pokemon/weezing/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMORPHOUS, AMORPHOUS ; egg groups
diff --git a/data/pokemon/base_stats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm
index b94bb3482..e2d3bd7e6 100644
--- a/data/pokemon/base_stats/wigglytuff.asm
+++ b/data/pokemon/base_stats/wigglytuff.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 10 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/wigglytuff/front.dimensions"
+	INCBIN "gfx/pokemon/wigglytuff/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn FAIRY, FAIRY ; egg groups
diff --git a/data/pokemon/base_stats/wobbuffet.asm b/data/pokemon/base_stats/wobbuffet.asm
index c476dd828..393655150 100644
--- a/data/pokemon/base_stats/wobbuffet.asm
+++ b/data/pokemon/base_stats/wobbuffet.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/wobbuffet/front.dimensions"
+	INCBIN "gfx/pokemon/wobbuffet/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMORPHOUS, AMORPHOUS ; egg groups
diff --git a/data/pokemon/base_stats/wooper.asm b/data/pokemon/base_stats/wooper.asm
index 6e621fe4b..db3f7f90a 100644
--- a/data/pokemon/base_stats/wooper.asm
+++ b/data/pokemon/base_stats/wooper.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/wooper/front.dimensions"
+	INCBIN "gfx/pokemon/wooper/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, FIELD ; egg groups
diff --git a/data/pokemon/base_stats/xatu.asm b/data/pokemon/base_stats/xatu.asm
index f2966ddb4..a5941421e 100644
--- a/data/pokemon/base_stats/xatu.asm
+++ b/data/pokemon/base_stats/xatu.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/xatu/front.dimensions"
+	INCBIN "gfx/pokemon/xatu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/pokemon/base_stats/yanma.asm b/data/pokemon/base_stats/yanma.asm
index 98449c720..0bff5157a 100644
--- a/data/pokemon/base_stats/yanma.asm
+++ b/data/pokemon/base_stats/yanma.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/yanma/front.dimensions"
+	INCBIN "gfx/pokemon/yanma/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/pokemon/base_stats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm
index 44c1a8e82..35b557404 100644
--- a/data/pokemon/base_stats/zapdos.asm
+++ b/data/pokemon/base_stats/zapdos.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 80 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/zapdos/front.dimensions"
+	INCBIN "gfx/pokemon/zapdos/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/pokemon/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm
index e8fd33ea2..5da4ceeba 100644
--- a/data/pokemon/base_stats/zubat.asm
+++ b/data/pokemon/base_stats/zubat.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	INCBIN "gfx/pics/zubat/front.dimensions"
+	INCBIN "gfx/pokemon/zubat/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm
new file mode 100644
index 000000000..e6f729361
--- /dev/null
+++ b/data/pokemon/cries.asm
@@ -0,0 +1,263 @@
+mon_cry: MACRO
+; index, pitch, length
+	dw \1, \2, \3
+ENDM
+
+PokemonCries:: ; f2787
+; entries correspond to constants/pokemon_constants.asm
+	mon_cry CRY_BULBASAUR,   $080,  $081 ; BULBASAUR
+	mon_cry CRY_BULBASAUR,   $020,  $100 ; IVYSAUR
+	mon_cry CRY_BULBASAUR,   $000,  $140 ; VENUSAUR
+	mon_cry CRY_CHARMANDER,  $060,  $0c0 ; CHARMANDER
+	mon_cry CRY_CHARMANDER,  $020,  $0c0 ; CHARMELEON
+	mon_cry CRY_CHARMANDER,  $000,  $100 ; CHARIZARD
+	mon_cry CRY_SQUIRTLE,    $060,  $0c0 ; SQUIRTLE
+	mon_cry CRY_SQUIRTLE,    $020,  $0c0 ; WARTORTLE
+	mon_cry CRY_BLASTOISE,   $000,  $100 ; BLASTOISE
+	mon_cry CRY_CATERPIE,    $080,  $0a0 ; CATERPIE
+	mon_cry CRY_METAPOD,     $0cc,  $081 ; METAPOD
+	mon_cry CRY_CATERPIE,    $077,  $0c0 ; BUTTERFREE
+	mon_cry CRY_WEEDLE,      $0ee,  $081 ; WEEDLE
+	mon_cry CRY_BLASTOISE,   $0ff,  $081 ; KAKUNA
+	mon_cry CRY_BLASTOISE,   $060,  $100 ; BEEDRILL
+	mon_cry CRY_PIDGEY,      $0df,  $084 ; PIDGEY
+	mon_cry CRY_PIDGEOTTO,   $028,  $140 ; PIDGEOTTO
+	mon_cry CRY_PIDGEOTTO,   $011,  $17f ; PIDGEOT
+	mon_cry CRY_RATTATA,     $000,  $100 ; RATTATA
+	mon_cry CRY_RATTATA,     $020,  $17f ; RATICATE
+	mon_cry CRY_SPEAROW,     $000,  $100 ; SPEAROW
+	mon_cry CRY_FEAROW,      $040,  $120 ; FEAROW
+	mon_cry CRY_EKANS,       $012,  $0c0 ; EKANS
+	mon_cry CRY_EKANS,       $0e0,  $090 ; ARBOK
+	mon_cry CRY_BULBASAUR,   $0ee,  $081 ; PIKACHU
+	mon_cry CRY_RAICHU,      $0ee,  $088 ; RAICHU
+	mon_cry CRY_NIDORAN_M,   $020,  $0c0 ; SANDSHREW
+	mon_cry CRY_NIDORAN_M,   $0ff,  $17f ; SANDSLASH
+	mon_cry CRY_NIDORAN_F,   $000,  $100 ; NIDORAN_F
+	mon_cry CRY_NIDORAN_F,   $02c,  $160 ; NIDORINA
+	mon_cry CRY_NIDOQUEEN,   $000,  $100 ; NIDOQUEEN
+	mon_cry CRY_NIDORAN_M,   $000,  $100 ; NIDORAN_M
+	mon_cry CRY_NIDORAN_M,   $02c,  $140 ; NIDORINO
+	mon_cry CRY_RAICHU,      $000,  $100 ; NIDOKING
+	mon_cry CRY_CLEFAIRY,    $0cc,  $081 ; CLEFAIRY
+	mon_cry CRY_CLEFAIRY,    $0aa,  $0a0 ; CLEFABLE
+	mon_cry CRY_VULPIX,      $04f,  $090 ; VULPIX
+	mon_cry CRY_VULPIX,      $088,  $0e0 ; NINETALES
+	mon_cry CRY_PIDGEY,      $0ff,  $0b5 ; JIGGLYPUFF
+	mon_cry CRY_PIDGEY,      $068,  $0e0 ; WIGGLYTUFF
+	mon_cry CRY_SQUIRTLE,    $0e0,  $100 ; ZUBAT
+	mon_cry CRY_SQUIRTLE,    $0fa,  $100 ; GOLBAT
+	mon_cry CRY_ODDISH,      $0dd,  $081 ; ODDISH
+	mon_cry CRY_ODDISH,      $0aa,  $0c0 ; GLOOM
+	mon_cry CRY_VILEPLUME,   $022,  $17f ; VILEPLUME
+	mon_cry CRY_PARAS,       $020,  $160 ; PARAS
+	mon_cry CRY_PARAS,       $042,  $17f ; PARASECT
+	mon_cry CRY_VENONAT,     $044,  $0c0 ; VENONAT
+	mon_cry CRY_VENONAT,     $029,  $100 ; VENOMOTH
+	mon_cry CRY_DIGLETT,     $0aa,  $081 ; DIGLETT
+	mon_cry CRY_DIGLETT,     $02a,  $090 ; DUGTRIO
+	mon_cry CRY_CLEFAIRY,    $077,  $090 ; MEOWTH
+	mon_cry CRY_CLEFAIRY,    $099,  $17f ; PERSIAN
+	mon_cry CRY_PSYDUCK,     $020,  $0e0 ; PSYDUCK
+	mon_cry CRY_PSYDUCK,     $0ff,  $0c0 ; GOLDUCK
+	mon_cry CRY_NIDOQUEEN,   $0dd,  $0e0 ; MANKEY
+	mon_cry CRY_NIDOQUEEN,   $0af,  $0c0 ; PRIMEAPE
+	mon_cry CRY_GROWLITHE,   $020,  $0c0 ; GROWLITHE
+	mon_cry CRY_WEEDLE,      $000,  $100 ; ARCANINE
+	mon_cry CRY_PIDGEY,      $0ff,  $17f ; POLIWAG
+	mon_cry CRY_PIDGEY,      $077,  $0e0 ; POLIWHIRL
+	mon_cry CRY_PIDGEY,      $000,  $17f ; POLIWRATH
+	mon_cry CRY_METAPOD,     $0c0,  $081 ; ABRA
+	mon_cry CRY_METAPOD,     $0a8,  $140 ; KADABRA
+	mon_cry CRY_METAPOD,     $098,  $17f ; ALAKAZAM
+	mon_cry CRY_GROWLITHE,   $0ee,  $081 ; MACHOP
+	mon_cry CRY_GROWLITHE,   $048,  $0e0 ; MACHOKE
+	mon_cry CRY_GROWLITHE,   $008,  $140 ; MACHAMP
+	mon_cry CRY_PSYDUCK,     $055,  $081 ; BELLSPROUT
+	mon_cry CRY_WEEPINBELL,  $044,  $0a0 ; WEEPINBELL
+	mon_cry CRY_WEEPINBELL,  $066,  $14c ; VICTREEBEL
+	mon_cry CRY_VENONAT,     $000,  $100 ; TENTACOOL
+	mon_cry CRY_VENONAT,     $0ee,  $17f ; TENTACRUEL
+	mon_cry CRY_VULPIX,      $0f0,  $090 ; GEODUDE
+	mon_cry CRY_VULPIX,      $000,  $100 ; GRAVELER
+	mon_cry CRY_GOLEM,       $0e0,  $0c0 ; GOLEM
+	mon_cry CRY_WEEPINBELL,  $000,  $100 ; PONYTA
+	mon_cry CRY_WEEPINBELL,  $020,  $140 ; RAPIDASH
+	mon_cry CRY_SLOWPOKE,    $000,  $100 ; SLOWPOKE
+	mon_cry CRY_GROWLITHE,   $000,  $100 ; SLOWBRO
+	mon_cry CRY_METAPOD,     $080,  $0e0 ; MAGNEMITE
+	mon_cry CRY_METAPOD,     $020,  $140 ; MAGNETON
+	mon_cry CRY_SPEAROW,     $0dd,  $081 ; FARFETCH_D
+	mon_cry CRY_DIGLETT,     $0bb,  $081 ; DODUO
+	mon_cry CRY_DIGLETT,     $099,  $0a0 ; DODRIO
+	mon_cry CRY_SEEL,        $088,  $140 ; SEEL
+	mon_cry CRY_SEEL,        $023,  $17f ; DEWGONG
+	mon_cry CRY_GRIMER,      $000,  $100 ; GRIMER
+	mon_cry CRY_MUK,         $0ef,  $17f ; MUK
+	mon_cry CRY_FEAROW,      $000,  $100 ; SHELLDER
+	mon_cry CRY_FEAROW,      $06f,  $160 ; CLOYSTER
+	mon_cry CRY_METAPOD,     $000,  $100 ; GASTLY
+	mon_cry CRY_METAPOD,     $030,  $0c0 ; HAUNTER
+	mon_cry CRY_MUK,         $000,  $17f ; GENGAR
+	mon_cry CRY_EKANS,       $0ff,  $140 ; ONIX
+	mon_cry CRY_DROWZEE,     $088,  $0a0 ; DROWZEE
+	mon_cry CRY_DROWZEE,     $0ee,  $0c0 ; HYPNO
+	mon_cry CRY_KRABBY,      $020,  $160 ; KRABBY
+	mon_cry CRY_KRABBY,      $0ee,  $160 ; KINGLER
+	mon_cry CRY_VOLTORB,     $0ed,  $100 ; VOLTORB
+	mon_cry CRY_VOLTORB,     $0a8,  $110 ; ELECTRODE
+	mon_cry CRY_DIGLETT,     $000,  $100 ; EXEGGCUTE
+	mon_cry CRY_DROWZEE,     $000,  $100 ; EXEGGUTOR
+	mon_cry CRY_CLEFAIRY,    $000,  $100 ; CUBONE
+	mon_cry CRY_ODDISH,      $04f,  $0e0 ; MAROWAK
+	mon_cry CRY_GOLEM,       $080,  $140 ; HITMONLEE
+	mon_cry CRY_SEEL,        $0ee,  $140 ; HITMONCHAN
+	mon_cry CRY_SEEL,        $000,  $100 ; LICKITUNG
+	mon_cry CRY_GOLEM,       $0e6,  $15d ; KOFFING
+	mon_cry CRY_GOLEM,       $0ff,  $17f ; WEEZING
+	mon_cry CRY_CHARMANDER,  $000,  $100 ; RHYHORN
+	mon_cry CRY_RHYDON,      $000,  $100 ; RHYDON
+	mon_cry CRY_PIDGEOTTO,   $00a,  $140 ; CHANSEY
+	mon_cry CRY_GOLEM,       $000,  $100 ; TANGELA
+	mon_cry CRY_KANGASKHAN,  $000,  $100 ; KANGASKHAN
+	mon_cry CRY_CLEFAIRY,    $099,  $090 ; HORSEA
+	mon_cry CRY_CLEFAIRY,    $03c,  $081 ; SEADRA
+	mon_cry CRY_CATERPIE,    $080,  $0c0 ; GOLDEEN
+	mon_cry CRY_CATERPIE,    $010,  $17f ; SEAKING
+	mon_cry CRY_PARAS,       $002,  $0a0 ; STARYU
+	mon_cry CRY_PARAS,       $000,  $100 ; STARMIE
+	mon_cry CRY_KRABBY,      $008,  $0c0 ; MR__MIME
+	mon_cry CRY_CATERPIE,    $000,  $100 ; SCYTHER
+	mon_cry CRY_DROWZEE,     $0ff,  $17f ; JYNX
+	mon_cry CRY_VOLTORB,     $08f,  $17f ; ELECTABUZZ
+	mon_cry CRY_CHARMANDER,  $0ff,  $0b0 ; MAGMAR
+	mon_cry CRY_PIDGEOTTO,   $000,  $100 ; PINSIR
+	mon_cry CRY_SQUIRTLE,    $011,  $0c0 ; TAUROS
+	mon_cry CRY_EKANS,       $080,  $080 ; MAGIKARP
+	mon_cry CRY_EKANS,       $000,  $100 ; GYARADOS
+	mon_cry CRY_LAPRAS,      $000,  $100 ; LAPRAS
+	mon_cry CRY_PIDGEY,      $0ff,  $17f ; DITTO
+	mon_cry CRY_VENONAT,     $088,  $0e0 ; EEVEE
+	mon_cry CRY_VENONAT,     $0aa,  $17f ; VAPOREON
+	mon_cry CRY_VENONAT,     $03d,  $100 ; JOLTEON
+	mon_cry CRY_VENONAT,     $010,  $0a0 ; FLAREON
+	mon_cry CRY_WEEPINBELL,  $0aa,  $17f ; PORYGON
+	mon_cry CRY_GROWLITHE,   $0f0,  $081 ; OMANYTE
+	mon_cry CRY_GROWLITHE,   $0ff,  $0c0 ; OMASTAR
+	mon_cry CRY_CATERPIE,    $0bb,  $0c0 ; KABUTO
+	mon_cry CRY_FEAROW,      $0ee,  $081 ; KABUTOPS
+	mon_cry CRY_VILEPLUME,   $020,  $170 ; AERODACTYL
+	mon_cry CRY_GRIMER,      $055,  $081 ; SNORLAX
+	mon_cry CRY_RAICHU,      $080,  $0c0 ; ARTICUNO
+	mon_cry CRY_FEAROW,      $0ff,  $100 ; ZAPDOS
+	mon_cry CRY_RAICHU,      $0f8,  $0c0 ; MOLTRES
+	mon_cry CRY_BULBASAUR,   $060,  $0c0 ; DRATINI
+	mon_cry CRY_BULBASAUR,   $040,  $100 ; DRAGONAIR
+	mon_cry CRY_BULBASAUR,   $03c,  $140 ; DRAGONITE
+	mon_cry CRY_PARAS,       $099,  $17f ; MEWTWO
+	mon_cry CRY_PARAS,       $0ee,  $17f ; MEW
+	mon_cry CRY_CHIKORITA,  -$010,  $0b0 ; CHIKORITA
+	mon_cry CRY_CHIKORITA,  -$022,  $120 ; BAYLEEF
+	mon_cry CRY_CHIKORITA,  -$0b7,  $200 ; MEGANIUM
+	mon_cry CRY_CYNDAQUIL,   $347,  $080 ; CYNDAQUIL
+	mon_cry CRY_CYNDAQUIL,   $321,  $120 ; QUILAVA
+	mon_cry CRY_TYPHLOSION,  $f00,  $0d4 ; TYPHLOSION
+	mon_cry CRY_TOTODILE,    $46c,  $0e8 ; TOTODILE
+	mon_cry CRY_TOTODILE,    $440,  $110 ; CROCONAW
+	mon_cry CRY_TOTODILE,    $3fc,  $180 ; FERALIGATR
+	mon_cry CRY_SENTRET,     $08a,  $0b8 ; SENTRET
+	mon_cry CRY_SENTRET,     $06b,  $102 ; FURRET
+	mon_cry CRY_HOOTHOOT,    $091,  $0d8 ; HOOTHOOT
+	mon_cry CRY_HOOTHOOT,    $000,  $1a0 ; NOCTOWL
+	mon_cry CRY_LEDYBA,      $000,  $0de ; LEDYBA
+	mon_cry CRY_LEDYBA,     -$096,  $138 ; LEDIAN
+	mon_cry CRY_SPINARAK,    $011,  $200 ; SPINARAK
+	mon_cry CRY_SPINARAK,   -$0ae,  $1e2 ; ARIADOS
+	mon_cry CRY_SQUIRTLE,   -$010,  $140 ; CROBAT
+	mon_cry CRY_CYNDAQUIL,   $3c9,  $140 ; CHINCHOU
+	mon_cry CRY_CYNDAQUIL,   $2d0,  $110 ; LANTURN
+	mon_cry CRY_PICHU,       $000,  $140 ; PICHU
+	mon_cry CRY_CLEFFA,      $061,  $091 ; CLEFFA
+	mon_cry CRY_CHIKORITA,   $0e8,  $0e8 ; IGGLYBUFF
+	mon_cry CRY_TOGEPI,      $010,  $100 ; TOGEPI
+	mon_cry CRY_TOGETIC,     $03b,  $038 ; TOGETIC
+	mon_cry CRY_NATU,       -$067,  $100 ; NATU
+	mon_cry CRY_NATU,       -$0a7,  $168 ; XATU
+	mon_cry CRY_MAREEP,      $022,  $0d8 ; MAREEP
+	mon_cry CRY_MAREEP,     -$007,  $180 ; FLAAFFY
+	mon_cry CRY_AMPHAROS,   -$07c,  $0e8 ; AMPHAROS
+	mon_cry CRY_CLEFFA,      $084,  $150 ; BELLOSSOM
+	mon_cry CRY_MARILL,      $11b,  $120 ; MARILL
+	mon_cry CRY_MARILL,      $0b6,  $180 ; AZUMARILL
+	mon_cry CRY_CLEFFA,      $f40,  $180 ; SUDOWOODO
+	mon_cry CRY_CLEFFA,     -$2a3,  $1c8 ; POLITOED
+	mon_cry CRY_CLEFFA,      $03b,  $0c8 ; HOPPIP
+	mon_cry CRY_CLEFFA,      $027,  $138 ; SKIPLOOM
+	mon_cry CRY_CLEFFA,      $000,  $180 ; JUMPLUFF
+	mon_cry CRY_AIPOM,      -$051,  $0e8 ; AIPOM
+	mon_cry CRY_MARILL,      $12b,  $0b8 ; SUNKERN
+	mon_cry CRY_SUNFLORA,   -$020,  $180 ; SUNFLORA
+	mon_cry CRY_TOTODILE,    $031,  $0c8 ; YANMA
+	mon_cry CRY_WOOPER,      $093,  $0af ; WOOPER
+	mon_cry CRY_WOOPER,     -$0c6,  $140 ; QUAGSIRE
+	mon_cry CRY_AIPOM,       $0a2,  $140 ; ESPEON
+	mon_cry CRY_VENONAT,    -$0e9,  $0f0 ; UMBREON
+	mon_cry CRY_MARILL,     -$01f,  $180 ; MURKROW
+	mon_cry CRY_SLOWKING,    $104,  $200 ; SLOWKING
+	mon_cry CRY_HOOTHOOT,    $130,  $0e8 ; MISDREAVUS
+	mon_cry CRY_HOOTHOOT,    $162,  $100 ; UNOWN
+	mon_cry CRY_AMPHAROS,    $27b,  $144 ; WOBBUFFET
+	mon_cry CRY_GIRAFARIG,   $041,  $200 ; GIRAFARIG
+	mon_cry CRY_SLOWKING,    $080,  $100 ; PINECO
+	mon_cry CRY_SLOWKING,    $000,  $180 ; FORRETRESS
+	mon_cry CRY_DUNSPARCE,   $1c4,  $100 ; DUNSPARCE
+	mon_cry CRY_GLIGAR,     -$102,  $100 ; GLIGAR
+	mon_cry CRY_TYPHLOSION,  $0ef,  $0f7 ; STEELIX
+	mon_cry CRY_DUNSPARCE,   $112,  $0e8 ; SNUBBULL
+	mon_cry CRY_DUNSPARCE,   $000,  $180 ; GRANBULL
+	mon_cry CRY_SLOWKING,    $160,  $0e0 ; QWILFISH
+	mon_cry CRY_AMPHAROS,    $000,  $160 ; SCIZOR
+	mon_cry CRY_DUNSPARCE,   $290,  $0a8 ; SHUCKLE
+	mon_cry CRY_AMPHAROS,    $035,  $0e0 ; HERACROSS
+	mon_cry CRY_WOOPER,      $053,  $0af ; SNEASEL
+	mon_cry CRY_TEDDIURSA,   $7a2,  $06e ; TEDDIURSA
+	mon_cry CRY_TEDDIURSA,   $640,  $0d8 ; URSARING
+	mon_cry CRY_SLUGMA,     -$1d8,  $140 ; SLUGMA
+	mon_cry CRY_MAGCARGO,   -$20d,  $1c0 ; MAGCARGO
+	mon_cry CRY_CYNDAQUIL,   $1fe,  $140 ; SWINUB
+	mon_cry CRY_MAGCARGO,   -$109,  $100 ; PILOSWINE
+	mon_cry CRY_MAGCARGO,    $0a1,  $0e8 ; CORSOLA
+	mon_cry CRY_SUNFLORA,    $00d,  $100 ; REMORAID
+	mon_cry CRY_TOTODILE,    $000,  $180 ; OCTILLERY
+	mon_cry CRY_TEDDIURSA,   $002,  $06a ; DELIBIRD
+	mon_cry CRY_MANTINE,    -$0be,  $0f0 ; MANTINE
+	mon_cry CRY_AMPHAROS,    $8a9,  $180 ; SKARMORY
+	mon_cry CRY_CYNDAQUIL,   $039,  $140 ; HOUNDOUR
+	mon_cry CRY_TOTODILE,   -$10a,  $100 ; HOUNDOOM
+	mon_cry CRY_SLUGMA,      $2fb,  $100 ; KINGDRA
+	mon_cry CRY_SENTRET,     $048,  $230 ; PHANPY
+	mon_cry CRY_DONPHAN,     $000,  $1a0 ; DONPHAN
+	mon_cry CRY_GIRAFARIG,   $073,  $240 ; PORYGON2
+	mon_cry CRY_AIPOM,      -$160,  $180 ; STANTLER
+	mon_cry CRY_PICHU,      -$21a,  $1f0 ; SMEARGLE
+	mon_cry CRY_AIPOM,       $02c,  $108 ; TYROGUE
+	mon_cry CRY_SLUGMA,      $000,  $100 ; HITMONTOP
+	mon_cry CRY_MARILL,      $068,  $100 ; SMOOCHUM
+	mon_cry CRY_SUNFLORA,   -$2d8,  $0b4 ; ELEKID
+	mon_cry CRY_TEDDIURSA,   $176,  $03a ; MAGBY
+	mon_cry CRY_GLIGAR,     -$1cd,  $1a0 ; MILTANK
+	mon_cry CRY_SLOWKING,    $293,  $140 ; BLISSEY
+	mon_cry CRY_RAIKOU,      $22e,  $120 ; RAIKOU
+	mon_cry CRY_ENTEI,       $000,  $1a0 ; ENTEI
+	mon_cry CRY_MAGCARGO,    $000,  $180 ; SUICUNE
+	mon_cry CRY_RAIKOU,      $05f,  $0d0 ; LARVITAR
+	mon_cry CRY_SPINARAK,   -$1db,  $150 ; PUPITAR
+	mon_cry CRY_RAIKOU,     -$100,  $180 ; TYRANITAR
+	mon_cry CRY_TYPHLOSION,  $000,  $100 ; LUGIA
+	mon_cry CRY_AIPOM,       $000,  $180 ; HO_OH
+	mon_cry CRY_ENTEI,       $14a,  $111 ; CELEBI
+	mon_cry CRY_NIDORAN_M,      0,     0 ; 252
+	mon_cry CRY_NIDORAN_M,      0,     0 ; 253
+	mon_cry CRY_NIDORAN_M,      0,     0 ; 254
+	mon_cry CRY_NIDORAN_M,      0,     0 ; 255
+; f2d81
diff --git a/data/pokemon/cry_headers.asm b/data/pokemon/cry_headers.asm
deleted file mode 100644
index 0651fa7f1..000000000
--- a/data/pokemon/cry_headers.asm
+++ /dev/null
@@ -1,259 +0,0 @@
-CryHeaders:: ; f2787
-; entries correspond to constants/pokemon_constants.asm
-;                               index,          pitch, length
-BulbasaurCryHeader:   cry_header CRY_BULBASAUR,   $080,  $081
-IvysaurCryHeader:     cry_header CRY_BULBASAUR,   $020,  $100
-VenusaurCryHeader:    cry_header CRY_BULBASAUR,   $000,  $140
-CharmanderCryHeader:  cry_header CRY_CHARMANDER,  $060,  $0c0
-CharmeleonCryHeader:  cry_header CRY_CHARMANDER,  $020,  $0c0
-CharizardCryHeader:   cry_header CRY_CHARMANDER,  $000,  $100
-SquirtleCryHeader:    cry_header CRY_SQUIRTLE,    $060,  $0c0
-WartortleCryHeader:   cry_header CRY_SQUIRTLE,    $020,  $0c0
-BlastoiseCryHeader:   cry_header CRY_BLASTOISE,   $000,  $100
-CaterpieCryHeader:    cry_header CRY_CATERPIE,    $080,  $0a0
-MetapodCryHeader:     cry_header CRY_METAPOD,     $0cc,  $081
-ButterfreeCryHeader:  cry_header CRY_CATERPIE,    $077,  $0c0
-WeedleCryHeader:      cry_header CRY_WEEDLE,      $0ee,  $081
-KakunaCryHeader:      cry_header CRY_BLASTOISE,   $0ff,  $081
-BeedrillCryHeader:    cry_header CRY_BLASTOISE,   $060,  $100
-PidgeyCryHeader:      cry_header CRY_PIDGEY,      $0df,  $084
-PidgeottoCryHeader:   cry_header CRY_PIDGEOTTO,   $028,  $140
-PidgeotCryHeader:     cry_header CRY_PIDGEOTTO,   $011,  $17f
-RattataCryHeader:     cry_header CRY_RATTATA,     $000,  $100
-RaticateCryHeader:    cry_header CRY_RATTATA,     $020,  $17f
-SpearowCryHeader:     cry_header CRY_SPEAROW,     $000,  $100
-FearowCryHeader:      cry_header CRY_FEAROW,      $040,  $120
-EkansCryHeader:       cry_header CRY_EKANS,       $012,  $0c0
-ArbokCryHeader:       cry_header CRY_EKANS,       $0e0,  $090
-PikachuCryHeader:     cry_header CRY_BULBASAUR,   $0ee,  $081
-RaichuCryHeader:      cry_header CRY_RAICHU,      $0ee,  $088
-SandshrewCryHeader:   cry_header CRY_NIDORAN_M,   $020,  $0c0
-SandslashCryHeader:   cry_header CRY_NIDORAN_M,   $0ff,  $17f
-NidoranFCryHeader:    cry_header CRY_NIDORAN_F,   $000,  $100
-NidorinaCryHeader:    cry_header CRY_NIDORAN_F,   $02c,  $160
-NidoqueenCryHeader:   cry_header CRY_NIDOQUEEN,   $000,  $100
-NidoranMCryHeader:    cry_header CRY_NIDORAN_M,   $000,  $100
-NidorinoCryHeader:    cry_header CRY_NIDORAN_M,   $02c,  $140
-NidokingCryHeader:    cry_header CRY_RAICHU,      $000,  $100
-ClefairyCryHeader:    cry_header CRY_CLEFAIRY,    $0cc,  $081
-ClefableCryHeader:    cry_header CRY_CLEFAIRY,    $0aa,  $0a0
-VulpixCryHeader:      cry_header CRY_VULPIX,      $04f,  $090
-NinetalesCryHeader:   cry_header CRY_VULPIX,      $088,  $0e0
-JigglypuffCryHeader:  cry_header CRY_PIDGEY,      $0ff,  $0b5
-WigglytuffCryHeader:  cry_header CRY_PIDGEY,      $068,  $0e0
-ZubatCryHeader:       cry_header CRY_SQUIRTLE,    $0e0,  $100
-GolbatCryHeader:      cry_header CRY_SQUIRTLE,    $0fa,  $100
-OddishCryHeader:      cry_header CRY_ODDISH,      $0dd,  $081
-GloomCryHeader:       cry_header CRY_ODDISH,      $0aa,  $0c0
-VileplumeCryHeader:   cry_header CRY_VILEPLUME,   $022,  $17f
-ParasCryHeader:       cry_header CRY_PARAS,       $020,  $160
-ParasectCryHeader:    cry_header CRY_PARAS,       $042,  $17f
-VenonatCryHeader:     cry_header CRY_VENONAT,     $044,  $0c0
-VenomothCryHeader:    cry_header CRY_VENONAT,     $029,  $100
-DiglettCryHeader:     cry_header CRY_DIGLETT,     $0aa,  $081
-DugtrioCryHeader:     cry_header CRY_DIGLETT,     $02a,  $090
-MeowthCryHeader:      cry_header CRY_CLEFAIRY,    $077,  $090
-PersianCryHeader:     cry_header CRY_CLEFAIRY,    $099,  $17f
-PsyduckCryHeader:     cry_header CRY_PSYDUCK,     $020,  $0e0
-GolduckCryHeader:     cry_header CRY_PSYDUCK,     $0ff,  $0c0
-MankeyCryHeader:      cry_header CRY_NIDOQUEEN,   $0dd,  $0e0
-PrimeapeCryHeader:    cry_header CRY_NIDOQUEEN,   $0af,  $0c0
-GrowlitheCryHeader:   cry_header CRY_GROWLITHE,   $020,  $0c0
-ArcanineCryHeader:    cry_header CRY_WEEDLE,      $000,  $100
-PoliwagCryHeader:     cry_header CRY_PIDGEY,      $0ff,  $17f
-PoliwhirlCryHeader:   cry_header CRY_PIDGEY,      $077,  $0e0
-PoliwrathCryHeader:   cry_header CRY_PIDGEY,      $000,  $17f
-AbraCryHeader:        cry_header CRY_METAPOD,     $0c0,  $081
-KadabraCryHeader:     cry_header CRY_METAPOD,     $0a8,  $140
-AlakazamCryHeader:    cry_header CRY_METAPOD,     $098,  $17f
-MachopCryHeader:      cry_header CRY_GROWLITHE,   $0ee,  $081
-MachokeCryHeader:     cry_header CRY_GROWLITHE,   $048,  $0e0
-MachampCryHeader:     cry_header CRY_GROWLITHE,   $008,  $140
-BellsproutCryHeader:  cry_header CRY_PSYDUCK,     $055,  $081
-WeepinbellCryHeader:  cry_header CRY_WEEPINBELL,  $044,  $0a0
-VictreebelCryHeader:  cry_header CRY_WEEPINBELL,  $066,  $14c
-TentacoolCryHeader:   cry_header CRY_VENONAT,     $000,  $100
-TentacruelCryHeader:  cry_header CRY_VENONAT,     $0ee,  $17f
-GeodudeCryHeader:     cry_header CRY_VULPIX,      $0f0,  $090
-GravelerCryHeader:    cry_header CRY_VULPIX,      $000,  $100
-GolemCryHeader:       cry_header CRY_GOLEM,       $0e0,  $0c0
-PonytaCryHeader:      cry_header CRY_WEEPINBELL,  $000,  $100
-RapidashCryHeader:    cry_header CRY_WEEPINBELL,  $020,  $140
-SlowpokeCryHeader:    cry_header CRY_SLOWPOKE,    $000,  $100
-SlowbroCryHeader:     cry_header CRY_GROWLITHE,   $000,  $100
-MagnemiteCryHeader:   cry_header CRY_METAPOD,     $080,  $0e0
-MagnetonCryHeader:    cry_header CRY_METAPOD,     $020,  $140
-FarfetchDCryHeader:   cry_header CRY_SPEAROW,     $0dd,  $081
-DoduoCryHeader:       cry_header CRY_DIGLETT,     $0bb,  $081
-DodrioCryHeader:      cry_header CRY_DIGLETT,     $099,  $0a0
-SeelCryHeader:        cry_header CRY_SEEL,        $088,  $140
-DewgongCryHeader:     cry_header CRY_SEEL,        $023,  $17f
-GrimerCryHeader:      cry_header CRY_GRIMER,      $000,  $100
-MukCryHeader:         cry_header CRY_MUK,         $0ef,  $17f
-ShellderCryHeader:    cry_header CRY_FEAROW,      $000,  $100
-CloysterCryHeader:    cry_header CRY_FEAROW,      $06f,  $160
-GastlyCryHeader:      cry_header CRY_METAPOD,     $000,  $100
-HaunterCryHeader:     cry_header CRY_METAPOD,     $030,  $0c0
-GengarCryHeader:      cry_header CRY_MUK,         $000,  $17f
-OnixCryHeader:        cry_header CRY_EKANS,       $0ff,  $140
-DrowzeeCryHeader:     cry_header CRY_DROWZEE,     $088,  $0a0
-HypnoCryHeader:       cry_header CRY_DROWZEE,     $0ee,  $0c0
-KrabbyCryHeader:      cry_header CRY_KRABBY,      $020,  $160
-KinglerCryHeader:     cry_header CRY_KRABBY,      $0ee,  $160
-VoltorbCryHeader:     cry_header CRY_VOLTORB,     $0ed,  $100
-ElectrodeCryHeader:   cry_header CRY_VOLTORB,     $0a8,  $110
-ExeggcuteCryHeader:   cry_header CRY_DIGLETT,     $000,  $100
-ExeggutorCryHeader:   cry_header CRY_DROWZEE,     $000,  $100
-CuboneCryHeader:      cry_header CRY_CLEFAIRY,    $000,  $100
-MarowakCryHeader:     cry_header CRY_ODDISH,      $04f,  $0e0
-HitmonleeCryHeader:   cry_header CRY_GOLEM,       $080,  $140
-HitmonchanCryHeader:  cry_header CRY_SEEL,        $0ee,  $140
-LickitungCryHeader:   cry_header CRY_SEEL,        $000,  $100
-KoffingCryHeader:     cry_header CRY_GOLEM,       $0e6,  $15d
-WeezingCryHeader:     cry_header CRY_GOLEM,       $0ff,  $17f
-RhyhornCryHeader:     cry_header CRY_CHARMANDER,  $000,  $100
-RhydonCryHeader:      cry_header CRY_RHYDON,      $000,  $100
-ChanseyCryHeader:     cry_header CRY_PIDGEOTTO,   $00a,  $140
-TangelaCryHeader:     cry_header CRY_GOLEM,       $000,  $100
-KangaskhanCryHeader:  cry_header CRY_KANGASKHAN,  $000,  $100
-HorseaCryHeader:      cry_header CRY_CLEFAIRY,    $099,  $090
-SeadraCryHeader:      cry_header CRY_CLEFAIRY,    $03c,  $081
-GoldeenCryHeader:     cry_header CRY_CATERPIE,    $080,  $0c0
-SeakingCryHeader:     cry_header CRY_CATERPIE,    $010,  $17f
-StaryuCryHeader:      cry_header CRY_PARAS,       $002,  $0a0
-StarmieCryHeader:     cry_header CRY_PARAS,       $000,  $100
-MrMimeCryHeader:      cry_header CRY_KRABBY,      $008,  $0c0
-ScytherCryHeader:     cry_header CRY_CATERPIE,    $000,  $100
-JynxCryHeader:        cry_header CRY_DROWZEE,     $0ff,  $17f
-ElectabuzzCryHeader:  cry_header CRY_VOLTORB,     $08f,  $17f
-MagmarCryHeader:      cry_header CRY_CHARMANDER,  $0ff,  $0b0
-PinsirCryHeader:      cry_header CRY_PIDGEOTTO,   $000,  $100
-TaurosCryHeader:      cry_header CRY_SQUIRTLE,    $011,  $0c0
-MagikarpCryHeader:    cry_header CRY_EKANS,       $080,  $080
-GyaradosCryHeader:    cry_header CRY_EKANS,       $000,  $100
-LaprasCryHeader:      cry_header CRY_LAPRAS,      $000,  $100
-DittoCryHeader:       cry_header CRY_PIDGEY,      $0ff,  $17f
-EeveeCryHeader:       cry_header CRY_VENONAT,     $088,  $0e0
-VaporeonCryHeader:    cry_header CRY_VENONAT,     $0aa,  $17f
-JolteonCryHeader:     cry_header CRY_VENONAT,     $03d,  $100
-FlareonCryHeader:     cry_header CRY_VENONAT,     $010,  $0a0
-PorygonCryHeader:     cry_header CRY_WEEPINBELL,  $0aa,  $17f
-OmanyteCryHeader:     cry_header CRY_GROWLITHE,   $0f0,  $081
-OmastarCryHeader:     cry_header CRY_GROWLITHE,   $0ff,  $0c0
-KabutoCryHeader:      cry_header CRY_CATERPIE,    $0bb,  $0c0
-KabutopsCryHeader:    cry_header CRY_FEAROW,      $0ee,  $081
-AerodactylCryHeader:  cry_header CRY_VILEPLUME,   $020,  $170
-SnorlaxCryHeader:     cry_header CRY_GRIMER,      $055,  $081
-ArticunoCryHeader:    cry_header CRY_RAICHU,      $080,  $0c0
-ZapdosCryHeader:      cry_header CRY_FEAROW,      $0ff,  $100
-MoltresCryHeader:     cry_header CRY_RAICHU,      $0f8,  $0c0
-DratiniCryHeader:     cry_header CRY_BULBASAUR,   $060,  $0c0
-DragonairCryHeader:   cry_header CRY_BULBASAUR,   $040,  $100
-DragoniteCryHeader:   cry_header CRY_BULBASAUR,   $03c,  $140
-MewtwoCryHeader:      cry_header CRY_PARAS,       $099,  $17f
-MewCryHeader:         cry_header CRY_PARAS,       $0ee,  $17f
-ChikoritaCryHeader:   cry_header CRY_CHIKORITA,  -$010,  $0b0
-BayleefCryHeader:     cry_header CRY_CHIKORITA,  -$022,  $120
-MeganiumCryHeader:    cry_header CRY_CHIKORITA,  -$0b7,  $200
-CyndaquilCryHeader:   cry_header CRY_CYNDAQUIL,   $347,  $080
-QuilavaCryHeader:     cry_header CRY_CYNDAQUIL,   $321,  $120
-TyphlosionCryHeader:  cry_header CRY_TYPHLOSION,  $f00,  $0d4
-TotodileCryHeader:    cry_header CRY_TOTODILE,    $46c,  $0e8
-CroconawCryHeader:    cry_header CRY_TOTODILE,    $440,  $110
-FeraligatrCryHeader:  cry_header CRY_TOTODILE,    $3fc,  $180
-SentretCryHeader:     cry_header CRY_SENTRET,     $08a,  $0b8
-FurretCryHeader:      cry_header CRY_SENTRET,     $06b,  $102
-HoothootCryHeader:    cry_header CRY_HOOTHOOT,    $091,  $0d8
-NoctowlCryHeader:     cry_header CRY_HOOTHOOT,    $000,  $1a0
-LedybaCryHeader:      cry_header CRY_LEDYBA,      $000,  $0de
-LedianCryHeader:      cry_header CRY_LEDYBA,     -$096,  $138
-SpinarakCryHeader:    cry_header CRY_SPINARAK,    $011,  $200
-AriadosCryHeader:     cry_header CRY_SPINARAK,   -$0ae,  $1e2
-CrobatCryHeader:      cry_header CRY_SQUIRTLE,   -$010,  $140
-ChinchouCryHeader:    cry_header CRY_CYNDAQUIL,   $3c9,  $140
-LanturnCryHeader:     cry_header CRY_CYNDAQUIL,   $2d0,  $110
-PichuCryHeader:       cry_header CRY_PICHU,       $000,  $140
-CleffaCryHeader:      cry_header CRY_CLEFFA,      $061,  $091
-IgglybuffCryHeader:   cry_header CRY_CHIKORITA,   $0e8,  $0e8
-TogepiCryHeader:      cry_header CRY_TOGEPI,      $010,  $100
-TogeticCryHeader:     cry_header CRY_TOGETIC,     $03b,  $038
-NatuCryHeader:        cry_header CRY_NATU,       -$067,  $100
-XatuCryHeader:        cry_header CRY_NATU,       -$0a7,  $168
-MareepCryHeader:      cry_header CRY_MAREEP,      $022,  $0d8
-FlaaffyCryHeader:     cry_header CRY_MAREEP,     -$007,  $180
-AmpharosCryHeader:    cry_header CRY_AMPHAROS,   -$07c,  $0e8
-BellossomCryHeader:   cry_header CRY_CLEFFA,      $084,  $150
-MarillCryHeader:      cry_header CRY_MARILL,      $11b,  $120
-AzumarillCryHeader:   cry_header CRY_MARILL,      $0b6,  $180
-SudowoodoCryHeader:   cry_header CRY_CLEFFA,      $f40,  $180
-PolitoedCryHeader:    cry_header CRY_CLEFFA,     -$2a3,  $1c8
-HoppipCryHeader:      cry_header CRY_CLEFFA,      $03b,  $0c8
-SkiploomCryHeader:    cry_header CRY_CLEFFA,      $027,  $138
-JumpluffCryHeader:    cry_header CRY_CLEFFA,      $000,  $180
-AipomCryHeader:       cry_header CRY_AIPOM,      -$051,  $0e8
-SunkernCryHeader:     cry_header CRY_MARILL,      $12b,  $0b8
-SunfloraCryHeader:    cry_header CRY_SUNFLORA,   -$020,  $180
-YanmaCryHeader:       cry_header CRY_TOTODILE,    $031,  $0c8
-WooperCryHeader:      cry_header CRY_WOOPER,      $093,  $0af
-QuagsireCryHeader:    cry_header CRY_WOOPER,     -$0c6,  $140
-EspeonCryHeader:      cry_header CRY_AIPOM,       $0a2,  $140
-UmbreonCryHeader:     cry_header CRY_VENONAT,    -$0e9,  $0f0
-MurkrowCryHeader:     cry_header CRY_MARILL,     -$01f,  $180
-SlowkingCryHeader:    cry_header CRY_SLOWKING,    $104,  $200
-MisdreavusCryHeader:  cry_header CRY_HOOTHOOT,    $130,  $0e8
-UnownCryHeader:       cry_header CRY_HOOTHOOT,    $162,  $100
-WobbuffetCryHeader:   cry_header CRY_AMPHAROS,    $27b,  $144
-GirafarigCryHeader:   cry_header CRY_GIRAFARIG,   $041,  $200
-PinecoCryHeader:      cry_header CRY_SLOWKING,    $080,  $100
-ForretressCryHeader:  cry_header CRY_SLOWKING,    $000,  $180
-DunsparceCryHeader:   cry_header CRY_DUNSPARCE,   $1c4,  $100
-GligarCryHeader:      cry_header CRY_GLIGAR,     -$102,  $100
-SteelixCryHeader:     cry_header CRY_TYPHLOSION,  $0ef,  $0f7
-SnubbullCryHeader:    cry_header CRY_DUNSPARCE,   $112,  $0e8
-GranbullCryHeader:    cry_header CRY_DUNSPARCE,   $000,  $180
-QwilfishCryHeader:    cry_header CRY_SLOWKING,    $160,  $0e0
-ScizorCryHeader:      cry_header CRY_AMPHAROS,    $000,  $160
-ShuckleCryHeader:     cry_header CRY_DUNSPARCE,   $290,  $0a8
-HeracrossCryHeader:   cry_header CRY_AMPHAROS,    $035,  $0e0
-SneaselCryHeader:     cry_header CRY_WOOPER,      $053,  $0af
-TeddiursaCryHeader:   cry_header CRY_TEDDIURSA,   $7a2,  $06e
-UrsaringCryHeader:    cry_header CRY_TEDDIURSA,   $640,  $0d8
-SlugmaCryHeader:      cry_header CRY_SLUGMA,     -$1d8,  $140
-MagcargoCryHeader:    cry_header CRY_MAGCARGO,   -$20d,  $1c0
-SwinubCryHeader:      cry_header CRY_CYNDAQUIL,   $1fe,  $140
-PiloswineCryHeader:   cry_header CRY_MAGCARGO,   -$109,  $100
-CorsolaCryHeader:     cry_header CRY_MAGCARGO,    $0a1,  $0e8
-RemoraidCryHeader:    cry_header CRY_SUNFLORA,    $00d,  $100
-OctilleryCryHeader:   cry_header CRY_TOTODILE,    $000,  $180
-DelibirdCryHeader:    cry_header CRY_TEDDIURSA,   $002,  $06a
-MantineCryHeader:     cry_header CRY_MANTINE,    -$0be,  $0f0
-SkarmoryCryHeader:    cry_header CRY_AMPHAROS,    $8a9,  $180
-HoundourCryHeader:    cry_header CRY_CYNDAQUIL,   $039,  $140
-HoundoomCryHeader:    cry_header CRY_TOTODILE,   -$10a,  $100
-KingdraCryHeader:     cry_header CRY_SLUGMA,      $2fb,  $100
-PhanpyCryHeader:      cry_header CRY_SENTRET,     $048,  $230
-DonphanCryHeader:     cry_header CRY_DONPHAN,     $000,  $1a0
-Porygon2CryHeader:    cry_header CRY_GIRAFARIG,   $073,  $240
-StantlerCryHeader:    cry_header CRY_AIPOM,      -$160,  $180
-SmeargleCryHeader:    cry_header CRY_PICHU,      -$21a,  $1f0
-TyrogueCryHeader:     cry_header CRY_AIPOM,       $02c,  $108
-HitmontopCryHeader:   cry_header CRY_SLUGMA,      $000,  $100
-SmoochumCryHeader:    cry_header CRY_MARILL,      $068,  $100
-ElekidCryHeader:      cry_header CRY_SUNFLORA,   -$2d8,  $0b4
-MagbyCryHeader:       cry_header CRY_TEDDIURSA,   $176,  $03a
-MiltankCryHeader:     cry_header CRY_GLIGAR,     -$1cd,  $1a0
-BlisseyCryHeader:     cry_header CRY_SLOWKING,    $293,  $140
-RaikouCryHeader:      cry_header CRY_RAIKOU,      $22e,  $120
-EnteiCryHeader:       cry_header CRY_ENTEI,       $000,  $1a0
-SuicuneCryHeader:     cry_header CRY_MAGCARGO,    $000,  $180
-LarvitarCryHeader:    cry_header CRY_RAIKOU,      $05f,  $0d0
-PupitarCryHeader:     cry_header CRY_SPINARAK,   -$1db,  $150
-TyranitarCryHeader:   cry_header CRY_RAIKOU,     -$100,  $180
-LugiaCryHeader:       cry_header CRY_TYPHLOSION,  $000,  $100
-HoOhCryHeader:        cry_header CRY_AIPOM,       $000,  $180
-CelebiCryHeader:      cry_header CRY_ENTEI,       $14a,  $111
-CryHeader252:         cry_header CRY_NIDORAN_M,      0,     0
-CryHeader253:         cry_header CRY_NIDORAN_M,      0,     0
-CryHeader254:         cry_header CRY_NIDORAN_M,      0,     0
-CryHeader255:         cry_header CRY_NIDORAN_M,      0,     0
-; f2d81
diff --git a/data/pokemon/pokemon_names.asm b/data/pokemon/names.asm
index 266b0c020..266b0c020 100644
--- a/data/pokemon/pokemon_names.asm
+++ b/data/pokemon/names.asm
diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm
new file mode 100644
index 000000000..2e47bbdaf
--- /dev/null
+++ b/data/pokemon/palettes.asm
@@ -0,0 +1,542 @@
+PokemonPalettes: ; a8ce
+; entries correspond to Pokémon species, two apiece
+
+; 000
+	RGB 30, 22, 17
+	RGB 16, 14, 19
+; 000 shiny
+	RGB 30, 22, 17
+	RGB 16, 14, 19
+
+INCLUDE "gfx/pokemon/bulbasaur/normal.pal"
+INCLUDE "gfx/pokemon/bulbasaur/shiny.pal"
+INCLUDE "gfx/pokemon/ivysaur/normal.pal"
+INCLUDE "gfx/pokemon/ivysaur/shiny.pal"
+INCLUDE "gfx/pokemon/venusaur/normal.pal"
+INCLUDE "gfx/pokemon/venusaur/shiny.pal"
+INCLUDE "gfx/pokemon/charmander/normal.pal"
+INCLUDE "gfx/pokemon/charmander/shiny.pal"
+INCLUDE "gfx/pokemon/charmeleon/normal.pal"
+INCLUDE "gfx/pokemon/charmeleon/shiny.pal"
+INCLUDE "gfx/pokemon/charizard/normal.pal"
+INCLUDE "gfx/pokemon/charizard/shiny.pal"
+INCLUDE "gfx/pokemon/squirtle/normal.pal"
+INCLUDE "gfx/pokemon/squirtle/shiny.pal"
+INCLUDE "gfx/pokemon/wartortle/normal.pal"
+INCLUDE "gfx/pokemon/wartortle/shiny.pal"
+INCLUDE "gfx/pokemon/blastoise/normal.pal"
+INCLUDE "gfx/pokemon/blastoise/shiny.pal"
+INCLUDE "gfx/pokemon/caterpie/normal.pal"
+INCLUDE "gfx/pokemon/caterpie/shiny.pal"
+INCLUDE "gfx/pokemon/metapod/normal.pal"
+INCLUDE "gfx/pokemon/metapod/shiny.pal"
+INCLUDE "gfx/pokemon/butterfree/normal.pal"
+INCLUDE "gfx/pokemon/butterfree/shiny.pal"
+INCLUDE "gfx/pokemon/weedle/normal.pal"
+INCLUDE "gfx/pokemon/weedle/shiny.pal"
+INCLUDE "gfx/pokemon/kakuna/normal.pal"
+INCLUDE "gfx/pokemon/kakuna/shiny.pal"
+INCLUDE "gfx/pokemon/beedrill/normal.pal"
+INCLUDE "gfx/pokemon/beedrill/shiny.pal"
+INCLUDE "gfx/pokemon/pidgey/normal.pal"
+INCLUDE "gfx/pokemon/pidgey/shiny.pal"
+INCLUDE "gfx/pokemon/pidgeotto/normal.pal"
+INCLUDE "gfx/pokemon/pidgeotto/shiny.pal"
+INCLUDE "gfx/pokemon/pidgeot/normal.pal"
+INCLUDE "gfx/pokemon/pidgeot/shiny.pal"
+INCLUDE "gfx/pokemon/rattata/normal.pal"
+INCLUDE "gfx/pokemon/rattata/shiny.pal"
+INCLUDE "gfx/pokemon/raticate/normal.pal"
+INCLUDE "gfx/pokemon/raticate/shiny.pal"
+INCLUDE "gfx/pokemon/spearow/normal.pal"
+INCLUDE "gfx/pokemon/spearow/shiny.pal"
+INCLUDE "gfx/pokemon/fearow/normal.pal"
+INCLUDE "gfx/pokemon/fearow/shiny.pal"
+INCLUDE "gfx/pokemon/ekans/normal.pal"
+INCLUDE "gfx/pokemon/ekans/shiny.pal"
+INCLUDE "gfx/pokemon/arbok/normal.pal"
+INCLUDE "gfx/pokemon/arbok/shiny.pal"
+INCLUDE "gfx/pokemon/pikachu/normal.pal"
+INCLUDE "gfx/pokemon/pikachu/shiny.pal"
+INCLUDE "gfx/pokemon/raichu/normal.pal"
+INCLUDE "gfx/pokemon/raichu/shiny.pal"
+INCLUDE "gfx/pokemon/sandshrew/normal.pal"
+INCLUDE "gfx/pokemon/sandshrew/shiny.pal"
+INCLUDE "gfx/pokemon/sandslash/normal.pal"
+INCLUDE "gfx/pokemon/sandslash/shiny.pal"
+INCLUDE "gfx/pokemon/nidoran_f/normal.pal"
+INCLUDE "gfx/pokemon/nidoran_f/shiny.pal"
+INCLUDE "gfx/pokemon/nidorina/normal.pal"
+INCLUDE "gfx/pokemon/nidorina/shiny.pal"
+INCLUDE "gfx/pokemon/nidoqueen/normal.pal"
+INCLUDE "gfx/pokemon/nidoqueen/shiny.pal"
+INCLUDE "gfx/pokemon/nidoran_m/normal.pal"
+INCLUDE "gfx/pokemon/nidoran_m/shiny.pal"
+INCLUDE "gfx/pokemon/nidorino/normal.pal"
+INCLUDE "gfx/pokemon/nidorino/shiny.pal"
+INCLUDE "gfx/pokemon/nidoking/normal.pal"
+INCLUDE "gfx/pokemon/nidoking/shiny.pal"
+INCLUDE "gfx/pokemon/clefairy/normal.pal"
+INCLUDE "gfx/pokemon/clefairy/shiny.pal"
+INCLUDE "gfx/pokemon/clefable/normal.pal"
+INCLUDE "gfx/pokemon/clefable/shiny.pal"
+INCLUDE "gfx/pokemon/vulpix/normal.pal"
+INCLUDE "gfx/pokemon/vulpix/shiny.pal"
+INCLUDE "gfx/pokemon/ninetales/normal.pal"
+INCLUDE "gfx/pokemon/ninetales/shiny.pal"
+INCLUDE "gfx/pokemon/jigglypuff/normal.pal"
+INCLUDE "gfx/pokemon/jigglypuff/shiny.pal"
+INCLUDE "gfx/pokemon/wigglytuff/normal.pal"
+INCLUDE "gfx/pokemon/wigglytuff/shiny.pal"
+INCLUDE "gfx/pokemon/zubat/normal.pal"
+INCLUDE "gfx/pokemon/zubat/shiny.pal"
+INCLUDE "gfx/pokemon/golbat/normal.pal"
+INCLUDE "gfx/pokemon/golbat/shiny.pal"
+INCLUDE "gfx/pokemon/oddish/normal.pal"
+INCLUDE "gfx/pokemon/oddish/shiny.pal"
+INCLUDE "gfx/pokemon/gloom/normal.pal"
+INCLUDE "gfx/pokemon/gloom/shiny.pal"
+INCLUDE "gfx/pokemon/vileplume/normal.pal"
+INCLUDE "gfx/pokemon/vileplume/shiny.pal"
+INCLUDE "gfx/pokemon/paras/normal.pal"
+INCLUDE "gfx/pokemon/paras/shiny.pal"
+INCLUDE "gfx/pokemon/parasect/normal.pal"
+INCLUDE "gfx/pokemon/parasect/shiny.pal"
+INCLUDE "gfx/pokemon/venonat/normal.pal"
+INCLUDE "gfx/pokemon/venonat/shiny.pal"
+INCLUDE "gfx/pokemon/venomoth/normal.pal"
+INCLUDE "gfx/pokemon/venomoth/shiny.pal"
+INCLUDE "gfx/pokemon/diglett/normal.pal"
+INCLUDE "gfx/pokemon/diglett/shiny.pal"
+INCLUDE "gfx/pokemon/dugtrio/normal.pal"
+INCLUDE "gfx/pokemon/dugtrio/shiny.pal"
+INCLUDE "gfx/pokemon/meowth/normal.pal"
+INCLUDE "gfx/pokemon/meowth/shiny.pal"
+INCLUDE "gfx/pokemon/persian/normal.pal"
+INCLUDE "gfx/pokemon/persian/shiny.pal"
+INCLUDE "gfx/pokemon/psyduck/normal.pal"
+INCLUDE "gfx/pokemon/psyduck/shiny.pal"
+INCLUDE "gfx/pokemon/golduck/normal.pal"
+INCLUDE "gfx/pokemon/golduck/shiny.pal"
+INCLUDE "gfx/pokemon/mankey/normal.pal"
+INCLUDE "gfx/pokemon/mankey/shiny.pal"
+INCLUDE "gfx/pokemon/primeape/normal.pal"
+INCLUDE "gfx/pokemon/primeape/shiny.pal"
+INCLUDE "gfx/pokemon/growlithe/normal.pal"
+INCLUDE "gfx/pokemon/growlithe/shiny.pal"
+INCLUDE "gfx/pokemon/arcanine/normal.pal"
+INCLUDE "gfx/pokemon/arcanine/shiny.pal"
+INCLUDE "gfx/pokemon/poliwag/normal.pal"
+INCLUDE "gfx/pokemon/poliwag/shiny.pal"
+INCLUDE "gfx/pokemon/poliwhirl/normal.pal"
+INCLUDE "gfx/pokemon/poliwhirl/shiny.pal"
+INCLUDE "gfx/pokemon/poliwrath/normal.pal"
+INCLUDE "gfx/pokemon/poliwrath/shiny.pal"
+INCLUDE "gfx/pokemon/abra/normal.pal"
+INCLUDE "gfx/pokemon/abra/shiny.pal"
+INCLUDE "gfx/pokemon/kadabra/normal.pal"
+INCLUDE "gfx/pokemon/kadabra/shiny.pal"
+INCLUDE "gfx/pokemon/alakazam/normal.pal"
+INCLUDE "gfx/pokemon/alakazam/shiny.pal"
+INCLUDE "gfx/pokemon/machop/normal.pal"
+INCLUDE "gfx/pokemon/machop/shiny.pal"
+INCLUDE "gfx/pokemon/machoke/normal.pal"
+INCLUDE "gfx/pokemon/machoke/shiny.pal"
+INCLUDE "gfx/pokemon/machamp/normal.pal"
+INCLUDE "gfx/pokemon/machamp/shiny.pal"
+INCLUDE "gfx/pokemon/bellsprout/normal.pal"
+INCLUDE "gfx/pokemon/bellsprout/shiny.pal"
+INCLUDE "gfx/pokemon/weepinbell/normal.pal"
+INCLUDE "gfx/pokemon/weepinbell/shiny.pal"
+INCLUDE "gfx/pokemon/victreebel/normal.pal"
+INCLUDE "gfx/pokemon/victreebel/shiny.pal"
+INCLUDE "gfx/pokemon/tentacool/normal.pal"
+INCLUDE "gfx/pokemon/tentacool/shiny.pal"
+INCLUDE "gfx/pokemon/tentacruel/normal.pal"
+INCLUDE "gfx/pokemon/tentacruel/shiny.pal"
+INCLUDE "gfx/pokemon/geodude/normal.pal"
+INCLUDE "gfx/pokemon/geodude/shiny.pal"
+INCLUDE "gfx/pokemon/graveler/normal.pal"
+INCLUDE "gfx/pokemon/graveler/shiny.pal"
+INCLUDE "gfx/pokemon/golem/normal.pal"
+INCLUDE "gfx/pokemon/golem/shiny.pal"
+INCLUDE "gfx/pokemon/ponyta/normal.pal"
+INCLUDE "gfx/pokemon/ponyta/shiny.pal"
+INCLUDE "gfx/pokemon/rapidash/normal.pal"
+INCLUDE "gfx/pokemon/rapidash/shiny.pal"
+INCLUDE "gfx/pokemon/slowpoke/normal.pal"
+INCLUDE "gfx/pokemon/slowpoke/shiny.pal"
+INCLUDE "gfx/pokemon/slowbro/normal.pal"
+INCLUDE "gfx/pokemon/slowbro/shiny.pal"
+INCLUDE "gfx/pokemon/magnemite/normal.pal"
+INCLUDE "gfx/pokemon/magnemite/shiny.pal"
+INCLUDE "gfx/pokemon/magneton/normal.pal"
+INCLUDE "gfx/pokemon/magneton/shiny.pal"
+INCLUDE "gfx/pokemon/farfetch_d/normal.pal"
+INCLUDE "gfx/pokemon/farfetch_d/shiny.pal"
+INCLUDE "gfx/pokemon/doduo/normal.pal"
+INCLUDE "gfx/pokemon/doduo/shiny.pal"
+INCLUDE "gfx/pokemon/dodrio/normal.pal"
+INCLUDE "gfx/pokemon/dodrio/shiny.pal"
+INCLUDE "gfx/pokemon/seel/normal.pal"
+INCLUDE "gfx/pokemon/seel/shiny.pal"
+INCLUDE "gfx/pokemon/dewgong/normal.pal"
+INCLUDE "gfx/pokemon/dewgong/shiny.pal"
+INCLUDE "gfx/pokemon/grimer/normal.pal"
+INCLUDE "gfx/pokemon/grimer/shiny.pal"
+INCLUDE "gfx/pokemon/muk/normal.pal"
+INCLUDE "gfx/pokemon/muk/shiny.pal"
+INCLUDE "gfx/pokemon/shellder/normal.pal"
+INCLUDE "gfx/pokemon/shellder/shiny.pal"
+INCLUDE "gfx/pokemon/cloyster/normal.pal"
+INCLUDE "gfx/pokemon/cloyster/shiny.pal"
+INCLUDE "gfx/pokemon/gastly/normal.pal"
+INCLUDE "gfx/pokemon/gastly/shiny.pal"
+INCLUDE "gfx/pokemon/haunter/normal.pal"
+INCLUDE "gfx/pokemon/haunter/shiny.pal"
+INCLUDE "gfx/pokemon/gengar/normal.pal"
+INCLUDE "gfx/pokemon/gengar/shiny.pal"
+INCLUDE "gfx/pokemon/onix/normal.pal"
+INCLUDE "gfx/pokemon/onix/shiny.pal"
+INCLUDE "gfx/pokemon/drowzee/normal.pal"
+INCLUDE "gfx/pokemon/drowzee/shiny.pal"
+INCLUDE "gfx/pokemon/hypno/normal.pal"
+INCLUDE "gfx/pokemon/hypno/shiny.pal"
+INCLUDE "gfx/pokemon/krabby/normal.pal"
+INCLUDE "gfx/pokemon/krabby/shiny.pal"
+INCLUDE "gfx/pokemon/kingler/normal.pal"
+INCLUDE "gfx/pokemon/kingler/shiny.pal"
+INCLUDE "gfx/pokemon/voltorb/normal.pal"
+INCLUDE "gfx/pokemon/voltorb/shiny.pal"
+INCLUDE "gfx/pokemon/electrode/normal.pal"
+INCLUDE "gfx/pokemon/electrode/shiny.pal"
+INCLUDE "gfx/pokemon/exeggcute/normal.pal"
+INCLUDE "gfx/pokemon/exeggcute/shiny.pal"
+INCLUDE "gfx/pokemon/exeggutor/normal.pal"
+INCLUDE "gfx/pokemon/exeggutor/shiny.pal"
+INCLUDE "gfx/pokemon/cubone/normal.pal"
+INCLUDE "gfx/pokemon/cubone/shiny.pal"
+INCLUDE "gfx/pokemon/marowak/normal.pal"
+INCLUDE "gfx/pokemon/marowak/shiny.pal"
+INCLUDE "gfx/pokemon/hitmonlee/normal.pal"
+INCLUDE "gfx/pokemon/hitmonlee/shiny.pal"
+INCLUDE "gfx/pokemon/hitmonchan/normal.pal"
+INCLUDE "gfx/pokemon/hitmonchan/shiny.pal"
+INCLUDE "gfx/pokemon/lickitung/normal.pal"
+INCLUDE "gfx/pokemon/lickitung/shiny.pal"
+INCLUDE "gfx/pokemon/koffing/normal.pal"
+INCLUDE "gfx/pokemon/koffing/shiny.pal"
+INCLUDE "gfx/pokemon/weezing/normal.pal"
+INCLUDE "gfx/pokemon/weezing/shiny.pal"
+INCLUDE "gfx/pokemon/rhyhorn/normal.pal"
+INCLUDE "gfx/pokemon/rhyhorn/shiny.pal"
+INCLUDE "gfx/pokemon/rhydon/normal.pal"
+INCLUDE "gfx/pokemon/rhydon/shiny.pal"
+INCLUDE "gfx/pokemon/chansey/normal.pal"
+INCLUDE "gfx/pokemon/chansey/shiny.pal"
+INCLUDE "gfx/pokemon/tangela/normal.pal"
+INCLUDE "gfx/pokemon/tangela/shiny.pal"
+INCLUDE "gfx/pokemon/kangaskhan/normal.pal"
+INCLUDE "gfx/pokemon/kangaskhan/shiny.pal"
+INCLUDE "gfx/pokemon/horsea/normal.pal"
+INCLUDE "gfx/pokemon/horsea/shiny.pal"
+INCLUDE "gfx/pokemon/seadra/normal.pal"
+INCLUDE "gfx/pokemon/seadra/shiny.pal"
+INCLUDE "gfx/pokemon/goldeen/normal.pal"
+INCLUDE "gfx/pokemon/goldeen/shiny.pal"
+INCLUDE "gfx/pokemon/seaking/normal.pal"
+INCLUDE "gfx/pokemon/seaking/shiny.pal"
+INCLUDE "gfx/pokemon/staryu/normal.pal"
+INCLUDE "gfx/pokemon/staryu/shiny.pal"
+INCLUDE "gfx/pokemon/starmie/normal.pal"
+INCLUDE "gfx/pokemon/starmie/shiny.pal"
+INCLUDE "gfx/pokemon/mr__mime/normal.pal"
+INCLUDE "gfx/pokemon/mr__mime/shiny.pal"
+INCLUDE "gfx/pokemon/scyther/normal.pal"
+INCLUDE "gfx/pokemon/scyther/shiny.pal"
+INCLUDE "gfx/pokemon/jynx/normal.pal"
+INCLUDE "gfx/pokemon/jynx/shiny.pal"
+INCLUDE "gfx/pokemon/electabuzz/normal.pal"
+INCLUDE "gfx/pokemon/electabuzz/shiny.pal"
+INCLUDE "gfx/pokemon/magmar/normal.pal"
+INCLUDE "gfx/pokemon/magmar/shiny.pal"
+INCLUDE "gfx/pokemon/pinsir/normal.pal"
+INCLUDE "gfx/pokemon/pinsir/shiny.pal"
+INCLUDE "gfx/pokemon/tauros/normal.pal"
+INCLUDE "gfx/pokemon/tauros/shiny.pal"
+INCLUDE "gfx/pokemon/magikarp/normal.pal"
+INCLUDE "gfx/pokemon/magikarp/shiny.pal"
+INCLUDE "gfx/pokemon/gyarados/normal.pal"
+INCLUDE "gfx/pokemon/gyarados/shiny.pal"
+INCLUDE "gfx/pokemon/lapras/normal.pal"
+INCLUDE "gfx/pokemon/lapras/shiny.pal"
+INCLUDE "gfx/pokemon/ditto/normal.pal"
+INCLUDE "gfx/pokemon/ditto/shiny.pal"
+INCLUDE "gfx/pokemon/eevee/normal.pal"
+INCLUDE "gfx/pokemon/eevee/shiny.pal"
+INCLUDE "gfx/pokemon/vaporeon/normal.pal"
+INCLUDE "gfx/pokemon/vaporeon/shiny.pal"
+INCLUDE "gfx/pokemon/jolteon/normal.pal"
+INCLUDE "gfx/pokemon/jolteon/shiny.pal"
+INCLUDE "gfx/pokemon/flareon/normal.pal"
+INCLUDE "gfx/pokemon/flareon/shiny.pal"
+INCLUDE "gfx/pokemon/porygon/normal.pal"
+INCLUDE "gfx/pokemon/porygon/shiny.pal"
+INCLUDE "gfx/pokemon/omanyte/normal.pal"
+INCLUDE "gfx/pokemon/omanyte/shiny.pal"
+INCLUDE "gfx/pokemon/omastar/normal.pal"
+INCLUDE "gfx/pokemon/omastar/shiny.pal"
+INCLUDE "gfx/pokemon/kabuto/normal.pal"
+INCLUDE "gfx/pokemon/kabuto/shiny.pal"
+INCLUDE "gfx/pokemon/kabutops/normal.pal"
+INCLUDE "gfx/pokemon/kabutops/shiny.pal"
+INCLUDE "gfx/pokemon/aerodactyl/normal.pal"
+INCLUDE "gfx/pokemon/aerodactyl/shiny.pal"
+INCLUDE "gfx/pokemon/snorlax/normal.pal"
+INCLUDE "gfx/pokemon/snorlax/shiny.pal"
+INCLUDE "gfx/pokemon/articuno/normal.pal"
+INCLUDE "gfx/pokemon/articuno/shiny.pal"
+INCLUDE "gfx/pokemon/zapdos/normal.pal"
+INCLUDE "gfx/pokemon/zapdos/shiny.pal"
+INCLUDE "gfx/pokemon/moltres/normal.pal"
+INCLUDE "gfx/pokemon/moltres/shiny.pal"
+INCLUDE "gfx/pokemon/dratini/normal.pal"
+INCLUDE "gfx/pokemon/dratini/shiny.pal"
+INCLUDE "gfx/pokemon/dragonair/normal.pal"
+INCLUDE "gfx/pokemon/dragonair/shiny.pal"
+INCLUDE "gfx/pokemon/dragonite/normal.pal"
+INCLUDE "gfx/pokemon/dragonite/shiny.pal"
+INCLUDE "gfx/pokemon/mewtwo/normal.pal"
+INCLUDE "gfx/pokemon/mewtwo/shiny.pal"
+INCLUDE "gfx/pokemon/mew/normal.pal"
+INCLUDE "gfx/pokemon/mew/shiny.pal"
+INCLUDE "gfx/pokemon/chikorita/normal.pal"
+INCLUDE "gfx/pokemon/chikorita/shiny.pal"
+INCLUDE "gfx/pokemon/bayleef/normal.pal"
+INCLUDE "gfx/pokemon/bayleef/shiny.pal"
+INCLUDE "gfx/pokemon/meganium/normal.pal"
+INCLUDE "gfx/pokemon/meganium/shiny.pal"
+INCLUDE "gfx/pokemon/cyndaquil/normal.pal"
+INCLUDE "gfx/pokemon/cyndaquil/shiny.pal"
+INCLUDE "gfx/pokemon/quilava/normal.pal"
+INCLUDE "gfx/pokemon/quilava/shiny.pal"
+INCLUDE "gfx/pokemon/typhlosion/normal.pal"
+INCLUDE "gfx/pokemon/typhlosion/shiny.pal"
+INCLUDE "gfx/pokemon/totodile/normal.pal"
+INCLUDE "gfx/pokemon/totodile/shiny.pal"
+INCLUDE "gfx/pokemon/croconaw/normal.pal"
+INCLUDE "gfx/pokemon/croconaw/shiny.pal"
+INCLUDE "gfx/pokemon/feraligatr/normal.pal"
+INCLUDE "gfx/pokemon/feraligatr/shiny.pal"
+INCLUDE "gfx/pokemon/sentret/normal.pal"
+INCLUDE "gfx/pokemon/sentret/shiny.pal"
+INCLUDE "gfx/pokemon/furret/normal.pal"
+INCLUDE "gfx/pokemon/furret/shiny.pal"
+INCLUDE "gfx/pokemon/hoothoot/normal.pal"
+INCLUDE "gfx/pokemon/hoothoot/shiny.pal"
+INCLUDE "gfx/pokemon/noctowl/normal.pal"
+INCLUDE "gfx/pokemon/noctowl/shiny.pal"
+INCLUDE "gfx/pokemon/ledyba/normal.pal"
+INCLUDE "gfx/pokemon/ledyba/shiny.pal"
+INCLUDE "gfx/pokemon/ledian/normal.pal"
+INCLUDE "gfx/pokemon/ledian/shiny.pal"
+INCLUDE "gfx/pokemon/spinarak/normal.pal"
+INCLUDE "gfx/pokemon/spinarak/shiny.pal"
+INCLUDE "gfx/pokemon/ariados/normal.pal"
+INCLUDE "gfx/pokemon/ariados/shiny.pal"
+INCLUDE "gfx/pokemon/crobat/normal.pal"
+INCLUDE "gfx/pokemon/crobat/shiny.pal"
+INCLUDE "gfx/pokemon/chinchou/normal.pal"
+INCLUDE "gfx/pokemon/chinchou/shiny.pal"
+INCLUDE "gfx/pokemon/lanturn/normal.pal"
+INCLUDE "gfx/pokemon/lanturn/shiny.pal"
+INCLUDE "gfx/pokemon/pichu/normal.pal"
+INCLUDE "gfx/pokemon/pichu/shiny.pal"
+INCLUDE "gfx/pokemon/cleffa/normal.pal"
+INCLUDE "gfx/pokemon/cleffa/shiny.pal"
+INCLUDE "gfx/pokemon/igglybuff/normal.pal"
+INCLUDE "gfx/pokemon/igglybuff/shiny.pal"
+INCLUDE "gfx/pokemon/togepi/normal.pal"
+INCLUDE "gfx/pokemon/togepi/shiny.pal"
+INCLUDE "gfx/pokemon/togetic/normal.pal"
+INCLUDE "gfx/pokemon/togetic/shiny.pal"
+INCLUDE "gfx/pokemon/natu/normal.pal"
+INCLUDE "gfx/pokemon/natu/shiny.pal"
+INCLUDE "gfx/pokemon/xatu/normal.pal"
+INCLUDE "gfx/pokemon/xatu/shiny.pal"
+INCLUDE "gfx/pokemon/mareep/normal.pal"
+INCLUDE "gfx/pokemon/mareep/shiny.pal"
+INCLUDE "gfx/pokemon/flaaffy/normal.pal"
+INCLUDE "gfx/pokemon/flaaffy/shiny.pal"
+INCLUDE "gfx/pokemon/ampharos/normal.pal"
+INCLUDE "gfx/pokemon/ampharos/shiny.pal"
+INCLUDE "gfx/pokemon/bellossom/normal.pal"
+INCLUDE "gfx/pokemon/bellossom/shiny.pal"
+INCLUDE "gfx/pokemon/marill/normal.pal"
+INCLUDE "gfx/pokemon/marill/shiny.pal"
+INCLUDE "gfx/pokemon/azumarill/normal.pal"
+INCLUDE "gfx/pokemon/azumarill/shiny.pal"
+INCLUDE "gfx/pokemon/sudowoodo/normal.pal"
+INCLUDE "gfx/pokemon/sudowoodo/shiny.pal"
+INCLUDE "gfx/pokemon/politoed/normal.pal"
+INCLUDE "gfx/pokemon/politoed/shiny.pal"
+INCLUDE "gfx/pokemon/hoppip/normal.pal"
+INCLUDE "gfx/pokemon/hoppip/shiny.pal"
+INCLUDE "gfx/pokemon/skiploom/normal.pal"
+INCLUDE "gfx/pokemon/skiploom/shiny.pal"
+INCLUDE "gfx/pokemon/jumpluff/normal.pal"
+INCLUDE "gfx/pokemon/jumpluff/shiny.pal"
+INCLUDE "gfx/pokemon/aipom/normal.pal"
+INCLUDE "gfx/pokemon/aipom/shiny.pal"
+INCLUDE "gfx/pokemon/sunkern/normal.pal"
+INCLUDE "gfx/pokemon/sunkern/shiny.pal"
+INCLUDE "gfx/pokemon/sunflora/normal.pal"
+INCLUDE "gfx/pokemon/sunflora/shiny.pal"
+INCLUDE "gfx/pokemon/yanma/normal.pal"
+INCLUDE "gfx/pokemon/yanma/shiny.pal"
+INCLUDE "gfx/pokemon/wooper/normal.pal"
+INCLUDE "gfx/pokemon/wooper/shiny.pal"
+INCLUDE "gfx/pokemon/quagsire/normal.pal"
+INCLUDE "gfx/pokemon/quagsire/shiny.pal"
+INCLUDE "gfx/pokemon/espeon/normal.pal"
+INCLUDE "gfx/pokemon/espeon/shiny.pal"
+INCLUDE "gfx/pokemon/umbreon/normal.pal"
+INCLUDE "gfx/pokemon/umbreon/shiny.pal"
+INCLUDE "gfx/pokemon/murkrow/normal.pal"
+INCLUDE "gfx/pokemon/murkrow/shiny.pal"
+INCLUDE "gfx/pokemon/slowking/normal.pal"
+INCLUDE "gfx/pokemon/slowking/shiny.pal"
+INCLUDE "gfx/pokemon/misdreavus/normal.pal"
+INCLUDE "gfx/pokemon/misdreavus/shiny.pal"
+INCLUDE "gfx/pokemon/unown/normal.pal"
+INCLUDE "gfx/pokemon/unown/shiny.pal"
+INCLUDE "gfx/pokemon/wobbuffet/normal.pal"
+INCLUDE "gfx/pokemon/wobbuffet/shiny.pal"
+INCLUDE "gfx/pokemon/girafarig/normal.pal"
+INCLUDE "gfx/pokemon/girafarig/shiny.pal"
+INCLUDE "gfx/pokemon/pineco/normal.pal"
+INCLUDE "gfx/pokemon/pineco/shiny.pal"
+INCLUDE "gfx/pokemon/forretress/normal.pal"
+INCLUDE "gfx/pokemon/forretress/shiny.pal"
+INCLUDE "gfx/pokemon/dunsparce/normal.pal"
+INCLUDE "gfx/pokemon/dunsparce/shiny.pal"
+INCLUDE "gfx/pokemon/gligar/normal.pal"
+INCLUDE "gfx/pokemon/gligar/shiny.pal"
+INCLUDE "gfx/pokemon/steelix/normal.pal"
+INCLUDE "gfx/pokemon/steelix/shiny.pal"
+INCLUDE "gfx/pokemon/snubbull/normal.pal"
+INCLUDE "gfx/pokemon/snubbull/shiny.pal"
+INCLUDE "gfx/pokemon/granbull/normal.pal"
+INCLUDE "gfx/pokemon/granbull/shiny.pal"
+INCLUDE "gfx/pokemon/qwilfish/normal.pal"
+INCLUDE "gfx/pokemon/qwilfish/shiny.pal"
+INCLUDE "gfx/pokemon/scizor/normal.pal"
+INCLUDE "gfx/pokemon/scizor/shiny.pal"
+INCLUDE "gfx/pokemon/shuckle/normal.pal"
+INCLUDE "gfx/pokemon/shuckle/shiny.pal"
+INCLUDE "gfx/pokemon/heracross/normal.pal"
+INCLUDE "gfx/pokemon/heracross/shiny.pal"
+INCLUDE "gfx/pokemon/sneasel/normal.pal"
+INCLUDE "gfx/pokemon/sneasel/shiny.pal"
+INCLUDE "gfx/pokemon/teddiursa/normal.pal"
+INCLUDE "gfx/pokemon/teddiursa/shiny.pal"
+INCLUDE "gfx/pokemon/ursaring/normal.pal"
+INCLUDE "gfx/pokemon/ursaring/shiny.pal"
+INCLUDE "gfx/pokemon/slugma/normal.pal"
+INCLUDE "gfx/pokemon/slugma/shiny.pal"
+INCLUDE "gfx/pokemon/magcargo/normal.pal"
+INCLUDE "gfx/pokemon/magcargo/shiny.pal"
+INCLUDE "gfx/pokemon/swinub/normal.pal"
+INCLUDE "gfx/pokemon/swinub/shiny.pal"
+INCLUDE "gfx/pokemon/piloswine/normal.pal"
+INCLUDE "gfx/pokemon/piloswine/shiny.pal"
+INCLUDE "gfx/pokemon/corsola/normal.pal"
+INCLUDE "gfx/pokemon/corsola/shiny.pal"
+INCLUDE "gfx/pokemon/remoraid/normal.pal"
+INCLUDE "gfx/pokemon/remoraid/shiny.pal"
+INCLUDE "gfx/pokemon/octillery/normal.pal"
+INCLUDE "gfx/pokemon/octillery/shiny.pal"
+INCLUDE "gfx/pokemon/delibird/normal.pal"
+INCLUDE "gfx/pokemon/delibird/shiny.pal"
+INCLUDE "gfx/pokemon/mantine/normal.pal"
+INCLUDE "gfx/pokemon/mantine/shiny.pal"
+INCLUDE "gfx/pokemon/skarmory/normal.pal"
+INCLUDE "gfx/pokemon/skarmory/shiny.pal"
+INCLUDE "gfx/pokemon/houndour/normal.pal"
+INCLUDE "gfx/pokemon/houndour/shiny.pal"
+INCLUDE "gfx/pokemon/houndoom/normal.pal"
+INCLUDE "gfx/pokemon/houndoom/shiny.pal"
+INCLUDE "gfx/pokemon/kingdra/normal.pal"
+INCLUDE "gfx/pokemon/kingdra/shiny.pal"
+INCLUDE "gfx/pokemon/phanpy/normal.pal"
+INCLUDE "gfx/pokemon/phanpy/shiny.pal"
+INCLUDE "gfx/pokemon/donphan/normal.pal"
+INCLUDE "gfx/pokemon/donphan/shiny.pal"
+INCLUDE "gfx/pokemon/porygon2/normal.pal"
+INCLUDE "gfx/pokemon/porygon2/shiny.pal"
+INCLUDE "gfx/pokemon/stantler/normal.pal"
+INCLUDE "gfx/pokemon/stantler/shiny.pal"
+INCLUDE "gfx/pokemon/smeargle/normal.pal"
+INCLUDE "gfx/pokemon/smeargle/shiny.pal"
+INCLUDE "gfx/pokemon/tyrogue/normal.pal"
+INCLUDE "gfx/pokemon/tyrogue/shiny.pal"
+INCLUDE "gfx/pokemon/hitmontop/normal.pal"
+INCLUDE "gfx/pokemon/hitmontop/shiny.pal"
+INCLUDE "gfx/pokemon/smoochum/normal.pal"
+INCLUDE "gfx/pokemon/smoochum/shiny.pal"
+INCLUDE "gfx/pokemon/elekid/normal.pal"
+INCLUDE "gfx/pokemon/elekid/shiny.pal"
+INCLUDE "gfx/pokemon/magby/normal.pal"
+INCLUDE "gfx/pokemon/magby/shiny.pal"
+INCLUDE "gfx/pokemon/miltank/normal.pal"
+INCLUDE "gfx/pokemon/miltank/shiny.pal"
+INCLUDE "gfx/pokemon/blissey/normal.pal"
+INCLUDE "gfx/pokemon/blissey/shiny.pal"
+INCLUDE "gfx/pokemon/raikou/normal.pal"
+INCLUDE "gfx/pokemon/raikou/shiny.pal"
+INCLUDE "gfx/pokemon/entei/normal.pal"
+INCLUDE "gfx/pokemon/entei/shiny.pal"
+INCLUDE "gfx/pokemon/suicune/normal.pal"
+INCLUDE "gfx/pokemon/suicune/shiny.pal"
+INCLUDE "gfx/pokemon/larvitar/normal.pal"
+INCLUDE "gfx/pokemon/larvitar/shiny.pal"
+INCLUDE "gfx/pokemon/pupitar/normal.pal"
+INCLUDE "gfx/pokemon/pupitar/shiny.pal"
+INCLUDE "gfx/pokemon/tyranitar/normal.pal"
+INCLUDE "gfx/pokemon/tyranitar/shiny.pal"
+INCLUDE "gfx/pokemon/lugia/normal.pal"
+INCLUDE "gfx/pokemon/lugia/shiny.pal"
+INCLUDE "gfx/pokemon/ho_oh/normal.pal"
+INCLUDE "gfx/pokemon/ho_oh/shiny.pal"
+INCLUDE "gfx/pokemon/celebi/normal.pal"
+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/pics/pic_pointers.asm b/data/pokemon/pic_pointers.asm
index 58631e09a..cca5c3b9c 100644
--- a/gfx/pics/pic_pointers.asm
+++ b/data/pokemon/pic_pointers.asm
@@ -1,5 +1,5 @@
-PicPointers::
-; entries correspond to constants/pokemon_constants.asm, two apiece
+PokemonPicPointers::
+; entries correspond to Pokémon species, two apiece
 	dba_pic BulbasaurFrontpic
 	dba_pic BulbasaurBackpic
 	dba_pic IvysaurFrontpic
diff --git a/gfx/pics/unown_pic_pointers.asm b/data/pokemon/unown_pic_pointers.asm
index 1ae0da6b6..1ae0da6b6 100644
--- a/gfx/pics/unown_pic_pointers.asm
+++ b/data/pokemon/unown_pic_pointers.asm
diff --git a/data/sprite_anim_frames.asm b/data/sprite_anim_frames.asm
deleted file mode 100755
index e69792ec1..000000000
--- a/data/sprite_anim_frames.asm
+++ /dev/null
@@ -1,499 +0,0 @@
-SpriteAnimFrameData: ; 8d6e6
-; entries correspond to SPRITE_ANIM_FRAMESET_* constants
-	dw .Frameset_00
-	dw .Frameset_PartyMon
-	dw .Frameset_PartyMonWithMail
-	dw .Frameset_PartyMonWithItem
-	dw .Frameset_PartyMonFast
-	dw .Frameset_PartyMonWithMailFast
-	dw .Frameset_PartyMonWithItemFast
-	dw .Frameset_GSTitleTrail
-	dw .Frameset_TextEntryCursor
-	dw .Frameset_09
-	dw .Frameset_GameFreakLogo
-	dw .Frameset_GSIntroStar
-	dw .Frameset_GSIntroSparkle
-	dw .Frameset_SlotsGolem
-	dw .Frameset_SlotsChansey
-	dw .Frameset_SlotsChansey2
-	dw .Frameset_SlotsEgg
-	dw .Frameset_RedWalk
-	dw .Frameset_StillCursor
-	dw .Frameset_TradePokeBall
-	dw .Frameset_TradePokeBall0
-	dw .Frameset_TradePoof
-	dw .Frameset_TradeTubeBulge
-	dw .Frameset_TrademonIcon
-	dw .Frameset_TrademonBubble
-	dw .Frameset_EvolutionBallOfLight
-	dw .Frameset_RadioTuningKnob
-	dw .Frameset_MagnetTrainRed
-	dw .Frameset_1c
-	dw .Frameset_Leaf
-	dw .Frameset_CutTree
-	dw .Frameset_EggCrack
-	dw .Frameset_EggHatch
-	dw .Frameset_21
-	dw .Frameset_22
-	dw .Frameset_23
-	dw .Frameset_24
-	dw .Frameset_HeadbuttTree
-	dw .Frameset_26
-	dw .Frameset_27
-	dw .Frameset_28
-	dw .Frameset_29
-	dw .Frameset_2a
-	dw .Frameset_2b
-	dw .Frameset_2c
-	dw .Frameset_BlueWalk
-	dw .Frameset_MagnetTrainBlue
-	dw .Frameset_MobileTradeSentBall
-	dw .Frameset_MobileTradeOTBall
-	dw .Frameset_ForMobile22
-	dw .Frameset_ForMobile23
-	dw .Frameset_ForMobile24
-	dw .Frameset_ForMobile25
-	dw .Frameset_IntroSuicune
-	dw .Frameset_IntroSuicune2
-	dw .Frameset_IntroPichu
-	dw .Frameset_IntroWooper
-	dw .Frameset_IntroUnown1
-	dw .Frameset_IntroUnown2
-	dw .Frameset_IntroUnown3
-	dw .Frameset_IntroUnown4
-	dw .Frameset_IntroUnownF2
-	dw .Frameset_IntroSuicuneAway
-	dw .Frameset_IntroUnownF
-	dw .Frameset_CelebiLeft
-	dw .Frameset_CelebiRight
-; 8d76a
-
-.Frameset_00:
-	frame SPRITE_ANIM_FRAME_IDX_RED_WALK_1, 32
-	endanim
-
-.Frameset_PartyMon:
-	frame SPRITE_ANIM_FRAME_IDX_RED_WALK_1,  8
-	frame SPRITE_ANIM_FRAME_IDX_RED_WALK_2,  8
-	dorestart
-
-.Frameset_PartyMonWithMail:
-	frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_1,  8
-	frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_2,  8
-	dorestart
-
-.Frameset_PartyMonWithItem:
-	frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_1,  8
-	frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_2,  8
-	dorestart
-
-.Frameset_PartyMonFast:
-	frame SPRITE_ANIM_FRAME_IDX_RED_WALK_1,  4
-	frame SPRITE_ANIM_FRAME_IDX_RED_WALK_2,  4
-	dorestart
-
-.Frameset_PartyMonWithMailFast:
-	frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_1,  4
-	frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_2,  4
-	dorestart
-
-.Frameset_PartyMonWithItemFast:
-	frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_1,  4
-	frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_2,  4
-	dorestart
-
-.Frameset_RedWalk:
-	frame SPRITE_ANIM_FRAME_IDX_RED_WALK_1,  8
-	frame SPRITE_ANIM_FRAME_IDX_RED_WALK_2,  8
-	frame SPRITE_ANIM_FRAME_IDX_RED_WALK_1,  8
-	frame SPRITE_ANIM_FRAME_IDX_RED_WALK_2,  8, OAM_X_FLIP
-	dorestart
-
-.Frameset_BlueWalk:
-	frame SPRITE_ANIM_FRAME_IDX_BLUE_WALK_1,  8
-	frame SPRITE_ANIM_FRAME_IDX_BLUE_WALK_2,  8
-	frame SPRITE_ANIM_FRAME_IDX_BLUE_WALK_1,  8
-	frame SPRITE_ANIM_FRAME_IDX_BLUE_WALK_2,  8, OAM_X_FLIP
-	dorestart
-
-.Frameset_MagnetTrainBlue:
-	frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_BLUE_1,  8
-	frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_BLUE_2,  8
-	frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_BLUE_1,  8
-	frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_BLUE_2,  8, OAM_X_FLIP
-	dorestart
-
-.Frameset_GSTitleTrail:
-	frame SPRITE_ANIM_FRAME_IDX_GS_TITLE_TRAIL_1,  1
-	frame SPRITE_ANIM_FRAME_IDX_GS_TITLE_TRAIL_2,  1
-	dorestart
-
-.Frameset_TextEntryCursor:
-	frame SPRITE_ANIM_FRAME_IDX_TEXT_ENTRY_CURSOR,  1
-	dorepeat  1
-	dorestart
-
-.Frameset_09:
-	frame SPRITE_ANIM_FRAME_IDX_FOR_FRAMESET_09,  1
-	dorepeat  1
-	dorestart
-
-.Frameset_GameFreakLogo:
-	frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_1,  12
-	frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_2,   1
-	frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_3,   1
-	frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_2,   4
-	frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_1,  12
-	frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_2,  12
-	frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_3,   4
-	frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_4,  32
-	frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_5,   3
-	frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_6,   3
-	frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_7,   4
-	frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_8,   4
-	frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_9,   4
-	frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_10, 10
-	frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_11,  7
-	endanim
-
-.Frameset_GSIntroStar:
-	frame SPRITE_ANIM_FRAME_IDX_GS_INTRO_STAR,  3
-	frame SPRITE_ANIM_FRAME_IDX_GS_INTRO_STAR,  3, OAM_Y_FLIP
-	dorestart
-
-.Frameset_GSIntroSparkle:
-	frame SPRITE_ANIM_FRAME_IDX_GS_INTRO_SPARKLE_1,  2
-	frame SPRITE_ANIM_FRAME_IDX_GS_INTRO_SPARKLE_2,  2
-	frame SPRITE_ANIM_FRAME_IDX_GS_INTRO_SPARKLE_3,  2
-	frame SPRITE_ANIM_FRAME_IDX_GS_INTRO_SPARKLE_2,  2
-	dorestart
-
-.Frameset_SlotsGolem:
-	frame SPRITE_ANIM_FRAME_IDX_SLOTS_GOLEM_1,  7
-	frame SPRITE_ANIM_FRAME_IDX_SLOTS_GOLEM_2,  7
-	frame SPRITE_ANIM_FRAME_IDX_SLOTS_GOLEM_1,  7, OAM_Y_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_SLOTS_GOLEM_2,  7, OAM_X_FLIP
-	dorestart
-
-.Frameset_SlotsChansey:
-	frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_1,  7
-	frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_2,  7
-	frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_1,  7
-	frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_3,  7
-	dorestart
-
-.Frameset_SlotsChansey2:
-	frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_1,  7
-	frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_4,  7
-	frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_5,  7
-	frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_4,  7
-	frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_1,  7
-	endanim
-
-.Frameset_SlotsEgg:
-	frame SPRITE_ANIM_FRAME_IDX_SLOTS_EGG, 20
-	endanim
-
-.Frameset_StillCursor:
-	frame SPRITE_ANIM_FRAME_IDX_STILL_CURSOR, 32
-	endanim
-
-.Frameset_TradePokeBall:
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1, 32
-	endanim
-
-.Frameset_TradePokeBall0:
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2,  3, OAM_X_FLIP
-	dorestart
-
-.Frameset_TradePoof:
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_1,  4
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_2,  4
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_3,  4
-	delanim
-
-.Frameset_TradeTubeBulge:
-	frame SPRITE_ANIM_FRAME_IDX_35,  3
-	frame SPRITE_ANIM_FRAME_IDX_36,  3
-	dorestart
-
-.Frameset_TrademonIcon:
-	frame SPRITE_ANIM_FRAME_IDX_TRADEMON_ICON_1,  7
-	frame SPRITE_ANIM_FRAME_IDX_TRADEMON_ICON_2,  7
-	dorestart
-
-.Frameset_TrademonBubble:
-	frame SPRITE_ANIM_FRAME_IDX_TRADEMON_BUBBLE, 32
-	endanim
-
-.Frameset_EvolutionBallOfLight:
-	frame SPRITE_ANIM_FRAME_IDX_EVOLUTION_BALL_OF_LIGHT_2,  2
-	frame SPRITE_ANIM_FRAME_IDX_EVOLUTION_BALL_OF_LIGHT_1,  2
-	frame SPRITE_ANIM_FRAME_IDX_EVOLUTION_BALL_OF_LIGHT_2,  2
-	endanim
-
-.Frameset_RadioTuningKnob:
-	frame SPRITE_ANIM_FRAME_IDX_RADIO_TUNING_KNOB, 32
-	endanim
-
-.Frameset_MagnetTrainRed:
-	frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_1,  8
-	frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_2,  8
-	frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_1,  8
-	frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_2,  8, OAM_X_FLIP
-	dorestart
-
-; XXX
-	frame SPRITE_ANIM_FRAME_IDX_43,  8
-	frame SPRITE_ANIM_FRAME_IDX_44,  8
-	dorestart
-
-; XXX
-	frame SPRITE_ANIM_FRAME_IDX_45,  8
-	frame SPRITE_ANIM_FRAME_IDX_46,  8
-	dorestart
-
-; XXX
-	frame SPRITE_ANIM_FRAME_IDX_47,  8
-	frame SPRITE_ANIM_FRAME_IDX_48,  8
-	dorestart
-
-; XXX
-	frame SPRITE_ANIM_FRAME_IDX_49,  1
-	frame SPRITE_ANIM_FRAME_IDX_49,  1, OAM_X_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_49,  1, OAM_X_FLIP, OAM_Y_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_49,  1, OAM_Y_FLIP
-	dorestart
-
-; XXX
-	frame SPRITE_ANIM_FRAME_IDX_4A, 32
-	endanim
-
-; XXX
-	frame SPRITE_ANIM_FRAME_IDX_4B, 32
-	endanim
-
-; XXX
-	frame SPRITE_ANIM_FRAME_IDX_4C, 32
-	endanim
-
-; XXX
-	frame SPRITE_ANIM_FRAME_IDX_4D, 32
-	endanim
-
-; XXX
-	frame SPRITE_ANIM_FRAME_IDX_4E,  3
-	dorepeat  3
-	dorestart
-
-.Frameset_1c:
-	dorepeat 32
-	endanim
-
-.Frameset_Leaf:
-	frame SPRITE_ANIM_FRAME_IDX_LEAF, 32
-	endanim
-
-.Frameset_CutTree:
-	frame SPRITE_ANIM_FRAME_IDX_TREE_1,      2
-	frame SPRITE_ANIM_FRAME_IDX_CUT_TREE_2, 16
-	dorepeat  1
-	frame SPRITE_ANIM_FRAME_IDX_CUT_TREE_3,  1
-	dorepeat  1
-	frame SPRITE_ANIM_FRAME_IDX_CUT_TREE_4,  1
-	delanim
-
-.Frameset_EggCrack:
-	frame SPRITE_ANIM_FRAME_IDX_EGG_CRACK, 32
-	endanim
-
-.Frameset_EggHatch:
-	frame SPRITE_ANIM_FRAME_IDX_55, 32
-	endanim
-
-.Frameset_21:
-	frame SPRITE_ANIM_FRAME_IDX_55, 32, OAM_X_FLIP
-	endanim
-
-.Frameset_22:
-	frame SPRITE_ANIM_FRAME_IDX_55, 32, OAM_Y_FLIP
-	endanim
-
-.Frameset_23:
-	frame SPRITE_ANIM_FRAME_IDX_55, 32, OAM_X_FLIP, OAM_Y_FLIP
-	endanim
-
-.Frameset_24:
-	frame SPRITE_ANIM_FRAME_IDX_56, 10
-	frame SPRITE_ANIM_FRAME_IDX_57,  9
-	frame SPRITE_ANIM_FRAME_IDX_58, 10
-	frame SPRITE_ANIM_FRAME_IDX_59, 10
-	frame SPRITE_ANIM_FRAME_IDX_58,  9
-	frame SPRITE_ANIM_FRAME_IDX_5A, 10
-	dorestart
-
-.Frameset_HeadbuttTree:
-	frame SPRITE_ANIM_FRAME_IDX_TREE_1,           2
-	frame SPRITE_ANIM_FRAME_IDX_HEADBUTT_TREE_2,  2
-	frame SPRITE_ANIM_FRAME_IDX_TREE_1,           2
-	frame SPRITE_ANIM_FRAME_IDX_HEADBUTT_TREE_2,  2, OAM_X_FLIP
-	dorestart
-
-.Frameset_26:
-	frame SPRITE_ANIM_FRAME_IDX_5C,  2
-	endanim
-
-.Frameset_27:
-	frame SPRITE_ANIM_FRAME_IDX_5D,  2
-	endanim
-
-.Frameset_28:
-	frame SPRITE_ANIM_FRAME_IDX_5E,  2
-	endanim
-
-.Frameset_29:
-	frame SPRITE_ANIM_FRAME_IDX_5F,  2
-	endanim
-
-.Frameset_2a:
-	frame SPRITE_ANIM_FRAME_IDX_60,  2
-	endanim
-
-.Frameset_2b:
-	frame SPRITE_ANIM_FRAME_IDX_61,  2
-	endanim
-
-.Frameset_2c:
-	frame SPRITE_ANIM_FRAME_IDX_62,  2
-	endanim
-
-.Frameset_MobileTradeSentBall:
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_2,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_3,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2,  3, OAM_X_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2,  3, OAM_X_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2,  3, OAM_X_FLIP
-	endanim
-
-.Frameset_MobileTradeOTBall:
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2,  3, OAM_X_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2,  3, OAM_X_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2,  3, OAM_X_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_2,  3
-	frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_3,  3
-	delanim
-
-.Frameset_ForMobile22:
-	frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_22_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_22_2,  3
-	dorestart
-
-.Frameset_ForMobile23:
-	frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_23,  3
-	endanim
-
-.Frameset_ForMobile24:
-	frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_24,  3
-	endanim
-
-.Frameset_ForMobile25:
-	frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_1,  2
-	frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_2,  2
-	frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_3,  2
-	delanim
-
-.Frameset_IntroSuicune:
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_2,  3
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_3,  3
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_4,  3
-	dorestart
-
-.Frameset_IntroSuicune2:
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_4,  3
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_1,  7
-	endanim
-
-.Frameset_IntroPichu:
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_1, 32
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_2,  7
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_3,  7
-	endanim
-
-.Frameset_IntroWooper:
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_WOOPER,  3
-	endanim
-
-.Frameset_IntroUnown1:
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_2,  3
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_3,  7
-	delanim
-
-.Frameset_IntroUnown2:
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_1,  3, OAM_X_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_2,  3, OAM_X_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_3,  7, OAM_X_FLIP
-	delanim
-
-.Frameset_IntroUnown3:
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_1,  3, OAM_Y_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_2,  3, OAM_Y_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_3,  7, OAM_Y_FLIP
-	delanim
-
-.Frameset_IntroUnown4:
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_1,  3, OAM_X_FLIP, OAM_Y_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_2,  3, OAM_X_FLIP, OAM_Y_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_3,  7, OAM_X_FLIP, OAM_Y_FLIP
-	delanim
-
-.Frameset_IntroUnownF2:
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_2,  3
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_3,  3
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_4,  7
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_5,  7
-	endanim
-
-.Frameset_IntroSuicuneAway:
-	frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_AWAY,  3
-	endanim
-
-.Frameset_IntroUnownF:
-	dorepeat 0
-	endanim
-
-.Frameset_CelebiLeft:
-	frame SPRITE_ANIM_FRAME_IDX_CELEBI_1,  8
-	frame SPRITE_ANIM_FRAME_IDX_CELEBI_2,  8
-	endanim
-
-.Frameset_CelebiRight:
-	frame SPRITE_ANIM_FRAME_IDX_CELEBI_1,  8, OAM_X_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_CELEBI_2,  8, OAM_X_FLIP
-	endanim
-; 8d94d
diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm
new file mode 100755
index 000000000..24b058859
--- /dev/null
+++ b/data/sprite_anims/framesets.asm
@@ -0,0 +1,499 @@
+SpriteAnimFrameData: ; 8d6e6
+; entries correspond to SPRITE_ANIM_FRAMESET_* constants
+	dw .Frameset_00
+	dw .Frameset_PartyMon
+	dw .Frameset_PartyMonWithMail
+	dw .Frameset_PartyMonWithItem
+	dw .Frameset_PartyMonFast
+	dw .Frameset_PartyMonWithMailFast
+	dw .Frameset_PartyMonWithItemFast
+	dw .Frameset_GSTitleTrail
+	dw .Frameset_TextEntryCursor
+	dw .Frameset_09
+	dw .Frameset_GameFreakLogo
+	dw .Frameset_GSIntroStar
+	dw .Frameset_GSIntroSparkle
+	dw .Frameset_SlotsGolem
+	dw .Frameset_SlotsChansey
+	dw .Frameset_SlotsChansey2
+	dw .Frameset_SlotsEgg
+	dw .Frameset_RedWalk
+	dw .Frameset_StillCursor
+	dw .Frameset_TradePokeBall
+	dw .Frameset_TradePokeBall0
+	dw .Frameset_TradePoof
+	dw .Frameset_TradeTubeBulge
+	dw .Frameset_TrademonIcon
+	dw .Frameset_TrademonBubble
+	dw .Frameset_EvolutionBallOfLight
+	dw .Frameset_RadioTuningKnob
+	dw .Frameset_MagnetTrainRed
+	dw .Frameset_1c
+	dw .Frameset_Leaf
+	dw .Frameset_CutTree
+	dw .Frameset_EggCrack
+	dw .Frameset_EggHatch
+	dw .Frameset_21
+	dw .Frameset_22
+	dw .Frameset_23
+	dw .Frameset_24
+	dw .Frameset_HeadbuttTree
+	dw .Frameset_26
+	dw .Frameset_27
+	dw .Frameset_28
+	dw .Frameset_29
+	dw .Frameset_2a
+	dw .Frameset_2b
+	dw .Frameset_2c
+	dw .Frameset_BlueWalk
+	dw .Frameset_MagnetTrainBlue
+	dw .Frameset_MobileTradeSentBall
+	dw .Frameset_MobileTradeOTBall
+	dw .Frameset_ForMobile22
+	dw .Frameset_ForMobile23
+	dw .Frameset_ForMobile24
+	dw .Frameset_ForMobile25
+	dw .Frameset_IntroSuicune
+	dw .Frameset_IntroSuicune2
+	dw .Frameset_IntroPichu
+	dw .Frameset_IntroWooper
+	dw .Frameset_IntroUnown1
+	dw .Frameset_IntroUnown2
+	dw .Frameset_IntroUnown3
+	dw .Frameset_IntroUnown4
+	dw .Frameset_IntroUnownF2
+	dw .Frameset_IntroSuicuneAway
+	dw .Frameset_IntroUnownF
+	dw .Frameset_CelebiLeft
+	dw .Frameset_CelebiRight
+; 8d76a
+
+.Frameset_00:
+	frame SPRITE_ANIM_OAMSET_RED_WALK_1, 32
+	endanim
+
+.Frameset_PartyMon:
+	frame SPRITE_ANIM_OAMSET_RED_WALK_1,  8
+	frame SPRITE_ANIM_OAMSET_RED_WALK_2,  8
+	dorestart
+
+.Frameset_PartyMonWithMail:
+	frame SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_1,  8
+	frame SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_2,  8
+	dorestart
+
+.Frameset_PartyMonWithItem:
+	frame SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_1,  8
+	frame SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_2,  8
+	dorestart
+
+.Frameset_PartyMonFast:
+	frame SPRITE_ANIM_OAMSET_RED_WALK_1,  4
+	frame SPRITE_ANIM_OAMSET_RED_WALK_2,  4
+	dorestart
+
+.Frameset_PartyMonWithMailFast:
+	frame SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_1,  4
+	frame SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_2,  4
+	dorestart
+
+.Frameset_PartyMonWithItemFast:
+	frame SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_1,  4
+	frame SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_2,  4
+	dorestart
+
+.Frameset_RedWalk:
+	frame SPRITE_ANIM_OAMSET_RED_WALK_1,  8
+	frame SPRITE_ANIM_OAMSET_RED_WALK_2,  8
+	frame SPRITE_ANIM_OAMSET_RED_WALK_1,  8
+	frame SPRITE_ANIM_OAMSET_RED_WALK_2,  8, OAM_X_FLIP
+	dorestart
+
+.Frameset_BlueWalk:
+	frame SPRITE_ANIM_OAMSET_BLUE_WALK_1,  8
+	frame SPRITE_ANIM_OAMSET_BLUE_WALK_2,  8
+	frame SPRITE_ANIM_OAMSET_BLUE_WALK_1,  8
+	frame SPRITE_ANIM_OAMSET_BLUE_WALK_2,  8, OAM_X_FLIP
+	dorestart
+
+.Frameset_MagnetTrainBlue:
+	frame SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_1,  8
+	frame SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_2,  8
+	frame SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_1,  8
+	frame SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_2,  8, OAM_X_FLIP
+	dorestart
+
+.Frameset_GSTitleTrail:
+	frame SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_1,  1
+	frame SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_2,  1
+	dorestart
+
+.Frameset_TextEntryCursor:
+	frame SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR,  1
+	dorepeat  1
+	dorestart
+
+.Frameset_09:
+	frame SPRITE_ANIM_OAMSET_FOR_FRAMESET_09,  1
+	dorepeat  1
+	dorestart
+
+.Frameset_GameFreakLogo:
+	frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_1,  12
+	frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_2,   1
+	frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_3,   1
+	frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_2,   4
+	frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_1,  12
+	frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_2,  12
+	frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_3,   4
+	frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_4,  32
+	frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_5,   3
+	frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_6,   3
+	frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_7,   4
+	frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_8,   4
+	frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_9,   4
+	frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_10, 10
+	frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_11,  7
+	endanim
+
+.Frameset_GSIntroStar:
+	frame SPRITE_ANIM_OAMSET_GS_INTRO_STAR,  3
+	frame SPRITE_ANIM_OAMSET_GS_INTRO_STAR,  3, OAM_Y_FLIP
+	dorestart
+
+.Frameset_GSIntroSparkle:
+	frame SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_1,  2
+	frame SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_2,  2
+	frame SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_3,  2
+	frame SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_2,  2
+	dorestart
+
+.Frameset_SlotsGolem:
+	frame SPRITE_ANIM_OAMSET_SLOTS_GOLEM_1,  7
+	frame SPRITE_ANIM_OAMSET_SLOTS_GOLEM_2,  7
+	frame SPRITE_ANIM_OAMSET_SLOTS_GOLEM_1,  7, OAM_Y_FLIP
+	frame SPRITE_ANIM_OAMSET_SLOTS_GOLEM_2,  7, OAM_X_FLIP
+	dorestart
+
+.Frameset_SlotsChansey:
+	frame SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_1,  7
+	frame SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_2,  7
+	frame SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_1,  7
+	frame SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_3,  7
+	dorestart
+
+.Frameset_SlotsChansey2:
+	frame SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_1,  7
+	frame SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_4,  7
+	frame SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_5,  7
+	frame SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_4,  7
+	frame SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_1,  7
+	endanim
+
+.Frameset_SlotsEgg:
+	frame SPRITE_ANIM_OAMSET_SLOTS_EGG, 20
+	endanim
+
+.Frameset_StillCursor:
+	frame SPRITE_ANIM_OAMSET_STILL_CURSOR, 32
+	endanim
+
+.Frameset_TradePokeBall:
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 32
+	endanim
+
+.Frameset_TradePokeBall0:
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2,  3, OAM_X_FLIP
+	dorestart
+
+.Frameset_TradePoof:
+	frame SPRITE_ANIM_OAMSET_TRADE_POOF_1,  4
+	frame SPRITE_ANIM_OAMSET_TRADE_POOF_2,  4
+	frame SPRITE_ANIM_OAMSET_TRADE_POOF_3,  4
+	delanim
+
+.Frameset_TradeTubeBulge:
+	frame SPRITE_ANIM_OAMSET_35,  3
+	frame SPRITE_ANIM_OAMSET_36,  3
+	dorestart
+
+.Frameset_TrademonIcon:
+	frame SPRITE_ANIM_OAMSET_TRADEMON_ICON_1,  7
+	frame SPRITE_ANIM_OAMSET_TRADEMON_ICON_2,  7
+	dorestart
+
+.Frameset_TrademonBubble:
+	frame SPRITE_ANIM_OAMSET_TRADEMON_BUBBLE, 32
+	endanim
+
+.Frameset_EvolutionBallOfLight:
+	frame SPRITE_ANIM_OAMSET_EVOLUTION_BALL_OF_LIGHT_2,  2
+	frame SPRITE_ANIM_OAMSET_EVOLUTION_BALL_OF_LIGHT_1,  2
+	frame SPRITE_ANIM_OAMSET_EVOLUTION_BALL_OF_LIGHT_2,  2
+	endanim
+
+.Frameset_RadioTuningKnob:
+	frame SPRITE_ANIM_OAMSET_RADIO_TUNING_KNOB, 32
+	endanim
+
+.Frameset_MagnetTrainRed:
+	frame SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_1,  8
+	frame SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_2,  8
+	frame SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_1,  8
+	frame SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_2,  8, OAM_X_FLIP
+	dorestart
+
+; XXX
+	frame SPRITE_ANIM_OAMSET_43,  8
+	frame SPRITE_ANIM_OAMSET_44,  8
+	dorestart
+
+; XXX
+	frame SPRITE_ANIM_OAMSET_45,  8
+	frame SPRITE_ANIM_OAMSET_46,  8
+	dorestart
+
+; XXX
+	frame SPRITE_ANIM_OAMSET_47,  8
+	frame SPRITE_ANIM_OAMSET_48,  8
+	dorestart
+
+; XXX
+	frame SPRITE_ANIM_OAMSET_49,  1
+	frame SPRITE_ANIM_OAMSET_49,  1, OAM_X_FLIP
+	frame SPRITE_ANIM_OAMSET_49,  1, OAM_X_FLIP, OAM_Y_FLIP
+	frame SPRITE_ANIM_OAMSET_49,  1, OAM_Y_FLIP
+	dorestart
+
+; XXX
+	frame SPRITE_ANIM_OAMSET_4A, 32
+	endanim
+
+; XXX
+	frame SPRITE_ANIM_OAMSET_4B, 32
+	endanim
+
+; XXX
+	frame SPRITE_ANIM_OAMSET_4C, 32
+	endanim
+
+; XXX
+	frame SPRITE_ANIM_OAMSET_4D, 32
+	endanim
+
+; XXX
+	frame SPRITE_ANIM_OAMSET_4E,  3
+	dorepeat  3
+	dorestart
+
+.Frameset_1c:
+	dorepeat 32
+	endanim
+
+.Frameset_Leaf:
+	frame SPRITE_ANIM_OAMSET_LEAF, 32
+	endanim
+
+.Frameset_CutTree:
+	frame SPRITE_ANIM_OAMSET_TREE_1,      2
+	frame SPRITE_ANIM_OAMSET_CUT_TREE_2, 16
+	dorepeat  1
+	frame SPRITE_ANIM_OAMSET_CUT_TREE_3,  1
+	dorepeat  1
+	frame SPRITE_ANIM_OAMSET_CUT_TREE_4,  1
+	delanim
+
+.Frameset_EggCrack:
+	frame SPRITE_ANIM_OAMSET_EGG_CRACK, 32
+	endanim
+
+.Frameset_EggHatch:
+	frame SPRITE_ANIM_OAMSET_55, 32
+	endanim
+
+.Frameset_21:
+	frame SPRITE_ANIM_OAMSET_55, 32, OAM_X_FLIP
+	endanim
+
+.Frameset_22:
+	frame SPRITE_ANIM_OAMSET_55, 32, OAM_Y_FLIP
+	endanim
+
+.Frameset_23:
+	frame SPRITE_ANIM_OAMSET_55, 32, OAM_X_FLIP, OAM_Y_FLIP
+	endanim
+
+.Frameset_24:
+	frame SPRITE_ANIM_OAMSET_56, 10
+	frame SPRITE_ANIM_OAMSET_57,  9
+	frame SPRITE_ANIM_OAMSET_58, 10
+	frame SPRITE_ANIM_OAMSET_59, 10
+	frame SPRITE_ANIM_OAMSET_58,  9
+	frame SPRITE_ANIM_OAMSET_5A, 10
+	dorestart
+
+.Frameset_HeadbuttTree:
+	frame SPRITE_ANIM_OAMSET_TREE_1,           2
+	frame SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2,  2
+	frame SPRITE_ANIM_OAMSET_TREE_1,           2
+	frame SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2,  2, OAM_X_FLIP
+	dorestart
+
+.Frameset_26:
+	frame SPRITE_ANIM_OAMSET_5C,  2
+	endanim
+
+.Frameset_27:
+	frame SPRITE_ANIM_OAMSET_5D,  2
+	endanim
+
+.Frameset_28:
+	frame SPRITE_ANIM_OAMSET_5E,  2
+	endanim
+
+.Frameset_29:
+	frame SPRITE_ANIM_OAMSET_5F,  2
+	endanim
+
+.Frameset_2a:
+	frame SPRITE_ANIM_OAMSET_60,  2
+	endanim
+
+.Frameset_2b:
+	frame SPRITE_ANIM_OAMSET_61,  2
+	endanim
+
+.Frameset_2c:
+	frame SPRITE_ANIM_OAMSET_62,  2
+	endanim
+
+.Frameset_MobileTradeSentBall:
+	frame SPRITE_ANIM_OAMSET_TRADE_POOF_1,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POOF_2,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POOF_3,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2,  3, OAM_X_FLIP
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2,  3, OAM_X_FLIP
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2,  3, OAM_X_FLIP
+	endanim
+
+.Frameset_MobileTradeOTBall:
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2,  3, OAM_X_FLIP
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2,  3, OAM_X_FLIP
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2,  3, OAM_X_FLIP
+	frame SPRITE_ANIM_OAMSET_TRADE_POOF_1,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POOF_2,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_POOF_3,  3
+	delanim
+
+.Frameset_ForMobile22:
+	frame SPRITE_ANIM_OAMSET_FOR_MOBILE_22_1,  3
+	frame SPRITE_ANIM_OAMSET_FOR_MOBILE_22_2,  3
+	dorestart
+
+.Frameset_ForMobile23:
+	frame SPRITE_ANIM_OAMSET_FOR_MOBILE_23,  3
+	endanim
+
+.Frameset_ForMobile24:
+	frame SPRITE_ANIM_OAMSET_FOR_MOBILE_24,  3
+	endanim
+
+.Frameset_ForMobile25:
+	frame SPRITE_ANIM_OAMSET_FOR_MOBILE_25_1,  2
+	frame SPRITE_ANIM_OAMSET_FOR_MOBILE_25_2,  2
+	frame SPRITE_ANIM_OAMSET_FOR_MOBILE_25_3,  2
+	delanim
+
+.Frameset_IntroSuicune:
+	frame SPRITE_ANIM_OAMSET_INTRO_SUICUNE_1,  3
+	frame SPRITE_ANIM_OAMSET_INTRO_SUICUNE_2,  3
+	frame SPRITE_ANIM_OAMSET_INTRO_SUICUNE_3,  3
+	frame SPRITE_ANIM_OAMSET_INTRO_SUICUNE_4,  3
+	dorestart
+
+.Frameset_IntroSuicune2:
+	frame SPRITE_ANIM_OAMSET_INTRO_SUICUNE_4,  3
+	frame SPRITE_ANIM_OAMSET_INTRO_SUICUNE_1,  7
+	endanim
+
+.Frameset_IntroPichu:
+	frame SPRITE_ANIM_OAMSET_INTRO_PICHU_1, 32
+	frame SPRITE_ANIM_OAMSET_INTRO_PICHU_2,  7
+	frame SPRITE_ANIM_OAMSET_INTRO_PICHU_3,  7
+	endanim
+
+.Frameset_IntroWooper:
+	frame SPRITE_ANIM_OAMSET_INTRO_WOOPER,  3
+	endanim
+
+.Frameset_IntroUnown1:
+	frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_1,  3
+	frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_2,  3
+	frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_3,  7
+	delanim
+
+.Frameset_IntroUnown2:
+	frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_1,  3, OAM_X_FLIP
+	frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_2,  3, OAM_X_FLIP
+	frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_3,  7, OAM_X_FLIP
+	delanim
+
+.Frameset_IntroUnown3:
+	frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_1,  3, OAM_Y_FLIP
+	frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_2,  3, OAM_Y_FLIP
+	frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_3,  7, OAM_Y_FLIP
+	delanim
+
+.Frameset_IntroUnown4:
+	frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_1,  3, OAM_X_FLIP, OAM_Y_FLIP
+	frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_2,  3, OAM_X_FLIP, OAM_Y_FLIP
+	frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_3,  7, OAM_X_FLIP, OAM_Y_FLIP
+	delanim
+
+.Frameset_IntroUnownF2:
+	frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_1,  3
+	frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_2,  3
+	frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_3,  3
+	frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_4,  7
+	frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_5,  7
+	endanim
+
+.Frameset_IntroSuicuneAway:
+	frame SPRITE_ANIM_OAMSET_INTRO_SUICUNE_AWAY,  3
+	endanim
+
+.Frameset_IntroUnownF:
+	dorepeat 0
+	endanim
+
+.Frameset_CelebiLeft:
+	frame SPRITE_ANIM_OAMSET_CELEBI_1,  8
+	frame SPRITE_ANIM_OAMSET_CELEBI_2,  8
+	endanim
+
+.Frameset_CelebiRight:
+	frame SPRITE_ANIM_OAMSET_CELEBI_1,  8, OAM_X_FLIP
+	frame SPRITE_ANIM_OAMSET_CELEBI_2,  8, OAM_X_FLIP
+	endanim
+; 8d94d
diff --git a/data/sprite_anim_oam.asm b/data/sprite_anims/oam.asm
index fea73f596..99adc9df3 100644
--- a/data/sprite_anim_oam.asm
+++ b/data/sprite_anims/oam.asm
@@ -1,146 +1,146 @@
 SpriteAnimOAMData: ; 8d94d
-; entries correspond to SPRITE_ANIM_FRAME_IDX_* constants
+; entries correspond to SPRITE_ANIM_OAMSET_* constants
 	; vtile offset, pointer
-	dbw $00, .OAMData_RedWalk ; SPRITE_ANIM_FRAME_IDX_RED_WALK_1
-	dbw $04, .OAMData_RedWalk ; SPRITE_ANIM_FRAME_IDX_RED_WALK_2
-	dbw $4c, .OAMData_1x1_Palette0 ; SPRITE_ANIM_FRAME_IDX_02
-	dbw $5c, .OAMData_1x1_Palette0 ; SPRITE_ANIM_FRAME_IDX_03
-	dbw $6c, .OAMData_04 ; SPRITE_ANIM_FRAME_IDX_04
-	dbw $6e, .OAMData_04 ; SPRITE_ANIM_FRAME_IDX_05
-	dbw $2d, .OAMData_06 ; SPRITE_ANIM_FRAME_IDX_06
-	dbw $4d, .OAMData_06 ; SPRITE_ANIM_FRAME_IDX_07
-	dbw $60, .OAMData_08 ; SPRITE_ANIM_FRAME_IDX_08
-	dbw $00, .OAMData_08 ; SPRITE_ANIM_FRAME_IDX_09
-	dbw $00, .OAMData_08 ; SPRITE_ANIM_FRAME_IDX_0A
-	dbw $06, .OAMData_08 ; SPRITE_ANIM_FRAME_IDX_0B
-	dbw $0c, .OAMData_0c ; SPRITE_ANIM_FRAME_IDX_0C
-	dbw $0d, .OAMData_1x1_Palette0 ; SPRITE_ANIM_FRAME_IDX_0D
-	dbw $00, .OAMData_0e ; SPRITE_ANIM_FRAME_IDX_0E
-	dbw $04, .OAMData_0e ; SPRITE_ANIM_FRAME_IDX_0F
-	dbw $08, .OAMData_0e ; SPRITE_ANIM_FRAME_IDX_10
-	dbw $40, .OAMData_0e ; SPRITE_ANIM_FRAME_IDX_11
-	dbw $44, .OAMData_0e ; SPRITE_ANIM_FRAME_IDX_12
-	dbw $48, .OAMData_0e ; SPRITE_ANIM_FRAME_IDX_13
-	dbw $4c, .OAMData_0e ; SPRITE_ANIM_FRAME_IDX_14
-	dbw $80, .OAMData_15 ; SPRITE_ANIM_FRAME_IDX_15
-	dbw $85, .OAMData_15 ; SPRITE_ANIM_FRAME_IDX_16
-	dbw $8a, .OAMData_15 ; SPRITE_ANIM_FRAME_IDX_17
-	dbw $00, .OAMData_18 ; SPRITE_ANIM_FRAME_IDX_18
-	dbw $01, .OAMData_TradePoofBubble ; SPRITE_ANIM_FRAME_IDX_19
-	dbw $09, .OAMData_1a ; SPRITE_ANIM_FRAME_IDX_1A
-	dbw $10, .OAMData_1b ; SPRITE_ANIM_FRAME_IDX_1B
-	dbw $29, .OAMData_1b ; SPRITE_ANIM_FRAME_IDX_1C
-	dbw $42, .OAMData_1b ; SPRITE_ANIM_FRAME_IDX_1D
-	dbw $f8, .OAMData_GSTitleTrail ; SPRITE_ANIM_FRAME_IDX_GS_TITLE_TRAIL_1
-	dbw $fa, .OAMData_GSTitleTrail ; SPRITE_ANIM_FRAME_IDX_GS_TITLE_TRAIL_2
-	dbw $00, .OAMData_TextEntryCursor ; SPRITE_ANIM_FRAME_IDX_TEXT_ENTRY_CURSOR
-	dbw $00, .OAMData_ForFrameset09 ; SPRITE_ANIM_FRAME_IDX_FOR_FRAMESET_09
-	dbw $00, .OAMData_22 ; SPRITE_ANIM_FRAME_IDX_22
-	dbw $0f, .OAMData_GSIntroStar ; SPRITE_ANIM_FRAME_IDX_GS_INTRO_STAR
-	dbw $11, .OAMData_1x1_Palette0 ; SPRITE_ANIM_FRAME_IDX_GS_INTRO_SPARKLE_1
-	dbw $12, .OAMData_1x1_Palette0 ; SPRITE_ANIM_FRAME_IDX_GS_INTRO_SPARKLE_2
-	dbw $13, .OAMData_1x1_Palette0 ; SPRITE_ANIM_FRAME_IDX_GS_INTRO_SPARKLE_3
-	dbw $00, .OAMData_SlotsGolem ; SPRITE_ANIM_FRAME_IDX_SLOTS_GOLEM_1
-	dbw $08, .OAMData_SlotsGolem ; SPRITE_ANIM_FRAME_IDX_SLOTS_GOLEM_2
-	dbw $10, .OAMData_SlotsChansey1 ; SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_1
-	dbw $10, .OAMData_SlotsChansey2 ; SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_2
-	dbw $10, .OAMData_SlotsChansey3 ; SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_3
-	dbw $10, .OAMData_SlotsChansey4 ; SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_4
-	dbw $10, .OAMData_SlotsChansey5 ; SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_5
-	dbw $3a, .OAMData_1x1_Palette0 ; SPRITE_ANIM_FRAME_IDX_SLOTS_EGG
-	dbw $00, .OAMData_RedWalk ; SPRITE_ANIM_FRAME_IDX_STILL_CURSOR
-	dbw $00, .OAMData_TradePokeBall1 ; SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1
-	dbw $02, .OAMData_MagnetTrainRed ; SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2
-	dbw $06, .OAMData_TradePoofBubble ; SPRITE_ANIM_FRAME_IDX_TRADE_POOF_1
-	dbw $0a, .OAMData_TradePoofBubble ; SPRITE_ANIM_FRAME_IDX_TRADE_POOF_2
-	dbw $0e, .OAMData_TradePoofBubble ; SPRITE_ANIM_FRAME_IDX_TRADE_POOF_3
-	dbw $12, .OAMData_35 ; SPRITE_ANIM_FRAME_IDX_35
-	dbw $13, .OAMData_35 ; SPRITE_ANIM_FRAME_IDX_36
-	dbw $00, .OAMData_RedWalk ; SPRITE_ANIM_FRAME_IDX_TRADEMON_ICON_1
-	dbw $04, .OAMData_RedWalk ; SPRITE_ANIM_FRAME_IDX_TRADEMON_ICON_2
-	dbw $10, .OAMData_TradePoofBubble ; SPRITE_ANIM_FRAME_IDX_TRADEMON_BUBBLE
-	dbw $00, .OAMData_MagnetTrainRed ; SPRITE_ANIM_FRAME_IDX_EVOLUTION_BALL_OF_LIGHT_1
-	dbw $04, .OAMData_1x1_Palette0 ; SPRITE_ANIM_FRAME_IDX_EVOLUTION_BALL_OF_LIGHT_2
-	dbw $00, .OAMData_RadioTuningKnob ; SPRITE_ANIM_FRAME_IDX_RADIO_TUNING_KNOB
-	dbw $00, .OAMData_PartyMonWithMail1 ; SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_1
-	dbw $00, .OAMData_PartyMonWithMail2 ; SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_2
-	dbw $00, .OAMData_PartyMonWithItem1 ; SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_1
-	dbw $00, .OAMData_PartyMonWithItem2 ; SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_2
-	dbw $00, .OAMData_MagnetTrainRed ; SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_1
-	dbw $04, .OAMData_MagnetTrainRed ; SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_2
-	dbw $00, .OAMData_43 ; SPRITE_ANIM_FRAME_IDX_43
-	dbw $30, .OAMData_43 ; SPRITE_ANIM_FRAME_IDX_44
-	dbw $03, .OAMData_43 ; SPRITE_ANIM_FRAME_IDX_45
-	dbw $33, .OAMData_43 ; SPRITE_ANIM_FRAME_IDX_46
-	dbw $06, .OAMData_43 ; SPRITE_ANIM_FRAME_IDX_47
-	dbw $36, .OAMData_43 ; SPRITE_ANIM_FRAME_IDX_48
-	dbw $09, .OAMData_43 ; SPRITE_ANIM_FRAME_IDX_49
-	dbw $39, .OAMData_43 ; SPRITE_ANIM_FRAME_IDX_4A
-	dbw $0c, .OAMData_4b ; SPRITE_ANIM_FRAME_IDX_4B
-	dbw $0c, .OAMData_4c ; SPRITE_ANIM_FRAME_IDX_4C
-	dbw $3c, .OAMData_1x1_Palette0 ; SPRITE_ANIM_FRAME_IDX_4D
-	dbw $3e, .OAMData_1x1_Palette0 ; SPRITE_ANIM_FRAME_IDX_4E
-	dbw $00, .OAMData_Leaf ; SPRITE_ANIM_FRAME_IDX_LEAF
-	dbw $00, .OAMData_Tree ; SPRITE_ANIM_FRAME_IDX_TREE_1
-	dbw $00, .OAMData_CutTree2 ; SPRITE_ANIM_FRAME_IDX_CUT_TREE_2
-	dbw $00, .OAMData_CutTree3 ; SPRITE_ANIM_FRAME_IDX_CUT_TREE_3
-	dbw $00, .OAMData_CutTree4 ; SPRITE_ANIM_FRAME_IDX_CUT_TREE_4
-	dbw $00, .OAMData_1x1_Palette0 ; SPRITE_ANIM_FRAME_IDX_EGG_CRACK
-	dbw $01, .OAMData_1x1_Palette0 ; SPRITE_ANIM_FRAME_IDX_55
-	dbw $00, .OAMData_56 ; SPRITE_ANIM_FRAME_IDX_56
-	dbw $00, .OAMData_57 ; SPRITE_ANIM_FRAME_IDX_57
-	dbw $00, .OAMData_58 ; SPRITE_ANIM_FRAME_IDX_58
-	dbw $00, .OAMData_59 ; SPRITE_ANIM_FRAME_IDX_59
-	dbw $00, .OAMData_5a ; SPRITE_ANIM_FRAME_IDX_5A
-	dbw $04, .OAMData_Tree ; SPRITE_ANIM_FRAME_IDX_HEADBUTT_TREE_2
-	dbw $00, .OAMData_5c ; SPRITE_ANIM_FRAME_IDX_5C
-	dbw $00, .OAMData_5d ; SPRITE_ANIM_FRAME_IDX_5D
-	dbw $00, .OAMData_5e ; SPRITE_ANIM_FRAME_IDX_5E
-	dbw $00, .OAMData_5f ; SPRITE_ANIM_FRAME_IDX_5F
-	dbw $00, .OAMData_60 ; SPRITE_ANIM_FRAME_IDX_60
-	dbw $00, .OAMData_61 ; SPRITE_ANIM_FRAME_IDX_61
-	dbw $00, .OAMData_62 ; SPRITE_ANIM_FRAME_IDX_62
-	dbw $00, .OAMData_BlueWalk ; SPRITE_ANIM_FRAME_IDX_BLUE_WALK_1
-	dbw $04, .OAMData_BlueWalk ; SPRITE_ANIM_FRAME_IDX_BLUE_WALK_2
-	dbw $00, .OAMData_MagnetTrainBlue ; SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_BLUE_1
-	dbw $04, .OAMData_MagnetTrainBlue ; SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_BLUE_2
-	dbw $20, .OAMData_ForMobile22 ; SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_22_1
-	dbw $21, .OAMData_ForMobile22 ; SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_22_2
-	dbw $22, .OAMData_ForMobile25_1 ; SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_1
-	dbw $23, .OAMData_ForMobile25_2 ; SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_2
-	dbw $27, .OAMData_ForMobile25_3 ; SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_3
-	dbw $2a, .OAMData_ForMobile23 ; SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_23
-	dbw $2a, .OAMData_ForMobile24 ; SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_24
-	dbw $00, .OAMData_IntroSuicune1 ; SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_1
-	dbw $08, .OAMData_IntroSuicune2 ; SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_2
-	dbw $60, .OAMData_IntroSuicune3 ; SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_3
-	dbw $68, .OAMData_IntroSuicune4 ; SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_4
-	dbw $00, .OAMData_IntroPichu ; SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_1
-	dbw $05, .OAMData_IntroPichu ; SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_2
-	dbw $0a, .OAMData_IntroPichu ; SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_3
-	dbw $50, .OAMData_IntroWooper ; SPRITE_ANIM_FRAME_IDX_INTRO_WOOPER
-	dbw $00, .OAMData_IntroUnown1 ; SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_1
-	dbw $01, .OAMData_IntroUnown2 ; SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_2
-	dbw $04, .OAMData_IntroUnown3 ; SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_3
-	dbw $00, .OAMData_18 ; SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_1
-	dbw $01, .OAMData_IntroUnownF2_2 ; SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_2
-	dbw $03, .OAMData_IntroUnownF2_3 ; SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_3
-	dbw $08, .OAMData_IntroUnownF2_4_5 ; SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_4
-	dbw $1c, .OAMData_IntroUnownF2_4_5 ; SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_5
-	dbw $80, .OAMData_IntroSuicuneAway ; SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_AWAY
-	dbw $00, .OAMData_Celebi ; SPRITE_ANIM_FRAME_IDX_CELEBI_1
-	dbw $04, .OAMData_Celebi ; SPRITE_ANIM_FRAME_IDX_CELEBI_2
-	dbw $d0, .OAMData_GameFreakLogo1_3 ; SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_1
-	dbw $d3, .OAMData_GameFreakLogo1_3 ; SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_2
-	dbw $d6, .OAMData_GameFreakLogo1_3 ; SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_3
-	dbw $6c, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_4
-	dbw $68, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_5
-	dbw $64, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_6
-	dbw $60, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_7
-	dbw $0c, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_8
-	dbw $08, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_9
-	dbw $04, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_10
-	dbw $00, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_11
+	dbw $00, .OAMData_RedWalk ; SPRITE_ANIM_OAMSET_RED_WALK_1
+	dbw $04, .OAMData_RedWalk ; SPRITE_ANIM_OAMSET_RED_WALK_2
+	dbw $4c, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_02
+	dbw $5c, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_03
+	dbw $6c, .OAMData_04 ; SPRITE_ANIM_OAMSET_04
+	dbw $6e, .OAMData_04 ; SPRITE_ANIM_OAMSET_05
+	dbw $2d, .OAMData_06 ; SPRITE_ANIM_OAMSET_06
+	dbw $4d, .OAMData_06 ; SPRITE_ANIM_OAMSET_07
+	dbw $60, .OAMData_08 ; SPRITE_ANIM_OAMSET_08
+	dbw $00, .OAMData_08 ; SPRITE_ANIM_OAMSET_09
+	dbw $00, .OAMData_08 ; SPRITE_ANIM_OAMSET_0A
+	dbw $06, .OAMData_08 ; SPRITE_ANIM_OAMSET_0B
+	dbw $0c, .OAMData_0c ; SPRITE_ANIM_OAMSET_0C
+	dbw $0d, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_0D
+	dbw $00, .OAMData_0e ; SPRITE_ANIM_OAMSET_0E
+	dbw $04, .OAMData_0e ; SPRITE_ANIM_OAMSET_0F
+	dbw $08, .OAMData_0e ; SPRITE_ANIM_OAMSET_10
+	dbw $40, .OAMData_0e ; SPRITE_ANIM_OAMSET_11
+	dbw $44, .OAMData_0e ; SPRITE_ANIM_OAMSET_12
+	dbw $48, .OAMData_0e ; SPRITE_ANIM_OAMSET_13
+	dbw $4c, .OAMData_0e ; SPRITE_ANIM_OAMSET_14
+	dbw $80, .OAMData_15 ; SPRITE_ANIM_OAMSET_15
+	dbw $85, .OAMData_15 ; SPRITE_ANIM_OAMSET_16
+	dbw $8a, .OAMData_15 ; SPRITE_ANIM_OAMSET_17
+	dbw $00, .OAMData_18 ; SPRITE_ANIM_OAMSET_18
+	dbw $01, .OAMData_TradePoofBubble ; SPRITE_ANIM_OAMSET_19
+	dbw $09, .OAMData_1a ; SPRITE_ANIM_OAMSET_1A
+	dbw $10, .OAMData_1b ; SPRITE_ANIM_OAMSET_1B
+	dbw $29, .OAMData_1b ; SPRITE_ANIM_OAMSET_1C
+	dbw $42, .OAMData_1b ; SPRITE_ANIM_OAMSET_1D
+	dbw $f8, .OAMData_GSTitleTrail ; SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_1
+	dbw $fa, .OAMData_GSTitleTrail ; SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_2
+	dbw $00, .OAMData_TextEntryCursor ; SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR
+	dbw $00, .OAMData_ForFrameset09 ; SPRITE_ANIM_OAMSET_FOR_FRAMESET_09
+	dbw $00, .OAMData_22 ; SPRITE_ANIM_OAMSET_22
+	dbw $0f, .OAMData_GSIntroStar ; SPRITE_ANIM_OAMSET_GS_INTRO_STAR
+	dbw $11, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_1
+	dbw $12, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_2
+	dbw $13, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_3
+	dbw $00, .OAMData_SlotsGolem ; SPRITE_ANIM_OAMSET_SLOTS_GOLEM_1
+	dbw $08, .OAMData_SlotsGolem ; SPRITE_ANIM_OAMSET_SLOTS_GOLEM_2
+	dbw $10, .OAMData_SlotsChansey1 ; SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_1
+	dbw $10, .OAMData_SlotsChansey2 ; SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_2
+	dbw $10, .OAMData_SlotsChansey3 ; SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_3
+	dbw $10, .OAMData_SlotsChansey4 ; SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_4
+	dbw $10, .OAMData_SlotsChansey5 ; SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_5
+	dbw $3a, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_SLOTS_EGG
+	dbw $00, .OAMData_RedWalk ; SPRITE_ANIM_OAMSET_STILL_CURSOR
+	dbw $00, .OAMData_TradePokeBall1 ; SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1
+	dbw $02, .OAMData_MagnetTrainRed ; SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2
+	dbw $06, .OAMData_TradePoofBubble ; SPRITE_ANIM_OAMSET_TRADE_POOF_1
+	dbw $0a, .OAMData_TradePoofBubble ; SPRITE_ANIM_OAMSET_TRADE_POOF_2
+	dbw $0e, .OAMData_TradePoofBubble ; SPRITE_ANIM_OAMSET_TRADE_POOF_3
+	dbw $12, .OAMData_35 ; SPRITE_ANIM_OAMSET_35
+	dbw $13, .OAMData_35 ; SPRITE_ANIM_OAMSET_36
+	dbw $00, .OAMData_RedWalk ; SPRITE_ANIM_OAMSET_TRADEMON_ICON_1
+	dbw $04, .OAMData_RedWalk ; SPRITE_ANIM_OAMSET_TRADEMON_ICON_2
+	dbw $10, .OAMData_TradePoofBubble ; SPRITE_ANIM_OAMSET_TRADEMON_BUBBLE
+	dbw $00, .OAMData_MagnetTrainRed ; SPRITE_ANIM_OAMSET_EVOLUTION_BALL_OF_LIGHT_1
+	dbw $04, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_EVOLUTION_BALL_OF_LIGHT_2
+	dbw $00, .OAMData_RadioTuningKnob ; SPRITE_ANIM_OAMSET_RADIO_TUNING_KNOB
+	dbw $00, .OAMData_PartyMonWithMail1 ; SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_1
+	dbw $00, .OAMData_PartyMonWithMail2 ; SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_2
+	dbw $00, .OAMData_PartyMonWithItem1 ; SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_1
+	dbw $00, .OAMData_PartyMonWithItem2 ; SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_2
+	dbw $00, .OAMData_MagnetTrainRed ; SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_1
+	dbw $04, .OAMData_MagnetTrainRed ; SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_2
+	dbw $00, .OAMData_43 ; SPRITE_ANIM_OAMSET_43
+	dbw $30, .OAMData_43 ; SPRITE_ANIM_OAMSET_44
+	dbw $03, .OAMData_43 ; SPRITE_ANIM_OAMSET_45
+	dbw $33, .OAMData_43 ; SPRITE_ANIM_OAMSET_46
+	dbw $06, .OAMData_43 ; SPRITE_ANIM_OAMSET_47
+	dbw $36, .OAMData_43 ; SPRITE_ANIM_OAMSET_48
+	dbw $09, .OAMData_43 ; SPRITE_ANIM_OAMSET_49
+	dbw $39, .OAMData_43 ; SPRITE_ANIM_OAMSET_4A
+	dbw $0c, .OAMData_4b ; SPRITE_ANIM_OAMSET_4B
+	dbw $0c, .OAMData_4c ; SPRITE_ANIM_OAMSET_4C
+	dbw $3c, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_4D
+	dbw $3e, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_4E
+	dbw $00, .OAMData_Leaf ; SPRITE_ANIM_OAMSET_LEAF
+	dbw $00, .OAMData_Tree ; SPRITE_ANIM_OAMSET_TREE_1
+	dbw $00, .OAMData_CutTree2 ; SPRITE_ANIM_OAMSET_CUT_TREE_2
+	dbw $00, .OAMData_CutTree3 ; SPRITE_ANIM_OAMSET_CUT_TREE_3
+	dbw $00, .OAMData_CutTree4 ; SPRITE_ANIM_OAMSET_CUT_TREE_4
+	dbw $00, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_EGG_CRACK
+	dbw $01, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_55
+	dbw $00, .OAMData_56 ; SPRITE_ANIM_OAMSET_56
+	dbw $00, .OAMData_57 ; SPRITE_ANIM_OAMSET_57
+	dbw $00, .OAMData_58 ; SPRITE_ANIM_OAMSET_58
+	dbw $00, .OAMData_59 ; SPRITE_ANIM_OAMSET_59
+	dbw $00, .OAMData_5a ; SPRITE_ANIM_OAMSET_5A
+	dbw $04, .OAMData_Tree ; SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2
+	dbw $00, .OAMData_5c ; SPRITE_ANIM_OAMSET_5C
+	dbw $00, .OAMData_5d ; SPRITE_ANIM_OAMSET_5D
+	dbw $00, .OAMData_5e ; SPRITE_ANIM_OAMSET_5E
+	dbw $00, .OAMData_5f ; SPRITE_ANIM_OAMSET_5F
+	dbw $00, .OAMData_60 ; SPRITE_ANIM_OAMSET_60
+	dbw $00, .OAMData_61 ; SPRITE_ANIM_OAMSET_61
+	dbw $00, .OAMData_62 ; SPRITE_ANIM_OAMSET_62
+	dbw $00, .OAMData_BlueWalk ; SPRITE_ANIM_OAMSET_BLUE_WALK_1
+	dbw $04, .OAMData_BlueWalk ; SPRITE_ANIM_OAMSET_BLUE_WALK_2
+	dbw $00, .OAMData_MagnetTrainBlue ; SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_1
+	dbw $04, .OAMData_MagnetTrainBlue ; SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_2
+	dbw $20, .OAMData_ForMobile22 ; SPRITE_ANIM_OAMSET_FOR_MOBILE_22_1
+	dbw $21, .OAMData_ForMobile22 ; SPRITE_ANIM_OAMSET_FOR_MOBILE_22_2
+	dbw $22, .OAMData_ForMobile25_1 ; SPRITE_ANIM_OAMSET_FOR_MOBILE_25_1
+	dbw $23, .OAMData_ForMobile25_2 ; SPRITE_ANIM_OAMSET_FOR_MOBILE_25_2
+	dbw $27, .OAMData_ForMobile25_3 ; SPRITE_ANIM_OAMSET_FOR_MOBILE_25_3
+	dbw $2a, .OAMData_ForMobile23 ; SPRITE_ANIM_OAMSET_FOR_MOBILE_23
+	dbw $2a, .OAMData_ForMobile24 ; SPRITE_ANIM_OAMSET_FOR_MOBILE_24
+	dbw $00, .OAMData_IntroSuicune1 ; SPRITE_ANIM_OAMSET_INTRO_SUICUNE_1
+	dbw $08, .OAMData_IntroSuicune2 ; SPRITE_ANIM_OAMSET_INTRO_SUICUNE_2
+	dbw $60, .OAMData_IntroSuicune3 ; SPRITE_ANIM_OAMSET_INTRO_SUICUNE_3
+	dbw $68, .OAMData_IntroSuicune4 ; SPRITE_ANIM_OAMSET_INTRO_SUICUNE_4
+	dbw $00, .OAMData_IntroPichu ; SPRITE_ANIM_OAMSET_INTRO_PICHU_1
+	dbw $05, .OAMData_IntroPichu ; SPRITE_ANIM_OAMSET_INTRO_PICHU_2
+	dbw $0a, .OAMData_IntroPichu ; SPRITE_ANIM_OAMSET_INTRO_PICHU_3
+	dbw $50, .OAMData_IntroWooper ; SPRITE_ANIM_OAMSET_INTRO_WOOPER
+	dbw $00, .OAMData_IntroUnown1 ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_1
+	dbw $01, .OAMData_IntroUnown2 ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_2
+	dbw $04, .OAMData_IntroUnown3 ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_3
+	dbw $00, .OAMData_18 ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_1
+	dbw $01, .OAMData_IntroUnownF2_2 ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_2
+	dbw $03, .OAMData_IntroUnownF2_3 ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_3
+	dbw $08, .OAMData_IntroUnownF2_4_5 ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_4
+	dbw $1c, .OAMData_IntroUnownF2_4_5 ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_5
+	dbw $80, .OAMData_IntroSuicuneAway ; SPRITE_ANIM_OAMSET_INTRO_SUICUNE_AWAY
+	dbw $00, .OAMData_Celebi ; SPRITE_ANIM_OAMSET_CELEBI_1
+	dbw $04, .OAMData_Celebi ; SPRITE_ANIM_OAMSET_CELEBI_2
+	dbw $d0, .OAMData_GameFreakLogo1_3 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_1
+	dbw $d3, .OAMData_GameFreakLogo1_3 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_2
+	dbw $d6, .OAMData_GameFreakLogo1_3 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_3
+	dbw $6c, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_4
+	dbw $68, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_5
+	dbw $64, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_6
+	dbw $60, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_7
+	dbw $0c, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_8
+	dbw $08, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_9
+	dbw $04, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_10
+	dbw $00, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_11
 
 .OAMData_1x1_Palette0:
 	db 1
diff --git a/data/sprite_anim_seqs.asm b/data/sprite_anims/sequences.asm
index 70544a60a..70544a60a 100644
--- a/data/sprite_anim_seqs.asm
+++ b/data/sprite_anims/sequences.asm
diff --git a/data/sprites.asm b/data/sprites.asm
new file mode 100644
index 000000000..214b14757
--- /dev/null
+++ b/data/sprites.asm
@@ -0,0 +1,111 @@
+overworld_sprite: MACRO
+; pointer, length, type, palette
+	dw \1
+	db \2 * 4 tiles, BANK(\1)
+	db \3, \4
+ENDM
+
+OverworldSprites: ; 14736
+; entries correspond to SPRITE_* constants
+	overworld_sprite ChrisSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite ChrisBikeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite GameboyKidSpriteGFX, 3, STANDING_SPRITE, PAL_OW_GREEN
+	overworld_sprite SilverSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite OakSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite RedSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite BlueSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite BillSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite ElderSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite JanineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite KurtSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite MomSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite BlaineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite RedsMomSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite DaisySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite ElmSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite WillSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED
+	overworld_sprite FalknerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite WhitneySpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite BugsySpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN
+	overworld_sprite MortySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite ChuckSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite JasmineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN
+	overworld_sprite PryceSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite ClairSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite BrockSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite KarenSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE
+	overworld_sprite BrunoSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite MistySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite LanceSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite SurgeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN
+	overworld_sprite ErikaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN
+	overworld_sprite KogaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite SabrinaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite CooltrainerMSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite CooltrainerFSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite BugCatcherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite TwinSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite YoungsterSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite LassSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite TeacherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite BuenaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite SuperNerdSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite RockerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN
+	overworld_sprite PokefanMSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite PokefanFSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite GrampsSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite GrannySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite SwimmerGuySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite SwimmerGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite BigSnorlaxSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE
+	overworld_sprite SurfingPikachuSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite RocketSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite RocketGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite NurseSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED
+	overworld_sprite LinkReceptionistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite ClerkSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN
+	overworld_sprite FisherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite FishingGuruSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite ScientistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite KimonoGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite SageSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite UnusedGuySpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED
+	overworld_sprite GentlemanSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite BlackBeltSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite ReceptionistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite OfficerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite CalSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite SlowpokeSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED
+	overworld_sprite CaptainSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite BigLaprasSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE
+	overworld_sprite GymGuySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite SailorSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite BikerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite PharmacistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite MonsterSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite FairySpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite BirdSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite DragonSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite BigOnixSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BROWN
+	overworld_sprite N64SpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN
+	overworld_sprite SudowoodoSpriteGFX, 3, STANDING_SPRITE, PAL_OW_GREEN
+	overworld_sprite SurfSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite PokeBallSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED
+	overworld_sprite PokedexSpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN
+	overworld_sprite PaperSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE
+	overworld_sprite VirtualBoySpriteGFX, 1, STILL_SPRITE, PAL_OW_RED
+	overworld_sprite OldLinkReceptionistSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED
+	overworld_sprite RockSpriteGFX, 1, STILL_SPRITE, PAL_OW_ROCK
+	overworld_sprite BoulderSpriteGFX, 1, STILL_SPRITE, PAL_OW_ROCK
+	overworld_sprite SnesSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE
+	overworld_sprite FamicomSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED
+	overworld_sprite FruitTreeSpriteGFX, 1, STILL_SPRITE, PAL_OW_TREE
+	overworld_sprite GoldTrophySpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN
+	overworld_sprite SilverTrophySpriteGFX, 1, STILL_SPRITE, PAL_OW_SILVER
+	overworld_sprite KrisSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite KrisBikeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite KurtOutsideSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BROWN
+	overworld_sprite SuicuneSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE
+	overworld_sprite EnteiSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED
+	overworld_sprite RaikouSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED
+	overworld_sprite StandingYoungsterSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE
diff --git a/data/trainers/trainer_attributes.asm b/data/trainers/attributes.asm
index 224e460c9..224e460c9 100644
--- a/data/trainers/trainer_attributes.asm
+++ b/data/trainers/attributes.asm
diff --git a/data/trainers/trainer_class_names.asm b/data/trainers/class_names.asm
index 48d81f910..48d81f910 100755
--- a/data/trainers/trainer_class_names.asm
+++ b/data/trainers/class_names.asm
diff --git a/data/trainers/trainer_dvs.asm b/data/trainers/dvs.asm
index 503c468d3..06f486774 100644
--- a/data/trainers/trainer_dvs.asm
+++ b/data/trainers/dvs.asm
@@ -1,24 +1,3 @@
-GetTrainerDVs: ; 270c4
-; Return the DVs of OtherTrainerClass in bc
-
-	push hl
-	ld a, [OtherTrainerClass]
-	dec a
-	ld c, a
-	ld b, 0
-
-	ld hl, TrainerClassDVs
-	add hl, bc
-	add hl, bc
-
-	ld a, [hli]
-	ld b, a
-	ld c, [hl]
-
-	pop hl
-	ret
-; 270d6
-
 TrainerClassDVs: ; 270d6
 ; entries correspond to trainer classes (see constants/trainer_constants.asm)
 	;  Atk  Spd
diff --git a/gfx/trainer_palettes.asm b/data/trainers/palettes.asm
index c943e49d7..c943e49d7 100644
--- a/gfx/trainer_palettes.asm
+++ b/data/trainers/palettes.asm
diff --git a/gfx/trainer_pic_pointers.asm b/data/trainers/pic_pointers.asm
index 201b44200..201b44200 100644
--- a/gfx/trainer_pic_pointers.asm
+++ b/data/trainers/pic_pointers.asm
diff --git a/battle/type_matchup.asm b/data/type_matchups.asm
index f330d8710..61fd19078 100644
--- a/battle/type_matchup.asm
+++ b/data/type_matchups.asm
@@ -1,13 +1,11 @@
 ; The multiplier is divided by 10, so we can use values like 0.5.
-
+; All other cases are neutral (1x).
 SUPER_EFFECTIVE    EQU 20
 NOT_VERY_EFFECTIVE EQU 05
 NO_EFFECT          EQU 00
 
-; All other cases are neutral (1x).
-
-	;  attacker  defender*=
-
+TypeMatchups: ; 34bb1
+	;  attacker,  defender,  *=
 	db NORMAL,    ROCK,      NOT_VERY_EFFECTIVE
 	db NORMAL,    STEEL,     NOT_VERY_EFFECTIVE
 	db FIRE,      FIRE,      NOT_VERY_EFFECTIVE
@@ -117,12 +115,11 @@ NO_EFFECT          EQU 00
 	db STEEL,     ROCK,      SUPER_EFFECTIVE
 	db STEEL,     STEEL,     NOT_VERY_EFFECTIVE
 
+	db $fe ; end
 
 ; Foresight removes Ghost's immunities.
-
-	db $fe
-
 	db NORMAL,    GHOST,     NO_EFFECT
 	db FIGHTING,  GHOST,     NO_EFFECT
 
-	db $ff ; end
+	db $ff ; end (with Foresight)
+; 34cfd
diff --git a/data/type_names.asm b/data/type_names.asm
new file mode 100644
index 000000000..d86fd62c7
--- /dev/null
+++ b/data/type_names.asm
@@ -0,0 +1,50 @@
+TypeNames: ; 5097b
+; entries correspond to types (see constants/type_constants.asm)
+	dw Normal
+	dw Fighting
+	dw Flying
+	dw Poison
+	dw Ground
+	dw Rock
+	dw Bird
+	dw Bug
+	dw Ghost
+	dw Steel
+	dw Normal
+	dw Normal
+	dw Normal
+	dw Normal
+	dw Normal
+	dw Normal
+	dw Normal
+	dw Normal
+	dw Normal
+	dw CurseType
+	dw Fire
+	dw Water
+	dw Grass
+	dw Electric
+	dw Psychic
+	dw Ice
+	dw Dragon
+	dw Dark
+
+Normal:    db "NORMAL@"
+Fighting:  db "FIGHTING@"
+Flying:    db "FLYING@"
+Poison:    db "POISON@"
+CurseType: db "???@"
+Fire:      db "FIRE@"
+Water:     db "WATER@"
+Grass:     db "GRASS@"
+Electric:  db "ELECTRIC@"
+Psychic:   db "PSYCHIC@"
+Ice:       db "ICE@"
+Ground:    db "GROUND@"
+Rock:      db "ROCK@"
+Bird:      db "BIRD@"
+Bug:       db "BUG@"
+Ghost:     db "GHOST@"
+Steel:     db "STEEL@"
+Dragon:    db "DRAGON@"
+Dark:      db "DARK@"
diff --git a/data/battle/flee_mons.asm b/data/wild/flee_mons.asm
index 1b1cea036..1b1cea036 100644
--- a/data/battle/flee_mons.asm
+++ b/data/wild/flee_mons.asm
diff --git a/docs/move_anim_commands.md b/docs/battle_anim_commands.md
index 1b9bd5b8f..5b457bf69 100644
--- a/docs/move_anim_commands.md
+++ b/docs/battle_anim_commands.md
@@ -1,6 +1,6 @@
-# Move Animation Commands
+# Battle Animation Commands
 
-Defined in [macros/scripts/move_anim.asm](/macros/scripts/move_anim.asm) and [battle/anims.asm:BattleAnimations](/battle/anims.asm).
+Defined in [macros/scripts/battle_anims.asm](/macros/scripts/battle_anims.asm) and [data/moves/animations.asm:BattleAnimations](/data/moves/animations.asm).
 
 
 ## `$00`−`$EF`: `anim_wait` *length*
diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md
index bf170881a..69f902eb0 100644
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -56,7 +56,7 @@
 
 ([Video](https://www.youtube.com/watch?v=rGqu3d3pdok&t=450))
 
-This is a bug with `SpeciesItemBoost` in [battle/effect_commands.asm](/battle/effect_commands.asm):
+This is a bug with `SpeciesItemBoost` in [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm):
 
 ```asm
 ; Double the stat
@@ -90,7 +90,7 @@ This is a bug with `SpeciesItemBoost` in [battle/effect_commands.asm](/battle/ef
 
 ([Video](https://www.youtube.com/watch?v=rGqu3d3pdok&t=450))
 
-This is a bug with `DittoMetalPowder` in [battle/effect_commands.asm](/battle/effect_commands.asm):
+This is a bug with `DittoMetalPowder` in [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm):
 
 ```asm
 	ld a, c
@@ -146,7 +146,7 @@ This is a bug with `DittoMetalPowder` in [battle/effect_commands.asm](/battle/ef
 
 ([Video](https://www.youtube.com/watch?v=zuCLMikWo4Y))
 
-This is a bug with `BattleCommand_BellyDrum` in [battle/effect_commands.asm](/battle/effect_commands.asm):
+This is a bug with `BattleCommand_BellyDrum` in [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm):
 
 ```asm
 BattleCommand_BellyDrum: ; 37c1a
@@ -186,7 +186,7 @@ BattleCommand_BellyDrum: ; 37c1a
 
 This bug affects Acid, Iron Tail, and Rock Smash.
 
-This is a bug with `DefenseDownHit` in [battle/moves/move_effects.asm](/battle/moves/move_effects.asm):
+This is a bug with `DefenseDownHit` in [data/moves/effects.asm](/data/moves/effects.asm):
 
 ```asm
 DefenseDownHit:
@@ -227,7 +227,7 @@ DefenseDownHit:
 
 ([Video](https://www.youtube.com/watch?v=1v9x4SgMggs))
 
-This is a bug with `CheckPlayerHasUsableMoves` in [battle/core.asm](/battle/core.asm):
+This is a bug with `CheckPlayerHasUsableMoves` in [engine/battle/core.asm](/engine/battle/core.asm):
 
 ```asm
 .done
@@ -259,7 +259,7 @@ This is a bug with `CheckPlayerHasUsableMoves` in [battle/core.asm](/battle/core
 
 This bug affects Attract, Curse, Foresight, Mean Look, Mimic, Nightmare, Spider Web, Transform, and stat-lowering effects of moves like String Shot or Bubble during the semi-invulnerable turn of Fly or Dig.
 
-This is a bug with `CheckHiddenOpponent` in [battle/effect_commands.asm](/battle/effect_commands.asm):
+This is a bug with `CheckHiddenOpponent` in [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm):
 
 ```asm
 CheckHiddenOpponent: ; 37daa
@@ -277,7 +277,7 @@ CheckHiddenOpponent: ; 37daa
 
 ([Video](https://www.youtube.com/watch?v=202-iAsrIa8))
 
-This is a bug with `BattleCommand_BeatUp` in [battle/effect_commands.asm](/battle/effect_commands.asm):
+This is a bug with `BattleCommand_BeatUp` in [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm):
 
 ```asm
 .got_mon
@@ -314,7 +314,7 @@ This is a bug with `BattleCommand_BeatUp` in [battle/effect_commands.asm](/battl
 
 This bug existed for all battles in Gold and Silver, and was only fixed for single-player battles in Crystal to preserve link compatibility.
 
-This is a bug with `BattleCommand_Present` in [battle/effects/present.asm](/battle/effects/present.asm):
+This is a bug with `BattleCommand_Present` in [engine/battle/effect_commands/present.asm](/engine/battle/effect_commands/present.asm):
 
 ```asm
 BattleCommand_Present: ; 37874
@@ -355,7 +355,7 @@ BattleCommand_Present: ; 37874
 
 ([Video](https://www.youtube.com/watch?v=cygMO-zHTls))
 
-This is a bug with `AI_Smart_MeanLook` in [battle/ai/scoring.asm](/battle/ai/scoring.asm):
+This is a bug with `AI_Smart_MeanLook` in [engine/battle/ai/scoring.asm](/engine/battle/ai/scoring.asm):
 
 ```asm
 ; 80% chance to greatly encourage this move if the enemy is badly poisoned (buggy).
@@ -370,7 +370,7 @@ This is a bug with `AI_Smart_MeanLook` in [battle/ai/scoring.asm](/battle/ai/sco
 
 ## AI makes a false assumption about `CheckTypeMatchup`
 
-In [battle/effect_commands.asm](/battle/effect_commands.asm):
+In [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm):
 
 ```asm
 BattleCheckTypeMatchup: ; 347c8
@@ -401,7 +401,7 @@ CheckTypeMatchup: ; 347d3
 
 ([Video](https://www.youtube.com/watch?v=rGqu3d3pdok&t=322))
 
-This is a bug with `AI_HealStatus` in [battle/ai/items.asm](/battle/ai/items.asm):
+This is a bug with `AI_HealStatus` in [engine/battle/ai/items.asm](/engine/battle/ai/items.asm):
 
 ```asm
 AI_HealStatus: ; 384e0
@@ -429,7 +429,7 @@ AI_HealStatus: ; 384e0
 
 ([Video](https://www.youtube.com/watch?v=SE-BfsFgZVM))
 
-This is a bug with `LongAnim_UpdateVariables` in [engine/anim_hp_bar.asm](/engine/anim_hp_bar.asm):
+This is a bug with `LongAnim_UpdateVariables` in [engine/battle/anim_hp_bar.asm](/engine/battle/anim_hp_bar.asm):
 
 ```asm
 	; This routine is buggy. The result from ComputeHPBarPixels is stored
@@ -661,7 +661,7 @@ FastBallMultiplier:
 
 ## Dragon Scale, not Dragon Fang, boosts Dragon-type moves
 
-This is a bug with `ItemAttributes` in [items/item_attributes.asm](/items/item_attributes.asm):
+This is a bug with `ItemAttributes` in [items/attributes.asm](/items/attributes.asm):
 
 ```asm
 ; DRAGON FANG
@@ -678,7 +678,7 @@ This is a bug with `ItemAttributes` in [items/item_attributes.asm](/items/item_a
 
 ## Daisy's grooming doesn't always increase happiness
 
-This is a bug with `MassageOrHaircut` in [event/special.asm](/event/special.asm):
+This is a bug with `MassageOrHaircut` in [engine/events/special.asm](/engine/events/special.asm):
 
 ```asm
 ; Bug: Subtracting $ff from $ff fails to set c.
@@ -727,7 +727,7 @@ Data_DaisyMassage: ; 746b
 
 ## Magikarp in Lake of Rage are shorter, not longer
 
-This is a bug with `LoadEnemyMon.CheckMagikarpArea` in [battle/core.asm](/battle/core.asm):
+This is a bug with `LoadEnemyMon.CheckMagikarpArea` in [engine/battle/core.asm](/engine/battle/core.asm):
 
 ```asm
 .CheckMagikarpArea:
@@ -753,7 +753,7 @@ This is a bug with `LoadEnemyMon.CheckMagikarpArea` in [battle/core.asm](/battle
 
 ## Magikarp lengths can be miscalculated
 
-This is a bug with `CalcMagikarpLength.BCLessThanDE` in [event/magikarp.asm](/event/magikarp.asm):
+This is a bug with `CalcMagikarpLength.BCLessThanDE` in [engine/events/magikarp.asm](/engine/events/magikarp.asm):
 
 ```asm
 .BCLessThanDE: ; fbc9a
@@ -1348,7 +1348,7 @@ In [engine/events.asm](/engine/events.asm):
 
 ## `Special_CheckBugContestContestantFlag` can read beyond its data table
 
-In [event/bug_contest_2.asm](/event/bug_contest_2.asm):
+In [engine/events/bug_contest/contest_2.asm](/engine/events/bug_contest/contest_2.asm):
 
 ```asm
 Special_CheckBugContestContestantFlag: ; 139ed
@@ -1398,8 +1398,8 @@ ClearWRAM:: ; 25a
 	push af
 	ld [rSVBK], a
 	xor a
-	ld hl, wRAM1Start
-	ld bc, $1000
+	ld hl, WRAM1_Begin
+	ld bc, WRAM1_End - WRAM1_Begin
 	call ByteFill
 	pop af
 	inc a
diff --git a/docs/event_commands.md b/docs/event_commands.md
index 151d74b54..b4314bd24 100644
--- a/docs/event_commands.md
+++ b/docs/event_commands.md
@@ -1,6 +1,6 @@
 # Event Commands
 
-Defined in [macros/scripts/event.asm](/macros/scripts/event.asm) and [engine/scripting.asm:ScriptCommandTable](/engine/scripting.asm).
+Defined in [macros/scripts/events.asm](/macros/scripts/events.asm) and [engine/scripting.asm:ScriptCommandTable](/engine/scripting.asm).
 
 
 ## `$00`: `scall` *script*
diff --git a/docs/effect_commands.md b/docs/move_effect_commands.md
index 3112950a9..b8b09c5c2 100644
--- a/docs/effect_commands.md
+++ b/docs/move_effect_commands.md
@@ -1,6 +1,6 @@
-# Effect Commands
+# Move Effect Commands
 
-Defined in [macros/scripts/effect_commands.asm](/macros/scripts/effect_commands.asm) and [battle/effect_command_pointers.asm:BattleCommandPointers](/battle/effect_command_pointers.asm).
+Defined in [macros/scripts/battle_commands.asm](/macros/scripts/battle_commands.asm) and [data/battle_command_pointers.asm:BattleCommandPointers](/data/battle_command_pointers.asm).
 
 
 ## `$01`: `checkturn`
diff --git a/docs/music_commands.md b/docs/music_commands.md
index 43d607ff9..7f7bd8b32 100644
--- a/docs/music_commands.md
+++ b/docs/music_commands.md
@@ -2,13 +2,11 @@
 
 Defined in [macros/scripts/audio.asm](/macros/scripts/audio.asm) and [audio/engine.asm:MusicCommands](/audio/engine.asm).
 
-See also: [Sound Engine Commands](https://github.com/pret/pokecrystal/wiki/Sound-Engine-Commands)
+*See also: [Sound Engine Commands](https://github.com/pret/pokecrystal/wiki/Sound-Engine-Commands)*
 
 
 ## `musicheader` *n*, *index*, *address*
 
-## `cry_header` *n*, *index*, *address*
-
 ## `note` *pitch*, *length*
 
 (Used on all channels)
diff --git a/docs/pic_animations.md b/docs/pic_animations.md
index 57c7f151a..ba11a1dc1 100644
--- a/docs/pic_animations.md
+++ b/docs/pic_animations.md
@@ -1,7 +1,6 @@
 # Pic Animations
 
-Defined in [macros/scripts/gfx_anim.asm](/macros/scripts/gfx_anim.asm) and [battle/anim_commands.asm:BattleAnimCommands](/battle/anim_commands.asm).
-
+Defined in [macros/scripts/gfx_anims.asm](/macros/scripts/gfx_anims.asm).
 
 Pic animations are assembled in 3 parts:
 
@@ -20,12 +19,12 @@ Pic animations are assembled in 3 parts:
 
 Animation data is in these files:
 
-- gfx/pics/anims.asm:
+- [gfx/pokemon/anims.asm](/gfx/pokemon/anims.asm):
   Main animations (played everywhere)
 
-- gfx/pics/extras.asm:
+- [gfx/pokemon/extras.asm](/gfx/pokemon/extras.asm):
   Extra animations, appended to the main animation.  
   Used in the status screen (blinking, tail wags etc.)
 
-- gfx/pics/unown_anims.asm and gfx/pics/unown_extras.asm:
+- [gfx/pokemon/unown_anims.asm](/gfx/pokemon/unown_anims.asm) and [gfx/pokemon/unown_extras.asm](/gfx/pokemon/unown_extras.asm):
   Unown has its own animation data despite having an entry in the main tables.
diff --git a/battle/ai/items.asm b/engine/battle/ai/items.asm
index 09595077a..09595077a 100644
--- a/battle/ai/items.asm
+++ b/engine/battle/ai/items.asm
diff --git a/battle/ai/move.asm b/engine/battle/ai/move.asm
index 11586c0da..11586c0da 100755
--- a/battle/ai/move.asm
+++ b/engine/battle/ai/move.asm
diff --git a/battle/ai/redundant.asm b/engine/battle/ai/redundant.asm
index 2e8f7c6df..2e8f7c6df 100755
--- a/battle/ai/redundant.asm
+++ b/engine/battle/ai/redundant.asm
diff --git a/battle/ai/scoring.asm b/engine/battle/ai/scoring.asm
index 44194d6f7..44194d6f7 100644
--- a/battle/ai/scoring.asm
+++ b/engine/battle/ai/scoring.asm
diff --git a/battle/ai/switch.asm b/engine/battle/ai/switch.asm
index c2f83fa1f..c2f83fa1f 100755
--- a/battle/ai/switch.asm
+++ b/engine/battle/ai/switch.asm
diff --git a/engine/anim_hp_bar.asm b/engine/battle/anim_hp_bar.asm
index 78062b547..78062b547 100755
--- a/engine/anim_hp_bar.asm
+++ b/engine/battle/anim_hp_bar.asm
diff --git a/engine/battle_transition.asm b/engine/battle/battle_transition.asm
index bef74ad29..bef74ad29 100644
--- a/engine/battle_transition.asm
+++ b/engine/battle/battle_transition.asm
diff --git a/engine/routines/battlestart_copytilemapatonce.asm b/engine/battle/battlestart_copytilemapatonce.asm
index 2952e833b..2952e833b 100644
--- a/engine/routines/battlestart_copytilemapatonce.asm
+++ b/engine/battle/battlestart_copytilemapatonce.asm
diff --git a/engine/routines/checkbattlescene.asm b/engine/battle/checkbattlescene.asm
index b63f00907..b63f00907 100644
--- a/engine/routines/checkbattlescene.asm
+++ b/engine/battle/checkbattlescene.asm
diff --git a/engine/routines/consumehelditem.asm b/engine/battle/consumehelditem.asm
index a6f7766fb..a6f7766fb 100644
--- a/engine/routines/consumehelditem.asm
+++ b/engine/battle/consumehelditem.asm
diff --git a/battle/core.asm b/engine/battle/core.asm
index 3a6d7ac9e..a62b70d72 100644
--- a/battle/core.asm
+++ b/engine/battle/core.asm
@@ -820,7 +820,7 @@ TryEnemyFlee: ; 3c543
 	ret
 ; 3c59a
 
-INCLUDE "data/battle/flee_mons.asm"
+INCLUDE "data/wild/flee_mons.asm"
 
 CompareMovePriority: ; 3c5b4
 ; Compare the priority of the player and enemy's moves.
diff --git a/battle/effect_commands.asm b/engine/battle/effect_commands.asm
index f2c6b5d77..5922afea3 100644
--- a/battle/effect_commands.asm
+++ b/engine/battle/effect_commands.asm
@@ -1428,7 +1428,7 @@ BattleCommand_Stab: ; 346d2
 	ld a, BATTLE_VARS_MOVE_TYPE
 	call GetBattleVar
 	ld b, a
-	ld hl, TypeMatchup
+	ld hl, TypeMatchups
 
 .TypesLoop:
 	ld a, [hli]
@@ -1559,7 +1559,7 @@ CheckTypeMatchup: ; 347d3
 	ld c, [hl]
 	ld a, 10 ; 1.0
 	ld [wTypeMatchup], a
-	ld hl, TypeMatchup
+	ld hl, TypeMatchups
 .TypesLoop:
 	ld a, [hli]
 	cp $ff
@@ -1638,12 +1638,9 @@ BattleCommand_ResetTypeMatchup: ; 34833
 
 ; 3484e
 
-INCLUDE "battle/ai/switch.asm"
-
-TypeMatchup: ; 34bb1
-INCLUDE "battle/type_matchup.asm"
-; 34cfd
+INCLUDE "engine/battle/ai/switch.asm"
 
+INCLUDE "data/type_matchups.asm"
 
 BattleCommand_DamageVariation: ; 34cfd
 ; damagevariation
@@ -8413,7 +8410,7 @@ BattleCommand_Heal: ; 3713e
 
 ; 371cd
 
-INCLUDE "battle/effects/transform.asm"
+INCLUDE "engine/battle/effect_commands/transform.asm"
 
 BattleSideCopy: ; 372c6
 ; Copy bc bytes from hl to de if it's the player's turn.
@@ -8640,9 +8637,9 @@ BattleCommand_Selfdestruct: ; 37380
 ; 373c9
 
 
-INCLUDE "battle/effects/mirror_move.asm"
+INCLUDE "engine/battle/effect_commands/mirror_move.asm"
 
-INCLUDE "battle/effects/metronome.asm"
+INCLUDE "engine/battle/effect_commands/metronome.asm"
 
 
 CheckUserMove: ; 37462
@@ -8689,7 +8686,7 @@ ResetTurn: ; 3747b
 ; 37492
 
 
-INCLUDE "battle/effects/thief.asm"
+INCLUDE "engine/battle/effect_commands/thief.asm"
 
 
 BattleCommand_ArenaTrap: ; 37517
@@ -8721,7 +8718,7 @@ BattleCommand_ArenaTrap: ; 37517
 ; 37536
 
 
-INCLUDE "battle/effects/nightmare.asm"
+INCLUDE "engine/battle/effect_commands/nightmare.asm"
 
 
 BattleCommand_Defrost: ; 37563
@@ -8758,21 +8755,21 @@ BattleCommand_Defrost: ; 37563
 ; 37588
 
 
-INCLUDE "battle/effects/curse.asm"
+INCLUDE "engine/battle/effect_commands/curse.asm"
 
-INCLUDE "battle/effects/protect.asm"
+INCLUDE "engine/battle/effect_commands/protect.asm"
 
-INCLUDE "battle/effects/endure.asm"
+INCLUDE "engine/battle/effect_commands/endure.asm"
 
-INCLUDE "battle/effects/spikes.asm"
+INCLUDE "engine/battle/effect_commands/spikes.asm"
 
-INCLUDE "battle/effects/foresight.asm"
+INCLUDE "engine/battle/effect_commands/foresight.asm"
 
-INCLUDE "battle/effects/perish_song.asm"
+INCLUDE "engine/battle/effect_commands/perish_song.asm"
 
-INCLUDE "battle/effects/sandstorm.asm"
+INCLUDE "engine/battle/effect_commands/sandstorm.asm"
 
-INCLUDE "battle/effects/rollout.asm"
+INCLUDE "engine/battle/effect_commands/rollout.asm"
 
 
 BattleCommand5d: ; 37791
@@ -8845,7 +8842,7 @@ ResetFuryCutterCount: ; 377be
 ; 377ce
 
 
-INCLUDE "battle/effects/attract.asm"
+INCLUDE "engine/battle/effect_commands/attract.asm"
 
 BattleCommand_HappinessPower: ; 3784b
 ; happinesspower
@@ -8876,7 +8873,7 @@ BattleCommand_HappinessPower: ; 3784b
 ; 37874
 
 
-INCLUDE "battle/effects/present.asm"
+INCLUDE "engine/battle/effect_commands/present.asm"
 
 BattleCommand_FrustrationPower: ; 3790e
 ; frustrationpower
diff --git a/battle/effects/attract.asm b/engine/battle/effect_commands/attract.asm
index 0a6d7c975..0a6d7c975 100755
--- a/battle/effects/attract.asm
+++ b/engine/battle/effect_commands/attract.asm
diff --git a/battle/effects/curse.asm b/engine/battle/effect_commands/curse.asm
index dceb3b8d5..dceb3b8d5 100644
--- a/battle/effects/curse.asm
+++ b/engine/battle/effect_commands/curse.asm
diff --git a/battle/effects/endure.asm b/engine/battle/effect_commands/endure.asm
index ed4329ff5..ed4329ff5 100644
--- a/battle/effects/endure.asm
+++ b/engine/battle/effect_commands/endure.asm
diff --git a/battle/effects/foresight.asm b/engine/battle/effect_commands/foresight.asm
index 6f4f97cd2..6f4f97cd2 100644
--- a/battle/effects/foresight.asm
+++ b/engine/battle/effect_commands/foresight.asm
diff --git a/battle/effects/metronome.asm b/engine/battle/effect_commands/metronome.asm
index 1908df84d..1908df84d 100644
--- a/battle/effects/metronome.asm
+++ b/engine/battle/effect_commands/metronome.asm
diff --git a/battle/effects/mirror_move.asm b/engine/battle/effect_commands/mirror_move.asm
index c4f208d77..c4f208d77 100644
--- a/battle/effects/mirror_move.asm
+++ b/engine/battle/effect_commands/mirror_move.asm
diff --git a/battle/effects/nightmare.asm b/engine/battle/effect_commands/nightmare.asm
index 788e3de41..788e3de41 100644
--- a/battle/effects/nightmare.asm
+++ b/engine/battle/effect_commands/nightmare.asm
diff --git a/battle/effects/perish_song.asm b/engine/battle/effect_commands/perish_song.asm
index ac491ef6b..ac491ef6b 100644
--- a/battle/effects/perish_song.asm
+++ b/engine/battle/effect_commands/perish_song.asm
diff --git a/battle/effects/present.asm b/engine/battle/effect_commands/present.asm
index 819294f8c..819294f8c 100755
--- a/battle/effects/present.asm
+++ b/engine/battle/effect_commands/present.asm
diff --git a/battle/effects/protect.asm b/engine/battle/effect_commands/protect.asm
index 568ac00f8..568ac00f8 100644
--- a/battle/effects/protect.asm
+++ b/engine/battle/effect_commands/protect.asm
diff --git a/battle/effects/rollout.asm b/engine/battle/effect_commands/rollout.asm
index 4ce9ab3d8..4ce9ab3d8 100644
--- a/battle/effects/rollout.asm
+++ b/engine/battle/effect_commands/rollout.asm
diff --git a/battle/effects/sandstorm.asm b/engine/battle/effect_commands/sandstorm.asm
index 27b8e8e2c..27b8e8e2c 100644
--- a/battle/effects/sandstorm.asm
+++ b/engine/battle/effect_commands/sandstorm.asm
diff --git a/battle/effects/spikes.asm b/engine/battle/effect_commands/spikes.asm
index 3d15e4cfd..3d15e4cfd 100644
--- a/battle/effects/spikes.asm
+++ b/engine/battle/effect_commands/spikes.asm
diff --git a/battle/effects/thief.asm b/engine/battle/effect_commands/thief.asm
index 6d32d68d4..6d32d68d4 100644
--- a/battle/effects/thief.asm
+++ b/engine/battle/effect_commands/thief.asm
diff --git a/battle/effects/transform.asm b/engine/battle/effect_commands/transform.asm
index 65c3f3e60..65c3f3e60 100755
--- a/battle/effects/transform.asm
+++ b/engine/battle/effect_commands/transform.asm
diff --git a/battle/hidden_power.asm b/engine/battle/hidden_power.asm
index c75a67ab3..c75a67ab3 100644
--- a/battle/hidden_power.asm
+++ b/engine/battle/hidden_power.asm
diff --git a/battle/link_result.asm b/engine/battle/link_result.asm
index cf6102acc..cf6102acc 100755
--- a/battle/link_result.asm
+++ b/engine/battle/link_result.asm
diff --git a/battle/menu.asm b/engine/battle/menu.asm
index 07d3e6081..07d3e6081 100755
--- a/battle/menu.asm
+++ b/engine/battle/menu.asm
diff --git a/battle/misc.asm b/engine/battle/misc.asm
index b05dc8071..b05dc8071 100644
--- a/battle/misc.asm
+++ b/engine/battle/misc.asm
diff --git a/engine/read_trainer_attributes.asm b/engine/battle/read_trainer_attributes.asm
index dfb8d3682..dfb8d3682 100644
--- a/engine/read_trainer_attributes.asm
+++ b/engine/battle/read_trainer_attributes.asm
diff --git a/engine/battle/read_trainer_dvs.asm b/engine/battle/read_trainer_dvs.asm
new file mode 100644
index 000000000..d7c0ff50b
--- /dev/null
+++ b/engine/battle/read_trainer_dvs.asm
@@ -0,0 +1,20 @@
+GetTrainerDVs: ; 270c4
+; Return the DVs of OtherTrainerClass in bc
+
+	push hl
+	ld a, [OtherTrainerClass]
+	dec a
+	ld c, a
+	ld b, 0
+
+	ld hl, TrainerClassDVs
+	add hl, bc
+	add hl, bc
+
+	ld a, [hli]
+	ld b, a
+	ld c, [hl]
+
+	pop hl
+	ret
+; 270d6
diff --git a/engine/read_trainer_party.asm b/engine/battle/read_trainer_party.asm
index 9b7727a84..a09c6dd08 100755
--- a/engine/read_trainer_party.asm
+++ b/engine/battle/read_trainer_party.asm
@@ -1,4 +1,3 @@
-
 ReadTrainerParty: ; 39771
 	ld a, [InBattleTowerBattle]
 	bit 0, a
diff --git a/engine/routines/returntobattle_useball.asm b/engine/battle/returntobattle_useball.asm
index e6e33f900..e6e33f900 100644
--- a/engine/routines/returntobattle_useball.asm
+++ b/engine/battle/returntobattle_useball.asm
diff --git a/battle/sliding_intro.asm b/engine/battle/sliding_intro.asm
index ed78add8e..ed78add8e 100755
--- a/battle/sliding_intro.asm
+++ b/engine/battle/sliding_intro.asm
diff --git a/engine/start_battle.asm b/engine/battle/start_battle.asm
index 8d510b72e..8d510b72e 100644
--- a/engine/start_battle.asm
+++ b/engine/battle/start_battle.asm
diff --git a/battle/trainer_huds.asm b/engine/battle/trainer_huds.asm
index 9efe08414..9efe08414 100755
--- a/battle/trainer_huds.asm
+++ b/engine/battle/trainer_huds.asm
diff --git a/engine/routines/updatebattlehuds.asm b/engine/battle/updatebattlehuds.asm
index ec7f662e8..ec7f662e8 100644
--- a/engine/routines/updatebattlehuds.asm
+++ b/engine/battle/updatebattlehuds.asm
diff --git a/battle/used_move_text.asm b/engine/battle/used_move_text.asm
index ea2351005..ce9e51359 100755
--- a/battle/used_move_text.asm
+++ b/engine/battle/used_move_text.asm
@@ -5,10 +5,8 @@ DisplayUsedMoveText: ; 105db0
 	jp WaitBGMap
 ; 105db9
 
-
 UsedMoveText: ; 105db9
 ; this is a stream of text and asm from 105db9 to 105ef6
-
 	text_jump _ActorNameText
 	start_asm
 	ld a, [hBattleTurn]
@@ -45,7 +43,6 @@ UsedMoveText: ; 105db9
 	call GetMoveGrammar
 ; wd265 now contains MoveGrammar
 
-
 ; everything except 'instead' made redundant in localization
 
 	; check obedience
diff --git a/battle/anim_commands.asm b/engine/battle_anims/anim_commands.asm
index 78786f516..875849ce3 100644
--- a/battle/anim_commands.asm
+++ b/engine/battle_anims/anim_commands.asm
@@ -1,6 +1,5 @@
 ; Battle animation command interpreter.
 
-
 PlayBattleAnim: ; cc0d6
 
 	ld a, [rSVBK]
@@ -352,7 +351,7 @@ RunBattleAnimCommand: ; cc25f
 
 
 BattleAnimCommands:: ; cc2a4 (33:42a4)
-; entries correspond to macros/move_anim.asm enumeration
+; entries correspond to macros/scripts/battle_anims.asm enumeration
 	dw BattleAnimCmd_Obj
 	dw BattleAnimCmd_1GFX
 	dw BattleAnimCmd_2GFX
diff --git a/battle/bg_effects.asm b/engine/battle_anims/bg_effects.asm
index 7799c2cf7..ab4a8036b 100644
--- a/battle/bg_effects.asm
+++ b/engine/battle_anims/bg_effects.asm
@@ -78,6 +78,7 @@ DoBattleBGEffectFunction: ; c804a (32:404a)
 	jp hl
 
 BattleBGEffects: ; c805a (32:405a)
+; entries correspond to ANIM_BG_* constants
 	dw BattleBGEffect_End
 	dw BattleBGEffect_FlashInverted
 	dw BattleBGEffect_FlashWhite
diff --git a/battle/objects/engine.asm b/engine/battle_anims/engine.asm
index ae3bdde28..55adeae8c 100755
--- a/battle/objects/engine.asm
+++ b/engine/battle_anims/engine.asm
@@ -88,7 +88,7 @@ BattleAnimOAMUpdate: ; cca09
 	jp z, .delete
 	push af
 	ld hl, wBattleAnimTempOAMFlags
-	ld a, [wBattleAnimTemp7]
+	ld a, [wBattleAnimTempAddSubFlags]
 	xor [hl]
 	and $e0
 	ld [hl], a
@@ -200,7 +200,7 @@ InitBattleAnimBuffer: ; ccaaa
 	and %10000000
 	ld [wBattleAnimTempOAMFlags], a
 	xor a
-	ld [wBattleAnimTemp7], a
+	ld [wBattleAnimTempAddSubFlags], a
 	ld hl, BATTLEANIMSTRUCT_PALETTE
 	add hl, bc
 	ld a, [hl]
@@ -208,7 +208,7 @@ InitBattleAnimBuffer: ; ccaaa
 	ld hl, BATTLEANIMSTRUCT_02
 	add hl, bc
 	ld a, [hl]
-	ld [wBattleAnimTemp1], a
+	ld [wBattleAnimTempField02], a
 	ld hl, BATTLEANIMSTRUCT_TILEID
 	add hl, bc
 	ld a, [hli]
@@ -239,7 +239,7 @@ InitBattleAnimBuffer: ; ccaaa
 	ld [wBattleAnimTempXCoord], a
 	ld a, [hli]
 	ld d, a
-	ld a, [wBattleAnimTemp1]
+	ld a, [wBattleAnimTempField02]
 	cp $ff
 	jr nz, .check_kinesis_softboiled_milkdrink
 	ld a, 5 * 8
diff --git a/battle/objects/functions.asm b/engine/battle_anims/functions.asm
index 64c390cbe..ea9fb70b3 100755
--- a/battle/objects/functions.asm
+++ b/engine/battle_anims/functions.asm
@@ -13,6 +13,7 @@ DoBattleAnimFrame: ; ccfbe
 ; ccfce
 
 .Jumptable:
+; entries correspond to BATTLEANIMFUNC_* constants
 	dw BattleAnimFunction_Null ; 00
 	dw BattleAnimFunction_01 ; 01
 	dw BattleAnimFunction_02 ; 02
@@ -450,7 +451,7 @@ GetBallAnimPal: ; cd249 (33:5249)
 	ret
 ; cd26c (33:526c)
 
-INCLUDE "data/battle/ball_colors.asm"
+INCLUDE "data/battle_anims/ball_colors.asm"
 
 BattleAnimFunction_10: ; cd284 (33:5284)
 	call BattleAnim_AnonJumptable
diff --git a/engine/routines/getpokeballwobble.asm b/engine/battle_anims/getpokeballwobble.asm
index 7fb4d3e38..7fb4d3e38 100755
--- a/engine/routines/getpokeballwobble.asm
+++ b/engine/battle_anims/getpokeballwobble.asm
diff --git a/battle/objects/helpers.asm b/engine/battle_anims/helpers.asm
index a692211d3..0a00b65a4 100755
--- a/battle/objects/helpers.asm
+++ b/engine/battle_anims/helpers.asm
@@ -29,10 +29,11 @@ GetBattleAnimFrame: ; ce7d1
 	inc [hl]
 	call .GetPointer
 	ld a, [hli]
-	cp -2
+	cp dorestart_command
 	jr z, .restart
-	cp -1
+	cp endanim_command
 	jr z, .repeat_last
+
 	push af
 	ld a, [hl]
 	push hl
@@ -41,12 +42,11 @@ GetBattleAnimFrame: ; ce7d1
 	add hl, bc
 	ld [hl], a
 	pop hl
-
 .okay
 	ld a, [hl]
 	and $c0
 	srl a
-	ld [wBattleAnimTemp7], a
+	ld [wBattleAnimTempAddSubFlags], a
 	pop af
 	ret
 
diff --git a/engine/color.asm b/engine/color.asm
index 23f953ebe..3eafbad70 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -1008,8 +1008,8 @@ PushSGBBorder:
 	ret
 
 SGB_ClearVRAM:
-	ld hl, VTiles0
-	ld bc, VRAM_End - VTiles0
+	ld hl, VRAM_Begin
+	ld bc, VRAM_End - VRAM_Begin
 	xor a
 	call ByteFill
 	ret
@@ -1218,8 +1218,9 @@ INCLUDE "data/palettes/hp_bar.pal"
 ExpBarPalette:
 INCLUDE "data/palettes/exp_bar.pal"
 
-INCLUDE "gfx/pics/palette_pointers.asm"
-INCLUDE "gfx/trainer_palettes.asm"
+INCLUDE "data/pokemon/palettes.asm"
+
+INCLUDE "data/trainers/palettes.asm"
 
 LoadMapPals:
 	farcall LoadSpecialMapPalette
diff --git a/engine/credits.asm b/engine/credits.asm
index 70729ed3b..12199f904 100644
--- a/engine/credits.asm
+++ b/engine/credits.asm
@@ -612,6 +612,13 @@ Credits_TheEnd: ; 109c11 (42:5c11)
 ; 109c24 (42:5c24)
 
 
-INCLUDE "gfx/credits.asm"
+CreditsBorderGFX:    INCBIN "gfx/credits/border.2bpp"
+
+CreditsMonsGFX:
+CreditsPichuGFX:     INCBIN "gfx/credits/pichu.2bpp"
+CreditsSmoochumGFX:  INCBIN "gfx/credits/smoochum.2bpp"
+CreditsDittoGFX:     INCBIN "gfx/credits/ditto.2bpp"
+CreditsIgglybuffGFX: INCBIN "gfx/credits/igglybuff.2bpp"
+
 INCLUDE "data/credits_script.asm"
 INCLUDE "data/credits_strings.asm"
diff --git a/engine/decorations.asm b/engine/decorations.asm
index 1e9effe97..c1b703fb6 100755
--- a/engine/decorations.asm
+++ b/engine/decorations.asm
@@ -541,36 +541,9 @@ GetDecorationSprite: ; 26a44
 	ret
 ; 26a4f
 
-INCLUDE "data/decoration_attributes.asm"
+INCLUDE "data/decorations/attributes.asm"
 
-DecorationNames: ; 26b8d
-	db "CANCEL@"
-	db "PUT IT AWAY@"
-	db "MAGNAPLANT@"
-	db "TROPICPLANT@"
-	db "JUMBOPLANT@"
-	db "TOWN MAP@"
-	db "NES@"
-	db "SUPER NES@"
-	db "NINTENDO 64@"
-	db "VIRTUAL BOY@"
-	db "GOLD TROPHY@"
-	db "SILVER TROPHY@"
-	db "SURF PIKACHU DOLL@"
-	db " BED@"
-	db " CARPET@"
-	db " POSTER@"
-	db " DOLL@"
-	db "BIG @"
-	db "FEATHERY@"
-	db "PIKACHU@"
-	db "PINK@"
-	db "POLKADOT@"
-	db "RED@"
-	db "BLUE@"
-	db "YELLOW@"
-	db "GREEN@"
-; 26c72
+INCLUDE "data/decorations/names.asm"
 
 GetDecoName: ; 26c72
 	ld a, [hli]
@@ -1084,60 +1057,7 @@ SetAllDecorationFlags: ; 26f19
 	ret
 ; 26f2b
 
-DecorationIDs: ; 26f2b
-	db DECO_FEATHERY_BED ; 2
-	db DECO_PINK_BED ; 3
-	db DECO_POLKADOT_BED ; 4
-	db DECO_PIKACHU_BED ; 5
-
-	db DECO_RED_CARPET ; 7
-	db DECO_BLUE_CARPET ; 8
-	db DECO_YELLOW_CARPET ; 9
-	db DECO_GREEN_CARPET ; a
-
-	db DECO_MAGNAPLANT ; c
-	db DECO_TROPICPLANT ; d
-	db DECO_JUMBOPLANT ; e
-
-	db DECO_TOWN_MAP ; 10
-	db DECO_PIKACHU_POSTER ; 11
-	db DECO_CLEFAIRY_POSTER ; 12
-	db DECO_JIGGLYPUFF_POSTER ; 13
-
-	db DECO_FAMICOM ; 15
-	db DECO_SNES ; 16
-	db DECO_N64 ; 17
-	db DECO_VIRTUAL_BOY ; 18
-
-	db DECO_PIKACHU_DOLL ; 1e
-	db DECO_SURF_PIKACHU_DOLL ; 1f
-	db DECO_CLEFAIRY_DOLL ; 20
-	db DECO_JIGGLYPUFF_DOLL ; 21
-	db DECO_BULBASAUR_DOLL ; 22
-	db DECO_CHARMANDER_DOLL ; 23
-	db DECO_SQUIRTLE_DOLL ; 24
-	db DECO_POLIWAG_DOLL ; 25
-	db DECO_DIGLETT_DOLL ; 26
-	db DECO_STARMIE_DOLL ; 27
-	db DECO_MAGIKARP_DOLL ; 28
-	db DECO_ODDISH_DOLL ; 29
-	db DECO_GENGAR_DOLL ; 2a
-	db DECO_SHELLDER_DOLL ; 2b
-	db DECO_GRIMER_DOLL ; 2c
-	db DECO_VOLTORB_DOLL ; 2d
-	db DECO_WEEDLE_DOLL ; 2e
-	db DECO_UNOWN_DOLL ; 2f
-	db DECO_GEODUDE_DOLL ; 30
-	db DECO_MACHOP_DOLL ; 31
-	db DECO_TENTACOOL_DOLL ; 32
-	db DECO_BIG_SNORLAX_DOLL ; 1a
-	db DECO_BIG_ONIX_DOLL ; 1b
-	db DECO_BIG_LAPRAS_DOLL ; 1c
-Trophys:
-	db DECO_GOLD_TROPHY_DOLL ; 33
-	db DECO_SILVER_TROPHY_DOLL ; 34
-	db -1
-; 26f59
+INCLUDE "data/decorations/decorations.asm"
 
 DescribeDecoration:: ; 26f59
 	ld a, b
diff --git a/event/basement_key.asm b/engine/events/basement_key.asm
index b15288d09..b15288d09 100755
--- a/event/basement_key.asm
+++ b/engine/events/basement_key.asm
diff --git a/engine/battle_tower.asm b/engine/events/battle_tower.asm
index b880a099b..b880a099b 100644
--- a/engine/battle_tower.asm
+++ b/engine/events/battle_tower.asm
diff --git a/event/battle_tower.asm b/engine/events/battle_tower_rules.asm
index de6022145..de6022145 100644
--- a/event/battle_tower.asm
+++ b/engine/events/battle_tower_rules.asm
diff --git a/event/buena.asm b/engine/events/buena.asm
index 1227593eb..1227593eb 100644
--- a/event/buena.asm
+++ b/engine/events/buena.asm
diff --git a/event/buena_menu.asm b/engine/events/buena_menu.asm
index b453da783..b453da783 100644
--- a/event/buena_menu.asm
+++ b/engine/events/buena_menu.asm
diff --git a/event/bug_contest/caught_mon.asm b/engine/events/bug_contest/caught_mon.asm
index 5d423f466..5d423f466 100644
--- a/event/bug_contest/caught_mon.asm
+++ b/engine/events/bug_contest/caught_mon.asm
diff --git a/event/bug_contest/contest.asm b/engine/events/bug_contest/contest.asm
index ba561abf2..ba561abf2 100644
--- a/event/bug_contest/contest.asm
+++ b/engine/events/bug_contest/contest.asm
diff --git a/event/bug_contest/contest_2.asm b/engine/events/bug_contest/contest_2.asm
index 493c69d0c..493c69d0c 100755
--- a/event/bug_contest/contest_2.asm
+++ b/engine/events/bug_contest/contest_2.asm
diff --git a/event/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm
index d6ad3997e..d6ad3997e 100644
--- a/event/bug_contest/display_stats.asm
+++ b/engine/events/bug_contest/display_stats.asm
diff --git a/event/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm
index 901ae88fa..901ae88fa 100755
--- a/event/bug_contest/judging.asm
+++ b/engine/events/bug_contest/judging.asm
diff --git a/event/card_key.asm b/engine/events/card_key.asm
index dc4c73ad2..dc4c73ad2 100755
--- a/event/card_key.asm
+++ b/engine/events/card_key.asm
diff --git a/event/catch_tutorial.asm b/engine/events/catch_tutorial.asm
index b9352ccd6..b9352ccd6 100644
--- a/event/catch_tutorial.asm
+++ b/engine/events/catch_tutorial.asm
diff --git a/event/catch_tutorial_input.asm b/engine/events/catch_tutorial_input.asm
index 9d2a03db2..9d2a03db2 100644
--- a/event/catch_tutorial_input.asm
+++ b/engine/events/catch_tutorial_input.asm
diff --git a/event/celebi.asm b/engine/events/celebi.asm
index b7bf95145..b7bf95145 100755
--- a/event/celebi.asm
+++ b/engine/events/celebi.asm
diff --git a/event/unown.asm b/engine/events/crystal_unown.asm
index 6c0e972f8..6c0e972f8 100644
--- a/event/unown.asm
+++ b/engine/events/crystal_unown.asm
diff --git a/event/daycare.asm b/engine/events/daycare.asm
index 6395a40fb..6395a40fb 100755
--- a/event/daycare.asm
+++ b/engine/events/daycare.asm
diff --git a/event/dratini.asm b/engine/events/dratini.asm
index f110b34ab..f110b34ab 100644
--- a/event/dratini.asm
+++ b/engine/events/dratini.asm
diff --git a/event/elevator.asm b/engine/events/elevator.asm
index 9170b642d..9170b642d 100755
--- a/event/elevator.asm
+++ b/engine/events/elevator.asm
diff --git a/event/field_moves.asm b/engine/events/field_moves.asm
index 1c21f4995..1c21f4995 100755
--- a/event/field_moves.asm
+++ b/engine/events/field_moves.asm
diff --git a/engine/fish.asm b/engine/events/fish.asm
index c571bba56..c571bba56 100644
--- a/engine/fish.asm
+++ b/engine/events/fish.asm
diff --git a/event/forced_movement.asm b/engine/events/forced_movement.asm
index 136698501..136698501 100755
--- a/event/forced_movement.asm
+++ b/engine/events/forced_movement.asm
diff --git a/engine/fruit_trees.asm b/engine/events/fruit_trees.asm
index 595e41824..595e41824 100644
--- a/engine/fruit_trees.asm
+++ b/engine/events/fruit_trees.asm
diff --git a/event/halloffame.asm b/engine/events/halloffame.asm
index 5fa1dc270..5fa1dc270 100755
--- a/event/halloffame.asm
+++ b/engine/events/halloffame.asm
diff --git a/event/happiness_egg.asm b/engine/events/happiness_egg.asm
index a1ade1364..a4ae8b7e6 100755
--- a/event/happiness_egg.asm
+++ b/engine/events/happiness_egg.asm
@@ -73,7 +73,7 @@ ChangeHappiness: ; 71c2
 	ld d, 0
 	add hl, de
 	ld a, [hl]
-	cp $64 ; $80?
+	cp $64 ; why not $80?
 	pop de
 
 	ld a, [de]
@@ -141,7 +141,9 @@ StepHappiness:: ; 725a
 	jr nz, .loop
 	ret
 
+
 DayCareStep:: ; 7282
+; Raise the experience of Day-Care Pokémon every step cycle.
 
 	ld a, [wDayCareMan]
 	bit 0, a
diff --git a/event/heal_machine_anim.asm b/engine/events/heal_machine_anim.asm
index 4f543c0b3..c7789a28d 100755
--- a/event/heal_machine_anim.asm
+++ b/engine/events/heal_machine_anim.asm
@@ -126,14 +126,14 @@ HealMachineAnim: ; 12324
 ; 123dc
 
 .PC_ElmsLab_OAM: ; 123dc
-	dsprite   4, 0,   4, 2, $7c, $16
-	dsprite   4, 0,   4, 6, $7c, $16
-	dsprite   4, 6,   4, 0, $7d, $16
-	dsprite   4, 6,   5, 0, $7d, $36 ; xflip
-	dsprite   5, 3,   4, 0, $7d, $16
-	dsprite   5, 3,   5, 0, $7d, $36 ; xflip
-	dsprite   6, 0,   4, 0, $7d, $16
-	dsprite   6, 0,   5, 0, $7d, $36 ; xflip
+	dsprite   4, 0,   4, 2, $7c, PAL_OW_TREE | OBP_NUM
+	dsprite   4, 0,   4, 6, $7c, PAL_OW_TREE | OBP_NUM
+	dsprite   4, 6,   4, 0, $7d, PAL_OW_TREE | OBP_NUM
+	dsprite   4, 6,   5, 0, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP
+	dsprite   5, 3,   4, 0, $7d, PAL_OW_TREE | OBP_NUM
+	dsprite   5, 3,   5, 0, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP
+	dsprite   6, 0,   4, 0, $7d, PAL_OW_TREE | OBP_NUM
+	dsprite   6, 0,   5, 0, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP
 ; 123fc
 
 .HealMachineGFX: ; 123fc
@@ -141,12 +141,12 @@ INCBIN "gfx/overworld/heal_machine.2bpp"
 ; 1241c
 
 .HOF_OAM: ; 1241c
-	dsprite   7, 4,  10, 1, $7d, $16
-	dsprite   7, 4,  10, 6, $7d, $16
-	dsprite   7, 3,   9, 5, $7d, $16
-	dsprite   7, 3,  11, 2, $7d, $16
-	dsprite   7, 1,   9, 1, $7d, $16
-	dsprite   7, 1,  11, 5, $7d, $16
+	dsprite   7, 4,  10, 1, $7d, PAL_OW_TREE | OBP_NUM
+	dsprite   7, 4,  10, 6, $7d, PAL_OW_TREE | OBP_NUM
+	dsprite   7, 3,   9, 5, $7d, PAL_OW_TREE | OBP_NUM
+	dsprite   7, 3,  11, 2, $7d, PAL_OW_TREE | OBP_NUM
+	dsprite   7, 1,   9, 1, $7d, PAL_OW_TREE | OBP_NUM
+	dsprite   7, 1,  11, 5, $7d, PAL_OW_TREE | OBP_NUM
 ; 12434
 
 .LoadPalettes: ; 12434
@@ -158,8 +158,8 @@ INCBIN "gfx/overworld/heal_machine.2bpp"
 
 .cgb
 	ld hl, .palettes
-	ld de, OBPals + 8 * 6
-	ld bc, 8
+	ld de, OBPals palette PAL_OW_TREE
+	ld bc, 1 palettes
 	ld a, $5
 	call FarCopyWRAM
 	ld a, $1
@@ -201,7 +201,7 @@ INCBIN "gfx/overworld/heal_machine.2bpp"
 	ld a, $5
 	ld [rSVBK], a
 
-	ld hl, OBPals + 8 * 6
+	ld hl, OBPals palette PAL_OW_TREE
 	ld a, [hli]
 	ld e, a
 	ld a, [hli]
diff --git a/event/itemfinder.asm b/engine/events/itemfinder.asm
index 71aaa5b69..71aaa5b69 100755
--- a/event/itemfinder.asm
+++ b/engine/events/itemfinder.asm
diff --git a/event/kurt.asm b/engine/events/kurt.asm
index 9bc06a613..9bc06a613 100644
--- a/event/kurt.asm
+++ b/engine/events/kurt.asm
diff --git a/engine/routines/kurt_selectquantity_interpretjoypad.asm b/engine/events/kurt_selectquantity_interpretjoypad.asm
index 12a43e325..12a43e325 100644
--- a/engine/routines/kurt_selectquantity_interpretjoypad.asm
+++ b/engine/events/kurt_selectquantity_interpretjoypad.asm
diff --git a/event/lucky_number.asm b/engine/events/lucky_number.asm
index 4488cfcc9..4488cfcc9 100644
--- a/event/lucky_number.asm
+++ b/engine/events/lucky_number.asm
diff --git a/event/magikarp.asm b/engine/events/magikarp.asm
index 02c4b10cd..02c4b10cd 100644
--- a/event/magikarp.asm
+++ b/engine/events/magikarp.asm
diff --git a/event/magnet_train.asm b/engine/events/magnet_train.asm
index 3a2f902c2..3a2f902c2 100755
--- a/event/magnet_train.asm
+++ b/engine/events/magnet_train.asm
diff --git a/event/misc_scripts.asm b/engine/events/misc_scripts.asm
index 97372a57a..97372a57a 100755
--- a/event/misc_scripts.asm
+++ b/engine/events/misc_scripts.asm
diff --git a/event/misc_scripts_2.asm b/engine/events/misc_scripts_2.asm
index c4c51d5e6..c4c51d5e6 100644
--- a/event/misc_scripts_2.asm
+++ b/engine/events/misc_scripts_2.asm
diff --git a/event/mom.asm b/engine/events/mom.asm
index 6e3c7b320..6e3c7b320 100644
--- a/event/mom.asm
+++ b/engine/events/mom.asm
diff --git a/event/mom_phone.asm b/engine/events/mom_phone.asm
index bef7d5688..bef7d5688 100755
--- a/event/mom_phone.asm
+++ b/engine/events/mom_phone.asm
diff --git a/event/move_deleter.asm b/engine/events/move_deleter.asm
index 95fc0f1d8..95fc0f1d8 100644
--- a/event/move_deleter.asm
+++ b/engine/events/move_deleter.asm
diff --git a/event/move_tutor.asm b/engine/events/move_tutor.asm
index a15ecaf93..a15ecaf93 100644
--- a/event/move_tutor.asm
+++ b/engine/events/move_tutor.asm
diff --git a/event/name_rater.asm b/engine/events/name_rater.asm
index 771c5090a..771c5090a 100644
--- a/event/name_rater.asm
+++ b/engine/events/name_rater.asm
diff --git a/engine/odd_eggs.asm b/engine/events/odd_egg.asm
index 4cbeb34dc..4cbeb34dc 100644
--- a/engine/odd_eggs.asm
+++ b/engine/events/odd_egg.asm
diff --git a/event/overworld.asm b/engine/events/overworld.asm
index 370162fa9..370162fa9 100755
--- a/event/overworld.asm
+++ b/engine/events/overworld.asm
diff --git a/event/poisonstep.asm b/engine/events/poisonstep.asm
index 00c7477bc..00c7477bc 100755
--- a/event/poisonstep.asm
+++ b/engine/events/poisonstep.asm
diff --git a/event/poisonstep_pals.asm b/engine/events/poisonstep_pals.asm
index 088be8848..088be8848 100644
--- a/event/poisonstep_pals.asm
+++ b/engine/events/poisonstep_pals.asm
diff --git a/event/poke_seer.asm b/engine/events/poke_seer.asm
index d6e335298..d6e335298 100644
--- a/event/poke_seer.asm
+++ b/engine/events/poke_seer.asm
diff --git a/engine/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm
index 7045dc1c8..7045dc1c8 100755
--- a/engine/pokecenter_pc.asm
+++ b/engine/events/pokecenter_pc.asm
diff --git a/engine/pokepic.asm b/engine/events/pokepic.asm
index ea5b3c300..ea5b3c300 100755
--- a/engine/pokepic.asm
+++ b/engine/events/pokepic.asm
diff --git a/engine/pokerus/apply_pokerus_tick.asm b/engine/events/pokerus/apply_pokerus_tick.asm
index 3c97fdc5e..3c97fdc5e 100644
--- a/engine/pokerus/apply_pokerus_tick.asm
+++ b/engine/events/pokerus/apply_pokerus_tick.asm
diff --git a/engine/pokerus/check_pokerus.asm b/engine/events/pokerus/check_pokerus.asm
index 285024754..285024754 100644
--- a/engine/pokerus/check_pokerus.asm
+++ b/engine/events/pokerus/check_pokerus.asm
diff --git a/engine/pokerus/pokerus.asm b/engine/events/pokerus/pokerus.asm
index 3e5e094e4..3e5e094e4 100644
--- a/engine/pokerus/pokerus.asm
+++ b/engine/events/pokerus/pokerus.asm
diff --git a/event/print_photo.asm b/engine/events/print_photo.asm
index 06b01bbcf..06b01bbcf 100755
--- a/event/print_photo.asm
+++ b/engine/events/print_photo.asm
diff --git a/event/print_unown.asm b/engine/events/print_unown.asm
index 7841a688b..7841a688b 100644
--- a/event/print_unown.asm
+++ b/engine/events/print_unown.asm
diff --git a/event/print_unown_2.asm b/engine/events/print_unown_2.asm
index 057db5176..057db5176 100644
--- a/event/print_unown_2.asm
+++ b/engine/events/print_unown_2.asm
diff --git a/engine/prof_oaks_pc.asm b/engine/events/prof_oaks_pc.asm
index 69949940b..69949940b 100755
--- a/engine/prof_oaks_pc.asm
+++ b/engine/events/prof_oaks_pc.asm
diff --git a/event/sacred_ash.asm b/engine/events/sacred_ash.asm
index cc46eac9f..cc46eac9f 100755
--- a/event/sacred_ash.asm
+++ b/engine/events/sacred_ash.asm
diff --git a/event/special.asm b/engine/events/special.asm
index d28d0de64..d28d0de64 100755
--- a/event/special.asm
+++ b/engine/events/special.asm
diff --git a/event/squirtbottle.asm b/engine/events/squirtbottle.asm
index 1134f1bb0..1134f1bb0 100755
--- a/event/squirtbottle.asm
+++ b/engine/events/squirtbottle.asm
diff --git a/event/std_collision.asm b/engine/events/std_collision.asm
index 79dbc71f1..79dbc71f1 100644
--- a/event/std_collision.asm
+++ b/engine/events/std_collision.asm
diff --git a/engine/std_scripts.asm b/engine/events/std_scripts.asm
index 297725c60..297725c60 100644
--- a/engine/std_scripts.asm
+++ b/engine/events/std_scripts.asm
diff --git a/event/sweet_scent.asm b/engine/events/sweet_scent.asm
index 77567488c..77567488c 100755
--- a/event/sweet_scent.asm
+++ b/engine/events/sweet_scent.asm
diff --git a/engine/trainer_scripts.asm b/engine/events/trainer_scripts.asm
index 212cd7f28..212cd7f28 100644
--- a/engine/trainer_scripts.asm
+++ b/engine/events/trainer_scripts.asm
diff --git a/event/whiteout.asm b/engine/events/whiteout.asm
index a9d6f900e..a9d6f900e 100755
--- a/event/whiteout.asm
+++ b/engine/events/whiteout.asm
diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm
index ec53549f8..77d1af6f9 100755
--- a/engine/intro_menu.asm
+++ b/engine/intro_menu.asm
@@ -111,8 +111,8 @@ _ResetWRAM: ; 5bae
 	xor a
 	call ByteFill
 
-	ld hl, wRAM1Start
-	ld bc, wGameData - wRAM1Start
+	ld hl, WRAM1_Begin
+	ld bc, wGameData - WRAM1_Begin
 	xor a
 	call ByteFill
 
diff --git a/engine/link.asm b/engine/link.asm
index bb3e98b3e..5c45707d7 100755
--- a/engine/link.asm
+++ b/engine/link.asm
@@ -861,7 +861,7 @@ Link_PrepPartyData_Gen2: ; 28595
 	pop bc
 	dec b
 	jr nz, .loop2
-; Copy the mail metadata to wcabf
+; Copy the mail data to wcabf
 	ld hl, sPartyMail
 	ld b, PARTY_LENGTH
 .loop3
diff --git a/engine/mail.asm b/engine/mail.asm
index 392405b20..0335a6dfe 100755
--- a/engine/mail.asm
+++ b/engine/mail.asm
@@ -383,7 +383,7 @@ MailboxPC_PrintMailAuthor: ; 0x447fb
 
 MailboxPC: ; 0x44806
 	xor a
-	ld [OBPals + 8 * 6], a
+	ld [wCurMessageScrollPosition], a
 	ld a, 1
 	ld [wCurMessageIndex], a
 .loop
@@ -397,11 +397,11 @@ MailboxPC: ; 0x44806
 
 	ld a, [wCurMessageIndex]
 	ld [wMenuCursorBuffer], a
-	ld a, [OBPals + 8 * 6]
+	ld a, [wCurMessageScrollPosition]
 	ld [wMenuScrollPosition], a
 	call ScrollingMenu
 	ld a, [wMenuScrollPosition]
-	ld [OBPals + 8 * 6], a
+	ld [wCurMessageScrollPosition], a
 	ld a, [wMenuCursorY]
 	ld [wCurMessageIndex], a
 
diff --git a/engine/mail_2.asm b/engine/mail_2.asm
new file mode 100755
index 000000000..dfbeca485
--- /dev/null
+++ b/engine/mail_2.asm
@@ -0,0 +1,950 @@
+ReadPartyMonMail: ; b9229
+	ld a, [CurPartyMon]
+	ld hl, sPartyMail
+	ld bc, MAIL_STRUCT_LENGTH
+	call AddNTimes
+	ld d, h
+	ld e, l
+ReadAnyMail: ; b9237
+	push de
+	call ClearBGPalettes
+	call ClearSprites
+	call ClearTileMap
+	call DisableLCD
+	call LoadFontsExtra
+	pop de
+	push de
+	ld a, BANK(sPartyMail)
+	call GetSRAMBank
+	farcall IsMailEuropean
+	call CloseSRAM
+	ld a, c
+	ld de, StandardEnglishFont
+	or a
+	jr z, .got_font
+	ld de, FrenchGermanFont
+	sub $3
+	jr c, .got_font
+	ld de, SpanishItalianFont
+
+.got_font
+	ld hl, VTiles1
+	lb bc, BANK(StandardEnglishFont), $80
+	call Get1bpp
+	pop de
+	call .LoadGFX
+	call EnableLCD
+	call WaitBGMap
+	ld a, [Buffer3]
+	ld e, a
+	farcall LoadMailPalettes
+	call SetPalettes
+	xor a
+	ld [hJoyPressed], a
+	call .loop
+	call ClearBGPalettes
+	call DisableLCD
+	call LoadStandardFont
+	jp EnableLCD
+
+.loop
+	call GetJoypad
+	ld a, [hJoyPressed]
+	and A_BUTTON | B_BUTTON | START
+	jr z, .loop
+	and START
+	jr nz, .pressed_start
+	ret
+
+.pressed_start
+	ld a, [wJumptableIndex]
+	push af
+	callfar PrintMail ; printer
+	pop af
+	ld [wJumptableIndex], a
+	jr .loop
+; b92b8
+
+.LoadGFX: ; b92b8
+	ld h, d
+	ld l, e
+	push hl
+	ld a, $0
+	call GetSRAMBank
+	ld de, sPartyMon1MailAuthorID - sPartyMon1Mail
+	add hl, de
+	ld a, [hli]
+	ld [Buffer1], a
+	ld a, [hli]
+	ld [Buffer2], a
+	ld a, [hli]
+	ld [CurPartySpecies], a
+	ld b, [hl]
+	call CloseSRAM
+	ld hl, MailGFXPointers
+	ld c, 0
+.loop2
+	ld a, [hli]
+	cp b
+	jr z, .got_pointer
+	cp -1
+	jr z, .invalid
+	inc c
+	inc hl
+	inc hl
+	jr .loop2
+
+.invalid
+	ld hl, MailGFXPointers
+	inc hl
+
+.got_pointer
+	ld a, c
+	ld [Buffer3], a
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	ld de, .done
+	pop bc
+	push de
+	jp hl
+.done
+	ret
+; b92f8
+
+MailGFXPointers: ; b92f8
+	dbw FLOWER_MAIL,  LoadFlowerMailGFX
+	dbw SURF_MAIL,    LoadSurfMailGFX
+	dbw LITEBLUEMAIL, LoadLiteBlueMailGFX
+	dbw PORTRAITMAIL, LoadPortraitMailGFX
+	dbw LOVELY_MAIL,  LoadLovelyMailGFX
+	dbw EON_MAIL,     LoadEonMailGFX
+	dbw MORPH_MAIL,   LoadMorphMailGFX
+	dbw BLUESKY_MAIL, LoadBlueSkyMailGFX
+	dbw MUSIC_MAIL,   LoadMusicMailGFX
+	dbw MIRAGE_MAIL,  LoadMirageMailGFX
+	db -1
+; b9317
+
+LoadSurfMailGFX: ; b9317
+	push bc
+	ld hl, VTiles2 tile $31
+	ld de, SurfMailBorderGFX
+	ld c, 8 * 8
+	call LoadMailGFX_Color2
+	ld de, MailLaprasGFX
+	ld c, 6 * 8
+	call LoadMailGFX_Color3
+	ld de, SurfMailWaveGFX
+	ld c, 1 * 8
+	call LoadMailGFX_Color2
+	jr FinishLoadingSurfLiteBlueMailGFX
+
+LoadLiteBlueMailGFX: ; b9335
+	push bc
+	ld hl, VTiles2 tile $31
+	ld de, LiteBlueMailBorderGFX
+	ld c, 8 * 8
+	call LoadMailGFX_Color2
+	ld de, MailDratiniGFX
+	ld c, 6 * 8
+	call LoadMailGFX_Color3
+	ld de, PortraitMailUnderlineGFX
+	ld c, 1 * 8
+	call LoadMailGFX_Color2
+
+FinishLoadingSurfLiteBlueMailGFX: ; b9351
+	ld de, SurfLiteBlueMailSmallShapesGFX
+	ld c, 2 * 8
+	call LoadMailGFX_Color2
+	ld c, 2 * 8
+	call LoadMailGFX_Color1
+	ld de, SurfLiteBlueMailLargeShapesGFX
+	ld c, 8 * 8
+	call LoadMailGFX_Color1
+	ld c, 8 * 8
+	call LoadMailGFX_Color2
+
+	call DrawMailBorder
+	hlcoord 2, 15
+	ld a, $3f
+	call Mail_Draw16TileRow
+	ld a, $39
+	hlcoord 15, 14
+	call Mail_Draw3x2Graphic
+	ld a, $44
+	hlcoord 2, 2
+	call Mail_Draw2x2Graphic
+	hlcoord 15, 11
+	call Mail_Draw2x2Graphic
+	ld a, $4c
+	hlcoord 3, 12
+	call Mail_Draw2x2Graphic
+	hlcoord 15, 2
+	call Mail_Draw2x2Graphic
+	ld a, $50
+	hlcoord 6, 3
+	call Mail_Draw2x2Graphic
+	ld a, $40
+	hlcoord 13, 2
+	ld [hli], a
+	hlcoord 6, 14
+	ld [hl], a
+	ld a, $41
+	hlcoord 4, 5
+	ld [hli], a
+	hlcoord 17, 5
+	ld [hli], a
+	hlcoord 13, 12
+	ld [hl], a
+	ld a, $42
+	hlcoord 9, 2
+	ld [hli], a
+	hlcoord 14, 5
+	ld [hli], a
+	hlcoord 3, 10
+	ld [hl], a
+	ld a, $43
+	hlcoord 6, 11
+	ld [hli], a
+	pop hl
+	jp MailGFX_PlaceMessage
+; b93d2
+
+LoadEonMailGFX: ; b93d2
+	push bc
+	ld hl, VTiles2 tile $31
+	ld de, EonMailBorder1GFX
+	ld c, 1 * 8
+	call LoadMailGFX_Color2
+	ld de, EonMailBorder2GFX
+	ld c, 1 * 8
+	call LoadMailGFX_Color1
+	ld de, EonMailBorder2GFX
+	ld c, 1 * 8
+	call LoadMailGFX_Color1
+	ld de, EonMailBorder1GFX
+	ld c, 1 * 8
+	call LoadMailGFX_Color2
+	ld de, SurfMailBorderGFX + 6 * 8
+	ld c, 1 * 8
+	call LoadMailGFX_Color2
+	ld de, MailEeveeGFX
+	ld c, 6 * 8
+	call LoadMailGFX_Color3
+	ld hl, VTiles2 tile $3d
+	ld de, MailLargeCircleGFX
+	ld c, 4 * 8
+	call LoadMailGFX_Color1
+	ld de, EonMailBorder2GFX
+	ld c, 1 * 8
+	call LoadMailGFX_Color2
+
+	ld a, $31
+	hlcoord 0, 0
+	call Mail_Place18TileAlternatingRow
+	hlcoord 1, 17
+	call Mail_Place18TileAlternatingRow
+	ld a, $33
+	hlcoord 0, 1
+	call Mail_Place16TileAlternatingColumn
+	hlcoord 19, 0
+	call Mail_Place16TileAlternatingColumn
+	hlcoord 2, 15
+	ld a, $35
+	call Mail_Draw16TileRow
+	inc a
+	hlcoord 15, 14
+	call Mail_Draw3x2Graphic
+	call LovelyEonMail_PlaceIcons
+	pop hl
+	jp MailGFX_PlaceMessage
+; b944b
+
+LoadLovelyMailGFX: ; b944b
+	push bc
+	ld hl, VTiles2 tile $31
+	ld de, LovelyMailBorderGFX
+	ld c, 5 * 8
+	call LoadMailGFX_Color2
+	ld de, MailPoliwagGFX
+	ld c, 6 * 8
+	call LoadMailGFX_Color3
+	ld de, LovelyMailUnderlineGFX
+	ld c, 1 * 8
+	call LoadMailGFX_Color2
+	ld de, LovelyMailLargeHeartGFX
+	ld c, 4 * 8
+	call LoadMailGFX_Color2
+	ld de, LovelyMailSmallHeartGFX
+	ld c, 1 * 8
+	call LoadMailGFX_Color1
+
+	call DrawMailBorder2
+	hlcoord 2, 15
+	ld a, $3c
+	call Mail_Draw16TileRow
+	ld a, $36
+	hlcoord 15, 14
+	call Mail_Draw3x2Graphic
+	call LovelyEonMail_PlaceIcons
+	pop hl
+	jp MailGFX_PlaceMessage
+; b9491
+
+LovelyEonMail_PlaceIcons: ; b9491
+	ld a, $3d
+	hlcoord 2, 2
+	call Mail_Draw2x2Graphic
+	hlcoord 16, 2
+	call Mail_Draw2x2Graphic
+	hlcoord 9, 4
+	call Mail_Draw2x2Graphic
+	hlcoord 2, 11
+	call Mail_Draw2x2Graphic
+	hlcoord 6, 12
+	call Mail_Draw2x2Graphic
+	hlcoord 12, 11
+	call Mail_Draw2x2Graphic
+	ld a, $41
+	hlcoord 5, 4
+	ld [hl], a
+	hlcoord 6, 2
+	ld [hl], a
+	hlcoord 12, 4
+	ld [hl], a
+	hlcoord 14, 2
+	ld [hl], a
+	hlcoord 3, 13
+	ld [hl], a
+	hlcoord 9, 11
+	ld [hl], a
+	hlcoord 16, 12
+	ld [hl], a
+	ret
+; b94d6
+
+LoadMorphMailGFX: ; b94d6
+	push bc
+	ld hl, VTiles2 tile $31
+	ld bc, 5 * 8
+	call MailGFX_GenerateMonochromeTilesColor2
+	ld de, MorphMailBorderCornerGFX + 3 * 8
+	ld c, 1 * 8
+	call LoadMailGFX_Color2
+	ld de, MorphMailBorderCornerGFX
+	ld c, 1 * 8
+	call LoadMailGFX_Color2
+	ld de, MorphMailBorderGFX
+	ld c, 1 * 8
+	call LoadMailGFX_Color2
+	ld de, EonMailBorder1GFX
+	ld c, 1 * 8
+	call LoadMailGFX_Color1
+	ld de, MorphMailDividerGFX
+	ld c, 1 * 8
+	call LoadMailGFX_Color2
+	ld de, MailDittoGFX
+	ld c, 6 * 8
+	call LoadMailGFX_Color3
+	call DrawMailBorder2
+	ld a, $31
+	hlcoord 1, 1
+	call Mail_Draw2x2Graphic
+	hlcoord 17, 15
+	call Mail_Draw2x2Graphic
+	hlcoord 1, 3
+	ld [hl], a
+	hlcoord 3, 1
+	ld [hl], a
+	hlcoord 16, 16
+	ld [hl], a
+	hlcoord 18, 14
+	ld [hl], a
+	ld a, $36
+	hlcoord 1, 4
+	ld [hl], a
+	hlcoord 2, 3
+	ld [hl], a
+	hlcoord 3, 2
+	ld [hl], a
+	hlcoord 4, 1
+	ld [hl], a
+	inc a
+	hlcoord 15, 16
+	ld [hl], a
+	hlcoord 16, 15
+	ld [hl], a
+	hlcoord 17, 14
+	ld [hl], a
+	hlcoord 18, 13
+	ld [hl], a
+	inc a
+	hlcoord 2, 15
+	ld b, $e
+	call Mail_DrawRowLoop
+	inc a
+	hlcoord 2, 11
+	call Mail_Draw16TileRow
+	hlcoord 2, 5
+	call Mail_Draw16TileRow
+	inc a
+	hlcoord 6, 1
+	call Mail_Draw13TileRow
+	hlcoord 1, 16
+	call Mail_Draw13TileRow
+	inc a
+	hlcoord 3, 13
+	call Mail_Draw3x2Graphic
+	pop hl
+	jp MailGFX_PlaceMessage
+; b9582
+
+LoadBlueSkyMailGFX: ; b9582
+	push bc
+	ld hl, VTiles2 tile $31
+	ld de, EonMailBorder1GFX
+	ld c, 1 * 8
+	call LoadMailGFX_Color2
+	ld a, $ff
+	ld bc, 1 tiles
+	call ByteFill
+	ld de, BlueSkyMailGrassGFX
+	ld c, 1 * 8
+	call LoadMailGFX_Color3
+	ld de, MailDragoniteGFX
+	ld c, 23 * 8
+	call LoadMailGFX_Color3
+	ld de, MailCloudGFX
+	ld c, 6 * 8
+	call LoadMailGFX_Color1
+	ld de, FlowerMailBorderGFX + 6 * 8
+	ld c, 1 * 8
+	call LoadMailGFX_Color1
+	ld de, MailCloudGFX
+	ld c, 1 * 8
+	call LoadMailGFX_Color1
+	ld de, MailCloudGFX + 2 * 8
+	ld c, 2 * 8
+	call LoadMailGFX_Color1
+	ld de, MailCloudGFX + 5 * 8
+	ld c, 1 * 8
+	call LoadMailGFX_Color1
+
+	ld a, $31
+	hlcoord 0, 0
+	call Mail_DrawFullWidthBorder
+	hlcoord 0, 1
+	call Mail_DrawLeftRightBorder
+	hlcoord 19, 1
+	call Mail_DrawLeftRightBorder
+	inc a
+	hlcoord 0, 17
+	call Mail_DrawFullWidthBorder
+	inc a
+	hlcoord 0, 16
+	call Mail_DrawFullWidthBorder
+	inc a
+	hlcoord 2, 2
+	call Mail_Place6TileRow
+	hlcoord 3, 3
+	call Mail_Place6TileRow
+	hlcoord 4, 4
+	call Mail_Place6TileRow
+	dec hl
+	ld [hl], $7f
+	dec a
+	hlcoord 15, 14
+	call Mail_Draw2x2Graphic
+	add $4
+	hlcoord 15, 16
+	ld [hli], a
+	inc a
+	ld [hl], a
+	inc a
+	push af
+	hlcoord 12, 1
+	call Mail_Draw3x2Graphic
+	pop af
+	hlcoord 15, 4
+	call Mail_Draw3x2Graphic
+	inc a
+	hlcoord 2, 11
+	call Mail_Draw16TileRow
+	inc a
+	hlcoord 10, 3
+	call Mail_Draw2x2Graphic
+	pop hl
+	jp MailGFX_PlaceMessage
+; b9636
+
+Mail_Place6TileRow: ; b9636
+	ld b, $6
+.loop
+	ld [hli], a
+	inc a
+	dec b
+	jr nz, .loop
+	ret
+; b963e
+
+LoadFlowerMailGFX: ; b963e
+	push bc
+	ld hl, VTiles2 tile $31
+	ld de, FlowerMailBorderGFX
+	ld c, 8 * 8
+	call LoadMailGFX_Color1
+	ld de, MailOddishGFX
+	ld c, 4 * 8
+	call LoadMailGFX_Color3
+	ld de, FlowerMailBorderGFX + 6 * 8
+	ld c, 1 * 8
+	call LoadMailGFX_Color2
+	ld de, FlowerMailFlowerGFX
+	ld c, 4 * 8
+	call LoadMailGFX_Color1
+	ld c, 4 * 8
+	call LoadMailGFX_Color2
+
+	call DrawMailBorder
+	hlcoord 2, 15
+	ld a, $3d ; underline
+	call Mail_Draw16TileRow
+	ld a, $39 ; oddish
+	hlcoord 16, 13
+	call Mail_Draw2x2Graphic
+	hlcoord 2, 13
+	call Mail_Draw2x2Graphic
+	ld a, $3e
+	hlcoord 2, 2
+	call Mail_Draw2x2Graphic
+	hlcoord 5, 3
+	call Mail_Draw2x2Graphic
+	hlcoord 10, 2
+	call Mail_Draw2x2Graphic
+	hlcoord 16, 3
+	call Mail_Draw2x2Graphic
+	hlcoord 5, 11
+	call Mail_Draw2x2Graphic
+	hlcoord 16, 10
+	call Mail_Draw2x2Graphic
+	ld a, $42
+	hlcoord 3, 4
+	call Mail_Draw2x2Graphic
+	hlcoord 12, 3
+	call Mail_Draw2x2Graphic
+	hlcoord 14, 2
+	call Mail_Draw2x2Graphic
+	hlcoord 2, 10
+	call Mail_Draw2x2Graphic
+	hlcoord 14, 11
+	call Mail_Draw2x2Graphic
+	pop hl
+	jp MailGFX_PlaceMessage
+; b96ca
+
+LoadPortraitMailGFX: ; b96ca
+	push bc
+	ld hl, VTiles2 tile $31
+	ld de, PortraitMailBorderGFX
+	ld c, 5 * 8
+	call LoadMailGFX_Color2
+	ld de, PortraitMailUnderlineGFX
+	ld c, 1 * 8
+	call LoadMailGFX_Color2
+	ld hl, VTiles2 tile $3d
+	ld de, PortraitMailLargePokeballGFX
+	ld c, 4 * 8
+	call LoadMailGFX_Color1
+	ld de, PortraitMailSmallPokeballGFX
+	ld c, 1 * 8
+	call LoadMailGFX_Color2
+
+	call DrawMailBorder2
+	hlcoord 8, 15
+	ld a, $36
+	ld b, $a
+	call Mail_DrawRowLoop
+	call LovelyEonMail_PlaceIcons
+	ld a, $1
+	ld [UnownLetter], a
+	hlcoord 1, 10
+	call PrepMonFrontpic
+	pop hl
+	jp MailGFX_PlaceMessage
+; b9710
+
+LoadMusicMailGFX: ; b9710
+	push bc
+	ld hl, VTiles2 tile $31
+	ld de, MusicMailBorderGFX
+	ld c, 4 * 8
+	call LoadMailGFX_Color2
+	ld de, MorphMailBorderGFX
+	ld c, 2 * 8
+	call LoadMailGFX_Color2
+	ld de, MailNatuGFX
+	ld c, 6 * 8
+	call LoadMailGFX_Color3
+	xor a
+	ld bc, 1 tiles
+	call ByteFill
+	ld de, MusicMailLargeNoteGFX
+	ld c, 3 * 8
+	call LoadMailGFX_Color1
+	ld de, MusicMailSmallNoteGFX
+	ld c, 1 * 8
+	call LoadMailGFX_Color1
+
+	ld a, $31
+	hlcoord 0, 0
+	call Mail_Place18TileAlternatingRow
+	hlcoord 1, 17
+	call Mail_Place18TileAlternatingRow
+	ld a, $33
+	hlcoord 0, 1
+	call Mail_Place16TileAlternatingColumn
+	hlcoord 19, 0
+	call Mail_Place16TileAlternatingColumn
+	ld a, $35
+	hlcoord 2, 15
+	call Mail_Place14TileAlternatingRow
+	ld a, $37
+	hlcoord 15, 14
+	call Mail_Draw3x2Graphic
+	call LovelyEonMail_PlaceIcons
+	pop hl
+	jp MailGFX_PlaceMessage
+; b9776
+
+LoadMirageMailGFX: ; b9776
+	push bc
+	ld hl, VTiles2 tile $31
+	ld bc, 5 * 8
+	call MailGFX_GenerateMonochromeTilesColor2
+	ld de, BlueSkyMailGrassGFX
+	ld c, 1 * 8
+	call LoadMailGFX_Color2
+	ld de, MailMewGFX
+	ld c, 18 * 8
+	call LoadMailGFX_Color2
+	ld de, LiteBlueMailBorderGFX + 1 * 8
+	ld c, 1 * 8
+	call LoadMailGFX_Color1
+	ld de, LiteBlueMailBorderGFX + 6 * 8
+	ld c, 1 * 8
+	call LoadMailGFX_Color1
+
+	call DrawMailBorder2
+	ld a, $36
+	hlcoord 1, 16
+	call Mail_DrawTopBottomBorder
+	inc a
+	hlcoord 15, 14
+	call Mail_Draw3x2Graphic
+	inc a
+	hlcoord 15, 16
+	ld [hli], a
+	inc a
+	ld [hl], a
+	ld a, $3f
+	hlcoord 1, 1
+	call Mail_Place18TileAlternatingRow
+	ld a, $41
+	hlcoord 0, 2
+	call Mail_Place14TileAlternatingColumn
+	ld a, $43
+	hlcoord 19, 2
+	call Mail_Place14TileAlternatingColumn
+	ld a, $45
+	hlcoord 0, 1
+	ld [hl], a
+	inc a
+	hlcoord 19, 1
+	ld [hl], a
+	inc a
+	hlcoord 0, 16
+	ld [hl], a
+	inc a
+	hlcoord 19, 16
+	ld [hl], a
+	inc a
+	hlcoord 2, 5
+	call Mail_Draw16TileRow
+	inc a
+	hlcoord 2, 11
+	call Mail_Draw16TileRow
+	pop hl
+	jp MailGFX_PlaceMessage
+; b97f8
+
+MailGFX_GenerateMonochromeTilesColor2: ; b97f8
+.loop
+	xor a
+	ld [hli], a
+	ld a, $ff
+	ld [hli], a
+	dec bc
+	ld a, b
+	or c
+	jr nz, .loop
+	ret
+; b9803
+
+MailGFX_PlaceMessage: ; b9803
+	ld bc, MAIL_STRUCT_LENGTH
+	ld de, wTempMail
+	ld a, BANK(sPartyMail)
+	call GetSRAMBank
+	call CopyBytes
+	call CloseSRAM
+	ld hl, wTempMailAuthor
+	ld de, wMonOrItemNameBuffer
+	ld bc, NAME_LENGTH - 1
+	call CopyBytes
+	ld a, "@"
+	ld [wTempMailAuthor], a
+	ld [wMonOrItemNameBuffer + NAME_LENGTH - 1], a
+	ld de, wTempMailMessage
+	hlcoord 2, 7
+	call PlaceString
+	ld de, wMonOrItemNameBuffer
+	ld a, [de]
+	and a
+	ret z
+	ld a, [Buffer3]
+	hlcoord 8, 14
+	cp $3 ; PORTRAITMAIL
+	jr z, .place_author
+	hlcoord 6, 14
+	cp $6 ; MORPH_MAIL
+	jr z, .place_author
+	hlcoord 5, 14
+
+.place_author
+	jp PlaceString
+; b984e
+
+Functionb984e: ; b984e
+; XXX
+.loop
+	ld a, [hl]
+	xor $ff
+	ld [hli], a
+	dec bc
+	ld a, b
+	or c
+	jr nz, .loop
+	ret
+; b9858
+
+DrawMailBorder: ; b9858
+	hlcoord 0, 0
+	ld a, $31
+	ld [hli], a
+	inc a
+	call Mail_DrawTopBottomBorder
+	inc a
+	ld [hli], a
+	inc a
+	call Mail_DrawLeftRightBorder
+	ld a, $36
+	ld [hli], a
+	inc a
+	call Mail_DrawTopBottomBorder
+	hlcoord 19, 1
+	ld a, $35
+	call Mail_DrawLeftRightBorder
+	ld a, $38
+	ld [hl], a
+	ret
+; b987b
+
+DrawMailBorder2: ; b987b
+	hlcoord 0, 0
+	ld a, $31
+	ld [hli], a
+	inc a
+	call Mail_DrawTopBottomBorder
+	ld [hl], $31
+	inc hl
+	inc a
+	call Mail_DrawLeftRightBorder
+	ld [hl], $31
+	inc hl
+	inc a
+	call Mail_DrawTopBottomBorder
+	hlcoord 19, 1
+	ld a, $35
+	call Mail_DrawLeftRightBorder
+	ld [hl], $31
+	ret
+; b989e
+
+Mail_Place14TileAlternatingRow: ; b989e
+	push af
+	ld b, 14 / 2
+	jr Mail_PlaceAlternatingRow
+
+Mail_Place16TileAlternatingRow: ; b98a3
+	push af
+	ld b, 16 / 2
+	jr Mail_PlaceAlternatingRow
+
+Mail_Place18TileAlternatingRow: ; b98a8
+	push af
+	ld b, 18 / 2
+
+Mail_PlaceAlternatingRow: ; b98ab
+.loop
+	ld [hli], a
+	inc a
+	ld [hli], a
+	dec a
+	dec b
+	jr nz, .loop
+	ld [hl], a
+	pop af
+	ret
+; b98b5
+
+Mail_Place14TileAlternatingColumn: ; b98b5
+	push af
+	ld b, 14 / 2
+	jr Mail_PlaceAlternatingColumn
+
+Mail_Place16TileAlternatingColumn: ; b98ba
+	push af
+	ld b, 16 / 2
+
+Mail_PlaceAlternatingColumn: ; b98bd
+.loop
+	ld [hl], a
+	ld de, SCREEN_WIDTH
+	add hl, de
+	inc a
+	ld [hl], a
+	add hl, de
+	dec a
+	dec b
+	jr nz, .loop
+	ld [hl], a
+	pop af
+	ret
+; b98cc
+
+Mail_Draw7TileRow: ; b98cc
+	ld b, $7
+	jr Mail_DrawRowLoop
+
+Mail_Draw13TileRow: ; b98d0
+	ld b, $d
+	jr Mail_DrawRowLoop
+
+Mail_Draw16TileRow: ; b98d4
+	ld b, $10
+	jr Mail_DrawRowLoop
+
+Mail_DrawTopBottomBorder: ; b98d8
+	ld b, SCREEN_WIDTH - 2
+	jr Mail_DrawRowLoop
+
+Mail_DrawFullWidthBorder: ; b98dc
+	ld b, SCREEN_WIDTH
+
+Mail_DrawRowLoop: ; b98de
+.loop
+	ld [hli], a
+	dec b
+	jr nz, .loop
+	ret
+; b98e3
+
+Mail_DrawLeftRightBorder: ; b98e3
+	ld b, SCREEN_HEIGHT - 2
+	ld de, SCREEN_WIDTH
+.loop
+	ld [hl], a
+	add hl, de
+	dec b
+	jr nz, .loop
+	ret
+; b98ee
+
+Mail_Draw2x2Graphic: ; b98ee
+	push af
+	ld [hli], a
+	inc a
+	ld [hl], a
+	ld bc, SCREEN_WIDTH - 1
+	add hl, bc
+	inc a
+	ld [hli], a
+	inc a
+	ld [hl], a
+	pop af
+	ret
+; b98fc
+
+Mail_Draw3x2Graphic: ; b98fc
+	ld [hli], a
+	inc a
+	ld [hli], a
+	inc a
+	ld [hl], a
+	ld bc, SCREEN_WIDTH - 2
+	add hl, bc
+	inc a
+	ld [hli], a
+	inc a
+	ld [hli], a
+	inc a
+	ld [hl], a
+	ret
+; b990c
+
+LoadMailGFX_Color1: ; b990c
+.loop
+	ld a, [de]
+	inc de
+	ld [hli], a
+	xor a
+	ld [hli], a
+	dec c
+	jr nz, .loop
+	ret
+; b9915
+
+LoadMailGFX_Color2: ; b9915
+.loop
+	xor a
+	ld [hli], a
+	ld a, [de]
+	inc de
+	ld [hli], a
+	dec c
+	jr nz, .loop
+	ret
+; b991e
+
+LoadMailGFX_Color3: ; b991e
+.loop
+	ld a, [de]
+	inc de
+	ld [hli], a
+	ld [hli], a
+	dec c
+	jr nz, .loop
+	ret
+; b9926
+
+INCLUDE "gfx/mail.asm"
+
+ItemIsMail: ; b9e76
+	ld a, d
+	ld hl, MailItems
+	ld de, 1
+	jp IsInArray
+; b9e80
+
+INCLUDE "data/items/mail_items.asm"
diff --git a/engine/map_setup.asm b/engine/map_setup.asm
index 01f3d05d7..562916442 100644
--- a/engine/map_setup.asm
+++ b/engine/map_setup.asm
@@ -1,4 +1,3 @@
-
 RunMapSetupScript:: ; 15363
 	ld a, [hMapEntryMethod]
 	and $f
@@ -15,183 +14,7 @@ RunMapSetupScript:: ; 15363
 	ret
 ; 15377
 
-MapSetupScripts: ; 15377
-	dw MapSetupScript_Warp
-	dw MapSetupScript_Continue
-	dw MapSetupScript_ReloadMap
-	dw MapSetupScript_Teleport
-	dw MapSetupScript_Door
-	dw MapSetupScript_Fall
-	dw MapSetupScript_Connection
-	dw MapSetupScript_LinkReturn
-	dw MapSetupScript_Train
-	dw MapSetupScript_Submenu
-	dw MapSetupScript_BadWarp
-	dw MapSetupScript_Fly
-; 1538f
-
-MapSetupScript_Teleport: ; 1538f
-	db map_prolong_sprites
-MapSetupScript_Fly: ; 15390
-	db map_fade_out_palettes
-	db map_keep_roam
-MapSetupScript_Warp: ; 15392
-	db map_lcd_off
-	db map_sound_off
-	db map_load_spawn
-	db map_attributes
-	db map_change_callback
-	db map_spawn_coord
-	db map_player_coord
-	db map_anchor_screen
-	db map_load_blocks
-	db map_buffer_screen
-	db map_load_graphics
-	db map_time_of_day
-	db map_load_objects
-	db map_lcd_on
-	db map_palettes
-	db map_face_down
-	db map_sprites
-	db map_bike_music
-	db map_max_volume
-	db map_fade_in_palettes
-	db map_animations_on
-	db map_wildmons
-	db map_end
-
-MapSetupScript_BadWarp: ; 153a9
-	db map_load_spawn
-	db map_attributes
-	db map_change_callback
-	db map_spawn_coord
-	db map_player_coord
-	db map_anchor_screen
-	db map_load_blocks
-	db map_buffer_screen
-	db map_lcd_off
-	db map_load_graphics
-	db map_time_of_day
-	db map_fade_out_music
-	db map_lcd_on
-	db map_load_objects
-	db map_palettes
-	db map_face_down
-	db map_sprites
-	db map_fade_music
-	db map_fade_in_palettes
-	db map_animations_on
-	db map_wildmons
-	db map_end
-
-MapSetupScript_Connection: ; 153bf
-	db map_animations_off
-	db map_load_connection
-	db map_attributes
-	db map_change_callback
-	db map_player_coord
-	db map_load_blocks
-	db map_load_tileset_header
-	db map_save_screen
-	db map_load_objects
-	db map_fade_music
-	db map_palettes
-	db map_stop_script
-	db map_keep_palettes
-	db map_wildmons
-	db map_update_roam
-	db map_animations_on
-	db map_end
-
-MapSetupScript_Fall: ; 153d0
-	db map_prolong_sprites
-MapSetupScript_Door: ; 153d1
-	db map_fade_out_palettes
-MapSetupScript_Train: ; 153d2
-	db map_load_warp
-	db map_attributes
-	db map_warp_face
-	db map_change_callback
-	db map_player_coord
-	db map_load_blocks
-	db map_buffer_screen
-	db map_lcd_off
-	db map_load_graphics
-	db map_time_of_day
-	db map_fade_out_music
-	db map_lcd_on
-	db map_load_objects
-	db map_palettes
-	db map_sprites
-	db map_fade_music
-	db map_fade_in_palettes
-	db map_animations_on
-	db map_wildmons
-	db map_update_roam
-	db map_end
-
-MapSetupScript_ReloadMap: ; 153e7
-	db map_fade
-	db map_clear_bg_palettes
-	db map_lcd_off
-	db map_sound_off
-	db map_load_blocks
-	db map_connection_blocks
-	db map_load_graphics
-	db map_time_of_day
-	db map_lcd_on
-	db map_palettes
-	db map_sprites
-	db map_music_force
-	db map_fade_in_palettes
-	db map_animations_on
-	db map_wildmons
-	db map_end
-
-MapSetupScript_LinkReturn: ; 153f7
-	db map_fade
-	db map_lcd_off
-	db map_sound_off
-	db map_change_callback
-	db map_load_blocks
-	db map_buffer_screen
-	db map_load_graphics
-	db map_time_of_day
-	db map_lcd_on
-	db map_palettes
-	db map_sprites
-	db map_bike_music
-	db map_fade_in_palettes
-	db map_animations_on
-	db map_wildmons
-	db map_text_scroll_off
-	db map_end
-
-MapSetupScript_Continue: ; 15408
-	db map_lcd_off
-	db map_sound_off
-	db map_attributes_2
-	db map_anchor_screen
-	db map_start_callback
-	db map_load_blocks
-	db map_connection_blocks
-	db map_buffer_screen
-	db map_load_graphics
-	db map_time_of_day
-	db map_lcd_on
-	db map_palettes
-	db map_sprites
-	db map_bike_music
-	db map_fade_in_palettes
-	db map_animations_on
-	db map_wildmons
-	db map_end
-
-MapSetupScript_Submenu: ; 1541a
-	db map_load_blocks
-	db map_connection_blocks
-	db map_end
-
+INCLUDE "data/maps/setup_scripts.asm"
 
 ReadMapSetupScript: ; 1541d
 .loop
@@ -238,6 +61,7 @@ ReadMapSetupScript: ; 1541d
 ; 15440
 
 MapSetupCommands: ; 15440
+; entries correspond to command indexes in constants/map_setup_constants.asm
 	dba EnableLCD ; 00
 	dba DisableLCD ; 01
 	dba MapSetup_Sound_Off ; 02
@@ -253,7 +77,7 @@ MapSetupCommands: ; 15440
 	dba SaveScreen ; 0c
 	dba BufferScreen ; 0d
 	dba LoadGraphics ; 0e
-	dba LoadTilesetHeader ; 0f
+	dba LoadTileset ; 0f
 	dba LoadMapTimeOfDay ; 10
 	dba LoadMapPalettes ; 11
 	dba LoadWildMonData ; 12
diff --git a/engine/mon_icons.asm b/engine/mon_icons.asm
index 965d9f0ef..2ebeb67fa 100755
--- a/engine/mon_icons.asm
+++ b/engine/mon_icons.asm
@@ -468,6 +468,6 @@ ReadMonMenuIcon: ; 8eab3
 
 INCLUDE "data/pokemon/menu_icons.asm"
 
-INCLUDE "gfx/icon_pointers.asm"
+INCLUDE "data/icon_pointers.asm"
 
 INCLUDE "gfx/icons.asm"
diff --git a/engine/movement.asm b/engine/movement.asm
index 66c501909..bec089978 100644
--- a/engine/movement.asm
+++ b/engine/movement.asm
@@ -1,5 +1,5 @@
 MovementPointers: ; 5075
-; entries correspond to macros/movement.asm enumeration
+; entries correspond to macros/scripts/movement.asm enumeration
 	dw Movement_turn_head_down        ; 00
 	dw Movement_turn_head_up          ; 01
 	dw Movement_turn_head_left        ; 02
diff --git a/engine/mystery_gift.asm b/engine/mystery_gift.asm
index 9e097e6d4..3c8f9d029 100755
--- a/engine/mystery_gift.asm
+++ b/engine/mystery_gift.asm
@@ -1153,7 +1153,7 @@ MysteryGift_CopyReceivedDecosToPC: ; 105091 (41:5091)
 .skip
 	inc c
 	ld a, c
-	cp Trophys - DecorationIDs
+	cp TrophyIDs - DecorationIDs
 	jr c, .loop
 	jp CloseSRAM
 
diff --git a/engine/mystery_gift_2.asm b/engine/mystery_gift_2.asm
index dc0baf39c..1d180f714 100755
--- a/engine/mystery_gift_2.asm
+++ b/engine/mystery_gift_2.asm
@@ -147,6 +147,6 @@ MysteryGiftFallbackItem: ; 2c722 (b:4722)
 ; 2c725 (b:4725)
 
 
-INCLUDE "data/mystery_gift/items.asm"
+INCLUDE "data/mystery_gift_items.asm"
 
-INCLUDE "data/mystery_gift/decos.asm"
+INCLUDE "data/mystery_gift_decos.asm"
diff --git a/engine/overworld.asm b/engine/overworld.asm
index a1b4545a9..7941b74d7 100755
--- a/engine/overworld.asm
+++ b/engine/overworld.asm
@@ -202,11 +202,11 @@ GetSprite: ; 1423c
 	call GetMonSprite
 	ret c
 
-	ld hl, SpriteHeaders ; address
+	ld hl, OverworldSprites + SPRITEDATA_ADDR
 	dec a
 	ld c, a
 	ld b, 0
-	ld a, 6
+	ld a, NUM_SPRITEDATA_FIELDS
 	call AddNTimes
 	; load the address into de
 	ld a, [hli]
@@ -299,11 +299,11 @@ _DoesSpriteHaveFacings:: ; 142a7
 
 	push hl
 	push bc
-	ld hl, SpriteHeaders + SPRITEHEADER_TYPE ; type
+	ld hl, OverworldSprites + SPRITEDATA_TYPE
 	dec a
 	ld c, a
 	ld b, 0
-	ld a, NUM_SPRITEHEADER_FIELDS
+	ld a, NUM_SPRITEDATA_FIELDS
 	call AddNTimes
 	ld a, [hl]
 	pop bc
@@ -324,11 +324,11 @@ _GetSpritePalette:: ; 142c4
 	call GetMonSprite
 	jr c, .is_pokemon
 
-	ld hl, SpriteHeaders + 5 ; palette
+	ld hl, OverworldSprites + SPRITEDATA_PALETTE
 	dec a
 	ld c, a
 	ld b, 0
-	ld a, 6
+	ld a, NUM_SPRITEDATA_FIELDS
 	call AddNTimes
 	ld c, [hl]
 	ret
@@ -691,8 +691,8 @@ endr
 LoadEmote:: ; 1442f
 ; Get the address of the pointer to emote c.
 	ld a, c
-	ld bc, 6
-	ld hl, EmotesPointers
+	ld bc, 6 ; sizeof(emote)
+	ld hl, Emotes
 	call AddNTimes
 ; Load the emote address into de
 	ld e, [hl]
@@ -719,10 +719,10 @@ LoadEmote:: ; 1442f
 ; 1444d
 
 
-INCLUDE "data/emote_headers.asm"
+INCLUDE "data/emotes.asm"
 
 INCLUDE "data/sprite_mons.asm"
 
 INCLUDE "data/maps/outdoor_sprites.asm"
 
-INCLUDE "gfx/sprite_headers.asm"
+INCLUDE "data/sprites.asm"
diff --git a/gfx/pics/animation.asm b/engine/pic_animation.asm
index 2b93ef749..2b93ef749 100644
--- a/gfx/pics/animation.asm
+++ b/engine/pic_animation.asm
diff --git a/engine/player_gfx.asm b/engine/player_gfx.asm
index 1af444d73..6ffaa77c8 100644
--- a/engine/player_gfx.asm
+++ b/engine/player_gfx.asm
@@ -71,45 +71,7 @@ ShowPlayerNamingChoices: ; 88297
 	call CloseWindow
 	ret
 
-ChrisNameMenuHeader: ; 882b5
-	db $40 ; flags
-	db 00, 00 ; start coords
-	db 11, 10 ; end coords
-	dw .MaleNames
-	db 1 ; ????
-	db 0 ; default option
-
-.MaleNames: ; 882be
-	db $91 ; flags
-	db 5 ; items
-	db "NEW NAME@"
-MalePlayerNameArray: ; 882c9
-	db "CHRIS@"
-	db "MAT@"
-	db "ALLAN@"
-	db "JON@"
-	db 2 ; displacement
-	db " NAME @" ; title
-
-KrisNameMenuHeader: ; 882e5
-	db $40 ; flags
-	db 00, 00 ; start coords
-	db 11, 10 ; end coords
-	dw .FemaleNames
-	db 1 ; ????
-	db 0 ; default option
-
-.FemaleNames: ; 882ee
-	db $91 ; flags
-	db 5 ; items
-	db "NEW NAME@"
-FemalePlayerNameArray: ; 882f9
-	db "KRIS@"
-	db "AMANDA@"
-	db "JUANA@"
-	db "JODI@"
-	db 2 ; displacement
-	db " NAME @" ; title
+INCLUDE "data/default_names.asm"
 
 GetPlayerNameArray: ; 88318 This Function is never called
 	ld hl, PlayerName
diff --git a/engine/pokedex_3.asm b/engine/pokedex_3.asm
index 3414252c1..6ec2ce9fd 100644
--- a/engine/pokedex_3.asm
+++ b/engine/pokedex_3.asm
@@ -21,7 +21,7 @@ LoadQuestionMarkPic: ; 1de0d7
 	ret
 
 .QuestionMarkLZ: ; 1de0e1
-INCBIN "gfx/pics/questionmark/front.2bpp.lz"
+INCBIN "gfx/pokemon/questionmark/front.2bpp.lz"
 
 DrawPokedexListWindow: ; 1de171 (77:6171)
 	ld a, $32
diff --git a/engine/pokegear.asm b/engine/pokegear.asm
index 96959205b..a3e43cebf 100755
--- a/engine/pokegear.asm
+++ b/engine/pokegear.asm
@@ -2338,7 +2338,7 @@ HasVisitedSpawn: ; 91c50
 
 ; 91c5e
 
-INCLUDE "data/flypoints.asm"
+INCLUDE "data/maps/flypoints.asm"
 
 ret_91c8f: ; 91c8f
 	ret
diff --git a/engine/scripting.asm b/engine/scripting.asm
index 9818bbac3..826267f6b 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -64,7 +64,7 @@ RunScriptCommand:
 
 
 ScriptCommandTable:
-; entries correspond to macros/event.asm enumeration
+; entries correspond to macros/scripts/events.asm enumeration
 	dw Script_scall                      ; 00
 	dw Script_farscall                   ; 01
 	dw Script_ptcall                     ; 02
diff --git a/engine/specials.asm b/engine/specials.asm
index 82b42d8c1..cd2394b96 100644
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -1,4 +1,3 @@
-
 Special:: ; c01b
 ; Run script special de.
 	ld hl, SpecialsPointers
diff --git a/engine/sprites.asm b/engine/sprites.asm
index 755ee0835..4a33eb5cf 100755
--- a/engine/sprites.asm
+++ b/engine/sprites.asm
@@ -444,9 +444,9 @@ GetSpriteAnimFrame: ; 8d132
 	inc [hl]
 	call .GetPointer ; load pointer from SpriteAnimFrameData
 	ld a, [hli]
-	cp -2
+	cp dorestart_command
 	jr z, .restart
-	cp -1
+	cp endanim_command
 	jr z, .repeat_last
 
 	push af
@@ -551,13 +551,13 @@ BrokenGetStdGraphics: ; 8d1ac
 ; 8d1c4
 
 
-INCLUDE "data/sprite_anim_seqs.asm"
+INCLUDE "data/sprite_anims/sequences.asm"
 
 INCLUDE "engine/sprite_anims.asm"
 
-INCLUDE "data/sprite_anim_frames.asm"
+INCLUDE "data/sprite_anims/framesets.asm"
 
-INCLUDE "data/sprite_anim_oam.asm"
+INCLUDE "data/sprite_anims/oam.asm"
 
 
 BrokenStdGFXPointers: ; Broken 2bpp pointers
diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm
index a4a07bc4d..7fc364f70 100644
--- a/engine/timeofdaypals.asm
+++ b/engine/timeofdaypals.asm
@@ -41,19 +41,18 @@ _TimeOfDayPals:: ; 8c011
 ; update palette id
 	ld [TimeOfDayPal], a
 
-
-; save bg palette 8
-	ld hl, UnknBGPals + 8 * 7 ; UnknBGPals + 7 pals
+; save bg palette 7
+	ld hl, UnknBGPals palette PAL_BG_TEXT
 
 ; save wram bank
 	ld a, [rSVBK]
 	ld b, a
 ; wram bank 5
-	ld a, 5
+	ld a, $5
 	ld [rSVBK], a
 
 ; push palette
-	ld c, 4 ; NUM_PAL_COLORS
+	ld c, NUM_PAL_COLORS
 .push
 	ld d, [hl]
 	inc hl
@@ -73,7 +72,7 @@ _TimeOfDayPals:: ; 8c011
 	call GetSGBLayout
 
 
-; restore bg palette 8
+; restore bg palette 7
 	ld hl, UnknOBPals - 1 ; last byte in UnknBGPals
 
 ; save wram bank
@@ -84,7 +83,7 @@ _TimeOfDayPals:: ; 8c011
 	ld [rSVBK], a
 
 ; pop palette
-	ld e, 4 ; NUM_PAL_COLORS
+	ld e, NUM_PAL_COLORS
 .pop
 	pop bc
 	ld [hl], c
diff --git a/engine/title.asm b/engine/title.asm
index ba7f34764..84e7550fd 100644
--- a/engine/title.asm
+++ b/engine/title.asm
@@ -88,7 +88,7 @@ _TitleScreen: ; 10ed67
 ; Suicune gfx
 	hlbgcoord 0, 12
 	ld bc, 6 bgrows ; the rest of the screen
-	ld a, 8
+	ld a, 0 | VRAM_BANK_1
 	call ByteFill
 
 
diff --git a/engine/tmhm.asm b/engine/tmhm.asm
index 78d3b1707..6a9c76f00 100755
--- a/engine/tmhm.asm
+++ b/engine/tmhm.asm
@@ -46,4 +46,4 @@ GetTMHMMove: ; 1166a
 ; 1167a
 
 
-INCLUDE "data/tmhm_moves.asm"
+INCLUDE "data/moves/tmhm_moves.asm"
diff --git a/engine/trade_animation.asm b/engine/trade_animation.asm
index fa631ae4e..1305fab5b 100755
--- a/engine/trade_animation.asm
+++ b/engine/trade_animation.asm
@@ -236,7 +236,7 @@ DoTradeAnimation: ; 29082
 ; 290af
 
 .JumpTable: ; 290af
-; entries correspond to macros/trade_anim.asm enumeration
+; entries correspond to macros/scripts/trade_anims.asm enumeration
 	dw TradeAnim_AdvanceScriptPointer ; 00
 	dw TradeAnim_ShowGivemonData      ; 01
 	dw TradeAnim_ShowGetmonData       ; 02
diff --git a/text/types.asm b/engine/types.asm
index adc1b17ef..375bfe434 100644
--- a/text/types.asm
+++ b/engine/types.asm
@@ -96,54 +96,6 @@ GetTypeName: ; 50964
 ; 5097b
 
 
-TypeNames: ; 5097b
-	dw Normal
-	dw Fighting
-	dw Flying
-	dw Poison
-	dw Ground
-	dw Rock
-	dw Bird
-	dw Bug
-	dw Ghost
-	dw Steel
-	dw Normal
-	dw Normal
-	dw Normal
-	dw Normal
-	dw Normal
-	dw Normal
-	dw Normal
-	dw Normal
-	dw Normal
-	dw CurseType
-	dw Fire
-	dw Water
-	dw Grass
-	dw Electric
-	dw Psychic
-	dw Ice
-	dw Dragon
-	dw Dark
-
-Normal:    db "NORMAL@"
-Fighting:  db "FIGHTING@"
-Flying:    db "FLYING@"
-Poison:    db "POISON@"
-CurseType: db "???@"
-Fire:      db "FIRE@"
-Water:     db "WATER@"
-Grass:     db "GRASS@"
-Electric:  db "ELECTRIC@"
-Psychic:   db "PSYCHIC@"
-Ice:       db "ICE@"
-Ground:    db "GROUND@"
-Rock:      db "ROCK@"
-Bird:      db "BIRD@"
-Bug:       db "BUG@"
-Ghost:     db "GHOST@"
-Steel:     db "STEEL@"
-Dragon:    db "DRAGON@"
-Dark:      db "DARK@"
+INCLUDE "data/type_names.asm"
 
 ; 50a28
diff --git a/engine/warp_connection.asm b/engine/warp_connection.asm
index 13a624d7f..ca0daae73 100755
--- a/engine/warp_connection.asm
+++ b/engine/warp_connection.asm
@@ -292,8 +292,8 @@ LoadMapTimeOfDay: ; 104750
 	ret
 
 LoadGraphics: ; 1047cf
-	call LoadTilesetHeader
 	call LoadTileset
+	call LoadTilesetGFX
 	xor a
 	ld [hMapAnims], a
 	xor a
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/fx/aeroblast.2bpp.lz.2f07c4ea b/gfx/battle_anims/aeroblast.2bpp.lz.2f07c4ea
index 5e203cb63..5e203cb63 100644
--- a/gfx/fx/aeroblast.2bpp.lz.2f07c4ea
+++ b/gfx/battle_anims/aeroblast.2bpp.lz.2f07c4ea
diff --git a/gfx/fx/aeroblast.png b/gfx/battle_anims/aeroblast.png
index 1fdc07c2f..1fdc07c2f 100644
--- a/gfx/fx/aeroblast.png
+++ b/gfx/battle_anims/aeroblast.png
diff --git a/gfx/fx/angels.2bpp.lz.b026d81e b/gfx/battle_anims/angels.2bpp.lz.b026d81e
index 61d89d224..61d89d224 100644
--- a/gfx/fx/angels.2bpp.lz.b026d81e
+++ b/gfx/battle_anims/angels.2bpp.lz.b026d81e
diff --git a/gfx/fx/angels.png b/gfx/battle_anims/angels.png
index ef38c61d2..ef38c61d2 100644
--- a/gfx/fx/angels.png
+++ b/gfx/battle_anims/angels.png
diff --git a/gfx/fx/beam.2bpp.lz.80b6d613 b/gfx/battle_anims/beam.2bpp.lz.80b6d613
index 1ce9ab82c..1ce9ab82c 100644
--- a/gfx/fx/beam.2bpp.lz.80b6d613
+++ b/gfx/battle_anims/beam.2bpp.lz.80b6d613
diff --git a/gfx/fx/beam.png b/gfx/battle_anims/beam.png
index 32a3b1967..32a3b1967 100755
--- a/gfx/fx/beam.png
+++ b/gfx/battle_anims/beam.png
diff --git a/gfx/fx/bubble.2bpp.lz.03b8ac99 b/gfx/battle_anims/bubble.2bpp.lz.03b8ac99
index 3d546191a..3d546191a 100644
--- a/gfx/fx/bubble.2bpp.lz.03b8ac99
+++ b/gfx/battle_anims/bubble.2bpp.lz.03b8ac99
diff --git a/gfx/fx/bubble.png b/gfx/battle_anims/bubble.png
index b6febb0a8..b6febb0a8 100644
--- a/gfx/fx/bubble.png
+++ b/gfx/battle_anims/bubble.png
diff --git a/gfx/fx/charge.2bpp.lz.95d3ea98 b/gfx/battle_anims/charge.2bpp.lz.95d3ea98
index 32c82243c..32c82243c 100644
--- a/gfx/fx/charge.2bpp.lz.95d3ea98
+++ b/gfx/battle_anims/charge.2bpp.lz.95d3ea98
diff --git a/gfx/fx/charge.png b/gfx/battle_anims/charge.png
index 90cb72f9f..90cb72f9f 100644
--- a/gfx/fx/charge.png
+++ b/gfx/battle_anims/charge.png
diff --git a/gfx/fx/cut.2bpp.lz.03d343ed b/gfx/battle_anims/cut.2bpp.lz.03d343ed
index 740a48799..740a48799 100644
--- a/gfx/fx/cut.2bpp.lz.03d343ed
+++ b/gfx/battle_anims/cut.2bpp.lz.03d343ed
diff --git a/gfx/fx/cut.png b/gfx/battle_anims/cut.png
index e227ad413..e227ad413 100644
--- a/gfx/fx/cut.png
+++ b/gfx/battle_anims/cut.png
diff --git a/gfx/fx/egg.2bpp.lz.41dd1a53 b/gfx/battle_anims/egg.2bpp.lz.41dd1a53
index fb55f2edc..fb55f2edc 100644
--- a/gfx/fx/egg.2bpp.lz.41dd1a53
+++ b/gfx/battle_anims/egg.2bpp.lz.41dd1a53
diff --git a/gfx/fx/egg.png b/gfx/battle_anims/egg.png
index 38aab505d..38aab505d 100644
--- a/gfx/fx/egg.png
+++ b/gfx/battle_anims/egg.png
diff --git a/gfx/fx/explosion.2bpp.lz.55fc334f b/gfx/battle_anims/explosion.2bpp.lz.55fc334f
index 4303302a1..4303302a1 100644
--- a/gfx/fx/explosion.2bpp.lz.55fc334f
+++ b/gfx/battle_anims/explosion.2bpp.lz.55fc334f
diff --git a/gfx/fx/explosion.png b/gfx/battle_anims/explosion.png
index 0af9f1a0d..0af9f1a0d 100644
--- a/gfx/fx/explosion.png
+++ b/gfx/battle_anims/explosion.png
diff --git a/gfx/fx/fire.2bpp.lz.d7701cda b/gfx/battle_anims/fire.2bpp.lz.d7701cda
index e15e9f9bb..e15e9f9bb 100644
--- a/gfx/fx/fire.2bpp.lz.d7701cda
+++ b/gfx/battle_anims/fire.2bpp.lz.d7701cda
diff --git a/gfx/fx/fire.png b/gfx/battle_anims/fire.png
index 19f01141b..19f01141b 100644
--- a/gfx/fx/fire.png
+++ b/gfx/battle_anims/fire.png
diff --git a/gfx/fx/flower.2bpp.lz.1bc2e9d2 b/gfx/battle_anims/flower.2bpp.lz.1bc2e9d2
index ef628afb4..ef628afb4 100644
--- a/gfx/fx/flower.2bpp.lz.1bc2e9d2
+++ b/gfx/battle_anims/flower.2bpp.lz.1bc2e9d2
diff --git a/gfx/fx/flower.png b/gfx/battle_anims/flower.png
index 61b4f58ce..61b4f58ce 100644
--- a/gfx/fx/flower.png
+++ b/gfx/battle_anims/flower.png
diff --git a/gfx/fx/globe.2bpp.lz.710dbb8e b/gfx/battle_anims/globe.2bpp.lz.710dbb8e
index 99fa15c6f..99fa15c6f 100644
--- a/gfx/fx/globe.2bpp.lz.710dbb8e
+++ b/gfx/battle_anims/globe.2bpp.lz.710dbb8e
diff --git a/gfx/fx/globe.png b/gfx/battle_anims/globe.png
index 8d3a35683..8d3a35683 100644
--- a/gfx/fx/globe.png
+++ b/gfx/battle_anims/globe.png
diff --git a/gfx/fx/haze.2bpp.lz.91424607 b/gfx/battle_anims/haze.2bpp.lz.91424607
index e0cdc644c..e0cdc644c 100644
--- a/gfx/fx/haze.2bpp.lz.91424607
+++ b/gfx/battle_anims/haze.2bpp.lz.91424607
diff --git a/gfx/fx/haze.png b/gfx/battle_anims/haze.png
index 8a870ba98..8a870ba98 100644
--- a/gfx/fx/haze.png
+++ b/gfx/battle_anims/haze.png
diff --git a/gfx/fx/hit.2bpp.lz.2b3c83f2 b/gfx/battle_anims/hit.2bpp.lz.2b3c83f2
index 5d9ffbe5d..5d9ffbe5d 100644
--- a/gfx/fx/hit.2bpp.lz.2b3c83f2
+++ b/gfx/battle_anims/hit.2bpp.lz.2b3c83f2
diff --git a/gfx/fx/hit.png b/gfx/battle_anims/hit.png
index 228066331..228066331 100644
--- a/gfx/fx/hit.png
+++ b/gfx/battle_anims/hit.png
diff --git a/gfx/fx/horn.2bpp.lz.48908aae b/gfx/battle_anims/horn.2bpp.lz.48908aae
index a92f74796..a92f74796 100644
--- a/gfx/fx/horn.2bpp.lz.48908aae
+++ b/gfx/battle_anims/horn.2bpp.lz.48908aae
diff --git a/gfx/fx/horn.png b/gfx/battle_anims/horn.png
index 56e8ca241..56e8ca241 100644
--- a/gfx/fx/horn.png
+++ b/gfx/battle_anims/horn.png
diff --git a/gfx/fx/ice.2bpp.lz.664d900f b/gfx/battle_anims/ice.2bpp.lz.664d900f
index 3d059700b..3d059700b 100644
--- a/gfx/fx/ice.2bpp.lz.664d900f
+++ b/gfx/battle_anims/ice.2bpp.lz.664d900f
diff --git a/gfx/fx/ice.png b/gfx/battle_anims/ice.png
index 62a67641e..62a67641e 100644
--- a/gfx/fx/ice.png
+++ b/gfx/battle_anims/ice.png
diff --git a/gfx/fx/lightning.2bpp.lz.a88fc131 b/gfx/battle_anims/lightning.2bpp.lz.a88fc131
index 81de5850f..81de5850f 100644
--- a/gfx/fx/lightning.2bpp.lz.a88fc131
+++ b/gfx/battle_anims/lightning.2bpp.lz.a88fc131
diff --git a/gfx/fx/lightning.png b/gfx/battle_anims/lightning.png
index 6606fad12..6606fad12 100755
--- a/gfx/fx/lightning.png
+++ b/gfx/battle_anims/lightning.png
diff --git a/gfx/fx/misc.2bpp.lz.4b20c3d7 b/gfx/battle_anims/misc.2bpp.lz.4b20c3d7
index d0c5f0dfc..d0c5f0dfc 100644
--- a/gfx/fx/misc.2bpp.lz.4b20c3d7
+++ b/gfx/battle_anims/misc.2bpp.lz.4b20c3d7
diff --git a/gfx/fx/misc.png b/gfx/battle_anims/misc.png
index d7e67508e..d7e67508e 100755
--- a/gfx/fx/misc.png
+++ b/gfx/battle_anims/misc.png
diff --git a/gfx/fx/noise.2bpp.lz.acb4a76e b/gfx/battle_anims/noise.2bpp.lz.acb4a76e
index e195da453..e195da453 100644
--- a/gfx/fx/noise.2bpp.lz.acb4a76e
+++ b/gfx/battle_anims/noise.2bpp.lz.acb4a76e
diff --git a/gfx/fx/noise.png b/gfx/battle_anims/noise.png
index 17540a5e8..17540a5e8 100755
--- a/gfx/fx/noise.png
+++ b/gfx/battle_anims/noise.png
diff --git a/gfx/fx/objects.2bpp.lz.83f812de b/gfx/battle_anims/objects.2bpp.lz.83f812de
index 1a52d6350..1a52d6350 100644
--- a/gfx/fx/objects.2bpp.lz.83f812de
+++ b/gfx/battle_anims/objects.2bpp.lz.83f812de
diff --git a/gfx/fx/objects.png b/gfx/battle_anims/objects.png
index 91ea435b8..91ea435b8 100755
--- a/gfx/fx/objects.png
+++ b/gfx/battle_anims/objects.png
diff --git a/gfx/fx/plant.2bpp.lz.4a00c417 b/gfx/battle_anims/plant.2bpp.lz.4a00c417
index 589fc48b6..589fc48b6 100644
--- a/gfx/fx/plant.2bpp.lz.4a00c417
+++ b/gfx/battle_anims/plant.2bpp.lz.4a00c417
diff --git a/gfx/fx/plant.png b/gfx/battle_anims/plant.png
index ec1125054..ec1125054 100644
--- a/gfx/fx/plant.png
+++ b/gfx/battle_anims/plant.png
diff --git a/gfx/fx/poison.2bpp.lz.fc7dc9c1 b/gfx/battle_anims/poison.2bpp.lz.fc7dc9c1
index df2cbe604..df2cbe604 100644
--- a/gfx/fx/poison.2bpp.lz.fc7dc9c1
+++ b/gfx/battle_anims/poison.2bpp.lz.fc7dc9c1
diff --git a/gfx/fx/poison.png b/gfx/battle_anims/poison.png
index ebbbc52be..ebbbc52be 100755
--- a/gfx/fx/poison.png
+++ b/gfx/battle_anims/poison.png
diff --git a/gfx/fx/pokeball.2bpp.lz.c58f7e01 b/gfx/battle_anims/pokeball.2bpp.lz.c58f7e01
index e09b082db..e09b082db 100644
--- a/gfx/fx/pokeball.2bpp.lz.c58f7e01
+++ b/gfx/battle_anims/pokeball.2bpp.lz.c58f7e01
diff --git a/gfx/fx/pokeball.png b/gfx/battle_anims/pokeball.png
index 47edf2190..47edf2190 100755
--- a/gfx/fx/pokeball.png
+++ b/gfx/battle_anims/pokeball.png
diff --git a/gfx/fx/powder.2bpp.lz.bfd566bb b/gfx/battle_anims/powder.2bpp.lz.bfd566bb
index 375d0bf9c..375d0bf9c 100644
--- a/gfx/fx/powder.2bpp.lz.bfd566bb
+++ b/gfx/battle_anims/powder.2bpp.lz.bfd566bb
diff --git a/gfx/fx/powder.png b/gfx/battle_anims/powder.png
index b2cb4d459..b2cb4d459 100644
--- a/gfx/fx/powder.png
+++ b/gfx/battle_anims/powder.png
diff --git a/gfx/fx/psychic.2bpp.lz.d80f285c b/gfx/battle_anims/psychic.2bpp.lz.d80f285c
index d6402dd3d..d6402dd3d 100644
--- a/gfx/fx/psychic.2bpp.lz.d80f285c
+++ b/gfx/battle_anims/psychic.2bpp.lz.d80f285c
diff --git a/gfx/fx/psychic.png b/gfx/battle_anims/psychic.png
index a6d22db2f..a6d22db2f 100644
--- a/gfx/fx/psychic.png
+++ b/gfx/battle_anims/psychic.png
diff --git a/gfx/fx/reflect.2bpp.lz.9a9c822d b/gfx/battle_anims/reflect.2bpp.lz.9a9c822d
index a563de1a8..a563de1a8 100644
--- a/gfx/fx/reflect.2bpp.lz.9a9c822d
+++ b/gfx/battle_anims/reflect.2bpp.lz.9a9c822d
diff --git a/gfx/fx/reflect.png b/gfx/battle_anims/reflect.png
index 48fbd7d0d..48fbd7d0d 100644
--- a/gfx/fx/reflect.png
+++ b/gfx/battle_anims/reflect.png
diff --git a/gfx/fx/rocks.2bpp.lz.73d0153e b/gfx/battle_anims/rocks.2bpp.lz.73d0153e
index d5481ea6e..d5481ea6e 100644
--- a/gfx/fx/rocks.2bpp.lz.73d0153e
+++ b/gfx/battle_anims/rocks.2bpp.lz.73d0153e
diff --git a/gfx/fx/rocks.png b/gfx/battle_anims/rocks.png
index d7fe76b2f..d7fe76b2f 100755
--- a/gfx/fx/rocks.png
+++ b/gfx/battle_anims/rocks.png
diff --git a/gfx/fx/rope.2bpp.lz.209d63dd b/gfx/battle_anims/rope.2bpp.lz.209d63dd
index f7d6a480f..f7d6a480f 100644
--- a/gfx/fx/rope.2bpp.lz.209d63dd
+++ b/gfx/battle_anims/rope.2bpp.lz.209d63dd
diff --git a/gfx/fx/rope.png b/gfx/battle_anims/rope.png
index a12553c7a..a12553c7a 100644
--- a/gfx/fx/rope.png
+++ b/gfx/battle_anims/rope.png
diff --git a/gfx/fx/sand.2bpp.lz.c87c0eaa b/gfx/battle_anims/sand.2bpp.lz.c87c0eaa
index 3508a1f58..3508a1f58 100644
--- a/gfx/fx/sand.2bpp.lz.c87c0eaa
+++ b/gfx/battle_anims/sand.2bpp.lz.c87c0eaa
diff --git a/gfx/fx/sand.png b/gfx/battle_anims/sand.png
index a54db235d..a54db235d 100755
--- a/gfx/fx/sand.png
+++ b/gfx/battle_anims/sand.png
diff --git a/gfx/fx/shapes.2bpp.lz.262d77f0 b/gfx/battle_anims/shapes.2bpp.lz.262d77f0
index d7d48020f..d7d48020f 100644
--- a/gfx/fx/shapes.2bpp.lz.262d77f0
+++ b/gfx/battle_anims/shapes.2bpp.lz.262d77f0
diff --git a/gfx/fx/shapes.png b/gfx/battle_anims/shapes.png
index b99fc601a..b99fc601a 100644
--- a/gfx/fx/shapes.png
+++ b/gfx/battle_anims/shapes.png
diff --git a/gfx/fx/shine.2bpp.lz.5fb79056 b/gfx/battle_anims/shine.2bpp.lz.5fb79056
index 3e47170b1..3e47170b1 100644
--- a/gfx/fx/shine.2bpp.lz.5fb79056
+++ b/gfx/battle_anims/shine.2bpp.lz.5fb79056
diff --git a/gfx/fx/shine.png b/gfx/battle_anims/shine.png
index 1b7e9834b..1b7e9834b 100644
--- a/gfx/fx/shine.png
+++ b/gfx/battle_anims/shine.png
diff --git a/gfx/fx/skyattack.2bpp.lz.31738ab8 b/gfx/battle_anims/skyattack.2bpp.lz.31738ab8
index e0412dd81..e0412dd81 100644
--- a/gfx/fx/skyattack.2bpp.lz.31738ab8
+++ b/gfx/battle_anims/skyattack.2bpp.lz.31738ab8
diff --git a/gfx/fx/skyattack.png b/gfx/battle_anims/skyattack.png
index e731c691c..e731c691c 100644
--- a/gfx/fx/skyattack.png
+++ b/gfx/battle_anims/skyattack.png
diff --git a/gfx/fx/smoke.2bpp.lz.aa05905e b/gfx/battle_anims/smoke.2bpp.lz.aa05905e
index bf26fed2b..bf26fed2b 100644
--- a/gfx/fx/smoke.2bpp.lz.aa05905e
+++ b/gfx/battle_anims/smoke.2bpp.lz.aa05905e
diff --git a/gfx/fx/smoke.png b/gfx/battle_anims/smoke.png
index 1b09874ba..1b09874ba 100644
--- a/gfx/fx/smoke.png
+++ b/gfx/battle_anims/smoke.png
diff --git a/gfx/fx/speed.2bpp.lz.1732b364 b/gfx/battle_anims/speed.2bpp.lz.1732b364
index 5d09f9a6a..5d09f9a6a 100644
--- a/gfx/fx/speed.2bpp.lz.1732b364
+++ b/gfx/battle_anims/speed.2bpp.lz.1732b364
diff --git a/gfx/fx/speed.png b/gfx/battle_anims/speed.png
index e219b38c9..e219b38c9 100644
--- a/gfx/fx/speed.png
+++ b/gfx/battle_anims/speed.png
diff --git a/gfx/fx/status.2bpp.lz.0c0aa13e b/gfx/battle_anims/status.2bpp.lz.0c0aa13e
index e5ce7df8a..e5ce7df8a 100644
--- a/gfx/fx/status.2bpp.lz.0c0aa13e
+++ b/gfx/battle_anims/status.2bpp.lz.0c0aa13e
diff --git a/gfx/fx/status.png b/gfx/battle_anims/status.png
index cb8527963..cb8527963 100644
--- a/gfx/fx/status.png
+++ b/gfx/battle_anims/status.png
diff --git a/gfx/fx/water.2bpp.lz.7b52ed12 b/gfx/battle_anims/water.2bpp.lz.7b52ed12
index 6a81bbb65..6a81bbb65 100644
--- a/gfx/fx/water.2bpp.lz.7b52ed12
+++ b/gfx/battle_anims/water.2bpp.lz.7b52ed12
diff --git a/gfx/fx/water.png b/gfx/battle_anims/water.png
index 4e3c3b719..4e3c3b719 100644
--- a/gfx/fx/water.png
+++ b/gfx/battle_anims/water.png
diff --git a/gfx/fx/wave.2bpp.lz.bee99402 b/gfx/battle_anims/wave.2bpp.lz.bee99402
index d94a5cb35..d94a5cb35 100644
--- a/gfx/fx/wave.2bpp.lz.bee99402
+++ b/gfx/battle_anims/wave.2bpp.lz.bee99402
diff --git a/gfx/fx/wave.png b/gfx/battle_anims/wave.png
index 55d4faa5f..55d4faa5f 100644
--- a/gfx/fx/wave.png
+++ b/gfx/battle_anims/wave.png
diff --git a/gfx/fx/web.2bpp.lz.80e3d480 b/gfx/battle_anims/web.2bpp.lz.80e3d480
index 84b4018e5..84b4018e5 100644
--- a/gfx/fx/web.2bpp.lz.80e3d480
+++ b/gfx/battle_anims/web.2bpp.lz.80e3d480
diff --git a/gfx/fx/web.png b/gfx/battle_anims/web.png
index 2aeffef0e..2aeffef0e 100644
--- a/gfx/fx/web.png
+++ b/gfx/battle_anims/web.png
diff --git a/gfx/fx/whip.2bpp.lz.d80d8d6e b/gfx/battle_anims/whip.2bpp.lz.d80d8d6e
index da62ba918..da62ba918 100644
--- a/gfx/fx/whip.2bpp.lz.d80d8d6e
+++ b/gfx/battle_anims/whip.2bpp.lz.d80d8d6e
diff --git a/gfx/fx/whip.png b/gfx/battle_anims/whip.png
index 92d7ded6f..92d7ded6f 100644
--- a/gfx/fx/whip.png
+++ b/gfx/battle_anims/whip.png
diff --git a/gfx/fx/wind.2bpp.lz.5a785180 b/gfx/battle_anims/wind.2bpp.lz.5a785180
index 9c2769b83..9c2769b83 100644
--- a/gfx/fx/wind.2bpp.lz.5a785180
+++ b/gfx/battle_anims/wind.2bpp.lz.5a785180
diff --git a/gfx/fx/wind.png b/gfx/battle_anims/wind.png
index b02031392..b02031392 100644
--- a/gfx/fx/wind.png
+++ b/gfx/battle_anims/wind.png
diff --git a/gfx/credits.asm b/gfx/credits.asm
deleted file mode 100644
index 2477bd562..000000000
--- a/gfx/credits.asm
+++ /dev/null
@@ -1,7 +0,0 @@
-CreditsBorderGFX:    INCBIN "gfx/credits/border.2bpp"
-
-CreditsMonsGFX:
-CreditsPichuGFX:     INCBIN "gfx/credits/pichu.2bpp"
-CreditsSmoochumGFX:  INCBIN "gfx/credits/smoochum.2bpp"
-CreditsDittoGFX:     INCBIN "gfx/credits/ditto.2bpp"
-CreditsIgglybuffGFX: INCBIN "gfx/credits/igglybuff.2bpp"
diff --git a/gfx/footprints.asm b/gfx/footprints.asm
index 44ca9bef2..24b4e2e92 100644
--- a/gfx/footprints.asm
+++ b/gfx/footprints.asm
@@ -1,14 +1,14 @@
-; In this game, footprints are stored in a non-continuous manner.
-; Instead, they're stored in a 32x8 grid.
-; Each of the footprints is 16x16, so, since tiles on the GB are 8x8,
-; you get the two top tiles first, while the two bottom tiles are stored
-; on the next row of the image.
+; Footprints are 2x2 tiles each, but are stored as a 16x64-tile image
+; (32 rows of 8 footprints per row).
+; That means there's a row of the top two tiles for eight footprints,
+; then a row of the bottom two tiles for those eight footprints.
 
-; These macros help extract the first two tiles, and the last two tiles,
-; respectively.
-footprint_top    EQUS "                0, 2 * LEN_1BPP_TILE"
+; These macros help extract the first and the last two tiles, respectively.
+footprint_top    EQUS "0,                 2 * LEN_1BPP_TILE"
 footprint_bottom EQUS "2 * LEN_1BPP_TILE, 2 * LEN_1BPP_TILE"
 
+; Entries correspond to Pokémon species, two apiece, 8 tops then 8 bottoms
+
 ; 001-008 top halves
 INCBIN "gfx/footprints/bulbasaur.1bpp",  footprint_top
 INCBIN "gfx/footprints/ivysaur.1bpp",    footprint_top
diff --git a/gfx/load_pics.asm b/gfx/load_pics.asm
index 838fc5656..b8ddde182 100755
--- a/gfx/load_pics.asm
+++ b/gfx/load_pics.asm
@@ -103,13 +103,13 @@ _GetFrontpic: ; 510a5
 	ret
 
 GetFrontpicPointer: ; 510d7
-GLOBAL PicPointers, UnownPicPointers
+GLOBAL PokemonPicPointers, UnownPicPointers
 
 	ld a, [CurPartySpecies]
 	cp UNOWN
 	jr z, .unown
 	ld a, [CurPartySpecies]
-	ld d, BANK(PicPointers)
+	ld d, BANK(PokemonPicPointers)
 	jr .ok
 
 .unown
@@ -117,7 +117,7 @@ GLOBAL PicPointers, UnownPicPointers
 	ld d, BANK(UnownPicPointers)
 
 .ok
-	ld hl, PicPointers ; UnownPicPointers
+	ld hl, PokemonPicPointers ; UnownPicPointers
 	dec a
 	ld bc, 6
 	call AddNTimes
@@ -212,10 +212,10 @@ GetMonBackpic: ; 5116c
 
 	; These are assumed to be at the same
 	; address in their respective banks.
-	GLOBAL PicPointers,  UnownPicPointers
-	ld hl, PicPointers ; UnownPicPointers
+	GLOBAL PokemonPicPointers,  UnownPicPointers
+	ld hl, PokemonPicPointers ; UnownPicPointers
 	ld a, b
-	ld d, BANK(PicPointers)
+	ld d, BANK(PokemonPicPointers)
 	cp UNOWN
 	jr nz, .ok
 	ld a, c
@@ -295,16 +295,16 @@ GLOBAL PICS_FIX
 Function511ec: ; 511ec
 	ld a, c
 	push de
-	ld hl, PicPointers
+	ld hl, PokemonPicPointers
 	dec a
 	ld bc, 6
 	call AddNTimes
-	ld a, BANK(PicPointers)
+	ld a, BANK(PokemonPicPointers)
 	call GetFarByte
 	call FixPicBank
 	push af
 	inc hl
-	ld a, BANK(PicPointers)
+	ld a, BANK(PokemonPicPointers)
 	call GetFarHalfword
 	pop af
 	pop de
diff --git a/gfx/mail.asm b/gfx/mail.asm
index c8770468d..83ca99f60 100755..100644
--- a/gfx/mail.asm
+++ b/gfx/mail.asm
@@ -1,1073 +1,111 @@
-ReadPartyMonMail: ; b9229
-	ld a, [CurPartyMon]
-	ld hl, sPartyMail
-	ld bc, MAIL_STRUCT_LENGTH
-	call AddNTimes
-	ld d, h
-	ld e, l
-ReadAnyMail: ; b9237
-	push de
-	call ClearBGPalettes
-	call ClearSprites
-	call ClearTileMap
-	call DisableLCD
-	call LoadFontsExtra
-	pop de
-	push de
-	ld a, BANK(sPartyMail)
-	call GetSRAMBank
-	farcall IsMailEuropean
-	call CloseSRAM
-	ld a, c
-	ld de, StandardEnglishFont
-	or a
-	jr z, .got_font
-	ld de, FrenchGermanFont
-	sub $3
-	jr c, .got_font
-	ld de, SpanishItalianFont
-
-.got_font
-	ld hl, VTiles1
-	lb bc, BANK(StandardEnglishFont), $80
-	call Get1bpp
-	pop de
-	call .LoadGFX
-	call EnableLCD
-	call WaitBGMap
-	ld a, [Buffer3]
-	ld e, a
-	farcall LoadMailPalettes
-	call SetPalettes
-	xor a
-	ld [hJoyPressed], a
-	call .loop
-	call ClearBGPalettes
-	call DisableLCD
-	call LoadStandardFont
-	jp EnableLCD
-
-.loop
-	call GetJoypad
-	ld a, [hJoyPressed]
-	and A_BUTTON | B_BUTTON | START
-	jr z, .loop
-	and START
-	jr nz, .pressed_start
-	ret
-
-.pressed_start
-	ld a, [wJumptableIndex]
-	push af
-	callfar PrintMail ; printer
-	pop af
-	ld [wJumptableIndex], a
-	jr .loop
-; b92b8
-
-.LoadGFX: ; b92b8
-	ld h, d
-	ld l, e
-	push hl
-	ld a, $0
-	call GetSRAMBank
-	ld de, sPartyMon1MailAuthorID - sPartyMon1Mail
-	add hl, de
-	ld a, [hli]
-	ld [Buffer1], a
-	ld a, [hli]
-	ld [Buffer2], a
-	ld a, [hli]
-	ld [CurPartySpecies], a
-	ld b, [hl]
-	call CloseSRAM
-	ld hl, MailGFXPointers
-	ld c, 0
-.loop2
-	ld a, [hli]
-	cp b
-	jr z, .got_pointer
-	cp -1
-	jr z, .invalid
-	inc c
-	inc hl
-	inc hl
-	jr .loop2
-
-.invalid
-	ld hl, MailGFXPointers
-	inc hl
-
-.got_pointer
-	ld a, c
-	ld [Buffer3], a
-	ld a, [hli]
-	ld h, [hl]
-	ld l, a
-	ld de, .done
-	pop bc
-	push de
-	jp hl
-.done
-	ret
-; b92f8
-
-MailGFXPointers: ; b92f8
-	dbw FLOWER_MAIL,  LoadFlowerMailGFX
-	dbw SURF_MAIL,    LoadSurfMailGFX
-	dbw LITEBLUEMAIL, LoadLiteBlueMailGFX
-	dbw PORTRAITMAIL, LoadPortraitMailGFX
-	dbw LOVELY_MAIL,  LoadLovelyMailGFX
-	dbw EON_MAIL,     LoadEonMailGFX
-	dbw MORPH_MAIL,   LoadMorphMailGFX
-	dbw BLUESKY_MAIL, LoadBlueSkyMailGFX
-	dbw MUSIC_MAIL,   LoadMusicMailGFX
-	dbw MIRAGE_MAIL,  LoadMirageMailGFX
-	db -1
-; b9317
-
-LoadSurfMailGFX: ; b9317
-	push bc
-	ld hl, VTiles2 tile $31
-	ld de, SurfMailBorderGFX
-	ld c, 8 * 8
-	call LoadMailGFX_Color2
-	ld de, MailLaprasGFX
-	ld c, 6 * 8
-	call LoadMailGFX_Color3
-	ld de, SurfMailWaveGFX
-	ld c, 1 * 8
-	call LoadMailGFX_Color2
-	jr FinishLoadingSurfLiteBlueMailGFX
-
-LoadLiteBlueMailGFX: ; b9335
-	push bc
-	ld hl, VTiles2 tile $31
-	ld de, LiteBlueMailBorderGFX
-	ld c, 8 * 8
-	call LoadMailGFX_Color2
-	ld de, MailDratiniGFX
-	ld c, 6 * 8
-	call LoadMailGFX_Color3
-	ld de, PortraitMailUnderlineGFX
-	ld c, 1 * 8
-	call LoadMailGFX_Color2
-
-FinishLoadingSurfLiteBlueMailGFX: ; b9351
-	ld de, SurfLiteBlueMailSmallShapesGFX
-	ld c, 2 * 8
-	call LoadMailGFX_Color2
-	ld c, 2 * 8
-	call LoadMailGFX_Color1
-	ld de, SurfLiteBlueMailLargeShapesGFX
-	ld c, 8 * 8
-	call LoadMailGFX_Color1
-	ld c, 8 * 8
-	call LoadMailGFX_Color2
-
-	call DrawMailBorder
-	hlcoord 2, 15
-	ld a, $3f
-	call Mail_Draw16TileRow
-	ld a, $39
-	hlcoord 15, 14
-	call Mail_Draw3x2Graphic
-	ld a, $44
-	hlcoord 2, 2
-	call Mail_Draw2x2Graphic
-	hlcoord 15, 11
-	call Mail_Draw2x2Graphic
-	ld a, $4c
-	hlcoord 3, 12
-	call Mail_Draw2x2Graphic
-	hlcoord 15, 2
-	call Mail_Draw2x2Graphic
-	ld a, $50
-	hlcoord 6, 3
-	call Mail_Draw2x2Graphic
-	ld a, $40
-	hlcoord 13, 2
-	ld [hli], a
-	hlcoord 6, 14
-	ld [hl], a
-	ld a, $41
-	hlcoord 4, 5
-	ld [hli], a
-	hlcoord 17, 5
-	ld [hli], a
-	hlcoord 13, 12
-	ld [hl], a
-	ld a, $42
-	hlcoord 9, 2
-	ld [hli], a
-	hlcoord 14, 5
-	ld [hli], a
-	hlcoord 3, 10
-	ld [hl], a
-	ld a, $43
-	hlcoord 6, 11
-	ld [hli], a
-	pop hl
-	jp MailGFX_PlaceMessage
-; b93d2
-
-LoadEonMailGFX: ; b93d2
-	push bc
-	ld hl, VTiles2 tile $31
-	ld de, EonMailBorder1GFX
-	ld c, 1 * 8
-	call LoadMailGFX_Color2
-	ld de, EonMailBorder2GFX
-	ld c, 1 * 8
-	call LoadMailGFX_Color1
-	ld de, EonMailBorder2GFX
-	ld c, 1 * 8
-	call LoadMailGFX_Color1
-	ld de, EonMailBorder1GFX
-	ld c, 1 * 8
-	call LoadMailGFX_Color2
-	ld de, SurfMailBorderGFX + 6 * 8
-	ld c, 1 * 8
-	call LoadMailGFX_Color2
-	ld de, MailEeveeGFX
-	ld c, 6 * 8
-	call LoadMailGFX_Color3
-	ld hl, VTiles2 tile $3d
-	ld de, MailLargeCircleGFX
-	ld c, 4 * 8
-	call LoadMailGFX_Color1
-	ld de, EonMailBorder2GFX
-	ld c, 1 * 8
-	call LoadMailGFX_Color2
-
-	ld a, $31
-	hlcoord 0, 0
-	call Mail_Place18TileAlternatingRow
-	hlcoord 1, 17
-	call Mail_Place18TileAlternatingRow
-	ld a, $33
-	hlcoord 0, 1
-	call Mail_Place16TileAlternatingColumn
-	hlcoord 19, 0
-	call Mail_Place16TileAlternatingColumn
-	hlcoord 2, 15
-	ld a, $35
-	call Mail_Draw16TileRow
-	inc a
-	hlcoord 15, 14
-	call Mail_Draw3x2Graphic
-	call LovelyEonMail_PlaceIcons
-	pop hl
-	jp MailGFX_PlaceMessage
-; b944b
-
-LoadLovelyMailGFX: ; b944b
-	push bc
-	ld hl, VTiles2 tile $31
-	ld de, LovelyMailBorderGFX
-	ld c, 5 * 8
-	call LoadMailGFX_Color2
-	ld de, MailPoliwagGFX
-	ld c, 6 * 8
-	call LoadMailGFX_Color3
-	ld de, LovelyMailUnderlineGFX
-	ld c, 1 * 8
-	call LoadMailGFX_Color2
-	ld de, LovelyMailLargeHeartGFX
-	ld c, 4 * 8
-	call LoadMailGFX_Color2
-	ld de, LovelyMailSmallHeartGFX
-	ld c, 1 * 8
-	call LoadMailGFX_Color1
-
-	call DrawMailBorder2
-	hlcoord 2, 15
-	ld a, $3c
-	call Mail_Draw16TileRow
-	ld a, $36
-	hlcoord 15, 14
-	call Mail_Draw3x2Graphic
-	call LovelyEonMail_PlaceIcons
-	pop hl
-	jp MailGFX_PlaceMessage
-; b9491
-
-LovelyEonMail_PlaceIcons: ; b9491
-	ld a, $3d
-	hlcoord 2, 2
-	call Mail_Draw2x2Graphic
-	hlcoord 16, 2
-	call Mail_Draw2x2Graphic
-	hlcoord 9, 4
-	call Mail_Draw2x2Graphic
-	hlcoord 2, 11
-	call Mail_Draw2x2Graphic
-	hlcoord 6, 12
-	call Mail_Draw2x2Graphic
-	hlcoord 12, 11
-	call Mail_Draw2x2Graphic
-	ld a, $41
-	hlcoord 5, 4
-	ld [hl], a
-	hlcoord 6, 2
-	ld [hl], a
-	hlcoord 12, 4
-	ld [hl], a
-	hlcoord 14, 2
-	ld [hl], a
-	hlcoord 3, 13
-	ld [hl], a
-	hlcoord 9, 11
-	ld [hl], a
-	hlcoord 16, 12
-	ld [hl], a
-	ret
-; b94d6
-
-LoadMorphMailGFX: ; b94d6
-	push bc
-	ld hl, VTiles2 tile $31
-	ld bc, 5 * 8
-	call MailGFX_GenerateMonochromeTilesColor2
-	ld de, MorphMailBorderCornerGFX + 3 * 8
-	ld c, 1 * 8
-	call LoadMailGFX_Color2
-	ld de, MorphMailBorderCornerGFX
-	ld c, 1 * 8
-	call LoadMailGFX_Color2
-	ld de, MorphMailBorderGFX
-	ld c, 1 * 8
-	call LoadMailGFX_Color2
-	ld de, EonMailBorder1GFX
-	ld c, 1 * 8
-	call LoadMailGFX_Color1
-	ld de, MorphMailDividerGFX
-	ld c, 1 * 8
-	call LoadMailGFX_Color2
-	ld de, MailDittoGFX
-	ld c, 6 * 8
-	call LoadMailGFX_Color3
-	call DrawMailBorder2
-	ld a, $31
-	hlcoord 1, 1
-	call Mail_Draw2x2Graphic
-	hlcoord 17, 15
-	call Mail_Draw2x2Graphic
-	hlcoord 1, 3
-	ld [hl], a
-	hlcoord 3, 1
-	ld [hl], a
-	hlcoord 16, 16
-	ld [hl], a
-	hlcoord 18, 14
-	ld [hl], a
-	ld a, $36
-	hlcoord 1, 4
-	ld [hl], a
-	hlcoord 2, 3
-	ld [hl], a
-	hlcoord 3, 2
-	ld [hl], a
-	hlcoord 4, 1
-	ld [hl], a
-	inc a
-	hlcoord 15, 16
-	ld [hl], a
-	hlcoord 16, 15
-	ld [hl], a
-	hlcoord 17, 14
-	ld [hl], a
-	hlcoord 18, 13
-	ld [hl], a
-	inc a
-	hlcoord 2, 15
-	ld b, $e
-	call Mail_DrawRowLoop
-	inc a
-	hlcoord 2, 11
-	call Mail_Draw16TileRow
-	hlcoord 2, 5
-	call Mail_Draw16TileRow
-	inc a
-	hlcoord 6, 1
-	call Mail_Draw13TileRow
-	hlcoord 1, 16
-	call Mail_Draw13TileRow
-	inc a
-	hlcoord 3, 13
-	call Mail_Draw3x2Graphic
-	pop hl
-	jp MailGFX_PlaceMessage
-; b9582
-
-LoadBlueSkyMailGFX: ; b9582
-	push bc
-	ld hl, VTiles2 tile $31
-	ld de, EonMailBorder1GFX
-	ld c, 1 * 8
-	call LoadMailGFX_Color2
-	ld a, $ff
-	ld bc, 1 tiles
-	call ByteFill
-	ld de, BlueSkyMailGrassGFX
-	ld c, 1 * 8
-	call LoadMailGFX_Color3
-	ld de, MailDragoniteGFX
-	ld c, 23 * 8
-	call LoadMailGFX_Color3
-	ld de, MailCloudGFX
-	ld c, 6 * 8
-	call LoadMailGFX_Color1
-	ld de, FlowerMailBorderGFX + 6 * 8
-	ld c, 1 * 8
-	call LoadMailGFX_Color1
-	ld de, MailCloudGFX
-	ld c, 1 * 8
-	call LoadMailGFX_Color1
-	ld de, MailCloudGFX + 2 * 8
-	ld c, 2 * 8
-	call LoadMailGFX_Color1
-	ld de, MailCloudGFX + 5 * 8
-	ld c, 1 * 8
-	call LoadMailGFX_Color1
-
-	ld a, $31
-	hlcoord 0, 0
-	call Mail_DrawFullWidthBorder
-	hlcoord 0, 1
-	call Mail_DrawLeftRightBorder
-	hlcoord 19, 1
-	call Mail_DrawLeftRightBorder
-	inc a
-	hlcoord 0, 17
-	call Mail_DrawFullWidthBorder
-	inc a
-	hlcoord 0, 16
-	call Mail_DrawFullWidthBorder
-	inc a
-	hlcoord 2, 2
-	call Mail_Place6TileRow
-	hlcoord 3, 3
-	call Mail_Place6TileRow
-	hlcoord 4, 4
-	call Mail_Place6TileRow
-	dec hl
-	ld [hl], $7f
-	dec a
-	hlcoord 15, 14
-	call Mail_Draw2x2Graphic
-	add $4
-	hlcoord 15, 16
-	ld [hli], a
-	inc a
-	ld [hl], a
-	inc a
-	push af
-	hlcoord 12, 1
-	call Mail_Draw3x2Graphic
-	pop af
-	hlcoord 15, 4
-	call Mail_Draw3x2Graphic
-	inc a
-	hlcoord 2, 11
-	call Mail_Draw16TileRow
-	inc a
-	hlcoord 10, 3
-	call Mail_Draw2x2Graphic
-	pop hl
-	jp MailGFX_PlaceMessage
-; b9636
-
-Mail_Place6TileRow: ; b9636
-	ld b, $6
-.loop
-	ld [hli], a
-	inc a
-	dec b
-	jr nz, .loop
-	ret
-; b963e
-
-LoadFlowerMailGFX: ; b963e
-	push bc
-	ld hl, VTiles2 tile $31
-	ld de, FlowerMailBorderGFX
-	ld c, 8 * 8
-	call LoadMailGFX_Color1
-	ld de, MailOddishGFX
-	ld c, 4 * 8
-	call LoadMailGFX_Color3
-	ld de, FlowerMailBorderGFX + 6 * 8
-	ld c, 1 * 8
-	call LoadMailGFX_Color2
-	ld de, FlowerMailFlowerGFX
-	ld c, 4 * 8
-	call LoadMailGFX_Color1
-	ld c, 4 * 8
-	call LoadMailGFX_Color2
-
-	call DrawMailBorder
-	hlcoord 2, 15
-	ld a, $3d ; underline
-	call Mail_Draw16TileRow
-	ld a, $39 ; oddish
-	hlcoord 16, 13
-	call Mail_Draw2x2Graphic
-	hlcoord 2, 13
-	call Mail_Draw2x2Graphic
-	ld a, $3e
-	hlcoord 2, 2
-	call Mail_Draw2x2Graphic
-	hlcoord 5, 3
-	call Mail_Draw2x2Graphic
-	hlcoord 10, 2
-	call Mail_Draw2x2Graphic
-	hlcoord 16, 3
-	call Mail_Draw2x2Graphic
-	hlcoord 5, 11
-	call Mail_Draw2x2Graphic
-	hlcoord 16, 10
-	call Mail_Draw2x2Graphic
-	ld a, $42
-	hlcoord 3, 4
-	call Mail_Draw2x2Graphic
-	hlcoord 12, 3
-	call Mail_Draw2x2Graphic
-	hlcoord 14, 2
-	call Mail_Draw2x2Graphic
-	hlcoord 2, 10
-	call Mail_Draw2x2Graphic
-	hlcoord 14, 11
-	call Mail_Draw2x2Graphic
-	pop hl
-	jp MailGFX_PlaceMessage
-; b96ca
-
-LoadPortraitMailGFX: ; b96ca
-	push bc
-	ld hl, VTiles2 tile $31
-	ld de, PortraitMailBorderGFX
-	ld c, 5 * 8
-	call LoadMailGFX_Color2
-	ld de, PortraitMailUnderlineGFX
-	ld c, 1 * 8
-	call LoadMailGFX_Color2
-	ld hl, VTiles2 tile $3d
-	ld de, PortraitMailLargePokeballGFX
-	ld c, 4 * 8
-	call LoadMailGFX_Color1
-	ld de, PortraitMailSmallPokeballGFX
-	ld c, 1 * 8
-	call LoadMailGFX_Color2
-
-	call DrawMailBorder2
-	hlcoord 8, 15
-	ld a, $36
-	ld b, $a
-	call Mail_DrawRowLoop
-	call LovelyEonMail_PlaceIcons
-	ld a, $1
-	ld [UnownLetter], a
-	hlcoord 1, 10
-	call PrepMonFrontpic
-	pop hl
-	jp MailGFX_PlaceMessage
-; b9710
-
-LoadMusicMailGFX: ; b9710
-	push bc
-	ld hl, VTiles2 tile $31
-	ld de, MusicMailBorderGFX
-	ld c, 4 * 8
-	call LoadMailGFX_Color2
-	ld de, MorphMailBorderGFX
-	ld c, 2 * 8
-	call LoadMailGFX_Color2
-	ld de, MailNatuGFX
-	ld c, 6 * 8
-	call LoadMailGFX_Color3
-	xor a
-	ld bc, 1 tiles
-	call ByteFill
-	ld de, MusicMailLargeNoteGFX
-	ld c, 3 * 8
-	call LoadMailGFX_Color1
-	ld de, MusicMailSmallNoteGFX
-	ld c, 1 * 8
-	call LoadMailGFX_Color1
-
-	ld a, $31
-	hlcoord 0, 0
-	call Mail_Place18TileAlternatingRow
-	hlcoord 1, 17
-	call Mail_Place18TileAlternatingRow
-	ld a, $33
-	hlcoord 0, 1
-	call Mail_Place16TileAlternatingColumn
-	hlcoord 19, 0
-	call Mail_Place16TileAlternatingColumn
-	ld a, $35
-	hlcoord 2, 15
-	call Mail_Place14TileAlternatingRow
-	ld a, $37
-	hlcoord 15, 14
-	call Mail_Draw3x2Graphic
-	call LovelyEonMail_PlaceIcons
-	pop hl
-	jp MailGFX_PlaceMessage
-; b9776
-
-LoadMirageMailGFX: ; b9776
-	push bc
-	ld hl, VTiles2 tile $31
-	ld bc, 5 * 8
-	call MailGFX_GenerateMonochromeTilesColor2
-	ld de, BlueSkyMailGrassGFX
-	ld c, 1 * 8
-	call LoadMailGFX_Color2
-	ld de, MailMewGFX
-	ld c, 18 * 8
-	call LoadMailGFX_Color2
-	ld de, LiteBlueMailBorderGFX + 1 * 8
-	ld c, 1 * 8
-	call LoadMailGFX_Color1
-	ld de, LiteBlueMailBorderGFX + 6 * 8
-	ld c, 1 * 8
-	call LoadMailGFX_Color1
-
-	call DrawMailBorder2
-	ld a, $36
-	hlcoord 1, 16
-	call Mail_DrawTopBottomBorder
-	inc a
-	hlcoord 15, 14
-	call Mail_Draw3x2Graphic
-	inc a
-	hlcoord 15, 16
-	ld [hli], a
-	inc a
-	ld [hl], a
-	ld a, $3f
-	hlcoord 1, 1
-	call Mail_Place18TileAlternatingRow
-	ld a, $41
-	hlcoord 0, 2
-	call Mail_Place14TileAlternatingColumn
-	ld a, $43
-	hlcoord 19, 2
-	call Mail_Place14TileAlternatingColumn
-	ld a, $45
-	hlcoord 0, 1
-	ld [hl], a
-	inc a
-	hlcoord 19, 1
-	ld [hl], a
-	inc a
-	hlcoord 0, 16
-	ld [hl], a
-	inc a
-	hlcoord 19, 16
-	ld [hl], a
-	inc a
-	hlcoord 2, 5
-	call Mail_Draw16TileRow
-	inc a
-	hlcoord 2, 11
-	call Mail_Draw16TileRow
-	pop hl
-	jp MailGFX_PlaceMessage
-; b97f8
-
-MailGFX_GenerateMonochromeTilesColor2: ; b97f8
-.loop
-	xor a
-	ld [hli], a
-	ld a, $ff
-	ld [hli], a
-	dec bc
-	ld a, b
-	or c
-	jr nz, .loop
-	ret
-; b9803
-
-MailGFX_PlaceMessage: ; b9803
-	ld bc, MAIL_STRUCT_LENGTH
-	ld de, wTempMail
-	ld a, BANK(sPartyMail)
-	call GetSRAMBank
-	call CopyBytes
-	call CloseSRAM
-	ld hl, wTempMailAuthor
-	ld de, wMonOrItemNameBuffer
-	ld bc, NAME_LENGTH - 1
-	call CopyBytes
-	ld a, "@"
-	ld [wTempMailAuthor], a
-	ld [wMonOrItemNameBuffer + NAME_LENGTH - 1], a
-	ld de, wTempMailMessage
-	hlcoord 2, 7
-	call PlaceString
-	ld de, wMonOrItemNameBuffer
-	ld a, [de]
-	and a
-	ret z
-	ld a, [Buffer3]
-	hlcoord 8, 14
-	cp $3 ; PORTRAITMAIL
-	jr z, .place_author
-	hlcoord 6, 14
-	cp $6 ; MORPH_MAIL
-	jr z, .place_author
-	hlcoord 5, 14
-
-.place_author
-	jp PlaceString
-; b984e
-
-Functionb984e: ; b984e
-; XXX
-.loop
-	ld a, [hl]
-	xor $ff
-	ld [hli], a
-	dec bc
-	ld a, b
-	or c
-	jr nz, .loop
-	ret
-; b9858
-
-DrawMailBorder: ; b9858
-	hlcoord 0, 0
-	ld a, $31
-	ld [hli], a
-	inc a
-	call Mail_DrawTopBottomBorder
-	inc a
-	ld [hli], a
-	inc a
-	call Mail_DrawLeftRightBorder
-	ld a, $36
-	ld [hli], a
-	inc a
-	call Mail_DrawTopBottomBorder
-	hlcoord 19, 1
-	ld a, $35
-	call Mail_DrawLeftRightBorder
-	ld a, $38
-	ld [hl], a
-	ret
-; b987b
-
-DrawMailBorder2: ; b987b
-	hlcoord 0, 0
-	ld a, $31
-	ld [hli], a
-	inc a
-	call Mail_DrawTopBottomBorder
-	ld [hl], $31
-	inc hl
-	inc a
-	call Mail_DrawLeftRightBorder
-	ld [hl], $31
-	inc hl
-	inc a
-	call Mail_DrawTopBottomBorder
-	hlcoord 19, 1
-	ld a, $35
-	call Mail_DrawLeftRightBorder
-	ld [hl], $31
-	ret
-; b989e
-
-Mail_Place14TileAlternatingRow: ; b989e
-	push af
-	ld b, 14 / 2
-	jr Mail_PlaceAlternatingRow
-
-Mail_Place16TileAlternatingRow: ; b98a3
-	push af
-	ld b, 16 / 2
-	jr Mail_PlaceAlternatingRow
-
-Mail_Place18TileAlternatingRow: ; b98a8
-	push af
-	ld b, 18 / 2
-
-Mail_PlaceAlternatingRow: ; b98ab
-.loop
-	ld [hli], a
-	inc a
-	ld [hli], a
-	dec a
-	dec b
-	jr nz, .loop
-	ld [hl], a
-	pop af
-	ret
-; b98b5
-
-Mail_Place14TileAlternatingColumn: ; b98b5
-	push af
-	ld b, 14 / 2
-	jr Mail_PlaceAlternatingColumn
-
-Mail_Place16TileAlternatingColumn: ; b98ba
-	push af
-	ld b, 16 / 2
-
-Mail_PlaceAlternatingColumn: ; b98bd
-.loop
-	ld [hl], a
-	ld de, SCREEN_WIDTH
-	add hl, de
-	inc a
-	ld [hl], a
-	add hl, de
-	dec a
-	dec b
-	jr nz, .loop
-	ld [hl], a
-	pop af
-	ret
-; b98cc
-
-Mail_Draw7TileRow: ; b98cc
-	ld b, $7
-	jr Mail_DrawRowLoop
-
-Mail_Draw13TileRow: ; b98d0
-	ld b, $d
-	jr Mail_DrawRowLoop
-
-Mail_Draw16TileRow: ; b98d4
-	ld b, $10
-	jr Mail_DrawRowLoop
-
-Mail_DrawTopBottomBorder: ; b98d8
-	ld b, SCREEN_WIDTH - 2
-	jr Mail_DrawRowLoop
-
-Mail_DrawFullWidthBorder: ; b98dc
-	ld b, SCREEN_WIDTH
-
-Mail_DrawRowLoop: ; b98de
-.loop
-	ld [hli], a
-	dec b
-	jr nz, .loop
-	ret
-; b98e3
-
-Mail_DrawLeftRightBorder: ; b98e3
-	ld b, SCREEN_HEIGHT - 2
-	ld de, SCREEN_WIDTH
-.loop
-	ld [hl], a
-	add hl, de
-	dec b
-	jr nz, .loop
-	ret
-; b98ee
-
-Mail_Draw2x2Graphic: ; b98ee
-	push af
-	ld [hli], a
-	inc a
-	ld [hl], a
-	ld bc, SCREEN_WIDTH - 1
-	add hl, bc
-	inc a
-	ld [hli], a
-	inc a
-	ld [hl], a
-	pop af
-	ret
-; b98fc
-
-Mail_Draw3x2Graphic: ; b98fc
-	ld [hli], a
-	inc a
-	ld [hli], a
-	inc a
-	ld [hl], a
-	ld bc, SCREEN_WIDTH - 2
-	add hl, bc
-	inc a
-	ld [hli], a
-	inc a
-	ld [hli], a
-	inc a
-	ld [hl], a
-	ret
-; b990c
-
-LoadMailGFX_Color1: ; b990c
-.loop
-	ld a, [de]
-	inc de
-	ld [hli], a
-	xor a
-	ld [hli], a
-	dec c
-	jr nz, .loop
-	ret
-; b9915
-
-LoadMailGFX_Color2: ; b9915
-.loop
-	xor a
-	ld [hli], a
-	ld a, [de]
-	inc de
-	ld [hli], a
-	dec c
-	jr nz, .loop
-	ret
-; b991e
-
-LoadMailGFX_Color3: ; b991e
-.loop
-	ld a, [de]
-	inc de
-	ld [hli], a
-	ld [hli], a
-	dec c
-	jr nz, .loop
-	ret
-; b9926
-
 MorphMailDividerGFX: ; b9926
-INCBIN "gfx/mail/0b9926.1bpp"
+INCBIN "gfx/mail/morph_mail_divider.1bpp"
 
 BlueSkyMailGrassGFX: ; b992e
-INCBIN "gfx/mail/0b992e.1bpp"
+INCBIN "gfx/mail/grass.1bpp"
 
 PortraitMailSmallPokeballGFX: ; b9936
-INCBIN "gfx/mail/0b9936.1bpp"
+INCBIN "gfx/mail/small_pokeball.1bpp"
 
 MorphMailBorderGFX: ; b993e
-INCBIN "gfx/mail/0b993e.1bpp"
+INCBIN "gfx/mail/morph_mail_border.1bpp"
 
 MusicMailSmallNoteGFX: ; b9946
-INCBIN "gfx/mail/0b9946.1bpp"
+INCBIN "gfx/mail/small_note.1bpp"
 
 SurfMailWaveGFX: ; b994e
-INCBIN "gfx/mail/0b994e.1bpp"
+INCBIN "gfx/mail/wave.1bpp"
 
 PortraitMailUnderlineGFX: ; b995e
-INCBIN "gfx/mail/0b995e.1bpp"
+INCBIN "gfx/mail/portraitmail_underline.1bpp"
 
 LovelyMailUnderlineGFX: ; b9966
-INCBIN "gfx/mail/0b9966.1bpp"
+INCBIN "gfx/mail/lovely_mail_underline.1bpp"
 
 LovelyMailSmallHeartGFX: ; b996e
-INCBIN "gfx/mail/0b996e.1bpp"
+INCBIN "gfx/mail/small_heart.1bpp"
 
 SurfLiteBlueMailSmallShapesGFX: ; b9976
-INCBIN "gfx/mail/0b9976.1bpp"
+INCBIN "gfx/mail/small_triangle.1bpp"
 
 EonMailBorder1GFX: ; b997e
-INCBIN "gfx/mail/0b997e.1bpp"
+INCBIN "gfx/mail/eon_mail_border_1.1bpp"
 
 EonMailBorder2GFX: ; b998e
-INCBIN "gfx/mail/0b998e.1bpp"
+INCBIN "gfx/mail/eon_mail_border_2.1bpp"
 
 MailNatuGFX: ; b9996
-INCBIN "gfx/mail/0b9996.1bpp"
+INCBIN "gfx/mail/natu.1bpp"
 
 MailDratiniGFX: ; b99c6
-INCBIN "gfx/mail/0b99c6.1bpp"
+INCBIN "gfx/mail/dratini.1bpp"
 
 MailPoliwagGFX: ; b99f6
-INCBIN "gfx/mail/0b99f6.1bpp"
+INCBIN "gfx/mail/poliwag.1bpp"
 
 MailLaprasGFX: ; b9a26
-INCBIN "gfx/mail/0b9a26.1bpp"
+INCBIN "gfx/mail/lapras.1bpp"
 
 MailEeveeGFX: ; b9a56
-INCBIN "gfx/mail/0b9a56.1bpp"
+INCBIN "gfx/mail/eevee.1bpp"
 
 MailDittoGFX: ; b9a86
-INCBIN "gfx/mail/0b9a86.1bpp"
+INCBIN "gfx/mail/ditto.1bpp"
 
 MailMewGFX: ; b9ab6
-INCBIN "gfx/mail/0b9ab6.1bpp"
+INCBIN "gfx/mail/mew.1bpp"
 
 MailDragoniteGFX: ; b9b46
-INCBIN "gfx/mail/0b9b46.1bpp"
+INCBIN "gfx/mail/dragonite.1bpp"
 
 MailSentretGFX: ; b9bce
-INCBIN "gfx/mail/0b9bce.1bpp"
+INCBIN "gfx/mail/sentret.1bpp"
 
 MailUnusedGrassGFX: ; b9bee
-INCBIN "gfx/mail/0b9bee.1bpp"
+INCBIN "gfx/mail/unused_grass.1bpp"
 
 PortraitMailLargePokeballGFX: ; b9bfe
-INCBIN "gfx/mail/0b9bfe.1bpp"
+INCBIN "gfx/mail/large_pokeball.1bpp"
 
 MailOddishGFX: ; b9c1e
-INCBIN "gfx/mail/0b9c1e.1bpp"
+INCBIN "gfx/mail/oddish.1bpp"
 
 SurfLiteBlueMailLargeShapesGFX: ; b9c3e
-INCBIN "gfx/mail/0b9c3e.1bpp"
+INCBIN "gfx/mail/large_triangle.1bpp"
 
 LovelyMailLargeHeartGFX: ; b9c5e
-INCBIN "gfx/mail/0b9c5e.1bpp"
+INCBIN "gfx/mail/large_heart.1bpp"
 
 MorphMailBorderCornerGFX: ; b9c7e
-INCBIN "gfx/mail/0b9c7e.1bpp"
+INCBIN "gfx/mail/morph_mail_corner.1bpp"
 
 MailLargeCircleGFX: ; b9c9e
-INCBIN "gfx/mail/0b9c9e.1bpp"
+INCBIN "gfx/mail/large_circle.1bpp"
 
 FlowerMailFlowerGFX: ; b9cbe
-INCBIN "gfx/mail/0b9cbe.1bpp"
-INCBIN "gfx/mail/0b9cde.1bpp"
+INCBIN "gfx/mail/flower_1.1bpp"
+INCBIN "gfx/mail/flower_2.1bpp"
 
 MusicMailLargeNoteGFX: ; b9cfe
-INCBIN "gfx/mail/0b9cfe.1bpp"
+INCBIN "gfx/mail/large_note.1bpp"
 
 MailCloudGFX: ; b9d16
-INCBIN "gfx/mail/0b9d16.1bpp"
+INCBIN "gfx/mail/cloud.1bpp"
 
 SurfMailBorderGFX: ; b9d46
-INCBIN "gfx/mail/0b9d46.1bpp"
+INCBIN "gfx/mail/surf_mail_border.1bpp"
 
 FlowerMailBorderGFX: ; b9d86
-INCBIN "gfx/mail/0b9d86.1bpp"
+INCBIN "gfx/mail/flower_mail_border.1bpp"
 
 LiteBlueMailBorderGFX: ; b9dc6
-INCBIN "gfx/mail/0b9dc6.1bpp"
+INCBIN "gfx/mail/litebluemail_border.1bpp"
 
 MusicMailBorderGFX: ; b9e06
-INCBIN "gfx/mail/0b9e06.1bpp"
+INCBIN "gfx/mail/music_mail_border.1bpp"
 
 LovelyMailBorderGFX: ; b9e26
-INCBIN "gfx/mail/0b9e26.1bpp"
+INCBIN "gfx/mail/lovely_mail_border.1bpp"
 
 PortraitMailBorderGFX: ; b9e4e
-INCBIN "gfx/mail/0b9e4e.1bpp"
-
-
-ItemIsMail: ; b9e76
-	ld a, d
-	ld hl, .items
-	ld de, 1
-	jp IsInArray
-; b9e80
-
-.items
-	db FLOWER_MAIL
-	db SURF_MAIL
-	db LITEBLUEMAIL
-	db PORTRAITMAIL
-	db LOVELY_MAIL
-	db EON_MAIL
-	db MORPH_MAIL
-	db BLUESKY_MAIL
-	db MUSIC_MAIL
-	db MIRAGE_MAIL
-	db -1
-; b9e8b
+INCBIN "gfx/mail/portraitmail_border.1bpp"
diff --git a/gfx/mail/0b9d16.png b/gfx/mail/cloud.png
index bc0786238..bc0786238 100755
--- a/gfx/mail/0b9d16.png
+++ b/gfx/mail/cloud.png
diff --git a/gfx/mail/0b9a86.png b/gfx/mail/ditto.png
index d0775fc32..d0775fc32 100644
--- a/gfx/mail/0b9a86.png
+++ b/gfx/mail/ditto.png
diff --git a/gfx/mail/0b9b46.png b/gfx/mail/dragonite.png
index 9f792d31c..9f792d31c 100755
--- a/gfx/mail/0b9b46.png
+++ b/gfx/mail/dragonite.png
diff --git a/gfx/mail/0b99c6.png b/gfx/mail/dratini.png
index 51c0d4a93..51c0d4a93 100644
--- a/gfx/mail/0b99c6.png
+++ b/gfx/mail/dratini.png
diff --git a/gfx/mail/0b9a56.png b/gfx/mail/eevee.png
index 6c020746f..6c020746f 100644
--- a/gfx/mail/0b9a56.png
+++ b/gfx/mail/eevee.png
diff --git a/gfx/mail/0b997e.png b/gfx/mail/eon_mail_border_1.png
index 83c029e90..83c029e90 100644
--- a/gfx/mail/0b997e.png
+++ b/gfx/mail/eon_mail_border_1.png
diff --git a/gfx/mail/0b998e.png b/gfx/mail/eon_mail_border_2.png
index b34ffce17..b34ffce17 100644
--- a/gfx/mail/0b998e.png
+++ b/gfx/mail/eon_mail_border_2.png
diff --git a/gfx/mail/0b9cbe.png b/gfx/mail/flower_1.png
index 2147bef31..2147bef31 100644
--- a/gfx/mail/0b9cbe.png
+++ b/gfx/mail/flower_1.png
diff --git a/gfx/mail/0b9cde.png b/gfx/mail/flower_2.png
index 3f0d34edc..3f0d34edc 100644
--- a/gfx/mail/0b9cde.png
+++ b/gfx/mail/flower_2.png
diff --git a/gfx/mail/0b9d86.png b/gfx/mail/flower_mail_border.png
index d0ac239f3..d0ac239f3 100755
--- a/gfx/mail/0b9d86.png
+++ b/gfx/mail/flower_mail_border.png
diff --git a/gfx/mail/0b992e.png b/gfx/mail/grass.png
index 7e1f17619..7e1f17619 100644
--- a/gfx/mail/0b992e.png
+++ b/gfx/mail/grass.png
diff --git a/gfx/mail/0b9a26.png b/gfx/mail/lapras.png
index 5ea40f472..5ea40f472 100644
--- a/gfx/mail/0b9a26.png
+++ b/gfx/mail/lapras.png
diff --git a/gfx/mail/0b9c9e.png b/gfx/mail/large_circle.png
index d91eae23f..d91eae23f 100644
--- a/gfx/mail/0b9c9e.png
+++ b/gfx/mail/large_circle.png
diff --git a/gfx/mail/0b9c5e.png b/gfx/mail/large_heart.png
index 075328574..075328574 100644
--- a/gfx/mail/0b9c5e.png
+++ b/gfx/mail/large_heart.png
diff --git a/gfx/mail/0b9cfe.png b/gfx/mail/large_note.png
index 4b7a26faa..4b7a26faa 100755
--- a/gfx/mail/0b9cfe.png
+++ b/gfx/mail/large_note.png
diff --git a/gfx/mail/0b9bfe.png b/gfx/mail/large_pokeball.png
index 5c2dcb10b..5c2dcb10b 100644
--- a/gfx/mail/0b9bfe.png
+++ b/gfx/mail/large_pokeball.png
diff --git a/gfx/mail/0b9c3e.png b/gfx/mail/large_triangle.png
index 1a518f774..1a518f774 100644
--- a/gfx/mail/0b9c3e.png
+++ b/gfx/mail/large_triangle.png
diff --git a/gfx/mail/0b9dc6.png b/gfx/mail/litebluemail_border.png
index 878021bf8..878021bf8 100755
--- a/gfx/mail/0b9dc6.png
+++ b/gfx/mail/litebluemail_border.png
diff --git a/gfx/mail/0b9e26.png b/gfx/mail/lovely_mail_border.png
index 48b8e7b7b..48b8e7b7b 100644
--- a/gfx/mail/0b9e26.png
+++ b/gfx/mail/lovely_mail_border.png
diff --git a/gfx/mail/0b9966.png b/gfx/mail/lovely_mail_underline.png
index 211848bff..211848bff 100644
--- a/gfx/mail/0b9966.png
+++ b/gfx/mail/lovely_mail_underline.png
diff --git a/gfx/mail/0b9ab6.png b/gfx/mail/mew.png
index 8a8ea55e0..8a8ea55e0 100644
--- a/gfx/mail/0b9ab6.png
+++ b/gfx/mail/mew.png
diff --git a/gfx/mail/0b993e.png b/gfx/mail/morph_mail_border.png
index 0fc395ef8..0fc395ef8 100644
--- a/gfx/mail/0b993e.png
+++ b/gfx/mail/morph_mail_border.png
diff --git a/gfx/mail/0b9c7e.png b/gfx/mail/morph_mail_corner.png
index f9e7a3cae..f9e7a3cae 100755
--- a/gfx/mail/0b9c7e.png
+++ b/gfx/mail/morph_mail_corner.png
diff --git a/gfx/mail/0b9926.png b/gfx/mail/morph_mail_divider.png
index 8a280b399..8a280b399 100644
--- a/gfx/mail/0b9926.png
+++ b/gfx/mail/morph_mail_divider.png
diff --git a/gfx/mail/0b9e06.png b/gfx/mail/music_mail_border.png
index 035757ee4..035757ee4 100644
--- a/gfx/mail/0b9e06.png
+++ b/gfx/mail/music_mail_border.png
diff --git a/gfx/mail/0b9996.png b/gfx/mail/natu.png
index ef4c1ebeb..ef4c1ebeb 100644
--- a/gfx/mail/0b9996.png
+++ b/gfx/mail/natu.png
diff --git a/gfx/mail/0b9c1e.png b/gfx/mail/oddish.png
index 761432369..761432369 100644
--- a/gfx/mail/0b9c1e.png
+++ b/gfx/mail/oddish.png
diff --git a/gfx/mail/0b99f6.png b/gfx/mail/poliwag.png
index a1b092e60..a1b092e60 100644
--- a/gfx/mail/0b99f6.png
+++ b/gfx/mail/poliwag.png
diff --git a/gfx/mail/0b9e4e.png b/gfx/mail/portraitmail_border.png
index 9efb3401f..9efb3401f 100644
--- a/gfx/mail/0b9e4e.png
+++ b/gfx/mail/portraitmail_border.png
diff --git a/gfx/mail/0b995e.png b/gfx/mail/portraitmail_underline.png
index 6c32516ed..6c32516ed 100644
--- a/gfx/mail/0b995e.png
+++ b/gfx/mail/portraitmail_underline.png
diff --git a/gfx/mail/0b9bce.png b/gfx/mail/sentret.png
index b277a2c9c..b277a2c9c 100644
--- a/gfx/mail/0b9bce.png
+++ b/gfx/mail/sentret.png
diff --git a/gfx/mail/0b996e.png b/gfx/mail/small_heart.png
index 51a61a19d..51a61a19d 100644
--- a/gfx/mail/0b996e.png
+++ b/gfx/mail/small_heart.png
diff --git a/gfx/mail/0b9946.png b/gfx/mail/small_note.png
index cc95134f6..cc95134f6 100644
--- a/gfx/mail/0b9946.png
+++ b/gfx/mail/small_note.png
diff --git a/gfx/mail/0b9936.png b/gfx/mail/small_pokeball.png
index 666c59813..666c59813 100644
--- a/gfx/mail/0b9936.png
+++ b/gfx/mail/small_pokeball.png
diff --git a/gfx/mail/0b9976.png b/gfx/mail/small_triangle.png
index f5d98bf9d..f5d98bf9d 100644
--- a/gfx/mail/0b9976.png
+++ b/gfx/mail/small_triangle.png
diff --git a/gfx/mail/0b9d46.png b/gfx/mail/surf_mail_border.png
index 466d26c39..466d26c39 100755
--- a/gfx/mail/0b9d46.png
+++ b/gfx/mail/surf_mail_border.png
diff --git a/gfx/mail/0b9bee.png b/gfx/mail/unused_grass.png
index bdc18dbaa..bdc18dbaa 100644
--- a/gfx/mail/0b9bee.png
+++ b/gfx/mail/unused_grass.png
diff --git a/gfx/mail/0b994e.png b/gfx/mail/wave.png
index 2f8d140c4..2f8d140c4 100644
--- a/gfx/mail/0b994e.png
+++ b/gfx/mail/wave.png
diff --git a/gfx/pics.asm b/gfx/pics.asm
index 026be8142..fc2d46a77 100644
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@@ -1,732 +1,732 @@
 INCLUDE "includes.asm"
 
 
-; PicPointers and UnownPicPointers are assumed to start at the same address,
-; but in different banks. This is enforced in pokecrystal.link.
+; PokemonPicPointers and UnownPicPointers are assumed to start at the same
+; address, but in different banks. This is enforced in pokecrystal.link.
 
 SECTION "Pic Pointers", ROMX
 
-INCLUDE "gfx/pics/pic_pointers.asm"
+INCLUDE "data/pokemon/pic_pointers.asm"
 
 
 SECTION "Unown Pic Pointers", ROMX
 
-INCLUDE "gfx/pics/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
 Pics_1::
 
-HoOhFrontpic:        INCBIN "gfx/pics/ho_oh/front.animated.2bpp.lz"
-MachampFrontpic:     INCBIN "gfx/pics/machamp/front.animated.2bpp.lz"
-NinetalesFrontpic:   INCBIN "gfx/pics/ninetales/front.animated.2bpp.lz"
-FeraligatrFrontpic:  INCBIN "gfx/pics/feraligatr/front.animated.2bpp.lz"
-NidokingFrontpic:    INCBIN "gfx/pics/nidoking/front.animated.2bpp.lz"
-RaikouFrontpic:      INCBIN "gfx/pics/raikou/front.animated.2bpp.lz"
-LugiaFrontpic:       INCBIN "gfx/pics/lugia/front.animated.2bpp.lz"
-ArticunoFrontpic:    INCBIN "gfx/pics/articuno/front.animated.2bpp.lz"
-TaurosFrontpic:      INCBIN "gfx/pics/tauros/front.animated.2bpp.lz"
-VenusaurFrontpic:    INCBIN "gfx/pics/venusaur/front.animated.2bpp.lz"
-EnteiFrontpic:       INCBIN "gfx/pics/entei/front.animated.2bpp.lz"
-SuicuneFrontpic:     INCBIN "gfx/pics/suicune/front.animated.2bpp.lz"
-TyphlosionFrontpic:  INCBIN "gfx/pics/typhlosion/front.animated.2bpp.lz"
+HoOhFrontpic:        INCBIN "gfx/pokemon/ho_oh/front.animated.2bpp.lz"
+MachampFrontpic:     INCBIN "gfx/pokemon/machamp/front.animated.2bpp.lz"
+NinetalesFrontpic:   INCBIN "gfx/pokemon/ninetales/front.animated.2bpp.lz"
+FeraligatrFrontpic:  INCBIN "gfx/pokemon/feraligatr/front.animated.2bpp.lz"
+NidokingFrontpic:    INCBIN "gfx/pokemon/nidoking/front.animated.2bpp.lz"
+RaikouFrontpic:      INCBIN "gfx/pokemon/raikou/front.animated.2bpp.lz"
+LugiaFrontpic:       INCBIN "gfx/pokemon/lugia/front.animated.2bpp.lz"
+ArticunoFrontpic:    INCBIN "gfx/pokemon/articuno/front.animated.2bpp.lz"
+TaurosFrontpic:      INCBIN "gfx/pokemon/tauros/front.animated.2bpp.lz"
+VenusaurFrontpic:    INCBIN "gfx/pokemon/venusaur/front.animated.2bpp.lz"
+EnteiFrontpic:       INCBIN "gfx/pokemon/entei/front.animated.2bpp.lz"
+SuicuneFrontpic:     INCBIN "gfx/pokemon/suicune/front.animated.2bpp.lz"
+TyphlosionFrontpic:  INCBIN "gfx/pokemon/typhlosion/front.animated.2bpp.lz"
 ; 123ffa
 
 
 SECTION "Pics 2", ROMX
 
-BlastoiseFrontpic:   INCBIN "gfx/pics/blastoise/front.animated.2bpp.lz"
-RapidashFrontpic:    INCBIN "gfx/pics/rapidash/front.animated.2bpp.lz"
-MeganiumFrontpic:    INCBIN "gfx/pics/meganium/front.animated.2bpp.lz"
-NidoqueenFrontpic:   INCBIN "gfx/pics/nidoqueen/front.animated.2bpp.lz"
-HitmonleeFrontpic:   INCBIN "gfx/pics/hitmonlee/front.animated.2bpp.lz"
-ScizorFrontpic:      INCBIN "gfx/pics/scizor/front.animated.2bpp.lz"
-BeedrillFrontpic:    INCBIN "gfx/pics/beedrill/front.animated.2bpp.lz"
-ArcanineFrontpic:    INCBIN "gfx/pics/arcanine/front.animated.2bpp.lz"
-TyranitarFrontpic:   INCBIN "gfx/pics/tyranitar/front.animated.2bpp.lz"
-MoltresFrontpic:     INCBIN "gfx/pics/moltres/front.animated.2bpp.lz"
-ZapdosFrontpic:      INCBIN "gfx/pics/zapdos/front.animated.2bpp.lz"
-ArbokFrontpic:       INCBIN "gfx/pics/arbok/front.animated.2bpp.lz"
-MewtwoFrontpic:      INCBIN "gfx/pics/mewtwo/front.animated.2bpp.lz"
-FearowFrontpic:      INCBIN "gfx/pics/fearow/front.animated.2bpp.lz"
-CharizardFrontpic:   INCBIN "gfx/pics/charizard/front.animated.2bpp.lz"
-QuilavaFrontpic:     INCBIN "gfx/pics/quilava/front.animated.2bpp.lz"
+BlastoiseFrontpic:   INCBIN "gfx/pokemon/blastoise/front.animated.2bpp.lz"
+RapidashFrontpic:    INCBIN "gfx/pokemon/rapidash/front.animated.2bpp.lz"
+MeganiumFrontpic:    INCBIN "gfx/pokemon/meganium/front.animated.2bpp.lz"
+NidoqueenFrontpic:   INCBIN "gfx/pokemon/nidoqueen/front.animated.2bpp.lz"
+HitmonleeFrontpic:   INCBIN "gfx/pokemon/hitmonlee/front.animated.2bpp.lz"
+ScizorFrontpic:      INCBIN "gfx/pokemon/scizor/front.animated.2bpp.lz"
+BeedrillFrontpic:    INCBIN "gfx/pokemon/beedrill/front.animated.2bpp.lz"
+ArcanineFrontpic:    INCBIN "gfx/pokemon/arcanine/front.animated.2bpp.lz"
+TyranitarFrontpic:   INCBIN "gfx/pokemon/tyranitar/front.animated.2bpp.lz"
+MoltresFrontpic:     INCBIN "gfx/pokemon/moltres/front.animated.2bpp.lz"
+ZapdosFrontpic:      INCBIN "gfx/pokemon/zapdos/front.animated.2bpp.lz"
+ArbokFrontpic:       INCBIN "gfx/pokemon/arbok/front.animated.2bpp.lz"
+MewtwoFrontpic:      INCBIN "gfx/pokemon/mewtwo/front.animated.2bpp.lz"
+FearowFrontpic:      INCBIN "gfx/pokemon/fearow/front.animated.2bpp.lz"
+CharizardFrontpic:   INCBIN "gfx/pokemon/charizard/front.animated.2bpp.lz"
+QuilavaFrontpic:     INCBIN "gfx/pokemon/quilava/front.animated.2bpp.lz"
 ; 127ffe
 
 
 SECTION "Pics 3", ROMX
 
-SteelixFrontpic:     INCBIN "gfx/pics/steelix/front.animated.2bpp.lz"
-AlakazamFrontpic:    INCBIN "gfx/pics/alakazam/front.animated.2bpp.lz"
-GyaradosFrontpic:    INCBIN "gfx/pics/gyarados/front.animated.2bpp.lz"
-KangaskhanFrontpic:  INCBIN "gfx/pics/kangaskhan/front.animated.2bpp.lz"
-RhydonFrontpic:      INCBIN "gfx/pics/rhydon/front.animated.2bpp.lz"
-GolduckFrontpic:     INCBIN "gfx/pics/golduck/front.animated.2bpp.lz"
-RhyhornFrontpic:     INCBIN "gfx/pics/rhyhorn/front.animated.2bpp.lz"
-PidgeotFrontpic:     INCBIN "gfx/pics/pidgeot/front.animated.2bpp.lz"
-SlowbroFrontpic:     INCBIN "gfx/pics/slowbro/front.animated.2bpp.lz"
-ButterfreeFrontpic:  INCBIN "gfx/pics/butterfree/front.animated.2bpp.lz"
-WeezingFrontpic:     INCBIN "gfx/pics/weezing/front.animated.2bpp.lz"
-CloysterFrontpic:    INCBIN "gfx/pics/cloyster/front.animated.2bpp.lz"
-SkarmoryFrontpic:    INCBIN "gfx/pics/skarmory/front.animated.2bpp.lz"
-DewgongFrontpic:     INCBIN "gfx/pics/dewgong/front.animated.2bpp.lz"
-VictreebelFrontpic:  INCBIN "gfx/pics/victreebel/front.animated.2bpp.lz"
-RaichuFrontpic:      INCBIN "gfx/pics/raichu/front.animated.2bpp.lz"
-PrimeapeFrontpic:    INCBIN "gfx/pics/primeape/front.animated.2bpp.lz"
-OmastarBackpic:      INCBIN "gfx/pics/omastar/back.2bpp.lz"
+SteelixFrontpic:     INCBIN "gfx/pokemon/steelix/front.animated.2bpp.lz"
+AlakazamFrontpic:    INCBIN "gfx/pokemon/alakazam/front.animated.2bpp.lz"
+GyaradosFrontpic:    INCBIN "gfx/pokemon/gyarados/front.animated.2bpp.lz"
+KangaskhanFrontpic:  INCBIN "gfx/pokemon/kangaskhan/front.animated.2bpp.lz"
+RhydonFrontpic:      INCBIN "gfx/pokemon/rhydon/front.animated.2bpp.lz"
+GolduckFrontpic:     INCBIN "gfx/pokemon/golduck/front.animated.2bpp.lz"
+RhyhornFrontpic:     INCBIN "gfx/pokemon/rhyhorn/front.animated.2bpp.lz"
+PidgeotFrontpic:     INCBIN "gfx/pokemon/pidgeot/front.animated.2bpp.lz"
+SlowbroFrontpic:     INCBIN "gfx/pokemon/slowbro/front.animated.2bpp.lz"
+ButterfreeFrontpic:  INCBIN "gfx/pokemon/butterfree/front.animated.2bpp.lz"
+WeezingFrontpic:     INCBIN "gfx/pokemon/weezing/front.animated.2bpp.lz"
+CloysterFrontpic:    INCBIN "gfx/pokemon/cloyster/front.animated.2bpp.lz"
+SkarmoryFrontpic:    INCBIN "gfx/pokemon/skarmory/front.animated.2bpp.lz"
+DewgongFrontpic:     INCBIN "gfx/pokemon/dewgong/front.animated.2bpp.lz"
+VictreebelFrontpic:  INCBIN "gfx/pokemon/victreebel/front.animated.2bpp.lz"
+RaichuFrontpic:      INCBIN "gfx/pokemon/raichu/front.animated.2bpp.lz"
+PrimeapeFrontpic:    INCBIN "gfx/pokemon/primeape/front.animated.2bpp.lz"
+OmastarBackpic:      INCBIN "gfx/pokemon/omastar/back.2bpp.lz"
 ; 12bffe
 
 
 SECTION "Pics 4", ROMX
 
-DodrioFrontpic:      INCBIN "gfx/pics/dodrio/front.animated.2bpp.lz"
-SlowkingFrontpic:    INCBIN "gfx/pics/slowking/front.animated.2bpp.lz"
-HitmontopFrontpic:   INCBIN "gfx/pics/hitmontop/front.animated.2bpp.lz"
-OnixFrontpic:        INCBIN "gfx/pics/onix/front.animated.2bpp.lz"
-BlisseyFrontpic:     INCBIN "gfx/pics/blissey/front.animated.2bpp.lz"
-MachokeFrontpic:     INCBIN "gfx/pics/machoke/front.animated.2bpp.lz"
-DragoniteFrontpic:   INCBIN "gfx/pics/dragonite/front.animated.2bpp.lz"
-PoliwrathFrontpic:   INCBIN "gfx/pics/poliwrath/front.animated.2bpp.lz"
-ScytherFrontpic:     INCBIN "gfx/pics/scyther/front.animated.2bpp.lz"
-AerodactylFrontpic:  INCBIN "gfx/pics/aerodactyl/front.animated.2bpp.lz"
-SeakingFrontpic:     INCBIN "gfx/pics/seaking/front.animated.2bpp.lz"
-MukFrontpic:         INCBIN "gfx/pics/muk/front.animated.2bpp.lz"
-CroconawFrontpic:    INCBIN "gfx/pics/croconaw/front.animated.2bpp.lz"
-HypnoFrontpic:       INCBIN "gfx/pics/hypno/front.animated.2bpp.lz"
-NidorinoFrontpic:    INCBIN "gfx/pics/nidorino/front.animated.2bpp.lz"
-SandslashFrontpic:   INCBIN "gfx/pics/sandslash/front.animated.2bpp.lz"
-JolteonFrontpic:     INCBIN "gfx/pics/jolteon/front.animated.2bpp.lz"
-DonphanFrontpic:     INCBIN "gfx/pics/donphan/front.animated.2bpp.lz"
-PinsirFrontpic:      INCBIN "gfx/pics/pinsir/front.animated.2bpp.lz"
-UnownEFrontpic:      INCBIN "gfx/pics/unown_e/front.animated.2bpp.lz"
+DodrioFrontpic:      INCBIN "gfx/pokemon/dodrio/front.animated.2bpp.lz"
+SlowkingFrontpic:    INCBIN "gfx/pokemon/slowking/front.animated.2bpp.lz"
+HitmontopFrontpic:   INCBIN "gfx/pokemon/hitmontop/front.animated.2bpp.lz"
+OnixFrontpic:        INCBIN "gfx/pokemon/onix/front.animated.2bpp.lz"
+BlisseyFrontpic:     INCBIN "gfx/pokemon/blissey/front.animated.2bpp.lz"
+MachokeFrontpic:     INCBIN "gfx/pokemon/machoke/front.animated.2bpp.lz"
+DragoniteFrontpic:   INCBIN "gfx/pokemon/dragonite/front.animated.2bpp.lz"
+PoliwrathFrontpic:   INCBIN "gfx/pokemon/poliwrath/front.animated.2bpp.lz"
+ScytherFrontpic:     INCBIN "gfx/pokemon/scyther/front.animated.2bpp.lz"
+AerodactylFrontpic:  INCBIN "gfx/pokemon/aerodactyl/front.animated.2bpp.lz"
+SeakingFrontpic:     INCBIN "gfx/pokemon/seaking/front.animated.2bpp.lz"
+MukFrontpic:         INCBIN "gfx/pokemon/muk/front.animated.2bpp.lz"
+CroconawFrontpic:    INCBIN "gfx/pokemon/croconaw/front.animated.2bpp.lz"
+HypnoFrontpic:       INCBIN "gfx/pokemon/hypno/front.animated.2bpp.lz"
+NidorinoFrontpic:    INCBIN "gfx/pokemon/nidorino/front.animated.2bpp.lz"
+SandslashFrontpic:   INCBIN "gfx/pokemon/sandslash/front.animated.2bpp.lz"
+JolteonFrontpic:     INCBIN "gfx/pokemon/jolteon/front.animated.2bpp.lz"
+DonphanFrontpic:     INCBIN "gfx/pokemon/donphan/front.animated.2bpp.lz"
+PinsirFrontpic:      INCBIN "gfx/pokemon/pinsir/front.animated.2bpp.lz"
+UnownEFrontpic:      INCBIN "gfx/pokemon/unown_e/front.animated.2bpp.lz"
 ; 130000
 
 
 SECTION "Pics 5", ROMX
 
-GolbatFrontpic:      INCBIN "gfx/pics/golbat/front.animated.2bpp.lz"
-KinglerFrontpic:     INCBIN "gfx/pics/kingler/front.animated.2bpp.lz"
-ExeggcuteFrontpic:   INCBIN "gfx/pics/exeggcute/front.animated.2bpp.lz"
-MagcargoFrontpic:    INCBIN "gfx/pics/magcargo/front.animated.2bpp.lz"
-PersianFrontpic:     INCBIN "gfx/pics/persian/front.animated.2bpp.lz"
-StantlerFrontpic:    INCBIN "gfx/pics/stantler/front.animated.2bpp.lz"
-RaticateFrontpic:    INCBIN "gfx/pics/raticate/front.animated.2bpp.lz"
-VenomothFrontpic:    INCBIN "gfx/pics/venomoth/front.animated.2bpp.lz"
-PolitoedFrontpic:    INCBIN "gfx/pics/politoed/front.animated.2bpp.lz"
-ElectabuzzFrontpic:  INCBIN "gfx/pics/electabuzz/front.animated.2bpp.lz"
-MantineFrontpic:     INCBIN "gfx/pics/mantine/front.animated.2bpp.lz"
-LickitungFrontpic:   INCBIN "gfx/pics/lickitung/front.animated.2bpp.lz"
-KingdraFrontpic:     INCBIN "gfx/pics/kingdra/front.animated.2bpp.lz"
-CharmeleonFrontpic:  INCBIN "gfx/pics/charmeleon/front.animated.2bpp.lz"
-KadabraFrontpic:     INCBIN "gfx/pics/kadabra/front.animated.2bpp.lz"
-ExeggutorFrontpic:   INCBIN "gfx/pics/exeggutor/front.animated.2bpp.lz"
-GastlyFrontpic:      INCBIN "gfx/pics/gastly/front.animated.2bpp.lz"
-AzumarillFrontpic:   INCBIN "gfx/pics/azumarill/front.animated.2bpp.lz"
-ParasectFrontpic:    INCBIN "gfx/pics/parasect/front.animated.2bpp.lz"
-MrMimeFrontpic:      INCBIN "gfx/pics/mr__mime/front.animated.2bpp.lz"
-HeracrossFrontpic:   INCBIN "gfx/pics/heracross/front.animated.2bpp.lz"
+GolbatFrontpic:      INCBIN "gfx/pokemon/golbat/front.animated.2bpp.lz"
+KinglerFrontpic:     INCBIN "gfx/pokemon/kingler/front.animated.2bpp.lz"
+ExeggcuteFrontpic:   INCBIN "gfx/pokemon/exeggcute/front.animated.2bpp.lz"
+MagcargoFrontpic:    INCBIN "gfx/pokemon/magcargo/front.animated.2bpp.lz"
+PersianFrontpic:     INCBIN "gfx/pokemon/persian/front.animated.2bpp.lz"
+StantlerFrontpic:    INCBIN "gfx/pokemon/stantler/front.animated.2bpp.lz"
+RaticateFrontpic:    INCBIN "gfx/pokemon/raticate/front.animated.2bpp.lz"
+VenomothFrontpic:    INCBIN "gfx/pokemon/venomoth/front.animated.2bpp.lz"
+PolitoedFrontpic:    INCBIN "gfx/pokemon/politoed/front.animated.2bpp.lz"
+ElectabuzzFrontpic:  INCBIN "gfx/pokemon/electabuzz/front.animated.2bpp.lz"
+MantineFrontpic:     INCBIN "gfx/pokemon/mantine/front.animated.2bpp.lz"
+LickitungFrontpic:   INCBIN "gfx/pokemon/lickitung/front.animated.2bpp.lz"
+KingdraFrontpic:     INCBIN "gfx/pokemon/kingdra/front.animated.2bpp.lz"
+CharmeleonFrontpic:  INCBIN "gfx/pokemon/charmeleon/front.animated.2bpp.lz"
+KadabraFrontpic:     INCBIN "gfx/pokemon/kadabra/front.animated.2bpp.lz"
+ExeggutorFrontpic:   INCBIN "gfx/pokemon/exeggutor/front.animated.2bpp.lz"
+GastlyFrontpic:      INCBIN "gfx/pokemon/gastly/front.animated.2bpp.lz"
+AzumarillFrontpic:   INCBIN "gfx/pokemon/azumarill/front.animated.2bpp.lz"
+ParasectFrontpic:    INCBIN "gfx/pokemon/parasect/front.animated.2bpp.lz"
+MrMimeFrontpic:      INCBIN "gfx/pokemon/mr__mime/front.animated.2bpp.lz"
+HeracrossFrontpic:   INCBIN "gfx/pokemon/heracross/front.animated.2bpp.lz"
 ; 133fff
 
 
 SECTION "Pics 6", ROMX
 
-AriadosFrontpic:     INCBIN "gfx/pics/ariados/front.animated.2bpp.lz"
-NoctowlFrontpic:     INCBIN "gfx/pics/noctowl/front.animated.2bpp.lz"
-WartortleFrontpic:   INCBIN "gfx/pics/wartortle/front.animated.2bpp.lz"
-LaprasFrontpic:      INCBIN "gfx/pics/lapras/front.animated.2bpp.lz"
-GolemFrontpic:       INCBIN "gfx/pics/golem/front.animated.2bpp.lz"
-PoliwhirlFrontpic:   INCBIN "gfx/pics/poliwhirl/front.animated.2bpp.lz"
-UrsaringFrontpic:    INCBIN "gfx/pics/ursaring/front.animated.2bpp.lz"
-HoundoomFrontpic:    INCBIN "gfx/pics/houndoom/front.animated.2bpp.lz"
-KabutopsFrontpic:    INCBIN "gfx/pics/kabutops/front.animated.2bpp.lz"
-AmpharosFrontpic:    INCBIN "gfx/pics/ampharos/front.animated.2bpp.lz"
-NidorinaFrontpic:    INCBIN "gfx/pics/nidorina/front.animated.2bpp.lz"
-FlareonFrontpic:     INCBIN "gfx/pics/flareon/front.animated.2bpp.lz"
-FarfetchDFrontpic:   INCBIN "gfx/pics/farfetch_d/front.animated.2bpp.lz"
-VileplumeFrontpic:   INCBIN "gfx/pics/vileplume/front.animated.2bpp.lz"
-BayleefFrontpic:     INCBIN "gfx/pics/bayleef/front.animated.2bpp.lz"
-MagmarFrontpic:      INCBIN "gfx/pics/magmar/front.animated.2bpp.lz"
-TentacruelFrontpic:  INCBIN "gfx/pics/tentacruel/front.animated.2bpp.lz"
-ElekidFrontpic:      INCBIN "gfx/pics/elekid/front.animated.2bpp.lz"
-JumpluffFrontpic:    INCBIN "gfx/pics/jumpluff/front.animated.2bpp.lz"
-MarowakFrontpic:     INCBIN "gfx/pics/marowak/front.animated.2bpp.lz"
-VulpixFrontpic:      INCBIN "gfx/pics/vulpix/front.animated.2bpp.lz"
-GligarFrontpic:      INCBIN "gfx/pics/gligar/front.animated.2bpp.lz"
-DunsparceFrontpic:   INCBIN "gfx/pics/dunsparce/front.animated.2bpp.lz"
+AriadosFrontpic:     INCBIN "gfx/pokemon/ariados/front.animated.2bpp.lz"
+NoctowlFrontpic:     INCBIN "gfx/pokemon/noctowl/front.animated.2bpp.lz"
+WartortleFrontpic:   INCBIN "gfx/pokemon/wartortle/front.animated.2bpp.lz"
+LaprasFrontpic:      INCBIN "gfx/pokemon/lapras/front.animated.2bpp.lz"
+GolemFrontpic:       INCBIN "gfx/pokemon/golem/front.animated.2bpp.lz"
+PoliwhirlFrontpic:   INCBIN "gfx/pokemon/poliwhirl/front.animated.2bpp.lz"
+UrsaringFrontpic:    INCBIN "gfx/pokemon/ursaring/front.animated.2bpp.lz"
+HoundoomFrontpic:    INCBIN "gfx/pokemon/houndoom/front.animated.2bpp.lz"
+KabutopsFrontpic:    INCBIN "gfx/pokemon/kabutops/front.animated.2bpp.lz"
+AmpharosFrontpic:    INCBIN "gfx/pokemon/ampharos/front.animated.2bpp.lz"
+NidorinaFrontpic:    INCBIN "gfx/pokemon/nidorina/front.animated.2bpp.lz"
+FlareonFrontpic:     INCBIN "gfx/pokemon/flareon/front.animated.2bpp.lz"
+FarfetchDFrontpic:   INCBIN "gfx/pokemon/farfetch_d/front.animated.2bpp.lz"
+VileplumeFrontpic:   INCBIN "gfx/pokemon/vileplume/front.animated.2bpp.lz"
+BayleefFrontpic:     INCBIN "gfx/pokemon/bayleef/front.animated.2bpp.lz"
+MagmarFrontpic:      INCBIN "gfx/pokemon/magmar/front.animated.2bpp.lz"
+TentacruelFrontpic:  INCBIN "gfx/pokemon/tentacruel/front.animated.2bpp.lz"
+ElekidFrontpic:      INCBIN "gfx/pokemon/elekid/front.animated.2bpp.lz"
+JumpluffFrontpic:    INCBIN "gfx/pokemon/jumpluff/front.animated.2bpp.lz"
+MarowakFrontpic:     INCBIN "gfx/pokemon/marowak/front.animated.2bpp.lz"
+VulpixFrontpic:      INCBIN "gfx/pokemon/vulpix/front.animated.2bpp.lz"
+GligarFrontpic:      INCBIN "gfx/pokemon/gligar/front.animated.2bpp.lz"
+DunsparceFrontpic:   INCBIN "gfx/pokemon/dunsparce/front.animated.2bpp.lz"
 ; 137fff
 
 
 SECTION "Pics 7", ROMX
 
-VaporeonFrontpic:    INCBIN "gfx/pics/vaporeon/front.animated.2bpp.lz"
-GirafarigFrontpic:   INCBIN "gfx/pics/girafarig/front.animated.2bpp.lz"
-DrowzeeFrontpic:     INCBIN "gfx/pics/drowzee/front.animated.2bpp.lz"
-SneaselFrontpic:     INCBIN "gfx/pics/sneasel/front.animated.2bpp.lz"
-BellossomFrontpic:   INCBIN "gfx/pics/bellossom/front.animated.2bpp.lz"
-SnorlaxFrontpic:     INCBIN "gfx/pics/snorlax/front.animated.2bpp.lz"
-WigglytuffFrontpic:  INCBIN "gfx/pics/wigglytuff/front.animated.2bpp.lz"
-YanmaFrontpic:       INCBIN "gfx/pics/yanma/front.animated.2bpp.lz"
-SmeargleFrontpic:    INCBIN "gfx/pics/smeargle/front.animated.2bpp.lz"
-ClefableFrontpic:    INCBIN "gfx/pics/clefable/front.animated.2bpp.lz"
-PonytaFrontpic:      INCBIN "gfx/pics/ponyta/front.animated.2bpp.lz"
-MurkrowFrontpic:     INCBIN "gfx/pics/murkrow/front.animated.2bpp.lz"
-GravelerFrontpic:    INCBIN "gfx/pics/graveler/front.animated.2bpp.lz"
-StarmieFrontpic:     INCBIN "gfx/pics/starmie/front.animated.2bpp.lz"
-PidgeottoFrontpic:   INCBIN "gfx/pics/pidgeotto/front.animated.2bpp.lz"
-LedybaFrontpic:      INCBIN "gfx/pics/ledyba/front.animated.2bpp.lz"
-GengarFrontpic:      INCBIN "gfx/pics/gengar/front.animated.2bpp.lz"
-OmastarFrontpic:     INCBIN "gfx/pics/omastar/front.animated.2bpp.lz"
-PiloswineFrontpic:   INCBIN "gfx/pics/piloswine/front.animated.2bpp.lz"
-DugtrioFrontpic:     INCBIN "gfx/pics/dugtrio/front.animated.2bpp.lz"
-MagnetonFrontpic:    INCBIN "gfx/pics/magneton/front.animated.2bpp.lz"
-DragonairFrontpic:   INCBIN "gfx/pics/dragonair/front.animated.2bpp.lz"
-ForretressFrontpic:  INCBIN "gfx/pics/forretress/front.animated.2bpp.lz"
-TogeticFrontpic:     INCBIN "gfx/pics/togetic/front.animated.2bpp.lz"
-KangaskhanBackpic:   INCBIN "gfx/pics/kangaskhan/back.2bpp.lz"
+VaporeonFrontpic:    INCBIN "gfx/pokemon/vaporeon/front.animated.2bpp.lz"
+GirafarigFrontpic:   INCBIN "gfx/pokemon/girafarig/front.animated.2bpp.lz"
+DrowzeeFrontpic:     INCBIN "gfx/pokemon/drowzee/front.animated.2bpp.lz"
+SneaselFrontpic:     INCBIN "gfx/pokemon/sneasel/front.animated.2bpp.lz"
+BellossomFrontpic:   INCBIN "gfx/pokemon/bellossom/front.animated.2bpp.lz"
+SnorlaxFrontpic:     INCBIN "gfx/pokemon/snorlax/front.animated.2bpp.lz"
+WigglytuffFrontpic:  INCBIN "gfx/pokemon/wigglytuff/front.animated.2bpp.lz"
+YanmaFrontpic:       INCBIN "gfx/pokemon/yanma/front.animated.2bpp.lz"
+SmeargleFrontpic:    INCBIN "gfx/pokemon/smeargle/front.animated.2bpp.lz"
+ClefableFrontpic:    INCBIN "gfx/pokemon/clefable/front.animated.2bpp.lz"
+PonytaFrontpic:      INCBIN "gfx/pokemon/ponyta/front.animated.2bpp.lz"
+MurkrowFrontpic:     INCBIN "gfx/pokemon/murkrow/front.animated.2bpp.lz"
+GravelerFrontpic:    INCBIN "gfx/pokemon/graveler/front.animated.2bpp.lz"
+StarmieFrontpic:     INCBIN "gfx/pokemon/starmie/front.animated.2bpp.lz"
+PidgeottoFrontpic:   INCBIN "gfx/pokemon/pidgeotto/front.animated.2bpp.lz"
+LedybaFrontpic:      INCBIN "gfx/pokemon/ledyba/front.animated.2bpp.lz"
+GengarFrontpic:      INCBIN "gfx/pokemon/gengar/front.animated.2bpp.lz"
+OmastarFrontpic:     INCBIN "gfx/pokemon/omastar/front.animated.2bpp.lz"
+PiloswineFrontpic:   INCBIN "gfx/pokemon/piloswine/front.animated.2bpp.lz"
+DugtrioFrontpic:     INCBIN "gfx/pokemon/dugtrio/front.animated.2bpp.lz"
+MagnetonFrontpic:    INCBIN "gfx/pokemon/magneton/front.animated.2bpp.lz"
+DragonairFrontpic:   INCBIN "gfx/pokemon/dragonair/front.animated.2bpp.lz"
+ForretressFrontpic:  INCBIN "gfx/pokemon/forretress/front.animated.2bpp.lz"
+TogeticFrontpic:     INCBIN "gfx/pokemon/togetic/front.animated.2bpp.lz"
+KangaskhanBackpic:   INCBIN "gfx/pokemon/kangaskhan/back.2bpp.lz"
 ; 13c000
 
 
 SECTION "Pics 8", ROMX
 
-SeelFrontpic:        INCBIN "gfx/pics/seel/front.animated.2bpp.lz"
-CrobatFrontpic:      INCBIN "gfx/pics/crobat/front.animated.2bpp.lz"
-ChanseyFrontpic:     INCBIN "gfx/pics/chansey/front.animated.2bpp.lz"
-TangelaFrontpic:     INCBIN "gfx/pics/tangela/front.animated.2bpp.lz"
-SnubbullFrontpic:    INCBIN "gfx/pics/snubbull/front.animated.2bpp.lz"
-GranbullFrontpic:    INCBIN "gfx/pics/granbull/front.animated.2bpp.lz"
-MiltankFrontpic:     INCBIN "gfx/pics/miltank/front.animated.2bpp.lz"
-HaunterFrontpic:     INCBIN "gfx/pics/haunter/front.animated.2bpp.lz"
-SunfloraFrontpic:    INCBIN "gfx/pics/sunflora/front.animated.2bpp.lz"
-UmbreonFrontpic:     INCBIN "gfx/pics/umbreon/front.animated.2bpp.lz"
-ChikoritaFrontpic:   INCBIN "gfx/pics/chikorita/front.animated.2bpp.lz"
-GoldeenFrontpic:     INCBIN "gfx/pics/goldeen/front.animated.2bpp.lz"
-EspeonFrontpic:      INCBIN "gfx/pics/espeon/front.animated.2bpp.lz"
-XatuFrontpic:        INCBIN "gfx/pics/xatu/front.animated.2bpp.lz"
-MewFrontpic:         INCBIN "gfx/pics/mew/front.animated.2bpp.lz"
-OctilleryFrontpic:   INCBIN "gfx/pics/octillery/front.animated.2bpp.lz"
-JynxFrontpic:        INCBIN "gfx/pics/jynx/front.animated.2bpp.lz"
-WobbuffetFrontpic:   INCBIN "gfx/pics/wobbuffet/front.animated.2bpp.lz"
-DelibirdFrontpic:    INCBIN "gfx/pics/delibird/front.animated.2bpp.lz"
-LedianFrontpic:      INCBIN "gfx/pics/ledian/front.animated.2bpp.lz"
-GloomFrontpic:       INCBIN "gfx/pics/gloom/front.animated.2bpp.lz"
-FlaaffyFrontpic:     INCBIN "gfx/pics/flaaffy/front.animated.2bpp.lz"
-IvysaurFrontpic:     INCBIN "gfx/pics/ivysaur/front.animated.2bpp.lz"
-FurretFrontpic:      INCBIN "gfx/pics/furret/front.animated.2bpp.lz"
-CyndaquilFrontpic:   INCBIN "gfx/pics/cyndaquil/front.animated.2bpp.lz"
-HitmonchanFrontpic:  INCBIN "gfx/pics/hitmonchan/front.animated.2bpp.lz"
-QuagsireFrontpic:    INCBIN "gfx/pics/quagsire/front.animated.2bpp.lz"
+SeelFrontpic:        INCBIN "gfx/pokemon/seel/front.animated.2bpp.lz"
+CrobatFrontpic:      INCBIN "gfx/pokemon/crobat/front.animated.2bpp.lz"
+ChanseyFrontpic:     INCBIN "gfx/pokemon/chansey/front.animated.2bpp.lz"
+TangelaFrontpic:     INCBIN "gfx/pokemon/tangela/front.animated.2bpp.lz"
+SnubbullFrontpic:    INCBIN "gfx/pokemon/snubbull/front.animated.2bpp.lz"
+GranbullFrontpic:    INCBIN "gfx/pokemon/granbull/front.animated.2bpp.lz"
+MiltankFrontpic:     INCBIN "gfx/pokemon/miltank/front.animated.2bpp.lz"
+HaunterFrontpic:     INCBIN "gfx/pokemon/haunter/front.animated.2bpp.lz"
+SunfloraFrontpic:    INCBIN "gfx/pokemon/sunflora/front.animated.2bpp.lz"
+UmbreonFrontpic:     INCBIN "gfx/pokemon/umbreon/front.animated.2bpp.lz"
+ChikoritaFrontpic:   INCBIN "gfx/pokemon/chikorita/front.animated.2bpp.lz"
+GoldeenFrontpic:     INCBIN "gfx/pokemon/goldeen/front.animated.2bpp.lz"
+EspeonFrontpic:      INCBIN "gfx/pokemon/espeon/front.animated.2bpp.lz"
+XatuFrontpic:        INCBIN "gfx/pokemon/xatu/front.animated.2bpp.lz"
+MewFrontpic:         INCBIN "gfx/pokemon/mew/front.animated.2bpp.lz"
+OctilleryFrontpic:   INCBIN "gfx/pokemon/octillery/front.animated.2bpp.lz"
+JynxFrontpic:        INCBIN "gfx/pokemon/jynx/front.animated.2bpp.lz"
+WobbuffetFrontpic:   INCBIN "gfx/pokemon/wobbuffet/front.animated.2bpp.lz"
+DelibirdFrontpic:    INCBIN "gfx/pokemon/delibird/front.animated.2bpp.lz"
+LedianFrontpic:      INCBIN "gfx/pokemon/ledian/front.animated.2bpp.lz"
+GloomFrontpic:       INCBIN "gfx/pokemon/gloom/front.animated.2bpp.lz"
+FlaaffyFrontpic:     INCBIN "gfx/pokemon/flaaffy/front.animated.2bpp.lz"
+IvysaurFrontpic:     INCBIN "gfx/pokemon/ivysaur/front.animated.2bpp.lz"
+FurretFrontpic:      INCBIN "gfx/pokemon/furret/front.animated.2bpp.lz"
+CyndaquilFrontpic:   INCBIN "gfx/pokemon/cyndaquil/front.animated.2bpp.lz"
+HitmonchanFrontpic:  INCBIN "gfx/pokemon/hitmonchan/front.animated.2bpp.lz"
+QuagsireFrontpic:    INCBIN "gfx/pokemon/quagsire/front.animated.2bpp.lz"
 ; 13fff7
 
 
 SECTION "Pics 9", ROMX
 
-EkansFrontpic:       INCBIN "gfx/pics/ekans/front.animated.2bpp.lz"
-SudowoodoFrontpic:   INCBIN "gfx/pics/sudowoodo/front.animated.2bpp.lz"
-PikachuFrontpic:     INCBIN "gfx/pics/pikachu/front.animated.2bpp.lz"
-SeadraFrontpic:      INCBIN "gfx/pics/seadra/front.animated.2bpp.lz"
-MagbyFrontpic:       INCBIN "gfx/pics/magby/front.animated.2bpp.lz"
-WeepinbellFrontpic:  INCBIN "gfx/pics/weepinbell/front.animated.2bpp.lz"
-TotodileFrontpic:    INCBIN "gfx/pics/totodile/front.animated.2bpp.lz"
-CorsolaFrontpic:     INCBIN "gfx/pics/corsola/front.animated.2bpp.lz"
+EkansFrontpic:       INCBIN "gfx/pokemon/ekans/front.animated.2bpp.lz"
+SudowoodoFrontpic:   INCBIN "gfx/pokemon/sudowoodo/front.animated.2bpp.lz"
+PikachuFrontpic:     INCBIN "gfx/pokemon/pikachu/front.animated.2bpp.lz"
+SeadraFrontpic:      INCBIN "gfx/pokemon/seadra/front.animated.2bpp.lz"
+MagbyFrontpic:       INCBIN "gfx/pokemon/magby/front.animated.2bpp.lz"
+WeepinbellFrontpic:  INCBIN "gfx/pokemon/weepinbell/front.animated.2bpp.lz"
+TotodileFrontpic:    INCBIN "gfx/pokemon/totodile/front.animated.2bpp.lz"
+CorsolaFrontpic:     INCBIN "gfx/pokemon/corsola/front.animated.2bpp.lz"
 FirebreatherPic:     INCBIN "gfx/trainers/firebreather.2bpp.lz"
-MachopFrontpic:      INCBIN "gfx/pics/machop/front.animated.2bpp.lz"
-ChinchouFrontpic:    INCBIN "gfx/pics/chinchou/front.animated.2bpp.lz"
-RattataFrontpic:     INCBIN "gfx/pics/rattata/front.animated.2bpp.lz"
+MachopFrontpic:      INCBIN "gfx/pokemon/machop/front.animated.2bpp.lz"
+ChinchouFrontpic:    INCBIN "gfx/pokemon/chinchou/front.animated.2bpp.lz"
+RattataFrontpic:     INCBIN "gfx/pokemon/rattata/front.animated.2bpp.lz"
 ChampionPic:         INCBIN "gfx/trainers/champion.2bpp.lz"
-SpearowFrontpic:     INCBIN "gfx/pics/spearow/front.animated.2bpp.lz"
-MagikarpFrontpic:    INCBIN "gfx/pics/magikarp/front.animated.2bpp.lz"
-CharmanderFrontpic:  INCBIN "gfx/pics/charmander/front.animated.2bpp.lz"
-CuboneFrontpic:      INCBIN "gfx/pics/cubone/front.animated.2bpp.lz"
+SpearowFrontpic:     INCBIN "gfx/pokemon/spearow/front.animated.2bpp.lz"
+MagikarpFrontpic:    INCBIN "gfx/pokemon/magikarp/front.animated.2bpp.lz"
+CharmanderFrontpic:  INCBIN "gfx/pokemon/charmander/front.animated.2bpp.lz"
+CuboneFrontpic:      INCBIN "gfx/pokemon/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.animated.2bpp.lz"
-PorygonFrontpic:     INCBIN "gfx/pics/porygon/front.animated.2bpp.lz"
+NidoranMFrontpic:    INCBIN "gfx/pokemon/nidoran_m/front.animated.2bpp.lz"
+PorygonFrontpic:     INCBIN "gfx/pokemon/porygon/front.animated.2bpp.lz"
 BrunoPic:            INCBIN "gfx/trainers/bruno.2bpp.lz"
-GrimerFrontpic:      INCBIN "gfx/pics/grimer/front.animated.2bpp.lz"
-StaryuFrontpic:      INCBIN "gfx/pics/staryu/front.animated.2bpp.lz"
+GrimerFrontpic:      INCBIN "gfx/pokemon/grimer/front.animated.2bpp.lz"
+StaryuFrontpic:      INCBIN "gfx/pokemon/staryu/front.animated.2bpp.lz"
 HikerPic:            INCBIN "gfx/trainers/hiker.2bpp.lz"
-MeowthFrontpic:      INCBIN "gfx/pics/meowth/front.animated.2bpp.lz"
-Porygon2Frontpic:    INCBIN "gfx/pics/porygon2/front.animated.2bpp.lz"
-SandshrewFrontpic:   INCBIN "gfx/pics/sandshrew/front.animated.2bpp.lz"
-NidoranFFrontpic:    INCBIN "gfx/pics/nidoran_f/front.animated.2bpp.lz"
-PidgeyFrontpic:      INCBIN "gfx/pics/pidgey/front.animated.2bpp.lz"
-ParasectBackpic:     INCBIN "gfx/pics/parasect/back.2bpp.lz"
+MeowthFrontpic:      INCBIN "gfx/pokemon/meowth/front.animated.2bpp.lz"
+Porygon2Frontpic:    INCBIN "gfx/pokemon/porygon2/front.animated.2bpp.lz"
+SandshrewFrontpic:   INCBIN "gfx/pokemon/sandshrew/front.animated.2bpp.lz"
+NidoranFFrontpic:    INCBIN "gfx/pokemon/nidoran_f/front.animated.2bpp.lz"
+PidgeyFrontpic:      INCBIN "gfx/pokemon/pidgey/front.animated.2bpp.lz"
+ParasectBackpic:     INCBIN "gfx/pokemon/parasect/back.2bpp.lz"
 ; 144000
 
 
 SECTION "Pics 10", ROMX
 
-MisdreavusFrontpic:  INCBIN "gfx/pics/misdreavus/front.animated.2bpp.lz"
-HoundourFrontpic:    INCBIN "gfx/pics/houndour/front.animated.2bpp.lz"
-MankeyFrontpic:      INCBIN "gfx/pics/mankey/front.animated.2bpp.lz"
-CelebiFrontpic:      INCBIN "gfx/pics/celebi/front.animated.2bpp.lz"
+MisdreavusFrontpic:  INCBIN "gfx/pokemon/misdreavus/front.animated.2bpp.lz"
+HoundourFrontpic:    INCBIN "gfx/pokemon/houndour/front.animated.2bpp.lz"
+MankeyFrontpic:      INCBIN "gfx/pokemon/mankey/front.animated.2bpp.lz"
+CelebiFrontpic:      INCBIN "gfx/pokemon/celebi/front.animated.2bpp.lz"
 MediumPic:           INCBIN "gfx/trainers/medium.2bpp.lz"
-PinecoFrontpic:      INCBIN "gfx/pics/pineco/front.animated.2bpp.lz"
-KrabbyFrontpic:      INCBIN "gfx/pics/krabby/front.animated.2bpp.lz"
+PinecoFrontpic:      INCBIN "gfx/pokemon/pineco/front.animated.2bpp.lz"
+KrabbyFrontpic:      INCBIN "gfx/pokemon/krabby/front.animated.2bpp.lz"
 FisherPic:           INCBIN "gfx/trainers/fisher.2bpp.lz"
-JigglypuffFrontpic:  INCBIN "gfx/pics/jigglypuff/front.animated.2bpp.lz"
-ParasFrontpic:       INCBIN "gfx/pics/paras/front.animated.2bpp.lz"
-NidokingBackpic:     INCBIN "gfx/pics/nidoking/back.2bpp.lz"
+JigglypuffFrontpic:  INCBIN "gfx/pokemon/jigglypuff/front.animated.2bpp.lz"
+ParasFrontpic:       INCBIN "gfx/pokemon/paras/front.animated.2bpp.lz"
+NidokingBackpic:     INCBIN "gfx/pokemon/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.animated.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.animated.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.animated.2bpp.lz"
-TyrogueFrontpic:     INCBIN "gfx/pics/tyrogue/front.animated.2bpp.lz"
-SkiploomFrontpic:    INCBIN "gfx/pics/skiploom/front.animated.2bpp.lz"
-MareepFrontpic:      INCBIN "gfx/pics/mareep/front.animated.2bpp.lz"
+PsyduckFrontpic:     INCBIN "gfx/pokemon/psyduck/front.animated.2bpp.lz"
+SquirtleFrontpic:    INCBIN "gfx/pokemon/squirtle/front.animated.2bpp.lz"
+MachampBackpic:      INCBIN "gfx/pokemon/machamp/back.2bpp.lz"
+KoffingFrontpic:     INCBIN "gfx/pokemon/koffing/front.animated.2bpp.lz"
+VenonatFrontpic:     INCBIN "gfx/pokemon/venonat/front.animated.2bpp.lz"
+ExeggutorBackpic:    INCBIN "gfx/pokemon/exeggutor/back.2bpp.lz"
+LanturnFrontpic:     INCBIN "gfx/pokemon/lanturn/front.animated.2bpp.lz"
+TyrogueFrontpic:     INCBIN "gfx/pokemon/tyrogue/front.animated.2bpp.lz"
+SkiploomFrontpic:    INCBIN "gfx/pokemon/skiploom/front.animated.2bpp.lz"
+MareepFrontpic:      INCBIN "gfx/pokemon/mareep/front.animated.2bpp.lz"
 ChuckPic:            INCBIN "gfx/trainers/chuck.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.animated.2bpp.lz"
+EeveeFrontpic:       INCBIN "gfx/pokemon/eevee/front.animated.2bpp.lz"
+ButterfreeBackpic:   INCBIN "gfx/pokemon/butterfree/back.2bpp.lz"
+ZubatFrontpic:       INCBIN "gfx/pokemon/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.animated.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.animated.2bpp.lz"
-UnownFBackpic:       INCBIN "gfx/pics/unown_f/back.2bpp.lz"
+AlakazamBackpic:     INCBIN "gfx/pokemon/alakazam/back.2bpp.lz"
+AipomFrontpic:       INCBIN "gfx/pokemon/aipom/front.animated.2bpp.lz"
+AbraFrontpic:        INCBIN "gfx/pokemon/abra/front.animated.2bpp.lz"
+HitmontopBackpic:    INCBIN "gfx/pokemon/hitmontop/back.2bpp.lz"
+CloysterBackpic:     INCBIN "gfx/pokemon/cloyster/back.2bpp.lz"
+HoothootFrontpic:    INCBIN "gfx/pokemon/hoothoot/front.animated.2bpp.lz"
+UnownFBackpic:       INCBIN "gfx/pokemon/unown_f/back.2bpp.lz"
 ; 148000
 
 
 SECTION "Pics 11", ROMX
 
-DodrioBackpic:       INCBIN "gfx/pics/dodrio/back.2bpp.lz"
-ClefairyFrontpic:    INCBIN "gfx/pics/clefairy/front.animated.2bpp.lz"
-SlugmaFrontpic:      INCBIN "gfx/pics/slugma/front.animated.2bpp.lz"
-GrowlitheFrontpic:   INCBIN "gfx/pics/growlithe/front.animated.2bpp.lz"
-SlowpokeFrontpic:    INCBIN "gfx/pics/slowpoke/front.animated.2bpp.lz"
-SmoochumFrontpic:    INCBIN "gfx/pics/smoochum/front.animated.2bpp.lz"
+DodrioBackpic:       INCBIN "gfx/pokemon/dodrio/back.2bpp.lz"
+ClefairyFrontpic:    INCBIN "gfx/pokemon/clefairy/front.animated.2bpp.lz"
+SlugmaFrontpic:      INCBIN "gfx/pokemon/slugma/front.animated.2bpp.lz"
+GrowlitheFrontpic:   INCBIN "gfx/pokemon/growlithe/front.animated.2bpp.lz"
+SlowpokeFrontpic:    INCBIN "gfx/pokemon/slowpoke/front.animated.2bpp.lz"
+SmoochumFrontpic:    INCBIN "gfx/pokemon/smoochum/front.animated.2bpp.lz"
 JugglerPic:          INCBIN "gfx/trainers/juggler.2bpp.lz"
-MarillFrontpic:      INCBIN "gfx/pics/marill/front.animated.2bpp.lz"
+MarillFrontpic:      INCBIN "gfx/pokemon/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"
+VenomothBackpic:     INCBIN "gfx/pokemon/venomoth/back.2bpp.lz"
 ClairPic:            INCBIN "gfx/trainers/clair.2bpp.lz"
 PokemaniacPic:       INCBIN "gfx/trainers/pokemaniac.2bpp.lz"
-OmanyteFrontpic:     INCBIN "gfx/pics/omanyte/front.animated.2bpp.lz"
+OmanyteFrontpic:     INCBIN "gfx/pokemon/omanyte/front.animated.2bpp.lz"
 SkierPic:            INCBIN "gfx/trainers/skier.2bpp.lz"
-PupitarFrontpic:     INCBIN "gfx/pics/pupitar/front.animated.2bpp.lz"
-BellsproutFrontpic:  INCBIN "gfx/pics/bellsprout/front.animated.2bpp.lz"
-ShellderFrontpic:    INCBIN "gfx/pics/shellder/front.animated.2bpp.lz"
-TentacoolFrontpic:   INCBIN "gfx/pics/tentacool/front.animated.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"
+PupitarFrontpic:     INCBIN "gfx/pokemon/pupitar/front.animated.2bpp.lz"
+BellsproutFrontpic:  INCBIN "gfx/pokemon/bellsprout/front.animated.2bpp.lz"
+ShellderFrontpic:    INCBIN "gfx/pokemon/shellder/front.animated.2bpp.lz"
+TentacoolFrontpic:   INCBIN "gfx/pokemon/tentacool/front.animated.2bpp.lz"
+CleffaFrontpic:      INCBIN "gfx/pokemon/cleffa/front.animated.2bpp.lz"
+GyaradosBackpic:     INCBIN "gfx/pokemon/gyarados/back.2bpp.lz"
+NinetalesBackpic:    INCBIN "gfx/pokemon/ninetales/back.2bpp.lz"
+YanmaBackpic:        INCBIN "gfx/pokemon/yanma/back.2bpp.lz"
+PinsirBackpic:       INCBIN "gfx/pokemon/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.animated.2bpp.lz"
-FeraligatrBackpic:   INCBIN "gfx/pics/feraligatr/back.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.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"
-CelebiBackpic:       INCBIN "gfx/pics/celebi/back.2bpp.lz"
-KrabbyBackpic:       INCBIN "gfx/pics/krabby/back.2bpp.lz"
+ClefableBackpic:     INCBIN "gfx/pokemon/clefable/back.2bpp.lz"
+DoduoFrontpic:       INCBIN "gfx/pokemon/doduo/front.animated.2bpp.lz"
+FeraligatrBackpic:   INCBIN "gfx/pokemon/feraligatr/back.2bpp.lz"
+DratiniFrontpic:     INCBIN "gfx/pokemon/dratini/front.animated.2bpp.lz"
+MagnetonBackpic:     INCBIN "gfx/pokemon/magneton/back.2bpp.lz"
+QwilfishFrontpic:    INCBIN "gfx/pokemon/qwilfish/front.animated.2bpp.lz"
+SuicuneBackpic:      INCBIN "gfx/pokemon/suicune/back.2bpp.lz"
+SlowkingBackpic:     INCBIN "gfx/pokemon/slowking/back.2bpp.lz"
+ElekidBackpic:       INCBIN "gfx/pokemon/elekid/back.2bpp.lz"
+CelebiBackpic:       INCBIN "gfx/pokemon/celebi/back.2bpp.lz"
+KrabbyBackpic:       INCBIN "gfx/pokemon/krabby/back.2bpp.lz"
 BugCatcherPic:       INCBIN "gfx/trainers/bug_catcher.2bpp.lz"
-SnorlaxBackpic:      INCBIN "gfx/pics/snorlax/back.2bpp.lz"
+SnorlaxBackpic:      INCBIN "gfx/pokemon/snorlax/back.2bpp.lz"
 ; 14bffb
 
 
 SECTION "Pics 12", ROMX
 
-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.animated.2bpp.lz"
-RhydonBackpic:       INCBIN "gfx/pics/rhydon/back.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"
+VenusaurBackpic:     INCBIN "gfx/pokemon/venusaur/back.2bpp.lz"
+MoltresBackpic:      INCBIN "gfx/pokemon/moltres/back.2bpp.lz"
+SunfloraBackpic:     INCBIN "gfx/pokemon/sunflora/back.2bpp.lz"
+PhanpyFrontpic:      INCBIN "gfx/pokemon/phanpy/front.animated.2bpp.lz"
+RhydonBackpic:       INCBIN "gfx/pokemon/rhydon/back.2bpp.lz"
+LarvitarFrontpic:    INCBIN "gfx/pokemon/larvitar/front.animated.2bpp.lz"
+TyranitarBackpic:    INCBIN "gfx/pokemon/tyranitar/back.2bpp.lz"
+SandslashBackpic:    INCBIN "gfx/pokemon/sandslash/back.2bpp.lz"
+SeadraBackpic:       INCBIN "gfx/pokemon/seadra/back.2bpp.lz"
 TwinsPic:            INCBIN "gfx/trainers/twins.2bpp.lz"
-FarfetchDBackpic:    INCBIN "gfx/pics/farfetch_d/back.2bpp.lz"
-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.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.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"
-QuilavaBackpic:      INCBIN "gfx/pics/quilava/back.2bpp.lz"
-CroconawBackpic:     INCBIN "gfx/pics/croconaw/back.2bpp.lz"
-SandshrewBackpic:    INCBIN "gfx/pics/sandshrew/back.2bpp.lz"
+FarfetchDBackpic:    INCBIN "gfx/pokemon/farfetch_d/back.2bpp.lz"
+NidoranMBackpic:     INCBIN "gfx/pokemon/nidoran_m/back.2bpp.lz"
+LedybaBackpic:       INCBIN "gfx/pokemon/ledyba/back.2bpp.lz"
+CyndaquilBackpic:    INCBIN "gfx/pokemon/cyndaquil/back.2bpp.lz"
+BayleefBackpic:      INCBIN "gfx/pokemon/bayleef/back.2bpp.lz"
+OddishFrontpic:      INCBIN "gfx/pokemon/oddish/front.animated.2bpp.lz"
+RapidashBackpic:     INCBIN "gfx/pokemon/rapidash/back.2bpp.lz"
+DoduoBackpic:        INCBIN "gfx/pokemon/doduo/back.2bpp.lz"
+HoppipFrontpic:      INCBIN "gfx/pokemon/hoppip/front.animated.2bpp.lz"
+MankeyBackpic:       INCBIN "gfx/pokemon/mankey/back.2bpp.lz"
+MagmarBackpic:       INCBIN "gfx/pokemon/magmar/back.2bpp.lz"
+HypnoBackpic:        INCBIN "gfx/pokemon/hypno/back.2bpp.lz"
+QuilavaBackpic:      INCBIN "gfx/pokemon/quilava/back.2bpp.lz"
+CroconawBackpic:     INCBIN "gfx/pokemon/croconaw/back.2bpp.lz"
+SandshrewBackpic:    INCBIN "gfx/pokemon/sandshrew/back.2bpp.lz"
 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.animated.2bpp.lz"
-CuboneBackpic:       INCBIN "gfx/pics/cubone/back.2bpp.lz"
+ShellderBackpic:     INCBIN "gfx/pokemon/shellder/back.2bpp.lz"
+ZubatBackpic:        INCBIN "gfx/pokemon/zubat/back.2bpp.lz"
+TeddiursaFrontpic:   INCBIN "gfx/pokemon/teddiursa/front.animated.2bpp.lz"
+CuboneBackpic:       INCBIN "gfx/pokemon/cubone/back.2bpp.lz"
 GruntmPic:           INCBIN "gfx/trainers/grunt_m.2bpp.lz"
-GloomBackpic:        INCBIN "gfx/pics/gloom/back.2bpp.lz"
-MagcargoBackpic:     INCBIN "gfx/pics/magcargo/back.2bpp.lz"
-KabutopsBackpic:     INCBIN "gfx/pics/kabutops/back.2bpp.lz"
-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.animated.2bpp.lz"
-StarmieBackpic:      INCBIN "gfx/pics/starmie/back.2bpp.lz"
+GloomBackpic:        INCBIN "gfx/pokemon/gloom/back.2bpp.lz"
+MagcargoBackpic:     INCBIN "gfx/pokemon/magcargo/back.2bpp.lz"
+KabutopsBackpic:     INCBIN "gfx/pokemon/kabutops/back.2bpp.lz"
+BeedrillBackpic:     INCBIN "gfx/pokemon/beedrill/back.2bpp.lz"
+ArcanineBackpic:     INCBIN "gfx/pokemon/arcanine/back.2bpp.lz"
+FlareonBackpic:      INCBIN "gfx/pokemon/flareon/back.2bpp.lz"
+GoldeenBackpic:      INCBIN "gfx/pokemon/goldeen/back.2bpp.lz"
+BulbasaurFrontpic:   INCBIN "gfx/pokemon/bulbasaur/front.animated.2bpp.lz"
+StarmieBackpic:      INCBIN "gfx/pokemon/starmie/back.2bpp.lz"
 ; 150000
 
 
 SECTION "Pics 13", ROMX
 
-OmanyteBackpic:      INCBIN "gfx/pics/omanyte/back.2bpp.lz"
-PidgeyBackpic:       INCBIN "gfx/pics/pidgey/back.2bpp.lz"
+OmanyteBackpic:      INCBIN "gfx/pokemon/omanyte/back.2bpp.lz"
+PidgeyBackpic:       INCBIN "gfx/pokemon/pidgey/back.2bpp.lz"
 ScientistPic:        INCBIN "gfx/trainers/scientist.2bpp.lz"
-QwilfishBackpic:     INCBIN "gfx/pics/qwilfish/back.2bpp.lz"
-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.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.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"
+QwilfishBackpic:     INCBIN "gfx/pokemon/qwilfish/back.2bpp.lz"
+GligarBackpic:       INCBIN "gfx/pokemon/gligar/back.2bpp.lz"
+TyphlosionBackpic:   INCBIN "gfx/pokemon/typhlosion/back.2bpp.lz"
+CharmeleonBackpic:   INCBIN "gfx/pokemon/charmeleon/back.2bpp.lz"
+NidoqueenBackpic:    INCBIN "gfx/pokemon/nidoqueen/back.2bpp.lz"
+PichuFrontpic:       INCBIN "gfx/pokemon/pichu/front.animated.2bpp.lz"
+ElectabuzzBackpic:   INCBIN "gfx/pokemon/electabuzz/back.2bpp.lz"
+LedianBackpic:       INCBIN "gfx/pokemon/ledian/back.2bpp.lz"
+PupitarBackpic:      INCBIN "gfx/pokemon/pupitar/back.2bpp.lz"
+HeracrossBackpic:    INCBIN "gfx/pokemon/heracross/back.2bpp.lz"
+UnownDFrontpic:      INCBIN "gfx/pokemon/unown_d/front.animated.2bpp.lz"
+MiltankBackpic:      INCBIN "gfx/pokemon/miltank/back.2bpp.lz"
+SteelixBackpic:      INCBIN "gfx/pokemon/steelix/back.2bpp.lz"
+PersianBackpic:      INCBIN "gfx/pokemon/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.animated.2bpp.lz"
-EeveeBackpic:        INCBIN "gfx/pics/eevee/back.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.animated.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"
+EggPic:              INCBIN "gfx/pokemon/egg/front.animated.2bpp.lz"
+EeveeBackpic:        INCBIN "gfx/pokemon/eevee/back.2bpp.lz"
+ShuckleFrontpic:     INCBIN "gfx/pokemon/shuckle/front.animated.2bpp.lz"
+PonytaBackpic:       INCBIN "gfx/pokemon/ponyta/back.2bpp.lz"
+RemoraidFrontpic:    INCBIN "gfx/pokemon/remoraid/front.animated.2bpp.lz"
+PoliwagFrontpic:     INCBIN "gfx/pokemon/poliwag/front.animated.2bpp.lz"
+OnixBackpic:         INCBIN "gfx/pokemon/onix/back.2bpp.lz"
+KoffingBackpic:      INCBIN "gfx/pokemon/koffing/back.2bpp.lz"
 BirdKeeperPic:       INCBIN "gfx/trainers/bird_keeper.2bpp.lz"
 FalknerPic:          INCBIN "gfx/trainers/falkner.2bpp.lz"
 KarenPic:            INCBIN "gfx/trainers/karen.2bpp.lz"
-NidorinaBackpic:     INCBIN "gfx/pics/nidorina/back.2bpp.lz"
-TentacruelBackpic:   INCBIN "gfx/pics/tentacruel/back.2bpp.lz"
-GrowlitheBackpic:    INCBIN "gfx/pics/growlithe/back.2bpp.lz"
+NidorinaBackpic:     INCBIN "gfx/pokemon/nidorina/back.2bpp.lz"
+TentacruelBackpic:   INCBIN "gfx/pokemon/tentacruel/back.2bpp.lz"
+GrowlitheBackpic:    INCBIN "gfx/pokemon/growlithe/back.2bpp.lz"
 KogaPic:             INCBIN "gfx/trainers/koga.2bpp.lz"
-MachokeBackpic:      INCBIN "gfx/pics/machoke/back.2bpp.lz"
-RaichuBackpic:       INCBIN "gfx/pics/raichu/back.2bpp.lz"
-PoliwrathBackpic:    INCBIN "gfx/pics/poliwrath/back.2bpp.lz"
+MachokeBackpic:      INCBIN "gfx/pokemon/machoke/back.2bpp.lz"
+RaichuBackpic:       INCBIN "gfx/pokemon/raichu/back.2bpp.lz"
+PoliwrathBackpic:    INCBIN "gfx/pokemon/poliwrath/back.2bpp.lz"
 SwimmermPic:         INCBIN "gfx/trainers/swimmer_m.2bpp.lz"
-SunkernFrontpic:     INCBIN "gfx/pics/sunkern/front.animated.2bpp.lz"
-NidorinoBackpic:     INCBIN "gfx/pics/nidorino/back.2bpp.lz"
+SunkernFrontpic:     INCBIN "gfx/pokemon/sunkern/front.animated.2bpp.lz"
+NidorinoBackpic:     INCBIN "gfx/pokemon/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.animated.2bpp.lz"
+ElectrodeFrontpic:   INCBIN "gfx/pokemon/electrode/front.animated.2bpp.lz"
 ; 153fe3
 
 
 SECTION "Pics 14", ROMX
 
-SudowoodoBackpic:    INCBIN "gfx/pics/sudowoodo/back.2bpp.lz"
-FlaaffyBackpic:      INCBIN "gfx/pics/flaaffy/back.2bpp.lz"
-SentretFrontpic:     INCBIN "gfx/pics/sentret/front.animated.2bpp.lz"
-TogeticBackpic:      INCBIN "gfx/pics/togetic/back.2bpp.lz"
+SudowoodoBackpic:    INCBIN "gfx/pokemon/sudowoodo/back.2bpp.lz"
+FlaaffyBackpic:      INCBIN "gfx/pokemon/flaaffy/back.2bpp.lz"
+SentretFrontpic:     INCBIN "gfx/pokemon/sentret/front.animated.2bpp.lz"
+TogeticBackpic:      INCBIN "gfx/pokemon/togetic/back.2bpp.lz"
 BugsyPic:            INCBIN "gfx/trainers/bugsy.2bpp.lz"
-MarowakBackpic:      INCBIN "gfx/pics/marowak/back.2bpp.lz"
-GeodudeBackpic:      INCBIN "gfx/pics/geodude/back.2bpp.lz"
-ScytherBackpic:      INCBIN "gfx/pics/scyther/back.2bpp.lz"
-VileplumeBackpic:    INCBIN "gfx/pics/vileplume/back.2bpp.lz"
-HitmonchanBackpic:   INCBIN "gfx/pics/hitmonchan/back.2bpp.lz"
-JumpluffBackpic:     INCBIN "gfx/pics/jumpluff/back.2bpp.lz"
+MarowakBackpic:      INCBIN "gfx/pokemon/marowak/back.2bpp.lz"
+GeodudeBackpic:      INCBIN "gfx/pokemon/geodude/back.2bpp.lz"
+ScytherBackpic:      INCBIN "gfx/pokemon/scyther/back.2bpp.lz"
+VileplumeBackpic:    INCBIN "gfx/pokemon/vileplume/back.2bpp.lz"
+HitmonchanBackpic:   INCBIN "gfx/pokemon/hitmonchan/back.2bpp.lz"
+JumpluffBackpic:     INCBIN "gfx/pokemon/jumpluff/back.2bpp.lz"
 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.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"
-SmeargleBackpic:     INCBIN "gfx/pics/smeargle/back.2bpp.lz"
-CharizardBackpic:    INCBIN "gfx/pics/charizard/back.2bpp.lz"
-KadabraBackpic:      INCBIN "gfx/pics/kadabra/back.2bpp.lz"
-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.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"
-SeakingBackpic:      INCBIN "gfx/pics/seaking/back.2bpp.lz"
+BlastoiseBackpic:    INCBIN "gfx/pokemon/blastoise/back.2bpp.lz"
+MisdreavusBackpic:   INCBIN "gfx/pokemon/misdreavus/back.2bpp.lz"
+TyrogueBackpic:      INCBIN "gfx/pokemon/tyrogue/back.2bpp.lz"
+GeodudeFrontpic:     INCBIN "gfx/pokemon/geodude/front.animated.2bpp.lz"
+ScizorBackpic:       INCBIN "gfx/pokemon/scizor/back.2bpp.lz"
+GirafarigBackpic:    INCBIN "gfx/pokemon/girafarig/back.2bpp.lz"
+StantlerBackpic:     INCBIN "gfx/pokemon/stantler/back.2bpp.lz"
+SmeargleBackpic:     INCBIN "gfx/pokemon/smeargle/back.2bpp.lz"
+CharizardBackpic:    INCBIN "gfx/pokemon/charizard/back.2bpp.lz"
+KadabraBackpic:      INCBIN "gfx/pokemon/kadabra/back.2bpp.lz"
+PrimeapeBackpic:     INCBIN "gfx/pokemon/primeape/back.2bpp.lz"
+FurretBackpic:       INCBIN "gfx/pokemon/furret/back.2bpp.lz"
+WartortleBackpic:    INCBIN "gfx/pokemon/wartortle/back.2bpp.lz"
+ExeggcuteBackpic:    INCBIN "gfx/pokemon/exeggcute/back.2bpp.lz"
+IgglybuffFrontpic:   INCBIN "gfx/pokemon/igglybuff/front.animated.2bpp.lz"
+RaticateBackpic:     INCBIN "gfx/pokemon/raticate/back.2bpp.lz"
+VulpixBackpic:       INCBIN "gfx/pokemon/vulpix/back.2bpp.lz"
+EkansBackpic:        INCBIN "gfx/pokemon/ekans/back.2bpp.lz"
+SeakingBackpic:      INCBIN "gfx/pokemon/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.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.animated.2bpp.lz"
-KingdraBackpic:      INCBIN "gfx/pics/kingdra/back.2bpp.lz"
+PsyduckBackpic:      INCBIN "gfx/pokemon/psyduck/back.2bpp.lz"
+PikachuBackpic:      INCBIN "gfx/pokemon/pikachu/back.2bpp.lz"
+KabutoFrontpic:      INCBIN "gfx/pokemon/kabuto/front.animated.2bpp.lz"
+MareepBackpic:       INCBIN "gfx/pokemon/mareep/back.2bpp.lz"
+RemoraidBackpic:     INCBIN "gfx/pokemon/remoraid/back.2bpp.lz"
+DittoFrontpic:       INCBIN "gfx/pokemon/ditto/front.animated.2bpp.lz"
+KingdraBackpic:      INCBIN "gfx/pokemon/kingdra/back.2bpp.lz"
 CamperPic:           INCBIN "gfx/trainers/camper.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"
+WooperFrontpic:      INCBIN "gfx/pokemon/wooper/front.animated.2bpp.lz"
+ClefairyBackpic:     INCBIN "gfx/pokemon/clefairy/back.2bpp.lz"
+VenonatBackpic:      INCBIN "gfx/pokemon/venonat/back.2bpp.lz"
+BellossomBackpic:    INCBIN "gfx/pokemon/bellossom/back.2bpp.lz"
 Rival1Pic:           INCBIN "gfx/trainers/rival1.2bpp.lz"
-SwinubBackpic:       INCBIN "gfx/pics/swinub/back.2bpp.lz"
+SwinubBackpic:       INCBIN "gfx/pokemon/swinub/back.2bpp.lz"
 ; 158000
 
 
 SECTION "Pics 15", ROMX
 
-MewtwoBackpic:       INCBIN "gfx/pics/mewtwo/back.2bpp.lz"
+MewtwoBackpic:       INCBIN "gfx/pokemon/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.animated.2bpp.lz"
+DiglettFrontpic:     INCBIN "gfx/pokemon/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"
+MukBackpic:          INCBIN "gfx/pokemon/muk/back.2bpp.lz"
+DelibirdBackpic:     INCBIN "gfx/pokemon/delibird/back.2bpp.lz"
 SabrinaPic:          INCBIN "gfx/trainers/sabrina.2bpp.lz"
-MagikarpBackpic:     INCBIN "gfx/pics/magikarp/back.2bpp.lz"
-AriadosBackpic:      INCBIN "gfx/pics/ariados/back.2bpp.lz"
-SneaselBackpic:      INCBIN "gfx/pics/sneasel/back.2bpp.lz"
-UmbreonBackpic:      INCBIN "gfx/pics/umbreon/back.2bpp.lz"
-MurkrowBackpic:      INCBIN "gfx/pics/murkrow/back.2bpp.lz"
-IvysaurBackpic:      INCBIN "gfx/pics/ivysaur/back.2bpp.lz"
-SlowbroBackpic:      INCBIN "gfx/pics/slowbro/back.2bpp.lz"
+MagikarpBackpic:     INCBIN "gfx/pokemon/magikarp/back.2bpp.lz"
+AriadosBackpic:      INCBIN "gfx/pokemon/ariados/back.2bpp.lz"
+SneaselBackpic:      INCBIN "gfx/pokemon/sneasel/back.2bpp.lz"
+UmbreonBackpic:      INCBIN "gfx/pokemon/umbreon/back.2bpp.lz"
+MurkrowBackpic:      INCBIN "gfx/pokemon/murkrow/back.2bpp.lz"
+IvysaurBackpic:      INCBIN "gfx/pokemon/ivysaur/back.2bpp.lz"
+SlowbroBackpic:      INCBIN "gfx/pokemon/slowbro/back.2bpp.lz"
 PsychicTPic:         INCBIN "gfx/trainers/psychic_t.2bpp.lz"
-GolduckBackpic:      INCBIN "gfx/pics/golduck/back.2bpp.lz"
-WeezingBackpic:      INCBIN "gfx/pics/weezing/back.2bpp.lz"
-EnteiBackpic:        INCBIN "gfx/pics/entei/back.2bpp.lz"
+GolduckBackpic:      INCBIN "gfx/pokemon/golduck/back.2bpp.lz"
+WeezingBackpic:      INCBIN "gfx/pokemon/weezing/back.2bpp.lz"
+EnteiBackpic:        INCBIN "gfx/pokemon/entei/back.2bpp.lz"
 GruntfPic:           INCBIN "gfx/trainers/grunt_f.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"
-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.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.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"
-GengarBackpic:       INCBIN "gfx/pics/gengar/back.2bpp.lz"
-RattataBackpic:      INCBIN "gfx/pics/rattata/back.2bpp.lz"
+HorseaFrontpic:      INCBIN "gfx/pokemon/horsea/front.animated.2bpp.lz"
+PidgeotBackpic:      INCBIN "gfx/pokemon/pidgeot/back.2bpp.lz"
+HoOhBackpic:         INCBIN "gfx/pokemon/ho_oh/back.2bpp.lz"
+PoliwhirlBackpic:    INCBIN "gfx/pokemon/poliwhirl/back.2bpp.lz"
+MewBackpic:          INCBIN "gfx/pokemon/mew/back.2bpp.lz"
+MachopBackpic:       INCBIN "gfx/pokemon/machop/back.2bpp.lz"
+AbraBackpic:         INCBIN "gfx/pokemon/abra/back.2bpp.lz"
+AerodactylBackpic:   INCBIN "gfx/pokemon/aerodactyl/back.2bpp.lz"
+KakunaFrontpic:      INCBIN "gfx/pokemon/kakuna/front.animated.2bpp.lz"
+DugtrioBackpic:      INCBIN "gfx/pokemon/dugtrio/back.2bpp.lz"
+WeepinbellBackpic:   INCBIN "gfx/pokemon/weepinbell/back.2bpp.lz"
+NidoranFBackpic:     INCBIN "gfx/pokemon/nidoran_f/back.2bpp.lz"
+GravelerBackpic:     INCBIN "gfx/pokemon/graveler/back.2bpp.lz"
+AipomBackpic:        INCBIN "gfx/pokemon/aipom/back.2bpp.lz"
+EspeonBackpic:       INCBIN "gfx/pokemon/espeon/back.2bpp.lz"
+WeedleFrontpic:      INCBIN "gfx/pokemon/weedle/front.animated.2bpp.lz"
+TotodileBackpic:     INCBIN "gfx/pokemon/totodile/back.2bpp.lz"
+SnubbullBackpic:     INCBIN "gfx/pokemon/snubbull/back.2bpp.lz"
+KinglerBackpic:      INCBIN "gfx/pokemon/kingler/back.2bpp.lz"
+GengarBackpic:       INCBIN "gfx/pokemon/gengar/back.2bpp.lz"
+RattataBackpic:      INCBIN "gfx/pokemon/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.animated.2bpp.lz"
+MagnemiteFrontpic:   INCBIN "gfx/pokemon/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"
+MagnemiteBackpic:    INCBIN "gfx/pokemon/magnemite/back.2bpp.lz"
 ; 15bffa
 
 
 SECTION "Pics 16", ROMX
 
-HoothootBackpic:     INCBIN "gfx/pics/hoothoot/back.2bpp.lz"
-NoctowlBackpic:      INCBIN "gfx/pics/noctowl/back.2bpp.lz"
+HoothootBackpic:     INCBIN "gfx/pokemon/hoothoot/back.2bpp.lz"
+NoctowlBackpic:      INCBIN "gfx/pokemon/noctowl/back.2bpp.lz"
 MortyPic:            INCBIN "gfx/trainers/morty.2bpp.lz"
-SlugmaBackpic:       INCBIN "gfx/pics/slugma/back.2bpp.lz"
-KabutoBackpic:       INCBIN "gfx/pics/kabuto/back.2bpp.lz"
-VictreebelBackpic:   INCBIN "gfx/pics/victreebel/back.2bpp.lz"
-MeowthBackpic:       INCBIN "gfx/pics/meowth/back.2bpp.lz"
-MeganiumBackpic:     INCBIN "gfx/pics/meganium/back.2bpp.lz"
+SlugmaBackpic:       INCBIN "gfx/pokemon/slugma/back.2bpp.lz"
+KabutoBackpic:       INCBIN "gfx/pokemon/kabuto/back.2bpp.lz"
+VictreebelBackpic:   INCBIN "gfx/pokemon/victreebel/back.2bpp.lz"
+MeowthBackpic:       INCBIN "gfx/pokemon/meowth/back.2bpp.lz"
+MeganiumBackpic:     INCBIN "gfx/pokemon/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.animated.2bpp.lz"
+LickitungBackpic:    INCBIN "gfx/pokemon/lickitung/back.2bpp.lz"
+TogepiFrontpic:      INCBIN "gfx/pokemon/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"
+HaunterBackpic:      INCBIN "gfx/pokemon/haunter/back.2bpp.lz"
+XatuBackpic:         INCBIN "gfx/pokemon/xatu/back.2bpp.lz"
 RedPic:              INCBIN "gfx/trainers/red.2bpp.lz"
-Porygon2Backpic:     INCBIN "gfx/pics/porygon2/back.2bpp.lz"
+Porygon2Backpic:     INCBIN "gfx/pokemon/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.animated.2bpp.lz"
-SeelBackpic:         INCBIN "gfx/pics/seel/back.2bpp.lz"
-QuagsireBackpic:     INCBIN "gfx/pics/quagsire/back.2bpp.lz"
+PinecoBackpic:       INCBIN "gfx/pokemon/pineco/back.2bpp.lz"
+MetapodFrontpic:     INCBIN "gfx/pokemon/metapod/front.animated.2bpp.lz"
+SeelBackpic:         INCBIN "gfx/pokemon/seel/back.2bpp.lz"
+QuagsireBackpic:     INCBIN "gfx/pokemon/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.animated.2bpp.lz"
-HoppipBackpic:       INCBIN "gfx/pics/hoppip/back.2bpp.lz"
+JolteonBackpic:      INCBIN "gfx/pokemon/jolteon/back.2bpp.lz"
+CaterpieFrontpic:    INCBIN "gfx/pokemon/caterpie/front.animated.2bpp.lz"
+HoppipBackpic:       INCBIN "gfx/pokemon/hoppip/back.2bpp.lz"
 BluePic:             INCBIN "gfx/trainers/blue.2bpp.lz"
-GranbullBackpic:     INCBIN "gfx/pics/granbull/back.2bpp.lz"
+GranbullBackpic:     INCBIN "gfx/pokemon/granbull/back.2bpp.lz"
 GentlemanPic:        INCBIN "gfx/trainers/gentleman.2bpp.lz"
 ExecutivemPic:       INCBIN "gfx/trainers/executive_m.2bpp.lz"
-SpearowBackpic:      INCBIN "gfx/pics/spearow/back.2bpp.lz"
-SunkernBackpic:      INCBIN "gfx/pics/sunkern/back.2bpp.lz"
-LaprasBackpic:       INCBIN "gfx/pics/lapras/back.2bpp.lz"
-MagbyBackpic:        INCBIN "gfx/pics/magby/back.2bpp.lz"
-DragonairBackpic:    INCBIN "gfx/pics/dragonair/back.2bpp.lz"
-ZapdosBackpic:       INCBIN "gfx/pics/zapdos/back.2bpp.lz"
-ChikoritaBackpic:    INCBIN "gfx/pics/chikorita/back.2bpp.lz"
-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.animated.2bpp.lz"
+SpearowBackpic:      INCBIN "gfx/pokemon/spearow/back.2bpp.lz"
+SunkernBackpic:      INCBIN "gfx/pokemon/sunkern/back.2bpp.lz"
+LaprasBackpic:       INCBIN "gfx/pokemon/lapras/back.2bpp.lz"
+MagbyBackpic:        INCBIN "gfx/pokemon/magby/back.2bpp.lz"
+DragonairBackpic:    INCBIN "gfx/pokemon/dragonair/back.2bpp.lz"
+ZapdosBackpic:       INCBIN "gfx/pokemon/zapdos/back.2bpp.lz"
+ChikoritaBackpic:    INCBIN "gfx/pokemon/chikorita/back.2bpp.lz"
+CorsolaBackpic:      INCBIN "gfx/pokemon/corsola/back.2bpp.lz"
+ChinchouBackpic:     INCBIN "gfx/pokemon/chinchou/back.2bpp.lz"
+ChanseyBackpic:      INCBIN "gfx/pokemon/chansey/back.2bpp.lz"
+SkiploomBackpic:     INCBIN "gfx/pokemon/skiploom/back.2bpp.lz"
+SpinarakFrontpic:    INCBIN "gfx/pokemon/spinarak/front.animated.2bpp.lz"
 Rival2Pic:           INCBIN "gfx/trainers/rival2.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.animated.2bpp.lz"
+UnownWFrontpic:      INCBIN "gfx/pokemon/unown_w/front.animated.2bpp.lz"
+CharmanderBackpic:   INCBIN "gfx/pokemon/charmander/back.2bpp.lz"
+RhyhornBackpic:      INCBIN "gfx/pokemon/rhyhorn/back.2bpp.lz"
+UnownCFrontpic:      INCBIN "gfx/pokemon/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.animated.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"
+UnownZFrontpic:      INCBIN "gfx/pokemon/unown_z/front.animated.2bpp.lz"
+SwinubFrontpic:      INCBIN "gfx/pokemon/swinub/front.animated.2bpp.lz"
+LarvitarBackpic:     INCBIN "gfx/pokemon/larvitar/back.2bpp.lz"
+PorygonBackpic:      INCBIN "gfx/pokemon/porygon/back.2bpp.lz"
+UnownHBackpic:       INCBIN "gfx/pokemon/unown_h/back.2bpp.lz"
 ; 15ffff
 
 
 SECTION "Pics 17", ROMX
 
-ParasBackpic:        INCBIN "gfx/pics/paras/back.2bpp.lz"
-VaporeonBackpic:     INCBIN "gfx/pics/vaporeon/back.2bpp.lz"
-TentacoolBackpic:    INCBIN "gfx/pics/tentacool/back.2bpp.lz"
+ParasBackpic:        INCBIN "gfx/pokemon/paras/back.2bpp.lz"
+VaporeonBackpic:     INCBIN "gfx/pokemon/vaporeon/back.2bpp.lz"
+TentacoolBackpic:    INCBIN "gfx/pokemon/tentacool/back.2bpp.lz"
 ExecutivefPic:       INCBIN "gfx/trainers/executive_f.2bpp.lz"
-BulbasaurBackpic:    INCBIN "gfx/pics/bulbasaur/back.2bpp.lz"
-SmoochumBackpic:     INCBIN "gfx/pics/smoochum/back.2bpp.lz"
-PichuBackpic:        INCBIN "gfx/pics/pichu/back.2bpp.lz"
-HoundoomBackpic:     INCBIN "gfx/pics/houndoom/back.2bpp.lz"
-BellsproutBackpic:   INCBIN "gfx/pics/bellsprout/back.2bpp.lz"
-GrimerBackpic:       INCBIN "gfx/pics/grimer/back.2bpp.lz"
-LanturnBackpic:      INCBIN "gfx/pics/lanturn/back.2bpp.lz"
-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.animated.2bpp.lz"
-LugiaBackpic:        INCBIN "gfx/pics/lugia/back.2bpp.lz"
+BulbasaurBackpic:    INCBIN "gfx/pokemon/bulbasaur/back.2bpp.lz"
+SmoochumBackpic:     INCBIN "gfx/pokemon/smoochum/back.2bpp.lz"
+PichuBackpic:        INCBIN "gfx/pokemon/pichu/back.2bpp.lz"
+HoundoomBackpic:     INCBIN "gfx/pokemon/houndoom/back.2bpp.lz"
+BellsproutBackpic:   INCBIN "gfx/pokemon/bellsprout/back.2bpp.lz"
+GrimerBackpic:       INCBIN "gfx/pokemon/grimer/back.2bpp.lz"
+LanturnBackpic:      INCBIN "gfx/pokemon/lanturn/back.2bpp.lz"
+PidgeottoBackpic:    INCBIN "gfx/pokemon/pidgeotto/back.2bpp.lz"
+StaryuBackpic:       INCBIN "gfx/pokemon/staryu/back.2bpp.lz"
+MrMimeBackpic:       INCBIN "gfx/pokemon/mr__mime/back.2bpp.lz"
+CaterpieBackpic:     INCBIN "gfx/pokemon/caterpie/back.2bpp.lz"
+VoltorbFrontpic:     INCBIN "gfx/pokemon/voltorb/front.animated.2bpp.lz"
+LugiaBackpic:        INCBIN "gfx/pokemon/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.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.animated.2bpp.lz"
-UrsaringBackpic:     INCBIN "gfx/pics/ursaring/back.2bpp.lz"
+UnownGFrontpic:      INCBIN "gfx/pokemon/unown_g/front.animated.2bpp.lz"
+ArbokBackpic:        INCBIN "gfx/pokemon/arbok/back.2bpp.lz"
+PolitoedBackpic:     INCBIN "gfx/pokemon/politoed/back.2bpp.lz"
+DragoniteBackpic:    INCBIN "gfx/pokemon/dragonite/back.2bpp.lz"
+HitmonleeBackpic:    INCBIN "gfx/pokemon/hitmonlee/back.2bpp.lz"
+NatuFrontpic:        INCBIN "gfx/pokemon/natu/front.animated.2bpp.lz"
+UrsaringBackpic:     INCBIN "gfx/pokemon/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.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"
-CrobatBackpic:       INCBIN "gfx/pics/crobat/back.2bpp.lz"
-BlisseyBackpic:      INCBIN "gfx/pics/blissey/back.2bpp.lz"
-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.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.animated.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.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"
-FearowBackpic:       INCBIN "gfx/pics/fearow/back.2bpp.lz"
-MarillBackpic:       INCBIN "gfx/pics/marill/back.2bpp.lz"
-DratiniBackpic:      INCBIN "gfx/pics/dratini/back.2bpp.lz"
-ElectrodeBackpic:    INCBIN "gfx/pics/electrode/back.2bpp.lz"
-SkarmoryBackpic:     INCBIN "gfx/pics/skarmory/back.2bpp.lz"
-MetapodBackpic:      INCBIN "gfx/pics/metapod/back.2bpp.lz"
-JigglypuffBackpic:   INCBIN "gfx/pics/jigglypuff/back.2bpp.lz"
-OddishBackpic:       INCBIN "gfx/pics/oddish/back.2bpp.lz"
-UnownDBackpic:       INCBIN "gfx/pics/unown_d/back.2bpp.lz"
+TeddiursaBackpic:    INCBIN "gfx/pokemon/teddiursa/back.2bpp.lz"
+PhanpyBackpic:       INCBIN "gfx/pokemon/phanpy/back.2bpp.lz"
+UnownVFrontpic:      INCBIN "gfx/pokemon/unown_v/front.animated.2bpp.lz"
+KakunaBackpic:       INCBIN "gfx/pokemon/kakuna/back.2bpp.lz"
+WobbuffetBackpic:    INCBIN "gfx/pokemon/wobbuffet/back.2bpp.lz"
+TogepiBackpic:       INCBIN "gfx/pokemon/togepi/back.2bpp.lz"
+CrobatBackpic:       INCBIN "gfx/pokemon/crobat/back.2bpp.lz"
+BlisseyBackpic:      INCBIN "gfx/pokemon/blissey/back.2bpp.lz"
+AmpharosBackpic:     INCBIN "gfx/pokemon/ampharos/back.2bpp.lz"
+IgglybuffBackpic:    INCBIN "gfx/pokemon/igglybuff/back.2bpp.lz"
+AzumarillBackpic:    INCBIN "gfx/pokemon/azumarill/back.2bpp.lz"
+OctilleryBackpic:    INCBIN "gfx/pokemon/octillery/back.2bpp.lz"
+UnownSFrontpic:      INCBIN "gfx/pokemon/unown_s/front.animated.2bpp.lz"
+HorseaBackpic:       INCBIN "gfx/pokemon/horsea/back.2bpp.lz"
+SentretBackpic:      INCBIN "gfx/pokemon/sentret/back.2bpp.lz"
+UnownOFrontpic:      INCBIN "gfx/pokemon/unown_o/front.animated.2bpp.lz"
+UnownTFrontpic:      INCBIN "gfx/pokemon/unown_t/front.animated.2bpp.lz"
+WigglytuffBackpic:   INCBIN "gfx/pokemon/wigglytuff/back.2bpp.lz"
+ArticunoBackpic:     INCBIN "gfx/pokemon/articuno/back.2bpp.lz"
+DittoBackpic:        INCBIN "gfx/pokemon/ditto/back.2bpp.lz"
+WeedleBackpic:       INCBIN "gfx/pokemon/weedle/back.2bpp.lz"
+UnownHFrontpic:      INCBIN "gfx/pokemon/unown_h/front.animated.2bpp.lz"
+CleffaBackpic:       INCBIN "gfx/pokemon/cleffa/back.2bpp.lz"
+DrowzeeBackpic:      INCBIN "gfx/pokemon/drowzee/back.2bpp.lz"
+GastlyBackpic:       INCBIN "gfx/pokemon/gastly/back.2bpp.lz"
+FearowBackpic:       INCBIN "gfx/pokemon/fearow/back.2bpp.lz"
+MarillBackpic:       INCBIN "gfx/pokemon/marill/back.2bpp.lz"
+DratiniBackpic:      INCBIN "gfx/pokemon/dratini/back.2bpp.lz"
+ElectrodeBackpic:    INCBIN "gfx/pokemon/electrode/back.2bpp.lz"
+SkarmoryBackpic:     INCBIN "gfx/pokemon/skarmory/back.2bpp.lz"
+MetapodBackpic:      INCBIN "gfx/pokemon/metapod/back.2bpp.lz"
+JigglypuffBackpic:   INCBIN "gfx/pokemon/jigglypuff/back.2bpp.lz"
+OddishBackpic:       INCBIN "gfx/pokemon/oddish/back.2bpp.lz"
+UnownDBackpic:       INCBIN "gfx/pokemon/unown_d/back.2bpp.lz"
 ; 163ffc
 
 
 SECTION "Pics 18", ROMX
 
-SpinarakBackpic:     INCBIN "gfx/pics/spinarak/back.2bpp.lz"
-RaikouBackpic:       INCBIN "gfx/pics/raikou/back.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.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.animated.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.animated.2bpp.lz"
-MantineBackpic:      INCBIN "gfx/pics/mantine/back.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.animated.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.animated.2bpp.lz"
-GolemBackpic:        INCBIN "gfx/pics/golem/back.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.animated.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.animated.2bpp.lz"
-UnownGBackpic:       INCBIN "gfx/pics/unown_g/back.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.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"
-UnownOBackpic:       INCBIN "gfx/pics/unown_o/back.2bpp.lz"
-UnownZBackpic:       INCBIN "gfx/pics/unown_z/back.2bpp.lz"
-UnownWBackpic:       INCBIN "gfx/pics/unown_w/back.2bpp.lz"
-UnownNBackpic:       INCBIN "gfx/pics/unown_n/back.2bpp.lz"
-UnownABackpic:       INCBIN "gfx/pics/unown_a/back.2bpp.lz"
-UnownMBackpic:       INCBIN "gfx/pics/unown_m/back.2bpp.lz"
-UnownKBackpic:       INCBIN "gfx/pics/unown_k/back.2bpp.lz"
-UnownTBackpic:       INCBIN "gfx/pics/unown_t/back.2bpp.lz"
-UnownXBackpic:       INCBIN "gfx/pics/unown_x/back.2bpp.lz"
-UnownLBackpic:       INCBIN "gfx/pics/unown_l/back.2bpp.lz"
-UnownUBackpic:       INCBIN "gfx/pics/unown_u/back.2bpp.lz"
-UnownQBackpic:       INCBIN "gfx/pics/unown_q/back.2bpp.lz"
-UnownYBackpic:       INCBIN "gfx/pics/unown_y/back.2bpp.lz"
-UnownPBackpic:       INCBIN "gfx/pics/unown_p/back.2bpp.lz"
-UnownIBackpic:       INCBIN "gfx/pics/unown_i/back.2bpp.lz"
-UnownRBackpic:       INCBIN "gfx/pics/unown_r/back.2bpp.lz"
+SpinarakBackpic:     INCBIN "gfx/pokemon/spinarak/back.2bpp.lz"
+RaikouBackpic:       INCBIN "gfx/pokemon/raikou/back.2bpp.lz"
+UnownKFrontpic:      INCBIN "gfx/pokemon/unown_k/front.animated.2bpp.lz"
+HoundourBackpic:     INCBIN "gfx/pokemon/houndour/back.2bpp.lz"
+PoliwagBackpic:      INCBIN "gfx/pokemon/poliwag/back.2bpp.lz"
+SquirtleBackpic:     INCBIN "gfx/pokemon/squirtle/back.2bpp.lz"
+ShuckleBackpic:      INCBIN "gfx/pokemon/shuckle/back.2bpp.lz"
+DewgongBackpic:      INCBIN "gfx/pokemon/dewgong/back.2bpp.lz"
+UnownBFrontpic:      INCBIN "gfx/pokemon/unown_b/front.animated.2bpp.lz"
+SlowpokeBackpic:     INCBIN "gfx/pokemon/slowpoke/back.2bpp.lz"
+DunsparceBackpic:    INCBIN "gfx/pokemon/dunsparce/back.2bpp.lz"
+DonphanBackpic:      INCBIN "gfx/pokemon/donphan/back.2bpp.lz"
+WooperBackpic:       INCBIN "gfx/pokemon/wooper/back.2bpp.lz"
+TaurosBackpic:       INCBIN "gfx/pokemon/tauros/back.2bpp.lz"
+UnownXFrontpic:      INCBIN "gfx/pokemon/unown_x/front.animated.2bpp.lz"
+UnownNFrontpic:      INCBIN "gfx/pokemon/unown_n/front.animated.2bpp.lz"
+TangelaBackpic:      INCBIN "gfx/pokemon/tangela/back.2bpp.lz"
+VoltorbBackpic:      INCBIN "gfx/pokemon/voltorb/back.2bpp.lz"
+UnownJFrontpic:      INCBIN "gfx/pokemon/unown_j/front.animated.2bpp.lz"
+MantineBackpic:      INCBIN "gfx/pokemon/mantine/back.2bpp.lz"
+UnownLFrontpic:      INCBIN "gfx/pokemon/unown_l/front.animated.2bpp.lz"
+PiloswineBackpic:    INCBIN "gfx/pokemon/piloswine/back.2bpp.lz"
+UnownMFrontpic:      INCBIN "gfx/pokemon/unown_m/front.animated.2bpp.lz"
+UnownFFrontpic:      INCBIN "gfx/pokemon/unown_f/front.animated.2bpp.lz"
+NatuBackpic:         INCBIN "gfx/pokemon/natu/back.2bpp.lz"
+UnownAFrontpic:      INCBIN "gfx/pokemon/unown_a/front.animated.2bpp.lz"
+GolemBackpic:        INCBIN "gfx/pokemon/golem/back.2bpp.lz"
+UnownUFrontpic:      INCBIN "gfx/pokemon/unown_u/front.animated.2bpp.lz"
+DiglettBackpic:      INCBIN "gfx/pokemon/diglett/back.2bpp.lz"
+UnownQFrontpic:      INCBIN "gfx/pokemon/unown_q/front.animated.2bpp.lz"
+UnownPFrontpic:      INCBIN "gfx/pokemon/unown_p/front.animated.2bpp.lz"
+UnownCBackpic:       INCBIN "gfx/pokemon/unown_c/back.2bpp.lz"
+JynxBackpic:         INCBIN "gfx/pokemon/jynx/back.2bpp.lz"
+GolbatBackpic:       INCBIN "gfx/pokemon/golbat/back.2bpp.lz"
+UnownYFrontpic:      INCBIN "gfx/pokemon/unown_y/front.animated.2bpp.lz"
+UnownGBackpic:       INCBIN "gfx/pokemon/unown_g/back.2bpp.lz"
+UnownIFrontpic:      INCBIN "gfx/pokemon/unown_i/front.animated.2bpp.lz"
+UnownVBackpic:       INCBIN "gfx/pokemon/unown_v/back.2bpp.lz"
+ForretressBackpic:   INCBIN "gfx/pokemon/forretress/back.2bpp.lz"
+UnownSBackpic:       INCBIN "gfx/pokemon/unown_s/back.2bpp.lz"
+UnownRFrontpic:      INCBIN "gfx/pokemon/unown_r/front.animated.2bpp.lz"
+UnownEBackpic:       INCBIN "gfx/pokemon/unown_e/back.2bpp.lz"
+UnownJBackpic:       INCBIN "gfx/pokemon/unown_j/back.2bpp.lz"
+UnownBBackpic:       INCBIN "gfx/pokemon/unown_b/back.2bpp.lz"
+UnownOBackpic:       INCBIN "gfx/pokemon/unown_o/back.2bpp.lz"
+UnownZBackpic:       INCBIN "gfx/pokemon/unown_z/back.2bpp.lz"
+UnownWBackpic:       INCBIN "gfx/pokemon/unown_w/back.2bpp.lz"
+UnownNBackpic:       INCBIN "gfx/pokemon/unown_n/back.2bpp.lz"
+UnownABackpic:       INCBIN "gfx/pokemon/unown_a/back.2bpp.lz"
+UnownMBackpic:       INCBIN "gfx/pokemon/unown_m/back.2bpp.lz"
+UnownKBackpic:       INCBIN "gfx/pokemon/unown_k/back.2bpp.lz"
+UnownTBackpic:       INCBIN "gfx/pokemon/unown_t/back.2bpp.lz"
+UnownXBackpic:       INCBIN "gfx/pokemon/unown_x/back.2bpp.lz"
+UnownLBackpic:       INCBIN "gfx/pokemon/unown_l/back.2bpp.lz"
+UnownUBackpic:       INCBIN "gfx/pokemon/unown_u/back.2bpp.lz"
+UnownQBackpic:       INCBIN "gfx/pokemon/unown_q/back.2bpp.lz"
+UnownYBackpic:       INCBIN "gfx/pokemon/unown_y/back.2bpp.lz"
+UnownPBackpic:       INCBIN "gfx/pokemon/unown_p/back.2bpp.lz"
+UnownIBackpic:       INCBIN "gfx/pokemon/unown_i/back.2bpp.lz"
+UnownRBackpic:       INCBIN "gfx/pokemon/unown_r/back.2bpp.lz"
 ; 1669d3
 
 
@@ -734,63 +734,63 @@ SECTION "Pics 19", ROMX
 
 ; Seems to be an accidental copy of the previous bank
 
-INCBIN "gfx/pics/spinarak/back.2bpp.lz"
-INCBIN "gfx/pics/raikou/back.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.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.animated.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.animated.2bpp.lz"
-INCBIN "gfx/pics/mantine/back.2bpp.lz"
-INCBIN "gfx/pics/unown_l/front.animated.2bpp.lz"
-INCBIN "gfx/pics/piloswine/back.2bpp.lz"
-INCBIN "gfx/pics/unown_m/front.animated.2bpp.lz"
-INCBIN "gfx/pics/unown_f/front.animated.2bpp.lz"
-INCBIN "gfx/pics/natu/back.2bpp.lz"
-INCBIN "gfx/pics/unown_a/front.animated.2bpp.lz"
-INCBIN "gfx/pics/golem/back.2bpp.lz"
-INCBIN "gfx/pics/unown_u/front.animated.2bpp.lz"
-INCBIN "gfx/pics/diglett/back.2bpp.lz"
-INCBIN "gfx/pics/unown_q/front.animated.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.animated.2bpp.lz"
-INCBIN "gfx/pics/unown_g/back.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.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"
-INCBIN "gfx/pics/unown_o/back.2bpp.lz"
-INCBIN "gfx/pics/unown_z/back.2bpp.lz"
-INCBIN "gfx/pics/unown_w/back.2bpp.lz"
-INCBIN "gfx/pics/unown_n/back.2bpp.lz"
-INCBIN "gfx/pics/unown_a/back.2bpp.lz"
-INCBIN "gfx/pics/unown_m/back.2bpp.lz"
-INCBIN "gfx/pics/unown_k/back.2bpp.lz"
-INCBIN "gfx/pics/unown_t/back.2bpp.lz"
-INCBIN "gfx/pics/unown_x/back.2bpp.lz"
-INCBIN "gfx/pics/unown_l/back.2bpp.lz"
-INCBIN "gfx/pics/unown_u/back.2bpp.lz"
-INCBIN "gfx/pics/unown_q/back.2bpp.lz"
-INCBIN "gfx/pics/unown_y/back.2bpp.lz"
-INCBIN "gfx/pics/unown_p/back.2bpp.lz"
-INCBIN "gfx/pics/unown_i/back.2bpp.lz"
-INCBIN "gfx/pics/unown_r/back.2bpp.lz"
+INCBIN "gfx/pokemon/spinarak/back.2bpp.lz"
+INCBIN "gfx/pokemon/raikou/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_k/front.animated.2bpp.lz"
+INCBIN "gfx/pokemon/houndour/back.2bpp.lz"
+INCBIN "gfx/pokemon/poliwag/back.2bpp.lz"
+INCBIN "gfx/pokemon/squirtle/back.2bpp.lz"
+INCBIN "gfx/pokemon/shuckle/back.2bpp.lz"
+INCBIN "gfx/pokemon/dewgong/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_b/front.animated.2bpp.lz"
+INCBIN "gfx/pokemon/slowpoke/back.2bpp.lz"
+INCBIN "gfx/pokemon/dunsparce/back.2bpp.lz"
+INCBIN "gfx/pokemon/donphan/back.2bpp.lz"
+INCBIN "gfx/pokemon/wooper/back.2bpp.lz"
+INCBIN "gfx/pokemon/tauros/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_x/front.animated.2bpp.lz"
+INCBIN "gfx/pokemon/unown_n/front.animated.2bpp.lz"
+INCBIN "gfx/pokemon/tangela/back.2bpp.lz"
+INCBIN "gfx/pokemon/voltorb/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_j/front.animated.2bpp.lz"
+INCBIN "gfx/pokemon/mantine/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_l/front.animated.2bpp.lz"
+INCBIN "gfx/pokemon/piloswine/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_m/front.animated.2bpp.lz"
+INCBIN "gfx/pokemon/unown_f/front.animated.2bpp.lz"
+INCBIN "gfx/pokemon/natu/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_a/front.animated.2bpp.lz"
+INCBIN "gfx/pokemon/golem/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_u/front.animated.2bpp.lz"
+INCBIN "gfx/pokemon/diglett/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_q/front.animated.2bpp.lz"
+INCBIN "gfx/pokemon/unown_p/front.animated.2bpp.lz"
+INCBIN "gfx/pokemon/unown_c/back.2bpp.lz"
+INCBIN "gfx/pokemon/jynx/back.2bpp.lz"
+INCBIN "gfx/pokemon/golbat/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_y/front.animated.2bpp.lz"
+INCBIN "gfx/pokemon/unown_g/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_i/front.animated.2bpp.lz"
+INCBIN "gfx/pokemon/unown_v/back.2bpp.lz"
+INCBIN "gfx/pokemon/forretress/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_s/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_r/front.animated.2bpp.lz"
+INCBIN "gfx/pokemon/unown_e/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_j/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_b/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_o/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_z/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_w/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_n/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_a/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_m/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_k/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_t/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_x/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_l/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_u/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_q/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_y/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_p/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_i/back.2bpp.lz"
+INCBIN "gfx/pokemon/unown_r/back.2bpp.lz"
diff --git a/gfx/pics/anims.asm b/gfx/pics/anims.asm
deleted file mode 100644
index 37d81777d..000000000
--- a/gfx/pics/anims.asm
+++ /dev/null
@@ -1,253 +0,0 @@
-PicAnimations:
-BulbasaurAnimation:  INCLUDE "gfx/pics/bulbasaur/anim0.asm"
-IvysaurAnimation:    INCLUDE "gfx/pics/ivysaur/anim0.asm"
-VenusaurAnimation:   INCLUDE "gfx/pics/venusaur/anim0.asm"
-CharmanderAnimation: INCLUDE "gfx/pics/charmander/anim0.asm"
-CharmeleonAnimation: INCLUDE "gfx/pics/charmeleon/anim0.asm"
-CharizardAnimation:  INCLUDE "gfx/pics/charizard/anim0.asm"
-SquirtleAnimation:   INCLUDE "gfx/pics/squirtle/anim0.asm"
-WartortleAnimation:  INCLUDE "gfx/pics/wartortle/anim0.asm"
-BlastoiseAnimation:  INCLUDE "gfx/pics/blastoise/anim0.asm"
-CaterpieAnimation:   INCLUDE "gfx/pics/caterpie/anim0.asm"
-MetapodAnimation:    INCLUDE "gfx/pics/metapod/anim0.asm"
-ButterfreeAnimation: INCLUDE "gfx/pics/butterfree/anim0.asm"
-WeedleAnimation:     INCLUDE "gfx/pics/weedle/anim0.asm"
-KakunaAnimation:     INCLUDE "gfx/pics/kakuna/anim0.asm"
-BeedrillAnimation:   INCLUDE "gfx/pics/beedrill/anim0.asm"
-PidgeyAnimation:     INCLUDE "gfx/pics/pidgey/anim0.asm"
-PidgeottoAnimation:  INCLUDE "gfx/pics/pidgeotto/anim0.asm"
-PidgeotAnimation:    INCLUDE "gfx/pics/pidgeot/anim0.asm"
-RattataAnimation:    INCLUDE "gfx/pics/rattata/anim0.asm"
-RaticateAnimation:   INCLUDE "gfx/pics/raticate/anim0.asm"
-SpearowAnimation:    INCLUDE "gfx/pics/spearow/anim0.asm"
-FearowAnimation:     INCLUDE "gfx/pics/fearow/anim0.asm"
-EkansAnimation:      INCLUDE "gfx/pics/ekans/anim0.asm"
-ArbokAnimation:      INCLUDE "gfx/pics/arbok/anim0.asm"
-PikachuAnimation:    INCLUDE "gfx/pics/pikachu/anim0.asm"
-RaichuAnimation:     INCLUDE "gfx/pics/raichu/anim0.asm"
-SandshrewAnimation:  INCLUDE "gfx/pics/sandshrew/anim0.asm"
-SandslashAnimation:  INCLUDE "gfx/pics/sandslash/anim0.asm"
-NidoranFAnimation:   INCLUDE "gfx/pics/nidoran_f/anim0.asm"
-NidorinaAnimation:   INCLUDE "gfx/pics/nidorina/anim0.asm"
-NidoqueenAnimation:  INCLUDE "gfx/pics/nidoqueen/anim0.asm"
-NidoranMAnimation:   INCLUDE "gfx/pics/nidoran_m/anim0.asm"
-NidorinoAnimation:   INCLUDE "gfx/pics/nidorino/anim0.asm"
-NidokingAnimation:   INCLUDE "gfx/pics/nidoking/anim0.asm"
-ClefairyAnimation:   INCLUDE "gfx/pics/clefairy/anim0.asm"
-ClefableAnimation:   INCLUDE "gfx/pics/clefable/anim0.asm"
-VulpixAnimation:     INCLUDE "gfx/pics/vulpix/anim0.asm"
-NinetalesAnimation:  INCLUDE "gfx/pics/ninetales/anim0.asm"
-JigglypuffAnimation: INCLUDE "gfx/pics/jigglypuff/anim0.asm"
-WigglytuffAnimation: INCLUDE "gfx/pics/wigglytuff/anim0.asm"
-ZubatAnimation:      INCLUDE "gfx/pics/zubat/anim0.asm"
-GolbatAnimation:     INCLUDE "gfx/pics/golbat/anim0.asm"
-OddishAnimation:     INCLUDE "gfx/pics/oddish/anim0.asm"
-GloomAnimation:      INCLUDE "gfx/pics/gloom/anim0.asm"
-VileplumeAnimation:  INCLUDE "gfx/pics/vileplume/anim0.asm"
-ParasAnimation:      INCLUDE "gfx/pics/paras/anim0.asm"
-ParasectAnimation:   INCLUDE "gfx/pics/parasect/anim0.asm"
-VenonatAnimation:    INCLUDE "gfx/pics/venonat/anim0.asm"
-VenomothAnimation:   INCLUDE "gfx/pics/venomoth/anim0.asm"
-DiglettAnimation:    INCLUDE "gfx/pics/diglett/anim0.asm"
-DugtrioAnimation:    INCLUDE "gfx/pics/dugtrio/anim0.asm"
-MeowthAnimation:     INCLUDE "gfx/pics/meowth/anim0.asm"
-PersianAnimation:    INCLUDE "gfx/pics/persian/anim0.asm"
-PsyduckAnimation:    INCLUDE "gfx/pics/psyduck/anim0.asm"
-GolduckAnimation:    INCLUDE "gfx/pics/golduck/anim0.asm"
-MankeyAnimation:     INCLUDE "gfx/pics/mankey/anim0.asm"
-PrimeapeAnimation:   INCLUDE "gfx/pics/primeape/anim0.asm"
-GrowlitheAnimation:  INCLUDE "gfx/pics/growlithe/anim0.asm"
-ArcanineAnimation:   INCLUDE "gfx/pics/arcanine/anim0.asm"
-PoliwagAnimation:    INCLUDE "gfx/pics/poliwag/anim0.asm"
-PoliwhirlAnimation:  INCLUDE "gfx/pics/poliwhirl/anim0.asm"
-PoliwrathAnimation:  INCLUDE "gfx/pics/poliwrath/anim0.asm"
-AbraAnimation:       INCLUDE "gfx/pics/abra/anim0.asm"
-KadabraAnimation:    INCLUDE "gfx/pics/kadabra/anim0.asm"
-AlakazamAnimation:   INCLUDE "gfx/pics/alakazam/anim0.asm"
-MachopAnimation:     INCLUDE "gfx/pics/machop/anim0.asm"
-MachokeAnimation:    INCLUDE "gfx/pics/machoke/anim0.asm"
-MachampAnimation:    INCLUDE "gfx/pics/machamp/anim0.asm"
-BellsproutAnimation: INCLUDE "gfx/pics/bellsprout/anim0.asm"
-WeepinbellAnimation: INCLUDE "gfx/pics/weepinbell/anim0.asm"
-VictreebelAnimation: INCLUDE "gfx/pics/victreebel/anim0.asm"
-TentacoolAnimation:  INCLUDE "gfx/pics/tentacool/anim0.asm"
-TentacruelAnimation: INCLUDE "gfx/pics/tentacruel/anim0.asm"
-GeodudeAnimation:    INCLUDE "gfx/pics/geodude/anim0.asm"
-GravelerAnimation:   INCLUDE "gfx/pics/graveler/anim0.asm"
-GolemAnimation:      INCLUDE "gfx/pics/golem/anim0.asm"
-PonytaAnimation:     INCLUDE "gfx/pics/ponyta/anim0.asm"
-RapidashAnimation:   INCLUDE "gfx/pics/rapidash/anim0.asm"
-SlowpokeAnimation:   INCLUDE "gfx/pics/slowpoke/anim0.asm"
-SlowbroAnimation:    INCLUDE "gfx/pics/slowbro/anim0.asm"
-MagnemiteAnimation:  INCLUDE "gfx/pics/magnemite/anim0.asm"
-MagnetonAnimation:   INCLUDE "gfx/pics/magneton/anim0.asm"
-FarfetchDAnimation:  INCLUDE "gfx/pics/farfetch_d/anim0.asm"
-DoduoAnimation:      INCLUDE "gfx/pics/doduo/anim0.asm"
-DodrioAnimation:     INCLUDE "gfx/pics/dodrio/anim0.asm"
-SeelAnimation:       INCLUDE "gfx/pics/seel/anim0.asm"
-DewgongAnimation:    INCLUDE "gfx/pics/dewgong/anim0.asm"
-GrimerAnimation:     INCLUDE "gfx/pics/grimer/anim0.asm"
-MukAnimation:        INCLUDE "gfx/pics/muk/anim0.asm"
-ShellderAnimation:   INCLUDE "gfx/pics/shellder/anim0.asm"
-CloysterAnimation:   INCLUDE "gfx/pics/cloyster/anim0.asm"
-GastlyAnimation:     INCLUDE "gfx/pics/gastly/anim0.asm"
-HaunterAnimation:    INCLUDE "gfx/pics/haunter/anim0.asm"
-GengarAnimation:     INCLUDE "gfx/pics/gengar/anim0.asm"
-OnixAnimation:       INCLUDE "gfx/pics/onix/anim0.asm"
-DrowzeeAnimation:    INCLUDE "gfx/pics/drowzee/anim0.asm"
-HypnoAnimation:      INCLUDE "gfx/pics/hypno/anim0.asm"
-KrabbyAnimation:     INCLUDE "gfx/pics/krabby/anim0.asm"
-KinglerAnimation:    INCLUDE "gfx/pics/kingler/anim0.asm"
-VoltorbAnimation:    INCLUDE "gfx/pics/voltorb/anim0.asm"
-ElectrodeAnimation:  INCLUDE "gfx/pics/electrode/anim0.asm"
-ExeggcuteAnimation:  INCLUDE "gfx/pics/exeggcute/anim0.asm"
-ExeggutorAnimation:  INCLUDE "gfx/pics/exeggutor/anim0.asm"
-CuboneAnimation:     INCLUDE "gfx/pics/cubone/anim0.asm"
-MarowakAnimation:    INCLUDE "gfx/pics/marowak/anim0.asm"
-HitmonleeAnimation:  INCLUDE "gfx/pics/hitmonlee/anim0.asm"
-HitmonchanAnimation: INCLUDE "gfx/pics/hitmonchan/anim0.asm"
-LickitungAnimation:  INCLUDE "gfx/pics/lickitung/anim0.asm"
-KoffingAnimation:    INCLUDE "gfx/pics/koffing/anim0.asm"
-WeezingAnimation:    INCLUDE "gfx/pics/weezing/anim0.asm"
-RhyhornAnimation:    INCLUDE "gfx/pics/rhyhorn/anim0.asm"
-RhydonAnimation:     INCLUDE "gfx/pics/rhydon/anim0.asm"
-ChanseyAnimation:    INCLUDE "gfx/pics/chansey/anim0.asm"
-TangelaAnimation:    INCLUDE "gfx/pics/tangela/anim0.asm"
-KangaskhanAnimation: INCLUDE "gfx/pics/kangaskhan/anim0.asm"
-HorseaAnimation:     INCLUDE "gfx/pics/horsea/anim0.asm"
-SeadraAnimation:     INCLUDE "gfx/pics/seadra/anim0.asm"
-GoldeenAnimation:    INCLUDE "gfx/pics/goldeen/anim0.asm"
-SeakingAnimation:    INCLUDE "gfx/pics/seaking/anim0.asm"
-StaryuAnimation:     INCLUDE "gfx/pics/staryu/anim0.asm"
-StarmieAnimation:    INCLUDE "gfx/pics/starmie/anim0.asm"
-MrMimeAnimation:     INCLUDE "gfx/pics/mr__mime/anim0.asm"
-ScytherAnimation:    INCLUDE "gfx/pics/scyther/anim0.asm"
-JynxAnimation:       INCLUDE "gfx/pics/jynx/anim0.asm"
-ElectabuzzAnimation: INCLUDE "gfx/pics/electabuzz/anim0.asm"
-MagmarAnimation:     INCLUDE "gfx/pics/magmar/anim0.asm"
-PinsirAnimation:     INCLUDE "gfx/pics/pinsir/anim0.asm"
-TaurosAnimation:     INCLUDE "gfx/pics/tauros/anim0.asm"
-MagikarpAnimation:   INCLUDE "gfx/pics/magikarp/anim0.asm"
-GyaradosAnimation:   INCLUDE "gfx/pics/gyarados/anim0.asm"
-LaprasAnimation:     INCLUDE "gfx/pics/lapras/anim0.asm"
-DittoAnimation:      INCLUDE "gfx/pics/ditto/anim0.asm"
-EeveeAnimation:      INCLUDE "gfx/pics/eevee/anim0.asm"
-VaporeonAnimation:   INCLUDE "gfx/pics/vaporeon/anim0.asm"
-JolteonAnimation:    INCLUDE "gfx/pics/jolteon/anim0.asm"
-FlareonAnimation:    INCLUDE "gfx/pics/flareon/anim0.asm"
-PorygonAnimation:    INCLUDE "gfx/pics/porygon/anim0.asm"
-OmanyteAnimation:    INCLUDE "gfx/pics/omanyte/anim0.asm"
-OmastarAnimation:    INCLUDE "gfx/pics/omastar/anim0.asm"
-KabutoAnimation:     INCLUDE "gfx/pics/kabuto/anim0.asm"
-KabutopsAnimation:   INCLUDE "gfx/pics/kabutops/anim0.asm"
-AerodactylAnimation: INCLUDE "gfx/pics/aerodactyl/anim0.asm"
-SnorlaxAnimation:    INCLUDE "gfx/pics/snorlax/anim0.asm"
-ArticunoAnimation:   INCLUDE "gfx/pics/articuno/anim0.asm"
-ZapdosAnimation:     INCLUDE "gfx/pics/zapdos/anim0.asm"
-MoltresAnimation:    INCLUDE "gfx/pics/moltres/anim0.asm"
-DratiniAnimation:    INCLUDE "gfx/pics/dratini/anim0.asm"
-DragonairAnimation:  INCLUDE "gfx/pics/dragonair/anim0.asm"
-DragoniteAnimation:  INCLUDE "gfx/pics/dragonite/anim0.asm"
-MewtwoAnimation:     INCLUDE "gfx/pics/mewtwo/anim0.asm"
-MewAnimation:        INCLUDE "gfx/pics/mew/anim0.asm"
-ChikoritaAnimation:  INCLUDE "gfx/pics/chikorita/anim0.asm"
-BayleefAnimation:    INCLUDE "gfx/pics/bayleef/anim0.asm"
-MeganiumAnimation:   INCLUDE "gfx/pics/meganium/anim0.asm"
-CyndaquilAnimation:  INCLUDE "gfx/pics/cyndaquil/anim0.asm"
-QuilavaAnimation:    INCLUDE "gfx/pics/quilava/anim0.asm"
-TyphlosionAnimation: INCLUDE "gfx/pics/typhlosion/anim0.asm"
-TotodileAnimation:   INCLUDE "gfx/pics/totodile/anim0.asm"
-CroconawAnimation:   INCLUDE "gfx/pics/croconaw/anim0.asm"
-FeraligatrAnimation: INCLUDE "gfx/pics/feraligatr/anim0.asm"
-SentretAnimation:    INCLUDE "gfx/pics/sentret/anim0.asm"
-FurretAnimation:     INCLUDE "gfx/pics/furret/anim0.asm"
-HoothootAnimation:   INCLUDE "gfx/pics/hoothoot/anim0.asm"
-NoctowlAnimation:    INCLUDE "gfx/pics/noctowl/anim0.asm"
-LedybaAnimation:     INCLUDE "gfx/pics/ledyba/anim0.asm"
-LedianAnimation:     INCLUDE "gfx/pics/ledian/anim0.asm"
-SpinarakAnimation:   INCLUDE "gfx/pics/spinarak/anim0.asm"
-AriadosAnimation:    INCLUDE "gfx/pics/ariados/anim0.asm"
-CrobatAnimation:     INCLUDE "gfx/pics/crobat/anim0.asm"
-ChinchouAnimation:   INCLUDE "gfx/pics/chinchou/anim0.asm"
-LanturnAnimation:    INCLUDE "gfx/pics/lanturn/anim0.asm"
-PichuAnimation:      INCLUDE "gfx/pics/pichu/anim0.asm"
-CleffaAnimation:     INCLUDE "gfx/pics/cleffa/anim0.asm"
-IgglybuffAnimation:  INCLUDE "gfx/pics/igglybuff/anim0.asm"
-TogepiAnimation:     INCLUDE "gfx/pics/togepi/anim0.asm"
-TogeticAnimation:    INCLUDE "gfx/pics/togetic/anim0.asm"
-NatuAnimation:       INCLUDE "gfx/pics/natu/anim0.asm"
-XatuAnimation:       INCLUDE "gfx/pics/xatu/anim0.asm"
-MareepAnimation:     INCLUDE "gfx/pics/mareep/anim0.asm"
-FlaaffyAnimation:    INCLUDE "gfx/pics/flaaffy/anim0.asm"
-AmpharosAnimation:   INCLUDE "gfx/pics/ampharos/anim0.asm"
-BellossomAnimation:  INCLUDE "gfx/pics/bellossom/anim0.asm"
-MarillAnimation:     INCLUDE "gfx/pics/marill/anim0.asm"
-AzumarillAnimation:  INCLUDE "gfx/pics/azumarill/anim0.asm"
-SudowoodoAnimation:  INCLUDE "gfx/pics/sudowoodo/anim0.asm"
-PolitoedAnimation:   INCLUDE "gfx/pics/politoed/anim0.asm"
-HoppipAnimation:     INCLUDE "gfx/pics/hoppip/anim0.asm"
-SkiploomAnimation:   INCLUDE "gfx/pics/skiploom/anim0.asm"
-JumpluffAnimation:   INCLUDE "gfx/pics/jumpluff/anim0.asm"
-AipomAnimation:      INCLUDE "gfx/pics/aipom/anim0.asm"
-SunkernAnimation:    INCLUDE "gfx/pics/sunkern/anim0.asm"
-SunfloraAnimation:   INCLUDE "gfx/pics/sunflora/anim0.asm"
-YanmaAnimation:      INCLUDE "gfx/pics/yanma/anim0.asm"
-WooperAnimation:     INCLUDE "gfx/pics/wooper/anim0.asm"
-QuagsireAnimation:   INCLUDE "gfx/pics/quagsire/anim0.asm"
-EspeonAnimation:     INCLUDE "gfx/pics/espeon/anim0.asm"
-UmbreonAnimation:    INCLUDE "gfx/pics/umbreon/anim0.asm"
-MurkrowAnimation:    INCLUDE "gfx/pics/murkrow/anim0.asm"
-SlowkingAnimation:   INCLUDE "gfx/pics/slowking/anim0.asm"
-MisdreavusAnimation: INCLUDE "gfx/pics/misdreavus/anim0.asm"
-UnownAnimation:      INCLUDE "gfx/pics/unown/anim0.asm"
-WobbuffetAnimation:  INCLUDE "gfx/pics/wobbuffet/anim0.asm"
-GirafarigAnimation:  INCLUDE "gfx/pics/girafarig/anim0.asm"
-PinecoAnimation:     INCLUDE "gfx/pics/pineco/anim0.asm"
-ForretressAnimation: INCLUDE "gfx/pics/forretress/anim0.asm"
-DunsparceAnimation:  INCLUDE "gfx/pics/dunsparce/anim0.asm"
-GligarAnimation:     INCLUDE "gfx/pics/gligar/anim0.asm"
-SteelixAnimation:    INCLUDE "gfx/pics/steelix/anim0.asm"
-SnubbullAnimation:   INCLUDE "gfx/pics/snubbull/anim0.asm"
-GranbullAnimation:   INCLUDE "gfx/pics/granbull/anim0.asm"
-QwilfishAnimation:   INCLUDE "gfx/pics/qwilfish/anim0.asm"
-ScizorAnimation:     INCLUDE "gfx/pics/scizor/anim0.asm"
-ShuckleAnimation:    INCLUDE "gfx/pics/shuckle/anim0.asm"
-HeracrossAnimation:  INCLUDE "gfx/pics/heracross/anim0.asm"
-SneaselAnimation:    INCLUDE "gfx/pics/sneasel/anim0.asm"
-TeddiursaAnimation:  INCLUDE "gfx/pics/teddiursa/anim0.asm"
-UrsaringAnimation:   INCLUDE "gfx/pics/ursaring/anim0.asm"
-SlugmaAnimation:     INCLUDE "gfx/pics/slugma/anim0.asm"
-MagcargoAnimation:   INCLUDE "gfx/pics/magcargo/anim0.asm"
-SwinubAnimation:     INCLUDE "gfx/pics/swinub/anim0.asm"
-PiloswineAnimation:  INCLUDE "gfx/pics/piloswine/anim0.asm"
-CorsolaAnimation:    INCLUDE "gfx/pics/corsola/anim0.asm"
-RemoraidAnimation:   INCLUDE "gfx/pics/remoraid/anim0.asm"
-OctilleryAnimation:  INCLUDE "gfx/pics/octillery/anim0.asm"
-DelibirdAnimation:   INCLUDE "gfx/pics/delibird/anim0.asm"
-MantineAnimation:    INCLUDE "gfx/pics/mantine/anim0.asm"
-SkarmoryAnimation:   INCLUDE "gfx/pics/skarmory/anim0.asm"
-HoundourAnimation:   INCLUDE "gfx/pics/houndour/anim0.asm"
-HoundoomAnimation:   INCLUDE "gfx/pics/houndoom/anim0.asm"
-KingdraAnimation:    INCLUDE "gfx/pics/kingdra/anim0.asm"
-PhanpyAnimation:     INCLUDE "gfx/pics/phanpy/anim0.asm"
-DonphanAnimation:    INCLUDE "gfx/pics/donphan/anim0.asm"
-Porygon2Animation:   INCLUDE "gfx/pics/porygon2/anim0.asm"
-StantlerAnimation:   INCLUDE "gfx/pics/stantler/anim0.asm"
-SmeargleAnimation:   INCLUDE "gfx/pics/smeargle/anim0.asm"
-TyrogueAnimation:    INCLUDE "gfx/pics/tyrogue/anim0.asm"
-HitmontopAnimation:  INCLUDE "gfx/pics/hitmontop/anim0.asm"
-SmoochumAnimation:   INCLUDE "gfx/pics/smoochum/anim0.asm"
-ElekidAnimation:     INCLUDE "gfx/pics/elekid/anim0.asm"
-MagbyAnimation:      INCLUDE "gfx/pics/magby/anim0.asm"
-MiltankAnimation:    INCLUDE "gfx/pics/miltank/anim0.asm"
-BlisseyAnimation:    INCLUDE "gfx/pics/blissey/anim0.asm"
-RaikouAnimation:     INCLUDE "gfx/pics/raikou/anim0.asm"
-EnteiAnimation:      INCLUDE "gfx/pics/entei/anim0.asm"
-SuicuneAnimation:    INCLUDE "gfx/pics/suicune/anim0.asm"
-LarvitarAnimation:   INCLUDE "gfx/pics/larvitar/anim0.asm"
-PupitarAnimation:    INCLUDE "gfx/pics/pupitar/anim0.asm"
-TyranitarAnimation:  INCLUDE "gfx/pics/tyranitar/anim0.asm"
-LugiaAnimation:      INCLUDE "gfx/pics/lugia/anim0.asm"
-HoOhAnimation:       INCLUDE "gfx/pics/ho_oh/anim0.asm"
-CelebiAnimation:     INCLUDE "gfx/pics/celebi/anim0.asm"
-EggAnimation:        INCLUDE "gfx/pics/egg/anim0.asm"
diff --git a/gfx/pics/bitmasks.asm b/gfx/pics/bitmasks.asm
deleted file mode 100644
index 4f142431f..000000000
--- a/gfx/pics/bitmasks.asm
+++ /dev/null
@@ -1,252 +0,0 @@
-BulbasaurBitmasks:  INCLUDE "gfx/pics/bulbasaur/bitmask.asm"
-IvysaurBitmasks:    INCLUDE "gfx/pics/ivysaur/bitmask.asm"
-VenusaurBitmasks:   INCLUDE "gfx/pics/venusaur/bitmask.asm"
-CharmanderBitmasks: INCLUDE "gfx/pics/charmander/bitmask.asm"
-CharmeleonBitmasks: INCLUDE "gfx/pics/charmeleon/bitmask.asm"
-CharizardBitmasks:  INCLUDE "gfx/pics/charizard/bitmask.asm"
-SquirtleBitmasks:   INCLUDE "gfx/pics/squirtle/bitmask.asm"
-WartortleBitmasks:  INCLUDE "gfx/pics/wartortle/bitmask.asm"
-BlastoiseBitmasks:  INCLUDE "gfx/pics/blastoise/bitmask.asm"
-CaterpieBitmasks:   INCLUDE "gfx/pics/caterpie/bitmask.asm"
-MetapodBitmasks:    INCLUDE "gfx/pics/metapod/bitmask.asm"
-ButterfreeBitmasks: INCLUDE "gfx/pics/butterfree/bitmask.asm"
-WeedleBitmasks:     INCLUDE "gfx/pics/weedle/bitmask.asm"
-KakunaBitmasks:     INCLUDE "gfx/pics/kakuna/bitmask.asm"
-BeedrillBitmasks:   INCLUDE "gfx/pics/beedrill/bitmask.asm"
-PidgeyBitmasks:     INCLUDE "gfx/pics/pidgey/bitmask.asm"
-PidgeottoBitmasks:  INCLUDE "gfx/pics/pidgeotto/bitmask.asm"
-PidgeotBitmasks:    INCLUDE "gfx/pics/pidgeot/bitmask.asm"
-RattataBitmasks:    INCLUDE "gfx/pics/rattata/bitmask.asm"
-RaticateBitmasks:   INCLUDE "gfx/pics/raticate/bitmask.asm"
-SpearowBitmasks:    INCLUDE "gfx/pics/spearow/bitmask.asm"
-FearowBitmasks:     INCLUDE "gfx/pics/fearow/bitmask.asm"
-EkansBitmasks:      INCLUDE "gfx/pics/ekans/bitmask.asm"
-ArbokBitmasks:      INCLUDE "gfx/pics/arbok/bitmask.asm"
-PikachuBitmasks:    INCLUDE "gfx/pics/pikachu/bitmask.asm"
-RaichuBitmasks:     INCLUDE "gfx/pics/raichu/bitmask.asm"
-SandshrewBitmasks:  INCLUDE "gfx/pics/sandshrew/bitmask.asm"
-SandslashBitmasks:  INCLUDE "gfx/pics/sandslash/bitmask.asm"
-NidoranFBitmasks:   INCLUDE "gfx/pics/nidoran_f/bitmask.asm"
-NidorinaBitmasks:   INCLUDE "gfx/pics/nidorina/bitmask.asm"
-NidoqueenBitmasks:  INCLUDE "gfx/pics/nidoqueen/bitmask.asm"
-NidoranMBitmasks:   INCLUDE "gfx/pics/nidoran_m/bitmask.asm"
-NidorinoBitmasks:   INCLUDE "gfx/pics/nidorino/bitmask.asm"
-NidokingBitmasks:   INCLUDE "gfx/pics/nidoking/bitmask.asm"
-ClefairyBitmasks:   INCLUDE "gfx/pics/clefairy/bitmask.asm"
-ClefableBitmasks:   INCLUDE "gfx/pics/clefable/bitmask.asm"
-VulpixBitmasks:     INCLUDE "gfx/pics/vulpix/bitmask.asm"
-NinetalesBitmasks:  INCLUDE "gfx/pics/ninetales/bitmask.asm"
-JigglypuffBitmasks: INCLUDE "gfx/pics/jigglypuff/bitmask.asm"
-WigglytuffBitmasks: INCLUDE "gfx/pics/wigglytuff/bitmask.asm"
-ZubatBitmasks:      INCLUDE "gfx/pics/zubat/bitmask.asm"
-GolbatBitmasks:     INCLUDE "gfx/pics/golbat/bitmask.asm"
-OddishBitmasks:     INCLUDE "gfx/pics/oddish/bitmask.asm"
-GloomBitmasks:      INCLUDE "gfx/pics/gloom/bitmask.asm"
-VileplumeBitmasks:  INCLUDE "gfx/pics/vileplume/bitmask.asm"
-ParasBitmasks:      INCLUDE "gfx/pics/paras/bitmask.asm"
-ParasectBitmasks:   INCLUDE "gfx/pics/parasect/bitmask.asm"
-VenonatBitmasks:    INCLUDE "gfx/pics/venonat/bitmask.asm"
-VenomothBitmasks:   INCLUDE "gfx/pics/venomoth/bitmask.asm"
-DiglettBitmasks:    INCLUDE "gfx/pics/diglett/bitmask.asm"
-DugtrioBitmasks:    INCLUDE "gfx/pics/dugtrio/bitmask.asm"
-MeowthBitmasks:     INCLUDE "gfx/pics/meowth/bitmask.asm"
-PersianBitmasks:    INCLUDE "gfx/pics/persian/bitmask.asm"
-PsyduckBitmasks:    INCLUDE "gfx/pics/psyduck/bitmask.asm"
-GolduckBitmasks:    INCLUDE "gfx/pics/golduck/bitmask.asm"
-MankeyBitmasks:     INCLUDE "gfx/pics/mankey/bitmask.asm"
-PrimeapeBitmasks:   INCLUDE "gfx/pics/primeape/bitmask.asm"
-GrowlitheBitmasks:  INCLUDE "gfx/pics/growlithe/bitmask.asm"
-ArcanineBitmasks:   INCLUDE "gfx/pics/arcanine/bitmask.asm"
-PoliwagBitmasks:    INCLUDE "gfx/pics/poliwag/bitmask.asm"
-PoliwhirlBitmasks:  INCLUDE "gfx/pics/poliwhirl/bitmask.asm"
-PoliwrathBitmasks:  INCLUDE "gfx/pics/poliwrath/bitmask.asm"
-AbraBitmasks:       INCLUDE "gfx/pics/abra/bitmask.asm"
-KadabraBitmasks:    INCLUDE "gfx/pics/kadabra/bitmask.asm"
-AlakazamBitmasks:   INCLUDE "gfx/pics/alakazam/bitmask.asm"
-MachopBitmasks:     INCLUDE "gfx/pics/machop/bitmask.asm"
-MachokeBitmasks:    INCLUDE "gfx/pics/machoke/bitmask.asm"
-MachampBitmasks:    INCLUDE "gfx/pics/machamp/bitmask.asm"
-BellsproutBitmasks: INCLUDE "gfx/pics/bellsprout/bitmask.asm"
-WeepinbellBitmasks: INCLUDE "gfx/pics/weepinbell/bitmask.asm"
-VictreebelBitmasks: INCLUDE "gfx/pics/victreebel/bitmask.asm"
-TentacoolBitmasks:  INCLUDE "gfx/pics/tentacool/bitmask.asm"
-TentacruelBitmasks: INCLUDE "gfx/pics/tentacruel/bitmask.asm"
-GeodudeBitmasks:    INCLUDE "gfx/pics/geodude/bitmask.asm"
-GravelerBitmasks:   INCLUDE "gfx/pics/graveler/bitmask.asm"
-GolemBitmasks:      INCLUDE "gfx/pics/golem/bitmask.asm"
-PonytaBitmasks:     INCLUDE "gfx/pics/ponyta/bitmask.asm"
-RapidashBitmasks:   INCLUDE "gfx/pics/rapidash/bitmask.asm"
-SlowpokeBitmasks:   INCLUDE "gfx/pics/slowpoke/bitmask.asm"
-SlowbroBitmasks:    INCLUDE "gfx/pics/slowbro/bitmask.asm"
-MagnemiteBitmasks:  INCLUDE "gfx/pics/magnemite/bitmask.asm"
-MagnetonBitmasks:   INCLUDE "gfx/pics/magneton/bitmask.asm"
-FarfetchDBitmasks:  INCLUDE "gfx/pics/farfetch_d/bitmask.asm"
-DoduoBitmasks:      INCLUDE "gfx/pics/doduo/bitmask.asm"
-DodrioBitmasks:     INCLUDE "gfx/pics/dodrio/bitmask.asm"
-SeelBitmasks:       INCLUDE "gfx/pics/seel/bitmask.asm"
-DewgongBitmasks:    INCLUDE "gfx/pics/dewgong/bitmask.asm"
-GrimerBitmasks:     INCLUDE "gfx/pics/grimer/bitmask.asm"
-MukBitmasks:        INCLUDE "gfx/pics/muk/bitmask.asm"
-ShellderBitmasks:   INCLUDE "gfx/pics/shellder/bitmask.asm"
-CloysterBitmasks:   INCLUDE "gfx/pics/cloyster/bitmask.asm"
-GastlyBitmasks:     INCLUDE "gfx/pics/gastly/bitmask.asm"
-HaunterBitmasks:    INCLUDE "gfx/pics/haunter/bitmask.asm"
-GengarBitmasks:     INCLUDE "gfx/pics/gengar/bitmask.asm"
-OnixBitmasks:       INCLUDE "gfx/pics/onix/bitmask.asm"
-DrowzeeBitmasks:    INCLUDE "gfx/pics/drowzee/bitmask.asm"
-HypnoBitmasks:      INCLUDE "gfx/pics/hypno/bitmask.asm"
-KrabbyBitmasks:     INCLUDE "gfx/pics/krabby/bitmask.asm"
-KinglerBitmasks:    INCLUDE "gfx/pics/kingler/bitmask.asm"
-VoltorbBitmasks:    INCLUDE "gfx/pics/voltorb/bitmask.asm"
-ElectrodeBitmasks:  INCLUDE "gfx/pics/electrode/bitmask.asm"
-ExeggcuteBitmasks:  INCLUDE "gfx/pics/exeggcute/bitmask.asm"
-ExeggutorBitmasks:  INCLUDE "gfx/pics/exeggutor/bitmask.asm"
-CuboneBitmasks:     INCLUDE "gfx/pics/cubone/bitmask.asm"
-MarowakBitmasks:    INCLUDE "gfx/pics/marowak/bitmask.asm"
-HitmonleeBitmasks:  INCLUDE "gfx/pics/hitmonlee/bitmask.asm"
-HitmonchanBitmasks: INCLUDE "gfx/pics/hitmonchan/bitmask.asm"
-LickitungBitmasks:  INCLUDE "gfx/pics/lickitung/bitmask.asm"
-KoffingBitmasks:    INCLUDE "gfx/pics/koffing/bitmask.asm"
-WeezingBitmasks:    INCLUDE "gfx/pics/weezing/bitmask.asm"
-RhyhornBitmasks:    INCLUDE "gfx/pics/rhyhorn/bitmask.asm"
-RhydonBitmasks:     INCLUDE "gfx/pics/rhydon/bitmask.asm"
-ChanseyBitmasks:    INCLUDE "gfx/pics/chansey/bitmask.asm"
-TangelaBitmasks:    INCLUDE "gfx/pics/tangela/bitmask.asm"
-KangaskhanBitmasks: INCLUDE "gfx/pics/kangaskhan/bitmask.asm"
-HorseaBitmasks:     INCLUDE "gfx/pics/horsea/bitmask.asm"
-SeadraBitmasks:     INCLUDE "gfx/pics/seadra/bitmask.asm"
-GoldeenBitmasks:    INCLUDE "gfx/pics/goldeen/bitmask.asm"
-SeakingBitmasks:    INCLUDE "gfx/pics/seaking/bitmask.asm"
-StaryuBitmasks:     INCLUDE "gfx/pics/staryu/bitmask.asm"
-StarmieBitmasks:    INCLUDE "gfx/pics/starmie/bitmask.asm"
-MrMimeBitmasks:     INCLUDE "gfx/pics/mr__mime/bitmask.asm"
-ScytherBitmasks:    INCLUDE "gfx/pics/scyther/bitmask.asm"
-JynxBitmasks:       INCLUDE "gfx/pics/jynx/bitmask.asm"
-ElectabuzzBitmasks: INCLUDE "gfx/pics/electabuzz/bitmask.asm"
-MagmarBitmasks:     INCLUDE "gfx/pics/magmar/bitmask.asm"
-PinsirBitmasks:     INCLUDE "gfx/pics/pinsir/bitmask.asm"
-TaurosBitmasks:     INCLUDE "gfx/pics/tauros/bitmask.asm"
-MagikarpBitmasks:   INCLUDE "gfx/pics/magikarp/bitmask.asm"
-GyaradosBitmasks:   INCLUDE "gfx/pics/gyarados/bitmask.asm"
-LaprasBitmasks:     INCLUDE "gfx/pics/lapras/bitmask.asm"
-DittoBitmasks:      INCLUDE "gfx/pics/ditto/bitmask.asm"
-EeveeBitmasks:      INCLUDE "gfx/pics/eevee/bitmask.asm"
-VaporeonBitmasks:   INCLUDE "gfx/pics/vaporeon/bitmask.asm"
-JolteonBitmasks:    INCLUDE "gfx/pics/jolteon/bitmask.asm"
-FlareonBitmasks:    INCLUDE "gfx/pics/flareon/bitmask.asm"
-PorygonBitmasks:    INCLUDE "gfx/pics/porygon/bitmask.asm"
-OmanyteBitmasks:    INCLUDE "gfx/pics/omanyte/bitmask.asm"
-OmastarBitmasks:    INCLUDE "gfx/pics/omastar/bitmask.asm"
-KabutoBitmasks:     INCLUDE "gfx/pics/kabuto/bitmask.asm"
-KabutopsBitmasks:   INCLUDE "gfx/pics/kabutops/bitmask.asm"
-AerodactylBitmasks: INCLUDE "gfx/pics/aerodactyl/bitmask.asm"
-SnorlaxBitmasks:    INCLUDE "gfx/pics/snorlax/bitmask.asm"
-ArticunoBitmasks:   INCLUDE "gfx/pics/articuno/bitmask.asm"
-ZapdosBitmasks:     INCLUDE "gfx/pics/zapdos/bitmask.asm"
-MoltresBitmasks:    INCLUDE "gfx/pics/moltres/bitmask.asm"
-DratiniBitmasks:    INCLUDE "gfx/pics/dratini/bitmask.asm"
-DragonairBitmasks:  INCLUDE "gfx/pics/dragonair/bitmask.asm"
-DragoniteBitmasks:  INCLUDE "gfx/pics/dragonite/bitmask.asm"
-MewtwoBitmasks:     INCLUDE "gfx/pics/mewtwo/bitmask.asm"
-MewBitmasks:        INCLUDE "gfx/pics/mew/bitmask.asm"
-ChikoritaBitmasks:  INCLUDE "gfx/pics/chikorita/bitmask.asm"
-BayleefBitmasks:    INCLUDE "gfx/pics/bayleef/bitmask.asm"
-MeganiumBitmasks:   INCLUDE "gfx/pics/meganium/bitmask.asm"
-CyndaquilBitmasks:  INCLUDE "gfx/pics/cyndaquil/bitmask.asm"
-QuilavaBitmasks:    INCLUDE "gfx/pics/quilava/bitmask.asm"
-TyphlosionBitmasks: INCLUDE "gfx/pics/typhlosion/bitmask.asm"
-TotodileBitmasks:   INCLUDE "gfx/pics/totodile/bitmask.asm"
-CroconawBitmasks:   INCLUDE "gfx/pics/croconaw/bitmask.asm"
-FeraligatrBitmasks: INCLUDE "gfx/pics/feraligatr/bitmask.asm"
-SentretBitmasks:    INCLUDE "gfx/pics/sentret/bitmask.asm"
-FurretBitmasks:     INCLUDE "gfx/pics/furret/bitmask.asm"
-HoothootBitmasks:   INCLUDE "gfx/pics/hoothoot/bitmask.asm"
-NoctowlBitmasks:    INCLUDE "gfx/pics/noctowl/bitmask.asm"
-LedybaBitmasks:     INCLUDE "gfx/pics/ledyba/bitmask.asm"
-LedianBitmasks:     INCLUDE "gfx/pics/ledian/bitmask.asm"
-SpinarakBitmasks:   INCLUDE "gfx/pics/spinarak/bitmask.asm"
-AriadosBitmasks:    INCLUDE "gfx/pics/ariados/bitmask.asm"
-CrobatBitmasks:     INCLUDE "gfx/pics/crobat/bitmask.asm"
-ChinchouBitmasks:   INCLUDE "gfx/pics/chinchou/bitmask.asm"
-LanturnBitmasks:    INCLUDE "gfx/pics/lanturn/bitmask.asm"
-PichuBitmasks:      INCLUDE "gfx/pics/pichu/bitmask.asm"
-CleffaBitmasks:     INCLUDE "gfx/pics/cleffa/bitmask.asm"
-IgglybuffBitmasks:  INCLUDE "gfx/pics/igglybuff/bitmask.asm"
-TogepiBitmasks:     INCLUDE "gfx/pics/togepi/bitmask.asm"
-TogeticBitmasks:    INCLUDE "gfx/pics/togetic/bitmask.asm"
-NatuBitmasks:       INCLUDE "gfx/pics/natu/bitmask.asm"
-XatuBitmasks:       INCLUDE "gfx/pics/xatu/bitmask.asm"
-MareepBitmasks:     INCLUDE "gfx/pics/mareep/bitmask.asm"
-FlaaffyBitmasks:    INCLUDE "gfx/pics/flaaffy/bitmask.asm"
-AmpharosBitmasks:   INCLUDE "gfx/pics/ampharos/bitmask.asm"
-BellossomBitmasks:  INCLUDE "gfx/pics/bellossom/bitmask.asm"
-MarillBitmasks:     INCLUDE "gfx/pics/marill/bitmask.asm"
-AzumarillBitmasks:  INCLUDE "gfx/pics/azumarill/bitmask.asm"
-SudowoodoBitmasks:  INCLUDE "gfx/pics/sudowoodo/bitmask.asm"
-PolitoedBitmasks:   INCLUDE "gfx/pics/politoed/bitmask.asm"
-HoppipBitmasks:     INCLUDE "gfx/pics/hoppip/bitmask.asm"
-SkiploomBitmasks:   INCLUDE "gfx/pics/skiploom/bitmask.asm"
-JumpluffBitmasks:   INCLUDE "gfx/pics/jumpluff/bitmask.asm"
-AipomBitmasks:      INCLUDE "gfx/pics/aipom/bitmask.asm"
-SunkernBitmasks:    INCLUDE "gfx/pics/sunkern/bitmask.asm"
-SunfloraBitmasks:   INCLUDE "gfx/pics/sunflora/bitmask.asm"
-YanmaBitmasks:      INCLUDE "gfx/pics/yanma/bitmask.asm"
-WooperBitmasks:     INCLUDE "gfx/pics/wooper/bitmask.asm"
-QuagsireBitmasks:   INCLUDE "gfx/pics/quagsire/bitmask.asm"
-EspeonBitmasks:     INCLUDE "gfx/pics/espeon/bitmask.asm"
-UmbreonBitmasks:    INCLUDE "gfx/pics/umbreon/bitmask.asm"
-MurkrowBitmasks:    INCLUDE "gfx/pics/murkrow/bitmask.asm"
-SlowkingBitmasks:   INCLUDE "gfx/pics/slowking/bitmask.asm"
-MisdreavusBitmasks: INCLUDE "gfx/pics/misdreavus/bitmask.asm"
-UnownBitmasks:      INCLUDE "gfx/pics/unown/bitmask.asm"
-WobbuffetBitmasks:  INCLUDE "gfx/pics/wobbuffet/bitmask.asm"
-GirafarigBitmasks:  INCLUDE "gfx/pics/girafarig/bitmask.asm"
-PinecoBitmasks:     INCLUDE "gfx/pics/pineco/bitmask.asm"
-ForretressBitmasks: INCLUDE "gfx/pics/forretress/bitmask.asm"
-DunsparceBitmasks:  INCLUDE "gfx/pics/dunsparce/bitmask.asm"
-GligarBitmasks:     INCLUDE "gfx/pics/gligar/bitmask.asm"
-SteelixBitmasks:    INCLUDE "gfx/pics/steelix/bitmask.asm"
-SnubbullBitmasks:   INCLUDE "gfx/pics/snubbull/bitmask.asm"
-GranbullBitmasks:   INCLUDE "gfx/pics/granbull/bitmask.asm"
-QwilfishBitmasks:   INCLUDE "gfx/pics/qwilfish/bitmask.asm"
-ScizorBitmasks:     INCLUDE "gfx/pics/scizor/bitmask.asm"
-ShuckleBitmasks:    INCLUDE "gfx/pics/shuckle/bitmask.asm"
-HeracrossBitmasks:  INCLUDE "gfx/pics/heracross/bitmask.asm"
-SneaselBitmasks:    INCLUDE "gfx/pics/sneasel/bitmask.asm"
-TeddiursaBitmasks:  INCLUDE "gfx/pics/teddiursa/bitmask.asm"
-UrsaringBitmasks:   INCLUDE "gfx/pics/ursaring/bitmask.asm"
-SlugmaBitmasks:     INCLUDE "gfx/pics/slugma/bitmask.asm"
-MagcargoBitmasks:   INCLUDE "gfx/pics/magcargo/bitmask.asm"
-SwinubBitmasks:     INCLUDE "gfx/pics/swinub/bitmask.asm"
-PiloswineBitmasks:  INCLUDE "gfx/pics/piloswine/bitmask.asm"
-CorsolaBitmasks:    INCLUDE "gfx/pics/corsola/bitmask.asm"
-RemoraidBitmasks:   INCLUDE "gfx/pics/remoraid/bitmask.asm"
-OctilleryBitmasks:  INCLUDE "gfx/pics/octillery/bitmask.asm"
-DelibirdBitmasks:   INCLUDE "gfx/pics/delibird/bitmask.asm"
-MantineBitmasks:    INCLUDE "gfx/pics/mantine/bitmask.asm"
-SkarmoryBitmasks:   INCLUDE "gfx/pics/skarmory/bitmask.asm"
-HoundourBitmasks:   INCLUDE "gfx/pics/houndour/bitmask.asm"
-HoundoomBitmasks:   INCLUDE "gfx/pics/houndoom/bitmask.asm"
-KingdraBitmasks:    INCLUDE "gfx/pics/kingdra/bitmask.asm"
-PhanpyBitmasks:     INCLUDE "gfx/pics/phanpy/bitmask.asm"
-DonphanBitmasks:    INCLUDE "gfx/pics/donphan/bitmask.asm"
-Porygon2Bitmasks:   INCLUDE "gfx/pics/porygon2/bitmask.asm"
-StantlerBitmasks:   INCLUDE "gfx/pics/stantler/bitmask.asm"
-SmeargleBitmasks:   INCLUDE "gfx/pics/smeargle/bitmask.asm"
-TyrogueBitmasks:    INCLUDE "gfx/pics/tyrogue/bitmask.asm"
-HitmontopBitmasks:  INCLUDE "gfx/pics/hitmontop/bitmask.asm"
-SmoochumBitmasks:   INCLUDE "gfx/pics/smoochum/bitmask.asm"
-ElekidBitmasks:     INCLUDE "gfx/pics/elekid/bitmask.asm"
-MagbyBitmasks:      INCLUDE "gfx/pics/magby/bitmask.asm"
-MiltankBitmasks:    INCLUDE "gfx/pics/miltank/bitmask.asm"
-BlisseyBitmasks:    INCLUDE "gfx/pics/blissey/bitmask.asm"
-RaikouBitmasks:     INCLUDE "gfx/pics/raikou/bitmask.asm"
-EnteiBitmasks:      INCLUDE "gfx/pics/entei/bitmask.asm"
-SuicuneBitmasks:    INCLUDE "gfx/pics/suicune/bitmask.asm"
-LarvitarBitmasks:   INCLUDE "gfx/pics/larvitar/bitmask.asm"
-PupitarBitmasks:    INCLUDE "gfx/pics/pupitar/bitmask.asm"
-TyranitarBitmasks:  INCLUDE "gfx/pics/tyranitar/bitmask.asm"
-LugiaBitmasks:      INCLUDE "gfx/pics/lugia/bitmask.asm"
-HoOhBitmasks:       INCLUDE "gfx/pics/ho_oh/bitmask.asm"
-CelebiBitmasks:     INCLUDE "gfx/pics/celebi/bitmask.asm"
-EggBitmasks:        INCLUDE "gfx/pics/egg/bitmask.asm"
diff --git a/gfx/pics/extras.asm b/gfx/pics/extras.asm
deleted file mode 100644
index 682cbb635..000000000
--- a/gfx/pics/extras.asm
+++ /dev/null
@@ -1,252 +0,0 @@
-BulbasaurAnimationExtra:  INCLUDE "gfx/pics/bulbasaur/anim1.asm"
-IvysaurAnimationExtra:    INCLUDE "gfx/pics/ivysaur/anim1.asm"
-VenusaurAnimationExtra:   INCLUDE "gfx/pics/venusaur/anim1.asm"
-CharmanderAnimationExtra: INCLUDE "gfx/pics/charmander/anim1.asm"
-CharmeleonAnimationExtra: INCLUDE "gfx/pics/charmeleon/anim1.asm"
-CharizardAnimationExtra:  INCLUDE "gfx/pics/charizard/anim1.asm"
-SquirtleAnimationExtra:   INCLUDE "gfx/pics/squirtle/anim1.asm"
-WartortleAnimationExtra:  INCLUDE "gfx/pics/wartortle/anim1.asm"
-BlastoiseAnimationExtra:  INCLUDE "gfx/pics/blastoise/anim1.asm"
-CaterpieAnimationExtra:   INCLUDE "gfx/pics/caterpie/anim1.asm"
-MetapodAnimationExtra:    INCLUDE "gfx/pics/metapod/anim1.asm"
-ButterfreeAnimationExtra: INCLUDE "gfx/pics/butterfree/anim1.asm"
-WeedleAnimationExtra:     INCLUDE "gfx/pics/weedle/anim1.asm"
-KakunaAnimationExtra:     INCLUDE "gfx/pics/kakuna/anim1.asm"
-BeedrillAnimationExtra:   INCLUDE "gfx/pics/beedrill/anim1.asm"
-PidgeyAnimationExtra:     INCLUDE "gfx/pics/pidgey/anim1.asm"
-PidgeottoAnimationExtra:  INCLUDE "gfx/pics/pidgeotto/anim1.asm"
-PidgeotAnimationExtra:    INCLUDE "gfx/pics/pidgeot/anim1.asm"
-RattataAnimationExtra:    INCLUDE "gfx/pics/rattata/anim1.asm"
-RaticateAnimationExtra:   INCLUDE "gfx/pics/raticate/anim1.asm"
-SpearowAnimationExtra:    INCLUDE "gfx/pics/spearow/anim1.asm"
-FearowAnimationExtra:     INCLUDE "gfx/pics/fearow/anim1.asm"
-EkansAnimationExtra:      INCLUDE "gfx/pics/ekans/anim1.asm"
-ArbokAnimationExtra:      INCLUDE "gfx/pics/arbok/anim1.asm"
-PikachuAnimationExtra:    INCLUDE "gfx/pics/pikachu/anim1.asm"
-RaichuAnimationExtra:     INCLUDE "gfx/pics/raichu/anim1.asm"
-SandshrewAnimationExtra:  INCLUDE "gfx/pics/sandshrew/anim1.asm"
-SandslashAnimationExtra:  INCLUDE "gfx/pics/sandslash/anim1.asm"
-NidoranFAnimationExtra:   INCLUDE "gfx/pics/nidoran_f/anim1.asm"
-NidorinaAnimationExtra:   INCLUDE "gfx/pics/nidorina/anim1.asm"
-NidoqueenAnimationExtra:  INCLUDE "gfx/pics/nidoqueen/anim1.asm"
-NidoranMAnimationExtra:   INCLUDE "gfx/pics/nidoran_m/anim1.asm"
-NidorinoAnimationExtra:   INCLUDE "gfx/pics/nidorino/anim1.asm"
-NidokingAnimationExtra:   INCLUDE "gfx/pics/nidoking/anim1.asm"
-ClefairyAnimationExtra:   INCLUDE "gfx/pics/clefairy/anim1.asm"
-ClefableAnimationExtra:   INCLUDE "gfx/pics/clefable/anim1.asm"
-VulpixAnimationExtra:     INCLUDE "gfx/pics/vulpix/anim1.asm"
-NinetalesAnimationExtra:  INCLUDE "gfx/pics/ninetales/anim1.asm"
-JigglypuffAnimationExtra: INCLUDE "gfx/pics/jigglypuff/anim1.asm"
-WigglytuffAnimationExtra: INCLUDE "gfx/pics/wigglytuff/anim1.asm"
-ZubatAnimationExtra:      INCLUDE "gfx/pics/zubat/anim1.asm"
-GolbatAnimationExtra:     INCLUDE "gfx/pics/golbat/anim1.asm"
-OddishAnimationExtra:     INCLUDE "gfx/pics/oddish/anim1.asm"
-GloomAnimationExtra:      INCLUDE "gfx/pics/gloom/anim1.asm"
-VileplumeAnimationExtra:  INCLUDE "gfx/pics/vileplume/anim1.asm"
-ParasAnimationExtra:      INCLUDE "gfx/pics/paras/anim1.asm"
-ParasectAnimationExtra:   INCLUDE "gfx/pics/parasect/anim1.asm"
-VenonatAnimationExtra:    INCLUDE "gfx/pics/venonat/anim1.asm"
-VenomothAnimationExtra:   INCLUDE "gfx/pics/venomoth/anim1.asm"
-DiglettAnimationExtra:    INCLUDE "gfx/pics/diglett/anim1.asm"
-DugtrioAnimationExtra:    INCLUDE "gfx/pics/dugtrio/anim1.asm"
-MeowthAnimationExtra:     INCLUDE "gfx/pics/meowth/anim1.asm"
-PersianAnimationExtra:    INCLUDE "gfx/pics/persian/anim1.asm"
-PsyduckAnimationExtra:    INCLUDE "gfx/pics/psyduck/anim1.asm"
-GolduckAnimationExtra:    INCLUDE "gfx/pics/golduck/anim1.asm"
-MankeyAnimationExtra:     INCLUDE "gfx/pics/mankey/anim1.asm"
-PrimeapeAnimationExtra:   INCLUDE "gfx/pics/primeape/anim1.asm"
-GrowlitheAnimationExtra:  INCLUDE "gfx/pics/growlithe/anim1.asm"
-ArcanineAnimationExtra:   INCLUDE "gfx/pics/arcanine/anim1.asm"
-PoliwagAnimationExtra:    INCLUDE "gfx/pics/poliwag/anim1.asm"
-PoliwhirlAnimationExtra:  INCLUDE "gfx/pics/poliwhirl/anim1.asm"
-PoliwrathAnimationExtra:  INCLUDE "gfx/pics/poliwrath/anim1.asm"
-AbraAnimationExtra:       INCLUDE "gfx/pics/abra/anim1.asm"
-KadabraAnimationExtra:    INCLUDE "gfx/pics/kadabra/anim1.asm"
-AlakazamAnimationExtra:   INCLUDE "gfx/pics/alakazam/anim1.asm"
-MachopAnimationExtra:     INCLUDE "gfx/pics/machop/anim1.asm"
-MachokeAnimationExtra:    INCLUDE "gfx/pics/machoke/anim1.asm"
-MachampAnimationExtra:    INCLUDE "gfx/pics/machamp/anim1.asm"
-BellsproutAnimationExtra: INCLUDE "gfx/pics/bellsprout/anim1.asm"
-WeepinbellAnimationExtra: INCLUDE "gfx/pics/weepinbell/anim1.asm"
-VictreebelAnimationExtra: INCLUDE "gfx/pics/victreebel/anim1.asm"
-TentacoolAnimationExtra:  INCLUDE "gfx/pics/tentacool/anim1.asm"
-TentacruelAnimationExtra: INCLUDE "gfx/pics/tentacruel/anim1.asm"
-GeodudeAnimationExtra:    INCLUDE "gfx/pics/geodude/anim1.asm"
-GravelerAnimationExtra:   INCLUDE "gfx/pics/graveler/anim1.asm"
-GolemAnimationExtra:      INCLUDE "gfx/pics/golem/anim1.asm"
-PonytaAnimationExtra:     INCLUDE "gfx/pics/ponyta/anim1.asm"
-RapidashAnimationExtra:   INCLUDE "gfx/pics/rapidash/anim1.asm"
-SlowpokeAnimationExtra:   INCLUDE "gfx/pics/slowpoke/anim1.asm"
-SlowbroAnimationExtra:    INCLUDE "gfx/pics/slowbro/anim1.asm"
-MagnemiteAnimationExtra:  INCLUDE "gfx/pics/magnemite/anim1.asm"
-MagnetonAnimationExtra:   INCLUDE "gfx/pics/magneton/anim1.asm"
-FarfetchDAnimationExtra:  INCLUDE "gfx/pics/farfetch_d/anim1.asm"
-DoduoAnimationExtra:      INCLUDE "gfx/pics/doduo/anim1.asm"
-DodrioAnimationExtra:     INCLUDE "gfx/pics/dodrio/anim1.asm"
-SeelAnimationExtra:       INCLUDE "gfx/pics/seel/anim1.asm"
-DewgongAnimationExtra:    INCLUDE "gfx/pics/dewgong/anim1.asm"
-GrimerAnimationExtra:     INCLUDE "gfx/pics/grimer/anim1.asm"
-MukAnimationExtra:        INCLUDE "gfx/pics/muk/anim1.asm"
-ShellderAnimationExtra:   INCLUDE "gfx/pics/shellder/anim1.asm"
-CloysterAnimationExtra:   INCLUDE "gfx/pics/cloyster/anim1.asm"
-GastlyAnimationExtra:     INCLUDE "gfx/pics/gastly/anim1.asm"
-HaunterAnimationExtra:    INCLUDE "gfx/pics/haunter/anim1.asm"
-GengarAnimationExtra:     INCLUDE "gfx/pics/gengar/anim1.asm"
-OnixAnimationExtra:       INCLUDE "gfx/pics/onix/anim1.asm"
-DrowzeeAnimationExtra:    INCLUDE "gfx/pics/drowzee/anim1.asm"
-HypnoAnimationExtra:      INCLUDE "gfx/pics/hypno/anim1.asm"
-KrabbyAnimationExtra:     INCLUDE "gfx/pics/krabby/anim1.asm"
-KinglerAnimationExtra:    INCLUDE "gfx/pics/kingler/anim1.asm"
-VoltorbAnimationExtra:    INCLUDE "gfx/pics/voltorb/anim1.asm"
-ElectrodeAnimationExtra:  INCLUDE "gfx/pics/electrode/anim1.asm"
-ExeggcuteAnimationExtra:  INCLUDE "gfx/pics/exeggcute/anim1.asm"
-ExeggutorAnimationExtra:  INCLUDE "gfx/pics/exeggutor/anim1.asm"
-CuboneAnimationExtra:     INCLUDE "gfx/pics/cubone/anim1.asm"
-MarowakAnimationExtra:    INCLUDE "gfx/pics/marowak/anim1.asm"
-HitmonleeAnimationExtra:  INCLUDE "gfx/pics/hitmonlee/anim1.asm"
-HitmonchanAnimationExtra: INCLUDE "gfx/pics/hitmonchan/anim1.asm"
-LickitungAnimationExtra:  INCLUDE "gfx/pics/lickitung/anim1.asm"
-KoffingAnimationExtra:    INCLUDE "gfx/pics/koffing/anim1.asm"
-WeezingAnimationExtra:    INCLUDE "gfx/pics/weezing/anim1.asm"
-RhyhornAnimationExtra:    INCLUDE "gfx/pics/rhyhorn/anim1.asm"
-RhydonAnimationExtra:     INCLUDE "gfx/pics/rhydon/anim1.asm"
-ChanseyAnimationExtra:    INCLUDE "gfx/pics/chansey/anim1.asm"
-TangelaAnimationExtra:    INCLUDE "gfx/pics/tangela/anim1.asm"
-KangaskhanAnimationExtra: INCLUDE "gfx/pics/kangaskhan/anim1.asm"
-HorseaAnimationExtra:     INCLUDE "gfx/pics/horsea/anim1.asm"
-SeadraAnimationExtra:     INCLUDE "gfx/pics/seadra/anim1.asm"
-GoldeenAnimationExtra:    INCLUDE "gfx/pics/goldeen/anim1.asm"
-SeakingAnimationExtra:    INCLUDE "gfx/pics/seaking/anim1.asm"
-StaryuAnimationExtra:     INCLUDE "gfx/pics/staryu/anim1.asm"
-StarmieAnimationExtra:    INCLUDE "gfx/pics/starmie/anim1.asm"
-MrMimeAnimationExtra:     INCLUDE "gfx/pics/mr__mime/anim1.asm"
-ScytherAnimationExtra:    INCLUDE "gfx/pics/scyther/anim1.asm"
-JynxAnimationExtra:       INCLUDE "gfx/pics/jynx/anim1.asm"
-ElectabuzzAnimationExtra: INCLUDE "gfx/pics/electabuzz/anim1.asm"
-MagmarAnimationExtra:     INCLUDE "gfx/pics/magmar/anim1.asm"
-PinsirAnimationExtra:     INCLUDE "gfx/pics/pinsir/anim1.asm"
-TaurosAnimationExtra:     INCLUDE "gfx/pics/tauros/anim1.asm"
-MagikarpAnimationExtra:   INCLUDE "gfx/pics/magikarp/anim1.asm"
-GyaradosAnimationExtra:   INCLUDE "gfx/pics/gyarados/anim1.asm"
-LaprasAnimationExtra:     INCLUDE "gfx/pics/lapras/anim1.asm"
-DittoAnimationExtra:      INCLUDE "gfx/pics/ditto/anim1.asm"
-EeveeAnimationExtra:      INCLUDE "gfx/pics/eevee/anim1.asm"
-VaporeonAnimationExtra:   INCLUDE "gfx/pics/vaporeon/anim1.asm"
-JolteonAnimationExtra:    INCLUDE "gfx/pics/jolteon/anim1.asm"
-FlareonAnimationExtra:    INCLUDE "gfx/pics/flareon/anim1.asm"
-PorygonAnimationExtra:    INCLUDE "gfx/pics/porygon/anim1.asm"
-OmanyteAnimationExtra:    INCLUDE "gfx/pics/omanyte/anim1.asm"
-OmastarAnimationExtra:    INCLUDE "gfx/pics/omastar/anim1.asm"
-KabutoAnimationExtra:     INCLUDE "gfx/pics/kabuto/anim1.asm"
-KabutopsAnimationExtra:   INCLUDE "gfx/pics/kabutops/anim1.asm"
-AerodactylAnimationExtra: INCLUDE "gfx/pics/aerodactyl/anim1.asm"
-SnorlaxAnimationExtra:    INCLUDE "gfx/pics/snorlax/anim1.asm"
-ArticunoAnimationExtra:   INCLUDE "gfx/pics/articuno/anim1.asm"
-ZapdosAnimationExtra:     INCLUDE "gfx/pics/zapdos/anim1.asm"
-MoltresAnimationExtra:    INCLUDE "gfx/pics/moltres/anim1.asm"
-DratiniAnimationExtra:    INCLUDE "gfx/pics/dratini/anim1.asm"
-DragonairAnimationExtra:  INCLUDE "gfx/pics/dragonair/anim1.asm"
-DragoniteAnimationExtra:  INCLUDE "gfx/pics/dragonite/anim1.asm"
-MewtwoAnimationExtra:     INCLUDE "gfx/pics/mewtwo/anim1.asm"
-MewAnimationExtra:        INCLUDE "gfx/pics/mew/anim1.asm"
-ChikoritaAnimationExtra:  INCLUDE "gfx/pics/chikorita/anim1.asm"
-BayleefAnimationExtra:    INCLUDE "gfx/pics/bayleef/anim1.asm"
-MeganiumAnimationExtra:   INCLUDE "gfx/pics/meganium/anim1.asm"
-CyndaquilAnimationExtra:  INCLUDE "gfx/pics/cyndaquil/anim1.asm"
-QuilavaAnimationExtra:    INCLUDE "gfx/pics/quilava/anim1.asm"
-TyphlosionAnimationExtra: INCLUDE "gfx/pics/typhlosion/anim1.asm"
-TotodileAnimationExtra:   INCLUDE "gfx/pics/totodile/anim1.asm"
-CroconawAnimationExtra:   INCLUDE "gfx/pics/croconaw/anim1.asm"
-FeraligatrAnimationExtra: INCLUDE "gfx/pics/feraligatr/anim1.asm"
-SentretAnimationExtra:    INCLUDE "gfx/pics/sentret/anim1.asm"
-FurretAnimationExtra:     INCLUDE "gfx/pics/furret/anim1.asm"
-HoothootAnimationExtra:   INCLUDE "gfx/pics/hoothoot/anim1.asm"
-NoctowlAnimationExtra:    INCLUDE "gfx/pics/noctowl/anim1.asm"
-LedybaAnimationExtra:     INCLUDE "gfx/pics/ledyba/anim1.asm"
-LedianAnimationExtra:     INCLUDE "gfx/pics/ledian/anim1.asm"
-SpinarakAnimationExtra:   INCLUDE "gfx/pics/spinarak/anim1.asm"
-AriadosAnimationExtra:    INCLUDE "gfx/pics/ariados/anim1.asm"
-CrobatAnimationExtra:     INCLUDE "gfx/pics/crobat/anim1.asm"
-ChinchouAnimationExtra:   INCLUDE "gfx/pics/chinchou/anim1.asm"
-LanturnAnimationExtra:    INCLUDE "gfx/pics/lanturn/anim1.asm"
-PichuAnimationExtra:      INCLUDE "gfx/pics/pichu/anim1.asm"
-CleffaAnimationExtra:     INCLUDE "gfx/pics/cleffa/anim1.asm"
-IgglybuffAnimationExtra:  INCLUDE "gfx/pics/igglybuff/anim1.asm"
-TogepiAnimationExtra:     INCLUDE "gfx/pics/togepi/anim1.asm"
-TogeticAnimationExtra:    INCLUDE "gfx/pics/togetic/anim1.asm"
-NatuAnimationExtra:       INCLUDE "gfx/pics/natu/anim1.asm"
-XatuAnimationExtra:       INCLUDE "gfx/pics/xatu/anim1.asm"
-MareepAnimationExtra:     INCLUDE "gfx/pics/mareep/anim1.asm"
-FlaaffyAnimationExtra:    INCLUDE "gfx/pics/flaaffy/anim1.asm"
-AmpharosAnimationExtra:   INCLUDE "gfx/pics/ampharos/anim1.asm"
-BellossomAnimationExtra:  INCLUDE "gfx/pics/bellossom/anim1.asm"
-MarillAnimationExtra:     INCLUDE "gfx/pics/marill/anim1.asm"
-AzumarillAnimationExtra:  INCLUDE "gfx/pics/azumarill/anim1.asm"
-SudowoodoAnimationExtra:  INCLUDE "gfx/pics/sudowoodo/anim1.asm"
-PolitoedAnimationExtra:   INCLUDE "gfx/pics/politoed/anim1.asm"
-HoppipAnimationExtra:     INCLUDE "gfx/pics/hoppip/anim1.asm"
-SkiploomAnimationExtra:   INCLUDE "gfx/pics/skiploom/anim1.asm"
-JumpluffAnimationExtra:   INCLUDE "gfx/pics/jumpluff/anim1.asm"
-AipomAnimationExtra:      INCLUDE "gfx/pics/aipom/anim1.asm"
-SunkernAnimationExtra:    INCLUDE "gfx/pics/sunkern/anim1.asm"
-SunfloraAnimationExtra:   INCLUDE "gfx/pics/sunflora/anim1.asm"
-YanmaAnimationExtra:      INCLUDE "gfx/pics/yanma/anim1.asm"
-WooperAnimationExtra:     INCLUDE "gfx/pics/wooper/anim1.asm"
-QuagsireAnimationExtra:   INCLUDE "gfx/pics/quagsire/anim1.asm"
-EspeonAnimationExtra:     INCLUDE "gfx/pics/espeon/anim1.asm"
-UmbreonAnimationExtra:    INCLUDE "gfx/pics/umbreon/anim1.asm"
-MurkrowAnimationExtra:    INCLUDE "gfx/pics/murkrow/anim1.asm"
-SlowkingAnimationExtra:   INCLUDE "gfx/pics/slowking/anim1.asm"
-MisdreavusAnimationExtra: INCLUDE "gfx/pics/misdreavus/anim1.asm"
-UnownAnimationExtra:      INCLUDE "gfx/pics/unown/anim1.asm"
-WobbuffetAnimationExtra:  INCLUDE "gfx/pics/wobbuffet/anim1.asm"
-GirafarigAnimationExtra:  INCLUDE "gfx/pics/girafarig/anim1.asm"
-PinecoAnimationExtra:     INCLUDE "gfx/pics/pineco/anim1.asm"
-ForretressAnimationExtra: INCLUDE "gfx/pics/forretress/anim1.asm"
-DunsparceAnimationExtra:  INCLUDE "gfx/pics/dunsparce/anim1.asm"
-GligarAnimationExtra:     INCLUDE "gfx/pics/gligar/anim1.asm"
-SteelixAnimationExtra:    INCLUDE "gfx/pics/steelix/anim1.asm"
-SnubbullAnimationExtra:   INCLUDE "gfx/pics/snubbull/anim1.asm"
-GranbullAnimationExtra:   INCLUDE "gfx/pics/granbull/anim1.asm"
-QwilfishAnimationExtra:   INCLUDE "gfx/pics/qwilfish/anim1.asm"
-ScizorAnimationExtra:     INCLUDE "gfx/pics/scizor/anim1.asm"
-ShuckleAnimationExtra:    INCLUDE "gfx/pics/shuckle/anim1.asm"
-HeracrossAnimationExtra:  INCLUDE "gfx/pics/heracross/anim1.asm"
-SneaselAnimationExtra:    INCLUDE "gfx/pics/sneasel/anim1.asm"
-TeddiursaAnimationExtra:  INCLUDE "gfx/pics/teddiursa/anim1.asm"
-UrsaringAnimationExtra:   INCLUDE "gfx/pics/ursaring/anim1.asm"
-SlugmaAnimationExtra:     INCLUDE "gfx/pics/slugma/anim1.asm"
-MagcargoAnimationExtra:   INCLUDE "gfx/pics/magcargo/anim1.asm"
-SwinubAnimationExtra:     INCLUDE "gfx/pics/swinub/anim1.asm"
-PiloswineAnimationExtra:  INCLUDE "gfx/pics/piloswine/anim1.asm"
-CorsolaAnimationExtra:    INCLUDE "gfx/pics/corsola/anim1.asm"
-RemoraidAnimationExtra:   INCLUDE "gfx/pics/remoraid/anim1.asm"
-OctilleryAnimationExtra:  INCLUDE "gfx/pics/octillery/anim1.asm"
-DelibirdAnimationExtra:   INCLUDE "gfx/pics/delibird/anim1.asm"
-MantineAnimationExtra:    INCLUDE "gfx/pics/mantine/anim1.asm"
-SkarmoryAnimationExtra:   INCLUDE "gfx/pics/skarmory/anim1.asm"
-HoundourAnimationExtra:   INCLUDE "gfx/pics/houndour/anim1.asm"
-HoundoomAnimationExtra:   INCLUDE "gfx/pics/houndoom/anim1.asm"
-KingdraAnimationExtra:    INCLUDE "gfx/pics/kingdra/anim1.asm"
-PhanpyAnimationExtra:     INCLUDE "gfx/pics/phanpy/anim1.asm"
-DonphanAnimationExtra:    INCLUDE "gfx/pics/donphan/anim1.asm"
-Porygon2AnimationExtra:   INCLUDE "gfx/pics/porygon2/anim1.asm"
-StantlerAnimationExtra:   INCLUDE "gfx/pics/stantler/anim1.asm"
-SmeargleAnimationExtra:   INCLUDE "gfx/pics/smeargle/anim1.asm"
-TyrogueAnimationExtra:    INCLUDE "gfx/pics/tyrogue/anim1.asm"
-HitmontopAnimationExtra:  INCLUDE "gfx/pics/hitmontop/anim1.asm"
-SmoochumAnimationExtra:   INCLUDE "gfx/pics/smoochum/anim1.asm"
-ElekidAnimationExtra:     INCLUDE "gfx/pics/elekid/anim1.asm"
-MagbyAnimationExtra:      INCLUDE "gfx/pics/magby/anim1.asm"
-MiltankAnimationExtra:    INCLUDE "gfx/pics/miltank/anim1.asm"
-BlisseyAnimationExtra:    INCLUDE "gfx/pics/blissey/anim1.asm"
-RaikouAnimationExtra:     INCLUDE "gfx/pics/raikou/anim1.asm"
-EnteiAnimationExtra:      INCLUDE "gfx/pics/entei/anim1.asm"
-SuicuneAnimationExtra:    INCLUDE "gfx/pics/suicune/anim1.asm"
-LarvitarAnimationExtra:   INCLUDE "gfx/pics/larvitar/anim1.asm"
-PupitarAnimationExtra:    INCLUDE "gfx/pics/pupitar/anim1.asm"
-TyranitarAnimationExtra:  INCLUDE "gfx/pics/tyranitar/anim1.asm"
-LugiaAnimationExtra:      INCLUDE "gfx/pics/lugia/anim1.asm"
-HoOhAnimationExtra:       INCLUDE "gfx/pics/ho_oh/anim1.asm"
-CelebiAnimationExtra:     INCLUDE "gfx/pics/celebi/anim1.asm"
-EggAnimationExtra:        INCLUDE "gfx/pics/egg/anim1.asm"
diff --git a/gfx/pics/johto_frames.asm b/gfx/pics/johto_frames.asm
deleted file mode 100644
index 5bac4fde2..000000000
--- a/gfx/pics/johto_frames.asm
+++ /dev/null
@@ -1,102 +0,0 @@
-JohtoFrames:
-ChikoritaFrames:  INCLUDE "gfx/pics/chikorita/frames.asm"
-BayleefFrames:    INCLUDE "gfx/pics/bayleef/frames.asm"
-MeganiumFrames:   INCLUDE "gfx/pics/meganium/frames.asm"
-CyndaquilFrames:  INCLUDE "gfx/pics/cyndaquil/frames.asm"
-QuilavaFrames:    INCLUDE "gfx/pics/quilava/frames.asm"
-TyphlosionFrames: INCLUDE "gfx/pics/typhlosion/frames.asm"
-TotodileFrames:   INCLUDE "gfx/pics/totodile/frames.asm"
-CroconawFrames:   INCLUDE "gfx/pics/croconaw/frames.asm"
-FeraligatrFrames: INCLUDE "gfx/pics/feraligatr/frames.asm"
-SentretFrames:    INCLUDE "gfx/pics/sentret/frames.asm"
-FurretFrames:     INCLUDE "gfx/pics/furret/frames.asm"
-HoothootFrames:   INCLUDE "gfx/pics/hoothoot/frames.asm"
-NoctowlFrames:    INCLUDE "gfx/pics/noctowl/frames.asm"
-LedybaFrames:     INCLUDE "gfx/pics/ledyba/frames.asm"
-LedianFrames:     INCLUDE "gfx/pics/ledian/frames.asm"
-SpinarakFrames:   INCLUDE "gfx/pics/spinarak/frames.asm"
-AriadosFrames:    INCLUDE "gfx/pics/ariados/frames.asm"
-CrobatFrames:     INCLUDE "gfx/pics/crobat/frames.asm"
-ChinchouFrames:   INCLUDE "gfx/pics/chinchou/frames.asm"
-LanturnFrames:    INCLUDE "gfx/pics/lanturn/frames.asm"
-PichuFrames:      INCLUDE "gfx/pics/pichu/frames.asm"
-CleffaFrames:     INCLUDE "gfx/pics/cleffa/frames.asm"
-IgglybuffFrames:  INCLUDE "gfx/pics/igglybuff/frames.asm"
-TogepiFrames:     INCLUDE "gfx/pics/togepi/frames.asm"
-TogeticFrames:    INCLUDE "gfx/pics/togetic/frames.asm"
-NatuFrames:       INCLUDE "gfx/pics/natu/frames.asm"
-XatuFrames:       INCLUDE "gfx/pics/xatu/frames.asm"
-MareepFrames:     INCLUDE "gfx/pics/mareep/frames.asm"
-FlaaffyFrames:    INCLUDE "gfx/pics/flaaffy/frames.asm"
-AmpharosFrames:   INCLUDE "gfx/pics/ampharos/frames.asm"
-BellossomFrames:  INCLUDE "gfx/pics/bellossom/frames.asm"
-MarillFrames:     INCLUDE "gfx/pics/marill/frames.asm"
-AzumarillFrames:  INCLUDE "gfx/pics/azumarill/frames.asm"
-SudowoodoFrames:  INCLUDE "gfx/pics/sudowoodo/frames.asm"
-PolitoedFrames:   INCLUDE "gfx/pics/politoed/frames.asm"
-HoppipFrames:     INCLUDE "gfx/pics/hoppip/frames.asm"
-SkiploomFrames:   INCLUDE "gfx/pics/skiploom/frames.asm"
-JumpluffFrames:   INCLUDE "gfx/pics/jumpluff/frames.asm"
-AipomFrames:      INCLUDE "gfx/pics/aipom/frames.asm"
-SunkernFrames:    INCLUDE "gfx/pics/sunkern/frames.asm"
-SunfloraFrames:   INCLUDE "gfx/pics/sunflora/frames.asm"
-YanmaFrames:      INCLUDE "gfx/pics/yanma/frames.asm"
-WooperFrames:     INCLUDE "gfx/pics/wooper/frames.asm"
-QuagsireFrames:   INCLUDE "gfx/pics/quagsire/frames.asm"
-EspeonFrames:     INCLUDE "gfx/pics/espeon/frames.asm"
-UmbreonFrames:    INCLUDE "gfx/pics/umbreon/frames.asm"
-MurkrowFrames:    INCLUDE "gfx/pics/murkrow/frames.asm"
-SlowkingFrames:   INCLUDE "gfx/pics/slowking/frames.asm"
-MisdreavusFrames: INCLUDE "gfx/pics/misdreavus/frames.asm"
-UnownFrames:      INCLUDE "gfx/pics/unown/frames.asm"
-WobbuffetFrames:  INCLUDE "gfx/pics/wobbuffet/frames.asm"
-GirafarigFrames:  INCLUDE "gfx/pics/girafarig/frames.asm"
-PinecoFrames:     INCLUDE "gfx/pics/pineco/frames.asm"
-ForretressFrames: INCLUDE "gfx/pics/forretress/frames.asm"
-DunsparceFrames:  INCLUDE "gfx/pics/dunsparce/frames.asm"
-GligarFrames:     INCLUDE "gfx/pics/gligar/frames.asm"
-SteelixFrames:    INCLUDE "gfx/pics/steelix/frames.asm"
-SnubbullFrames:   INCLUDE "gfx/pics/snubbull/frames.asm"
-GranbullFrames:   INCLUDE "gfx/pics/granbull/frames.asm"
-QwilfishFrames:   INCLUDE "gfx/pics/qwilfish/frames.asm"
-ScizorFrames:     INCLUDE "gfx/pics/scizor/frames.asm"
-ShuckleFrames:    INCLUDE "gfx/pics/shuckle/frames.asm"
-HeracrossFrames:  INCLUDE "gfx/pics/heracross/frames.asm"
-SneaselFrames:    INCLUDE "gfx/pics/sneasel/frames.asm"
-TeddiursaFrames:  INCLUDE "gfx/pics/teddiursa/frames.asm"
-UrsaringFrames:   INCLUDE "gfx/pics/ursaring/frames.asm"
-SlugmaFrames:     INCLUDE "gfx/pics/slugma/frames.asm"
-MagcargoFrames:   INCLUDE "gfx/pics/magcargo/frames.asm"
-SwinubFrames:     INCLUDE "gfx/pics/swinub/frames.asm"
-PiloswineFrames:  INCLUDE "gfx/pics/piloswine/frames.asm"
-CorsolaFrames:    INCLUDE "gfx/pics/corsola/frames.asm"
-RemoraidFrames:   INCLUDE "gfx/pics/remoraid/frames.asm"
-OctilleryFrames:  INCLUDE "gfx/pics/octillery/frames.asm"
-DelibirdFrames:   INCLUDE "gfx/pics/delibird/frames.asm"
-MantineFrames:    INCLUDE "gfx/pics/mantine/frames.asm"
-SkarmoryFrames:   INCLUDE "gfx/pics/skarmory/frames.asm"
-HoundourFrames:   INCLUDE "gfx/pics/houndour/frames.asm"
-HoundoomFrames:   INCLUDE "gfx/pics/houndoom/frames.asm"
-KingdraFrames:    INCLUDE "gfx/pics/kingdra/frames.asm"
-PhanpyFrames:     INCLUDE "gfx/pics/phanpy/frames.asm"
-DonphanFrames:    INCLUDE "gfx/pics/donphan/frames.asm"
-Porygon2Frames:   INCLUDE "gfx/pics/porygon2/frames.asm"
-StantlerFrames:   INCLUDE "gfx/pics/stantler/frames.asm"
-SmeargleFrames:   INCLUDE "gfx/pics/smeargle/frames.asm"
-TyrogueFrames:    INCLUDE "gfx/pics/tyrogue/frames.asm"
-HitmontopFrames:  INCLUDE "gfx/pics/hitmontop/frames.asm"
-SmoochumFrames:   INCLUDE "gfx/pics/smoochum/frames.asm"
-ElekidFrames:     INCLUDE "gfx/pics/elekid/frames.asm"
-MagbyFrames:      INCLUDE "gfx/pics/magby/frames.asm"
-MiltankFrames:    INCLUDE "gfx/pics/miltank/frames.asm"
-BlisseyFrames:    INCLUDE "gfx/pics/blissey/frames.asm"
-RaikouFrames:     INCLUDE "gfx/pics/raikou/frames.asm"
-EnteiFrames:      INCLUDE "gfx/pics/entei/frames.asm"
-SuicuneFrames:    INCLUDE "gfx/pics/suicune/frames.asm"
-LarvitarFrames:   INCLUDE "gfx/pics/larvitar/frames.asm"
-PupitarFrames:    INCLUDE "gfx/pics/pupitar/frames.asm"
-TyranitarFrames:  INCLUDE "gfx/pics/tyranitar/frames.asm"
-LugiaFrames:      INCLUDE "gfx/pics/lugia/frames.asm"
-HoOhFrames:       INCLUDE "gfx/pics/ho_oh/frames.asm"
-CelebiFrames:     INCLUDE "gfx/pics/celebi/frames.asm"
-EggFrames:        INCLUDE "gfx/pics/egg/frames.asm"
diff --git a/gfx/pics/kanto_frames.asm b/gfx/pics/kanto_frames.asm
deleted file mode 100644
index 2cb87b2b9..000000000
--- a/gfx/pics/kanto_frames.asm
+++ /dev/null
@@ -1,152 +0,0 @@
-KantoFrames:
-BulbasaurFrames:  INCLUDE "gfx/pics/bulbasaur/frames.asm"
-IvysaurFrames:    INCLUDE "gfx/pics/ivysaur/frames.asm"
-VenusaurFrames:   INCLUDE "gfx/pics/venusaur/frames.asm"
-CharmanderFrames: INCLUDE "gfx/pics/charmander/frames.asm"
-CharmeleonFrames: INCLUDE "gfx/pics/charmeleon/frames.asm"
-CharizardFrames:  INCLUDE "gfx/pics/charizard/frames.asm"
-SquirtleFrames:   INCLUDE "gfx/pics/squirtle/frames.asm"
-WartortleFrames:  INCLUDE "gfx/pics/wartortle/frames.asm"
-BlastoiseFrames:  INCLUDE "gfx/pics/blastoise/frames.asm"
-CaterpieFrames:   INCLUDE "gfx/pics/caterpie/frames.asm"
-MetapodFrames:    INCLUDE "gfx/pics/metapod/frames.asm"
-ButterfreeFrames: INCLUDE "gfx/pics/butterfree/frames.asm"
-WeedleFrames:     INCLUDE "gfx/pics/weedle/frames.asm"
-KakunaFrames:     INCLUDE "gfx/pics/kakuna/frames.asm"
-BeedrillFrames:   INCLUDE "gfx/pics/beedrill/frames.asm"
-PidgeyFrames:     INCLUDE "gfx/pics/pidgey/frames.asm"
-PidgeottoFrames:  INCLUDE "gfx/pics/pidgeotto/frames.asm"
-PidgeotFrames:    INCLUDE "gfx/pics/pidgeot/frames.asm"
-RattataFrames:    INCLUDE "gfx/pics/rattata/frames.asm"
-RaticateFrames:   INCLUDE "gfx/pics/raticate/frames.asm"
-SpearowFrames:    INCLUDE "gfx/pics/spearow/frames.asm"
-FearowFrames:     INCLUDE "gfx/pics/fearow/frames.asm"
-EkansFrames:      INCLUDE "gfx/pics/ekans/frames.asm"
-ArbokFrames:      INCLUDE "gfx/pics/arbok/frames.asm"
-PikachuFrames:    INCLUDE "gfx/pics/pikachu/frames.asm"
-RaichuFrames:     INCLUDE "gfx/pics/raichu/frames.asm"
-SandshrewFrames:  INCLUDE "gfx/pics/sandshrew/frames.asm"
-SandslashFrames:  INCLUDE "gfx/pics/sandslash/frames.asm"
-NidoranFFrames:   INCLUDE "gfx/pics/nidoran_f/frames.asm"
-NidorinaFrames:   INCLUDE "gfx/pics/nidorina/frames.asm"
-NidoqueenFrames:  INCLUDE "gfx/pics/nidoqueen/frames.asm"
-NidoranMFrames:   INCLUDE "gfx/pics/nidoran_m/frames.asm"
-NidorinoFrames:   INCLUDE "gfx/pics/nidorino/frames.asm"
-NidokingFrames:   INCLUDE "gfx/pics/nidoking/frames.asm"
-ClefairyFrames:   INCLUDE "gfx/pics/clefairy/frames.asm"
-ClefableFrames:   INCLUDE "gfx/pics/clefable/frames.asm"
-VulpixFrames:     INCLUDE "gfx/pics/vulpix/frames.asm"
-NinetalesFrames:  INCLUDE "gfx/pics/ninetales/frames.asm"
-JigglypuffFrames: INCLUDE "gfx/pics/jigglypuff/frames.asm"
-WigglytuffFrames: INCLUDE "gfx/pics/wigglytuff/frames.asm"
-ZubatFrames:      INCLUDE "gfx/pics/zubat/frames.asm"
-GolbatFrames:     INCLUDE "gfx/pics/golbat/frames.asm"
-OddishFrames:     INCLUDE "gfx/pics/oddish/frames.asm"
-GloomFrames:      INCLUDE "gfx/pics/gloom/frames.asm"
-VileplumeFrames:  INCLUDE "gfx/pics/vileplume/frames.asm"
-ParasFrames:      INCLUDE "gfx/pics/paras/frames.asm"
-ParasectFrames:   INCLUDE "gfx/pics/parasect/frames.asm"
-VenonatFrames:    INCLUDE "gfx/pics/venonat/frames.asm"
-VenomothFrames:   INCLUDE "gfx/pics/venomoth/frames.asm"
-DiglettFrames:    INCLUDE "gfx/pics/diglett/frames.asm"
-DugtrioFrames:    INCLUDE "gfx/pics/dugtrio/frames.asm"
-MeowthFrames:     INCLUDE "gfx/pics/meowth/frames.asm"
-PersianFrames:    INCLUDE "gfx/pics/persian/frames.asm"
-PsyduckFrames:    INCLUDE "gfx/pics/psyduck/frames.asm"
-GolduckFrames:    INCLUDE "gfx/pics/golduck/frames.asm"
-MankeyFrames:     INCLUDE "gfx/pics/mankey/frames.asm"
-PrimeapeFrames:   INCLUDE "gfx/pics/primeape/frames.asm"
-GrowlitheFrames:  INCLUDE "gfx/pics/growlithe/frames.asm"
-ArcanineFrames:   INCLUDE "gfx/pics/arcanine/frames.asm"
-PoliwagFrames:    INCLUDE "gfx/pics/poliwag/frames.asm"
-PoliwhirlFrames:  INCLUDE "gfx/pics/poliwhirl/frames.asm"
-PoliwrathFrames:  INCLUDE "gfx/pics/poliwrath/frames.asm"
-AbraFrames:       INCLUDE "gfx/pics/abra/frames.asm"
-KadabraFrames:    INCLUDE "gfx/pics/kadabra/frames.asm"
-AlakazamFrames:   INCLUDE "gfx/pics/alakazam/frames.asm"
-MachopFrames:     INCLUDE "gfx/pics/machop/frames.asm"
-MachokeFrames:    INCLUDE "gfx/pics/machoke/frames.asm"
-MachampFrames:    INCLUDE "gfx/pics/machamp/frames.asm"
-BellsproutFrames: INCLUDE "gfx/pics/bellsprout/frames.asm"
-WeepinbellFrames: INCLUDE "gfx/pics/weepinbell/frames.asm"
-VictreebelFrames: INCLUDE "gfx/pics/victreebel/frames.asm"
-TentacoolFrames:  INCLUDE "gfx/pics/tentacool/frames.asm"
-TentacruelFrames: INCLUDE "gfx/pics/tentacruel/frames.asm"
-GeodudeFrames:    INCLUDE "gfx/pics/geodude/frames.asm"
-GravelerFrames:   INCLUDE "gfx/pics/graveler/frames.asm"
-GolemFrames:      INCLUDE "gfx/pics/golem/frames.asm"
-PonytaFrames:     INCLUDE "gfx/pics/ponyta/frames.asm"
-RapidashFrames:   INCLUDE "gfx/pics/rapidash/frames.asm"
-SlowpokeFrames:   INCLUDE "gfx/pics/slowpoke/frames.asm"
-SlowbroFrames:    INCLUDE "gfx/pics/slowbro/frames.asm"
-MagnemiteFrames:  INCLUDE "gfx/pics/magnemite/frames.asm"
-MagnetonFrames:   INCLUDE "gfx/pics/magneton/frames.asm"
-FarfetchDFrames:  INCLUDE "gfx/pics/farfetch_d/frames.asm"
-DoduoFrames:      INCLUDE "gfx/pics/doduo/frames.asm"
-DodrioFrames:     INCLUDE "gfx/pics/dodrio/frames.asm"
-SeelFrames:       INCLUDE "gfx/pics/seel/frames.asm"
-DewgongFrames:    INCLUDE "gfx/pics/dewgong/frames.asm"
-GrimerFrames:     INCLUDE "gfx/pics/grimer/frames.asm"
-MukFrames:        INCLUDE "gfx/pics/muk/frames.asm"
-ShellderFrames:   INCLUDE "gfx/pics/shellder/frames.asm"
-CloysterFrames:   INCLUDE "gfx/pics/cloyster/frames.asm"
-GastlyFrames:     INCLUDE "gfx/pics/gastly/frames.asm"
-HaunterFrames:    INCLUDE "gfx/pics/haunter/frames.asm"
-GengarFrames:     INCLUDE "gfx/pics/gengar/frames.asm"
-OnixFrames:       INCLUDE "gfx/pics/onix/frames.asm"
-DrowzeeFrames:    INCLUDE "gfx/pics/drowzee/frames.asm"
-HypnoFrames:      INCLUDE "gfx/pics/hypno/frames.asm"
-KrabbyFrames:     INCLUDE "gfx/pics/krabby/frames.asm"
-KinglerFrames:    INCLUDE "gfx/pics/kingler/frames.asm"
-VoltorbFrames:    INCLUDE "gfx/pics/voltorb/frames.asm"
-ElectrodeFrames:  INCLUDE "gfx/pics/electrode/frames.asm"
-ExeggcuteFrames:  INCLUDE "gfx/pics/exeggcute/frames.asm"
-ExeggutorFrames:  INCLUDE "gfx/pics/exeggutor/frames.asm"
-CuboneFrames:     INCLUDE "gfx/pics/cubone/frames.asm"
-MarowakFrames:    INCLUDE "gfx/pics/marowak/frames.asm"
-HitmonleeFrames:  INCLUDE "gfx/pics/hitmonlee/frames.asm"
-HitmonchanFrames: INCLUDE "gfx/pics/hitmonchan/frames.asm"
-LickitungFrames:  INCLUDE "gfx/pics/lickitung/frames.asm"
-KoffingFrames:    INCLUDE "gfx/pics/koffing/frames.asm"
-WeezingFrames:    INCLUDE "gfx/pics/weezing/frames.asm"
-RhyhornFrames:    INCLUDE "gfx/pics/rhyhorn/frames.asm"
-RhydonFrames:     INCLUDE "gfx/pics/rhydon/frames.asm"
-ChanseyFrames:    INCLUDE "gfx/pics/chansey/frames.asm"
-TangelaFrames:    INCLUDE "gfx/pics/tangela/frames.asm"
-KangaskhanFrames: INCLUDE "gfx/pics/kangaskhan/frames.asm"
-HorseaFrames:     INCLUDE "gfx/pics/horsea/frames.asm"
-SeadraFrames:     INCLUDE "gfx/pics/seadra/frames.asm"
-GoldeenFrames:    INCLUDE "gfx/pics/goldeen/frames.asm"
-SeakingFrames:    INCLUDE "gfx/pics/seaking/frames.asm"
-StaryuFrames:     INCLUDE "gfx/pics/staryu/frames.asm"
-StarmieFrames:    INCLUDE "gfx/pics/starmie/frames.asm"
-MrMimeFrames:     INCLUDE "gfx/pics/mr__mime/frames.asm"
-ScytherFrames:    INCLUDE "gfx/pics/scyther/frames.asm"
-JynxFrames:       INCLUDE "gfx/pics/jynx/frames.asm"
-ElectabuzzFrames: INCLUDE "gfx/pics/electabuzz/frames.asm"
-MagmarFrames:     INCLUDE "gfx/pics/magmar/frames.asm"
-PinsirFrames:     INCLUDE "gfx/pics/pinsir/frames.asm"
-TaurosFrames:     INCLUDE "gfx/pics/tauros/frames.asm"
-MagikarpFrames:   INCLUDE "gfx/pics/magikarp/frames.asm"
-GyaradosFrames:   INCLUDE "gfx/pics/gyarados/frames.asm"
-LaprasFrames:     INCLUDE "gfx/pics/lapras/frames.asm"
-DittoFrames:      INCLUDE "gfx/pics/ditto/frames.asm"
-EeveeFrames:      INCLUDE "gfx/pics/eevee/frames.asm"
-VaporeonFrames:   INCLUDE "gfx/pics/vaporeon/frames.asm"
-JolteonFrames:    INCLUDE "gfx/pics/jolteon/frames.asm"
-FlareonFrames:    INCLUDE "gfx/pics/flareon/frames.asm"
-PorygonFrames:    INCLUDE "gfx/pics/porygon/frames.asm"
-OmanyteFrames:    INCLUDE "gfx/pics/omanyte/frames.asm"
-OmastarFrames:    INCLUDE "gfx/pics/omastar/frames.asm"
-KabutoFrames:     INCLUDE "gfx/pics/kabuto/frames.asm"
-KabutopsFrames:   INCLUDE "gfx/pics/kabutops/frames.asm"
-AerodactylFrames: INCLUDE "gfx/pics/aerodactyl/frames.asm"
-SnorlaxFrames:    INCLUDE "gfx/pics/snorlax/frames.asm"
-ArticunoFrames:   INCLUDE "gfx/pics/articuno/frames.asm"
-ZapdosFrames:     INCLUDE "gfx/pics/zapdos/frames.asm"
-MoltresFrames:    INCLUDE "gfx/pics/moltres/frames.asm"
-DratiniFrames:    INCLUDE "gfx/pics/dratini/frames.asm"
-DragonairFrames:  INCLUDE "gfx/pics/dragonair/frames.asm"
-DragoniteFrames:  INCLUDE "gfx/pics/dragonite/frames.asm"
-MewtwoFrames:     INCLUDE "gfx/pics/mewtwo/frames.asm"
-MewFrames:        INCLUDE "gfx/pics/mew/frames.asm"
diff --git a/gfx/pics/palette_pointers.asm b/gfx/pics/palette_pointers.asm
deleted file mode 100644
index 7756e8e7e..000000000
--- a/gfx/pics/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/pics/bulbasaur/normal.pal"
-BulbasaurShinyPalette:  INCLUDE "gfx/pics/bulbasaur/shiny.pal"
-IvysaurPalette:         INCLUDE "gfx/pics/ivysaur/normal.pal"
-IvysaurShinyPalette:    INCLUDE "gfx/pics/ivysaur/shiny.pal"
-VenusaurPalette:        INCLUDE "gfx/pics/venusaur/normal.pal"
-VenusaurShinyPalette:   INCLUDE "gfx/pics/venusaur/shiny.pal"
-CharmanderPalette:      INCLUDE "gfx/pics/charmander/normal.pal"
-CharmanderShinyPalette: INCLUDE "gfx/pics/charmander/shiny.pal"
-CharmeleonPalette:      INCLUDE "gfx/pics/charmeleon/normal.pal"
-CharmeleonShinyPalette: INCLUDE "gfx/pics/charmeleon/shiny.pal"
-CharizardPalette:       INCLUDE "gfx/pics/charizard/normal.pal"
-CharizardShinyPalette:  INCLUDE "gfx/pics/charizard/shiny.pal"
-SquirtlePalette:        INCLUDE "gfx/pics/squirtle/normal.pal"
-SquirtleShinyPalette:   INCLUDE "gfx/pics/squirtle/shiny.pal"
-WartortlePalette:       INCLUDE "gfx/pics/wartortle/normal.pal"
-WartortleShinyPalette:  INCLUDE "gfx/pics/wartortle/shiny.pal"
-BlastoisePalette:       INCLUDE "gfx/pics/blastoise/normal.pal"
-BlastoiseShinyPalette:  INCLUDE "gfx/pics/blastoise/shiny.pal"
-CaterpiePalette:        INCLUDE "gfx/pics/caterpie/normal.pal"
-CaterpieShinyPalette:   INCLUDE "gfx/pics/caterpie/shiny.pal"
-MetapodPalette:         INCLUDE "gfx/pics/metapod/normal.pal"
-MetapodShinyPalette:    INCLUDE "gfx/pics/metapod/shiny.pal"
-ButterfreePalette:      INCLUDE "gfx/pics/butterfree/normal.pal"
-ButterfreeShinyPalette: INCLUDE "gfx/pics/butterfree/shiny.pal"
-WeedlePalette:          INCLUDE "gfx/pics/weedle/normal.pal"
-WeedleShinyPalette:     INCLUDE "gfx/pics/weedle/shiny.pal"
-KakunaPalette:          INCLUDE "gfx/pics/kakuna/normal.pal"
-KakunaShinyPalette:     INCLUDE "gfx/pics/kakuna/shiny.pal"
-BeedrillPalette:        INCLUDE "gfx/pics/beedrill/normal.pal"
-BeedrillShinyPalette:   INCLUDE "gfx/pics/beedrill/shiny.pal"
-PidgeyPalette:          INCLUDE "gfx/pics/pidgey/normal.pal"
-PidgeyShinyPalette:     INCLUDE "gfx/pics/pidgey/shiny.pal"
-PidgeottoPalette:       INCLUDE "gfx/pics/pidgeotto/normal.pal"
-PidgeottoShinyPalette:  INCLUDE "gfx/pics/pidgeotto/shiny.pal"
-PidgeotPalette:         INCLUDE "gfx/pics/pidgeot/normal.pal"
-PidgeotShinyPalette:    INCLUDE "gfx/pics/pidgeot/shiny.pal"
-RattataPalette:         INCLUDE "gfx/pics/rattata/normal.pal"
-RattataShinyPalette:    INCLUDE "gfx/pics/rattata/shiny.pal"
-RaticatePalette:        INCLUDE "gfx/pics/raticate/normal.pal"
-RaticateShinyPalette:   INCLUDE "gfx/pics/raticate/shiny.pal"
-SpearowPalette:         INCLUDE "gfx/pics/spearow/normal.pal"
-SpearowShinyPalette:    INCLUDE "gfx/pics/spearow/shiny.pal"
-FearowPalette:          INCLUDE "gfx/pics/fearow/normal.pal"
-FearowShinyPalette:     INCLUDE "gfx/pics/fearow/shiny.pal"
-EkansPalette:           INCLUDE "gfx/pics/ekans/normal.pal"
-EkansShinyPalette:      INCLUDE "gfx/pics/ekans/shiny.pal"
-ArbokPalette:           INCLUDE "gfx/pics/arbok/normal.pal"
-ArbokShinyPalette:      INCLUDE "gfx/pics/arbok/shiny.pal"
-PikachuPalette:         INCLUDE "gfx/pics/pikachu/normal.pal"
-PikachuShinyPalette:    INCLUDE "gfx/pics/pikachu/shiny.pal"
-RaichuPalette:          INCLUDE "gfx/pics/raichu/normal.pal"
-RaichuShinyPalette:     INCLUDE "gfx/pics/raichu/shiny.pal"
-SandshrewPalette:       INCLUDE "gfx/pics/sandshrew/normal.pal"
-SandshrewShinyPalette:  INCLUDE "gfx/pics/sandshrew/shiny.pal"
-SandslashPalette:       INCLUDE "gfx/pics/sandslash/normal.pal"
-SandslashShinyPalette:  INCLUDE "gfx/pics/sandslash/shiny.pal"
-NidoranFPalette:        INCLUDE "gfx/pics/nidoran_f/normal.pal"
-NidoranFShinyPalette:   INCLUDE "gfx/pics/nidoran_f/shiny.pal"
-NidorinaPalette:        INCLUDE "gfx/pics/nidorina/normal.pal"
-NidorinaShinyPalette:   INCLUDE "gfx/pics/nidorina/shiny.pal"
-NidoqueenPalette:       INCLUDE "gfx/pics/nidoqueen/normal.pal"
-NidoqueenShinyPalette:  INCLUDE "gfx/pics/nidoqueen/shiny.pal"
-NidoranMPalette:        INCLUDE "gfx/pics/nidoran_m/normal.pal"
-NidoranMShinyPalette:   INCLUDE "gfx/pics/nidoran_m/shiny.pal"
-NidorinoPalette:        INCLUDE "gfx/pics/nidorino/normal.pal"
-NidorinoShinyPalette:   INCLUDE "gfx/pics/nidorino/shiny.pal"
-NidokingPalette:        INCLUDE "gfx/pics/nidoking/normal.pal"
-NidokingShinyPalette:   INCLUDE "gfx/pics/nidoking/shiny.pal"
-ClefairyPalette:        INCLUDE "gfx/pics/clefairy/normal.pal"
-ClefairyShinyPalette:   INCLUDE "gfx/pics/clefairy/shiny.pal"
-ClefablePalette:        INCLUDE "gfx/pics/clefable/normal.pal"
-ClefableShinyPalette:   INCLUDE "gfx/pics/clefable/shiny.pal"
-VulpixPalette:          INCLUDE "gfx/pics/vulpix/normal.pal"
-VulpixShinyPalette:     INCLUDE "gfx/pics/vulpix/shiny.pal"
-NinetalesPalette:       INCLUDE "gfx/pics/ninetales/normal.pal"
-NinetalesShinyPalette:  INCLUDE "gfx/pics/ninetales/shiny.pal"
-JigglypuffPalette:      INCLUDE "gfx/pics/jigglypuff/normal.pal"
-JigglypuffShinyPalette: INCLUDE "gfx/pics/jigglypuff/shiny.pal"
-WigglytuffPalette:      INCLUDE "gfx/pics/wigglytuff/normal.pal"
-WigglytuffShinyPalette: INCLUDE "gfx/pics/wigglytuff/shiny.pal"
-ZubatPalette:           INCLUDE "gfx/pics/zubat/normal.pal"
-ZubatShinyPalette:      INCLUDE "gfx/pics/zubat/shiny.pal"
-GolbatPalette:          INCLUDE "gfx/pics/golbat/normal.pal"
-GolbatShinyPalette:     INCLUDE "gfx/pics/golbat/shiny.pal"
-OddishPalette:          INCLUDE "gfx/pics/oddish/normal.pal"
-OddishShinyPalette:     INCLUDE "gfx/pics/oddish/shiny.pal"
-GloomPalette:           INCLUDE "gfx/pics/gloom/normal.pal"
-GloomShinyPalette:      INCLUDE "gfx/pics/gloom/shiny.pal"
-VileplumePalette:       INCLUDE "gfx/pics/vileplume/normal.pal"
-VileplumeShinyPalette:  INCLUDE "gfx/pics/vileplume/shiny.pal"
-ParasPalette:           INCLUDE "gfx/pics/paras/normal.pal"
-ParasShinyPalette:      INCLUDE "gfx/pics/paras/shiny.pal"
-ParasectPalette:        INCLUDE "gfx/pics/parasect/normal.pal"
-ParasectShinyPalette:   INCLUDE "gfx/pics/parasect/shiny.pal"
-VenonatPalette:         INCLUDE "gfx/pics/venonat/normal.pal"
-VenonatShinyPalette:    INCLUDE "gfx/pics/venonat/shiny.pal"
-VenomothPalette:        INCLUDE "gfx/pics/venomoth/normal.pal"
-VenomothShinyPalette:   INCLUDE "gfx/pics/venomoth/shiny.pal"
-DiglettPalette:         INCLUDE "gfx/pics/diglett/normal.pal"
-DiglettShinyPalette:    INCLUDE "gfx/pics/diglett/shiny.pal"
-DugtrioPalette:         INCLUDE "gfx/pics/dugtrio/normal.pal"
-DugtrioShinyPalette:    INCLUDE "gfx/pics/dugtrio/shiny.pal"
-MeowthPalette:          INCLUDE "gfx/pics/meowth/normal.pal"
-MeowthShinyPalette:     INCLUDE "gfx/pics/meowth/shiny.pal"
-PersianPalette:         INCLUDE "gfx/pics/persian/normal.pal"
-PersianShinyPalette:    INCLUDE "gfx/pics/persian/shiny.pal"
-PsyduckPalette:         INCLUDE "gfx/pics/psyduck/normal.pal"
-PsyduckShinyPalette:    INCLUDE "gfx/pics/psyduck/shiny.pal"
-GolduckPalette:         INCLUDE "gfx/pics/golduck/normal.pal"
-GolduckShinyPalette:    INCLUDE "gfx/pics/golduck/shiny.pal"
-MankeyPalette:          INCLUDE "gfx/pics/mankey/normal.pal"
-MankeyShinyPalette:     INCLUDE "gfx/pics/mankey/shiny.pal"
-PrimeapePalette:        INCLUDE "gfx/pics/primeape/normal.pal"
-PrimeapeShinyPalette:   INCLUDE "gfx/pics/primeape/shiny.pal"
-GrowlithePalette:       INCLUDE "gfx/pics/growlithe/normal.pal"
-GrowlitheShinyPalette:  INCLUDE "gfx/pics/growlithe/shiny.pal"
-ArcaninePalette:        INCLUDE "gfx/pics/arcanine/normal.pal"
-ArcanineShinyPalette:   INCLUDE "gfx/pics/arcanine/shiny.pal"
-PoliwagPalette:         INCLUDE "gfx/pics/poliwag/normal.pal"
-PoliwagShinyPalette:    INCLUDE "gfx/pics/poliwag/shiny.pal"
-PoliwhirlPalette:       INCLUDE "gfx/pics/poliwhirl/normal.pal"
-PoliwhirlShinyPalette:  INCLUDE "gfx/pics/poliwhirl/shiny.pal"
-PoliwrathPalette:       INCLUDE "gfx/pics/poliwrath/normal.pal"
-PoliwrathShinyPalette:  INCLUDE "gfx/pics/poliwrath/shiny.pal"
-AbraPalette:            INCLUDE "gfx/pics/abra/normal.pal"
-AbraShinyPalette:       INCLUDE "gfx/pics/abra/shiny.pal"
-KadabraPalette:         INCLUDE "gfx/pics/kadabra/normal.pal"
-KadabraShinyPalette:    INCLUDE "gfx/pics/kadabra/shiny.pal"
-AlakazamPalette:        INCLUDE "gfx/pics/alakazam/normal.pal"
-AlakazamShinyPalette:   INCLUDE "gfx/pics/alakazam/shiny.pal"
-MachopPalette:          INCLUDE "gfx/pics/machop/normal.pal"
-MachopShinyPalette:     INCLUDE "gfx/pics/machop/shiny.pal"
-MachokePalette:         INCLUDE "gfx/pics/machoke/normal.pal"
-MachokeShinyPalette:    INCLUDE "gfx/pics/machoke/shiny.pal"
-MachampPalette:         INCLUDE "gfx/pics/machamp/normal.pal"
-MachampShinyPalette:    INCLUDE "gfx/pics/machamp/shiny.pal"
-BellsproutPalette:      INCLUDE "gfx/pics/bellsprout/normal.pal"
-BellsproutShinyPalette: INCLUDE "gfx/pics/bellsprout/shiny.pal"
-WeepinbellPalette:      INCLUDE "gfx/pics/weepinbell/normal.pal"
-WeepinbellShinyPalette: INCLUDE "gfx/pics/weepinbell/shiny.pal"
-VictreebelPalette:      INCLUDE "gfx/pics/victreebel/normal.pal"
-VictreebelShinyPalette: INCLUDE "gfx/pics/victreebel/shiny.pal"
-TentacoolPalette:       INCLUDE "gfx/pics/tentacool/normal.pal"
-TentacoolShinyPalette:  INCLUDE "gfx/pics/tentacool/shiny.pal"
-TentacruelPalette:      INCLUDE "gfx/pics/tentacruel/normal.pal"
-TentacruelShinyPalette: INCLUDE "gfx/pics/tentacruel/shiny.pal"
-GeodudePalette:         INCLUDE "gfx/pics/geodude/normal.pal"
-GeodudeShinyPalette:    INCLUDE "gfx/pics/geodude/shiny.pal"
-GravelerPalette:        INCLUDE "gfx/pics/graveler/normal.pal"
-GravelerShinyPalette:   INCLUDE "gfx/pics/graveler/shiny.pal"
-GolemPalette:           INCLUDE "gfx/pics/golem/normal.pal"
-GolemShinyPalette:      INCLUDE "gfx/pics/golem/shiny.pal"
-PonytaPalette:          INCLUDE "gfx/pics/ponyta/normal.pal"
-PonytaShinyPalette:     INCLUDE "gfx/pics/ponyta/shiny.pal"
-RapidashPalette:        INCLUDE "gfx/pics/rapidash/normal.pal"
-RapidashShinyPalette:   INCLUDE "gfx/pics/rapidash/shiny.pal"
-SlowpokePalette:        INCLUDE "gfx/pics/slowpoke/normal.pal"
-SlowpokeShinyPalette:   INCLUDE "gfx/pics/slowpoke/shiny.pal"
-SlowbroPalette:         INCLUDE "gfx/pics/slowbro/normal.pal"
-SlowbroShinyPalette:    INCLUDE "gfx/pics/slowbro/shiny.pal"
-MagnemitePalette:       INCLUDE "gfx/pics/magnemite/normal.pal"
-MagnemiteShinyPalette:  INCLUDE "gfx/pics/magnemite/shiny.pal"
-MagnetonPalette:        INCLUDE "gfx/pics/magneton/normal.pal"
-MagnetonShinyPalette:   INCLUDE "gfx/pics/magneton/shiny.pal"
-FarfetchDPalette:       INCLUDE "gfx/pics/farfetch_d/normal.pal"
-FarfetchDShinyPalette:  INCLUDE "gfx/pics/farfetch_d/shiny.pal"
-DoduoPalette:           INCLUDE "gfx/pics/doduo/normal.pal"
-DoduoShinyPalette:      INCLUDE "gfx/pics/doduo/shiny.pal"
-DodrioPalette:          INCLUDE "gfx/pics/dodrio/normal.pal"
-DodrioShinyPalette:     INCLUDE "gfx/pics/dodrio/shiny.pal"
-SeelPalette:            INCLUDE "gfx/pics/seel/normal.pal"
-SeelShinyPalette:       INCLUDE "gfx/pics/seel/shiny.pal"
-DewgongPalette:         INCLUDE "gfx/pics/dewgong/normal.pal"
-DewgongShinyPalette:    INCLUDE "gfx/pics/dewgong/shiny.pal"
-GrimerPalette:          INCLUDE "gfx/pics/grimer/normal.pal"
-GrimerShinyPalette:     INCLUDE "gfx/pics/grimer/shiny.pal"
-MukPalette:             INCLUDE "gfx/pics/muk/normal.pal"
-MukShinyPalette:        INCLUDE "gfx/pics/muk/shiny.pal"
-ShellderPalette:        INCLUDE "gfx/pics/shellder/normal.pal"
-ShellderShinyPalette:   INCLUDE "gfx/pics/shellder/shiny.pal"
-CloysterPalette:        INCLUDE "gfx/pics/cloyster/normal.pal"
-CloysterShinyPalette:   INCLUDE "gfx/pics/cloyster/shiny.pal"
-GastlyPalette:          INCLUDE "gfx/pics/gastly/normal.pal"
-GastlyShinyPalette:     INCLUDE "gfx/pics/gastly/shiny.pal"
-HaunterPalette:         INCLUDE "gfx/pics/haunter/normal.pal"
-HaunterShinyPalette:    INCLUDE "gfx/pics/haunter/shiny.pal"
-GengarPalette:          INCLUDE "gfx/pics/gengar/normal.pal"
-GengarShinyPalette:     INCLUDE "gfx/pics/gengar/shiny.pal"
-OnixPalette:            INCLUDE "gfx/pics/onix/normal.pal"
-OnixShinyPalette:       INCLUDE "gfx/pics/onix/shiny.pal"
-DrowzeePalette:         INCLUDE "gfx/pics/drowzee/normal.pal"
-DrowzeeShinyPalette:    INCLUDE "gfx/pics/drowzee/shiny.pal"
-HypnoPalette:           INCLUDE "gfx/pics/hypno/normal.pal"
-HypnoShinyPalette:      INCLUDE "gfx/pics/hypno/shiny.pal"
-KrabbyPalette:          INCLUDE "gfx/pics/krabby/normal.pal"
-KrabbyShinyPalette:     INCLUDE "gfx/pics/krabby/shiny.pal"
-KinglerPalette:         INCLUDE "gfx/pics/kingler/normal.pal"
-KinglerShinyPalette:    INCLUDE "gfx/pics/kingler/shiny.pal"
-VoltorbPalette:         INCLUDE "gfx/pics/voltorb/normal.pal"
-VoltorbShinyPalette:    INCLUDE "gfx/pics/voltorb/shiny.pal"
-ElectrodePalette:       INCLUDE "gfx/pics/electrode/normal.pal"
-ElectrodeShinyPalette:  INCLUDE "gfx/pics/electrode/shiny.pal"
-ExeggcutePalette:       INCLUDE "gfx/pics/exeggcute/normal.pal"
-ExeggcuteShinyPalette:  INCLUDE "gfx/pics/exeggcute/shiny.pal"
-ExeggutorPalette:       INCLUDE "gfx/pics/exeggutor/normal.pal"
-ExeggutorShinyPalette:  INCLUDE "gfx/pics/exeggutor/shiny.pal"
-CubonePalette:          INCLUDE "gfx/pics/cubone/normal.pal"
-CuboneShinyPalette:     INCLUDE "gfx/pics/cubone/shiny.pal"
-MarowakPalette:         INCLUDE "gfx/pics/marowak/normal.pal"
-MarowakShinyPalette:    INCLUDE "gfx/pics/marowak/shiny.pal"
-HitmonleePalette:       INCLUDE "gfx/pics/hitmonlee/normal.pal"
-HitmonleeShinyPalette:  INCLUDE "gfx/pics/hitmonlee/shiny.pal"
-HitmonchanPalette:      INCLUDE "gfx/pics/hitmonchan/normal.pal"
-HitmonchanShinyPalette: INCLUDE "gfx/pics/hitmonchan/shiny.pal"
-LickitungPalette:       INCLUDE "gfx/pics/lickitung/normal.pal"
-LickitungShinyPalette:  INCLUDE "gfx/pics/lickitung/shiny.pal"
-KoffingPalette:         INCLUDE "gfx/pics/koffing/normal.pal"
-KoffingShinyPalette:    INCLUDE "gfx/pics/koffing/shiny.pal"
-WeezingPalette:         INCLUDE "gfx/pics/weezing/normal.pal"
-WeezingShinyPalette:    INCLUDE "gfx/pics/weezing/shiny.pal"
-RhyhornPalette:         INCLUDE "gfx/pics/rhyhorn/normal.pal"
-RhyhornShinyPalette:    INCLUDE "gfx/pics/rhyhorn/shiny.pal"
-RhydonPalette:          INCLUDE "gfx/pics/rhydon/normal.pal"
-RhydonShinyPalette:     INCLUDE "gfx/pics/rhydon/shiny.pal"
-ChanseyPalette:         INCLUDE "gfx/pics/chansey/normal.pal"
-ChanseyShinyPalette:    INCLUDE "gfx/pics/chansey/shiny.pal"
-TangelaPalette:         INCLUDE "gfx/pics/tangela/normal.pal"
-TangelaShinyPalette:    INCLUDE "gfx/pics/tangela/shiny.pal"
-KangaskhanPalette:      INCLUDE "gfx/pics/kangaskhan/normal.pal"
-KangaskhanShinyPalette: INCLUDE "gfx/pics/kangaskhan/shiny.pal"
-HorseaPalette:          INCLUDE "gfx/pics/horsea/normal.pal"
-HorseaShinyPalette:     INCLUDE "gfx/pics/horsea/shiny.pal"
-SeadraPalette:          INCLUDE "gfx/pics/seadra/normal.pal"
-SeadraShinyPalette:     INCLUDE "gfx/pics/seadra/shiny.pal"
-GoldeenPalette:         INCLUDE "gfx/pics/goldeen/normal.pal"
-GoldeenShinyPalette:    INCLUDE "gfx/pics/goldeen/shiny.pal"
-SeakingPalette:         INCLUDE "gfx/pics/seaking/normal.pal"
-SeakingShinyPalette:    INCLUDE "gfx/pics/seaking/shiny.pal"
-StaryuPalette:          INCLUDE "gfx/pics/staryu/normal.pal"
-StaryuShinyPalette:     INCLUDE "gfx/pics/staryu/shiny.pal"
-StarmiePalette:         INCLUDE "gfx/pics/starmie/normal.pal"
-StarmieShinyPalette:    INCLUDE "gfx/pics/starmie/shiny.pal"
-MrMimePalette:          INCLUDE "gfx/pics/mr__mime/normal.pal"
-MrMimeShinyPalette:     INCLUDE "gfx/pics/mr__mime/shiny.pal"
-ScytherPalette:         INCLUDE "gfx/pics/scyther/normal.pal"
-ScytherShinyPalette:    INCLUDE "gfx/pics/scyther/shiny.pal"
-JynxPalette:            INCLUDE "gfx/pics/jynx/normal.pal"
-JynxShinyPalette:       INCLUDE "gfx/pics/jynx/shiny.pal"
-ElectabuzzPalette:      INCLUDE "gfx/pics/electabuzz/normal.pal"
-ElectabuzzShinyPalette: INCLUDE "gfx/pics/electabuzz/shiny.pal"
-MagmarPalette:          INCLUDE "gfx/pics/magmar/normal.pal"
-MagmarShinyPalette:     INCLUDE "gfx/pics/magmar/shiny.pal"
-PinsirPalette:          INCLUDE "gfx/pics/pinsir/normal.pal"
-PinsirShinyPalette:     INCLUDE "gfx/pics/pinsir/shiny.pal"
-TaurosPalette:          INCLUDE "gfx/pics/tauros/normal.pal"
-TaurosShinyPalette:     INCLUDE "gfx/pics/tauros/shiny.pal"
-MagikarpPalette:        INCLUDE "gfx/pics/magikarp/normal.pal"
-MagikarpShinyPalette:   INCLUDE "gfx/pics/magikarp/shiny.pal"
-GyaradosPalette:        INCLUDE "gfx/pics/gyarados/normal.pal"
-GyaradosShinyPalette:   INCLUDE "gfx/pics/gyarados/shiny.pal"
-LaprasPalette:          INCLUDE "gfx/pics/lapras/normal.pal"
-LaprasShinyPalette:     INCLUDE "gfx/pics/lapras/shiny.pal"
-DittoPalette:           INCLUDE "gfx/pics/ditto/normal.pal"
-DittoShinyPalette:      INCLUDE "gfx/pics/ditto/shiny.pal"
-EeveePalette:           INCLUDE "gfx/pics/eevee/normal.pal"
-EeveeShinyPalette:      INCLUDE "gfx/pics/eevee/shiny.pal"
-VaporeonPalette:        INCLUDE "gfx/pics/vaporeon/normal.pal"
-VaporeonShinyPalette:   INCLUDE "gfx/pics/vaporeon/shiny.pal"
-JolteonPalette:         INCLUDE "gfx/pics/jolteon/normal.pal"
-JolteonShinyPalette:    INCLUDE "gfx/pics/jolteon/shiny.pal"
-FlareonPalette:         INCLUDE "gfx/pics/flareon/normal.pal"
-FlareonShinyPalette:    INCLUDE "gfx/pics/flareon/shiny.pal"
-PorygonPalette:         INCLUDE "gfx/pics/porygon/normal.pal"
-PorygonShinyPalette:    INCLUDE "gfx/pics/porygon/shiny.pal"
-OmanytePalette:         INCLUDE "gfx/pics/omanyte/normal.pal"
-OmanyteShinyPalette:    INCLUDE "gfx/pics/omanyte/shiny.pal"
-OmastarPalette:         INCLUDE "gfx/pics/omastar/normal.pal"
-OmastarShinyPalette:    INCLUDE "gfx/pics/omastar/shiny.pal"
-KabutoPalette:          INCLUDE "gfx/pics/kabuto/normal.pal"
-KabutoShinyPalette:     INCLUDE "gfx/pics/kabuto/shiny.pal"
-KabutopsPalette:        INCLUDE "gfx/pics/kabutops/normal.pal"
-KabutopsShinyPalette:   INCLUDE "gfx/pics/kabutops/shiny.pal"
-AerodactylPalette:      INCLUDE "gfx/pics/aerodactyl/normal.pal"
-AerodactylShinyPalette: INCLUDE "gfx/pics/aerodactyl/shiny.pal"
-SnorlaxPalette:         INCLUDE "gfx/pics/snorlax/normal.pal"
-SnorlaxShinyPalette:    INCLUDE "gfx/pics/snorlax/shiny.pal"
-ArticunoPalette:        INCLUDE "gfx/pics/articuno/normal.pal"
-ArticunoShinyPalette:   INCLUDE "gfx/pics/articuno/shiny.pal"
-ZapdosPalette:          INCLUDE "gfx/pics/zapdos/normal.pal"
-ZapdosShinyPalette:     INCLUDE "gfx/pics/zapdos/shiny.pal"
-MoltresPalette:         INCLUDE "gfx/pics/moltres/normal.pal"
-MoltresShinyPalette:    INCLUDE "gfx/pics/moltres/shiny.pal"
-DratiniPalette:         INCLUDE "gfx/pics/dratini/normal.pal"
-DratiniShinyPalette:    INCLUDE "gfx/pics/dratini/shiny.pal"
-DragonairPalette:       INCLUDE "gfx/pics/dragonair/normal.pal"
-DragonairShinyPalette:  INCLUDE "gfx/pics/dragonair/shiny.pal"
-DragonitePalette:       INCLUDE "gfx/pics/dragonite/normal.pal"
-DragoniteShinyPalette:  INCLUDE "gfx/pics/dragonite/shiny.pal"
-MewtwoPalette:          INCLUDE "gfx/pics/mewtwo/normal.pal"
-MewtwoShinyPalette:     INCLUDE "gfx/pics/mewtwo/shiny.pal"
-MewPalette:             INCLUDE "gfx/pics/mew/normal.pal"
-MewShinyPalette:        INCLUDE "gfx/pics/mew/shiny.pal"
-ChikoritaPalette:       INCLUDE "gfx/pics/chikorita/normal.pal"
-ChikoritaShinyPalette:  INCLUDE "gfx/pics/chikorita/shiny.pal"
-BayleefPalette:         INCLUDE "gfx/pics/bayleef/normal.pal"
-BayleefShinyPalette:    INCLUDE "gfx/pics/bayleef/shiny.pal"
-MeganiumPalette:        INCLUDE "gfx/pics/meganium/normal.pal"
-MeganiumShinyPalette:   INCLUDE "gfx/pics/meganium/shiny.pal"
-CyndaquilPalette:       INCLUDE "gfx/pics/cyndaquil/normal.pal"
-CyndaquilShinyPalette:  INCLUDE "gfx/pics/cyndaquil/shiny.pal"
-QuilavaPalette:         INCLUDE "gfx/pics/quilava/normal.pal"
-QuilavaShinyPalette:    INCLUDE "gfx/pics/quilava/shiny.pal"
-TyphlosionPalette:      INCLUDE "gfx/pics/typhlosion/normal.pal"
-TyphlosionShinyPalette: INCLUDE "gfx/pics/typhlosion/shiny.pal"
-TotodilePalette:        INCLUDE "gfx/pics/totodile/normal.pal"
-TotodileShinyPalette:   INCLUDE "gfx/pics/totodile/shiny.pal"
-CroconawPalette:        INCLUDE "gfx/pics/croconaw/normal.pal"
-CroconawShinyPalette:   INCLUDE "gfx/pics/croconaw/shiny.pal"
-FeraligatrPalette:      INCLUDE "gfx/pics/feraligatr/normal.pal"
-FeraligatrShinyPalette: INCLUDE "gfx/pics/feraligatr/shiny.pal"
-SentretPalette:         INCLUDE "gfx/pics/sentret/normal.pal"
-SentretShinyPalette:    INCLUDE "gfx/pics/sentret/shiny.pal"
-FurretPalette:          INCLUDE "gfx/pics/furret/normal.pal"
-FurretShinyPalette:     INCLUDE "gfx/pics/furret/shiny.pal"
-HoothootPalette:        INCLUDE "gfx/pics/hoothoot/normal.pal"
-HoothootShinyPalette:   INCLUDE "gfx/pics/hoothoot/shiny.pal"
-NoctowlPalette:         INCLUDE "gfx/pics/noctowl/normal.pal"
-NoctowlShinyPalette:    INCLUDE "gfx/pics/noctowl/shiny.pal"
-LedybaPalette:          INCLUDE "gfx/pics/ledyba/normal.pal"
-LedybaShinyPalette:     INCLUDE "gfx/pics/ledyba/shiny.pal"
-LedianPalette:          INCLUDE "gfx/pics/ledian/normal.pal"
-LedianShinyPalette:     INCLUDE "gfx/pics/ledian/shiny.pal"
-SpinarakPalette:        INCLUDE "gfx/pics/spinarak/normal.pal"
-SpinarakShinyPalette:   INCLUDE "gfx/pics/spinarak/shiny.pal"
-AriadosPalette:         INCLUDE "gfx/pics/ariados/normal.pal"
-AriadosShinyPalette:    INCLUDE "gfx/pics/ariados/shiny.pal"
-CrobatPalette:          INCLUDE "gfx/pics/crobat/normal.pal"
-CrobatShinyPalette:     INCLUDE "gfx/pics/crobat/shiny.pal"
-ChinchouPalette:        INCLUDE "gfx/pics/chinchou/normal.pal"
-ChinchouShinyPalette:   INCLUDE "gfx/pics/chinchou/shiny.pal"
-LanturnPalette:         INCLUDE "gfx/pics/lanturn/normal.pal"
-LanturnShinyPalette:    INCLUDE "gfx/pics/lanturn/shiny.pal"
-PichuPalette:           INCLUDE "gfx/pics/pichu/normal.pal"
-PichuShinyPalette:      INCLUDE "gfx/pics/pichu/shiny.pal"
-CleffaPalette:          INCLUDE "gfx/pics/cleffa/normal.pal"
-CleffaShinyPalette:     INCLUDE "gfx/pics/cleffa/shiny.pal"
-IgglybuffPalette:       INCLUDE "gfx/pics/igglybuff/normal.pal"
-IgglybuffShinyPalette:  INCLUDE "gfx/pics/igglybuff/shiny.pal"
-TogepiPalette:          INCLUDE "gfx/pics/togepi/normal.pal"
-TogepiShinyPalette:     INCLUDE "gfx/pics/togepi/shiny.pal"
-TogeticPalette:         INCLUDE "gfx/pics/togetic/normal.pal"
-TogeticShinyPalette:    INCLUDE "gfx/pics/togetic/shiny.pal"
-NatuPalette:            INCLUDE "gfx/pics/natu/normal.pal"
-NatuShinyPalette:       INCLUDE "gfx/pics/natu/shiny.pal"
-XatuPalette:            INCLUDE "gfx/pics/xatu/normal.pal"
-XatuShinyPalette:       INCLUDE "gfx/pics/xatu/shiny.pal"
-MareepPalette:          INCLUDE "gfx/pics/mareep/normal.pal"
-MareepShinyPalette:     INCLUDE "gfx/pics/mareep/shiny.pal"
-FlaaffyPalette:         INCLUDE "gfx/pics/flaaffy/normal.pal"
-FlaaffyShinyPalette:    INCLUDE "gfx/pics/flaaffy/shiny.pal"
-AmpharosPalette:        INCLUDE "gfx/pics/ampharos/normal.pal"
-AmpharosShinyPalette:   INCLUDE "gfx/pics/ampharos/shiny.pal"
-BellossomPalette:       INCLUDE "gfx/pics/bellossom/normal.pal"
-BellossomShinyPalette:  INCLUDE "gfx/pics/bellossom/shiny.pal"
-MarillPalette:          INCLUDE "gfx/pics/marill/normal.pal"
-MarillShinyPalette:     INCLUDE "gfx/pics/marill/shiny.pal"
-AzumarillPalette:       INCLUDE "gfx/pics/azumarill/normal.pal"
-AzumarillShinyPalette:  INCLUDE "gfx/pics/azumarill/shiny.pal"
-SudowoodoPalette:       INCLUDE "gfx/pics/sudowoodo/normal.pal"
-SudowoodoShinyPalette:  INCLUDE "gfx/pics/sudowoodo/shiny.pal"
-PolitoedPalette:        INCLUDE "gfx/pics/politoed/normal.pal"
-PolitoedShinyPalette:   INCLUDE "gfx/pics/politoed/shiny.pal"
-HoppipPalette:          INCLUDE "gfx/pics/hoppip/normal.pal"
-HoppipShinyPalette:     INCLUDE "gfx/pics/hoppip/shiny.pal"
-SkiploomPalette:        INCLUDE "gfx/pics/skiploom/normal.pal"
-SkiploomShinyPalette:   INCLUDE "gfx/pics/skiploom/shiny.pal"
-JumpluffPalette:        INCLUDE "gfx/pics/jumpluff/normal.pal"
-JumpluffShinyPalette:   INCLUDE "gfx/pics/jumpluff/shiny.pal"
-AipomPalette:           INCLUDE "gfx/pics/aipom/normal.pal"
-AipomShinyPalette:      INCLUDE "gfx/pics/aipom/shiny.pal"
-SunkernPalette:         INCLUDE "gfx/pics/sunkern/normal.pal"
-SunkernShinyPalette:    INCLUDE "gfx/pics/sunkern/shiny.pal"
-SunfloraPalette:        INCLUDE "gfx/pics/sunflora/normal.pal"
-SunfloraShinyPalette:   INCLUDE "gfx/pics/sunflora/shiny.pal"
-YanmaPalette:           INCLUDE "gfx/pics/yanma/normal.pal"
-YanmaShinyPalette:      INCLUDE "gfx/pics/yanma/shiny.pal"
-WooperPalette:          INCLUDE "gfx/pics/wooper/normal.pal"
-WooperShinyPalette:     INCLUDE "gfx/pics/wooper/shiny.pal"
-QuagsirePalette:        INCLUDE "gfx/pics/quagsire/normal.pal"
-QuagsireShinyPalette:   INCLUDE "gfx/pics/quagsire/shiny.pal"
-EspeonPalette:          INCLUDE "gfx/pics/espeon/normal.pal"
-EspeonShinyPalette:     INCLUDE "gfx/pics/espeon/shiny.pal"
-UmbreonPalette:         INCLUDE "gfx/pics/umbreon/normal.pal"
-UmbreonShinyPalette:    INCLUDE "gfx/pics/umbreon/shiny.pal"
-MurkrowPalette:         INCLUDE "gfx/pics/murkrow/normal.pal"
-MurkrowShinyPalette:    INCLUDE "gfx/pics/murkrow/shiny.pal"
-SlowkingPalette:        INCLUDE "gfx/pics/slowking/normal.pal"
-SlowkingShinyPalette:   INCLUDE "gfx/pics/slowking/shiny.pal"
-MisdreavusPalette:      INCLUDE "gfx/pics/misdreavus/normal.pal"
-MisdreavusShinyPalette: INCLUDE "gfx/pics/misdreavus/shiny.pal"
-UnownPalette:           INCLUDE "gfx/pics/unown/normal.pal"
-UnownShinyPalette:      INCLUDE "gfx/pics/unown/shiny.pal"
-WobbuffetPalette:       INCLUDE "gfx/pics/wobbuffet/normal.pal"
-WobbuffetShinyPalette:  INCLUDE "gfx/pics/wobbuffet/shiny.pal"
-GirafarigPalette:       INCLUDE "gfx/pics/girafarig/normal.pal"
-GirafarigShinyPalette:  INCLUDE "gfx/pics/girafarig/shiny.pal"
-PinecoPalette:          INCLUDE "gfx/pics/pineco/normal.pal"
-PinecoShinyPalette:     INCLUDE "gfx/pics/pineco/shiny.pal"
-ForretressPalette:      INCLUDE "gfx/pics/forretress/normal.pal"
-ForretressShinyPalette: INCLUDE "gfx/pics/forretress/shiny.pal"
-DunsparcePalette:       INCLUDE "gfx/pics/dunsparce/normal.pal"
-DunsparceShinyPalette:  INCLUDE "gfx/pics/dunsparce/shiny.pal"
-GligarPalette:          INCLUDE "gfx/pics/gligar/normal.pal"
-GligarShinyPalette:     INCLUDE "gfx/pics/gligar/shiny.pal"
-SteelixPalette:         INCLUDE "gfx/pics/steelix/normal.pal"
-SteelixShinyPalette:    INCLUDE "gfx/pics/steelix/shiny.pal"
-SnubbullPalette:        INCLUDE "gfx/pics/snubbull/normal.pal"
-SnubbullShinyPalette:   INCLUDE "gfx/pics/snubbull/shiny.pal"
-GranbullPalette:        INCLUDE "gfx/pics/granbull/normal.pal"
-GranbullShinyPalette:   INCLUDE "gfx/pics/granbull/shiny.pal"
-QwilfishPalette:        INCLUDE "gfx/pics/qwilfish/normal.pal"
-QwilfishShinyPalette:   INCLUDE "gfx/pics/qwilfish/shiny.pal"
-ScizorPalette:          INCLUDE "gfx/pics/scizor/normal.pal"
-ScizorShinyPalette:     INCLUDE "gfx/pics/scizor/shiny.pal"
-ShucklePalette:         INCLUDE "gfx/pics/shuckle/normal.pal"
-ShuckleShinyPalette:    INCLUDE "gfx/pics/shuckle/shiny.pal"
-HeracrossPalette:       INCLUDE "gfx/pics/heracross/normal.pal"
-HeracrossShinyPalette:  INCLUDE "gfx/pics/heracross/shiny.pal"
-SneaselPalette:         INCLUDE "gfx/pics/sneasel/normal.pal"
-SneaselShinyPalette:    INCLUDE "gfx/pics/sneasel/shiny.pal"
-TeddiursaPalette:       INCLUDE "gfx/pics/teddiursa/normal.pal"
-TeddiursaShinyPalette:  INCLUDE "gfx/pics/teddiursa/shiny.pal"
-UrsaringPalette:        INCLUDE "gfx/pics/ursaring/normal.pal"
-UrsaringShinyPalette:   INCLUDE "gfx/pics/ursaring/shiny.pal"
-SlugmaPalette:          INCLUDE "gfx/pics/slugma/normal.pal"
-SlugmaShinyPalette:     INCLUDE "gfx/pics/slugma/shiny.pal"
-MagcargoPalette:        INCLUDE "gfx/pics/magcargo/normal.pal"
-MagcargoShinyPalette:   INCLUDE "gfx/pics/magcargo/shiny.pal"
-SwinubPalette:          INCLUDE "gfx/pics/swinub/normal.pal"
-SwinubShinyPalette:     INCLUDE "gfx/pics/swinub/shiny.pal"
-PiloswinePalette:       INCLUDE "gfx/pics/piloswine/normal.pal"
-PiloswineShinyPalette:  INCLUDE "gfx/pics/piloswine/shiny.pal"
-CorsolaPalette:         INCLUDE "gfx/pics/corsola/normal.pal"
-CorsolaShinyPalette:    INCLUDE "gfx/pics/corsola/shiny.pal"
-RemoraidPalette:        INCLUDE "gfx/pics/remoraid/normal.pal"
-RemoraidShinyPalette:   INCLUDE "gfx/pics/remoraid/shiny.pal"
-OctilleryPalette:       INCLUDE "gfx/pics/octillery/normal.pal"
-OctilleryShinyPalette:  INCLUDE "gfx/pics/octillery/shiny.pal"
-DelibirdPalette:        INCLUDE "gfx/pics/delibird/normal.pal"
-DelibirdShinyPalette:   INCLUDE "gfx/pics/delibird/shiny.pal"
-MantinePalette:         INCLUDE "gfx/pics/mantine/normal.pal"
-MantineShinyPalette:    INCLUDE "gfx/pics/mantine/shiny.pal"
-SkarmoryPalette:        INCLUDE "gfx/pics/skarmory/normal.pal"
-SkarmoryShinyPalette:   INCLUDE "gfx/pics/skarmory/shiny.pal"
-HoundourPalette:        INCLUDE "gfx/pics/houndour/normal.pal"
-HoundourShinyPalette:   INCLUDE "gfx/pics/houndour/shiny.pal"
-HoundoomPalette:        INCLUDE "gfx/pics/houndoom/normal.pal"
-HoundoomShinyPalette:   INCLUDE "gfx/pics/houndoom/shiny.pal"
-KingdraPalette:         INCLUDE "gfx/pics/kingdra/normal.pal"
-KingdraShinyPalette:    INCLUDE "gfx/pics/kingdra/shiny.pal"
-PhanpyPalette:          INCLUDE "gfx/pics/phanpy/normal.pal"
-PhanpyShinyPalette:     INCLUDE "gfx/pics/phanpy/shiny.pal"
-DonphanPalette:         INCLUDE "gfx/pics/donphan/normal.pal"
-DonphanShinyPalette:    INCLUDE "gfx/pics/donphan/shiny.pal"
-Porygon2Palette:        INCLUDE "gfx/pics/porygon2/normal.pal"
-Porygon2ShinyPalette:   INCLUDE "gfx/pics/porygon2/shiny.pal"
-StantlerPalette:        INCLUDE "gfx/pics/stantler/normal.pal"
-StantlerShinyPalette:   INCLUDE "gfx/pics/stantler/shiny.pal"
-SmearglePalette:        INCLUDE "gfx/pics/smeargle/normal.pal"
-SmeargleShinyPalette:   INCLUDE "gfx/pics/smeargle/shiny.pal"
-TyroguePalette:         INCLUDE "gfx/pics/tyrogue/normal.pal"
-TyrogueShinyPalette:    INCLUDE "gfx/pics/tyrogue/shiny.pal"
-HitmontopPalette:       INCLUDE "gfx/pics/hitmontop/normal.pal"
-HitmontopShinyPalette:  INCLUDE "gfx/pics/hitmontop/shiny.pal"
-SmoochumPalette:        INCLUDE "gfx/pics/smoochum/normal.pal"
-SmoochumShinyPalette:   INCLUDE "gfx/pics/smoochum/shiny.pal"
-ElekidPalette:          INCLUDE "gfx/pics/elekid/normal.pal"
-ElekidShinyPalette:     INCLUDE "gfx/pics/elekid/shiny.pal"
-MagbyPalette:           INCLUDE "gfx/pics/magby/normal.pal"
-MagbyShinyPalette:      INCLUDE "gfx/pics/magby/shiny.pal"
-MiltankPalette:         INCLUDE "gfx/pics/miltank/normal.pal"
-MiltankShinyPalette:    INCLUDE "gfx/pics/miltank/shiny.pal"
-BlisseyPalette:         INCLUDE "gfx/pics/blissey/normal.pal"
-BlisseyShinyPalette:    INCLUDE "gfx/pics/blissey/shiny.pal"
-RaikouPalette:          INCLUDE "gfx/pics/raikou/normal.pal"
-RaikouShinyPalette:     INCLUDE "gfx/pics/raikou/shiny.pal"
-EnteiPalette:           INCLUDE "gfx/pics/entei/normal.pal"
-EnteiShinyPalette:      INCLUDE "gfx/pics/entei/shiny.pal"
-SuicunePalette:         INCLUDE "gfx/pics/suicune/normal.pal"
-SuicuneShinyPalette:    INCLUDE "gfx/pics/suicune/shiny.pal"
-LarvitarPalette:        INCLUDE "gfx/pics/larvitar/normal.pal"
-LarvitarShinyPalette:   INCLUDE "gfx/pics/larvitar/shiny.pal"
-PupitarPalette:         INCLUDE "gfx/pics/pupitar/normal.pal"
-PupitarShinyPalette:    INCLUDE "gfx/pics/pupitar/shiny.pal"
-TyranitarPalette:       INCLUDE "gfx/pics/tyranitar/normal.pal"
-TyranitarShinyPalette:  INCLUDE "gfx/pics/tyranitar/shiny.pal"
-LugiaPalette:           INCLUDE "gfx/pics/lugia/normal.pal"
-LugiaShinyPalette:      INCLUDE "gfx/pics/lugia/shiny.pal"
-HoOhPalette:            INCLUDE "gfx/pics/ho_oh/normal.pal"
-HoOhShinyPalette:       INCLUDE "gfx/pics/ho_oh/shiny.pal"
-CelebiPalette:          INCLUDE "gfx/pics/celebi/normal.pal"
-CelebiShinyPalette:     INCLUDE "gfx/pics/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/pics/unown_anims.asm b/gfx/pics/unown_anims.asm
deleted file mode 100644
index 3f988c2f6..000000000
--- a/gfx/pics/unown_anims.asm
+++ /dev/null
@@ -1,27 +0,0 @@
-UnownAnimations:
-UnownAAnimation: INCLUDE "gfx/pics/unown_a/anim0.asm"
-UnownBAnimation: INCLUDE "gfx/pics/unown_b/anim0.asm"
-UnownCAnimation: INCLUDE "gfx/pics/unown_c/anim0.asm"
-UnownDAnimation: INCLUDE "gfx/pics/unown_d/anim0.asm"
-UnownEAnimation: INCLUDE "gfx/pics/unown_e/anim0.asm"
-UnownFAnimation: INCLUDE "gfx/pics/unown_f/anim0.asm"
-UnownGAnimation: INCLUDE "gfx/pics/unown_g/anim0.asm"
-UnownHAnimation: INCLUDE "gfx/pics/unown_h/anim0.asm"
-UnownIAnimation: INCLUDE "gfx/pics/unown_i/anim0.asm"
-UnownJAnimation: INCLUDE "gfx/pics/unown_j/anim0.asm"
-UnownKAnimation: INCLUDE "gfx/pics/unown_k/anim0.asm"
-UnownLAnimation: INCLUDE "gfx/pics/unown_l/anim0.asm"
-UnownMAnimation: INCLUDE "gfx/pics/unown_m/anim0.asm"
-UnownNAnimation: INCLUDE "gfx/pics/unown_n/anim0.asm"
-UnownOAnimation: INCLUDE "gfx/pics/unown_o/anim0.asm"
-UnownPAnimation: INCLUDE "gfx/pics/unown_p/anim0.asm"
-UnownQAnimation: INCLUDE "gfx/pics/unown_q/anim0.asm"
-UnownRAnimation: INCLUDE "gfx/pics/unown_r/anim0.asm"
-UnownSAnimation: INCLUDE "gfx/pics/unown_s/anim0.asm"
-UnownTAnimation: INCLUDE "gfx/pics/unown_t/anim0.asm"
-UnownUAnimation: INCLUDE "gfx/pics/unown_u/anim0.asm"
-UnownVAnimation: INCLUDE "gfx/pics/unown_v/anim0.asm"
-UnownWAnimation: INCLUDE "gfx/pics/unown_w/anim0.asm"
-UnownXAnimation: INCLUDE "gfx/pics/unown_x/anim0.asm"
-UnownYAnimation: INCLUDE "gfx/pics/unown_y/anim0.asm"
-UnownZAnimation: INCLUDE "gfx/pics/unown_z/anim0.asm"
diff --git a/gfx/pics/unown_bitmasks.asm b/gfx/pics/unown_bitmasks.asm
deleted file mode 100644
index 5df6b7463..000000000
--- a/gfx/pics/unown_bitmasks.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-UnownABitmasks: INCLUDE "gfx/pics/unown_a/bitmask.asm"
-UnownBBitmasks: INCLUDE "gfx/pics/unown_b/bitmask.asm"
-UnownCBitmasks: INCLUDE "gfx/pics/unown_c/bitmask.asm"
-UnownDBitmasks: INCLUDE "gfx/pics/unown_d/bitmask.asm"
-UnownEBitmasks: INCLUDE "gfx/pics/unown_e/bitmask.asm"
-UnownFBitmasks: INCLUDE "gfx/pics/unown_f/bitmask.asm"
-UnownGBitmasks: INCLUDE "gfx/pics/unown_g/bitmask.asm"
-UnownHBitmasks: INCLUDE "gfx/pics/unown_h/bitmask.asm"
-UnownIBitmasks: INCLUDE "gfx/pics/unown_i/bitmask.asm"
-UnownJBitmasks: INCLUDE "gfx/pics/unown_j/bitmask.asm"
-UnownKBitmasks: INCLUDE "gfx/pics/unown_k/bitmask.asm"
-UnownLBitmasks: INCLUDE "gfx/pics/unown_l/bitmask.asm"
-UnownMBitmasks: INCLUDE "gfx/pics/unown_m/bitmask.asm"
-UnownNBitmasks: INCLUDE "gfx/pics/unown_n/bitmask.asm"
-UnownOBitmasks: INCLUDE "gfx/pics/unown_o/bitmask.asm"
-UnownPBitmasks: INCLUDE "gfx/pics/unown_p/bitmask.asm"
-UnownQBitmasks: INCLUDE "gfx/pics/unown_q/bitmask.asm"
-UnownRBitmasks: INCLUDE "gfx/pics/unown_r/bitmask.asm"
-UnownSBitmasks: INCLUDE "gfx/pics/unown_s/bitmask.asm"
-UnownTBitmasks: INCLUDE "gfx/pics/unown_t/bitmask.asm"
-UnownUBitmasks: INCLUDE "gfx/pics/unown_u/bitmask.asm"
-UnownVBitmasks: INCLUDE "gfx/pics/unown_v/bitmask.asm"
-UnownWBitmasks: INCLUDE "gfx/pics/unown_w/bitmask.asm"
-UnownXBitmasks: INCLUDE "gfx/pics/unown_x/bitmask.asm"
-UnownYBitmasks: INCLUDE "gfx/pics/unown_y/bitmask.asm"
-UnownZBitmasks: INCLUDE "gfx/pics/unown_z/bitmask.asm"
diff --git a/gfx/pics/unown_extras.asm b/gfx/pics/unown_extras.asm
deleted file mode 100644
index 2609afe46..000000000
--- a/gfx/pics/unown_extras.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-UnownAAnimationExtra: INCLUDE "gfx/pics/unown_a/anim1.asm"
-UnownBAnimationExtra: INCLUDE "gfx/pics/unown_b/anim1.asm"
-UnownCAnimationExtra: INCLUDE "gfx/pics/unown_c/anim1.asm"
-UnownDAnimationExtra: INCLUDE "gfx/pics/unown_d/anim1.asm"
-UnownEAnimationExtra: INCLUDE "gfx/pics/unown_e/anim1.asm"
-UnownFAnimationExtra: INCLUDE "gfx/pics/unown_f/anim1.asm"
-UnownGAnimationExtra: INCLUDE "gfx/pics/unown_g/anim1.asm"
-UnownHAnimationExtra: INCLUDE "gfx/pics/unown_h/anim1.asm"
-UnownIAnimationExtra: INCLUDE "gfx/pics/unown_i/anim1.asm"
-UnownJAnimationExtra: INCLUDE "gfx/pics/unown_j/anim1.asm"
-UnownKAnimationExtra: INCLUDE "gfx/pics/unown_k/anim1.asm"
-UnownLAnimationExtra: INCLUDE "gfx/pics/unown_l/anim1.asm"
-UnownMAnimationExtra: INCLUDE "gfx/pics/unown_m/anim1.asm"
-UnownNAnimationExtra: INCLUDE "gfx/pics/unown_n/anim1.asm"
-UnownOAnimationExtra: INCLUDE "gfx/pics/unown_o/anim1.asm"
-UnownPAnimationExtra: INCLUDE "gfx/pics/unown_p/anim1.asm"
-UnownQAnimationExtra: INCLUDE "gfx/pics/unown_q/anim1.asm"
-UnownRAnimationExtra: INCLUDE "gfx/pics/unown_r/anim1.asm"
-UnownSAnimationExtra: INCLUDE "gfx/pics/unown_s/anim1.asm"
-UnownTAnimationExtra: INCLUDE "gfx/pics/unown_t/anim1.asm"
-UnownUAnimationExtra: INCLUDE "gfx/pics/unown_u/anim1.asm"
-UnownVAnimationExtra: INCLUDE "gfx/pics/unown_v/anim1.asm"
-UnownWAnimationExtra: INCLUDE "gfx/pics/unown_w/anim1.asm"
-UnownXAnimationExtra: INCLUDE "gfx/pics/unown_x/anim1.asm"
-UnownYAnimationExtra: INCLUDE "gfx/pics/unown_y/anim1.asm"
-UnownZAnimationExtra: INCLUDE "gfx/pics/unown_z/anim1.asm"
diff --git a/gfx/pics/unown_frames.asm b/gfx/pics/unown_frames.asm
deleted file mode 100644
index 402f22efa..000000000
--- a/gfx/pics/unown_frames.asm
+++ /dev/null
@@ -1,27 +0,0 @@
-UnownsFrames:
-UnownAFrames: INCLUDE "gfx/pics/unown_a/frames.asm"
-UnownBFrames: INCLUDE "gfx/pics/unown_b/frames.asm"
-UnownCFrames: INCLUDE "gfx/pics/unown_c/frames.asm"
-UnownDFrames: INCLUDE "gfx/pics/unown_d/frames.asm"
-UnownEFrames: INCLUDE "gfx/pics/unown_e/frames.asm"
-UnownFFrames: INCLUDE "gfx/pics/unown_f/frames.asm"
-UnownGFrames: INCLUDE "gfx/pics/unown_g/frames.asm"
-UnownHFrames: INCLUDE "gfx/pics/unown_h/frames.asm"
-UnownIFrames: INCLUDE "gfx/pics/unown_i/frames.asm"
-UnownJFrames: INCLUDE "gfx/pics/unown_j/frames.asm"
-UnownKFrames: INCLUDE "gfx/pics/unown_k/frames.asm"
-UnownLFrames: INCLUDE "gfx/pics/unown_l/frames.asm"
-UnownMFrames: INCLUDE "gfx/pics/unown_m/frames.asm"
-UnownNFrames: INCLUDE "gfx/pics/unown_n/frames.asm"
-UnownOFrames: INCLUDE "gfx/pics/unown_o/frames.asm"
-UnownPFrames: INCLUDE "gfx/pics/unown_p/frames.asm"
-UnownQFrames: INCLUDE "gfx/pics/unown_q/frames.asm"
-UnownRFrames: INCLUDE "gfx/pics/unown_r/frames.asm"
-UnownSFrames: INCLUDE "gfx/pics/unown_s/frames.asm"
-UnownTFrames: INCLUDE "gfx/pics/unown_t/frames.asm"
-UnownUFrames: INCLUDE "gfx/pics/unown_u/frames.asm"
-UnownVFrames: INCLUDE "gfx/pics/unown_v/frames.asm"
-UnownWFrames: INCLUDE "gfx/pics/unown_w/frames.asm"
-UnownXFrames: INCLUDE "gfx/pics/unown_x/frames.asm"
-UnownYFrames: INCLUDE "gfx/pics/unown_y/frames.asm"
-UnownZFrames: INCLUDE "gfx/pics/unown_z/frames.asm"
diff --git a/gfx/pics/abra/anim0.asm b/gfx/pokemon/abra/anim0.asm
index 9d37567ac..9d37567ac 100644
--- a/gfx/pics/abra/anim0.asm
+++ b/gfx/pokemon/abra/anim0.asm
diff --git a/gfx/pics/abra/anim1.asm b/gfx/pokemon/abra/anim1.asm
index 796e57f88..796e57f88 100644
--- a/gfx/pics/abra/anim1.asm
+++ b/gfx/pokemon/abra/anim1.asm
diff --git a/gfx/pics/abra/back.2bpp.lz.9ac09a32 b/gfx/pokemon/abra/back.2bpp.lz.9ac09a32
index 2df351881..2df351881 100644
--- a/gfx/pics/abra/back.2bpp.lz.9ac09a32
+++ b/gfx/pokemon/abra/back.2bpp.lz.9ac09a32
diff --git a/gfx/pics/abra/back.png b/gfx/pokemon/abra/back.png
index f3a681f04..f3a681f04 100644
--- a/gfx/pics/abra/back.png
+++ b/gfx/pokemon/abra/back.png
diff --git a/gfx/pics/abra/front.animated.2bpp.lz.12e14d9a b/gfx/pokemon/abra/front.animated.2bpp.lz.12e14d9a
index 2b41c4263..2b41c4263 100644
--- a/gfx/pics/abra/front.animated.2bpp.lz.12e14d9a
+++ b/gfx/pokemon/abra/front.animated.2bpp.lz.12e14d9a
diff --git a/gfx/pics/abra/front.png b/gfx/pokemon/abra/front.png
index cd3cbd704..cd3cbd704 100644
--- a/gfx/pics/abra/front.png
+++ b/gfx/pokemon/abra/front.png
diff --git a/gfx/pics/abra/shiny.pal b/gfx/pokemon/abra/shiny.pal
index 328319095..328319095 100644
--- a/gfx/pics/abra/shiny.pal
+++ b/gfx/pokemon/abra/shiny.pal
diff --git a/gfx/pics/aerodactyl/anim0.asm b/gfx/pokemon/aerodactyl/anim0.asm
index 515cba043..515cba043 100644
--- a/gfx/pics/aerodactyl/anim0.asm
+++ b/gfx/pokemon/aerodactyl/anim0.asm
diff --git a/gfx/pics/aerodactyl/anim1.asm b/gfx/pokemon/aerodactyl/anim1.asm
index 4394a8e0c..4394a8e0c 100644
--- a/gfx/pics/aerodactyl/anim1.asm
+++ b/gfx/pokemon/aerodactyl/anim1.asm
diff --git a/gfx/pics/aerodactyl/back.2bpp.lz.e2da1f61 b/gfx/pokemon/aerodactyl/back.2bpp.lz.e2da1f61
index 05536351b..05536351b 100644
--- a/gfx/pics/aerodactyl/back.2bpp.lz.e2da1f61
+++ b/gfx/pokemon/aerodactyl/back.2bpp.lz.e2da1f61
diff --git a/gfx/pics/aerodactyl/back.png b/gfx/pokemon/aerodactyl/back.png
index a88138069..a88138069 100644
--- a/gfx/pics/aerodactyl/back.png
+++ b/gfx/pokemon/aerodactyl/back.png
diff --git a/gfx/pics/aerodactyl/front.animated.2bpp.lz.3bceb33e b/gfx/pokemon/aerodactyl/front.animated.2bpp.lz.3bceb33e
index ae8d9f8ab..ae8d9f8ab 100644
--- a/gfx/pics/aerodactyl/front.animated.2bpp.lz.3bceb33e
+++ b/gfx/pokemon/aerodactyl/front.animated.2bpp.lz.3bceb33e
diff --git a/gfx/pics/aerodactyl/front.png b/gfx/pokemon/aerodactyl/front.png
index 3fdf99f61..3fdf99f61 100644
--- a/gfx/pics/aerodactyl/front.png
+++ b/gfx/pokemon/aerodactyl/front.png
diff --git a/gfx/pics/aerodactyl/shiny.pal b/gfx/pokemon/aerodactyl/shiny.pal
index 6dade0490..6dade0490 100644
--- a/gfx/pics/aerodactyl/shiny.pal
+++ b/gfx/pokemon/aerodactyl/shiny.pal
diff --git a/gfx/pics/aipom/anim0.asm b/gfx/pokemon/aipom/anim0.asm
index 99556d958..99556d958 100644
--- a/gfx/pics/aipom/anim0.asm
+++ b/gfx/pokemon/aipom/anim0.asm
diff --git a/gfx/pics/aipom/anim1.asm b/gfx/pokemon/aipom/anim1.asm
index 9685b665d..9685b665d 100644
--- a/gfx/pics/aipom/anim1.asm
+++ b/gfx/pokemon/aipom/anim1.asm
diff --git a/gfx/pics/aipom/back.2bpp.lz.597d4dda b/gfx/pokemon/aipom/back.2bpp.lz.597d4dda
index d6d9fdbc1..d6d9fdbc1 100644
--- a/gfx/pics/aipom/back.2bpp.lz.597d4dda
+++ b/gfx/pokemon/aipom/back.2bpp.lz.597d4dda
diff --git a/gfx/pics/aipom/back.png b/gfx/pokemon/aipom/back.png
index 0be9d9ed0..0be9d9ed0 100644
--- a/gfx/pics/aipom/back.png
+++ b/gfx/pokemon/aipom/back.png
diff --git a/gfx/pics/aipom/front.animated.2bpp.lz.fba7c862 b/gfx/pokemon/aipom/front.animated.2bpp.lz.fba7c862
index 58800e5e4..58800e5e4 100644
--- a/gfx/pics/aipom/front.animated.2bpp.lz.fba7c862
+++ b/gfx/pokemon/aipom/front.animated.2bpp.lz.fba7c862
diff --git a/gfx/pics/aipom/front.png b/gfx/pokemon/aipom/front.png
index 72cc3b718..72cc3b718 100644
--- a/gfx/pics/aipom/front.png
+++ b/gfx/pokemon/aipom/front.png
diff --git a/gfx/pics/aipom/shiny.pal b/gfx/pokemon/aipom/shiny.pal
index a01f18d1a..a01f18d1a 100644
--- a/gfx/pics/aipom/shiny.pal
+++ b/gfx/pokemon/aipom/shiny.pal
diff --git a/gfx/pics/alakazam/anim0.asm b/gfx/pokemon/alakazam/anim0.asm
index fb87afbfe..fb87afbfe 100644
--- a/gfx/pics/alakazam/anim0.asm
+++ b/gfx/pokemon/alakazam/anim0.asm
diff --git a/gfx/pics/alakazam/anim1.asm b/gfx/pokemon/alakazam/anim1.asm
index 52cf585fb..52cf585fb 100644
--- a/gfx/pics/alakazam/anim1.asm
+++ b/gfx/pokemon/alakazam/anim1.asm
diff --git a/gfx/pics/alakazam/back.2bpp.lz.75e7e1c6 b/gfx/pokemon/alakazam/back.2bpp.lz.75e7e1c6
index 65f1a2729..65f1a2729 100644
--- a/gfx/pics/alakazam/back.2bpp.lz.75e7e1c6
+++ b/gfx/pokemon/alakazam/back.2bpp.lz.75e7e1c6
diff --git a/gfx/pics/alakazam/back.png b/gfx/pokemon/alakazam/back.png
index 977c2974f..977c2974f 100644
--- a/gfx/pics/alakazam/back.png
+++ b/gfx/pokemon/alakazam/back.png
diff --git a/gfx/pics/alakazam/front.animated.2bpp.lz.b246e050 b/gfx/pokemon/alakazam/front.animated.2bpp.lz.b246e050
index 6272553a7..6272553a7 100644
--- a/gfx/pics/alakazam/front.animated.2bpp.lz.b246e050
+++ b/gfx/pokemon/alakazam/front.animated.2bpp.lz.b246e050
diff --git a/gfx/pics/alakazam/front.png b/gfx/pokemon/alakazam/front.png
index 958aa11ad..958aa11ad 100644
--- a/gfx/pics/alakazam/front.png
+++ b/gfx/pokemon/alakazam/front.png
diff --git a/gfx/pics/alakazam/shiny.pal b/gfx/pokemon/alakazam/shiny.pal
index 2e52d97de..2e52d97de 100644
--- a/gfx/pics/alakazam/shiny.pal
+++ b/gfx/pokemon/alakazam/shiny.pal
diff --git a/gfx/pics/ampharos/anim0.asm b/gfx/pokemon/ampharos/anim0.asm
index 5e3d6538e..5e3d6538e 100644
--- a/gfx/pics/ampharos/anim0.asm
+++ b/gfx/pokemon/ampharos/anim0.asm
diff --git a/gfx/pics/ampharos/anim1.asm b/gfx/pokemon/ampharos/anim1.asm
index 6dcb40d61..6dcb40d61 100644
--- a/gfx/pics/ampharos/anim1.asm
+++ b/gfx/pokemon/ampharos/anim1.asm
diff --git a/gfx/pics/ampharos/back.2bpp.lz.06af98c8 b/gfx/pokemon/ampharos/back.2bpp.lz.06af98c8
index 8d3b42d9b..8d3b42d9b 100644
--- a/gfx/pics/ampharos/back.2bpp.lz.06af98c8
+++ b/gfx/pokemon/ampharos/back.2bpp.lz.06af98c8
diff --git a/gfx/pics/ampharos/back.png b/gfx/pokemon/ampharos/back.png
index 0e1075491..0e1075491 100644
--- a/gfx/pics/ampharos/back.png
+++ b/gfx/pokemon/ampharos/back.png
diff --git a/gfx/pics/ampharos/front.animated.2bpp.lz.4b908a28 b/gfx/pokemon/ampharos/front.animated.2bpp.lz.4b908a28
index 84f43c105..84f43c105 100644
--- a/gfx/pics/ampharos/front.animated.2bpp.lz.4b908a28
+++ b/gfx/pokemon/ampharos/front.animated.2bpp.lz.4b908a28
diff --git a/gfx/pics/ampharos/front.png b/gfx/pokemon/ampharos/front.png
index 0cf155177..0cf155177 100644
--- a/gfx/pics/ampharos/front.png
+++ b/gfx/pokemon/ampharos/front.png
diff --git a/gfx/pics/ampharos/shiny.pal b/gfx/pokemon/ampharos/shiny.pal
index 67451112f..67451112f 100644
--- a/gfx/pics/ampharos/shiny.pal
+++ b/gfx/pokemon/ampharos/shiny.pal
diff --git a/gfx/pics/anim_pointers.asm b/gfx/pokemon/anim_pointers.asm
index c14cf56ea..c14cf56ea 100644
--- a/gfx/pics/anim_pointers.asm
+++ b/gfx/pokemon/anim_pointers.asm
diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm
new file mode 100644
index 000000000..04d0be9ce
--- /dev/null
+++ b/gfx/pokemon/anims.asm
@@ -0,0 +1,253 @@
+PicAnimations:
+BulbasaurAnimation:  INCLUDE "gfx/pokemon/bulbasaur/anim0.asm"
+IvysaurAnimation:    INCLUDE "gfx/pokemon/ivysaur/anim0.asm"
+VenusaurAnimation:   INCLUDE "gfx/pokemon/venusaur/anim0.asm"
+CharmanderAnimation: INCLUDE "gfx/pokemon/charmander/anim0.asm"
+CharmeleonAnimation: INCLUDE "gfx/pokemon/charmeleon/anim0.asm"
+CharizardAnimation:  INCLUDE "gfx/pokemon/charizard/anim0.asm"
+SquirtleAnimation:   INCLUDE "gfx/pokemon/squirtle/anim0.asm"
+WartortleAnimation:  INCLUDE "gfx/pokemon/wartortle/anim0.asm"
+BlastoiseAnimation:  INCLUDE "gfx/pokemon/blastoise/anim0.asm"
+CaterpieAnimation:   INCLUDE "gfx/pokemon/caterpie/anim0.asm"
+MetapodAnimation:    INCLUDE "gfx/pokemon/metapod/anim0.asm"
+ButterfreeAnimation: INCLUDE "gfx/pokemon/butterfree/anim0.asm"
+WeedleAnimation:     INCLUDE "gfx/pokemon/weedle/anim0.asm"
+KakunaAnimation:     INCLUDE "gfx/pokemon/kakuna/anim0.asm"
+BeedrillAnimation:   INCLUDE "gfx/pokemon/beedrill/anim0.asm"
+PidgeyAnimation:     INCLUDE "gfx/pokemon/pidgey/anim0.asm"
+PidgeottoAnimation:  INCLUDE "gfx/pokemon/pidgeotto/anim0.asm"
+PidgeotAnimation:    INCLUDE "gfx/pokemon/pidgeot/anim0.asm"
+RattataAnimation:    INCLUDE "gfx/pokemon/rattata/anim0.asm"
+RaticateAnimation:   INCLUDE "gfx/pokemon/raticate/anim0.asm"
+SpearowAnimation:    INCLUDE "gfx/pokemon/spearow/anim0.asm"
+FearowAnimation:     INCLUDE "gfx/pokemon/fearow/anim0.asm"
+EkansAnimation:      INCLUDE "gfx/pokemon/ekans/anim0.asm"
+ArbokAnimation:      INCLUDE "gfx/pokemon/arbok/anim0.asm"
+PikachuAnimation:    INCLUDE "gfx/pokemon/pikachu/anim0.asm"
+RaichuAnimation:     INCLUDE "gfx/pokemon/raichu/anim0.asm"
+SandshrewAnimation:  INCLUDE "gfx/pokemon/sandshrew/anim0.asm"
+SandslashAnimation:  INCLUDE "gfx/pokemon/sandslash/anim0.asm"
+NidoranFAnimation:   INCLUDE "gfx/pokemon/nidoran_f/anim0.asm"
+NidorinaAnimation:   INCLUDE "gfx/pokemon/nidorina/anim0.asm"
+NidoqueenAnimation:  INCLUDE "gfx/pokemon/nidoqueen/anim0.asm"
+NidoranMAnimation:   INCLUDE "gfx/pokemon/nidoran_m/anim0.asm"
+NidorinoAnimation:   INCLUDE "gfx/pokemon/nidorino/anim0.asm"
+NidokingAnimation:   INCLUDE "gfx/pokemon/nidoking/anim0.asm"
+ClefairyAnimation:   INCLUDE "gfx/pokemon/clefairy/anim0.asm"
+ClefableAnimation:   INCLUDE "gfx/pokemon/clefable/anim0.asm"
+VulpixAnimation:     INCLUDE "gfx/pokemon/vulpix/anim0.asm"
+NinetalesAnimation:  INCLUDE "gfx/pokemon/ninetales/anim0.asm"
+JigglypuffAnimation: INCLUDE "gfx/pokemon/jigglypuff/anim0.asm"
+WigglytuffAnimation: INCLUDE "gfx/pokemon/wigglytuff/anim0.asm"
+ZubatAnimation:      INCLUDE "gfx/pokemon/zubat/anim0.asm"
+GolbatAnimation:     INCLUDE "gfx/pokemon/golbat/anim0.asm"
+OddishAnimation:     INCLUDE "gfx/pokemon/oddish/anim0.asm"
+GloomAnimation:      INCLUDE "gfx/pokemon/gloom/anim0.asm"
+VileplumeAnimation:  INCLUDE "gfx/pokemon/vileplume/anim0.asm"
+ParasAnimation:      INCLUDE "gfx/pokemon/paras/anim0.asm"
+ParasectAnimation:   INCLUDE "gfx/pokemon/parasect/anim0.asm"
+VenonatAnimation:    INCLUDE "gfx/pokemon/venonat/anim0.asm"
+VenomothAnimation:   INCLUDE "gfx/pokemon/venomoth/anim0.asm"
+DiglettAnimation:    INCLUDE "gfx/pokemon/diglett/anim0.asm"
+DugtrioAnimation:    INCLUDE "gfx/pokemon/dugtrio/anim0.asm"
+MeowthAnimation:     INCLUDE "gfx/pokemon/meowth/anim0.asm"
+PersianAnimation:    INCLUDE "gfx/pokemon/persian/anim0.asm"
+PsyduckAnimation:    INCLUDE "gfx/pokemon/psyduck/anim0.asm"
+GolduckAnimation:    INCLUDE "gfx/pokemon/golduck/anim0.asm"
+MankeyAnimation:     INCLUDE "gfx/pokemon/mankey/anim0.asm"
+PrimeapeAnimation:   INCLUDE "gfx/pokemon/primeape/anim0.asm"
+GrowlitheAnimation:  INCLUDE "gfx/pokemon/growlithe/anim0.asm"
+ArcanineAnimation:   INCLUDE "gfx/pokemon/arcanine/anim0.asm"
+PoliwagAnimation:    INCLUDE "gfx/pokemon/poliwag/anim0.asm"
+PoliwhirlAnimation:  INCLUDE "gfx/pokemon/poliwhirl/anim0.asm"
+PoliwrathAnimation:  INCLUDE "gfx/pokemon/poliwrath/anim0.asm"
+AbraAnimation:       INCLUDE "gfx/pokemon/abra/anim0.asm"
+KadabraAnimation:    INCLUDE "gfx/pokemon/kadabra/anim0.asm"
+AlakazamAnimation:   INCLUDE "gfx/pokemon/alakazam/anim0.asm"
+MachopAnimation:     INCLUDE "gfx/pokemon/machop/anim0.asm"
+MachokeAnimation:    INCLUDE "gfx/pokemon/machoke/anim0.asm"
+MachampAnimation:    INCLUDE "gfx/pokemon/machamp/anim0.asm"
+BellsproutAnimation: INCLUDE "gfx/pokemon/bellsprout/anim0.asm"
+WeepinbellAnimation: INCLUDE "gfx/pokemon/weepinbell/anim0.asm"
+VictreebelAnimation: INCLUDE "gfx/pokemon/victreebel/anim0.asm"
+TentacoolAnimation:  INCLUDE "gfx/pokemon/tentacool/anim0.asm"
+TentacruelAnimation: INCLUDE "gfx/pokemon/tentacruel/anim0.asm"
+GeodudeAnimation:    INCLUDE "gfx/pokemon/geodude/anim0.asm"
+GravelerAnimation:   INCLUDE "gfx/pokemon/graveler/anim0.asm"
+GolemAnimation:      INCLUDE "gfx/pokemon/golem/anim0.asm"
+PonytaAnimation:     INCLUDE "gfx/pokemon/ponyta/anim0.asm"
+RapidashAnimation:   INCLUDE "gfx/pokemon/rapidash/anim0.asm"
+SlowpokeAnimation:   INCLUDE "gfx/pokemon/slowpoke/anim0.asm"
+SlowbroAnimation:    INCLUDE "gfx/pokemon/slowbro/anim0.asm"
+MagnemiteAnimation:  INCLUDE "gfx/pokemon/magnemite/anim0.asm"
+MagnetonAnimation:   INCLUDE "gfx/pokemon/magneton/anim0.asm"
+FarfetchDAnimation:  INCLUDE "gfx/pokemon/farfetch_d/anim0.asm"
+DoduoAnimation:      INCLUDE "gfx/pokemon/doduo/anim0.asm"
+DodrioAnimation:     INCLUDE "gfx/pokemon/dodrio/anim0.asm"
+SeelAnimation:       INCLUDE "gfx/pokemon/seel/anim0.asm"
+DewgongAnimation:    INCLUDE "gfx/pokemon/dewgong/anim0.asm"
+GrimerAnimation:     INCLUDE "gfx/pokemon/grimer/anim0.asm"
+MukAnimation:        INCLUDE "gfx/pokemon/muk/anim0.asm"
+ShellderAnimation:   INCLUDE "gfx/pokemon/shellder/anim0.asm"
+CloysterAnimation:   INCLUDE "gfx/pokemon/cloyster/anim0.asm"
+GastlyAnimation:     INCLUDE "gfx/pokemon/gastly/anim0.asm"
+HaunterAnimation:    INCLUDE "gfx/pokemon/haunter/anim0.asm"
+GengarAnimation:     INCLUDE "gfx/pokemon/gengar/anim0.asm"
+OnixAnimation:       INCLUDE "gfx/pokemon/onix/anim0.asm"
+DrowzeeAnimation:    INCLUDE "gfx/pokemon/drowzee/anim0.asm"
+HypnoAnimation:      INCLUDE "gfx/pokemon/hypno/anim0.asm"
+KrabbyAnimation:     INCLUDE "gfx/pokemon/krabby/anim0.asm"
+KinglerAnimation:    INCLUDE "gfx/pokemon/kingler/anim0.asm"
+VoltorbAnimation:    INCLUDE "gfx/pokemon/voltorb/anim0.asm"
+ElectrodeAnimation:  INCLUDE "gfx/pokemon/electrode/anim0.asm"
+ExeggcuteAnimation:  INCLUDE "gfx/pokemon/exeggcute/anim0.asm"
+ExeggutorAnimation:  INCLUDE "gfx/pokemon/exeggutor/anim0.asm"
+CuboneAnimation:     INCLUDE "gfx/pokemon/cubone/anim0.asm"
+MarowakAnimation:    INCLUDE "gfx/pokemon/marowak/anim0.asm"
+HitmonleeAnimation:  INCLUDE "gfx/pokemon/hitmonlee/anim0.asm"
+HitmonchanAnimation: INCLUDE "gfx/pokemon/hitmonchan/anim0.asm"
+LickitungAnimation:  INCLUDE "gfx/pokemon/lickitung/anim0.asm"
+KoffingAnimation:    INCLUDE "gfx/pokemon/koffing/anim0.asm"
+WeezingAnimation:    INCLUDE "gfx/pokemon/weezing/anim0.asm"
+RhyhornAnimation:    INCLUDE "gfx/pokemon/rhyhorn/anim0.asm"
+RhydonAnimation:     INCLUDE "gfx/pokemon/rhydon/anim0.asm"
+ChanseyAnimation:    INCLUDE "gfx/pokemon/chansey/anim0.asm"
+TangelaAnimation:    INCLUDE "gfx/pokemon/tangela/anim0.asm"
+KangaskhanAnimation: INCLUDE "gfx/pokemon/kangaskhan/anim0.asm"
+HorseaAnimation:     INCLUDE "gfx/pokemon/horsea/anim0.asm"
+SeadraAnimation:     INCLUDE "gfx/pokemon/seadra/anim0.asm"
+GoldeenAnimation:    INCLUDE "gfx/pokemon/goldeen/anim0.asm"
+SeakingAnimation:    INCLUDE "gfx/pokemon/seaking/anim0.asm"
+StaryuAnimation:     INCLUDE "gfx/pokemon/staryu/anim0.asm"
+StarmieAnimation:    INCLUDE "gfx/pokemon/starmie/anim0.asm"
+MrMimeAnimation:     INCLUDE "gfx/pokemon/mr__mime/anim0.asm"
+ScytherAnimation:    INCLUDE "gfx/pokemon/scyther/anim0.asm"
+JynxAnimation:       INCLUDE "gfx/pokemon/jynx/anim0.asm"
+ElectabuzzAnimation: INCLUDE "gfx/pokemon/electabuzz/anim0.asm"
+MagmarAnimation:     INCLUDE "gfx/pokemon/magmar/anim0.asm"
+PinsirAnimation:     INCLUDE "gfx/pokemon/pinsir/anim0.asm"
+TaurosAnimation:     INCLUDE "gfx/pokemon/tauros/anim0.asm"
+MagikarpAnimation:   INCLUDE "gfx/pokemon/magikarp/anim0.asm"
+GyaradosAnimation:   INCLUDE "gfx/pokemon/gyarados/anim0.asm"
+LaprasAnimation:     INCLUDE "gfx/pokemon/lapras/anim0.asm"
+DittoAnimation:      INCLUDE "gfx/pokemon/ditto/anim0.asm"
+EeveeAnimation:      INCLUDE "gfx/pokemon/eevee/anim0.asm"
+VaporeonAnimation:   INCLUDE "gfx/pokemon/vaporeon/anim0.asm"
+JolteonAnimation:    INCLUDE "gfx/pokemon/jolteon/anim0.asm"
+FlareonAnimation:    INCLUDE "gfx/pokemon/flareon/anim0.asm"
+PorygonAnimation:    INCLUDE "gfx/pokemon/porygon/anim0.asm"
+OmanyteAnimation:    INCLUDE "gfx/pokemon/omanyte/anim0.asm"
+OmastarAnimation:    INCLUDE "gfx/pokemon/omastar/anim0.asm"
+KabutoAnimation:     INCLUDE "gfx/pokemon/kabuto/anim0.asm"
+KabutopsAnimation:   INCLUDE "gfx/pokemon/kabutops/anim0.asm"
+AerodactylAnimation: INCLUDE "gfx/pokemon/aerodactyl/anim0.asm"
+SnorlaxAnimation:    INCLUDE "gfx/pokemon/snorlax/anim0.asm"
+ArticunoAnimation:   INCLUDE "gfx/pokemon/articuno/anim0.asm"
+ZapdosAnimation:     INCLUDE "gfx/pokemon/zapdos/anim0.asm"
+MoltresAnimation:    INCLUDE "gfx/pokemon/moltres/anim0.asm"
+DratiniAnimation:    INCLUDE "gfx/pokemon/dratini/anim0.asm"
+DragonairAnimation:  INCLUDE "gfx/pokemon/dragonair/anim0.asm"
+DragoniteAnimation:  INCLUDE "gfx/pokemon/dragonite/anim0.asm"
+MewtwoAnimation:     INCLUDE "gfx/pokemon/mewtwo/anim0.asm"
+MewAnimation:        INCLUDE "gfx/pokemon/mew/anim0.asm"
+ChikoritaAnimation:  INCLUDE "gfx/pokemon/chikorita/anim0.asm"
+BayleefAnimation:    INCLUDE "gfx/pokemon/bayleef/anim0.asm"
+MeganiumAnimation:   INCLUDE "gfx/pokemon/meganium/anim0.asm"
+CyndaquilAnimation:  INCLUDE "gfx/pokemon/cyndaquil/anim0.asm"
+QuilavaAnimation:    INCLUDE "gfx/pokemon/quilava/anim0.asm"
+TyphlosionAnimation: INCLUDE "gfx/pokemon/typhlosion/anim0.asm"
+TotodileAnimation:   INCLUDE "gfx/pokemon/totodile/anim0.asm"
+CroconawAnimation:   INCLUDE "gfx/pokemon/croconaw/anim0.asm"
+FeraligatrAnimation: INCLUDE "gfx/pokemon/feraligatr/anim0.asm"
+SentretAnimation:    INCLUDE "gfx/pokemon/sentret/anim0.asm"
+FurretAnimation:     INCLUDE "gfx/pokemon/furret/anim0.asm"
+HoothootAnimation:   INCLUDE "gfx/pokemon/hoothoot/anim0.asm"
+NoctowlAnimation:    INCLUDE "gfx/pokemon/noctowl/anim0.asm"
+LedybaAnimation:     INCLUDE "gfx/pokemon/ledyba/anim0.asm"
+LedianAnimation:     INCLUDE "gfx/pokemon/ledian/anim0.asm"
+SpinarakAnimation:   INCLUDE "gfx/pokemon/spinarak/anim0.asm"
+AriadosAnimation:    INCLUDE "gfx/pokemon/ariados/anim0.asm"
+CrobatAnimation:     INCLUDE "gfx/pokemon/crobat/anim0.asm"
+ChinchouAnimation:   INCLUDE "gfx/pokemon/chinchou/anim0.asm"
+LanturnAnimation:    INCLUDE "gfx/pokemon/lanturn/anim0.asm"
+PichuAnimation:      INCLUDE "gfx/pokemon/pichu/anim0.asm"
+CleffaAnimation:     INCLUDE "gfx/pokemon/cleffa/anim0.asm"
+IgglybuffAnimation:  INCLUDE "gfx/pokemon/igglybuff/anim0.asm"
+TogepiAnimation:     INCLUDE "gfx/pokemon/togepi/anim0.asm"
+TogeticAnimation:    INCLUDE "gfx/pokemon/togetic/anim0.asm"
+NatuAnimation:       INCLUDE "gfx/pokemon/natu/anim0.asm"
+XatuAnimation:       INCLUDE "gfx/pokemon/xatu/anim0.asm"
+MareepAnimation:     INCLUDE "gfx/pokemon/mareep/anim0.asm"
+FlaaffyAnimation:    INCLUDE "gfx/pokemon/flaaffy/anim0.asm"
+AmpharosAnimation:   INCLUDE "gfx/pokemon/ampharos/anim0.asm"
+BellossomAnimation:  INCLUDE "gfx/pokemon/bellossom/anim0.asm"
+MarillAnimation:     INCLUDE "gfx/pokemon/marill/anim0.asm"
+AzumarillAnimation:  INCLUDE "gfx/pokemon/azumarill/anim0.asm"
+SudowoodoAnimation:  INCLUDE "gfx/pokemon/sudowoodo/anim0.asm"
+PolitoedAnimation:   INCLUDE "gfx/pokemon/politoed/anim0.asm"
+HoppipAnimation:     INCLUDE "gfx/pokemon/hoppip/anim0.asm"
+SkiploomAnimation:   INCLUDE "gfx/pokemon/skiploom/anim0.asm"
+JumpluffAnimation:   INCLUDE "gfx/pokemon/jumpluff/anim0.asm"
+AipomAnimation:      INCLUDE "gfx/pokemon/aipom/anim0.asm"
+SunkernAnimation:    INCLUDE "gfx/pokemon/sunkern/anim0.asm"
+SunfloraAnimation:   INCLUDE "gfx/pokemon/sunflora/anim0.asm"
+YanmaAnimation:      INCLUDE "gfx/pokemon/yanma/anim0.asm"
+WooperAnimation:     INCLUDE "gfx/pokemon/wooper/anim0.asm"
+QuagsireAnimation:   INCLUDE "gfx/pokemon/quagsire/anim0.asm"
+EspeonAnimation:     INCLUDE "gfx/pokemon/espeon/anim0.asm"
+UmbreonAnimation:    INCLUDE "gfx/pokemon/umbreon/anim0.asm"
+MurkrowAnimation:    INCLUDE "gfx/pokemon/murkrow/anim0.asm"
+SlowkingAnimation:   INCLUDE "gfx/pokemon/slowking/anim0.asm"
+MisdreavusAnimation: INCLUDE "gfx/pokemon/misdreavus/anim0.asm"
+UnownAnimation:      INCLUDE "gfx/pokemon/unown/anim0.asm"
+WobbuffetAnimation:  INCLUDE "gfx/pokemon/wobbuffet/anim0.asm"
+GirafarigAnimation:  INCLUDE "gfx/pokemon/girafarig/anim0.asm"
+PinecoAnimation:     INCLUDE "gfx/pokemon/pineco/anim0.asm"
+ForretressAnimation: INCLUDE "gfx/pokemon/forretress/anim0.asm"
+DunsparceAnimation:  INCLUDE "gfx/pokemon/dunsparce/anim0.asm"
+GligarAnimation:     INCLUDE "gfx/pokemon/gligar/anim0.asm"
+SteelixAnimation:    INCLUDE "gfx/pokemon/steelix/anim0.asm"
+SnubbullAnimation:   INCLUDE "gfx/pokemon/snubbull/anim0.asm"
+GranbullAnimation:   INCLUDE "gfx/pokemon/granbull/anim0.asm"
+QwilfishAnimation:   INCLUDE "gfx/pokemon/qwilfish/anim0.asm"
+ScizorAnimation:     INCLUDE "gfx/pokemon/scizor/anim0.asm"
+ShuckleAnimation:    INCLUDE "gfx/pokemon/shuckle/anim0.asm"
+HeracrossAnimation:  INCLUDE "gfx/pokemon/heracross/anim0.asm"
+SneaselAnimation:    INCLUDE "gfx/pokemon/sneasel/anim0.asm"
+TeddiursaAnimation:  INCLUDE "gfx/pokemon/teddiursa/anim0.asm"
+UrsaringAnimation:   INCLUDE "gfx/pokemon/ursaring/anim0.asm"
+SlugmaAnimation:     INCLUDE "gfx/pokemon/slugma/anim0.asm"
+MagcargoAnimation:   INCLUDE "gfx/pokemon/magcargo/anim0.asm"
+SwinubAnimation:     INCLUDE "gfx/pokemon/swinub/anim0.asm"
+PiloswineAnimation:  INCLUDE "gfx/pokemon/piloswine/anim0.asm"
+CorsolaAnimation:    INCLUDE "gfx/pokemon/corsola/anim0.asm"
+RemoraidAnimation:   INCLUDE "gfx/pokemon/remoraid/anim0.asm"
+OctilleryAnimation:  INCLUDE "gfx/pokemon/octillery/anim0.asm"
+DelibirdAnimation:   INCLUDE "gfx/pokemon/delibird/anim0.asm"
+MantineAnimation:    INCLUDE "gfx/pokemon/mantine/anim0.asm"
+SkarmoryAnimation:   INCLUDE "gfx/pokemon/skarmory/anim0.asm"
+HoundourAnimation:   INCLUDE "gfx/pokemon/houndour/anim0.asm"
+HoundoomAnimation:   INCLUDE "gfx/pokemon/houndoom/anim0.asm"
+KingdraAnimation:    INCLUDE "gfx/pokemon/kingdra/anim0.asm"
+PhanpyAnimation:     INCLUDE "gfx/pokemon/phanpy/anim0.asm"
+DonphanAnimation:    INCLUDE "gfx/pokemon/donphan/anim0.asm"
+Porygon2Animation:   INCLUDE "gfx/pokemon/porygon2/anim0.asm"
+StantlerAnimation:   INCLUDE "gfx/pokemon/stantler/anim0.asm"
+SmeargleAnimation:   INCLUDE "gfx/pokemon/smeargle/anim0.asm"
+TyrogueAnimation:    INCLUDE "gfx/pokemon/tyrogue/anim0.asm"
+HitmontopAnimation:  INCLUDE "gfx/pokemon/hitmontop/anim0.asm"
+SmoochumAnimation:   INCLUDE "gfx/pokemon/smoochum/anim0.asm"
+ElekidAnimation:     INCLUDE "gfx/pokemon/elekid/anim0.asm"
+MagbyAnimation:      INCLUDE "gfx/pokemon/magby/anim0.asm"
+MiltankAnimation:    INCLUDE "gfx/pokemon/miltank/anim0.asm"
+BlisseyAnimation:    INCLUDE "gfx/pokemon/blissey/anim0.asm"
+RaikouAnimation:     INCLUDE "gfx/pokemon/raikou/anim0.asm"
+EnteiAnimation:      INCLUDE "gfx/pokemon/entei/anim0.asm"
+SuicuneAnimation:    INCLUDE "gfx/pokemon/suicune/anim0.asm"
+LarvitarAnimation:   INCLUDE "gfx/pokemon/larvitar/anim0.asm"
+PupitarAnimation:    INCLUDE "gfx/pokemon/pupitar/anim0.asm"
+TyranitarAnimation:  INCLUDE "gfx/pokemon/tyranitar/anim0.asm"
+LugiaAnimation:      INCLUDE "gfx/pokemon/lugia/anim0.asm"
+HoOhAnimation:       INCLUDE "gfx/pokemon/ho_oh/anim0.asm"
+CelebiAnimation:     INCLUDE "gfx/pokemon/celebi/anim0.asm"
+EggAnimation:        INCLUDE "gfx/pokemon/egg/anim0.asm"
diff --git a/gfx/pics/arbok/anim0.asm b/gfx/pokemon/arbok/anim0.asm
index 0ceceacac..0ceceacac 100644
--- a/gfx/pics/arbok/anim0.asm
+++ b/gfx/pokemon/arbok/anim0.asm
diff --git a/gfx/pics/arbok/anim1.asm b/gfx/pokemon/arbok/anim1.asm
index c9f85e238..c9f85e238 100644
--- a/gfx/pics/arbok/anim1.asm
+++ b/gfx/pokemon/arbok/anim1.asm
diff --git a/gfx/pics/arbok/back.2bpp.lz.7b18cb93 b/gfx/pokemon/arbok/back.2bpp.lz.7b18cb93
index 175abb499..175abb499 100644
--- a/gfx/pics/arbok/back.2bpp.lz.7b18cb93
+++ b/gfx/pokemon/arbok/back.2bpp.lz.7b18cb93
diff --git a/gfx/pics/arbok/back.png b/gfx/pokemon/arbok/back.png
index 5d9809918..5d9809918 100644
--- a/gfx/pics/arbok/back.png
+++ b/gfx/pokemon/arbok/back.png
diff --git a/gfx/pics/arbok/front.animated.2bpp.lz.1589a977 b/gfx/pokemon/arbok/front.animated.2bpp.lz.1589a977
index 8b5918dbd..8b5918dbd 100644
--- a/gfx/pics/arbok/front.animated.2bpp.lz.1589a977
+++ b/gfx/pokemon/arbok/front.animated.2bpp.lz.1589a977
diff --git a/gfx/pics/arbok/front.png b/gfx/pokemon/arbok/front.png
index 340c07d1a..340c07d1a 100644
--- a/gfx/pics/arbok/front.png
+++ b/gfx/pokemon/arbok/front.png
diff --git a/gfx/pics/arbok/shiny.pal b/gfx/pokemon/arbok/shiny.pal
index 3c731f915..3c731f915 100644
--- a/gfx/pics/arbok/shiny.pal
+++ b/gfx/pokemon/arbok/shiny.pal
diff --git a/gfx/pics/arcanine/anim0.asm b/gfx/pokemon/arcanine/anim0.asm
index 0dc0dcacc..0dc0dcacc 100644
--- a/gfx/pics/arcanine/anim0.asm
+++ b/gfx/pokemon/arcanine/anim0.asm
diff --git a/gfx/pics/arcanine/anim1.asm b/gfx/pokemon/arcanine/anim1.asm
index e178a2d24..e178a2d24 100644
--- a/gfx/pics/arcanine/anim1.asm
+++ b/gfx/pokemon/arcanine/anim1.asm
diff --git a/gfx/pics/arcanine/back.2bpp.lz.f5b35ebf b/gfx/pokemon/arcanine/back.2bpp.lz.f5b35ebf
index a76d64986..a76d64986 100644
--- a/gfx/pics/arcanine/back.2bpp.lz.f5b35ebf
+++ b/gfx/pokemon/arcanine/back.2bpp.lz.f5b35ebf
diff --git a/gfx/pics/arcanine/back.png b/gfx/pokemon/arcanine/back.png
index 0358d9344..0358d9344 100644
--- a/gfx/pics/arcanine/back.png
+++ b/gfx/pokemon/arcanine/back.png
diff --git a/gfx/pics/arcanine/front.animated.2bpp.lz.5ae8eff3 b/gfx/pokemon/arcanine/front.animated.2bpp.lz.5ae8eff3
index da1784800..da1784800 100644
--- a/gfx/pics/arcanine/front.animated.2bpp.lz.5ae8eff3
+++ b/gfx/pokemon/arcanine/front.animated.2bpp.lz.5ae8eff3
diff --git a/gfx/pics/arcanine/front.png b/gfx/pokemon/arcanine/front.png
index 5a65299ed..5a65299ed 100644
--- a/gfx/pics/arcanine/front.png
+++ b/gfx/pokemon/arcanine/front.png
diff --git a/gfx/pics/arcanine/shiny.pal b/gfx/pokemon/arcanine/shiny.pal
index 78da21464..78da21464 100644
--- a/gfx/pics/arcanine/shiny.pal
+++ b/gfx/pokemon/arcanine/shiny.pal
diff --git a/gfx/pics/ariados/anim0.asm b/gfx/pokemon/ariados/anim0.asm
index 9a4d30385..9a4d30385 100644
--- a/gfx/pics/ariados/anim0.asm
+++ b/gfx/pokemon/ariados/anim0.asm
diff --git a/gfx/pics/ariados/anim1.asm b/gfx/pokemon/ariados/anim1.asm
index 6b9f416be..6b9f416be 100644
--- a/gfx/pics/ariados/anim1.asm
+++ b/gfx/pokemon/ariados/anim1.asm
diff --git a/gfx/pics/ariados/back.2bpp.lz.9fb1c3fc b/gfx/pokemon/ariados/back.2bpp.lz.9fb1c3fc
index ff3aec7fb..ff3aec7fb 100644
--- a/gfx/pics/ariados/back.2bpp.lz.9fb1c3fc
+++ b/gfx/pokemon/ariados/back.2bpp.lz.9fb1c3fc
diff --git a/gfx/pics/ariados/back.png b/gfx/pokemon/ariados/back.png
index 6d0bc737d..6d0bc737d 100644
--- a/gfx/pics/ariados/back.png
+++ b/gfx/pokemon/ariados/back.png
diff --git a/gfx/pics/ariados/front.animated.2bpp.lz.5ac5c83c b/gfx/pokemon/ariados/front.animated.2bpp.lz.5ac5c83c
index 51039aeb5..51039aeb5 100644
--- a/gfx/pics/ariados/front.animated.2bpp.lz.5ac5c83c
+++ b/gfx/pokemon/ariados/front.animated.2bpp.lz.5ac5c83c
diff --git a/gfx/pics/ariados/front.png b/gfx/pokemon/ariados/front.png
index ba40159e6..ba40159e6 100644
--- a/gfx/pics/ariados/front.png
+++ b/gfx/pokemon/ariados/front.png
diff --git a/gfx/pics/ariados/shiny.pal b/gfx/pokemon/ariados/shiny.pal
index 1dae64a4f..1dae64a4f 100644
--- a/gfx/pics/ariados/shiny.pal
+++ b/gfx/pokemon/ariados/shiny.pal
diff --git a/gfx/pics/articuno/anim0.asm b/gfx/pokemon/articuno/anim0.asm
index ccb583766..ccb583766 100644
--- a/gfx/pics/articuno/anim0.asm
+++ b/gfx/pokemon/articuno/anim0.asm
diff --git a/gfx/pics/articuno/anim1.asm b/gfx/pokemon/articuno/anim1.asm
index 634d8daff..634d8daff 100644
--- a/gfx/pics/articuno/anim1.asm
+++ b/gfx/pokemon/articuno/anim1.asm
diff --git a/gfx/pics/articuno/back.2bpp.lz.c263c2aa b/gfx/pokemon/articuno/back.2bpp.lz.c263c2aa
index 87b61ac9d..87b61ac9d 100644
--- a/gfx/pics/articuno/back.2bpp.lz.c263c2aa
+++ b/gfx/pokemon/articuno/back.2bpp.lz.c263c2aa
diff --git a/gfx/pics/articuno/back.png b/gfx/pokemon/articuno/back.png
index 9734a3095..9734a3095 100644
--- a/gfx/pics/articuno/back.png
+++ b/gfx/pokemon/articuno/back.png
diff --git a/gfx/pics/articuno/front.animated.2bpp.lz.650aef29 b/gfx/pokemon/articuno/front.animated.2bpp.lz.650aef29
index a60367098..a60367098 100644
--- a/gfx/pics/articuno/front.animated.2bpp.lz.650aef29
+++ b/gfx/pokemon/articuno/front.animated.2bpp.lz.650aef29
diff --git a/gfx/pics/articuno/front.png b/gfx/pokemon/articuno/front.png
index bd0090d7b..bd0090d7b 100644
--- a/gfx/pics/articuno/front.png
+++ b/gfx/pokemon/articuno/front.png
diff --git a/gfx/pics/articuno/shiny.pal b/gfx/pokemon/articuno/shiny.pal
index d6c56f521..d6c56f521 100644
--- a/gfx/pics/articuno/shiny.pal
+++ b/gfx/pokemon/articuno/shiny.pal
diff --git a/gfx/pics/azumarill/anim0.asm b/gfx/pokemon/azumarill/anim0.asm
index bbe46d4b7..bbe46d4b7 100644
--- a/gfx/pics/azumarill/anim0.asm
+++ b/gfx/pokemon/azumarill/anim0.asm
diff --git a/gfx/pics/azumarill/anim1.asm b/gfx/pokemon/azumarill/anim1.asm
index 070e6145f..070e6145f 100644
--- a/gfx/pics/azumarill/anim1.asm
+++ b/gfx/pokemon/azumarill/anim1.asm
diff --git a/gfx/pics/azumarill/back.2bpp.lz.f7fa0db9 b/gfx/pokemon/azumarill/back.2bpp.lz.f7fa0db9
index b66df2a71..b66df2a71 100644
--- a/gfx/pics/azumarill/back.2bpp.lz.f7fa0db9
+++ b/gfx/pokemon/azumarill/back.2bpp.lz.f7fa0db9
diff --git a/gfx/pics/azumarill/back.png b/gfx/pokemon/azumarill/back.png
index 581c0e926..581c0e926 100644
--- a/gfx/pics/azumarill/back.png
+++ b/gfx/pokemon/azumarill/back.png
diff --git a/gfx/pics/azumarill/front.animated.2bpp.lz.cc9fd2ed b/gfx/pokemon/azumarill/front.animated.2bpp.lz.cc9fd2ed
index d6f031164..d6f031164 100644
--- a/gfx/pics/azumarill/front.animated.2bpp.lz.cc9fd2ed
+++ b/gfx/pokemon/azumarill/front.animated.2bpp.lz.cc9fd2ed
diff --git a/gfx/pics/azumarill/front.png b/gfx/pokemon/azumarill/front.png
index 9a51d6739..9a51d6739 100644
--- a/gfx/pics/azumarill/front.png
+++ b/gfx/pokemon/azumarill/front.png
diff --git a/gfx/pics/azumarill/shiny.pal b/gfx/pokemon/azumarill/shiny.pal
index 18cfd1195..18cfd1195 100644
--- a/gfx/pics/azumarill/shiny.pal
+++ b/gfx/pokemon/azumarill/shiny.pal
diff --git a/gfx/pics/bayleef/anim0.asm b/gfx/pokemon/bayleef/anim0.asm
index de54fe495..de54fe495 100644
--- a/gfx/pics/bayleef/anim0.asm
+++ b/gfx/pokemon/bayleef/anim0.asm
diff --git a/gfx/pics/bayleef/anim1.asm b/gfx/pokemon/bayleef/anim1.asm
index 59d3f1762..59d3f1762 100644
--- a/gfx/pics/bayleef/anim1.asm
+++ b/gfx/pokemon/bayleef/anim1.asm
diff --git a/gfx/pics/bayleef/back.2bpp.lz.c4783e65 b/gfx/pokemon/bayleef/back.2bpp.lz.c4783e65
index 809e5d199..809e5d199 100644
--- a/gfx/pics/bayleef/back.2bpp.lz.c4783e65
+++ b/gfx/pokemon/bayleef/back.2bpp.lz.c4783e65
diff --git a/gfx/pics/bayleef/back.png b/gfx/pokemon/bayleef/back.png
index 1e95d7b08..1e95d7b08 100644
--- a/gfx/pics/bayleef/back.png
+++ b/gfx/pokemon/bayleef/back.png
diff --git a/gfx/pics/bayleef/front.animated.2bpp.lz.147649f2 b/gfx/pokemon/bayleef/front.animated.2bpp.lz.147649f2
index 3134f6e16..3134f6e16 100644
--- a/gfx/pics/bayleef/front.animated.2bpp.lz.147649f2
+++ b/gfx/pokemon/bayleef/front.animated.2bpp.lz.147649f2
diff --git a/gfx/pics/bayleef/front.png b/gfx/pokemon/bayleef/front.png
index 9fd993152..9fd993152 100644
--- a/gfx/pics/bayleef/front.png
+++ b/gfx/pokemon/bayleef/front.png
diff --git a/gfx/pics/bayleef/shiny.pal b/gfx/pokemon/bayleef/shiny.pal
index fcacccc19..fcacccc19 100644
--- a/gfx/pics/bayleef/shiny.pal
+++ b/gfx/pokemon/bayleef/shiny.pal
diff --git a/gfx/pics/beedrill/anim0.asm b/gfx/pokemon/beedrill/anim0.asm
index 036fbb738..036fbb738 100644
--- a/gfx/pics/beedrill/anim0.asm
+++ b/gfx/pokemon/beedrill/anim0.asm
diff --git a/gfx/pics/beedrill/anim1.asm b/gfx/pokemon/beedrill/anim1.asm
index 8205f9a8c..8205f9a8c 100644
--- a/gfx/pics/beedrill/anim1.asm
+++ b/gfx/pokemon/beedrill/anim1.asm
diff --git a/gfx/pics/beedrill/back.2bpp.lz.dfd6a87b b/gfx/pokemon/beedrill/back.2bpp.lz.dfd6a87b
index 492eb64e2..492eb64e2 100644
--- a/gfx/pics/beedrill/back.2bpp.lz.dfd6a87b
+++ b/gfx/pokemon/beedrill/back.2bpp.lz.dfd6a87b
diff --git a/gfx/pics/beedrill/back.png b/gfx/pokemon/beedrill/back.png
index c41eccf5f..c41eccf5f 100644
--- a/gfx/pics/beedrill/back.png
+++ b/gfx/pokemon/beedrill/back.png
diff --git a/gfx/pics/beedrill/front.animated.2bpp.lz.1b5d3117 b/gfx/pokemon/beedrill/front.animated.2bpp.lz.1b5d3117
index 55f560521..55f560521 100644
--- a/gfx/pics/beedrill/front.animated.2bpp.lz.1b5d3117
+++ b/gfx/pokemon/beedrill/front.animated.2bpp.lz.1b5d3117
diff --git a/gfx/pics/beedrill/front.png b/gfx/pokemon/beedrill/front.png
index 271eaa3b4..271eaa3b4 100644
--- a/gfx/pics/beedrill/front.png
+++ b/gfx/pokemon/beedrill/front.png
diff --git a/gfx/pics/beedrill/shiny.pal b/gfx/pokemon/beedrill/shiny.pal
index cfbc9997a..cfbc9997a 100644
--- a/gfx/pics/beedrill/shiny.pal
+++ b/gfx/pokemon/beedrill/shiny.pal
diff --git a/gfx/pics/bellossom/anim0.asm b/gfx/pokemon/bellossom/anim0.asm
index 7aa2e3568..7aa2e3568 100644
--- a/gfx/pics/bellossom/anim0.asm
+++ b/gfx/pokemon/bellossom/anim0.asm
diff --git a/gfx/pics/bellossom/anim1.asm b/gfx/pokemon/bellossom/anim1.asm
index 322fa3758..322fa3758 100644
--- a/gfx/pics/bellossom/anim1.asm
+++ b/gfx/pokemon/bellossom/anim1.asm
diff --git a/gfx/pics/bellossom/back.2bpp.lz.10d31691 b/gfx/pokemon/bellossom/back.2bpp.lz.10d31691
index d1a59b617..d1a59b617 100644
--- a/gfx/pics/bellossom/back.2bpp.lz.10d31691
+++ b/gfx/pokemon/bellossom/back.2bpp.lz.10d31691
diff --git a/gfx/pics/bellossom/back.png b/gfx/pokemon/bellossom/back.png
index 53b24c2b4..53b24c2b4 100644
--- a/gfx/pics/bellossom/back.png
+++ b/gfx/pokemon/bellossom/back.png
diff --git a/gfx/pics/bellossom/front.animated.2bpp.lz.289eaecf b/gfx/pokemon/bellossom/front.animated.2bpp.lz.289eaecf
index 9cba9a1c3..9cba9a1c3 100644
--- a/gfx/pics/bellossom/front.animated.2bpp.lz.289eaecf
+++ b/gfx/pokemon/bellossom/front.animated.2bpp.lz.289eaecf
diff --git a/gfx/pics/bellossom/front.png b/gfx/pokemon/bellossom/front.png
index f77907c45..f77907c45 100644
--- a/gfx/pics/bellossom/front.png
+++ b/gfx/pokemon/bellossom/front.png
diff --git a/gfx/pics/bellossom/shiny.pal b/gfx/pokemon/bellossom/shiny.pal
index a099a594e..a099a594e 100644
--- a/gfx/pics/bellossom/shiny.pal
+++ b/gfx/pokemon/bellossom/shiny.pal
diff --git a/gfx/pics/bellsprout/anim0.asm b/gfx/pokemon/bellsprout/anim0.asm
index 9a71b29ac..9a71b29ac 100644
--- a/gfx/pics/bellsprout/anim0.asm
+++ b/gfx/pokemon/bellsprout/anim0.asm
diff --git a/gfx/pics/bellsprout/anim1.asm b/gfx/pokemon/bellsprout/anim1.asm
index 31ad26997..31ad26997 100644
--- a/gfx/pics/bellsprout/anim1.asm
+++ b/gfx/pokemon/bellsprout/anim1.asm
diff --git a/gfx/pics/bellsprout/back.2bpp.lz.9dacbda8 b/gfx/pokemon/bellsprout/back.2bpp.lz.9dacbda8
index ab600f064..ab600f064 100644
--- a/gfx/pics/bellsprout/back.2bpp.lz.9dacbda8
+++ b/gfx/pokemon/bellsprout/back.2bpp.lz.9dacbda8
diff --git a/gfx/pics/bellsprout/back.png b/gfx/pokemon/bellsprout/back.png
index ef5c271ef..ef5c271ef 100644
--- a/gfx/pics/bellsprout/back.png
+++ b/gfx/pokemon/bellsprout/back.png
diff --git a/gfx/pics/bellsprout/front.animated.2bpp.lz.44df413d b/gfx/pokemon/bellsprout/front.animated.2bpp.lz.44df413d
index 2593fb112..2593fb112 100644
--- a/gfx/pics/bellsprout/front.animated.2bpp.lz.44df413d
+++ b/gfx/pokemon/bellsprout/front.animated.2bpp.lz.44df413d
diff --git a/gfx/pics/bellsprout/front.png b/gfx/pokemon/bellsprout/front.png
index 0a243dd94..0a243dd94 100644
--- a/gfx/pics/bellsprout/front.png
+++ b/gfx/pokemon/bellsprout/front.png
diff --git a/gfx/pics/bellsprout/shiny.pal b/gfx/pokemon/bellsprout/shiny.pal
index 5a2b267f1..5a2b267f1 100644
--- a/gfx/pics/bellsprout/shiny.pal
+++ b/gfx/pokemon/bellsprout/shiny.pal
diff --git a/gfx/pics/bitmask_pointers.asm b/gfx/pokemon/bitmask_pointers.asm
index 7d87ad8d9..7d87ad8d9 100644
--- a/gfx/pics/bitmask_pointers.asm
+++ b/gfx/pokemon/bitmask_pointers.asm
diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm
new file mode 100644
index 000000000..5f4504934
--- /dev/null
+++ b/gfx/pokemon/bitmasks.asm
@@ -0,0 +1,252 @@
+BulbasaurBitmasks:  INCLUDE "gfx/pokemon/bulbasaur/bitmask.asm"
+IvysaurBitmasks:    INCLUDE "gfx/pokemon/ivysaur/bitmask.asm"
+VenusaurBitmasks:   INCLUDE "gfx/pokemon/venusaur/bitmask.asm"
+CharmanderBitmasks: INCLUDE "gfx/pokemon/charmander/bitmask.asm"
+CharmeleonBitmasks: INCLUDE "gfx/pokemon/charmeleon/bitmask.asm"
+CharizardBitmasks:  INCLUDE "gfx/pokemon/charizard/bitmask.asm"
+SquirtleBitmasks:   INCLUDE "gfx/pokemon/squirtle/bitmask.asm"
+WartortleBitmasks:  INCLUDE "gfx/pokemon/wartortle/bitmask.asm"
+BlastoiseBitmasks:  INCLUDE "gfx/pokemon/blastoise/bitmask.asm"
+CaterpieBitmasks:   INCLUDE "gfx/pokemon/caterpie/bitmask.asm"
+MetapodBitmasks:    INCLUDE "gfx/pokemon/metapod/bitmask.asm"
+ButterfreeBitmasks: INCLUDE "gfx/pokemon/butterfree/bitmask.asm"
+WeedleBitmasks:     INCLUDE "gfx/pokemon/weedle/bitmask.asm"
+KakunaBitmasks:     INCLUDE "gfx/pokemon/kakuna/bitmask.asm"
+BeedrillBitmasks:   INCLUDE "gfx/pokemon/beedrill/bitmask.asm"
+PidgeyBitmasks:     INCLUDE "gfx/pokemon/pidgey/bitmask.asm"
+PidgeottoBitmasks:  INCLUDE "gfx/pokemon/pidgeotto/bitmask.asm"
+PidgeotBitmasks:    INCLUDE "gfx/pokemon/pidgeot/bitmask.asm"
+RattataBitmasks:    INCLUDE "gfx/pokemon/rattata/bitmask.asm"
+RaticateBitmasks:   INCLUDE "gfx/pokemon/raticate/bitmask.asm"
+SpearowBitmasks:    INCLUDE "gfx/pokemon/spearow/bitmask.asm"
+FearowBitmasks:     INCLUDE "gfx/pokemon/fearow/bitmask.asm"
+EkansBitmasks:      INCLUDE "gfx/pokemon/ekans/bitmask.asm"
+ArbokBitmasks:      INCLUDE "gfx/pokemon/arbok/bitmask.asm"
+PikachuBitmasks:    INCLUDE "gfx/pokemon/pikachu/bitmask.asm"
+RaichuBitmasks:     INCLUDE "gfx/pokemon/raichu/bitmask.asm"
+SandshrewBitmasks:  INCLUDE "gfx/pokemon/sandshrew/bitmask.asm"
+SandslashBitmasks:  INCLUDE "gfx/pokemon/sandslash/bitmask.asm"
+NidoranFBitmasks:   INCLUDE "gfx/pokemon/nidoran_f/bitmask.asm"
+NidorinaBitmasks:   INCLUDE "gfx/pokemon/nidorina/bitmask.asm"
+NidoqueenBitmasks:  INCLUDE "gfx/pokemon/nidoqueen/bitmask.asm"
+NidoranMBitmasks:   INCLUDE "gfx/pokemon/nidoran_m/bitmask.asm"
+NidorinoBitmasks:   INCLUDE "gfx/pokemon/nidorino/bitmask.asm"
+NidokingBitmasks:   INCLUDE "gfx/pokemon/nidoking/bitmask.asm"
+ClefairyBitmasks:   INCLUDE "gfx/pokemon/clefairy/bitmask.asm"
+ClefableBitmasks:   INCLUDE "gfx/pokemon/clefable/bitmask.asm"
+VulpixBitmasks:     INCLUDE "gfx/pokemon/vulpix/bitmask.asm"
+NinetalesBitmasks:  INCLUDE "gfx/pokemon/ninetales/bitmask.asm"
+JigglypuffBitmasks: INCLUDE "gfx/pokemon/jigglypuff/bitmask.asm"
+WigglytuffBitmasks: INCLUDE "gfx/pokemon/wigglytuff/bitmask.asm"
+ZubatBitmasks:      INCLUDE "gfx/pokemon/zubat/bitmask.asm"
+GolbatBitmasks:     INCLUDE "gfx/pokemon/golbat/bitmask.asm"
+OddishBitmasks:     INCLUDE "gfx/pokemon/oddish/bitmask.asm"
+GloomBitmasks:      INCLUDE "gfx/pokemon/gloom/bitmask.asm"
+VileplumeBitmasks:  INCLUDE "gfx/pokemon/vileplume/bitmask.asm"
+ParasBitmasks:      INCLUDE "gfx/pokemon/paras/bitmask.asm"
+ParasectBitmasks:   INCLUDE "gfx/pokemon/parasect/bitmask.asm"
+VenonatBitmasks:    INCLUDE "gfx/pokemon/venonat/bitmask.asm"
+VenomothBitmasks:   INCLUDE "gfx/pokemon/venomoth/bitmask.asm"
+DiglettBitmasks:    INCLUDE "gfx/pokemon/diglett/bitmask.asm"
+DugtrioBitmasks:    INCLUDE "gfx/pokemon/dugtrio/bitmask.asm"
+MeowthBitmasks:     INCLUDE "gfx/pokemon/meowth/bitmask.asm"
+PersianBitmasks:    INCLUDE "gfx/pokemon/persian/bitmask.asm"
+PsyduckBitmasks:    INCLUDE "gfx/pokemon/psyduck/bitmask.asm"
+GolduckBitmasks:    INCLUDE "gfx/pokemon/golduck/bitmask.asm"
+MankeyBitmasks:     INCLUDE "gfx/pokemon/mankey/bitmask.asm"
+PrimeapeBitmasks:   INCLUDE "gfx/pokemon/primeape/bitmask.asm"
+GrowlitheBitmasks:  INCLUDE "gfx/pokemon/growlithe/bitmask.asm"
+ArcanineBitmasks:   INCLUDE "gfx/pokemon/arcanine/bitmask.asm"
+PoliwagBitmasks:    INCLUDE "gfx/pokemon/poliwag/bitmask.asm"
+PoliwhirlBitmasks:  INCLUDE "gfx/pokemon/poliwhirl/bitmask.asm"
+PoliwrathBitmasks:  INCLUDE "gfx/pokemon/poliwrath/bitmask.asm"
+AbraBitmasks:       INCLUDE "gfx/pokemon/abra/bitmask.asm"
+KadabraBitmasks:    INCLUDE "gfx/pokemon/kadabra/bitmask.asm"
+AlakazamBitmasks:   INCLUDE "gfx/pokemon/alakazam/bitmask.asm"
+MachopBitmasks:     INCLUDE "gfx/pokemon/machop/bitmask.asm"
+MachokeBitmasks:    INCLUDE "gfx/pokemon/machoke/bitmask.asm"
+MachampBitmasks:    INCLUDE "gfx/pokemon/machamp/bitmask.asm"
+BellsproutBitmasks: INCLUDE "gfx/pokemon/bellsprout/bitmask.asm"
+WeepinbellBitmasks: INCLUDE "gfx/pokemon/weepinbell/bitmask.asm"
+VictreebelBitmasks: INCLUDE "gfx/pokemon/victreebel/bitmask.asm"
+TentacoolBitmasks:  INCLUDE "gfx/pokemon/tentacool/bitmask.asm"
+TentacruelBitmasks: INCLUDE "gfx/pokemon/tentacruel/bitmask.asm"
+GeodudeBitmasks:    INCLUDE "gfx/pokemon/geodude/bitmask.asm"
+GravelerBitmasks:   INCLUDE "gfx/pokemon/graveler/bitmask.asm"
+GolemBitmasks:      INCLUDE "gfx/pokemon/golem/bitmask.asm"
+PonytaBitmasks:     INCLUDE "gfx/pokemon/ponyta/bitmask.asm"
+RapidashBitmasks:   INCLUDE "gfx/pokemon/rapidash/bitmask.asm"
+SlowpokeBitmasks:   INCLUDE "gfx/pokemon/slowpoke/bitmask.asm"
+SlowbroBitmasks:    INCLUDE "gfx/pokemon/slowbro/bitmask.asm"
+MagnemiteBitmasks:  INCLUDE "gfx/pokemon/magnemite/bitmask.asm"
+MagnetonBitmasks:   INCLUDE "gfx/pokemon/magneton/bitmask.asm"
+FarfetchDBitmasks:  INCLUDE "gfx/pokemon/farfetch_d/bitmask.asm"
+DoduoBitmasks:      INCLUDE "gfx/pokemon/doduo/bitmask.asm"
+DodrioBitmasks:     INCLUDE "gfx/pokemon/dodrio/bitmask.asm"
+SeelBitmasks:       INCLUDE "gfx/pokemon/seel/bitmask.asm"
+DewgongBitmasks:    INCLUDE "gfx/pokemon/dewgong/bitmask.asm"
+GrimerBitmasks:     INCLUDE "gfx/pokemon/grimer/bitmask.asm"
+MukBitmasks:        INCLUDE "gfx/pokemon/muk/bitmask.asm"
+ShellderBitmasks:   INCLUDE "gfx/pokemon/shellder/bitmask.asm"
+CloysterBitmasks:   INCLUDE "gfx/pokemon/cloyster/bitmask.asm"
+GastlyBitmasks:     INCLUDE "gfx/pokemon/gastly/bitmask.asm"
+HaunterBitmasks:    INCLUDE "gfx/pokemon/haunter/bitmask.asm"
+GengarBitmasks:     INCLUDE "gfx/pokemon/gengar/bitmask.asm"
+OnixBitmasks:       INCLUDE "gfx/pokemon/onix/bitmask.asm"
+DrowzeeBitmasks:    INCLUDE "gfx/pokemon/drowzee/bitmask.asm"
+HypnoBitmasks:      INCLUDE "gfx/pokemon/hypno/bitmask.asm"
+KrabbyBitmasks:     INCLUDE "gfx/pokemon/krabby/bitmask.asm"
+KinglerBitmasks:    INCLUDE "gfx/pokemon/kingler/bitmask.asm"
+VoltorbBitmasks:    INCLUDE "gfx/pokemon/voltorb/bitmask.asm"
+ElectrodeBitmasks:  INCLUDE "gfx/pokemon/electrode/bitmask.asm"
+ExeggcuteBitmasks:  INCLUDE "gfx/pokemon/exeggcute/bitmask.asm"
+ExeggutorBitmasks:  INCLUDE "gfx/pokemon/exeggutor/bitmask.asm"
+CuboneBitmasks:     INCLUDE "gfx/pokemon/cubone/bitmask.asm"
+MarowakBitmasks:    INCLUDE "gfx/pokemon/marowak/bitmask.asm"
+HitmonleeBitmasks:  INCLUDE "gfx/pokemon/hitmonlee/bitmask.asm"
+HitmonchanBitmasks: INCLUDE "gfx/pokemon/hitmonchan/bitmask.asm"
+LickitungBitmasks:  INCLUDE "gfx/pokemon/lickitung/bitmask.asm"
+KoffingBitmasks:    INCLUDE "gfx/pokemon/koffing/bitmask.asm"
+WeezingBitmasks:    INCLUDE "gfx/pokemon/weezing/bitmask.asm"
+RhyhornBitmasks:    INCLUDE "gfx/pokemon/rhyhorn/bitmask.asm"
+RhydonBitmasks:     INCLUDE "gfx/pokemon/rhydon/bitmask.asm"
+ChanseyBitmasks:    INCLUDE "gfx/pokemon/chansey/bitmask.asm"
+TangelaBitmasks:    INCLUDE "gfx/pokemon/tangela/bitmask.asm"
+KangaskhanBitmasks: INCLUDE "gfx/pokemon/kangaskhan/bitmask.asm"
+HorseaBitmasks:     INCLUDE "gfx/pokemon/horsea/bitmask.asm"
+SeadraBitmasks:     INCLUDE "gfx/pokemon/seadra/bitmask.asm"
+GoldeenBitmasks:    INCLUDE "gfx/pokemon/goldeen/bitmask.asm"
+SeakingBitmasks:    INCLUDE "gfx/pokemon/seaking/bitmask.asm"
+StaryuBitmasks:     INCLUDE "gfx/pokemon/staryu/bitmask.asm"
+StarmieBitmasks:    INCLUDE "gfx/pokemon/starmie/bitmask.asm"
+MrMimeBitmasks:     INCLUDE "gfx/pokemon/mr__mime/bitmask.asm"
+ScytherBitmasks:    INCLUDE "gfx/pokemon/scyther/bitmask.asm"
+JynxBitmasks:       INCLUDE "gfx/pokemon/jynx/bitmask.asm"
+ElectabuzzBitmasks: INCLUDE "gfx/pokemon/electabuzz/bitmask.asm"
+MagmarBitmasks:     INCLUDE "gfx/pokemon/magmar/bitmask.asm"
+PinsirBitmasks:     INCLUDE "gfx/pokemon/pinsir/bitmask.asm"
+TaurosBitmasks:     INCLUDE "gfx/pokemon/tauros/bitmask.asm"
+MagikarpBitmasks:   INCLUDE "gfx/pokemon/magikarp/bitmask.asm"
+GyaradosBitmasks:   INCLUDE "gfx/pokemon/gyarados/bitmask.asm"
+LaprasBitmasks:     INCLUDE "gfx/pokemon/lapras/bitmask.asm"
+DittoBitmasks:      INCLUDE "gfx/pokemon/ditto/bitmask.asm"
+EeveeBitmasks:      INCLUDE "gfx/pokemon/eevee/bitmask.asm"
+VaporeonBitmasks:   INCLUDE "gfx/pokemon/vaporeon/bitmask.asm"
+JolteonBitmasks:    INCLUDE "gfx/pokemon/jolteon/bitmask.asm"
+FlareonBitmasks:    INCLUDE "gfx/pokemon/flareon/bitmask.asm"
+PorygonBitmasks:    INCLUDE "gfx/pokemon/porygon/bitmask.asm"
+OmanyteBitmasks:    INCLUDE "gfx/pokemon/omanyte/bitmask.asm"
+OmastarBitmasks:    INCLUDE "gfx/pokemon/omastar/bitmask.asm"
+KabutoBitmasks:     INCLUDE "gfx/pokemon/kabuto/bitmask.asm"
+KabutopsBitmasks:   INCLUDE "gfx/pokemon/kabutops/bitmask.asm"
+AerodactylBitmasks: INCLUDE "gfx/pokemon/aerodactyl/bitmask.asm"
+SnorlaxBitmasks:    INCLUDE "gfx/pokemon/snorlax/bitmask.asm"
+ArticunoBitmasks:   INCLUDE "gfx/pokemon/articuno/bitmask.asm"
+ZapdosBitmasks:     INCLUDE "gfx/pokemon/zapdos/bitmask.asm"
+MoltresBitmasks:    INCLUDE "gfx/pokemon/moltres/bitmask.asm"
+DratiniBitmasks:    INCLUDE "gfx/pokemon/dratini/bitmask.asm"
+DragonairBitmasks:  INCLUDE "gfx/pokemon/dragonair/bitmask.asm"
+DragoniteBitmasks:  INCLUDE "gfx/pokemon/dragonite/bitmask.asm"
+MewtwoBitmasks:     INCLUDE "gfx/pokemon/mewtwo/bitmask.asm"
+MewBitmasks:        INCLUDE "gfx/pokemon/mew/bitmask.asm"
+ChikoritaBitmasks:  INCLUDE "gfx/pokemon/chikorita/bitmask.asm"
+BayleefBitmasks:    INCLUDE "gfx/pokemon/bayleef/bitmask.asm"
+MeganiumBitmasks:   INCLUDE "gfx/pokemon/meganium/bitmask.asm"
+CyndaquilBitmasks:  INCLUDE "gfx/pokemon/cyndaquil/bitmask.asm"
+QuilavaBitmasks:    INCLUDE "gfx/pokemon/quilava/bitmask.asm"
+TyphlosionBitmasks: INCLUDE "gfx/pokemon/typhlosion/bitmask.asm"
+TotodileBitmasks:   INCLUDE "gfx/pokemon/totodile/bitmask.asm"
+CroconawBitmasks:   INCLUDE "gfx/pokemon/croconaw/bitmask.asm"
+FeraligatrBitmasks: INCLUDE "gfx/pokemon/feraligatr/bitmask.asm"
+SentretBitmasks:    INCLUDE "gfx/pokemon/sentret/bitmask.asm"
+FurretBitmasks:     INCLUDE "gfx/pokemon/furret/bitmask.asm"
+HoothootBitmasks:   INCLUDE "gfx/pokemon/hoothoot/bitmask.asm"
+NoctowlBitmasks:    INCLUDE "gfx/pokemon/noctowl/bitmask.asm"
+LedybaBitmasks:     INCLUDE "gfx/pokemon/ledyba/bitmask.asm"
+LedianBitmasks:     INCLUDE "gfx/pokemon/ledian/bitmask.asm"
+SpinarakBitmasks:   INCLUDE "gfx/pokemon/spinarak/bitmask.asm"
+AriadosBitmasks:    INCLUDE "gfx/pokemon/ariados/bitmask.asm"
+CrobatBitmasks:     INCLUDE "gfx/pokemon/crobat/bitmask.asm"
+ChinchouBitmasks:   INCLUDE "gfx/pokemon/chinchou/bitmask.asm"
+LanturnBitmasks:    INCLUDE "gfx/pokemon/lanturn/bitmask.asm"
+PichuBitmasks:      INCLUDE "gfx/pokemon/pichu/bitmask.asm"
+CleffaBitmasks:     INCLUDE "gfx/pokemon/cleffa/bitmask.asm"
+IgglybuffBitmasks:  INCLUDE "gfx/pokemon/igglybuff/bitmask.asm"
+TogepiBitmasks:     INCLUDE "gfx/pokemon/togepi/bitmask.asm"
+TogeticBitmasks:    INCLUDE "gfx/pokemon/togetic/bitmask.asm"
+NatuBitmasks:       INCLUDE "gfx/pokemon/natu/bitmask.asm"
+XatuBitmasks:       INCLUDE "gfx/pokemon/xatu/bitmask.asm"
+MareepBitmasks:     INCLUDE "gfx/pokemon/mareep/bitmask.asm"
+FlaaffyBitmasks:    INCLUDE "gfx/pokemon/flaaffy/bitmask.asm"
+AmpharosBitmasks:   INCLUDE "gfx/pokemon/ampharos/bitmask.asm"
+BellossomBitmasks:  INCLUDE "gfx/pokemon/bellossom/bitmask.asm"
+MarillBitmasks:     INCLUDE "gfx/pokemon/marill/bitmask.asm"
+AzumarillBitmasks:  INCLUDE "gfx/pokemon/azumarill/bitmask.asm"
+SudowoodoBitmasks:  INCLUDE "gfx/pokemon/sudowoodo/bitmask.asm"
+PolitoedBitmasks:   INCLUDE "gfx/pokemon/politoed/bitmask.asm"
+HoppipBitmasks:     INCLUDE "gfx/pokemon/hoppip/bitmask.asm"
+SkiploomBitmasks:   INCLUDE "gfx/pokemon/skiploom/bitmask.asm"
+JumpluffBitmasks:   INCLUDE "gfx/pokemon/jumpluff/bitmask.asm"
+AipomBitmasks:      INCLUDE "gfx/pokemon/aipom/bitmask.asm"
+SunkernBitmasks:    INCLUDE "gfx/pokemon/sunkern/bitmask.asm"
+SunfloraBitmasks:   INCLUDE "gfx/pokemon/sunflora/bitmask.asm"
+YanmaBitmasks:      INCLUDE "gfx/pokemon/yanma/bitmask.asm"
+WooperBitmasks:     INCLUDE "gfx/pokemon/wooper/bitmask.asm"
+QuagsireBitmasks:   INCLUDE "gfx/pokemon/quagsire/bitmask.asm"
+EspeonBitmasks:     INCLUDE "gfx/pokemon/espeon/bitmask.asm"
+UmbreonBitmasks:    INCLUDE "gfx/pokemon/umbreon/bitmask.asm"
+MurkrowBitmasks:    INCLUDE "gfx/pokemon/murkrow/bitmask.asm"
+SlowkingBitmasks:   INCLUDE "gfx/pokemon/slowking/bitmask.asm"
+MisdreavusBitmasks: INCLUDE "gfx/pokemon/misdreavus/bitmask.asm"
+UnownBitmasks:      INCLUDE "gfx/pokemon/unown/bitmask.asm"
+WobbuffetBitmasks:  INCLUDE "gfx/pokemon/wobbuffet/bitmask.asm"
+GirafarigBitmasks:  INCLUDE "gfx/pokemon/girafarig/bitmask.asm"
+PinecoBitmasks:     INCLUDE "gfx/pokemon/pineco/bitmask.asm"
+ForretressBitmasks: INCLUDE "gfx/pokemon/forretress/bitmask.asm"
+DunsparceBitmasks:  INCLUDE "gfx/pokemon/dunsparce/bitmask.asm"
+GligarBitmasks:     INCLUDE "gfx/pokemon/gligar/bitmask.asm"
+SteelixBitmasks:    INCLUDE "gfx/pokemon/steelix/bitmask.asm"
+SnubbullBitmasks:   INCLUDE "gfx/pokemon/snubbull/bitmask.asm"
+GranbullBitmasks:   INCLUDE "gfx/pokemon/granbull/bitmask.asm"
+QwilfishBitmasks:   INCLUDE "gfx/pokemon/qwilfish/bitmask.asm"
+ScizorBitmasks:     INCLUDE "gfx/pokemon/scizor/bitmask.asm"
+ShuckleBitmasks:    INCLUDE "gfx/pokemon/shuckle/bitmask.asm"
+HeracrossBitmasks:  INCLUDE "gfx/pokemon/heracross/bitmask.asm"
+SneaselBitmasks:    INCLUDE "gfx/pokemon/sneasel/bitmask.asm"
+TeddiursaBitmasks:  INCLUDE "gfx/pokemon/teddiursa/bitmask.asm"
+UrsaringBitmasks:   INCLUDE "gfx/pokemon/ursaring/bitmask.asm"
+SlugmaBitmasks:     INCLUDE "gfx/pokemon/slugma/bitmask.asm"
+MagcargoBitmasks:   INCLUDE "gfx/pokemon/magcargo/bitmask.asm"
+SwinubBitmasks:     INCLUDE "gfx/pokemon/swinub/bitmask.asm"
+PiloswineBitmasks:  INCLUDE "gfx/pokemon/piloswine/bitmask.asm"
+CorsolaBitmasks:    INCLUDE "gfx/pokemon/corsola/bitmask.asm"
+RemoraidBitmasks:   INCLUDE "gfx/pokemon/remoraid/bitmask.asm"
+OctilleryBitmasks:  INCLUDE "gfx/pokemon/octillery/bitmask.asm"
+DelibirdBitmasks:   INCLUDE "gfx/pokemon/delibird/bitmask.asm"
+MantineBitmasks:    INCLUDE "gfx/pokemon/mantine/bitmask.asm"
+SkarmoryBitmasks:   INCLUDE "gfx/pokemon/skarmory/bitmask.asm"
+HoundourBitmasks:   INCLUDE "gfx/pokemon/houndour/bitmask.asm"
+HoundoomBitmasks:   INCLUDE "gfx/pokemon/houndoom/bitmask.asm"
+KingdraBitmasks:    INCLUDE "gfx/pokemon/kingdra/bitmask.asm"
+PhanpyBitmasks:     INCLUDE "gfx/pokemon/phanpy/bitmask.asm"
+DonphanBitmasks:    INCLUDE "gfx/pokemon/donphan/bitmask.asm"
+Porygon2Bitmasks:   INCLUDE "gfx/pokemon/porygon2/bitmask.asm"
+StantlerBitmasks:   INCLUDE "gfx/pokemon/stantler/bitmask.asm"
+SmeargleBitmasks:   INCLUDE "gfx/pokemon/smeargle/bitmask.asm"
+TyrogueBitmasks:    INCLUDE "gfx/pokemon/tyrogue/bitmask.asm"
+HitmontopBitmasks:  INCLUDE "gfx/pokemon/hitmontop/bitmask.asm"
+SmoochumBitmasks:   INCLUDE "gfx/pokemon/smoochum/bitmask.asm"
+ElekidBitmasks:     INCLUDE "gfx/pokemon/elekid/bitmask.asm"
+MagbyBitmasks:      INCLUDE "gfx/pokemon/magby/bitmask.asm"
+MiltankBitmasks:    INCLUDE "gfx/pokemon/miltank/bitmask.asm"
+BlisseyBitmasks:    INCLUDE "gfx/pokemon/blissey/bitmask.asm"
+RaikouBitmasks:     INCLUDE "gfx/pokemon/raikou/bitmask.asm"
+EnteiBitmasks:      INCLUDE "gfx/pokemon/entei/bitmask.asm"
+SuicuneBitmasks:    INCLUDE "gfx/pokemon/suicune/bitmask.asm"
+LarvitarBitmasks:   INCLUDE "gfx/pokemon/larvitar/bitmask.asm"
+PupitarBitmasks:    INCLUDE "gfx/pokemon/pupitar/bitmask.asm"
+TyranitarBitmasks:  INCLUDE "gfx/pokemon/tyranitar/bitmask.asm"
+LugiaBitmasks:      INCLUDE "gfx/pokemon/lugia/bitmask.asm"
+HoOhBitmasks:       INCLUDE "gfx/pokemon/ho_oh/bitmask.asm"
+CelebiBitmasks:     INCLUDE "gfx/pokemon/celebi/bitmask.asm"
+EggBitmasks:        INCLUDE "gfx/pokemon/egg/bitmask.asm"
diff --git a/gfx/pics/blastoise/anim0.asm b/gfx/pokemon/blastoise/anim0.asm
index 2d8b464d0..2d8b464d0 100644
--- a/gfx/pics/blastoise/anim0.asm
+++ b/gfx/pokemon/blastoise/anim0.asm
diff --git a/gfx/pics/blastoise/anim1.asm b/gfx/pokemon/blastoise/anim1.asm
index b25c75e5a..b25c75e5a 100644
--- a/gfx/pics/blastoise/anim1.asm
+++ b/gfx/pokemon/blastoise/anim1.asm
diff --git a/gfx/pics/blastoise/back.2bpp.lz.b90e8d5a b/gfx/pokemon/blastoise/back.2bpp.lz.b90e8d5a
index 5e27c9989..5e27c9989 100644
--- a/gfx/pics/blastoise/back.2bpp.lz.b90e8d5a
+++ b/gfx/pokemon/blastoise/back.2bpp.lz.b90e8d5a
diff --git a/gfx/pics/blastoise/back.png b/gfx/pokemon/blastoise/back.png
index 9f236fb94..9f236fb94 100644
--- a/gfx/pics/blastoise/back.png
+++ b/gfx/pokemon/blastoise/back.png
diff --git a/gfx/pics/blastoise/front.animated.2bpp.lz.3899aed0 b/gfx/pokemon/blastoise/front.animated.2bpp.lz.3899aed0
index 33148b076..33148b076 100644
--- a/gfx/pics/blastoise/front.animated.2bpp.lz.3899aed0
+++ b/gfx/pokemon/blastoise/front.animated.2bpp.lz.3899aed0
diff --git a/gfx/pics/blastoise/front.png b/gfx/pokemon/blastoise/front.png
index f6623fe78..f6623fe78 100644
--- a/gfx/pics/blastoise/front.png
+++ b/gfx/pokemon/blastoise/front.png
diff --git a/gfx/pics/blastoise/shiny.pal b/gfx/pokemon/blastoise/shiny.pal
index dbde45ec9..dbde45ec9 100644
--- a/gfx/pics/blastoise/shiny.pal
+++ b/gfx/pokemon/blastoise/shiny.pal
diff --git a/gfx/pics/blissey/anim0.asm b/gfx/pokemon/blissey/anim0.asm
index 097ecc094..097ecc094 100644
--- a/gfx/pics/blissey/anim0.asm
+++ b/gfx/pokemon/blissey/anim0.asm
diff --git a/gfx/pics/blissey/anim1.asm b/gfx/pokemon/blissey/anim1.asm
index 846d85003..846d85003 100644
--- a/gfx/pics/blissey/anim1.asm
+++ b/gfx/pokemon/blissey/anim1.asm
diff --git a/gfx/pics/blissey/back.2bpp.lz.d2763673 b/gfx/pokemon/blissey/back.2bpp.lz.d2763673
index 00749ddee..00749ddee 100644
--- a/gfx/pics/blissey/back.2bpp.lz.d2763673
+++ b/gfx/pokemon/blissey/back.2bpp.lz.d2763673
diff --git a/gfx/pics/blissey/back.png b/gfx/pokemon/blissey/back.png
index 858ad5d40..858ad5d40 100644
--- a/gfx/pics/blissey/back.png
+++ b/gfx/pokemon/blissey/back.png
diff --git a/gfx/pics/blissey/front.animated.2bpp.lz.04f2353a b/gfx/pokemon/blissey/front.animated.2bpp.lz.04f2353a
index 76f492c43..76f492c43 100644
--- a/gfx/pics/blissey/front.animated.2bpp.lz.04f2353a
+++ b/gfx/pokemon/blissey/front.animated.2bpp.lz.04f2353a
diff --git a/gfx/pics/blissey/front.png b/gfx/pokemon/blissey/front.png
index 3d44eb5d6..3d44eb5d6 100644
--- a/gfx/pics/blissey/front.png
+++ b/gfx/pokemon/blissey/front.png
diff --git a/gfx/pics/blissey/shiny.pal b/gfx/pokemon/blissey/shiny.pal
index 862858e75..862858e75 100644
--- a/gfx/pics/blissey/shiny.pal
+++ b/gfx/pokemon/blissey/shiny.pal
diff --git a/gfx/pics/bulbasaur/anim0.asm b/gfx/pokemon/bulbasaur/anim0.asm
index e5c1cbe1e..e5c1cbe1e 100644
--- a/gfx/pics/bulbasaur/anim0.asm
+++ b/gfx/pokemon/bulbasaur/anim0.asm
diff --git a/gfx/pics/bulbasaur/anim1.asm b/gfx/pokemon/bulbasaur/anim1.asm
index cfc0f54e9..cfc0f54e9 100644
--- a/gfx/pics/bulbasaur/anim1.asm
+++ b/gfx/pokemon/bulbasaur/anim1.asm
diff --git a/gfx/pics/bulbasaur/back.2bpp.lz.84f8d1c4 b/gfx/pokemon/bulbasaur/back.2bpp.lz.84f8d1c4
index 44f8fa450..44f8fa450 100644
--- a/gfx/pics/bulbasaur/back.2bpp.lz.84f8d1c4
+++ b/gfx/pokemon/bulbasaur/back.2bpp.lz.84f8d1c4
diff --git a/gfx/pics/bulbasaur/back.png b/gfx/pokemon/bulbasaur/back.png
index c37b4b2c2..c37b4b2c2 100644
--- a/gfx/pics/bulbasaur/back.png
+++ b/gfx/pokemon/bulbasaur/back.png
diff --git a/gfx/pics/bulbasaur/front.animated.2bpp.lz.04627405 b/gfx/pokemon/bulbasaur/front.animated.2bpp.lz.04627405
index fc4550001..fc4550001 100644
--- a/gfx/pics/bulbasaur/front.animated.2bpp.lz.04627405
+++ b/gfx/pokemon/bulbasaur/front.animated.2bpp.lz.04627405
diff --git a/gfx/pics/bulbasaur/front.png b/gfx/pokemon/bulbasaur/front.png
index 0bd513962..0bd513962 100644
--- a/gfx/pics/bulbasaur/front.png
+++ b/gfx/pokemon/bulbasaur/front.png
diff --git a/gfx/pics/bulbasaur/shiny.pal b/gfx/pokemon/bulbasaur/shiny.pal
index bcd5ad011..bcd5ad011 100644
--- a/gfx/pics/bulbasaur/shiny.pal
+++ b/gfx/pokemon/bulbasaur/shiny.pal
diff --git a/gfx/pics/butterfree/anim0.asm b/gfx/pokemon/butterfree/anim0.asm
index d31161a28..d31161a28 100644
--- a/gfx/pics/butterfree/anim0.asm
+++ b/gfx/pokemon/butterfree/anim0.asm
diff --git a/gfx/pics/butterfree/anim1.asm b/gfx/pokemon/butterfree/anim1.asm
index 1eb152f28..1eb152f28 100644
--- a/gfx/pics/butterfree/anim1.asm
+++ b/gfx/pokemon/butterfree/anim1.asm
diff --git a/gfx/pics/butterfree/back.2bpp.lz.a8543d86 b/gfx/pokemon/butterfree/back.2bpp.lz.a8543d86
index 6d741f493..6d741f493 100644
--- a/gfx/pics/butterfree/back.2bpp.lz.a8543d86
+++ b/gfx/pokemon/butterfree/back.2bpp.lz.a8543d86
diff --git a/gfx/pics/butterfree/back.png b/gfx/pokemon/butterfree/back.png
index 18757bb3e..18757bb3e 100644
--- a/gfx/pics/butterfree/back.png
+++ b/gfx/pokemon/butterfree/back.png
diff --git a/gfx/pics/butterfree/front.animated.2bpp.lz.33ba7e24 b/gfx/pokemon/butterfree/front.animated.2bpp.lz.33ba7e24
index bf8b7a690..bf8b7a690 100644
--- a/gfx/pics/butterfree/front.animated.2bpp.lz.33ba7e24
+++ b/gfx/pokemon/butterfree/front.animated.2bpp.lz.33ba7e24
diff --git a/gfx/pics/butterfree/front.png b/gfx/pokemon/butterfree/front.png
index 5b60425bf..5b60425bf 100644
--- a/gfx/pics/butterfree/front.png
+++ b/gfx/pokemon/butterfree/front.png
diff --git a/gfx/pics/butterfree/shiny.pal b/gfx/pokemon/butterfree/shiny.pal
index 75a74906b..75a74906b 100644
--- a/gfx/pics/butterfree/shiny.pal
+++ b/gfx/pokemon/butterfree/shiny.pal
diff --git a/gfx/pics/caterpie/anim0.asm b/gfx/pokemon/caterpie/anim0.asm
index a5cf5f238..a5cf5f238 100644
--- a/gfx/pics/caterpie/anim0.asm
+++ b/gfx/pokemon/caterpie/anim0.asm
diff --git a/gfx/pics/caterpie/anim1.asm b/gfx/pokemon/caterpie/anim1.asm
index e75b83f5c..e75b83f5c 100644
--- a/gfx/pics/caterpie/anim1.asm
+++ b/gfx/pokemon/caterpie/anim1.asm
diff --git a/gfx/pics/caterpie/back.2bpp.lz.57e32015 b/gfx/pokemon/caterpie/back.2bpp.lz.57e32015
index a3788d1e4..a3788d1e4 100644
--- a/gfx/pics/caterpie/back.2bpp.lz.57e32015
+++ b/gfx/pokemon/caterpie/back.2bpp.lz.57e32015
diff --git a/gfx/pics/caterpie/back.png b/gfx/pokemon/caterpie/back.png
index 66add2336..66add2336 100644
--- a/gfx/pics/caterpie/back.png
+++ b/gfx/pokemon/caterpie/back.png
diff --git a/gfx/pics/caterpie/front.animated.2bpp.lz.ec4f7cb8 b/gfx/pokemon/caterpie/front.animated.2bpp.lz.ec4f7cb8
index d3036d9ff..d3036d9ff 100644
--- a/gfx/pics/caterpie/front.animated.2bpp.lz.ec4f7cb8
+++ b/gfx/pokemon/caterpie/front.animated.2bpp.lz.ec4f7cb8
diff --git a/gfx/pics/caterpie/front.png b/gfx/pokemon/caterpie/front.png
index 78130b1aa..78130b1aa 100644
--- a/gfx/pics/caterpie/front.png
+++ b/gfx/pokemon/caterpie/front.png
diff --git a/gfx/pics/caterpie/shiny.pal b/gfx/pokemon/caterpie/shiny.pal
index 32410e492..32410e492 100644
--- a/gfx/pics/caterpie/shiny.pal
+++ b/gfx/pokemon/caterpie/shiny.pal
diff --git a/gfx/pics/celebi/anim0.asm b/gfx/pokemon/celebi/anim0.asm
index 9f218a43e..9f218a43e 100644
--- a/gfx/pics/celebi/anim0.asm
+++ b/gfx/pokemon/celebi/anim0.asm
diff --git a/gfx/pics/celebi/anim1.asm b/gfx/pokemon/celebi/anim1.asm
index 6162488db..6162488db 100644
--- a/gfx/pics/celebi/anim1.asm
+++ b/gfx/pokemon/celebi/anim1.asm
diff --git a/gfx/pics/celebi/back.2bpp.lz.17ea5fe6 b/gfx/pokemon/celebi/back.2bpp.lz.17ea5fe6
index e8153224c..e8153224c 100644
--- a/gfx/pics/celebi/back.2bpp.lz.17ea5fe6
+++ b/gfx/pokemon/celebi/back.2bpp.lz.17ea5fe6
diff --git a/gfx/pics/celebi/back.png b/gfx/pokemon/celebi/back.png
index ebb79c020..ebb79c020 100644
--- a/gfx/pics/celebi/back.png
+++ b/gfx/pokemon/celebi/back.png
diff --git a/gfx/pics/celebi/front.animated.2bpp.lz.16f259a5 b/gfx/pokemon/celebi/front.animated.2bpp.lz.16f259a5
index afc41bee7..afc41bee7 100644
--- a/gfx/pics/celebi/front.animated.2bpp.lz.16f259a5
+++ b/gfx/pokemon/celebi/front.animated.2bpp.lz.16f259a5
diff --git a/gfx/pics/celebi/front.png b/gfx/pokemon/celebi/front.png
index 66bcd2e70..66bcd2e70 100644
--- a/gfx/pics/celebi/front.png
+++ b/gfx/pokemon/celebi/front.png
diff --git a/gfx/pics/celebi/shiny.pal b/gfx/pokemon/celebi/shiny.pal
index 1d73c8043..1d73c8043 100644
--- a/gfx/pics/celebi/shiny.pal
+++ b/gfx/pokemon/celebi/shiny.pal
diff --git a/gfx/pics/chansey/anim0.asm b/gfx/pokemon/chansey/anim0.asm
index 75de3b32b..75de3b32b 100644
--- a/gfx/pics/chansey/anim0.asm
+++ b/gfx/pokemon/chansey/anim0.asm
diff --git a/gfx/pics/chansey/anim1.asm b/gfx/pokemon/chansey/anim1.asm
index a78f8cf88..a78f8cf88 100644
--- a/gfx/pics/chansey/anim1.asm
+++ b/gfx/pokemon/chansey/anim1.asm
diff --git a/gfx/pics/chansey/back.2bpp.lz.14d90ba1 b/gfx/pokemon/chansey/back.2bpp.lz.14d90ba1
index 239df2d63..239df2d63 100644
--- a/gfx/pics/chansey/back.2bpp.lz.14d90ba1
+++ b/gfx/pokemon/chansey/back.2bpp.lz.14d90ba1
diff --git a/gfx/pics/chansey/back.png b/gfx/pokemon/chansey/back.png
index ea2296b37..ea2296b37 100644
--- a/gfx/pics/chansey/back.png
+++ b/gfx/pokemon/chansey/back.png
diff --git a/gfx/pics/chansey/front.animated.2bpp.lz.158fc381 b/gfx/pokemon/chansey/front.animated.2bpp.lz.158fc381
index 1fc457f19..1fc457f19 100644
--- a/gfx/pics/chansey/front.animated.2bpp.lz.158fc381
+++ b/gfx/pokemon/chansey/front.animated.2bpp.lz.158fc381
diff --git a/gfx/pics/chansey/front.png b/gfx/pokemon/chansey/front.png
index 0213b874d..0213b874d 100644
--- a/gfx/pics/chansey/front.png
+++ b/gfx/pokemon/chansey/front.png
diff --git a/gfx/pics/chansey/shiny.pal b/gfx/pokemon/chansey/shiny.pal
index 4d52ad934..4d52ad934 100644
--- a/gfx/pics/chansey/shiny.pal
+++ b/gfx/pokemon/chansey/shiny.pal
diff --git a/gfx/pics/charizard/anim0.asm b/gfx/pokemon/charizard/anim0.asm
index b258e35c7..b258e35c7 100644
--- a/gfx/pics/charizard/anim0.asm
+++ b/gfx/pokemon/charizard/anim0.asm
diff --git a/gfx/pics/charizard/anim1.asm b/gfx/pokemon/charizard/anim1.asm
index daffccb9d..daffccb9d 100644
--- a/gfx/pics/charizard/anim1.asm
+++ b/gfx/pokemon/charizard/anim1.asm
diff --git a/gfx/pics/charizard/back.2bpp.lz.f04ac62c b/gfx/pokemon/charizard/back.2bpp.lz.f04ac62c
index db1d9c9ea..db1d9c9ea 100644
--- a/gfx/pics/charizard/back.2bpp.lz.f04ac62c
+++ b/gfx/pokemon/charizard/back.2bpp.lz.f04ac62c
diff --git a/gfx/pics/charizard/back.png b/gfx/pokemon/charizard/back.png
index 2ad954963..2ad954963 100644
--- a/gfx/pics/charizard/back.png
+++ b/gfx/pokemon/charizard/back.png
diff --git a/gfx/pics/charizard/front.animated.2bpp.lz.0068f820 b/gfx/pokemon/charizard/front.animated.2bpp.lz.0068f820
index aab0fda99..aab0fda99 100644
--- a/gfx/pics/charizard/front.animated.2bpp.lz.0068f820
+++ b/gfx/pokemon/charizard/front.animated.2bpp.lz.0068f820
diff --git a/gfx/pics/charizard/front.png b/gfx/pokemon/charizard/front.png
index 1cb0df943..1cb0df943 100644
--- a/gfx/pics/charizard/front.png
+++ b/gfx/pokemon/charizard/front.png
diff --git a/gfx/pics/charizard/shiny.pal b/gfx/pokemon/charizard/shiny.pal
index 88c195d74..88c195d74 100644
--- a/gfx/pics/charizard/shiny.pal
+++ b/gfx/pokemon/charizard/shiny.pal
diff --git a/gfx/pics/charmander/anim0.asm b/gfx/pokemon/charmander/anim0.asm
index 72a0fe83d..72a0fe83d 100644
--- a/gfx/pics/charmander/anim0.asm
+++ b/gfx/pokemon/charmander/anim0.asm
diff --git a/gfx/pics/charmander/anim1.asm b/gfx/pokemon/charmander/anim1.asm
index 219b5407f..219b5407f 100644
--- a/gfx/pics/charmander/anim1.asm
+++ b/gfx/pokemon/charmander/anim1.asm
diff --git a/gfx/pics/charmander/back.2bpp.lz.bcb371c6 b/gfx/pokemon/charmander/back.2bpp.lz.bcb371c6
index e8eb5eb4e..e8eb5eb4e 100644
--- a/gfx/pics/charmander/back.2bpp.lz.bcb371c6
+++ b/gfx/pokemon/charmander/back.2bpp.lz.bcb371c6
diff --git a/gfx/pics/charmander/back.png b/gfx/pokemon/charmander/back.png
index b5e6cc5a7..b5e6cc5a7 100644
--- a/gfx/pics/charmander/back.png
+++ b/gfx/pokemon/charmander/back.png
diff --git a/gfx/pics/charmander/front.animated.2bpp.lz.704bfc17 b/gfx/pokemon/charmander/front.animated.2bpp.lz.704bfc17
index 7cc31694b..7cc31694b 100644
--- a/gfx/pics/charmander/front.animated.2bpp.lz.704bfc17
+++ b/gfx/pokemon/charmander/front.animated.2bpp.lz.704bfc17
diff --git a/gfx/pics/charmander/front.png b/gfx/pokemon/charmander/front.png
index ba365e42a..ba365e42a 100644
--- a/gfx/pics/charmander/front.png
+++ b/gfx/pokemon/charmander/front.png
diff --git a/gfx/pics/charmander/shiny.pal b/gfx/pokemon/charmander/shiny.pal
index d7a346bd8..d7a346bd8 100644
--- a/gfx/pics/charmander/shiny.pal
+++ b/gfx/pokemon/charmander/shiny.pal
diff --git a/gfx/pics/charmeleon/anim0.asm b/gfx/pokemon/charmeleon/anim0.asm
index 30eeae979..30eeae979 100644
--- a/gfx/pics/charmeleon/anim0.asm
+++ b/gfx/pokemon/charmeleon/anim0.asm
diff --git a/gfx/pics/charmeleon/anim1.asm b/gfx/pokemon/charmeleon/anim1.asm
index d3320e33c..d3320e33c 100644
--- a/gfx/pics/charmeleon/anim1.asm
+++ b/gfx/pokemon/charmeleon/anim1.asm
diff --git a/gfx/pics/charmeleon/back.2bpp.lz.cf73268f b/gfx/pokemon/charmeleon/back.2bpp.lz.cf73268f
index aec0cd7b2..aec0cd7b2 100644
--- a/gfx/pics/charmeleon/back.2bpp.lz.cf73268f
+++ b/gfx/pokemon/charmeleon/back.2bpp.lz.cf73268f
diff --git a/gfx/pics/charmeleon/back.png b/gfx/pokemon/charmeleon/back.png
index 60eb4666f..60eb4666f 100644
--- a/gfx/pics/charmeleon/back.png
+++ b/gfx/pokemon/charmeleon/back.png
diff --git a/gfx/pics/charmeleon/front.animated.2bpp.lz.0e629968 b/gfx/pokemon/charmeleon/front.animated.2bpp.lz.0e629968
index efe789dad..efe789dad 100644
--- a/gfx/pics/charmeleon/front.animated.2bpp.lz.0e629968
+++ b/gfx/pokemon/charmeleon/front.animated.2bpp.lz.0e629968
diff --git a/gfx/pics/charmeleon/front.png b/gfx/pokemon/charmeleon/front.png
index 44558255f..44558255f 100644
--- a/gfx/pics/charmeleon/front.png
+++ b/gfx/pokemon/charmeleon/front.png
diff --git a/gfx/pics/charmeleon/shiny.pal b/gfx/pokemon/charmeleon/shiny.pal
index 7a86d2cb1..7a86d2cb1 100644
--- a/gfx/pics/charmeleon/shiny.pal
+++ b/gfx/pokemon/charmeleon/shiny.pal
diff --git a/gfx/pics/chikorita/anim0.asm b/gfx/pokemon/chikorita/anim0.asm
index 2b8fa7d35..2b8fa7d35 100644
--- a/gfx/pics/chikorita/anim0.asm
+++ b/gfx/pokemon/chikorita/anim0.asm
diff --git a/gfx/pics/chikorita/anim1.asm b/gfx/pokemon/chikorita/anim1.asm
index 9003c3ff2..9003c3ff2 100644
--- a/gfx/pics/chikorita/anim1.asm
+++ b/gfx/pokemon/chikorita/anim1.asm
diff --git a/gfx/pics/chikorita/back.2bpp.lz.27a21938 b/gfx/pokemon/chikorita/back.2bpp.lz.27a21938
index e98365a2b..e98365a2b 100644
--- a/gfx/pics/chikorita/back.2bpp.lz.27a21938
+++ b/gfx/pokemon/chikorita/back.2bpp.lz.27a21938
diff --git a/gfx/pics/chikorita/back.png b/gfx/pokemon/chikorita/back.png
index 5ce5ae068..5ce5ae068 100644
--- a/gfx/pics/chikorita/back.png
+++ b/gfx/pokemon/chikorita/back.png
diff --git a/gfx/pics/chikorita/front.animated.2bpp.lz.18de5fe9 b/gfx/pokemon/chikorita/front.animated.2bpp.lz.18de5fe9
index 008c4ec2d..008c4ec2d 100644
--- a/gfx/pics/chikorita/front.animated.2bpp.lz.18de5fe9
+++ b/gfx/pokemon/chikorita/front.animated.2bpp.lz.18de5fe9
diff --git a/gfx/pics/chikorita/front.png b/gfx/pokemon/chikorita/front.png
index 584f05cbc..584f05cbc 100644
--- a/gfx/pics/chikorita/front.png
+++ b/gfx/pokemon/chikorita/front.png
diff --git a/gfx/pics/chikorita/shiny.pal b/gfx/pokemon/chikorita/shiny.pal
index c2ff6a3f8..c2ff6a3f8 100644
--- a/gfx/pics/chikorita/shiny.pal
+++ b/gfx/pokemon/chikorita/shiny.pal
diff --git a/gfx/pics/chinchou/anim0.asm b/gfx/pokemon/chinchou/anim0.asm
index f765c151a..f765c151a 100644
--- a/gfx/pics/chinchou/anim0.asm
+++ b/gfx/pokemon/chinchou/anim0.asm
diff --git a/gfx/pics/chinchou/anim1.asm b/gfx/pokemon/chinchou/anim1.asm
index bf38f8d87..bf38f8d87 100644
--- a/gfx/pics/chinchou/anim1.asm
+++ b/gfx/pokemon/chinchou/anim1.asm
diff --git a/gfx/pics/chinchou/back.2bpp.lz.ea061e91 b/gfx/pokemon/chinchou/back.2bpp.lz.ea061e91
index 744af1ad4..744af1ad4 100644
--- a/gfx/pics/chinchou/back.2bpp.lz.ea061e91
+++ b/gfx/pokemon/chinchou/back.2bpp.lz.ea061e91
diff --git a/gfx/pics/chinchou/back.png b/gfx/pokemon/chinchou/back.png
index 5de7df3ba..5de7df3ba 100644
--- a/gfx/pics/chinchou/back.png
+++ b/gfx/pokemon/chinchou/back.png
diff --git a/gfx/pics/chinchou/front.animated.2bpp.lz.901aa690 b/gfx/pokemon/chinchou/front.animated.2bpp.lz.901aa690
index b5db65701..b5db65701 100644
--- a/gfx/pics/chinchou/front.animated.2bpp.lz.901aa690
+++ b/gfx/pokemon/chinchou/front.animated.2bpp.lz.901aa690
diff --git a/gfx/pics/chinchou/front.png b/gfx/pokemon/chinchou/front.png
index 4af95c53e..4af95c53e 100644
--- a/gfx/pics/chinchou/front.png
+++ b/gfx/pokemon/chinchou/front.png
diff --git a/gfx/pics/chinchou/shiny.pal b/gfx/pokemon/chinchou/shiny.pal
index 334561248..334561248 100644
--- a/gfx/pics/chinchou/shiny.pal
+++ b/gfx/pokemon/chinchou/shiny.pal
diff --git a/gfx/pics/clefable/anim0.asm b/gfx/pokemon/clefable/anim0.asm
index d442807e8..d442807e8 100644
--- a/gfx/pics/clefable/anim0.asm
+++ b/gfx/pokemon/clefable/anim0.asm
diff --git a/gfx/pics/clefable/anim1.asm b/gfx/pokemon/clefable/anim1.asm
index 2b024ffd8..2b024ffd8 100644
--- a/gfx/pics/clefable/anim1.asm
+++ b/gfx/pokemon/clefable/anim1.asm
diff --git a/gfx/pics/clefable/back.2bpp.lz.d57ec142 b/gfx/pokemon/clefable/back.2bpp.lz.d57ec142
index 1bcb8cbcd..1bcb8cbcd 100644
--- a/gfx/pics/clefable/back.2bpp.lz.d57ec142
+++ b/gfx/pokemon/clefable/back.2bpp.lz.d57ec142
diff --git a/gfx/pics/clefable/back.png b/gfx/pokemon/clefable/back.png
index b049faa13..b049faa13 100644
--- a/gfx/pics/clefable/back.png
+++ b/gfx/pokemon/clefable/back.png
diff --git a/gfx/pics/clefable/front.animated.2bpp.lz.59d160ad b/gfx/pokemon/clefable/front.animated.2bpp.lz.59d160ad
index 4fb424305..4fb424305 100644
--- a/gfx/pics/clefable/front.animated.2bpp.lz.59d160ad
+++ b/gfx/pokemon/clefable/front.animated.2bpp.lz.59d160ad
diff --git a/gfx/pics/clefable/front.png b/gfx/pokemon/clefable/front.png
index 0b85d5f7d..0b85d5f7d 100644
--- a/gfx/pics/clefable/front.png
+++ b/gfx/pokemon/clefable/front.png
diff --git a/gfx/pics/clefable/shiny.pal b/gfx/pokemon/clefable/shiny.pal
index 1c0871557..1c0871557 100644
--- a/gfx/pics/clefable/shiny.pal
+++ b/gfx/pokemon/clefable/shiny.pal
diff --git a/gfx/pics/clefairy/anim0.asm b/gfx/pokemon/clefairy/anim0.asm
index 9905c4fcc..9905c4fcc 100644
--- a/gfx/pics/clefairy/anim0.asm
+++ b/gfx/pokemon/clefairy/anim0.asm
diff --git a/gfx/pics/clefairy/anim1.asm b/gfx/pokemon/clefairy/anim1.asm
index c93613467..c93613467 100644
--- a/gfx/pics/clefairy/anim1.asm
+++ b/gfx/pokemon/clefairy/anim1.asm
diff --git a/gfx/pics/clefairy/back.2bpp.lz.f8aff3dd b/gfx/pokemon/clefairy/back.2bpp.lz.f8aff3dd
index a6a5ecb82..a6a5ecb82 100644
--- a/gfx/pics/clefairy/back.2bpp.lz.f8aff3dd
+++ b/gfx/pokemon/clefairy/back.2bpp.lz.f8aff3dd
diff --git a/gfx/pics/clefairy/back.png b/gfx/pokemon/clefairy/back.png
index 76f475ea0..76f475ea0 100644
--- a/gfx/pics/clefairy/back.png
+++ b/gfx/pokemon/clefairy/back.png
diff --git a/gfx/pics/clefairy/front.animated.2bpp.lz.0918b60d b/gfx/pokemon/clefairy/front.animated.2bpp.lz.0918b60d
index d8adc2e2e..d8adc2e2e 100644
--- a/gfx/pics/clefairy/front.animated.2bpp.lz.0918b60d
+++ b/gfx/pokemon/clefairy/front.animated.2bpp.lz.0918b60d
diff --git a/gfx/pics/clefairy/front.png b/gfx/pokemon/clefairy/front.png
index 70e63d454..70e63d454 100644
--- a/gfx/pics/clefairy/front.png
+++ b/gfx/pokemon/clefairy/front.png
diff --git a/gfx/pics/clefairy/shiny.pal b/gfx/pokemon/clefairy/shiny.pal
index 1c0871557..1c0871557 100644
--- a/gfx/pics/clefairy/shiny.pal
+++ b/gfx/pokemon/clefairy/shiny.pal
diff --git a/gfx/pics/cleffa/anim0.asm b/gfx/pokemon/cleffa/anim0.asm
index 37f3da590..37f3da590 100644
--- a/gfx/pics/cleffa/anim0.asm
+++ b/gfx/pokemon/cleffa/anim0.asm
diff --git a/gfx/pics/cleffa/anim1.asm b/gfx/pokemon/cleffa/anim1.asm
index 129f123c2..129f123c2 100644
--- a/gfx/pics/cleffa/anim1.asm
+++ b/gfx/pokemon/cleffa/anim1.asm
diff --git a/gfx/pics/cleffa/back.2bpp.lz.ea9b3d08 b/gfx/pokemon/cleffa/back.2bpp.lz.ea9b3d08
index 35ec3369b..35ec3369b 100644
--- a/gfx/pics/cleffa/back.2bpp.lz.ea9b3d08
+++ b/gfx/pokemon/cleffa/back.2bpp.lz.ea9b3d08
diff --git a/gfx/pics/cleffa/back.png b/gfx/pokemon/cleffa/back.png
index c888fef10..c888fef10 100644
--- a/gfx/pics/cleffa/back.png
+++ b/gfx/pokemon/cleffa/back.png
diff --git a/gfx/pics/cleffa/front.animated.2bpp.lz.49630c80 b/gfx/pokemon/cleffa/front.animated.2bpp.lz.49630c80
index e8c624069..e8c624069 100644
--- a/gfx/pics/cleffa/front.animated.2bpp.lz.49630c80
+++ b/gfx/pokemon/cleffa/front.animated.2bpp.lz.49630c80
diff --git a/gfx/pics/cleffa/front.png b/gfx/pokemon/cleffa/front.png
index 6c411c3ad..6c411c3ad 100644
--- a/gfx/pics/cleffa/front.png
+++ b/gfx/pokemon/cleffa/front.png
diff --git a/gfx/pics/cleffa/shiny.pal b/gfx/pokemon/cleffa/shiny.pal
index 1c0871557..1c0871557 100644
--- a/gfx/pics/cleffa/shiny.pal
+++ b/gfx/pokemon/cleffa/shiny.pal
diff --git a/gfx/pics/cloyster/anim0.asm b/gfx/pokemon/cloyster/anim0.asm
index cc338f014..cc338f014 100644
--- a/gfx/pics/cloyster/anim0.asm
+++ b/gfx/pokemon/cloyster/anim0.asm
diff --git a/gfx/pics/cloyster/anim1.asm b/gfx/pokemon/cloyster/anim1.asm
index e872bbc59..e872bbc59 100644
--- a/gfx/pics/cloyster/anim1.asm
+++ b/gfx/pokemon/cloyster/anim1.asm
diff --git a/gfx/pics/cloyster/back.2bpp.lz.5ad194b3 b/gfx/pokemon/cloyster/back.2bpp.lz.5ad194b3
index 655890df8..655890df8 100644
--- a/gfx/pics/cloyster/back.2bpp.lz.5ad194b3
+++ b/gfx/pokemon/cloyster/back.2bpp.lz.5ad194b3
diff --git a/gfx/pics/cloyster/back.png b/gfx/pokemon/cloyster/back.png
index 4b4f9294a..4b4f9294a 100644
--- a/gfx/pics/cloyster/back.png
+++ b/gfx/pokemon/cloyster/back.png
diff --git a/gfx/pics/cloyster/front.animated.2bpp.lz.fe85709f b/gfx/pokemon/cloyster/front.animated.2bpp.lz.fe85709f
index 83991eed6..83991eed6 100644
--- a/gfx/pics/cloyster/front.animated.2bpp.lz.fe85709f
+++ b/gfx/pokemon/cloyster/front.animated.2bpp.lz.fe85709f
diff --git a/gfx/pics/cloyster/front.png b/gfx/pokemon/cloyster/front.png
index fc725f85c..fc725f85c 100644
--- a/gfx/pics/cloyster/front.png
+++ b/gfx/pokemon/cloyster/front.png
diff --git a/gfx/pics/cloyster/shiny.pal b/gfx/pokemon/cloyster/shiny.pal
index 973ccfb8a..973ccfb8a 100644
--- a/gfx/pics/cloyster/shiny.pal
+++ b/gfx/pokemon/cloyster/shiny.pal
diff --git a/gfx/pics/corsola/anim0.asm b/gfx/pokemon/corsola/anim0.asm
index 68182e18e..68182e18e 100644
--- a/gfx/pics/corsola/anim0.asm
+++ b/gfx/pokemon/corsola/anim0.asm
diff --git a/gfx/pics/corsola/anim1.asm b/gfx/pokemon/corsola/anim1.asm
index 6360176ca..6360176ca 100644
--- a/gfx/pics/corsola/anim1.asm
+++ b/gfx/pokemon/corsola/anim1.asm
diff --git a/gfx/pics/corsola/back.2bpp.lz.2b6c7860 b/gfx/pokemon/corsola/back.2bpp.lz.2b6c7860
index 6707a3538..6707a3538 100644
--- a/gfx/pics/corsola/back.2bpp.lz.2b6c7860
+++ b/gfx/pokemon/corsola/back.2bpp.lz.2b6c7860
diff --git a/gfx/pics/corsola/back.png b/gfx/pokemon/corsola/back.png
index 8550813ab..8550813ab 100644
--- a/gfx/pics/corsola/back.png
+++ b/gfx/pokemon/corsola/back.png
diff --git a/gfx/pics/corsola/front.animated.2bpp.lz.2e7905aa b/gfx/pokemon/corsola/front.animated.2bpp.lz.2e7905aa
index afa208922..afa208922 100644
--- a/gfx/pics/corsola/front.animated.2bpp.lz.2e7905aa
+++ b/gfx/pokemon/corsola/front.animated.2bpp.lz.2e7905aa
diff --git a/gfx/pics/corsola/front.png b/gfx/pokemon/corsola/front.png
index 210b508e7..210b508e7 100644
--- a/gfx/pics/corsola/front.png
+++ b/gfx/pokemon/corsola/front.png
diff --git a/gfx/pics/corsola/shiny.pal b/gfx/pokemon/corsola/shiny.pal
index 8aec60de2..8aec60de2 100644
--- a/gfx/pics/corsola/shiny.pal
+++ b/gfx/pokemon/corsola/shiny.pal
diff --git a/gfx/pics/crobat/anim0.asm b/gfx/pokemon/crobat/anim0.asm
index 99888ab81..99888ab81 100644
--- a/gfx/pics/crobat/anim0.asm
+++ b/gfx/pokemon/crobat/anim0.asm
diff --git a/gfx/pics/crobat/anim1.asm b/gfx/pokemon/crobat/anim1.asm
index ec1dae2ac..ec1dae2ac 100644
--- a/gfx/pics/crobat/anim1.asm
+++ b/gfx/pokemon/crobat/anim1.asm
diff --git a/gfx/pics/crobat/back.2bpp.lz.30850b2e b/gfx/pokemon/crobat/back.2bpp.lz.30850b2e
index a572d93c5..a572d93c5 100644
--- a/gfx/pics/crobat/back.2bpp.lz.30850b2e
+++ b/gfx/pokemon/crobat/back.2bpp.lz.30850b2e
diff --git a/gfx/pics/crobat/back.png b/gfx/pokemon/crobat/back.png
index 944c3a872..944c3a872 100644
--- a/gfx/pics/crobat/back.png
+++ b/gfx/pokemon/crobat/back.png
diff --git a/gfx/pics/crobat/front.animated.2bpp.lz.dc386ff0 b/gfx/pokemon/crobat/front.animated.2bpp.lz.dc386ff0
index 1e12aeed2..1e12aeed2 100644
--- a/gfx/pics/crobat/front.animated.2bpp.lz.dc386ff0
+++ b/gfx/pokemon/crobat/front.animated.2bpp.lz.dc386ff0
diff --git a/gfx/pics/crobat/front.png b/gfx/pokemon/crobat/front.png
index b1e989fac..b1e989fac 100644
--- a/gfx/pics/crobat/front.png
+++ b/gfx/pokemon/crobat/front.png
diff --git a/gfx/pics/crobat/shiny.pal b/gfx/pokemon/crobat/shiny.pal
index 2cb1d6ced..2cb1d6ced 100644
--- a/gfx/pics/crobat/shiny.pal
+++ b/gfx/pokemon/crobat/shiny.pal
diff --git a/gfx/pics/croconaw/anim0.asm b/gfx/pokemon/croconaw/anim0.asm
index c487abfd9..c487abfd9 100644
--- a/gfx/pics/croconaw/anim0.asm
+++ b/gfx/pokemon/croconaw/anim0.asm
diff --git a/gfx/pics/croconaw/anim1.asm b/gfx/pokemon/croconaw/anim1.asm
index 78bd8518e..78bd8518e 100644
--- a/gfx/pics/croconaw/anim1.asm
+++ b/gfx/pokemon/croconaw/anim1.asm
diff --git a/gfx/pics/croconaw/back.2bpp.lz.a605c82f b/gfx/pokemon/croconaw/back.2bpp.lz.a605c82f
index 7e573e6a0..7e573e6a0 100644
--- a/gfx/pics/croconaw/back.2bpp.lz.a605c82f
+++ b/gfx/pokemon/croconaw/back.2bpp.lz.a605c82f
diff --git a/gfx/pics/croconaw/back.png b/gfx/pokemon/croconaw/back.png
index 1c745387a..1c745387a 100644
--- a/gfx/pics/croconaw/back.png
+++ b/gfx/pokemon/croconaw/back.png
diff --git a/gfx/pics/croconaw/front.animated.2bpp.lz.a797986d b/gfx/pokemon/croconaw/front.animated.2bpp.lz.a797986d
index 9c7f511ba..9c7f511ba 100644
--- a/gfx/pics/croconaw/front.animated.2bpp.lz.a797986d
+++ b/gfx/pokemon/croconaw/front.animated.2bpp.lz.a797986d
diff --git a/gfx/pics/croconaw/front.png b/gfx/pokemon/croconaw/front.png
index 8fabda95c..8fabda95c 100644
--- a/gfx/pics/croconaw/front.png
+++ b/gfx/pokemon/croconaw/front.png
diff --git a/gfx/pics/croconaw/shiny.pal b/gfx/pokemon/croconaw/shiny.pal
index efba52bea..efba52bea 100644
--- a/gfx/pics/croconaw/shiny.pal
+++ b/gfx/pokemon/croconaw/shiny.pal
diff --git a/gfx/pics/cubone/anim0.asm b/gfx/pokemon/cubone/anim0.asm
index 2af8c522c..2af8c522c 100644
--- a/gfx/pics/cubone/anim0.asm
+++ b/gfx/pokemon/cubone/anim0.asm
diff --git a/gfx/pics/cubone/anim1.asm b/gfx/pokemon/cubone/anim1.asm
index fb3b0b3ba..fb3b0b3ba 100644
--- a/gfx/pics/cubone/anim1.asm
+++ b/gfx/pokemon/cubone/anim1.asm
diff --git a/gfx/pics/cubone/back.2bpp.lz.bd849dfb b/gfx/pokemon/cubone/back.2bpp.lz.bd849dfb
index fc9931417..fc9931417 100644
--- a/gfx/pics/cubone/back.2bpp.lz.bd849dfb
+++ b/gfx/pokemon/cubone/back.2bpp.lz.bd849dfb
diff --git a/gfx/pics/cubone/back.png b/gfx/pokemon/cubone/back.png
index d4069071b..d4069071b 100644
--- a/gfx/pics/cubone/back.png
+++ b/gfx/pokemon/cubone/back.png
diff --git a/gfx/pics/cubone/front.animated.2bpp.lz.0d63a3a4 b/gfx/pokemon/cubone/front.animated.2bpp.lz.0d63a3a4
index 9de9f7732..9de9f7732 100644
--- a/gfx/pics/cubone/front.animated.2bpp.lz.0d63a3a4
+++ b/gfx/pokemon/cubone/front.animated.2bpp.lz.0d63a3a4
diff --git a/gfx/pics/cubone/front.png b/gfx/pokemon/cubone/front.png
index de641c36d..de641c36d 100644
--- a/gfx/pics/cubone/front.png
+++ b/gfx/pokemon/cubone/front.png
diff --git a/gfx/pics/cubone/shiny.pal b/gfx/pokemon/cubone/shiny.pal
index e27abe43a..e27abe43a 100644
--- a/gfx/pics/cubone/shiny.pal
+++ b/gfx/pokemon/cubone/shiny.pal
diff --git a/gfx/pics/cyndaquil/anim0.asm b/gfx/pokemon/cyndaquil/anim0.asm
index b069cc300..b069cc300 100644
--- a/gfx/pics/cyndaquil/anim0.asm
+++ b/gfx/pokemon/cyndaquil/anim0.asm
diff --git a/gfx/pics/cyndaquil/anim1.asm b/gfx/pokemon/cyndaquil/anim1.asm
index 43c4d495a..43c4d495a 100644
--- a/gfx/pics/cyndaquil/anim1.asm
+++ b/gfx/pokemon/cyndaquil/anim1.asm
diff --git a/gfx/pics/cyndaquil/back.2bpp.lz.68baeeeb b/gfx/pokemon/cyndaquil/back.2bpp.lz.68baeeeb
index 226c41e49..226c41e49 100644
--- a/gfx/pics/cyndaquil/back.2bpp.lz.68baeeeb
+++ b/gfx/pokemon/cyndaquil/back.2bpp.lz.68baeeeb
diff --git a/gfx/pics/cyndaquil/back.png b/gfx/pokemon/cyndaquil/back.png
index 4e0664be0..4e0664be0 100644
--- a/gfx/pics/cyndaquil/back.png
+++ b/gfx/pokemon/cyndaquil/back.png
diff --git a/gfx/pics/cyndaquil/front.animated.2bpp.lz.0d5dce8d b/gfx/pokemon/cyndaquil/front.animated.2bpp.lz.0d5dce8d
index 3e2886783..3e2886783 100644
--- a/gfx/pics/cyndaquil/front.animated.2bpp.lz.0d5dce8d
+++ b/gfx/pokemon/cyndaquil/front.animated.2bpp.lz.0d5dce8d
diff --git a/gfx/pics/cyndaquil/front.png b/gfx/pokemon/cyndaquil/front.png
index 4edae6bc6..4edae6bc6 100644
--- a/gfx/pics/cyndaquil/front.png
+++ b/gfx/pokemon/cyndaquil/front.png
diff --git a/gfx/pics/cyndaquil/shiny.pal b/gfx/pokemon/cyndaquil/shiny.pal
index 5b3df0b4e..5b3df0b4e 100644
--- a/gfx/pics/cyndaquil/shiny.pal
+++ b/gfx/pokemon/cyndaquil/shiny.pal
diff --git a/gfx/pics/delibird/anim0.asm b/gfx/pokemon/delibird/anim0.asm
index 3431ad1ae..3431ad1ae 100644
--- a/gfx/pics/delibird/anim0.asm
+++ b/gfx/pokemon/delibird/anim0.asm
diff --git a/gfx/pics/delibird/anim1.asm b/gfx/pokemon/delibird/anim1.asm
index 8a416cc61..8a416cc61 100644
--- a/gfx/pics/delibird/anim1.asm
+++ b/gfx/pokemon/delibird/anim1.asm
diff --git a/gfx/pics/delibird/back.2bpp.lz.11463d76 b/gfx/pokemon/delibird/back.2bpp.lz.11463d76
index 22f41237c..22f41237c 100644
--- a/gfx/pics/delibird/back.2bpp.lz.11463d76
+++ b/gfx/pokemon/delibird/back.2bpp.lz.11463d76
diff --git a/gfx/pics/delibird/back.png b/gfx/pokemon/delibird/back.png
index 367d6055a..367d6055a 100644
--- a/gfx/pics/delibird/back.png
+++ b/gfx/pokemon/delibird/back.png
diff --git a/gfx/pics/delibird/front.animated.2bpp.lz.a3126c48 b/gfx/pokemon/delibird/front.animated.2bpp.lz.a3126c48
index 819e46af0..819e46af0 100644
--- a/gfx/pics/delibird/front.animated.2bpp.lz.a3126c48
+++ b/gfx/pokemon/delibird/front.animated.2bpp.lz.a3126c48
diff --git a/gfx/pics/delibird/front.png b/gfx/pokemon/delibird/front.png
index 591271b3a..591271b3a 100644
--- a/gfx/pics/delibird/front.png
+++ b/gfx/pokemon/delibird/front.png
diff --git a/gfx/pics/delibird/shiny.pal b/gfx/pokemon/delibird/shiny.pal
index 4c4ee713f..4c4ee713f 100644
--- a/gfx/pics/delibird/shiny.pal
+++ b/gfx/pokemon/delibird/shiny.pal
diff --git a/gfx/pics/dewgong/anim0.asm b/gfx/pokemon/dewgong/anim0.asm
index b7c3efecf..b7c3efecf 100644
--- a/gfx/pics/dewgong/anim0.asm
+++ b/gfx/pokemon/dewgong/anim0.asm
diff --git a/gfx/pics/dewgong/anim1.asm b/gfx/pokemon/dewgong/anim1.asm
index 0357ce660..0357ce660 100644
--- a/gfx/pics/dewgong/anim1.asm
+++ b/gfx/pokemon/dewgong/anim1.asm
diff --git a/gfx/pics/dewgong/back.2bpp.lz.4e1fef76 b/gfx/pokemon/dewgong/back.2bpp.lz.4e1fef76
index bc6842e86..bc6842e86 100644
--- a/gfx/pics/dewgong/back.2bpp.lz.4e1fef76
+++ b/gfx/pokemon/dewgong/back.2bpp.lz.4e1fef76
diff --git a/gfx/pics/dewgong/back.png b/gfx/pokemon/dewgong/back.png
index 9544f9c25..9544f9c25 100644
--- a/gfx/pics/dewgong/back.png
+++ b/gfx/pokemon/dewgong/back.png
diff --git a/gfx/pics/dewgong/front.animated.2bpp.lz.cc53359c b/gfx/pokemon/dewgong/front.animated.2bpp.lz.cc53359c
index cbb0ace94..cbb0ace94 100644
--- a/gfx/pics/dewgong/front.animated.2bpp.lz.cc53359c
+++ b/gfx/pokemon/dewgong/front.animated.2bpp.lz.cc53359c
diff --git a/gfx/pics/dewgong/front.png b/gfx/pokemon/dewgong/front.png
index b73d51c07..b73d51c07 100644
--- a/gfx/pics/dewgong/front.png
+++ b/gfx/pokemon/dewgong/front.png
diff --git a/gfx/pics/dewgong/shiny.pal b/gfx/pokemon/dewgong/shiny.pal
index b9da48134..b9da48134 100644
--- a/gfx/pics/dewgong/shiny.pal
+++ b/gfx/pokemon/dewgong/shiny.pal
diff --git a/gfx/pics/diglett/anim0.asm b/gfx/pokemon/diglett/anim0.asm
index a4d79bd56..a4d79bd56 100644
--- a/gfx/pics/diglett/anim0.asm
+++ b/gfx/pokemon/diglett/anim0.asm
diff --git a/gfx/pics/diglett/anim1.asm b/gfx/pokemon/diglett/anim1.asm
index bd2a27e03..bd2a27e03 100644
--- a/gfx/pics/diglett/anim1.asm
+++ b/gfx/pokemon/diglett/anim1.asm
diff --git a/gfx/pics/diglett/back.2bpp.lz.31d8cacc b/gfx/pokemon/diglett/back.2bpp.lz.31d8cacc
index 05625954c..05625954c 100644
--- a/gfx/pics/diglett/back.2bpp.lz.31d8cacc
+++ b/gfx/pokemon/diglett/back.2bpp.lz.31d8cacc
diff --git a/gfx/pics/diglett/back.png b/gfx/pokemon/diglett/back.png
index cde3b07f9..cde3b07f9 100644
--- a/gfx/pics/diglett/back.png
+++ b/gfx/pokemon/diglett/back.png
diff --git a/gfx/pics/diglett/front.animated.2bpp.lz.52b0361e b/gfx/pokemon/diglett/front.animated.2bpp.lz.52b0361e
index 5ed5e87ff..5ed5e87ff 100644
--- a/gfx/pics/diglett/front.animated.2bpp.lz.52b0361e
+++ b/gfx/pokemon/diglett/front.animated.2bpp.lz.52b0361e
diff --git a/gfx/pics/diglett/front.png b/gfx/pokemon/diglett/front.png
index 49adc371a..49adc371a 100644
--- a/gfx/pics/diglett/front.png
+++ b/gfx/pokemon/diglett/front.png
diff --git a/gfx/pics/diglett/shiny.pal b/gfx/pokemon/diglett/shiny.pal
index ce41b3928..ce41b3928 100644
--- a/gfx/pics/diglett/shiny.pal
+++ b/gfx/pokemon/diglett/shiny.pal
diff --git a/gfx/pics/ditto/anim0.asm b/gfx/pokemon/ditto/anim0.asm
index 53f3f9afa..53f3f9afa 100644
--- a/gfx/pics/ditto/anim0.asm
+++ b/gfx/pokemon/ditto/anim0.asm
diff --git a/gfx/pics/ditto/anim1.asm b/gfx/pokemon/ditto/anim1.asm
index 195808be1..195808be1 100644
--- a/gfx/pics/ditto/anim1.asm
+++ b/gfx/pokemon/ditto/anim1.asm
diff --git a/gfx/pics/ditto/back.2bpp.lz.b01a9d91 b/gfx/pokemon/ditto/back.2bpp.lz.b01a9d91
index ee2a621bf..ee2a621bf 100644
--- a/gfx/pics/ditto/back.2bpp.lz.b01a9d91
+++ b/gfx/pokemon/ditto/back.2bpp.lz.b01a9d91
diff --git a/gfx/pics/ditto/back.png b/gfx/pokemon/ditto/back.png
index bf1f4cb1a..bf1f4cb1a 100644
--- a/gfx/pics/ditto/back.png
+++ b/gfx/pokemon/ditto/back.png
diff --git a/gfx/pics/ditto/front.animated.2bpp.lz.344c90fd b/gfx/pokemon/ditto/front.animated.2bpp.lz.344c90fd
index ef64bd777..ef64bd777 100644
--- a/gfx/pics/ditto/front.animated.2bpp.lz.344c90fd
+++ b/gfx/pokemon/ditto/front.animated.2bpp.lz.344c90fd
diff --git a/gfx/pics/ditto/front.png b/gfx/pokemon/ditto/front.png
index 9979863f6..9979863f6 100644
--- a/gfx/pics/ditto/front.png
+++ b/gfx/pokemon/ditto/front.png
diff --git a/gfx/pics/ditto/shiny.pal b/gfx/pokemon/ditto/shiny.pal
index bcc063864..bcc063864 100644
--- a/gfx/pics/ditto/shiny.pal
+++ b/gfx/pokemon/ditto/shiny.pal
diff --git a/gfx/pics/dodrio/anim0.asm b/gfx/pokemon/dodrio/anim0.asm
index 539f896d7..539f896d7 100644
--- a/gfx/pics/dodrio/anim0.asm
+++ b/gfx/pokemon/dodrio/anim0.asm
diff --git a/gfx/pics/dodrio/anim1.asm b/gfx/pokemon/dodrio/anim1.asm
index a921058f3..a921058f3 100644
--- a/gfx/pics/dodrio/anim1.asm
+++ b/gfx/pokemon/dodrio/anim1.asm
diff --git a/gfx/pics/dodrio/back.2bpp.lz.a5480e88 b/gfx/pokemon/dodrio/back.2bpp.lz.a5480e88
index 3b1d80db5..3b1d80db5 100644
--- a/gfx/pics/dodrio/back.2bpp.lz.a5480e88
+++ b/gfx/pokemon/dodrio/back.2bpp.lz.a5480e88
diff --git a/gfx/pics/dodrio/back.png b/gfx/pokemon/dodrio/back.png
index abc232883..abc232883 100644
--- a/gfx/pics/dodrio/back.png
+++ b/gfx/pokemon/dodrio/back.png
diff --git a/gfx/pics/dodrio/front.animated.2bpp.lz.2aaff569 b/gfx/pokemon/dodrio/front.animated.2bpp.lz.2aaff569
index 8de65b2de..8de65b2de 100644
--- a/gfx/pics/dodrio/front.animated.2bpp.lz.2aaff569
+++ b/gfx/pokemon/dodrio/front.animated.2bpp.lz.2aaff569
diff --git a/gfx/pics/dodrio/front.png b/gfx/pokemon/dodrio/front.png
index ddd441ba1..ddd441ba1 100644
--- a/gfx/pics/dodrio/front.png
+++ b/gfx/pokemon/dodrio/front.png
diff --git a/gfx/pics/dodrio/shiny.pal b/gfx/pokemon/dodrio/shiny.pal
index 521bc017b..521bc017b 100644
--- a/gfx/pics/dodrio/shiny.pal
+++ b/gfx/pokemon/dodrio/shiny.pal
diff --git a/gfx/pics/doduo/anim0.asm b/gfx/pokemon/doduo/anim0.asm
index cd38ca192..cd38ca192 100644
--- a/gfx/pics/doduo/anim0.asm
+++ b/gfx/pokemon/doduo/anim0.asm
diff --git a/gfx/pics/doduo/anim1.asm b/gfx/pokemon/doduo/anim1.asm
index 89715cae8..89715cae8 100644
--- a/gfx/pics/doduo/anim1.asm
+++ b/gfx/pokemon/doduo/anim1.asm
diff --git a/gfx/pics/doduo/back.2bpp.lz.05a57563 b/gfx/pokemon/doduo/back.2bpp.lz.05a57563
index 8f204150b..8f204150b 100644
--- a/gfx/pics/doduo/back.2bpp.lz.05a57563
+++ b/gfx/pokemon/doduo/back.2bpp.lz.05a57563
diff --git a/gfx/pics/doduo/back.png b/gfx/pokemon/doduo/back.png
index 8440b7af7..8440b7af7 100644
--- a/gfx/pics/doduo/back.png
+++ b/gfx/pokemon/doduo/back.png
diff --git a/gfx/pics/doduo/front.animated.2bpp.lz.89c4acbd b/gfx/pokemon/doduo/front.animated.2bpp.lz.89c4acbd
index 11d525427..11d525427 100644
--- a/gfx/pics/doduo/front.animated.2bpp.lz.89c4acbd
+++ b/gfx/pokemon/doduo/front.animated.2bpp.lz.89c4acbd
diff --git a/gfx/pics/doduo/front.png b/gfx/pokemon/doduo/front.png
index 8c90b36f7..8c90b36f7 100644
--- a/gfx/pics/doduo/front.png
+++ b/gfx/pokemon/doduo/front.png
diff --git a/gfx/pics/doduo/shiny.pal b/gfx/pokemon/doduo/shiny.pal
index f8093f636..f8093f636 100644
--- a/gfx/pics/doduo/shiny.pal
+++ b/gfx/pokemon/doduo/shiny.pal
diff --git a/gfx/pics/donphan/anim0.asm b/gfx/pokemon/donphan/anim0.asm
index fbfbd8d17..fbfbd8d17 100644
--- a/gfx/pics/donphan/anim0.asm
+++ b/gfx/pokemon/donphan/anim0.asm
diff --git a/gfx/pics/donphan/anim1.asm b/gfx/pokemon/donphan/anim1.asm
index 341013ce9..341013ce9 100644
--- a/gfx/pics/donphan/anim1.asm
+++ b/gfx/pokemon/donphan/anim1.asm
diff --git a/gfx/pics/donphan/back.2bpp.lz.5067b370 b/gfx/pokemon/donphan/back.2bpp.lz.5067b370
index 4914f03aa..4914f03aa 100644
--- a/gfx/pics/donphan/back.2bpp.lz.5067b370
+++ b/gfx/pokemon/donphan/back.2bpp.lz.5067b370
diff --git a/gfx/pics/donphan/back.png b/gfx/pokemon/donphan/back.png
index a156f85bf..a156f85bf 100644
--- a/gfx/pics/donphan/back.png
+++ b/gfx/pokemon/donphan/back.png
diff --git a/gfx/pics/donphan/front.animated.2bpp.lz.9e1b7048 b/gfx/pokemon/donphan/front.animated.2bpp.lz.9e1b7048
index b46d083fc..b46d083fc 100644
--- a/gfx/pics/donphan/front.animated.2bpp.lz.9e1b7048
+++ b/gfx/pokemon/donphan/front.animated.2bpp.lz.9e1b7048
diff --git a/gfx/pics/donphan/front.png b/gfx/pokemon/donphan/front.png
index 9dc93c065..9dc93c065 100644
--- a/gfx/pics/donphan/front.png
+++ b/gfx/pokemon/donphan/front.png
diff --git a/gfx/pics/donphan/shiny.pal b/gfx/pokemon/donphan/shiny.pal
index d705694c2..d705694c2 100644
--- a/gfx/pics/donphan/shiny.pal
+++ b/gfx/pokemon/donphan/shiny.pal
diff --git a/gfx/pics/dragonair/anim0.asm b/gfx/pokemon/dragonair/anim0.asm
index b7a2be64d..b7a2be64d 100644
--- a/gfx/pics/dragonair/anim0.asm
+++ b/gfx/pokemon/dragonair/anim0.asm
diff --git a/gfx/pics/dragonair/anim1.asm b/gfx/pokemon/dragonair/anim1.asm
index afea7ab43..afea7ab43 100644
--- a/gfx/pics/dragonair/anim1.asm
+++ b/gfx/pokemon/dragonair/anim1.asm
diff --git a/gfx/pics/dragonair/back.2bpp.lz.9b6fda5b b/gfx/pokemon/dragonair/back.2bpp.lz.9b6fda5b
index 52094c394..52094c394 100644
--- a/gfx/pics/dragonair/back.2bpp.lz.9b6fda5b
+++ b/gfx/pokemon/dragonair/back.2bpp.lz.9b6fda5b
diff --git a/gfx/pics/dragonair/back.png b/gfx/pokemon/dragonair/back.png
index 99c03894a..99c03894a 100644
--- a/gfx/pics/dragonair/back.png
+++ b/gfx/pokemon/dragonair/back.png
diff --git a/gfx/pics/dragonair/front.animated.2bpp.lz.bb9ee373 b/gfx/pokemon/dragonair/front.animated.2bpp.lz.bb9ee373
index aad34536f..aad34536f 100644
--- a/gfx/pics/dragonair/front.animated.2bpp.lz.bb9ee373
+++ b/gfx/pokemon/dragonair/front.animated.2bpp.lz.bb9ee373
diff --git a/gfx/pics/dragonair/front.png b/gfx/pokemon/dragonair/front.png
index 19feeeec1..19feeeec1 100644
--- a/gfx/pics/dragonair/front.png
+++ b/gfx/pokemon/dragonair/front.png
diff --git a/gfx/pics/dragonair/shiny.pal b/gfx/pokemon/dragonair/shiny.pal
index 744429411..744429411 100644
--- a/gfx/pics/dragonair/shiny.pal
+++ b/gfx/pokemon/dragonair/shiny.pal
diff --git a/gfx/pics/dragonite/anim0.asm b/gfx/pokemon/dragonite/anim0.asm
index 9dd6bf84a..9dd6bf84a 100644
--- a/gfx/pics/dragonite/anim0.asm
+++ b/gfx/pokemon/dragonite/anim0.asm
diff --git a/gfx/pics/dragonite/anim1.asm b/gfx/pokemon/dragonite/anim1.asm
index fe0d7edbb..fe0d7edbb 100644
--- a/gfx/pics/dragonite/anim1.asm
+++ b/gfx/pokemon/dragonite/anim1.asm
diff --git a/gfx/pics/dragonite/back.2bpp.lz.c408806f b/gfx/pokemon/dragonite/back.2bpp.lz.c408806f
index 09a828dd0..09a828dd0 100644
--- a/gfx/pics/dragonite/back.2bpp.lz.c408806f
+++ b/gfx/pokemon/dragonite/back.2bpp.lz.c408806f
diff --git a/gfx/pics/dragonite/back.png b/gfx/pokemon/dragonite/back.png
index 29ef7abea..29ef7abea 100644
--- a/gfx/pics/dragonite/back.png
+++ b/gfx/pokemon/dragonite/back.png
diff --git a/gfx/pics/dragonite/front.animated.2bpp.lz.b914dfd9 b/gfx/pokemon/dragonite/front.animated.2bpp.lz.b914dfd9
index 730c16739..730c16739 100644
--- a/gfx/pics/dragonite/front.animated.2bpp.lz.b914dfd9
+++ b/gfx/pokemon/dragonite/front.animated.2bpp.lz.b914dfd9
diff --git a/gfx/pics/dragonite/front.png b/gfx/pokemon/dragonite/front.png
index 5675a1441..5675a1441 100644
--- a/gfx/pics/dragonite/front.png
+++ b/gfx/pokemon/dragonite/front.png
diff --git a/gfx/pics/dragonite/shiny.pal b/gfx/pokemon/dragonite/shiny.pal
index f12fb4a7b..f12fb4a7b 100644
--- a/gfx/pics/dragonite/shiny.pal
+++ b/gfx/pokemon/dragonite/shiny.pal
diff --git a/gfx/pics/dratini/anim0.asm b/gfx/pokemon/dratini/anim0.asm
index f844a2eec..f844a2eec 100644
--- a/gfx/pics/dratini/anim0.asm
+++ b/gfx/pokemon/dratini/anim0.asm
diff --git a/gfx/pics/dratini/anim1.asm b/gfx/pokemon/dratini/anim1.asm
index 441340446..441340446 100644
--- a/gfx/pics/dratini/anim1.asm
+++ b/gfx/pokemon/dratini/anim1.asm
diff --git a/gfx/pics/dratini/back.2bpp.lz.be4d6a2a b/gfx/pokemon/dratini/back.2bpp.lz.be4d6a2a
index b40ffcaaf..b40ffcaaf 100644
--- a/gfx/pics/dratini/back.2bpp.lz.be4d6a2a
+++ b/gfx/pokemon/dratini/back.2bpp.lz.be4d6a2a
diff --git a/gfx/pics/dratini/back.png b/gfx/pokemon/dratini/back.png
index 352e436de..352e436de 100644
--- a/gfx/pics/dratini/back.png
+++ b/gfx/pokemon/dratini/back.png
diff --git a/gfx/pics/dratini/front.animated.2bpp.lz.838e4248 b/gfx/pokemon/dratini/front.animated.2bpp.lz.838e4248
index b933491b7..b933491b7 100644
--- a/gfx/pics/dratini/front.animated.2bpp.lz.838e4248
+++ b/gfx/pokemon/dratini/front.animated.2bpp.lz.838e4248
diff --git a/gfx/pics/dratini/front.png b/gfx/pokemon/dratini/front.png
index 9f49eb8f0..9f49eb8f0 100644
--- a/gfx/pics/dratini/front.png
+++ b/gfx/pokemon/dratini/front.png
diff --git a/gfx/pics/dratini/shiny.pal b/gfx/pokemon/dratini/shiny.pal
index e7c9b58a1..e7c9b58a1 100644
--- a/gfx/pics/dratini/shiny.pal
+++ b/gfx/pokemon/dratini/shiny.pal
diff --git a/gfx/pics/drowzee/anim0.asm b/gfx/pokemon/drowzee/anim0.asm
index badc99074..badc99074 100644
--- a/gfx/pics/drowzee/anim0.asm
+++ b/gfx/pokemon/drowzee/anim0.asm
diff --git a/gfx/pics/drowzee/anim1.asm b/gfx/pokemon/drowzee/anim1.asm
index 247ecb8fe..247ecb8fe 100644
--- a/gfx/pics/drowzee/anim1.asm
+++ b/gfx/pokemon/drowzee/anim1.asm
diff --git a/gfx/pics/drowzee/back.2bpp.lz.55367f5a b/gfx/pokemon/drowzee/back.2bpp.lz.55367f5a
index a4218ade7..a4218ade7 100644
--- a/gfx/pics/drowzee/back.2bpp.lz.55367f5a
+++ b/gfx/pokemon/drowzee/back.2bpp.lz.55367f5a
diff --git a/gfx/pics/drowzee/back.png b/gfx/pokemon/drowzee/back.png
index 8186a9529..8186a9529 100644
--- a/gfx/pics/drowzee/back.png
+++ b/gfx/pokemon/drowzee/back.png
diff --git a/gfx/pics/drowzee/front.animated.2bpp.lz.1f23711a b/gfx/pokemon/drowzee/front.animated.2bpp.lz.1f23711a
index cf3f87571..cf3f87571 100644
--- a/gfx/pics/drowzee/front.animated.2bpp.lz.1f23711a
+++ b/gfx/pokemon/drowzee/front.animated.2bpp.lz.1f23711a
diff --git a/gfx/pics/drowzee/front.png b/gfx/pokemon/drowzee/front.png
index 2b3a43d26..2b3a43d26 100644
--- a/gfx/pics/drowzee/front.png
+++ b/gfx/pokemon/drowzee/front.png
diff --git a/gfx/pics/drowzee/shiny.pal b/gfx/pokemon/drowzee/shiny.pal
index 2b0946ece..2b0946ece 100644
--- a/gfx/pics/drowzee/shiny.pal
+++ b/gfx/pokemon/drowzee/shiny.pal
diff --git a/gfx/pics/dugtrio/anim0.asm b/gfx/pokemon/dugtrio/anim0.asm
index 7b5038620..7b5038620 100644
--- a/gfx/pics/dugtrio/anim0.asm
+++ b/gfx/pokemon/dugtrio/anim0.asm
diff --git a/gfx/pics/dugtrio/anim1.asm b/gfx/pokemon/dugtrio/anim1.asm
index 1b32b854c..1b32b854c 100644
--- a/gfx/pics/dugtrio/anim1.asm
+++ b/gfx/pokemon/dugtrio/anim1.asm
diff --git a/gfx/pics/dugtrio/back.2bpp.lz.e821a89c b/gfx/pokemon/dugtrio/back.2bpp.lz.e821a89c
index 05ad7b1ad..05ad7b1ad 100644
--- a/gfx/pics/dugtrio/back.2bpp.lz.e821a89c
+++ b/gfx/pokemon/dugtrio/back.2bpp.lz.e821a89c
diff --git a/gfx/pics/dugtrio/back.png b/gfx/pokemon/dugtrio/back.png
index c1bca81bd..c1bca81bd 100644
--- a/gfx/pics/dugtrio/back.png
+++ b/gfx/pokemon/dugtrio/back.png
diff --git a/gfx/pics/dugtrio/front.animated.2bpp.lz.5c9e668c b/gfx/pokemon/dugtrio/front.animated.2bpp.lz.5c9e668c
index 7ef2606cd..7ef2606cd 100644
--- a/gfx/pics/dugtrio/front.animated.2bpp.lz.5c9e668c
+++ b/gfx/pokemon/dugtrio/front.animated.2bpp.lz.5c9e668c
diff --git a/gfx/pics/dugtrio/front.png b/gfx/pokemon/dugtrio/front.png
index 9fe5e14a7..9fe5e14a7 100644
--- a/gfx/pics/dugtrio/front.png
+++ b/gfx/pokemon/dugtrio/front.png
diff --git a/gfx/pics/dugtrio/shiny.pal b/gfx/pokemon/dugtrio/shiny.pal
index ce41b3928..ce41b3928 100644
--- a/gfx/pics/dugtrio/shiny.pal
+++ b/gfx/pokemon/dugtrio/shiny.pal
diff --git a/gfx/pics/dunsparce/anim0.asm b/gfx/pokemon/dunsparce/anim0.asm
index b4217afbd..b4217afbd 100644
--- a/gfx/pics/dunsparce/anim0.asm
+++ b/gfx/pokemon/dunsparce/anim0.asm
diff --git a/gfx/pics/dunsparce/anim1.asm b/gfx/pokemon/dunsparce/anim1.asm
index f5d6d9b05..f5d6d9b05 100644
--- a/gfx/pics/dunsparce/anim1.asm
+++ b/gfx/pokemon/dunsparce/anim1.asm
diff --git a/gfx/pics/dunsparce/back.2bpp.lz.aee69114 b/gfx/pokemon/dunsparce/back.2bpp.lz.aee69114
index 1042b07f8..1042b07f8 100644
--- a/gfx/pics/dunsparce/back.2bpp.lz.aee69114
+++ b/gfx/pokemon/dunsparce/back.2bpp.lz.aee69114
diff --git a/gfx/pics/dunsparce/back.png b/gfx/pokemon/dunsparce/back.png
index d3fc9cc85..d3fc9cc85 100644
--- a/gfx/pics/dunsparce/back.png
+++ b/gfx/pokemon/dunsparce/back.png
diff --git a/gfx/pics/dunsparce/front.animated.2bpp.lz.04ea863c b/gfx/pokemon/dunsparce/front.animated.2bpp.lz.04ea863c
index 31e9aa319..31e9aa319 100644
--- a/gfx/pics/dunsparce/front.animated.2bpp.lz.04ea863c
+++ b/gfx/pokemon/dunsparce/front.animated.2bpp.lz.04ea863c
diff --git a/gfx/pics/dunsparce/front.png b/gfx/pokemon/dunsparce/front.png
index a2fbc6f18..a2fbc6f18 100644
--- a/gfx/pics/dunsparce/front.png
+++ b/gfx/pokemon/dunsparce/front.png
diff --git a/gfx/pics/dunsparce/shiny.pal b/gfx/pokemon/dunsparce/shiny.pal
index a86589ee4..a86589ee4 100644
--- a/gfx/pics/dunsparce/shiny.pal
+++ b/gfx/pokemon/dunsparce/shiny.pal
diff --git a/gfx/pics/eevee/anim0.asm b/gfx/pokemon/eevee/anim0.asm
index 537cefb83..537cefb83 100644
--- a/gfx/pics/eevee/anim0.asm
+++ b/gfx/pokemon/eevee/anim0.asm
diff --git a/gfx/pics/eevee/anim1.asm b/gfx/pokemon/eevee/anim1.asm
index 0f50b3cb8..0f50b3cb8 100644
--- a/gfx/pics/eevee/anim1.asm
+++ b/gfx/pokemon/eevee/anim1.asm
diff --git a/gfx/pics/eevee/back.2bpp.lz.bc34ce62 b/gfx/pokemon/eevee/back.2bpp.lz.bc34ce62
index ddd051f3a..ddd051f3a 100644
--- a/gfx/pics/eevee/back.2bpp.lz.bc34ce62
+++ b/gfx/pokemon/eevee/back.2bpp.lz.bc34ce62
diff --git a/gfx/pics/eevee/back.png b/gfx/pokemon/eevee/back.png
index 7dbca2487..7dbca2487 100644
--- a/gfx/pics/eevee/back.png
+++ b/gfx/pokemon/eevee/back.png
diff --git a/gfx/pics/eevee/front.animated.2bpp.lz.04e72b48 b/gfx/pokemon/eevee/front.animated.2bpp.lz.04e72b48
index aea8d545e..aea8d545e 100644
--- a/gfx/pics/eevee/front.animated.2bpp.lz.04e72b48
+++ b/gfx/pokemon/eevee/front.animated.2bpp.lz.04e72b48
diff --git a/gfx/pics/eevee/front.png b/gfx/pokemon/eevee/front.png
index b35e901c8..b35e901c8 100644
--- a/gfx/pics/eevee/front.png
+++ b/gfx/pokemon/eevee/front.png
diff --git a/gfx/pics/eevee/shiny.pal b/gfx/pokemon/eevee/shiny.pal
index 69759609c..69759609c 100644
--- a/gfx/pics/eevee/shiny.pal
+++ b/gfx/pokemon/eevee/shiny.pal
diff --git a/gfx/pics/egg/anim0.asm b/gfx/pokemon/egg/anim0.asm
index 1ded66327..1ded66327 100644
--- a/gfx/pics/egg/anim0.asm
+++ b/gfx/pokemon/egg/anim0.asm
diff --git a/gfx/pics/egg/anim1.asm b/gfx/pokemon/egg/anim1.asm
index 634736c6b..634736c6b 100644
--- a/gfx/pics/egg/anim1.asm
+++ b/gfx/pokemon/egg/anim1.asm
diff --git a/gfx/pics/egg/front.animated.2bpp.lz.7b468eff b/gfx/pokemon/egg/front.animated.2bpp.lz.7b468eff
index 47d8b997e..47d8b997e 100644
--- a/gfx/pics/egg/front.animated.2bpp.lz.7b468eff
+++ b/gfx/pokemon/egg/front.animated.2bpp.lz.7b468eff
diff --git a/gfx/pics/egg/front.png b/gfx/pokemon/egg/front.png
index be8e9d4a4..be8e9d4a4 100644
--- a/gfx/pics/egg/front.png
+++ b/gfx/pokemon/egg/front.png
diff --git a/gfx/pics/ekans/anim0.asm b/gfx/pokemon/ekans/anim0.asm
index 9728434c0..9728434c0 100644
--- a/gfx/pics/ekans/anim0.asm
+++ b/gfx/pokemon/ekans/anim0.asm
diff --git a/gfx/pics/ekans/anim1.asm b/gfx/pokemon/ekans/anim1.asm
index 660a4f971..660a4f971 100644
--- a/gfx/pics/ekans/anim1.asm
+++ b/gfx/pokemon/ekans/anim1.asm
diff --git a/gfx/pics/ekans/back.2bpp.lz.671d14d9 b/gfx/pokemon/ekans/back.2bpp.lz.671d14d9
index 07785737f..07785737f 100644
--- a/gfx/pics/ekans/back.2bpp.lz.671d14d9
+++ b/gfx/pokemon/ekans/back.2bpp.lz.671d14d9
diff --git a/gfx/pics/ekans/back.png b/gfx/pokemon/ekans/back.png
index d61670da7..d61670da7 100644
--- a/gfx/pics/ekans/back.png
+++ b/gfx/pokemon/ekans/back.png
diff --git a/gfx/pics/ekans/front.animated.2bpp.lz.018a1c72 b/gfx/pokemon/ekans/front.animated.2bpp.lz.018a1c72
index efa075fab..efa075fab 100644
--- a/gfx/pics/ekans/front.animated.2bpp.lz.018a1c72
+++ b/gfx/pokemon/ekans/front.animated.2bpp.lz.018a1c72
diff --git a/gfx/pics/ekans/front.png b/gfx/pokemon/ekans/front.png
index 21f476943..21f476943 100644
--- a/gfx/pics/ekans/front.png
+++ b/gfx/pokemon/ekans/front.png
diff --git a/gfx/pics/ekans/shiny.pal b/gfx/pokemon/ekans/shiny.pal
index 6f71f8cbb..6f71f8cbb 100644
--- a/gfx/pics/ekans/shiny.pal
+++ b/gfx/pokemon/ekans/shiny.pal
diff --git a/gfx/pics/electabuzz/anim0.asm b/gfx/pokemon/electabuzz/anim0.asm
index 4e2a550ed..4e2a550ed 100644
--- a/gfx/pics/electabuzz/anim0.asm
+++ b/gfx/pokemon/electabuzz/anim0.asm
diff --git a/gfx/pics/electabuzz/anim1.asm b/gfx/pokemon/electabuzz/anim1.asm
index efff4b3db..efff4b3db 100644
--- a/gfx/pics/electabuzz/anim1.asm
+++ b/gfx/pokemon/electabuzz/anim1.asm
diff --git a/gfx/pics/electabuzz/back.2bpp.lz.e97330fe b/gfx/pokemon/electabuzz/back.2bpp.lz.e97330fe
index b64bc1ca1..b64bc1ca1 100644
--- a/gfx/pics/electabuzz/back.2bpp.lz.e97330fe
+++ b/gfx/pokemon/electabuzz/back.2bpp.lz.e97330fe
diff --git a/gfx/pics/electabuzz/back.png b/gfx/pokemon/electabuzz/back.png
index 73496522e..73496522e 100644
--- a/gfx/pics/electabuzz/back.png
+++ b/gfx/pokemon/electabuzz/back.png
diff --git a/gfx/pics/electabuzz/front.animated.2bpp.lz.381e1c6e b/gfx/pokemon/electabuzz/front.animated.2bpp.lz.381e1c6e
index 645db8d4d..645db8d4d 100644
--- a/gfx/pics/electabuzz/front.animated.2bpp.lz.381e1c6e
+++ b/gfx/pokemon/electabuzz/front.animated.2bpp.lz.381e1c6e
diff --git a/gfx/pics/electabuzz/front.png b/gfx/pokemon/electabuzz/front.png
index 3d44a603a..3d44a603a 100644
--- a/gfx/pics/electabuzz/front.png
+++ b/gfx/pokemon/electabuzz/front.png
diff --git a/gfx/pics/electabuzz/shiny.pal b/gfx/pokemon/electabuzz/shiny.pal
index e932aa461..e932aa461 100644
--- a/gfx/pics/electabuzz/shiny.pal
+++ b/gfx/pokemon/electabuzz/shiny.pal
diff --git a/gfx/pics/electrode/anim0.asm b/gfx/pokemon/electrode/anim0.asm
index 18b31e305..18b31e305 100644
--- a/gfx/pics/electrode/anim0.asm
+++ b/gfx/pokemon/electrode/anim0.asm
diff --git a/gfx/pics/electrode/anim1.asm b/gfx/pokemon/electrode/anim1.asm
index 30d1b1788..30d1b1788 100644
--- a/gfx/pics/electrode/anim1.asm
+++ b/gfx/pokemon/electrode/anim1.asm
diff --git a/gfx/pics/electrode/back.2bpp.lz.874e1f1c b/gfx/pokemon/electrode/back.2bpp.lz.874e1f1c
index 9161c8884..9161c8884 100644
--- a/gfx/pics/electrode/back.2bpp.lz.874e1f1c
+++ b/gfx/pokemon/electrode/back.2bpp.lz.874e1f1c
diff --git a/gfx/pics/electrode/back.png b/gfx/pokemon/electrode/back.png
index ea243bf3c..ea243bf3c 100644
--- a/gfx/pics/electrode/back.png
+++ b/gfx/pokemon/electrode/back.png
diff --git a/gfx/pics/electrode/front.animated.2bpp.lz.d7943ad8 b/gfx/pokemon/electrode/front.animated.2bpp.lz.d7943ad8
index 2d86aa4ac..2d86aa4ac 100644
--- a/gfx/pics/electrode/front.animated.2bpp.lz.d7943ad8
+++ b/gfx/pokemon/electrode/front.animated.2bpp.lz.d7943ad8
diff --git a/gfx/pics/electrode/front.png b/gfx/pokemon/electrode/front.png
index 25c181357..25c181357 100644
--- a/gfx/pics/electrode/front.png
+++ b/gfx/pokemon/electrode/front.png
diff --git a/gfx/pics/electrode/shiny.pal b/gfx/pokemon/electrode/shiny.pal
index b8509a81f..b8509a81f 100644
--- a/gfx/pics/electrode/shiny.pal
+++ b/gfx/pokemon/electrode/shiny.pal
diff --git a/gfx/pics/elekid/anim0.asm b/gfx/pokemon/elekid/anim0.asm
index 590dccf14..590dccf14 100644
--- a/gfx/pics/elekid/anim0.asm
+++ b/gfx/pokemon/elekid/anim0.asm
diff --git a/gfx/pics/elekid/anim1.asm b/gfx/pokemon/elekid/anim1.asm
index cd10626f6..cd10626f6 100644
--- a/gfx/pics/elekid/anim1.asm
+++ b/gfx/pokemon/elekid/anim1.asm
diff --git a/gfx/pics/elekid/back.2bpp.lz.227a1b23 b/gfx/pokemon/elekid/back.2bpp.lz.227a1b23
index fd8dd04df..fd8dd04df 100644
--- a/gfx/pics/elekid/back.2bpp.lz.227a1b23
+++ b/gfx/pokemon/elekid/back.2bpp.lz.227a1b23
diff --git a/gfx/pics/elekid/back.png b/gfx/pokemon/elekid/back.png
index 8049ca5ad..8049ca5ad 100644
--- a/gfx/pics/elekid/back.png
+++ b/gfx/pokemon/elekid/back.png
diff --git a/gfx/pics/elekid/front.animated.2bpp.lz.3bbb6b61 b/gfx/pokemon/elekid/front.animated.2bpp.lz.3bbb6b61
index dde6b0e0b..dde6b0e0b 100644
--- a/gfx/pics/elekid/front.animated.2bpp.lz.3bbb6b61
+++ b/gfx/pokemon/elekid/front.animated.2bpp.lz.3bbb6b61
diff --git a/gfx/pics/elekid/front.png b/gfx/pokemon/elekid/front.png
index eaefbdc6c..eaefbdc6c 100644
--- a/gfx/pics/elekid/front.png
+++ b/gfx/pokemon/elekid/front.png
diff --git a/gfx/pics/elekid/shiny.pal b/gfx/pokemon/elekid/shiny.pal
index 4eb42c6d4..4eb42c6d4 100644
--- a/gfx/pics/elekid/shiny.pal
+++ b/gfx/pokemon/elekid/shiny.pal
diff --git a/gfx/pics/entei/anim0.asm b/gfx/pokemon/entei/anim0.asm
index 66c2c128d..66c2c128d 100644
--- a/gfx/pics/entei/anim0.asm
+++ b/gfx/pokemon/entei/anim0.asm
diff --git a/gfx/pics/entei/anim1.asm b/gfx/pokemon/entei/anim1.asm
index f20e5d072..f20e5d072 100644
--- a/gfx/pics/entei/anim1.asm
+++ b/gfx/pokemon/entei/anim1.asm
diff --git a/gfx/pics/entei/back.2bpp.lz.d1e1986a b/gfx/pokemon/entei/back.2bpp.lz.d1e1986a
index 7f2440f51..7f2440f51 100644
--- a/gfx/pics/entei/back.2bpp.lz.d1e1986a
+++ b/gfx/pokemon/entei/back.2bpp.lz.d1e1986a
diff --git a/gfx/pics/entei/back.png b/gfx/pokemon/entei/back.png
index fa966a3c9..fa966a3c9 100644
--- a/gfx/pics/entei/back.png
+++ b/gfx/pokemon/entei/back.png
diff --git a/gfx/pics/entei/front.animated.2bpp.lz.ebaf8024 b/gfx/pokemon/entei/front.animated.2bpp.lz.ebaf8024
index bc969fe65..bc969fe65 100644
--- a/gfx/pics/entei/front.animated.2bpp.lz.ebaf8024
+++ b/gfx/pokemon/entei/front.animated.2bpp.lz.ebaf8024
diff --git a/gfx/pics/entei/front.png b/gfx/pokemon/entei/front.png
index 220bcf9a6..220bcf9a6 100644
--- a/gfx/pics/entei/front.png
+++ b/gfx/pokemon/entei/front.png
diff --git a/gfx/pics/entei/shiny.pal b/gfx/pokemon/entei/shiny.pal
index e806f7e00..e806f7e00 100644
--- a/gfx/pics/entei/shiny.pal
+++ b/gfx/pokemon/entei/shiny.pal
diff --git a/gfx/pics/espeon/anim0.asm b/gfx/pokemon/espeon/anim0.asm
index 8a54a9b97..8a54a9b97 100644
--- a/gfx/pics/espeon/anim0.asm
+++ b/gfx/pokemon/espeon/anim0.asm
diff --git a/gfx/pics/espeon/anim1.asm b/gfx/pokemon/espeon/anim1.asm
index 33c88d1b4..33c88d1b4 100644
--- a/gfx/pics/espeon/anim1.asm
+++ b/gfx/pokemon/espeon/anim1.asm
diff --git a/gfx/pics/espeon/back.2bpp.lz.0e77f26e b/gfx/pokemon/espeon/back.2bpp.lz.0e77f26e
index 59a69eae1..59a69eae1 100644
--- a/gfx/pics/espeon/back.2bpp.lz.0e77f26e
+++ b/gfx/pokemon/espeon/back.2bpp.lz.0e77f26e
diff --git a/gfx/pics/espeon/back.png b/gfx/pokemon/espeon/back.png
index 26d2d2973..26d2d2973 100644
--- a/gfx/pics/espeon/back.png
+++ b/gfx/pokemon/espeon/back.png
diff --git a/gfx/pics/espeon/front.animated.2bpp.lz.069f57ec b/gfx/pokemon/espeon/front.animated.2bpp.lz.069f57ec
index b7d983e9f..b7d983e9f 100644
--- a/gfx/pics/espeon/front.animated.2bpp.lz.069f57ec
+++ b/gfx/pokemon/espeon/front.animated.2bpp.lz.069f57ec
diff --git a/gfx/pics/espeon/front.png b/gfx/pokemon/espeon/front.png
index dd68a6c18..dd68a6c18 100644
--- a/gfx/pics/espeon/front.png
+++ b/gfx/pokemon/espeon/front.png
diff --git a/gfx/pics/espeon/shiny.pal b/gfx/pokemon/espeon/shiny.pal
index 8f2343d89..8f2343d89 100644
--- a/gfx/pics/espeon/shiny.pal
+++ b/gfx/pokemon/espeon/shiny.pal
diff --git a/gfx/pics/exeggcute/anim0.asm b/gfx/pokemon/exeggcute/anim0.asm
index 0f0c10729..0f0c10729 100644
--- a/gfx/pics/exeggcute/anim0.asm
+++ b/gfx/pokemon/exeggcute/anim0.asm
diff --git a/gfx/pics/exeggcute/anim1.asm b/gfx/pokemon/exeggcute/anim1.asm
index ef839f5d1..ef839f5d1 100644
--- a/gfx/pics/exeggcute/anim1.asm
+++ b/gfx/pokemon/exeggcute/anim1.asm
diff --git a/gfx/pics/exeggcute/back.2bpp.lz.060c38b0 b/gfx/pokemon/exeggcute/back.2bpp.lz.060c38b0
index 1877fcea1..1877fcea1 100644
--- a/gfx/pics/exeggcute/back.2bpp.lz.060c38b0
+++ b/gfx/pokemon/exeggcute/back.2bpp.lz.060c38b0
diff --git a/gfx/pics/exeggcute/back.png b/gfx/pokemon/exeggcute/back.png
index 97f04b02f..97f04b02f 100644
--- a/gfx/pics/exeggcute/back.png
+++ b/gfx/pokemon/exeggcute/back.png
diff --git a/gfx/pics/exeggcute/front.animated.2bpp.lz.578a4722 b/gfx/pokemon/exeggcute/front.animated.2bpp.lz.578a4722
index 9d018e7c4..9d018e7c4 100644
--- a/gfx/pics/exeggcute/front.animated.2bpp.lz.578a4722
+++ b/gfx/pokemon/exeggcute/front.animated.2bpp.lz.578a4722
diff --git a/gfx/pics/exeggcute/front.png b/gfx/pokemon/exeggcute/front.png
index a492d0cf5..a492d0cf5 100644
--- a/gfx/pics/exeggcute/front.png
+++ b/gfx/pokemon/exeggcute/front.png
diff --git a/gfx/pics/exeggcute/shiny.pal b/gfx/pokemon/exeggcute/shiny.pal
index 63686e6f0..63686e6f0 100644
--- a/gfx/pics/exeggcute/shiny.pal
+++ b/gfx/pokemon/exeggcute/shiny.pal
diff --git a/gfx/pics/exeggutor/anim0.asm b/gfx/pokemon/exeggutor/anim0.asm
index 92f11a117..92f11a117 100644
--- a/gfx/pics/exeggutor/anim0.asm
+++ b/gfx/pokemon/exeggutor/anim0.asm
diff --git a/gfx/pics/exeggutor/anim1.asm b/gfx/pokemon/exeggutor/anim1.asm
index 3e5542c97..3e5542c97 100644
--- a/gfx/pics/exeggutor/anim1.asm
+++ b/gfx/pokemon/exeggutor/anim1.asm
diff --git a/gfx/pics/exeggutor/back.2bpp.lz.e012643e b/gfx/pokemon/exeggutor/back.2bpp.lz.e012643e
index abf6c97dd..abf6c97dd 100644
--- a/gfx/pics/exeggutor/back.2bpp.lz.e012643e
+++ b/gfx/pokemon/exeggutor/back.2bpp.lz.e012643e
diff --git a/gfx/pics/exeggutor/back.png b/gfx/pokemon/exeggutor/back.png
index 7812499b1..7812499b1 100644
--- a/gfx/pics/exeggutor/back.png
+++ b/gfx/pokemon/exeggutor/back.png
diff --git a/gfx/pics/exeggutor/front.animated.2bpp.lz.3915d572 b/gfx/pokemon/exeggutor/front.animated.2bpp.lz.3915d572
index b4056b175..b4056b175 100644
--- a/gfx/pics/exeggutor/front.animated.2bpp.lz.3915d572
+++ b/gfx/pokemon/exeggutor/front.animated.2bpp.lz.3915d572
diff --git a/gfx/pics/exeggutor/front.png b/gfx/pokemon/exeggutor/front.png
index b9d75b166..b9d75b166 100644
--- a/gfx/pics/exeggutor/front.png
+++ b/gfx/pokemon/exeggutor/front.png
diff --git a/gfx/pics/exeggutor/shiny.pal b/gfx/pokemon/exeggutor/shiny.pal
index c580552e0..c580552e0 100644
--- a/gfx/pics/exeggutor/shiny.pal
+++ b/gfx/pokemon/exeggutor/shiny.pal
diff --git a/gfx/pics/extra_pointers.asm b/gfx/pokemon/extra_pointers.asm
index 7afd95148..7afd95148 100644
--- a/gfx/pics/extra_pointers.asm
+++ b/gfx/pokemon/extra_pointers.asm
diff --git a/gfx/pokemon/extras.asm b/gfx/pokemon/extras.asm
new file mode 100644
index 000000000..88cb6a77b
--- /dev/null
+++ b/gfx/pokemon/extras.asm
@@ -0,0 +1,252 @@
+BulbasaurAnimationExtra:  INCLUDE "gfx/pokemon/bulbasaur/anim1.asm"
+IvysaurAnimationExtra:    INCLUDE "gfx/pokemon/ivysaur/anim1.asm"
+VenusaurAnimationExtra:   INCLUDE "gfx/pokemon/venusaur/anim1.asm"
+CharmanderAnimationExtra: INCLUDE "gfx/pokemon/charmander/anim1.asm"
+CharmeleonAnimationExtra: INCLUDE "gfx/pokemon/charmeleon/anim1.asm"
+CharizardAnimationExtra:  INCLUDE "gfx/pokemon/charizard/anim1.asm"
+SquirtleAnimationExtra:   INCLUDE "gfx/pokemon/squirtle/anim1.asm"
+WartortleAnimationExtra:  INCLUDE "gfx/pokemon/wartortle/anim1.asm"
+BlastoiseAnimationExtra:  INCLUDE "gfx/pokemon/blastoise/anim1.asm"
+CaterpieAnimationExtra:   INCLUDE "gfx/pokemon/caterpie/anim1.asm"
+MetapodAnimationExtra:    INCLUDE "gfx/pokemon/metapod/anim1.asm"
+ButterfreeAnimationExtra: INCLUDE "gfx/pokemon/butterfree/anim1.asm"
+WeedleAnimationExtra:     INCLUDE "gfx/pokemon/weedle/anim1.asm"
+KakunaAnimationExtra:     INCLUDE "gfx/pokemon/kakuna/anim1.asm"
+BeedrillAnimationExtra:   INCLUDE "gfx/pokemon/beedrill/anim1.asm"
+PidgeyAnimationExtra:     INCLUDE "gfx/pokemon/pidgey/anim1.asm"
+PidgeottoAnimationExtra:  INCLUDE "gfx/pokemon/pidgeotto/anim1.asm"
+PidgeotAnimationExtra:    INCLUDE "gfx/pokemon/pidgeot/anim1.asm"
+RattataAnimationExtra:    INCLUDE "gfx/pokemon/rattata/anim1.asm"
+RaticateAnimationExtra:   INCLUDE "gfx/pokemon/raticate/anim1.asm"
+SpearowAnimationExtra:    INCLUDE "gfx/pokemon/spearow/anim1.asm"
+FearowAnimationExtra:     INCLUDE "gfx/pokemon/fearow/anim1.asm"
+EkansAnimationExtra:      INCLUDE "gfx/pokemon/ekans/anim1.asm"
+ArbokAnimationExtra:      INCLUDE "gfx/pokemon/arbok/anim1.asm"
+PikachuAnimationExtra:    INCLUDE "gfx/pokemon/pikachu/anim1.asm"
+RaichuAnimationExtra:     INCLUDE "gfx/pokemon/raichu/anim1.asm"
+SandshrewAnimationExtra:  INCLUDE "gfx/pokemon/sandshrew/anim1.asm"
+SandslashAnimationExtra:  INCLUDE "gfx/pokemon/sandslash/anim1.asm"
+NidoranFAnimationExtra:   INCLUDE "gfx/pokemon/nidoran_f/anim1.asm"
+NidorinaAnimationExtra:   INCLUDE "gfx/pokemon/nidorina/anim1.asm"
+NidoqueenAnimationExtra:  INCLUDE "gfx/pokemon/nidoqueen/anim1.asm"
+NidoranMAnimationExtra:   INCLUDE "gfx/pokemon/nidoran_m/anim1.asm"
+NidorinoAnimationExtra:   INCLUDE "gfx/pokemon/nidorino/anim1.asm"
+NidokingAnimationExtra:   INCLUDE "gfx/pokemon/nidoking/anim1.asm"
+ClefairyAnimationExtra:   INCLUDE "gfx/pokemon/clefairy/anim1.asm"
+ClefableAnimationExtra:   INCLUDE "gfx/pokemon/clefable/anim1.asm"
+VulpixAnimationExtra:     INCLUDE "gfx/pokemon/vulpix/anim1.asm"
+NinetalesAnimationExtra:  INCLUDE "gfx/pokemon/ninetales/anim1.asm"
+JigglypuffAnimationExtra: INCLUDE "gfx/pokemon/jigglypuff/anim1.asm"
+WigglytuffAnimationExtra: INCLUDE "gfx/pokemon/wigglytuff/anim1.asm"
+ZubatAnimationExtra:      INCLUDE "gfx/pokemon/zubat/anim1.asm"
+GolbatAnimationExtra:     INCLUDE "gfx/pokemon/golbat/anim1.asm"
+OddishAnimationExtra:     INCLUDE "gfx/pokemon/oddish/anim1.asm"
+GloomAnimationExtra:      INCLUDE "gfx/pokemon/gloom/anim1.asm"
+VileplumeAnimationExtra:  INCLUDE "gfx/pokemon/vileplume/anim1.asm"
+ParasAnimationExtra:      INCLUDE "gfx/pokemon/paras/anim1.asm"
+ParasectAnimationExtra:   INCLUDE "gfx/pokemon/parasect/anim1.asm"
+VenonatAnimationExtra:    INCLUDE "gfx/pokemon/venonat/anim1.asm"
+VenomothAnimationExtra:   INCLUDE "gfx/pokemon/venomoth/anim1.asm"
+DiglettAnimationExtra:    INCLUDE "gfx/pokemon/diglett/anim1.asm"
+DugtrioAnimationExtra:    INCLUDE "gfx/pokemon/dugtrio/anim1.asm"
+MeowthAnimationExtra:     INCLUDE "gfx/pokemon/meowth/anim1.asm"
+PersianAnimationExtra:    INCLUDE "gfx/pokemon/persian/anim1.asm"
+PsyduckAnimationExtra:    INCLUDE "gfx/pokemon/psyduck/anim1.asm"
+GolduckAnimationExtra:    INCLUDE "gfx/pokemon/golduck/anim1.asm"
+MankeyAnimationExtra:     INCLUDE "gfx/pokemon/mankey/anim1.asm"
+PrimeapeAnimationExtra:   INCLUDE "gfx/pokemon/primeape/anim1.asm"
+GrowlitheAnimationExtra:  INCLUDE "gfx/pokemon/growlithe/anim1.asm"
+ArcanineAnimationExtra:   INCLUDE "gfx/pokemon/arcanine/anim1.asm"
+PoliwagAnimationExtra:    INCLUDE "gfx/pokemon/poliwag/anim1.asm"
+PoliwhirlAnimationExtra:  INCLUDE "gfx/pokemon/poliwhirl/anim1.asm"
+PoliwrathAnimationExtra:  INCLUDE "gfx/pokemon/poliwrath/anim1.asm"
+AbraAnimationExtra:       INCLUDE "gfx/pokemon/abra/anim1.asm"
+KadabraAnimationExtra:    INCLUDE "gfx/pokemon/kadabra/anim1.asm"
+AlakazamAnimationExtra:   INCLUDE "gfx/pokemon/alakazam/anim1.asm"
+MachopAnimationExtra:     INCLUDE "gfx/pokemon/machop/anim1.asm"
+MachokeAnimationExtra:    INCLUDE "gfx/pokemon/machoke/anim1.asm"
+MachampAnimationExtra:    INCLUDE "gfx/pokemon/machamp/anim1.asm"
+BellsproutAnimationExtra: INCLUDE "gfx/pokemon/bellsprout/anim1.asm"
+WeepinbellAnimationExtra: INCLUDE "gfx/pokemon/weepinbell/anim1.asm"
+VictreebelAnimationExtra: INCLUDE "gfx/pokemon/victreebel/anim1.asm"
+TentacoolAnimationExtra:  INCLUDE "gfx/pokemon/tentacool/anim1.asm"
+TentacruelAnimationExtra: INCLUDE "gfx/pokemon/tentacruel/anim1.asm"
+GeodudeAnimationExtra:    INCLUDE "gfx/pokemon/geodude/anim1.asm"
+GravelerAnimationExtra:   INCLUDE "gfx/pokemon/graveler/anim1.asm"
+GolemAnimationExtra:      INCLUDE "gfx/pokemon/golem/anim1.asm"
+PonytaAnimationExtra:     INCLUDE "gfx/pokemon/ponyta/anim1.asm"
+RapidashAnimationExtra:   INCLUDE "gfx/pokemon/rapidash/anim1.asm"
+SlowpokeAnimationExtra:   INCLUDE "gfx/pokemon/slowpoke/anim1.asm"
+SlowbroAnimationExtra:    INCLUDE "gfx/pokemon/slowbro/anim1.asm"
+MagnemiteAnimationExtra:  INCLUDE "gfx/pokemon/magnemite/anim1.asm"
+MagnetonAnimationExtra:   INCLUDE "gfx/pokemon/magneton/anim1.asm"
+FarfetchDAnimationExtra:  INCLUDE "gfx/pokemon/farfetch_d/anim1.asm"
+DoduoAnimationExtra:      INCLUDE "gfx/pokemon/doduo/anim1.asm"
+DodrioAnimationExtra:     INCLUDE "gfx/pokemon/dodrio/anim1.asm"
+SeelAnimationExtra:       INCLUDE "gfx/pokemon/seel/anim1.asm"
+DewgongAnimationExtra:    INCLUDE "gfx/pokemon/dewgong/anim1.asm"
+GrimerAnimationExtra:     INCLUDE "gfx/pokemon/grimer/anim1.asm"
+MukAnimationExtra:        INCLUDE "gfx/pokemon/muk/anim1.asm"
+ShellderAnimationExtra:   INCLUDE "gfx/pokemon/shellder/anim1.asm"
+CloysterAnimationExtra:   INCLUDE "gfx/pokemon/cloyster/anim1.asm"
+GastlyAnimationExtra:     INCLUDE "gfx/pokemon/gastly/anim1.asm"
+HaunterAnimationExtra:    INCLUDE "gfx/pokemon/haunter/anim1.asm"
+GengarAnimationExtra:     INCLUDE "gfx/pokemon/gengar/anim1.asm"
+OnixAnimationExtra:       INCLUDE "gfx/pokemon/onix/anim1.asm"
+DrowzeeAnimationExtra:    INCLUDE "gfx/pokemon/drowzee/anim1.asm"
+HypnoAnimationExtra:      INCLUDE "gfx/pokemon/hypno/anim1.asm"
+KrabbyAnimationExtra:     INCLUDE "gfx/pokemon/krabby/anim1.asm"
+KinglerAnimationExtra:    INCLUDE "gfx/pokemon/kingler/anim1.asm"
+VoltorbAnimationExtra:    INCLUDE "gfx/pokemon/voltorb/anim1.asm"
+ElectrodeAnimationExtra:  INCLUDE "gfx/pokemon/electrode/anim1.asm"
+ExeggcuteAnimationExtra:  INCLUDE "gfx/pokemon/exeggcute/anim1.asm"
+ExeggutorAnimationExtra:  INCLUDE "gfx/pokemon/exeggutor/anim1.asm"
+CuboneAnimationExtra:     INCLUDE "gfx/pokemon/cubone/anim1.asm"
+MarowakAnimationExtra:    INCLUDE "gfx/pokemon/marowak/anim1.asm"
+HitmonleeAnimationExtra:  INCLUDE "gfx/pokemon/hitmonlee/anim1.asm"
+HitmonchanAnimationExtra: INCLUDE "gfx/pokemon/hitmonchan/anim1.asm"
+LickitungAnimationExtra:  INCLUDE "gfx/pokemon/lickitung/anim1.asm"
+KoffingAnimationExtra:    INCLUDE "gfx/pokemon/koffing/anim1.asm"
+WeezingAnimationExtra:    INCLUDE "gfx/pokemon/weezing/anim1.asm"
+RhyhornAnimationExtra:    INCLUDE "gfx/pokemon/rhyhorn/anim1.asm"
+RhydonAnimationExtra:     INCLUDE "gfx/pokemon/rhydon/anim1.asm"
+ChanseyAnimationExtra:    INCLUDE "gfx/pokemon/chansey/anim1.asm"
+TangelaAnimationExtra:    INCLUDE "gfx/pokemon/tangela/anim1.asm"
+KangaskhanAnimationExtra: INCLUDE "gfx/pokemon/kangaskhan/anim1.asm"
+HorseaAnimationExtra:     INCLUDE "gfx/pokemon/horsea/anim1.asm"
+SeadraAnimationExtra:     INCLUDE "gfx/pokemon/seadra/anim1.asm"
+GoldeenAnimationExtra:    INCLUDE "gfx/pokemon/goldeen/anim1.asm"
+SeakingAnimationExtra:    INCLUDE "gfx/pokemon/seaking/anim1.asm"
+StaryuAnimationExtra:     INCLUDE "gfx/pokemon/staryu/anim1.asm"
+StarmieAnimationExtra:    INCLUDE "gfx/pokemon/starmie/anim1.asm"
+MrMimeAnimationExtra:     INCLUDE "gfx/pokemon/mr__mime/anim1.asm"
+ScytherAnimationExtra:    INCLUDE "gfx/pokemon/scyther/anim1.asm"
+JynxAnimationExtra:       INCLUDE "gfx/pokemon/jynx/anim1.asm"
+ElectabuzzAnimationExtra: INCLUDE "gfx/pokemon/electabuzz/anim1.asm"
+MagmarAnimationExtra:     INCLUDE "gfx/pokemon/magmar/anim1.asm"
+PinsirAnimationExtra:     INCLUDE "gfx/pokemon/pinsir/anim1.asm"
+TaurosAnimationExtra:     INCLUDE "gfx/pokemon/tauros/anim1.asm"
+MagikarpAnimationExtra:   INCLUDE "gfx/pokemon/magikarp/anim1.asm"
+GyaradosAnimationExtra:   INCLUDE "gfx/pokemon/gyarados/anim1.asm"
+LaprasAnimationExtra:     INCLUDE "gfx/pokemon/lapras/anim1.asm"
+DittoAnimationExtra:      INCLUDE "gfx/pokemon/ditto/anim1.asm"
+EeveeAnimationExtra:      INCLUDE "gfx/pokemon/eevee/anim1.asm"
+VaporeonAnimationExtra:   INCLUDE "gfx/pokemon/vaporeon/anim1.asm"
+JolteonAnimationExtra:    INCLUDE "gfx/pokemon/jolteon/anim1.asm"
+FlareonAnimationExtra:    INCLUDE "gfx/pokemon/flareon/anim1.asm"
+PorygonAnimationExtra:    INCLUDE "gfx/pokemon/porygon/anim1.asm"
+OmanyteAnimationExtra:    INCLUDE "gfx/pokemon/omanyte/anim1.asm"
+OmastarAnimationExtra:    INCLUDE "gfx/pokemon/omastar/anim1.asm"
+KabutoAnimationExtra:     INCLUDE "gfx/pokemon/kabuto/anim1.asm"
+KabutopsAnimationExtra:   INCLUDE "gfx/pokemon/kabutops/anim1.asm"
+AerodactylAnimationExtra: INCLUDE "gfx/pokemon/aerodactyl/anim1.asm"
+SnorlaxAnimationExtra:    INCLUDE "gfx/pokemon/snorlax/anim1.asm"
+ArticunoAnimationExtra:   INCLUDE "gfx/pokemon/articuno/anim1.asm"
+ZapdosAnimationExtra:     INCLUDE "gfx/pokemon/zapdos/anim1.asm"
+MoltresAnimationExtra:    INCLUDE "gfx/pokemon/moltres/anim1.asm"
+DratiniAnimationExtra:    INCLUDE "gfx/pokemon/dratini/anim1.asm"
+DragonairAnimationExtra:  INCLUDE "gfx/pokemon/dragonair/anim1.asm"
+DragoniteAnimationExtra:  INCLUDE "gfx/pokemon/dragonite/anim1.asm"
+MewtwoAnimationExtra:     INCLUDE "gfx/pokemon/mewtwo/anim1.asm"
+MewAnimationExtra:        INCLUDE "gfx/pokemon/mew/anim1.asm"
+ChikoritaAnimationExtra:  INCLUDE "gfx/pokemon/chikorita/anim1.asm"
+BayleefAnimationExtra:    INCLUDE "gfx/pokemon/bayleef/anim1.asm"
+MeganiumAnimationExtra:   INCLUDE "gfx/pokemon/meganium/anim1.asm"
+CyndaquilAnimationExtra:  INCLUDE "gfx/pokemon/cyndaquil/anim1.asm"
+QuilavaAnimationExtra:    INCLUDE "gfx/pokemon/quilava/anim1.asm"
+TyphlosionAnimationExtra: INCLUDE "gfx/pokemon/typhlosion/anim1.asm"
+TotodileAnimationExtra:   INCLUDE "gfx/pokemon/totodile/anim1.asm"
+CroconawAnimationExtra:   INCLUDE "gfx/pokemon/croconaw/anim1.asm"
+FeraligatrAnimationExtra: INCLUDE "gfx/pokemon/feraligatr/anim1.asm"
+SentretAnimationExtra:    INCLUDE "gfx/pokemon/sentret/anim1.asm"
+FurretAnimationExtra:     INCLUDE "gfx/pokemon/furret/anim1.asm"
+HoothootAnimationExtra:   INCLUDE "gfx/pokemon/hoothoot/anim1.asm"
+NoctowlAnimationExtra:    INCLUDE "gfx/pokemon/noctowl/anim1.asm"
+LedybaAnimationExtra:     INCLUDE "gfx/pokemon/ledyba/anim1.asm"
+LedianAnimationExtra:     INCLUDE "gfx/pokemon/ledian/anim1.asm"
+SpinarakAnimationExtra:   INCLUDE "gfx/pokemon/spinarak/anim1.asm"
+AriadosAnimationExtra:    INCLUDE "gfx/pokemon/ariados/anim1.asm"
+CrobatAnimationExtra:     INCLUDE "gfx/pokemon/crobat/anim1.asm"
+ChinchouAnimationExtra:   INCLUDE "gfx/pokemon/chinchou/anim1.asm"
+LanturnAnimationExtra:    INCLUDE "gfx/pokemon/lanturn/anim1.asm"
+PichuAnimationExtra:      INCLUDE "gfx/pokemon/pichu/anim1.asm"
+CleffaAnimationExtra:     INCLUDE "gfx/pokemon/cleffa/anim1.asm"
+IgglybuffAnimationExtra:  INCLUDE "gfx/pokemon/igglybuff/anim1.asm"
+TogepiAnimationExtra:     INCLUDE "gfx/pokemon/togepi/anim1.asm"
+TogeticAnimationExtra:    INCLUDE "gfx/pokemon/togetic/anim1.asm"
+NatuAnimationExtra:       INCLUDE "gfx/pokemon/natu/anim1.asm"
+XatuAnimationExtra:       INCLUDE "gfx/pokemon/xatu/anim1.asm"
+MareepAnimationExtra:     INCLUDE "gfx/pokemon/mareep/anim1.asm"
+FlaaffyAnimationExtra:    INCLUDE "gfx/pokemon/flaaffy/anim1.asm"
+AmpharosAnimationExtra:   INCLUDE "gfx/pokemon/ampharos/anim1.asm"
+BellossomAnimationExtra:  INCLUDE "gfx/pokemon/bellossom/anim1.asm"
+MarillAnimationExtra:     INCLUDE "gfx/pokemon/marill/anim1.asm"
+AzumarillAnimationExtra:  INCLUDE "gfx/pokemon/azumarill/anim1.asm"
+SudowoodoAnimationExtra:  INCLUDE "gfx/pokemon/sudowoodo/anim1.asm"
+PolitoedAnimationExtra:   INCLUDE "gfx/pokemon/politoed/anim1.asm"
+HoppipAnimationExtra:     INCLUDE "gfx/pokemon/hoppip/anim1.asm"
+SkiploomAnimationExtra:   INCLUDE "gfx/pokemon/skiploom/anim1.asm"
+JumpluffAnimationExtra:   INCLUDE "gfx/pokemon/jumpluff/anim1.asm"
+AipomAnimationExtra:      INCLUDE "gfx/pokemon/aipom/anim1.asm"
+SunkernAnimationExtra:    INCLUDE "gfx/pokemon/sunkern/anim1.asm"
+SunfloraAnimationExtra:   INCLUDE "gfx/pokemon/sunflora/anim1.asm"
+YanmaAnimationExtra:      INCLUDE "gfx/pokemon/yanma/anim1.asm"
+WooperAnimationExtra:     INCLUDE "gfx/pokemon/wooper/anim1.asm"
+QuagsireAnimationExtra:   INCLUDE "gfx/pokemon/quagsire/anim1.asm"
+EspeonAnimationExtra:     INCLUDE "gfx/pokemon/espeon/anim1.asm"
+UmbreonAnimationExtra:    INCLUDE "gfx/pokemon/umbreon/anim1.asm"
+MurkrowAnimationExtra:    INCLUDE "gfx/pokemon/murkrow/anim1.asm"
+SlowkingAnimationExtra:   INCLUDE "gfx/pokemon/slowking/anim1.asm"
+MisdreavusAnimationExtra: INCLUDE "gfx/pokemon/misdreavus/anim1.asm"
+UnownAnimationExtra:      INCLUDE "gfx/pokemon/unown/anim1.asm"
+WobbuffetAnimationExtra:  INCLUDE "gfx/pokemon/wobbuffet/anim1.asm"
+GirafarigAnimationExtra:  INCLUDE "gfx/pokemon/girafarig/anim1.asm"
+PinecoAnimationExtra:     INCLUDE "gfx/pokemon/pineco/anim1.asm"
+ForretressAnimationExtra: INCLUDE "gfx/pokemon/forretress/anim1.asm"
+DunsparceAnimationExtra:  INCLUDE "gfx/pokemon/dunsparce/anim1.asm"
+GligarAnimationExtra:     INCLUDE "gfx/pokemon/gligar/anim1.asm"
+SteelixAnimationExtra:    INCLUDE "gfx/pokemon/steelix/anim1.asm"
+SnubbullAnimationExtra:   INCLUDE "gfx/pokemon/snubbull/anim1.asm"
+GranbullAnimationExtra:   INCLUDE "gfx/pokemon/granbull/anim1.asm"
+QwilfishAnimationExtra:   INCLUDE "gfx/pokemon/qwilfish/anim1.asm"
+ScizorAnimationExtra:     INCLUDE "gfx/pokemon/scizor/anim1.asm"
+ShuckleAnimationExtra:    INCLUDE "gfx/pokemon/shuckle/anim1.asm"
+HeracrossAnimationExtra:  INCLUDE "gfx/pokemon/heracross/anim1.asm"
+SneaselAnimationExtra:    INCLUDE "gfx/pokemon/sneasel/anim1.asm"
+TeddiursaAnimationExtra:  INCLUDE "gfx/pokemon/teddiursa/anim1.asm"
+UrsaringAnimationExtra:   INCLUDE "gfx/pokemon/ursaring/anim1.asm"
+SlugmaAnimationExtra:     INCLUDE "gfx/pokemon/slugma/anim1.asm"
+MagcargoAnimationExtra:   INCLUDE "gfx/pokemon/magcargo/anim1.asm"
+SwinubAnimationExtra:     INCLUDE "gfx/pokemon/swinub/anim1.asm"
+PiloswineAnimationExtra:  INCLUDE "gfx/pokemon/piloswine/anim1.asm"
+CorsolaAnimationExtra:    INCLUDE "gfx/pokemon/corsola/anim1.asm"
+RemoraidAnimationExtra:   INCLUDE "gfx/pokemon/remoraid/anim1.asm"
+OctilleryAnimationExtra:  INCLUDE "gfx/pokemon/octillery/anim1.asm"
+DelibirdAnimationExtra:   INCLUDE "gfx/pokemon/delibird/anim1.asm"
+MantineAnimationExtra:    INCLUDE "gfx/pokemon/mantine/anim1.asm"
+SkarmoryAnimationExtra:   INCLUDE "gfx/pokemon/skarmory/anim1.asm"
+HoundourAnimationExtra:   INCLUDE "gfx/pokemon/houndour/anim1.asm"
+HoundoomAnimationExtra:   INCLUDE "gfx/pokemon/houndoom/anim1.asm"
+KingdraAnimationExtra:    INCLUDE "gfx/pokemon/kingdra/anim1.asm"
+PhanpyAnimationExtra:     INCLUDE "gfx/pokemon/phanpy/anim1.asm"
+DonphanAnimationExtra:    INCLUDE "gfx/pokemon/donphan/anim1.asm"
+Porygon2AnimationExtra:   INCLUDE "gfx/pokemon/porygon2/anim1.asm"
+StantlerAnimationExtra:   INCLUDE "gfx/pokemon/stantler/anim1.asm"
+SmeargleAnimationExtra:   INCLUDE "gfx/pokemon/smeargle/anim1.asm"
+TyrogueAnimationExtra:    INCLUDE "gfx/pokemon/tyrogue/anim1.asm"
+HitmontopAnimationExtra:  INCLUDE "gfx/pokemon/hitmontop/anim1.asm"
+SmoochumAnimationExtra:   INCLUDE "gfx/pokemon/smoochum/anim1.asm"
+ElekidAnimationExtra:     INCLUDE "gfx/pokemon/elekid/anim1.asm"
+MagbyAnimationExtra:      INCLUDE "gfx/pokemon/magby/anim1.asm"
+MiltankAnimationExtra:    INCLUDE "gfx/pokemon/miltank/anim1.asm"
+BlisseyAnimationExtra:    INCLUDE "gfx/pokemon/blissey/anim1.asm"
+RaikouAnimationExtra:     INCLUDE "gfx/pokemon/raikou/anim1.asm"
+EnteiAnimationExtra:      INCLUDE "gfx/pokemon/entei/anim1.asm"
+SuicuneAnimationExtra:    INCLUDE "gfx/pokemon/suicune/anim1.asm"
+LarvitarAnimationExtra:   INCLUDE "gfx/pokemon/larvitar/anim1.asm"
+PupitarAnimationExtra:    INCLUDE "gfx/pokemon/pupitar/anim1.asm"
+TyranitarAnimationExtra:  INCLUDE "gfx/pokemon/tyranitar/anim1.asm"
+LugiaAnimationExtra:      INCLUDE "gfx/pokemon/lugia/anim1.asm"
+HoOhAnimationExtra:       INCLUDE "gfx/pokemon/ho_oh/anim1.asm"
+CelebiAnimationExtra:     INCLUDE "gfx/pokemon/celebi/anim1.asm"
+EggAnimationExtra:        INCLUDE "gfx/pokemon/egg/anim1.asm"
diff --git a/gfx/pics/farfetch_d/anim0.asm b/gfx/pokemon/farfetch_d/anim0.asm
index 4dac6c1a4..4dac6c1a4 100644
--- a/gfx/pics/farfetch_d/anim0.asm
+++ b/gfx/pokemon/farfetch_d/anim0.asm
diff --git a/gfx/pics/farfetch_d/anim1.asm b/gfx/pokemon/farfetch_d/anim1.asm
index 5dcfaa89d..5dcfaa89d 100644
--- a/gfx/pics/farfetch_d/anim1.asm
+++ b/gfx/pokemon/farfetch_d/anim1.asm
diff --git a/gfx/pics/farfetch_d/back.2bpp.lz.6f28ebc4 b/gfx/pokemon/farfetch_d/back.2bpp.lz.6f28ebc4
index 77dd25ae9..77dd25ae9 100644
--- a/gfx/pics/farfetch_d/back.2bpp.lz.6f28ebc4
+++ b/gfx/pokemon/farfetch_d/back.2bpp.lz.6f28ebc4
diff --git a/gfx/pics/farfetch_d/back.png b/gfx/pokemon/farfetch_d/back.png
index b7f1ce41f..b7f1ce41f 100644
--- a/gfx/pics/farfetch_d/back.png
+++ b/gfx/pokemon/farfetch_d/back.png
diff --git a/gfx/pics/farfetch_d/front.animated.2bpp.lz.a4ae9393 b/gfx/pokemon/farfetch_d/front.animated.2bpp.lz.a4ae9393
index d9eeb7489..d9eeb7489 100644
--- a/gfx/pics/farfetch_d/front.animated.2bpp.lz.a4ae9393
+++ b/gfx/pokemon/farfetch_d/front.animated.2bpp.lz.a4ae9393
diff --git a/gfx/pics/farfetch_d/front.png b/gfx/pokemon/farfetch_d/front.png
index 1ad86679f..1ad86679f 100644
--- a/gfx/pics/farfetch_d/front.png
+++ b/gfx/pokemon/farfetch_d/front.png
diff --git a/gfx/pics/farfetch_d/shiny.pal b/gfx/pokemon/farfetch_d/shiny.pal
index 2bae03e7f..2bae03e7f 100644
--- a/gfx/pics/farfetch_d/shiny.pal
+++ b/gfx/pokemon/farfetch_d/shiny.pal
diff --git a/gfx/pics/fearow/anim0.asm b/gfx/pokemon/fearow/anim0.asm
index 3a689af18..3a689af18 100644
--- a/gfx/pics/fearow/anim0.asm
+++ b/gfx/pokemon/fearow/anim0.asm
diff --git a/gfx/pics/fearow/anim1.asm b/gfx/pokemon/fearow/anim1.asm
index 0233782c9..0233782c9 100644
--- a/gfx/pics/fearow/anim1.asm
+++ b/gfx/pokemon/fearow/anim1.asm
diff --git a/gfx/pics/fearow/back.2bpp.lz.a7a39118 b/gfx/pokemon/fearow/back.2bpp.lz.a7a39118
index 641086eaa..641086eaa 100644
--- a/gfx/pics/fearow/back.2bpp.lz.a7a39118
+++ b/gfx/pokemon/fearow/back.2bpp.lz.a7a39118
diff --git a/gfx/pics/fearow/back.png b/gfx/pokemon/fearow/back.png
index f6fc2a63a..f6fc2a63a 100644
--- a/gfx/pics/fearow/back.png
+++ b/gfx/pokemon/fearow/back.png
diff --git a/gfx/pics/fearow/front.animated.2bpp.lz.393b11d6 b/gfx/pokemon/fearow/front.animated.2bpp.lz.393b11d6
index 4fbf2d47f..4fbf2d47f 100644
--- a/gfx/pics/fearow/front.animated.2bpp.lz.393b11d6
+++ b/gfx/pokemon/fearow/front.animated.2bpp.lz.393b11d6
diff --git a/gfx/pics/fearow/front.png b/gfx/pokemon/fearow/front.png
index f003ce0f7..f003ce0f7 100644
--- a/gfx/pics/fearow/front.png
+++ b/gfx/pokemon/fearow/front.png
diff --git a/gfx/pics/fearow/shiny.pal b/gfx/pokemon/fearow/shiny.pal
index abc40692b..abc40692b 100644
--- a/gfx/pics/fearow/shiny.pal
+++ b/gfx/pokemon/fearow/shiny.pal
diff --git a/gfx/pics/feraligatr/anim0.asm b/gfx/pokemon/feraligatr/anim0.asm
index 1a0cebd2e..1a0cebd2e 100644
--- a/gfx/pics/feraligatr/anim0.asm
+++ b/gfx/pokemon/feraligatr/anim0.asm
diff --git a/gfx/pics/feraligatr/anim1.asm b/gfx/pokemon/feraligatr/anim1.asm
index c1c39258d..c1c39258d 100644
--- a/gfx/pics/feraligatr/anim1.asm
+++ b/gfx/pokemon/feraligatr/anim1.asm
diff --git a/gfx/pics/feraligatr/back.2bpp.lz.f95abe99 b/gfx/pokemon/feraligatr/back.2bpp.lz.f95abe99
index 4e180d0f5..4e180d0f5 100644
--- a/gfx/pics/feraligatr/back.2bpp.lz.f95abe99
+++ b/gfx/pokemon/feraligatr/back.2bpp.lz.f95abe99
diff --git a/gfx/pics/feraligatr/back.png b/gfx/pokemon/feraligatr/back.png
index 8f1e63203..8f1e63203 100644
--- a/gfx/pics/feraligatr/back.png
+++ b/gfx/pokemon/feraligatr/back.png
diff --git a/gfx/pics/feraligatr/front.animated.2bpp.lz.fade72cc b/gfx/pokemon/feraligatr/front.animated.2bpp.lz.fade72cc
index cc055e629..cc055e629 100644
--- a/gfx/pics/feraligatr/front.animated.2bpp.lz.fade72cc
+++ b/gfx/pokemon/feraligatr/front.animated.2bpp.lz.fade72cc
diff --git a/gfx/pics/feraligatr/front.png b/gfx/pokemon/feraligatr/front.png
index c3057a8cb..c3057a8cb 100644
--- a/gfx/pics/feraligatr/front.png
+++ b/gfx/pokemon/feraligatr/front.png
diff --git a/gfx/pics/feraligatr/shiny.pal b/gfx/pokemon/feraligatr/shiny.pal
index afe21b2b2..afe21b2b2 100644
--- a/gfx/pics/feraligatr/shiny.pal
+++ b/gfx/pokemon/feraligatr/shiny.pal
diff --git a/gfx/pics/flaaffy/anim0.asm b/gfx/pokemon/flaaffy/anim0.asm
index c9f1f4e7e..c9f1f4e7e 100644
--- a/gfx/pics/flaaffy/anim0.asm
+++ b/gfx/pokemon/flaaffy/anim0.asm
diff --git a/gfx/pics/flaaffy/anim1.asm b/gfx/pokemon/flaaffy/anim1.asm
index b9ec0d483..b9ec0d483 100644
--- a/gfx/pics/flaaffy/anim1.asm
+++ b/gfx/pokemon/flaaffy/anim1.asm
diff --git a/gfx/pics/flaaffy/back.2bpp.lz.461855e4 b/gfx/pokemon/flaaffy/back.2bpp.lz.461855e4
index 5eec3df7a..5eec3df7a 100644
--- a/gfx/pics/flaaffy/back.2bpp.lz.461855e4
+++ b/gfx/pokemon/flaaffy/back.2bpp.lz.461855e4
diff --git a/gfx/pics/flaaffy/back.png b/gfx/pokemon/flaaffy/back.png
index 36259453c..36259453c 100644
--- a/gfx/pics/flaaffy/back.png
+++ b/gfx/pokemon/flaaffy/back.png
diff --git a/gfx/pics/flaaffy/front.animated.2bpp.lz.6a27aac3 b/gfx/pokemon/flaaffy/front.animated.2bpp.lz.6a27aac3
index 673155a7e..673155a7e 100644
--- a/gfx/pics/flaaffy/front.animated.2bpp.lz.6a27aac3
+++ b/gfx/pokemon/flaaffy/front.animated.2bpp.lz.6a27aac3
diff --git a/gfx/pics/flaaffy/front.png b/gfx/pokemon/flaaffy/front.png
index f42a3b749..f42a3b749 100644
--- a/gfx/pics/flaaffy/front.png
+++ b/gfx/pokemon/flaaffy/front.png
diff --git a/gfx/pics/flaaffy/shiny.pal b/gfx/pokemon/flaaffy/shiny.pal
index 50c88df2e..50c88df2e 100644
--- a/gfx/pics/flaaffy/shiny.pal
+++ b/gfx/pokemon/flaaffy/shiny.pal
diff --git a/gfx/pics/flareon/anim0.asm b/gfx/pokemon/flareon/anim0.asm
index dbefae362..dbefae362 100644
--- a/gfx/pics/flareon/anim0.asm
+++ b/gfx/pokemon/flareon/anim0.asm
diff --git a/gfx/pics/flareon/anim1.asm b/gfx/pokemon/flareon/anim1.asm
index 431573106..431573106 100644
--- a/gfx/pics/flareon/anim1.asm
+++ b/gfx/pokemon/flareon/anim1.asm
diff --git a/gfx/pics/flareon/back.2bpp.lz.d58af0e5 b/gfx/pokemon/flareon/back.2bpp.lz.d58af0e5
index bafc64cd2..bafc64cd2 100644
--- a/gfx/pics/flareon/back.2bpp.lz.d58af0e5
+++ b/gfx/pokemon/flareon/back.2bpp.lz.d58af0e5
diff --git a/gfx/pics/flareon/back.png b/gfx/pokemon/flareon/back.png
index 4b68451c1..4b68451c1 100644
--- a/gfx/pics/flareon/back.png
+++ b/gfx/pokemon/flareon/back.png
diff --git a/gfx/pics/flareon/front.animated.2bpp.lz.7b68c716 b/gfx/pokemon/flareon/front.animated.2bpp.lz.7b68c716
index d3210b7e3..d3210b7e3 100644
--- a/gfx/pics/flareon/front.animated.2bpp.lz.7b68c716
+++ b/gfx/pokemon/flareon/front.animated.2bpp.lz.7b68c716
diff --git a/gfx/pics/flareon/front.png b/gfx/pokemon/flareon/front.png
index 13a9af29a..13a9af29a 100644
--- a/gfx/pics/flareon/front.png
+++ b/gfx/pokemon/flareon/front.png
diff --git a/gfx/pics/flareon/shiny.pal b/gfx/pokemon/flareon/shiny.pal
index 7e840a3cd..7e840a3cd 100644
--- a/gfx/pics/flareon/shiny.pal
+++ b/gfx/pokemon/flareon/shiny.pal
diff --git a/gfx/pics/forretress/anim0.asm b/gfx/pokemon/forretress/anim0.asm
index 74c8e2e12..74c8e2e12 100644
--- a/gfx/pics/forretress/anim0.asm
+++ b/gfx/pokemon/forretress/anim0.asm
diff --git a/gfx/pics/forretress/anim1.asm b/gfx/pokemon/forretress/anim1.asm
index 4fafa1a3e..4fafa1a3e 100644
--- a/gfx/pics/forretress/anim1.asm
+++ b/gfx/pokemon/forretress/anim1.asm
diff --git a/gfx/pics/forretress/back.2bpp.lz.2b8e5f48 b/gfx/pokemon/forretress/back.2bpp.lz.2b8e5f48
index 1c4b5d69a..1c4b5d69a 100644
--- a/gfx/pics/forretress/back.2bpp.lz.2b8e5f48
+++ b/gfx/pokemon/forretress/back.2bpp.lz.2b8e5f48
diff --git a/gfx/pics/forretress/back.png b/gfx/pokemon/forretress/back.png
index a64fb1480..a64fb1480 100644
--- a/gfx/pics/forretress/back.png
+++ b/gfx/pokemon/forretress/back.png
diff --git a/gfx/pics/forretress/front.animated.2bpp.lz.761b9f80 b/gfx/pokemon/forretress/front.animated.2bpp.lz.761b9f80
index 239e20532..239e20532 100644
--- a/gfx/pics/forretress/front.animated.2bpp.lz.761b9f80
+++ b/gfx/pokemon/forretress/front.animated.2bpp.lz.761b9f80
diff --git a/gfx/pics/forretress/front.png b/gfx/pokemon/forretress/front.png
index 065237310..065237310 100644
--- a/gfx/pics/forretress/front.png
+++ b/gfx/pokemon/forretress/front.png
diff --git a/gfx/pics/forretress/shiny.pal b/gfx/pokemon/forretress/shiny.pal
index 84aa229d2..84aa229d2 100644
--- a/gfx/pics/forretress/shiny.pal
+++ b/gfx/pokemon/forretress/shiny.pal
diff --git a/gfx/pics/frame_pointers.asm b/gfx/pokemon/frame_pointers.asm
index cff10ef33..cff10ef33 100644
--- a/gfx/pics/frame_pointers.asm
+++ b/gfx/pokemon/frame_pointers.asm
diff --git a/gfx/pics/furret/anim0.asm b/gfx/pokemon/furret/anim0.asm
index 8503d74ec..8503d74ec 100644
--- a/gfx/pics/furret/anim0.asm
+++ b/gfx/pokemon/furret/anim0.asm
diff --git a/gfx/pics/furret/anim1.asm b/gfx/pokemon/furret/anim1.asm
index e175bf7cc..e175bf7cc 100644
--- a/gfx/pics/furret/anim1.asm
+++ b/gfx/pokemon/furret/anim1.asm
diff --git a/gfx/pics/furret/back.2bpp.lz.24792550 b/gfx/pokemon/furret/back.2bpp.lz.24792550
index 0cbe66f49..0cbe66f49 100644
--- a/gfx/pics/furret/back.2bpp.lz.24792550
+++ b/gfx/pokemon/furret/back.2bpp.lz.24792550
diff --git a/gfx/pics/furret/back.png b/gfx/pokemon/furret/back.png
index 906e6e7f1..906e6e7f1 100644
--- a/gfx/pics/furret/back.png
+++ b/gfx/pokemon/furret/back.png
diff --git a/gfx/pics/furret/front.animated.2bpp.lz.f72a2758 b/gfx/pokemon/furret/front.animated.2bpp.lz.f72a2758
index afba64f59..afba64f59 100644
--- a/gfx/pics/furret/front.animated.2bpp.lz.f72a2758
+++ b/gfx/pokemon/furret/front.animated.2bpp.lz.f72a2758
diff --git a/gfx/pics/furret/front.png b/gfx/pokemon/furret/front.png
index 3ae88bf70..3ae88bf70 100644
--- a/gfx/pics/furret/front.png
+++ b/gfx/pokemon/furret/front.png
diff --git a/gfx/pics/furret/shiny.pal b/gfx/pokemon/furret/shiny.pal
index fe5870bd6..fe5870bd6 100644
--- a/gfx/pics/furret/shiny.pal
+++ b/gfx/pokemon/furret/shiny.pal
diff --git a/gfx/pics/gastly/anim0.asm b/gfx/pokemon/gastly/anim0.asm
index d9414d188..d9414d188 100644
--- a/gfx/pics/gastly/anim0.asm
+++ b/gfx/pokemon/gastly/anim0.asm
diff --git a/gfx/pics/gastly/anim1.asm b/gfx/pokemon/gastly/anim1.asm
index 65dc17abf..65dc17abf 100644
--- a/gfx/pics/gastly/anim1.asm
+++ b/gfx/pokemon/gastly/anim1.asm
diff --git a/gfx/pics/gastly/back.2bpp.lz.4078fa56 b/gfx/pokemon/gastly/back.2bpp.lz.4078fa56
index ecb4af90d..ecb4af90d 100644
--- a/gfx/pics/gastly/back.2bpp.lz.4078fa56
+++ b/gfx/pokemon/gastly/back.2bpp.lz.4078fa56
diff --git a/gfx/pics/gastly/back.png b/gfx/pokemon/gastly/back.png
index 78f96fe93..78f96fe93 100644
--- a/gfx/pics/gastly/back.png
+++ b/gfx/pokemon/gastly/back.png
diff --git a/gfx/pics/gastly/front.animated.2bpp.lz.84148c1e b/gfx/pokemon/gastly/front.animated.2bpp.lz.84148c1e
index f3d99339b..f3d99339b 100644
--- a/gfx/pics/gastly/front.animated.2bpp.lz.84148c1e
+++ b/gfx/pokemon/gastly/front.animated.2bpp.lz.84148c1e
diff --git a/gfx/pics/gastly/front.png b/gfx/pokemon/gastly/front.png
index 5a28030d4..5a28030d4 100644
--- a/gfx/pics/gastly/front.png
+++ b/gfx/pokemon/gastly/front.png
diff --git a/gfx/pics/gastly/shiny.pal b/gfx/pokemon/gastly/shiny.pal
index 50e42ab4a..50e42ab4a 100644
--- a/gfx/pics/gastly/shiny.pal
+++ b/gfx/pokemon/gastly/shiny.pal
diff --git a/gfx/pics/gengar/anim0.asm b/gfx/pokemon/gengar/anim0.asm
index 842c47c76..842c47c76 100644
--- a/gfx/pics/gengar/anim0.asm
+++ b/gfx/pokemon/gengar/anim0.asm
diff --git a/gfx/pics/gengar/anim1.asm b/gfx/pokemon/gengar/anim1.asm
index 09df5dca3..09df5dca3 100644
--- a/gfx/pics/gengar/anim1.asm
+++ b/gfx/pokemon/gengar/anim1.asm
diff --git a/gfx/pics/gengar/back.2bpp.lz.5237ee63 b/gfx/pokemon/gengar/back.2bpp.lz.5237ee63
index d1ecca65e..d1ecca65e 100644
--- a/gfx/pics/gengar/back.2bpp.lz.5237ee63
+++ b/gfx/pokemon/gengar/back.2bpp.lz.5237ee63
diff --git a/gfx/pics/gengar/back.png b/gfx/pokemon/gengar/back.png
index 1cb67715d..1cb67715d 100644
--- a/gfx/pics/gengar/back.png
+++ b/gfx/pokemon/gengar/back.png
diff --git a/gfx/pics/gengar/front.animated.2bpp.lz.65ddc6f5 b/gfx/pokemon/gengar/front.animated.2bpp.lz.65ddc6f5
index a11754646..a11754646 100644
--- a/gfx/pics/gengar/front.animated.2bpp.lz.65ddc6f5
+++ b/gfx/pokemon/gengar/front.animated.2bpp.lz.65ddc6f5
diff --git a/gfx/pics/gengar/front.png b/gfx/pokemon/gengar/front.png
index 5fa68e3a0..5fa68e3a0 100644
--- a/gfx/pics/gengar/front.png
+++ b/gfx/pokemon/gengar/front.png
diff --git a/gfx/pics/gengar/shiny.pal b/gfx/pokemon/gengar/shiny.pal
index ccf6bf685..ccf6bf685 100644
--- a/gfx/pics/gengar/shiny.pal
+++ b/gfx/pokemon/gengar/shiny.pal
diff --git a/gfx/pics/geodude/anim0.asm b/gfx/pokemon/geodude/anim0.asm
index 3c54bc94e..3c54bc94e 100644
--- a/gfx/pics/geodude/anim0.asm
+++ b/gfx/pokemon/geodude/anim0.asm
diff --git a/gfx/pics/geodude/anim1.asm b/gfx/pokemon/geodude/anim1.asm
index 4ec72d9b1..4ec72d9b1 100644
--- a/gfx/pics/geodude/anim1.asm
+++ b/gfx/pokemon/geodude/anim1.asm
diff --git a/gfx/pics/geodude/back.2bpp.lz.d5aa5e9f b/gfx/pokemon/geodude/back.2bpp.lz.d5aa5e9f
index 443fd327d..443fd327d 100644
--- a/gfx/pics/geodude/back.2bpp.lz.d5aa5e9f
+++ b/gfx/pokemon/geodude/back.2bpp.lz.d5aa5e9f
diff --git a/gfx/pics/geodude/back.png b/gfx/pokemon/geodude/back.png
index 0b3acd0c1..0b3acd0c1 100644
--- a/gfx/pics/geodude/back.png
+++ b/gfx/pokemon/geodude/back.png
diff --git a/gfx/pics/geodude/front.animated.2bpp.lz.d743f2c9 b/gfx/pokemon/geodude/front.animated.2bpp.lz.d743f2c9
index 96bd9f794..96bd9f794 100644
--- a/gfx/pics/geodude/front.animated.2bpp.lz.d743f2c9
+++ b/gfx/pokemon/geodude/front.animated.2bpp.lz.d743f2c9
diff --git a/gfx/pics/geodude/front.png b/gfx/pokemon/geodude/front.png
index 22fb6c4a7..22fb6c4a7 100644
--- a/gfx/pics/geodude/front.png
+++ b/gfx/pokemon/geodude/front.png
diff --git a/gfx/pics/geodude/shiny.pal b/gfx/pokemon/geodude/shiny.pal
index 305e1a362..305e1a362 100644
--- a/gfx/pics/geodude/shiny.pal
+++ b/gfx/pokemon/geodude/shiny.pal
diff --git a/gfx/pics/girafarig/anim0.asm b/gfx/pokemon/girafarig/anim0.asm
index 3a7ebd9fe..3a7ebd9fe 100644
--- a/gfx/pics/girafarig/anim0.asm
+++ b/gfx/pokemon/girafarig/anim0.asm
diff --git a/gfx/pics/girafarig/anim1.asm b/gfx/pokemon/girafarig/anim1.asm
index 95b1131ca..95b1131ca 100644
--- a/gfx/pics/girafarig/anim1.asm
+++ b/gfx/pokemon/girafarig/anim1.asm
diff --git a/gfx/pics/girafarig/back.2bpp.lz.5dd68457 b/gfx/pokemon/girafarig/back.2bpp.lz.5dd68457
index aca23f976..aca23f976 100644
--- a/gfx/pics/girafarig/back.2bpp.lz.5dd68457
+++ b/gfx/pokemon/girafarig/back.2bpp.lz.5dd68457
diff --git a/gfx/pics/girafarig/back.png b/gfx/pokemon/girafarig/back.png
index 6ca3e0dea..6ca3e0dea 100644
--- a/gfx/pics/girafarig/back.png
+++ b/gfx/pokemon/girafarig/back.png
diff --git a/gfx/pics/girafarig/front.animated.2bpp.lz.76d809c4 b/gfx/pokemon/girafarig/front.animated.2bpp.lz.76d809c4
index 48c9fc94a..48c9fc94a 100644
--- a/gfx/pics/girafarig/front.animated.2bpp.lz.76d809c4
+++ b/gfx/pokemon/girafarig/front.animated.2bpp.lz.76d809c4
diff --git a/gfx/pics/girafarig/front.png b/gfx/pokemon/girafarig/front.png
index 18071ac82..18071ac82 100644
--- a/gfx/pics/girafarig/front.png
+++ b/gfx/pokemon/girafarig/front.png
diff --git a/gfx/pics/girafarig/shiny.pal b/gfx/pokemon/girafarig/shiny.pal
index 51b7f3847..51b7f3847 100644
--- a/gfx/pics/girafarig/shiny.pal
+++ b/gfx/pokemon/girafarig/shiny.pal
diff --git a/gfx/pics/gligar/anim0.asm b/gfx/pokemon/gligar/anim0.asm
index 1dabf6cbd..1dabf6cbd 100644
--- a/gfx/pics/gligar/anim0.asm
+++ b/gfx/pokemon/gligar/anim0.asm
diff --git a/gfx/pics/gligar/anim1.asm b/gfx/pokemon/gligar/anim1.asm
index 0cc7c0916..0cc7c0916 100644
--- a/gfx/pics/gligar/anim1.asm
+++ b/gfx/pokemon/gligar/anim1.asm
diff --git a/gfx/pics/gligar/back.2bpp.lz.ee922122 b/gfx/pokemon/gligar/back.2bpp.lz.ee922122
index 45b7d9b76..45b7d9b76 100644
--- a/gfx/pics/gligar/back.2bpp.lz.ee922122
+++ b/gfx/pokemon/gligar/back.2bpp.lz.ee922122
diff --git a/gfx/pics/gligar/back.png b/gfx/pokemon/gligar/back.png
index 64bcc503f..64bcc503f 100644
--- a/gfx/pics/gligar/back.png
+++ b/gfx/pokemon/gligar/back.png
diff --git a/gfx/pics/gligar/front.animated.2bpp.lz.4dcc41b3 b/gfx/pokemon/gligar/front.animated.2bpp.lz.4dcc41b3
index 4ef9e5398..4ef9e5398 100644
--- a/gfx/pics/gligar/front.animated.2bpp.lz.4dcc41b3
+++ b/gfx/pokemon/gligar/front.animated.2bpp.lz.4dcc41b3
diff --git a/gfx/pics/gligar/front.png b/gfx/pokemon/gligar/front.png
index 729bc9d7f..729bc9d7f 100644
--- a/gfx/pics/gligar/front.png
+++ b/gfx/pokemon/gligar/front.png
diff --git a/gfx/pics/gligar/shiny.pal b/gfx/pokemon/gligar/shiny.pal
index b33b2c373..b33b2c373 100644
--- a/gfx/pics/gligar/shiny.pal
+++ b/gfx/pokemon/gligar/shiny.pal
diff --git a/gfx/pics/gloom/anim0.asm b/gfx/pokemon/gloom/anim0.asm
index 89c6805b9..89c6805b9 100644
--- a/gfx/pics/gloom/anim0.asm
+++ b/gfx/pokemon/gloom/anim0.asm
diff --git a/gfx/pics/gloom/anim1.asm b/gfx/pokemon/gloom/anim1.asm
index cdb6c5191..cdb6c5191 100644
--- a/gfx/pics/gloom/anim1.asm
+++ b/gfx/pokemon/gloom/anim1.asm
diff --git a/gfx/pics/gloom/back.2bpp.lz.9a321f63 b/gfx/pokemon/gloom/back.2bpp.lz.9a321f63
index 7d35e2d82..7d35e2d82 100644
--- a/gfx/pics/gloom/back.2bpp.lz.9a321f63
+++ b/gfx/pokemon/gloom/back.2bpp.lz.9a321f63
diff --git a/gfx/pics/gloom/back.png b/gfx/pokemon/gloom/back.png
index 9308b29ae..9308b29ae 100644
--- a/gfx/pics/gloom/back.png
+++ b/gfx/pokemon/gloom/back.png
diff --git a/gfx/pics/gloom/front.animated.2bpp.lz.c6ef04a5 b/gfx/pokemon/gloom/front.animated.2bpp.lz.c6ef04a5
index a69e4b76c..a69e4b76c 100644
--- a/gfx/pics/gloom/front.animated.2bpp.lz.c6ef04a5
+++ b/gfx/pokemon/gloom/front.animated.2bpp.lz.c6ef04a5
diff --git a/gfx/pics/gloom/front.png b/gfx/pokemon/gloom/front.png
index 34625df13..34625df13 100644
--- a/gfx/pics/gloom/front.png
+++ b/gfx/pokemon/gloom/front.png
diff --git a/gfx/pics/gloom/shiny.pal b/gfx/pokemon/gloom/shiny.pal
index 998bfce6e..998bfce6e 100644
--- a/gfx/pics/gloom/shiny.pal
+++ b/gfx/pokemon/gloom/shiny.pal
diff --git a/gfx/pics/golbat/anim0.asm b/gfx/pokemon/golbat/anim0.asm
index cb04c1a3b..cb04c1a3b 100644
--- a/gfx/pics/golbat/anim0.asm
+++ b/gfx/pokemon/golbat/anim0.asm
diff --git a/gfx/pics/golbat/anim1.asm b/gfx/pokemon/golbat/anim1.asm
index 689aed3fd..689aed3fd 100644
--- a/gfx/pics/golbat/anim1.asm
+++ b/gfx/pokemon/golbat/anim1.asm
diff --git a/gfx/pics/golbat/back.2bpp.lz.e277e260 b/gfx/pokemon/golbat/back.2bpp.lz.e277e260
index e2bd0c367..e2bd0c367 100644
--- a/gfx/pics/golbat/back.2bpp.lz.e277e260
+++ b/gfx/pokemon/golbat/back.2bpp.lz.e277e260
diff --git a/gfx/pics/golbat/back.png b/gfx/pokemon/golbat/back.png
index 5bc2b1336..5bc2b1336 100644
--- a/gfx/pics/golbat/back.png
+++ b/gfx/pokemon/golbat/back.png
diff --git a/gfx/pics/golbat/front.animated.2bpp.lz.c35ffe9b b/gfx/pokemon/golbat/front.animated.2bpp.lz.c35ffe9b
index 94f7d8216..94f7d8216 100644
--- a/gfx/pics/golbat/front.animated.2bpp.lz.c35ffe9b
+++ b/gfx/pokemon/golbat/front.animated.2bpp.lz.c35ffe9b
diff --git a/gfx/pics/golbat/front.png b/gfx/pokemon/golbat/front.png
index 5a7d1745a..5a7d1745a 100644
--- a/gfx/pics/golbat/front.png
+++ b/gfx/pokemon/golbat/front.png
diff --git a/gfx/pics/golbat/shiny.pal b/gfx/pokemon/golbat/shiny.pal
index 2cb1d6ced..2cb1d6ced 100644
--- a/gfx/pics/golbat/shiny.pal
+++ b/gfx/pokemon/golbat/shiny.pal
diff --git a/gfx/pics/goldeen/anim0.asm b/gfx/pokemon/goldeen/anim0.asm
index c93141feb..c93141feb 100644
--- a/gfx/pics/goldeen/anim0.asm
+++ b/gfx/pokemon/goldeen/anim0.asm
diff --git a/gfx/pics/goldeen/anim1.asm b/gfx/pokemon/goldeen/anim1.asm
index f31dfd1b2..f31dfd1b2 100644
--- a/gfx/pics/goldeen/anim1.asm
+++ b/gfx/pokemon/goldeen/anim1.asm
diff --git a/gfx/pics/goldeen/back.2bpp.lz.d0e5751e b/gfx/pokemon/goldeen/back.2bpp.lz.d0e5751e
index 5d00534ec..5d00534ec 100644
--- a/gfx/pics/goldeen/back.2bpp.lz.d0e5751e
+++ b/gfx/pokemon/goldeen/back.2bpp.lz.d0e5751e
diff --git a/gfx/pics/goldeen/back.png b/gfx/pokemon/goldeen/back.png
index 7644dc343..7644dc343 100644
--- a/gfx/pics/goldeen/back.png
+++ b/gfx/pokemon/goldeen/back.png
diff --git a/gfx/pics/goldeen/front.animated.2bpp.lz.c451a8c4 b/gfx/pokemon/goldeen/front.animated.2bpp.lz.c451a8c4
index f0090e94e..f0090e94e 100644
--- a/gfx/pics/goldeen/front.animated.2bpp.lz.c451a8c4
+++ b/gfx/pokemon/goldeen/front.animated.2bpp.lz.c451a8c4
diff --git a/gfx/pics/goldeen/front.png b/gfx/pokemon/goldeen/front.png
index c3a874b35..c3a874b35 100644
--- a/gfx/pics/goldeen/front.png
+++ b/gfx/pokemon/goldeen/front.png
diff --git a/gfx/pics/goldeen/shiny.pal b/gfx/pokemon/goldeen/shiny.pal
index 14910020e..14910020e 100644
--- a/gfx/pics/goldeen/shiny.pal
+++ b/gfx/pokemon/goldeen/shiny.pal
diff --git a/gfx/pics/golduck/anim0.asm b/gfx/pokemon/golduck/anim0.asm
index 41ce17c55..41ce17c55 100644
--- a/gfx/pics/golduck/anim0.asm
+++ b/gfx/pokemon/golduck/anim0.asm
diff --git a/gfx/pics/golduck/anim1.asm b/gfx/pokemon/golduck/anim1.asm
index a73476ca9..a73476ca9 100644
--- a/gfx/pics/golduck/anim1.asm
+++ b/gfx/pokemon/golduck/anim1.asm
diff --git a/gfx/pics/golduck/back.2bpp.lz.2d022642 b/gfx/pokemon/golduck/back.2bpp.lz.2d022642
index 13807b9e9..13807b9e9 100644
--- a/gfx/pics/golduck/back.2bpp.lz.2d022642
+++ b/gfx/pokemon/golduck/back.2bpp.lz.2d022642
diff --git a/gfx/pics/golduck/back.png b/gfx/pokemon/golduck/back.png
index 4791a6b8e..4791a6b8e 100644
--- a/gfx/pics/golduck/back.png
+++ b/gfx/pokemon/golduck/back.png
diff --git a/gfx/pics/golduck/front.animated.2bpp.lz.09e97414 b/gfx/pokemon/golduck/front.animated.2bpp.lz.09e97414
index ff3fa6792..ff3fa6792 100644
--- a/gfx/pics/golduck/front.animated.2bpp.lz.09e97414
+++ b/gfx/pokemon/golduck/front.animated.2bpp.lz.09e97414
diff --git a/gfx/pics/golduck/front.png b/gfx/pokemon/golduck/front.png
index 172653ab2..172653ab2 100644
--- a/gfx/pics/golduck/front.png
+++ b/gfx/pokemon/golduck/front.png
diff --git a/gfx/pics/golduck/shiny.pal b/gfx/pokemon/golduck/shiny.pal
index cfd29e90e..cfd29e90e 100644
--- a/gfx/pics/golduck/shiny.pal
+++ b/gfx/pokemon/golduck/shiny.pal
diff --git a/gfx/pics/golem/anim0.asm b/gfx/pokemon/golem/anim0.asm
index ef21ec211..ef21ec211 100644
--- a/gfx/pics/golem/anim0.asm
+++ b/gfx/pokemon/golem/anim0.asm
diff --git a/gfx/pics/golem/anim1.asm b/gfx/pokemon/golem/anim1.asm
index 9d3c23ba3..9d3c23ba3 100644
--- a/gfx/pics/golem/anim1.asm
+++ b/gfx/pokemon/golem/anim1.asm
diff --git a/gfx/pics/golem/back.2bpp.lz.ae903dee b/gfx/pokemon/golem/back.2bpp.lz.ae903dee
index fd1ee3dcb..fd1ee3dcb 100644
--- a/gfx/pics/golem/back.2bpp.lz.ae903dee
+++ b/gfx/pokemon/golem/back.2bpp.lz.ae903dee
diff --git a/gfx/pics/golem/back.png b/gfx/pokemon/golem/back.png
index 4b39da3cd..4b39da3cd 100644
--- a/gfx/pics/golem/back.png
+++ b/gfx/pokemon/golem/back.png
diff --git a/gfx/pics/golem/front.animated.2bpp.lz.a16f21c8 b/gfx/pokemon/golem/front.animated.2bpp.lz.a16f21c8
index 0a7bf3369..0a7bf3369 100644
--- a/gfx/pics/golem/front.animated.2bpp.lz.a16f21c8
+++ b/gfx/pokemon/golem/front.animated.2bpp.lz.a16f21c8
diff --git a/gfx/pics/golem/front.png b/gfx/pokemon/golem/front.png
index 8a8450b28..8a8450b28 100644
--- a/gfx/pics/golem/front.png
+++ b/gfx/pokemon/golem/front.png
diff --git a/gfx/pics/golem/shiny.pal b/gfx/pokemon/golem/shiny.pal
index d50b44fa6..d50b44fa6 100644
--- a/gfx/pics/golem/shiny.pal
+++ b/gfx/pokemon/golem/shiny.pal
diff --git a/gfx/pics/granbull/anim0.asm b/gfx/pokemon/granbull/anim0.asm
index 2f412479f..2f412479f 100644
--- a/gfx/pics/granbull/anim0.asm
+++ b/gfx/pokemon/granbull/anim0.asm
diff --git a/gfx/pics/granbull/anim1.asm b/gfx/pokemon/granbull/anim1.asm
index 22e166977..22e166977 100644
--- a/gfx/pics/granbull/anim1.asm
+++ b/gfx/pokemon/granbull/anim1.asm
diff --git a/gfx/pics/granbull/back.2bpp.lz.7f1208ed b/gfx/pokemon/granbull/back.2bpp.lz.7f1208ed
index f09d4e7dc..f09d4e7dc 100644
--- a/gfx/pics/granbull/back.2bpp.lz.7f1208ed
+++ b/gfx/pokemon/granbull/back.2bpp.lz.7f1208ed
diff --git a/gfx/pics/granbull/back.png b/gfx/pokemon/granbull/back.png
index 9ffdc7c99..9ffdc7c99 100644
--- a/gfx/pics/granbull/back.png
+++ b/gfx/pokemon/granbull/back.png
diff --git a/gfx/pics/granbull/front.animated.2bpp.lz.4504768b b/gfx/pokemon/granbull/front.animated.2bpp.lz.4504768b
index 94062ce3f..94062ce3f 100644
--- a/gfx/pics/granbull/front.animated.2bpp.lz.4504768b
+++ b/gfx/pokemon/granbull/front.animated.2bpp.lz.4504768b
diff --git a/gfx/pics/granbull/front.png b/gfx/pokemon/granbull/front.png
index 911bc59ae..911bc59ae 100644
--- a/gfx/pics/granbull/front.png
+++ b/gfx/pokemon/granbull/front.png
diff --git a/gfx/pics/granbull/shiny.pal b/gfx/pokemon/granbull/shiny.pal
index b15bd641c..b15bd641c 100644
--- a/gfx/pics/granbull/shiny.pal
+++ b/gfx/pokemon/granbull/shiny.pal
diff --git a/gfx/pics/graveler/anim0.asm b/gfx/pokemon/graveler/anim0.asm
index 8c0fba1ac..8c0fba1ac 100644
--- a/gfx/pics/graveler/anim0.asm
+++ b/gfx/pokemon/graveler/anim0.asm
diff --git a/gfx/pics/graveler/anim1.asm b/gfx/pokemon/graveler/anim1.asm
index e4ebc15e0..e4ebc15e0 100644
--- a/gfx/pics/graveler/anim1.asm
+++ b/gfx/pokemon/graveler/anim1.asm
diff --git a/gfx/pics/graveler/back.2bpp.lz.c7867de7 b/gfx/pokemon/graveler/back.2bpp.lz.c7867de7
index ba2fba8e6..ba2fba8e6 100644
--- a/gfx/pics/graveler/back.2bpp.lz.c7867de7
+++ b/gfx/pokemon/graveler/back.2bpp.lz.c7867de7
diff --git a/gfx/pics/graveler/back.png b/gfx/pokemon/graveler/back.png
index 17eb486b6..17eb486b6 100644
--- a/gfx/pics/graveler/back.png
+++ b/gfx/pokemon/graveler/back.png
diff --git a/gfx/pics/graveler/front.animated.2bpp.lz.68d07c61 b/gfx/pokemon/graveler/front.animated.2bpp.lz.68d07c61
index 5dcee6436..5dcee6436 100644
--- a/gfx/pics/graveler/front.animated.2bpp.lz.68d07c61
+++ b/gfx/pokemon/graveler/front.animated.2bpp.lz.68d07c61
diff --git a/gfx/pics/graveler/front.png b/gfx/pokemon/graveler/front.png
index 30cca1550..30cca1550 100644
--- a/gfx/pics/graveler/front.png
+++ b/gfx/pokemon/graveler/front.png
diff --git a/gfx/pics/graveler/shiny.pal b/gfx/pokemon/graveler/shiny.pal
index 36ba603c5..36ba603c5 100644
--- a/gfx/pics/graveler/shiny.pal
+++ b/gfx/pokemon/graveler/shiny.pal
diff --git a/gfx/pics/grimer/anim0.asm b/gfx/pokemon/grimer/anim0.asm
index c8edda489..c8edda489 100644
--- a/gfx/pics/grimer/anim0.asm
+++ b/gfx/pokemon/grimer/anim0.asm
diff --git a/gfx/pics/grimer/anim1.asm b/gfx/pokemon/grimer/anim1.asm
index 50829935e..50829935e 100644
--- a/gfx/pics/grimer/anim1.asm
+++ b/gfx/pokemon/grimer/anim1.asm
diff --git a/gfx/pics/grimer/back.2bpp.lz.833bd626 b/gfx/pokemon/grimer/back.2bpp.lz.833bd626
index d4494a003..d4494a003 100644
--- a/gfx/pics/grimer/back.2bpp.lz.833bd626
+++ b/gfx/pokemon/grimer/back.2bpp.lz.833bd626
diff --git a/gfx/pics/grimer/back.png b/gfx/pokemon/grimer/back.png
index e5c70286b..e5c70286b 100644
--- a/gfx/pics/grimer/back.png
+++ b/gfx/pokemon/grimer/back.png
diff --git a/gfx/pics/grimer/front.animated.2bpp.lz.dfe40e91 b/gfx/pokemon/grimer/front.animated.2bpp.lz.dfe40e91
index 176f2da1c..176f2da1c 100644
--- a/gfx/pics/grimer/front.animated.2bpp.lz.dfe40e91
+++ b/gfx/pokemon/grimer/front.animated.2bpp.lz.dfe40e91
diff --git a/gfx/pics/grimer/front.png b/gfx/pokemon/grimer/front.png
index f71dca145..f71dca145 100644
--- a/gfx/pics/grimer/front.png
+++ b/gfx/pokemon/grimer/front.png
diff --git a/gfx/pics/grimer/shiny.pal b/gfx/pokemon/grimer/shiny.pal
index 893276df4..893276df4 100644
--- a/gfx/pics/grimer/shiny.pal
+++ b/gfx/pokemon/grimer/shiny.pal
diff --git a/gfx/pics/growlithe/anim0.asm b/gfx/pokemon/growlithe/anim0.asm
index 333c08e67..333c08e67 100644
--- a/gfx/pics/growlithe/anim0.asm
+++ b/gfx/pokemon/growlithe/anim0.asm
diff --git a/gfx/pics/growlithe/anim1.asm b/gfx/pokemon/growlithe/anim1.asm
index bce18fa44..bce18fa44 100644
--- a/gfx/pics/growlithe/anim1.asm
+++ b/gfx/pokemon/growlithe/anim1.asm
diff --git a/gfx/pics/growlithe/back.2bpp.lz.7f5831f6 b/gfx/pokemon/growlithe/back.2bpp.lz.7f5831f6
index 222250f79..222250f79 100644
--- a/gfx/pics/growlithe/back.2bpp.lz.7f5831f6
+++ b/gfx/pokemon/growlithe/back.2bpp.lz.7f5831f6
diff --git a/gfx/pics/growlithe/back.png b/gfx/pokemon/growlithe/back.png
index e5e23b822..e5e23b822 100644
--- a/gfx/pics/growlithe/back.png
+++ b/gfx/pokemon/growlithe/back.png
diff --git a/gfx/pics/growlithe/front.animated.2bpp.lz.f7b376fa b/gfx/pokemon/growlithe/front.animated.2bpp.lz.f7b376fa
index a01b4f1fc..a01b4f1fc 100644
--- a/gfx/pics/growlithe/front.animated.2bpp.lz.f7b376fa
+++ b/gfx/pokemon/growlithe/front.animated.2bpp.lz.f7b376fa
diff --git a/gfx/pics/growlithe/front.png b/gfx/pokemon/growlithe/front.png
index 333568169..333568169 100644
--- a/gfx/pics/growlithe/front.png
+++ b/gfx/pokemon/growlithe/front.png
diff --git a/gfx/pics/growlithe/shiny.pal b/gfx/pokemon/growlithe/shiny.pal
index 5033bfda2..5033bfda2 100644
--- a/gfx/pics/growlithe/shiny.pal
+++ b/gfx/pokemon/growlithe/shiny.pal
diff --git a/gfx/pics/gyarados/anim0.asm b/gfx/pokemon/gyarados/anim0.asm
index 89195fa31..89195fa31 100644
--- a/gfx/pics/gyarados/anim0.asm
+++ b/gfx/pokemon/gyarados/anim0.asm
diff --git a/gfx/pics/gyarados/anim1.asm b/gfx/pokemon/gyarados/anim1.asm
index b33c52080..b33c52080 100644
--- a/gfx/pics/gyarados/anim1.asm
+++ b/gfx/pokemon/gyarados/anim1.asm
diff --git a/gfx/pics/gyarados/back.2bpp.lz.fc577f9e b/gfx/pokemon/gyarados/back.2bpp.lz.fc577f9e
index d061ec9b2..d061ec9b2 100644
--- a/gfx/pics/gyarados/back.2bpp.lz.fc577f9e
+++ b/gfx/pokemon/gyarados/back.2bpp.lz.fc577f9e
diff --git a/gfx/pics/gyarados/back.png b/gfx/pokemon/gyarados/back.png
index 12e942927..12e942927 100644
--- a/gfx/pics/gyarados/back.png
+++ b/gfx/pokemon/gyarados/back.png
diff --git a/gfx/pics/gyarados/front.animated.2bpp.lz.1b498e2b b/gfx/pokemon/gyarados/front.animated.2bpp.lz.1b498e2b
index 4d66d5814..4d66d5814 100644
--- a/gfx/pics/gyarados/front.animated.2bpp.lz.1b498e2b
+++ b/gfx/pokemon/gyarados/front.animated.2bpp.lz.1b498e2b
diff --git a/gfx/pics/gyarados/front.png b/gfx/pokemon/gyarados/front.png
index 0b6c883e9..0b6c883e9 100644
--- a/gfx/pics/gyarados/front.png
+++ b/gfx/pokemon/gyarados/front.png
diff --git a/gfx/pics/gyarados/shiny.pal b/gfx/pokemon/gyarados/shiny.pal
index d0599722d..d0599722d 100644
--- a/gfx/pics/gyarados/shiny.pal
+++ b/gfx/pokemon/gyarados/shiny.pal
diff --git a/gfx/pics/haunter/anim0.asm b/gfx/pokemon/haunter/anim0.asm
index a46d0f0bc..a46d0f0bc 100644
--- a/gfx/pics/haunter/anim0.asm
+++ b/gfx/pokemon/haunter/anim0.asm
diff --git a/gfx/pics/haunter/anim1.asm b/gfx/pokemon/haunter/anim1.asm
index bf439b1e1..bf439b1e1 100644
--- a/gfx/pics/haunter/anim1.asm
+++ b/gfx/pokemon/haunter/anim1.asm
diff --git a/gfx/pics/haunter/back.2bpp.lz.8a5dc2c1 b/gfx/pokemon/haunter/back.2bpp.lz.8a5dc2c1
index 660c0408b..660c0408b 100644
--- a/gfx/pics/haunter/back.2bpp.lz.8a5dc2c1
+++ b/gfx/pokemon/haunter/back.2bpp.lz.8a5dc2c1
diff --git a/gfx/pics/haunter/back.png b/gfx/pokemon/haunter/back.png
index 204e1987f..204e1987f 100644
--- a/gfx/pics/haunter/back.png
+++ b/gfx/pokemon/haunter/back.png
diff --git a/gfx/pics/haunter/front.animated.2bpp.lz.aeed5f7e b/gfx/pokemon/haunter/front.animated.2bpp.lz.aeed5f7e
index 6bb6ab582..6bb6ab582 100644
--- a/gfx/pics/haunter/front.animated.2bpp.lz.aeed5f7e
+++ b/gfx/pokemon/haunter/front.animated.2bpp.lz.aeed5f7e
diff --git a/gfx/pics/haunter/front.png b/gfx/pokemon/haunter/front.png
index 5f6c2d1b3..5f6c2d1b3 100644
--- a/gfx/pics/haunter/front.png
+++ b/gfx/pokemon/haunter/front.png
diff --git a/gfx/pics/haunter/shiny.pal b/gfx/pokemon/haunter/shiny.pal
index b8ea0d809..b8ea0d809 100644
--- a/gfx/pics/haunter/shiny.pal
+++ b/gfx/pokemon/haunter/shiny.pal
diff --git a/gfx/pics/heracross/anim0.asm b/gfx/pokemon/heracross/anim0.asm
index 5bba06fad..5bba06fad 100644
--- a/gfx/pics/heracross/anim0.asm
+++ b/gfx/pokemon/heracross/anim0.asm
diff --git a/gfx/pics/heracross/anim1.asm b/gfx/pokemon/heracross/anim1.asm
index 6c402379c..6c402379c 100644
--- a/gfx/pics/heracross/anim1.asm
+++ b/gfx/pokemon/heracross/anim1.asm
diff --git a/gfx/pics/heracross/back.2bpp.lz.ba09608b b/gfx/pokemon/heracross/back.2bpp.lz.ba09608b
index da4d40981..da4d40981 100644
--- a/gfx/pics/heracross/back.2bpp.lz.ba09608b
+++ b/gfx/pokemon/heracross/back.2bpp.lz.ba09608b
diff --git a/gfx/pics/heracross/back.png b/gfx/pokemon/heracross/back.png
index f3ee9d73d..f3ee9d73d 100644
--- a/gfx/pics/heracross/back.png
+++ b/gfx/pokemon/heracross/back.png
diff --git a/gfx/pics/heracross/front.animated.2bpp.lz.0742fe2b b/gfx/pokemon/heracross/front.animated.2bpp.lz.0742fe2b
index ad23e01d1..ad23e01d1 100644
--- a/gfx/pics/heracross/front.animated.2bpp.lz.0742fe2b
+++ b/gfx/pokemon/heracross/front.animated.2bpp.lz.0742fe2b
diff --git a/gfx/pics/heracross/front.png b/gfx/pokemon/heracross/front.png
index a8908ab86..a8908ab86 100644
--- a/gfx/pics/heracross/front.png
+++ b/gfx/pokemon/heracross/front.png
diff --git a/gfx/pics/heracross/shiny.pal b/gfx/pokemon/heracross/shiny.pal
index 3bc81cbdc..3bc81cbdc 100644
--- a/gfx/pics/heracross/shiny.pal
+++ b/gfx/pokemon/heracross/shiny.pal
diff --git a/gfx/pics/hitmonchan/anim0.asm b/gfx/pokemon/hitmonchan/anim0.asm
index b6ddd647e..b6ddd647e 100644
--- a/gfx/pics/hitmonchan/anim0.asm
+++ b/gfx/pokemon/hitmonchan/anim0.asm
diff --git a/gfx/pics/hitmonchan/anim1.asm b/gfx/pokemon/hitmonchan/anim1.asm
index 6f67577a0..6f67577a0 100644
--- a/gfx/pics/hitmonchan/anim1.asm
+++ b/gfx/pokemon/hitmonchan/anim1.asm
diff --git a/gfx/pics/hitmonchan/back.2bpp.lz.68e28b98 b/gfx/pokemon/hitmonchan/back.2bpp.lz.68e28b98
index f785248c1..f785248c1 100644
--- a/gfx/pics/hitmonchan/back.2bpp.lz.68e28b98
+++ b/gfx/pokemon/hitmonchan/back.2bpp.lz.68e28b98
diff --git a/gfx/pics/hitmonchan/back.png b/gfx/pokemon/hitmonchan/back.png
index 6a2e663e3..6a2e663e3 100644
--- a/gfx/pics/hitmonchan/back.png
+++ b/gfx/pokemon/hitmonchan/back.png
diff --git a/gfx/pics/hitmonchan/front.animated.2bpp.lz.61836c4c b/gfx/pokemon/hitmonchan/front.animated.2bpp.lz.61836c4c
index e9a77e987..e9a77e987 100644
--- a/gfx/pics/hitmonchan/front.animated.2bpp.lz.61836c4c
+++ b/gfx/pokemon/hitmonchan/front.animated.2bpp.lz.61836c4c
diff --git a/gfx/pics/hitmonchan/front.png b/gfx/pokemon/hitmonchan/front.png
index 6575dad5a..6575dad5a 100644
--- a/gfx/pics/hitmonchan/front.png
+++ b/gfx/pokemon/hitmonchan/front.png
diff --git a/gfx/pics/hitmonchan/shiny.pal b/gfx/pokemon/hitmonchan/shiny.pal
index ff930b7a5..ff930b7a5 100644
--- a/gfx/pics/hitmonchan/shiny.pal
+++ b/gfx/pokemon/hitmonchan/shiny.pal
diff --git a/gfx/pics/hitmonlee/anim0.asm b/gfx/pokemon/hitmonlee/anim0.asm
index 4260d7753..4260d7753 100644
--- a/gfx/pics/hitmonlee/anim0.asm
+++ b/gfx/pokemon/hitmonlee/anim0.asm
diff --git a/gfx/pics/hitmonlee/anim1.asm b/gfx/pokemon/hitmonlee/anim1.asm
index 4d7d191bf..4d7d191bf 100644
--- a/gfx/pics/hitmonlee/anim1.asm
+++ b/gfx/pokemon/hitmonlee/anim1.asm
diff --git a/gfx/pics/hitmonlee/back.2bpp.lz.374e3caa b/gfx/pokemon/hitmonlee/back.2bpp.lz.374e3caa
index 4847a1496..4847a1496 100644
--- a/gfx/pics/hitmonlee/back.2bpp.lz.374e3caa
+++ b/gfx/pokemon/hitmonlee/back.2bpp.lz.374e3caa
diff --git a/gfx/pics/hitmonlee/back.png b/gfx/pokemon/hitmonlee/back.png
index 9bc03d5e7..9bc03d5e7 100644
--- a/gfx/pics/hitmonlee/back.png
+++ b/gfx/pokemon/hitmonlee/back.png
diff --git a/gfx/pics/hitmonlee/front.animated.2bpp.lz.d174eba1 b/gfx/pokemon/hitmonlee/front.animated.2bpp.lz.d174eba1
index c85ec5817..c85ec5817 100644
--- a/gfx/pics/hitmonlee/front.animated.2bpp.lz.d174eba1
+++ b/gfx/pokemon/hitmonlee/front.animated.2bpp.lz.d174eba1
diff --git a/gfx/pics/hitmonlee/front.png b/gfx/pokemon/hitmonlee/front.png
index 96b6430ce..96b6430ce 100644
--- a/gfx/pics/hitmonlee/front.png
+++ b/gfx/pokemon/hitmonlee/front.png
diff --git a/gfx/pics/hitmonlee/shiny.pal b/gfx/pokemon/hitmonlee/shiny.pal
index c0ee7cc2e..c0ee7cc2e 100644
--- a/gfx/pics/hitmonlee/shiny.pal
+++ b/gfx/pokemon/hitmonlee/shiny.pal
diff --git a/gfx/pics/hitmontop/anim0.asm b/gfx/pokemon/hitmontop/anim0.asm
index 195f1554b..195f1554b 100644
--- a/gfx/pics/hitmontop/anim0.asm
+++ b/gfx/pokemon/hitmontop/anim0.asm
diff --git a/gfx/pics/hitmontop/anim1.asm b/gfx/pokemon/hitmontop/anim1.asm
index 3b4f17403..3b4f17403 100644
--- a/gfx/pics/hitmontop/anim1.asm
+++ b/gfx/pokemon/hitmontop/anim1.asm
diff --git a/gfx/pics/hitmontop/back.2bpp.lz.ea3f1576 b/gfx/pokemon/hitmontop/back.2bpp.lz.ea3f1576
index 185f08aff..185f08aff 100644
--- a/gfx/pics/hitmontop/back.2bpp.lz.ea3f1576
+++ b/gfx/pokemon/hitmontop/back.2bpp.lz.ea3f1576
diff --git a/gfx/pics/hitmontop/back.png b/gfx/pokemon/hitmontop/back.png
index 95a1faa4c..95a1faa4c 100644
--- a/gfx/pics/hitmontop/back.png
+++ b/gfx/pokemon/hitmontop/back.png
diff --git a/gfx/pics/hitmontop/front.animated.2bpp.lz.1b3e96fc b/gfx/pokemon/hitmontop/front.animated.2bpp.lz.1b3e96fc
index d28913fcf..d28913fcf 100644
--- a/gfx/pics/hitmontop/front.animated.2bpp.lz.1b3e96fc
+++ b/gfx/pokemon/hitmontop/front.animated.2bpp.lz.1b3e96fc
diff --git a/gfx/pics/hitmontop/front.png b/gfx/pokemon/hitmontop/front.png
index 3c580896d..3c580896d 100644
--- a/gfx/pics/hitmontop/front.png
+++ b/gfx/pokemon/hitmontop/front.png
diff --git a/gfx/pics/hitmontop/shiny.pal b/gfx/pokemon/hitmontop/shiny.pal
index 5c88a27e0..5c88a27e0 100644
--- a/gfx/pics/hitmontop/shiny.pal
+++ b/gfx/pokemon/hitmontop/shiny.pal
diff --git a/gfx/pics/ho_oh/anim0.asm b/gfx/pokemon/ho_oh/anim0.asm
index 5ae27b487..5ae27b487 100644
--- a/gfx/pics/ho_oh/anim0.asm
+++ b/gfx/pokemon/ho_oh/anim0.asm
diff --git a/gfx/pics/ho_oh/anim1.asm b/gfx/pokemon/ho_oh/anim1.asm
index d7808f281..d7808f281 100644
--- a/gfx/pics/ho_oh/anim1.asm
+++ b/gfx/pokemon/ho_oh/anim1.asm
diff --git a/gfx/pics/ho_oh/back.2bpp.lz.1412f260 b/gfx/pokemon/ho_oh/back.2bpp.lz.1412f260
index 1d58cf8ac..1d58cf8ac 100644
--- a/gfx/pics/ho_oh/back.2bpp.lz.1412f260
+++ b/gfx/pokemon/ho_oh/back.2bpp.lz.1412f260
diff --git a/gfx/pics/ho_oh/back.png b/gfx/pokemon/ho_oh/back.png
index c28d038d9..c28d038d9 100644
--- a/gfx/pics/ho_oh/back.png
+++ b/gfx/pokemon/ho_oh/back.png
diff --git a/gfx/pics/ho_oh/front.animated.2bpp.lz.db80b5eb b/gfx/pokemon/ho_oh/front.animated.2bpp.lz.db80b5eb
index 40c91739e..40c91739e 100644
--- a/gfx/pics/ho_oh/front.animated.2bpp.lz.db80b5eb
+++ b/gfx/pokemon/ho_oh/front.animated.2bpp.lz.db80b5eb
diff --git a/gfx/pics/ho_oh/front.png b/gfx/pokemon/ho_oh/front.png
index 52598814d..52598814d 100644
--- a/gfx/pics/ho_oh/front.png
+++ b/gfx/pokemon/ho_oh/front.png
diff --git a/gfx/pics/ho_oh/shiny.pal b/gfx/pokemon/ho_oh/shiny.pal
index 64a56ec52..64a56ec52 100644
--- a/gfx/pics/ho_oh/shiny.pal
+++ b/gfx/pokemon/ho_oh/shiny.pal
diff --git a/gfx/pics/hoothoot/anim0.asm b/gfx/pokemon/hoothoot/anim0.asm
index 813faf909..813faf909 100644
--- a/gfx/pics/hoothoot/anim0.asm
+++ b/gfx/pokemon/hoothoot/anim0.asm
diff --git a/gfx/pics/hoothoot/anim1.asm b/gfx/pokemon/hoothoot/anim1.asm
index 4aaf1a124..4aaf1a124 100644
--- a/gfx/pics/hoothoot/anim1.asm
+++ b/gfx/pokemon/hoothoot/anim1.asm
diff --git a/gfx/pics/hoothoot/back.2bpp.lz.7ebb0b29 b/gfx/pokemon/hoothoot/back.2bpp.lz.7ebb0b29
index e4ca2f37f..e4ca2f37f 100644
--- a/gfx/pics/hoothoot/back.2bpp.lz.7ebb0b29
+++ b/gfx/pokemon/hoothoot/back.2bpp.lz.7ebb0b29
diff --git a/gfx/pics/hoothoot/back.png b/gfx/pokemon/hoothoot/back.png
index 73247ff34..73247ff34 100644
--- a/gfx/pics/hoothoot/back.png
+++ b/gfx/pokemon/hoothoot/back.png
diff --git a/gfx/pics/hoothoot/front.animated.2bpp.lz.752ab202 b/gfx/pokemon/hoothoot/front.animated.2bpp.lz.752ab202
index 6abcd37fc..6abcd37fc 100644
--- a/gfx/pics/hoothoot/front.animated.2bpp.lz.752ab202
+++ b/gfx/pokemon/hoothoot/front.animated.2bpp.lz.752ab202
diff --git a/gfx/pics/hoothoot/front.png b/gfx/pokemon/hoothoot/front.png
index 97500e77c..97500e77c 100644
--- a/gfx/pics/hoothoot/front.png
+++ b/gfx/pokemon/hoothoot/front.png
diff --git a/gfx/pics/hoothoot/shiny.pal b/gfx/pokemon/hoothoot/shiny.pal
index 360685581..360685581 100644
--- a/gfx/pics/hoothoot/shiny.pal
+++ b/gfx/pokemon/hoothoot/shiny.pal
diff --git a/gfx/pics/hoppip/anim0.asm b/gfx/pokemon/hoppip/anim0.asm
index 6af60ab0b..6af60ab0b 100644
--- a/gfx/pics/hoppip/anim0.asm
+++ b/gfx/pokemon/hoppip/anim0.asm
diff --git a/gfx/pics/hoppip/anim1.asm b/gfx/pokemon/hoppip/anim1.asm
index d0281ca1c..d0281ca1c 100644
--- a/gfx/pics/hoppip/anim1.asm
+++ b/gfx/pokemon/hoppip/anim1.asm
diff --git a/gfx/pics/hoppip/back.2bpp.lz.5684c023 b/gfx/pokemon/hoppip/back.2bpp.lz.5684c023
index c5439118e..c5439118e 100644
--- a/gfx/pics/hoppip/back.2bpp.lz.5684c023
+++ b/gfx/pokemon/hoppip/back.2bpp.lz.5684c023
diff --git a/gfx/pics/hoppip/back.png b/gfx/pokemon/hoppip/back.png
index 325c08993..325c08993 100644
--- a/gfx/pics/hoppip/back.png
+++ b/gfx/pokemon/hoppip/back.png
diff --git a/gfx/pics/hoppip/front.animated.2bpp.lz.a03efe74 b/gfx/pokemon/hoppip/front.animated.2bpp.lz.a03efe74
index 4387e2886..4387e2886 100644
--- a/gfx/pics/hoppip/front.animated.2bpp.lz.a03efe74
+++ b/gfx/pokemon/hoppip/front.animated.2bpp.lz.a03efe74
diff --git a/gfx/pics/hoppip/front.png b/gfx/pokemon/hoppip/front.png
index 19cd0d473..19cd0d473 100644
--- a/gfx/pics/hoppip/front.png
+++ b/gfx/pokemon/hoppip/front.png
diff --git a/gfx/pics/hoppip/shiny.pal b/gfx/pokemon/hoppip/shiny.pal
index 4a4afec42..4a4afec42 100644
--- a/gfx/pics/hoppip/shiny.pal
+++ b/gfx/pokemon/hoppip/shiny.pal
diff --git a/gfx/pics/horsea/anim0.asm b/gfx/pokemon/horsea/anim0.asm
index 18d51863c..18d51863c 100644
--- a/gfx/pics/horsea/anim0.asm
+++ b/gfx/pokemon/horsea/anim0.asm
diff --git a/gfx/pics/horsea/anim1.asm b/gfx/pokemon/horsea/anim1.asm
index 2475abfdb..2475abfdb 100644
--- a/gfx/pics/horsea/anim1.asm
+++ b/gfx/pokemon/horsea/anim1.asm
diff --git a/gfx/pics/horsea/back.2bpp.lz.50b6afb9 b/gfx/pokemon/horsea/back.2bpp.lz.50b6afb9
index ae6a2ecab..ae6a2ecab 100644
--- a/gfx/pics/horsea/back.2bpp.lz.50b6afb9
+++ b/gfx/pokemon/horsea/back.2bpp.lz.50b6afb9
diff --git a/gfx/pics/horsea/back.png b/gfx/pokemon/horsea/back.png
index 70c34e674..70c34e674 100644
--- a/gfx/pics/horsea/back.png
+++ b/gfx/pokemon/horsea/back.png
diff --git a/gfx/pics/horsea/front.animated.2bpp.lz.8b84f98e b/gfx/pokemon/horsea/front.animated.2bpp.lz.8b84f98e
index 7db08094b..7db08094b 100644
--- a/gfx/pics/horsea/front.animated.2bpp.lz.8b84f98e
+++ b/gfx/pokemon/horsea/front.animated.2bpp.lz.8b84f98e
diff --git a/gfx/pics/horsea/front.png b/gfx/pokemon/horsea/front.png
index 285617685..285617685 100644
--- a/gfx/pics/horsea/front.png
+++ b/gfx/pokemon/horsea/front.png
diff --git a/gfx/pics/horsea/shiny.pal b/gfx/pokemon/horsea/shiny.pal
index 9b9875302..9b9875302 100644
--- a/gfx/pics/horsea/shiny.pal
+++ b/gfx/pokemon/horsea/shiny.pal
diff --git a/gfx/pics/houndoom/anim0.asm b/gfx/pokemon/houndoom/anim0.asm
index 60ad08726..60ad08726 100644
--- a/gfx/pics/houndoom/anim0.asm
+++ b/gfx/pokemon/houndoom/anim0.asm
diff --git a/gfx/pics/houndoom/anim1.asm b/gfx/pokemon/houndoom/anim1.asm
index 78fa8610c..78fa8610c 100644
--- a/gfx/pics/houndoom/anim1.asm
+++ b/gfx/pokemon/houndoom/anim1.asm
diff --git a/gfx/pics/houndoom/back.2bpp.lz.5fa55a47 b/gfx/pokemon/houndoom/back.2bpp.lz.5fa55a47
index 5b7b72ffc..5b7b72ffc 100644
--- a/gfx/pics/houndoom/back.2bpp.lz.5fa55a47
+++ b/gfx/pokemon/houndoom/back.2bpp.lz.5fa55a47
diff --git a/gfx/pics/houndoom/back.png b/gfx/pokemon/houndoom/back.png
index e9137ba77..e9137ba77 100644
--- a/gfx/pics/houndoom/back.png
+++ b/gfx/pokemon/houndoom/back.png
diff --git a/gfx/pics/houndoom/front.animated.2bpp.lz.2d450e90 b/gfx/pokemon/houndoom/front.animated.2bpp.lz.2d450e90
index c2ce34ee3..c2ce34ee3 100644
--- a/gfx/pics/houndoom/front.animated.2bpp.lz.2d450e90
+++ b/gfx/pokemon/houndoom/front.animated.2bpp.lz.2d450e90
diff --git a/gfx/pics/houndoom/front.png b/gfx/pokemon/houndoom/front.png
index 0a8315734..0a8315734 100644
--- a/gfx/pics/houndoom/front.png
+++ b/gfx/pokemon/houndoom/front.png
diff --git a/gfx/pics/houndoom/shiny.pal b/gfx/pokemon/houndoom/shiny.pal
index cf16faf2c..cf16faf2c 100644
--- a/gfx/pics/houndoom/shiny.pal
+++ b/gfx/pokemon/houndoom/shiny.pal
diff --git a/gfx/pics/houndour/anim0.asm b/gfx/pokemon/houndour/anim0.asm
index 2235850c0..2235850c0 100644
--- a/gfx/pics/houndour/anim0.asm
+++ b/gfx/pokemon/houndour/anim0.asm
diff --git a/gfx/pics/houndour/anim1.asm b/gfx/pokemon/houndour/anim1.asm
index dd8318689..dd8318689 100644
--- a/gfx/pics/houndour/anim1.asm
+++ b/gfx/pokemon/houndour/anim1.asm
diff --git a/gfx/pics/houndour/back.2bpp.lz.ae5f2dc9 b/gfx/pokemon/houndour/back.2bpp.lz.ae5f2dc9
index fe3584bd1..fe3584bd1 100644
--- a/gfx/pics/houndour/back.2bpp.lz.ae5f2dc9
+++ b/gfx/pokemon/houndour/back.2bpp.lz.ae5f2dc9
diff --git a/gfx/pics/houndour/back.png b/gfx/pokemon/houndour/back.png
index bcaf2c7ca..bcaf2c7ca 100644
--- a/gfx/pics/houndour/back.png
+++ b/gfx/pokemon/houndour/back.png
diff --git a/gfx/pics/houndour/front.animated.2bpp.lz.f847f4f6 b/gfx/pokemon/houndour/front.animated.2bpp.lz.f847f4f6
index 786c0f9a4..786c0f9a4 100644
--- a/gfx/pics/houndour/front.animated.2bpp.lz.f847f4f6
+++ b/gfx/pokemon/houndour/front.animated.2bpp.lz.f847f4f6
diff --git a/gfx/pics/houndour/front.png b/gfx/pokemon/houndour/front.png
index b002b0f15..b002b0f15 100644
--- a/gfx/pics/houndour/front.png
+++ b/gfx/pokemon/houndour/front.png
diff --git a/gfx/pics/houndour/shiny.pal b/gfx/pokemon/houndour/shiny.pal
index c7296ab33..c7296ab33 100644
--- a/gfx/pics/houndour/shiny.pal
+++ b/gfx/pokemon/houndour/shiny.pal
diff --git a/gfx/pics/hypno/anim0.asm b/gfx/pokemon/hypno/anim0.asm
index b6c3e6463..b6c3e6463 100644
--- a/gfx/pics/hypno/anim0.asm
+++ b/gfx/pokemon/hypno/anim0.asm
diff --git a/gfx/pics/hypno/anim1.asm b/gfx/pokemon/hypno/anim1.asm
index 4d981c442..4d981c442 100644
--- a/gfx/pics/hypno/anim1.asm
+++ b/gfx/pokemon/hypno/anim1.asm
diff --git a/gfx/pics/hypno/back.2bpp.lz.c091ce88 b/gfx/pokemon/hypno/back.2bpp.lz.c091ce88
index b69fcadf7..b69fcadf7 100644
--- a/gfx/pics/hypno/back.2bpp.lz.c091ce88
+++ b/gfx/pokemon/hypno/back.2bpp.lz.c091ce88
diff --git a/gfx/pics/hypno/back.png b/gfx/pokemon/hypno/back.png
index b68f235d3..b68f235d3 100644
--- a/gfx/pics/hypno/back.png
+++ b/gfx/pokemon/hypno/back.png
diff --git a/gfx/pics/hypno/front.animated.2bpp.lz.638333a3 b/gfx/pokemon/hypno/front.animated.2bpp.lz.638333a3
index ca6ec0608..ca6ec0608 100644
--- a/gfx/pics/hypno/front.animated.2bpp.lz.638333a3
+++ b/gfx/pokemon/hypno/front.animated.2bpp.lz.638333a3
diff --git a/gfx/pics/hypno/front.png b/gfx/pokemon/hypno/front.png
index 64c844425..64c844425 100644
--- a/gfx/pics/hypno/front.png
+++ b/gfx/pokemon/hypno/front.png
diff --git a/gfx/pics/hypno/shiny.pal b/gfx/pokemon/hypno/shiny.pal
index 51f14601f..51f14601f 100644
--- a/gfx/pics/hypno/shiny.pal
+++ b/gfx/pokemon/hypno/shiny.pal
diff --git a/gfx/pics/igglybuff/anim0.asm b/gfx/pokemon/igglybuff/anim0.asm
index 0b2430e44..0b2430e44 100644
--- a/gfx/pics/igglybuff/anim0.asm
+++ b/gfx/pokemon/igglybuff/anim0.asm
diff --git a/gfx/pics/igglybuff/anim1.asm b/gfx/pokemon/igglybuff/anim1.asm
index 338a0ab2d..338a0ab2d 100644
--- a/gfx/pics/igglybuff/anim1.asm
+++ b/gfx/pokemon/igglybuff/anim1.asm
diff --git a/gfx/pics/igglybuff/back.2bpp.lz.c0c17dcb b/gfx/pokemon/igglybuff/back.2bpp.lz.c0c17dcb
index b416af3f0..b416af3f0 100644
--- a/gfx/pics/igglybuff/back.2bpp.lz.c0c17dcb
+++ b/gfx/pokemon/igglybuff/back.2bpp.lz.c0c17dcb
diff --git a/gfx/pics/igglybuff/back.png b/gfx/pokemon/igglybuff/back.png
index 7b34a17ff..7b34a17ff 100644
--- a/gfx/pics/igglybuff/back.png
+++ b/gfx/pokemon/igglybuff/back.png
diff --git a/gfx/pics/igglybuff/front.animated.2bpp.lz.1e00afc3 b/gfx/pokemon/igglybuff/front.animated.2bpp.lz.1e00afc3
index 1c4bbefa0..1c4bbefa0 100644
--- a/gfx/pics/igglybuff/front.animated.2bpp.lz.1e00afc3
+++ b/gfx/pokemon/igglybuff/front.animated.2bpp.lz.1e00afc3
diff --git a/gfx/pics/igglybuff/front.png b/gfx/pokemon/igglybuff/front.png
index 2fb7dbb78..2fb7dbb78 100644
--- a/gfx/pics/igglybuff/front.png
+++ b/gfx/pokemon/igglybuff/front.png
diff --git a/gfx/pics/igglybuff/shiny.pal b/gfx/pokemon/igglybuff/shiny.pal
index 38ce5d76d..38ce5d76d 100644
--- a/gfx/pics/igglybuff/shiny.pal
+++ b/gfx/pokemon/igglybuff/shiny.pal
diff --git a/gfx/pics/ivysaur/anim0.asm b/gfx/pokemon/ivysaur/anim0.asm
index 65e89f5ab..65e89f5ab 100644
--- a/gfx/pics/ivysaur/anim0.asm
+++ b/gfx/pokemon/ivysaur/anim0.asm
diff --git a/gfx/pics/ivysaur/anim1.asm b/gfx/pokemon/ivysaur/anim1.asm
index 3df18b2cd..3df18b2cd 100644
--- a/gfx/pics/ivysaur/anim1.asm
+++ b/gfx/pokemon/ivysaur/anim1.asm
diff --git a/gfx/pics/ivysaur/back.2bpp.lz.bed1ff58 b/gfx/pokemon/ivysaur/back.2bpp.lz.bed1ff58
index 34557d9dd..34557d9dd 100644
--- a/gfx/pics/ivysaur/back.2bpp.lz.bed1ff58
+++ b/gfx/pokemon/ivysaur/back.2bpp.lz.bed1ff58
diff --git a/gfx/pics/ivysaur/back.png b/gfx/pokemon/ivysaur/back.png
index 325b5cdf5..325b5cdf5 100644
--- a/gfx/pics/ivysaur/back.png
+++ b/gfx/pokemon/ivysaur/back.png
diff --git a/gfx/pics/ivysaur/front.animated.2bpp.lz.3abed0fa b/gfx/pokemon/ivysaur/front.animated.2bpp.lz.3abed0fa
index 7b9c8f9d9..7b9c8f9d9 100644
--- a/gfx/pics/ivysaur/front.animated.2bpp.lz.3abed0fa
+++ b/gfx/pokemon/ivysaur/front.animated.2bpp.lz.3abed0fa
diff --git a/gfx/pics/ivysaur/front.png b/gfx/pokemon/ivysaur/front.png
index 799c79667..799c79667 100644
--- a/gfx/pics/ivysaur/front.png
+++ b/gfx/pokemon/ivysaur/front.png
diff --git a/gfx/pics/ivysaur/shiny.pal b/gfx/pokemon/ivysaur/shiny.pal
index 04c81cf45..04c81cf45 100644
--- a/gfx/pics/ivysaur/shiny.pal
+++ b/gfx/pokemon/ivysaur/shiny.pal
diff --git a/gfx/pics/jigglypuff/anim0.asm b/gfx/pokemon/jigglypuff/anim0.asm
index ada7e0d99..ada7e0d99 100644
--- a/gfx/pics/jigglypuff/anim0.asm
+++ b/gfx/pokemon/jigglypuff/anim0.asm
diff --git a/gfx/pics/jigglypuff/anim1.asm b/gfx/pokemon/jigglypuff/anim1.asm
index 40584de87..40584de87 100644
--- a/gfx/pics/jigglypuff/anim1.asm
+++ b/gfx/pokemon/jigglypuff/anim1.asm
diff --git a/gfx/pics/jigglypuff/back.2bpp.lz.87d5730b b/gfx/pokemon/jigglypuff/back.2bpp.lz.87d5730b
index e551afaf6..e551afaf6 100644
--- a/gfx/pics/jigglypuff/back.2bpp.lz.87d5730b
+++ b/gfx/pokemon/jigglypuff/back.2bpp.lz.87d5730b
diff --git a/gfx/pics/jigglypuff/back.png b/gfx/pokemon/jigglypuff/back.png
index 4e1849c51..4e1849c51 100644
--- a/gfx/pics/jigglypuff/back.png
+++ b/gfx/pokemon/jigglypuff/back.png
diff --git a/gfx/pics/jigglypuff/front.animated.2bpp.lz.9fd159f4 b/gfx/pokemon/jigglypuff/front.animated.2bpp.lz.9fd159f4
index 4367e41d8..4367e41d8 100644
--- a/gfx/pics/jigglypuff/front.animated.2bpp.lz.9fd159f4
+++ b/gfx/pokemon/jigglypuff/front.animated.2bpp.lz.9fd159f4
diff --git a/gfx/pics/jigglypuff/front.png b/gfx/pokemon/jigglypuff/front.png
index 867134d13..867134d13 100644
--- a/gfx/pics/jigglypuff/front.png
+++ b/gfx/pokemon/jigglypuff/front.png
diff --git a/gfx/pics/jigglypuff/shiny.pal b/gfx/pokemon/jigglypuff/shiny.pal
index 38ce5d76d..38ce5d76d 100644
--- a/gfx/pics/jigglypuff/shiny.pal
+++ b/gfx/pokemon/jigglypuff/shiny.pal
diff --git a/gfx/pokemon/johto_frames.asm b/gfx/pokemon/johto_frames.asm
new file mode 100644
index 000000000..56ea6eb00
--- /dev/null
+++ b/gfx/pokemon/johto_frames.asm
@@ -0,0 +1,102 @@
+JohtoFrames:
+ChikoritaFrames:  INCLUDE "gfx/pokemon/chikorita/frames.asm"
+BayleefFrames:    INCLUDE "gfx/pokemon/bayleef/frames.asm"
+MeganiumFrames:   INCLUDE "gfx/pokemon/meganium/frames.asm"
+CyndaquilFrames:  INCLUDE "gfx/pokemon/cyndaquil/frames.asm"
+QuilavaFrames:    INCLUDE "gfx/pokemon/quilava/frames.asm"
+TyphlosionFrames: INCLUDE "gfx/pokemon/typhlosion/frames.asm"
+TotodileFrames:   INCLUDE "gfx/pokemon/totodile/frames.asm"
+CroconawFrames:   INCLUDE "gfx/pokemon/croconaw/frames.asm"
+FeraligatrFrames: INCLUDE "gfx/pokemon/feraligatr/frames.asm"
+SentretFrames:    INCLUDE "gfx/pokemon/sentret/frames.asm"
+FurretFrames:     INCLUDE "gfx/pokemon/furret/frames.asm"
+HoothootFrames:   INCLUDE "gfx/pokemon/hoothoot/frames.asm"
+NoctowlFrames:    INCLUDE "gfx/pokemon/noctowl/frames.asm"
+LedybaFrames:     INCLUDE "gfx/pokemon/ledyba/frames.asm"
+LedianFrames:     INCLUDE "gfx/pokemon/ledian/frames.asm"
+SpinarakFrames:   INCLUDE "gfx/pokemon/spinarak/frames.asm"
+AriadosFrames:    INCLUDE "gfx/pokemon/ariados/frames.asm"
+CrobatFrames:     INCLUDE "gfx/pokemon/crobat/frames.asm"
+ChinchouFrames:   INCLUDE "gfx/pokemon/chinchou/frames.asm"
+LanturnFrames:    INCLUDE "gfx/pokemon/lanturn/frames.asm"
+PichuFrames:      INCLUDE "gfx/pokemon/pichu/frames.asm"
+CleffaFrames:     INCLUDE "gfx/pokemon/cleffa/frames.asm"
+IgglybuffFrames:  INCLUDE "gfx/pokemon/igglybuff/frames.asm"
+TogepiFrames:     INCLUDE "gfx/pokemon/togepi/frames.asm"
+TogeticFrames:    INCLUDE "gfx/pokemon/togetic/frames.asm"
+NatuFrames:       INCLUDE "gfx/pokemon/natu/frames.asm"
+XatuFrames:       INCLUDE "gfx/pokemon/xatu/frames.asm"
+MareepFrames:     INCLUDE "gfx/pokemon/mareep/frames.asm"
+FlaaffyFrames:    INCLUDE "gfx/pokemon/flaaffy/frames.asm"
+AmpharosFrames:   INCLUDE "gfx/pokemon/ampharos/frames.asm"
+BellossomFrames:  INCLUDE "gfx/pokemon/bellossom/frames.asm"
+MarillFrames:     INCLUDE "gfx/pokemon/marill/frames.asm"
+AzumarillFrames:  INCLUDE "gfx/pokemon/azumarill/frames.asm"
+SudowoodoFrames:  INCLUDE "gfx/pokemon/sudowoodo/frames.asm"
+PolitoedFrames:   INCLUDE "gfx/pokemon/politoed/frames.asm"
+HoppipFrames:     INCLUDE "gfx/pokemon/hoppip/frames.asm"
+SkiploomFrames:   INCLUDE "gfx/pokemon/skiploom/frames.asm"
+JumpluffFrames:   INCLUDE "gfx/pokemon/jumpluff/frames.asm"
+AipomFrames:      INCLUDE "gfx/pokemon/aipom/frames.asm"
+SunkernFrames:    INCLUDE "gfx/pokemon/sunkern/frames.asm"
+SunfloraFrames:   INCLUDE "gfx/pokemon/sunflora/frames.asm"
+YanmaFrames:      INCLUDE "gfx/pokemon/yanma/frames.asm"
+WooperFrames:     INCLUDE "gfx/pokemon/wooper/frames.asm"
+QuagsireFrames:   INCLUDE "gfx/pokemon/quagsire/frames.asm"
+EspeonFrames:     INCLUDE "gfx/pokemon/espeon/frames.asm"
+UmbreonFrames:    INCLUDE "gfx/pokemon/umbreon/frames.asm"
+MurkrowFrames:    INCLUDE "gfx/pokemon/murkrow/frames.asm"
+SlowkingFrames:   INCLUDE "gfx/pokemon/slowking/frames.asm"
+MisdreavusFrames: INCLUDE "gfx/pokemon/misdreavus/frames.asm"
+UnownFrames:      INCLUDE "gfx/pokemon/unown/frames.asm"
+WobbuffetFrames:  INCLUDE "gfx/pokemon/wobbuffet/frames.asm"
+GirafarigFrames:  INCLUDE "gfx/pokemon/girafarig/frames.asm"
+PinecoFrames:     INCLUDE "gfx/pokemon/pineco/frames.asm"
+ForretressFrames: INCLUDE "gfx/pokemon/forretress/frames.asm"
+DunsparceFrames:  INCLUDE "gfx/pokemon/dunsparce/frames.asm"
+GligarFrames:     INCLUDE "gfx/pokemon/gligar/frames.asm"
+SteelixFrames:    INCLUDE "gfx/pokemon/steelix/frames.asm"
+SnubbullFrames:   INCLUDE "gfx/pokemon/snubbull/frames.asm"
+GranbullFrames:   INCLUDE "gfx/pokemon/granbull/frames.asm"
+QwilfishFrames:   INCLUDE "gfx/pokemon/qwilfish/frames.asm"
+ScizorFrames:     INCLUDE "gfx/pokemon/scizor/frames.asm"
+ShuckleFrames:    INCLUDE "gfx/pokemon/shuckle/frames.asm"
+HeracrossFrames:  INCLUDE "gfx/pokemon/heracross/frames.asm"
+SneaselFrames:    INCLUDE "gfx/pokemon/sneasel/frames.asm"
+TeddiursaFrames:  INCLUDE "gfx/pokemon/teddiursa/frames.asm"
+UrsaringFrames:   INCLUDE "gfx/pokemon/ursaring/frames.asm"
+SlugmaFrames:     INCLUDE "gfx/pokemon/slugma/frames.asm"
+MagcargoFrames:   INCLUDE "gfx/pokemon/magcargo/frames.asm"
+SwinubFrames:     INCLUDE "gfx/pokemon/swinub/frames.asm"
+PiloswineFrames:  INCLUDE "gfx/pokemon/piloswine/frames.asm"
+CorsolaFrames:    INCLUDE "gfx/pokemon/corsola/frames.asm"
+RemoraidFrames:   INCLUDE "gfx/pokemon/remoraid/frames.asm"
+OctilleryFrames:  INCLUDE "gfx/pokemon/octillery/frames.asm"
+DelibirdFrames:   INCLUDE "gfx/pokemon/delibird/frames.asm"
+MantineFrames:    INCLUDE "gfx/pokemon/mantine/frames.asm"
+SkarmoryFrames:   INCLUDE "gfx/pokemon/skarmory/frames.asm"
+HoundourFrames:   INCLUDE "gfx/pokemon/houndour/frames.asm"
+HoundoomFrames:   INCLUDE "gfx/pokemon/houndoom/frames.asm"
+KingdraFrames:    INCLUDE "gfx/pokemon/kingdra/frames.asm"
+PhanpyFrames:     INCLUDE "gfx/pokemon/phanpy/frames.asm"
+DonphanFrames:    INCLUDE "gfx/pokemon/donphan/frames.asm"
+Porygon2Frames:   INCLUDE "gfx/pokemon/porygon2/frames.asm"
+StantlerFrames:   INCLUDE "gfx/pokemon/stantler/frames.asm"
+SmeargleFrames:   INCLUDE "gfx/pokemon/smeargle/frames.asm"
+TyrogueFrames:    INCLUDE "gfx/pokemon/tyrogue/frames.asm"
+HitmontopFrames:  INCLUDE "gfx/pokemon/hitmontop/frames.asm"
+SmoochumFrames:   INCLUDE "gfx/pokemon/smoochum/frames.asm"
+ElekidFrames:     INCLUDE "gfx/pokemon/elekid/frames.asm"
+MagbyFrames:      INCLUDE "gfx/pokemon/magby/frames.asm"
+MiltankFrames:    INCLUDE "gfx/pokemon/miltank/frames.asm"
+BlisseyFrames:    INCLUDE "gfx/pokemon/blissey/frames.asm"
+RaikouFrames:     INCLUDE "gfx/pokemon/raikou/frames.asm"
+EnteiFrames:      INCLUDE "gfx/pokemon/entei/frames.asm"
+SuicuneFrames:    INCLUDE "gfx/pokemon/suicune/frames.asm"
+LarvitarFrames:   INCLUDE "gfx/pokemon/larvitar/frames.asm"
+PupitarFrames:    INCLUDE "gfx/pokemon/pupitar/frames.asm"
+TyranitarFrames:  INCLUDE "gfx/pokemon/tyranitar/frames.asm"
+LugiaFrames:      INCLUDE "gfx/pokemon/lugia/frames.asm"
+HoOhFrames:       INCLUDE "gfx/pokemon/ho_oh/frames.asm"
+CelebiFrames:     INCLUDE "gfx/pokemon/celebi/frames.asm"
+EggFrames:        INCLUDE "gfx/pokemon/egg/frames.asm"
diff --git a/gfx/pics/jolteon/anim0.asm b/gfx/pokemon/jolteon/anim0.asm
index c4c01e60a..c4c01e60a 100644
--- a/gfx/pics/jolteon/anim0.asm
+++ b/gfx/pokemon/jolteon/anim0.asm
diff --git a/gfx/pics/jolteon/anim1.asm b/gfx/pokemon/jolteon/anim1.asm
index 0b5481afd..0b5481afd 100644
--- a/gfx/pics/jolteon/anim1.asm
+++ b/gfx/pokemon/jolteon/anim1.asm
diff --git a/gfx/pics/jolteon/back.2bpp.lz.f248aac4 b/gfx/pokemon/jolteon/back.2bpp.lz.f248aac4
index e95f893ce..e95f893ce 100644
--- a/gfx/pics/jolteon/back.2bpp.lz.f248aac4
+++ b/gfx/pokemon/jolteon/back.2bpp.lz.f248aac4
diff --git a/gfx/pics/jolteon/back.png b/gfx/pokemon/jolteon/back.png
index 0bf798ebf..0bf798ebf 100644
--- a/gfx/pics/jolteon/back.png
+++ b/gfx/pokemon/jolteon/back.png
diff --git a/gfx/pics/jolteon/front.animated.2bpp.lz.b2b07d79 b/gfx/pokemon/jolteon/front.animated.2bpp.lz.b2b07d79
index 32d271390..32d271390 100644
--- a/gfx/pics/jolteon/front.animated.2bpp.lz.b2b07d79
+++ b/gfx/pokemon/jolteon/front.animated.2bpp.lz.b2b07d79
diff --git a/gfx/pics/jolteon/front.png b/gfx/pokemon/jolteon/front.png
index 4f052d559..4f052d559 100644
--- a/gfx/pics/jolteon/front.png
+++ b/gfx/pokemon/jolteon/front.png
diff --git a/gfx/pics/jolteon/shiny.pal b/gfx/pokemon/jolteon/shiny.pal
index 81d8eda41..81d8eda41 100644
--- a/gfx/pics/jolteon/shiny.pal
+++ b/gfx/pokemon/jolteon/shiny.pal
diff --git a/gfx/pics/jumpluff/anim0.asm b/gfx/pokemon/jumpluff/anim0.asm
index c4161560e..c4161560e 100644
--- a/gfx/pics/jumpluff/anim0.asm
+++ b/gfx/pokemon/jumpluff/anim0.asm
diff --git a/gfx/pics/jumpluff/anim1.asm b/gfx/pokemon/jumpluff/anim1.asm
index 5013b953f..5013b953f 100644
--- a/gfx/pics/jumpluff/anim1.asm
+++ b/gfx/pokemon/jumpluff/anim1.asm
diff --git a/gfx/pics/jumpluff/back.2bpp.lz.b258a699 b/gfx/pokemon/jumpluff/back.2bpp.lz.b258a699
index 57ae8b890..57ae8b890 100644
--- a/gfx/pics/jumpluff/back.2bpp.lz.b258a699
+++ b/gfx/pokemon/jumpluff/back.2bpp.lz.b258a699
diff --git a/gfx/pics/jumpluff/back.png b/gfx/pokemon/jumpluff/back.png
index 1b72ecf2f..1b72ecf2f 100644
--- a/gfx/pics/jumpluff/back.png
+++ b/gfx/pokemon/jumpluff/back.png
diff --git a/gfx/pics/jumpluff/front.animated.2bpp.lz.6d1d8175 b/gfx/pokemon/jumpluff/front.animated.2bpp.lz.6d1d8175
index c3570ed09..c3570ed09 100644
--- a/gfx/pics/jumpluff/front.animated.2bpp.lz.6d1d8175
+++ b/gfx/pokemon/jumpluff/front.animated.2bpp.lz.6d1d8175
diff --git a/gfx/pics/jumpluff/front.png b/gfx/pokemon/jumpluff/front.png
index 1048e3937..1048e3937 100644
--- a/gfx/pics/jumpluff/front.png
+++ b/gfx/pokemon/jumpluff/front.png
diff --git a/gfx/pics/jumpluff/shiny.pal b/gfx/pokemon/jumpluff/shiny.pal
index c553ebebf..c553ebebf 100644
--- a/gfx/pics/jumpluff/shiny.pal
+++ b/gfx/pokemon/jumpluff/shiny.pal
diff --git a/gfx/pics/jynx/anim0.asm b/gfx/pokemon/jynx/anim0.asm
index 78f0e63ed..78f0e63ed 100644
--- a/gfx/pics/jynx/anim0.asm
+++ b/gfx/pokemon/jynx/anim0.asm
diff --git a/gfx/pics/jynx/anim1.asm b/gfx/pokemon/jynx/anim1.asm
index 42f42859c..42f42859c 100644
--- a/gfx/pics/jynx/anim1.asm
+++ b/gfx/pokemon/jynx/anim1.asm
diff --git a/gfx/pics/jynx/back.2bpp.lz.1eef1c1b b/gfx/pokemon/jynx/back.2bpp.lz.1eef1c1b
index 4642ecda7..4642ecda7 100644
--- a/gfx/pics/jynx/back.2bpp.lz.1eef1c1b
+++ b/gfx/pokemon/jynx/back.2bpp.lz.1eef1c1b
diff --git a/gfx/pics/jynx/back.png b/gfx/pokemon/jynx/back.png
index 6478f6099..6478f6099 100644
--- a/gfx/pics/jynx/back.png
+++ b/gfx/pokemon/jynx/back.png
diff --git a/gfx/pics/jynx/front.animated.2bpp.lz.6aaf67b0 b/gfx/pokemon/jynx/front.animated.2bpp.lz.6aaf67b0
index 78a436494..78a436494 100644
--- a/gfx/pics/jynx/front.animated.2bpp.lz.6aaf67b0
+++ b/gfx/pokemon/jynx/front.animated.2bpp.lz.6aaf67b0
diff --git a/gfx/pics/jynx/front.png b/gfx/pokemon/jynx/front.png
index 297a90630..297a90630 100644
--- a/gfx/pics/jynx/front.png
+++ b/gfx/pokemon/jynx/front.png
diff --git a/gfx/pics/jynx/shiny.pal b/gfx/pokemon/jynx/shiny.pal
index 7e6ad315e..7e6ad315e 100644
--- a/gfx/pics/jynx/shiny.pal
+++ b/gfx/pokemon/jynx/shiny.pal
diff --git a/gfx/pics/kabuto/anim0.asm b/gfx/pokemon/kabuto/anim0.asm
index de308c900..de308c900 100644
--- a/gfx/pics/kabuto/anim0.asm
+++ b/gfx/pokemon/kabuto/anim0.asm
diff --git a/gfx/pics/kabuto/anim1.asm b/gfx/pokemon/kabuto/anim1.asm
index 0e347c87d..0e347c87d 100644
--- a/gfx/pics/kabuto/anim1.asm
+++ b/gfx/pokemon/kabuto/anim1.asm
diff --git a/gfx/pics/kabuto/back.2bpp.lz.0717a29b b/gfx/pokemon/kabuto/back.2bpp.lz.0717a29b
index 61390a32e..61390a32e 100644
--- a/gfx/pics/kabuto/back.2bpp.lz.0717a29b
+++ b/gfx/pokemon/kabuto/back.2bpp.lz.0717a29b
diff --git a/gfx/pics/kabuto/back.png b/gfx/pokemon/kabuto/back.png
index acd9444b6..acd9444b6 100644
--- a/gfx/pics/kabuto/back.png
+++ b/gfx/pokemon/kabuto/back.png
diff --git a/gfx/pics/kabuto/front.animated.2bpp.lz.afe4e2dc b/gfx/pokemon/kabuto/front.animated.2bpp.lz.afe4e2dc
index 24a9376c8..24a9376c8 100644
--- a/gfx/pics/kabuto/front.animated.2bpp.lz.afe4e2dc
+++ b/gfx/pokemon/kabuto/front.animated.2bpp.lz.afe4e2dc
diff --git a/gfx/pics/kabuto/front.png b/gfx/pokemon/kabuto/front.png
index c354983ed..c354983ed 100644
--- a/gfx/pics/kabuto/front.png
+++ b/gfx/pokemon/kabuto/front.png
diff --git a/gfx/pics/kabuto/shiny.pal b/gfx/pokemon/kabuto/shiny.pal
index 1248ce809..1248ce809 100644
--- a/gfx/pics/kabuto/shiny.pal
+++ b/gfx/pokemon/kabuto/shiny.pal
diff --git a/gfx/pics/kabutops/anim0.asm b/gfx/pokemon/kabutops/anim0.asm
index f5812126a..f5812126a 100644
--- a/gfx/pics/kabutops/anim0.asm
+++ b/gfx/pokemon/kabutops/anim0.asm
diff --git a/gfx/pics/kabutops/anim1.asm b/gfx/pokemon/kabutops/anim1.asm
index 32a70f827..32a70f827 100644
--- a/gfx/pics/kabutops/anim1.asm
+++ b/gfx/pokemon/kabutops/anim1.asm
diff --git a/gfx/pics/kabutops/back.2bpp.lz.98a1dfc4 b/gfx/pokemon/kabutops/back.2bpp.lz.98a1dfc4
index 507c10e2f..507c10e2f 100644
--- a/gfx/pics/kabutops/back.2bpp.lz.98a1dfc4
+++ b/gfx/pokemon/kabutops/back.2bpp.lz.98a1dfc4
diff --git a/gfx/pics/kabutops/back.png b/gfx/pokemon/kabutops/back.png
index 2a1fde94d..2a1fde94d 100644
--- a/gfx/pics/kabutops/back.png
+++ b/gfx/pokemon/kabutops/back.png
diff --git a/gfx/pics/kabutops/front.animated.2bpp.lz.d5e4bfeb b/gfx/pokemon/kabutops/front.animated.2bpp.lz.d5e4bfeb
index 38d21fa16..38d21fa16 100644
--- a/gfx/pics/kabutops/front.animated.2bpp.lz.d5e4bfeb
+++ b/gfx/pokemon/kabutops/front.animated.2bpp.lz.d5e4bfeb
diff --git a/gfx/pics/kabutops/front.png b/gfx/pokemon/kabutops/front.png
index 776073b50..776073b50 100644
--- a/gfx/pics/kabutops/front.png
+++ b/gfx/pokemon/kabutops/front.png
diff --git a/gfx/pics/kabutops/shiny.pal b/gfx/pokemon/kabutops/shiny.pal
index 5c7ac28cf..5c7ac28cf 100644
--- a/gfx/pics/kabutops/shiny.pal
+++ b/gfx/pokemon/kabutops/shiny.pal
diff --git a/gfx/pics/kadabra/anim0.asm b/gfx/pokemon/kadabra/anim0.asm
index 9b132e26b..9b132e26b 100644
--- a/gfx/pics/kadabra/anim0.asm
+++ b/gfx/pokemon/kadabra/anim0.asm
diff --git a/gfx/pics/kadabra/anim1.asm b/gfx/pokemon/kadabra/anim1.asm
index eabcdb07d..eabcdb07d 100644
--- a/gfx/pics/kadabra/anim1.asm
+++ b/gfx/pokemon/kadabra/anim1.asm
diff --git a/gfx/pics/kadabra/back.2bpp.lz.6b26c1a0 b/gfx/pokemon/kadabra/back.2bpp.lz.6b26c1a0
index 0092147d7..0092147d7 100644
--- a/gfx/pics/kadabra/back.2bpp.lz.6b26c1a0
+++ b/gfx/pokemon/kadabra/back.2bpp.lz.6b26c1a0
diff --git a/gfx/pics/kadabra/back.png b/gfx/pokemon/kadabra/back.png
index 20f615a84..20f615a84 100644
--- a/gfx/pics/kadabra/back.png
+++ b/gfx/pokemon/kadabra/back.png
diff --git a/gfx/pics/kadabra/front.animated.2bpp.lz.bc78f9cf b/gfx/pokemon/kadabra/front.animated.2bpp.lz.bc78f9cf
index 54f47795d..54f47795d 100644
--- a/gfx/pics/kadabra/front.animated.2bpp.lz.bc78f9cf
+++ b/gfx/pokemon/kadabra/front.animated.2bpp.lz.bc78f9cf
diff --git a/gfx/pics/kadabra/front.png b/gfx/pokemon/kadabra/front.png
index 50341a6b3..50341a6b3 100644
--- a/gfx/pics/kadabra/front.png
+++ b/gfx/pokemon/kadabra/front.png
diff --git a/gfx/pics/kadabra/shiny.pal b/gfx/pokemon/kadabra/shiny.pal
index 328319095..328319095 100644
--- a/gfx/pics/kadabra/shiny.pal
+++ b/gfx/pokemon/kadabra/shiny.pal
diff --git a/gfx/pics/kakuna/anim0.asm b/gfx/pokemon/kakuna/anim0.asm
index b67e66e26..b67e66e26 100644
--- a/gfx/pics/kakuna/anim0.asm
+++ b/gfx/pokemon/kakuna/anim0.asm
diff --git a/gfx/pics/kakuna/anim1.asm b/gfx/pokemon/kakuna/anim1.asm
index a7ca98540..a7ca98540 100644
--- a/gfx/pics/kakuna/anim1.asm
+++ b/gfx/pokemon/kakuna/anim1.asm
diff --git a/gfx/pics/kakuna/back.2bpp.lz.3bffa4c3 b/gfx/pokemon/kakuna/back.2bpp.lz.3bffa4c3
index b369857d5..b369857d5 100644
--- a/gfx/pics/kakuna/back.2bpp.lz.3bffa4c3
+++ b/gfx/pokemon/kakuna/back.2bpp.lz.3bffa4c3
diff --git a/gfx/pics/kakuna/back.png b/gfx/pokemon/kakuna/back.png
index b7f2b2e52..b7f2b2e52 100644
--- a/gfx/pics/kakuna/back.png
+++ b/gfx/pokemon/kakuna/back.png
diff --git a/gfx/pics/kakuna/front.animated.2bpp.lz.c7425e72 b/gfx/pokemon/kakuna/front.animated.2bpp.lz.c7425e72
index 2f2431edf..2f2431edf 100644
--- a/gfx/pics/kakuna/front.animated.2bpp.lz.c7425e72
+++ b/gfx/pokemon/kakuna/front.animated.2bpp.lz.c7425e72
diff --git a/gfx/pics/kakuna/front.png b/gfx/pokemon/kakuna/front.png
index b34a398f9..b34a398f9 100644
--- a/gfx/pics/kakuna/front.png
+++ b/gfx/pokemon/kakuna/front.png
diff --git a/gfx/pics/kakuna/shiny.pal b/gfx/pokemon/kakuna/shiny.pal
index 335bdffe9..335bdffe9 100644
--- a/gfx/pics/kakuna/shiny.pal
+++ b/gfx/pokemon/kakuna/shiny.pal
diff --git a/gfx/pics/kangaskhan/anim0.asm b/gfx/pokemon/kangaskhan/anim0.asm
index 34363f893..34363f893 100644
--- a/gfx/pics/kangaskhan/anim0.asm
+++ b/gfx/pokemon/kangaskhan/anim0.asm
diff --git a/gfx/pics/kangaskhan/anim1.asm b/gfx/pokemon/kangaskhan/anim1.asm
index 0da29ec4a..0da29ec4a 100644
--- a/gfx/pics/kangaskhan/anim1.asm
+++ b/gfx/pokemon/kangaskhan/anim1.asm
diff --git a/gfx/pics/kangaskhan/back.2bpp.lz.0d7cc337 b/gfx/pokemon/kangaskhan/back.2bpp.lz.0d7cc337
index c7ff00272..c7ff00272 100644
--- a/gfx/pics/kangaskhan/back.2bpp.lz.0d7cc337
+++ b/gfx/pokemon/kangaskhan/back.2bpp.lz.0d7cc337
diff --git a/gfx/pics/kangaskhan/back.png b/gfx/pokemon/kangaskhan/back.png
index d69e041ca..d69e041ca 100644
--- a/gfx/pics/kangaskhan/back.png
+++ b/gfx/pokemon/kangaskhan/back.png
diff --git a/gfx/pics/kangaskhan/front.animated.2bpp.lz.09c81009 b/gfx/pokemon/kangaskhan/front.animated.2bpp.lz.09c81009
index 1ec58169d..1ec58169d 100644
--- a/gfx/pics/kangaskhan/front.animated.2bpp.lz.09c81009
+++ b/gfx/pokemon/kangaskhan/front.animated.2bpp.lz.09c81009
diff --git a/gfx/pics/kangaskhan/front.png b/gfx/pokemon/kangaskhan/front.png
index abe680c64..abe680c64 100644
--- a/gfx/pics/kangaskhan/front.png
+++ b/gfx/pokemon/kangaskhan/front.png
diff --git a/gfx/pics/kangaskhan/shiny.pal b/gfx/pokemon/kangaskhan/shiny.pal
index 492559959..492559959 100644
--- a/gfx/pics/kangaskhan/shiny.pal
+++ b/gfx/pokemon/kangaskhan/shiny.pal
diff --git a/gfx/pokemon/kanto_frames.asm b/gfx/pokemon/kanto_frames.asm
new file mode 100644
index 000000000..9a7aa7c85
--- /dev/null
+++ b/gfx/pokemon/kanto_frames.asm
@@ -0,0 +1,152 @@
+KantoFrames:
+BulbasaurFrames:  INCLUDE "gfx/pokemon/bulbasaur/frames.asm"
+IvysaurFrames:    INCLUDE "gfx/pokemon/ivysaur/frames.asm"
+VenusaurFrames:   INCLUDE "gfx/pokemon/venusaur/frames.asm"
+CharmanderFrames: INCLUDE "gfx/pokemon/charmander/frames.asm"
+CharmeleonFrames: INCLUDE "gfx/pokemon/charmeleon/frames.asm"
+CharizardFrames:  INCLUDE "gfx/pokemon/charizard/frames.asm"
+SquirtleFrames:   INCLUDE "gfx/pokemon/squirtle/frames.asm"
+WartortleFrames:  INCLUDE "gfx/pokemon/wartortle/frames.asm"
+BlastoiseFrames:  INCLUDE "gfx/pokemon/blastoise/frames.asm"
+CaterpieFrames:   INCLUDE "gfx/pokemon/caterpie/frames.asm"
+MetapodFrames:    INCLUDE "gfx/pokemon/metapod/frames.asm"
+ButterfreeFrames: INCLUDE "gfx/pokemon/butterfree/frames.asm"
+WeedleFrames:     INCLUDE "gfx/pokemon/weedle/frames.asm"
+KakunaFrames:     INCLUDE "gfx/pokemon/kakuna/frames.asm"
+BeedrillFrames:   INCLUDE "gfx/pokemon/beedrill/frames.asm"
+PidgeyFrames:     INCLUDE "gfx/pokemon/pidgey/frames.asm"
+PidgeottoFrames:  INCLUDE "gfx/pokemon/pidgeotto/frames.asm"
+PidgeotFrames:    INCLUDE "gfx/pokemon/pidgeot/frames.asm"
+RattataFrames:    INCLUDE "gfx/pokemon/rattata/frames.asm"
+RaticateFrames:   INCLUDE "gfx/pokemon/raticate/frames.asm"
+SpearowFrames:    INCLUDE "gfx/pokemon/spearow/frames.asm"
+FearowFrames:     INCLUDE "gfx/pokemon/fearow/frames.asm"
+EkansFrames:      INCLUDE "gfx/pokemon/ekans/frames.asm"
+ArbokFrames:      INCLUDE "gfx/pokemon/arbok/frames.asm"
+PikachuFrames:    INCLUDE "gfx/pokemon/pikachu/frames.asm"
+RaichuFrames:     INCLUDE "gfx/pokemon/raichu/frames.asm"
+SandshrewFrames:  INCLUDE "gfx/pokemon/sandshrew/frames.asm"
+SandslashFrames:  INCLUDE "gfx/pokemon/sandslash/frames.asm"
+NidoranFFrames:   INCLUDE "gfx/pokemon/nidoran_f/frames.asm"
+NidorinaFrames:   INCLUDE "gfx/pokemon/nidorina/frames.asm"
+NidoqueenFrames:  INCLUDE "gfx/pokemon/nidoqueen/frames.asm"
+NidoranMFrames:   INCLUDE "gfx/pokemon/nidoran_m/frames.asm"
+NidorinoFrames:   INCLUDE "gfx/pokemon/nidorino/frames.asm"
+NidokingFrames:   INCLUDE "gfx/pokemon/nidoking/frames.asm"
+ClefairyFrames:   INCLUDE "gfx/pokemon/clefairy/frames.asm"
+ClefableFrames:   INCLUDE "gfx/pokemon/clefable/frames.asm"
+VulpixFrames:     INCLUDE "gfx/pokemon/vulpix/frames.asm"
+NinetalesFrames:  INCLUDE "gfx/pokemon/ninetales/frames.asm"
+JigglypuffFrames: INCLUDE "gfx/pokemon/jigglypuff/frames.asm"
+WigglytuffFrames: INCLUDE "gfx/pokemon/wigglytuff/frames.asm"
+ZubatFrames:      INCLUDE "gfx/pokemon/zubat/frames.asm"
+GolbatFrames:     INCLUDE "gfx/pokemon/golbat/frames.asm"
+OddishFrames:     INCLUDE "gfx/pokemon/oddish/frames.asm"
+GloomFrames:      INCLUDE "gfx/pokemon/gloom/frames.asm"
+VileplumeFrames:  INCLUDE "gfx/pokemon/vileplume/frames.asm"
+ParasFrames:      INCLUDE "gfx/pokemon/paras/frames.asm"
+ParasectFrames:   INCLUDE "gfx/pokemon/parasect/frames.asm"
+VenonatFrames:    INCLUDE "gfx/pokemon/venonat/frames.asm"
+VenomothFrames:   INCLUDE "gfx/pokemon/venomoth/frames.asm"
+DiglettFrames:    INCLUDE "gfx/pokemon/diglett/frames.asm"
+DugtrioFrames:    INCLUDE "gfx/pokemon/dugtrio/frames.asm"
+MeowthFrames:     INCLUDE "gfx/pokemon/meowth/frames.asm"
+PersianFrames:    INCLUDE "gfx/pokemon/persian/frames.asm"
+PsyduckFrames:    INCLUDE "gfx/pokemon/psyduck/frames.asm"
+GolduckFrames:    INCLUDE "gfx/pokemon/golduck/frames.asm"
+MankeyFrames:     INCLUDE "gfx/pokemon/mankey/frames.asm"
+PrimeapeFrames:   INCLUDE "gfx/pokemon/primeape/frames.asm"
+GrowlitheFrames:  INCLUDE "gfx/pokemon/growlithe/frames.asm"
+ArcanineFrames:   INCLUDE "gfx/pokemon/arcanine/frames.asm"
+PoliwagFrames:    INCLUDE "gfx/pokemon/poliwag/frames.asm"
+PoliwhirlFrames:  INCLUDE "gfx/pokemon/poliwhirl/frames.asm"
+PoliwrathFrames:  INCLUDE "gfx/pokemon/poliwrath/frames.asm"
+AbraFrames:       INCLUDE "gfx/pokemon/abra/frames.asm"
+KadabraFrames:    INCLUDE "gfx/pokemon/kadabra/frames.asm"
+AlakazamFrames:   INCLUDE "gfx/pokemon/alakazam/frames.asm"
+MachopFrames:     INCLUDE "gfx/pokemon/machop/frames.asm"
+MachokeFrames:    INCLUDE "gfx/pokemon/machoke/frames.asm"
+MachampFrames:    INCLUDE "gfx/pokemon/machamp/frames.asm"
+BellsproutFrames: INCLUDE "gfx/pokemon/bellsprout/frames.asm"
+WeepinbellFrames: INCLUDE "gfx/pokemon/weepinbell/frames.asm"
+VictreebelFrames: INCLUDE "gfx/pokemon/victreebel/frames.asm"
+TentacoolFrames:  INCLUDE "gfx/pokemon/tentacool/frames.asm"
+TentacruelFrames: INCLUDE "gfx/pokemon/tentacruel/frames.asm"
+GeodudeFrames:    INCLUDE "gfx/pokemon/geodude/frames.asm"
+GravelerFrames:   INCLUDE "gfx/pokemon/graveler/frames.asm"
+GolemFrames:      INCLUDE "gfx/pokemon/golem/frames.asm"
+PonytaFrames:     INCLUDE "gfx/pokemon/ponyta/frames.asm"
+RapidashFrames:   INCLUDE "gfx/pokemon/rapidash/frames.asm"
+SlowpokeFrames:   INCLUDE "gfx/pokemon/slowpoke/frames.asm"
+SlowbroFrames:    INCLUDE "gfx/pokemon/slowbro/frames.asm"
+MagnemiteFrames:  INCLUDE "gfx/pokemon/magnemite/frames.asm"
+MagnetonFrames:   INCLUDE "gfx/pokemon/magneton/frames.asm"
+FarfetchDFrames:  INCLUDE "gfx/pokemon/farfetch_d/frames.asm"
+DoduoFrames:      INCLUDE "gfx/pokemon/doduo/frames.asm"
+DodrioFrames:     INCLUDE "gfx/pokemon/dodrio/frames.asm"
+SeelFrames:       INCLUDE "gfx/pokemon/seel/frames.asm"
+DewgongFrames:    INCLUDE "gfx/pokemon/dewgong/frames.asm"
+GrimerFrames:     INCLUDE "gfx/pokemon/grimer/frames.asm"
+MukFrames:        INCLUDE "gfx/pokemon/muk/frames.asm"
+ShellderFrames:   INCLUDE "gfx/pokemon/shellder/frames.asm"
+CloysterFrames:   INCLUDE "gfx/pokemon/cloyster/frames.asm"
+GastlyFrames:     INCLUDE "gfx/pokemon/gastly/frames.asm"
+HaunterFrames:    INCLUDE "gfx/pokemon/haunter/frames.asm"
+GengarFrames:     INCLUDE "gfx/pokemon/gengar/frames.asm"
+OnixFrames:       INCLUDE "gfx/pokemon/onix/frames.asm"
+DrowzeeFrames:    INCLUDE "gfx/pokemon/drowzee/frames.asm"
+HypnoFrames:      INCLUDE "gfx/pokemon/hypno/frames.asm"
+KrabbyFrames:     INCLUDE "gfx/pokemon/krabby/frames.asm"
+KinglerFrames:    INCLUDE "gfx/pokemon/kingler/frames.asm"
+VoltorbFrames:    INCLUDE "gfx/pokemon/voltorb/frames.asm"
+ElectrodeFrames:  INCLUDE "gfx/pokemon/electrode/frames.asm"
+ExeggcuteFrames:  INCLUDE "gfx/pokemon/exeggcute/frames.asm"
+ExeggutorFrames:  INCLUDE "gfx/pokemon/exeggutor/frames.asm"
+CuboneFrames:     INCLUDE "gfx/pokemon/cubone/frames.asm"
+MarowakFrames:    INCLUDE "gfx/pokemon/marowak/frames.asm"
+HitmonleeFrames:  INCLUDE "gfx/pokemon/hitmonlee/frames.asm"
+HitmonchanFrames: INCLUDE "gfx/pokemon/hitmonchan/frames.asm"
+LickitungFrames:  INCLUDE "gfx/pokemon/lickitung/frames.asm"
+KoffingFrames:    INCLUDE "gfx/pokemon/koffing/frames.asm"
+WeezingFrames:    INCLUDE "gfx/pokemon/weezing/frames.asm"
+RhyhornFrames:    INCLUDE "gfx/pokemon/rhyhorn/frames.asm"
+RhydonFrames:     INCLUDE "gfx/pokemon/rhydon/frames.asm"
+ChanseyFrames:    INCLUDE "gfx/pokemon/chansey/frames.asm"
+TangelaFrames:    INCLUDE "gfx/pokemon/tangela/frames.asm"
+KangaskhanFrames: INCLUDE "gfx/pokemon/kangaskhan/frames.asm"
+HorseaFrames:     INCLUDE "gfx/pokemon/horsea/frames.asm"
+SeadraFrames:     INCLUDE "gfx/pokemon/seadra/frames.asm"
+GoldeenFrames:    INCLUDE "gfx/pokemon/goldeen/frames.asm"
+SeakingFrames:    INCLUDE "gfx/pokemon/seaking/frames.asm"
+StaryuFrames:     INCLUDE "gfx/pokemon/staryu/frames.asm"
+StarmieFrames:    INCLUDE "gfx/pokemon/starmie/frames.asm"
+MrMimeFrames:     INCLUDE "gfx/pokemon/mr__mime/frames.asm"
+ScytherFrames:    INCLUDE "gfx/pokemon/scyther/frames.asm"
+JynxFrames:       INCLUDE "gfx/pokemon/jynx/frames.asm"
+ElectabuzzFrames: INCLUDE "gfx/pokemon/electabuzz/frames.asm"
+MagmarFrames:     INCLUDE "gfx/pokemon/magmar/frames.asm"
+PinsirFrames:     INCLUDE "gfx/pokemon/pinsir/frames.asm"
+TaurosFrames:     INCLUDE "gfx/pokemon/tauros/frames.asm"
+MagikarpFrames:   INCLUDE "gfx/pokemon/magikarp/frames.asm"
+GyaradosFrames:   INCLUDE "gfx/pokemon/gyarados/frames.asm"
+LaprasFrames:     INCLUDE "gfx/pokemon/lapras/frames.asm"
+DittoFrames:      INCLUDE "gfx/pokemon/ditto/frames.asm"
+EeveeFrames:      INCLUDE "gfx/pokemon/eevee/frames.asm"
+VaporeonFrames:   INCLUDE "gfx/pokemon/vaporeon/frames.asm"
+JolteonFrames:    INCLUDE "gfx/pokemon/jolteon/frames.asm"
+FlareonFrames:    INCLUDE "gfx/pokemon/flareon/frames.asm"
+PorygonFrames:    INCLUDE "gfx/pokemon/porygon/frames.asm"
+OmanyteFrames:    INCLUDE "gfx/pokemon/omanyte/frames.asm"
+OmastarFrames:    INCLUDE "gfx/pokemon/omastar/frames.asm"
+KabutoFrames:     INCLUDE "gfx/pokemon/kabuto/frames.asm"
+KabutopsFrames:   INCLUDE "gfx/pokemon/kabutops/frames.asm"
+AerodactylFrames: INCLUDE "gfx/pokemon/aerodactyl/frames.asm"
+SnorlaxFrames:    INCLUDE "gfx/pokemon/snorlax/frames.asm"
+ArticunoFrames:   INCLUDE "gfx/pokemon/articuno/frames.asm"
+ZapdosFrames:     INCLUDE "gfx/pokemon/zapdos/frames.asm"
+MoltresFrames:    INCLUDE "gfx/pokemon/moltres/frames.asm"
+DratiniFrames:    INCLUDE "gfx/pokemon/dratini/frames.asm"
+DragonairFrames:  INCLUDE "gfx/pokemon/dragonair/frames.asm"
+DragoniteFrames:  INCLUDE "gfx/pokemon/dragonite/frames.asm"
+MewtwoFrames:     INCLUDE "gfx/pokemon/mewtwo/frames.asm"
+MewFrames:        INCLUDE "gfx/pokemon/mew/frames.asm"
diff --git a/gfx/pics/kingdra/anim0.asm b/gfx/pokemon/kingdra/anim0.asm
index c7bc2991f..c7bc2991f 100644
--- a/gfx/pics/kingdra/anim0.asm
+++ b/gfx/pokemon/kingdra/anim0.asm
diff --git a/gfx/pics/kingdra/anim1.asm b/gfx/pokemon/kingdra/anim1.asm
index 2ec7e99ae..2ec7e99ae 100644
--- a/gfx/pics/kingdra/anim1.asm
+++ b/gfx/pokemon/kingdra/anim1.asm
diff --git a/gfx/pics/kingdra/back.2bpp.lz.e48ecb3f b/gfx/pokemon/kingdra/back.2bpp.lz.e48ecb3f
index 9f2c38b6c..9f2c38b6c 100644
--- a/gfx/pics/kingdra/back.2bpp.lz.e48ecb3f
+++ b/gfx/pokemon/kingdra/back.2bpp.lz.e48ecb3f
diff --git a/gfx/pics/kingdra/back.png b/gfx/pokemon/kingdra/back.png
index 9f0784999..9f0784999 100644
--- a/gfx/pics/kingdra/back.png
+++ b/gfx/pokemon/kingdra/back.png
diff --git a/gfx/pics/kingdra/front.animated.2bpp.lz.668c0516 b/gfx/pokemon/kingdra/front.animated.2bpp.lz.668c0516
index d28a4dc78..d28a4dc78 100644
--- a/gfx/pics/kingdra/front.animated.2bpp.lz.668c0516
+++ b/gfx/pokemon/kingdra/front.animated.2bpp.lz.668c0516
diff --git a/gfx/pics/kingdra/front.png b/gfx/pokemon/kingdra/front.png
index 978f8e91c..978f8e91c 100644
--- a/gfx/pics/kingdra/front.png
+++ b/gfx/pokemon/kingdra/front.png
diff --git a/gfx/pics/kingdra/shiny.pal b/gfx/pokemon/kingdra/shiny.pal
index 2a65783f1..2a65783f1 100644
--- a/gfx/pics/kingdra/shiny.pal
+++ b/gfx/pokemon/kingdra/shiny.pal
diff --git a/gfx/pics/kingler/anim0.asm b/gfx/pokemon/kingler/anim0.asm
index 2be7b62be..2be7b62be 100644
--- a/gfx/pics/kingler/anim0.asm
+++ b/gfx/pokemon/kingler/anim0.asm
diff --git a/gfx/pics/kingler/anim1.asm b/gfx/pokemon/kingler/anim1.asm
index 25af73bc9..25af73bc9 100644
--- a/gfx/pics/kingler/anim1.asm
+++ b/gfx/pokemon/kingler/anim1.asm
diff --git a/gfx/pics/kingler/back.2bpp.lz.88e96d65 b/gfx/pokemon/kingler/back.2bpp.lz.88e96d65
index aceed0679..aceed0679 100644
--- a/gfx/pics/kingler/back.2bpp.lz.88e96d65
+++ b/gfx/pokemon/kingler/back.2bpp.lz.88e96d65
diff --git a/gfx/pics/kingler/back.png b/gfx/pokemon/kingler/back.png
index 02e058053..02e058053 100644
--- a/gfx/pics/kingler/back.png
+++ b/gfx/pokemon/kingler/back.png
diff --git a/gfx/pics/kingler/front.animated.2bpp.lz.35305199 b/gfx/pokemon/kingler/front.animated.2bpp.lz.35305199
index 590bd05ee..590bd05ee 100644
--- a/gfx/pics/kingler/front.animated.2bpp.lz.35305199
+++ b/gfx/pokemon/kingler/front.animated.2bpp.lz.35305199
diff --git a/gfx/pics/kingler/front.png b/gfx/pokemon/kingler/front.png
index 5631d87e7..5631d87e7 100644
--- a/gfx/pics/kingler/front.png
+++ b/gfx/pokemon/kingler/front.png
diff --git a/gfx/pics/kingler/shiny.pal b/gfx/pokemon/kingler/shiny.pal
index 9a9c3818b..9a9c3818b 100644
--- a/gfx/pics/kingler/shiny.pal
+++ b/gfx/pokemon/kingler/shiny.pal
diff --git a/gfx/pics/koffing/anim0.asm b/gfx/pokemon/koffing/anim0.asm
index fc574f528..fc574f528 100644
--- a/gfx/pics/koffing/anim0.asm
+++ b/gfx/pokemon/koffing/anim0.asm
diff --git a/gfx/pics/koffing/anim1.asm b/gfx/pokemon/koffing/anim1.asm
index e0e81b4d3..e0e81b4d3 100644
--- a/gfx/pics/koffing/anim1.asm
+++ b/gfx/pokemon/koffing/anim1.asm
diff --git a/gfx/pics/koffing/back.2bpp.lz.8c0a2526 b/gfx/pokemon/koffing/back.2bpp.lz.8c0a2526
index 2e8762565..2e8762565 100644
--- a/gfx/pics/koffing/back.2bpp.lz.8c0a2526
+++ b/gfx/pokemon/koffing/back.2bpp.lz.8c0a2526
diff --git a/gfx/pics/koffing/back.png b/gfx/pokemon/koffing/back.png
index fd156a89b..fd156a89b 100644
--- a/gfx/pics/koffing/back.png
+++ b/gfx/pokemon/koffing/back.png
diff --git a/gfx/pics/koffing/front.animated.2bpp.lz.00044b3f b/gfx/pokemon/koffing/front.animated.2bpp.lz.00044b3f
index 78de37eeb..78de37eeb 100644
--- a/gfx/pics/koffing/front.animated.2bpp.lz.00044b3f
+++ b/gfx/pokemon/koffing/front.animated.2bpp.lz.00044b3f
diff --git a/gfx/pics/koffing/front.png b/gfx/pokemon/koffing/front.png
index 1468a07f1..1468a07f1 100644
--- a/gfx/pics/koffing/front.png
+++ b/gfx/pokemon/koffing/front.png
diff --git a/gfx/pics/koffing/shiny.pal b/gfx/pokemon/koffing/shiny.pal
index 8132fea04..8132fea04 100644
--- a/gfx/pics/koffing/shiny.pal
+++ b/gfx/pokemon/koffing/shiny.pal
diff --git a/gfx/pics/krabby/anim0.asm b/gfx/pokemon/krabby/anim0.asm
index 22f5657e5..22f5657e5 100644
--- a/gfx/pics/krabby/anim0.asm
+++ b/gfx/pokemon/krabby/anim0.asm
diff --git a/gfx/pics/krabby/anim1.asm b/gfx/pokemon/krabby/anim1.asm
index 0b89ffc33..0b89ffc33 100644
--- a/gfx/pics/krabby/anim1.asm
+++ b/gfx/pokemon/krabby/anim1.asm
diff --git a/gfx/pics/krabby/back.2bpp.lz.2bc2487b b/gfx/pokemon/krabby/back.2bpp.lz.2bc2487b
index 5954b413d..5954b413d 100644
--- a/gfx/pics/krabby/back.2bpp.lz.2bc2487b
+++ b/gfx/pokemon/krabby/back.2bpp.lz.2bc2487b
diff --git a/gfx/pics/krabby/back.png b/gfx/pokemon/krabby/back.png
index baf5a048e..baf5a048e 100644
--- a/gfx/pics/krabby/back.png
+++ b/gfx/pokemon/krabby/back.png
diff --git a/gfx/pics/krabby/front.animated.2bpp.lz.39592514 b/gfx/pokemon/krabby/front.animated.2bpp.lz.39592514
index c0f968fa5..c0f968fa5 100644
--- a/gfx/pics/krabby/front.animated.2bpp.lz.39592514
+++ b/gfx/pokemon/krabby/front.animated.2bpp.lz.39592514
diff --git a/gfx/pics/krabby/front.png b/gfx/pokemon/krabby/front.png
index f790059e8..f790059e8 100644
--- a/gfx/pics/krabby/front.png
+++ b/gfx/pokemon/krabby/front.png
diff --git a/gfx/pics/krabby/shiny.pal b/gfx/pokemon/krabby/shiny.pal
index 57fd91a81..57fd91a81 100644
--- a/gfx/pics/krabby/shiny.pal
+++ b/gfx/pokemon/krabby/shiny.pal
diff --git a/gfx/pics/lanturn/anim0.asm b/gfx/pokemon/lanturn/anim0.asm
index 18882deb5..18882deb5 100644
--- a/gfx/pics/lanturn/anim0.asm
+++ b/gfx/pokemon/lanturn/anim0.asm
diff --git a/gfx/pics/lanturn/anim1.asm b/gfx/pokemon/lanturn/anim1.asm
index d57dd04b1..d57dd04b1 100644
--- a/gfx/pics/lanturn/anim1.asm
+++ b/gfx/pokemon/lanturn/anim1.asm
diff --git a/gfx/pics/lanturn/back.2bpp.lz.8e9c7c1a b/gfx/pokemon/lanturn/back.2bpp.lz.8e9c7c1a
index ea916b7ea..ea916b7ea 100644
--- a/gfx/pics/lanturn/back.2bpp.lz.8e9c7c1a
+++ b/gfx/pokemon/lanturn/back.2bpp.lz.8e9c7c1a
diff --git a/gfx/pics/lanturn/back.png b/gfx/pokemon/lanturn/back.png
index f80ffc742..f80ffc742 100644
--- a/gfx/pics/lanturn/back.png
+++ b/gfx/pokemon/lanturn/back.png
diff --git a/gfx/pics/lanturn/front.animated.2bpp.lz.1bfac161 b/gfx/pokemon/lanturn/front.animated.2bpp.lz.1bfac161
index ba57a1569..ba57a1569 100644
--- a/gfx/pics/lanturn/front.animated.2bpp.lz.1bfac161
+++ b/gfx/pokemon/lanturn/front.animated.2bpp.lz.1bfac161
diff --git a/gfx/pics/lanturn/front.png b/gfx/pokemon/lanturn/front.png
index 5b2eaeb5b..5b2eaeb5b 100644
--- a/gfx/pics/lanturn/front.png
+++ b/gfx/pokemon/lanturn/front.png
diff --git a/gfx/pics/lanturn/shiny.pal b/gfx/pokemon/lanturn/shiny.pal
index e1e3e4fe8..e1e3e4fe8 100644
--- a/gfx/pics/lanturn/shiny.pal
+++ b/gfx/pokemon/lanturn/shiny.pal
diff --git a/gfx/pics/lapras/anim0.asm b/gfx/pokemon/lapras/anim0.asm
index 9ae8f4e5c..9ae8f4e5c 100644
--- a/gfx/pics/lapras/anim0.asm
+++ b/gfx/pokemon/lapras/anim0.asm
diff --git a/gfx/pics/lapras/anim1.asm b/gfx/pokemon/lapras/anim1.asm
index 790cccf05..790cccf05 100644
--- a/gfx/pics/lapras/anim1.asm
+++ b/gfx/pokemon/lapras/anim1.asm
diff --git a/gfx/pics/lapras/back.2bpp.lz.d09351a1 b/gfx/pokemon/lapras/back.2bpp.lz.d09351a1
index 00f6b4329..00f6b4329 100644
--- a/gfx/pics/lapras/back.2bpp.lz.d09351a1
+++ b/gfx/pokemon/lapras/back.2bpp.lz.d09351a1
diff --git a/gfx/pics/lapras/back.png b/gfx/pokemon/lapras/back.png
index 9c17ce376..9c17ce376 100644
--- a/gfx/pics/lapras/back.png
+++ b/gfx/pokemon/lapras/back.png
diff --git a/gfx/pics/lapras/front.animated.2bpp.lz.8290ef8e b/gfx/pokemon/lapras/front.animated.2bpp.lz.8290ef8e
index 0c20fc0be..0c20fc0be 100644
--- a/gfx/pics/lapras/front.animated.2bpp.lz.8290ef8e
+++ b/gfx/pokemon/lapras/front.animated.2bpp.lz.8290ef8e
diff --git a/gfx/pics/lapras/front.png b/gfx/pokemon/lapras/front.png
index f6c2c483b..f6c2c483b 100644
--- a/gfx/pics/lapras/front.png
+++ b/gfx/pokemon/lapras/front.png
diff --git a/gfx/pics/lapras/shiny.pal b/gfx/pokemon/lapras/shiny.pal
index 58fa3bc59..58fa3bc59 100644
--- a/gfx/pics/lapras/shiny.pal
+++ b/gfx/pokemon/lapras/shiny.pal
diff --git a/gfx/pics/larvitar/anim0.asm b/gfx/pokemon/larvitar/anim0.asm
index bb861f733..bb861f733 100644
--- a/gfx/pics/larvitar/anim0.asm
+++ b/gfx/pokemon/larvitar/anim0.asm
diff --git a/gfx/pics/larvitar/anim1.asm b/gfx/pokemon/larvitar/anim1.asm
index 2b87de7be..2b87de7be 100644
--- a/gfx/pics/larvitar/anim1.asm
+++ b/gfx/pokemon/larvitar/anim1.asm
diff --git a/gfx/pics/larvitar/back.2bpp.lz.4b2ac395 b/gfx/pokemon/larvitar/back.2bpp.lz.4b2ac395
index b4122419b..b4122419b 100644
--- a/gfx/pics/larvitar/back.2bpp.lz.4b2ac395
+++ b/gfx/pokemon/larvitar/back.2bpp.lz.4b2ac395
diff --git a/gfx/pics/larvitar/back.png b/gfx/pokemon/larvitar/back.png
index 84e51b20b..84e51b20b 100644
--- a/gfx/pics/larvitar/back.png
+++ b/gfx/pokemon/larvitar/back.png
diff --git a/gfx/pics/larvitar/front.animated.2bpp.lz.83859c57 b/gfx/pokemon/larvitar/front.animated.2bpp.lz.83859c57
index deba5d5a2..deba5d5a2 100644
--- a/gfx/pics/larvitar/front.animated.2bpp.lz.83859c57
+++ b/gfx/pokemon/larvitar/front.animated.2bpp.lz.83859c57
diff --git a/gfx/pics/larvitar/front.png b/gfx/pokemon/larvitar/front.png
index 3f58d0be6..3f58d0be6 100644
--- a/gfx/pics/larvitar/front.png
+++ b/gfx/pokemon/larvitar/front.png
diff --git a/gfx/pics/larvitar/shiny.pal b/gfx/pokemon/larvitar/shiny.pal
index 025a819dc..025a819dc 100644
--- a/gfx/pics/larvitar/shiny.pal
+++ b/gfx/pokemon/larvitar/shiny.pal
diff --git a/gfx/pics/ledian/anim0.asm b/gfx/pokemon/ledian/anim0.asm
index ece77ff44..ece77ff44 100644
--- a/gfx/pics/ledian/anim0.asm
+++ b/gfx/pokemon/ledian/anim0.asm
diff --git a/gfx/pics/ledian/anim1.asm b/gfx/pokemon/ledian/anim1.asm
index cf5a0e011..cf5a0e011 100644
--- a/gfx/pics/ledian/anim1.asm
+++ b/gfx/pokemon/ledian/anim1.asm
diff --git a/gfx/pics/ledian/back.2bpp.lz.48657bbb b/gfx/pokemon/ledian/back.2bpp.lz.48657bbb
index eb996b4e3..eb996b4e3 100644
--- a/gfx/pics/ledian/back.2bpp.lz.48657bbb
+++ b/gfx/pokemon/ledian/back.2bpp.lz.48657bbb
diff --git a/gfx/pics/ledian/back.png b/gfx/pokemon/ledian/back.png
index 6dcd7eb53..6dcd7eb53 100644
--- a/gfx/pics/ledian/back.png
+++ b/gfx/pokemon/ledian/back.png
diff --git a/gfx/pics/ledian/front.animated.2bpp.lz.83e819c3 b/gfx/pokemon/ledian/front.animated.2bpp.lz.83e819c3
index 117d19c14..117d19c14 100644
--- a/gfx/pics/ledian/front.animated.2bpp.lz.83e819c3
+++ b/gfx/pokemon/ledian/front.animated.2bpp.lz.83e819c3
diff --git a/gfx/pics/ledian/front.png b/gfx/pokemon/ledian/front.png
index d5773cbba..d5773cbba 100644
--- a/gfx/pics/ledian/front.png
+++ b/gfx/pokemon/ledian/front.png
diff --git a/gfx/pics/ledian/shiny.pal b/gfx/pokemon/ledian/shiny.pal
index f404bc1d1..f404bc1d1 100644
--- a/gfx/pics/ledian/shiny.pal
+++ b/gfx/pokemon/ledian/shiny.pal
diff --git a/gfx/pics/ledyba/anim0.asm b/gfx/pokemon/ledyba/anim0.asm
index ac4c8e154..ac4c8e154 100644
--- a/gfx/pics/ledyba/anim0.asm
+++ b/gfx/pokemon/ledyba/anim0.asm
diff --git a/gfx/pics/ledyba/anim1.asm b/gfx/pokemon/ledyba/anim1.asm
index d493c5fbc..d493c5fbc 100644
--- a/gfx/pics/ledyba/anim1.asm
+++ b/gfx/pokemon/ledyba/anim1.asm
diff --git a/gfx/pics/ledyba/back.2bpp.lz.d50e8860 b/gfx/pokemon/ledyba/back.2bpp.lz.d50e8860
index 728f4dedb..728f4dedb 100644
--- a/gfx/pics/ledyba/back.2bpp.lz.d50e8860
+++ b/gfx/pokemon/ledyba/back.2bpp.lz.d50e8860
diff --git a/gfx/pics/ledyba/back.png b/gfx/pokemon/ledyba/back.png
index e9f080747..e9f080747 100644
--- a/gfx/pics/ledyba/back.png
+++ b/gfx/pokemon/ledyba/back.png
diff --git a/gfx/pics/ledyba/front.animated.2bpp.lz.1700dc27 b/gfx/pokemon/ledyba/front.animated.2bpp.lz.1700dc27
index fc15ab1ba..fc15ab1ba 100644
--- a/gfx/pics/ledyba/front.animated.2bpp.lz.1700dc27
+++ b/gfx/pokemon/ledyba/front.animated.2bpp.lz.1700dc27
diff --git a/gfx/pics/ledyba/front.png b/gfx/pokemon/ledyba/front.png
index 317670632..317670632 100644
--- a/gfx/pics/ledyba/front.png
+++ b/gfx/pokemon/ledyba/front.png
diff --git a/gfx/pics/ledyba/shiny.pal b/gfx/pokemon/ledyba/shiny.pal
index f404bc1d1..f404bc1d1 100644
--- a/gfx/pics/ledyba/shiny.pal
+++ b/gfx/pokemon/ledyba/shiny.pal
diff --git a/gfx/pics/lickitung/anim0.asm b/gfx/pokemon/lickitung/anim0.asm
index 2fb31e50b..2fb31e50b 100644
--- a/gfx/pics/lickitung/anim0.asm
+++ b/gfx/pokemon/lickitung/anim0.asm
diff --git a/gfx/pics/lickitung/anim1.asm b/gfx/pokemon/lickitung/anim1.asm
index cf0355a03..cf0355a03 100644
--- a/gfx/pics/lickitung/anim1.asm
+++ b/gfx/pokemon/lickitung/anim1.asm
diff --git a/gfx/pics/lickitung/back.2bpp.lz.a127e40b b/gfx/pokemon/lickitung/back.2bpp.lz.a127e40b
index 85764655a..85764655a 100644
--- a/gfx/pics/lickitung/back.2bpp.lz.a127e40b
+++ b/gfx/pokemon/lickitung/back.2bpp.lz.a127e40b
diff --git a/gfx/pics/lickitung/back.png b/gfx/pokemon/lickitung/back.png
index dd6276d7c..dd6276d7c 100644
--- a/gfx/pics/lickitung/back.png
+++ b/gfx/pokemon/lickitung/back.png
diff --git a/gfx/pics/lickitung/front.animated.2bpp.lz.328a7c53 b/gfx/pokemon/lickitung/front.animated.2bpp.lz.328a7c53
index f7e2f4f43..f7e2f4f43 100644
--- a/gfx/pics/lickitung/front.animated.2bpp.lz.328a7c53
+++ b/gfx/pokemon/lickitung/front.animated.2bpp.lz.328a7c53
diff --git a/gfx/pics/lickitung/front.png b/gfx/pokemon/lickitung/front.png
index 9918326e4..9918326e4 100644
--- a/gfx/pics/lickitung/front.png
+++ b/gfx/pokemon/lickitung/front.png
diff --git a/gfx/pics/lickitung/shiny.pal b/gfx/pokemon/lickitung/shiny.pal
index 214a63264..214a63264 100644
--- a/gfx/pics/lickitung/shiny.pal
+++ b/gfx/pokemon/lickitung/shiny.pal
diff --git a/gfx/pics/lugia/anim0.asm b/gfx/pokemon/lugia/anim0.asm
index 3c3c021a5..3c3c021a5 100644
--- a/gfx/pics/lugia/anim0.asm
+++ b/gfx/pokemon/lugia/anim0.asm
diff --git a/gfx/pics/lugia/anim1.asm b/gfx/pokemon/lugia/anim1.asm
index 31f2ea09c..31f2ea09c 100644
--- a/gfx/pics/lugia/anim1.asm
+++ b/gfx/pokemon/lugia/anim1.asm
diff --git a/gfx/pics/lugia/back.2bpp.lz.ad953eb5 b/gfx/pokemon/lugia/back.2bpp.lz.ad953eb5
index 8f7134e13..8f7134e13 100644
--- a/gfx/pics/lugia/back.2bpp.lz.ad953eb5
+++ b/gfx/pokemon/lugia/back.2bpp.lz.ad953eb5
diff --git a/gfx/pics/lugia/back.png b/gfx/pokemon/lugia/back.png
index 07e502f41..07e502f41 100644
--- a/gfx/pics/lugia/back.png
+++ b/gfx/pokemon/lugia/back.png
diff --git a/gfx/pics/lugia/front.animated.2bpp.lz.7293eddc b/gfx/pokemon/lugia/front.animated.2bpp.lz.7293eddc
index b1b300304..b1b300304 100644
--- a/gfx/pics/lugia/front.animated.2bpp.lz.7293eddc
+++ b/gfx/pokemon/lugia/front.animated.2bpp.lz.7293eddc
diff --git a/gfx/pics/lugia/front.png b/gfx/pokemon/lugia/front.png
index 29c21ee3c..29c21ee3c 100644
--- a/gfx/pics/lugia/front.png
+++ b/gfx/pokemon/lugia/front.png
diff --git a/gfx/pics/lugia/shiny.pal b/gfx/pokemon/lugia/shiny.pal
index 22a7970ff..22a7970ff 100644
--- a/gfx/pics/lugia/shiny.pal
+++ b/gfx/pokemon/lugia/shiny.pal
diff --git a/gfx/pics/machamp/anim0.asm b/gfx/pokemon/machamp/anim0.asm
index 6202aefe5..6202aefe5 100644
--- a/gfx/pics/machamp/anim0.asm
+++ b/gfx/pokemon/machamp/anim0.asm
diff --git a/gfx/pics/machamp/anim1.asm b/gfx/pokemon/machamp/anim1.asm
index 5171d3966..5171d3966 100644
--- a/gfx/pics/machamp/anim1.asm
+++ b/gfx/pokemon/machamp/anim1.asm
diff --git a/gfx/pics/machamp/back.2bpp.lz.757f4c29 b/gfx/pokemon/machamp/back.2bpp.lz.757f4c29
index b82d09cce..b82d09cce 100644
--- a/gfx/pics/machamp/back.2bpp.lz.757f4c29
+++ b/gfx/pokemon/machamp/back.2bpp.lz.757f4c29
diff --git a/gfx/pics/machamp/back.png b/gfx/pokemon/machamp/back.png
index 9fd20fd70..9fd20fd70 100644
--- a/gfx/pics/machamp/back.png
+++ b/gfx/pokemon/machamp/back.png
diff --git a/gfx/pics/machamp/front.animated.2bpp.lz.2d408542 b/gfx/pokemon/machamp/front.animated.2bpp.lz.2d408542
index aa1b12edb..aa1b12edb 100644
--- a/gfx/pics/machamp/front.animated.2bpp.lz.2d408542
+++ b/gfx/pokemon/machamp/front.animated.2bpp.lz.2d408542
diff --git a/gfx/pics/machamp/front.png b/gfx/pokemon/machamp/front.png
index b06c66af6..b06c66af6 100644
--- a/gfx/pics/machamp/front.png
+++ b/gfx/pokemon/machamp/front.png
diff --git a/gfx/pics/machamp/shiny.pal b/gfx/pokemon/machamp/shiny.pal
index afe8a06a6..afe8a06a6 100644
--- a/gfx/pics/machamp/shiny.pal
+++ b/gfx/pokemon/machamp/shiny.pal
diff --git a/gfx/pics/machoke/anim0.asm b/gfx/pokemon/machoke/anim0.asm
index 6d89ab174..6d89ab174 100644
--- a/gfx/pics/machoke/anim0.asm
+++ b/gfx/pokemon/machoke/anim0.asm
diff --git a/gfx/pics/machoke/anim1.asm b/gfx/pokemon/machoke/anim1.asm
index c79f108d7..c79f108d7 100644
--- a/gfx/pics/machoke/anim1.asm
+++ b/gfx/pokemon/machoke/anim1.asm
diff --git a/gfx/pics/machoke/back.2bpp.lz.2634245e b/gfx/pokemon/machoke/back.2bpp.lz.2634245e
index e6a0015ed..e6a0015ed 100644
--- a/gfx/pics/machoke/back.2bpp.lz.2634245e
+++ b/gfx/pokemon/machoke/back.2bpp.lz.2634245e
diff --git a/gfx/pics/machoke/back.png b/gfx/pokemon/machoke/back.png
index a6f9c2c4c..a6f9c2c4c 100644
--- a/gfx/pics/machoke/back.png
+++ b/gfx/pokemon/machoke/back.png
diff --git a/gfx/pics/machoke/front.animated.2bpp.lz.f38b95a7 b/gfx/pokemon/machoke/front.animated.2bpp.lz.f38b95a7
index 984f1601f..984f1601f 100644
--- a/gfx/pics/machoke/front.animated.2bpp.lz.f38b95a7
+++ b/gfx/pokemon/machoke/front.animated.2bpp.lz.f38b95a7
diff --git a/gfx/pics/machoke/front.png b/gfx/pokemon/machoke/front.png
index 8c496b08b..8c496b08b 100644
--- a/gfx/pics/machoke/front.png
+++ b/gfx/pokemon/machoke/front.png
diff --git a/gfx/pics/machoke/shiny.pal b/gfx/pokemon/machoke/shiny.pal
index 7dceaa4c1..7dceaa4c1 100644
--- a/gfx/pics/machoke/shiny.pal
+++ b/gfx/pokemon/machoke/shiny.pal
diff --git a/gfx/pics/machop/anim0.asm b/gfx/pokemon/machop/anim0.asm
index 8fee766ce..8fee766ce 100644
--- a/gfx/pics/machop/anim0.asm
+++ b/gfx/pokemon/machop/anim0.asm
diff --git a/gfx/pics/machop/anim1.asm b/gfx/pokemon/machop/anim1.asm
index 20658284d..20658284d 100644
--- a/gfx/pics/machop/anim1.asm
+++ b/gfx/pokemon/machop/anim1.asm
diff --git a/gfx/pics/machop/back.2bpp.lz.bc17b50a b/gfx/pokemon/machop/back.2bpp.lz.bc17b50a
index 96e6d00c6..96e6d00c6 100644
--- a/gfx/pics/machop/back.2bpp.lz.bc17b50a
+++ b/gfx/pokemon/machop/back.2bpp.lz.bc17b50a
diff --git a/gfx/pics/machop/back.png b/gfx/pokemon/machop/back.png
index e463bd456..e463bd456 100644
--- a/gfx/pics/machop/back.png
+++ b/gfx/pokemon/machop/back.png
diff --git a/gfx/pics/machop/front.animated.2bpp.lz.0fd8735f b/gfx/pokemon/machop/front.animated.2bpp.lz.0fd8735f
index 3b5404276..3b5404276 100644
--- a/gfx/pics/machop/front.animated.2bpp.lz.0fd8735f
+++ b/gfx/pokemon/machop/front.animated.2bpp.lz.0fd8735f
diff --git a/gfx/pics/machop/front.png b/gfx/pokemon/machop/front.png
index 4ec28bf2f..4ec28bf2f 100644
--- a/gfx/pics/machop/front.png
+++ b/gfx/pokemon/machop/front.png
diff --git a/gfx/pics/machop/shiny.pal b/gfx/pokemon/machop/shiny.pal
index 0b940effd..0b940effd 100644
--- a/gfx/pics/machop/shiny.pal
+++ b/gfx/pokemon/machop/shiny.pal
diff --git a/gfx/pics/magby/anim0.asm b/gfx/pokemon/magby/anim0.asm
index b0f8c7a10..b0f8c7a10 100644
--- a/gfx/pics/magby/anim0.asm
+++ b/gfx/pokemon/magby/anim0.asm
diff --git a/gfx/pics/magby/anim1.asm b/gfx/pokemon/magby/anim1.asm
index 20b2b7997..20b2b7997 100644
--- a/gfx/pics/magby/anim1.asm
+++ b/gfx/pokemon/magby/anim1.asm
diff --git a/gfx/pics/magby/back.2bpp.lz.e50ccadb b/gfx/pokemon/magby/back.2bpp.lz.e50ccadb
index 8746c640e..8746c640e 100644
--- a/gfx/pics/magby/back.2bpp.lz.e50ccadb
+++ b/gfx/pokemon/magby/back.2bpp.lz.e50ccadb
diff --git a/gfx/pics/magby/back.png b/gfx/pokemon/magby/back.png
index 8d38c2ccb..8d38c2ccb 100644
--- a/gfx/pics/magby/back.png
+++ b/gfx/pokemon/magby/back.png
diff --git a/gfx/pics/magby/front.animated.2bpp.lz.172d0807 b/gfx/pokemon/magby/front.animated.2bpp.lz.172d0807
index b4eac5040..b4eac5040 100644
--- a/gfx/pics/magby/front.animated.2bpp.lz.172d0807
+++ b/gfx/pokemon/magby/front.animated.2bpp.lz.172d0807
diff --git a/gfx/pics/magby/front.png b/gfx/pokemon/magby/front.png
index a966313d7..a966313d7 100644
--- a/gfx/pics/magby/front.png
+++ b/gfx/pokemon/magby/front.png
diff --git a/gfx/pics/magby/shiny.pal b/gfx/pokemon/magby/shiny.pal
index ee96fafd2..ee96fafd2 100644
--- a/gfx/pics/magby/shiny.pal
+++ b/gfx/pokemon/magby/shiny.pal
diff --git a/gfx/pics/magcargo/anim0.asm b/gfx/pokemon/magcargo/anim0.asm
index d6bf7543a..d6bf7543a 100644
--- a/gfx/pics/magcargo/anim0.asm
+++ b/gfx/pokemon/magcargo/anim0.asm
diff --git a/gfx/pics/magcargo/anim1.asm b/gfx/pokemon/magcargo/anim1.asm
index 3c76a44df..3c76a44df 100644
--- a/gfx/pics/magcargo/anim1.asm
+++ b/gfx/pokemon/magcargo/anim1.asm
diff --git a/gfx/pics/magcargo/back.2bpp.lz.56b096bc b/gfx/pokemon/magcargo/back.2bpp.lz.56b096bc
index 5cafe687a..5cafe687a 100644
--- a/gfx/pics/magcargo/back.2bpp.lz.56b096bc
+++ b/gfx/pokemon/magcargo/back.2bpp.lz.56b096bc
diff --git a/gfx/pics/magcargo/back.png b/gfx/pokemon/magcargo/back.png
index a1db71ec2..a1db71ec2 100644
--- a/gfx/pics/magcargo/back.png
+++ b/gfx/pokemon/magcargo/back.png
diff --git a/gfx/pics/magcargo/front.animated.2bpp.lz.53a425f4 b/gfx/pokemon/magcargo/front.animated.2bpp.lz.53a425f4
index 8b2cda00e..8b2cda00e 100644
--- a/gfx/pics/magcargo/front.animated.2bpp.lz.53a425f4
+++ b/gfx/pokemon/magcargo/front.animated.2bpp.lz.53a425f4
diff --git a/gfx/pics/magcargo/front.png b/gfx/pokemon/magcargo/front.png
index f5be029bf..f5be029bf 100644
--- a/gfx/pics/magcargo/front.png
+++ b/gfx/pokemon/magcargo/front.png
diff --git a/gfx/pics/magcargo/shiny.pal b/gfx/pokemon/magcargo/shiny.pal
index a31d8288f..a31d8288f 100644
--- a/gfx/pics/magcargo/shiny.pal
+++ b/gfx/pokemon/magcargo/shiny.pal
diff --git a/gfx/pics/magikarp/anim0.asm b/gfx/pokemon/magikarp/anim0.asm
index f06f21a40..f06f21a40 100644
--- a/gfx/pics/magikarp/anim0.asm
+++ b/gfx/pokemon/magikarp/anim0.asm
diff --git a/gfx/pics/magikarp/anim1.asm b/gfx/pokemon/magikarp/anim1.asm
index 7c3f5cb76..7c3f5cb76 100644
--- a/gfx/pics/magikarp/anim1.asm
+++ b/gfx/pokemon/magikarp/anim1.asm
diff --git a/gfx/pics/magikarp/back.2bpp.lz.7f25810a b/gfx/pokemon/magikarp/back.2bpp.lz.7f25810a
index 17100a9c5..17100a9c5 100644
--- a/gfx/pics/magikarp/back.2bpp.lz.7f25810a
+++ b/gfx/pokemon/magikarp/back.2bpp.lz.7f25810a
diff --git a/gfx/pics/magikarp/back.png b/gfx/pokemon/magikarp/back.png
index 94efb9b92..94efb9b92 100644
--- a/gfx/pics/magikarp/back.png
+++ b/gfx/pokemon/magikarp/back.png
diff --git a/gfx/pics/magikarp/front.animated.2bpp.lz.031ee449 b/gfx/pokemon/magikarp/front.animated.2bpp.lz.031ee449
index 3ec963c7f..3ec963c7f 100644
--- a/gfx/pics/magikarp/front.animated.2bpp.lz.031ee449
+++ b/gfx/pokemon/magikarp/front.animated.2bpp.lz.031ee449
diff --git a/gfx/pics/magikarp/front.png b/gfx/pokemon/magikarp/front.png
index 6358fcbfc..6358fcbfc 100644
--- a/gfx/pics/magikarp/front.png
+++ b/gfx/pokemon/magikarp/front.png
diff --git a/gfx/pics/magikarp/shiny.pal b/gfx/pokemon/magikarp/shiny.pal
index 24fb00761..24fb00761 100644
--- a/gfx/pics/magikarp/shiny.pal
+++ b/gfx/pokemon/magikarp/shiny.pal
diff --git a/gfx/pics/magmar/anim0.asm b/gfx/pokemon/magmar/anim0.asm
index 8fde5d3b5..8fde5d3b5 100644
--- a/gfx/pics/magmar/anim0.asm
+++ b/gfx/pokemon/magmar/anim0.asm
diff --git a/gfx/pics/magmar/anim1.asm b/gfx/pokemon/magmar/anim1.asm
index 784bdcd3d..784bdcd3d 100644
--- a/gfx/pics/magmar/anim1.asm
+++ b/gfx/pokemon/magmar/anim1.asm
diff --git a/gfx/pics/magmar/back.2bpp.lz.6916c87b b/gfx/pokemon/magmar/back.2bpp.lz.6916c87b
index 9b44bab34..9b44bab34 100644
--- a/gfx/pics/magmar/back.2bpp.lz.6916c87b
+++ b/gfx/pokemon/magmar/back.2bpp.lz.6916c87b
diff --git a/gfx/pics/magmar/back.png b/gfx/pokemon/magmar/back.png
index a1ab94d0b..a1ab94d0b 100644
--- a/gfx/pics/magmar/back.png
+++ b/gfx/pokemon/magmar/back.png
diff --git a/gfx/pics/magmar/front.animated.2bpp.lz.0048e21c b/gfx/pokemon/magmar/front.animated.2bpp.lz.0048e21c
index 178afc45f..178afc45f 100644
--- a/gfx/pics/magmar/front.animated.2bpp.lz.0048e21c
+++ b/gfx/pokemon/magmar/front.animated.2bpp.lz.0048e21c
diff --git a/gfx/pics/magmar/front.png b/gfx/pokemon/magmar/front.png
index 386cef0a5..386cef0a5 100644
--- a/gfx/pics/magmar/front.png
+++ b/gfx/pokemon/magmar/front.png
diff --git a/gfx/pics/magmar/shiny.pal b/gfx/pokemon/magmar/shiny.pal
index 0ccf2a2dd..0ccf2a2dd 100644
--- a/gfx/pics/magmar/shiny.pal
+++ b/gfx/pokemon/magmar/shiny.pal
diff --git a/gfx/pics/magnemite/anim0.asm b/gfx/pokemon/magnemite/anim0.asm
index 4f038b0ed..4f038b0ed 100644
--- a/gfx/pics/magnemite/anim0.asm
+++ b/gfx/pokemon/magnemite/anim0.asm
diff --git a/gfx/pics/magnemite/anim1.asm b/gfx/pokemon/magnemite/anim1.asm
index a41239563..a41239563 100644
--- a/gfx/pics/magnemite/anim1.asm
+++ b/gfx/pokemon/magnemite/anim1.asm
diff --git a/gfx/pics/magnemite/back.2bpp.lz.e00bd515 b/gfx/pokemon/magnemite/back.2bpp.lz.e00bd515
index f5cb4f801..f5cb4f801 100644
--- a/gfx/pics/magnemite/back.2bpp.lz.e00bd515
+++ b/gfx/pokemon/magnemite/back.2bpp.lz.e00bd515
diff --git a/gfx/pics/magnemite/back.png b/gfx/pokemon/magnemite/back.png
index a41bbc584..a41bbc584 100644
--- a/gfx/pics/magnemite/back.png
+++ b/gfx/pokemon/magnemite/back.png
diff --git a/gfx/pics/magnemite/front.animated.2bpp.lz.e4b07135 b/gfx/pokemon/magnemite/front.animated.2bpp.lz.e4b07135
index fb221be89..fb221be89 100644
--- a/gfx/pics/magnemite/front.animated.2bpp.lz.e4b07135
+++ b/gfx/pokemon/magnemite/front.animated.2bpp.lz.e4b07135
diff --git a/gfx/pics/magnemite/front.png b/gfx/pokemon/magnemite/front.png
index e42c951de..e42c951de 100644
--- a/gfx/pics/magnemite/front.png
+++ b/gfx/pokemon/magnemite/front.png
diff --git a/gfx/pics/magnemite/shiny.pal b/gfx/pokemon/magnemite/shiny.pal
index 1ebbee13f..1ebbee13f 100644
--- a/gfx/pics/magnemite/shiny.pal
+++ b/gfx/pokemon/magnemite/shiny.pal
diff --git a/gfx/pics/magneton/anim0.asm b/gfx/pokemon/magneton/anim0.asm
index 26b34d4ec..26b34d4ec 100644
--- a/gfx/pics/magneton/anim0.asm
+++ b/gfx/pokemon/magneton/anim0.asm
diff --git a/gfx/pics/magneton/anim1.asm b/gfx/pokemon/magneton/anim1.asm
index 6045d8fae..6045d8fae 100644
--- a/gfx/pics/magneton/anim1.asm
+++ b/gfx/pokemon/magneton/anim1.asm
diff --git a/gfx/pics/magneton/back.2bpp.lz.f7a7089b b/gfx/pokemon/magneton/back.2bpp.lz.f7a7089b
index c029f8cef..c029f8cef 100644
--- a/gfx/pics/magneton/back.2bpp.lz.f7a7089b
+++ b/gfx/pokemon/magneton/back.2bpp.lz.f7a7089b
diff --git a/gfx/pics/magneton/back.png b/gfx/pokemon/magneton/back.png
index 1203c90d0..1203c90d0 100644
--- a/gfx/pics/magneton/back.png
+++ b/gfx/pokemon/magneton/back.png
diff --git a/gfx/pics/magneton/front.animated.2bpp.lz.cd3b65a6 b/gfx/pokemon/magneton/front.animated.2bpp.lz.cd3b65a6
index f7b7a0be0..f7b7a0be0 100644
--- a/gfx/pics/magneton/front.animated.2bpp.lz.cd3b65a6
+++ b/gfx/pokemon/magneton/front.animated.2bpp.lz.cd3b65a6
diff --git a/gfx/pics/magneton/front.png b/gfx/pokemon/magneton/front.png
index fa77862fd..fa77862fd 100644
--- a/gfx/pics/magneton/front.png
+++ b/gfx/pokemon/magneton/front.png
diff --git a/gfx/pics/magneton/shiny.pal b/gfx/pokemon/magneton/shiny.pal
index 54c3a94ac..54c3a94ac 100644
--- a/gfx/pics/magneton/shiny.pal
+++ b/gfx/pokemon/magneton/shiny.pal
diff --git a/gfx/pics/mankey/anim0.asm b/gfx/pokemon/mankey/anim0.asm
index 7d6ef1fa5..7d6ef1fa5 100644
--- a/gfx/pics/mankey/anim0.asm
+++ b/gfx/pokemon/mankey/anim0.asm
diff --git a/gfx/pics/mankey/anim1.asm b/gfx/pokemon/mankey/anim1.asm
index c5874fc6d..c5874fc6d 100644
--- a/gfx/pics/mankey/anim1.asm
+++ b/gfx/pokemon/mankey/anim1.asm
diff --git a/gfx/pics/mankey/back.2bpp.lz.42cb1b61 b/gfx/pokemon/mankey/back.2bpp.lz.42cb1b61
index 62989a377..62989a377 100644
--- a/gfx/pics/mankey/back.2bpp.lz.42cb1b61
+++ b/gfx/pokemon/mankey/back.2bpp.lz.42cb1b61
diff --git a/gfx/pics/mankey/back.png b/gfx/pokemon/mankey/back.png
index ba4901eaa..ba4901eaa 100644
--- a/gfx/pics/mankey/back.png
+++ b/gfx/pokemon/mankey/back.png
diff --git a/gfx/pics/mankey/front.animated.2bpp.lz.48eac19a b/gfx/pokemon/mankey/front.animated.2bpp.lz.48eac19a
index 03d014d87..03d014d87 100644
--- a/gfx/pics/mankey/front.animated.2bpp.lz.48eac19a
+++ b/gfx/pokemon/mankey/front.animated.2bpp.lz.48eac19a
diff --git a/gfx/pics/mankey/front.png b/gfx/pokemon/mankey/front.png
index 1c0c21485..1c0c21485 100644
--- a/gfx/pics/mankey/front.png
+++ b/gfx/pokemon/mankey/front.png
diff --git a/gfx/pics/mankey/shiny.pal b/gfx/pokemon/mankey/shiny.pal
index 455125489..455125489 100644
--- a/gfx/pics/mankey/shiny.pal
+++ b/gfx/pokemon/mankey/shiny.pal
diff --git a/gfx/pics/mantine/anim0.asm b/gfx/pokemon/mantine/anim0.asm
index d0a51de3e..d0a51de3e 100644
--- a/gfx/pics/mantine/anim0.asm
+++ b/gfx/pokemon/mantine/anim0.asm
diff --git a/gfx/pics/mantine/anim1.asm b/gfx/pokemon/mantine/anim1.asm
index f552b1f09..f552b1f09 100644
--- a/gfx/pics/mantine/anim1.asm
+++ b/gfx/pokemon/mantine/anim1.asm
diff --git a/gfx/pics/mantine/back.2bpp.lz.1320b7f3 b/gfx/pokemon/mantine/back.2bpp.lz.1320b7f3
index 3378e2df5..3378e2df5 100644
--- a/gfx/pics/mantine/back.2bpp.lz.1320b7f3
+++ b/gfx/pokemon/mantine/back.2bpp.lz.1320b7f3
diff --git a/gfx/pics/mantine/back.png b/gfx/pokemon/mantine/back.png
index dfb363f40..dfb363f40 100644
--- a/gfx/pics/mantine/back.png
+++ b/gfx/pokemon/mantine/back.png
diff --git a/gfx/pics/mantine/front.animated.2bpp.lz.9eb40d04 b/gfx/pokemon/mantine/front.animated.2bpp.lz.9eb40d04
index 6ebc14050..6ebc14050 100644
--- a/gfx/pics/mantine/front.animated.2bpp.lz.9eb40d04
+++ b/gfx/pokemon/mantine/front.animated.2bpp.lz.9eb40d04
diff --git a/gfx/pics/mantine/front.png b/gfx/pokemon/mantine/front.png
index 1102eb41b..1102eb41b 100644
--- a/gfx/pics/mantine/front.png
+++ b/gfx/pokemon/mantine/front.png
diff --git a/gfx/pics/mantine/shiny.pal b/gfx/pokemon/mantine/shiny.pal
index cd743d8ba..cd743d8ba 100644
--- a/gfx/pics/mantine/shiny.pal
+++ b/gfx/pokemon/mantine/shiny.pal
diff --git a/gfx/pics/mareep/anim0.asm b/gfx/pokemon/mareep/anim0.asm
index e74a78cad..e74a78cad 100644
--- a/gfx/pics/mareep/anim0.asm
+++ b/gfx/pokemon/mareep/anim0.asm
diff --git a/gfx/pics/mareep/anim1.asm b/gfx/pokemon/mareep/anim1.asm
index 21d7a79f8..21d7a79f8 100644
--- a/gfx/pics/mareep/anim1.asm
+++ b/gfx/pokemon/mareep/anim1.asm
diff --git a/gfx/pics/mareep/back.2bpp.lz.b9bdc89c b/gfx/pokemon/mareep/back.2bpp.lz.b9bdc89c
index e703d450f..e703d450f 100644
--- a/gfx/pics/mareep/back.2bpp.lz.b9bdc89c
+++ b/gfx/pokemon/mareep/back.2bpp.lz.b9bdc89c
diff --git a/gfx/pics/mareep/back.png b/gfx/pokemon/mareep/back.png
index f0a89696c..f0a89696c 100644
--- a/gfx/pics/mareep/back.png
+++ b/gfx/pokemon/mareep/back.png
diff --git a/gfx/pics/mareep/front.animated.2bpp.lz.f660483d b/gfx/pokemon/mareep/front.animated.2bpp.lz.f660483d
index 0245a96cd..0245a96cd 100644
--- a/gfx/pics/mareep/front.animated.2bpp.lz.f660483d
+++ b/gfx/pokemon/mareep/front.animated.2bpp.lz.f660483d
diff --git a/gfx/pics/mareep/front.png b/gfx/pokemon/mareep/front.png
index 3ab91d605..3ab91d605 100644
--- a/gfx/pics/mareep/front.png
+++ b/gfx/pokemon/mareep/front.png
diff --git a/gfx/pics/mareep/shiny.pal b/gfx/pokemon/mareep/shiny.pal
index 7e4fe925b..7e4fe925b 100644
--- a/gfx/pics/mareep/shiny.pal
+++ b/gfx/pokemon/mareep/shiny.pal
diff --git a/gfx/pics/marill/anim0.asm b/gfx/pokemon/marill/anim0.asm
index 5b8c7fc2a..5b8c7fc2a 100644
--- a/gfx/pics/marill/anim0.asm
+++ b/gfx/pokemon/marill/anim0.asm
diff --git a/gfx/pics/marill/anim1.asm b/gfx/pokemon/marill/anim1.asm
index 3be2dd1dc..3be2dd1dc 100644
--- a/gfx/pics/marill/anim1.asm
+++ b/gfx/pokemon/marill/anim1.asm
diff --git a/gfx/pics/marill/back.2bpp.lz.87e2be16 b/gfx/pokemon/marill/back.2bpp.lz.87e2be16
index 699fdaf6c..699fdaf6c 100644
--- a/gfx/pics/marill/back.2bpp.lz.87e2be16
+++ b/gfx/pokemon/marill/back.2bpp.lz.87e2be16
diff --git a/gfx/pics/marill/back.png b/gfx/pokemon/marill/back.png
index 59af13b35..59af13b35 100644
--- a/gfx/pics/marill/back.png
+++ b/gfx/pokemon/marill/back.png
diff --git a/gfx/pics/marill/front.animated.2bpp.lz.7f742686 b/gfx/pokemon/marill/front.animated.2bpp.lz.7f742686
index abe4c982a..abe4c982a 100644
--- a/gfx/pics/marill/front.animated.2bpp.lz.7f742686
+++ b/gfx/pokemon/marill/front.animated.2bpp.lz.7f742686
diff --git a/gfx/pics/marill/front.png b/gfx/pokemon/marill/front.png
index 5b07959aa..5b07959aa 100644
--- a/gfx/pics/marill/front.png
+++ b/gfx/pokemon/marill/front.png
diff --git a/gfx/pics/marill/shiny.pal b/gfx/pokemon/marill/shiny.pal
index e75fe9208..e75fe9208 100644
--- a/gfx/pics/marill/shiny.pal
+++ b/gfx/pokemon/marill/shiny.pal
diff --git a/gfx/pics/marowak/anim0.asm b/gfx/pokemon/marowak/anim0.asm
index 23c9d2f92..23c9d2f92 100644
--- a/gfx/pics/marowak/anim0.asm
+++ b/gfx/pokemon/marowak/anim0.asm
diff --git a/gfx/pics/marowak/anim1.asm b/gfx/pokemon/marowak/anim1.asm
index 5cdcd7594..5cdcd7594 100644
--- a/gfx/pics/marowak/anim1.asm
+++ b/gfx/pokemon/marowak/anim1.asm
diff --git a/gfx/pics/marowak/back.2bpp.lz.055ba40e b/gfx/pokemon/marowak/back.2bpp.lz.055ba40e
index 90a297b3d..90a297b3d 100644
--- a/gfx/pics/marowak/back.2bpp.lz.055ba40e
+++ b/gfx/pokemon/marowak/back.2bpp.lz.055ba40e
diff --git a/gfx/pics/marowak/back.png b/gfx/pokemon/marowak/back.png
index e10e17dc2..e10e17dc2 100644
--- a/gfx/pics/marowak/back.png
+++ b/gfx/pokemon/marowak/back.png
diff --git a/gfx/pics/marowak/front.animated.2bpp.lz.ef1553a0 b/gfx/pokemon/marowak/front.animated.2bpp.lz.ef1553a0
index 59f984bcd..59f984bcd 100644
--- a/gfx/pics/marowak/front.animated.2bpp.lz.ef1553a0
+++ b/gfx/pokemon/marowak/front.animated.2bpp.lz.ef1553a0
diff --git a/gfx/pics/marowak/front.png b/gfx/pokemon/marowak/front.png
index 4007d0486..4007d0486 100644
--- a/gfx/pics/marowak/front.png
+++ b/gfx/pokemon/marowak/front.png
diff --git a/gfx/pics/marowak/shiny.pal b/gfx/pokemon/marowak/shiny.pal
index 2f2093469..2f2093469 100644
--- a/gfx/pics/marowak/shiny.pal
+++ b/gfx/pokemon/marowak/shiny.pal
diff --git a/gfx/pics/meganium/anim0.asm b/gfx/pokemon/meganium/anim0.asm
index adf80db8f..adf80db8f 100644
--- a/gfx/pics/meganium/anim0.asm
+++ b/gfx/pokemon/meganium/anim0.asm
diff --git a/gfx/pics/meganium/anim1.asm b/gfx/pokemon/meganium/anim1.asm
index f28c9d97a..f28c9d97a 100644
--- a/gfx/pics/meganium/anim1.asm
+++ b/gfx/pokemon/meganium/anim1.asm
diff --git a/gfx/pics/meganium/back.2bpp.lz.d25a5edb b/gfx/pokemon/meganium/back.2bpp.lz.d25a5edb
index 718f66f87..718f66f87 100644
--- a/gfx/pics/meganium/back.2bpp.lz.d25a5edb
+++ b/gfx/pokemon/meganium/back.2bpp.lz.d25a5edb
diff --git a/gfx/pics/meganium/back.png b/gfx/pokemon/meganium/back.png
index 5f51bdbff..5f51bdbff 100644
--- a/gfx/pics/meganium/back.png
+++ b/gfx/pokemon/meganium/back.png
diff --git a/gfx/pics/meganium/front.animated.2bpp.lz.fe0b9df4 b/gfx/pokemon/meganium/front.animated.2bpp.lz.fe0b9df4
index 84f600d60..84f600d60 100644
--- a/gfx/pics/meganium/front.animated.2bpp.lz.fe0b9df4
+++ b/gfx/pokemon/meganium/front.animated.2bpp.lz.fe0b9df4
diff --git a/gfx/pics/meganium/front.png b/gfx/pokemon/meganium/front.png
index f520626a9..f520626a9 100644
--- a/gfx/pics/meganium/front.png
+++ b/gfx/pokemon/meganium/front.png
diff --git a/gfx/pics/meganium/shiny.pal b/gfx/pokemon/meganium/shiny.pal
index b09a172f6..b09a172f6 100644
--- a/gfx/pics/meganium/shiny.pal
+++ b/gfx/pokemon/meganium/shiny.pal
diff --git a/gfx/pics/meowth/anim0.asm b/gfx/pokemon/meowth/anim0.asm
index ff95e9c6d..ff95e9c6d 100644
--- a/gfx/pics/meowth/anim0.asm
+++ b/gfx/pokemon/meowth/anim0.asm
diff --git a/gfx/pics/meowth/anim1.asm b/gfx/pokemon/meowth/anim1.asm
index 7f1e9eba8..7f1e9eba8 100644
--- a/gfx/pics/meowth/anim1.asm
+++ b/gfx/pokemon/meowth/anim1.asm
diff --git a/gfx/pics/meowth/back.2bpp.lz.4196bd91 b/gfx/pokemon/meowth/back.2bpp.lz.4196bd91
index 205b106e9..205b106e9 100644
--- a/gfx/pics/meowth/back.2bpp.lz.4196bd91
+++ b/gfx/pokemon/meowth/back.2bpp.lz.4196bd91
diff --git a/gfx/pics/meowth/back.png b/gfx/pokemon/meowth/back.png
index 3883a636b..3883a636b 100644
--- a/gfx/pics/meowth/back.png
+++ b/gfx/pokemon/meowth/back.png
diff --git a/gfx/pics/meowth/front.animated.2bpp.lz.144f12f0 b/gfx/pokemon/meowth/front.animated.2bpp.lz.144f12f0
index 87ff35366..87ff35366 100644
--- a/gfx/pics/meowth/front.animated.2bpp.lz.144f12f0
+++ b/gfx/pokemon/meowth/front.animated.2bpp.lz.144f12f0
diff --git a/gfx/pics/meowth/front.png b/gfx/pokemon/meowth/front.png
index 55c5bf38a..55c5bf38a 100644
--- a/gfx/pics/meowth/front.png
+++ b/gfx/pokemon/meowth/front.png
diff --git a/gfx/pics/meowth/shiny.pal b/gfx/pokemon/meowth/shiny.pal
index 3ca34fc76..3ca34fc76 100644
--- a/gfx/pics/meowth/shiny.pal
+++ b/gfx/pokemon/meowth/shiny.pal
diff --git a/gfx/pics/metapod/anim0.asm b/gfx/pokemon/metapod/anim0.asm
index da76c7094..da76c7094 100644
--- a/gfx/pics/metapod/anim0.asm
+++ b/gfx/pokemon/metapod/anim0.asm
diff --git a/gfx/pics/metapod/anim1.asm b/gfx/pokemon/metapod/anim1.asm
index e22d46cb7..e22d46cb7 100644
--- a/gfx/pics/metapod/anim1.asm
+++ b/gfx/pokemon/metapod/anim1.asm
diff --git a/gfx/pics/metapod/back.2bpp.lz.b580afc8 b/gfx/pokemon/metapod/back.2bpp.lz.b580afc8
index a2a446960..a2a446960 100644
--- a/gfx/pics/metapod/back.2bpp.lz.b580afc8
+++ b/gfx/pokemon/metapod/back.2bpp.lz.b580afc8
diff --git a/gfx/pics/metapod/back.png b/gfx/pokemon/metapod/back.png
index 7906fb6b7..7906fb6b7 100644
--- a/gfx/pics/metapod/back.png
+++ b/gfx/pokemon/metapod/back.png
diff --git a/gfx/pics/metapod/front.animated.2bpp.lz.5025baa2 b/gfx/pokemon/metapod/front.animated.2bpp.lz.5025baa2
index 1dcd7a501..1dcd7a501 100644
--- a/gfx/pics/metapod/front.animated.2bpp.lz.5025baa2
+++ b/gfx/pokemon/metapod/front.animated.2bpp.lz.5025baa2
diff --git a/gfx/pics/metapod/front.png b/gfx/pokemon/metapod/front.png
index d67b1c516..d67b1c516 100644
--- a/gfx/pics/metapod/front.png
+++ b/gfx/pokemon/metapod/front.png
diff --git a/gfx/pics/metapod/shiny.pal b/gfx/pokemon/metapod/shiny.pal
index 4d0b72658..4d0b72658 100644
--- a/gfx/pics/metapod/shiny.pal
+++ b/gfx/pokemon/metapod/shiny.pal
diff --git a/gfx/pics/mew/anim0.asm b/gfx/pokemon/mew/anim0.asm
index b01e307de..b01e307de 100644
--- a/gfx/pics/mew/anim0.asm
+++ b/gfx/pokemon/mew/anim0.asm
diff --git a/gfx/pics/mew/anim1.asm b/gfx/pokemon/mew/anim1.asm
index c22e552cb..c22e552cb 100644
--- a/gfx/pics/mew/anim1.asm
+++ b/gfx/pokemon/mew/anim1.asm
diff --git a/gfx/pics/mew/back.2bpp.lz.9947d6eb b/gfx/pokemon/mew/back.2bpp.lz.9947d6eb
index 388a8de9e..388a8de9e 100644
--- a/gfx/pics/mew/back.2bpp.lz.9947d6eb
+++ b/gfx/pokemon/mew/back.2bpp.lz.9947d6eb
diff --git a/gfx/pics/mew/back.png b/gfx/pokemon/mew/back.png
index 310328a39..310328a39 100644
--- a/gfx/pics/mew/back.png
+++ b/gfx/pokemon/mew/back.png
diff --git a/gfx/pics/mew/front.animated.2bpp.lz.b6da9713 b/gfx/pokemon/mew/front.animated.2bpp.lz.b6da9713
index 240965783..240965783 100644
--- a/gfx/pics/mew/front.animated.2bpp.lz.b6da9713
+++ b/gfx/pokemon/mew/front.animated.2bpp.lz.b6da9713
diff --git a/gfx/pics/mew/front.png b/gfx/pokemon/mew/front.png
index 2a93d8303..2a93d8303 100644
--- a/gfx/pics/mew/front.png
+++ b/gfx/pokemon/mew/front.png
diff --git a/gfx/pics/mew/shiny.pal b/gfx/pokemon/mew/shiny.pal
index 9b1a1cced..9b1a1cced 100644
--- a/gfx/pics/mew/shiny.pal
+++ b/gfx/pokemon/mew/shiny.pal
diff --git a/gfx/pics/mewtwo/anim0.asm b/gfx/pokemon/mewtwo/anim0.asm
index 78682c111..78682c111 100644
--- a/gfx/pics/mewtwo/anim0.asm
+++ b/gfx/pokemon/mewtwo/anim0.asm
diff --git a/gfx/pics/mewtwo/anim1.asm b/gfx/pokemon/mewtwo/anim1.asm
index a80a56899..a80a56899 100644
--- a/gfx/pics/mewtwo/anim1.asm
+++ b/gfx/pokemon/mewtwo/anim1.asm
diff --git a/gfx/pics/mewtwo/back.2bpp.lz.a7d2c077 b/gfx/pokemon/mewtwo/back.2bpp.lz.a7d2c077
index 3be56c470..3be56c470 100644
--- a/gfx/pics/mewtwo/back.2bpp.lz.a7d2c077
+++ b/gfx/pokemon/mewtwo/back.2bpp.lz.a7d2c077
diff --git a/gfx/pics/mewtwo/back.png b/gfx/pokemon/mewtwo/back.png
index e9675aaad..e9675aaad 100644
--- a/gfx/pics/mewtwo/back.png
+++ b/gfx/pokemon/mewtwo/back.png
diff --git a/gfx/pics/mewtwo/front.animated.2bpp.lz.45e8b40d b/gfx/pokemon/mewtwo/front.animated.2bpp.lz.45e8b40d
index 35cc2c378..35cc2c378 100644
--- a/gfx/pics/mewtwo/front.animated.2bpp.lz.45e8b40d
+++ b/gfx/pokemon/mewtwo/front.animated.2bpp.lz.45e8b40d
diff --git a/gfx/pics/mewtwo/front.png b/gfx/pokemon/mewtwo/front.png
index 07ab0771b..07ab0771b 100644
--- a/gfx/pics/mewtwo/front.png
+++ b/gfx/pokemon/mewtwo/front.png
diff --git a/gfx/pics/mewtwo/shiny.pal b/gfx/pokemon/mewtwo/shiny.pal
index c5dec4c3b..c5dec4c3b 100644
--- a/gfx/pics/mewtwo/shiny.pal
+++ b/gfx/pokemon/mewtwo/shiny.pal
diff --git a/gfx/pics/miltank/anim0.asm b/gfx/pokemon/miltank/anim0.asm
index 6d12f2d5d..6d12f2d5d 100644
--- a/gfx/pics/miltank/anim0.asm
+++ b/gfx/pokemon/miltank/anim0.asm
diff --git a/gfx/pics/miltank/anim1.asm b/gfx/pokemon/miltank/anim1.asm
index a6a76db7b..a6a76db7b 100644
--- a/gfx/pics/miltank/anim1.asm
+++ b/gfx/pokemon/miltank/anim1.asm
diff --git a/gfx/pics/miltank/back.2bpp.lz.b7787e72 b/gfx/pokemon/miltank/back.2bpp.lz.b7787e72
index 150f65c54..150f65c54 100644
--- a/gfx/pics/miltank/back.2bpp.lz.b7787e72
+++ b/gfx/pokemon/miltank/back.2bpp.lz.b7787e72
diff --git a/gfx/pics/miltank/back.png b/gfx/pokemon/miltank/back.png
index 28c4a906f..28c4a906f 100644
--- a/gfx/pics/miltank/back.png
+++ b/gfx/pokemon/miltank/back.png
diff --git a/gfx/pics/miltank/front.animated.2bpp.lz.91da7c3b b/gfx/pokemon/miltank/front.animated.2bpp.lz.91da7c3b
index 969d04fcd..969d04fcd 100644
--- a/gfx/pics/miltank/front.animated.2bpp.lz.91da7c3b
+++ b/gfx/pokemon/miltank/front.animated.2bpp.lz.91da7c3b
diff --git a/gfx/pics/miltank/front.png b/gfx/pokemon/miltank/front.png
index b0965c8f6..b0965c8f6 100644
--- a/gfx/pics/miltank/front.png
+++ b/gfx/pokemon/miltank/front.png
diff --git a/gfx/pics/miltank/shiny.pal b/gfx/pokemon/miltank/shiny.pal
index 37792fe7e..37792fe7e 100644
--- a/gfx/pics/miltank/shiny.pal
+++ b/gfx/pokemon/miltank/shiny.pal
diff --git a/gfx/pics/misdreavus/anim0.asm b/gfx/pokemon/misdreavus/anim0.asm
index d833c96fb..d833c96fb 100644
--- a/gfx/pics/misdreavus/anim0.asm
+++ b/gfx/pokemon/misdreavus/anim0.asm
diff --git a/gfx/pics/misdreavus/anim1.asm b/gfx/pokemon/misdreavus/anim1.asm
index 3f0ee9517..3f0ee9517 100644
--- a/gfx/pics/misdreavus/anim1.asm
+++ b/gfx/pokemon/misdreavus/anim1.asm
diff --git a/gfx/pics/misdreavus/back.2bpp.lz.8bdebfce b/gfx/pokemon/misdreavus/back.2bpp.lz.8bdebfce
index 5cf96e821..5cf96e821 100644
--- a/gfx/pics/misdreavus/back.2bpp.lz.8bdebfce
+++ b/gfx/pokemon/misdreavus/back.2bpp.lz.8bdebfce
diff --git a/gfx/pics/misdreavus/back.png b/gfx/pokemon/misdreavus/back.png
index 890f1da22..890f1da22 100644
--- a/gfx/pics/misdreavus/back.png
+++ b/gfx/pokemon/misdreavus/back.png
diff --git a/gfx/pics/misdreavus/front.animated.2bpp.lz.5f73baa2 b/gfx/pokemon/misdreavus/front.animated.2bpp.lz.5f73baa2
index 76f5c6919..76f5c6919 100644
--- a/gfx/pics/misdreavus/front.animated.2bpp.lz.5f73baa2
+++ b/gfx/pokemon/misdreavus/front.animated.2bpp.lz.5f73baa2
diff --git a/gfx/pics/misdreavus/front.png b/gfx/pokemon/misdreavus/front.png
index 05c2dd338..05c2dd338 100644
--- a/gfx/pics/misdreavus/front.png
+++ b/gfx/pokemon/misdreavus/front.png
diff --git a/gfx/pics/misdreavus/shiny.pal b/gfx/pokemon/misdreavus/shiny.pal
index dbd1aac54..dbd1aac54 100644
--- a/gfx/pics/misdreavus/shiny.pal
+++ b/gfx/pokemon/misdreavus/shiny.pal
diff --git a/gfx/pics/moltres/anim0.asm b/gfx/pokemon/moltres/anim0.asm
index 220626749..220626749 100644
--- a/gfx/pics/moltres/anim0.asm
+++ b/gfx/pokemon/moltres/anim0.asm
diff --git a/gfx/pics/moltres/anim1.asm b/gfx/pokemon/moltres/anim1.asm
index 258191b6e..258191b6e 100644
--- a/gfx/pics/moltres/anim1.asm
+++ b/gfx/pokemon/moltres/anim1.asm
diff --git a/gfx/pics/moltres/back.2bpp.lz.356242c8 b/gfx/pokemon/moltres/back.2bpp.lz.356242c8
index 542a73138..542a73138 100644
--- a/gfx/pics/moltres/back.2bpp.lz.356242c8
+++ b/gfx/pokemon/moltres/back.2bpp.lz.356242c8
diff --git a/gfx/pics/moltres/back.png b/gfx/pokemon/moltres/back.png
index b8df5c699..b8df5c699 100644
--- a/gfx/pics/moltres/back.png
+++ b/gfx/pokemon/moltres/back.png
diff --git a/gfx/pics/moltres/front.animated.2bpp.lz.281bc0ec b/gfx/pokemon/moltres/front.animated.2bpp.lz.281bc0ec
index ec03e4653..ec03e4653 100644
--- a/gfx/pics/moltres/front.animated.2bpp.lz.281bc0ec
+++ b/gfx/pokemon/moltres/front.animated.2bpp.lz.281bc0ec
diff --git a/gfx/pics/moltres/front.png b/gfx/pokemon/moltres/front.png
index fa41824b6..fa41824b6 100644
--- a/gfx/pics/moltres/front.png
+++ b/gfx/pokemon/moltres/front.png
diff --git a/gfx/pics/moltres/shiny.pal b/gfx/pokemon/moltres/shiny.pal
index 523732d45..523732d45 100644
--- a/gfx/pics/moltres/shiny.pal
+++ b/gfx/pokemon/moltres/shiny.pal
diff --git a/gfx/pics/mr__mime/anim0.asm b/gfx/pokemon/mr__mime/anim0.asm
index fcb597a5a..fcb597a5a 100644
--- a/gfx/pics/mr__mime/anim0.asm
+++ b/gfx/pokemon/mr__mime/anim0.asm
diff --git a/gfx/pics/mr__mime/anim1.asm b/gfx/pokemon/mr__mime/anim1.asm
index c3747ac1e..c3747ac1e 100644
--- a/gfx/pics/mr__mime/anim1.asm
+++ b/gfx/pokemon/mr__mime/anim1.asm
diff --git a/gfx/pics/mr__mime/back.2bpp.lz.0fb88006 b/gfx/pokemon/mr__mime/back.2bpp.lz.0fb88006
index eb1647580..eb1647580 100644
--- a/gfx/pics/mr__mime/back.2bpp.lz.0fb88006
+++ b/gfx/pokemon/mr__mime/back.2bpp.lz.0fb88006
diff --git a/gfx/pics/mr__mime/back.png b/gfx/pokemon/mr__mime/back.png
index 6deab1929..6deab1929 100644
--- a/gfx/pics/mr__mime/back.png
+++ b/gfx/pokemon/mr__mime/back.png
diff --git a/gfx/pics/mr__mime/front.animated.2bpp.lz.f948d1b8 b/gfx/pokemon/mr__mime/front.animated.2bpp.lz.f948d1b8
index 48555cbe0..48555cbe0 100644
--- a/gfx/pics/mr__mime/front.animated.2bpp.lz.f948d1b8
+++ b/gfx/pokemon/mr__mime/front.animated.2bpp.lz.f948d1b8
diff --git a/gfx/pics/mr__mime/front.png b/gfx/pokemon/mr__mime/front.png
index 578a0286b..578a0286b 100644
--- a/gfx/pics/mr__mime/front.png
+++ b/gfx/pokemon/mr__mime/front.png
diff --git a/gfx/pics/mr__mime/shiny.pal b/gfx/pokemon/mr__mime/shiny.pal
index d9a2accd2..d9a2accd2 100644
--- a/gfx/pics/mr__mime/shiny.pal
+++ b/gfx/pokemon/mr__mime/shiny.pal
diff --git a/gfx/pics/muk/anim0.asm b/gfx/pokemon/muk/anim0.asm
index 1bacba421..1bacba421 100644
--- a/gfx/pics/muk/anim0.asm
+++ b/gfx/pokemon/muk/anim0.asm
diff --git a/gfx/pics/muk/anim1.asm b/gfx/pokemon/muk/anim1.asm
index db37bf515..db37bf515 100644
--- a/gfx/pics/muk/anim1.asm
+++ b/gfx/pokemon/muk/anim1.asm
diff --git a/gfx/pics/muk/back.2bpp.lz.a1f2f370 b/gfx/pokemon/muk/back.2bpp.lz.a1f2f370
index 63a6aa8de..63a6aa8de 100644
--- a/gfx/pics/muk/back.2bpp.lz.a1f2f370
+++ b/gfx/pokemon/muk/back.2bpp.lz.a1f2f370
diff --git a/gfx/pics/muk/back.png b/gfx/pokemon/muk/back.png
index e610da01c..e610da01c 100644
--- a/gfx/pics/muk/back.png
+++ b/gfx/pokemon/muk/back.png
diff --git a/gfx/pics/muk/front.animated.2bpp.lz.530363b2 b/gfx/pokemon/muk/front.animated.2bpp.lz.530363b2
index 3a4280270..3a4280270 100644
--- a/gfx/pics/muk/front.animated.2bpp.lz.530363b2
+++ b/gfx/pokemon/muk/front.animated.2bpp.lz.530363b2
diff --git a/gfx/pics/muk/front.png b/gfx/pokemon/muk/front.png
index c4369d8a6..c4369d8a6 100644
--- a/gfx/pics/muk/front.png
+++ b/gfx/pokemon/muk/front.png
diff --git a/gfx/pics/muk/shiny.pal b/gfx/pokemon/muk/shiny.pal
index 34c8de27e..34c8de27e 100644
--- a/gfx/pics/muk/shiny.pal
+++ b/gfx/pokemon/muk/shiny.pal
diff --git a/gfx/pics/murkrow/anim0.asm b/gfx/pokemon/murkrow/anim0.asm
index 8f0ca6a72..8f0ca6a72 100644
--- a/gfx/pics/murkrow/anim0.asm
+++ b/gfx/pokemon/murkrow/anim0.asm
diff --git a/gfx/pics/murkrow/anim1.asm b/gfx/pokemon/murkrow/anim1.asm
index 85e2f9c56..85e2f9c56 100644
--- a/gfx/pics/murkrow/anim1.asm
+++ b/gfx/pokemon/murkrow/anim1.asm
diff --git a/gfx/pics/murkrow/back.2bpp.lz.0c347b5b b/gfx/pokemon/murkrow/back.2bpp.lz.0c347b5b
index b99287081..b99287081 100644
--- a/gfx/pics/murkrow/back.2bpp.lz.0c347b5b
+++ b/gfx/pokemon/murkrow/back.2bpp.lz.0c347b5b
diff --git a/gfx/pics/murkrow/back.png b/gfx/pokemon/murkrow/back.png
index 255471a39..255471a39 100644
--- a/gfx/pics/murkrow/back.png
+++ b/gfx/pokemon/murkrow/back.png
diff --git a/gfx/pics/murkrow/front.animated.2bpp.lz.5d2805e8 b/gfx/pokemon/murkrow/front.animated.2bpp.lz.5d2805e8
index e7ae99387..e7ae99387 100644
--- a/gfx/pics/murkrow/front.animated.2bpp.lz.5d2805e8
+++ b/gfx/pokemon/murkrow/front.animated.2bpp.lz.5d2805e8
diff --git a/gfx/pics/murkrow/front.png b/gfx/pokemon/murkrow/front.png
index b17cf2d6c..b17cf2d6c 100644
--- a/gfx/pics/murkrow/front.png
+++ b/gfx/pokemon/murkrow/front.png
diff --git a/gfx/pics/murkrow/shiny.pal b/gfx/pokemon/murkrow/shiny.pal
index 8f015f0fe..8f015f0fe 100644
--- a/gfx/pics/murkrow/shiny.pal
+++ b/gfx/pokemon/murkrow/shiny.pal
diff --git a/gfx/pics/natu/anim0.asm b/gfx/pokemon/natu/anim0.asm
index 22c2659db..22c2659db 100644
--- a/gfx/pics/natu/anim0.asm
+++ b/gfx/pokemon/natu/anim0.asm
diff --git a/gfx/pics/natu/anim1.asm b/gfx/pokemon/natu/anim1.asm
index a4a974877..a4a974877 100644
--- a/gfx/pics/natu/anim1.asm
+++ b/gfx/pokemon/natu/anim1.asm
diff --git a/gfx/pics/natu/back.2bpp.lz.c8339fb4 b/gfx/pokemon/natu/back.2bpp.lz.c8339fb4
index b4ba45c14..b4ba45c14 100644
--- a/gfx/pics/natu/back.2bpp.lz.c8339fb4
+++ b/gfx/pokemon/natu/back.2bpp.lz.c8339fb4
diff --git a/gfx/pics/natu/back.png b/gfx/pokemon/natu/back.png
index 923e34230..923e34230 100644
--- a/gfx/pics/natu/back.png
+++ b/gfx/pokemon/natu/back.png
diff --git a/gfx/pics/natu/front.animated.2bpp.lz.997efaf6 b/gfx/pokemon/natu/front.animated.2bpp.lz.997efaf6
index adebc8879..adebc8879 100644
--- a/gfx/pics/natu/front.animated.2bpp.lz.997efaf6
+++ b/gfx/pokemon/natu/front.animated.2bpp.lz.997efaf6
diff --git a/gfx/pics/natu/front.png b/gfx/pokemon/natu/front.png
index 4360e5b60..4360e5b60 100644
--- a/gfx/pics/natu/front.png
+++ b/gfx/pokemon/natu/front.png
diff --git a/gfx/pics/natu/shiny.pal b/gfx/pokemon/natu/shiny.pal
index 0ee2b82af..0ee2b82af 100644
--- a/gfx/pics/natu/shiny.pal
+++ b/gfx/pokemon/natu/shiny.pal
diff --git a/gfx/pics/nidoking/anim0.asm b/gfx/pokemon/nidoking/anim0.asm
index a32945d49..a32945d49 100644
--- a/gfx/pics/nidoking/anim0.asm
+++ b/gfx/pokemon/nidoking/anim0.asm
diff --git a/gfx/pics/nidoking/anim1.asm b/gfx/pokemon/nidoking/anim1.asm
index 4e56028e1..4e56028e1 100644
--- a/gfx/pics/nidoking/anim1.asm
+++ b/gfx/pokemon/nidoking/anim1.asm
diff --git a/gfx/pics/nidoking/back.2bpp.lz.93211604 b/gfx/pokemon/nidoking/back.2bpp.lz.93211604
index b3f35b5a1..b3f35b5a1 100644
--- a/gfx/pics/nidoking/back.2bpp.lz.93211604
+++ b/gfx/pokemon/nidoking/back.2bpp.lz.93211604
diff --git a/gfx/pics/nidoking/back.png b/gfx/pokemon/nidoking/back.png
index d5af2af2e..d5af2af2e 100644
--- a/gfx/pics/nidoking/back.png
+++ b/gfx/pokemon/nidoking/back.png
diff --git a/gfx/pics/nidoking/front.animated.2bpp.lz.bd38fa1e b/gfx/pokemon/nidoking/front.animated.2bpp.lz.bd38fa1e
index aad75774c..aad75774c 100644
--- a/gfx/pics/nidoking/front.animated.2bpp.lz.bd38fa1e
+++ b/gfx/pokemon/nidoking/front.animated.2bpp.lz.bd38fa1e
diff --git a/gfx/pics/nidoking/front.png b/gfx/pokemon/nidoking/front.png
index 1ed2d18bd..1ed2d18bd 100644
--- a/gfx/pics/nidoking/front.png
+++ b/gfx/pokemon/nidoking/front.png
diff --git a/gfx/pics/nidoking/shiny.pal b/gfx/pokemon/nidoking/shiny.pal
index 61991fb6f..61991fb6f 100644
--- a/gfx/pics/nidoking/shiny.pal
+++ b/gfx/pokemon/nidoking/shiny.pal
diff --git a/gfx/pics/nidoqueen/anim0.asm b/gfx/pokemon/nidoqueen/anim0.asm
index bd9d8eee8..bd9d8eee8 100644
--- a/gfx/pics/nidoqueen/anim0.asm
+++ b/gfx/pokemon/nidoqueen/anim0.asm
diff --git a/gfx/pics/nidoqueen/anim1.asm b/gfx/pokemon/nidoqueen/anim1.asm
index 1cc934c42..1cc934c42 100644
--- a/gfx/pics/nidoqueen/anim1.asm
+++ b/gfx/pokemon/nidoqueen/anim1.asm
diff --git a/gfx/pics/nidoqueen/back.2bpp.lz.f1eb0f0c b/gfx/pokemon/nidoqueen/back.2bpp.lz.f1eb0f0c
index b363f089e..b363f089e 100644
--- a/gfx/pics/nidoqueen/back.2bpp.lz.f1eb0f0c
+++ b/gfx/pokemon/nidoqueen/back.2bpp.lz.f1eb0f0c
diff --git a/gfx/pics/nidoqueen/back.png b/gfx/pokemon/nidoqueen/back.png
index 9d250b32c..9d250b32c 100644
--- a/gfx/pics/nidoqueen/back.png
+++ b/gfx/pokemon/nidoqueen/back.png
diff --git a/gfx/pics/nidoqueen/front.animated.2bpp.lz.0bf11b0a b/gfx/pokemon/nidoqueen/front.animated.2bpp.lz.0bf11b0a
index d02a553d5..d02a553d5 100644
--- a/gfx/pics/nidoqueen/front.animated.2bpp.lz.0bf11b0a
+++ b/gfx/pokemon/nidoqueen/front.animated.2bpp.lz.0bf11b0a
diff --git a/gfx/pics/nidoqueen/front.png b/gfx/pokemon/nidoqueen/front.png
index 5aaee10c2..5aaee10c2 100644
--- a/gfx/pics/nidoqueen/front.png
+++ b/gfx/pokemon/nidoqueen/front.png
diff --git a/gfx/pics/nidoqueen/shiny.pal b/gfx/pokemon/nidoqueen/shiny.pal
index b27c118a6..b27c118a6 100644
--- a/gfx/pics/nidoqueen/shiny.pal
+++ b/gfx/pokemon/nidoqueen/shiny.pal
diff --git a/gfx/pics/nidoran_f/anim0.asm b/gfx/pokemon/nidoran_f/anim0.asm
index 623db13d1..623db13d1 100644
--- a/gfx/pics/nidoran_f/anim0.asm
+++ b/gfx/pokemon/nidoran_f/anim0.asm
diff --git a/gfx/pics/nidoran_f/anim1.asm b/gfx/pokemon/nidoran_f/anim1.asm
index 348179aac..348179aac 100644
--- a/gfx/pics/nidoran_f/anim1.asm
+++ b/gfx/pokemon/nidoran_f/anim1.asm
diff --git a/gfx/pics/nidoran_f/back.2bpp.lz.9b6990f1 b/gfx/pokemon/nidoran_f/back.2bpp.lz.9b6990f1
index df43f06a1..df43f06a1 100644
--- a/gfx/pics/nidoran_f/back.2bpp.lz.9b6990f1
+++ b/gfx/pokemon/nidoran_f/back.2bpp.lz.9b6990f1
diff --git a/gfx/pics/nidoran_f/back.png b/gfx/pokemon/nidoran_f/back.png
index 9fcaf581c..9fcaf581c 100644
--- a/gfx/pics/nidoran_f/back.png
+++ b/gfx/pokemon/nidoran_f/back.png
diff --git a/gfx/pics/nidoran_f/front.animated.2bpp.lz.0a4602e7 b/gfx/pokemon/nidoran_f/front.animated.2bpp.lz.0a4602e7
index 477857691..477857691 100644
--- a/gfx/pics/nidoran_f/front.animated.2bpp.lz.0a4602e7
+++ b/gfx/pokemon/nidoran_f/front.animated.2bpp.lz.0a4602e7
diff --git a/gfx/pics/nidoran_f/front.png b/gfx/pokemon/nidoran_f/front.png
index fa14f1dfc..fa14f1dfc 100644
--- a/gfx/pics/nidoran_f/front.png
+++ b/gfx/pokemon/nidoran_f/front.png
diff --git a/gfx/pics/nidoran_f/shiny.pal b/gfx/pokemon/nidoran_f/shiny.pal
index 06dc1de15..06dc1de15 100644
--- a/gfx/pics/nidoran_f/shiny.pal
+++ b/gfx/pokemon/nidoran_f/shiny.pal
diff --git a/gfx/pics/nidoran_m/anim0.asm b/gfx/pokemon/nidoran_m/anim0.asm
index 9b8a38133..9b8a38133 100644
--- a/gfx/pics/nidoran_m/anim0.asm
+++ b/gfx/pokemon/nidoran_m/anim0.asm
diff --git a/gfx/pics/nidoran_m/anim1.asm b/gfx/pokemon/nidoran_m/anim1.asm
index 20b437f6a..20b437f6a 100644
--- a/gfx/pics/nidoran_m/anim1.asm
+++ b/gfx/pokemon/nidoran_m/anim1.asm
diff --git a/gfx/pics/nidoran_m/back.2bpp.lz.c9e54720 b/gfx/pokemon/nidoran_m/back.2bpp.lz.c9e54720
index 4b3be9a60..4b3be9a60 100644
--- a/gfx/pics/nidoran_m/back.2bpp.lz.c9e54720
+++ b/gfx/pokemon/nidoran_m/back.2bpp.lz.c9e54720
diff --git a/gfx/pics/nidoran_m/back.png b/gfx/pokemon/nidoran_m/back.png
index f7ee2491b..f7ee2491b 100644
--- a/gfx/pics/nidoran_m/back.png
+++ b/gfx/pokemon/nidoran_m/back.png
diff --git a/gfx/pics/nidoran_m/front.animated.2bpp.lz.b121beaa b/gfx/pokemon/nidoran_m/front.animated.2bpp.lz.b121beaa
index 661dadada..661dadada 100644
--- a/gfx/pics/nidoran_m/front.animated.2bpp.lz.b121beaa
+++ b/gfx/pokemon/nidoran_m/front.animated.2bpp.lz.b121beaa
diff --git a/gfx/pics/nidoran_m/front.png b/gfx/pokemon/nidoran_m/front.png
index 86f5904a4..86f5904a4 100644
--- a/gfx/pics/nidoran_m/front.png
+++ b/gfx/pokemon/nidoran_m/front.png
diff --git a/gfx/pics/nidoran_m/shiny.pal b/gfx/pokemon/nidoran_m/shiny.pal
index 771fd4e31..771fd4e31 100644
--- a/gfx/pics/nidoran_m/shiny.pal
+++ b/gfx/pokemon/nidoran_m/shiny.pal
diff --git a/gfx/pics/nidorina/anim0.asm b/gfx/pokemon/nidorina/anim0.asm
index 6ab079db4..6ab079db4 100644
--- a/gfx/pics/nidorina/anim0.asm
+++ b/gfx/pokemon/nidorina/anim0.asm
diff --git a/gfx/pics/nidorina/anim1.asm b/gfx/pokemon/nidorina/anim1.asm
index 6afb1cbc8..6afb1cbc8 100644
--- a/gfx/pics/nidorina/anim1.asm
+++ b/gfx/pokemon/nidorina/anim1.asm
diff --git a/gfx/pics/nidorina/back.2bpp.lz.a00ecf4a b/gfx/pokemon/nidorina/back.2bpp.lz.a00ecf4a
index 141d61f81..141d61f81 100644
--- a/gfx/pics/nidorina/back.2bpp.lz.a00ecf4a
+++ b/gfx/pokemon/nidorina/back.2bpp.lz.a00ecf4a
diff --git a/gfx/pics/nidorina/back.png b/gfx/pokemon/nidorina/back.png
index d334bfaab..d334bfaab 100644
--- a/gfx/pics/nidorina/back.png
+++ b/gfx/pokemon/nidorina/back.png
diff --git a/gfx/pics/nidorina/front.animated.2bpp.lz.51532540 b/gfx/pokemon/nidorina/front.animated.2bpp.lz.51532540
index 04523a52b..04523a52b 100644
--- a/gfx/pics/nidorina/front.animated.2bpp.lz.51532540
+++ b/gfx/pokemon/nidorina/front.animated.2bpp.lz.51532540
diff --git a/gfx/pics/nidorina/front.png b/gfx/pokemon/nidorina/front.png
index c3e49f8e1..c3e49f8e1 100644
--- a/gfx/pics/nidorina/front.png
+++ b/gfx/pokemon/nidorina/front.png
diff --git a/gfx/pics/nidorina/shiny.pal b/gfx/pokemon/nidorina/shiny.pal
index ae93e6242..ae93e6242 100644
--- a/gfx/pics/nidorina/shiny.pal
+++ b/gfx/pokemon/nidorina/shiny.pal
diff --git a/gfx/pics/nidorino/anim0.asm b/gfx/pokemon/nidorino/anim0.asm
index 16a6cb1dc..16a6cb1dc 100644
--- a/gfx/pics/nidorino/anim0.asm
+++ b/gfx/pokemon/nidorino/anim0.asm
diff --git a/gfx/pics/nidorino/anim1.asm b/gfx/pokemon/nidorino/anim1.asm
index 40e17f454..40e17f454 100644
--- a/gfx/pics/nidorino/anim1.asm
+++ b/gfx/pokemon/nidorino/anim1.asm
diff --git a/gfx/pics/nidorino/back.2bpp.lz.8504fdd1 b/gfx/pokemon/nidorino/back.2bpp.lz.8504fdd1
index 6e6a841e9..6e6a841e9 100644
--- a/gfx/pics/nidorino/back.2bpp.lz.8504fdd1
+++ b/gfx/pokemon/nidorino/back.2bpp.lz.8504fdd1
diff --git a/gfx/pics/nidorino/back.png b/gfx/pokemon/nidorino/back.png
index b40dd9aaf..b40dd9aaf 100644
--- a/gfx/pics/nidorino/back.png
+++ b/gfx/pokemon/nidorino/back.png
diff --git a/gfx/pics/nidorino/front.animated.2bpp.lz.ba11ef23 b/gfx/pokemon/nidorino/front.animated.2bpp.lz.ba11ef23
index 228c93b52..228c93b52 100644
--- a/gfx/pics/nidorino/front.animated.2bpp.lz.ba11ef23
+++ b/gfx/pokemon/nidorino/front.animated.2bpp.lz.ba11ef23
diff --git a/gfx/pics/nidorino/front.png b/gfx/pokemon/nidorino/front.png
index 86d37de47..86d37de47 100644
--- a/gfx/pics/nidorino/front.png
+++ b/gfx/pokemon/nidorino/front.png
diff --git a/gfx/pics/nidorino/shiny.pal b/gfx/pokemon/nidorino/shiny.pal
index b6d2e6fe9..b6d2e6fe9 100644
--- a/gfx/pics/nidorino/shiny.pal
+++ b/gfx/pokemon/nidorino/shiny.pal
diff --git a/gfx/pics/ninetales/anim0.asm b/gfx/pokemon/ninetales/anim0.asm
index 0d691ee9d..0d691ee9d 100644
--- a/gfx/pics/ninetales/anim0.asm
+++ b/gfx/pokemon/ninetales/anim0.asm
diff --git a/gfx/pics/ninetales/anim1.asm b/gfx/pokemon/ninetales/anim1.asm
index 68d1e8051..68d1e8051 100644
--- a/gfx/pics/ninetales/anim1.asm
+++ b/gfx/pokemon/ninetales/anim1.asm
diff --git a/gfx/pics/ninetales/back.2bpp.lz.999b3894 b/gfx/pokemon/ninetales/back.2bpp.lz.999b3894
index e6b264033..e6b264033 100644
--- a/gfx/pics/ninetales/back.2bpp.lz.999b3894
+++ b/gfx/pokemon/ninetales/back.2bpp.lz.999b3894
diff --git a/gfx/pics/ninetales/back.png b/gfx/pokemon/ninetales/back.png
index 98af16d8a..98af16d8a 100644
--- a/gfx/pics/ninetales/back.png
+++ b/gfx/pokemon/ninetales/back.png
diff --git a/gfx/pics/ninetales/front.animated.2bpp.lz.eef934ff b/gfx/pokemon/ninetales/front.animated.2bpp.lz.eef934ff
index 4865c6d82..4865c6d82 100644
--- a/gfx/pics/ninetales/front.animated.2bpp.lz.eef934ff
+++ b/gfx/pokemon/ninetales/front.animated.2bpp.lz.eef934ff
diff --git a/gfx/pics/ninetales/front.png b/gfx/pokemon/ninetales/front.png
index 0bfeed4eb..0bfeed4eb 100644
--- a/gfx/pics/ninetales/front.png
+++ b/gfx/pokemon/ninetales/front.png
diff --git a/gfx/pics/ninetales/shiny.pal b/gfx/pokemon/ninetales/shiny.pal
index 6b0dafcc8..6b0dafcc8 100644
--- a/gfx/pics/ninetales/shiny.pal
+++ b/gfx/pokemon/ninetales/shiny.pal
diff --git a/gfx/pics/noctowl/anim0.asm b/gfx/pokemon/noctowl/anim0.asm
index ce19c30a5..ce19c30a5 100644
--- a/gfx/pics/noctowl/anim0.asm
+++ b/gfx/pokemon/noctowl/anim0.asm
diff --git a/gfx/pics/noctowl/anim1.asm b/gfx/pokemon/noctowl/anim1.asm
index 4fe81f336..4fe81f336 100644
--- a/gfx/pics/noctowl/anim1.asm
+++ b/gfx/pokemon/noctowl/anim1.asm
diff --git a/gfx/pics/noctowl/back.2bpp.lz.9c8ac57f b/gfx/pokemon/noctowl/back.2bpp.lz.9c8ac57f
index 9ef83c86e..9ef83c86e 100644
--- a/gfx/pics/noctowl/back.2bpp.lz.9c8ac57f
+++ b/gfx/pokemon/noctowl/back.2bpp.lz.9c8ac57f
diff --git a/gfx/pics/noctowl/back.png b/gfx/pokemon/noctowl/back.png
index 6f7237943..6f7237943 100644
--- a/gfx/pics/noctowl/back.png
+++ b/gfx/pokemon/noctowl/back.png
diff --git a/gfx/pics/noctowl/front.animated.2bpp.lz.7d6594fe b/gfx/pokemon/noctowl/front.animated.2bpp.lz.7d6594fe
index cd0d1313b..cd0d1313b 100644
--- a/gfx/pics/noctowl/front.animated.2bpp.lz.7d6594fe
+++ b/gfx/pokemon/noctowl/front.animated.2bpp.lz.7d6594fe
diff --git a/gfx/pics/noctowl/front.png b/gfx/pokemon/noctowl/front.png
index bbc8b1623..bbc8b1623 100644
--- a/gfx/pics/noctowl/front.png
+++ b/gfx/pokemon/noctowl/front.png
diff --git a/gfx/pics/noctowl/shiny.pal b/gfx/pokemon/noctowl/shiny.pal
index d53a230e7..d53a230e7 100644
--- a/gfx/pics/noctowl/shiny.pal
+++ b/gfx/pokemon/noctowl/shiny.pal
diff --git a/gfx/pics/octillery/anim0.asm b/gfx/pokemon/octillery/anim0.asm
index 2405d46a1..2405d46a1 100644
--- a/gfx/pics/octillery/anim0.asm
+++ b/gfx/pokemon/octillery/anim0.asm
diff --git a/gfx/pics/octillery/anim1.asm b/gfx/pokemon/octillery/anim1.asm
index 0903a867a..0903a867a 100644
--- a/gfx/pics/octillery/anim1.asm
+++ b/gfx/pokemon/octillery/anim1.asm
diff --git a/gfx/pics/octillery/back.2bpp.lz.48b6e47d b/gfx/pokemon/octillery/back.2bpp.lz.48b6e47d
index 2d12597ca..2d12597ca 100644
--- a/gfx/pics/octillery/back.2bpp.lz.48b6e47d
+++ b/gfx/pokemon/octillery/back.2bpp.lz.48b6e47d
diff --git a/gfx/pics/octillery/back.png b/gfx/pokemon/octillery/back.png
index 8717ea071..8717ea071 100644
--- a/gfx/pics/octillery/back.png
+++ b/gfx/pokemon/octillery/back.png
diff --git a/gfx/pics/octillery/front.animated.2bpp.lz.de99954b b/gfx/pokemon/octillery/front.animated.2bpp.lz.de99954b
index 9ffec9b38..9ffec9b38 100644
--- a/gfx/pics/octillery/front.animated.2bpp.lz.de99954b
+++ b/gfx/pokemon/octillery/front.animated.2bpp.lz.de99954b
diff --git a/gfx/pics/octillery/front.png b/gfx/pokemon/octillery/front.png
index a2359dc98..a2359dc98 100644
--- a/gfx/pics/octillery/front.png
+++ b/gfx/pokemon/octillery/front.png
diff --git a/gfx/pics/octillery/shiny.pal b/gfx/pokemon/octillery/shiny.pal
index a5bdc9b71..a5bdc9b71 100644
--- a/gfx/pics/octillery/shiny.pal
+++ b/gfx/pokemon/octillery/shiny.pal
diff --git a/gfx/pics/oddish/anim0.asm b/gfx/pokemon/oddish/anim0.asm
index 338771fce..338771fce 100644
--- a/gfx/pics/oddish/anim0.asm
+++ b/gfx/pokemon/oddish/anim0.asm
diff --git a/gfx/pics/oddish/anim1.asm b/gfx/pokemon/oddish/anim1.asm
index 92d041ff5..92d041ff5 100644
--- a/gfx/pics/oddish/anim1.asm
+++ b/gfx/pokemon/oddish/anim1.asm
diff --git a/gfx/pics/oddish/back.2bpp.lz.4f9ec682 b/gfx/pokemon/oddish/back.2bpp.lz.4f9ec682
index 81ba4e5f3..81ba4e5f3 100644
--- a/gfx/pics/oddish/back.2bpp.lz.4f9ec682
+++ b/gfx/pokemon/oddish/back.2bpp.lz.4f9ec682
diff --git a/gfx/pics/oddish/back.png b/gfx/pokemon/oddish/back.png
index 11f40353d..11f40353d 100644
--- a/gfx/pics/oddish/back.png
+++ b/gfx/pokemon/oddish/back.png
diff --git a/gfx/pics/oddish/front.animated.2bpp.lz.ea2e0dcd b/gfx/pokemon/oddish/front.animated.2bpp.lz.ea2e0dcd
index 3864c0b7a..3864c0b7a 100644
--- a/gfx/pics/oddish/front.animated.2bpp.lz.ea2e0dcd
+++ b/gfx/pokemon/oddish/front.animated.2bpp.lz.ea2e0dcd
diff --git a/gfx/pics/oddish/front.png b/gfx/pokemon/oddish/front.png
index c49334613..c49334613 100644
--- a/gfx/pics/oddish/front.png
+++ b/gfx/pokemon/oddish/front.png
diff --git a/gfx/pics/oddish/shiny.pal b/gfx/pokemon/oddish/shiny.pal
index 6e1d339b4..6e1d339b4 100644
--- a/gfx/pics/oddish/shiny.pal
+++ b/gfx/pokemon/oddish/shiny.pal
diff --git a/gfx/pics/omanyte/anim0.asm b/gfx/pokemon/omanyte/anim0.asm
index 5863efecc..5863efecc 100644
--- a/gfx/pics/omanyte/anim0.asm
+++ b/gfx/pokemon/omanyte/anim0.asm
diff --git a/gfx/pics/omanyte/anim1.asm b/gfx/pokemon/omanyte/anim1.asm
index ffdce5abd..ffdce5abd 100644
--- a/gfx/pics/omanyte/anim1.asm
+++ b/gfx/pokemon/omanyte/anim1.asm
diff --git a/gfx/pics/omanyte/back.2bpp.lz.f442a670 b/gfx/pokemon/omanyte/back.2bpp.lz.f442a670
index 0ee462eaf..0ee462eaf 100644
--- a/gfx/pics/omanyte/back.2bpp.lz.f442a670
+++ b/gfx/pokemon/omanyte/back.2bpp.lz.f442a670
diff --git a/gfx/pics/omanyte/back.png b/gfx/pokemon/omanyte/back.png
index 0c3fb8eb7..0c3fb8eb7 100644
--- a/gfx/pics/omanyte/back.png
+++ b/gfx/pokemon/omanyte/back.png
diff --git a/gfx/pics/omanyte/front.animated.2bpp.lz.15b343dc b/gfx/pokemon/omanyte/front.animated.2bpp.lz.15b343dc
index 7673b2390..7673b2390 100644
--- a/gfx/pics/omanyte/front.animated.2bpp.lz.15b343dc
+++ b/gfx/pokemon/omanyte/front.animated.2bpp.lz.15b343dc
diff --git a/gfx/pics/omanyte/front.png b/gfx/pokemon/omanyte/front.png
index 1e47c7800..1e47c7800 100644
--- a/gfx/pics/omanyte/front.png
+++ b/gfx/pokemon/omanyte/front.png
diff --git a/gfx/pics/omanyte/shiny.pal b/gfx/pokemon/omanyte/shiny.pal
index cc1531b57..cc1531b57 100644
--- a/gfx/pics/omanyte/shiny.pal
+++ b/gfx/pokemon/omanyte/shiny.pal
diff --git a/gfx/pics/omastar/anim0.asm b/gfx/pokemon/omastar/anim0.asm
index 76d8c3aa8..76d8c3aa8 100644
--- a/gfx/pics/omastar/anim0.asm
+++ b/gfx/pokemon/omastar/anim0.asm
diff --git a/gfx/pics/omastar/anim1.asm b/gfx/pokemon/omastar/anim1.asm
index 60bcf04d2..60bcf04d2 100644
--- a/gfx/pics/omastar/anim1.asm
+++ b/gfx/pokemon/omastar/anim1.asm
diff --git a/gfx/pics/omastar/back.2bpp.lz.c75932db b/gfx/pokemon/omastar/back.2bpp.lz.c75932db
index b41a828c5..b41a828c5 100644
--- a/gfx/pics/omastar/back.2bpp.lz.c75932db
+++ b/gfx/pokemon/omastar/back.2bpp.lz.c75932db
diff --git a/gfx/pics/omastar/back.png b/gfx/pokemon/omastar/back.png
index c6ff219e7..c6ff219e7 100644
--- a/gfx/pics/omastar/back.png
+++ b/gfx/pokemon/omastar/back.png
diff --git a/gfx/pics/omastar/front.animated.2bpp.lz.b3f6c3dc b/gfx/pokemon/omastar/front.animated.2bpp.lz.b3f6c3dc
index 544e2d87b..544e2d87b 100644
--- a/gfx/pics/omastar/front.animated.2bpp.lz.b3f6c3dc
+++ b/gfx/pokemon/omastar/front.animated.2bpp.lz.b3f6c3dc
diff --git a/gfx/pics/omastar/front.png b/gfx/pokemon/omastar/front.png
index 382bb5417..382bb5417 100644
--- a/gfx/pics/omastar/front.png
+++ b/gfx/pokemon/omastar/front.png
diff --git a/gfx/pics/omastar/shiny.pal b/gfx/pokemon/omastar/shiny.pal
index 2b8017338..2b8017338 100644
--- a/gfx/pics/omastar/shiny.pal
+++ b/gfx/pokemon/omastar/shiny.pal
diff --git a/gfx/pics/onix/anim0.asm b/gfx/pokemon/onix/anim0.asm
index a5b18f5b6..a5b18f5b6 100644
--- a/gfx/pics/onix/anim0.asm
+++ b/gfx/pokemon/onix/anim0.asm
diff --git a/gfx/pics/onix/anim1.asm b/gfx/pokemon/onix/anim1.asm
index e4ae7acac..e4ae7acac 100644
--- a/gfx/pics/onix/anim1.asm
+++ b/gfx/pokemon/onix/anim1.asm
diff --git a/gfx/pics/onix/back.2bpp.lz.cb580eb9 b/gfx/pokemon/onix/back.2bpp.lz.cb580eb9
index 05df1a96b..05df1a96b 100644
--- a/gfx/pics/onix/back.2bpp.lz.cb580eb9
+++ b/gfx/pokemon/onix/back.2bpp.lz.cb580eb9
diff --git a/gfx/pics/onix/back.png b/gfx/pokemon/onix/back.png
index 6aa7be5bc..6aa7be5bc 100644
--- a/gfx/pics/onix/back.png
+++ b/gfx/pokemon/onix/back.png
diff --git a/gfx/pics/onix/front.animated.2bpp.lz.84b7e9ef b/gfx/pokemon/onix/front.animated.2bpp.lz.84b7e9ef
index dc3bfca6e..dc3bfca6e 100644
--- a/gfx/pics/onix/front.animated.2bpp.lz.84b7e9ef
+++ b/gfx/pokemon/onix/front.animated.2bpp.lz.84b7e9ef
diff --git a/gfx/pics/onix/front.png b/gfx/pokemon/onix/front.png
index 188378160..188378160 100644
--- a/gfx/pics/onix/front.png
+++ b/gfx/pokemon/onix/front.png
diff --git a/gfx/pics/onix/shiny.pal b/gfx/pokemon/onix/shiny.pal
index 66935962c..66935962c 100644
--- a/gfx/pics/onix/shiny.pal
+++ b/gfx/pokemon/onix/shiny.pal
diff --git a/gfx/pics/paras/anim0.asm b/gfx/pokemon/paras/anim0.asm
index 6fcc935e9..6fcc935e9 100644
--- a/gfx/pics/paras/anim0.asm
+++ b/gfx/pokemon/paras/anim0.asm
diff --git a/gfx/pics/paras/anim1.asm b/gfx/pokemon/paras/anim1.asm
index 3ce495f04..3ce495f04 100644
--- a/gfx/pics/paras/anim1.asm
+++ b/gfx/pokemon/paras/anim1.asm
diff --git a/gfx/pics/paras/back.2bpp.lz.b5a4d1e2 b/gfx/pokemon/paras/back.2bpp.lz.b5a4d1e2
index d6c3d4a62..d6c3d4a62 100644
--- a/gfx/pics/paras/back.2bpp.lz.b5a4d1e2
+++ b/gfx/pokemon/paras/back.2bpp.lz.b5a4d1e2
diff --git a/gfx/pics/paras/back.png b/gfx/pokemon/paras/back.png
index 4962bde38..4962bde38 100644
--- a/gfx/pics/paras/back.png
+++ b/gfx/pokemon/paras/back.png
diff --git a/gfx/pics/paras/front.animated.2bpp.lz.37a2c2f8 b/gfx/pokemon/paras/front.animated.2bpp.lz.37a2c2f8
index 927c831d0..927c831d0 100644
--- a/gfx/pics/paras/front.animated.2bpp.lz.37a2c2f8
+++ b/gfx/pokemon/paras/front.animated.2bpp.lz.37a2c2f8
diff --git a/gfx/pics/paras/front.png b/gfx/pokemon/paras/front.png
index 9e67fdc9e..9e67fdc9e 100644
--- a/gfx/pics/paras/front.png
+++ b/gfx/pokemon/paras/front.png
diff --git a/gfx/pics/paras/shiny.pal b/gfx/pokemon/paras/shiny.pal
index 7a63c68d7..7a63c68d7 100644
--- a/gfx/pics/paras/shiny.pal
+++ b/gfx/pokemon/paras/shiny.pal
diff --git a/gfx/pics/parasect/anim0.asm b/gfx/pokemon/parasect/anim0.asm
index e9e253cee..e9e253cee 100644
--- a/gfx/pics/parasect/anim0.asm
+++ b/gfx/pokemon/parasect/anim0.asm
diff --git a/gfx/pics/parasect/anim1.asm b/gfx/pokemon/parasect/anim1.asm
index 8275690a6..8275690a6 100644
--- a/gfx/pics/parasect/anim1.asm
+++ b/gfx/pokemon/parasect/anim1.asm
diff --git a/gfx/pics/parasect/back.2bpp.lz.ed08ef08 b/gfx/pokemon/parasect/back.2bpp.lz.ed08ef08
index a63677ff7..a63677ff7 100644
--- a/gfx/pics/parasect/back.2bpp.lz.ed08ef08
+++ b/gfx/pokemon/parasect/back.2bpp.lz.ed08ef08
diff --git a/gfx/pics/parasect/back.png b/gfx/pokemon/parasect/back.png
index c0707e7b5..c0707e7b5 100644
--- a/gfx/pics/parasect/back.png
+++ b/gfx/pokemon/parasect/back.png
diff --git a/gfx/pics/parasect/front.animated.2bpp.lz.f78f9f36 b/gfx/pokemon/parasect/front.animated.2bpp.lz.f78f9f36
index f1743d07e..f1743d07e 100644
--- a/gfx/pics/parasect/front.animated.2bpp.lz.f78f9f36
+++ b/gfx/pokemon/parasect/front.animated.2bpp.lz.f78f9f36
diff --git a/gfx/pics/parasect/front.png b/gfx/pokemon/parasect/front.png
index 165d0a012..165d0a012 100644
--- a/gfx/pics/parasect/front.png
+++ b/gfx/pokemon/parasect/front.png
diff --git a/gfx/pics/parasect/shiny.pal b/gfx/pokemon/parasect/shiny.pal
index 343a793bb..343a793bb 100644
--- a/gfx/pics/parasect/shiny.pal
+++ b/gfx/pokemon/parasect/shiny.pal
diff --git a/gfx/pics/persian/anim0.asm b/gfx/pokemon/persian/anim0.asm
index ae771c09c..ae771c09c 100644
--- a/gfx/pics/persian/anim0.asm
+++ b/gfx/pokemon/persian/anim0.asm
diff --git a/gfx/pics/persian/anim1.asm b/gfx/pokemon/persian/anim1.asm
index ca9129bfa..ca9129bfa 100644
--- a/gfx/pics/persian/anim1.asm
+++ b/gfx/pokemon/persian/anim1.asm
diff --git a/gfx/pics/persian/back.2bpp.lz.0e1c1c9a b/gfx/pokemon/persian/back.2bpp.lz.0e1c1c9a
index e615d47fb..e615d47fb 100644
--- a/gfx/pics/persian/back.2bpp.lz.0e1c1c9a
+++ b/gfx/pokemon/persian/back.2bpp.lz.0e1c1c9a
diff --git a/gfx/pics/persian/back.png b/gfx/pokemon/persian/back.png
index 476964b80..476964b80 100644
--- a/gfx/pics/persian/back.png
+++ b/gfx/pokemon/persian/back.png
diff --git a/gfx/pics/persian/front.animated.2bpp.lz.0e6a2521 b/gfx/pokemon/persian/front.animated.2bpp.lz.0e6a2521
index 1f13a0cca..1f13a0cca 100644
--- a/gfx/pics/persian/front.animated.2bpp.lz.0e6a2521
+++ b/gfx/pokemon/persian/front.animated.2bpp.lz.0e6a2521
diff --git a/gfx/pics/persian/front.png b/gfx/pokemon/persian/front.png
index e9a2be761..e9a2be761 100644
--- a/gfx/pics/persian/front.png
+++ b/gfx/pokemon/persian/front.png
diff --git a/gfx/pics/persian/shiny.pal b/gfx/pokemon/persian/shiny.pal
index 6ede92a01..6ede92a01 100644
--- a/gfx/pics/persian/shiny.pal
+++ b/gfx/pokemon/persian/shiny.pal
diff --git a/gfx/pics/phanpy/anim0.asm b/gfx/pokemon/phanpy/anim0.asm
index 7ec513762..7ec513762 100644
--- a/gfx/pics/phanpy/anim0.asm
+++ b/gfx/pokemon/phanpy/anim0.asm
diff --git a/gfx/pics/phanpy/anim1.asm b/gfx/pokemon/phanpy/anim1.asm
index 43148da49..43148da49 100644
--- a/gfx/pics/phanpy/anim1.asm
+++ b/gfx/pokemon/phanpy/anim1.asm
diff --git a/gfx/pics/phanpy/back.2bpp.lz.a5c509b8 b/gfx/pokemon/phanpy/back.2bpp.lz.a5c509b8
index cef1bf442..cef1bf442 100644
--- a/gfx/pics/phanpy/back.2bpp.lz.a5c509b8
+++ b/gfx/pokemon/phanpy/back.2bpp.lz.a5c509b8
diff --git a/gfx/pics/phanpy/back.png b/gfx/pokemon/phanpy/back.png
index 5efafc74b..5efafc74b 100644
--- a/gfx/pics/phanpy/back.png
+++ b/gfx/pokemon/phanpy/back.png
diff --git a/gfx/pics/phanpy/front.animated.2bpp.lz.53b49445 b/gfx/pokemon/phanpy/front.animated.2bpp.lz.53b49445
index d919487b8..d919487b8 100644
--- a/gfx/pics/phanpy/front.animated.2bpp.lz.53b49445
+++ b/gfx/pokemon/phanpy/front.animated.2bpp.lz.53b49445
diff --git a/gfx/pics/phanpy/front.png b/gfx/pokemon/phanpy/front.png
index e2e0eeb14..e2e0eeb14 100644
--- a/gfx/pics/phanpy/front.png
+++ b/gfx/pokemon/phanpy/front.png
diff --git a/gfx/pics/phanpy/shiny.pal b/gfx/pokemon/phanpy/shiny.pal
index 64b15d904..64b15d904 100644
--- a/gfx/pics/phanpy/shiny.pal
+++ b/gfx/pokemon/phanpy/shiny.pal
diff --git a/gfx/pics/pichu/anim0.asm b/gfx/pokemon/pichu/anim0.asm
index 50a1ae73c..50a1ae73c 100644
--- a/gfx/pics/pichu/anim0.asm
+++ b/gfx/pokemon/pichu/anim0.asm
diff --git a/gfx/pics/pichu/anim1.asm b/gfx/pokemon/pichu/anim1.asm
index dd39adcab..dd39adcab 100644
--- a/gfx/pics/pichu/anim1.asm
+++ b/gfx/pokemon/pichu/anim1.asm
diff --git a/gfx/pics/pichu/back.2bpp.lz.c5580983 b/gfx/pokemon/pichu/back.2bpp.lz.c5580983
index 61ab083b3..61ab083b3 100644
--- a/gfx/pics/pichu/back.2bpp.lz.c5580983
+++ b/gfx/pokemon/pichu/back.2bpp.lz.c5580983
diff --git a/gfx/pics/pichu/back.png b/gfx/pokemon/pichu/back.png
index 830cf34f4..830cf34f4 100644
--- a/gfx/pics/pichu/back.png
+++ b/gfx/pokemon/pichu/back.png
diff --git a/gfx/pics/pichu/front.animated.2bpp.lz.9c1c3bef b/gfx/pokemon/pichu/front.animated.2bpp.lz.9c1c3bef
index 06712d244..06712d244 100644
--- a/gfx/pics/pichu/front.animated.2bpp.lz.9c1c3bef
+++ b/gfx/pokemon/pichu/front.animated.2bpp.lz.9c1c3bef
diff --git a/gfx/pics/pichu/front.png b/gfx/pokemon/pichu/front.png
index 1557f73fb..1557f73fb 100644
--- a/gfx/pics/pichu/front.png
+++ b/gfx/pokemon/pichu/front.png
diff --git a/gfx/pics/pichu/shiny.pal b/gfx/pokemon/pichu/shiny.pal
index a89172f54..a89172f54 100644
--- a/gfx/pics/pichu/shiny.pal
+++ b/gfx/pokemon/pichu/shiny.pal
diff --git a/gfx/pics/pidgeot/anim0.asm b/gfx/pokemon/pidgeot/anim0.asm
index 34d5d3a98..34d5d3a98 100644
--- a/gfx/pics/pidgeot/anim0.asm
+++ b/gfx/pokemon/pidgeot/anim0.asm
diff --git a/gfx/pics/pidgeot/anim1.asm b/gfx/pokemon/pidgeot/anim1.asm
index 6ba60e83e..6ba60e83e 100644
--- a/gfx/pics/pidgeot/anim1.asm
+++ b/gfx/pokemon/pidgeot/anim1.asm
diff --git a/gfx/pics/pidgeot/back.2bpp.lz.7d9e44a5 b/gfx/pokemon/pidgeot/back.2bpp.lz.7d9e44a5
index a464dd7d1..a464dd7d1 100644
--- a/gfx/pics/pidgeot/back.2bpp.lz.7d9e44a5
+++ b/gfx/pokemon/pidgeot/back.2bpp.lz.7d9e44a5
diff --git a/gfx/pics/pidgeot/back.png b/gfx/pokemon/pidgeot/back.png
index a452584e4..a452584e4 100644
--- a/gfx/pics/pidgeot/back.png
+++ b/gfx/pokemon/pidgeot/back.png
diff --git a/gfx/pics/pidgeot/front.animated.2bpp.lz.c161ad71 b/gfx/pokemon/pidgeot/front.animated.2bpp.lz.c161ad71
index f5cbb3f56..f5cbb3f56 100644
--- a/gfx/pics/pidgeot/front.animated.2bpp.lz.c161ad71
+++ b/gfx/pokemon/pidgeot/front.animated.2bpp.lz.c161ad71
diff --git a/gfx/pics/pidgeot/front.png b/gfx/pokemon/pidgeot/front.png
index a3e598a28..a3e598a28 100644
--- a/gfx/pics/pidgeot/front.png
+++ b/gfx/pokemon/pidgeot/front.png
diff --git a/gfx/pics/pidgeot/shiny.pal b/gfx/pokemon/pidgeot/shiny.pal
index 68eefb13f..68eefb13f 100644
--- a/gfx/pics/pidgeot/shiny.pal
+++ b/gfx/pokemon/pidgeot/shiny.pal
diff --git a/gfx/pics/pidgeotto/anim0.asm b/gfx/pokemon/pidgeotto/anim0.asm
index 53008855f..53008855f 100644
--- a/gfx/pics/pidgeotto/anim0.asm
+++ b/gfx/pokemon/pidgeotto/anim0.asm
diff --git a/gfx/pics/pidgeotto/anim1.asm b/gfx/pokemon/pidgeotto/anim1.asm
index 95a27bb15..95a27bb15 100644
--- a/gfx/pics/pidgeotto/anim1.asm
+++ b/gfx/pokemon/pidgeotto/anim1.asm
diff --git a/gfx/pics/pidgeotto/back.2bpp.lz.8a0dd470 b/gfx/pokemon/pidgeotto/back.2bpp.lz.8a0dd470
index d766747ef..d766747ef 100644
--- a/gfx/pics/pidgeotto/back.2bpp.lz.8a0dd470
+++ b/gfx/pokemon/pidgeotto/back.2bpp.lz.8a0dd470
diff --git a/gfx/pics/pidgeotto/back.png b/gfx/pokemon/pidgeotto/back.png
index 46c5970a4..46c5970a4 100644
--- a/gfx/pics/pidgeotto/back.png
+++ b/gfx/pokemon/pidgeotto/back.png
diff --git a/gfx/pics/pidgeotto/front.animated.2bpp.lz.8ce78b51 b/gfx/pokemon/pidgeotto/front.animated.2bpp.lz.8ce78b51
index 0fc3a94fd..0fc3a94fd 100644
--- a/gfx/pics/pidgeotto/front.animated.2bpp.lz.8ce78b51
+++ b/gfx/pokemon/pidgeotto/front.animated.2bpp.lz.8ce78b51
diff --git a/gfx/pics/pidgeotto/front.png b/gfx/pokemon/pidgeotto/front.png
index cdf3f1a28..cdf3f1a28 100644
--- a/gfx/pics/pidgeotto/front.png
+++ b/gfx/pokemon/pidgeotto/front.png
diff --git a/gfx/pics/pidgeotto/shiny.pal b/gfx/pokemon/pidgeotto/shiny.pal
index 56a28e867..56a28e867 100644
--- a/gfx/pics/pidgeotto/shiny.pal
+++ b/gfx/pokemon/pidgeotto/shiny.pal
diff --git a/gfx/pics/pidgey/anim0.asm b/gfx/pokemon/pidgey/anim0.asm
index 4ca6553d2..4ca6553d2 100644
--- a/gfx/pics/pidgey/anim0.asm
+++ b/gfx/pokemon/pidgey/anim0.asm
diff --git a/gfx/pics/pidgey/anim1.asm b/gfx/pokemon/pidgey/anim1.asm
index 25a55fb45..25a55fb45 100644
--- a/gfx/pics/pidgey/anim1.asm
+++ b/gfx/pokemon/pidgey/anim1.asm
diff --git a/gfx/pics/pidgey/back.2bpp.lz.027129e8 b/gfx/pokemon/pidgey/back.2bpp.lz.027129e8
index 48669456e..48669456e 100644
--- a/gfx/pics/pidgey/back.2bpp.lz.027129e8
+++ b/gfx/pokemon/pidgey/back.2bpp.lz.027129e8
diff --git a/gfx/pics/pidgey/back.png b/gfx/pokemon/pidgey/back.png
index 7ab2fe5fc..7ab2fe5fc 100644
--- a/gfx/pics/pidgey/back.png
+++ b/gfx/pokemon/pidgey/back.png
diff --git a/gfx/pics/pidgey/front.animated.2bpp.lz.9acd46ca b/gfx/pokemon/pidgey/front.animated.2bpp.lz.9acd46ca
index 03c579dbf..03c579dbf 100644
--- a/gfx/pics/pidgey/front.animated.2bpp.lz.9acd46ca
+++ b/gfx/pokemon/pidgey/front.animated.2bpp.lz.9acd46ca
diff --git a/gfx/pics/pidgey/front.png b/gfx/pokemon/pidgey/front.png
index c65e7494d..c65e7494d 100644
--- a/gfx/pics/pidgey/front.png
+++ b/gfx/pokemon/pidgey/front.png
diff --git a/gfx/pics/pidgey/shiny.pal b/gfx/pokemon/pidgey/shiny.pal
index e209bc93f..e209bc93f 100644
--- a/gfx/pics/pidgey/shiny.pal
+++ b/gfx/pokemon/pidgey/shiny.pal
diff --git a/gfx/pics/pikachu/anim0.asm b/gfx/pokemon/pikachu/anim0.asm
index 6a1ac0954..6a1ac0954 100644
--- a/gfx/pics/pikachu/anim0.asm
+++ b/gfx/pokemon/pikachu/anim0.asm
diff --git a/gfx/pics/pikachu/anim1.asm b/gfx/pokemon/pikachu/anim1.asm
index 0454a2855..0454a2855 100644
--- a/gfx/pics/pikachu/anim1.asm
+++ b/gfx/pokemon/pikachu/anim1.asm
diff --git a/gfx/pics/pikachu/back.2bpp.lz.98998807 b/gfx/pokemon/pikachu/back.2bpp.lz.98998807
index 3f74382ae..3f74382ae 100644
--- a/gfx/pics/pikachu/back.2bpp.lz.98998807
+++ b/gfx/pokemon/pikachu/back.2bpp.lz.98998807
diff --git a/gfx/pics/pikachu/back.png b/gfx/pokemon/pikachu/back.png
index 5438e0e5a..5438e0e5a 100644
--- a/gfx/pics/pikachu/back.png
+++ b/gfx/pokemon/pikachu/back.png
diff --git a/gfx/pics/pikachu/front.animated.2bpp.lz.9c100565 b/gfx/pokemon/pikachu/front.animated.2bpp.lz.9c100565
index 1dbea0496..1dbea0496 100644
--- a/gfx/pics/pikachu/front.animated.2bpp.lz.9c100565
+++ b/gfx/pokemon/pikachu/front.animated.2bpp.lz.9c100565
diff --git a/gfx/pics/pikachu/front.png b/gfx/pokemon/pikachu/front.png
index 07dcb4da6..07dcb4da6 100644
--- a/gfx/pics/pikachu/front.png
+++ b/gfx/pokemon/pikachu/front.png
diff --git a/gfx/pics/pikachu/shiny.pal b/gfx/pokemon/pikachu/shiny.pal
index a89172f54..a89172f54 100644
--- a/gfx/pics/pikachu/shiny.pal
+++ b/gfx/pokemon/pikachu/shiny.pal
diff --git a/gfx/pics/piloswine/anim0.asm b/gfx/pokemon/piloswine/anim0.asm
index 5b57b3ef9..5b57b3ef9 100644
--- a/gfx/pics/piloswine/anim0.asm
+++ b/gfx/pokemon/piloswine/anim0.asm
diff --git a/gfx/pics/piloswine/anim1.asm b/gfx/pokemon/piloswine/anim1.asm
index c1cba5ee2..c1cba5ee2 100644
--- a/gfx/pics/piloswine/anim1.asm
+++ b/gfx/pokemon/piloswine/anim1.asm
diff --git a/gfx/pics/piloswine/back.2bpp.lz.6fe7da21 b/gfx/pokemon/piloswine/back.2bpp.lz.6fe7da21
index 2bdbd05b7..2bdbd05b7 100644
--- a/gfx/pics/piloswine/back.2bpp.lz.6fe7da21
+++ b/gfx/pokemon/piloswine/back.2bpp.lz.6fe7da21
diff --git a/gfx/pics/piloswine/back.png b/gfx/pokemon/piloswine/back.png
index b2963e86f..b2963e86f 100644
--- a/gfx/pics/piloswine/back.png
+++ b/gfx/pokemon/piloswine/back.png
diff --git a/gfx/pics/piloswine/front.animated.2bpp.lz.f6f37ed2 b/gfx/pokemon/piloswine/front.animated.2bpp.lz.f6f37ed2
index 45b87144e..45b87144e 100644
--- a/gfx/pics/piloswine/front.animated.2bpp.lz.f6f37ed2
+++ b/gfx/pokemon/piloswine/front.animated.2bpp.lz.f6f37ed2
diff --git a/gfx/pics/piloswine/front.png b/gfx/pokemon/piloswine/front.png
index 822759c1c..822759c1c 100644
--- a/gfx/pics/piloswine/front.png
+++ b/gfx/pokemon/piloswine/front.png
diff --git a/gfx/pics/piloswine/shiny.pal b/gfx/pokemon/piloswine/shiny.pal
index 3afb0539d..3afb0539d 100644
--- a/gfx/pics/piloswine/shiny.pal
+++ b/gfx/pokemon/piloswine/shiny.pal
diff --git a/gfx/pics/pineco/anim0.asm b/gfx/pokemon/pineco/anim0.asm
index 4579032ec..4579032ec 100644
--- a/gfx/pics/pineco/anim0.asm
+++ b/gfx/pokemon/pineco/anim0.asm
diff --git a/gfx/pics/pineco/anim1.asm b/gfx/pokemon/pineco/anim1.asm
index f1b4e949e..f1b4e949e 100644
--- a/gfx/pics/pineco/anim1.asm
+++ b/gfx/pokemon/pineco/anim1.asm
diff --git a/gfx/pics/pineco/back.2bpp.lz.70df8ca3 b/gfx/pokemon/pineco/back.2bpp.lz.70df8ca3
index f4baaadb9..f4baaadb9 100644
--- a/gfx/pics/pineco/back.2bpp.lz.70df8ca3
+++ b/gfx/pokemon/pineco/back.2bpp.lz.70df8ca3
diff --git a/gfx/pics/pineco/back.png b/gfx/pokemon/pineco/back.png
index ae6299015..ae6299015 100644
--- a/gfx/pics/pineco/back.png
+++ b/gfx/pokemon/pineco/back.png
diff --git a/gfx/pics/pineco/front.animated.2bpp.lz.82d91497 b/gfx/pokemon/pineco/front.animated.2bpp.lz.82d91497
index c36a27807..c36a27807 100644
--- a/gfx/pics/pineco/front.animated.2bpp.lz.82d91497
+++ b/gfx/pokemon/pineco/front.animated.2bpp.lz.82d91497
diff --git a/gfx/pics/pineco/front.png b/gfx/pokemon/pineco/front.png
index 2d91d5932..2d91d5932 100644
--- a/gfx/pics/pineco/front.png
+++ b/gfx/pokemon/pineco/front.png
diff --git a/gfx/pics/pineco/shiny.pal b/gfx/pokemon/pineco/shiny.pal
index 33ee632d5..33ee632d5 100644
--- a/gfx/pics/pineco/shiny.pal
+++ b/gfx/pokemon/pineco/shiny.pal
diff --git a/gfx/pics/pinsir/anim0.asm b/gfx/pokemon/pinsir/anim0.asm
index f45752006..f45752006 100644
--- a/gfx/pics/pinsir/anim0.asm
+++ b/gfx/pokemon/pinsir/anim0.asm
diff --git a/gfx/pics/pinsir/anim1.asm b/gfx/pokemon/pinsir/anim1.asm
index 73895c2e0..73895c2e0 100644
--- a/gfx/pics/pinsir/anim1.asm
+++ b/gfx/pokemon/pinsir/anim1.asm
diff --git a/gfx/pics/pinsir/back.2bpp.lz.09ac7dd4 b/gfx/pokemon/pinsir/back.2bpp.lz.09ac7dd4
index 8803c8a0a..8803c8a0a 100644
--- a/gfx/pics/pinsir/back.2bpp.lz.09ac7dd4
+++ b/gfx/pokemon/pinsir/back.2bpp.lz.09ac7dd4
diff --git a/gfx/pics/pinsir/back.png b/gfx/pokemon/pinsir/back.png
index 978ba561b..978ba561b 100644
--- a/gfx/pics/pinsir/back.png
+++ b/gfx/pokemon/pinsir/back.png
diff --git a/gfx/pics/pinsir/front.animated.2bpp.lz.1e3839f2 b/gfx/pokemon/pinsir/front.animated.2bpp.lz.1e3839f2
index d2ec9ecd9..d2ec9ecd9 100644
--- a/gfx/pics/pinsir/front.animated.2bpp.lz.1e3839f2
+++ b/gfx/pokemon/pinsir/front.animated.2bpp.lz.1e3839f2
diff --git a/gfx/pics/pinsir/front.png b/gfx/pokemon/pinsir/front.png
index 5bd4c4cee..5bd4c4cee 100644
--- a/gfx/pics/pinsir/front.png
+++ b/gfx/pokemon/pinsir/front.png
diff --git a/gfx/pics/pinsir/shiny.pal b/gfx/pokemon/pinsir/shiny.pal
index 4f586775a..4f586775a 100644
--- a/gfx/pics/pinsir/shiny.pal
+++ b/gfx/pokemon/pinsir/shiny.pal
diff --git a/gfx/pics/politoed/anim0.asm b/gfx/pokemon/politoed/anim0.asm
index 72347714f..72347714f 100644
--- a/gfx/pics/politoed/anim0.asm
+++ b/gfx/pokemon/politoed/anim0.asm
diff --git a/gfx/pics/politoed/anim1.asm b/gfx/pokemon/politoed/anim1.asm
index 8ec01df37..8ec01df37 100644
--- a/gfx/pics/politoed/anim1.asm
+++ b/gfx/pokemon/politoed/anim1.asm
diff --git a/gfx/pics/politoed/back.2bpp.lz.7873e52f b/gfx/pokemon/politoed/back.2bpp.lz.7873e52f
index 2c492fcaf..2c492fcaf 100644
--- a/gfx/pics/politoed/back.2bpp.lz.7873e52f
+++ b/gfx/pokemon/politoed/back.2bpp.lz.7873e52f
diff --git a/gfx/pics/politoed/back.png b/gfx/pokemon/politoed/back.png
index 4376ca6ae..4376ca6ae 100644
--- a/gfx/pics/politoed/back.png
+++ b/gfx/pokemon/politoed/back.png
diff --git a/gfx/pics/politoed/front.animated.2bpp.lz.408a9c1a b/gfx/pokemon/politoed/front.animated.2bpp.lz.408a9c1a
index 8890a7ed4..8890a7ed4 100644
--- a/gfx/pics/politoed/front.animated.2bpp.lz.408a9c1a
+++ b/gfx/pokemon/politoed/front.animated.2bpp.lz.408a9c1a
diff --git a/gfx/pics/politoed/front.png b/gfx/pokemon/politoed/front.png
index 03aa089e3..03aa089e3 100644
--- a/gfx/pics/politoed/front.png
+++ b/gfx/pokemon/politoed/front.png
diff --git a/gfx/pics/politoed/shiny.pal b/gfx/pokemon/politoed/shiny.pal
index 1ba49cbc5..1ba49cbc5 100644
--- a/gfx/pics/politoed/shiny.pal
+++ b/gfx/pokemon/politoed/shiny.pal
diff --git a/gfx/pics/poliwag/anim0.asm b/gfx/pokemon/poliwag/anim0.asm
index 8446897c0..8446897c0 100644
--- a/gfx/pics/poliwag/anim0.asm
+++ b/gfx/pokemon/poliwag/anim0.asm
diff --git a/gfx/pics/poliwag/anim1.asm b/gfx/pokemon/poliwag/anim1.asm
index 839e57e87..839e57e87 100644
--- a/gfx/pics/poliwag/anim1.asm
+++ b/gfx/pokemon/poliwag/anim1.asm
diff --git a/gfx/pics/poliwag/back.2bpp.lz.35b9ee20 b/gfx/pokemon/poliwag/back.2bpp.lz.35b9ee20
index 58d039d16..58d039d16 100644
--- a/gfx/pics/poliwag/back.2bpp.lz.35b9ee20
+++ b/gfx/pokemon/poliwag/back.2bpp.lz.35b9ee20
diff --git a/gfx/pics/poliwag/back.png b/gfx/pokemon/poliwag/back.png
index 44348236e..44348236e 100644
--- a/gfx/pics/poliwag/back.png
+++ b/gfx/pokemon/poliwag/back.png
diff --git a/gfx/pics/poliwag/front.animated.2bpp.lz.c7d26488 b/gfx/pokemon/poliwag/front.animated.2bpp.lz.c7d26488
index df9741516..df9741516 100644
--- a/gfx/pics/poliwag/front.animated.2bpp.lz.c7d26488
+++ b/gfx/pokemon/poliwag/front.animated.2bpp.lz.c7d26488
diff --git a/gfx/pics/poliwag/front.png b/gfx/pokemon/poliwag/front.png
index c61c98fff..c61c98fff 100644
--- a/gfx/pics/poliwag/front.png
+++ b/gfx/pokemon/poliwag/front.png
diff --git a/gfx/pics/poliwag/shiny.pal b/gfx/pokemon/poliwag/shiny.pal
index a6dbd0cfd..a6dbd0cfd 100644
--- a/gfx/pics/poliwag/shiny.pal
+++ b/gfx/pokemon/poliwag/shiny.pal
diff --git a/gfx/pics/poliwhirl/anim0.asm b/gfx/pokemon/poliwhirl/anim0.asm
index 14cb89029..14cb89029 100644
--- a/gfx/pics/poliwhirl/anim0.asm
+++ b/gfx/pokemon/poliwhirl/anim0.asm
diff --git a/gfx/pics/poliwhirl/anim1.asm b/gfx/pokemon/poliwhirl/anim1.asm
index 72ba07245..72ba07245 100644
--- a/gfx/pics/poliwhirl/anim1.asm
+++ b/gfx/pokemon/poliwhirl/anim1.asm
diff --git a/gfx/pics/poliwhirl/back.2bpp.lz.76564593 b/gfx/pokemon/poliwhirl/back.2bpp.lz.76564593
index a78a2cfff..a78a2cfff 100644
--- a/gfx/pics/poliwhirl/back.2bpp.lz.76564593
+++ b/gfx/pokemon/poliwhirl/back.2bpp.lz.76564593
diff --git a/gfx/pics/poliwhirl/back.png b/gfx/pokemon/poliwhirl/back.png
index 51e374cb7..51e374cb7 100644
--- a/gfx/pics/poliwhirl/back.png
+++ b/gfx/pokemon/poliwhirl/back.png
diff --git a/gfx/pics/poliwhirl/front.animated.2bpp.lz.9a36033f b/gfx/pokemon/poliwhirl/front.animated.2bpp.lz.9a36033f
index b06f41441..b06f41441 100644
--- a/gfx/pics/poliwhirl/front.animated.2bpp.lz.9a36033f
+++ b/gfx/pokemon/poliwhirl/front.animated.2bpp.lz.9a36033f
diff --git a/gfx/pics/poliwhirl/front.png b/gfx/pokemon/poliwhirl/front.png
index 0419f4f9e..0419f4f9e 100644
--- a/gfx/pics/poliwhirl/front.png
+++ b/gfx/pokemon/poliwhirl/front.png
diff --git a/gfx/pics/poliwhirl/shiny.pal b/gfx/pokemon/poliwhirl/shiny.pal
index 1a5ee7b27..1a5ee7b27 100644
--- a/gfx/pics/poliwhirl/shiny.pal
+++ b/gfx/pokemon/poliwhirl/shiny.pal
diff --git a/gfx/pics/poliwrath/anim0.asm b/gfx/pokemon/poliwrath/anim0.asm
index 2b5fb0eef..2b5fb0eef 100644
--- a/gfx/pics/poliwrath/anim0.asm
+++ b/gfx/pokemon/poliwrath/anim0.asm
diff --git a/gfx/pics/poliwrath/anim1.asm b/gfx/pokemon/poliwrath/anim1.asm
index f709ea35c..f709ea35c 100644
--- a/gfx/pics/poliwrath/anim1.asm
+++ b/gfx/pokemon/poliwrath/anim1.asm
diff --git a/gfx/pics/poliwrath/back.2bpp.lz.240e911e b/gfx/pokemon/poliwrath/back.2bpp.lz.240e911e
index eab9164aa..eab9164aa 100644
--- a/gfx/pics/poliwrath/back.2bpp.lz.240e911e
+++ b/gfx/pokemon/poliwrath/back.2bpp.lz.240e911e
diff --git a/gfx/pics/poliwrath/back.png b/gfx/pokemon/poliwrath/back.png
index fe6216970..fe6216970 100644
--- a/gfx/pics/poliwrath/back.png
+++ b/gfx/pokemon/poliwrath/back.png
diff --git a/gfx/pics/poliwrath/front.animated.2bpp.lz.fb1157ec b/gfx/pokemon/poliwrath/front.animated.2bpp.lz.fb1157ec
index 601937221..601937221 100644
--- a/gfx/pics/poliwrath/front.animated.2bpp.lz.fb1157ec
+++ b/gfx/pokemon/poliwrath/front.animated.2bpp.lz.fb1157ec
diff --git a/gfx/pics/poliwrath/front.png b/gfx/pokemon/poliwrath/front.png
index a1271b9e2..a1271b9e2 100644
--- a/gfx/pics/poliwrath/front.png
+++ b/gfx/pokemon/poliwrath/front.png
diff --git a/gfx/pics/poliwrath/shiny.pal b/gfx/pokemon/poliwrath/shiny.pal
index f9da6007b..f9da6007b 100644
--- a/gfx/pics/poliwrath/shiny.pal
+++ b/gfx/pokemon/poliwrath/shiny.pal
diff --git a/gfx/pics/ponyta/anim0.asm b/gfx/pokemon/ponyta/anim0.asm
index 34c3a82b6..34c3a82b6 100644
--- a/gfx/pics/ponyta/anim0.asm
+++ b/gfx/pokemon/ponyta/anim0.asm
diff --git a/gfx/pics/ponyta/anim1.asm b/gfx/pokemon/ponyta/anim1.asm
index 10c9f42dd..10c9f42dd 100644
--- a/gfx/pics/ponyta/anim1.asm
+++ b/gfx/pokemon/ponyta/anim1.asm
diff --git a/gfx/pics/ponyta/back.2bpp.lz.10ddc7ea b/gfx/pokemon/ponyta/back.2bpp.lz.10ddc7ea
index 5d7ecaa93..5d7ecaa93 100644
--- a/gfx/pics/ponyta/back.2bpp.lz.10ddc7ea
+++ b/gfx/pokemon/ponyta/back.2bpp.lz.10ddc7ea
diff --git a/gfx/pics/ponyta/back.png b/gfx/pokemon/ponyta/back.png
index 42b1190c6..42b1190c6 100644
--- a/gfx/pics/ponyta/back.png
+++ b/gfx/pokemon/ponyta/back.png
diff --git a/gfx/pics/ponyta/front.animated.2bpp.lz.2c8708d6 b/gfx/pokemon/ponyta/front.animated.2bpp.lz.2c8708d6
index 5d3aa48db..5d3aa48db 100644
--- a/gfx/pics/ponyta/front.animated.2bpp.lz.2c8708d6
+++ b/gfx/pokemon/ponyta/front.animated.2bpp.lz.2c8708d6
diff --git a/gfx/pics/ponyta/front.png b/gfx/pokemon/ponyta/front.png
index a83fbfb15..a83fbfb15 100644
--- a/gfx/pics/ponyta/front.png
+++ b/gfx/pokemon/ponyta/front.png
diff --git a/gfx/pics/ponyta/shiny.pal b/gfx/pokemon/ponyta/shiny.pal
index 0358f40dd..0358f40dd 100644
--- a/gfx/pics/ponyta/shiny.pal
+++ b/gfx/pokemon/ponyta/shiny.pal
diff --git a/gfx/pics/porygon/anim0.asm b/gfx/pokemon/porygon/anim0.asm
index 0246a5621..0246a5621 100644
--- a/gfx/pics/porygon/anim0.asm
+++ b/gfx/pokemon/porygon/anim0.asm
diff --git a/gfx/pics/porygon/anim1.asm b/gfx/pokemon/porygon/anim1.asm
index 89af5d13f..89af5d13f 100644
--- a/gfx/pics/porygon/anim1.asm
+++ b/gfx/pokemon/porygon/anim1.asm
diff --git a/gfx/pics/porygon/back.2bpp.lz.b3d71350 b/gfx/pokemon/porygon/back.2bpp.lz.b3d71350
index 5f0a47032..5f0a47032 100644
--- a/gfx/pics/porygon/back.2bpp.lz.b3d71350
+++ b/gfx/pokemon/porygon/back.2bpp.lz.b3d71350
diff --git a/gfx/pics/porygon/back.png b/gfx/pokemon/porygon/back.png
index 6833d9206..6833d9206 100644
--- a/gfx/pics/porygon/back.png
+++ b/gfx/pokemon/porygon/back.png
diff --git a/gfx/pics/porygon/front.animated.2bpp.lz.70fc1333 b/gfx/pokemon/porygon/front.animated.2bpp.lz.70fc1333
index 734305a14..734305a14 100644
--- a/gfx/pics/porygon/front.animated.2bpp.lz.70fc1333
+++ b/gfx/pokemon/porygon/front.animated.2bpp.lz.70fc1333
diff --git a/gfx/pics/porygon/front.png b/gfx/pokemon/porygon/front.png
index ef4a1d782..ef4a1d782 100644
--- a/gfx/pics/porygon/front.png
+++ b/gfx/pokemon/porygon/front.png
diff --git a/gfx/pics/porygon/shiny.pal b/gfx/pokemon/porygon/shiny.pal
index bea4751bf..bea4751bf 100644
--- a/gfx/pics/porygon/shiny.pal
+++ b/gfx/pokemon/porygon/shiny.pal
diff --git a/gfx/pics/porygon2/anim0.asm b/gfx/pokemon/porygon2/anim0.asm
index b94920e29..b94920e29 100644
--- a/gfx/pics/porygon2/anim0.asm
+++ b/gfx/pokemon/porygon2/anim0.asm
diff --git a/gfx/pics/porygon2/anim1.asm b/gfx/pokemon/porygon2/anim1.asm
index b3a029047..b3a029047 100644
--- a/gfx/pics/porygon2/anim1.asm
+++ b/gfx/pokemon/porygon2/anim1.asm
diff --git a/gfx/pics/porygon2/back.2bpp.lz.5bba6e40 b/gfx/pokemon/porygon2/back.2bpp.lz.5bba6e40
index 5be528963..5be528963 100644
--- a/gfx/pics/porygon2/back.2bpp.lz.5bba6e40
+++ b/gfx/pokemon/porygon2/back.2bpp.lz.5bba6e40
diff --git a/gfx/pics/porygon2/back.png b/gfx/pokemon/porygon2/back.png
index a8d7ed4e6..a8d7ed4e6 100644
--- a/gfx/pics/porygon2/back.png
+++ b/gfx/pokemon/porygon2/back.png
diff --git a/gfx/pics/porygon2/front.animated.2bpp.lz.a6410e75 b/gfx/pokemon/porygon2/front.animated.2bpp.lz.a6410e75
index 5e66bb54d..5e66bb54d 100644
--- a/gfx/pics/porygon2/front.animated.2bpp.lz.a6410e75
+++ b/gfx/pokemon/porygon2/front.animated.2bpp.lz.a6410e75
diff --git a/gfx/pics/porygon2/front.png b/gfx/pokemon/porygon2/front.png
index 16e8d44e6..16e8d44e6 100644
--- a/gfx/pics/porygon2/front.png
+++ b/gfx/pokemon/porygon2/front.png
diff --git a/gfx/pics/porygon2/shiny.pal b/gfx/pokemon/porygon2/shiny.pal
index 3b0c4dabe..3b0c4dabe 100644
--- a/gfx/pics/porygon2/shiny.pal
+++ b/gfx/pokemon/porygon2/shiny.pal
diff --git a/gfx/pics/primeape/anim0.asm b/gfx/pokemon/primeape/anim0.asm
index a2a427059..a2a427059 100644
--- a/gfx/pics/primeape/anim0.asm
+++ b/gfx/pokemon/primeape/anim0.asm
diff --git a/gfx/pics/primeape/anim1.asm b/gfx/pokemon/primeape/anim1.asm
index 7d1c8a2d7..7d1c8a2d7 100644
--- a/gfx/pics/primeape/anim1.asm
+++ b/gfx/pokemon/primeape/anim1.asm
diff --git a/gfx/pics/primeape/back.2bpp.lz.690e407d b/gfx/pokemon/primeape/back.2bpp.lz.690e407d
index c0937a9ae..c0937a9ae 100644
--- a/gfx/pics/primeape/back.2bpp.lz.690e407d
+++ b/gfx/pokemon/primeape/back.2bpp.lz.690e407d
diff --git a/gfx/pics/primeape/back.png b/gfx/pokemon/primeape/back.png
index 172c67b57..172c67b57 100644
--- a/gfx/pics/primeape/back.png
+++ b/gfx/pokemon/primeape/back.png
diff --git a/gfx/pics/primeape/front.animated.2bpp.lz.218352ec b/gfx/pokemon/primeape/front.animated.2bpp.lz.218352ec
index 8f513878f..8f513878f 100644
--- a/gfx/pics/primeape/front.animated.2bpp.lz.218352ec
+++ b/gfx/pokemon/primeape/front.animated.2bpp.lz.218352ec
diff --git a/gfx/pics/primeape/front.png b/gfx/pokemon/primeape/front.png
index 94c2cedba..94c2cedba 100644
--- a/gfx/pics/primeape/front.png
+++ b/gfx/pokemon/primeape/front.png
diff --git a/gfx/pics/primeape/shiny.pal b/gfx/pokemon/primeape/shiny.pal
index ee3d37e93..ee3d37e93 100644
--- a/gfx/pics/primeape/shiny.pal
+++ b/gfx/pokemon/primeape/shiny.pal
diff --git a/gfx/pics/psyduck/anim0.asm b/gfx/pokemon/psyduck/anim0.asm
index da6f3aec6..da6f3aec6 100644
--- a/gfx/pics/psyduck/anim0.asm
+++ b/gfx/pokemon/psyduck/anim0.asm
diff --git a/gfx/pics/psyduck/anim1.asm b/gfx/pokemon/psyduck/anim1.asm
index 2fabc5b19..2fabc5b19 100644
--- a/gfx/pics/psyduck/anim1.asm
+++ b/gfx/pokemon/psyduck/anim1.asm
diff --git a/gfx/pics/psyduck/back.2bpp.lz.d68cddb2 b/gfx/pokemon/psyduck/back.2bpp.lz.d68cddb2
index d627a146c..d627a146c 100644
--- a/gfx/pics/psyduck/back.2bpp.lz.d68cddb2
+++ b/gfx/pokemon/psyduck/back.2bpp.lz.d68cddb2
diff --git a/gfx/pics/psyduck/back.png b/gfx/pokemon/psyduck/back.png
index e2aab20b1..e2aab20b1 100644
--- a/gfx/pics/psyduck/back.png
+++ b/gfx/pokemon/psyduck/back.png
diff --git a/gfx/pics/psyduck/front.animated.2bpp.lz.e4efd065 b/gfx/pokemon/psyduck/front.animated.2bpp.lz.e4efd065
index 7988f1b0c..7988f1b0c 100644
--- a/gfx/pics/psyduck/front.animated.2bpp.lz.e4efd065
+++ b/gfx/pokemon/psyduck/front.animated.2bpp.lz.e4efd065
diff --git a/gfx/pics/psyduck/front.png b/gfx/pokemon/psyduck/front.png
index a207b04d8..a207b04d8 100644
--- a/gfx/pics/psyduck/front.png
+++ b/gfx/pokemon/psyduck/front.png
diff --git a/gfx/pics/psyduck/shiny.pal b/gfx/pokemon/psyduck/shiny.pal
index 27cbf08c4..27cbf08c4 100644
--- a/gfx/pics/psyduck/shiny.pal
+++ b/gfx/pokemon/psyduck/shiny.pal
diff --git a/gfx/pics/pupitar/anim0.asm b/gfx/pokemon/pupitar/anim0.asm
index c3ea44bc9..c3ea44bc9 100644
--- a/gfx/pics/pupitar/anim0.asm
+++ b/gfx/pokemon/pupitar/anim0.asm
diff --git a/gfx/pics/pupitar/anim1.asm b/gfx/pokemon/pupitar/anim1.asm
index efc0f3bb4..efc0f3bb4 100644
--- a/gfx/pics/pupitar/anim1.asm
+++ b/gfx/pokemon/pupitar/anim1.asm
diff --git a/gfx/pics/pupitar/back.2bpp.lz.100020c1 b/gfx/pokemon/pupitar/back.2bpp.lz.100020c1
index 46cf0e240..46cf0e240 100644
--- a/gfx/pics/pupitar/back.2bpp.lz.100020c1
+++ b/gfx/pokemon/pupitar/back.2bpp.lz.100020c1
diff --git a/gfx/pics/pupitar/back.png b/gfx/pokemon/pupitar/back.png
index ae19688ab..ae19688ab 100644
--- a/gfx/pics/pupitar/back.png
+++ b/gfx/pokemon/pupitar/back.png
diff --git a/gfx/pics/pupitar/front.animated.2bpp.lz.418c0962 b/gfx/pokemon/pupitar/front.animated.2bpp.lz.418c0962
index c39582db6..c39582db6 100644
--- a/gfx/pics/pupitar/front.animated.2bpp.lz.418c0962
+++ b/gfx/pokemon/pupitar/front.animated.2bpp.lz.418c0962
diff --git a/gfx/pics/pupitar/front.png b/gfx/pokemon/pupitar/front.png
index afc1897d1..afc1897d1 100644
--- a/gfx/pics/pupitar/front.png
+++ b/gfx/pokemon/pupitar/front.png
diff --git a/gfx/pics/pupitar/shiny.pal b/gfx/pokemon/pupitar/shiny.pal
index a8c6cb74f..a8c6cb74f 100644
--- a/gfx/pics/pupitar/shiny.pal
+++ b/gfx/pokemon/pupitar/shiny.pal
diff --git a/gfx/pics/quagsire/anim0.asm b/gfx/pokemon/quagsire/anim0.asm
index 852780069..852780069 100644
--- a/gfx/pics/quagsire/anim0.asm
+++ b/gfx/pokemon/quagsire/anim0.asm
diff --git a/gfx/pics/quagsire/anim1.asm b/gfx/pokemon/quagsire/anim1.asm
index f5c2ed31b..f5c2ed31b 100644
--- a/gfx/pics/quagsire/anim1.asm
+++ b/gfx/pokemon/quagsire/anim1.asm
diff --git a/gfx/pics/quagsire/back.2bpp.lz.64b2ec05 b/gfx/pokemon/quagsire/back.2bpp.lz.64b2ec05
index 543ce394f..543ce394f 100644
--- a/gfx/pics/quagsire/back.2bpp.lz.64b2ec05
+++ b/gfx/pokemon/quagsire/back.2bpp.lz.64b2ec05
diff --git a/gfx/pics/quagsire/back.png b/gfx/pokemon/quagsire/back.png
index d83a1b810..d83a1b810 100644
--- a/gfx/pics/quagsire/back.png
+++ b/gfx/pokemon/quagsire/back.png
diff --git a/gfx/pics/quagsire/front.animated.2bpp.lz.bd292a94 b/gfx/pokemon/quagsire/front.animated.2bpp.lz.bd292a94
index d1f42f064..d1f42f064 100644
--- a/gfx/pics/quagsire/front.animated.2bpp.lz.bd292a94
+++ b/gfx/pokemon/quagsire/front.animated.2bpp.lz.bd292a94
diff --git a/gfx/pics/quagsire/front.png b/gfx/pokemon/quagsire/front.png
index d64fe3709..d64fe3709 100644
--- a/gfx/pics/quagsire/front.png
+++ b/gfx/pokemon/quagsire/front.png
diff --git a/gfx/pics/quagsire/shiny.pal b/gfx/pokemon/quagsire/shiny.pal
index 05ed0f64a..05ed0f64a 100644
--- a/gfx/pics/quagsire/shiny.pal
+++ b/gfx/pokemon/quagsire/shiny.pal
diff --git a/gfx/pics/questionmark/front.2bpp.lz.14c284f5 b/gfx/pokemon/questionmark/front.2bpp.lz.14c284f5
index cd2f7f22e..cd2f7f22e 100644
--- a/gfx/pics/questionmark/front.2bpp.lz.14c284f5
+++ b/gfx/pokemon/questionmark/front.2bpp.lz.14c284f5
diff --git a/gfx/pics/questionmark/front.png b/gfx/pokemon/questionmark/front.png
index e2b681c73..e2b681c73 100644
--- a/gfx/pics/questionmark/front.png
+++ b/gfx/pokemon/questionmark/front.png
diff --git a/gfx/pics/quilava/anim0.asm b/gfx/pokemon/quilava/anim0.asm
index b5df67978..b5df67978 100644
--- a/gfx/pics/quilava/anim0.asm
+++ b/gfx/pokemon/quilava/anim0.asm
diff --git a/gfx/pics/quilava/anim1.asm b/gfx/pokemon/quilava/anim1.asm
index 09f187796..09f187796 100644
--- a/gfx/pics/quilava/anim1.asm
+++ b/gfx/pokemon/quilava/anim1.asm
diff --git a/gfx/pics/quilava/back.2bpp.lz.500906e1 b/gfx/pokemon/quilava/back.2bpp.lz.500906e1
index 8514a77c7..8514a77c7 100644
--- a/gfx/pics/quilava/back.2bpp.lz.500906e1
+++ b/gfx/pokemon/quilava/back.2bpp.lz.500906e1
diff --git a/gfx/pics/quilava/back.png b/gfx/pokemon/quilava/back.png
index 79b50b9b0..79b50b9b0 100644
--- a/gfx/pics/quilava/back.png
+++ b/gfx/pokemon/quilava/back.png
diff --git a/gfx/pics/quilava/front.animated.2bpp.lz.f42f4c67 b/gfx/pokemon/quilava/front.animated.2bpp.lz.f42f4c67
index 33aebb81c..33aebb81c 100644
--- a/gfx/pics/quilava/front.animated.2bpp.lz.f42f4c67
+++ b/gfx/pokemon/quilava/front.animated.2bpp.lz.f42f4c67
diff --git a/gfx/pics/quilava/front.png b/gfx/pokemon/quilava/front.png
index 96ccbb551..96ccbb551 100644
--- a/gfx/pics/quilava/front.png
+++ b/gfx/pokemon/quilava/front.png
diff --git a/gfx/pics/quilava/shiny.pal b/gfx/pokemon/quilava/shiny.pal
index 5b3df0b4e..5b3df0b4e 100644
--- a/gfx/pics/quilava/shiny.pal
+++ b/gfx/pokemon/quilava/shiny.pal
diff --git a/gfx/pics/qwilfish/anim0.asm b/gfx/pokemon/qwilfish/anim0.asm
index 6e5d62d04..6e5d62d04 100644
--- a/gfx/pics/qwilfish/anim0.asm
+++ b/gfx/pokemon/qwilfish/anim0.asm
diff --git a/gfx/pics/qwilfish/anim1.asm b/gfx/pokemon/qwilfish/anim1.asm
index 4330e80cc..4330e80cc 100644
--- a/gfx/pics/qwilfish/anim1.asm
+++ b/gfx/pokemon/qwilfish/anim1.asm
diff --git a/gfx/pics/qwilfish/back.2bpp.lz.b2bb83c6 b/gfx/pokemon/qwilfish/back.2bpp.lz.b2bb83c6
index 09f793f47..09f793f47 100644
--- a/gfx/pics/qwilfish/back.2bpp.lz.b2bb83c6
+++ b/gfx/pokemon/qwilfish/back.2bpp.lz.b2bb83c6
diff --git a/gfx/pics/qwilfish/back.png b/gfx/pokemon/qwilfish/back.png
index 107af1018..107af1018 100644
--- a/gfx/pics/qwilfish/back.png
+++ b/gfx/pokemon/qwilfish/back.png
diff --git a/gfx/pics/qwilfish/front.animated.2bpp.lz.9e79c033 b/gfx/pokemon/qwilfish/front.animated.2bpp.lz.9e79c033
index 02370c7ba..02370c7ba 100644
--- a/gfx/pics/qwilfish/front.animated.2bpp.lz.9e79c033
+++ b/gfx/pokemon/qwilfish/front.animated.2bpp.lz.9e79c033
diff --git a/gfx/pics/qwilfish/front.png b/gfx/pokemon/qwilfish/front.png
index 15a0415cb..15a0415cb 100644
--- a/gfx/pics/qwilfish/front.png
+++ b/gfx/pokemon/qwilfish/front.png
diff --git a/gfx/pics/qwilfish/shiny.pal b/gfx/pokemon/qwilfish/shiny.pal
index 97c36795e..97c36795e 100644
--- a/gfx/pics/qwilfish/shiny.pal
+++ b/gfx/pokemon/qwilfish/shiny.pal
diff --git a/gfx/pics/raichu/anim0.asm b/gfx/pokemon/raichu/anim0.asm
index a7312c7ae..a7312c7ae 100644
--- a/gfx/pics/raichu/anim0.asm
+++ b/gfx/pokemon/raichu/anim0.asm
diff --git a/gfx/pics/raichu/anim1.asm b/gfx/pokemon/raichu/anim1.asm
index 87f07ce9c..87f07ce9c 100644
--- a/gfx/pics/raichu/anim1.asm
+++ b/gfx/pokemon/raichu/anim1.asm
diff --git a/gfx/pics/raichu/back.2bpp.lz.fa4c7423 b/gfx/pokemon/raichu/back.2bpp.lz.fa4c7423
index 912c378e8..912c378e8 100644
--- a/gfx/pics/raichu/back.2bpp.lz.fa4c7423
+++ b/gfx/pokemon/raichu/back.2bpp.lz.fa4c7423
diff --git a/gfx/pics/raichu/back.png b/gfx/pokemon/raichu/back.png
index 36a0df5f3..36a0df5f3 100644
--- a/gfx/pics/raichu/back.png
+++ b/gfx/pokemon/raichu/back.png
diff --git a/gfx/pics/raichu/front.animated.2bpp.lz.25f943cb b/gfx/pokemon/raichu/front.animated.2bpp.lz.25f943cb
index 84115fb00..84115fb00 100644
--- a/gfx/pics/raichu/front.animated.2bpp.lz.25f943cb
+++ b/gfx/pokemon/raichu/front.animated.2bpp.lz.25f943cb
diff --git a/gfx/pics/raichu/front.png b/gfx/pokemon/raichu/front.png
index 06bbf12bb..06bbf12bb 100644
--- a/gfx/pics/raichu/front.png
+++ b/gfx/pokemon/raichu/front.png
diff --git a/gfx/pics/raichu/shiny.pal b/gfx/pokemon/raichu/shiny.pal
index 0491d1ee2..0491d1ee2 100644
--- a/gfx/pics/raichu/shiny.pal
+++ b/gfx/pokemon/raichu/shiny.pal
diff --git a/gfx/pics/raikou/anim0.asm b/gfx/pokemon/raikou/anim0.asm
index 91931b3ef..91931b3ef 100644
--- a/gfx/pics/raikou/anim0.asm
+++ b/gfx/pokemon/raikou/anim0.asm
diff --git a/gfx/pics/raikou/anim1.asm b/gfx/pokemon/raikou/anim1.asm
index ec54577cd..ec54577cd 100644
--- a/gfx/pics/raikou/anim1.asm
+++ b/gfx/pokemon/raikou/anim1.asm
diff --git a/gfx/pics/raikou/back.2bpp.lz.657ddfaf b/gfx/pokemon/raikou/back.2bpp.lz.657ddfaf
index 23fd5c471..23fd5c471 100644
--- a/gfx/pics/raikou/back.2bpp.lz.657ddfaf
+++ b/gfx/pokemon/raikou/back.2bpp.lz.657ddfaf
diff --git a/gfx/pics/raikou/back.png b/gfx/pokemon/raikou/back.png
index 0214e673c..0214e673c 100644
--- a/gfx/pics/raikou/back.png
+++ b/gfx/pokemon/raikou/back.png
diff --git a/gfx/pics/raikou/front.animated.2bpp.lz.464b6fd7 b/gfx/pokemon/raikou/front.animated.2bpp.lz.464b6fd7
index dba4517aa..dba4517aa 100644
--- a/gfx/pics/raikou/front.animated.2bpp.lz.464b6fd7
+++ b/gfx/pokemon/raikou/front.animated.2bpp.lz.464b6fd7
diff --git a/gfx/pics/raikou/front.png b/gfx/pokemon/raikou/front.png
index 4854f2571..4854f2571 100644
--- a/gfx/pics/raikou/front.png
+++ b/gfx/pokemon/raikou/front.png
diff --git a/gfx/pics/raikou/shiny.pal b/gfx/pokemon/raikou/shiny.pal
index 509a54c48..509a54c48 100644
--- a/gfx/pics/raikou/shiny.pal
+++ b/gfx/pokemon/raikou/shiny.pal
diff --git a/gfx/pics/rapidash/anim0.asm b/gfx/pokemon/rapidash/anim0.asm
index 6fe29db8f..6fe29db8f 100644
--- a/gfx/pics/rapidash/anim0.asm
+++ b/gfx/pokemon/rapidash/anim0.asm
diff --git a/gfx/pics/rapidash/anim1.asm b/gfx/pokemon/rapidash/anim1.asm
index 0105673c9..0105673c9 100644
--- a/gfx/pics/rapidash/anim1.asm
+++ b/gfx/pokemon/rapidash/anim1.asm
diff --git a/gfx/pics/rapidash/back.2bpp.lz.fdd1946c b/gfx/pokemon/rapidash/back.2bpp.lz.fdd1946c
index 3854c29e5..3854c29e5 100644
--- a/gfx/pics/rapidash/back.2bpp.lz.fdd1946c
+++ b/gfx/pokemon/rapidash/back.2bpp.lz.fdd1946c
diff --git a/gfx/pics/rapidash/back.png b/gfx/pokemon/rapidash/back.png
index 70de0e5ec..70de0e5ec 100644
--- a/gfx/pics/rapidash/back.png
+++ b/gfx/pokemon/rapidash/back.png
diff --git a/gfx/pics/rapidash/front.animated.2bpp.lz.d5ac5a96 b/gfx/pokemon/rapidash/front.animated.2bpp.lz.d5ac5a96
index 231e312fb..231e312fb 100644
--- a/gfx/pics/rapidash/front.animated.2bpp.lz.d5ac5a96
+++ b/gfx/pokemon/rapidash/front.animated.2bpp.lz.d5ac5a96
diff --git a/gfx/pics/rapidash/front.png b/gfx/pokemon/rapidash/front.png
index 7930fd606..7930fd606 100644
--- a/gfx/pics/rapidash/front.png
+++ b/gfx/pokemon/rapidash/front.png
diff --git a/gfx/pics/rapidash/shiny.pal b/gfx/pokemon/rapidash/shiny.pal
index f6ae96e3c..f6ae96e3c 100644
--- a/gfx/pics/rapidash/shiny.pal
+++ b/gfx/pokemon/rapidash/shiny.pal
diff --git a/gfx/pics/raticate/anim0.asm b/gfx/pokemon/raticate/anim0.asm
index ad6450f27..ad6450f27 100644
--- a/gfx/pics/raticate/anim0.asm
+++ b/gfx/pokemon/raticate/anim0.asm
diff --git a/gfx/pics/raticate/anim1.asm b/gfx/pokemon/raticate/anim1.asm
index 3ff83aa1c..3ff83aa1c 100644
--- a/gfx/pics/raticate/anim1.asm
+++ b/gfx/pokemon/raticate/anim1.asm
diff --git a/gfx/pics/raticate/back.2bpp.lz.b2a77d02 b/gfx/pokemon/raticate/back.2bpp.lz.b2a77d02
index 4e69587dd..4e69587dd 100644
--- a/gfx/pics/raticate/back.2bpp.lz.b2a77d02
+++ b/gfx/pokemon/raticate/back.2bpp.lz.b2a77d02
diff --git a/gfx/pics/raticate/back.png b/gfx/pokemon/raticate/back.png
index fbeef9a41..fbeef9a41 100644
--- a/gfx/pics/raticate/back.png
+++ b/gfx/pokemon/raticate/back.png
diff --git a/gfx/pics/raticate/front.animated.2bpp.lz.ef1a4689 b/gfx/pokemon/raticate/front.animated.2bpp.lz.ef1a4689
index 5b426cbdd..5b426cbdd 100644
--- a/gfx/pics/raticate/front.animated.2bpp.lz.ef1a4689
+++ b/gfx/pokemon/raticate/front.animated.2bpp.lz.ef1a4689
diff --git a/gfx/pics/raticate/front.png b/gfx/pokemon/raticate/front.png
index 37695c19d..37695c19d 100644
--- a/gfx/pics/raticate/front.png
+++ b/gfx/pokemon/raticate/front.png
diff --git a/gfx/pics/raticate/shiny.pal b/gfx/pokemon/raticate/shiny.pal
index a0c0f5546..a0c0f5546 100644
--- a/gfx/pics/raticate/shiny.pal
+++ b/gfx/pokemon/raticate/shiny.pal
diff --git a/gfx/pics/rattata/anim0.asm b/gfx/pokemon/rattata/anim0.asm
index 0c72f16f9..0c72f16f9 100644
--- a/gfx/pics/rattata/anim0.asm
+++ b/gfx/pokemon/rattata/anim0.asm
diff --git a/gfx/pics/rattata/anim1.asm b/gfx/pokemon/rattata/anim1.asm
index a760b136e..a760b136e 100644
--- a/gfx/pics/rattata/anim1.asm
+++ b/gfx/pokemon/rattata/anim1.asm
diff --git a/gfx/pics/rattata/back.2bpp.lz.86979cd5 b/gfx/pokemon/rattata/back.2bpp.lz.86979cd5
index a06c5f1f8..a06c5f1f8 100644
--- a/gfx/pics/rattata/back.2bpp.lz.86979cd5
+++ b/gfx/pokemon/rattata/back.2bpp.lz.86979cd5
diff --git a/gfx/pics/rattata/back.png b/gfx/pokemon/rattata/back.png
index 355f16b4b..355f16b4b 100644
--- a/gfx/pics/rattata/back.png
+++ b/gfx/pokemon/rattata/back.png
diff --git a/gfx/pics/rattata/front.animated.2bpp.lz.5bdaea2b b/gfx/pokemon/rattata/front.animated.2bpp.lz.5bdaea2b
index 7bb18d542..7bb18d542 100644
--- a/gfx/pics/rattata/front.animated.2bpp.lz.5bdaea2b
+++ b/gfx/pokemon/rattata/front.animated.2bpp.lz.5bdaea2b
diff --git a/gfx/pics/rattata/front.png b/gfx/pokemon/rattata/front.png
index cb556cbdb..cb556cbdb 100644
--- a/gfx/pics/rattata/front.png
+++ b/gfx/pokemon/rattata/front.png
diff --git a/gfx/pics/rattata/shiny.pal b/gfx/pokemon/rattata/shiny.pal
index 834a29cf0..834a29cf0 100644
--- a/gfx/pics/rattata/shiny.pal
+++ b/gfx/pokemon/rattata/shiny.pal
diff --git a/gfx/pics/remoraid/anim0.asm b/gfx/pokemon/remoraid/anim0.asm
index 5fca75d12..5fca75d12 100644
--- a/gfx/pics/remoraid/anim0.asm
+++ b/gfx/pokemon/remoraid/anim0.asm
diff --git a/gfx/pics/remoraid/anim1.asm b/gfx/pokemon/remoraid/anim1.asm
index cb14bb7a7..cb14bb7a7 100644
--- a/gfx/pics/remoraid/anim1.asm
+++ b/gfx/pokemon/remoraid/anim1.asm
diff --git a/gfx/pics/remoraid/back.2bpp.lz.8a6e4f29 b/gfx/pokemon/remoraid/back.2bpp.lz.8a6e4f29
index 414d65a14..414d65a14 100644
--- a/gfx/pics/remoraid/back.2bpp.lz.8a6e4f29
+++ b/gfx/pokemon/remoraid/back.2bpp.lz.8a6e4f29
diff --git a/gfx/pics/remoraid/back.png b/gfx/pokemon/remoraid/back.png
index 2abcc55e0..2abcc55e0 100644
--- a/gfx/pics/remoraid/back.png
+++ b/gfx/pokemon/remoraid/back.png
diff --git a/gfx/pics/remoraid/front.animated.2bpp.lz.4eaf1230 b/gfx/pokemon/remoraid/front.animated.2bpp.lz.4eaf1230
index 6d702b4a1..6d702b4a1 100644
--- a/gfx/pics/remoraid/front.animated.2bpp.lz.4eaf1230
+++ b/gfx/pokemon/remoraid/front.animated.2bpp.lz.4eaf1230
diff --git a/gfx/pics/remoraid/front.png b/gfx/pokemon/remoraid/front.png
index d92ff5838..d92ff5838 100644
--- a/gfx/pics/remoraid/front.png
+++ b/gfx/pokemon/remoraid/front.png
diff --git a/gfx/pics/remoraid/shiny.pal b/gfx/pokemon/remoraid/shiny.pal
index 669e14e4a..669e14e4a 100644
--- a/gfx/pics/remoraid/shiny.pal
+++ b/gfx/pokemon/remoraid/shiny.pal
diff --git a/gfx/pics/rhydon/anim0.asm b/gfx/pokemon/rhydon/anim0.asm
index 77d736a55..77d736a55 100644
--- a/gfx/pics/rhydon/anim0.asm
+++ b/gfx/pokemon/rhydon/anim0.asm
diff --git a/gfx/pics/rhydon/anim1.asm b/gfx/pokemon/rhydon/anim1.asm
index b572a54ed..b572a54ed 100644
--- a/gfx/pics/rhydon/anim1.asm
+++ b/gfx/pokemon/rhydon/anim1.asm
diff --git a/gfx/pics/rhydon/back.2bpp.lz.4a3ea4af b/gfx/pokemon/rhydon/back.2bpp.lz.4a3ea4af
index b626f4ce6..b626f4ce6 100644
--- a/gfx/pics/rhydon/back.2bpp.lz.4a3ea4af
+++ b/gfx/pokemon/rhydon/back.2bpp.lz.4a3ea4af
diff --git a/gfx/pics/rhydon/back.png b/gfx/pokemon/rhydon/back.png
index 4b6f89869..4b6f89869 100644
--- a/gfx/pics/rhydon/back.png
+++ b/gfx/pokemon/rhydon/back.png
diff --git a/gfx/pics/rhydon/front.animated.2bpp.lz.7257fc4f b/gfx/pokemon/rhydon/front.animated.2bpp.lz.7257fc4f
index 0ad1c221b..0ad1c221b 100644
--- a/gfx/pics/rhydon/front.animated.2bpp.lz.7257fc4f
+++ b/gfx/pokemon/rhydon/front.animated.2bpp.lz.7257fc4f
diff --git a/gfx/pics/rhydon/front.png b/gfx/pokemon/rhydon/front.png
index 18a5f0aed..18a5f0aed 100644
--- a/gfx/pics/rhydon/front.png
+++ b/gfx/pokemon/rhydon/front.png
diff --git a/gfx/pics/rhydon/shiny.pal b/gfx/pokemon/rhydon/shiny.pal
index b036be1f3..b036be1f3 100644
--- a/gfx/pics/rhydon/shiny.pal
+++ b/gfx/pokemon/rhydon/shiny.pal
diff --git a/gfx/pics/rhyhorn/anim0.asm b/gfx/pokemon/rhyhorn/anim0.asm
index b966557c4..b966557c4 100644
--- a/gfx/pics/rhyhorn/anim0.asm
+++ b/gfx/pokemon/rhyhorn/anim0.asm
diff --git a/gfx/pics/rhyhorn/anim1.asm b/gfx/pokemon/rhyhorn/anim1.asm
index 66e53642e..66e53642e 100644
--- a/gfx/pics/rhyhorn/anim1.asm
+++ b/gfx/pokemon/rhyhorn/anim1.asm
diff --git a/gfx/pics/rhyhorn/back.2bpp.lz.b9a8e755 b/gfx/pokemon/rhyhorn/back.2bpp.lz.b9a8e755
index bfcafdcb4..bfcafdcb4 100644
--- a/gfx/pics/rhyhorn/back.2bpp.lz.b9a8e755
+++ b/gfx/pokemon/rhyhorn/back.2bpp.lz.b9a8e755
diff --git a/gfx/pics/rhyhorn/back.png b/gfx/pokemon/rhyhorn/back.png
index d2f6aa62f..d2f6aa62f 100644
--- a/gfx/pics/rhyhorn/back.png
+++ b/gfx/pokemon/rhyhorn/back.png
diff --git a/gfx/pics/rhyhorn/front.animated.2bpp.lz.bdfdf7dc b/gfx/pokemon/rhyhorn/front.animated.2bpp.lz.bdfdf7dc
index 62a2e8919..62a2e8919 100644
--- a/gfx/pics/rhyhorn/front.animated.2bpp.lz.bdfdf7dc
+++ b/gfx/pokemon/rhyhorn/front.animated.2bpp.lz.bdfdf7dc
diff --git a/gfx/pics/rhyhorn/front.png b/gfx/pokemon/rhyhorn/front.png
index e053a9703..e053a9703 100644
--- a/gfx/pics/rhyhorn/front.png
+++ b/gfx/pokemon/rhyhorn/front.png
diff --git a/gfx/pics/rhyhorn/shiny.pal b/gfx/pokemon/rhyhorn/shiny.pal
index 4b11a7f20..4b11a7f20 100644
--- a/gfx/pics/rhyhorn/shiny.pal
+++ b/gfx/pokemon/rhyhorn/shiny.pal
diff --git a/gfx/pics/sandshrew/anim0.asm b/gfx/pokemon/sandshrew/anim0.asm
index 01827dda4..01827dda4 100644
--- a/gfx/pics/sandshrew/anim0.asm
+++ b/gfx/pokemon/sandshrew/anim0.asm
diff --git a/gfx/pics/sandshrew/anim1.asm b/gfx/pokemon/sandshrew/anim1.asm
index 545b445bd..545b445bd 100644
--- a/gfx/pics/sandshrew/anim1.asm
+++ b/gfx/pokemon/sandshrew/anim1.asm
diff --git a/gfx/pics/sandshrew/back.2bpp.lz.7655193f b/gfx/pokemon/sandshrew/back.2bpp.lz.7655193f
index 63ddb82a1..63ddb82a1 100644
--- a/gfx/pics/sandshrew/back.2bpp.lz.7655193f
+++ b/gfx/pokemon/sandshrew/back.2bpp.lz.7655193f
diff --git a/gfx/pics/sandshrew/back.png b/gfx/pokemon/sandshrew/back.png
index c23af0677..c23af0677 100644
--- a/gfx/pics/sandshrew/back.png
+++ b/gfx/pokemon/sandshrew/back.png
diff --git a/gfx/pics/sandshrew/front.animated.2bpp.lz.758def3d b/gfx/pokemon/sandshrew/front.animated.2bpp.lz.758def3d
index 3d1da3087..3d1da3087 100644
--- a/gfx/pics/sandshrew/front.animated.2bpp.lz.758def3d
+++ b/gfx/pokemon/sandshrew/front.animated.2bpp.lz.758def3d
diff --git a/gfx/pics/sandshrew/front.png b/gfx/pokemon/sandshrew/front.png
index 44b69f12b..44b69f12b 100644
--- a/gfx/pics/sandshrew/front.png
+++ b/gfx/pokemon/sandshrew/front.png
diff --git a/gfx/pics/sandshrew/shiny.pal b/gfx/pokemon/sandshrew/shiny.pal
index 86d48731e..86d48731e 100644
--- a/gfx/pics/sandshrew/shiny.pal
+++ b/gfx/pokemon/sandshrew/shiny.pal
diff --git a/gfx/pics/sandslash/anim0.asm b/gfx/pokemon/sandslash/anim0.asm
index 040c0c429..040c0c429 100644
--- a/gfx/pics/sandslash/anim0.asm
+++ b/gfx/pokemon/sandslash/anim0.asm
diff --git a/gfx/pics/sandslash/anim1.asm b/gfx/pokemon/sandslash/anim1.asm
index b3480762d..b3480762d 100644
--- a/gfx/pics/sandslash/anim1.asm
+++ b/gfx/pokemon/sandslash/anim1.asm
diff --git a/gfx/pics/sandslash/back.2bpp.lz.2999f4c6 b/gfx/pokemon/sandslash/back.2bpp.lz.2999f4c6
index 52bb7ce7d..52bb7ce7d 100644
--- a/gfx/pics/sandslash/back.2bpp.lz.2999f4c6
+++ b/gfx/pokemon/sandslash/back.2bpp.lz.2999f4c6
diff --git a/gfx/pics/sandslash/back.png b/gfx/pokemon/sandslash/back.png
index 43704ad08..43704ad08 100644
--- a/gfx/pics/sandslash/back.png
+++ b/gfx/pokemon/sandslash/back.png
diff --git a/gfx/pics/sandslash/front.animated.2bpp.lz.d6498722 b/gfx/pokemon/sandslash/front.animated.2bpp.lz.d6498722
index cdffe9baf..cdffe9baf 100644
--- a/gfx/pics/sandslash/front.animated.2bpp.lz.d6498722
+++ b/gfx/pokemon/sandslash/front.animated.2bpp.lz.d6498722
diff --git a/gfx/pics/sandslash/front.png b/gfx/pokemon/sandslash/front.png
index adda651e1..adda651e1 100644
--- a/gfx/pics/sandslash/front.png
+++ b/gfx/pokemon/sandslash/front.png
diff --git a/gfx/pics/sandslash/shiny.pal b/gfx/pokemon/sandslash/shiny.pal
index db584124b..db584124b 100644
--- a/gfx/pics/sandslash/shiny.pal
+++ b/gfx/pokemon/sandslash/shiny.pal
diff --git a/gfx/pics/scizor/anim0.asm b/gfx/pokemon/scizor/anim0.asm
index d269c91d1..d269c91d1 100644
--- a/gfx/pics/scizor/anim0.asm
+++ b/gfx/pokemon/scizor/anim0.asm
diff --git a/gfx/pics/scizor/anim1.asm b/gfx/pokemon/scizor/anim1.asm
index 744d6cafc..744d6cafc 100644
--- a/gfx/pics/scizor/anim1.asm
+++ b/gfx/pokemon/scizor/anim1.asm
diff --git a/gfx/pics/scizor/back.2bpp.lz.85149f27 b/gfx/pokemon/scizor/back.2bpp.lz.85149f27
index 5a02e7000..5a02e7000 100644
--- a/gfx/pics/scizor/back.2bpp.lz.85149f27
+++ b/gfx/pokemon/scizor/back.2bpp.lz.85149f27
diff --git a/gfx/pics/scizor/back.png b/gfx/pokemon/scizor/back.png
index 53cef907e..53cef907e 100644
--- a/gfx/pics/scizor/back.png
+++ b/gfx/pokemon/scizor/back.png
diff --git a/gfx/pics/scizor/front.animated.2bpp.lz.afd0131a b/gfx/pokemon/scizor/front.animated.2bpp.lz.afd0131a
index e7d506f48..e7d506f48 100644
--- a/gfx/pics/scizor/front.animated.2bpp.lz.afd0131a
+++ b/gfx/pokemon/scizor/front.animated.2bpp.lz.afd0131a
diff --git a/gfx/pics/scizor/front.png b/gfx/pokemon/scizor/front.png
index 2adfb879f..2adfb879f 100644
--- a/gfx/pics/scizor/front.png
+++ b/gfx/pokemon/scizor/front.png
diff --git a/gfx/pics/scizor/shiny.pal b/gfx/pokemon/scizor/shiny.pal
index e4f5cf30e..e4f5cf30e 100644
--- a/gfx/pics/scizor/shiny.pal
+++ b/gfx/pokemon/scizor/shiny.pal
diff --git a/gfx/pics/scyther/anim0.asm b/gfx/pokemon/scyther/anim0.asm
index 572161065..572161065 100644
--- a/gfx/pics/scyther/anim0.asm
+++ b/gfx/pokemon/scyther/anim0.asm
diff --git a/gfx/pics/scyther/anim1.asm b/gfx/pokemon/scyther/anim1.asm
index e251a964d..e251a964d 100644
--- a/gfx/pics/scyther/anim1.asm
+++ b/gfx/pokemon/scyther/anim1.asm
diff --git a/gfx/pics/scyther/back.2bpp.lz.1d7f8a87 b/gfx/pokemon/scyther/back.2bpp.lz.1d7f8a87
index 421fc4ed0..421fc4ed0 100644
--- a/gfx/pics/scyther/back.2bpp.lz.1d7f8a87
+++ b/gfx/pokemon/scyther/back.2bpp.lz.1d7f8a87
diff --git a/gfx/pics/scyther/back.png b/gfx/pokemon/scyther/back.png
index 6af485895..6af485895 100644
--- a/gfx/pics/scyther/back.png
+++ b/gfx/pokemon/scyther/back.png
diff --git a/gfx/pics/scyther/front.animated.2bpp.lz.86d1a281 b/gfx/pokemon/scyther/front.animated.2bpp.lz.86d1a281
index 02773fc11..02773fc11 100644
--- a/gfx/pics/scyther/front.animated.2bpp.lz.86d1a281
+++ b/gfx/pokemon/scyther/front.animated.2bpp.lz.86d1a281
diff --git a/gfx/pics/scyther/front.png b/gfx/pokemon/scyther/front.png
index 088adc5a4..088adc5a4 100644
--- a/gfx/pics/scyther/front.png
+++ b/gfx/pokemon/scyther/front.png
diff --git a/gfx/pics/scyther/shiny.pal b/gfx/pokemon/scyther/shiny.pal
index 550d6dece..550d6dece 100644
--- a/gfx/pics/scyther/shiny.pal
+++ b/gfx/pokemon/scyther/shiny.pal
diff --git a/gfx/pics/seadra/anim0.asm b/gfx/pokemon/seadra/anim0.asm
index d06adbdb0..d06adbdb0 100644
--- a/gfx/pics/seadra/anim0.asm
+++ b/gfx/pokemon/seadra/anim0.asm
diff --git a/gfx/pics/seadra/anim1.asm b/gfx/pokemon/seadra/anim1.asm
index d4c171276..d4c171276 100644
--- a/gfx/pics/seadra/anim1.asm
+++ b/gfx/pokemon/seadra/anim1.asm
diff --git a/gfx/pics/seadra/back.2bpp.lz.354a02e4 b/gfx/pokemon/seadra/back.2bpp.lz.354a02e4
index ba9025832..ba9025832 100644
--- a/gfx/pics/seadra/back.2bpp.lz.354a02e4
+++ b/gfx/pokemon/seadra/back.2bpp.lz.354a02e4
diff --git a/gfx/pics/seadra/back.png b/gfx/pokemon/seadra/back.png
index 45ea0bd90..45ea0bd90 100644
--- a/gfx/pics/seadra/back.png
+++ b/gfx/pokemon/seadra/back.png
diff --git a/gfx/pics/seadra/front.animated.2bpp.lz.efa9c88c b/gfx/pokemon/seadra/front.animated.2bpp.lz.efa9c88c
index 6d63f3645..6d63f3645 100644
--- a/gfx/pics/seadra/front.animated.2bpp.lz.efa9c88c
+++ b/gfx/pokemon/seadra/front.animated.2bpp.lz.efa9c88c
diff --git a/gfx/pics/seadra/front.png b/gfx/pokemon/seadra/front.png
index 00a2a827d..00a2a827d 100644
--- a/gfx/pics/seadra/front.png
+++ b/gfx/pokemon/seadra/front.png
diff --git a/gfx/pics/seadra/shiny.pal b/gfx/pokemon/seadra/shiny.pal
index 7dab3b2ec..7dab3b2ec 100644
--- a/gfx/pics/seadra/shiny.pal
+++ b/gfx/pokemon/seadra/shiny.pal
diff --git a/gfx/pics/seaking/anim0.asm b/gfx/pokemon/seaking/anim0.asm
index a147346e2..a147346e2 100644
--- a/gfx/pics/seaking/anim0.asm
+++ b/gfx/pokemon/seaking/anim0.asm
diff --git a/gfx/pics/seaking/anim1.asm b/gfx/pokemon/seaking/anim1.asm
index 3d949a4bb..3d949a4bb 100644
--- a/gfx/pics/seaking/anim1.asm
+++ b/gfx/pokemon/seaking/anim1.asm
diff --git a/gfx/pics/seaking/back.2bpp.lz.3e699249 b/gfx/pokemon/seaking/back.2bpp.lz.3e699249
index 328a1fb55..328a1fb55 100644
--- a/gfx/pics/seaking/back.2bpp.lz.3e699249
+++ b/gfx/pokemon/seaking/back.2bpp.lz.3e699249
diff --git a/gfx/pics/seaking/back.png b/gfx/pokemon/seaking/back.png
index 121608b9f..121608b9f 100644
--- a/gfx/pics/seaking/back.png
+++ b/gfx/pokemon/seaking/back.png
diff --git a/gfx/pics/seaking/front.animated.2bpp.lz.fb4eb288 b/gfx/pokemon/seaking/front.animated.2bpp.lz.fb4eb288
index e204f1025..e204f1025 100644
--- a/gfx/pics/seaking/front.animated.2bpp.lz.fb4eb288
+++ b/gfx/pokemon/seaking/front.animated.2bpp.lz.fb4eb288
diff --git a/gfx/pics/seaking/front.png b/gfx/pokemon/seaking/front.png
index 7b06f5a27..7b06f5a27 100644
--- a/gfx/pics/seaking/front.png
+++ b/gfx/pokemon/seaking/front.png
diff --git a/gfx/pics/seaking/shiny.pal b/gfx/pokemon/seaking/shiny.pal
index be7291e84..be7291e84 100644
--- a/gfx/pics/seaking/shiny.pal
+++ b/gfx/pokemon/seaking/shiny.pal
diff --git a/gfx/pics/seel/anim0.asm b/gfx/pokemon/seel/anim0.asm
index ea92a35be..ea92a35be 100644
--- a/gfx/pics/seel/anim0.asm
+++ b/gfx/pokemon/seel/anim0.asm
diff --git a/gfx/pics/seel/anim1.asm b/gfx/pokemon/seel/anim1.asm
index c601e55e5..c601e55e5 100644
--- a/gfx/pics/seel/anim1.asm
+++ b/gfx/pokemon/seel/anim1.asm
diff --git a/gfx/pics/seel/back.2bpp.lz.518a4d40 b/gfx/pokemon/seel/back.2bpp.lz.518a4d40
index 0d5b89dae..0d5b89dae 100644
--- a/gfx/pics/seel/back.2bpp.lz.518a4d40
+++ b/gfx/pokemon/seel/back.2bpp.lz.518a4d40
diff --git a/gfx/pics/seel/back.png b/gfx/pokemon/seel/back.png
index 45c050d44..45c050d44 100644
--- a/gfx/pics/seel/back.png
+++ b/gfx/pokemon/seel/back.png
diff --git a/gfx/pics/seel/front.animated.2bpp.lz.2dc48023 b/gfx/pokemon/seel/front.animated.2bpp.lz.2dc48023
index c8f1343d6..c8f1343d6 100644
--- a/gfx/pics/seel/front.animated.2bpp.lz.2dc48023
+++ b/gfx/pokemon/seel/front.animated.2bpp.lz.2dc48023
diff --git a/gfx/pics/seel/front.png b/gfx/pokemon/seel/front.png
index a25d50d2f..a25d50d2f 100644
--- a/gfx/pics/seel/front.png
+++ b/gfx/pokemon/seel/front.png
diff --git a/gfx/pics/seel/shiny.pal b/gfx/pokemon/seel/shiny.pal
index bee98179f..bee98179f 100644
--- a/gfx/pics/seel/shiny.pal
+++ b/gfx/pokemon/seel/shiny.pal
diff --git a/gfx/pics/sentret/anim0.asm b/gfx/pokemon/sentret/anim0.asm
index 8080c7303..8080c7303 100644
--- a/gfx/pics/sentret/anim0.asm
+++ b/gfx/pokemon/sentret/anim0.asm
diff --git a/gfx/pics/sentret/anim1.asm b/gfx/pokemon/sentret/anim1.asm
index 9fcaecad0..9fcaecad0 100644
--- a/gfx/pics/sentret/anim1.asm
+++ b/gfx/pokemon/sentret/anim1.asm
diff --git a/gfx/pics/sentret/back.2bpp.lz.c19b7f3b b/gfx/pokemon/sentret/back.2bpp.lz.c19b7f3b
index 511ba5465..511ba5465 100644
--- a/gfx/pics/sentret/back.2bpp.lz.c19b7f3b
+++ b/gfx/pokemon/sentret/back.2bpp.lz.c19b7f3b
diff --git a/gfx/pics/sentret/back.png b/gfx/pokemon/sentret/back.png
index ce452af47..ce452af47 100644
--- a/gfx/pics/sentret/back.png
+++ b/gfx/pokemon/sentret/back.png
diff --git a/gfx/pics/sentret/front.animated.2bpp.lz.07c594c0 b/gfx/pokemon/sentret/front.animated.2bpp.lz.07c594c0
index 229aa430c..229aa430c 100644
--- a/gfx/pics/sentret/front.animated.2bpp.lz.07c594c0
+++ b/gfx/pokemon/sentret/front.animated.2bpp.lz.07c594c0
diff --git a/gfx/pics/sentret/front.png b/gfx/pokemon/sentret/front.png
index 6e080188a..6e080188a 100644
--- a/gfx/pics/sentret/front.png
+++ b/gfx/pokemon/sentret/front.png
diff --git a/gfx/pics/sentret/shiny.pal b/gfx/pokemon/sentret/shiny.pal
index 86ba2ffba..86ba2ffba 100644
--- a/gfx/pics/sentret/shiny.pal
+++ b/gfx/pokemon/sentret/shiny.pal
diff --git a/gfx/pics/shellder/anim0.asm b/gfx/pokemon/shellder/anim0.asm
index 71aa3d358..71aa3d358 100644
--- a/gfx/pics/shellder/anim0.asm
+++ b/gfx/pokemon/shellder/anim0.asm
diff --git a/gfx/pics/shellder/anim1.asm b/gfx/pokemon/shellder/anim1.asm
index c32e9d19c..c32e9d19c 100644
--- a/gfx/pics/shellder/anim1.asm
+++ b/gfx/pokemon/shellder/anim1.asm
diff --git a/gfx/pics/shellder/back.2bpp.lz.61e27953 b/gfx/pokemon/shellder/back.2bpp.lz.61e27953
index f0d93b8a8..f0d93b8a8 100644
--- a/gfx/pics/shellder/back.2bpp.lz.61e27953
+++ b/gfx/pokemon/shellder/back.2bpp.lz.61e27953
diff --git a/gfx/pics/shellder/back.png b/gfx/pokemon/shellder/back.png
index be61dc743..be61dc743 100644
--- a/gfx/pics/shellder/back.png
+++ b/gfx/pokemon/shellder/back.png
diff --git a/gfx/pics/shellder/front.animated.2bpp.lz.df57d475 b/gfx/pokemon/shellder/front.animated.2bpp.lz.df57d475
index 5a444cfa6..5a444cfa6 100644
--- a/gfx/pics/shellder/front.animated.2bpp.lz.df57d475
+++ b/gfx/pokemon/shellder/front.animated.2bpp.lz.df57d475
diff --git a/gfx/pics/shellder/front.png b/gfx/pokemon/shellder/front.png
index ff863bb56..ff863bb56 100644
--- a/gfx/pics/shellder/front.png
+++ b/gfx/pokemon/shellder/front.png
diff --git a/gfx/pics/shellder/shiny.pal b/gfx/pokemon/shellder/shiny.pal
index 21c389b28..21c389b28 100644
--- a/gfx/pics/shellder/shiny.pal
+++ b/gfx/pokemon/shellder/shiny.pal
diff --git a/gfx/pics/shuckle/anim0.asm b/gfx/pokemon/shuckle/anim0.asm
index 148d2bf7d..148d2bf7d 100644
--- a/gfx/pics/shuckle/anim0.asm
+++ b/gfx/pokemon/shuckle/anim0.asm
diff --git a/gfx/pics/shuckle/anim1.asm b/gfx/pokemon/shuckle/anim1.asm
index 4dd072951..4dd072951 100644
--- a/gfx/pics/shuckle/anim1.asm
+++ b/gfx/pokemon/shuckle/anim1.asm
diff --git a/gfx/pics/shuckle/back.2bpp.lz.8d66899b b/gfx/pokemon/shuckle/back.2bpp.lz.8d66899b
index 1cc4efcea..1cc4efcea 100644
--- a/gfx/pics/shuckle/back.2bpp.lz.8d66899b
+++ b/gfx/pokemon/shuckle/back.2bpp.lz.8d66899b
diff --git a/gfx/pics/shuckle/back.png b/gfx/pokemon/shuckle/back.png
index 9e38480d7..9e38480d7 100644
--- a/gfx/pics/shuckle/back.png
+++ b/gfx/pokemon/shuckle/back.png
diff --git a/gfx/pics/shuckle/front.animated.2bpp.lz.dee153d4 b/gfx/pokemon/shuckle/front.animated.2bpp.lz.dee153d4
index 95e78302a..95e78302a 100644
--- a/gfx/pics/shuckle/front.animated.2bpp.lz.dee153d4
+++ b/gfx/pokemon/shuckle/front.animated.2bpp.lz.dee153d4
diff --git a/gfx/pics/shuckle/front.png b/gfx/pokemon/shuckle/front.png
index 5220fe21d..5220fe21d 100644
--- a/gfx/pics/shuckle/front.png
+++ b/gfx/pokemon/shuckle/front.png
diff --git a/gfx/pics/shuckle/shiny.pal b/gfx/pokemon/shuckle/shiny.pal
index 63b3644ab..63b3644ab 100644
--- a/gfx/pics/shuckle/shiny.pal
+++ b/gfx/pokemon/shuckle/shiny.pal
diff --git a/gfx/pics/skarmory/anim0.asm b/gfx/pokemon/skarmory/anim0.asm
index 64c2bfaf0..64c2bfaf0 100644
--- a/gfx/pics/skarmory/anim0.asm
+++ b/gfx/pokemon/skarmory/anim0.asm
diff --git a/gfx/pics/skarmory/anim1.asm b/gfx/pokemon/skarmory/anim1.asm
index 1853c881f..1853c881f 100644
--- a/gfx/pics/skarmory/anim1.asm
+++ b/gfx/pokemon/skarmory/anim1.asm
diff --git a/gfx/pics/skarmory/back.2bpp.lz.f5e2e2e4 b/gfx/pokemon/skarmory/back.2bpp.lz.f5e2e2e4
index fca13d16a..fca13d16a 100644
--- a/gfx/pics/skarmory/back.2bpp.lz.f5e2e2e4
+++ b/gfx/pokemon/skarmory/back.2bpp.lz.f5e2e2e4
diff --git a/gfx/pics/skarmory/back.png b/gfx/pokemon/skarmory/back.png
index 7005cb336..7005cb336 100644
--- a/gfx/pics/skarmory/back.png
+++ b/gfx/pokemon/skarmory/back.png
diff --git a/gfx/pics/skarmory/front.animated.2bpp.lz.7de4675e b/gfx/pokemon/skarmory/front.animated.2bpp.lz.7de4675e
index e53f5a9ef..e53f5a9ef 100644
--- a/gfx/pics/skarmory/front.animated.2bpp.lz.7de4675e
+++ b/gfx/pokemon/skarmory/front.animated.2bpp.lz.7de4675e
diff --git a/gfx/pics/skarmory/front.png b/gfx/pokemon/skarmory/front.png
index 68e39d93d..68e39d93d 100644
--- a/gfx/pics/skarmory/front.png
+++ b/gfx/pokemon/skarmory/front.png
diff --git a/gfx/pics/skarmory/shiny.pal b/gfx/pokemon/skarmory/shiny.pal
index 80c53554d..80c53554d 100644
--- a/gfx/pics/skarmory/shiny.pal
+++ b/gfx/pokemon/skarmory/shiny.pal
diff --git a/gfx/pics/skiploom/anim0.asm b/gfx/pokemon/skiploom/anim0.asm
index 2ab6422e5..2ab6422e5 100644
--- a/gfx/pics/skiploom/anim0.asm
+++ b/gfx/pokemon/skiploom/anim0.asm
diff --git a/gfx/pics/skiploom/anim1.asm b/gfx/pokemon/skiploom/anim1.asm
index d26d1717e..d26d1717e 100644
--- a/gfx/pics/skiploom/anim1.asm
+++ b/gfx/pokemon/skiploom/anim1.asm
diff --git a/gfx/pics/skiploom/back.2bpp.lz.54e87a0c b/gfx/pokemon/skiploom/back.2bpp.lz.54e87a0c
index 8b197406c..8b197406c 100644
--- a/gfx/pics/skiploom/back.2bpp.lz.54e87a0c
+++ b/gfx/pokemon/skiploom/back.2bpp.lz.54e87a0c
diff --git a/gfx/pics/skiploom/back.png b/gfx/pokemon/skiploom/back.png
index ffe1de918..ffe1de918 100644
--- a/gfx/pics/skiploom/back.png
+++ b/gfx/pokemon/skiploom/back.png
diff --git a/gfx/pics/skiploom/front.animated.2bpp.lz.6436d556 b/gfx/pokemon/skiploom/front.animated.2bpp.lz.6436d556
index f48561c76..f48561c76 100644
--- a/gfx/pics/skiploom/front.animated.2bpp.lz.6436d556
+++ b/gfx/pokemon/skiploom/front.animated.2bpp.lz.6436d556
diff --git a/gfx/pics/skiploom/front.png b/gfx/pokemon/skiploom/front.png
index 313b5c9f3..313b5c9f3 100644
--- a/gfx/pics/skiploom/front.png
+++ b/gfx/pokemon/skiploom/front.png
diff --git a/gfx/pics/skiploom/shiny.pal b/gfx/pokemon/skiploom/shiny.pal
index 3165d8ee7..3165d8ee7 100644
--- a/gfx/pics/skiploom/shiny.pal
+++ b/gfx/pokemon/skiploom/shiny.pal
diff --git a/gfx/pics/slowbro/anim0.asm b/gfx/pokemon/slowbro/anim0.asm
index cc288a464..cc288a464 100644
--- a/gfx/pics/slowbro/anim0.asm
+++ b/gfx/pokemon/slowbro/anim0.asm
diff --git a/gfx/pics/slowbro/anim1.asm b/gfx/pokemon/slowbro/anim1.asm
index 9e793ee00..9e793ee00 100644
--- a/gfx/pics/slowbro/anim1.asm
+++ b/gfx/pokemon/slowbro/anim1.asm
diff --git a/gfx/pics/slowbro/back.2bpp.lz.3676b1f1 b/gfx/pokemon/slowbro/back.2bpp.lz.3676b1f1
index af1d60999..af1d60999 100644
--- a/gfx/pics/slowbro/back.2bpp.lz.3676b1f1
+++ b/gfx/pokemon/slowbro/back.2bpp.lz.3676b1f1
diff --git a/gfx/pics/slowbro/back.png b/gfx/pokemon/slowbro/back.png
index 10c4b20e3..10c4b20e3 100644
--- a/gfx/pics/slowbro/back.png
+++ b/gfx/pokemon/slowbro/back.png
diff --git a/gfx/pics/slowbro/front.animated.2bpp.lz.257e2e84 b/gfx/pokemon/slowbro/front.animated.2bpp.lz.257e2e84
index 0a6d1ac2c..0a6d1ac2c 100644
--- a/gfx/pics/slowbro/front.animated.2bpp.lz.257e2e84
+++ b/gfx/pokemon/slowbro/front.animated.2bpp.lz.257e2e84
diff --git a/gfx/pics/slowbro/front.png b/gfx/pokemon/slowbro/front.png
index de0280bbf..de0280bbf 100644
--- a/gfx/pics/slowbro/front.png
+++ b/gfx/pokemon/slowbro/front.png
diff --git a/gfx/pics/slowbro/shiny.pal b/gfx/pokemon/slowbro/shiny.pal
index 7c1a1e020..7c1a1e020 100644
--- a/gfx/pics/slowbro/shiny.pal
+++ b/gfx/pokemon/slowbro/shiny.pal
diff --git a/gfx/pics/slowking/anim0.asm b/gfx/pokemon/slowking/anim0.asm
index d7ab700bd..d7ab700bd 100644
--- a/gfx/pics/slowking/anim0.asm
+++ b/gfx/pokemon/slowking/anim0.asm
diff --git a/gfx/pics/slowking/anim1.asm b/gfx/pokemon/slowking/anim1.asm
index 36fd7cd7a..36fd7cd7a 100644
--- a/gfx/pics/slowking/anim1.asm
+++ b/gfx/pokemon/slowking/anim1.asm
diff --git a/gfx/pics/slowking/back.2bpp.lz.a90de69e b/gfx/pokemon/slowking/back.2bpp.lz.a90de69e
index e6342e434..e6342e434 100644
--- a/gfx/pics/slowking/back.2bpp.lz.a90de69e
+++ b/gfx/pokemon/slowking/back.2bpp.lz.a90de69e
diff --git a/gfx/pics/slowking/back.png b/gfx/pokemon/slowking/back.png
index a2308a98a..a2308a98a 100644
--- a/gfx/pics/slowking/back.png
+++ b/gfx/pokemon/slowking/back.png
diff --git a/gfx/pics/slowking/front.animated.2bpp.lz.4c2f7140 b/gfx/pokemon/slowking/front.animated.2bpp.lz.4c2f7140
index 2f9bd1654..2f9bd1654 100644
--- a/gfx/pics/slowking/front.animated.2bpp.lz.4c2f7140
+++ b/gfx/pokemon/slowking/front.animated.2bpp.lz.4c2f7140
diff --git a/gfx/pics/slowking/front.png b/gfx/pokemon/slowking/front.png
index d648e8f0c..d648e8f0c 100644
--- a/gfx/pics/slowking/front.png
+++ b/gfx/pokemon/slowking/front.png
diff --git a/gfx/pics/slowking/shiny.pal b/gfx/pokemon/slowking/shiny.pal
index 6a893a090..6a893a090 100644
--- a/gfx/pics/slowking/shiny.pal
+++ b/gfx/pokemon/slowking/shiny.pal
diff --git a/gfx/pics/slowpoke/anim0.asm b/gfx/pokemon/slowpoke/anim0.asm
index fa391743c..fa391743c 100644
--- a/gfx/pics/slowpoke/anim0.asm
+++ b/gfx/pokemon/slowpoke/anim0.asm
diff --git a/gfx/pics/slowpoke/anim1.asm b/gfx/pokemon/slowpoke/anim1.asm
index 805a281c5..805a281c5 100644
--- a/gfx/pics/slowpoke/anim1.asm
+++ b/gfx/pokemon/slowpoke/anim1.asm
diff --git a/gfx/pics/slowpoke/back.2bpp.lz.f2d1bb5c b/gfx/pokemon/slowpoke/back.2bpp.lz.f2d1bb5c
index cdaa2178d..cdaa2178d 100644
--- a/gfx/pics/slowpoke/back.2bpp.lz.f2d1bb5c
+++ b/gfx/pokemon/slowpoke/back.2bpp.lz.f2d1bb5c
diff --git a/gfx/pics/slowpoke/back.png b/gfx/pokemon/slowpoke/back.png
index 8672dde51..8672dde51 100644
--- a/gfx/pics/slowpoke/back.png
+++ b/gfx/pokemon/slowpoke/back.png
diff --git a/gfx/pics/slowpoke/front.animated.2bpp.lz.42347014 b/gfx/pokemon/slowpoke/front.animated.2bpp.lz.42347014
index 23d8e22f2..23d8e22f2 100644
--- a/gfx/pics/slowpoke/front.animated.2bpp.lz.42347014
+++ b/gfx/pokemon/slowpoke/front.animated.2bpp.lz.42347014
diff --git a/gfx/pics/slowpoke/front.png b/gfx/pokemon/slowpoke/front.png
index 009619adf..009619adf 100644
--- a/gfx/pics/slowpoke/front.png
+++ b/gfx/pokemon/slowpoke/front.png
diff --git a/gfx/pics/slowpoke/shiny.pal b/gfx/pokemon/slowpoke/shiny.pal
index a70e0d0ed..a70e0d0ed 100644
--- a/gfx/pics/slowpoke/shiny.pal
+++ b/gfx/pokemon/slowpoke/shiny.pal
diff --git a/gfx/pics/slugma/anim0.asm b/gfx/pokemon/slugma/anim0.asm
index 1c867ec37..1c867ec37 100644
--- a/gfx/pics/slugma/anim0.asm
+++ b/gfx/pokemon/slugma/anim0.asm
diff --git a/gfx/pics/slugma/anim1.asm b/gfx/pokemon/slugma/anim1.asm
index 5bfe4e799..5bfe4e799 100644
--- a/gfx/pics/slugma/anim1.asm
+++ b/gfx/pokemon/slugma/anim1.asm
diff --git a/gfx/pics/slugma/back.2bpp.lz.dc25c77a b/gfx/pokemon/slugma/back.2bpp.lz.dc25c77a
index 949fbc218..949fbc218 100644
--- a/gfx/pics/slugma/back.2bpp.lz.dc25c77a
+++ b/gfx/pokemon/slugma/back.2bpp.lz.dc25c77a
diff --git a/gfx/pics/slugma/back.png b/gfx/pokemon/slugma/back.png
index f0fedc230..f0fedc230 100644
--- a/gfx/pics/slugma/back.png
+++ b/gfx/pokemon/slugma/back.png
diff --git a/gfx/pics/slugma/front.animated.2bpp.lz.c1a44906 b/gfx/pokemon/slugma/front.animated.2bpp.lz.c1a44906
index 4c9a0078e..4c9a0078e 100644
--- a/gfx/pics/slugma/front.animated.2bpp.lz.c1a44906
+++ b/gfx/pokemon/slugma/front.animated.2bpp.lz.c1a44906
diff --git a/gfx/pics/slugma/front.png b/gfx/pokemon/slugma/front.png
index ce63adac6..ce63adac6 100644
--- a/gfx/pics/slugma/front.png
+++ b/gfx/pokemon/slugma/front.png
diff --git a/gfx/pics/slugma/shiny.pal b/gfx/pokemon/slugma/shiny.pal
index b66ef094d..b66ef094d 100644
--- a/gfx/pics/slugma/shiny.pal
+++ b/gfx/pokemon/slugma/shiny.pal
diff --git a/gfx/pics/smeargle/anim0.asm b/gfx/pokemon/smeargle/anim0.asm
index 2144197fc..2144197fc 100644
--- a/gfx/pics/smeargle/anim0.asm
+++ b/gfx/pokemon/smeargle/anim0.asm
diff --git a/gfx/pics/smeargle/anim1.asm b/gfx/pokemon/smeargle/anim1.asm
index 178b14959..178b14959 100644
--- a/gfx/pics/smeargle/anim1.asm
+++ b/gfx/pokemon/smeargle/anim1.asm
diff --git a/gfx/pics/smeargle/back.2bpp.lz.2de2de8c b/gfx/pokemon/smeargle/back.2bpp.lz.2de2de8c
index eb96bfd07..eb96bfd07 100644
--- a/gfx/pics/smeargle/back.2bpp.lz.2de2de8c
+++ b/gfx/pokemon/smeargle/back.2bpp.lz.2de2de8c
diff --git a/gfx/pics/smeargle/back.png b/gfx/pokemon/smeargle/back.png
index 22ba83c3c..22ba83c3c 100644
--- a/gfx/pics/smeargle/back.png
+++ b/gfx/pokemon/smeargle/back.png
diff --git a/gfx/pics/smeargle/front.animated.2bpp.lz.82ec0f51 b/gfx/pokemon/smeargle/front.animated.2bpp.lz.82ec0f51
index 81be921d5..81be921d5 100644
--- a/gfx/pics/smeargle/front.animated.2bpp.lz.82ec0f51
+++ b/gfx/pokemon/smeargle/front.animated.2bpp.lz.82ec0f51
diff --git a/gfx/pics/smeargle/front.png b/gfx/pokemon/smeargle/front.png
index 2c4a90508..2c4a90508 100644
--- a/gfx/pics/smeargle/front.png
+++ b/gfx/pokemon/smeargle/front.png
diff --git a/gfx/pics/smeargle/shiny.pal b/gfx/pokemon/smeargle/shiny.pal
index 3b0290ba1..3b0290ba1 100644
--- a/gfx/pics/smeargle/shiny.pal
+++ b/gfx/pokemon/smeargle/shiny.pal
diff --git a/gfx/pics/smoochum/anim0.asm b/gfx/pokemon/smoochum/anim0.asm
index 39f5e7ebe..39f5e7ebe 100644
--- a/gfx/pics/smoochum/anim0.asm
+++ b/gfx/pokemon/smoochum/anim0.asm
diff --git a/gfx/pics/smoochum/anim1.asm b/gfx/pokemon/smoochum/anim1.asm
index 5ba02f113..5ba02f113 100644
--- a/gfx/pics/smoochum/anim1.asm
+++ b/gfx/pokemon/smoochum/anim1.asm
diff --git a/gfx/pics/smoochum/back.2bpp.lz.af01f906 b/gfx/pokemon/smoochum/back.2bpp.lz.af01f906
index 52c256c16..52c256c16 100644
--- a/gfx/pics/smoochum/back.2bpp.lz.af01f906
+++ b/gfx/pokemon/smoochum/back.2bpp.lz.af01f906
diff --git a/gfx/pics/smoochum/back.png b/gfx/pokemon/smoochum/back.png
index e5167842e..e5167842e 100644
--- a/gfx/pics/smoochum/back.png
+++ b/gfx/pokemon/smoochum/back.png
diff --git a/gfx/pics/smoochum/front.animated.2bpp.lz.5977720b b/gfx/pokemon/smoochum/front.animated.2bpp.lz.5977720b
index cd4b75761..cd4b75761 100644
--- a/gfx/pics/smoochum/front.animated.2bpp.lz.5977720b
+++ b/gfx/pokemon/smoochum/front.animated.2bpp.lz.5977720b
diff --git a/gfx/pics/smoochum/front.png b/gfx/pokemon/smoochum/front.png
index 49ba75639..49ba75639 100644
--- a/gfx/pics/smoochum/front.png
+++ b/gfx/pokemon/smoochum/front.png
diff --git a/gfx/pics/smoochum/shiny.pal b/gfx/pokemon/smoochum/shiny.pal
index ee3baba53..ee3baba53 100644
--- a/gfx/pics/smoochum/shiny.pal
+++ b/gfx/pokemon/smoochum/shiny.pal
diff --git a/gfx/pics/sneasel/anim0.asm b/gfx/pokemon/sneasel/anim0.asm
index 5b7f3fb79..5b7f3fb79 100644
--- a/gfx/pics/sneasel/anim0.asm
+++ b/gfx/pokemon/sneasel/anim0.asm
diff --git a/gfx/pics/sneasel/anim1.asm b/gfx/pokemon/sneasel/anim1.asm
index 1d3e3a41d..1d3e3a41d 100644
--- a/gfx/pics/sneasel/anim1.asm
+++ b/gfx/pokemon/sneasel/anim1.asm
diff --git a/gfx/pics/sneasel/back.2bpp.lz.5298828d b/gfx/pokemon/sneasel/back.2bpp.lz.5298828d
index be5ad2304..be5ad2304 100644
--- a/gfx/pics/sneasel/back.2bpp.lz.5298828d
+++ b/gfx/pokemon/sneasel/back.2bpp.lz.5298828d
diff --git a/gfx/pics/sneasel/back.png b/gfx/pokemon/sneasel/back.png
index 4b1921c2a..4b1921c2a 100644
--- a/gfx/pics/sneasel/back.png
+++ b/gfx/pokemon/sneasel/back.png
diff --git a/gfx/pics/sneasel/front.animated.2bpp.lz.8f7db3e9 b/gfx/pokemon/sneasel/front.animated.2bpp.lz.8f7db3e9
index 4add5f2e0..4add5f2e0 100644
--- a/gfx/pics/sneasel/front.animated.2bpp.lz.8f7db3e9
+++ b/gfx/pokemon/sneasel/front.animated.2bpp.lz.8f7db3e9
diff --git a/gfx/pics/sneasel/front.png b/gfx/pokemon/sneasel/front.png
index 958d314d9..958d314d9 100644
--- a/gfx/pics/sneasel/front.png
+++ b/gfx/pokemon/sneasel/front.png
diff --git a/gfx/pics/sneasel/shiny.pal b/gfx/pokemon/sneasel/shiny.pal
index 951cc3786..951cc3786 100644
--- a/gfx/pics/sneasel/shiny.pal
+++ b/gfx/pokemon/sneasel/shiny.pal
diff --git a/gfx/pics/snorlax/anim0.asm b/gfx/pokemon/snorlax/anim0.asm
index 3825f3bca..3825f3bca 100644
--- a/gfx/pics/snorlax/anim0.asm
+++ b/gfx/pokemon/snorlax/anim0.asm
diff --git a/gfx/pics/snorlax/anim1.asm b/gfx/pokemon/snorlax/anim1.asm
index 4969f8f1f..4969f8f1f 100644
--- a/gfx/pics/snorlax/anim1.asm
+++ b/gfx/pokemon/snorlax/anim1.asm
diff --git a/gfx/pics/snorlax/back.2bpp.lz.90570272 b/gfx/pokemon/snorlax/back.2bpp.lz.90570272
index dfbfcbb50..dfbfcbb50 100644
--- a/gfx/pics/snorlax/back.2bpp.lz.90570272
+++ b/gfx/pokemon/snorlax/back.2bpp.lz.90570272
diff --git a/gfx/pics/snorlax/back.png b/gfx/pokemon/snorlax/back.png
index 8493ee5ef..8493ee5ef 100644
--- a/gfx/pics/snorlax/back.png
+++ b/gfx/pokemon/snorlax/back.png
diff --git a/gfx/pics/snorlax/front.animated.2bpp.lz.8253357b b/gfx/pokemon/snorlax/front.animated.2bpp.lz.8253357b
index 7c610f46c..7c610f46c 100644
--- a/gfx/pics/snorlax/front.animated.2bpp.lz.8253357b
+++ b/gfx/pokemon/snorlax/front.animated.2bpp.lz.8253357b
diff --git a/gfx/pics/snorlax/front.png b/gfx/pokemon/snorlax/front.png
index e328c4ca6..e328c4ca6 100644
--- a/gfx/pics/snorlax/front.png
+++ b/gfx/pokemon/snorlax/front.png
diff --git a/gfx/pics/snorlax/shiny.pal b/gfx/pokemon/snorlax/shiny.pal
index 9a3ed5d55..9a3ed5d55 100644
--- a/gfx/pics/snorlax/shiny.pal
+++ b/gfx/pokemon/snorlax/shiny.pal
diff --git a/gfx/pics/snubbull/anim0.asm b/gfx/pokemon/snubbull/anim0.asm
index d97f9b354..d97f9b354 100644
--- a/gfx/pics/snubbull/anim0.asm
+++ b/gfx/pokemon/snubbull/anim0.asm
diff --git a/gfx/pics/snubbull/anim1.asm b/gfx/pokemon/snubbull/anim1.asm
index 08cae5b71..08cae5b71 100644
--- a/gfx/pics/snubbull/anim1.asm
+++ b/gfx/pokemon/snubbull/anim1.asm
diff --git a/gfx/pics/snubbull/back.2bpp.lz.26eaaa5d b/gfx/pokemon/snubbull/back.2bpp.lz.26eaaa5d
index 5b020db5e..5b020db5e 100644
--- a/gfx/pics/snubbull/back.2bpp.lz.26eaaa5d
+++ b/gfx/pokemon/snubbull/back.2bpp.lz.26eaaa5d
diff --git a/gfx/pics/snubbull/back.png b/gfx/pokemon/snubbull/back.png
index 2c9635344..2c9635344 100644
--- a/gfx/pics/snubbull/back.png
+++ b/gfx/pokemon/snubbull/back.png
diff --git a/gfx/pics/snubbull/front.animated.2bpp.lz.a1b4eb88 b/gfx/pokemon/snubbull/front.animated.2bpp.lz.a1b4eb88
index 69a534e2c..69a534e2c 100644
--- a/gfx/pics/snubbull/front.animated.2bpp.lz.a1b4eb88
+++ b/gfx/pokemon/snubbull/front.animated.2bpp.lz.a1b4eb88
diff --git a/gfx/pics/snubbull/front.png b/gfx/pokemon/snubbull/front.png
index ee352f0e3..ee352f0e3 100644
--- a/gfx/pics/snubbull/front.png
+++ b/gfx/pokemon/snubbull/front.png
diff --git a/gfx/pics/snubbull/shiny.pal b/gfx/pokemon/snubbull/shiny.pal
index 04cda49ec..04cda49ec 100644
--- a/gfx/pics/snubbull/shiny.pal
+++ b/gfx/pokemon/snubbull/shiny.pal
diff --git a/gfx/pics/spearow/anim0.asm b/gfx/pokemon/spearow/anim0.asm
index 35780c784..35780c784 100644
--- a/gfx/pics/spearow/anim0.asm
+++ b/gfx/pokemon/spearow/anim0.asm
diff --git a/gfx/pics/spearow/anim1.asm b/gfx/pokemon/spearow/anim1.asm
index ed487ecc3..ed487ecc3 100644
--- a/gfx/pics/spearow/anim1.asm
+++ b/gfx/pokemon/spearow/anim1.asm
diff --git a/gfx/pics/spearow/back.2bpp.lz.b8e760aa b/gfx/pokemon/spearow/back.2bpp.lz.b8e760aa
index 9411f32bd..9411f32bd 100644
--- a/gfx/pics/spearow/back.2bpp.lz.b8e760aa
+++ b/gfx/pokemon/spearow/back.2bpp.lz.b8e760aa
diff --git a/gfx/pics/spearow/back.png b/gfx/pokemon/spearow/back.png
index e25a137a2..e25a137a2 100644
--- a/gfx/pics/spearow/back.png
+++ b/gfx/pokemon/spearow/back.png
diff --git a/gfx/pics/spearow/front.animated.2bpp.lz.59d61986 b/gfx/pokemon/spearow/front.animated.2bpp.lz.59d61986
index 8def69a01..8def69a01 100644
--- a/gfx/pics/spearow/front.animated.2bpp.lz.59d61986
+++ b/gfx/pokemon/spearow/front.animated.2bpp.lz.59d61986
diff --git a/gfx/pics/spearow/front.png b/gfx/pokemon/spearow/front.png
index 85c2e7e23..85c2e7e23 100644
--- a/gfx/pics/spearow/front.png
+++ b/gfx/pokemon/spearow/front.png
diff --git a/gfx/pics/spearow/shiny.pal b/gfx/pokemon/spearow/shiny.pal
index 188394e5f..188394e5f 100644
--- a/gfx/pics/spearow/shiny.pal
+++ b/gfx/pokemon/spearow/shiny.pal
diff --git a/gfx/pics/spinarak/anim0.asm b/gfx/pokemon/spinarak/anim0.asm
index be299fc49..be299fc49 100644
--- a/gfx/pics/spinarak/anim0.asm
+++ b/gfx/pokemon/spinarak/anim0.asm
diff --git a/gfx/pics/spinarak/anim1.asm b/gfx/pokemon/spinarak/anim1.asm
index c605578ef..c605578ef 100644
--- a/gfx/pics/spinarak/anim1.asm
+++ b/gfx/pokemon/spinarak/anim1.asm
diff --git a/gfx/pics/spinarak/back.2bpp.lz.14002836 b/gfx/pokemon/spinarak/back.2bpp.lz.14002836
index 3fa2e3b12..3fa2e3b12 100644
--- a/gfx/pics/spinarak/back.2bpp.lz.14002836
+++ b/gfx/pokemon/spinarak/back.2bpp.lz.14002836
diff --git a/gfx/pics/spinarak/back.png b/gfx/pokemon/spinarak/back.png
index 52f9eb053..52f9eb053 100644
--- a/gfx/pics/spinarak/back.png
+++ b/gfx/pokemon/spinarak/back.png
diff --git a/gfx/pics/spinarak/front.animated.2bpp.lz.31ab6868 b/gfx/pokemon/spinarak/front.animated.2bpp.lz.31ab6868
index edbe6e1ce..edbe6e1ce 100644
--- a/gfx/pics/spinarak/front.animated.2bpp.lz.31ab6868
+++ b/gfx/pokemon/spinarak/front.animated.2bpp.lz.31ab6868
diff --git a/gfx/pics/spinarak/front.png b/gfx/pokemon/spinarak/front.png
index e35c28646..e35c28646 100644
--- a/gfx/pics/spinarak/front.png
+++ b/gfx/pokemon/spinarak/front.png
diff --git a/gfx/pics/spinarak/shiny.pal b/gfx/pokemon/spinarak/shiny.pal
index 931425e3c..931425e3c 100644
--- a/gfx/pics/spinarak/shiny.pal
+++ b/gfx/pokemon/spinarak/shiny.pal
diff --git a/gfx/pics/squirtle/anim0.asm b/gfx/pokemon/squirtle/anim0.asm
index 9969d4263..9969d4263 100644
--- a/gfx/pics/squirtle/anim0.asm
+++ b/gfx/pokemon/squirtle/anim0.asm
diff --git a/gfx/pics/squirtle/anim1.asm b/gfx/pokemon/squirtle/anim1.asm
index de24c37a6..de24c37a6 100644
--- a/gfx/pics/squirtle/anim1.asm
+++ b/gfx/pokemon/squirtle/anim1.asm
diff --git a/gfx/pics/squirtle/back.2bpp.lz.76295ae8 b/gfx/pokemon/squirtle/back.2bpp.lz.76295ae8
index a8fa8d3fd..a8fa8d3fd 100644
--- a/gfx/pics/squirtle/back.2bpp.lz.76295ae8
+++ b/gfx/pokemon/squirtle/back.2bpp.lz.76295ae8
diff --git a/gfx/pics/squirtle/back.png b/gfx/pokemon/squirtle/back.png
index 231dfa1bb..231dfa1bb 100644
--- a/gfx/pics/squirtle/back.png
+++ b/gfx/pokemon/squirtle/back.png
diff --git a/gfx/pics/squirtle/front.animated.2bpp.lz.9b6f9ec9 b/gfx/pokemon/squirtle/front.animated.2bpp.lz.9b6f9ec9
index 175cc5e0d..175cc5e0d 100644
--- a/gfx/pics/squirtle/front.animated.2bpp.lz.9b6f9ec9
+++ b/gfx/pokemon/squirtle/front.animated.2bpp.lz.9b6f9ec9
diff --git a/gfx/pics/squirtle/front.png b/gfx/pokemon/squirtle/front.png
index fd8f05fa9..fd8f05fa9 100644
--- a/gfx/pics/squirtle/front.png
+++ b/gfx/pokemon/squirtle/front.png
diff --git a/gfx/pics/squirtle/shiny.pal b/gfx/pokemon/squirtle/shiny.pal
index 8df9f8263..8df9f8263 100644
--- a/gfx/pics/squirtle/shiny.pal
+++ b/gfx/pokemon/squirtle/shiny.pal
diff --git a/gfx/pics/stantler/anim0.asm b/gfx/pokemon/stantler/anim0.asm
index 8f4c133d8..8f4c133d8 100644
--- a/gfx/pics/stantler/anim0.asm
+++ b/gfx/pokemon/stantler/anim0.asm
diff --git a/gfx/pics/stantler/anim1.asm b/gfx/pokemon/stantler/anim1.asm
index 7444d761a..7444d761a 100644
--- a/gfx/pics/stantler/anim1.asm
+++ b/gfx/pokemon/stantler/anim1.asm
diff --git a/gfx/pics/stantler/back.2bpp.lz.16502aac b/gfx/pokemon/stantler/back.2bpp.lz.16502aac
index a0ab53039..a0ab53039 100644
--- a/gfx/pics/stantler/back.2bpp.lz.16502aac
+++ b/gfx/pokemon/stantler/back.2bpp.lz.16502aac
diff --git a/gfx/pics/stantler/back.png b/gfx/pokemon/stantler/back.png
index 90e7b4a65..90e7b4a65 100644
--- a/gfx/pics/stantler/back.png
+++ b/gfx/pokemon/stantler/back.png
diff --git a/gfx/pics/stantler/front.animated.2bpp.lz.46b7dd06 b/gfx/pokemon/stantler/front.animated.2bpp.lz.46b7dd06
index 87a56e667..87a56e667 100644
--- a/gfx/pics/stantler/front.animated.2bpp.lz.46b7dd06
+++ b/gfx/pokemon/stantler/front.animated.2bpp.lz.46b7dd06
diff --git a/gfx/pics/stantler/front.png b/gfx/pokemon/stantler/front.png
index ac8628445..ac8628445 100644
--- a/gfx/pics/stantler/front.png
+++ b/gfx/pokemon/stantler/front.png
diff --git a/gfx/pics/stantler/shiny.pal b/gfx/pokemon/stantler/shiny.pal
index efdc404e9..efdc404e9 100644
--- a/gfx/pics/stantler/shiny.pal
+++ b/gfx/pokemon/stantler/shiny.pal
diff --git a/gfx/pics/starmie/anim0.asm b/gfx/pokemon/starmie/anim0.asm
index c81477807..c81477807 100644
--- a/gfx/pics/starmie/anim0.asm
+++ b/gfx/pokemon/starmie/anim0.asm
diff --git a/gfx/pics/starmie/anim1.asm b/gfx/pokemon/starmie/anim1.asm
index 7508e6e10..7508e6e10 100644
--- a/gfx/pics/starmie/anim1.asm
+++ b/gfx/pokemon/starmie/anim1.asm
diff --git a/gfx/pics/starmie/back.2bpp.lz.a8923741 b/gfx/pokemon/starmie/back.2bpp.lz.a8923741
index 8085f0f44..8085f0f44 100644
--- a/gfx/pics/starmie/back.2bpp.lz.a8923741
+++ b/gfx/pokemon/starmie/back.2bpp.lz.a8923741
diff --git a/gfx/pics/starmie/back.png b/gfx/pokemon/starmie/back.png
index f4e67e4fa..f4e67e4fa 100644
--- a/gfx/pics/starmie/back.png
+++ b/gfx/pokemon/starmie/back.png
diff --git a/gfx/pics/starmie/front.animated.2bpp.lz.522b6699 b/gfx/pokemon/starmie/front.animated.2bpp.lz.522b6699
index b9019f6c6..b9019f6c6 100644
--- a/gfx/pics/starmie/front.animated.2bpp.lz.522b6699
+++ b/gfx/pokemon/starmie/front.animated.2bpp.lz.522b6699
diff --git a/gfx/pics/starmie/front.png b/gfx/pokemon/starmie/front.png
index 2378c948b..2378c948b 100644
--- a/gfx/pics/starmie/front.png
+++ b/gfx/pokemon/starmie/front.png
diff --git a/gfx/pics/starmie/shiny.pal b/gfx/pokemon/starmie/shiny.pal
index c9932cd86..c9932cd86 100644
--- a/gfx/pics/starmie/shiny.pal
+++ b/gfx/pokemon/starmie/shiny.pal
diff --git a/gfx/pics/staryu/anim0.asm b/gfx/pokemon/staryu/anim0.asm
index d257949e7..d257949e7 100644
--- a/gfx/pics/staryu/anim0.asm
+++ b/gfx/pokemon/staryu/anim0.asm
diff --git a/gfx/pics/staryu/anim1.asm b/gfx/pokemon/staryu/anim1.asm
index 184806574..184806574 100644
--- a/gfx/pics/staryu/anim1.asm
+++ b/gfx/pokemon/staryu/anim1.asm
diff --git a/gfx/pics/staryu/back.2bpp.lz.79ea9d00 b/gfx/pokemon/staryu/back.2bpp.lz.79ea9d00
index 65366eb7c..65366eb7c 100644
--- a/gfx/pics/staryu/back.2bpp.lz.79ea9d00
+++ b/gfx/pokemon/staryu/back.2bpp.lz.79ea9d00
diff --git a/gfx/pics/staryu/back.png b/gfx/pokemon/staryu/back.png
index 9cab96362..9cab96362 100644
--- a/gfx/pics/staryu/back.png
+++ b/gfx/pokemon/staryu/back.png
diff --git a/gfx/pics/staryu/front.animated.2bpp.lz.22f1d06b b/gfx/pokemon/staryu/front.animated.2bpp.lz.22f1d06b
index 8d0bdacb9..8d0bdacb9 100644
--- a/gfx/pics/staryu/front.animated.2bpp.lz.22f1d06b
+++ b/gfx/pokemon/staryu/front.animated.2bpp.lz.22f1d06b
diff --git a/gfx/pics/staryu/front.png b/gfx/pokemon/staryu/front.png
index 74949a9b1..74949a9b1 100644
--- a/gfx/pics/staryu/front.png
+++ b/gfx/pokemon/staryu/front.png
diff --git a/gfx/pics/staryu/shiny.pal b/gfx/pokemon/staryu/shiny.pal
index 11546faee..11546faee 100644
--- a/gfx/pics/staryu/shiny.pal
+++ b/gfx/pokemon/staryu/shiny.pal
diff --git a/gfx/pics/steelix/anim0.asm b/gfx/pokemon/steelix/anim0.asm
index 9acb2af0a..9acb2af0a 100644
--- a/gfx/pics/steelix/anim0.asm
+++ b/gfx/pokemon/steelix/anim0.asm
diff --git a/gfx/pics/steelix/anim1.asm b/gfx/pokemon/steelix/anim1.asm
index 3c1de78fb..3c1de78fb 100644
--- a/gfx/pics/steelix/anim1.asm
+++ b/gfx/pokemon/steelix/anim1.asm
diff --git a/gfx/pics/steelix/back.2bpp.lz.f3c03e61 b/gfx/pokemon/steelix/back.2bpp.lz.f3c03e61
index e4cb2d6dc..e4cb2d6dc 100644
--- a/gfx/pics/steelix/back.2bpp.lz.f3c03e61
+++ b/gfx/pokemon/steelix/back.2bpp.lz.f3c03e61
diff --git a/gfx/pics/steelix/back.png b/gfx/pokemon/steelix/back.png
index 6788dacd9..6788dacd9 100644
--- a/gfx/pics/steelix/back.png
+++ b/gfx/pokemon/steelix/back.png
diff --git a/gfx/pics/steelix/front.animated.2bpp.lz.42f3f8d1 b/gfx/pokemon/steelix/front.animated.2bpp.lz.42f3f8d1
index 2da642f04..2da642f04 100644
--- a/gfx/pics/steelix/front.animated.2bpp.lz.42f3f8d1
+++ b/gfx/pokemon/steelix/front.animated.2bpp.lz.42f3f8d1
diff --git a/gfx/pics/steelix/front.png b/gfx/pokemon/steelix/front.png
index 30df74f27..30df74f27 100644
--- a/gfx/pics/steelix/front.png
+++ b/gfx/pokemon/steelix/front.png
diff --git a/gfx/pics/steelix/shiny.pal b/gfx/pokemon/steelix/shiny.pal
index d929c214f..d929c214f 100644
--- a/gfx/pics/steelix/shiny.pal
+++ b/gfx/pokemon/steelix/shiny.pal
diff --git a/gfx/pics/sudowoodo/anim0.asm b/gfx/pokemon/sudowoodo/anim0.asm
index 8e974a074..8e974a074 100644
--- a/gfx/pics/sudowoodo/anim0.asm
+++ b/gfx/pokemon/sudowoodo/anim0.asm
diff --git a/gfx/pics/sudowoodo/anim1.asm b/gfx/pokemon/sudowoodo/anim1.asm
index e42e960f9..e42e960f9 100644
--- a/gfx/pics/sudowoodo/anim1.asm
+++ b/gfx/pokemon/sudowoodo/anim1.asm
diff --git a/gfx/pics/sudowoodo/back.2bpp.lz.728036c6 b/gfx/pokemon/sudowoodo/back.2bpp.lz.728036c6
index c10731ea9..c10731ea9 100644
--- a/gfx/pics/sudowoodo/back.2bpp.lz.728036c6
+++ b/gfx/pokemon/sudowoodo/back.2bpp.lz.728036c6
diff --git a/gfx/pics/sudowoodo/back.png b/gfx/pokemon/sudowoodo/back.png
index cd7466ac3..cd7466ac3 100644
--- a/gfx/pics/sudowoodo/back.png
+++ b/gfx/pokemon/sudowoodo/back.png
diff --git a/gfx/pics/sudowoodo/front.animated.2bpp.lz.b0f04991 b/gfx/pokemon/sudowoodo/front.animated.2bpp.lz.b0f04991
index 160f800cf..160f800cf 100644
--- a/gfx/pics/sudowoodo/front.animated.2bpp.lz.b0f04991
+++ b/gfx/pokemon/sudowoodo/front.animated.2bpp.lz.b0f04991
diff --git a/gfx/pics/sudowoodo/front.png b/gfx/pokemon/sudowoodo/front.png
index cc794899a..cc794899a 100644
--- a/gfx/pics/sudowoodo/front.png
+++ b/gfx/pokemon/sudowoodo/front.png
diff --git a/gfx/pics/sudowoodo/shiny.pal b/gfx/pokemon/sudowoodo/shiny.pal
index b82128b50..b82128b50 100644
--- a/gfx/pics/sudowoodo/shiny.pal
+++ b/gfx/pokemon/sudowoodo/shiny.pal
diff --git a/gfx/pics/suicune/anim0.asm b/gfx/pokemon/suicune/anim0.asm
index 0f2528116..0f2528116 100644
--- a/gfx/pics/suicune/anim0.asm
+++ b/gfx/pokemon/suicune/anim0.asm
diff --git a/gfx/pics/suicune/anim1.asm b/gfx/pokemon/suicune/anim1.asm
index 9e018683a..9e018683a 100644
--- a/gfx/pics/suicune/anim1.asm
+++ b/gfx/pokemon/suicune/anim1.asm
diff --git a/gfx/pics/suicune/back.2bpp.lz.5c49d112 b/gfx/pokemon/suicune/back.2bpp.lz.5c49d112
index a8106fbb4..a8106fbb4 100644
--- a/gfx/pics/suicune/back.2bpp.lz.5c49d112
+++ b/gfx/pokemon/suicune/back.2bpp.lz.5c49d112
diff --git a/gfx/pics/suicune/back.png b/gfx/pokemon/suicune/back.png
index b02456055..b02456055 100644
--- a/gfx/pics/suicune/back.png
+++ b/gfx/pokemon/suicune/back.png
diff --git a/gfx/pics/suicune/front.animated.2bpp.lz.64698c0a b/gfx/pokemon/suicune/front.animated.2bpp.lz.64698c0a
index cbc9dfdbf..cbc9dfdbf 100644
--- a/gfx/pics/suicune/front.animated.2bpp.lz.64698c0a
+++ b/gfx/pokemon/suicune/front.animated.2bpp.lz.64698c0a
diff --git a/gfx/pics/suicune/front.png b/gfx/pokemon/suicune/front.png
index f369cff81..f369cff81 100644
--- a/gfx/pics/suicune/front.png
+++ b/gfx/pokemon/suicune/front.png
diff --git a/gfx/pics/suicune/shiny.pal b/gfx/pokemon/suicune/shiny.pal
index 776effbc3..776effbc3 100644
--- a/gfx/pics/suicune/shiny.pal
+++ b/gfx/pokemon/suicune/shiny.pal
diff --git a/gfx/pics/sunflora/anim0.asm b/gfx/pokemon/sunflora/anim0.asm
index aad8ddadd..aad8ddadd 100644
--- a/gfx/pics/sunflora/anim0.asm
+++ b/gfx/pokemon/sunflora/anim0.asm
diff --git a/gfx/pics/sunflora/anim1.asm b/gfx/pokemon/sunflora/anim1.asm
index e78d5449e..e78d5449e 100644
--- a/gfx/pics/sunflora/anim1.asm
+++ b/gfx/pokemon/sunflora/anim1.asm
diff --git a/gfx/pics/sunflora/back.2bpp.lz.9d0684f0 b/gfx/pokemon/sunflora/back.2bpp.lz.9d0684f0
index 3fb3432ba..3fb3432ba 100644
--- a/gfx/pics/sunflora/back.2bpp.lz.9d0684f0
+++ b/gfx/pokemon/sunflora/back.2bpp.lz.9d0684f0
diff --git a/gfx/pics/sunflora/back.png b/gfx/pokemon/sunflora/back.png
index e30eca3b0..e30eca3b0 100644
--- a/gfx/pics/sunflora/back.png
+++ b/gfx/pokemon/sunflora/back.png
diff --git a/gfx/pics/sunflora/front.animated.2bpp.lz.258c3e67 b/gfx/pokemon/sunflora/front.animated.2bpp.lz.258c3e67
index 1026c3719..1026c3719 100644
--- a/gfx/pics/sunflora/front.animated.2bpp.lz.258c3e67
+++ b/gfx/pokemon/sunflora/front.animated.2bpp.lz.258c3e67
diff --git a/gfx/pics/sunflora/front.png b/gfx/pokemon/sunflora/front.png
index 377124363..377124363 100644
--- a/gfx/pics/sunflora/front.png
+++ b/gfx/pokemon/sunflora/front.png
diff --git a/gfx/pics/sunflora/shiny.pal b/gfx/pokemon/sunflora/shiny.pal
index a52ad6f96..a52ad6f96 100644
--- a/gfx/pics/sunflora/shiny.pal
+++ b/gfx/pokemon/sunflora/shiny.pal
diff --git a/gfx/pics/sunkern/anim0.asm b/gfx/pokemon/sunkern/anim0.asm
index c282b1fb2..c282b1fb2 100644
--- a/gfx/pics/sunkern/anim0.asm
+++ b/gfx/pokemon/sunkern/anim0.asm
diff --git a/gfx/pics/sunkern/anim1.asm b/gfx/pokemon/sunkern/anim1.asm
index f92d267a1..f92d267a1 100644
--- a/gfx/pics/sunkern/anim1.asm
+++ b/gfx/pokemon/sunkern/anim1.asm
diff --git a/gfx/pics/sunkern/back.2bpp.lz.d28f6303 b/gfx/pokemon/sunkern/back.2bpp.lz.d28f6303
index a9ba0f738..a9ba0f738 100644
--- a/gfx/pics/sunkern/back.2bpp.lz.d28f6303
+++ b/gfx/pokemon/sunkern/back.2bpp.lz.d28f6303
diff --git a/gfx/pics/sunkern/back.png b/gfx/pokemon/sunkern/back.png
index f6a12a830..f6a12a830 100644
--- a/gfx/pics/sunkern/back.png
+++ b/gfx/pokemon/sunkern/back.png
diff --git a/gfx/pics/sunkern/front.animated.2bpp.lz.316c5261 b/gfx/pokemon/sunkern/front.animated.2bpp.lz.316c5261
index 77a21af73..77a21af73 100644
--- a/gfx/pics/sunkern/front.animated.2bpp.lz.316c5261
+++ b/gfx/pokemon/sunkern/front.animated.2bpp.lz.316c5261
diff --git a/gfx/pics/sunkern/front.png b/gfx/pokemon/sunkern/front.png
index 5bc994e6d..5bc994e6d 100644
--- a/gfx/pics/sunkern/front.png
+++ b/gfx/pokemon/sunkern/front.png
diff --git a/gfx/pics/sunkern/shiny.pal b/gfx/pokemon/sunkern/shiny.pal
index 3215a861c..3215a861c 100644
--- a/gfx/pics/sunkern/shiny.pal
+++ b/gfx/pokemon/sunkern/shiny.pal
diff --git a/gfx/pics/swinub/anim0.asm b/gfx/pokemon/swinub/anim0.asm
index f1d93138a..f1d93138a 100644
--- a/gfx/pics/swinub/anim0.asm
+++ b/gfx/pokemon/swinub/anim0.asm
diff --git a/gfx/pics/swinub/anim1.asm b/gfx/pokemon/swinub/anim1.asm
index 5fe97a2ba..5fe97a2ba 100644
--- a/gfx/pics/swinub/anim1.asm
+++ b/gfx/pokemon/swinub/anim1.asm
diff --git a/gfx/pics/swinub/back.2bpp.lz.1ebbfabf b/gfx/pokemon/swinub/back.2bpp.lz.1ebbfabf
index 51b90aae2..51b90aae2 100644
--- a/gfx/pics/swinub/back.2bpp.lz.1ebbfabf
+++ b/gfx/pokemon/swinub/back.2bpp.lz.1ebbfabf
diff --git a/gfx/pics/swinub/back.png b/gfx/pokemon/swinub/back.png
index 254b08e27..254b08e27 100644
--- a/gfx/pics/swinub/back.png
+++ b/gfx/pokemon/swinub/back.png
diff --git a/gfx/pics/swinub/front.animated.2bpp.lz.228147a5 b/gfx/pokemon/swinub/front.animated.2bpp.lz.228147a5
index 00171e0f3..00171e0f3 100644
--- a/gfx/pics/swinub/front.animated.2bpp.lz.228147a5
+++ b/gfx/pokemon/swinub/front.animated.2bpp.lz.228147a5
diff --git a/gfx/pics/swinub/front.png b/gfx/pokemon/swinub/front.png
index 52fcadade..52fcadade 100644
--- a/gfx/pics/swinub/front.png
+++ b/gfx/pokemon/swinub/front.png
diff --git a/gfx/pics/swinub/shiny.pal b/gfx/pokemon/swinub/shiny.pal
index 4e3eadacb..4e3eadacb 100644
--- a/gfx/pics/swinub/shiny.pal
+++ b/gfx/pokemon/swinub/shiny.pal
diff --git a/gfx/pics/tangela/anim0.asm b/gfx/pokemon/tangela/anim0.asm
index 57a237afe..57a237afe 100644
--- a/gfx/pics/tangela/anim0.asm
+++ b/gfx/pokemon/tangela/anim0.asm
diff --git a/gfx/pics/tangela/anim1.asm b/gfx/pokemon/tangela/anim1.asm
index 7d8b2550f..7d8b2550f 100644
--- a/gfx/pics/tangela/anim1.asm
+++ b/gfx/pokemon/tangela/anim1.asm
diff --git a/gfx/pics/tangela/back.2bpp.lz.435194a6 b/gfx/pokemon/tangela/back.2bpp.lz.435194a6
index 9ad73a0b6..9ad73a0b6 100644
--- a/gfx/pics/tangela/back.2bpp.lz.435194a6
+++ b/gfx/pokemon/tangela/back.2bpp.lz.435194a6
diff --git a/gfx/pics/tangela/back.png b/gfx/pokemon/tangela/back.png
index edbe07de1..edbe07de1 100644
--- a/gfx/pics/tangela/back.png
+++ b/gfx/pokemon/tangela/back.png
diff --git a/gfx/pics/tangela/front.animated.2bpp.lz.7cb3fed8 b/gfx/pokemon/tangela/front.animated.2bpp.lz.7cb3fed8
index 345732b84..345732b84 100644
--- a/gfx/pics/tangela/front.animated.2bpp.lz.7cb3fed8
+++ b/gfx/pokemon/tangela/front.animated.2bpp.lz.7cb3fed8
diff --git a/gfx/pics/tangela/front.png b/gfx/pokemon/tangela/front.png
index 23c506929..23c506929 100644
--- a/gfx/pics/tangela/front.png
+++ b/gfx/pokemon/tangela/front.png
diff --git a/gfx/pics/tangela/shiny.pal b/gfx/pokemon/tangela/shiny.pal
index 089ec35c4..089ec35c4 100644
--- a/gfx/pics/tangela/shiny.pal
+++ b/gfx/pokemon/tangela/shiny.pal
diff --git a/gfx/pics/tauros/anim0.asm b/gfx/pokemon/tauros/anim0.asm
index 52c9264c3..52c9264c3 100644
--- a/gfx/pics/tauros/anim0.asm
+++ b/gfx/pokemon/tauros/anim0.asm
diff --git a/gfx/pics/tauros/anim1.asm b/gfx/pokemon/tauros/anim1.asm
index ab6608d0d..ab6608d0d 100644
--- a/gfx/pics/tauros/anim1.asm
+++ b/gfx/pokemon/tauros/anim1.asm
diff --git a/gfx/pics/tauros/back.2bpp.lz.f487c586 b/gfx/pokemon/tauros/back.2bpp.lz.f487c586
index 219aee479..219aee479 100644
--- a/gfx/pics/tauros/back.2bpp.lz.f487c586
+++ b/gfx/pokemon/tauros/back.2bpp.lz.f487c586
diff --git a/gfx/pics/tauros/back.png b/gfx/pokemon/tauros/back.png
index 9345301d3..9345301d3 100644
--- a/gfx/pics/tauros/back.png
+++ b/gfx/pokemon/tauros/back.png
diff --git a/gfx/pics/tauros/front.animated.2bpp.lz.982dd0db b/gfx/pokemon/tauros/front.animated.2bpp.lz.982dd0db
index d395b145b..d395b145b 100644
--- a/gfx/pics/tauros/front.animated.2bpp.lz.982dd0db
+++ b/gfx/pokemon/tauros/front.animated.2bpp.lz.982dd0db
diff --git a/gfx/pics/tauros/front.png b/gfx/pokemon/tauros/front.png
index 535526411..535526411 100644
--- a/gfx/pics/tauros/front.png
+++ b/gfx/pokemon/tauros/front.png
diff --git a/gfx/pics/tauros/shiny.pal b/gfx/pokemon/tauros/shiny.pal
index cc360615c..cc360615c 100644
--- a/gfx/pics/tauros/shiny.pal
+++ b/gfx/pokemon/tauros/shiny.pal
diff --git a/gfx/pics/teddiursa/anim0.asm b/gfx/pokemon/teddiursa/anim0.asm
index 78bbeae60..78bbeae60 100644
--- a/gfx/pics/teddiursa/anim0.asm
+++ b/gfx/pokemon/teddiursa/anim0.asm
diff --git a/gfx/pics/teddiursa/anim1.asm b/gfx/pokemon/teddiursa/anim1.asm
index 85cae5284..85cae5284 100644
--- a/gfx/pics/teddiursa/anim1.asm
+++ b/gfx/pokemon/teddiursa/anim1.asm
diff --git a/gfx/pics/teddiursa/back.2bpp.lz.53f6e34e b/gfx/pokemon/teddiursa/back.2bpp.lz.53f6e34e
index a6d267ef8..a6d267ef8 100644
--- a/gfx/pics/teddiursa/back.2bpp.lz.53f6e34e
+++ b/gfx/pokemon/teddiursa/back.2bpp.lz.53f6e34e
diff --git a/gfx/pics/teddiursa/back.png b/gfx/pokemon/teddiursa/back.png
index 0d4640318..0d4640318 100644
--- a/gfx/pics/teddiursa/back.png
+++ b/gfx/pokemon/teddiursa/back.png
diff --git a/gfx/pics/teddiursa/front.animated.2bpp.lz.5f9648c7 b/gfx/pokemon/teddiursa/front.animated.2bpp.lz.5f9648c7
index 40c22315e..40c22315e 100644
--- a/gfx/pics/teddiursa/front.animated.2bpp.lz.5f9648c7
+++ b/gfx/pokemon/teddiursa/front.animated.2bpp.lz.5f9648c7
diff --git a/gfx/pics/teddiursa/front.png b/gfx/pokemon/teddiursa/front.png
index 83dd4896d..83dd4896d 100644
--- a/gfx/pics/teddiursa/front.png
+++ b/gfx/pokemon/teddiursa/front.png
diff --git a/gfx/pics/teddiursa/shiny.pal b/gfx/pokemon/teddiursa/shiny.pal
index f3b997329..f3b997329 100644
--- a/gfx/pics/teddiursa/shiny.pal
+++ b/gfx/pokemon/teddiursa/shiny.pal
diff --git a/gfx/pics/tentacool/anim0.asm b/gfx/pokemon/tentacool/anim0.asm
index 19b7d3a14..19b7d3a14 100644
--- a/gfx/pics/tentacool/anim0.asm
+++ b/gfx/pokemon/tentacool/anim0.asm
diff --git a/gfx/pics/tentacool/anim1.asm b/gfx/pokemon/tentacool/anim1.asm
index 4e9ba0b11..4e9ba0b11 100644
--- a/gfx/pics/tentacool/anim1.asm
+++ b/gfx/pokemon/tentacool/anim1.asm
diff --git a/gfx/pics/tentacool/back.2bpp.lz.ae7b2102 b/gfx/pokemon/tentacool/back.2bpp.lz.ae7b2102
index c0b615905..c0b615905 100644
--- a/gfx/pics/tentacool/back.2bpp.lz.ae7b2102
+++ b/gfx/pokemon/tentacool/back.2bpp.lz.ae7b2102
diff --git a/gfx/pics/tentacool/back.png b/gfx/pokemon/tentacool/back.png
index 7a7724189..7a7724189 100644
--- a/gfx/pics/tentacool/back.png
+++ b/gfx/pokemon/tentacool/back.png
diff --git a/gfx/pics/tentacool/front.animated.2bpp.lz.7a86457c b/gfx/pokemon/tentacool/front.animated.2bpp.lz.7a86457c
index 57916e4e9..57916e4e9 100644
--- a/gfx/pics/tentacool/front.animated.2bpp.lz.7a86457c
+++ b/gfx/pokemon/tentacool/front.animated.2bpp.lz.7a86457c
diff --git a/gfx/pics/tentacool/front.png b/gfx/pokemon/tentacool/front.png
index 1e4684719..1e4684719 100644
--- a/gfx/pics/tentacool/front.png
+++ b/gfx/pokemon/tentacool/front.png
diff --git a/gfx/pics/tentacool/shiny.pal b/gfx/pokemon/tentacool/shiny.pal
index 1fec33a22..1fec33a22 100644
--- a/gfx/pics/tentacool/shiny.pal
+++ b/gfx/pokemon/tentacool/shiny.pal
diff --git a/gfx/pics/tentacruel/anim0.asm b/gfx/pokemon/tentacruel/anim0.asm
index 4fed8e9d4..4fed8e9d4 100644
--- a/gfx/pics/tentacruel/anim0.asm
+++ b/gfx/pokemon/tentacruel/anim0.asm
diff --git a/gfx/pics/tentacruel/anim1.asm b/gfx/pokemon/tentacruel/anim1.asm
index fd8d510b4..fd8d510b4 100644
--- a/gfx/pics/tentacruel/anim1.asm
+++ b/gfx/pokemon/tentacruel/anim1.asm
diff --git a/gfx/pics/tentacruel/back.2bpp.lz.0e344f19 b/gfx/pokemon/tentacruel/back.2bpp.lz.0e344f19
index 89d7a492d..89d7a492d 100644
--- a/gfx/pics/tentacruel/back.2bpp.lz.0e344f19
+++ b/gfx/pokemon/tentacruel/back.2bpp.lz.0e344f19
diff --git a/gfx/pics/tentacruel/back.png b/gfx/pokemon/tentacruel/back.png
index 4430f740f..4430f740f 100644
--- a/gfx/pics/tentacruel/back.png
+++ b/gfx/pokemon/tentacruel/back.png
diff --git a/gfx/pics/tentacruel/front.animated.2bpp.lz.f13e5904 b/gfx/pokemon/tentacruel/front.animated.2bpp.lz.f13e5904
index ec6f4c2c8..ec6f4c2c8 100644
--- a/gfx/pics/tentacruel/front.animated.2bpp.lz.f13e5904
+++ b/gfx/pokemon/tentacruel/front.animated.2bpp.lz.f13e5904
diff --git a/gfx/pics/tentacruel/front.png b/gfx/pokemon/tentacruel/front.png
index fad5553fe..fad5553fe 100644
--- a/gfx/pics/tentacruel/front.png
+++ b/gfx/pokemon/tentacruel/front.png
diff --git a/gfx/pics/tentacruel/shiny.pal b/gfx/pokemon/tentacruel/shiny.pal
index afe40aff6..afe40aff6 100644
--- a/gfx/pics/tentacruel/shiny.pal
+++ b/gfx/pokemon/tentacruel/shiny.pal
diff --git a/gfx/pics/togepi/anim0.asm b/gfx/pokemon/togepi/anim0.asm
index a09192323..a09192323 100644
--- a/gfx/pics/togepi/anim0.asm
+++ b/gfx/pokemon/togepi/anim0.asm
diff --git a/gfx/pics/togepi/anim1.asm b/gfx/pokemon/togepi/anim1.asm
index e3bd76591..e3bd76591 100644
--- a/gfx/pics/togepi/anim1.asm
+++ b/gfx/pokemon/togepi/anim1.asm
diff --git a/gfx/pics/togepi/back.2bpp.lz.0e22cc02 b/gfx/pokemon/togepi/back.2bpp.lz.0e22cc02
index ed6fab2ec..ed6fab2ec 100644
--- a/gfx/pics/togepi/back.2bpp.lz.0e22cc02
+++ b/gfx/pokemon/togepi/back.2bpp.lz.0e22cc02
diff --git a/gfx/pics/togepi/back.png b/gfx/pokemon/togepi/back.png
index de6bc8a40..de6bc8a40 100644
--- a/gfx/pics/togepi/back.png
+++ b/gfx/pokemon/togepi/back.png
diff --git a/gfx/pics/togepi/front.animated.2bpp.lz.0cf7ba07 b/gfx/pokemon/togepi/front.animated.2bpp.lz.0cf7ba07
index 8ceaf38bf..8ceaf38bf 100644
--- a/gfx/pics/togepi/front.animated.2bpp.lz.0cf7ba07
+++ b/gfx/pokemon/togepi/front.animated.2bpp.lz.0cf7ba07
diff --git a/gfx/pics/togepi/front.png b/gfx/pokemon/togepi/front.png
index 3fc23b9d7..3fc23b9d7 100644
--- a/gfx/pics/togepi/front.png
+++ b/gfx/pokemon/togepi/front.png
diff --git a/gfx/pics/togepi/shiny.pal b/gfx/pokemon/togepi/shiny.pal
index 6e194e5d9..6e194e5d9 100644
--- a/gfx/pics/togepi/shiny.pal
+++ b/gfx/pokemon/togepi/shiny.pal
diff --git a/gfx/pics/togetic/anim0.asm b/gfx/pokemon/togetic/anim0.asm
index cd1ac8f9b..cd1ac8f9b 100644
--- a/gfx/pics/togetic/anim0.asm
+++ b/gfx/pokemon/togetic/anim0.asm
diff --git a/gfx/pics/togetic/anim1.asm b/gfx/pokemon/togetic/anim1.asm
index 543befa82..543befa82 100644
--- a/gfx/pics/togetic/anim1.asm
+++ b/gfx/pokemon/togetic/anim1.asm
diff --git a/gfx/pics/togetic/back.2bpp.lz.62cbb330 b/gfx/pokemon/togetic/back.2bpp.lz.62cbb330
index 134d5718a..134d5718a 100644
--- a/gfx/pics/togetic/back.2bpp.lz.62cbb330
+++ b/gfx/pokemon/togetic/back.2bpp.lz.62cbb330
diff --git a/gfx/pics/togetic/back.png b/gfx/pokemon/togetic/back.png
index 9a92e0970..9a92e0970 100644
--- a/gfx/pics/togetic/back.png
+++ b/gfx/pokemon/togetic/back.png
diff --git a/gfx/pics/togetic/front.animated.2bpp.lz.5797583e b/gfx/pokemon/togetic/front.animated.2bpp.lz.5797583e
index 13e98ae1d..13e98ae1d 100644
--- a/gfx/pics/togetic/front.animated.2bpp.lz.5797583e
+++ b/gfx/pokemon/togetic/front.animated.2bpp.lz.5797583e
diff --git a/gfx/pics/togetic/front.png b/gfx/pokemon/togetic/front.png
index 9851c9011..9851c9011 100644
--- a/gfx/pics/togetic/front.png
+++ b/gfx/pokemon/togetic/front.png
diff --git a/gfx/pics/togetic/shiny.pal b/gfx/pokemon/togetic/shiny.pal
index 10e7182f5..10e7182f5 100644
--- a/gfx/pics/togetic/shiny.pal
+++ b/gfx/pokemon/togetic/shiny.pal
diff --git a/gfx/pics/totodile/anim0.asm b/gfx/pokemon/totodile/anim0.asm
index c320f4646..c320f4646 100644
--- a/gfx/pics/totodile/anim0.asm
+++ b/gfx/pokemon/totodile/anim0.asm
diff --git a/gfx/pics/totodile/anim1.asm b/gfx/pokemon/totodile/anim1.asm
index 35379db93..35379db93 100644
--- a/gfx/pics/totodile/anim1.asm
+++ b/gfx/pokemon/totodile/anim1.asm
diff --git a/gfx/pics/totodile/back.2bpp.lz.ab6bc2a1 b/gfx/pokemon/totodile/back.2bpp.lz.ab6bc2a1
index 6d73c934f..6d73c934f 100644
--- a/gfx/pics/totodile/back.2bpp.lz.ab6bc2a1
+++ b/gfx/pokemon/totodile/back.2bpp.lz.ab6bc2a1
diff --git a/gfx/pics/totodile/back.png b/gfx/pokemon/totodile/back.png
index 5cf6adf42..5cf6adf42 100644
--- a/gfx/pics/totodile/back.png
+++ b/gfx/pokemon/totodile/back.png
diff --git a/gfx/pics/totodile/front.animated.2bpp.lz.afce8cd0 b/gfx/pokemon/totodile/front.animated.2bpp.lz.afce8cd0
index 8e1ebd2f5..8e1ebd2f5 100644
--- a/gfx/pics/totodile/front.animated.2bpp.lz.afce8cd0
+++ b/gfx/pokemon/totodile/front.animated.2bpp.lz.afce8cd0
diff --git a/gfx/pics/totodile/front.png b/gfx/pokemon/totodile/front.png
index 634d04189..634d04189 100644
--- a/gfx/pics/totodile/front.png
+++ b/gfx/pokemon/totodile/front.png
diff --git a/gfx/pics/totodile/shiny.pal b/gfx/pokemon/totodile/shiny.pal
index c947fe43a..c947fe43a 100644
--- a/gfx/pics/totodile/shiny.pal
+++ b/gfx/pokemon/totodile/shiny.pal
diff --git a/gfx/pics/typhlosion/anim0.asm b/gfx/pokemon/typhlosion/anim0.asm
index bb4b30d6c..bb4b30d6c 100644
--- a/gfx/pics/typhlosion/anim0.asm
+++ b/gfx/pokemon/typhlosion/anim0.asm
diff --git a/gfx/pics/typhlosion/anim1.asm b/gfx/pokemon/typhlosion/anim1.asm
index 2f7ed3abc..2f7ed3abc 100644
--- a/gfx/pics/typhlosion/anim1.asm
+++ b/gfx/pokemon/typhlosion/anim1.asm
diff --git a/gfx/pics/typhlosion/back.2bpp.lz.83be0292 b/gfx/pokemon/typhlosion/back.2bpp.lz.83be0292
index 592306fa6..592306fa6 100644
--- a/gfx/pics/typhlosion/back.2bpp.lz.83be0292
+++ b/gfx/pokemon/typhlosion/back.2bpp.lz.83be0292
diff --git a/gfx/pics/typhlosion/back.png b/gfx/pokemon/typhlosion/back.png
index 1808f3089..1808f3089 100644
--- a/gfx/pics/typhlosion/back.png
+++ b/gfx/pokemon/typhlosion/back.png
diff --git a/gfx/pics/typhlosion/front.animated.2bpp.lz.65adc1e1 b/gfx/pokemon/typhlosion/front.animated.2bpp.lz.65adc1e1
index 9dba415ad..9dba415ad 100644
--- a/gfx/pics/typhlosion/front.animated.2bpp.lz.65adc1e1
+++ b/gfx/pokemon/typhlosion/front.animated.2bpp.lz.65adc1e1
diff --git a/gfx/pics/typhlosion/front.png b/gfx/pokemon/typhlosion/front.png
index aef81a01b..aef81a01b 100644
--- a/gfx/pics/typhlosion/front.png
+++ b/gfx/pokemon/typhlosion/front.png
diff --git a/gfx/pics/typhlosion/shiny.pal b/gfx/pokemon/typhlosion/shiny.pal
index 5b3df0b4e..5b3df0b4e 100644
--- a/gfx/pics/typhlosion/shiny.pal
+++ b/gfx/pokemon/typhlosion/shiny.pal
diff --git a/gfx/pics/tyranitar/anim0.asm b/gfx/pokemon/tyranitar/anim0.asm
index f345bdd8e..f345bdd8e 100644
--- a/gfx/pics/tyranitar/anim0.asm
+++ b/gfx/pokemon/tyranitar/anim0.asm
diff --git a/gfx/pics/tyranitar/anim1.asm b/gfx/pokemon/tyranitar/anim1.asm
index 29788fd1d..29788fd1d 100644
--- a/gfx/pics/tyranitar/anim1.asm
+++ b/gfx/pokemon/tyranitar/anim1.asm
diff --git a/gfx/pics/tyranitar/back.2bpp.lz.05b022c9 b/gfx/pokemon/tyranitar/back.2bpp.lz.05b022c9
index 572e56d69..572e56d69 100644
--- a/gfx/pics/tyranitar/back.2bpp.lz.05b022c9
+++ b/gfx/pokemon/tyranitar/back.2bpp.lz.05b022c9
diff --git a/gfx/pics/tyranitar/back.png b/gfx/pokemon/tyranitar/back.png
index 07f6d1b57..07f6d1b57 100644
--- a/gfx/pics/tyranitar/back.png
+++ b/gfx/pokemon/tyranitar/back.png
diff --git a/gfx/pics/tyranitar/front.animated.2bpp.lz.e0e9187e b/gfx/pokemon/tyranitar/front.animated.2bpp.lz.e0e9187e
index 07d48a5fe..07d48a5fe 100644
--- a/gfx/pics/tyranitar/front.animated.2bpp.lz.e0e9187e
+++ b/gfx/pokemon/tyranitar/front.animated.2bpp.lz.e0e9187e
diff --git a/gfx/pics/tyranitar/front.png b/gfx/pokemon/tyranitar/front.png
index 4b1ba3416..4b1ba3416 100644
--- a/gfx/pics/tyranitar/front.png
+++ b/gfx/pokemon/tyranitar/front.png
diff --git a/gfx/pics/tyranitar/shiny.pal b/gfx/pokemon/tyranitar/shiny.pal
index 4eebd8b4f..4eebd8b4f 100644
--- a/gfx/pics/tyranitar/shiny.pal
+++ b/gfx/pokemon/tyranitar/shiny.pal
diff --git a/gfx/pics/tyrogue/anim0.asm b/gfx/pokemon/tyrogue/anim0.asm
index e1470d816..e1470d816 100644
--- a/gfx/pics/tyrogue/anim0.asm
+++ b/gfx/pokemon/tyrogue/anim0.asm
diff --git a/gfx/pics/tyrogue/anim1.asm b/gfx/pokemon/tyrogue/anim1.asm
index da73f62e3..da73f62e3 100644
--- a/gfx/pics/tyrogue/anim1.asm
+++ b/gfx/pokemon/tyrogue/anim1.asm
diff --git a/gfx/pics/tyrogue/back.2bpp.lz.5d84cef1 b/gfx/pokemon/tyrogue/back.2bpp.lz.5d84cef1
index 9c9a0babc..9c9a0babc 100644
--- a/gfx/pics/tyrogue/back.2bpp.lz.5d84cef1
+++ b/gfx/pokemon/tyrogue/back.2bpp.lz.5d84cef1
diff --git a/gfx/pics/tyrogue/back.png b/gfx/pokemon/tyrogue/back.png
index 22c1d61c4..22c1d61c4 100644
--- a/gfx/pics/tyrogue/back.png
+++ b/gfx/pokemon/tyrogue/back.png
diff --git a/gfx/pics/tyrogue/front.animated.2bpp.lz.a3790421 b/gfx/pokemon/tyrogue/front.animated.2bpp.lz.a3790421
index 8245825fb..8245825fb 100644
--- a/gfx/pics/tyrogue/front.animated.2bpp.lz.a3790421
+++ b/gfx/pokemon/tyrogue/front.animated.2bpp.lz.a3790421
diff --git a/gfx/pics/tyrogue/front.png b/gfx/pokemon/tyrogue/front.png
index af8af4a4e..af8af4a4e 100644
--- a/gfx/pics/tyrogue/front.png
+++ b/gfx/pokemon/tyrogue/front.png
diff --git a/gfx/pics/tyrogue/shiny.pal b/gfx/pokemon/tyrogue/shiny.pal
index 53e0a5c1e..53e0a5c1e 100644
--- a/gfx/pics/tyrogue/shiny.pal
+++ b/gfx/pokemon/tyrogue/shiny.pal
diff --git a/gfx/pics/umbreon/anim0.asm b/gfx/pokemon/umbreon/anim0.asm
index 541539979..541539979 100644
--- a/gfx/pics/umbreon/anim0.asm
+++ b/gfx/pokemon/umbreon/anim0.asm
diff --git a/gfx/pics/umbreon/anim1.asm b/gfx/pokemon/umbreon/anim1.asm
index adb0158e2..adb0158e2 100644
--- a/gfx/pics/umbreon/anim1.asm
+++ b/gfx/pokemon/umbreon/anim1.asm
diff --git a/gfx/pics/umbreon/back.2bpp.lz.55e50b8c b/gfx/pokemon/umbreon/back.2bpp.lz.55e50b8c
index cf39af2c6..cf39af2c6 100644
--- a/gfx/pics/umbreon/back.2bpp.lz.55e50b8c
+++ b/gfx/pokemon/umbreon/back.2bpp.lz.55e50b8c
diff --git a/gfx/pics/umbreon/back.png b/gfx/pokemon/umbreon/back.png
index f1cce4fc8..f1cce4fc8 100644
--- a/gfx/pics/umbreon/back.png
+++ b/gfx/pokemon/umbreon/back.png
diff --git a/gfx/pics/umbreon/front.animated.2bpp.lz.b484be57 b/gfx/pokemon/umbreon/front.animated.2bpp.lz.b484be57
index 64a338138..64a338138 100644
--- a/gfx/pics/umbreon/front.animated.2bpp.lz.b484be57
+++ b/gfx/pokemon/umbreon/front.animated.2bpp.lz.b484be57
diff --git a/gfx/pics/umbreon/front.png b/gfx/pokemon/umbreon/front.png
index c1bf9c2f8..c1bf9c2f8 100644
--- a/gfx/pics/umbreon/front.png
+++ b/gfx/pokemon/umbreon/front.png
diff --git a/gfx/pics/umbreon/shiny.pal b/gfx/pokemon/umbreon/shiny.pal
index 9173bbb15..9173bbb15 100644
--- a/gfx/pics/umbreon/shiny.pal
+++ b/gfx/pokemon/umbreon/shiny.pal
diff --git a/gfx/pics/unown/anim0.asm b/gfx/pokemon/unown/anim0.asm
index 510d2751c..510d2751c 100644
--- a/gfx/pics/unown/anim0.asm
+++ b/gfx/pokemon/unown/anim0.asm
diff --git a/gfx/pics/unown/anim1.asm b/gfx/pokemon/unown/anim1.asm
index 3d0f65488..3d0f65488 100644
--- a/gfx/pics/unown/anim1.asm
+++ b/gfx/pokemon/unown/anim1.asm
diff --git a/gfx/pics/unown/bitmask.asm b/gfx/pokemon/unown/bitmask.asm
index f0ae4e5b2..f0ae4e5b2 100644
--- a/gfx/pics/unown/bitmask.asm
+++ b/gfx/pokemon/unown/bitmask.asm
diff --git a/gfx/pics/unown/frames.asm b/gfx/pokemon/unown/frames.asm
index ca996e90a..ca996e90a 100644
--- a/gfx/pics/unown/frames.asm
+++ b/gfx/pokemon/unown/frames.asm
diff --git a/gfx/pics/unown/normal.pal b/gfx/pokemon/unown/normal.pal
index 19f5252a7..19f5252a7 100644
--- a/gfx/pics/unown/normal.pal
+++ b/gfx/pokemon/unown/normal.pal
diff --git a/gfx/pics/unown/shiny.pal b/gfx/pokemon/unown/shiny.pal
index 6a30f11e6..6a30f11e6 100644
--- a/gfx/pics/unown/shiny.pal
+++ b/gfx/pokemon/unown/shiny.pal
diff --git a/gfx/pics/unown_a/anim0.asm b/gfx/pokemon/unown_a/anim0.asm
index 7243ed0fb..7243ed0fb 100644
--- a/gfx/pics/unown_a/anim0.asm
+++ b/gfx/pokemon/unown_a/anim0.asm
diff --git a/gfx/pics/unown_a/anim1.asm b/gfx/pokemon/unown_a/anim1.asm
index d995ba44d..d995ba44d 100644
--- a/gfx/pics/unown_a/anim1.asm
+++ b/gfx/pokemon/unown_a/anim1.asm
diff --git a/gfx/pics/unown_a/back.2bpp.lz.b8389572 b/gfx/pokemon/unown_a/back.2bpp.lz.b8389572
index 08833e3e2..08833e3e2 100644
--- a/gfx/pics/unown_a/back.2bpp.lz.b8389572
+++ b/gfx/pokemon/unown_a/back.2bpp.lz.b8389572
diff --git a/gfx/pics/unown_a/back.png b/gfx/pokemon/unown_a/back.png
index 48f7c0200..48f7c0200 100644
--- a/gfx/pics/unown_a/back.png
+++ b/gfx/pokemon/unown_a/back.png
diff --git a/gfx/pics/unown_a/front.animated.2bpp.lz.47e16756 b/gfx/pokemon/unown_a/front.animated.2bpp.lz.47e16756
index 6f0639575..6f0639575 100644
--- a/gfx/pics/unown_a/front.animated.2bpp.lz.47e16756
+++ b/gfx/pokemon/unown_a/front.animated.2bpp.lz.47e16756
diff --git a/gfx/pics/unown_a/front.png b/gfx/pokemon/unown_a/front.png
index 1949bdc9a..1949bdc9a 100644
--- a/gfx/pics/unown_a/front.png
+++ b/gfx/pokemon/unown_a/front.png
diff --git a/gfx/pics/unown_anim_pointers.asm b/gfx/pokemon/unown_anim_pointers.asm
index 46aa757e4..46aa757e4 100644
--- a/gfx/pics/unown_anim_pointers.asm
+++ b/gfx/pokemon/unown_anim_pointers.asm
diff --git a/gfx/pokemon/unown_anims.asm b/gfx/pokemon/unown_anims.asm
new file mode 100644
index 000000000..cb5bf0aa2
--- /dev/null
+++ b/gfx/pokemon/unown_anims.asm
@@ -0,0 +1,27 @@
+UnownAnimations:
+UnownAAnimation: INCLUDE "gfx/pokemon/unown_a/anim0.asm"
+UnownBAnimation: INCLUDE "gfx/pokemon/unown_b/anim0.asm"
+UnownCAnimation: INCLUDE "gfx/pokemon/unown_c/anim0.asm"
+UnownDAnimation: INCLUDE "gfx/pokemon/unown_d/anim0.asm"
+UnownEAnimation: INCLUDE "gfx/pokemon/unown_e/anim0.asm"
+UnownFAnimation: INCLUDE "gfx/pokemon/unown_f/anim0.asm"
+UnownGAnimation: INCLUDE "gfx/pokemon/unown_g/anim0.asm"
+UnownHAnimation: INCLUDE "gfx/pokemon/unown_h/anim0.asm"
+UnownIAnimation: INCLUDE "gfx/pokemon/unown_i/anim0.asm"
+UnownJAnimation: INCLUDE "gfx/pokemon/unown_j/anim0.asm"
+UnownKAnimation: INCLUDE "gfx/pokemon/unown_k/anim0.asm"
+UnownLAnimation: INCLUDE "gfx/pokemon/unown_l/anim0.asm"
+UnownMAnimation: INCLUDE "gfx/pokemon/unown_m/anim0.asm"
+UnownNAnimation: INCLUDE "gfx/pokemon/unown_n/anim0.asm"
+UnownOAnimation: INCLUDE "gfx/pokemon/unown_o/anim0.asm"
+UnownPAnimation: INCLUDE "gfx/pokemon/unown_p/anim0.asm"
+UnownQAnimation: INCLUDE "gfx/pokemon/unown_q/anim0.asm"
+UnownRAnimation: INCLUDE "gfx/pokemon/unown_r/anim0.asm"
+UnownSAnimation: INCLUDE "gfx/pokemon/unown_s/anim0.asm"
+UnownTAnimation: INCLUDE "gfx/pokemon/unown_t/anim0.asm"
+UnownUAnimation: INCLUDE "gfx/pokemon/unown_u/anim0.asm"
+UnownVAnimation: INCLUDE "gfx/pokemon/unown_v/anim0.asm"
+UnownWAnimation: INCLUDE "gfx/pokemon/unown_w/anim0.asm"
+UnownXAnimation: INCLUDE "gfx/pokemon/unown_x/anim0.asm"
+UnownYAnimation: INCLUDE "gfx/pokemon/unown_y/anim0.asm"
+UnownZAnimation: INCLUDE "gfx/pokemon/unown_z/anim0.asm"
diff --git a/gfx/pics/unown_b/anim0.asm b/gfx/pokemon/unown_b/anim0.asm
index 7683b9e84..7683b9e84 100644
--- a/gfx/pics/unown_b/anim0.asm
+++ b/gfx/pokemon/unown_b/anim0.asm
diff --git a/gfx/pics/unown_b/anim1.asm b/gfx/pokemon/unown_b/anim1.asm
index b8e03b299..b8e03b299 100644
--- a/gfx/pics/unown_b/anim1.asm
+++ b/gfx/pokemon/unown_b/anim1.asm
diff --git a/gfx/pics/unown_b/back.2bpp.lz.72a0840f b/gfx/pokemon/unown_b/back.2bpp.lz.72a0840f
index 46375f630..46375f630 100644
--- a/gfx/pics/unown_b/back.2bpp.lz.72a0840f
+++ b/gfx/pokemon/unown_b/back.2bpp.lz.72a0840f
diff --git a/gfx/pics/unown_b/back.png b/gfx/pokemon/unown_b/back.png
index 3ceaba03c..3ceaba03c 100644
--- a/gfx/pics/unown_b/back.png
+++ b/gfx/pokemon/unown_b/back.png
diff --git a/gfx/pics/unown_b/front.animated.2bpp.lz.5742d494 b/gfx/pokemon/unown_b/front.animated.2bpp.lz.5742d494
index 661c64a9e..661c64a9e 100644
--- a/gfx/pics/unown_b/front.animated.2bpp.lz.5742d494
+++ b/gfx/pokemon/unown_b/front.animated.2bpp.lz.5742d494
diff --git a/gfx/pics/unown_b/front.png b/gfx/pokemon/unown_b/front.png
index 9858a26ba..9858a26ba 100644
--- a/gfx/pics/unown_b/front.png
+++ b/gfx/pokemon/unown_b/front.png
diff --git a/gfx/pics/unown_bitmask_pointers.asm b/gfx/pokemon/unown_bitmask_pointers.asm
index a20db9700..a20db9700 100644
--- a/gfx/pics/unown_bitmask_pointers.asm
+++ b/gfx/pokemon/unown_bitmask_pointers.asm
diff --git a/gfx/pokemon/unown_bitmasks.asm b/gfx/pokemon/unown_bitmasks.asm
new file mode 100644
index 000000000..99604c98f
--- /dev/null
+++ b/gfx/pokemon/unown_bitmasks.asm
@@ -0,0 +1,26 @@
+UnownABitmasks: INCLUDE "gfx/pokemon/unown_a/bitmask.asm"
+UnownBBitmasks: INCLUDE "gfx/pokemon/unown_b/bitmask.asm"
+UnownCBitmasks: INCLUDE "gfx/pokemon/unown_c/bitmask.asm"
+UnownDBitmasks: INCLUDE "gfx/pokemon/unown_d/bitmask.asm"
+UnownEBitmasks: INCLUDE "gfx/pokemon/unown_e/bitmask.asm"
+UnownFBitmasks: INCLUDE "gfx/pokemon/unown_f/bitmask.asm"
+UnownGBitmasks: INCLUDE "gfx/pokemon/unown_g/bitmask.asm"
+UnownHBitmasks: INCLUDE "gfx/pokemon/unown_h/bitmask.asm"
+UnownIBitmasks: INCLUDE "gfx/pokemon/unown_i/bitmask.asm"
+UnownJBitmasks: INCLUDE "gfx/pokemon/unown_j/bitmask.asm"
+UnownKBitmasks: INCLUDE "gfx/pokemon/unown_k/bitmask.asm"
+UnownLBitmasks: INCLUDE "gfx/pokemon/unown_l/bitmask.asm"
+UnownMBitmasks: INCLUDE "gfx/pokemon/unown_m/bitmask.asm"
+UnownNBitmasks: INCLUDE "gfx/pokemon/unown_n/bitmask.asm"
+UnownOBitmasks: INCLUDE "gfx/pokemon/unown_o/bitmask.asm"
+UnownPBitmasks: INCLUDE "gfx/pokemon/unown_p/bitmask.asm"
+UnownQBitmasks: INCLUDE "gfx/pokemon/unown_q/bitmask.asm"
+UnownRBitmasks: INCLUDE "gfx/pokemon/unown_r/bitmask.asm"
+UnownSBitmasks: INCLUDE "gfx/pokemon/unown_s/bitmask.asm"
+UnownTBitmasks: INCLUDE "gfx/pokemon/unown_t/bitmask.asm"
+UnownUBitmasks: INCLUDE "gfx/pokemon/unown_u/bitmask.asm"
+UnownVBitmasks: INCLUDE "gfx/pokemon/unown_v/bitmask.asm"
+UnownWBitmasks: INCLUDE "gfx/pokemon/unown_w/bitmask.asm"
+UnownXBitmasks: INCLUDE "gfx/pokemon/unown_x/bitmask.asm"
+UnownYBitmasks: INCLUDE "gfx/pokemon/unown_y/bitmask.asm"
+UnownZBitmasks: INCLUDE "gfx/pokemon/unown_z/bitmask.asm"
diff --git a/gfx/pics/unown_c/anim0.asm b/gfx/pokemon/unown_c/anim0.asm
index 1e8b894ab..1e8b894ab 100644
--- a/gfx/pics/unown_c/anim0.asm
+++ b/gfx/pokemon/unown_c/anim0.asm
diff --git a/gfx/pics/unown_c/anim1.asm b/gfx/pokemon/unown_c/anim1.asm
index fcf07ced3..fcf07ced3 100644
--- a/gfx/pics/unown_c/anim1.asm
+++ b/gfx/pokemon/unown_c/anim1.asm
diff --git a/gfx/pics/unown_c/back.2bpp.lz.f92b665a b/gfx/pokemon/unown_c/back.2bpp.lz.f92b665a
index 796ba6d6a..796ba6d6a 100644
--- a/gfx/pics/unown_c/back.2bpp.lz.f92b665a
+++ b/gfx/pokemon/unown_c/back.2bpp.lz.f92b665a
diff --git a/gfx/pics/unown_c/back.png b/gfx/pokemon/unown_c/back.png
index 7f7655dd7..7f7655dd7 100644
--- a/gfx/pics/unown_c/back.png
+++ b/gfx/pokemon/unown_c/back.png
diff --git a/gfx/pics/unown_c/front.animated.2bpp.lz.5fef639b b/gfx/pokemon/unown_c/front.animated.2bpp.lz.5fef639b
index 18fb3b48b..18fb3b48b 100644
--- a/gfx/pics/unown_c/front.animated.2bpp.lz.5fef639b
+++ b/gfx/pokemon/unown_c/front.animated.2bpp.lz.5fef639b
diff --git a/gfx/pics/unown_c/front.png b/gfx/pokemon/unown_c/front.png
index 057fffdc7..057fffdc7 100644
--- a/gfx/pics/unown_c/front.png
+++ b/gfx/pokemon/unown_c/front.png
diff --git a/gfx/pics/unown_d/anim0.asm b/gfx/pokemon/unown_d/anim0.asm
index 51c3b2de1..51c3b2de1 100644
--- a/gfx/pics/unown_d/anim0.asm
+++ b/gfx/pokemon/unown_d/anim0.asm
diff --git a/gfx/pics/unown_d/anim1.asm b/gfx/pokemon/unown_d/anim1.asm
index 17604ce36..17604ce36 100644
--- a/gfx/pics/unown_d/anim1.asm
+++ b/gfx/pokemon/unown_d/anim1.asm
diff --git a/gfx/pics/unown_d/back.2bpp.lz.c8213d32 b/gfx/pokemon/unown_d/back.2bpp.lz.c8213d32
index 8a967332f..8a967332f 100644
--- a/gfx/pics/unown_d/back.2bpp.lz.c8213d32
+++ b/gfx/pokemon/unown_d/back.2bpp.lz.c8213d32
diff --git a/gfx/pics/unown_d/back.png b/gfx/pokemon/unown_d/back.png
index 443c7c589..443c7c589 100644
--- a/gfx/pics/unown_d/back.png
+++ b/gfx/pokemon/unown_d/back.png
diff --git a/gfx/pics/unown_d/front.animated.2bpp.lz.7810a57f b/gfx/pokemon/unown_d/front.animated.2bpp.lz.7810a57f
index d8004662d..d8004662d 100644
--- a/gfx/pics/unown_d/front.animated.2bpp.lz.7810a57f
+++ b/gfx/pokemon/unown_d/front.animated.2bpp.lz.7810a57f
diff --git a/gfx/pics/unown_d/front.png b/gfx/pokemon/unown_d/front.png
index df2114a35..df2114a35 100644
--- a/gfx/pics/unown_d/front.png
+++ b/gfx/pokemon/unown_d/front.png
diff --git a/gfx/pics/unown_e/anim0.asm b/gfx/pokemon/unown_e/anim0.asm
index 0a58feb4d..0a58feb4d 100644
--- a/gfx/pics/unown_e/anim0.asm
+++ b/gfx/pokemon/unown_e/anim0.asm
diff --git a/gfx/pics/unown_e/anim1.asm b/gfx/pokemon/unown_e/anim1.asm
index 53db93c1f..53db93c1f 100644
--- a/gfx/pics/unown_e/anim1.asm
+++ b/gfx/pokemon/unown_e/anim1.asm
diff --git a/gfx/pics/unown_e/back.2bpp.lz.777a8ecd b/gfx/pokemon/unown_e/back.2bpp.lz.777a8ecd
index dfc768a1e..dfc768a1e 100644
--- a/gfx/pics/unown_e/back.2bpp.lz.777a8ecd
+++ b/gfx/pokemon/unown_e/back.2bpp.lz.777a8ecd
diff --git a/gfx/pics/unown_e/back.png b/gfx/pokemon/unown_e/back.png
index 567ebcfb2..567ebcfb2 100644
--- a/gfx/pics/unown_e/back.png
+++ b/gfx/pokemon/unown_e/back.png
diff --git a/gfx/pics/unown_e/front.animated.2bpp.lz.83f43ff7 b/gfx/pokemon/unown_e/front.animated.2bpp.lz.83f43ff7
index 5358f5ff9..5358f5ff9 100644
--- a/gfx/pics/unown_e/front.animated.2bpp.lz.83f43ff7
+++ b/gfx/pokemon/unown_e/front.animated.2bpp.lz.83f43ff7
diff --git a/gfx/pics/unown_e/front.png b/gfx/pokemon/unown_e/front.png
index 36d98fe38..36d98fe38 100644
--- a/gfx/pics/unown_e/front.png
+++ b/gfx/pokemon/unown_e/front.png
diff --git a/gfx/pics/unown_extra_pointers.asm b/gfx/pokemon/unown_extra_pointers.asm
index 5b466064d..5b466064d 100644
--- a/gfx/pics/unown_extra_pointers.asm
+++ b/gfx/pokemon/unown_extra_pointers.asm
diff --git a/gfx/pokemon/unown_extras.asm b/gfx/pokemon/unown_extras.asm
new file mode 100644
index 000000000..218a539fe
--- /dev/null
+++ b/gfx/pokemon/unown_extras.asm
@@ -0,0 +1,26 @@
+UnownAAnimationExtra: INCLUDE "gfx/pokemon/unown_a/anim1.asm"
+UnownBAnimationExtra: INCLUDE "gfx/pokemon/unown_b/anim1.asm"
+UnownCAnimationExtra: INCLUDE "gfx/pokemon/unown_c/anim1.asm"
+UnownDAnimationExtra: INCLUDE "gfx/pokemon/unown_d/anim1.asm"
+UnownEAnimationExtra: INCLUDE "gfx/pokemon/unown_e/anim1.asm"
+UnownFAnimationExtra: INCLUDE "gfx/pokemon/unown_f/anim1.asm"
+UnownGAnimationExtra: INCLUDE "gfx/pokemon/unown_g/anim1.asm"
+UnownHAnimationExtra: INCLUDE "gfx/pokemon/unown_h/anim1.asm"
+UnownIAnimationExtra: INCLUDE "gfx/pokemon/unown_i/anim1.asm"
+UnownJAnimationExtra: INCLUDE "gfx/pokemon/unown_j/anim1.asm"
+UnownKAnimationExtra: INCLUDE "gfx/pokemon/unown_k/anim1.asm"
+UnownLAnimationExtra: INCLUDE "gfx/pokemon/unown_l/anim1.asm"
+UnownMAnimationExtra: INCLUDE "gfx/pokemon/unown_m/anim1.asm"
+UnownNAnimationExtra: INCLUDE "gfx/pokemon/unown_n/anim1.asm"
+UnownOAnimationExtra: INCLUDE "gfx/pokemon/unown_o/anim1.asm"
+UnownPAnimationExtra: INCLUDE "gfx/pokemon/unown_p/anim1.asm"
+UnownQAnimationExtra: INCLUDE "gfx/pokemon/unown_q/anim1.asm"
+UnownRAnimationExtra: INCLUDE "gfx/pokemon/unown_r/anim1.asm"
+UnownSAnimationExtra: INCLUDE "gfx/pokemon/unown_s/anim1.asm"
+UnownTAnimationExtra: INCLUDE "gfx/pokemon/unown_t/anim1.asm"
+UnownUAnimationExtra: INCLUDE "gfx/pokemon/unown_u/anim1.asm"
+UnownVAnimationExtra: INCLUDE "gfx/pokemon/unown_v/anim1.asm"
+UnownWAnimationExtra: INCLUDE "gfx/pokemon/unown_w/anim1.asm"
+UnownXAnimationExtra: INCLUDE "gfx/pokemon/unown_x/anim1.asm"
+UnownYAnimationExtra: INCLUDE "gfx/pokemon/unown_y/anim1.asm"
+UnownZAnimationExtra: INCLUDE "gfx/pokemon/unown_z/anim1.asm"
diff --git a/gfx/pics/unown_f/anim0.asm b/gfx/pokemon/unown_f/anim0.asm
index f81c298a6..f81c298a6 100644
--- a/gfx/pics/unown_f/anim0.asm
+++ b/gfx/pokemon/unown_f/anim0.asm
diff --git a/gfx/pics/unown_f/anim1.asm b/gfx/pokemon/unown_f/anim1.asm
index a75176981..a75176981 100644
--- a/gfx/pics/unown_f/anim1.asm
+++ b/gfx/pokemon/unown_f/anim1.asm
diff --git a/gfx/pics/unown_f/back.2bpp.lz.3fe1c85a b/gfx/pokemon/unown_f/back.2bpp.lz.3fe1c85a
index 47e54ab66..47e54ab66 100644
--- a/gfx/pics/unown_f/back.2bpp.lz.3fe1c85a
+++ b/gfx/pokemon/unown_f/back.2bpp.lz.3fe1c85a
diff --git a/gfx/pics/unown_f/back.png b/gfx/pokemon/unown_f/back.png
index de60198da..de60198da 100644
--- a/gfx/pics/unown_f/back.png
+++ b/gfx/pokemon/unown_f/back.png
diff --git a/gfx/pics/unown_f/front.animated.2bpp.lz.ec888954 b/gfx/pokemon/unown_f/front.animated.2bpp.lz.ec888954
index 4e0339419..4e0339419 100644
--- a/gfx/pics/unown_f/front.animated.2bpp.lz.ec888954
+++ b/gfx/pokemon/unown_f/front.animated.2bpp.lz.ec888954
diff --git a/gfx/pics/unown_f/front.png b/gfx/pokemon/unown_f/front.png
index f47dcb53b..f47dcb53b 100644
--- a/gfx/pics/unown_f/front.png
+++ b/gfx/pokemon/unown_f/front.png
diff --git a/gfx/pics/unown_frame_pointers.asm b/gfx/pokemon/unown_frame_pointers.asm
index 8907f5303..8907f5303 100644
--- a/gfx/pics/unown_frame_pointers.asm
+++ b/gfx/pokemon/unown_frame_pointers.asm
diff --git a/gfx/pokemon/unown_frames.asm b/gfx/pokemon/unown_frames.asm
new file mode 100644
index 000000000..7b7c5bc7e
--- /dev/null
+++ b/gfx/pokemon/unown_frames.asm
@@ -0,0 +1,27 @@
+UnownsFrames:
+UnownAFrames: INCLUDE "gfx/pokemon/unown_a/frames.asm"
+UnownBFrames: INCLUDE "gfx/pokemon/unown_b/frames.asm"
+UnownCFrames: INCLUDE "gfx/pokemon/unown_c/frames.asm"
+UnownDFrames: INCLUDE "gfx/pokemon/unown_d/frames.asm"
+UnownEFrames: INCLUDE "gfx/pokemon/unown_e/frames.asm"
+UnownFFrames: INCLUDE "gfx/pokemon/unown_f/frames.asm"
+UnownGFrames: INCLUDE "gfx/pokemon/unown_g/frames.asm"
+UnownHFrames: INCLUDE "gfx/pokemon/unown_h/frames.asm"
+UnownIFrames: INCLUDE "gfx/pokemon/unown_i/frames.asm"
+UnownJFrames: INCLUDE "gfx/pokemon/unown_j/frames.asm"
+UnownKFrames: INCLUDE "gfx/pokemon/unown_k/frames.asm"
+UnownLFrames: INCLUDE "gfx/pokemon/unown_l/frames.asm"
+UnownMFrames: INCLUDE "gfx/pokemon/unown_m/frames.asm"
+UnownNFrames: INCLUDE "gfx/pokemon/unown_n/frames.asm"
+UnownOFrames: INCLUDE "gfx/pokemon/unown_o/frames.asm"
+UnownPFrames: INCLUDE "gfx/pokemon/unown_p/frames.asm"
+UnownQFrames: INCLUDE "gfx/pokemon/unown_q/frames.asm"
+UnownRFrames: INCLUDE "gfx/pokemon/unown_r/frames.asm"
+UnownSFrames: INCLUDE "gfx/pokemon/unown_s/frames.asm"
+UnownTFrames: INCLUDE "gfx/pokemon/unown_t/frames.asm"
+UnownUFrames: INCLUDE "gfx/pokemon/unown_u/frames.asm"
+UnownVFrames: INCLUDE "gfx/pokemon/unown_v/frames.asm"
+UnownWFrames: INCLUDE "gfx/pokemon/unown_w/frames.asm"
+UnownXFrames: INCLUDE "gfx/pokemon/unown_x/frames.asm"
+UnownYFrames: INCLUDE "gfx/pokemon/unown_y/frames.asm"
+UnownZFrames: INCLUDE "gfx/pokemon/unown_z/frames.asm"
diff --git a/gfx/pics/unown_g/anim0.asm b/gfx/pokemon/unown_g/anim0.asm
index 48100274f..48100274f 100644
--- a/gfx/pics/unown_g/anim0.asm
+++ b/gfx/pokemon/unown_g/anim0.asm
diff --git a/gfx/pics/unown_g/anim1.asm b/gfx/pokemon/unown_g/anim1.asm
index 45906aed4..45906aed4 100644
--- a/gfx/pics/unown_g/anim1.asm
+++ b/gfx/pokemon/unown_g/anim1.asm
diff --git a/gfx/pics/unown_g/back.2bpp.lz.91650439 b/gfx/pokemon/unown_g/back.2bpp.lz.91650439
index 1f380f3ba..1f380f3ba 100644
--- a/gfx/pics/unown_g/back.2bpp.lz.91650439
+++ b/gfx/pokemon/unown_g/back.2bpp.lz.91650439
diff --git a/gfx/pics/unown_g/back.png b/gfx/pokemon/unown_g/back.png
index b31728f31..b31728f31 100644
--- a/gfx/pics/unown_g/back.png
+++ b/gfx/pokemon/unown_g/back.png
diff --git a/gfx/pics/unown_g/front.animated.2bpp.lz.c0b74162 b/gfx/pokemon/unown_g/front.animated.2bpp.lz.c0b74162
index 0e6e343f9..0e6e343f9 100644
--- a/gfx/pics/unown_g/front.animated.2bpp.lz.c0b74162
+++ b/gfx/pokemon/unown_g/front.animated.2bpp.lz.c0b74162
diff --git a/gfx/pics/unown_g/front.png b/gfx/pokemon/unown_g/front.png
index 1439f4d7e..1439f4d7e 100644
--- a/gfx/pics/unown_g/front.png
+++ b/gfx/pokemon/unown_g/front.png
diff --git a/gfx/pics/unown_h/anim0.asm b/gfx/pokemon/unown_h/anim0.asm
index fdee3822b..fdee3822b 100644
--- a/gfx/pics/unown_h/anim0.asm
+++ b/gfx/pokemon/unown_h/anim0.asm
diff --git a/gfx/pics/unown_h/anim1.asm b/gfx/pokemon/unown_h/anim1.asm
index e6fb90d5e..e6fb90d5e 100644
--- a/gfx/pics/unown_h/anim1.asm
+++ b/gfx/pokemon/unown_h/anim1.asm
diff --git a/gfx/pics/unown_h/back.2bpp.lz.78421e5b b/gfx/pokemon/unown_h/back.2bpp.lz.78421e5b
index 926bf5757..926bf5757 100644
--- a/gfx/pics/unown_h/back.2bpp.lz.78421e5b
+++ b/gfx/pokemon/unown_h/back.2bpp.lz.78421e5b
diff --git a/gfx/pics/unown_h/back.png b/gfx/pokemon/unown_h/back.png
index abf0b39e5..abf0b39e5 100644
--- a/gfx/pics/unown_h/back.png
+++ b/gfx/pokemon/unown_h/back.png
diff --git a/gfx/pics/unown_h/front.animated.2bpp.lz.9a6afeb9 b/gfx/pokemon/unown_h/front.animated.2bpp.lz.9a6afeb9
index be2d0293c..be2d0293c 100644
--- a/gfx/pics/unown_h/front.animated.2bpp.lz.9a6afeb9
+++ b/gfx/pokemon/unown_h/front.animated.2bpp.lz.9a6afeb9
diff --git a/gfx/pics/unown_h/front.png b/gfx/pokemon/unown_h/front.png
index 3c644c7da..3c644c7da 100644
--- a/gfx/pics/unown_h/front.png
+++ b/gfx/pokemon/unown_h/front.png
diff --git a/gfx/pics/unown_i/anim0.asm b/gfx/pokemon/unown_i/anim0.asm
index 38e19a0c9..38e19a0c9 100644
--- a/gfx/pics/unown_i/anim0.asm
+++ b/gfx/pokemon/unown_i/anim0.asm
diff --git a/gfx/pics/unown_i/anim1.asm b/gfx/pokemon/unown_i/anim1.asm
index 1d5ce67ad..1d5ce67ad 100644
--- a/gfx/pics/unown_i/anim1.asm
+++ b/gfx/pokemon/unown_i/anim1.asm
diff --git a/gfx/pics/unown_i/back.2bpp.lz.7feb4b30 b/gfx/pokemon/unown_i/back.2bpp.lz.7feb4b30
index 7dcea181f..7dcea181f 100644
--- a/gfx/pics/unown_i/back.2bpp.lz.7feb4b30
+++ b/gfx/pokemon/unown_i/back.2bpp.lz.7feb4b30
diff --git a/gfx/pics/unown_i/back.png b/gfx/pokemon/unown_i/back.png
index 0d861d9f8..0d861d9f8 100644
--- a/gfx/pics/unown_i/back.png
+++ b/gfx/pokemon/unown_i/back.png
diff --git a/gfx/pics/unown_i/front.animated.2bpp.lz.f5e7f816 b/gfx/pokemon/unown_i/front.animated.2bpp.lz.f5e7f816
index dfd89c266..dfd89c266 100644
--- a/gfx/pics/unown_i/front.animated.2bpp.lz.f5e7f816
+++ b/gfx/pokemon/unown_i/front.animated.2bpp.lz.f5e7f816
diff --git a/gfx/pics/unown_i/front.png b/gfx/pokemon/unown_i/front.png
index 971439d5a..971439d5a 100644
--- a/gfx/pics/unown_i/front.png
+++ b/gfx/pokemon/unown_i/front.png
diff --git a/gfx/pics/unown_j/anim0.asm b/gfx/pokemon/unown_j/anim0.asm
index 3a7467d45..3a7467d45 100644
--- a/gfx/pics/unown_j/anim0.asm
+++ b/gfx/pokemon/unown_j/anim0.asm
diff --git a/gfx/pics/unown_j/anim1.asm b/gfx/pokemon/unown_j/anim1.asm
index d46b36028..d46b36028 100644
--- a/gfx/pics/unown_j/anim1.asm
+++ b/gfx/pokemon/unown_j/anim1.asm
diff --git a/gfx/pics/unown_j/back.2bpp.lz.b0f3bec2 b/gfx/pokemon/unown_j/back.2bpp.lz.b0f3bec2
index c0eabf3ba..c0eabf3ba 100644
--- a/gfx/pics/unown_j/back.2bpp.lz.b0f3bec2
+++ b/gfx/pokemon/unown_j/back.2bpp.lz.b0f3bec2
diff --git a/gfx/pics/unown_j/back.png b/gfx/pokemon/unown_j/back.png
index 93df2154c..93df2154c 100644
--- a/gfx/pics/unown_j/back.png
+++ b/gfx/pokemon/unown_j/back.png
diff --git a/gfx/pics/unown_j/front.animated.2bpp.lz.d8bf9223 b/gfx/pokemon/unown_j/front.animated.2bpp.lz.d8bf9223
index ec8e536d3..ec8e536d3 100644
--- a/gfx/pics/unown_j/front.animated.2bpp.lz.d8bf9223
+++ b/gfx/pokemon/unown_j/front.animated.2bpp.lz.d8bf9223
diff --git a/gfx/pics/unown_j/front.png b/gfx/pokemon/unown_j/front.png
index 03316dc6e..03316dc6e 100644
--- a/gfx/pics/unown_j/front.png
+++ b/gfx/pokemon/unown_j/front.png
diff --git a/gfx/pics/unown_k/anim0.asm b/gfx/pokemon/unown_k/anim0.asm
index 0948f212d..0948f212d 100644
--- a/gfx/pics/unown_k/anim0.asm
+++ b/gfx/pokemon/unown_k/anim0.asm
diff --git a/gfx/pics/unown_k/anim1.asm b/gfx/pokemon/unown_k/anim1.asm
index 8f8a4acb1..8f8a4acb1 100644
--- a/gfx/pics/unown_k/anim1.asm
+++ b/gfx/pokemon/unown_k/anim1.asm
diff --git a/gfx/pics/unown_k/back.2bpp.lz.745fda48 b/gfx/pokemon/unown_k/back.2bpp.lz.745fda48
index 0f4e8fda7..0f4e8fda7 100644
--- a/gfx/pics/unown_k/back.2bpp.lz.745fda48
+++ b/gfx/pokemon/unown_k/back.2bpp.lz.745fda48
diff --git a/gfx/pics/unown_k/back.png b/gfx/pokemon/unown_k/back.png
index 1fbb8b041..1fbb8b041 100644
--- a/gfx/pics/unown_k/back.png
+++ b/gfx/pokemon/unown_k/back.png
diff --git a/gfx/pics/unown_k/front.animated.2bpp.lz.fb25b385 b/gfx/pokemon/unown_k/front.animated.2bpp.lz.fb25b385
index b617e898c..b617e898c 100644
--- a/gfx/pics/unown_k/front.animated.2bpp.lz.fb25b385
+++ b/gfx/pokemon/unown_k/front.animated.2bpp.lz.fb25b385
diff --git a/gfx/pics/unown_k/front.png b/gfx/pokemon/unown_k/front.png
index ce6b81e9f..ce6b81e9f 100644
--- a/gfx/pics/unown_k/front.png
+++ b/gfx/pokemon/unown_k/front.png
diff --git a/gfx/pics/unown_l/anim0.asm b/gfx/pokemon/unown_l/anim0.asm
index 7b4e5e21c..7b4e5e21c 100644
--- a/gfx/pics/unown_l/anim0.asm
+++ b/gfx/pokemon/unown_l/anim0.asm
diff --git a/gfx/pics/unown_l/anim1.asm b/gfx/pokemon/unown_l/anim1.asm
index 859dec2ec..859dec2ec 100644
--- a/gfx/pics/unown_l/anim1.asm
+++ b/gfx/pokemon/unown_l/anim1.asm
diff --git a/gfx/pics/unown_l/back.2bpp.lz.e38e0d57 b/gfx/pokemon/unown_l/back.2bpp.lz.e38e0d57
index 4f48955df..4f48955df 100644
--- a/gfx/pics/unown_l/back.2bpp.lz.e38e0d57
+++ b/gfx/pokemon/unown_l/back.2bpp.lz.e38e0d57
diff --git a/gfx/pics/unown_l/back.png b/gfx/pokemon/unown_l/back.png
index 470d46c05..470d46c05 100644
--- a/gfx/pics/unown_l/back.png
+++ b/gfx/pokemon/unown_l/back.png
diff --git a/gfx/pics/unown_l/front.animated.2bpp.lz.26195a59 b/gfx/pokemon/unown_l/front.animated.2bpp.lz.26195a59
index d0eee7516..d0eee7516 100644
--- a/gfx/pics/unown_l/front.animated.2bpp.lz.26195a59
+++ b/gfx/pokemon/unown_l/front.animated.2bpp.lz.26195a59
diff --git a/gfx/pics/unown_l/front.png b/gfx/pokemon/unown_l/front.png
index ff86501db..ff86501db 100644
--- a/gfx/pics/unown_l/front.png
+++ b/gfx/pokemon/unown_l/front.png
diff --git a/gfx/pics/unown_m/anim0.asm b/gfx/pokemon/unown_m/anim0.asm
index bb5292446..bb5292446 100644
--- a/gfx/pics/unown_m/anim0.asm
+++ b/gfx/pokemon/unown_m/anim0.asm
diff --git a/gfx/pics/unown_m/anim1.asm b/gfx/pokemon/unown_m/anim1.asm
index 710300f20..710300f20 100644
--- a/gfx/pics/unown_m/anim1.asm
+++ b/gfx/pokemon/unown_m/anim1.asm
diff --git a/gfx/pics/unown_m/back.2bpp.lz.38d93bc8 b/gfx/pokemon/unown_m/back.2bpp.lz.38d93bc8
index 3ab40cb03..3ab40cb03 100644
--- a/gfx/pics/unown_m/back.2bpp.lz.38d93bc8
+++ b/gfx/pokemon/unown_m/back.2bpp.lz.38d93bc8
diff --git a/gfx/pics/unown_m/back.png b/gfx/pokemon/unown_m/back.png
index a7f90e72b..a7f90e72b 100644
--- a/gfx/pics/unown_m/back.png
+++ b/gfx/pokemon/unown_m/back.png
diff --git a/gfx/pics/unown_m/front.animated.2bpp.lz.2659315e b/gfx/pokemon/unown_m/front.animated.2bpp.lz.2659315e
index 04e1592ce..04e1592ce 100644
--- a/gfx/pics/unown_m/front.animated.2bpp.lz.2659315e
+++ b/gfx/pokemon/unown_m/front.animated.2bpp.lz.2659315e
diff --git a/gfx/pics/unown_m/front.png b/gfx/pokemon/unown_m/front.png
index b55a03682..b55a03682 100644
--- a/gfx/pics/unown_m/front.png
+++ b/gfx/pokemon/unown_m/front.png
diff --git a/gfx/pics/unown_n/anim0.asm b/gfx/pokemon/unown_n/anim0.asm
index 1f6924926..1f6924926 100644
--- a/gfx/pics/unown_n/anim0.asm
+++ b/gfx/pokemon/unown_n/anim0.asm
diff --git a/gfx/pics/unown_n/anim1.asm b/gfx/pokemon/unown_n/anim1.asm
index 5275e3463..5275e3463 100644
--- a/gfx/pics/unown_n/anim1.asm
+++ b/gfx/pokemon/unown_n/anim1.asm
diff --git a/gfx/pics/unown_n/back.2bpp.lz.c8b7d3a4 b/gfx/pokemon/unown_n/back.2bpp.lz.c8b7d3a4
index c39417aa8..c39417aa8 100644
--- a/gfx/pics/unown_n/back.2bpp.lz.c8b7d3a4
+++ b/gfx/pokemon/unown_n/back.2bpp.lz.c8b7d3a4
diff --git a/gfx/pics/unown_n/back.png b/gfx/pokemon/unown_n/back.png
index 801959468..801959468 100644
--- a/gfx/pics/unown_n/back.png
+++ b/gfx/pokemon/unown_n/back.png
diff --git a/gfx/pics/unown_n/front.animated.2bpp.lz.96ce7c62 b/gfx/pokemon/unown_n/front.animated.2bpp.lz.96ce7c62
index ec17bff9f..ec17bff9f 100644
--- a/gfx/pics/unown_n/front.animated.2bpp.lz.96ce7c62
+++ b/gfx/pokemon/unown_n/front.animated.2bpp.lz.96ce7c62
diff --git a/gfx/pics/unown_n/front.png b/gfx/pokemon/unown_n/front.png
index 2ba3f9a17..2ba3f9a17 100644
--- a/gfx/pics/unown_n/front.png
+++ b/gfx/pokemon/unown_n/front.png
diff --git a/gfx/pics/unown_o/anim0.asm b/gfx/pokemon/unown_o/anim0.asm
index 581d47b9d..581d47b9d 100644
--- a/gfx/pics/unown_o/anim0.asm
+++ b/gfx/pokemon/unown_o/anim0.asm
diff --git a/gfx/pics/unown_o/anim1.asm b/gfx/pokemon/unown_o/anim1.asm
index fec231c84..fec231c84 100644
--- a/gfx/pics/unown_o/anim1.asm
+++ b/gfx/pokemon/unown_o/anim1.asm
diff --git a/gfx/pics/unown_o/back.2bpp.lz.89ba693c b/gfx/pokemon/unown_o/back.2bpp.lz.89ba693c
index 4d4b4fd4f..4d4b4fd4f 100644
--- a/gfx/pics/unown_o/back.2bpp.lz.89ba693c
+++ b/gfx/pokemon/unown_o/back.2bpp.lz.89ba693c
diff --git a/gfx/pics/unown_o/back.png b/gfx/pokemon/unown_o/back.png
index 68c4e2743..68c4e2743 100644
--- a/gfx/pics/unown_o/back.png
+++ b/gfx/pokemon/unown_o/back.png
diff --git a/gfx/pics/unown_o/front.animated.2bpp.lz.a9151b66 b/gfx/pokemon/unown_o/front.animated.2bpp.lz.a9151b66
index 66b6b8141..66b6b8141 100644
--- a/gfx/pics/unown_o/front.animated.2bpp.lz.a9151b66
+++ b/gfx/pokemon/unown_o/front.animated.2bpp.lz.a9151b66
diff --git a/gfx/pics/unown_o/front.png b/gfx/pokemon/unown_o/front.png
index 7fd75de36..7fd75de36 100644
--- a/gfx/pics/unown_o/front.png
+++ b/gfx/pokemon/unown_o/front.png
diff --git a/gfx/pics/unown_p/anim0.asm b/gfx/pokemon/unown_p/anim0.asm
index 0cbaf30ed..0cbaf30ed 100644
--- a/gfx/pics/unown_p/anim0.asm
+++ b/gfx/pokemon/unown_p/anim0.asm
diff --git a/gfx/pics/unown_p/anim1.asm b/gfx/pokemon/unown_p/anim1.asm
index 51e0e0941..51e0e0941 100644
--- a/gfx/pics/unown_p/anim1.asm
+++ b/gfx/pokemon/unown_p/anim1.asm
diff --git a/gfx/pics/unown_p/back.2bpp.lz.09c618c4 b/gfx/pokemon/unown_p/back.2bpp.lz.09c618c4
index 19fd45591..19fd45591 100644
--- a/gfx/pics/unown_p/back.2bpp.lz.09c618c4
+++ b/gfx/pokemon/unown_p/back.2bpp.lz.09c618c4
diff --git a/gfx/pics/unown_p/back.png b/gfx/pokemon/unown_p/back.png
index 5098b51ce..5098b51ce 100644
--- a/gfx/pics/unown_p/back.png
+++ b/gfx/pokemon/unown_p/back.png
diff --git a/gfx/pics/unown_p/front.animated.2bpp.lz.83a096fc b/gfx/pokemon/unown_p/front.animated.2bpp.lz.83a096fc
index 53d4bfbcd..53d4bfbcd 100644
--- a/gfx/pics/unown_p/front.animated.2bpp.lz.83a096fc
+++ b/gfx/pokemon/unown_p/front.animated.2bpp.lz.83a096fc
diff --git a/gfx/pics/unown_p/front.png b/gfx/pokemon/unown_p/front.png
index eca40f041..eca40f041 100644
--- a/gfx/pics/unown_p/front.png
+++ b/gfx/pokemon/unown_p/front.png
diff --git a/gfx/pics/unown_q/anim0.asm b/gfx/pokemon/unown_q/anim0.asm
index 555f61cf3..555f61cf3 100644
--- a/gfx/pics/unown_q/anim0.asm
+++ b/gfx/pokemon/unown_q/anim0.asm
diff --git a/gfx/pics/unown_q/anim1.asm b/gfx/pokemon/unown_q/anim1.asm
index a17caa474..a17caa474 100644
--- a/gfx/pics/unown_q/anim1.asm
+++ b/gfx/pokemon/unown_q/anim1.asm
diff --git a/gfx/pics/unown_q/back.2bpp.lz.e32430b4 b/gfx/pokemon/unown_q/back.2bpp.lz.e32430b4
index 5199cdc6c..5199cdc6c 100644
--- a/gfx/pics/unown_q/back.2bpp.lz.e32430b4
+++ b/gfx/pokemon/unown_q/back.2bpp.lz.e32430b4
diff --git a/gfx/pics/unown_q/back.png b/gfx/pokemon/unown_q/back.png
index 9b2b34c51..9b2b34c51 100644
--- a/gfx/pics/unown_q/back.png
+++ b/gfx/pokemon/unown_q/back.png
diff --git a/gfx/pics/unown_q/front.animated.2bpp.lz.44dad60c b/gfx/pokemon/unown_q/front.animated.2bpp.lz.44dad60c
index 65536e23f..65536e23f 100644
--- a/gfx/pics/unown_q/front.animated.2bpp.lz.44dad60c
+++ b/gfx/pokemon/unown_q/front.animated.2bpp.lz.44dad60c
diff --git a/gfx/pics/unown_q/front.png b/gfx/pokemon/unown_q/front.png
index 98f19fdc1..98f19fdc1 100644
--- a/gfx/pics/unown_q/front.png
+++ b/gfx/pokemon/unown_q/front.png
diff --git a/gfx/pics/unown_r/anim0.asm b/gfx/pokemon/unown_r/anim0.asm
index fde5a58ab..fde5a58ab 100644
--- a/gfx/pics/unown_r/anim0.asm
+++ b/gfx/pokemon/unown_r/anim0.asm
diff --git a/gfx/pics/unown_r/anim1.asm b/gfx/pokemon/unown_r/anim1.asm
index b1db8166a..b1db8166a 100644
--- a/gfx/pics/unown_r/anim1.asm
+++ b/gfx/pokemon/unown_r/anim1.asm
diff --git a/gfx/pics/unown_r/back.2bpp.lz.5df8287c b/gfx/pokemon/unown_r/back.2bpp.lz.5df8287c
index a8a243e0b..a8a243e0b 100644
--- a/gfx/pics/unown_r/back.2bpp.lz.5df8287c
+++ b/gfx/pokemon/unown_r/back.2bpp.lz.5df8287c
diff --git a/gfx/pics/unown_r/back.png b/gfx/pokemon/unown_r/back.png
index a3d7de37e..a3d7de37e 100644
--- a/gfx/pics/unown_r/back.png
+++ b/gfx/pokemon/unown_r/back.png
diff --git a/gfx/pics/unown_r/front.animated.2bpp.lz.8e67e3fc b/gfx/pokemon/unown_r/front.animated.2bpp.lz.8e67e3fc
index 9e76761d1..9e76761d1 100644
--- a/gfx/pics/unown_r/front.animated.2bpp.lz.8e67e3fc
+++ b/gfx/pokemon/unown_r/front.animated.2bpp.lz.8e67e3fc
diff --git a/gfx/pics/unown_r/front.png b/gfx/pokemon/unown_r/front.png
index a7038ec16..a7038ec16 100644
--- a/gfx/pics/unown_r/front.png
+++ b/gfx/pokemon/unown_r/front.png
diff --git a/gfx/pics/unown_s/anim0.asm b/gfx/pokemon/unown_s/anim0.asm
index 9cac3910d..9cac3910d 100644
--- a/gfx/pics/unown_s/anim0.asm
+++ b/gfx/pokemon/unown_s/anim0.asm
diff --git a/gfx/pics/unown_s/anim1.asm b/gfx/pokemon/unown_s/anim1.asm
index 49483f8f5..49483f8f5 100644
--- a/gfx/pics/unown_s/anim1.asm
+++ b/gfx/pokemon/unown_s/anim1.asm
diff --git a/gfx/pics/unown_s/back.2bpp.lz.abd4ad58 b/gfx/pokemon/unown_s/back.2bpp.lz.abd4ad58
index 8441f2519..8441f2519 100644
--- a/gfx/pics/unown_s/back.2bpp.lz.abd4ad58
+++ b/gfx/pokemon/unown_s/back.2bpp.lz.abd4ad58
diff --git a/gfx/pics/unown_s/back.png b/gfx/pokemon/unown_s/back.png
index 75de76a29..75de76a29 100644
--- a/gfx/pics/unown_s/back.png
+++ b/gfx/pokemon/unown_s/back.png
diff --git a/gfx/pics/unown_s/front.animated.2bpp.lz.f3db4e89 b/gfx/pokemon/unown_s/front.animated.2bpp.lz.f3db4e89
index d16dea5e9..d16dea5e9 100644
--- a/gfx/pics/unown_s/front.animated.2bpp.lz.f3db4e89
+++ b/gfx/pokemon/unown_s/front.animated.2bpp.lz.f3db4e89
diff --git a/gfx/pics/unown_s/front.png b/gfx/pokemon/unown_s/front.png
index b854e648b..b854e648b 100644
--- a/gfx/pics/unown_s/front.png
+++ b/gfx/pokemon/unown_s/front.png
diff --git a/gfx/pics/unown_t/anim0.asm b/gfx/pokemon/unown_t/anim0.asm
index feba7be07..feba7be07 100644
--- a/gfx/pics/unown_t/anim0.asm
+++ b/gfx/pokemon/unown_t/anim0.asm
diff --git a/gfx/pics/unown_t/anim1.asm b/gfx/pokemon/unown_t/anim1.asm
index d295d6830..d295d6830 100644
--- a/gfx/pics/unown_t/anim1.asm
+++ b/gfx/pokemon/unown_t/anim1.asm
diff --git a/gfx/pics/unown_t/back.2bpp.lz.87d48ca0 b/gfx/pokemon/unown_t/back.2bpp.lz.87d48ca0
index 8d415b53d..8d415b53d 100644
--- a/gfx/pics/unown_t/back.2bpp.lz.87d48ca0
+++ b/gfx/pokemon/unown_t/back.2bpp.lz.87d48ca0
diff --git a/gfx/pics/unown_t/back.png b/gfx/pokemon/unown_t/back.png
index edbe2a1de..edbe2a1de 100644
--- a/gfx/pics/unown_t/back.png
+++ b/gfx/pokemon/unown_t/back.png
diff --git a/gfx/pics/unown_t/front.animated.2bpp.lz.8bdc40ae b/gfx/pokemon/unown_t/front.animated.2bpp.lz.8bdc40ae
index 83100fbdb..83100fbdb 100644
--- a/gfx/pics/unown_t/front.animated.2bpp.lz.8bdc40ae
+++ b/gfx/pokemon/unown_t/front.animated.2bpp.lz.8bdc40ae
diff --git a/gfx/pics/unown_t/front.png b/gfx/pokemon/unown_t/front.png
index 807b4af12..807b4af12 100644
--- a/gfx/pics/unown_t/front.png
+++ b/gfx/pokemon/unown_t/front.png
diff --git a/gfx/pics/unown_u/anim0.asm b/gfx/pokemon/unown_u/anim0.asm
index 12c53636d..12c53636d 100644
--- a/gfx/pics/unown_u/anim0.asm
+++ b/gfx/pokemon/unown_u/anim0.asm
diff --git a/gfx/pics/unown_u/anim1.asm b/gfx/pokemon/unown_u/anim1.asm
index 834e75999..834e75999 100644
--- a/gfx/pics/unown_u/anim1.asm
+++ b/gfx/pokemon/unown_u/anim1.asm
diff --git a/gfx/pics/unown_u/back.2bpp.lz.40b63dfb b/gfx/pokemon/unown_u/back.2bpp.lz.40b63dfb
index ad395b7ec..ad395b7ec 100644
--- a/gfx/pics/unown_u/back.2bpp.lz.40b63dfb
+++ b/gfx/pokemon/unown_u/back.2bpp.lz.40b63dfb
diff --git a/gfx/pics/unown_u/back.png b/gfx/pokemon/unown_u/back.png
index 4efb1dd2a..4efb1dd2a 100644
--- a/gfx/pics/unown_u/back.png
+++ b/gfx/pokemon/unown_u/back.png
diff --git a/gfx/pics/unown_u/front.animated.2bpp.lz.2690db54 b/gfx/pokemon/unown_u/front.animated.2bpp.lz.2690db54
index 622825cbe..622825cbe 100644
--- a/gfx/pics/unown_u/front.animated.2bpp.lz.2690db54
+++ b/gfx/pokemon/unown_u/front.animated.2bpp.lz.2690db54
diff --git a/gfx/pics/unown_u/front.png b/gfx/pokemon/unown_u/front.png
index 2d7950f18..2d7950f18 100644
--- a/gfx/pics/unown_u/front.png
+++ b/gfx/pokemon/unown_u/front.png
diff --git a/gfx/pics/unown_v/anim0.asm b/gfx/pokemon/unown_v/anim0.asm
index acc500009..acc500009 100644
--- a/gfx/pics/unown_v/anim0.asm
+++ b/gfx/pokemon/unown_v/anim0.asm
diff --git a/gfx/pics/unown_v/anim1.asm b/gfx/pokemon/unown_v/anim1.asm
index 818f727ea..818f727ea 100644
--- a/gfx/pics/unown_v/anim1.asm
+++ b/gfx/pokemon/unown_v/anim1.asm
diff --git a/gfx/pics/unown_v/back.2bpp.lz.5b1a6acc b/gfx/pokemon/unown_v/back.2bpp.lz.5b1a6acc
index 21c3191f2..21c3191f2 100644
--- a/gfx/pics/unown_v/back.2bpp.lz.5b1a6acc
+++ b/gfx/pokemon/unown_v/back.2bpp.lz.5b1a6acc
diff --git a/gfx/pics/unown_v/back.png b/gfx/pokemon/unown_v/back.png
index 0097a050f..0097a050f 100644
--- a/gfx/pics/unown_v/back.png
+++ b/gfx/pokemon/unown_v/back.png
diff --git a/gfx/pics/unown_v/front.animated.2bpp.lz.d196c60e b/gfx/pokemon/unown_v/front.animated.2bpp.lz.d196c60e
index aee5ce362..aee5ce362 100644
--- a/gfx/pics/unown_v/front.animated.2bpp.lz.d196c60e
+++ b/gfx/pokemon/unown_v/front.animated.2bpp.lz.d196c60e
diff --git a/gfx/pics/unown_v/front.png b/gfx/pokemon/unown_v/front.png
index a687e5d7c..a687e5d7c 100644
--- a/gfx/pics/unown_v/front.png
+++ b/gfx/pokemon/unown_v/front.png
diff --git a/gfx/pics/unown_w/anim0.asm b/gfx/pokemon/unown_w/anim0.asm
index 620ff03e5..620ff03e5 100644
--- a/gfx/pics/unown_w/anim0.asm
+++ b/gfx/pokemon/unown_w/anim0.asm
diff --git a/gfx/pics/unown_w/anim1.asm b/gfx/pokemon/unown_w/anim1.asm
index b43d44bbc..b43d44bbc 100644
--- a/gfx/pics/unown_w/anim1.asm
+++ b/gfx/pokemon/unown_w/anim1.asm
diff --git a/gfx/pics/unown_w/back.2bpp.lz.a55282bf b/gfx/pokemon/unown_w/back.2bpp.lz.a55282bf
index 882648c4d..882648c4d 100644
--- a/gfx/pics/unown_w/back.2bpp.lz.a55282bf
+++ b/gfx/pokemon/unown_w/back.2bpp.lz.a55282bf
diff --git a/gfx/pics/unown_w/back.png b/gfx/pokemon/unown_w/back.png
index 629d7ccb2..629d7ccb2 100644
--- a/gfx/pics/unown_w/back.png
+++ b/gfx/pokemon/unown_w/back.png
diff --git a/gfx/pics/unown_w/front.animated.2bpp.lz.5b45fa3d b/gfx/pokemon/unown_w/front.animated.2bpp.lz.5b45fa3d
index 78a7fefac..78a7fefac 100644
--- a/gfx/pics/unown_w/front.animated.2bpp.lz.5b45fa3d
+++ b/gfx/pokemon/unown_w/front.animated.2bpp.lz.5b45fa3d
diff --git a/gfx/pics/unown_w/front.png b/gfx/pokemon/unown_w/front.png
index b65b96735..b65b96735 100644
--- a/gfx/pics/unown_w/front.png
+++ b/gfx/pokemon/unown_w/front.png
diff --git a/gfx/pics/unown_x/anim0.asm b/gfx/pokemon/unown_x/anim0.asm
index 0bb204da6..0bb204da6 100644
--- a/gfx/pics/unown_x/anim0.asm
+++ b/gfx/pokemon/unown_x/anim0.asm
diff --git a/gfx/pics/unown_x/anim1.asm b/gfx/pokemon/unown_x/anim1.asm
index 22b15a504..22b15a504 100644
--- a/gfx/pics/unown_x/anim1.asm
+++ b/gfx/pokemon/unown_x/anim1.asm
diff --git a/gfx/pics/unown_x/back.2bpp.lz.0001a198 b/gfx/pokemon/unown_x/back.2bpp.lz.0001a198
index 591af9668..591af9668 100644
--- a/gfx/pics/unown_x/back.2bpp.lz.0001a198
+++ b/gfx/pokemon/unown_x/back.2bpp.lz.0001a198
diff --git a/gfx/pics/unown_x/back.png b/gfx/pokemon/unown_x/back.png
index f2213d93f..f2213d93f 100644
--- a/gfx/pics/unown_x/back.png
+++ b/gfx/pokemon/unown_x/back.png
diff --git a/gfx/pics/unown_x/front.animated.2bpp.lz.3362c680 b/gfx/pokemon/unown_x/front.animated.2bpp.lz.3362c680
index 11adc7c6f..11adc7c6f 100644
--- a/gfx/pics/unown_x/front.animated.2bpp.lz.3362c680
+++ b/gfx/pokemon/unown_x/front.animated.2bpp.lz.3362c680
diff --git a/gfx/pics/unown_x/front.png b/gfx/pokemon/unown_x/front.png
index d0cef6024..d0cef6024 100644
--- a/gfx/pics/unown_x/front.png
+++ b/gfx/pokemon/unown_x/front.png
diff --git a/gfx/pics/unown_y/anim0.asm b/gfx/pokemon/unown_y/anim0.asm
index e65aa4134..e65aa4134 100644
--- a/gfx/pics/unown_y/anim0.asm
+++ b/gfx/pokemon/unown_y/anim0.asm
diff --git a/gfx/pics/unown_y/anim1.asm b/gfx/pokemon/unown_y/anim1.asm
index e1a9a2acb..e1a9a2acb 100644
--- a/gfx/pics/unown_y/anim1.asm
+++ b/gfx/pokemon/unown_y/anim1.asm
diff --git a/gfx/pics/unown_y/back.2bpp.lz.292d9ff2 b/gfx/pokemon/unown_y/back.2bpp.lz.292d9ff2
index ab7563e0d..ab7563e0d 100644
--- a/gfx/pics/unown_y/back.2bpp.lz.292d9ff2
+++ b/gfx/pokemon/unown_y/back.2bpp.lz.292d9ff2
diff --git a/gfx/pics/unown_y/back.png b/gfx/pokemon/unown_y/back.png
index 141f16157..141f16157 100644
--- a/gfx/pics/unown_y/back.png
+++ b/gfx/pokemon/unown_y/back.png
diff --git a/gfx/pics/unown_y/front.animated.2bpp.lz.8cd89db4 b/gfx/pokemon/unown_y/front.animated.2bpp.lz.8cd89db4
index 1604f7e7b..1604f7e7b 100644
--- a/gfx/pics/unown_y/front.animated.2bpp.lz.8cd89db4
+++ b/gfx/pokemon/unown_y/front.animated.2bpp.lz.8cd89db4
diff --git a/gfx/pics/unown_y/front.png b/gfx/pokemon/unown_y/front.png
index 1b2fbdfcd..1b2fbdfcd 100644
--- a/gfx/pics/unown_y/front.png
+++ b/gfx/pokemon/unown_y/front.png
diff --git a/gfx/pics/unown_z/anim0.asm b/gfx/pokemon/unown_z/anim0.asm
index 197978f9b..197978f9b 100644
--- a/gfx/pics/unown_z/anim0.asm
+++ b/gfx/pokemon/unown_z/anim0.asm
diff --git a/gfx/pics/unown_z/anim1.asm b/gfx/pokemon/unown_z/anim1.asm
index 4eb7513f6..4eb7513f6 100644
--- a/gfx/pics/unown_z/anim1.asm
+++ b/gfx/pokemon/unown_z/anim1.asm
diff --git a/gfx/pics/unown_z/back.2bpp.lz.a41240a1 b/gfx/pokemon/unown_z/back.2bpp.lz.a41240a1
index 31bcb7baa..31bcb7baa 100644
--- a/gfx/pics/unown_z/back.2bpp.lz.a41240a1
+++ b/gfx/pokemon/unown_z/back.2bpp.lz.a41240a1
diff --git a/gfx/pics/unown_z/back.png b/gfx/pokemon/unown_z/back.png
index 987d4d9df..987d4d9df 100644
--- a/gfx/pics/unown_z/back.png
+++ b/gfx/pokemon/unown_z/back.png
diff --git a/gfx/pics/unown_z/front.animated.2bpp.lz.2d4170a0 b/gfx/pokemon/unown_z/front.animated.2bpp.lz.2d4170a0
index 0d9b8b4f8..0d9b8b4f8 100644
--- a/gfx/pics/unown_z/front.animated.2bpp.lz.2d4170a0
+++ b/gfx/pokemon/unown_z/front.animated.2bpp.lz.2d4170a0
diff --git a/gfx/pics/unown_z/front.png b/gfx/pokemon/unown_z/front.png
index 60fc433bc..60fc433bc 100644
--- a/gfx/pics/unown_z/front.png
+++ b/gfx/pokemon/unown_z/front.png
diff --git a/gfx/pics/ursaring/anim0.asm b/gfx/pokemon/ursaring/anim0.asm
index f571913ea..f571913ea 100644
--- a/gfx/pics/ursaring/anim0.asm
+++ b/gfx/pokemon/ursaring/anim0.asm
diff --git a/gfx/pics/ursaring/anim1.asm b/gfx/pokemon/ursaring/anim1.asm
index 01ebc0f1a..01ebc0f1a 100644
--- a/gfx/pics/ursaring/anim1.asm
+++ b/gfx/pokemon/ursaring/anim1.asm
diff --git a/gfx/pics/ursaring/back.2bpp.lz.0966cee1 b/gfx/pokemon/ursaring/back.2bpp.lz.0966cee1
index 263eac805..263eac805 100644
--- a/gfx/pics/ursaring/back.2bpp.lz.0966cee1
+++ b/gfx/pokemon/ursaring/back.2bpp.lz.0966cee1
diff --git a/gfx/pics/ursaring/back.png b/gfx/pokemon/ursaring/back.png
index 266218522..266218522 100644
--- a/gfx/pics/ursaring/back.png
+++ b/gfx/pokemon/ursaring/back.png
diff --git a/gfx/pics/ursaring/front.animated.2bpp.lz.5bcb8114 b/gfx/pokemon/ursaring/front.animated.2bpp.lz.5bcb8114
index f98dd0cb0..f98dd0cb0 100644
--- a/gfx/pics/ursaring/front.animated.2bpp.lz.5bcb8114
+++ b/gfx/pokemon/ursaring/front.animated.2bpp.lz.5bcb8114
diff --git a/gfx/pics/ursaring/front.png b/gfx/pokemon/ursaring/front.png
index 31c28d585..31c28d585 100644
--- a/gfx/pics/ursaring/front.png
+++ b/gfx/pokemon/ursaring/front.png
diff --git a/gfx/pics/ursaring/shiny.pal b/gfx/pokemon/ursaring/shiny.pal
index b2e472ea3..b2e472ea3 100644
--- a/gfx/pics/ursaring/shiny.pal
+++ b/gfx/pokemon/ursaring/shiny.pal
diff --git a/gfx/pics/vaporeon/anim0.asm b/gfx/pokemon/vaporeon/anim0.asm
index d13f1dd94..d13f1dd94 100644
--- a/gfx/pics/vaporeon/anim0.asm
+++ b/gfx/pokemon/vaporeon/anim0.asm
diff --git a/gfx/pics/vaporeon/anim1.asm b/gfx/pokemon/vaporeon/anim1.asm
index 79c386650..79c386650 100644
--- a/gfx/pics/vaporeon/anim1.asm
+++ b/gfx/pokemon/vaporeon/anim1.asm
diff --git a/gfx/pics/vaporeon/back.2bpp.lz.aafe2ea4 b/gfx/pokemon/vaporeon/back.2bpp.lz.aafe2ea4
index 9ea248261..9ea248261 100644
--- a/gfx/pics/vaporeon/back.2bpp.lz.aafe2ea4
+++ b/gfx/pokemon/vaporeon/back.2bpp.lz.aafe2ea4
diff --git a/gfx/pics/vaporeon/back.png b/gfx/pokemon/vaporeon/back.png
index 61ed8e4ba..61ed8e4ba 100644
--- a/gfx/pics/vaporeon/back.png
+++ b/gfx/pokemon/vaporeon/back.png
diff --git a/gfx/pics/vaporeon/front.animated.2bpp.lz.6e1ee993 b/gfx/pokemon/vaporeon/front.animated.2bpp.lz.6e1ee993
index 67793c7ec..67793c7ec 100644
--- a/gfx/pics/vaporeon/front.animated.2bpp.lz.6e1ee993
+++ b/gfx/pokemon/vaporeon/front.animated.2bpp.lz.6e1ee993
diff --git a/gfx/pics/vaporeon/front.png b/gfx/pokemon/vaporeon/front.png
index f8ed11756..f8ed11756 100644
--- a/gfx/pics/vaporeon/front.png
+++ b/gfx/pokemon/vaporeon/front.png
diff --git a/gfx/pics/vaporeon/shiny.pal b/gfx/pokemon/vaporeon/shiny.pal
index b8571c740..b8571c740 100644
--- a/gfx/pics/vaporeon/shiny.pal
+++ b/gfx/pokemon/vaporeon/shiny.pal
diff --git a/gfx/pics/venomoth/anim0.asm b/gfx/pokemon/venomoth/anim0.asm
index ba6014d59..ba6014d59 100644
--- a/gfx/pics/venomoth/anim0.asm
+++ b/gfx/pokemon/venomoth/anim0.asm
diff --git a/gfx/pics/venomoth/anim1.asm b/gfx/pokemon/venomoth/anim1.asm
index 619c19b73..619c19b73 100644
--- a/gfx/pics/venomoth/anim1.asm
+++ b/gfx/pokemon/venomoth/anim1.asm
diff --git a/gfx/pics/venomoth/back.2bpp.lz.ba3cccb7 b/gfx/pokemon/venomoth/back.2bpp.lz.ba3cccb7
index 721527c2a..721527c2a 100644
--- a/gfx/pics/venomoth/back.2bpp.lz.ba3cccb7
+++ b/gfx/pokemon/venomoth/back.2bpp.lz.ba3cccb7
diff --git a/gfx/pics/venomoth/back.png b/gfx/pokemon/venomoth/back.png
index 5fbf6bba9..5fbf6bba9 100644
--- a/gfx/pics/venomoth/back.png
+++ b/gfx/pokemon/venomoth/back.png
diff --git a/gfx/pics/venomoth/front.animated.2bpp.lz.6c0096ec b/gfx/pokemon/venomoth/front.animated.2bpp.lz.6c0096ec
index 5f32ad682..5f32ad682 100644
--- a/gfx/pics/venomoth/front.animated.2bpp.lz.6c0096ec
+++ b/gfx/pokemon/venomoth/front.animated.2bpp.lz.6c0096ec
diff --git a/gfx/pics/venomoth/front.png b/gfx/pokemon/venomoth/front.png
index eb3c291b8..eb3c291b8 100644
--- a/gfx/pics/venomoth/front.png
+++ b/gfx/pokemon/venomoth/front.png
diff --git a/gfx/pics/venomoth/shiny.pal b/gfx/pokemon/venomoth/shiny.pal
index 50d971276..50d971276 100644
--- a/gfx/pics/venomoth/shiny.pal
+++ b/gfx/pokemon/venomoth/shiny.pal
diff --git a/gfx/pics/venonat/anim0.asm b/gfx/pokemon/venonat/anim0.asm
index 508cbd84a..508cbd84a 100644
--- a/gfx/pics/venonat/anim0.asm
+++ b/gfx/pokemon/venonat/anim0.asm
diff --git a/gfx/pics/venonat/anim1.asm b/gfx/pokemon/venonat/anim1.asm
index ecd7a45f1..ecd7a45f1 100644
--- a/gfx/pics/venonat/anim1.asm
+++ b/gfx/pokemon/venonat/anim1.asm
diff --git a/gfx/pics/venonat/back.2bpp.lz.63b1017a b/gfx/pokemon/venonat/back.2bpp.lz.63b1017a
index b28c7523d..b28c7523d 100644
--- a/gfx/pics/venonat/back.2bpp.lz.63b1017a
+++ b/gfx/pokemon/venonat/back.2bpp.lz.63b1017a
diff --git a/gfx/pics/venonat/back.png b/gfx/pokemon/venonat/back.png
index 09b946146..09b946146 100644
--- a/gfx/pics/venonat/back.png
+++ b/gfx/pokemon/venonat/back.png
diff --git a/gfx/pics/venonat/front.animated.2bpp.lz.02a36f08 b/gfx/pokemon/venonat/front.animated.2bpp.lz.02a36f08
index f6b057e8f..f6b057e8f 100644
--- a/gfx/pics/venonat/front.animated.2bpp.lz.02a36f08
+++ b/gfx/pokemon/venonat/front.animated.2bpp.lz.02a36f08
diff --git a/gfx/pics/venonat/front.png b/gfx/pokemon/venonat/front.png
index 466b6b4c3..466b6b4c3 100644
--- a/gfx/pics/venonat/front.png
+++ b/gfx/pokemon/venonat/front.png
diff --git a/gfx/pics/venonat/shiny.pal b/gfx/pokemon/venonat/shiny.pal
index 0660ed752..0660ed752 100644
--- a/gfx/pics/venonat/shiny.pal
+++ b/gfx/pokemon/venonat/shiny.pal
diff --git a/gfx/pics/venusaur/anim0.asm b/gfx/pokemon/venusaur/anim0.asm
index 9ee74b6c0..9ee74b6c0 100644
--- a/gfx/pics/venusaur/anim0.asm
+++ b/gfx/pokemon/venusaur/anim0.asm
diff --git a/gfx/pics/venusaur/anim1.asm b/gfx/pokemon/venusaur/anim1.asm
index 6eebd7cd3..6eebd7cd3 100644
--- a/gfx/pics/venusaur/anim1.asm
+++ b/gfx/pokemon/venusaur/anim1.asm
diff --git a/gfx/pics/venusaur/back.2bpp.lz.1d5b9ebe b/gfx/pokemon/venusaur/back.2bpp.lz.1d5b9ebe
index 27ca82e8a..27ca82e8a 100644
--- a/gfx/pics/venusaur/back.2bpp.lz.1d5b9ebe
+++ b/gfx/pokemon/venusaur/back.2bpp.lz.1d5b9ebe
diff --git a/gfx/pics/venusaur/back.png b/gfx/pokemon/venusaur/back.png
index b611551f6..b611551f6 100644
--- a/gfx/pics/venusaur/back.png
+++ b/gfx/pokemon/venusaur/back.png
diff --git a/gfx/pics/venusaur/front.animated.2bpp.lz.48d131f4 b/gfx/pokemon/venusaur/front.animated.2bpp.lz.48d131f4
index d436da0bd..d436da0bd 100644
--- a/gfx/pics/venusaur/front.animated.2bpp.lz.48d131f4
+++ b/gfx/pokemon/venusaur/front.animated.2bpp.lz.48d131f4
diff --git a/gfx/pics/venusaur/front.png b/gfx/pokemon/venusaur/front.png
index 2cd0293cc..2cd0293cc 100644
--- a/gfx/pics/venusaur/front.png
+++ b/gfx/pokemon/venusaur/front.png
diff --git a/gfx/pics/venusaur/shiny.pal b/gfx/pokemon/venusaur/shiny.pal
index 6cffe65cb..6cffe65cb 100644
--- a/gfx/pics/venusaur/shiny.pal
+++ b/gfx/pokemon/venusaur/shiny.pal
diff --git a/gfx/pics/victreebel/anim0.asm b/gfx/pokemon/victreebel/anim0.asm
index ec490f7fb..ec490f7fb 100644
--- a/gfx/pics/victreebel/anim0.asm
+++ b/gfx/pokemon/victreebel/anim0.asm
diff --git a/gfx/pics/victreebel/anim1.asm b/gfx/pokemon/victreebel/anim1.asm
index 121550865..121550865 100644
--- a/gfx/pics/victreebel/anim1.asm
+++ b/gfx/pokemon/victreebel/anim1.asm
diff --git a/gfx/pics/victreebel/back.2bpp.lz.a80b1dc4 b/gfx/pokemon/victreebel/back.2bpp.lz.a80b1dc4
index d4b014f67..d4b014f67 100644
--- a/gfx/pics/victreebel/back.2bpp.lz.a80b1dc4
+++ b/gfx/pokemon/victreebel/back.2bpp.lz.a80b1dc4
diff --git a/gfx/pics/victreebel/back.png b/gfx/pokemon/victreebel/back.png
index 6f3ec484e..6f3ec484e 100644
--- a/gfx/pics/victreebel/back.png
+++ b/gfx/pokemon/victreebel/back.png
diff --git a/gfx/pics/victreebel/front.animated.2bpp.lz.d5d535c1 b/gfx/pokemon/victreebel/front.animated.2bpp.lz.d5d535c1
index c53114990..c53114990 100644
--- a/gfx/pics/victreebel/front.animated.2bpp.lz.d5d535c1
+++ b/gfx/pokemon/victreebel/front.animated.2bpp.lz.d5d535c1
diff --git a/gfx/pics/victreebel/front.png b/gfx/pokemon/victreebel/front.png
index 7fc688ef3..7fc688ef3 100644
--- a/gfx/pics/victreebel/front.png
+++ b/gfx/pokemon/victreebel/front.png
diff --git a/gfx/pics/victreebel/shiny.pal b/gfx/pokemon/victreebel/shiny.pal
index c538a41fa..c538a41fa 100644
--- a/gfx/pics/victreebel/shiny.pal
+++ b/gfx/pokemon/victreebel/shiny.pal
diff --git a/gfx/pics/vileplume/anim0.asm b/gfx/pokemon/vileplume/anim0.asm
index 98c2a86de..98c2a86de 100644
--- a/gfx/pics/vileplume/anim0.asm
+++ b/gfx/pokemon/vileplume/anim0.asm
diff --git a/gfx/pics/vileplume/anim1.asm b/gfx/pokemon/vileplume/anim1.asm
index e57622363..e57622363 100644
--- a/gfx/pics/vileplume/anim1.asm
+++ b/gfx/pokemon/vileplume/anim1.asm
diff --git a/gfx/pics/vileplume/back.2bpp.lz.9f944092 b/gfx/pokemon/vileplume/back.2bpp.lz.9f944092
index 823f0e112..823f0e112 100644
--- a/gfx/pics/vileplume/back.2bpp.lz.9f944092
+++ b/gfx/pokemon/vileplume/back.2bpp.lz.9f944092
diff --git a/gfx/pics/vileplume/back.png b/gfx/pokemon/vileplume/back.png
index 4e0e9fbe3..4e0e9fbe3 100644
--- a/gfx/pics/vileplume/back.png
+++ b/gfx/pokemon/vileplume/back.png
diff --git a/gfx/pics/vileplume/front.animated.2bpp.lz.db2287e6 b/gfx/pokemon/vileplume/front.animated.2bpp.lz.db2287e6
index 05ca10ba5..05ca10ba5 100644
--- a/gfx/pics/vileplume/front.animated.2bpp.lz.db2287e6
+++ b/gfx/pokemon/vileplume/front.animated.2bpp.lz.db2287e6
diff --git a/gfx/pics/vileplume/front.png b/gfx/pokemon/vileplume/front.png
index 6a8a4c0fd..6a8a4c0fd 100644
--- a/gfx/pics/vileplume/front.png
+++ b/gfx/pokemon/vileplume/front.png
diff --git a/gfx/pics/vileplume/shiny.pal b/gfx/pokemon/vileplume/shiny.pal
index d65151640..d65151640 100644
--- a/gfx/pics/vileplume/shiny.pal
+++ b/gfx/pokemon/vileplume/shiny.pal
diff --git a/gfx/pics/voltorb/anim0.asm b/gfx/pokemon/voltorb/anim0.asm
index fdb49b9af..fdb49b9af 100644
--- a/gfx/pics/voltorb/anim0.asm
+++ b/gfx/pokemon/voltorb/anim0.asm
diff --git a/gfx/pics/voltorb/anim1.asm b/gfx/pokemon/voltorb/anim1.asm
index be799fe4a..be799fe4a 100644
--- a/gfx/pics/voltorb/anim1.asm
+++ b/gfx/pokemon/voltorb/anim1.asm
diff --git a/gfx/pics/voltorb/back.2bpp.lz.f19cefe9 b/gfx/pokemon/voltorb/back.2bpp.lz.f19cefe9
index fe102da9a..fe102da9a 100644
--- a/gfx/pics/voltorb/back.2bpp.lz.f19cefe9
+++ b/gfx/pokemon/voltorb/back.2bpp.lz.f19cefe9
diff --git a/gfx/pics/voltorb/back.png b/gfx/pokemon/voltorb/back.png
index e2e46de54..e2e46de54 100644
--- a/gfx/pics/voltorb/back.png
+++ b/gfx/pokemon/voltorb/back.png
diff --git a/gfx/pics/voltorb/front.animated.2bpp.lz.64051f97 b/gfx/pokemon/voltorb/front.animated.2bpp.lz.64051f97
index 94f35f9aa..94f35f9aa 100644
--- a/gfx/pics/voltorb/front.animated.2bpp.lz.64051f97
+++ b/gfx/pokemon/voltorb/front.animated.2bpp.lz.64051f97
diff --git a/gfx/pics/voltorb/front.png b/gfx/pokemon/voltorb/front.png
index 90dcedaf9..90dcedaf9 100644
--- a/gfx/pics/voltorb/front.png
+++ b/gfx/pokemon/voltorb/front.png
diff --git a/gfx/pics/voltorb/shiny.pal b/gfx/pokemon/voltorb/shiny.pal
index b8509a81f..b8509a81f 100644
--- a/gfx/pics/voltorb/shiny.pal
+++ b/gfx/pokemon/voltorb/shiny.pal
diff --git a/gfx/pics/vulpix/anim0.asm b/gfx/pokemon/vulpix/anim0.asm
index 878054202..878054202 100644
--- a/gfx/pics/vulpix/anim0.asm
+++ b/gfx/pokemon/vulpix/anim0.asm
diff --git a/gfx/pics/vulpix/anim1.asm b/gfx/pokemon/vulpix/anim1.asm
index f7c9e3671..f7c9e3671 100644
--- a/gfx/pics/vulpix/anim1.asm
+++ b/gfx/pokemon/vulpix/anim1.asm
diff --git a/gfx/pics/vulpix/back.2bpp.lz.0c7852c8 b/gfx/pokemon/vulpix/back.2bpp.lz.0c7852c8
index ce2535141..ce2535141 100644
--- a/gfx/pics/vulpix/back.2bpp.lz.0c7852c8
+++ b/gfx/pokemon/vulpix/back.2bpp.lz.0c7852c8
diff --git a/gfx/pics/vulpix/back.png b/gfx/pokemon/vulpix/back.png
index cd37be416..cd37be416 100644
--- a/gfx/pics/vulpix/back.png
+++ b/gfx/pokemon/vulpix/back.png
diff --git a/gfx/pics/vulpix/front.animated.2bpp.lz.df94d884 b/gfx/pokemon/vulpix/front.animated.2bpp.lz.df94d884
index 9248ce808..9248ce808 100644
--- a/gfx/pics/vulpix/front.animated.2bpp.lz.df94d884
+++ b/gfx/pokemon/vulpix/front.animated.2bpp.lz.df94d884
diff --git a/gfx/pics/vulpix/front.png b/gfx/pokemon/vulpix/front.png
index 43c19a3f8..43c19a3f8 100644
--- a/gfx/pics/vulpix/front.png
+++ b/gfx/pokemon/vulpix/front.png
diff --git a/gfx/pics/vulpix/shiny.pal b/gfx/pokemon/vulpix/shiny.pal
index 0084507cd..0084507cd 100644
--- a/gfx/pics/vulpix/shiny.pal
+++ b/gfx/pokemon/vulpix/shiny.pal
diff --git a/gfx/pics/wartortle/anim0.asm b/gfx/pokemon/wartortle/anim0.asm
index 832b87b88..832b87b88 100644
--- a/gfx/pics/wartortle/anim0.asm
+++ b/gfx/pokemon/wartortle/anim0.asm
diff --git a/gfx/pics/wartortle/anim1.asm b/gfx/pokemon/wartortle/anim1.asm
index 40c4fcd14..40c4fcd14 100644
--- a/gfx/pics/wartortle/anim1.asm
+++ b/gfx/pokemon/wartortle/anim1.asm
diff --git a/gfx/pics/wartortle/back.2bpp.lz.f2338cb4 b/gfx/pokemon/wartortle/back.2bpp.lz.f2338cb4
index 5734c20cb..5734c20cb 100644
--- a/gfx/pics/wartortle/back.2bpp.lz.f2338cb4
+++ b/gfx/pokemon/wartortle/back.2bpp.lz.f2338cb4
diff --git a/gfx/pics/wartortle/back.png b/gfx/pokemon/wartortle/back.png
index bb53292eb..bb53292eb 100644
--- a/gfx/pics/wartortle/back.png
+++ b/gfx/pokemon/wartortle/back.png
diff --git a/gfx/pics/wartortle/front.animated.2bpp.lz.f50d25f5 b/gfx/pokemon/wartortle/front.animated.2bpp.lz.f50d25f5
index 29642807d..29642807d 100644
--- a/gfx/pics/wartortle/front.animated.2bpp.lz.f50d25f5
+++ b/gfx/pokemon/wartortle/front.animated.2bpp.lz.f50d25f5
diff --git a/gfx/pics/wartortle/front.png b/gfx/pokemon/wartortle/front.png
index f4a4ad33f..f4a4ad33f 100644
--- a/gfx/pics/wartortle/front.png
+++ b/gfx/pokemon/wartortle/front.png
diff --git a/gfx/pics/wartortle/shiny.pal b/gfx/pokemon/wartortle/shiny.pal
index c108dfdbf..c108dfdbf 100644
--- a/gfx/pics/wartortle/shiny.pal
+++ b/gfx/pokemon/wartortle/shiny.pal
diff --git a/gfx/pics/weedle/anim0.asm b/gfx/pokemon/weedle/anim0.asm
index 5d959a772..5d959a772 100644
--- a/gfx/pics/weedle/anim0.asm
+++ b/gfx/pokemon/weedle/anim0.asm
diff --git a/gfx/pics/weedle/anim1.asm b/gfx/pokemon/weedle/anim1.asm
index 30dcb9185..30dcb9185 100644
--- a/gfx/pics/weedle/anim1.asm
+++ b/gfx/pokemon/weedle/anim1.asm
diff --git a/gfx/pics/weedle/back.2bpp.lz.f26ac339 b/gfx/pokemon/weedle/back.2bpp.lz.f26ac339
index 64decb914..64decb914 100644
--- a/gfx/pics/weedle/back.2bpp.lz.f26ac339
+++ b/gfx/pokemon/weedle/back.2bpp.lz.f26ac339
diff --git a/gfx/pics/weedle/back.png b/gfx/pokemon/weedle/back.png
index b20e4a53d..b20e4a53d 100644
--- a/gfx/pics/weedle/back.png
+++ b/gfx/pokemon/weedle/back.png
diff --git a/gfx/pics/weedle/front.animated.2bpp.lz.9e1dedbd b/gfx/pokemon/weedle/front.animated.2bpp.lz.9e1dedbd
index 091df588a..091df588a 100644
--- a/gfx/pics/weedle/front.animated.2bpp.lz.9e1dedbd
+++ b/gfx/pokemon/weedle/front.animated.2bpp.lz.9e1dedbd
diff --git a/gfx/pics/weedle/front.png b/gfx/pokemon/weedle/front.png
index 3dfa35241..3dfa35241 100644
--- a/gfx/pics/weedle/front.png
+++ b/gfx/pokemon/weedle/front.png
diff --git a/gfx/pics/weedle/shiny.pal b/gfx/pokemon/weedle/shiny.pal
index 45cc7073c..45cc7073c 100644
--- a/gfx/pics/weedle/shiny.pal
+++ b/gfx/pokemon/weedle/shiny.pal
diff --git a/gfx/pics/weepinbell/anim0.asm b/gfx/pokemon/weepinbell/anim0.asm
index 6f710d29a..6f710d29a 100644
--- a/gfx/pics/weepinbell/anim0.asm
+++ b/gfx/pokemon/weepinbell/anim0.asm
diff --git a/gfx/pics/weepinbell/anim1.asm b/gfx/pokemon/weepinbell/anim1.asm
index 0e56c9cc1..0e56c9cc1 100644
--- a/gfx/pics/weepinbell/anim1.asm
+++ b/gfx/pokemon/weepinbell/anim1.asm
diff --git a/gfx/pics/weepinbell/back.2bpp.lz.f84a5fe6 b/gfx/pokemon/weepinbell/back.2bpp.lz.f84a5fe6
index 26e44257c..26e44257c 100644
--- a/gfx/pics/weepinbell/back.2bpp.lz.f84a5fe6
+++ b/gfx/pokemon/weepinbell/back.2bpp.lz.f84a5fe6
diff --git a/gfx/pics/weepinbell/back.png b/gfx/pokemon/weepinbell/back.png
index cb20b0da8..cb20b0da8 100644
--- a/gfx/pics/weepinbell/back.png
+++ b/gfx/pokemon/weepinbell/back.png
diff --git a/gfx/pics/weepinbell/front.animated.2bpp.lz.7b06c092 b/gfx/pokemon/weepinbell/front.animated.2bpp.lz.7b06c092
index a7e7d60b5..a7e7d60b5 100644
--- a/gfx/pics/weepinbell/front.animated.2bpp.lz.7b06c092
+++ b/gfx/pokemon/weepinbell/front.animated.2bpp.lz.7b06c092
diff --git a/gfx/pics/weepinbell/front.png b/gfx/pokemon/weepinbell/front.png
index eb6d4658c..eb6d4658c 100644
--- a/gfx/pics/weepinbell/front.png
+++ b/gfx/pokemon/weepinbell/front.png
diff --git a/gfx/pics/weepinbell/shiny.pal b/gfx/pokemon/weepinbell/shiny.pal
index e4f10596c..e4f10596c 100644
--- a/gfx/pics/weepinbell/shiny.pal
+++ b/gfx/pokemon/weepinbell/shiny.pal
diff --git a/gfx/pics/weezing/anim0.asm b/gfx/pokemon/weezing/anim0.asm
index e64ca5d37..e64ca5d37 100644
--- a/gfx/pics/weezing/anim0.asm
+++ b/gfx/pokemon/weezing/anim0.asm
diff --git a/gfx/pics/weezing/anim1.asm b/gfx/pokemon/weezing/anim1.asm
index 1ba31dd74..1ba31dd74 100644
--- a/gfx/pics/weezing/anim1.asm
+++ b/gfx/pokemon/weezing/anim1.asm
diff --git a/gfx/pics/weezing/back.2bpp.lz.5ac5b672 b/gfx/pokemon/weezing/back.2bpp.lz.5ac5b672
index a85124f3a..a85124f3a 100644
--- a/gfx/pics/weezing/back.2bpp.lz.5ac5b672
+++ b/gfx/pokemon/weezing/back.2bpp.lz.5ac5b672
diff --git a/gfx/pics/weezing/back.png b/gfx/pokemon/weezing/back.png
index 8f4b076a0..8f4b076a0 100644
--- a/gfx/pics/weezing/back.png
+++ b/gfx/pokemon/weezing/back.png
diff --git a/gfx/pics/weezing/front.animated.2bpp.lz.75928bd0 b/gfx/pokemon/weezing/front.animated.2bpp.lz.75928bd0
index 3c6f24a41..3c6f24a41 100644
--- a/gfx/pics/weezing/front.animated.2bpp.lz.75928bd0
+++ b/gfx/pokemon/weezing/front.animated.2bpp.lz.75928bd0
diff --git a/gfx/pics/weezing/front.png b/gfx/pokemon/weezing/front.png
index 7fd7b9312..7fd7b9312 100644
--- a/gfx/pics/weezing/front.png
+++ b/gfx/pokemon/weezing/front.png
diff --git a/gfx/pics/weezing/shiny.pal b/gfx/pokemon/weezing/shiny.pal
index 8132fea04..8132fea04 100644
--- a/gfx/pics/weezing/shiny.pal
+++ b/gfx/pokemon/weezing/shiny.pal
diff --git a/gfx/pics/wigglytuff/anim0.asm b/gfx/pokemon/wigglytuff/anim0.asm
index 53b468fdd..53b468fdd 100644
--- a/gfx/pics/wigglytuff/anim0.asm
+++ b/gfx/pokemon/wigglytuff/anim0.asm
diff --git a/gfx/pics/wigglytuff/anim1.asm b/gfx/pokemon/wigglytuff/anim1.asm
index b99bf002c..b99bf002c 100644
--- a/gfx/pics/wigglytuff/anim1.asm
+++ b/gfx/pokemon/wigglytuff/anim1.asm
diff --git a/gfx/pics/wigglytuff/back.2bpp.lz.fee674ac b/gfx/pokemon/wigglytuff/back.2bpp.lz.fee674ac
index 3b3732986..3b3732986 100644
--- a/gfx/pics/wigglytuff/back.2bpp.lz.fee674ac
+++ b/gfx/pokemon/wigglytuff/back.2bpp.lz.fee674ac
diff --git a/gfx/pics/wigglytuff/back.png b/gfx/pokemon/wigglytuff/back.png
index 5e264305b..5e264305b 100644
--- a/gfx/pics/wigglytuff/back.png
+++ b/gfx/pokemon/wigglytuff/back.png
diff --git a/gfx/pics/wigglytuff/front.animated.2bpp.lz.49311d0b b/gfx/pokemon/wigglytuff/front.animated.2bpp.lz.49311d0b
index c633d2a0a..c633d2a0a 100644
--- a/gfx/pics/wigglytuff/front.animated.2bpp.lz.49311d0b
+++ b/gfx/pokemon/wigglytuff/front.animated.2bpp.lz.49311d0b
diff --git a/gfx/pics/wigglytuff/front.png b/gfx/pokemon/wigglytuff/front.png
index 229f6647a..229f6647a 100644
--- a/gfx/pics/wigglytuff/front.png
+++ b/gfx/pokemon/wigglytuff/front.png
diff --git a/gfx/pics/wigglytuff/shiny.pal b/gfx/pokemon/wigglytuff/shiny.pal
index 38ce5d76d..38ce5d76d 100644
--- a/gfx/pics/wigglytuff/shiny.pal
+++ b/gfx/pokemon/wigglytuff/shiny.pal
diff --git a/gfx/pics/wobbuffet/anim0.asm b/gfx/pokemon/wobbuffet/anim0.asm
index 340f3df46..340f3df46 100644
--- a/gfx/pics/wobbuffet/anim0.asm
+++ b/gfx/pokemon/wobbuffet/anim0.asm
diff --git a/gfx/pics/wobbuffet/anim1.asm b/gfx/pokemon/wobbuffet/anim1.asm
index 8a3564daa..8a3564daa 100644
--- a/gfx/pics/wobbuffet/anim1.asm
+++ b/gfx/pokemon/wobbuffet/anim1.asm
diff --git a/gfx/pics/wobbuffet/back.2bpp.lz.a862192a b/gfx/pokemon/wobbuffet/back.2bpp.lz.a862192a
index 87dba2049..87dba2049 100644
--- a/gfx/pics/wobbuffet/back.2bpp.lz.a862192a
+++ b/gfx/pokemon/wobbuffet/back.2bpp.lz.a862192a
diff --git a/gfx/pics/wobbuffet/back.png b/gfx/pokemon/wobbuffet/back.png
index 103f69106..103f69106 100644
--- a/gfx/pics/wobbuffet/back.png
+++ b/gfx/pokemon/wobbuffet/back.png
diff --git a/gfx/pics/wobbuffet/front.animated.2bpp.lz.f1f4687d b/gfx/pokemon/wobbuffet/front.animated.2bpp.lz.f1f4687d
index ce7aa46c8..ce7aa46c8 100644
--- a/gfx/pics/wobbuffet/front.animated.2bpp.lz.f1f4687d
+++ b/gfx/pokemon/wobbuffet/front.animated.2bpp.lz.f1f4687d
diff --git a/gfx/pics/wobbuffet/front.png b/gfx/pokemon/wobbuffet/front.png
index e1b7935aa..e1b7935aa 100644
--- a/gfx/pics/wobbuffet/front.png
+++ b/gfx/pokemon/wobbuffet/front.png
diff --git a/gfx/pics/wobbuffet/shiny.pal b/gfx/pokemon/wobbuffet/shiny.pal
index c721c9ba6..c721c9ba6 100644
--- a/gfx/pics/wobbuffet/shiny.pal
+++ b/gfx/pokemon/wobbuffet/shiny.pal
diff --git a/gfx/pics/wooper/anim0.asm b/gfx/pokemon/wooper/anim0.asm
index 2c9becf9e..2c9becf9e 100644
--- a/gfx/pics/wooper/anim0.asm
+++ b/gfx/pokemon/wooper/anim0.asm
diff --git a/gfx/pics/wooper/anim1.asm b/gfx/pokemon/wooper/anim1.asm
index 3f152d035..3f152d035 100644
--- a/gfx/pics/wooper/anim1.asm
+++ b/gfx/pokemon/wooper/anim1.asm
diff --git a/gfx/pics/wooper/back.2bpp.lz.4f4b7917 b/gfx/pokemon/wooper/back.2bpp.lz.4f4b7917
index 973037f02..973037f02 100644
--- a/gfx/pics/wooper/back.2bpp.lz.4f4b7917
+++ b/gfx/pokemon/wooper/back.2bpp.lz.4f4b7917
diff --git a/gfx/pics/wooper/back.png b/gfx/pokemon/wooper/back.png
index 83fca2bf5..83fca2bf5 100644
--- a/gfx/pics/wooper/back.png
+++ b/gfx/pokemon/wooper/back.png
diff --git a/gfx/pics/wooper/front.animated.2bpp.lz.4e440469 b/gfx/pokemon/wooper/front.animated.2bpp.lz.4e440469
index 3d5d53c1b..3d5d53c1b 100644
--- a/gfx/pics/wooper/front.animated.2bpp.lz.4e440469
+++ b/gfx/pokemon/wooper/front.animated.2bpp.lz.4e440469
diff --git a/gfx/pics/wooper/front.png b/gfx/pokemon/wooper/front.png
index 9a232b113..9a232b113 100644
--- a/gfx/pics/wooper/front.png
+++ b/gfx/pokemon/wooper/front.png
diff --git a/gfx/pics/wooper/shiny.pal b/gfx/pokemon/wooper/shiny.pal
index aa3475256..aa3475256 100644
--- a/gfx/pics/wooper/shiny.pal
+++ b/gfx/pokemon/wooper/shiny.pal
diff --git a/gfx/pics/xatu/anim0.asm b/gfx/pokemon/xatu/anim0.asm
index 002f905b8..002f905b8 100644
--- a/gfx/pics/xatu/anim0.asm
+++ b/gfx/pokemon/xatu/anim0.asm
diff --git a/gfx/pics/xatu/anim1.asm b/gfx/pokemon/xatu/anim1.asm
index 3fa8d7875..3fa8d7875 100644
--- a/gfx/pics/xatu/anim1.asm
+++ b/gfx/pokemon/xatu/anim1.asm
diff --git a/gfx/pics/xatu/back.2bpp.lz.4de765ff b/gfx/pokemon/xatu/back.2bpp.lz.4de765ff
index 8b6889ffb..8b6889ffb 100644
--- a/gfx/pics/xatu/back.2bpp.lz.4de765ff
+++ b/gfx/pokemon/xatu/back.2bpp.lz.4de765ff
diff --git a/gfx/pics/xatu/back.png b/gfx/pokemon/xatu/back.png
index 94f56f87d..94f56f87d 100644
--- a/gfx/pics/xatu/back.png
+++ b/gfx/pokemon/xatu/back.png
diff --git a/gfx/pics/xatu/front.animated.2bpp.lz.4f452e43 b/gfx/pokemon/xatu/front.animated.2bpp.lz.4f452e43
index 4b5918b3a..4b5918b3a 100644
--- a/gfx/pics/xatu/front.animated.2bpp.lz.4f452e43
+++ b/gfx/pokemon/xatu/front.animated.2bpp.lz.4f452e43
diff --git a/gfx/pics/xatu/front.png b/gfx/pokemon/xatu/front.png
index f6335d27d..f6335d27d 100644
--- a/gfx/pics/xatu/front.png
+++ b/gfx/pokemon/xatu/front.png
diff --git a/gfx/pics/xatu/shiny.pal b/gfx/pokemon/xatu/shiny.pal
index 00ac32371..00ac32371 100644
--- a/gfx/pics/xatu/shiny.pal
+++ b/gfx/pokemon/xatu/shiny.pal
diff --git a/gfx/pics/yanma/anim0.asm b/gfx/pokemon/yanma/anim0.asm
index 4f1aaa929..4f1aaa929 100644
--- a/gfx/pics/yanma/anim0.asm
+++ b/gfx/pokemon/yanma/anim0.asm
diff --git a/gfx/pics/yanma/anim1.asm b/gfx/pokemon/yanma/anim1.asm
index 75464b3f1..75464b3f1 100644
--- a/gfx/pics/yanma/anim1.asm
+++ b/gfx/pokemon/yanma/anim1.asm
diff --git a/gfx/pics/yanma/back.2bpp.lz.2ca27ab3 b/gfx/pokemon/yanma/back.2bpp.lz.2ca27ab3
index 47105f12f..47105f12f 100644
--- a/gfx/pics/yanma/back.2bpp.lz.2ca27ab3
+++ b/gfx/pokemon/yanma/back.2bpp.lz.2ca27ab3
diff --git a/gfx/pics/yanma/back.png b/gfx/pokemon/yanma/back.png
index cc21b1a28..cc21b1a28 100644
--- a/gfx/pics/yanma/back.png
+++ b/gfx/pokemon/yanma/back.png
diff --git a/gfx/pics/yanma/front.animated.2bpp.lz.25f91adf b/gfx/pokemon/yanma/front.animated.2bpp.lz.25f91adf
index 1987afdc9..1987afdc9 100644
--- a/gfx/pics/yanma/front.animated.2bpp.lz.25f91adf
+++ b/gfx/pokemon/yanma/front.animated.2bpp.lz.25f91adf
diff --git a/gfx/pics/yanma/front.png b/gfx/pokemon/yanma/front.png
index 1812eea58..1812eea58 100644
--- a/gfx/pics/yanma/front.png
+++ b/gfx/pokemon/yanma/front.png
diff --git a/gfx/pics/yanma/shiny.pal b/gfx/pokemon/yanma/shiny.pal
index cbbdc755b..cbbdc755b 100644
--- a/gfx/pics/yanma/shiny.pal
+++ b/gfx/pokemon/yanma/shiny.pal
diff --git a/gfx/pics/zapdos/anim0.asm b/gfx/pokemon/zapdos/anim0.asm
index a22540c2a..a22540c2a 100644
--- a/gfx/pics/zapdos/anim0.asm
+++ b/gfx/pokemon/zapdos/anim0.asm
diff --git a/gfx/pics/zapdos/anim1.asm b/gfx/pokemon/zapdos/anim1.asm
index 3d8c8fd57..3d8c8fd57 100644
--- a/gfx/pics/zapdos/anim1.asm
+++ b/gfx/pokemon/zapdos/anim1.asm
diff --git a/gfx/pics/zapdos/back.2bpp.lz.a44c7524 b/gfx/pokemon/zapdos/back.2bpp.lz.a44c7524
index 2f2167941..2f2167941 100644
--- a/gfx/pics/zapdos/back.2bpp.lz.a44c7524
+++ b/gfx/pokemon/zapdos/back.2bpp.lz.a44c7524
diff --git a/gfx/pics/zapdos/back.png b/gfx/pokemon/zapdos/back.png
index 8b1b740ea..8b1b740ea 100644
--- a/gfx/pics/zapdos/back.png
+++ b/gfx/pokemon/zapdos/back.png
diff --git a/gfx/pics/zapdos/front.animated.2bpp.lz.05cb214a b/gfx/pokemon/zapdos/front.animated.2bpp.lz.05cb214a
index 0f048171c..0f048171c 100644
--- a/gfx/pics/zapdos/front.animated.2bpp.lz.05cb214a
+++ b/gfx/pokemon/zapdos/front.animated.2bpp.lz.05cb214a
diff --git a/gfx/pics/zapdos/front.png b/gfx/pokemon/zapdos/front.png
index ae1b68cd0..ae1b68cd0 100644
--- a/gfx/pics/zapdos/front.png
+++ b/gfx/pokemon/zapdos/front.png
diff --git a/gfx/pics/zapdos/shiny.pal b/gfx/pokemon/zapdos/shiny.pal
index e73dbe6ff..e73dbe6ff 100644
--- a/gfx/pics/zapdos/shiny.pal
+++ b/gfx/pokemon/zapdos/shiny.pal
diff --git a/gfx/pics/zubat/anim0.asm b/gfx/pokemon/zubat/anim0.asm
index a34a66671..a34a66671 100644
--- a/gfx/pics/zubat/anim0.asm
+++ b/gfx/pokemon/zubat/anim0.asm
diff --git a/gfx/pics/zubat/anim1.asm b/gfx/pokemon/zubat/anim1.asm
index cfba587f9..cfba587f9 100644
--- a/gfx/pics/zubat/anim1.asm
+++ b/gfx/pokemon/zubat/anim1.asm
diff --git a/gfx/pics/zubat/back.2bpp.lz.aa77eb62 b/gfx/pokemon/zubat/back.2bpp.lz.aa77eb62
index d50e00e90..d50e00e90 100644
--- a/gfx/pics/zubat/back.2bpp.lz.aa77eb62
+++ b/gfx/pokemon/zubat/back.2bpp.lz.aa77eb62
diff --git a/gfx/pics/zubat/back.png b/gfx/pokemon/zubat/back.png
index 2e1eb35cf..2e1eb35cf 100644
--- a/gfx/pics/zubat/back.png
+++ b/gfx/pokemon/zubat/back.png
diff --git a/gfx/pics/zubat/front.animated.2bpp.lz.f12e6581 b/gfx/pokemon/zubat/front.animated.2bpp.lz.f12e6581
index b22e1d971..b22e1d971 100644
--- a/gfx/pics/zubat/front.animated.2bpp.lz.f12e6581
+++ b/gfx/pokemon/zubat/front.animated.2bpp.lz.f12e6581
diff --git a/gfx/pics/zubat/front.png b/gfx/pokemon/zubat/front.png
index 1dbccda8e..1dbccda8e 100644
--- a/gfx/pics/zubat/front.png
+++ b/gfx/pokemon/zubat/front.png
diff --git a/gfx/pics/zubat/shiny.pal b/gfx/pokemon/zubat/shiny.pal
index 722f84ed2..722f84ed2 100644
--- a/gfx/pics/zubat/shiny.pal
+++ b/gfx/pokemon/zubat/shiny.pal
diff --git a/gfx/sprite_headers.asm b/gfx/sprite_headers.asm
deleted file mode 100644
index d41d62075..000000000
--- a/gfx/sprite_headers.asm
+++ /dev/null
@@ -1,111 +0,0 @@
-sprite_header: MACRO
-; pointer, length, type, palette
-	dw \1
-	db \2 * 4 tiles, BANK(\1)
-	db \3, \4
-ENDM
-
-SpriteHeaders: ; 14736
-; entries correspond to SPRITE_* constants
-	sprite_header ChrisSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1473c
-	sprite_header ChrisBikeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14742
-	sprite_header GameboyKidSpriteGFX, 3, STANDING_SPRITE, PAL_OW_GREEN ; 14748
-	sprite_header SilverSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1474e
-	sprite_header OakSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 14754
-	sprite_header RedSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1475a
-	sprite_header BlueSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14760
-	sprite_header BillSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14766
-	sprite_header ElderSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 1476c
-	sprite_header JanineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14772
-	sprite_header KurtSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 14778
-	sprite_header MomSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1477e
-	sprite_header BlaineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 14784
-	sprite_header RedsMomSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1478a
-	sprite_header DaisySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14790
-	sprite_header ElmSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 14796
-	sprite_header WillSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED ; 1479c
-	sprite_header FalknerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 147a2
-	sprite_header WhitneySpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 147a8
-	sprite_header BugsySpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN ; 147ae
-	sprite_header MortySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 147b4
-	sprite_header ChuckSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 147ba
-	sprite_header JasmineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN ; 147c0
-	sprite_header PryceSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 147c6
-	sprite_header ClairSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 147cc
-	sprite_header BrockSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 147d2
-	sprite_header KarenSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE ; 147d8
-	sprite_header BrunoSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 147de
-	sprite_header MistySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 147e4
-	sprite_header LanceSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 147ea
-	sprite_header SurgeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN ; 147f0
-	sprite_header ErikaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN ; 147f6
-	sprite_header KogaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 147fc
-	sprite_header SabrinaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14802
-	sprite_header CooltrainerMSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14808
-	sprite_header CooltrainerFSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 1480e
-	sprite_header BugCatcherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14814
-	sprite_header TwinSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1481a
-	sprite_header YoungsterSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14820
-	sprite_header LassSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14826
-	sprite_header TeacherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1482c
-	sprite_header BuenaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14832
-	sprite_header SuperNerdSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14838
-	sprite_header RockerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN ; 1483e
-	sprite_header PokefanMSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 14844
-	sprite_header PokefanFSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 1484a
-	sprite_header GrampsSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 14850
-	sprite_header GrannySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 14856
-	sprite_header SwimmerGuySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 1485c
-	sprite_header SwimmerGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14862
-	sprite_header BigSnorlaxSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE ; 14868
-	sprite_header SurfingPikachuSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1486e
-	sprite_header RocketSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 14874
-	sprite_header RocketGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 1487a
-	sprite_header NurseSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED ; 14880
-	sprite_header LinkReceptionistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14886
-	sprite_header ClerkSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN ; 1488c
-	sprite_header FisherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14892
-	sprite_header FishingGuruSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14898
-	sprite_header ScientistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 1489e
-	sprite_header KimonoGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 148a4
-	sprite_header SageSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 148aa
-	sprite_header UnusedGuySpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED ; 148b0
-	sprite_header GentlemanSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 148b6
-	sprite_header BlackBeltSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 148bc
-	sprite_header ReceptionistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 148c2
-	sprite_header OfficerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 148c8
-	sprite_header CalSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 148ce
-	sprite_header SlowpokeSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED ; 148d4
-	sprite_header CaptainSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 148da
-	sprite_header BigLaprasSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE ; 148e0
-	sprite_header GymGuySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 148e6
-	sprite_header SailorSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 148ec
-	sprite_header BikerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 148f2
-	sprite_header PharmacistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 148f8
-	sprite_header MonsterSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 148fe
-	sprite_header FairySpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14904
-	sprite_header BirdSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1490a
-	sprite_header DragonSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14910
-	sprite_header BigOnixSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BROWN ; 14916
-	sprite_header N64SpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN ; 1491c
-	sprite_header SudowoodoSpriteGFX, 3, STANDING_SPRITE, PAL_OW_GREEN ; 14922
-	sprite_header SurfSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14928
-	sprite_header PokeBallSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED ; 1492e
-	sprite_header PokedexSpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN ; 14934
-	sprite_header PaperSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE ; 1493a
-	sprite_header VirtualBoySpriteGFX, 1, STILL_SPRITE, PAL_OW_RED ; 14940
-	sprite_header OldLinkReceptionistSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED ; 14946
-	sprite_header RockSpriteGFX, 1, STILL_SPRITE, PAL_OW_ROCK ; 1494c
-	sprite_header BoulderSpriteGFX, 1, STILL_SPRITE, PAL_OW_ROCK ; 14952
-	sprite_header SnesSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE ; 14958
-	sprite_header FamicomSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED ; 1495e
-	sprite_header FruitTreeSpriteGFX, 1, STILL_SPRITE, PAL_OW_TREE ; 14964
-	sprite_header GoldTrophySpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN ; 1496a
-	sprite_header SilverTrophySpriteGFX, 1, STILL_SPRITE, PAL_OW_SILVER ; 14970
-	sprite_header KrisSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14976
-	sprite_header KrisBikeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 1497c
-	sprite_header KurtOutsideSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BROWN ; 14982
-	sprite_header SuicuneSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE ; 14988
-	sprite_header EnteiSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED ; 1498e
-	sprite_header RaikouSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED ; 14994
-	sprite_header StandingYoungsterSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE ; 1499a
diff --git a/home.asm b/home.asm
index 8bd081707..d46ba8cbf 100644
--- a/home.asm
+++ b/home.asm
@@ -1104,7 +1104,7 @@ PrintLevel:: ; 382d
 
 ; How many digits?
 	ld c, 2
-	cp 100
+	cp 100 ; This is distinct from MAX_LEVEL.
 	jr c, Print8BitNumRightAlign
 
 ; 3-digit numbers overwrite the :L.
diff --git a/home/audio.asm b/home/audio.asm
index 98e1fc40c..21e4f81f9 100644
--- a/home/audio.asm
+++ b/home/audio.asm
@@ -152,13 +152,13 @@ PlayCryHeader:: ; 3be3
 	ld a, [hROMBank]
 	push af
 
-	; Cry headers are stuck in one bank.
-	ld a, BANK(CryHeaders)
+	; Cries are stuck in one bank.
+	ld a, BANK(PokemonCries)
 	ld [hROMBank], a
 	ld [MBC3RomBank], a
 
-	ld hl, CryHeaders
-rept 6
+	ld hl, PokemonCries
+rept 6 ; sizeof(mon_cry)
 	add hl, de
 endr
 
diff --git a/home/cry.asm b/home/cry.asm
index aea7af03d..393534a29 100644
--- a/home/cry.asm
+++ b/home/cry.asm
@@ -62,11 +62,11 @@ LoadCryHeader:: ; 37f3
 
 	ld a, [hROMBank]
 	push af
-	ld a, BANK(CryHeaders)
+	ld a, BANK(PokemonCries)
 	rst Bankswitch
 
-	ld hl, CryHeaders
-rept 6
+	ld hl, PokemonCries
+rept 6 ; sizeof(mon_cry)
 	add hl, bc
 endr
 
diff --git a/home/init.asm b/home/init.asm
index 9023fada2..daac79da3 100644
--- a/home/init.asm
+++ b/home/init.asm
@@ -69,8 +69,8 @@ Init:: ; 17d
 	ld [rLCDC], a
 
 ; Clear WRAM bank 0
-	ld hl, wRAM0Start
-	ld bc, wRAM1Start - wRAM0Start
+	ld hl, WRAM0_Begin
+	ld bc, WRAM0_End - WRAM0_Begin
 .ByteFill:
 	ld [hl], 0
 	inc hl
@@ -87,8 +87,8 @@ Init:: ; 17d
 	ld a, [hFFEA]
 	push af
 	xor a
-	ld hl, HRAM_START
-	ld bc, HRAM_END - HRAM_START
+	ld hl, HRAM_Begin
+	ld bc, HRAM_End - HRAM_Begin
 	call ByteFill
 	pop af
 	ld [hFFEA], a
@@ -201,8 +201,8 @@ ClearWRAM:: ; 25a
 	push af
 	ld [rSVBK], a
 	xor a
-	ld hl, wRAM1Start
-	ld bc, $1000
+	ld hl, WRAM1_Begin
+	ld bc, WRAM1_End - WRAM1_Begin
 	call ByteFill
 	pop af
 	inc a
diff --git a/home/map.asm b/home/map.asm
index 1becaa64a..83b5adf11 100644
--- a/home/map.asm
+++ b/home/map.asm
@@ -1391,7 +1391,7 @@ UpdateBGMapColumn:: ; 27f8
 	ret
 ; 2821
 
-LoadTileset:: ; 2821
+LoadTilesetGFX:: ; 2821
 	ld hl, TilesetAddress
 	ld a, [hli]
 	ld h, [hl]
@@ -2054,7 +2054,7 @@ ReloadTilesetAndPalettes:: ; 2bae
 	call SwitchToAnyMapBank
 	farcall UpdateTimeOfDayPal
 	call OverworldTextModeSwitch
-	call LoadTileset
+	call LoadTilesetGFX
 	ld a, 9
 	call SkipMusic
 	pop af
@@ -2372,17 +2372,17 @@ GetFishingGroup:: ; 2d19
 	ret
 ; 2d27
 
-LoadTilesetHeader:: ; 2d27
+LoadTileset:: ; 2d27
 	push hl
 	push bc
 
 	ld hl, Tilesets
-	ld bc, TilesetHeaderEnd - TilesetHeader
+	ld bc, TilesetEnd - Tileset
 	ld a, [wTileset]
 	call AddNTimes
 
 	ld de, TilesetBank
-	ld bc, TilesetHeaderEnd - TilesetHeader
+	ld bc, TilesetEnd - Tileset
 
 	ld a, BANK(Tilesets)
 	call FarCopyBytes
diff --git a/home/palettes.asm b/home/palettes.asm
index 80e4e25ec..bf414eee7 100644
--- a/home/palettes.asm
+++ b/home/palettes.asm
@@ -246,7 +246,7 @@ CopyPals:: ; d50
 ; copy c palettes in order b from de to hl
 
 	push bc
-	ld c, 4 ; NUM_PAL_COLORS
+	ld c, NUM_PAL_COLORS
 .loop
 	push de
 	push hl
@@ -280,7 +280,7 @@ CopyPals:: ; d50
 	jr nz, .loop
 
 ; de += 8 (next pal)
-	ld a, 1 palettes ; NUM_PAL_COLORS * 2 ; bytes per pal
+	ld a, NUM_PAL_COLORS * 2
 	add e
 	jr nc, .ok
 	inc d
@@ -303,8 +303,8 @@ ClearVBank1:: ; d79
 	ld a, 1
 	ld [rVBK], a
 
-	ld hl, VTiles0
-	ld bc, VRAM_End - VTiles0
+	ld hl, VRAM_Begin
+	ld bc, VRAM_End - VRAM_Begin
 	xor a
 	call ByteFill
 
diff --git a/home/text.asm b/home/text.asm
index 4b0d0d5df..39d9a3ed1 100644
--- a/home/text.asm
+++ b/home/text.asm
@@ -1,17 +1,7 @@
-BORDER_WIDTH   EQU 2
-TEXTBOX_WIDTH  EQU SCREEN_WIDTH
-TEXTBOX_INNERW EQU TEXTBOX_WIDTH - BORDER_WIDTH
-TEXTBOX_HEIGHT EQU 6
-TEXTBOX_INNERH EQU TEXTBOX_HEIGHT - BORDER_WIDTH
-TEXTBOX_X      EQU 0
-TEXTBOX_INNERX EQU TEXTBOX_X + 1
-TEXTBOX_Y      EQU SCREEN_HEIGHT - TEXTBOX_HEIGHT
-TEXTBOX_INNERY EQU TEXTBOX_Y + 2
-
 ClearBox:: ; fb6
 ; Fill a c*b box at hl with blank tiles.
-
 	ld a, " "
+	; fallthrough
 
 FillBoxWithByte::
 .row
@@ -56,7 +46,6 @@ ClearScreen:: ; fdb
 ; fe8
 
 
-
 TextBox:: ; fe8
 ; Draw a text box at hl with room for
 ; b lines of c characters each.
diff --git a/hram.asm b/hram.asm
index d036085bc..3f84d19ca 100644
--- a/hram.asm
+++ b/hram.asm
@@ -1,4 +1,3 @@
-HRAM_START         EQU $ff80
 hPushOAM           EQU $ff80 ; 10 bytes
 
 hROMBankBackup     EQU $ff8a
@@ -124,5 +123,3 @@ hDMATransfer       EQU $ffe8
 hMobile            EQU $ffe9
 hFFEA              EQU $ffea
 hClockResetTrigger EQU $ffeb
-
-HRAM_END EQU $ffff
diff --git a/lib/mobile/main.asm b/lib/mobile/main.asm
index a383979e2..c2a03fbc0 100644
--- a/lib/mobile/main.asm
+++ b/lib/mobile/main.asm
@@ -4,7 +4,8 @@ charmap "<CR>", $d
 
 INCLUDE "constants/hardware_constants.asm"
 
-SECTION "Main", ROMX
+
+SECTION "Mobile Adapter SDK", ROMX
 
 Function110000: ; 110000 (44:4000)
 ; Copy b bytes from hl to de
diff --git a/macros.asm b/macros.asm
index cce53b45f..b6598c933 100644
--- a/macros.asm
+++ b/macros.asm
@@ -11,13 +11,13 @@ INCLUDE "macros/tilesets.asm"
 
 INCLUDE "macros/scripts/audio.asm"
 INCLUDE "macros/scripts/maps.asm"
-INCLUDE "macros/scripts/event.asm"
+INCLUDE "macros/scripts/events.asm"
 INCLUDE "macros/scripts/text.asm"
 INCLUDE "macros/scripts/movement.asm"
-INCLUDE "macros/scripts/effect_commands.asm"
-INCLUDE "macros/scripts/move_anim.asm"
-INCLUDE "macros/scripts/trade_anim.asm"
-INCLUDE "macros/scripts/gfx_anim.asm"
+INCLUDE "macros/scripts/battle_commands.asm"
+INCLUDE "macros/scripts/battle_anims.asm"
+INCLUDE "macros/scripts/trade_anims.asm"
+INCLUDE "macros/scripts/gfx_anims.asm"
 
 percent EQUS "* $ff / 100"
 
diff --git a/macros/predef.asm b/macros/predef.asm
index b99c6e1f2..139e3bf3a 100644
--- a/macros/predef.asm
+++ b/macros/predef.asm
@@ -1,6 +1,6 @@
 add_predef: MACRO
 \1Predef::
-	dwb \1, BANK(\1)
+	dab \1
 ENDM
 
 predef_id: MACRO
diff --git a/macros/scripts/audio.asm b/macros/scripts/audio.asm
index 83ff44963..b1d340a91 100644
--- a/macros/scripts/audio.asm
+++ b/macros/scripts/audio.asm
@@ -1,3 +1,8 @@
+musicheader: macro
+	; number of tracks, track idx, address
+	dbw ((\1 - 1) << 6) + (\2 - 1), \3
+	endm
+
 note: MACRO
 	dn (\1), (\2) - 1
 	ENDM
@@ -14,15 +19,6 @@ noise: macro
 	db \4 ; frequency
 	endm
 
-musicheader: macro
-	; number of tracks, track idx, address
-	dbw ((\1 - 1) << 6) + (\2 - 1), \3
-	endm
-
-cry_header: macro
-	dw \1, \2, \3
-	endm
-
 ; MusicCommands indexes (see audio/engine.asm)
 	enum_start $d8
 
diff --git a/macros/scripts/move_anim.asm b/macros/scripts/battle_anims.asm
index 7714bb09a..3c054d460 100644
--- a/macros/scripts/move_anim.asm
+++ b/macros/scripts/battle_anims.asm
@@ -5,7 +5,7 @@ endc
 	db \1
 	endm
 
-; BattleAnimCommands indexes (see battle/anim_commands.asm)
+; BattleAnimCommands indexes (see engine/battle_anims/anim_commands.asm)
 	enum_start $d0
 
 	enum anim_obj_command ; $d0
diff --git a/macros/scripts/effect_commands.asm b/macros/scripts/battle_commands.asm
index 4fd2475b7..5ac9009ff 100644
--- a/macros/scripts/effect_commands.asm
+++ b/macros/scripts/battle_commands.asm
@@ -3,7 +3,7 @@ command: macro
 \1 equs "db \1_command"
 endm
 
-; BattleCommandPointers indexes (see battle/effect_commands.asm)
+; BattleCommandPointers indexes (see data/battle_command_pointers.asm)
 	enum_start 1
 	command checkturn               ; 01
 	command checkobedience          ; 02
diff --git a/macros/scripts/event.asm b/macros/scripts/events.asm
index 1bf6b8622..1bf6b8622 100644
--- a/macros/scripts/event.asm
+++ b/macros/scripts/events.asm
diff --git a/macros/scripts/gfx_anim.asm b/macros/scripts/gfx_anims.asm
index a3fa710a0..a3fa710a0 100644
--- a/macros/scripts/gfx_anim.asm
+++ b/macros/scripts/gfx_anims.asm
diff --git a/macros/scripts/trade_anim.asm b/macros/scripts/trade_anims.asm
index 4b0291eea..4b0291eea 100644
--- a/macros/scripts/trade_anim.asm
+++ b/macros/scripts/trade_anims.asm
diff --git a/main.asm b/main.asm
index cb57726da..727453db8 100644
--- a/main.asm
+++ b/main.asm
@@ -11,10 +11,10 @@ INCLUDE "engine/init_map.asm"
 INCLUDE "engine/learn.asm"
 INCLUDE "engine/routines/checknickerrors.asm"
 INCLUDE "engine/math.asm"
-INCLUDE "data/items/item_attributes.asm"
+INCLUDE "data/items/attributes.asm"
 INCLUDE "engine/npc_movement.asm"
-INCLUDE "event/happiness_egg.asm"
-INCLUDE "event/special.asm"
+INCLUDE "engine/events/happiness_egg.asm"
+INCLUDE "engine/events/special.asm"
 
 
 SECTION "bank2", ROMX
@@ -31,16 +31,16 @@ INCLUDE "engine/routines/checktime.asm"
 INCLUDE "engine/specials.asm"
 INCLUDE "engine/printnum.asm"
 INCLUDE "engine/health.asm"
-INCLUDE "event/overworld.asm"
+INCLUDE "engine/events/overworld.asm"
 INCLUDE "engine/items.asm"
 INCLUDE "engine/player_step.asm"
-INCLUDE "engine/anim_hp_bar.asm"
+INCLUDE "engine/battle/anim_hp_bar.asm"
 INCLUDE "engine/move_mon.asm"
 INCLUDE "engine/billspctop.asm"
 INCLUDE "engine/routines/getbreedmonlevelgrowth.asm"
-INCLUDE "event/bug_contest/caught_mon.asm"
+INCLUDE "engine/events/bug_contest/caught_mon.asm"
 INCLUDE "engine/item_effects.asm"
-INCLUDE "engine/routines/getpokeballwobble.asm"
+INCLUDE "engine/battle_anims/getpokeballwobble.asm"
 INCLUDE "engine/routines/knowsmove.asm"
 
 
@@ -50,20 +50,20 @@ INCLUDE "engine/pack.asm"
 INCLUDE "engine/time.asm"
 INCLUDE "engine/tmhm.asm"
 INCLUDE "engine/namingscreen.asm"
-INCLUDE "event/misc_scripts.asm"
-INCLUDE "event/heal_machine_anim.asm"
-INCLUDE "event/whiteout.asm"
-INCLUDE "event/forced_movement.asm"
-INCLUDE "event/itemfinder.asm"
+INCLUDE "engine/events/misc_scripts.asm"
+INCLUDE "engine/events/heal_machine_anim.asm"
+INCLUDE "engine/events/whiteout.asm"
+INCLUDE "engine/events/forced_movement.asm"
+INCLUDE "engine/events/itemfinder.asm"
 INCLUDE "engine/start_menu.asm"
 INCLUDE "engine/select_menu.asm"
-INCLUDE "event/elevator.asm"
-INCLUDE "event/bug_contest/contest.asm"
-INCLUDE "event/misc_scripts_2.asm"
-INCLUDE "event/std_collision.asm"
-INCLUDE "event/bug_contest/judging.asm"
-INCLUDE "engine/pokerus/apply_pokerus_tick.asm"
-INCLUDE "event/bug_contest/contest_2.asm"
+INCLUDE "engine/events/elevator.asm"
+INCLUDE "engine/events/bug_contest/contest.asm"
+INCLUDE "engine/events/misc_scripts_2.asm"
+INCLUDE "engine/events/std_collision.asm"
+INCLUDE "engine/events/bug_contest/judging.asm"
+INCLUDE "engine/events/pokerus/apply_pokerus_tick.asm"
+INCLUDE "engine/events/bug_contest/contest_2.asm"
 INCLUDE "engine/routines/correcterrorsinplayerparty.asm"
 INCLUDE "engine/routines/getsquareroot.asm"
 
@@ -76,14 +76,14 @@ INCLUDE "engine/tile_events.asm"
 INCLUDE "engine/save.asm"
 INCLUDE "engine/spawn_points.asm"
 INCLUDE "engine/map_setup.asm"
-INCLUDE "engine/pokecenter_pc.asm"
+INCLUDE "engine/events/pokecenter_pc.asm"
 INCLUDE "engine/mart.asm"
 INCLUDE "engine/money.asm"
 INCLUDE "data/items/marts.asm"
-INCLUDE "event/mom.asm"
-INCLUDE "event/daycare.asm"
-INCLUDE "event/print_unown.asm"
-INCLUDE "event/print_photo.asm"
+INCLUDE "engine/events/mom.asm"
+INCLUDE "engine/events/daycare.asm"
+INCLUDE "engine/events/print_unown.asm"
+INCLUDE "engine/events/print_photo.asm"
 INCLUDE "engine/breeding.asm"
 
 
@@ -105,31 +105,32 @@ SECTION "bank9", ROMX
 INCLUDE "data/text_buffers.asm"
 INCLUDE "engine/menu.asm"
 INCLUDE "engine/routines/updateitemdescription.asm"
-INCLUDE "engine/pokepic.asm"
+INCLUDE "engine/events/pokepic.asm"
 INCLUDE "engine/map_objects_2.asm"
 INCLUDE "engine/scrolling_menu.asm"
 INCLUDE "engine/switch_items.asm"
 INCLUDE "engine/menu_2.asm"
 INCLUDE "engine/mon_menu.asm"
-INCLUDE "battle/menu.asm"
+INCLUDE "engine/battle/menu.asm"
 INCLUDE "engine/buy_sell_toss.asm"
 INCLUDE "engine/trainer_card.asm"
-INCLUDE "engine/prof_oaks_pc.asm"
+INCLUDE "engine/events/prof_oaks_pc.asm"
 INCLUDE "engine/decorations.asm"
 INCLUDE "engine/routines/leveluphappinessmod.asm"
-INCLUDE "data/trainers/trainer_dvs.asm"
-INCLUDE "engine/routines/returntobattle_useball.asm"
-INCLUDE "engine/routines/consumehelditem.asm"
-INCLUDE "battle/moves/move_effects_pointers.asm"
-INCLUDE "battle/moves/move_effects.asm"
-INCLUDE "engine/routines/kurt_selectquantity_interpretjoypad.asm"
+INCLUDE "engine/battle/read_trainer_dvs.asm"
+INCLUDE "data/trainers/dvs.asm"
+INCLUDE "engine/battle/returntobattle_useball.asm"
+INCLUDE "engine/battle/consumehelditem.asm"
+INCLUDE "data/moves/effects_pointers.asm"
+INCLUDE "data/moves/effects.asm"
+INCLUDE "engine/events/kurt_selectquantity_interpretjoypad.asm"
 
 
 SECTION "bankA", ROMX
 
 INCLUDE "engine/link.asm"
 INCLUDE "engine/wildmons.asm"
-INCLUDE "battle/link_result.asm"
+INCLUDE "engine/battle/link_result.asm"
 
 ChrisBackpic: ; 2ba1a
 INCBIN "gfx/player/chris_back.2bpp.lz"
@@ -140,68 +141,68 @@ INCBIN "gfx/battle/dude.2bpp.lz"
 
 SECTION "bankB", ROMX
 
-INCLUDE "battle/trainer_huds.asm"
-INCLUDE "data/trainers/trainer_class_names.asm"
-INCLUDE "battle/ai/redundant.asm"
-INCLUDE "event/move_deleter.asm"
+INCLUDE "engine/battle/trainer_huds.asm"
+INCLUDE "data/trainers/class_names.asm"
+INCLUDE "engine/battle/ai/redundant.asm"
+INCLUDE "engine/events/move_deleter.asm"
 INCLUDE "engine/mystery_gift_2.asm"
 INCLUDE "engine/tmhm2.asm"
-INCLUDE "battle/moves/move_descriptions.asm"
-INCLUDE "engine/pokerus/pokerus.asm"
-INCLUDE "engine/start_battle.asm"
+INCLUDE "data/moves/descriptions.asm"
+INCLUDE "engine/events/pokerus/pokerus.asm"
+INCLUDE "engine/battle/start_battle.asm"
 INCLUDE "engine/routines/placegraphic.asm"
 
 
 SECTION "Effect Commands", ROMX
 
-INCLUDE "battle/effect_commands.asm"
+INCLUDE "engine/battle/effect_commands.asm"
 
 
 SECTION "Enemy Trainers", ROMX
 
-INCLUDE "battle/ai/items.asm"
-INCLUDE "battle/ai/scoring.asm"
-INCLUDE "engine/read_trainer_attributes.asm"
-INCLUDE "data/trainers/trainer_attributes.asm"
-INCLUDE "engine/read_trainer_party.asm"
+INCLUDE "engine/battle/ai/items.asm"
+INCLUDE "engine/battle/ai/scoring.asm"
+INCLUDE "engine/battle/read_trainer_attributes.asm"
+INCLUDE "data/trainers/attributes.asm"
+INCLUDE "engine/battle/read_trainer_party.asm"
 INCLUDE "data/trainers/party_pointers.asm"
 INCLUDE "data/trainers/parties.asm"
 
 
 SECTION "Battle Core", ROMX
 
-INCLUDE "battle/core.asm"
-INCLUDE "battle/effect_command_pointers.asm"
+INCLUDE "engine/battle/core.asm"
+INCLUDE "data/battle_command_pointers.asm"
 
 
 SECTION "bank10", ROMX
 
 INCLUDE "engine/pokedex.asm"
-INCLUDE "battle/moves/moves.asm"
+INCLUDE "data/moves/moves.asm"
 INCLUDE "engine/evolve.asm"
 
 
 SECTION "bank11", ROMX
 
-INCLUDE "engine/fruit_trees.asm"
-INCLUDE "battle/ai/move.asm"
+INCLUDE "engine/events/fruit_trees.asm"
+INCLUDE "engine/battle/ai/move.asm"
 INCLUDE "engine/pokedex_2.asm"
 INCLUDE "data/pokemon/dex_entry_pointers.asm"
 INCLUDE "engine/mail.asm"
 
 
-SECTION "Crystal Unique", ROMX
+SECTION "Crystal Features 1", ROMX
 
 INCLUDE "engine/init_gender.asm"
 INCLUDE "engine/routines/drawkrispackgfx.asm"
-INCLUDE "event/move_tutor.asm"
+INCLUDE "engine/events/move_tutor.asm"
 INCLUDE "engine/crystal_colors.asm"
-INCLUDE "event/celebi.asm"
+INCLUDE "engine/events/celebi.asm"
 INCLUDE "engine/main_menu.asm"
 INCLUDE "mobile/mobile_menu.asm"
 INCLUDE "engine/search.asm"
 INCLUDE "mobile/mobile_12_2.asm"
-INCLUDE "event/buena_menu.asm"
+INCLUDE "engine/events/buena_menu.asm"
 
 
 SECTION "bank13", ROMX
@@ -220,7 +221,7 @@ INCLUDE "data/collision_permissions.asm"
 INCLUDE "engine/routines/emptyallsrambanks.asm"
 INCLUDE "engine/routines/savemenu_copytilemapatonce.asm"
 INCLUDE "engine/routines/checksave.asm"
-INCLUDE "data/maps/map_scenes.asm"
+INCLUDE "data/maps/scenes.asm"
 INCLUDE "engine/routines/loadmappart.asm"
 INCLUDE "engine/routines/phonering_copytilemapatonce.asm"
 
@@ -232,36 +233,36 @@ INCBIN "gfx/shrink/shrink2.2bpp.lz"
 
 INCLUDE "engine/link_2.asm"
 INCLUDE "engine/delete_save_change_clock.asm"
-INCLUDE "tilesets/tileset_headers.asm"
+INCLUDE "tilesets/tilesets.asm"
 INCLUDE "engine/routines/flagpredef.asm"
 INCLUDE "engine/routines/trademonfrontpic.asm"
-INCLUDE "engine/pokerus/check_pokerus.asm"
-INCLUDE "event/lucky_number.asm"
+INCLUDE "engine/events/pokerus/check_pokerus.asm"
+INCLUDE "engine/events/lucky_number.asm"
 INCLUDE "engine/caught_data.asm"
 INCLUDE "engine/search2.asm"
 INCLUDE "engine/stats_screen.asm"
-INCLUDE "event/catch_tutorial.asm"
+INCLUDE "engine/events/catch_tutorial.asm"
 INCLUDE "engine/evolution_animation.asm"
 INCLUDE "engine/init_hof_credits.asm"
 INCLUDE "mobile/get_trainer_class.asm"
-INCLUDE "battle/sliding_intro.asm"
+INCLUDE "engine/battle/sliding_intro.asm"
 INCLUDE "mobile/print_opp_message.asm"
-INCLUDE "engine/routines/checkbattlescene.asm"
+INCLUDE "engine/battle/checkbattlescene.asm"
 INCLUDE "engine/gbc_only.asm"
-INCLUDE "event/poke_seer.asm"
+INCLUDE "engine/events/poke_seer.asm"
 
 
 SECTION "bank14", ROMX
 
 INCLUDE "engine/party_menu.asm"
-INCLUDE "event/poisonstep.asm"
-INCLUDE "event/sweet_scent.asm"
-INCLUDE "event/squirtbottle.asm"
-INCLUDE "event/card_key.asm"
-INCLUDE "event/basement_key.asm"
-INCLUDE "event/sacred_ash.asm"
+INCLUDE "engine/events/poisonstep.asm"
+INCLUDE "engine/events/sweet_scent.asm"
+INCLUDE "engine/events/squirtbottle.asm"
+INCLUDE "engine/events/card_key.asm"
+INCLUDE "engine/events/basement_key.asm"
+INCLUDE "engine/events/sacred_ash.asm"
 INCLUDE "engine/tempmon.asm"
-INCLUDE "text/types.asm"
+INCLUDE "engine/types.asm"
 INCLUDE "text/unused_gen_1_trainers.asm"
 INCLUDE "engine/mon_stats.asm"
 INCLUDE "engine/routines/initlist.asm"
@@ -270,7 +271,7 @@ INCLUDE "engine/routines/switchpartymons.asm"
 INCLUDE "gfx/load_pics.asm"
 INCLUDE "engine/move_mon_wo_mail.asm"
 INCLUDE "data/pokemon/base_stats.asm"
-INCLUDE "data/pokemon/pokemon_names.asm"
+INCLUDE "data/pokemon/names.asm"
 
 Unknown_53d84: ; unreferenced
 	db $1a, $15
@@ -308,29 +309,29 @@ INCLUDE "engine/debug.asm"
 SECTION "bank21", ROMX
 
 INCLUDE "engine/printer.asm"
-INCLUDE "battle/anim_gfx.asm"
-INCLUDE "event/halloffame.asm"
+INCLUDE "gfx/battle_anims.asm"
+INCLUDE "engine/events/halloffame.asm"
 
 
-SECTION "bank22", ROMX
+SECTION "Crystal Features 2", ROMX
 
-INCLUDE "event/kurt.asm"
+INCLUDE "engine/events/kurt.asm"
 INCLUDE "engine/player_gfx.asm"
 INCLUDE "mobile/mobile_22.asm"
-INCLUDE "event/unown.asm"
-INCLUDE "event/buena.asm"
-INCLUDE "event/dratini.asm"
-INCLUDE "event/battle_tower.asm"
+INCLUDE "engine/events/crystal_unown.asm"
+INCLUDE "engine/events/buena.asm"
+INCLUDE "engine/events/dratini.asm"
+INCLUDE "engine/events/battle_tower_rules.asm"
 INCLUDE "mobile/mobile_22_2.asm"
 
 
 SECTION "bank23", ROMX
 
 INCLUDE "engine/timeofdaypals.asm"
-INCLUDE "engine/battle_transition.asm"
-INCLUDE "event/field_moves.asm"
-INCLUDE "event/magnet_train.asm"
-INCLUDE "engine/routines/battlestart_copytilemapatonce.asm"
+INCLUDE "engine/battle/battle_transition.asm"
+INCLUDE "engine/events/field_moves.asm"
+INCLUDE "engine/events/magnet_train.asm"
+INCLUDE "engine/battle/battlestart_copytilemapatonce.asm"
 INCLUDE "engine/sprites.asm"
 INCLUDE "engine/mon_icons.asm"
 
@@ -340,7 +341,7 @@ SECTION "bank24", ROMX
 INCLUDE "engine/phone/phone.asm"
 INCLUDE "engine/timeset.asm"
 INCLUDE "engine/pokegear.asm"
-INCLUDE "engine/fish.asm"
+INCLUDE "engine/events/fish.asm"
 INCLUDE "engine/slot_machine.asm"
 
 
@@ -376,55 +377,61 @@ SECTION "bank2E", ROMX
 
 INCLUDE "engine/events_3.asm"
 INCLUDE "engine/radio.asm"
-INCLUDE "gfx/mail.asm"
+INCLUDE "engine/mail_2.asm"
 
 
 SECTION "bank2F", ROMX
 
-INCLUDE "engine/std_scripts.asm"
+INCLUDE "engine/events/std_scripts.asm"
 INCLUDE "engine/phone/phone_scripts.asm"
 INCLUDE "engine/phone/generic_calls.asm"
-INCLUDE "engine/trainer_scripts.asm"
+INCLUDE "engine/events/trainer_scripts.asm"
 
 
 SECTION "bank32", ROMX
 
-INCLUDE "battle/bg_effects.asm"
-INCLUDE "battle/anims.asm"
-INCLUDE "event/poisonstep_pals.asm"
+INCLUDE "engine/battle_anims/bg_effects.asm"
+INCLUDE "data/moves/animations.asm"
+INCLUDE "engine/events/poisonstep_pals.asm"
 
 TheEndGFX:: ; cbd2e
 INCBIN "gfx/credits/theend.2bpp"
 
 
-SECTION "bank33", ROMX
+SECTION "Move Animations", ROMX
 
-INCLUDE "event/bug_contest/display_stats.asm"
-INCLUDE "battle/anim_commands.asm"
-INCLUDE "battle/anim_objects.asm"
+INCLUDE "engine/events/bug_contest/display_stats.asm"
+INCLUDE "engine/battle_anims/anim_commands.asm"
+INCLUDE "engine/battle_anims/engine.asm"
+INCLUDE "data/battle_anims/objects.asm"
+INCLUDE "engine/battle_anims/functions.asm"
+INCLUDE "engine/battle_anims/helpers.asm"
+INCLUDE "data/battle_anims/framesets.asm"
+INCLUDE "data/battle_anims/oam.asm"
+INCLUDE "data/battle_anims/object_gfx.asm"
 
 
 SECTION "Pic Animations 1", ROMX
 
-INCLUDE "gfx/pics/animation.asm"
-INCLUDE "gfx/pics/anim_pointers.asm"
-INCLUDE "gfx/pics/anims.asm"
-INCLUDE "gfx/pics/extra_pointers.asm"
-INCLUDE "gfx/pics/extras.asm"
-INCLUDE "gfx/pics/unown_anim_pointers.asm"
-INCLUDE "gfx/pics/unown_anims.asm"
-INCLUDE "gfx/pics/unown_extra_pointers.asm"
-INCLUDE "gfx/pics/unown_extras.asm"
-INCLUDE "gfx/pics/bitmask_pointers.asm"
-INCLUDE "gfx/pics/bitmasks.asm"
-INCLUDE "gfx/pics/unown_bitmask_pointers.asm"
-INCLUDE "gfx/pics/unown_bitmasks.asm"
+INCLUDE "engine/pic_animation.asm"
+INCLUDE "gfx/pokemon/anim_pointers.asm"
+INCLUDE "gfx/pokemon/anims.asm"
+INCLUDE "gfx/pokemon/extra_pointers.asm"
+INCLUDE "gfx/pokemon/extras.asm"
+INCLUDE "gfx/pokemon/unown_anim_pointers.asm"
+INCLUDE "gfx/pokemon/unown_anims.asm"
+INCLUDE "gfx/pokemon/unown_extra_pointers.asm"
+INCLUDE "gfx/pokemon/unown_extras.asm"
+INCLUDE "gfx/pokemon/bitmask_pointers.asm"
+INCLUDE "gfx/pokemon/bitmasks.asm"
+INCLUDE "gfx/pokemon/unown_bitmask_pointers.asm"
+INCLUDE "gfx/pokemon/unown_bitmasks.asm"
 
 
 SECTION "Pic Animations 2", ROMX
 
-INCLUDE "gfx/pics/frame_pointers.asm"
-INCLUDE "gfx/pics/kanto_frames.asm"
+INCLUDE "gfx/pokemon/frame_pointers.asm"
+INCLUDE "gfx/pokemon/kanto_frames.asm"
 
 
 SECTION "Font Inversed", ROMX
@@ -435,14 +442,14 @@ INCBIN "gfx/font/font_inversed.1bpp"
 
 SECTION "Pic Animations 3", ROMX
 
-INCLUDE "gfx/pics/johto_frames.asm"
-INCLUDE "gfx/pics/unown_frame_pointers.asm"
-INCLUDE "gfx/pics/unown_frames.asm"
+INCLUDE "gfx/pokemon/johto_frames.asm"
+INCLUDE "gfx/pokemon/unown_frame_pointers.asm"
+INCLUDE "gfx/pokemon/unown_frames.asm"
 
 
 SECTION "bank38", ROMX
 
-INCLUDE "event/print_unown_2.asm"
+INCLUDE "engine/events/print_unown_2.asm"
 
 Unknown_e00ed:
 ; Graphics for an unused Game Corner
@@ -471,21 +478,21 @@ SECTION "bank3E", ROMX
 
 INCLUDE "gfx/font.asm"
 INCLUDE "engine/time_capsule.asm"
-INCLUDE "event/name_rater.asm"
+INCLUDE "engine/events/name_rater.asm"
 INCLUDE "engine/routines/playslowcry.asm"
 INCLUDE "engine/routines/newpokedexentry.asm"
 INCLUDE "engine/time_capsule_2.asm"
 INCLUDE "engine/unown_dex.asm"
-INCLUDE "event/magikarp.asm"
-INCLUDE "battle/hidden_power.asm"
-INCLUDE "battle/misc.asm"
+INCLUDE "engine/events/magikarp.asm"
+INCLUDE "engine/battle/hidden_power.asm"
+INCLUDE "engine/battle/misc.asm"
 
 
 SECTION "bank3F", ROMX
 
 INCLUDE "tilesets/animations.asm"
 INCLUDE "engine/npctrade.asm"
-INCLUDE "event/mom_phone.asm"
+INCLUDE "engine/events/mom_phone.asm"
 
 
 INCLUDE "mobile/mobile_40.asm"
@@ -497,12 +504,12 @@ INCLUDE "engine/dma_transfer.asm"
 INCLUDE "gfx/emotes.asm"
 INCLUDE "engine/warp_connection.asm"
 INCLUDE "engine/mystery_gift.asm"
-INCLUDE "battle/used_move_text.asm"
+INCLUDE "engine/battle/used_move_text.asm"
 INCLUDE "mobile/mobile_41.asm"
 INCLUDE "gfx/overworld_font.asm"
 
 
-SECTION "mobile_42", ROMX
+SECTION "Mobile 42", ROMX
 
 INCLUDE "mobile/mobile_42.asm"
 
@@ -513,7 +520,7 @@ IntroLogoGFX: ; 109407
 INCBIN "gfx/intro/logo.2bpp.lz"
 
 
-SECTION "bank43", ROMX
+SECTION "Title", ROMX
 
 INCLUDE "engine/unused_title.asm"
 INCLUDE "engine/title.asm"
@@ -525,7 +532,7 @@ INCLUDE "mobile/mobile_45.asm"
 INCLUDE "mobile/mobile_46.asm"
 
 
-SECTION "battle_tower_47", ROMX
+SECTION "Battle Tower", ROMX
 
 INCLUDE "mobile/battle_tower_47.asm"
 
@@ -536,7 +543,7 @@ INCLUDE "mobile/mobile_5b.asm"
 INCLUDE "engine/link_trade.asm"
 
 
-SECTION "mobile_5c", ROMX
+SECTION "Mobile 5C", ROMX
 
 INCLUDE "mobile/mobile_5c.asm"
 
@@ -546,17 +553,17 @@ SECTION "Crystal Phone Text 2", ROMX
 INCLUDE "text/phone/extra2.asm"
 
 
-SECTION "bank5E", ROMX
+SECTION "UpdateBattleHUDs", ROMX
 
-INCLUDE "engine/routines/updatebattlehuds.asm"
+INCLUDE "engine/battle/updatebattlehuds.asm"
 
 
-SECTION "mobile_5e", ROMX
+SECTION "Mobile 5E", ROMX
 
 INCLUDE "mobile/mobile_5e.asm"
 
 
-SECTION "bank5F", ROMX
+SECTION "Mobile 5F", ROMX
 
 INCLUDE "mobile/mobile_5f.asm"
 
@@ -585,11 +592,11 @@ INCLUDE "text/phone/elm.asm"
 INCLUDE "text/phone/trainers1.asm"
 
 
-SECTION "bank72", ROMX
+SECTION "Miscellaneous Text", ROMX
 
-INCLUDE "data/items/item_names.asm"
-INCLUDE "data/items/item_descriptions.asm"
-INCLUDE "battle/move_names.asm"
+INCLUDE "data/items/names.asm"
+INCLUDE "data/items/descriptions.asm"
+INCLUDE "data/moves/names.asm"
 INCLUDE "engine/landmarks.asm"
 
 
@@ -606,7 +613,7 @@ SECTION "bank77_2", ROMX
 INCLUDE "engine/routines/printhoursmins.asm"
 INCLUDE "engine/diploma.asm"
 INCLUDE "engine/pokedex_3.asm"
-INCLUDE "event/catch_tutorial_input.asm"
+INCLUDE "engine/events/catch_tutorial_input.asm"
 INCLUDE "engine/routines/townmap_convertlinebreakcharacters.asm"
 
 PokegearGFX: ; 1de2e4
@@ -630,13 +637,10 @@ SECTION "Mobile News Data", ROMX
 INCLUDE "mobile/news/news.asm"
 
 
-SECTION "bank7E", ROMX
+SECTION "Crystal Events", ROMX
 
-INCLUDE "engine/battle_tower.asm"
-INCLUDE "engine/odd_eggs.asm"
-
-
-SECTION "bank7F", ROMX
+INCLUDE "engine/events/battle_tower.asm"
+INCLUDE "engine/events/odd_egg.asm"
 
 
 SECTION "Mobile Stadium 2", ROMX
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm
index 54f9432d1..c9d5d9763 100644
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -91,35 +91,35 @@ TrainerTwinsAmyandmay2:
 	closetext
 	end
 
-TrainerBug_catcherbenny:
-	trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, Bug_catcherbennySeenText, Bug_catcherbennyBeatenText, 0, .AfterScript
+TrainerBugCatcherBenny:
+	trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, BugCatcherBennySeenText, BugCatcherBennyBeatenText, 0, .AfterScript
 
 .AfterScript:
 	end_if_just_battled
 	opentext
-	writetext Bug_catcherbennyAfterBattleText
+	writetext BugCatcherBennyAfterBattleText
 	waitbutton
 	closetext
 	end
 
-TrainerBug_catcherAl:
-	trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, Bug_catcherAlSeenText, Bug_catcherAlBeatenText, 0, .AfterScript
+TrainerBugCatcherAl:
+	trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, BugCatcherAlSeenText, BugCatcherAlBeatenText, 0, .AfterScript
 
 .AfterScript:
 	end_if_just_battled
 	opentext
-	writetext Bug_catcherAlAfterBattleText
+	writetext BugCatcherAlAfterBattleText
 	waitbutton
 	closetext
 	end
 
-TrainerBug_catcherJosh:
-	trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, Bug_catcherJoshSeenText, Bug_catcherJoshBeatenText, 0, .AfterScript
+TrainerBugCatcherJosh:
+	trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, BugCatcherJoshSeenText, BugCatcherJoshBeatenText, 0, .AfterScript
 
 .AfterScript:
 	end_if_just_battled
 	opentext
-	writetext Bug_catcherJoshAfterBattleText
+	writetext BugCatcherJoshAfterBattleText
 	waitbutton
 	closetext
 	end
@@ -232,7 +232,7 @@ BugsyText_BugMonsAreDeep:
 	line "ites thoroughly."
 	done
 
-Bug_catcherbennySeenText:
+BugCatcherBennySeenText:
 	text "Bug #MON evolve"
 	line "young. So they get"
 
@@ -240,18 +240,18 @@ Bug_catcherbennySeenText:
 	line "faster."
 	done
 
-Bug_catcherbennyBeatenText:
+BugCatcherBennyBeatenText:
 	text "Just evolving"
 	line "isn't enough!"
 	done
 
-Bug_catcherbennyAfterBattleText:
+BugCatcherBennyAfterBattleText:
 	text "#MON become"
 	line "stronger if they"
 	cont "evolve. Really!"
 	done
 
-Bug_catcherAlSeenText:
+BugCatcherAlSeenText:
 	text "Bug #MON are"
 	line "cool and tough!"
 
@@ -259,12 +259,12 @@ Bug_catcherAlSeenText:
 	line "you!"
 	done
 
-Bug_catcherAlBeatenText:
+BugCatcherAlBeatenText:
 	text "You proved how"
 	line "tough you are…"
 	done
 
-Bug_catcherAlAfterBattleText:
+BugCatcherAlAfterBattleText:
 	text "They're so cool,"
 	line "but most girls"
 
@@ -274,7 +274,7 @@ Bug_catcherAlAfterBattleText:
 	para "I don't know why…"
 	done
 
-Bug_catcherJoshSeenText:
+BugCatcherJoshSeenText:
 	text "You saved all the"
 	line "SLOWPOKE? Whew,"
 	cont "you're mighty!"
@@ -284,11 +284,11 @@ Bug_catcherJoshSeenText:
 	cont "tough too!"
 	done
 
-Bug_catcherJoshBeatenText:
+BugCatcherJoshBeatenText:
 	text "Urrgggh!"
 	done
 
-Bug_catcherJoshAfterBattleText:
+BugCatcherJoshAfterBattleText:
 	text "I guess I should"
 	line "teach them better"
 	cont "moves…"
@@ -381,9 +381,9 @@ AzaleaGym_MapEventHeader:
 .ObjectEvents:
 	db 7
 	object_event SPRITE_BUGSY, 7, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1
-	object_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBug_catcherbenny, -1
-	object_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherAl, -1
-	object_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherJosh, -1
+	object_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherBenny, -1
+	object_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherAl, -1
+	object_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherJosh, -1
 	object_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1
 	object_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1
 	object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1
diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm
index f2a7717f6..ab2febc5f 100644
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -22,13 +22,13 @@ TrainerFirebreatherLyle:
 	closetext
 	end
 
-TrainerBug_catcherKen:
-	trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, Bug_catcherKenSeenText, Bug_catcherKenBeatenText, 0, .Script
+TrainerBugCatcherKen:
+	trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, BugCatcherKenSeenText, BugCatcherKenBeatenText, 0, .Script
 
 .Script:
 	end_if_just_battled
 	opentext
-	writetext Bug_catcherKenAfterBattleText
+	writetext BugCatcherKenAfterBattleText
 	waitbutton
 	closetext
 	end
@@ -132,18 +132,18 @@ FirebreatherLyleAfterBattleText:
 	line "Really?"
 	done
 
-Bug_catcherKenSeenText:
+BugCatcherKenSeenText:
 	text "I'm visiting my"
 	line "grandma to catch"
 	cont "me some bugs!"
 	done
 
-Bug_catcherKenBeatenText:
+BugCatcherKenBeatenText:
 	text "Ooh, wow."
 	line "You're tough!"
 	done
 
-Bug_catcherKenAfterBattleText:
+BugCatcherKenAfterBattleText:
 	text "You can find lots"
 	line "of #MON in the"
 	cont "trees of JOHTO!"
@@ -246,6 +246,6 @@ FastShipCabins_SW_SSW_NW_MapEventHeader:
 .ObjectEvents:
 	db 4
 	object_event SPRITE_FISHER, 15, 1, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
-	object_event SPRITE_BUG_CATCHER, 15, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBug_catcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event SPRITE_BUG_CATCHER, 15, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
 	object_event SPRITE_BUENA, 26, 1, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
 	object_event SPRITE_ROCKER, 28, 3, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm
index 6ce300e27..fc9bbca86 100644
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -387,13 +387,13 @@ IlexForestHeadbuttGuyScript:
 	closetext
 	end
 
-TrainerBug_catcherWayne:
-	trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, Bug_catcherWayneSeenText, Bug_catcherWayneBeatenText, 0, .Script
+TrainerBugCatcherWayne:
+	trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, BugCatcherWayneSeenText, BugCatcherWayneBeatenText, 0, .Script
 
 .Script:
 	end_if_just_battled
 	opentext
-	writetext Bug_catcherWayneAfterBattleText
+	writetext BugCatcherWayneAfterBattleText
 	waitbutton
 	closetext
 	end
@@ -913,7 +913,7 @@ Text_KurtCaughtCelebi:
 	para "I'm going!"
 	done
 
-Bug_catcherWayneSeenText:
+BugCatcherWayneSeenText:
 	text "Don't sneak up on"
 	line "me like that!"
 
@@ -921,12 +921,12 @@ Bug_catcherWayneSeenText:
 	line "#MON away!"
 	done
 
-Bug_catcherWayneBeatenText:
+BugCatcherWayneBeatenText:
 	text "I hadn't seen that"
 	line "#MON before…"
 	done
 
-Bug_catcherWayneAfterBattleText:
+BugCatcherWayneAfterBattleText:
 	text "A #MON I've"
 	line "never seen before"
 
@@ -969,7 +969,7 @@ IlexForest_MapEventHeader:
 	object_event SPRITE_POKE_BALL, 32, 20, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestRevive, EVENT_ILEX_FOREST_REVIVE
 	object_event SPRITE_KURT, 29, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT
 	object_event SPRITE_LASS, 24, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestLassScript, EVENT_ILEX_FOREST_LASS
-	object_event SPRITE_YOUNGSTER, 1, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerBug_catcherWayne, -1
+	object_event SPRITE_YOUNGSTER, 1, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerBugCatcherWayne, -1
 	object_event SPRITE_POKE_BALL, 17, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestXAttack, EVENT_ILEX_FOREST_X_ATTACK
 	object_event SPRITE_POKE_BALL, 7, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestAntidote, EVENT_ILEX_FOREST_ANTIDOTE
 	object_event SPRITE_POKE_BALL, 1, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestEther, EVENT_ILEX_FOREST_ETHER
diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm
index 847de0e44..500dab0c9 100644
--- a/maps/OlivineLighthouse3F.asm
+++ b/maps/OlivineLighthouse3F.asm
@@ -11,13 +11,13 @@ OlivineLighthouse3F_MapScriptHeader:
 .MapCallbacks:
 	db 0
 
-TrainerBird_keeperTheo:
-	trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, 0, .Script
+TrainerBirdKeeperTheo:
+	trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, BirdKeeperTheoSeenText, BirdKeeperTheoBeatenText, 0, .Script
 
 .Script:
 	end_if_just_battled
 	opentext
-	writetext Bird_keeperTheoAfterBattleText
+	writetext BirdKeeperTheoAfterBattleText
 	waitbutton
 	closetext
 	end
@@ -47,7 +47,7 @@ TrainerSailorTerrell:
 OlivineLighthouse3FEther:
 	itemball ETHER
 
-Bird_keeperTheoSeenText:
+BirdKeeperTheoSeenText:
 	text "Why are you here?"
 	line "Are you just going"
 
@@ -55,12 +55,12 @@ Bird_keeperTheoSeenText:
 	line "that you leave!"
 	done
 
-Bird_keeperTheoBeatenText:
+BirdKeeperTheoBeatenText:
 	text "You really are"
 	line "concerned…"
 	done
 
-Bird_keeperTheoAfterBattleText:
+BirdKeeperTheoAfterBattleText:
 	text "How the heck do"
 	line "you go up?"
 
@@ -138,5 +138,5 @@ OlivineLighthouse3F_MapEventHeader:
 	db 4
 	object_event SPRITE_SAILOR, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSailorTerrell, -1
 	object_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanPreston, -1
-	object_event SPRITE_YOUNGSTER, 9, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperTheo, -1
+	object_event SPRITE_YOUNGSTER, 9, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperTheo, -1
 	object_event SPRITE_POKE_BALL, 2, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse3FEther, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER
diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm
index 2c166bc69..5b29a089e 100644
--- a/maps/OlivineLighthouse5F.asm
+++ b/maps/OlivineLighthouse5F.asm
@@ -12,13 +12,13 @@ OlivineLighthouse5F_MapScriptHeader:
 .MapCallbacks:
 	db 0
 
-TrainerBird_keeperDenis:
-	trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, Bird_keeperDenisSeenText, Bird_keeperDenisBeatenText, 0, .Script
+TrainerBirdKeeperDenis:
+	trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, BirdKeeperDenisSeenText, BirdKeeperDenisBeatenText, 0, .Script
 
 .Script:
 	end_if_just_battled
 	opentext
-	writetext Bird_keeperDenisAfterBattleText
+	writetext BirdKeeperDenisAfterBattleText
 	waitbutton
 	closetext
 	end
@@ -69,7 +69,7 @@ SailorErnestAfterBattleText:
 	cont "compassionate."
 	done
 
-Bird_keeperDenisSeenText:
+BirdKeeperDenisSeenText:
 	text "We're pretty high"
 	line "up here. My bird"
 
@@ -77,11 +77,11 @@ Bird_keeperDenisSeenText:
 	line "prime form."
 	done
 
-Bird_keeperDenisBeatenText:
+BirdKeeperDenisBeatenText:
 	text "Oops…They crashed…"
 	done
 
-Bird_keeperDenisAfterBattleText:
+BirdKeeperDenisAfterBattleText:
 	text "My #MON learned"
 	line "how to use FLY in"
 	cont "CIANWOOD."
@@ -115,7 +115,7 @@ OlivineLighthouse5F_MapEventHeader:
 .ObjectEvents:
 	db 5
 	object_event SPRITE_SAILOR, 11, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorErnest, -1
-	object_event SPRITE_YOUNGSTER, 3, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerBird_keeperDenis, -1
+	object_event SPRITE_YOUNGSTER, 3, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerBirdKeeperDenis, -1
 	object_event SPRITE_POKE_BALL, 12, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY
 	object_event SPRITE_POKE_BALL, 15, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FSuperRepel, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL
 	object_event SPRITE_POKE_BALL, 13, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FTMSwagger, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER
diff --git a/maps/Route13.asm b/maps/Route13.asm
index 7ea3738fd..3111b82f6 100644
--- a/maps/Route13.asm
+++ b/maps/Route13.asm
@@ -34,24 +34,24 @@ TrainerPokefanmJoshua:
 	closetext
 	end
 
-TrainerBird_keeperPerry:
-	trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, Bird_keeperPerrySeenText, Bird_keeperPerryBeatenText, 0, .Script
+TrainerBirdKeeperPerry:
+	trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, BirdKeeperPerrySeenText, BirdKeeperPerryBeatenText, 0, .Script
 
 .Script:
 	end_if_just_battled
 	opentext
-	writetext Bird_keeperPerryAfterBattleText
+	writetext BirdKeeperPerryAfterBattleText
 	waitbutton
 	closetext
 	end
 
-TrainerBird_keeperBret:
-	trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, Bird_keeperBretSeenText, Bird_keeperBretBeatenText, 0, .Script
+TrainerBirdKeeperBret:
+	trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, BirdKeeperBretSeenText, BirdKeeperBretBeatenText, 0, .Script
 
 .Script:
 	end_if_just_battled
 	opentext
-	writetext Bird_keeperBretAfterBattleText
+	writetext BirdKeeperBretAfterBattleText
 	waitbutton
 	closetext
 	end
@@ -114,24 +114,24 @@ PokefanmJoshuaAfterBattleText:
 	line "still the best."
 	done
 
-Bird_keeperPerrySeenText:
+BirdKeeperPerrySeenText:
 	text "Agility is the key"
 	line "attribute of bird"
 	cont "#MON."
 	done
 
-Bird_keeperPerryBeatenText:
+BirdKeeperPerryBeatenText:
 	text "You beat me with"
 	line "your speed…"
 	done
 
-Bird_keeperPerryAfterBattleText:
+BirdKeeperPerryAfterBattleText:
 	text "Your #MON are"
 	line "remarkably well-"
 	cont "trained."
 	done
 
-Bird_keeperBretSeenText:
+BirdKeeperBretSeenText:
 	text "Check out my #-"
 	line "MON. Just look at"
 
@@ -139,12 +139,12 @@ Bird_keeperBretSeenText:
 	line "their plumage."
 	done
 
-Bird_keeperBretBeatenText:
+BirdKeeperBretBeatenText:
 	text "Shoot!"
 	line "Not good enough!"
 	done
 
-Bird_keeperBretAfterBattleText:
+BirdKeeperBretAfterBattleText:
 	text "If you groom them,"
 	line "#MON get happy."
 	done
@@ -211,8 +211,8 @@ Route13_MapEventHeader:
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_YOUNGSTER, 6, 42, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBird_keeperPerry, -1
-	object_event SPRITE_YOUNGSTER, 6, 43, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBird_keeperBret, -1
+	object_event SPRITE_YOUNGSTER, 6, 42, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperPerry, -1
+	object_event SPRITE_YOUNGSTER, 6, 43, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperBret, -1
 	object_event SPRITE_POKEFAN_M, 8, 32, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJoshua, -1
 	object_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerHikerKenny, -1
 	object_event SPRITE_POKEFAN_M, 6, 25, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmAlex, -1
diff --git a/maps/Route14.asm b/maps/Route14.asm
index ba9a510af..411f5029a 100644
--- a/maps/Route14.asm
+++ b/maps/Route14.asm
@@ -30,13 +30,13 @@ TrainerPokefanmCarter:
 	closetext
 	end
 
-TrainerBird_keeperRoy:
-	trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, Bird_keeperRoySeenText, Bird_keeperRoyBeatenText, 0, .Script
+TrainerBirdKeeperRoy:
+	trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, BirdKeeperRoySeenText, BirdKeeperRoyBeatenText, 0, .Script
 
 .Script:
 	end_if_just_battled
 	opentext
-	writetext Bird_keeperRoyAfterBattleText
+	writetext BirdKeeperRoyAfterBattleText
 	waitbutton
 	closetext
 	end
@@ -72,18 +72,18 @@ PokefanmCarterAfterBattleText:
 	line "well-balanced mix."
 	done
 
-Bird_keeperRoySeenText:
+BirdKeeperRoySeenText:
 	text "My dream is to fly"
 	line "with my beloved"
 	cont "bird #MON."
 	done
 
-Bird_keeperRoyBeatenText:
+BirdKeeperRoyBeatenText:
 	text "I can dream, but I"
 	line "can't ever fly…"
 	done
 
-Bird_keeperRoyAfterBattleText:
+BirdKeeperRoyAfterBattleText:
 	text "You have #MON"
 	line "that know the HM"
 
@@ -131,6 +131,6 @@ Route14_MapEventHeader:
 .ObjectEvents:
 	db 4
 	object_event SPRITE_POKEFAN_M, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmCarter, -1
-	object_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperRoy, -1
+	object_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRoy, -1
 	object_event SPRITE_POKEFAN_M, 11, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1
 	object_event SPRITE_TEACHER, 5, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 4, Kim, -1
diff --git a/maps/Route18.asm b/maps/Route18.asm
index aaa2ce6cf..75ce7ca65 100644
--- a/maps/Route18.asm
+++ b/maps/Route18.asm
@@ -9,24 +9,24 @@ Route18_MapScriptHeader:
 .MapCallbacks:
 	db 0
 
-TrainerBird_keeperBoris:
-	trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, Bird_keeperBorisSeenText, Bird_keeperBorisBeatenText, 0, .Script
+TrainerBirdKeeperBoris:
+	trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, BirdKeeperBorisSeenText, BirdKeeperBorisBeatenText, 0, .Script
 
 .Script:
 	end_if_just_battled
 	opentext
-	writetext Bird_keeperBorisAfterBattleText
+	writetext BirdKeeperBorisAfterBattleText
 	waitbutton
 	closetext
 	end
 
-TrainerBird_keeperBob:
-	trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, Bird_keeperBobSeenText, Bird_keeperBobBeatenText, 0, .Script
+TrainerBirdKeeperBob:
+	trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, BirdKeeperBobSeenText, BirdKeeperBobBeatenText, 0, .Script
 
 .Script:
 	end_if_just_battled
 	opentext
-	writetext Bird_keeperBobAfterBattleText
+	writetext BirdKeeperBobAfterBattleText
 	waitbutton
 	closetext
 	end
@@ -34,7 +34,7 @@ TrainerBird_keeperBob:
 Route18Sign:
 	jumptext Route18SignText
 
-Bird_keeperBorisSeenText:
+BirdKeeperBorisSeenText:
 	text "If you're looking"
 	line "for #MON, you"
 
@@ -42,27 +42,27 @@ Bird_keeperBorisSeenText:
 	line "the tall grass."
 	done
 
-Bird_keeperBorisBeatenText:
+BirdKeeperBorisBeatenText:
 	text "Ayieee!"
 	done
 
-Bird_keeperBorisAfterBattleText:
+BirdKeeperBorisAfterBattleText:
 	text "Since you're so"
 	line "strong, it must be"
 	cont "fun to battle."
 	done
 
-Bird_keeperBobSeenText:
+BirdKeeperBobSeenText:
 	text "CYCLING ROAD is a"
 	line "quick shortcut to"
 	cont "CELADON."
 	done
 
-Bird_keeperBobBeatenText:
+BirdKeeperBobBeatenText:
 	text "…Whew!"
 	done
 
-Bird_keeperBobAfterBattleText:
+BirdKeeperBobAfterBattleText:
 	text "If you don't have"
 	line "a BICYCLE, you're"
 
@@ -95,5 +95,5 @@ Route18_MapEventHeader:
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_YOUNGSTER, 12, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperBoris, -1
-	object_event SPRITE_YOUNGSTER, 6, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperBob, -1
+	object_event SPRITE_YOUNGSTER, 12, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBoris, -1
+	object_event SPRITE_YOUNGSTER, 6, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBob, -1
diff --git a/maps/Route2.asm b/maps/Route2.asm
index 80f703b16..cceac50f7 100644
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -15,35 +15,35 @@ Route2_MapScriptHeader:
 .MapCallbacks:
 	db 0
 
-TrainerBug_catcherRob:
-	trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, Bug_catcherRobSeenText, Bug_catcherRobBeatenText, 0, .Script
+TrainerBugCatcherRob:
+	trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, BugCatcherRobSeenText, BugCatcherRobBeatenText, 0, .Script
 
 .Script:
 	end_if_just_battled
 	opentext
-	writetext Bug_catcherRobAfterBattleText
+	writetext BugCatcherRobAfterBattleText
 	waitbutton
 	closetext
 	end
 
-TrainerBug_catcherEd:
-	trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, Bug_catcherEdSeenText, Bug_catcherEdBeatenText, 0, .Script
+TrainerBugCatcherEd:
+	trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, BugCatcherEdSeenText, BugCatcherEdBeatenText, 0, .Script
 
 .Script:
 	end_if_just_battled
 	opentext
-	writetext Bug_catcherEdAfterBattleText
+	writetext BugCatcherEdAfterBattleText
 	waitbutton
 	closetext
 	end
 
-TrainerBug_catcherDoug:
-	trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, Bug_catcherDougSeenText, Bug_catcherDougBeatenText, 0, .Script
+TrainerBugCatcherDoug:
+	trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, BugCatcherDougSeenText, BugCatcherDougBeatenText, 0, .Script
 
 .Script:
 	end_if_just_battled
 	opentext
-	writetext Bug_catcherDougAfterBattleText
+	writetext BugCatcherDougAfterBattleText
 	waitbutton
 	closetext
 	end
@@ -81,23 +81,23 @@ Route2HiddenFullRestore:
 Route2HiddenRevive:
 	dwb EVENT_ROUTE_2_HIDDEN_REVIVE, REVIVE
 
-Bug_catcherRobSeenText:
+BugCatcherRobSeenText:
 	text "My bug #MON are"
 	line "tough. Prepare to"
 	cont "lose!"
 	done
 
-Bug_catcherRobBeatenText:
+BugCatcherRobBeatenText:
 	text "I was whipped…"
 	done
 
-Bug_catcherRobAfterBattleText:
+BugCatcherRobAfterBattleText:
 	text "I'm going to look"
 	line "for stronger bug"
 	cont "#MON."
 	done
 
-Bug_catcherEdSeenText:
+BugCatcherEdSeenText:
 	text "If you walk in"
 	line "tall grass wearing"
 
@@ -105,26 +105,26 @@ Bug_catcherEdSeenText:
 	line "nicks and cuts?"
 	done
 
-Bug_catcherEdBeatenText:
+BugCatcherEdBeatenText:
 	text "Ouch, ouch, ouch!"
 	done
 
-Bug_catcherEdAfterBattleText:
+BugCatcherEdAfterBattleText:
 	text "They'll really"
 	line "sting when you"
 	cont "take a bath."
 	done
 
-Bug_catcherDougSeenText:
+BugCatcherDougSeenText:
 	text "Why don't girls"
 	line "like bug #MON?"
 	done
 
-Bug_catcherDougBeatenText:
+BugCatcherDougBeatenText:
 	text "No good!"
 	done
 
-Bug_catcherDougAfterBattleText:
+BugCatcherDougAfterBattleText:
 	text "Bug #MON squish"
 	line "like plush toys"
 
@@ -172,9 +172,9 @@ Route2_MapEventHeader:
 
 .ObjectEvents:
 	db 8
-	object_event SPRITE_BUG_CATCHER, 45, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBug_catcherRob, -1
-	object_event SPRITE_BUG_CATCHER, 4, 6, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherEd, -1
-	object_event SPRITE_BUG_CATCHER, 40, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherDoug, -1
+	object_event SPRITE_BUG_CATCHER, 45, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherRob, -1
+	object_event SPRITE_BUG_CATCHER, 4, 6, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherEd, -1
+	object_event SPRITE_BUG_CATCHER, 40, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDoug, -1
 	object_event SPRITE_POKE_BALL, 29, 0, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT
 	object_event SPRITE_POKE_BALL, 23, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION
 	object_event SPRITE_POKE_BALL, 2, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS
diff --git a/maps/Route27.asm b/maps/Route27.asm
index a058af254..e58ae3656 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -59,8 +59,8 @@ TrainerPsychicGilbert:
 	closetext
 	end
 
-TrainerBird_keeperJose2:
-	trainer EVENT_BEAT_BIRD_KEEPER_JOSE2, BIRD_KEEPER, JOSE2, Bird_keeperJose2SeenText, Bird_keeperJose2BeatenText, 0, .Script
+TrainerBirdKeeperJose2:
+	trainer EVENT_BEAT_BIRD_KEEPER_JOSE2, BIRD_KEEPER, JOSE2, BirdKeeperJose2SeenText, BirdKeeperJose2BeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_BIRDKEEPER_JOSE
@@ -92,7 +92,7 @@ UnknownScript_0x1a08eb:
 
 UnknownScript_0x1a08ff:
 	scall UnknownScript_0x1a096f
-	winlosstext Bird_keeperJose2BeatenText, 0
+	winlosstext BirdKeeperJose2BeatenText, 0
 	copybytetovar wJoseFightCount
 	if_equal 2, .Fight2
 	if_equal 1, .Fight1
@@ -443,12 +443,12 @@ PsychicGilbertAfterBattleText:
 	line "premonition says."
 	done
 
-Bird_keeperJose2SeenText:
+BirdKeeperJose2SeenText:
 	text "Tweet! Tweet!"
 	line "Tetweet!"
 	done
 
-Bird_keeperJose2BeatenText:
+BirdKeeperJose2BeatenText:
 	text "Tweet!"
 	done
 
@@ -493,7 +493,7 @@ Route27_MapEventHeader:
 	object_event SPRITE_COOLTRAINER_F, 10, 72, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfReena, -1
 	object_event SPRITE_COOLTRAINER_F, 6, 37, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfMegan, -1
 	object_event SPRITE_YOUNGSTER, 7, 65, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicGilbert, -1
-	object_event SPRITE_YOUNGSTER, 13, 58, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperJose2, -1
+	object_event SPRITE_YOUNGSTER, 13, 58, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperJose2, -1
 	object_event SPRITE_POKE_BALL, 12, 60, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27TMSolarbeam, EVENT_ROUTE_27_TM_SOLARBEAM
 	object_event SPRITE_POKE_BALL, 12, 53, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27RareCandy, EVENT_ROUTE_27_RARE_CANDY
 	object_event SPRITE_FISHER, 10, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 3, Route27FisherScript, -1
diff --git a/maps/Route30.asm b/maps/Route30.asm
index 7a98c6a7e..293238095 100644
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -196,13 +196,13 @@ TrainerYoungsterMikey:
 	closetext
 	end
 
-TrainerBug_catcherDon:
-	trainer EVENT_BEAT_BUG_CATCHER_DON, BUG_CATCHER, DON, Bug_catcherDonSeenText, Bug_catcherDonBeatenText, 0, .Script
+TrainerBugCatcherDon:
+	trainer EVENT_BEAT_BUG_CATCHER_DON, BUG_CATCHER, DON, BugCatcherDonSeenText, BugCatcherDonBeatenText, 0, .Script
 
 .Script:
 	end_if_just_battled
 	opentext
-	writetext Bug_catcherDonAfterText
+	writetext BugCatcherDonAfterText
 	waitbutton
 	closetext
 	end
@@ -325,18 +325,18 @@ YoungsterMikeyAfterText:
 	cont "to get better."
 	done
 
-Bug_catcherDonSeenText:
+BugCatcherDonSeenText:
 	text "Instead of a bug"
 	line "#MON, I found"
 	cont "a trainer!"
 	done
 
-Bug_catcherDonBeatenText:
+BugCatcherDonBeatenText:
 	text "Argh! You're too"
 	line "strong!"
 	done
 
-Bug_catcherDonAfterText:
+BugCatcherDonAfterText:
 	text "I ran out of #"
 	line "BALLS while I was"
 	cont "catching #MON."
@@ -432,7 +432,7 @@ Route30_MapEventHeader:
 	object_event SPRITE_YOUNGSTER, 26, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE
 	object_event SPRITE_YOUNGSTER, 28, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY
 	object_event SPRITE_YOUNGSTER, 23, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterMikey, -1
-	object_event SPRITE_BUG_CATCHER, 7, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherDon, -1
+	object_event SPRITE_BUG_CATCHER, 7, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDon, -1
 	object_event SPRITE_YOUNGSTER, 30, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route30YoungsterScript, -1
 	object_event SPRITE_MONSTER, 24, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
 	object_event SPRITE_MONSTER, 25, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
diff --git a/maps/Route31.asm b/maps/Route31.asm
index d356f2c6f..efd236b28 100644
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -24,8 +24,8 @@ Route31_MapScriptHeader:
 	specialphonecall SPECIALCALL_WORRIED
 	return
 
-TrainerBug_catcherWade1:
-	trainer EVENT_BEAT_BUG_CATCHER_WADE, BUG_CATCHER, WADE1, Bug_catcherWade1SeenText, Bug_catcherWade1BeatenText, 0, .Script
+TrainerBugCatcherWade1:
+	trainer EVENT_BEAT_BUG_CATCHER_WADE, BUG_CATCHER, WADE1, BugCatcherWade1SeenText, BugCatcherWade1BeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_BUG_CATCHER_WADE
@@ -39,7 +39,7 @@ TrainerBug_catcherWade1:
 	iftrue .AcceptedNumberSTD
 	checkevent EVENT_WADE_ASKED_FOR_PHONE_NUMBER
 	iftrue .AskAgain
-	writetext Bug_catcherWade1AfterText
+	writetext BugCatcherWade1AfterText
 	waitbutton
 	setevent EVENT_WADE_ASKED_FOR_PHONE_NUMBER
 	scall .AskPhoneNumberSTD
@@ -57,7 +57,7 @@ TrainerBug_catcherWade1:
 
 .WadeRematch:
 	scall .RematchSTD
-	winlosstext Bug_catcherWade1BeatenText, 0
+	winlosstext BugCatcherWade1BeatenText, 0
 	copybytetovar wWadeFightCount
 	if_equal 4, .Fight4
 	if_equal 3, .Fight3
@@ -274,17 +274,17 @@ Route31CooltrainerMText:
 	cont "explore it."
 	done
 
-Bug_catcherWade1SeenText:
+BugCatcherWade1SeenText:
 	text "I caught a bunch"
 	line "of #MON. Let me"
 	cont "battle with you!"
 	done
 
-Bug_catcherWade1BeatenText:
+BugCatcherWade1BeatenText:
 	text "Awwwww…"
 	done
 
-Bug_catcherWade1AfterText:
+BugCatcherWade1AfterText:
 	text "You can catch"
 	line "#MON even if"
 
@@ -438,7 +438,7 @@ Route31_MapEventHeader:
 	db 7
 	object_event SPRITE_FISHER, 7, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31MailRecipientScript, -1
 	object_event SPRITE_YOUNGSTER, 5, 9, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31YoungsterScript, -1
-	object_event SPRITE_BUG_CATCHER, 13, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBug_catcherWade1, -1
+	object_event SPRITE_BUG_CATCHER, 13, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherWade1, -1
 	object_event SPRITE_COOLTRAINER_M, 8, 33, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31CooltrainerMScript, -1
 	object_event SPRITE_FRUIT_TREE, 7, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31FruitTree, -1
 	object_event SPRITE_POKE_BALL, 5, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31Potion, EVENT_ROUTE_31_POTION
diff --git a/maps/Route32.asm b/maps/Route32.asm
index 660f972f3..43df9f0a3 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -440,13 +440,13 @@ TrainerYoungsterGordon:
 	closetext
 	end
 
-TrainerBird_keeperPeter:
-	trainer EVENT_BEAT_BIRD_KEEPER_PETER, BIRD_KEEPER, PETER, Bird_keeperPeterSeenText, Bird_keeperPeterBeatenText, 0, .Script
+TrainerBirdKeeperPeter:
+	trainer EVENT_BEAT_BIRD_KEEPER_PETER, BIRD_KEEPER, PETER, BirdKeeperPeterSeenText, BirdKeeperPeterBeatenText, 0, .Script
 
 .Script:
 	end_if_just_battled
 	opentext
-	writetext Bird_keeperPeterAfterText
+	writetext BirdKeeperPeterAfterText
 	waitbutton
 	closetext
 	end
@@ -821,19 +821,19 @@ PicnickerLiz1AfterText:
 	line "nice chat too."
 	done
 
-Bird_keeperPeterSeenText:
+BirdKeeperPeterSeenText:
 	text "That BADGE! It's"
 	line "from VIOLET CITY!"
 
 	para "You beat FALKNER?"
 	done
 
-Bird_keeperPeterBeatenText:
+BirdKeeperPeterBeatenText:
 	text "I know what my"
 	line "weaknesses are."
 	done
 
-Bird_keeperPeterAfterText:
+BirdKeeperPeterAfterText:
 	text "I should train"
 	line "again at the GYM"
 	cont "in VIOLET CITY."
@@ -965,7 +965,7 @@ Route32_MapEventHeader:
 	object_event SPRITE_YOUNGSTER, 45, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperRoland, -1
 	object_event SPRITE_LASS, 30, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerLiz1, -1
 	object_event SPRITE_COOLTRAINER_M, 8, 19, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32CooltrainerMScript, -1
-	object_event SPRITE_YOUNGSTER, 82, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperPeter, -1
+	object_event SPRITE_YOUNGSTER, 82, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperPeter, -1
 	object_event SPRITE_FISHER, 70, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeTailSalesmanScript, EVENT_SLOWPOKE_WELL_ROCKETS
 	object_event SPRITE_POKE_BALL, 53, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL
 	object_event SPRITE_FISHER, 13, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32RoarTMGuyScript, -1
diff --git a/maps/Route35.asm b/maps/Route35.asm
index 2e10bd22a..59a5d57e9 100644
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -18,13 +18,13 @@ Route35_MapScriptHeader:
 .MapCallbacks:
 	db 0
 
-TrainerBird_keeperBryan:
-	trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, Bird_keeperBryanSeenText, Bird_keeperBryanBeatenText, 0, .Script
+TrainerBirdKeeperBryan:
+	trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, BirdKeeperBryanSeenText, BirdKeeperBryanBeatenText, 0, .Script
 
 .Script:
 	end_if_just_battled
 	opentext
-	writetext Bird_keeperBryanAfterBattleText
+	writetext BirdKeeperBryanAfterBattleText
 	waitbutton
 	closetext
 	end
@@ -128,8 +128,8 @@ TrainerPicnickerKim:
 	closetext
 	end
 
-TrainerBug_catcherArnie1:
-	trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, Bug_catcherArnie1SeenText, Bug_catcherArnie1BeatenText, 0, .Script
+TrainerBugCatcherArnie1:
+	trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, BugCatcherArnie1SeenText, BugCatcherArnie1BeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_BUG_CATCHER_ARNIE
@@ -161,7 +161,7 @@ UnknownScript_0x19c9a7:
 
 UnknownScript_0x19c9bb:
 	scall UnknownScript_0x19c91b
-	winlosstext Bug_catcherArnie1BeatenText, 0
+	winlosstext BugCatcherArnie1BeatenText, 0
 	copybytetovar wArnieFightCount
 	if_equal 4, .Fight4
 	if_equal 3, .Fight3
@@ -344,17 +344,17 @@ PicnickerKimAfterBattleText:
 	cont "them."
 	done
 
-Bird_keeperBryanSeenText:
+BirdKeeperBryanSeenText:
 	text "What kinds of"
 	line "BALLS do you use?"
 	done
 
-Bird_keeperBryanBeatenText:
+BirdKeeperBryanBeatenText:
 	text "Yikes! Not fast"
 	line "enough!"
 	done
 
-Bird_keeperBryanAfterBattleText:
+BirdKeeperBryanAfterBattleText:
 	text "Some #MON flee"
 	line "right away."
 
@@ -389,13 +389,13 @@ UnknownText_0x19cd5a:
 	line "electrified me!"
 	done
 
-Bug_catcherArnie1SeenText:
+BugCatcherArnie1SeenText:
 	text "I'll go anywhere"
 	line "if bug #MON"
 	cont "appear there."
 	done
 
-Bug_catcherArnie1BeatenText:
+BugCatcherArnie1BeatenText:
 	text "Huh? I shouldn't"
 	line "have lost that…"
 	done
@@ -486,9 +486,9 @@ Route35_MapEventHeader:
 	object_event SPRITE_YOUNGSTER, 20, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperElliot, -1
 	object_event SPRITE_LASS, 20, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerBrooke, -1
 	object_event SPRITE_LASS, 26, 10, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerKim, -1
-	object_event SPRITE_YOUNGSTER, 28, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerBird_keeperBryan, -1
+	object_event SPRITE_YOUNGSTER, 28, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerBirdKeeperBryan, -1
 	object_event SPRITE_FISHER, 10, 2, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherWalt, -1
-	object_event SPRITE_BUG_CATCHER, 7, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherArnie1, -1
+	object_event SPRITE_BUG_CATCHER, 7, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherArnie1, -1
 	object_event SPRITE_SUPER_NERD, 10, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerJugglerIrwin, -1
 	object_event SPRITE_OFFICER, 6, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x19ca49, -1
 	object_event SPRITE_FRUIT_TREE, 25, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1
diff --git a/maps/Route38.asm b/maps/Route38.asm
index f2ae60489..c4b957465 100644
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -14,13 +14,13 @@ Route38_MapScriptHeader:
 .MapCallbacks:
 	db 0
 
-TrainerBird_keeperToby:
-	trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, Bird_keeperTobySeenText, Bird_keeperTobyBeatenText, 0, .Script
+TrainerBirdKeeperToby:
+	trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, BirdKeeperTobySeenText, BirdKeeperTobyBeatenText, 0, .Script
 
 .Script
 	end_if_just_battled
 	opentext
-	writetext Bird_keeperTobyAfterBattleText
+	writetext BirdKeeperTobyAfterBattleText
 	waitbutton
 	closetext
 	end
@@ -322,18 +322,18 @@ Route38TrainerTips:
 FruitTreeScript_0x1a1f33:
 	fruittree FRUITTREE_ROUTE_38
 
-Bird_keeperTobySeenText:
+BirdKeeperTobySeenText:
 	text "Fly high into the"
 	line "sky, my beloved"
 	cont "bird #MON!"
 	done
 
-Bird_keeperTobyBeatenText:
+BirdKeeperTobyBeatenText:
 	text "I feel like just"
 	line "flying away now."
 	done
 
-Bird_keeperTobyAfterBattleText:
+BirdKeeperTobyAfterBattleText:
 	text "I plan to train in"
 	line "CIANWOOD CITY to"
 
@@ -493,7 +493,7 @@ Route38_MapEventHeader:
 	db 7
 	object_event SPRITE_STANDING_YOUNGSTER, 1, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1
 	object_event SPRITE_LASS, 3, 15, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassDana1, -1
-	object_event SPRITE_STANDING_YOUNGSTER, 15, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBird_keeperToby, -1
+	object_event SPRITE_STANDING_YOUNGSTER, 15, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBirdKeeperToby, -1
 	object_event SPRITE_BUENA, 9, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyValerie, -1
 	object_event SPRITE_SAILOR, 5, 24, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSailorHarry, -1
 	object_event SPRITE_FRUIT_TREE, 10, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a1f33, -1
diff --git a/maps/Route4.asm b/maps/Route4.asm
index cb1b18d69..e4797656e 100644
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -11,13 +11,13 @@ Route4_MapScriptHeader:
 .MapCallbacks:
 	db 0
 
-TrainerBird_keeperHank:
-	trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, Bird_keeperHankSeenText, Bird_keeperHankBeatenText, 0, .Script
+TrainerBirdKeeperHank:
+	trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, BirdKeeperHankSeenText, BirdKeeperHankBeatenText, 0, .Script
 
 .Script:
 	end_if_just_battled
 	opentext
-	writetext Bird_keeperHankAfterBattleText
+	writetext BirdKeeperHankAfterBattleText
 	waitbutton
 	closetext
 	end
@@ -54,18 +54,18 @@ Route4HiddenUltraBall:
 	dwb EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL
 
 
-Bird_keeperHankSeenText:
+BirdKeeperHankSeenText:
 	text "I'm raising my"
 	line "#MON. Want to"
 	cont "battle with me?"
 	done
 
-Bird_keeperHankBeatenText:
+BirdKeeperHankBeatenText:
 	text "Ack! I lost that"
 	line "one…"
 	done
 
-Bird_keeperHankAfterBattleText:
+BirdKeeperHankAfterBattleText:
 	text "If you have a"
 	line "specific #MON"
 
@@ -139,7 +139,7 @@ Route4_MapEventHeader:
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_YOUNGSTER, 9, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperHank, -1
+	object_event SPRITE_YOUNGSTER, 9, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperHank, -1
 	object_event SPRITE_LASS, 8, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerHope, -1
 	object_event SPRITE_LASS, 6, 21, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerSharon, -1
 	object_event SPRITE_POKE_BALL, 3, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP
diff --git a/maps/Route44.asm b/maps/Route44.asm
index a12953ebc..29ff0399a 100644
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -18,8 +18,8 @@ Route44_MapScriptHeader:
 .MapCallbacks:
 	db 0
 
-TrainerBird_keeperVance1:
-	trainer EVENT_BEAT_BIRD_KEEPER_VANCE, BIRD_KEEPER, VANCE1, Bird_keeperVance1SeenText, Bird_keeperVance1BeatenText, 0, .Script
+TrainerBirdKeeperVance1:
+	trainer EVENT_BEAT_BIRD_KEEPER_VANCE, BIRD_KEEPER, VANCE1, BirdKeeperVance1SeenText, BirdKeeperVance1BeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_BIRDKEEPER_VANCE
@@ -49,7 +49,7 @@ UnknownScript_0x19d856:
 
 UnknownScript_0x19d86a:
 	scall UnknownScript_0x19d8f7
-	winlosstext Bird_keeperVance1BeatenText, 0
+	winlosstext BirdKeeperVance1BeatenText, 0
 	copybytetovar wVanceFightCount
 	if_equal 2, .Fight2
 	if_equal 1, .Fight1
@@ -368,13 +368,13 @@ FisherEdgarAfterBattleText:
 	line "again for a while."
 	done
 
-Bird_keeperVance1SeenText:
+BirdKeeperVance1SeenText:
 	text "Do you know about"
 	line "the legendary bird"
 	cont "#MON?"
 	done
 
-Bird_keeperVance1BeatenText:
+BirdKeeperVance1BeatenText:
 	text "Whew! You're hot"
 	line "stuff."
 	done
@@ -530,7 +530,7 @@ Route44_MapEventHeader:
 	object_event SPRITE_FISHER, 13, 19, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherEdgar, -1
 	object_event SPRITE_YOUNGSTER, 9, 10, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicPhil, -1
 	object_event SPRITE_SUPER_NERD, 2, 43, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacZach, -1
-	object_event SPRITE_YOUNGSTER, 5, 51, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBird_keeperVance1, -1
+	object_event SPRITE_YOUNGSTER, 5, 51, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperVance1, -1
 	object_event SPRITE_COOLTRAINER_M, 15, 41, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainermAllen, -1
 	object_event SPRITE_COOLTRAINER_F, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainerfCybil, -1
 	object_event SPRITE_FRUIT_TREE, 5, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19da40, -1
diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm
index a40fe33db..239cdcd7a 100644
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -66,24 +66,24 @@ VioletGymActivateRockets:
 .RadioTowerRockets:
 	jumpstd radiotowerrockets
 
-TrainerBird_keeperRod:
-	trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, Bird_keeperRodSeenText, Bird_keeperRodBeatenText, 0, .Script
+TrainerBirdKeeperRod:
+	trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, BirdKeeperRodSeenText, BirdKeeperRodBeatenText, 0, .Script
 
 .Script:
 	end_if_just_battled
 	opentext
-	writetext Bird_keeperRodAfterBattleText
+	writetext BirdKeeperRodAfterBattleText
 	waitbutton
 	closetext
 	end
 
-TrainerBird_keeperAbe:
-	trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, Bird_keeperAbeSeenText, Bird_keeperAbeBeatenText, 0, .Script
+TrainerBirdKeeperAbe:
+	trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, BirdKeeperAbeSeenText, BirdKeeperAbeBeatenText, 0, .Script
 
 .Script:
 	end_if_just_battled
 	opentext
-	writetext Bird_keeperAbeAfterBattleText
+	writetext BirdKeeperAbeAfterBattleText
 	waitbutton
 	closetext
 	end
@@ -209,7 +209,7 @@ UnknownText_0x68735:
 	line "master!"
 	done
 
-Bird_keeperRodSeenText:
+BirdKeeperRodSeenText:
 	text "The keyword is"
 	line "guts!"
 
@@ -222,11 +222,11 @@ Bird_keeperRodSeenText:
 	para "Come on!"
 	done
 
-Bird_keeperRodBeatenText:
+BirdKeeperRodBeatenText:
 	text "Gaaah!"
 	done
 
-Bird_keeperRodAfterBattleText:
+BirdKeeperRodAfterBattleText:
 	text "FALKNER's skills"
 	line "are for real!"
 
@@ -235,18 +235,18 @@ Bird_keeperRodAfterBattleText:
 	cont "beat me!"
 	done
 
-Bird_keeperAbeSeenText:
+BirdKeeperAbeSeenText:
 	text "Let me see if you"
 	line "are good enough to"
 	cont "face FALKNER!"
 	done
 
-Bird_keeperAbeBeatenText:
+BirdKeeperAbeBeatenText:
 	text "This can't be"
 	line "true!"
 	done
 
-Bird_keeperAbeAfterBattleText:
+BirdKeeperAbeAfterBattleText:
 	text "This is pathetic,"
 	line "losing to some"
 	cont "rookie trainer…"
@@ -301,6 +301,6 @@ VioletGym_MapEventHeader:
 .ObjectEvents:
 	db 4
 	object_event SPRITE_FALKNER, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1
-	object_event SPRITE_YOUNGSTER, 6, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperRod, -1
-	object_event SPRITE_YOUNGSTER, 10, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperAbe, -1
+	object_event SPRITE_YOUNGSTER, 6, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRod, -1
+	object_event SPRITE_YOUNGSTER, 10, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperAbe, -1
 	object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletGymGuyScript, -1
diff --git a/maps/map_headers.asm b/maps/map_headers.asm
index d3724aa22..9053329d7 100644
--- a/maps/map_headers.asm
+++ b/maps/map_headers.asm
@@ -382,7 +382,7 @@ MapGroup_Lavender:
 	map_header Route12SuperRodHouse, TILESET_HOUSE_1, INDOOR, ROUTE_12, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
 
 
-MapGroup_Silver    :
+MapGroup_Silver:
 	map_header Route28, TILESET_KANTO, ROUTE, ROUTE_28, MUSIC_INDIGO_PLATEAU, 0, PALETTE_AUTO, FISHGROUP_POND
 	map_header SilverCaveOutside, TILESET_KANTO, TOWN, SILVER_CAVE, MUSIC_INDIGO_PLATEAU, 0, PALETTE_AUTO, FISHGROUP_POND
 	map_header SilverCavePokecenter1F, TILESET_POKECENTER, INDOOR, SILVER_CAVE, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm
index fa58b7a05..6fbda0146 100644
--- a/mobile/mobile_22.asm
+++ b/mobile/mobile_22.asm
@@ -631,8 +631,8 @@ Function8949c: ; 8949c
 	ld a, 5
 	ld [rSVBK], a
 	ld hl, Palette_894b3
-	ld de, UnknBGPals + 8 * 7
-	ld bc, 8
+	ld de, UnknBGPals palette 7
+	ld bc, 1 palettes
 	call CopyBytes
 	pop af
 	ld [rSVBK], a
diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm
index ff3f41102..b2abfe9b9 100644
--- a/mobile/mobile_45.asm
+++ b/mobile/mobile_45.asm
@@ -1,4 +1,4 @@
-SECTION "bank45", ROMX
+SECTION "Mobile 45", ROMX
 
 	charmap " ", $20 ; revert to ascii
 
diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm
index 71cf49467..1cf9a8351 100755
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -1,4 +1,4 @@
-SECTION "bank46", ROMX
+SECTION "Mobile 46", ROMX
 
 Function118000: ; 118000
 	ld a, $1
@@ -3016,7 +3016,7 @@ Unknown_1196b8: ; 1196b8
 ; 1196cd
 
 
-SECTION "bank46_2", ROMX
+SECTION "Mobile 46 ASCII", ROMX
 ; A hack to use ascii above.
 
 Function1196cd: ; 1196cd (46:56cd)
diff --git a/pokecrystal.link b/pokecrystal.link
index 6002adbf5..f27883ed9 100644
--- a/pokecrystal.link
+++ b/pokecrystal.link
@@ -68,7 +68,7 @@ ROMX $10
 ROMX $11
 	"bank11"
 ROMX $12
-	"Crystal Unique"
+	"Crystal Features 1"
 ROMX $13
 	"bank13"
 ROMX $14
@@ -100,7 +100,7 @@ ROMX $20
 ROMX $21
 	"bank21"
 ROMX $22
-	"bank22"
+	"Crystal Features 2"
 ROMX $23
 	"bank23"
 ROMX $24
@@ -135,7 +135,7 @@ ROMX $31
 ROMX $32
 	"bank32"
 ROMX $33
-	"bank33"
+	"Move Animations"
 	"Extra Songs 2"
 ROMX $34
 	"Pic Animations 1"
@@ -174,21 +174,21 @@ ROMX $40
 ROMX $41
 	"bank41"
 ROMX $42
-	"mobile_42"
+	"Mobile 42"
 	"Intro Logo"
 	"Credits"
 ROMX $43
-	"bank43"
+	"Title"
 ROMX $44
-	"Main"
+	"Mobile Adapter SDK"
 ROMX $45
-	"bank45"
+	"Mobile 45"
 	"Mobile Stadium"
 ROMX $46
-	"bank46"
-	"bank46_2"
+	"Mobile 46"
+	"Mobile 46 ASCII"
 ROMX $47
-	"battle_tower_47"
+	"Battle Tower"
 ROMX $48
 	org $4000
 	"Pic Pointers"
@@ -235,16 +235,16 @@ ROMX $5a
 ROMX $5b
 	"bank5B"
 ROMX $5c
-	"mobile_5c"
+	"Mobile 5C"
 ROMX $5d
 	"Crystal Phone Text 2"
 ROMX $5e
-	"bank5E"
+	"UpdateBattleHUDs"
 	"Songs 5"
 	"Crystal Sound Effects"
-	"mobile_5e"
+	"Mobile 5E"
 ROMX $5f
-	"bank5F"
+	"Mobile 5F"
 ROMX $60
 	"Map Scripts 13"
 	"Pokedex Entries 001-064"
@@ -284,7 +284,7 @@ ROMX $70
 ROMX $71
 	"Text 3"
 ROMX $72
-	"bank72"
+	"Miscellaneous Text"
 ROMX $73
 	"Pokedex Entries 129-192"
 ROMX $74
@@ -302,9 +302,8 @@ ROMX $7c
 ROMX $7d
 	"Mobile News Data"
 ROMX $7e
-	"bank7E"
+	"Crystal Events"
 ROMX $7f
-	"bank7F"
 	org $7de0
 	"Mobile Stadium 2"
 WRAM0
@@ -325,7 +324,7 @@ WRAMX 1
 WRAMX 2
 	"Pic Animations"
 WRAMX 3
-	"Battle Tower"
+	"Battle Tower RAM"
 WRAMX 5
 	"GBC Video"
 	org $d300
diff --git a/sram.asm b/sram.asm
index 163de6bda..0b44c9304 100644
--- a/sram.asm
+++ b/sram.asm
@@ -1,12 +1,6 @@
-SRAM_Begin EQU $a000
-SRAM_End   EQU $c000
-
-GLOBAL SRAM_Begin, SRAM_End
-
-
 SECTION "Scratch", SRAM
 
-sScratch::
+sScratch:: ds $600 ; a000
 
 
 SECTION "SRAM Bank 0", SRAM
diff --git a/text/battle_tower.asm b/text/battle_tower.asm
index 8ddd69b09..53af5a9e6 100644
--- a/text/battle_tower.asm
+++ b/text/battle_tower.asm
@@ -1,4 +1,3 @@
-
 BattleTowerText_0x1ec000: ; 0x1ec000
 	text "Hello, glad to"
 	line "meet you!"
diff --git a/tilesets/roofs.asm b/tilesets/roofs.asm
index a9fd8a654..2a4b0a1b4 100644
--- a/tilesets/roofs.asm
+++ b/tilesets/roofs.asm
@@ -17,4 +17,4 @@ LoadMapGroupRoof:: ; 1c000
 ; 1c021
 
 
-INCLUDE "data/maps/mapgroup_roofs.asm"
+INCLUDE "data/maps/roofs.asm"
diff --git a/tilesets/special_palettes.asm b/tilesets/special_palettes.asm
index 7ec2537e0..de7d09963 100644
--- a/tilesets/special_palettes.asm
+++ b/tilesets/special_palettes.asm
@@ -63,7 +63,7 @@ LoadPokeComPalette: ; 494f2
 ; 49501
 
 PokeComPalette: ; 49501
-INCLUDE "tilesets/palettes/pokecom_center.pal"
+INCLUDE "data/palettes/tilesets/pokecom_center.pal"
 ; 49541
 
 LoadBattleTowerPalette: ; 49541
@@ -76,7 +76,7 @@ LoadBattleTowerPalette: ; 49541
 ; 49550
 
 BattleTowerPalette: ; 49550
-INCLUDE "tilesets/palettes/battle_tower.pal"
+INCLUDE "data/palettes/tilesets/battle_tower.pal"
 ; 49590
 
 LoadIcePathPalette: ; 49590
@@ -89,7 +89,7 @@ LoadIcePathPalette: ; 49590
 ; 4959f
 
 IcePathPalette: ; 4959f
-INCLUDE "tilesets/palettes/ice_path.pal"
+INCLUDE "data/palettes/tilesets/ice_path.pal"
 ; 495df
 
 LoadHousePalette: ; 495df
@@ -102,7 +102,7 @@ LoadHousePalette: ; 495df
 ; 495ee
 
 HousePalette: ; 495ee
-INCLUDE "tilesets/palettes/house_1.pal"
+INCLUDE "data/palettes/tilesets/house_1.pal"
 ; 4962e
 
 LoadRadioTowerPalette: ; 4962e
@@ -115,7 +115,7 @@ LoadRadioTowerPalette: ; 4962e
 ; 4963d
 
 RadioTowerPalette: ; 4963d
-INCLUDE "tilesets/palettes/radio_tower.pal"
+INCLUDE "data/palettes/tilesets/radio_tower.pal"
 ; 4967d
 
 MansionPalette1: ; 4967d
diff --git a/tilesets/tileset_headers.asm b/tilesets/tilesets.asm
index b63e962f1..b63e962f1 100644
--- a/tilesets/tileset_headers.asm
+++ b/tilesets/tilesets.asm
diff --git a/vram.asm b/vram.asm
index 85d8f4369..fdb0dc159 100644
--- a/vram.asm
+++ b/vram.asm
@@ -1,14 +1,16 @@
-SECTION "VRAM0", VRAM, BANK [0]
+SECTION "VRAM0", VRAM
+
 VTiles0:: ds $800
 VTiles1:: ds $800
 VTiles2:: ds $800
 VBGMap0:: ds $400
 VBGMap1:: ds $400
 
-SECTION "VRAM1", VRAM, BANK [1]
+
+SECTION "VRAM1", VRAM
+
 VTiles3:: ds $800
 VTiles4:: ds $800
 VTiles5:: ds $800
 VBGMap2:: ds $400
 VBGMap3:: ds $400
-VRAM_End::
diff --git a/wram.asm b/wram.asm
index 718d51d36..2f9b8dda7 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1,11 +1,12 @@
 INCLUDE "includes.asm"
 INCLUDE "macros/wram.asm"
+
+
 INCLUDE "vram.asm"
 
 
 SECTION "Stack", WRAM0
 
-wRAM0Start::
 StackBottom::
 	ds $100 - 1
 Stack::
@@ -805,7 +806,6 @@ NEXTU ; c6d0
 wPokedexDataStart::
 wPokedexOrder:: ds $100 ; >= NUM_POKEMON
 wPokedexOrderEnd::
-wPokedexMetadata::
 wDexListingScrollOffset:: db ; offset of the first displayed entry from the start
 wDexListingCursor:: db ; Dex cursor
 wDexListingEnd:: db ; Last mon to display
@@ -1504,7 +1504,6 @@ wDaysSince:: db
 
 SECTION "WRAM 1", WRAMX
 
-wRAM1Start::
 wd000:: ds 1
 
 DefaultSpawnpoint:: db
@@ -1840,7 +1839,7 @@ CurElevatorFloors:: db
 
 NEXTU ; d0f0
 ; mailbox data
-	ds 1
+wCurMessageScrollPosition:: db
 wCurMessageIndex:: db
 wMailboxCount:: db
 wMailboxItems:: ds MAILBOX_CAPACITY
@@ -1956,7 +1955,7 @@ SouthMapConnection:: map_connection_struct South ; d1b5
 WestMapConnection::  map_connection_struct West ; d1c1
 EastMapConnection::  map_connection_struct East ; d1cd
 
-TilesetHeader::
+Tileset::
 TilesetBank:: db ; d1d9
 TilesetAddress:: dw ; d1da
 TilesetBlocksBank:: db ; d1dc
@@ -1966,7 +1965,7 @@ TilesetCollisionAddress:: dw ; d1e0
 TilesetAnim:: dw ; bank 3f ; d1e2
 	ds 2  ; unused ; d1e4
 TilesetPalettes:: dw ; bank 3f ; d1e6
-TilesetHeaderEnd::
+TilesetEnd::
 
 EvolvableFlags:: flag_array PARTY_LENGTH ; d1e8
 
@@ -2819,7 +2818,7 @@ wPokeAnimBitmaskBuffer:: ds 7
 wPokeAnimStructEnd::
 
 
-SECTION "Battle Tower", WRAMX
+SECTION "Battle Tower RAM", WRAMX
 
 w3_d000:: ds 1 ; d000
 w3_d001:: ds 1
@@ -2942,21 +2941,16 @@ wBattleAnimTemp0:: db
 wBattleAnimTemp1:: db
 wBattleAnimTemp2:: db
 wBattleAnimTemp3:: db
-wBattleAnimTemp4:: db
-wBattleAnimTemp5:: db
-wBattleAnimTemp6:: db
-wBattleAnimTemp7:: db
-wBattleAnimTemp8:: db
 
 NEXTU ; d419
 wBattleAnimTempOAMFlags:: db
-	ds 1
+wBattleAnimTempField02:: db
 wBattleAnimTempTileID:: db
 wBattleAnimTempXCoord:: db
 wBattleAnimTempYCoord:: db
 wBattleAnimTempXOffset:: db
 wBattleAnimTempYOffset:: db
-	ds 1
+wBattleAnimTempAddSubFlags:: db
 wBattleAnimTempPalette:: db
 ENDU ; d422
author	yenatch <yenatch@gmail.com>	2017-12-28 01:30:36 -0500
committer	GitHub <noreply@github.com>	2017-12-28 01:30:36 -0500
commit	da28d1a84b0499bead314e17ae2ff0d13eb03196 (patch)
tree	c212adfc53d1996c06f2e4be1d6e480e687a2ad8
parent	bad9e33530af8cdc29ce5629df682fc7915bfff0 (diff)
parent	2c4777f3363cd64d05fb00084fd83dff8ac31674 (diff)