Merge pull request #242 from yenatch/master

Redone graphics handling and renamed pics.

2382 files changed, 2538 insertions, 2505 deletions

diff --git a/Makefile b/Makefile
index 403ecf1ce..c35b888bb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,15 @@
 PYTHON := python
-POKEMONTOOLS := extras/pokemontools
-.SUFFIXES: .asm .tx .o .gbc .png .2bpp .1bpp .lz .pal .bin
+
+.SUFFIXES:
+.SUFFIXES: .asm .tx .o .gbc .png .2bpp .1bpp .lz .pal .bin .blk .tilemap
 .PHONY: all clean crystal pngs
 .SECONDEXPANSION:
 
+POKEMONTOOLS := extras/pokemontools
+GFX          := $(PYTHON) $(POKEMONTOOLS)/gfx.py
+INCLUDES     := $(PYTHON) $(POKEMONTOOLS)/scan_includes.py
+PREPROCESS   := $(PYTHON) prequeue.py
+
 TEXTQUEUE :=
 
 CRYSTAL_OBJS := \
@@ -26,12 +32,8 @@ OBJS := $(CRYSTAL_OBJS)
 
 ROMS := pokecrystal.gbc
 
-
-# generate a list of dependencies for each object file
-$(shell $(foreach obj, $(OBJS), \
-	$(eval $(obj:.o=)_DEPENDENCIES := $(shell $(PYTHON) $(POKEMONTOOLS)/scan_includes.py $(obj:.o=.asm))) \
-))
-
+# object dependencies
+$(shell $(foreach obj, $(OBJS), $(eval $(obj:.o=)_DEPENDENCIES := $(shell $(INCLUDES) $(obj:.o=.asm)))))
 
 all: $(ROMS)
 
@@ -52,7 +54,7 @@ baserom.gbc: ;
 	@rm -f $@
 
 $(OBJS): $$*.tx $$(patsubst %.asm, %.tx, $$($$*_DEPENDENCIES))
-	@$(PYTHON) prequeue.py $(TEXTQUEUE)
+	@$(PREPROCESS) $(TEXTQUEUE)
 	$(eval TEXTQUEUE :=)
 	rgbasm -o $@ $*.tx
 
@@ -63,49 +65,17 @@ pokecrystal.gbc: $(CRYSTAL_OBJS)
 
 
 pngs:
-	$(PYTHON) $(POKEMONTOOLS)/gfx.py mass-decompress
-	$(PYTHON) $(POKEMONTOOLS)/gfx.py dump-pngs
-
-gfx/pics/%/front.lz:: gfx/pics/%/tiles.2bpp gfx/pics/%/front.png
-	$(PYTHON) $(POKEMONTOOLS)/gfx.py png-to-lz --front $^
-gfx/pics/%/front.2bpp:: gfx/pics/%/front.lz
-	$(PYTHON) $(POKEMONTOOLS)/gfx.py front-to-2bpp $<
-gfx/pics/%/front.png:: gfx/pics/%/front.2bpp
-	$(PYTHON) $(POKEMONTOOLS)/gfx.py 2bpp-to-png $<
-gfx/pics/%/tiles.2bpp:: gfx/pics/%/front.lz
-	$(PYTHON) $(POKEMONTOOLS)/gfx.py anim-from-front $<
-
-gfx/pics/%/tiles.2bpp:: gfx/pics/%/tiles.png
-	$(PYTHON) $(POKEMONTOOLS)/gfx.py png-to-2bpp $<
-gfx/pics/%/tiles.png:: gfx/pics/%/tiles.2bpp
-	$(PYTHON) $(POKEMONTOOLS)/gfx.py 2bpp-to-png $<
-
-gfx/pics/%/back.lz:: gfx/pics/%/back.png
-	$(PYTHON) $(POKEMONTOOLS)/gfx.py png-to-lz --vert $<
-gfx/pics/%/back.png:: gfx/pics/%/back.lz
-	$(PYTHON) $(POKEMONTOOLS)/gfx.py lz-to-png --vert $<
-
-gfx/trainers/%.lz:: gfx/trainers/%.png
-	$(PYTHON) $(POKEMONTOOLS)/gfx.py png-to-lz --vert $<
-gfx/trainers/%.png:: gfx/trainers/%.lz
-	$(PYTHON) $(POKEMONTOOLS)/gfx.py lz-to-png --vert $<
-
-
-%.lz:: %.png
-	$(PYTHON) $(POKEMONTOOLS)/gfx.py png-to-lz $<
-%.png:: %.lz
-	$(PYTHON) $(POKEMONTOOLS)/gfx.py lz-to-png $<
-
-%.2bpp:: %.png
-	$(PYTHON) $(POKEMONTOOLS)/gfx.py png-to-2bpp $<
-%.png:: %.2bpp
-	$(PYTHON) $(POKEMONTOOLS)/gfx.py 2bpp-to-png $<
-
-%.1bpp:: %.png
-	$(PYTHON) $(POKEMONTOOLS)/gfx.py png-to-1bpp $<
-%.png:: %.1bpp
-	$(PYTHON) $(POKEMONTOOLS)/gfx.py 1bpp-to-png $<
+	find . -iname "*.lz"      -exec $(GFX) unlz {} +
+	find . -iname "*.[12]bpp" -exec $(GFX) png  {} +
+	find . -iname "*.[12]bpp" -exec touch {} +
+	find . -iname "*.lz"      -exec touch {} +
+
+%.2bpp: %.png ; $(GFX) 2bpp $<
+%.1bpp: %.png ; $(GFX) 1bpp $<
+%.lz:   %     ; $(GFX) lz   $<
 
 %.pal: ;
 %.bin: ;
+%.blk: ;
+%.tilemap: ;
 
diff --git a/battle/anim_gfx.asm b/battle/anim_gfx.asm
index be318332d..f95365188 100644
--- a/battle/anim_gfx.asm
+++ b/battle/anim_gfx.asm
@@ -1,42 +1,42 @@
 AnimObj00GFX: ; 84a2e
-AnimObj01GFX: INCBIN "gfx/fx/001.lz"
-AnimObj02GFX: INCBIN "gfx/fx/002.lz"
-AnimObj03GFX: INCBIN "gfx/fx/003.lz"
-AnimObj04GFX: INCBIN "gfx/fx/004.lz"
-AnimObj05GFX: INCBIN "gfx/fx/005.lz"
-AnimObj07GFX: INCBIN "gfx/fx/007.lz"
-AnimObj08GFX: INCBIN "gfx/fx/008.lz"
-AnimObj10GFX: INCBIN "gfx/fx/010.lz"
-AnimObj09GFX: INCBIN "gfx/fx/009.lz"
-AnimObj12GFX: INCBIN "gfx/fx/012.lz"
-AnimObj06GFX: INCBIN "gfx/fx/006.lz"
-AnimObj11GFX: INCBIN "gfx/fx/011.lz"
-AnimObj13GFX: INCBIN "gfx/fx/013.lz"
-AnimObj14GFX: INCBIN "gfx/fx/014.lz"
-AnimObj24GFX: INCBIN "gfx/fx/024.lz"
-AnimObj15GFX: INCBIN "gfx/fx/015.lz"
-AnimObj16GFX: INCBIN "gfx/fx/016.lz"
-AnimObj17GFX: INCBIN "gfx/fx/017.lz"
-AnimObj18GFX: INCBIN "gfx/fx/018.lz"
-AnimObj19GFX: INCBIN "gfx/fx/019.lz"
-AnimObj20GFX: INCBIN "gfx/fx/020.lz"
-AnimObj22GFX: INCBIN "gfx/fx/022.lz"
-AnimObj21GFX: INCBIN "gfx/fx/021.lz"
-AnimObj23GFX: INCBIN "gfx/fx/023.lz"
-AnimObj26GFX: INCBIN "gfx/fx/026.lz"
-AnimObj27GFX: INCBIN "gfx/fx/027.lz"
-AnimObj28GFX: INCBIN "gfx/fx/028.lz"
-AnimObj29GFX: INCBIN "gfx/fx/029.lz"
-AnimObj30GFX: INCBIN "gfx/fx/030.lz"
-AnimObj31GFX: INCBIN "gfx/fx/031.lz"
-AnimObj32GFX: INCBIN "gfx/fx/032.lz"
-AnimObj33GFX: INCBIN "gfx/fx/033.lz"
-AnimObj34GFX: INCBIN "gfx/fx/034.lz"
-AnimObj25GFX: INCBIN "gfx/fx/025.lz"
-AnimObj35GFX: INCBIN "gfx/fx/035.lz"
-AnimObj36GFX: INCBIN "gfx/fx/036.lz"
-AnimObj37GFX: INCBIN "gfx/fx/037.lz"
-AnimObj38GFX: INCBIN "gfx/fx/038.lz"
-AnimObj39GFX: INCBIN "gfx/fx/039.lz"
+AnimObj01GFX: INCBIN "gfx/fx/001.2bpp.lz"
+AnimObj02GFX: INCBIN "gfx/fx/002.2bpp.lz"
+AnimObj03GFX: INCBIN "gfx/fx/003.2bpp.lz"
+AnimObj04GFX: INCBIN "gfx/fx/004.2bpp.lz"
+AnimObj05GFX: INCBIN "gfx/fx/005.2bpp.lz"
+AnimObj07GFX: INCBIN "gfx/fx/007.2bpp.lz"
+AnimObj08GFX: INCBIN "gfx/fx/008.2bpp.lz"
+AnimObj10GFX: INCBIN "gfx/fx/010.2bpp.lz"
+AnimObj09GFX: INCBIN "gfx/fx/009.2bpp.lz"
+AnimObj12GFX: INCBIN "gfx/fx/012.2bpp.lz"
+AnimObj06GFX: INCBIN "gfx/fx/006.2bpp.lz"
+AnimObj11GFX: INCBIN "gfx/fx/011.2bpp.lz"
+AnimObj13GFX: INCBIN "gfx/fx/013.2bpp.lz"
+AnimObj14GFX: INCBIN "gfx/fx/014.2bpp.lz"
+AnimObj24GFX: INCBIN "gfx/fx/024.2bpp.lz"
+AnimObj15GFX: INCBIN "gfx/fx/015.2bpp.lz"
+AnimObj16GFX: INCBIN "gfx/fx/016.2bpp.lz"
+AnimObj17GFX: INCBIN "gfx/fx/017.2bpp.lz"
+AnimObj18GFX: INCBIN "gfx/fx/018.2bpp.lz"
+AnimObj19GFX: INCBIN "gfx/fx/019.2bpp.lz"
+AnimObj20GFX: INCBIN "gfx/fx/020.2bpp.lz"
+AnimObj22GFX: INCBIN "gfx/fx/022.2bpp.lz"
+AnimObj21GFX: INCBIN "gfx/fx/021.2bpp.lz"
+AnimObj23GFX: INCBIN "gfx/fx/023.2bpp.lz"
+AnimObj26GFX: INCBIN "gfx/fx/026.2bpp.lz"
+AnimObj27GFX: INCBIN "gfx/fx/027.2bpp.lz"
+AnimObj28GFX: INCBIN "gfx/fx/028.2bpp.lz"
+AnimObj29GFX: INCBIN "gfx/fx/029.2bpp.lz"
+AnimObj30GFX: INCBIN "gfx/fx/030.2bpp.lz"
+AnimObj31GFX: INCBIN "gfx/fx/031.2bpp.lz"
+AnimObj32GFX: INCBIN "gfx/fx/032.2bpp.lz"
+AnimObj33GFX: INCBIN "gfx/fx/033.2bpp.lz"
+AnimObj34GFX: INCBIN "gfx/fx/034.2bpp.lz"
+AnimObj25GFX: INCBIN "gfx/fx/025.2bpp.lz"
+AnimObj35GFX: INCBIN "gfx/fx/035.2bpp.lz"
+AnimObj36GFX: INCBIN "gfx/fx/036.2bpp.lz"
+AnimObj37GFX: INCBIN "gfx/fx/037.2bpp.lz"
+AnimObj38GFX: INCBIN "gfx/fx/038.2bpp.lz"
+AnimObj39GFX: INCBIN "gfx/fx/039.2bpp.lz"
 ; 8640e
 
diff --git a/engine/credits.asm b/engine/credits.asm
index 42144c5d2..a68f7ceb0 100644
--- a/engine/credits.asm
+++ b/engine/credits.asm
@@ -803,13 +803,13 @@ Function109c1c: ; 109c1c (42:5c1c)
 ; 109c24 (42:5c24)
 
 
-CreditsBorderGFX:    INCBIN "gfx/credits/border.2bpp"
+CreditsBorderGFX:    INCBIN "gfx/credits/border.w72.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"
+CreditsPichuGFX:     INCBIN "gfx/credits/pichu.w32.2bpp"
+CreditsSmoochumGFX:  INCBIN "gfx/credits/smoochum.w32.2bpp"
+CreditsDittoGFX:     INCBIN "gfx/credits/ditto.w32.2bpp"
+CreditsIgglybuffGFX: INCBIN "gfx/credits/igglybuff.w32.2bpp"
 
 
 CreditsScript: ; 10acb4
diff --git a/engine/title.asm b/engine/title.asm
index 5e444cff1..39025b2f1 100644
--- a/engine/title.asm
+++ b/engine/title.asm
@@ -375,15 +375,15 @@ AnimateTitleCrystal: ; 10ef32
 ; 10ef46
 
 TitleSuicuneGFX: ; 10ef46
-INCBIN "gfx/title/suicune.lz"
+INCBIN "gfx/title/suicune.w128.2bpp.lz"
 ; 10f326
 
 TitleLogoGFX: ; 10f326
-INCBIN "gfx/title/logo.lz"
+INCBIN "gfx/title/logo.w160.t4.2bpp.lz"
 ; 10fcee
 
 TitleCrystalGFX: ; 10fcee
-INCBIN "gfx/title/crystal.lz"
+INCBIN "gfx/title/crystal.w48.interleave.2bpp.lz"
 ; 10fede
 
 TitleScreenPalettes:
diff --git a/extras b/extras
-Subproject c9f9d7f280e177855e8120f50f770630b881ca7
+Subproject b73c3096662c243fc5d76046e960d7f80d09dfe
diff --git a/gfx/credits/border.2bpp b/gfx/credits/border.w72.2bpp
index 32b3fead9..32b3fead9 100644
--- a/gfx/credits/border.2bpp
+++ b/gfx/credits/border.w72.2bpp
diff --git a/gfx/credits/ditto.2bpp b/gfx/credits/ditto.w32.2bpp
index 59677a90f..59677a90f 100644
--- a/gfx/credits/ditto.2bpp
+++ b/gfx/credits/ditto.w32.2bpp
diff --git a/gfx/credits/igglybuff.2bpp b/gfx/credits/igglybuff.w32.2bpp
index a626c758d..a626c758d 100644
--- a/gfx/credits/igglybuff.2bpp
+++ b/gfx/credits/igglybuff.w32.2bpp
diff --git a/gfx/credits/pichu.2bpp b/gfx/credits/pichu.w32.2bpp
index da635e6b4..da635e6b4 100644
--- a/gfx/credits/pichu.2bpp
+++ b/gfx/credits/pichu.w32.2bpp
diff --git a/gfx/credits/smoochum.2bpp b/gfx/credits/smoochum.w32.2bpp
index 83926ec95..83926ec95 100644
--- a/gfx/credits/smoochum.2bpp
+++ b/gfx/credits/smoochum.w32.2bpp
diff --git a/gfx/credits/theend.2bpp b/gfx/credits/theend.w64.2bpp
index b689688ba..b689688ba 100644
--- a/gfx/credits/theend.2bpp
+++ b/gfx/credits/theend.w64.2bpp
diff --git a/gfx/fx/000.lz b/gfx/fx/000.2bpp.lz
index 5d9ffbe5d..5d9ffbe5d 100644
--- a/gfx/fx/000.lz
+++ b/gfx/fx/000.2bpp.lz
diff --git a/gfx/fx/001.lz b/gfx/fx/001.2bpp.lz
index 5d9ffbe5d..5d9ffbe5d 100644
--- a/gfx/fx/001.lz
+++ b/gfx/fx/001.2bpp.lz
diff --git a/gfx/fx/002.lz b/gfx/fx/002.2bpp.lz
index 740a48799..740a48799 100644
--- a/gfx/fx/002.lz
+++ b/gfx/fx/002.2bpp.lz
diff --git a/gfx/fx/003.lz b/gfx/fx/003.2bpp.lz
index e15e9f9bb..e15e9f9bb 100644
--- a/gfx/fx/003.lz
+++ b/gfx/fx/003.2bpp.lz
diff --git a/gfx/fx/004.lz b/gfx/fx/004.2bpp.lz
index 6a81bbb65..6a81bbb65 100644
--- a/gfx/fx/004.lz
+++ b/gfx/fx/004.2bpp.lz
diff --git a/gfx/fx/005.lz b/gfx/fx/005.2bpp.lz
index 81de5850f..81de5850f 100644
--- a/gfx/fx/005.lz
+++ b/gfx/fx/005.2bpp.lz
diff --git a/gfx/fx/006.lz b/gfx/fx/006.2bpp.lz
index 589fc48b6..589fc48b6 100644
--- a/gfx/fx/006.lz
+++ b/gfx/fx/006.2bpp.lz
diff --git a/gfx/fx/007.lz b/gfx/fx/007.2bpp.lz
index bf26fed2b..bf26fed2b 100644
--- a/gfx/fx/007.lz
+++ b/gfx/fx/007.2bpp.lz
diff --git a/gfx/fx/008.lz b/gfx/fx/008.2bpp.lz
index 4303302a1..4303302a1 100644
--- a/gfx/fx/008.lz
+++ b/gfx/fx/008.2bpp.lz
diff --git a/gfx/fx/009.lz b/gfx/fx/009.2bpp.lz
index d5481ea6e..d5481ea6e 100644
--- a/gfx/fx/009.lz
+++ b/gfx/fx/009.2bpp.lz
diff --git a/gfx/fx/010.lz b/gfx/fx/010.2bpp.lz
index 3d059700b..3d059700b 100644
--- a/gfx/fx/010.lz
+++ b/gfx/fx/010.2bpp.lz
diff --git a/gfx/fx/011.lz b/gfx/fx/011.2bpp.lz
index e09b082db..e09b082db 100644
--- a/gfx/fx/011.lz
+++ b/gfx/fx/011.2bpp.lz
diff --git a/gfx/fx/012.lz b/gfx/fx/012.2bpp.lz
index df2cbe604..df2cbe604 100644
--- a/gfx/fx/012.lz
+++ b/gfx/fx/012.2bpp.lz
diff --git a/gfx/fx/013.lz b/gfx/fx/013.2bpp.lz
index 3d546191a..3d546191a 100644
--- a/gfx/fx/013.lz
+++ b/gfx/fx/013.2bpp.lz
diff --git a/gfx/fx/014.lz b/gfx/fx/014.2bpp.lz
index e195da453..e195da453 100644
--- a/gfx/fx/014.lz
+++ b/gfx/fx/014.2bpp.lz
diff --git a/gfx/fx/015.lz b/gfx/fx/015.2bpp.lz
index 375d0bf9c..375d0bf9c 100644
--- a/gfx/fx/015.lz
+++ b/gfx/fx/015.2bpp.lz
diff --git a/gfx/fx/016.lz b/gfx/fx/016.2bpp.lz
index 1ce9ab82c..1ce9ab82c 100644
--- a/gfx/fx/016.lz
+++ b/gfx/fx/016.2bpp.lz
diff --git a/gfx/fx/017.lz b/gfx/fx/017.2bpp.lz
index 5d09f9a6a..5d09f9a6a 100644
--- a/gfx/fx/017.lz
+++ b/gfx/fx/017.2bpp.lz
diff --git a/gfx/fx/018.lz b/gfx/fx/018.2bpp.lz
index 32c82243c..32c82243c 100644
--- a/gfx/fx/018.lz
+++ b/gfx/fx/018.2bpp.lz
diff --git a/gfx/fx/019.lz b/gfx/fx/019.2bpp.lz
index 9c2769b83..9c2769b83 100644
--- a/gfx/fx/019.lz
+++ b/gfx/fx/019.2bpp.lz
diff --git a/gfx/fx/020.lz b/gfx/fx/020.2bpp.lz
index da62ba918..da62ba918 100644
--- a/gfx/fx/020.lz
+++ b/gfx/fx/020.2bpp.lz
diff --git a/gfx/fx/021.lz b/gfx/fx/021.2bpp.lz
index fb55f2edc..fb55f2edc 100644
--- a/gfx/fx/021.lz
+++ b/gfx/fx/021.2bpp.lz
diff --git a/gfx/fx/022.lz b/gfx/fx/022.2bpp.lz
index f7d6a480f..f7d6a480f 100644
--- a/gfx/fx/022.lz
+++ b/gfx/fx/022.2bpp.lz
diff --git a/gfx/fx/023.lz b/gfx/fx/023.2bpp.lz
index d6402dd3d..d6402dd3d 100644
--- a/gfx/fx/023.lz
+++ b/gfx/fx/023.2bpp.lz
diff --git a/gfx/fx/024.lz b/gfx/fx/024.2bpp.lz
index a563de1a8..a563de1a8 100644
--- a/gfx/fx/024.lz
+++ b/gfx/fx/024.2bpp.lz
diff --git a/gfx/fx/025.lz b/gfx/fx/025.2bpp.lz
index e5ce7df8a..e5ce7df8a 100644
--- a/gfx/fx/025.lz
+++ b/gfx/fx/025.2bpp.lz
diff --git a/gfx/fx/026.lz b/gfx/fx/026.2bpp.lz
index 3508a1f58..3508a1f58 100644
--- a/gfx/fx/026.lz
+++ b/gfx/fx/026.2bpp.lz
diff --git a/gfx/fx/027.lz b/gfx/fx/027.2bpp.lz
index 84b4018e5..84b4018e5 100644
--- a/gfx/fx/027.lz
+++ b/gfx/fx/027.2bpp.lz
diff --git a/gfx/fx/028.lz b/gfx/fx/028.2bpp.lz
index e0cdc644c..e0cdc644c 100644
--- a/gfx/fx/028.lz
+++ b/gfx/fx/028.2bpp.lz
diff --git a/gfx/fx/029.lz b/gfx/fx/029.2bpp.lz
index a92f74796..a92f74796 100644
--- a/gfx/fx/029.lz
+++ b/gfx/fx/029.2bpp.lz
diff --git a/gfx/fx/030.lz b/gfx/fx/030.2bpp.lz
index ef628afb4..ef628afb4 100644
--- a/gfx/fx/030.lz
+++ b/gfx/fx/030.2bpp.lz
diff --git a/gfx/fx/031.lz b/gfx/fx/031.2bpp.lz
index d0c5f0dfc..d0c5f0dfc 100644
--- a/gfx/fx/031.lz
+++ b/gfx/fx/031.2bpp.lz
diff --git a/gfx/fx/032.lz b/gfx/fx/032.2bpp.lz
index e0412dd81..e0412dd81 100644
--- a/gfx/fx/032.lz
+++ b/gfx/fx/032.2bpp.lz
diff --git a/gfx/fx/033.lz b/gfx/fx/033.2bpp.lz
index 99fa15c6f..99fa15c6f 100644
--- a/gfx/fx/033.lz
+++ b/gfx/fx/033.2bpp.lz
diff --git a/gfx/fx/034.lz b/gfx/fx/034.2bpp.lz
index d7d48020f..d7d48020f 100644
--- a/gfx/fx/034.lz
+++ b/gfx/fx/034.2bpp.lz
diff --git a/gfx/fx/035.lz b/gfx/fx/035.2bpp.lz
index 1a52d6350..1a52d6350 100644
--- a/gfx/fx/035.lz
+++ b/gfx/fx/035.2bpp.lz
diff --git a/gfx/fx/036.lz b/gfx/fx/036.2bpp.lz
index 3e47170b1..3e47170b1 100644
--- a/gfx/fx/036.lz
+++ b/gfx/fx/036.2bpp.lz
diff --git a/gfx/fx/037.lz b/gfx/fx/037.2bpp.lz
index 61d89d224..61d89d224 100644
--- a/gfx/fx/037.lz
+++ b/gfx/fx/037.2bpp.lz
diff --git a/gfx/fx/038.lz b/gfx/fx/038.2bpp.lz
index d94a5cb35..d94a5cb35 100644
--- a/gfx/fx/038.lz
+++ b/gfx/fx/038.2bpp.lz
diff --git a/gfx/fx/039.lz b/gfx/fx/039.2bpp.lz
index 5e203cb63..5e203cb63 100644
--- a/gfx/fx/039.lz
+++ b/gfx/fx/039.2bpp.lz
diff --git a/gfx/intro/001.lz b/gfx/intro/001.tilemap.lz
index 926fb6e8e..926fb6e8e 100644
--- a/gfx/intro/001.lz
+++ b/gfx/intro/001.tilemap.lz
diff --git a/gfx/intro/002.lz b/gfx/intro/002.tilemap.lz
index c63f215f2..c63f215f2 100644
--- a/gfx/intro/002.lz
+++ b/gfx/intro/002.tilemap.lz
diff --git a/gfx/intro/003.lz b/gfx/intro/003.tilemap.lz
index 182ffb130..182ffb130 100644
--- a/gfx/intro/003.lz
+++ b/gfx/intro/003.tilemap.lz
diff --git a/gfx/intro/004.lz b/gfx/intro/004.tilemap.lz
index 5897d176b..5897d176b 100644
--- a/gfx/intro/004.lz
+++ b/gfx/intro/004.tilemap.lz
diff --git a/gfx/intro/005.lz b/gfx/intro/005.tilemap.lz
index 0ae96b7f7..0ae96b7f7 100644
--- a/gfx/intro/005.lz
+++ b/gfx/intro/005.tilemap.lz
diff --git a/gfx/intro/006.lz b/gfx/intro/006.tilemap.lz
index 46436b607..46436b607 100644
--- a/gfx/intro/006.lz
+++ b/gfx/intro/006.tilemap.lz
diff --git a/gfx/intro/007.lz b/gfx/intro/007.tilemap.lz
index d1694ed3e..d1694ed3e 100644
--- a/gfx/intro/007.lz
+++ b/gfx/intro/007.tilemap.lz
diff --git a/gfx/intro/008.lz b/gfx/intro/008.tilemap.lz
index 356c6d5e8..356c6d5e8 100644
--- a/gfx/intro/008.lz
+++ b/gfx/intro/008.tilemap.lz
diff --git a/gfx/intro/009.lz b/gfx/intro/009.tilemap.lz
index 238d6a60e..238d6a60e 100644
--- a/gfx/intro/009.lz
+++ b/gfx/intro/009.tilemap.lz
diff --git a/gfx/intro/010.lz b/gfx/intro/010.tilemap.lz
index 6e45c45f7..6e45c45f7 100644
--- a/gfx/intro/010.lz
+++ b/gfx/intro/010.tilemap.lz
diff --git a/gfx/intro/011.lz b/gfx/intro/011.tilemap.lz
index 68ceb19f8..68ceb19f8 100644
--- a/gfx/intro/011.lz
+++ b/gfx/intro/011.tilemap.lz
diff --git a/gfx/intro/012.lz b/gfx/intro/012.tilemap.lz
index 0d6af294c..0d6af294c 100644
--- a/gfx/intro/012.lz
+++ b/gfx/intro/012.tilemap.lz
diff --git a/gfx/intro/013.lz b/gfx/intro/013.tilemap.lz
index 91635527c..91635527c 100644
--- a/gfx/intro/013.lz
+++ b/gfx/intro/013.tilemap.lz
diff --git a/gfx/intro/014.lz b/gfx/intro/014.tilemap.lz
index a892ab1b4..a892ab1b4 100644
--- a/gfx/intro/014.lz
+++ b/gfx/intro/014.tilemap.lz
diff --git a/gfx/intro/015.lz b/gfx/intro/015.tilemap.lz
index 22a4cc926..22a4cc926 100644
--- a/gfx/intro/015.lz
+++ b/gfx/intro/015.tilemap.lz
diff --git a/gfx/intro/017.lz b/gfx/intro/017.tilemap.lz
index 90ce59e58..90ce59e58 100644
--- a/gfx/intro/017.lz
+++ b/gfx/intro/017.tilemap.lz
diff --git a/gfx/intro/background.lz b/gfx/intro/background.2bpp.lz
index 1ef2f1203..1ef2f1203 100644
--- a/gfx/intro/background.lz
+++ b/gfx/intro/background.2bpp.lz
diff --git a/gfx/intro/crystal_unowns.lz b/gfx/intro/crystal_unowns.2bpp.lz
index 2585d9c52..2585d9c52 100644
--- a/gfx/intro/crystal_unowns.lz
+++ b/gfx/intro/crystal_unowns.2bpp.lz
diff --git a/gfx/intro/logo.lz b/gfx/intro/logo.2bpp.lz
index 5beb0e6ef..5beb0e6ef 100644
--- a/gfx/intro/logo.lz
+++ b/gfx/intro/logo.2bpp.lz
diff --git a/gfx/intro/pichu_wooper.lz b/gfx/intro/pichu_wooper.2bpp.lz
index 90174a098..90174a098 100644
--- a/gfx/intro/pichu_wooper.lz
+++ b/gfx/intro/pichu_wooper.2bpp.lz
diff --git a/gfx/intro/pulse.lz b/gfx/intro/pulse.2bpp.lz
index 5a7fec1a9..5a7fec1a9 100644
--- a/gfx/intro/pulse.lz
+++ b/gfx/intro/pulse.2bpp.lz
diff --git a/gfx/intro/suicune_back.lz b/gfx/intro/suicune_back.2bpp.lz
index 470d78b5b..470d78b5b 100644
--- a/gfx/intro/suicune_back.lz
+++ b/gfx/intro/suicune_back.2bpp.lz
diff --git a/gfx/intro/suicune_close.lz b/gfx/intro/suicune_close.2bpp.lz
index 19b806269..19b806269 100644
--- a/gfx/intro/suicune_close.lz
+++ b/gfx/intro/suicune_close.2bpp.lz
diff --git a/gfx/intro/suicune_jump.lz b/gfx/intro/suicune_jump.2bpp.lz
index b34a0c765..b34a0c765 100644
--- a/gfx/intro/suicune_jump.lz
+++ b/gfx/intro/suicune_jump.2bpp.lz
diff --git a/gfx/intro/suicune_run.lz b/gfx/intro/suicune_run.2bpp.lz
index f48162258..f48162258 100644
--- a/gfx/intro/suicune_run.lz
+++ b/gfx/intro/suicune_run.2bpp.lz
diff --git a/gfx/intro/unown_back.lz b/gfx/intro/unown_back.2bpp.lz
index 21cae2927..21cae2927 100644
--- a/gfx/intro/unown_back.lz
+++ b/gfx/intro/unown_back.2bpp.lz
diff --git a/gfx/intro/unowns.lz b/gfx/intro/unowns.2bpp.lz
index 67e90b0b6..67e90b0b6 100644
--- a/gfx/intro/unowns.lz
+++ b/gfx/intro/unowns.2bpp.lz
diff --git a/gfx/misc/badges.2bpp b/gfx/misc/badges.w16.2bpp
index 52cf24e1b..52cf24e1b 100644
--- a/gfx/misc/badges.2bpp
+++ b/gfx/misc/badges.w16.2bpp
diff --git a/gfx/misc/dude.lz b/gfx/misc/dude.6x6.2bpp.lz
index b8e96a09f..b8e96a09f 100644
--- a/gfx/misc/dude.lz
+++ b/gfx/misc/dude.6x6.2bpp.lz
diff --git a/gfx/misc/font.1bpp b/gfx/misc/font.w128.1bpp
index ff8d2d4fe..ff8d2d4fe 100644
--- a/gfx/misc/font.1bpp
+++ b/gfx/misc/font.w128.1bpp
diff --git a/gfx/misc/font_inversed.1bpp b/gfx/misc/font_inversed.w128.1bpp
index 39a7e73d6..39a7e73d6 100644
--- a/gfx/misc/font_inversed.1bpp
+++ b/gfx/misc/font_inversed.w128.1bpp
diff --git a/gfx/misc/footprints.1bpp b/gfx/misc/footprints.w128.1bpp
index 005bfee0f..005bfee0f 100644
--- a/gfx/misc/footprints.1bpp
+++ b/gfx/misc/footprints.w128.1bpp
diff --git a/gfx/misc/gbc_only.lz b/gfx/misc/gbc_only.w112.2bpp.lz
index 9533fbe6d..9533fbe6d 100644
--- a/gfx/misc/gbc_only.lz
+++ b/gfx/misc/gbc_only.w112.2bpp.lz
diff --git a/gfx/misc/leaders.2bpp b/gfx/misc/leaders.w24.2bpp
index fecae45db..fecae45db 100644
--- a/gfx/misc/leaders.2bpp
+++ b/gfx/misc/leaders.w24.2bpp
diff --git a/gfx/misc/pack.2bpp b/gfx/misc/pack.w40.2bpp
index 22be55081..22be55081 100644
--- a/gfx/misc/pack.2bpp
+++ b/gfx/misc/pack.w40.2bpp
diff --git a/gfx/misc/pack_f.2bpp b/gfx/misc/pack_f.w40.2bpp
index 60d6b7f91..60d6b7f91 100644
--- a/gfx/misc/pack_f.2bpp
+++ b/gfx/misc/pack_f.w40.2bpp
diff --git a/gfx/misc/player.lz b/gfx/misc/player.6x6.2bpp.lz
index aec84bbab..aec84bbab 100644
--- a/gfx/misc/player.lz
+++ b/gfx/misc/player.6x6.2bpp.lz
diff --git a/gfx/misc/pokegear.lz b/gfx/misc/pokegear.2bpp.lz
index 9db046141..9db046141 100644
--- a/gfx/misc/pokegear.lz
+++ b/gfx/misc/pokegear.2bpp.lz
diff --git a/gfx/misc/pokegear_sprites.lz b/gfx/misc/pokegear_sprites.2bpp.lz
index e64a385be..e64a385be 100644
--- a/gfx/misc/pokegear_sprites.lz
+++ b/gfx/misc/pokegear_sprites.2bpp.lz
diff --git a/gfx/misc/town_map.lz b/gfx/misc/town_map.2bpp.lz
index c807a372f..c807a372f 100644
--- a/gfx/misc/town_map.lz
+++ b/gfx/misc/town_map.2bpp.lz
diff --git a/gfx/pics.asm b/gfx/pics.asm
index 375d28ac5..a83345ecf 100644
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@@ -22,711 +22,711 @@ INCLUDE "gfx/pics/trainer_pic_pointers.asm"
 
 SECTION "Pics 1", ROMX, BANK[PICS_1]
 
-HoOhFrontpic:        INCBIN "gfx/pics/250/front.lz"
-MachampFrontpic:     INCBIN "gfx/pics/068/front.lz"
-NinetalesFrontpic:   INCBIN "gfx/pics/038/front.lz"
-FeraligatrFrontpic:  INCBIN "gfx/pics/160/front.lz"
-NidokingFrontpic:    INCBIN "gfx/pics/034/front.lz"
-RaikouFrontpic:      INCBIN "gfx/pics/243/front.lz"
-LugiaFrontpic:       INCBIN "gfx/pics/249/front.lz"
-ArticunoFrontpic:    INCBIN "gfx/pics/144/front.lz"
-TaurosFrontpic:      INCBIN "gfx/pics/128/front.lz"
-VenusaurFrontpic:    INCBIN "gfx/pics/003/front.lz"
-EnteiFrontpic:       INCBIN "gfx/pics/244/front.lz"
-SuicuneFrontpic:     INCBIN "gfx/pics/245/front.lz"
-TyphlosionFrontpic:  INCBIN "gfx/pics/157/front.lz"
+HoOhFrontpic:        INCBIN "gfx/pics/ho_oh/front.7x7.2bpp.lz"
+MachampFrontpic:     INCBIN "gfx/pics/machamp/front.7x7.2bpp.lz"
+NinetalesFrontpic:   INCBIN "gfx/pics/ninetales/front.7x7.2bpp.lz"
+FeraligatrFrontpic:  INCBIN "gfx/pics/feraligatr/front.7x7.2bpp.lz"
+NidokingFrontpic:    INCBIN "gfx/pics/nidoking/front.7x7.2bpp.lz"
+RaikouFrontpic:      INCBIN "gfx/pics/raikou/front.7x7.2bpp.lz"
+LugiaFrontpic:       INCBIN "gfx/pics/lugia/front.7x7.2bpp.lz"
+ArticunoFrontpic:    INCBIN "gfx/pics/articuno/front.7x7.2bpp.lz"
+TaurosFrontpic:      INCBIN "gfx/pics/tauros/front.7x7.2bpp.lz"
+VenusaurFrontpic:    INCBIN "gfx/pics/venusaur/front.7x7.2bpp.lz"
+EnteiFrontpic:       INCBIN "gfx/pics/entei/front.7x7.2bpp.lz"
+SuicuneFrontpic:     INCBIN "gfx/pics/suicune/front.7x7.2bpp.lz"
+TyphlosionFrontpic:  INCBIN "gfx/pics/typhlosion/front.7x7.2bpp.lz"
 ; 123ffa
 
 
 SECTION "Pics 2", ROMX, BANK[PICS_2]
 
-BlastoiseFrontpic:   INCBIN "gfx/pics/009/front.lz"
-RapidashFrontpic:    INCBIN "gfx/pics/078/front.lz"
-MeganiumFrontpic:    INCBIN "gfx/pics/154/front.lz"
-NidoqueenFrontpic:   INCBIN "gfx/pics/031/front.lz"
-HitmonleeFrontpic:   INCBIN "gfx/pics/106/front.lz"
-ScizorFrontpic:      INCBIN "gfx/pics/212/front.lz"
-BeedrillFrontpic:    INCBIN "gfx/pics/015/front.lz"
-ArcanineFrontpic:    INCBIN "gfx/pics/059/front.lz"
-TyranitarFrontpic:   INCBIN "gfx/pics/248/front.lz"
-MoltresFrontpic:     INCBIN "gfx/pics/146/front.lz"
-ZapdosFrontpic:      INCBIN "gfx/pics/145/front.lz"
-ArbokFrontpic:       INCBIN "gfx/pics/024/front.lz"
-MewtwoFrontpic:      INCBIN "gfx/pics/150/front.lz"
-FearowFrontpic:      INCBIN "gfx/pics/022/front.lz"
-CharizardFrontpic:   INCBIN "gfx/pics/006/front.lz"
-QuilavaFrontpic:     INCBIN "gfx/pics/156/front.lz"
+BlastoiseFrontpic:   INCBIN "gfx/pics/blastoise/front.7x7.2bpp.lz"
+RapidashFrontpic:    INCBIN "gfx/pics/rapidash/front.7x7.2bpp.lz"
+MeganiumFrontpic:    INCBIN "gfx/pics/meganium/front.7x7.2bpp.lz"
+NidoqueenFrontpic:   INCBIN "gfx/pics/nidoqueen/front.7x7.2bpp.lz"
+HitmonleeFrontpic:   INCBIN "gfx/pics/hitmonlee/front.7x7.2bpp.lz"
+ScizorFrontpic:      INCBIN "gfx/pics/scizor/front.7x7.2bpp.lz"
+BeedrillFrontpic:    INCBIN "gfx/pics/beedrill/front.7x7.2bpp.lz"
+ArcanineFrontpic:    INCBIN "gfx/pics/arcanine/front.7x7.2bpp.lz"
+TyranitarFrontpic:   INCBIN "gfx/pics/tyranitar/front.7x7.2bpp.lz"
+MoltresFrontpic:     INCBIN "gfx/pics/moltres/front.7x7.2bpp.lz"
+ZapdosFrontpic:      INCBIN "gfx/pics/zapdos/front.7x7.2bpp.lz"
+ArbokFrontpic:       INCBIN "gfx/pics/arbok/front.7x7.2bpp.lz"
+MewtwoFrontpic:      INCBIN "gfx/pics/mewtwo/front.7x7.2bpp.lz"
+FearowFrontpic:      INCBIN "gfx/pics/fearow/front.7x7.2bpp.lz"
+CharizardFrontpic:   INCBIN "gfx/pics/charizard/front.7x7.2bpp.lz"
+QuilavaFrontpic:     INCBIN "gfx/pics/quilava/front.6x6.2bpp.lz"
 ; 127ffe
 
 
 SECTION "Pics 3", ROMX, BANK[PICS_3]
 
-SteelixFrontpic:     INCBIN "gfx/pics/208/front.lz"
-AlakazamFrontpic:    INCBIN "gfx/pics/065/front.lz"
-GyaradosFrontpic:    INCBIN "gfx/pics/130/front.lz"
-KangaskhanFrontpic:  INCBIN "gfx/pics/115/front.lz"
-RhydonFrontpic:      INCBIN "gfx/pics/112/front.lz"
-GolduckFrontpic:     INCBIN "gfx/pics/055/front.lz"
-RhyhornFrontpic:     INCBIN "gfx/pics/111/front.lz"
-PidgeotFrontpic:     INCBIN "gfx/pics/018/front.lz"
-SlowbroFrontpic:     INCBIN "gfx/pics/080/front.lz"
-ButterfreeFrontpic:  INCBIN "gfx/pics/012/front.lz"
-WeezingFrontpic:     INCBIN "gfx/pics/110/front.lz"
-CloysterFrontpic:    INCBIN "gfx/pics/091/front.lz"
-SkarmoryFrontpic:    INCBIN "gfx/pics/227/front.lz"
-DewgongFrontpic:     INCBIN "gfx/pics/087/front.lz"
-VictreebelFrontpic:  INCBIN "gfx/pics/071/front.lz"
-RaichuFrontpic:      INCBIN "gfx/pics/026/front.lz"
-PrimeapeFrontpic:    INCBIN "gfx/pics/057/front.lz"
-OmastarBackpic:      INCBIN "gfx/pics/139/back.lz"
+SteelixFrontpic:     INCBIN "gfx/pics/steelix/front.7x7.2bpp.lz"
+AlakazamFrontpic:    INCBIN "gfx/pics/alakazam/front.7x7.2bpp.lz"
+GyaradosFrontpic:    INCBIN "gfx/pics/gyarados/front.7x7.2bpp.lz"
+KangaskhanFrontpic:  INCBIN "gfx/pics/kangaskhan/front.7x7.2bpp.lz"
+RhydonFrontpic:      INCBIN "gfx/pics/rhydon/front.7x7.2bpp.lz"
+GolduckFrontpic:     INCBIN "gfx/pics/golduck/front.7x7.2bpp.lz"
+RhyhornFrontpic:     INCBIN "gfx/pics/rhyhorn/front.7x7.2bpp.lz"
+PidgeotFrontpic:     INCBIN "gfx/pics/pidgeot/front.7x7.2bpp.lz"
+SlowbroFrontpic:     INCBIN "gfx/pics/slowbro/front.7x7.2bpp.lz"
+ButterfreeFrontpic:  INCBIN "gfx/pics/butterfree/front.7x7.2bpp.lz"
+WeezingFrontpic:     INCBIN "gfx/pics/weezing/front.7x7.2bpp.lz"
+CloysterFrontpic:    INCBIN "gfx/pics/cloyster/front.7x7.2bpp.lz"
+SkarmoryFrontpic:    INCBIN "gfx/pics/skarmory/front.7x7.2bpp.lz"
+DewgongFrontpic:     INCBIN "gfx/pics/dewgong/front.7x7.2bpp.lz"
+VictreebelFrontpic:  INCBIN "gfx/pics/victreebel/front.7x7.2bpp.lz"
+RaichuFrontpic:      INCBIN "gfx/pics/raichu/front.7x7.2bpp.lz"
+PrimeapeFrontpic:    INCBIN "gfx/pics/primeape/front.7x7.2bpp.lz"
+OmastarBackpic:      INCBIN "gfx/pics/omastar/back.6x6.2bpp.lz"
 ; 12bffe
 
 
 SECTION "Pics 4", ROMX, BANK[PICS_4]
 
-DodrioFrontpic:      INCBIN "gfx/pics/085/front.lz"
-SlowkingFrontpic:    INCBIN "gfx/pics/199/front.lz"
-HitmontopFrontpic:   INCBIN "gfx/pics/237/front.lz"
-OnixFrontpic:        INCBIN "gfx/pics/095/front.lz"
-BlisseyFrontpic:     INCBIN "gfx/pics/242/front.lz"
-MachokeFrontpic:     INCBIN "gfx/pics/067/front.lz"
-DragoniteFrontpic:   INCBIN "gfx/pics/149/front.lz"
-PoliwrathFrontpic:   INCBIN "gfx/pics/062/front.lz"
-ScytherFrontpic:     INCBIN "gfx/pics/123/front.lz"
-AerodactylFrontpic:  INCBIN "gfx/pics/142/front.lz"
-SeakingFrontpic:     INCBIN "gfx/pics/119/front.lz"
-MukFrontpic:         INCBIN "gfx/pics/089/front.lz"
-CroconawFrontpic:    INCBIN "gfx/pics/159/front.lz"
-HypnoFrontpic:       INCBIN "gfx/pics/097/front.lz"
-NidorinoFrontpic:    INCBIN "gfx/pics/033/front.lz"
-SandslashFrontpic:   INCBIN "gfx/pics/028/front.lz"
-JolteonFrontpic:     INCBIN "gfx/pics/135/front.lz"
-DonphanFrontpic:     INCBIN "gfx/pics/232/front.lz"
-PinsirFrontpic:      INCBIN "gfx/pics/127/front.lz"
-UnownEFrontpic:      INCBIN "gfx/pics/201e/front.lz"
+DodrioFrontpic:      INCBIN "gfx/pics/dodrio/front.7x7.2bpp.lz"
+SlowkingFrontpic:    INCBIN "gfx/pics/slowking/front.7x7.2bpp.lz"
+HitmontopFrontpic:   INCBIN "gfx/pics/hitmontop/front.7x7.2bpp.lz"
+OnixFrontpic:        INCBIN "gfx/pics/onix/front.7x7.2bpp.lz"
+BlisseyFrontpic:     INCBIN "gfx/pics/blissey/front.7x7.2bpp.lz"
+MachokeFrontpic:     INCBIN "gfx/pics/machoke/front.7x7.2bpp.lz"
+DragoniteFrontpic:   INCBIN "gfx/pics/dragonite/front.7x7.2bpp.lz"
+PoliwrathFrontpic:   INCBIN "gfx/pics/poliwrath/front.7x7.2bpp.lz"
+ScytherFrontpic:     INCBIN "gfx/pics/scyther/front.7x7.2bpp.lz"
+AerodactylFrontpic:  INCBIN "gfx/pics/aerodactyl/front.7x7.2bpp.lz"
+SeakingFrontpic:     INCBIN "gfx/pics/seaking/front.7x7.2bpp.lz"
+MukFrontpic:         INCBIN "gfx/pics/muk/front.7x7.2bpp.lz"
+CroconawFrontpic:    INCBIN "gfx/pics/croconaw/front.6x6.2bpp.lz"
+HypnoFrontpic:       INCBIN "gfx/pics/hypno/front.7x7.2bpp.lz"
+NidorinoFrontpic:    INCBIN "gfx/pics/nidorino/front.6x6.2bpp.lz"
+SandslashFrontpic:   INCBIN "gfx/pics/sandslash/front.6x6.2bpp.lz"
+JolteonFrontpic:     INCBIN "gfx/pics/jolteon/front.6x6.2bpp.lz"
+DonphanFrontpic:     INCBIN "gfx/pics/donphan/front.7x7.2bpp.lz"
+PinsirFrontpic:      INCBIN "gfx/pics/pinsir/front.7x7.2bpp.lz"
+UnownEFrontpic:      INCBIN "gfx/pics/unown_e/front.5x5.2bpp.lz"
 ; 130000
 
 
 SECTION "Pics 5", ROMX, BANK[PICS_5]
 
-GolbatFrontpic:      INCBIN "gfx/pics/042/front.lz"
-KinglerFrontpic:     INCBIN "gfx/pics/099/front.lz"
-ExeggcuteFrontpic:   INCBIN "gfx/pics/102/front.lz"
-MagcargoFrontpic:    INCBIN "gfx/pics/219/front.lz"
-PersianFrontpic:     INCBIN "gfx/pics/053/front.lz"
-StantlerFrontpic:    INCBIN "gfx/pics/234/front.lz"
-RaticateFrontpic:    INCBIN "gfx/pics/020/front.lz"
-VenomothFrontpic:    INCBIN "gfx/pics/049/front.lz"
-PolitoedFrontpic:    INCBIN "gfx/pics/186/front.lz"
-ElectabuzzFrontpic:  INCBIN "gfx/pics/125/front.lz"
-MantineFrontpic:     INCBIN "gfx/pics/226/front.lz"
-LickitungFrontpic:   INCBIN "gfx/pics/108/front.lz"
-KingdraFrontpic:     INCBIN "gfx/pics/230/front.lz"
-CharmeleonFrontpic:  INCBIN "gfx/pics/005/front.lz"
-KadabraFrontpic:     INCBIN "gfx/pics/064/front.lz"
-ExeggutorFrontpic:   INCBIN "gfx/pics/103/front.lz"
-GastlyFrontpic:      INCBIN "gfx/pics/092/front.lz"
-AzumarillFrontpic:   INCBIN "gfx/pics/184/front.lz"
-ParasectFrontpic:    INCBIN "gfx/pics/047/front.lz"
-MrMimeFrontpic:      INCBIN "gfx/pics/122/front.lz"
-HeracrossFrontpic:   INCBIN "gfx/pics/214/front.lz"
+GolbatFrontpic:      INCBIN "gfx/pics/golbat/front.7x7.2bpp.lz"
+KinglerFrontpic:     INCBIN "gfx/pics/kingler/front.7x7.2bpp.lz"
+ExeggcuteFrontpic:   INCBIN "gfx/pics/exeggcute/front.7x7.2bpp.lz"
+MagcargoFrontpic:    INCBIN "gfx/pics/magcargo/front.6x6.2bpp.lz"
+PersianFrontpic:     INCBIN "gfx/pics/persian/front.7x7.2bpp.lz"
+StantlerFrontpic:    INCBIN "gfx/pics/stantler/front.7x7.2bpp.lz"
+RaticateFrontpic:    INCBIN "gfx/pics/raticate/front.6x6.2bpp.lz"
+VenomothFrontpic:    INCBIN "gfx/pics/venomoth/front.7x7.2bpp.lz"
+PolitoedFrontpic:    INCBIN "gfx/pics/politoed/front.7x7.2bpp.lz"
+ElectabuzzFrontpic:  INCBIN "gfx/pics/electabuzz/front.6x6.2bpp.lz"
+MantineFrontpic:     INCBIN "gfx/pics/mantine/front.7x7.2bpp.lz"
+LickitungFrontpic:   INCBIN "gfx/pics/lickitung/front.7x7.2bpp.lz"
+KingdraFrontpic:     INCBIN "gfx/pics/kingdra/front.7x7.2bpp.lz"
+CharmeleonFrontpic:  INCBIN "gfx/pics/charmeleon/front.6x6.2bpp.lz"
+KadabraFrontpic:     INCBIN "gfx/pics/kadabra/front.6x6.2bpp.lz"
+ExeggutorFrontpic:   INCBIN "gfx/pics/exeggutor/front.7x7.2bpp.lz"
+GastlyFrontpic:      INCBIN "gfx/pics/gastly/front.7x7.2bpp.lz"
+AzumarillFrontpic:   INCBIN "gfx/pics/azumarill/front.7x7.2bpp.lz"
+ParasectFrontpic:    INCBIN "gfx/pics/parasect/front.7x7.2bpp.lz"
+MrMimeFrontpic:      INCBIN "gfx/pics/mr__mime/front.6x6.2bpp.lz"
+HeracrossFrontpic:   INCBIN "gfx/pics/heracross/front.6x6.2bpp.lz"
 ; 133fff
 
 
 SECTION "Pics 6", ROMX, BANK[PICS_6]
 
-AriadosFrontpic:     INCBIN "gfx/pics/168/front.lz"
-NoctowlFrontpic:     INCBIN "gfx/pics/164/front.lz"
-WartortleFrontpic:   INCBIN "gfx/pics/008/front.lz"
-LaprasFrontpic:      INCBIN "gfx/pics/131/front.lz"
-GolemFrontpic:       INCBIN "gfx/pics/076/front.lz"
-PoliwhirlFrontpic:   INCBIN "gfx/pics/061/front.lz"
-UrsaringFrontpic:    INCBIN "gfx/pics/217/front.lz"
-HoundoomFrontpic:    INCBIN "gfx/pics/229/front.lz"
-KabutopsFrontpic:    INCBIN "gfx/pics/141/front.lz"
-AmpharosFrontpic:    INCBIN "gfx/pics/181/front.lz"
-NidorinaFrontpic:    INCBIN "gfx/pics/030/front.lz"
-FlareonFrontpic:     INCBIN "gfx/pics/136/front.lz"
-FarfetchDFrontpic:   INCBIN "gfx/pics/083/front.lz"
-VileplumeFrontpic:   INCBIN "gfx/pics/045/front.lz"
-BayleefFrontpic:     INCBIN "gfx/pics/153/front.lz"
-MagmarFrontpic:      INCBIN "gfx/pics/126/front.lz"
-TentacruelFrontpic:  INCBIN "gfx/pics/073/front.lz"
-ElekidFrontpic:      INCBIN "gfx/pics/239/front.lz"
-JumpluffFrontpic:    INCBIN "gfx/pics/189/front.lz"
-MarowakFrontpic:     INCBIN "gfx/pics/105/front.lz"
-VulpixFrontpic:      INCBIN "gfx/pics/037/front.lz"
-GligarFrontpic:      INCBIN "gfx/pics/207/front.lz"
-DunsparceFrontpic:   INCBIN "gfx/pics/206/front.lz"
+AriadosFrontpic:     INCBIN "gfx/pics/ariados/front.7x7.2bpp.lz"
+NoctowlFrontpic:     INCBIN "gfx/pics/noctowl/front.7x7.2bpp.lz"
+WartortleFrontpic:   INCBIN "gfx/pics/wartortle/front.6x6.2bpp.lz"
+LaprasFrontpic:      INCBIN "gfx/pics/lapras/front.7x7.2bpp.lz"
+GolemFrontpic:       INCBIN "gfx/pics/golem/front.6x6.2bpp.lz"
+PoliwhirlFrontpic:   INCBIN "gfx/pics/poliwhirl/front.6x6.2bpp.lz"
+UrsaringFrontpic:    INCBIN "gfx/pics/ursaring/front.7x7.2bpp.lz"
+HoundoomFrontpic:    INCBIN "gfx/pics/houndoom/front.7x7.2bpp.lz"
+KabutopsFrontpic:    INCBIN "gfx/pics/kabutops/front.6x6.2bpp.lz"
+AmpharosFrontpic:    INCBIN "gfx/pics/ampharos/front.7x7.2bpp.lz"
+NidorinaFrontpic:    INCBIN "gfx/pics/nidorina/front.6x6.2bpp.lz"
+FlareonFrontpic:     INCBIN "gfx/pics/flareon/front.6x6.2bpp.lz"
+FarfetchDFrontpic:   INCBIN "gfx/pics/farfetch_d/front.6x6.2bpp.lz"
+VileplumeFrontpic:   INCBIN "gfx/pics/vileplume/front.7x7.2bpp.lz"
+BayleefFrontpic:     INCBIN "gfx/pics/bayleef/front.6x6.2bpp.lz"
+MagmarFrontpic:      INCBIN "gfx/pics/magmar/front.6x6.2bpp.lz"
+TentacruelFrontpic:  INCBIN "gfx/pics/tentacruel/front.6x6.2bpp.lz"
+ElekidFrontpic:      INCBIN "gfx/pics/elekid/front.6x6.2bpp.lz"
+JumpluffFrontpic:    INCBIN "gfx/pics/jumpluff/front.7x7.2bpp.lz"
+MarowakFrontpic:     INCBIN "gfx/pics/marowak/front.6x6.2bpp.lz"
+VulpixFrontpic:      INCBIN "gfx/pics/vulpix/front.6x6.2bpp.lz"
+GligarFrontpic:      INCBIN "gfx/pics/gligar/front.6x6.2bpp.lz"
+DunsparceFrontpic:   INCBIN "gfx/pics/dunsparce/front.6x6.2bpp.lz"
 ; 137fff
 
 
 SECTION "Pics 7", ROMX, BANK[PICS_7]
 
-VaporeonFrontpic:    INCBIN "gfx/pics/134/front.lz"
-GirafarigFrontpic:   INCBIN "gfx/pics/203/front.lz"
-DrowzeeFrontpic:     INCBIN "gfx/pics/096/front.lz"
-SneaselFrontpic:     INCBIN "gfx/pics/215/front.lz"
-BellossomFrontpic:   INCBIN "gfx/pics/182/front.lz"
-SnorlaxFrontpic:     INCBIN "gfx/pics/143/front.lz"
-WigglytuffFrontpic:  INCBIN "gfx/pics/040/front.lz"
-YanmaFrontpic:       INCBIN "gfx/pics/193/front.lz"
-SmeargleFrontpic:    INCBIN "gfx/pics/235/front.lz"
-ClefableFrontpic:    INCBIN "gfx/pics/036/front.lz"
-PonytaFrontpic:      INCBIN "gfx/pics/077/front.lz"
-MurkrowFrontpic:     INCBIN "gfx/pics/198/front.lz"
-GravelerFrontpic:    INCBIN "gfx/pics/075/front.lz"
-StarmieFrontpic:     INCBIN "gfx/pics/121/front.lz"
-PidgeottoFrontpic:   INCBIN "gfx/pics/017/front.lz"
-LedybaFrontpic:      INCBIN "gfx/pics/165/front.lz"
-GengarFrontpic:      INCBIN "gfx/pics/094/front.lz"
-OmastarFrontpic:     INCBIN "gfx/pics/139/front.lz"
-PiloswineFrontpic:   INCBIN "gfx/pics/221/front.lz"
-DugtrioFrontpic:     INCBIN "gfx/pics/051/front.lz"
-MagnetonFrontpic:    INCBIN "gfx/pics/082/front.lz"
-DragonairFrontpic:   INCBIN "gfx/pics/148/front.lz"
-ForretressFrontpic:  INCBIN "gfx/pics/205/front.lz"
-TogeticFrontpic:     INCBIN "gfx/pics/176/front.lz"
-KangaskhanBackpic:   INCBIN "gfx/pics/115/back.lz"
+VaporeonFrontpic:    INCBIN "gfx/pics/vaporeon/front.6x6.2bpp.lz"
+GirafarigFrontpic:   INCBIN "gfx/pics/girafarig/front.7x7.2bpp.lz"
+DrowzeeFrontpic:     INCBIN "gfx/pics/drowzee/front.6x6.2bpp.lz"
+SneaselFrontpic:     INCBIN "gfx/pics/sneasel/front.6x6.2bpp.lz"
+BellossomFrontpic:   INCBIN "gfx/pics/bellossom/front.7x7.2bpp.lz"
+SnorlaxFrontpic:     INCBIN "gfx/pics/snorlax/front.7x7.2bpp.lz"
+WigglytuffFrontpic:  INCBIN "gfx/pics/wigglytuff/front.6x6.2bpp.lz"
+YanmaFrontpic:       INCBIN "gfx/pics/yanma/front.6x6.2bpp.lz"
+SmeargleFrontpic:    INCBIN "gfx/pics/smeargle/front.7x7.2bpp.lz"
+ClefableFrontpic:    INCBIN "gfx/pics/clefable/front.6x6.2bpp.lz"
+PonytaFrontpic:      INCBIN "gfx/pics/ponyta/front.6x6.2bpp.lz"
+MurkrowFrontpic:     INCBIN "gfx/pics/murkrow/front.6x6.2bpp.lz"
+GravelerFrontpic:    INCBIN "gfx/pics/graveler/front.6x6.2bpp.lz"
+StarmieFrontpic:     INCBIN "gfx/pics/starmie/front.6x6.2bpp.lz"
+PidgeottoFrontpic:   INCBIN "gfx/pics/pidgeotto/front.6x6.2bpp.lz"
+LedybaFrontpic:      INCBIN "gfx/pics/ledyba/front.6x6.2bpp.lz"
+GengarFrontpic:      INCBIN "gfx/pics/gengar/front.6x6.2bpp.lz"
+OmastarFrontpic:     INCBIN "gfx/pics/omastar/front.6x6.2bpp.lz"
+PiloswineFrontpic:   INCBIN "gfx/pics/piloswine/front.6x6.2bpp.lz"
+DugtrioFrontpic:     INCBIN "gfx/pics/dugtrio/front.7x7.2bpp.lz"
+MagnetonFrontpic:    INCBIN "gfx/pics/magneton/front.6x6.2bpp.lz"
+DragonairFrontpic:   INCBIN "gfx/pics/dragonair/front.6x6.2bpp.lz"
+ForretressFrontpic:  INCBIN "gfx/pics/forretress/front.7x7.2bpp.lz"
+TogeticFrontpic:     INCBIN "gfx/pics/togetic/front.7x7.2bpp.lz"
+KangaskhanBackpic:   INCBIN "gfx/pics/kangaskhan/back.6x6.2bpp.lz"
 ; 13c000
 
 
 SECTION "Pics 8", ROMX, BANK[PICS_8]
 
-SeelFrontpic:        INCBIN "gfx/pics/086/front.lz"
-CrobatFrontpic:      INCBIN "gfx/pics/169/front.lz"
-ChanseyFrontpic:     INCBIN "gfx/pics/113/front.lz"
-TangelaFrontpic:     INCBIN "gfx/pics/114/front.lz"
-SnubbullFrontpic:    INCBIN "gfx/pics/209/front.lz"
-GranbullFrontpic:    INCBIN "gfx/pics/210/front.lz"
-MiltankFrontpic:     INCBIN "gfx/pics/241/front.lz"
-HaunterFrontpic:     INCBIN "gfx/pics/093/front.lz"
-SunfloraFrontpic:    INCBIN "gfx/pics/192/front.lz"
-UmbreonFrontpic:     INCBIN "gfx/pics/197/front.lz"
-ChikoritaFrontpic:   INCBIN "gfx/pics/152/front.lz"
-GoldeenFrontpic:     INCBIN "gfx/pics/118/front.lz"
-EspeonFrontpic:      INCBIN "gfx/pics/196/front.lz"
-XatuFrontpic:        INCBIN "gfx/pics/178/front.lz"
-MewFrontpic:         INCBIN "gfx/pics/151/front.lz"
-OctilleryFrontpic:   INCBIN "gfx/pics/224/front.lz"
-JynxFrontpic:        INCBIN "gfx/pics/124/front.lz"
-WobbuffetFrontpic:   INCBIN "gfx/pics/202/front.lz"
-DelibirdFrontpic:    INCBIN "gfx/pics/225/front.lz"
-LedianFrontpic:      INCBIN "gfx/pics/166/front.lz"
-GloomFrontpic:       INCBIN "gfx/pics/044/front.lz"
-FlaaffyFrontpic:     INCBIN "gfx/pics/180/front.lz"
-IvysaurFrontpic:     INCBIN "gfx/pics/002/front.lz"
-FurretFrontpic:      INCBIN "gfx/pics/162/front.lz"
-CyndaquilFrontpic:   INCBIN "gfx/pics/155/front.lz"
-HitmonchanFrontpic:  INCBIN "gfx/pics/107/front.lz"
-QuagsireFrontpic:    INCBIN "gfx/pics/195/front.lz"
+SeelFrontpic:        INCBIN "gfx/pics/seel/front.6x6.2bpp.lz"
+CrobatFrontpic:      INCBIN "gfx/pics/crobat/front.7x7.2bpp.lz"
+ChanseyFrontpic:     INCBIN "gfx/pics/chansey/front.6x6.2bpp.lz"
+TangelaFrontpic:     INCBIN "gfx/pics/tangela/front.6x6.2bpp.lz"
+SnubbullFrontpic:    INCBIN "gfx/pics/snubbull/front.6x6.2bpp.lz"
+GranbullFrontpic:    INCBIN "gfx/pics/granbull/front.6x6.2bpp.lz"
+MiltankFrontpic:     INCBIN "gfx/pics/miltank/front.6x6.2bpp.lz"
+HaunterFrontpic:     INCBIN "gfx/pics/haunter/front.6x6.2bpp.lz"
+SunfloraFrontpic:    INCBIN "gfx/pics/sunflora/front.6x6.2bpp.lz"
+UmbreonFrontpic:     INCBIN "gfx/pics/umbreon/front.6x6.2bpp.lz"
+ChikoritaFrontpic:   INCBIN "gfx/pics/chikorita/front.5x5.2bpp.lz"
+GoldeenFrontpic:     INCBIN "gfx/pics/goldeen/front.6x6.2bpp.lz"
+EspeonFrontpic:      INCBIN "gfx/pics/espeon/front.6x6.2bpp.lz"
+XatuFrontpic:        INCBIN "gfx/pics/xatu/front.6x6.2bpp.lz"
+MewFrontpic:         INCBIN "gfx/pics/mew/front.5x5.2bpp.lz"
+OctilleryFrontpic:   INCBIN "gfx/pics/octillery/front.6x6.2bpp.lz"
+JynxFrontpic:        INCBIN "gfx/pics/jynx/front.6x6.2bpp.lz"
+WobbuffetFrontpic:   INCBIN "gfx/pics/wobbuffet/front.6x6.2bpp.lz"
+DelibirdFrontpic:    INCBIN "gfx/pics/delibird/front.6x6.2bpp.lz"
+LedianFrontpic:      INCBIN "gfx/pics/ledian/front.6x6.2bpp.lz"
+GloomFrontpic:       INCBIN "gfx/pics/gloom/front.6x6.2bpp.lz"
+FlaaffyFrontpic:     INCBIN "gfx/pics/flaaffy/front.6x6.2bpp.lz"
+IvysaurFrontpic:     INCBIN "gfx/pics/ivysaur/front.6x6.2bpp.lz"
+FurretFrontpic:      INCBIN "gfx/pics/furret/front.6x6.2bpp.lz"
+CyndaquilFrontpic:   INCBIN "gfx/pics/cyndaquil/front.5x5.2bpp.lz"
+HitmonchanFrontpic:  INCBIN "gfx/pics/hitmonchan/front.6x6.2bpp.lz"
+QuagsireFrontpic:    INCBIN "gfx/pics/quagsire/front.6x6.2bpp.lz"
 ; 13fff7
 
 
 SECTION "Pics 9", ROMX, BANK[PICS_9]
 
-EkansFrontpic:       INCBIN "gfx/pics/023/front.lz"
-SudowoodoFrontpic:   INCBIN "gfx/pics/185/front.lz"
-PikachuFrontpic:     INCBIN "gfx/pics/025/front.lz"
-SeadraFrontpic:      INCBIN "gfx/pics/117/front.lz"
-MagbyFrontpic:       INCBIN "gfx/pics/240/front.lz"
-WeepinbellFrontpic:  INCBIN "gfx/pics/070/front.lz"
-TotodileFrontpic:    INCBIN "gfx/pics/158/front.lz"
-CorsolaFrontpic:     INCBIN "gfx/pics/222/front.lz"
-FirebreatherPic:     INCBIN "gfx/trainers/047.lz"
-MachopFrontpic:      INCBIN "gfx/pics/066/front.lz"
-ChinchouFrontpic:    INCBIN "gfx/pics/170/front.lz"
-RattataFrontpic:     INCBIN "gfx/pics/019/front.lz"
-ChampionPic:         INCBIN "gfx/trainers/015.lz"
-SpearowFrontpic:     INCBIN "gfx/pics/021/front.lz"
-MagikarpFrontpic:    INCBIN "gfx/pics/129/front.lz"
-CharmanderFrontpic:  INCBIN "gfx/pics/004/front.lz"
-CuboneFrontpic:      INCBIN "gfx/pics/104/front.lz"
-BlackbeltTPic:       INCBIN "gfx/trainers/049.lz"
-BikerPic:            INCBIN "gfx/trainers/044.lz"
-NidoranMFrontpic:    INCBIN "gfx/pics/032/front.lz"
-PorygonFrontpic:     INCBIN "gfx/pics/137/front.lz"
-BrunoPic:            INCBIN "gfx/trainers/012.lz"
-GrimerFrontpic:      INCBIN "gfx/pics/088/front.lz"
-StaryuFrontpic:      INCBIN "gfx/pics/120/front.lz"
-HikerPic:            INCBIN "gfx/trainers/043.lz"
-MeowthFrontpic:      INCBIN "gfx/pics/052/front.lz"
-Porygon2Frontpic:    INCBIN "gfx/pics/233/front.lz"
-SandshrewFrontpic:   INCBIN "gfx/pics/027/front.lz"
-NidoranFFrontpic:    INCBIN "gfx/pics/029/front.lz"
-PidgeyFrontpic:      INCBIN "gfx/pics/016/front.lz"
-ParasectBackpic:     INCBIN "gfx/pics/047/back.lz"
+EkansFrontpic:       INCBIN "gfx/pics/ekans/front.5x5.2bpp.lz"
+SudowoodoFrontpic:   INCBIN "gfx/pics/sudowoodo/front.6x6.2bpp.lz"
+PikachuFrontpic:     INCBIN "gfx/pics/pikachu/front.5x5.2bpp.lz"
+SeadraFrontpic:      INCBIN "gfx/pics/seadra/front.6x6.2bpp.lz"
+MagbyFrontpic:       INCBIN "gfx/pics/magby/front.6x6.2bpp.lz"
+WeepinbellFrontpic:  INCBIN "gfx/pics/weepinbell/front.6x6.2bpp.lz"
+TotodileFrontpic:    INCBIN "gfx/pics/totodile/front.5x5.2bpp.lz"
+CorsolaFrontpic:     INCBIN "gfx/pics/corsola/front.6x6.2bpp.lz"
+FirebreatherPic:     INCBIN "gfx/trainers/firebreather.7x7.2bpp.lz"
+MachopFrontpic:      INCBIN "gfx/pics/machop/front.5x5.2bpp.lz"
+ChinchouFrontpic:    INCBIN "gfx/pics/chinchou/front.6x6.2bpp.lz"
+RattataFrontpic:     INCBIN "gfx/pics/rattata/front.5x5.2bpp.lz"
+ChampionPic:         INCBIN "gfx/trainers/champion.7x7.2bpp.lz"
+SpearowFrontpic:     INCBIN "gfx/pics/spearow/front.5x5.2bpp.lz"
+MagikarpFrontpic:    INCBIN "gfx/pics/magikarp/front.6x6.2bpp.lz"
+CharmanderFrontpic:  INCBIN "gfx/pics/charmander/front.5x5.2bpp.lz"
+CuboneFrontpic:      INCBIN "gfx/pics/cubone/front.5x5.2bpp.lz"
+BlackbeltTPic:       INCBIN "gfx/trainers/blackbelt_t.7x7.2bpp.lz"
+BikerPic:            INCBIN "gfx/trainers/biker.7x7.2bpp.lz"
+NidoranMFrontpic:    INCBIN "gfx/pics/nidoran_m/front.5x5.2bpp.lz"
+PorygonFrontpic:     INCBIN "gfx/pics/porygon/front.6x6.2bpp.lz"
+BrunoPic:            INCBIN "gfx/trainers/bruno.7x7.2bpp.lz"
+GrimerFrontpic:      INCBIN "gfx/pics/grimer/front.5x5.2bpp.lz"
+StaryuFrontpic:      INCBIN "gfx/pics/staryu/front.6x6.2bpp.lz"
+HikerPic:            INCBIN "gfx/trainers/hiker.7x7.2bpp.lz"
+MeowthFrontpic:      INCBIN "gfx/pics/meowth/front.5x5.2bpp.lz"
+Porygon2Frontpic:    INCBIN "gfx/pics/porygon2/front.6x6.2bpp.lz"
+SandshrewFrontpic:   INCBIN "gfx/pics/sandshrew/front.5x5.2bpp.lz"
+NidoranFFrontpic:    INCBIN "gfx/pics/nidoran_f/front.5x5.2bpp.lz"
+PidgeyFrontpic:      INCBIN "gfx/pics/pidgey/front.5x5.2bpp.lz"
+ParasectBackpic:     INCBIN "gfx/pics/parasect/back.6x6.2bpp.lz"
 ; 144000
 
 
 SECTION "Pics 10", ROMX, BANK[PICS_10]
 
-MisdreavusFrontpic:  INCBIN "gfx/pics/200/front.lz"
-HoundourFrontpic:    INCBIN "gfx/pics/228/front.lz"
-MankeyFrontpic:      INCBIN "gfx/pics/056/front.lz"
-CelebiFrontpic:      INCBIN "gfx/pics/251/front.lz"
-MediumPic:           INCBIN "gfx/trainers/056.lz"
-PinecoFrontpic:      INCBIN "gfx/pics/204/front.lz"
-KrabbyFrontpic:      INCBIN "gfx/pics/098/front.lz"
-FisherPic:           INCBIN "gfx/trainers/036.lz"
-JigglypuffFrontpic:  INCBIN "gfx/pics/039/front.lz"
-ParasFrontpic:       INCBIN "gfx/pics/046/front.lz"
-NidokingBackpic:     INCBIN "gfx/pics/034/back.lz"
-PokefanmPic:         INCBIN "gfx/trainers/058.lz"
-BoarderPic:          INCBIN "gfx/trainers/057.lz"
-PsyduckFrontpic:     INCBIN "gfx/pics/054/front.lz"
-SquirtleFrontpic:    INCBIN "gfx/pics/007/front.lz"
-MachampBackpic:      INCBIN "gfx/pics/068/back.lz"
-KoffingFrontpic:     INCBIN "gfx/pics/109/front.lz"
-VenonatFrontpic:     INCBIN "gfx/pics/048/front.lz"
-ExeggutorBackpic:    INCBIN "gfx/pics/103/back.lz"
-LanturnFrontpic:     INCBIN "gfx/pics/171/front.lz"
-TyrogueFrontpic:     INCBIN "gfx/pics/236/front.lz"
-SkiploomFrontpic:    INCBIN "gfx/pics/188/front.lz"
-MareepFrontpic:      INCBIN "gfx/pics/179/front.lz"
-ChuckPic:            INCBIN "gfx/trainers/006.lz"
-EeveeFrontpic:       INCBIN "gfx/pics/133/front.lz"
-ButterfreeBackpic:   INCBIN "gfx/pics/012/back.lz"
-ZubatFrontpic:       INCBIN "gfx/pics/041/front.lz"
-KimonoGirlPic:       INCBIN "gfx/trainers/059.lz"
-AlakazamBackpic:     INCBIN "gfx/pics/065/back.lz"
-AipomFrontpic:       INCBIN "gfx/pics/190/front.lz"
-AbraFrontpic:        INCBIN "gfx/pics/063/front.lz"
-HitmontopBackpic:    INCBIN "gfx/pics/237/back.lz"
-CloysterBackpic:     INCBIN "gfx/pics/091/back.lz"
-HoothootFrontpic:    INCBIN "gfx/pics/163/front.lz"
-UnownFBackpic:       INCBIN "gfx/pics/201f/back.lz"
+MisdreavusFrontpic:  INCBIN "gfx/pics/misdreavus/front.6x6.2bpp.lz"
+HoundourFrontpic:    INCBIN "gfx/pics/houndour/front.6x6.2bpp.lz"
+MankeyFrontpic:      INCBIN "gfx/pics/mankey/front.5x5.2bpp.lz"
+CelebiFrontpic:      INCBIN "gfx/pics/celebi/front.5x5.2bpp.lz"
+MediumPic:           INCBIN "gfx/trainers/medium.7x7.2bpp.lz"
+PinecoFrontpic:      INCBIN "gfx/pics/pineco/front.5x5.2bpp.lz"
+KrabbyFrontpic:      INCBIN "gfx/pics/krabby/front.5x5.2bpp.lz"
+FisherPic:           INCBIN "gfx/trainers/fisher.7x7.2bpp.lz"
+JigglypuffFrontpic:  INCBIN "gfx/pics/jigglypuff/front.5x5.2bpp.lz"
+ParasFrontpic:       INCBIN "gfx/pics/paras/front.5x5.2bpp.lz"
+NidokingBackpic:     INCBIN "gfx/pics/nidoking/back.6x6.2bpp.lz"
+PokefanmPic:         INCBIN "gfx/trainers/pokefan_m.7x7.2bpp.lz"
+BoarderPic:          INCBIN "gfx/trainers/boarder.7x7.2bpp.lz"
+PsyduckFrontpic:     INCBIN "gfx/pics/psyduck/front.5x5.2bpp.lz"
+SquirtleFrontpic:    INCBIN "gfx/pics/squirtle/front.5x5.2bpp.lz"
+MachampBackpic:      INCBIN "gfx/pics/machamp/back.6x6.2bpp.lz"
+KoffingFrontpic:     INCBIN "gfx/pics/koffing/front.6x6.2bpp.lz"
+VenonatFrontpic:     INCBIN "gfx/pics/venonat/front.5x5.2bpp.lz"
+ExeggutorBackpic:    INCBIN "gfx/pics/exeggutor/back.6x6.2bpp.lz"
+LanturnFrontpic:     INCBIN "gfx/pics/lanturn/front.6x6.2bpp.lz"
+TyrogueFrontpic:     INCBIN "gfx/pics/tyrogue/front.5x5.2bpp.lz"
+SkiploomFrontpic:    INCBIN "gfx/pics/skiploom/front.6x6.2bpp.lz"
+MareepFrontpic:      INCBIN "gfx/pics/mareep/front.5x5.2bpp.lz"
+ChuckPic:            INCBIN "gfx/trainers/chuck.7x7.2bpp.lz"
+EeveeFrontpic:       INCBIN "gfx/pics/eevee/front.5x5.2bpp.lz"
+ButterfreeBackpic:   INCBIN "gfx/pics/butterfree/back.6x6.2bpp.lz"
+ZubatFrontpic:       INCBIN "gfx/pics/zubat/front.5x5.2bpp.lz"
+KimonoGirlPic:       INCBIN "gfx/trainers/kimono_girl.7x7.2bpp.lz"
+AlakazamBackpic:     INCBIN "gfx/pics/alakazam/back.6x6.2bpp.lz"
+AipomFrontpic:       INCBIN "gfx/pics/aipom/front.5x5.2bpp.lz"
+AbraFrontpic:        INCBIN "gfx/pics/abra/front.5x5.2bpp.lz"
+HitmontopBackpic:    INCBIN "gfx/pics/hitmontop/back.6x6.2bpp.lz"
+CloysterBackpic:     INCBIN "gfx/pics/cloyster/back.6x6.2bpp.lz"
+HoothootFrontpic:    INCBIN "gfx/pics/hoothoot/front.5x5.2bpp.lz"
+UnownFBackpic:       INCBIN "gfx/pics/unown_f/back.6x6.2bpp.lz"
 ; 148000
 
 
 SECTION "Pics 11", ROMX, BANK[PICS_11]
 
-DodrioBackpic:       INCBIN "gfx/pics/085/back.lz"
-ClefairyFrontpic:    INCBIN "gfx/pics/035/front.lz"
-SlugmaFrontpic:      INCBIN "gfx/pics/218/front.lz"
-GrowlitheFrontpic:   INCBIN "gfx/pics/058/front.lz"
-SlowpokeFrontpic:    INCBIN "gfx/pics/079/front.lz"
-SmoochumFrontpic:    INCBIN "gfx/pics/238/front.lz"
-JugglerPic:          INCBIN "gfx/trainers/048.lz"
-MarillFrontpic:      INCBIN "gfx/pics/183/front.lz"
-GuitaristPic:        INCBIN "gfx/trainers/042.lz"
-PokefanfPic:         INCBIN "gfx/trainers/061.lz"
-VenomothBackpic:     INCBIN "gfx/pics/049/back.lz"
-ClairPic:            INCBIN "gfx/trainers/007.lz"
-PokemaniacPic:       INCBIN "gfx/trainers/029.lz"
-OmanyteFrontpic:     INCBIN "gfx/pics/138/front.lz"
-SkierPic:            INCBIN "gfx/trainers/032.lz"
-PupitarFrontpic:     INCBIN "gfx/pics/247/front.lz"
-BellsproutFrontpic:  INCBIN "gfx/pics/069/front.lz"
-ShellderFrontpic:    INCBIN "gfx/pics/090/front.lz"
-TentacoolFrontpic:   INCBIN "gfx/pics/072/front.lz"
-CleffaFrontpic:      INCBIN "gfx/pics/173/front.lz"
-GyaradosBackpic:     INCBIN "gfx/pics/130/back.lz"
-NinetalesBackpic:    INCBIN "gfx/pics/038/back.lz"
-YanmaBackpic:        INCBIN "gfx/pics/193/back.lz"
-PinsirBackpic:       INCBIN "gfx/pics/127/back.lz"
-LassPic:             INCBIN "gfx/trainers/024.lz"
-ClefableBackpic:     INCBIN "gfx/pics/036/back.lz"
-DoduoFrontpic:       INCBIN "gfx/pics/084/front.lz"
-FeraligatrBackpic:   INCBIN "gfx/pics/160/back.lz"
-DratiniFrontpic:     INCBIN "gfx/pics/147/front.lz"
-MagnetonBackpic:     INCBIN "gfx/pics/082/back.lz"
-QwilfishFrontpic:    INCBIN "gfx/pics/211/front.lz"
-SuicuneBackpic:      INCBIN "gfx/pics/245/back.lz"
-SlowkingBackpic:     INCBIN "gfx/pics/199/back.lz"
-ElekidBackpic:       INCBIN "gfx/pics/239/back.lz"
-CelebiBackpic:       INCBIN "gfx/pics/251/back.lz"
-KrabbyBackpic:       INCBIN "gfx/pics/098/back.lz"
-BugCatcherPic:       INCBIN "gfx/trainers/035.lz"
-SnorlaxBackpic:      INCBIN "gfx/pics/143/back.lz"
+DodrioBackpic:       INCBIN "gfx/pics/dodrio/back.6x6.2bpp.lz"
+ClefairyFrontpic:    INCBIN "gfx/pics/clefairy/front.5x5.2bpp.lz"
+SlugmaFrontpic:      INCBIN "gfx/pics/slugma/front.5x5.2bpp.lz"
+GrowlitheFrontpic:   INCBIN "gfx/pics/growlithe/front.5x5.2bpp.lz"
+SlowpokeFrontpic:    INCBIN "gfx/pics/slowpoke/front.5x5.2bpp.lz"
+SmoochumFrontpic:    INCBIN "gfx/pics/smoochum/front.5x5.2bpp.lz"
+JugglerPic:          INCBIN "gfx/trainers/juggler.7x7.2bpp.lz"
+MarillFrontpic:      INCBIN "gfx/pics/marill/front.5x5.2bpp.lz"
+GuitaristPic:        INCBIN "gfx/trainers/guitarist.7x7.2bpp.lz"
+PokefanfPic:         INCBIN "gfx/trainers/pokefan_f.7x7.2bpp.lz"
+VenomothBackpic:     INCBIN "gfx/pics/venomoth/back.6x6.2bpp.lz"
+ClairPic:            INCBIN "gfx/trainers/clair.7x7.2bpp.lz"
+PokemaniacPic:       INCBIN "gfx/trainers/pokemaniac.7x7.2bpp.lz"
+OmanyteFrontpic:     INCBIN "gfx/pics/omanyte/front.5x5.2bpp.lz"
+SkierPic:            INCBIN "gfx/trainers/skier.7x7.2bpp.lz"
+PupitarFrontpic:     INCBIN "gfx/pics/pupitar/front.6x6.2bpp.lz"
+BellsproutFrontpic:  INCBIN "gfx/pics/bellsprout/front.5x5.2bpp.lz"
+ShellderFrontpic:    INCBIN "gfx/pics/shellder/front.5x5.2bpp.lz"
+TentacoolFrontpic:   INCBIN "gfx/pics/tentacool/front.5x5.2bpp.lz"
+CleffaFrontpic:      INCBIN "gfx/pics/cleffa/front.5x5.2bpp.lz"
+GyaradosBackpic:     INCBIN "gfx/pics/gyarados/back.6x6.2bpp.lz"
+NinetalesBackpic:    INCBIN "gfx/pics/ninetales/back.6x6.2bpp.lz"
+YanmaBackpic:        INCBIN "gfx/pics/yanma/back.6x6.2bpp.lz"
+PinsirBackpic:       INCBIN "gfx/pics/pinsir/back.6x6.2bpp.lz"
+LassPic:             INCBIN "gfx/trainers/lass.7x7.2bpp.lz"
+ClefableBackpic:     INCBIN "gfx/pics/clefable/back.6x6.2bpp.lz"
+DoduoFrontpic:       INCBIN "gfx/pics/doduo/front.5x5.2bpp.lz"
+FeraligatrBackpic:   INCBIN "gfx/pics/feraligatr/back.6x6.2bpp.lz"
+DratiniFrontpic:     INCBIN "gfx/pics/dratini/front.5x5.2bpp.lz"
+MagnetonBackpic:     INCBIN "gfx/pics/magneton/back.6x6.2bpp.lz"
+QwilfishFrontpic:    INCBIN "gfx/pics/qwilfish/front.5x5.2bpp.lz"
+SuicuneBackpic:      INCBIN "gfx/pics/suicune/back.6x6.2bpp.lz"
+SlowkingBackpic:     INCBIN "gfx/pics/slowking/back.6x6.2bpp.lz"
+ElekidBackpic:       INCBIN "gfx/pics/elekid/back.6x6.2bpp.lz"
+CelebiBackpic:       INCBIN "gfx/pics/celebi/back.6x6.2bpp.lz"
+KrabbyBackpic:       INCBIN "gfx/pics/krabby/back.6x6.2bpp.lz"
+BugCatcherPic:       INCBIN "gfx/trainers/bug_catcher.7x7.2bpp.lz"
+SnorlaxBackpic:      INCBIN "gfx/pics/snorlax/back.6x6.2bpp.lz"
 ; 14bffb
 
 
 SECTION "Pics 12", ROMX, BANK[PICS_12]
 
-VenusaurBackpic:     INCBIN "gfx/pics/003/back.lz"
-MoltresBackpic:      INCBIN "gfx/pics/146/back.lz"
-SunfloraBackpic:     INCBIN "gfx/pics/192/back.lz"
-PhanpyFrontpic:      INCBIN "gfx/pics/231/front.lz"
-RhydonBackpic:       INCBIN "gfx/pics/112/back.lz"
-LarvitarFrontpic:    INCBIN "gfx/pics/246/front.lz"
-TyranitarBackpic:    INCBIN "gfx/pics/248/back.lz"
-SandslashBackpic:    INCBIN "gfx/pics/028/back.lz"
-SeadraBackpic:       INCBIN "gfx/pics/117/back.lz"
-TwinsPic:            INCBIN "gfx/trainers/060.lz"
-FarfetchDBackpic:    INCBIN "gfx/pics/083/back.lz"
-NidoranMBackpic:     INCBIN "gfx/pics/032/back.lz"
-LedybaBackpic:       INCBIN "gfx/pics/165/back.lz"
-CyndaquilBackpic:    INCBIN "gfx/pics/155/back.lz"
-BayleefBackpic:      INCBIN "gfx/pics/153/back.lz"
-OddishFrontpic:      INCBIN "gfx/pics/043/front.lz"
-RapidashBackpic:     INCBIN "gfx/pics/078/back.lz"
-DoduoBackpic:        INCBIN "gfx/pics/084/back.lz"
-HoppipFrontpic:      INCBIN "gfx/pics/187/front.lz"
-MankeyBackpic:       INCBIN "gfx/pics/056/back.lz"
-MagmarBackpic:       INCBIN "gfx/pics/126/back.lz"
-HypnoBackpic:        INCBIN "gfx/pics/097/back.lz"
-QuilavaBackpic:      INCBIN "gfx/pics/156/back.lz"
-CroconawBackpic:     INCBIN "gfx/pics/159/back.lz"
-SandshrewBackpic:    INCBIN "gfx/pics/027/back.lz"
-SailorPic:           INCBIN "gfx/trainers/039.lz"
-BeautyPic:           INCBIN "gfx/trainers/028.lz"
-ShellderBackpic:     INCBIN "gfx/pics/090/back.lz"
-ZubatBackpic:        INCBIN "gfx/pics/041/back.lz"
-TeddiursaFrontpic:   INCBIN "gfx/pics/216/front.lz"
-CuboneBackpic:       INCBIN "gfx/pics/104/back.lz"
-GruntmPic:           INCBIN "gfx/trainers/030.lz"
-GloomBackpic:        INCBIN "gfx/pics/044/back.lz"
-MagcargoBackpic:     INCBIN "gfx/pics/219/back.lz"
-KabutopsBackpic:     INCBIN "gfx/pics/141/back.lz"
-BeedrillBackpic:     INCBIN "gfx/pics/015/back.lz"
-ArcanineBackpic:     INCBIN "gfx/pics/059/back.lz"
-FlareonBackpic:      INCBIN "gfx/pics/136/back.lz"
-GoldeenBackpic:      INCBIN "gfx/pics/118/back.lz"
-BulbasaurFrontpic:   INCBIN "gfx/pics/001/front.lz"
-StarmieBackpic:      INCBIN "gfx/pics/121/back.lz"
+VenusaurBackpic:     INCBIN "gfx/pics/venusaur/back.6x6.2bpp.lz"
+MoltresBackpic:      INCBIN "gfx/pics/moltres/back.6x6.2bpp.lz"
+SunfloraBackpic:     INCBIN "gfx/pics/sunflora/back.6x6.2bpp.lz"
+PhanpyFrontpic:      INCBIN "gfx/pics/phanpy/front.5x5.2bpp.lz"
+RhydonBackpic:       INCBIN "gfx/pics/rhydon/back.6x6.2bpp.lz"
+LarvitarFrontpic:    INCBIN "gfx/pics/larvitar/front.5x5.2bpp.lz"
+TyranitarBackpic:    INCBIN "gfx/pics/tyranitar/back.6x6.2bpp.lz"
+SandslashBackpic:    INCBIN "gfx/pics/sandslash/back.6x6.2bpp.lz"
+SeadraBackpic:       INCBIN "gfx/pics/seadra/back.6x6.2bpp.lz"
+TwinsPic:            INCBIN "gfx/trainers/twins.7x7.2bpp.lz"
+FarfetchDBackpic:    INCBIN "gfx/pics/farfetch_d/back.6x6.2bpp.lz"
+NidoranMBackpic:     INCBIN "gfx/pics/nidoran_m/back.6x6.2bpp.lz"
+LedybaBackpic:       INCBIN "gfx/pics/ledyba/back.6x6.2bpp.lz"
+CyndaquilBackpic:    INCBIN "gfx/pics/cyndaquil/back.6x6.2bpp.lz"
+BayleefBackpic:      INCBIN "gfx/pics/bayleef/back.6x6.2bpp.lz"
+OddishFrontpic:      INCBIN "gfx/pics/oddish/front.5x5.2bpp.lz"
+RapidashBackpic:     INCBIN "gfx/pics/rapidash/back.6x6.2bpp.lz"
+DoduoBackpic:        INCBIN "gfx/pics/doduo/back.6x6.2bpp.lz"
+HoppipFrontpic:      INCBIN "gfx/pics/hoppip/front.5x5.2bpp.lz"
+MankeyBackpic:       INCBIN "gfx/pics/mankey/back.6x6.2bpp.lz"
+MagmarBackpic:       INCBIN "gfx/pics/magmar/back.6x6.2bpp.lz"
+HypnoBackpic:        INCBIN "gfx/pics/hypno/back.6x6.2bpp.lz"
+QuilavaBackpic:      INCBIN "gfx/pics/quilava/back.6x6.2bpp.lz"
+CroconawBackpic:     INCBIN "gfx/pics/croconaw/back.6x6.2bpp.lz"
+SandshrewBackpic:    INCBIN "gfx/pics/sandshrew/back.6x6.2bpp.lz"
+SailorPic:           INCBIN "gfx/trainers/sailor.7x7.2bpp.lz"
+BeautyPic:           INCBIN "gfx/trainers/beauty.7x7.2bpp.lz"
+ShellderBackpic:     INCBIN "gfx/pics/shellder/back.6x6.2bpp.lz"
+ZubatBackpic:        INCBIN "gfx/pics/zubat/back.6x6.2bpp.lz"
+TeddiursaFrontpic:   INCBIN "gfx/pics/teddiursa/front.5x5.2bpp.lz"
+CuboneBackpic:       INCBIN "gfx/pics/cubone/back.6x6.2bpp.lz"
+GruntmPic:           INCBIN "gfx/trainers/grunt_m.7x7.2bpp.lz"
+GloomBackpic:        INCBIN "gfx/pics/gloom/back.6x6.2bpp.lz"
+MagcargoBackpic:     INCBIN "gfx/pics/magcargo/back.6x6.2bpp.lz"
+KabutopsBackpic:     INCBIN "gfx/pics/kabutops/back.6x6.2bpp.lz"
+BeedrillBackpic:     INCBIN "gfx/pics/beedrill/back.6x6.2bpp.lz"
+ArcanineBackpic:     INCBIN "gfx/pics/arcanine/back.6x6.2bpp.lz"
+FlareonBackpic:      INCBIN "gfx/pics/flareon/back.6x6.2bpp.lz"
+GoldeenBackpic:      INCBIN "gfx/pics/goldeen/back.6x6.2bpp.lz"
+BulbasaurFrontpic:   INCBIN "gfx/pics/bulbasaur/front.5x5.2bpp.lz"
+StarmieBackpic:      INCBIN "gfx/pics/starmie/back.6x6.2bpp.lz"
 ; 150000
 
 
 SECTION "Pics 13", ROMX, BANK[PICS_13]
 
-OmanyteBackpic:      INCBIN "gfx/pics/138/back.lz"
-PidgeyBackpic:       INCBIN "gfx/pics/016/back.lz"
-ScientistPic:        INCBIN "gfx/trainers/019.lz"
-QwilfishBackpic:     INCBIN "gfx/pics/211/back.lz"
-GligarBackpic:       INCBIN "gfx/pics/207/back.lz"
-TyphlosionBackpic:   INCBIN "gfx/pics/157/back.lz"
-CharmeleonBackpic:   INCBIN "gfx/pics/005/back.lz"
-NidoqueenBackpic:    INCBIN "gfx/pics/031/back.lz"
-PichuFrontpic:       INCBIN "gfx/pics/172/front.lz"
-ElectabuzzBackpic:   INCBIN "gfx/pics/125/back.lz"
-LedianBackpic:       INCBIN "gfx/pics/166/back.lz"
-PupitarBackpic:      INCBIN "gfx/pics/247/back.lz"
-HeracrossBackpic:    INCBIN "gfx/pics/214/back.lz"
-UnownDFrontpic:      INCBIN "gfx/pics/201d/front.lz"
-MiltankBackpic:      INCBIN "gfx/pics/241/back.lz"
-SteelixBackpic:      INCBIN "gfx/pics/208/back.lz"
-PersianBackpic:      INCBIN "gfx/pics/053/back.lz"
-LtSurgePic:          INCBIN "gfx/trainers/018.lz"
-TeacherPic:          INCBIN "gfx/trainers/033.lz"
-EggPic:              INCBIN "gfx/pics/egg/front.lz"
-EeveeBackpic:        INCBIN "gfx/pics/133/back.lz"
-ShuckleFrontpic:     INCBIN "gfx/pics/213/front.lz"
-PonytaBackpic:       INCBIN "gfx/pics/077/back.lz"
-RemoraidFrontpic:    INCBIN "gfx/pics/223/front.lz"
-PoliwagFrontpic:     INCBIN "gfx/pics/060/front.lz"
-OnixBackpic:         INCBIN "gfx/pics/095/back.lz"
-KoffingBackpic:      INCBIN "gfx/pics/109/back.lz"
-BirdKeeperPic:       INCBIN "gfx/trainers/023.lz"
-FalknerPic:          INCBIN "gfx/trainers/000.lz"
-KarenPic:            INCBIN "gfx/trainers/013.lz"
-NidorinaBackpic:     INCBIN "gfx/pics/030/back.lz"
-TentacruelBackpic:   INCBIN "gfx/pics/073/back.lz"
-GrowlitheBackpic:    INCBIN "gfx/pics/058/back.lz"
-KogaPic:             INCBIN "gfx/trainers/014.lz"
-MachokeBackpic:      INCBIN "gfx/pics/067/back.lz"
-RaichuBackpic:       INCBIN "gfx/pics/026/back.lz"
-PoliwrathBackpic:    INCBIN "gfx/pics/062/back.lz"
-SwimmermPic:         INCBIN "gfx/trainers/037.lz"
-SunkernFrontpic:     INCBIN "gfx/pics/191/front.lz"
-NidorinoBackpic:     INCBIN "gfx/pics/033/back.lz"
-MysticalmanPic:      INCBIN "gfx/trainers/066.lz"
-CooltrainerfPic:     INCBIN "gfx/trainers/027.lz"
-ElectrodeFrontpic:   INCBIN "gfx/pics/101/front.lz"
+OmanyteBackpic:      INCBIN "gfx/pics/omanyte/back.6x6.2bpp.lz"
+PidgeyBackpic:       INCBIN "gfx/pics/pidgey/back.6x6.2bpp.lz"
+ScientistPic:        INCBIN "gfx/trainers/scientist.7x7.2bpp.lz"
+QwilfishBackpic:     INCBIN "gfx/pics/qwilfish/back.6x6.2bpp.lz"
+GligarBackpic:       INCBIN "gfx/pics/gligar/back.6x6.2bpp.lz"
+TyphlosionBackpic:   INCBIN "gfx/pics/typhlosion/back.6x6.2bpp.lz"
+CharmeleonBackpic:   INCBIN "gfx/pics/charmeleon/back.6x6.2bpp.lz"
+NidoqueenBackpic:    INCBIN "gfx/pics/nidoqueen/back.6x6.2bpp.lz"
+PichuFrontpic:       INCBIN "gfx/pics/pichu/front.5x5.2bpp.lz"
+ElectabuzzBackpic:   INCBIN "gfx/pics/electabuzz/back.6x6.2bpp.lz"
+LedianBackpic:       INCBIN "gfx/pics/ledian/back.6x6.2bpp.lz"
+PupitarBackpic:      INCBIN "gfx/pics/pupitar/back.6x6.2bpp.lz"
+HeracrossBackpic:    INCBIN "gfx/pics/heracross/back.6x6.2bpp.lz"
+UnownDFrontpic:      INCBIN "gfx/pics/unown_d/front.5x5.2bpp.lz"
+MiltankBackpic:      INCBIN "gfx/pics/miltank/back.6x6.2bpp.lz"
+SteelixBackpic:      INCBIN "gfx/pics/steelix/back.6x6.2bpp.lz"
+PersianBackpic:      INCBIN "gfx/pics/persian/back.6x6.2bpp.lz"
+LtSurgePic:          INCBIN "gfx/trainers/lt_surge.7x7.2bpp.lz"
+TeacherPic:          INCBIN "gfx/trainers/teacher.7x7.2bpp.lz"
+EggPic:              INCBIN "gfx/pics/egg/front.5x5.2bpp.lz"
+EeveeBackpic:        INCBIN "gfx/pics/eevee/back.6x6.2bpp.lz"
+ShuckleFrontpic:     INCBIN "gfx/pics/shuckle/front.5x5.2bpp.lz"
+PonytaBackpic:       INCBIN "gfx/pics/ponyta/back.6x6.2bpp.lz"
+RemoraidFrontpic:    INCBIN "gfx/pics/remoraid/front.5x5.2bpp.lz"
+PoliwagFrontpic:     INCBIN "gfx/pics/poliwag/front.5x5.2bpp.lz"
+OnixBackpic:         INCBIN "gfx/pics/onix/back.6x6.2bpp.lz"
+KoffingBackpic:      INCBIN "gfx/pics/koffing/back.6x6.2bpp.lz"
+BirdKeeperPic:       INCBIN "gfx/trainers/bird_keeper.7x7.2bpp.lz"
+FalknerPic:          INCBIN "gfx/trainers/falkner.7x7.2bpp.lz"
+KarenPic:            INCBIN "gfx/trainers/karen.7x7.2bpp.lz"
+NidorinaBackpic:     INCBIN "gfx/pics/nidorina/back.6x6.2bpp.lz"
+TentacruelBackpic:   INCBIN "gfx/pics/tentacruel/back.6x6.2bpp.lz"
+GrowlitheBackpic:    INCBIN "gfx/pics/growlithe/back.6x6.2bpp.lz"
+KogaPic:             INCBIN "gfx/trainers/koga.7x7.2bpp.lz"
+MachokeBackpic:      INCBIN "gfx/pics/machoke/back.6x6.2bpp.lz"
+RaichuBackpic:       INCBIN "gfx/pics/raichu/back.6x6.2bpp.lz"
+PoliwrathBackpic:    INCBIN "gfx/pics/poliwrath/back.6x6.2bpp.lz"
+SwimmermPic:         INCBIN "gfx/trainers/swimmer_m.7x7.2bpp.lz"
+SunkernFrontpic:     INCBIN "gfx/pics/sunkern/front.5x5.2bpp.lz"
+NidorinoBackpic:     INCBIN "gfx/pics/nidorino/back.6x6.2bpp.lz"
+MysticalmanPic:      INCBIN "gfx/trainers/mysticalman.7x7.2bpp.lz"
+CooltrainerfPic:     INCBIN "gfx/trainers/cooltrainer_f.7x7.2bpp.lz"
+ElectrodeFrontpic:   INCBIN "gfx/pics/electrode/front.5x5.2bpp.lz"
 ; 153fe3
 
 
 SECTION "Pics 14", ROMX, BANK[PICS_14]
 
-SudowoodoBackpic:    INCBIN "gfx/pics/185/back.lz"
-FlaaffyBackpic:      INCBIN "gfx/pics/180/back.lz"
-SentretFrontpic:     INCBIN "gfx/pics/161/front.lz"
-TogeticBackpic:      INCBIN "gfx/pics/176/back.lz"
-BugsyPic:            INCBIN "gfx/trainers/002.lz"
-MarowakBackpic:      INCBIN "gfx/pics/105/back.lz"
-GeodudeBackpic:      INCBIN "gfx/pics/074/back.lz"
-ScytherBackpic:      INCBIN "gfx/pics/123/back.lz"
-VileplumeBackpic:    INCBIN "gfx/pics/045/back.lz"
-HitmonchanBackpic:   INCBIN "gfx/pics/107/back.lz"
-JumpluffBackpic:     INCBIN "gfx/pics/189/back.lz"
-CooltrainermPic:     INCBIN "gfx/trainers/026.lz"
-BlastoiseBackpic:    INCBIN "gfx/pics/009/back.lz"
-MisdreavusBackpic:   INCBIN "gfx/pics/200/back.lz"
-TyrogueBackpic:      INCBIN "gfx/pics/236/back.lz"
-GeodudeFrontpic:     INCBIN "gfx/pics/074/front.lz"
-ScizorBackpic:       INCBIN "gfx/pics/212/back.lz"
-GirafarigBackpic:    INCBIN "gfx/pics/203/back.lz"
-StantlerBackpic:     INCBIN "gfx/pics/234/back.lz"
-SmeargleBackpic:     INCBIN "gfx/pics/235/back.lz"
-CharizardBackpic:    INCBIN "gfx/pics/006/back.lz"
-KadabraBackpic:      INCBIN "gfx/pics/064/back.lz"
-PrimeapeBackpic:     INCBIN "gfx/pics/057/back.lz"
-FurretBackpic:       INCBIN "gfx/pics/162/back.lz"
-WartortleBackpic:    INCBIN "gfx/pics/008/back.lz"
-ExeggcuteBackpic:    INCBIN "gfx/pics/102/back.lz"
-IgglybuffFrontpic:   INCBIN "gfx/pics/174/front.lz"
-RaticateBackpic:     INCBIN "gfx/pics/020/back.lz"
-VulpixBackpic:       INCBIN "gfx/pics/037/back.lz"
-EkansBackpic:        INCBIN "gfx/pics/023/back.lz"
-SeakingBackpic:      INCBIN "gfx/pics/119/back.lz"
-BurglarPic:          INCBIN "gfx/trainers/046.lz"
-PsyduckBackpic:      INCBIN "gfx/pics/054/back.lz"
-PikachuBackpic:      INCBIN "gfx/pics/025/back.lz"
-KabutoFrontpic:      INCBIN "gfx/pics/140/front.lz"
-MareepBackpic:       INCBIN "gfx/pics/179/back.lz"
-RemoraidBackpic:     INCBIN "gfx/pics/223/back.lz"
-DittoFrontpic:       INCBIN "gfx/pics/132/front.lz"
-KingdraBackpic:      INCBIN "gfx/pics/230/back.lz"
-CamperPic:           INCBIN "gfx/trainers/053.lz"
-WooperFrontpic:      INCBIN "gfx/pics/194/front.lz"
-ClefairyBackpic:     INCBIN "gfx/pics/035/back.lz"
-VenonatBackpic:      INCBIN "gfx/pics/048/back.lz"
-BellossomBackpic:    INCBIN "gfx/pics/182/back.lz"
-Rival1Pic:           INCBIN "gfx/trainers/008.lz"
-SwinubBackpic:       INCBIN "gfx/pics/220/back.lz"
+SudowoodoBackpic:    INCBIN "gfx/pics/sudowoodo/back.6x6.2bpp.lz"
+FlaaffyBackpic:      INCBIN "gfx/pics/flaaffy/back.6x6.2bpp.lz"
+SentretFrontpic:     INCBIN "gfx/pics/sentret/front.6x6.2bpp.lz"
+TogeticBackpic:      INCBIN "gfx/pics/togetic/back.6x6.2bpp.lz"
+BugsyPic:            INCBIN "gfx/trainers/bugsy.7x7.2bpp.lz"
+MarowakBackpic:      INCBIN "gfx/pics/marowak/back.6x6.2bpp.lz"
+GeodudeBackpic:      INCBIN "gfx/pics/geodude/back.6x6.2bpp.lz"
+ScytherBackpic:      INCBIN "gfx/pics/scyther/back.6x6.2bpp.lz"
+VileplumeBackpic:    INCBIN "gfx/pics/vileplume/back.6x6.2bpp.lz"
+HitmonchanBackpic:   INCBIN "gfx/pics/hitmonchan/back.6x6.2bpp.lz"
+JumpluffBackpic:     INCBIN "gfx/pics/jumpluff/back.6x6.2bpp.lz"
+CooltrainermPic:     INCBIN "gfx/trainers/cooltrainer_m.7x7.2bpp.lz"
+BlastoiseBackpic:    INCBIN "gfx/pics/blastoise/back.6x6.2bpp.lz"
+MisdreavusBackpic:   INCBIN "gfx/pics/misdreavus/back.6x6.2bpp.lz"
+TyrogueBackpic:      INCBIN "gfx/pics/tyrogue/back.6x6.2bpp.lz"
+GeodudeFrontpic:     INCBIN "gfx/pics/geodude/front.5x5.2bpp.lz"
+ScizorBackpic:       INCBIN "gfx/pics/scizor/back.6x6.2bpp.lz"
+GirafarigBackpic:    INCBIN "gfx/pics/girafarig/back.6x6.2bpp.lz"
+StantlerBackpic:     INCBIN "gfx/pics/stantler/back.6x6.2bpp.lz"
+SmeargleBackpic:     INCBIN "gfx/pics/smeargle/back.6x6.2bpp.lz"
+CharizardBackpic:    INCBIN "gfx/pics/charizard/back.6x6.2bpp.lz"
+KadabraBackpic:      INCBIN "gfx/pics/kadabra/back.6x6.2bpp.lz"
+PrimeapeBackpic:     INCBIN "gfx/pics/primeape/back.6x6.2bpp.lz"
+FurretBackpic:       INCBIN "gfx/pics/furret/back.6x6.2bpp.lz"
+WartortleBackpic:    INCBIN "gfx/pics/wartortle/back.6x6.2bpp.lz"
+ExeggcuteBackpic:    INCBIN "gfx/pics/exeggcute/back.6x6.2bpp.lz"
+IgglybuffFrontpic:   INCBIN "gfx/pics/igglybuff/front.5x5.2bpp.lz"
+RaticateBackpic:     INCBIN "gfx/pics/raticate/back.6x6.2bpp.lz"
+VulpixBackpic:       INCBIN "gfx/pics/vulpix/back.6x6.2bpp.lz"
+EkansBackpic:        INCBIN "gfx/pics/ekans/back.6x6.2bpp.lz"
+SeakingBackpic:      INCBIN "gfx/pics/seaking/back.6x6.2bpp.lz"
+BurglarPic:          INCBIN "gfx/trainers/burglar.7x7.2bpp.lz"
+PsyduckBackpic:      INCBIN "gfx/pics/psyduck/back.6x6.2bpp.lz"
+PikachuBackpic:      INCBIN "gfx/pics/pikachu/back.6x6.2bpp.lz"
+KabutoFrontpic:      INCBIN "gfx/pics/kabuto/front.5x5.2bpp.lz"
+MareepBackpic:       INCBIN "gfx/pics/mareep/back.6x6.2bpp.lz"
+RemoraidBackpic:     INCBIN "gfx/pics/remoraid/back.6x6.2bpp.lz"
+DittoFrontpic:       INCBIN "gfx/pics/ditto/front.5x5.2bpp.lz"
+KingdraBackpic:      INCBIN "gfx/pics/kingdra/back.6x6.2bpp.lz"
+CamperPic:           INCBIN "gfx/trainers/camper.7x7.2bpp.lz"
+WooperFrontpic:      INCBIN "gfx/pics/wooper/front.5x5.2bpp.lz"
+ClefairyBackpic:     INCBIN "gfx/pics/clefairy/back.6x6.2bpp.lz"
+VenonatBackpic:      INCBIN "gfx/pics/venonat/back.6x6.2bpp.lz"
+BellossomBackpic:    INCBIN "gfx/pics/bellossom/back.6x6.2bpp.lz"
+Rival1Pic:           INCBIN "gfx/trainers/rival1.7x7.2bpp.lz"
+SwinubBackpic:       INCBIN "gfx/pics/swinub/back.6x6.2bpp.lz"
 ; 158000
 
 
 SECTION "Pics 15", ROMX, BANK[PICS_15]
 
-MewtwoBackpic:       INCBIN "gfx/pics/150/back.lz"
-PokemonProfPic:      INCBIN "gfx/trainers/009.lz"
-CalPic:              INCBIN "gfx/trainers/011.lz"
-SwimmerfPic:         INCBIN "gfx/trainers/038.lz"
-DiglettFrontpic:     INCBIN "gfx/pics/050/front.lz"
-OfficerPic:          INCBIN "gfx/trainers/064.lz"
-MukBackpic:          INCBIN "gfx/pics/089/back.lz"
-DelibirdBackpic:     INCBIN "gfx/pics/225/back.lz"
-SabrinaPic:          INCBIN "gfx/trainers/034.lz"
-MagikarpBackpic:     INCBIN "gfx/pics/129/back.lz"
-AriadosBackpic:      INCBIN "gfx/pics/168/back.lz"
-SneaselBackpic:      INCBIN "gfx/pics/215/back.lz"
-UmbreonBackpic:      INCBIN "gfx/pics/197/back.lz"
-MurkrowBackpic:      INCBIN "gfx/pics/198/back.lz"
-IvysaurBackpic:      INCBIN "gfx/pics/002/back.lz"
-SlowbroBackpic:      INCBIN "gfx/pics/080/back.lz"
-PsychicTPic:         INCBIN "gfx/trainers/051.lz"
-GolduckBackpic:      INCBIN "gfx/pics/055/back.lz"
-WeezingBackpic:      INCBIN "gfx/pics/110/back.lz"
-EnteiBackpic:        INCBIN "gfx/pics/244/back.lz"
-GruntfPic:           INCBIN "gfx/trainers/065.lz"
-HorseaFrontpic:      INCBIN "gfx/pics/116/front.lz"
-PidgeotBackpic:      INCBIN "gfx/pics/018/back.lz"
-HoOhBackpic:         INCBIN "gfx/pics/250/back.lz"
-PoliwhirlBackpic:    INCBIN "gfx/pics/061/back.lz"
-MewBackpic:          INCBIN "gfx/pics/151/back.lz"
-MachopBackpic:       INCBIN "gfx/pics/066/back.lz"
-AbraBackpic:         INCBIN "gfx/pics/063/back.lz"
-AerodactylBackpic:   INCBIN "gfx/pics/142/back.lz"
-KakunaFrontpic:      INCBIN "gfx/pics/014/front.lz"
-DugtrioBackpic:      INCBIN "gfx/pics/051/back.lz"
-WeepinbellBackpic:   INCBIN "gfx/pics/070/back.lz"
-NidoranFBackpic:     INCBIN "gfx/pics/029/back.lz"
-GravelerBackpic:     INCBIN "gfx/pics/075/back.lz"
-AipomBackpic:        INCBIN "gfx/pics/190/back.lz"
-EspeonBackpic:       INCBIN "gfx/pics/196/back.lz"
-WeedleFrontpic:      INCBIN "gfx/pics/013/front.lz"
-TotodileBackpic:     INCBIN "gfx/pics/158/back.lz"
-SnubbullBackpic:     INCBIN "gfx/pics/209/back.lz"
-KinglerBackpic:      INCBIN "gfx/pics/099/back.lz"
-GengarBackpic:       INCBIN "gfx/pics/094/back.lz"
-RattataBackpic:      INCBIN "gfx/pics/019/back.lz"
-YoungsterPic:        INCBIN "gfx/trainers/021.lz"
-WillPic:             INCBIN "gfx/trainers/010.lz"
-SchoolboyPic:        INCBIN "gfx/trainers/022.lz"
-MagnemiteFrontpic:   INCBIN "gfx/pics/081/front.lz"
-ErikaPic:            INCBIN "gfx/trainers/020.lz"
-JaninePic:           INCBIN "gfx/trainers/025.lz"
-MagnemiteBackpic:    INCBIN "gfx/pics/081/back.lz"
+MewtwoBackpic:       INCBIN "gfx/pics/mewtwo/back.6x6.2bpp.lz"
+PokemonProfPic:      INCBIN "gfx/trainers/oak.7x7.2bpp.lz"
+CalPic:              INCBIN "gfx/trainers/cal.7x7.2bpp.lz"
+SwimmerfPic:         INCBIN "gfx/trainers/swimmer_f.7x7.2bpp.lz"
+DiglettFrontpic:     INCBIN "gfx/pics/diglett/front.5x5.2bpp.lz"
+OfficerPic:          INCBIN "gfx/trainers/officer.7x7.2bpp.lz"
+MukBackpic:          INCBIN "gfx/pics/muk/back.6x6.2bpp.lz"
+DelibirdBackpic:     INCBIN "gfx/pics/delibird/back.6x6.2bpp.lz"
+SabrinaPic:          INCBIN "gfx/trainers/sabrina.7x7.2bpp.lz"
+MagikarpBackpic:     INCBIN "gfx/pics/magikarp/back.6x6.2bpp.lz"
+AriadosBackpic:      INCBIN "gfx/pics/ariados/back.6x6.2bpp.lz"
+SneaselBackpic:      INCBIN "gfx/pics/sneasel/back.6x6.2bpp.lz"
+UmbreonBackpic:      INCBIN "gfx/pics/umbreon/back.6x6.2bpp.lz"
+MurkrowBackpic:      INCBIN "gfx/pics/murkrow/back.6x6.2bpp.lz"
+IvysaurBackpic:      INCBIN "gfx/pics/ivysaur/back.6x6.2bpp.lz"
+SlowbroBackpic:      INCBIN "gfx/pics/slowbro/back.6x6.2bpp.lz"
+PsychicTPic:         INCBIN "gfx/trainers/psychic_t.7x7.2bpp.lz"
+GolduckBackpic:      INCBIN "gfx/pics/golduck/back.6x6.2bpp.lz"
+WeezingBackpic:      INCBIN "gfx/pics/weezing/back.6x6.2bpp.lz"
+EnteiBackpic:        INCBIN "gfx/pics/entei/back.6x6.2bpp.lz"
+GruntfPic:           INCBIN "gfx/trainers/grunt_f.7x7.2bpp.lz"
+HorseaFrontpic:      INCBIN "gfx/pics/horsea/front.5x5.2bpp.lz"
+PidgeotBackpic:      INCBIN "gfx/pics/pidgeot/back.6x6.2bpp.lz"
+HoOhBackpic:         INCBIN "gfx/pics/ho_oh/back.6x6.2bpp.lz"
+PoliwhirlBackpic:    INCBIN "gfx/pics/poliwhirl/back.6x6.2bpp.lz"
+MewBackpic:          INCBIN "gfx/pics/mew/back.6x6.2bpp.lz"
+MachopBackpic:       INCBIN "gfx/pics/machop/back.6x6.2bpp.lz"
+AbraBackpic:         INCBIN "gfx/pics/abra/back.6x6.2bpp.lz"
+AerodactylBackpic:   INCBIN "gfx/pics/aerodactyl/back.6x6.2bpp.lz"
+KakunaFrontpic:      INCBIN "gfx/pics/kakuna/front.5x5.2bpp.lz"
+DugtrioBackpic:      INCBIN "gfx/pics/dugtrio/back.6x6.2bpp.lz"
+WeepinbellBackpic:   INCBIN "gfx/pics/weepinbell/back.6x6.2bpp.lz"
+NidoranFBackpic:     INCBIN "gfx/pics/nidoran_f/back.6x6.2bpp.lz"
+GravelerBackpic:     INCBIN "gfx/pics/graveler/back.6x6.2bpp.lz"
+AipomBackpic:        INCBIN "gfx/pics/aipom/back.6x6.2bpp.lz"
+EspeonBackpic:       INCBIN "gfx/pics/espeon/back.6x6.2bpp.lz"
+WeedleFrontpic:      INCBIN "gfx/pics/weedle/front.5x5.2bpp.lz"
+TotodileBackpic:     INCBIN "gfx/pics/totodile/back.6x6.2bpp.lz"
+SnubbullBackpic:     INCBIN "gfx/pics/snubbull/back.6x6.2bpp.lz"
+KinglerBackpic:      INCBIN "gfx/pics/kingler/back.6x6.2bpp.lz"
+GengarBackpic:       INCBIN "gfx/pics/gengar/back.6x6.2bpp.lz"
+RattataBackpic:      INCBIN "gfx/pics/rattata/back.6x6.2bpp.lz"
+YoungsterPic:        INCBIN "gfx/trainers/youngster.7x7.2bpp.lz"
+WillPic:             INCBIN "gfx/trainers/will.7x7.2bpp.lz"
+SchoolboyPic:        INCBIN "gfx/trainers/schoolboy.7x7.2bpp.lz"
+MagnemiteFrontpic:   INCBIN "gfx/pics/magnemite/front.5x5.2bpp.lz"
+ErikaPic:            INCBIN "gfx/trainers/erika.7x7.2bpp.lz"
+JaninePic:           INCBIN "gfx/trainers/janine.7x7.2bpp.lz"
+MagnemiteBackpic:    INCBIN "gfx/pics/magnemite/back.6x6.2bpp.lz"
 ; 15bffa
 
 
 SECTION "Pics 16", ROMX, BANK[PICS_16]
 
-HoothootBackpic:     INCBIN "gfx/pics/163/back.lz"
-NoctowlBackpic:      INCBIN "gfx/pics/164/back.lz"
-MortyPic:            INCBIN "gfx/trainers/003.lz"
-SlugmaBackpic:       INCBIN "gfx/pics/218/back.lz"
-KabutoBackpic:       INCBIN "gfx/pics/140/back.lz"
-VictreebelBackpic:   INCBIN "gfx/pics/071/back.lz"
-MeowthBackpic:       INCBIN "gfx/pics/052/back.lz"
-MeganiumBackpic:     INCBIN "gfx/pics/154/back.lz"
-PicnickerPic:        INCBIN "gfx/trainers/052.lz"
-LickitungBackpic:    INCBIN "gfx/pics/108/back.lz"
-TogepiFrontpic:      INCBIN "gfx/pics/175/front.lz"
-SuperNerdPic:        INCBIN "gfx/trainers/040.lz"
-HaunterBackpic:      INCBIN "gfx/pics/093/back.lz"
-XatuBackpic:         INCBIN "gfx/pics/178/back.lz"
-RedPic:              INCBIN "gfx/trainers/062.lz"
-Porygon2Backpic:     INCBIN "gfx/pics/233/back.lz"
-JasminePic:          INCBIN "gfx/trainers/005.lz"
-PinecoBackpic:       INCBIN "gfx/pics/204/back.lz"
-MetapodFrontpic:     INCBIN "gfx/pics/011/front.lz"
-SeelBackpic:         INCBIN "gfx/pics/086/back.lz"
-QuagsireBackpic:     INCBIN "gfx/pics/195/back.lz"
-WhitneyPic:          INCBIN "gfx/trainers/001.lz"
-JolteonBackpic:      INCBIN "gfx/pics/135/back.lz"
-CaterpieFrontpic:    INCBIN "gfx/pics/010/front.lz"
-HoppipBackpic:       INCBIN "gfx/pics/187/back.lz"
-BluePic:             INCBIN "gfx/trainers/063.lz"
-GranbullBackpic:     INCBIN "gfx/pics/210/back.lz"
-GentlemanPic:        INCBIN "gfx/trainers/031.lz"
-ExecutivemPic:       INCBIN "gfx/trainers/050.lz"
-SpearowBackpic:      INCBIN "gfx/pics/021/back.lz"
-SunkernBackpic:      INCBIN "gfx/pics/191/back.lz"
-LaprasBackpic:       INCBIN "gfx/pics/131/back.lz"
-MagbyBackpic:        INCBIN "gfx/pics/240/back.lz"
-DragonairBackpic:    INCBIN "gfx/pics/148/back.lz"
-ZapdosBackpic:       INCBIN "gfx/pics/145/back.lz"
-ChikoritaBackpic:    INCBIN "gfx/pics/152/back.lz"
-CorsolaBackpic:      INCBIN "gfx/pics/222/back.lz"
-ChinchouBackpic:     INCBIN "gfx/pics/170/back.lz"
-ChanseyBackpic:      INCBIN "gfx/pics/113/back.lz"
-SkiploomBackpic:     INCBIN "gfx/pics/188/back.lz"
-SpinarakFrontpic:    INCBIN "gfx/pics/167/front.lz"
-Rival2Pic:           INCBIN "gfx/trainers/041.lz"
-UnownWFrontpic:      INCBIN "gfx/pics/201w/front.lz"
-CharmanderBackpic:   INCBIN "gfx/pics/004/back.lz"
-RhyhornBackpic:      INCBIN "gfx/pics/111/back.lz"
-UnownCFrontpic:      INCBIN "gfx/pics/201c/front.lz"
-MistyPic:            INCBIN "gfx/trainers/017.lz"
-BlainePic:           INCBIN "gfx/trainers/045.lz"
-UnownZFrontpic:      INCBIN "gfx/pics/201z/front.lz"
-SwinubFrontpic:      INCBIN "gfx/pics/220/front.lz"
-LarvitarBackpic:     INCBIN "gfx/pics/246/back.lz"
-PorygonBackpic:      INCBIN "gfx/pics/137/back.lz"
-UnownHBackpic:       INCBIN "gfx/pics/201h/back.lz"
+HoothootBackpic:     INCBIN "gfx/pics/hoothoot/back.6x6.2bpp.lz"
+NoctowlBackpic:      INCBIN "gfx/pics/noctowl/back.6x6.2bpp.lz"
+MortyPic:            INCBIN "gfx/trainers/morty.7x7.2bpp.lz"
+SlugmaBackpic:       INCBIN "gfx/pics/slugma/back.6x6.2bpp.lz"
+KabutoBackpic:       INCBIN "gfx/pics/kabuto/back.6x6.2bpp.lz"
+VictreebelBackpic:   INCBIN "gfx/pics/victreebel/back.6x6.2bpp.lz"
+MeowthBackpic:       INCBIN "gfx/pics/meowth/back.6x6.2bpp.lz"
+MeganiumBackpic:     INCBIN "gfx/pics/meganium/back.6x6.2bpp.lz"
+PicnickerPic:        INCBIN "gfx/trainers/picnicker.7x7.2bpp.lz"
+LickitungBackpic:    INCBIN "gfx/pics/lickitung/back.6x6.2bpp.lz"
+TogepiFrontpic:      INCBIN "gfx/pics/togepi/front.5x5.2bpp.lz"
+SuperNerdPic:        INCBIN "gfx/trainers/super_nerd.7x7.2bpp.lz"
+HaunterBackpic:      INCBIN "gfx/pics/haunter/back.6x6.2bpp.lz"
+XatuBackpic:         INCBIN "gfx/pics/xatu/back.6x6.2bpp.lz"
+RedPic:              INCBIN "gfx/trainers/red.7x7.2bpp.lz"
+Porygon2Backpic:     INCBIN "gfx/pics/porygon2/back.6x6.2bpp.lz"
+JasminePic:          INCBIN "gfx/trainers/jasmine.7x7.2bpp.lz"
+PinecoBackpic:       INCBIN "gfx/pics/pineco/back.6x6.2bpp.lz"
+MetapodFrontpic:     INCBIN "gfx/pics/metapod/front.5x5.2bpp.lz"
+SeelBackpic:         INCBIN "gfx/pics/seel/back.6x6.2bpp.lz"
+QuagsireBackpic:     INCBIN "gfx/pics/quagsire/back.6x6.2bpp.lz"
+WhitneyPic:          INCBIN "gfx/trainers/whitney.7x7.2bpp.lz"
+JolteonBackpic:      INCBIN "gfx/pics/jolteon/back.6x6.2bpp.lz"
+CaterpieFrontpic:    INCBIN "gfx/pics/caterpie/front.5x5.2bpp.lz"
+HoppipBackpic:       INCBIN "gfx/pics/hoppip/back.6x6.2bpp.lz"
+BluePic:             INCBIN "gfx/trainers/blue.7x7.2bpp.lz"
+GranbullBackpic:     INCBIN "gfx/pics/granbull/back.6x6.2bpp.lz"
+GentlemanPic:        INCBIN "gfx/trainers/gentleman.7x7.2bpp.lz"
+ExecutivemPic:       INCBIN "gfx/trainers/executive_m.7x7.2bpp.lz"
+SpearowBackpic:      INCBIN "gfx/pics/spearow/back.6x6.2bpp.lz"
+SunkernBackpic:      INCBIN "gfx/pics/sunkern/back.6x6.2bpp.lz"
+LaprasBackpic:       INCBIN "gfx/pics/lapras/back.6x6.2bpp.lz"
+MagbyBackpic:        INCBIN "gfx/pics/magby/back.6x6.2bpp.lz"
+DragonairBackpic:    INCBIN "gfx/pics/dragonair/back.6x6.2bpp.lz"
+ZapdosBackpic:       INCBIN "gfx/pics/zapdos/back.6x6.2bpp.lz"
+ChikoritaBackpic:    INCBIN "gfx/pics/chikorita/back.6x6.2bpp.lz"
+CorsolaBackpic:      INCBIN "gfx/pics/corsola/back.6x6.2bpp.lz"
+ChinchouBackpic:     INCBIN "gfx/pics/chinchou/back.6x6.2bpp.lz"
+ChanseyBackpic:      INCBIN "gfx/pics/chansey/back.6x6.2bpp.lz"
+SkiploomBackpic:     INCBIN "gfx/pics/skiploom/back.6x6.2bpp.lz"
+SpinarakFrontpic:    INCBIN "gfx/pics/spinarak/front.5x5.2bpp.lz"
+Rival2Pic:           INCBIN "gfx/trainers/rival2.7x7.2bpp.lz"
+UnownWFrontpic:      INCBIN "gfx/pics/unown_w/front.5x5.2bpp.lz"
+CharmanderBackpic:   INCBIN "gfx/pics/charmander/back.6x6.2bpp.lz"
+RhyhornBackpic:      INCBIN "gfx/pics/rhyhorn/back.6x6.2bpp.lz"
+UnownCFrontpic:      INCBIN "gfx/pics/unown_c/front.5x5.2bpp.lz"
+MistyPic:            INCBIN "gfx/trainers/misty.7x7.2bpp.lz"
+BlainePic:           INCBIN "gfx/trainers/blaine.7x7.2bpp.lz"
+UnownZFrontpic:      INCBIN "gfx/pics/unown_z/front.5x5.2bpp.lz"
+SwinubFrontpic:      INCBIN "gfx/pics/swinub/front.5x5.2bpp.lz"
+LarvitarBackpic:     INCBIN "gfx/pics/larvitar/back.6x6.2bpp.lz"
+PorygonBackpic:      INCBIN "gfx/pics/porygon/back.6x6.2bpp.lz"
+UnownHBackpic:       INCBIN "gfx/pics/unown_h/back.6x6.2bpp.lz"
 ; 15ffff
 
 
 SECTION "Pics 17", ROMX, BANK[PICS_17]
 
-ParasBackpic:        INCBIN "gfx/pics/046/back.lz"
-VaporeonBackpic:     INCBIN "gfx/pics/134/back.lz"
-TentacoolBackpic:    INCBIN "gfx/pics/072/back.lz"
-ExecutivefPic:       INCBIN "gfx/trainers/054.lz"
-BulbasaurBackpic:    INCBIN "gfx/pics/001/back.lz"
-SmoochumBackpic:     INCBIN "gfx/pics/238/back.lz"
-PichuBackpic:        INCBIN "gfx/pics/172/back.lz"
-HoundoomBackpic:     INCBIN "gfx/pics/229/back.lz"
-BellsproutBackpic:   INCBIN "gfx/pics/069/back.lz"
-GrimerBackpic:       INCBIN "gfx/pics/088/back.lz"
-LanturnBackpic:      INCBIN "gfx/pics/171/back.lz"
-PidgeottoBackpic:    INCBIN "gfx/pics/017/back.lz"
-StaryuBackpic:       INCBIN "gfx/pics/120/back.lz"
-MrMimeBackpic:       INCBIN "gfx/pics/122/back.lz"
-CaterpieBackpic:     INCBIN "gfx/pics/010/back.lz"
-VoltorbFrontpic:     INCBIN "gfx/pics/100/front.lz"
-LugiaBackpic:        INCBIN "gfx/pics/249/back.lz"
-PrycePic:            INCBIN "gfx/trainers/004.lz"
-BrockPic:            INCBIN "gfx/trainers/016.lz"
-UnownGFrontpic:      INCBIN "gfx/pics/201g/front.lz"
-ArbokBackpic:        INCBIN "gfx/pics/024/back.lz"
-PolitoedBackpic:     INCBIN "gfx/pics/186/back.lz"
-DragoniteBackpic:    INCBIN "gfx/pics/149/back.lz"
-HitmonleeBackpic:    INCBIN "gfx/pics/106/back.lz"
-NatuFrontpic:        INCBIN "gfx/pics/177/front.lz"
-UrsaringBackpic:     INCBIN "gfx/pics/217/back.lz"
-SagePic:             INCBIN "gfx/trainers/055.lz"
-TeddiursaBackpic:    INCBIN "gfx/pics/216/back.lz"
-PhanpyBackpic:       INCBIN "gfx/pics/231/back.lz"
-UnownVFrontpic:      INCBIN "gfx/pics/201v/front.lz"
-KakunaBackpic:       INCBIN "gfx/pics/014/back.lz"
-WobbuffetBackpic:    INCBIN "gfx/pics/202/back.lz"
-TogepiBackpic:       INCBIN "gfx/pics/175/back.lz"
-CrobatBackpic:       INCBIN "gfx/pics/169/back.lz"
-BlisseyBackpic:      INCBIN "gfx/pics/242/back.lz"
-AmpharosBackpic:     INCBIN "gfx/pics/181/back.lz"
-IgglybuffBackpic:    INCBIN "gfx/pics/174/back.lz"
-AzumarillBackpic:    INCBIN "gfx/pics/184/back.lz"
-OctilleryBackpic:    INCBIN "gfx/pics/224/back.lz"
-UnownSFrontpic:      INCBIN "gfx/pics/201s/front.lz"
-HorseaBackpic:       INCBIN "gfx/pics/116/back.lz"
-SentretBackpic:      INCBIN "gfx/pics/161/back.lz"
-UnownOFrontpic:      INCBIN "gfx/pics/201o/front.lz"
-UnownTFrontpic:      INCBIN "gfx/pics/201t/front.lz"
-WigglytuffBackpic:   INCBIN "gfx/pics/040/back.lz"
-ArticunoBackpic:     INCBIN "gfx/pics/144/back.lz"
-DittoBackpic:        INCBIN "gfx/pics/132/back.lz"
-WeedleBackpic:       INCBIN "gfx/pics/013/back.lz"
-UnownHFrontpic:      INCBIN "gfx/pics/201h/front.lz"
-CleffaBackpic:       INCBIN "gfx/pics/173/back.lz"
-DrowzeeBackpic:      INCBIN "gfx/pics/096/back.lz"
-GastlyBackpic:       INCBIN "gfx/pics/092/back.lz"
-FearowBackpic:       INCBIN "gfx/pics/022/back.lz"
-MarillBackpic:       INCBIN "gfx/pics/183/back.lz"
-DratiniBackpic:      INCBIN "gfx/pics/147/back.lz"
-ElectrodeBackpic:    INCBIN "gfx/pics/101/back.lz"
-SkarmoryBackpic:     INCBIN "gfx/pics/227/back.lz"
-MetapodBackpic:      INCBIN "gfx/pics/011/back.lz"
-JigglypuffBackpic:   INCBIN "gfx/pics/039/back.lz"
-OddishBackpic:       INCBIN "gfx/pics/043/back.lz"
-UnownDBackpic:       INCBIN "gfx/pics/201d/back.lz"
+ParasBackpic:        INCBIN "gfx/pics/paras/back.6x6.2bpp.lz"
+VaporeonBackpic:     INCBIN "gfx/pics/vaporeon/back.6x6.2bpp.lz"
+TentacoolBackpic:    INCBIN "gfx/pics/tentacool/back.6x6.2bpp.lz"
+ExecutivefPic:       INCBIN "gfx/trainers/executive_f.7x7.2bpp.lz"
+BulbasaurBackpic:    INCBIN "gfx/pics/bulbasaur/back.6x6.2bpp.lz"
+SmoochumBackpic:     INCBIN "gfx/pics/smoochum/back.6x6.2bpp.lz"
+PichuBackpic:        INCBIN "gfx/pics/pichu/back.6x6.2bpp.lz"
+HoundoomBackpic:     INCBIN "gfx/pics/houndoom/back.6x6.2bpp.lz"
+BellsproutBackpic:   INCBIN "gfx/pics/bellsprout/back.6x6.2bpp.lz"
+GrimerBackpic:       INCBIN "gfx/pics/grimer/back.6x6.2bpp.lz"
+LanturnBackpic:      INCBIN "gfx/pics/lanturn/back.6x6.2bpp.lz"
+PidgeottoBackpic:    INCBIN "gfx/pics/pidgeotto/back.6x6.2bpp.lz"
+StaryuBackpic:       INCBIN "gfx/pics/staryu/back.6x6.2bpp.lz"
+MrMimeBackpic:       INCBIN "gfx/pics/mr__mime/back.6x6.2bpp.lz"
+CaterpieBackpic:     INCBIN "gfx/pics/caterpie/back.6x6.2bpp.lz"
+VoltorbFrontpic:     INCBIN "gfx/pics/voltorb/front.5x5.2bpp.lz"
+LugiaBackpic:        INCBIN "gfx/pics/lugia/back.6x6.2bpp.lz"
+PrycePic:            INCBIN "gfx/trainers/pryce.7x7.2bpp.lz"
+BrockPic:            INCBIN "gfx/trainers/brock.7x7.2bpp.lz"
+UnownGFrontpic:      INCBIN "gfx/pics/unown_g/front.5x5.2bpp.lz"
+ArbokBackpic:        INCBIN "gfx/pics/arbok/back.6x6.2bpp.lz"
+PolitoedBackpic:     INCBIN "gfx/pics/politoed/back.6x6.2bpp.lz"
+DragoniteBackpic:    INCBIN "gfx/pics/dragonite/back.6x6.2bpp.lz"
+HitmonleeBackpic:    INCBIN "gfx/pics/hitmonlee/back.6x6.2bpp.lz"
+NatuFrontpic:        INCBIN "gfx/pics/natu/front.5x5.2bpp.lz"
+UrsaringBackpic:     INCBIN "gfx/pics/ursaring/back.6x6.2bpp.lz"
+SagePic:             INCBIN "gfx/trainers/sage.7x7.2bpp.lz"
+TeddiursaBackpic:    INCBIN "gfx/pics/teddiursa/back.6x6.2bpp.lz"
+PhanpyBackpic:       INCBIN "gfx/pics/phanpy/back.6x6.2bpp.lz"
+UnownVFrontpic:      INCBIN "gfx/pics/unown_v/front.5x5.2bpp.lz"
+KakunaBackpic:       INCBIN "gfx/pics/kakuna/back.6x6.2bpp.lz"
+WobbuffetBackpic:    INCBIN "gfx/pics/wobbuffet/back.6x6.2bpp.lz"
+TogepiBackpic:       INCBIN "gfx/pics/togepi/back.6x6.2bpp.lz"
+CrobatBackpic:       INCBIN "gfx/pics/crobat/back.6x6.2bpp.lz"
+BlisseyBackpic:      INCBIN "gfx/pics/blissey/back.6x6.2bpp.lz"
+AmpharosBackpic:     INCBIN "gfx/pics/ampharos/back.6x6.2bpp.lz"
+IgglybuffBackpic:    INCBIN "gfx/pics/igglybuff/back.6x6.2bpp.lz"
+AzumarillBackpic:    INCBIN "gfx/pics/azumarill/back.6x6.2bpp.lz"
+OctilleryBackpic:    INCBIN "gfx/pics/octillery/back.6x6.2bpp.lz"
+UnownSFrontpic:      INCBIN "gfx/pics/unown_s/front.5x5.2bpp.lz"
+HorseaBackpic:       INCBIN "gfx/pics/horsea/back.6x6.2bpp.lz"
+SentretBackpic:      INCBIN "gfx/pics/sentret/back.6x6.2bpp.lz"
+UnownOFrontpic:      INCBIN "gfx/pics/unown_o/front.5x5.2bpp.lz"
+UnownTFrontpic:      INCBIN "gfx/pics/unown_t/front.5x5.2bpp.lz"
+WigglytuffBackpic:   INCBIN "gfx/pics/wigglytuff/back.6x6.2bpp.lz"
+ArticunoBackpic:     INCBIN "gfx/pics/articuno/back.6x6.2bpp.lz"
+DittoBackpic:        INCBIN "gfx/pics/ditto/back.6x6.2bpp.lz"
+WeedleBackpic:       INCBIN "gfx/pics/weedle/back.6x6.2bpp.lz"
+UnownHFrontpic:      INCBIN "gfx/pics/unown_h/front.5x5.2bpp.lz"
+CleffaBackpic:       INCBIN "gfx/pics/cleffa/back.6x6.2bpp.lz"
+DrowzeeBackpic:      INCBIN "gfx/pics/drowzee/back.6x6.2bpp.lz"
+GastlyBackpic:       INCBIN "gfx/pics/gastly/back.6x6.2bpp.lz"
+FearowBackpic:       INCBIN "gfx/pics/fearow/back.6x6.2bpp.lz"
+MarillBackpic:       INCBIN "gfx/pics/marill/back.6x6.2bpp.lz"
+DratiniBackpic:      INCBIN "gfx/pics/dratini/back.6x6.2bpp.lz"
+ElectrodeBackpic:    INCBIN "gfx/pics/electrode/back.6x6.2bpp.lz"
+SkarmoryBackpic:     INCBIN "gfx/pics/skarmory/back.6x6.2bpp.lz"
+MetapodBackpic:      INCBIN "gfx/pics/metapod/back.6x6.2bpp.lz"
+JigglypuffBackpic:   INCBIN "gfx/pics/jigglypuff/back.6x6.2bpp.lz"
+OddishBackpic:       INCBIN "gfx/pics/oddish/back.6x6.2bpp.lz"
+UnownDBackpic:       INCBIN "gfx/pics/unown_d/back.6x6.2bpp.lz"
 ; 163ffc
 
 
 SECTION "Pics 18", ROMX, BANK[PICS_18]
 
-SpinarakBackpic:     INCBIN "gfx/pics/167/back.lz"
-RaikouBackpic:       INCBIN "gfx/pics/243/back.lz"
-UnownKFrontpic:      INCBIN "gfx/pics/201k/front.lz"
-HoundourBackpic:     INCBIN "gfx/pics/228/back.lz"
-PoliwagBackpic:      INCBIN "gfx/pics/060/back.lz"
-SquirtleBackpic:     INCBIN "gfx/pics/007/back.lz"
-ShuckleBackpic:      INCBIN "gfx/pics/213/back.lz"
-DewgongBackpic:      INCBIN "gfx/pics/087/back.lz"
-UnownBFrontpic:      INCBIN "gfx/pics/201b/front.lz"
-SlowpokeBackpic:     INCBIN "gfx/pics/079/back.lz"
-DunsparceBackpic:    INCBIN "gfx/pics/206/back.lz"
-DonphanBackpic:      INCBIN "gfx/pics/232/back.lz"
-WooperBackpic:       INCBIN "gfx/pics/194/back.lz"
-TaurosBackpic:       INCBIN "gfx/pics/128/back.lz"
-UnownXFrontpic:      INCBIN "gfx/pics/201x/front.lz"
-UnownNFrontpic:      INCBIN "gfx/pics/201n/front.lz"
-TangelaBackpic:      INCBIN "gfx/pics/114/back.lz"
-VoltorbBackpic:      INCBIN "gfx/pics/100/back.lz"
-UnownJFrontpic:      INCBIN "gfx/pics/201j/front.lz"
-MantineBackpic:      INCBIN "gfx/pics/226/back.lz"
-UnownLFrontpic:      INCBIN "gfx/pics/201l/front.lz"
-PiloswineBackpic:    INCBIN "gfx/pics/221/back.lz"
-UnownMFrontpic:      INCBIN "gfx/pics/201m/front.lz"
-UnownFFrontpic:      INCBIN "gfx/pics/201f/front.lz"
-NatuBackpic:         INCBIN "gfx/pics/177/back.lz"
-UnownAFrontpic:      INCBIN "gfx/pics/201a/front.lz"
-GolemBackpic:        INCBIN "gfx/pics/076/back.lz"
-UnownUFrontpic:      INCBIN "gfx/pics/201u/front.lz"
-DiglettBackpic:      INCBIN "gfx/pics/050/back.lz"
-UnownQFrontpic:      INCBIN "gfx/pics/201q/front.lz"
-UnownPFrontpic:      INCBIN "gfx/pics/201p/front.lz"
-UnownCBackpic:       INCBIN "gfx/pics/201c/back.lz"
-JynxBackpic:         INCBIN "gfx/pics/124/back.lz"
-GolbatBackpic:       INCBIN "gfx/pics/042/back.lz"
-UnownYFrontpic:      INCBIN "gfx/pics/201y/front.lz"
-UnownGBackpic:       INCBIN "gfx/pics/201g/back.lz"
-UnownIFrontpic:      INCBIN "gfx/pics/201i/front.lz"
-UnownVBackpic:       INCBIN "gfx/pics/201v/back.lz"
-ForretressBackpic:   INCBIN "gfx/pics/205/back.lz"
-UnownSBackpic:       INCBIN "gfx/pics/201s/back.lz"
-UnownRFrontpic:      INCBIN "gfx/pics/201r/front.lz"
-UnownEBackpic:       INCBIN "gfx/pics/201e/back.lz"
-UnownJBackpic:       INCBIN "gfx/pics/201j/back.lz"
-UnownBBackpic:       INCBIN "gfx/pics/201b/back.lz"
-UnownOBackpic:       INCBIN "gfx/pics/201o/back.lz"
-UnownZBackpic:       INCBIN "gfx/pics/201z/back.lz"
-UnownWBackpic:       INCBIN "gfx/pics/201w/back.lz"
-UnownNBackpic:       INCBIN "gfx/pics/201n/back.lz"
-UnownABackpic:       INCBIN "gfx/pics/201a/back.lz"
-UnownMBackpic:       INCBIN "gfx/pics/201m/back.lz"
-UnownKBackpic:       INCBIN "gfx/pics/201k/back.lz"
-UnownTBackpic:       INCBIN "gfx/pics/201t/back.lz"
-UnownXBackpic:       INCBIN "gfx/pics/201x/back.lz"
-UnownLBackpic:       INCBIN "gfx/pics/201l/back.lz"
-UnownUBackpic:       INCBIN "gfx/pics/201u/back.lz"
-UnownQBackpic:       INCBIN "gfx/pics/201q/back.lz"
-UnownYBackpic:       INCBIN "gfx/pics/201y/back.lz"
-UnownPBackpic:       INCBIN "gfx/pics/201p/back.lz"
-UnownIBackpic:       INCBIN "gfx/pics/201i/back.lz"
-UnownRBackpic:       INCBIN "gfx/pics/201r/back.lz"
+SpinarakBackpic:     INCBIN "gfx/pics/spinarak/back.6x6.2bpp.lz"
+RaikouBackpic:       INCBIN "gfx/pics/raikou/back.6x6.2bpp.lz"
+UnownKFrontpic:      INCBIN "gfx/pics/unown_k/front.5x5.2bpp.lz"
+HoundourBackpic:     INCBIN "gfx/pics/houndour/back.6x6.2bpp.lz"
+PoliwagBackpic:      INCBIN "gfx/pics/poliwag/back.6x6.2bpp.lz"
+SquirtleBackpic:     INCBIN "gfx/pics/squirtle/back.6x6.2bpp.lz"
+ShuckleBackpic:      INCBIN "gfx/pics/shuckle/back.6x6.2bpp.lz"
+DewgongBackpic:      INCBIN "gfx/pics/dewgong/back.6x6.2bpp.lz"
+UnownBFrontpic:      INCBIN "gfx/pics/unown_b/front.5x5.2bpp.lz"
+SlowpokeBackpic:     INCBIN "gfx/pics/slowpoke/back.6x6.2bpp.lz"
+DunsparceBackpic:    INCBIN "gfx/pics/dunsparce/back.6x6.2bpp.lz"
+DonphanBackpic:      INCBIN "gfx/pics/donphan/back.6x6.2bpp.lz"
+WooperBackpic:       INCBIN "gfx/pics/wooper/back.6x6.2bpp.lz"
+TaurosBackpic:       INCBIN "gfx/pics/tauros/back.6x6.2bpp.lz"
+UnownXFrontpic:      INCBIN "gfx/pics/unown_x/front.5x5.2bpp.lz"
+UnownNFrontpic:      INCBIN "gfx/pics/unown_n/front.5x5.2bpp.lz"
+TangelaBackpic:      INCBIN "gfx/pics/tangela/back.6x6.2bpp.lz"
+VoltorbBackpic:      INCBIN "gfx/pics/voltorb/back.6x6.2bpp.lz"
+UnownJFrontpic:      INCBIN "gfx/pics/unown_j/front.5x5.2bpp.lz"
+MantineBackpic:      INCBIN "gfx/pics/mantine/back.6x6.2bpp.lz"
+UnownLFrontpic:      INCBIN "gfx/pics/unown_l/front.5x5.2bpp.lz"
+PiloswineBackpic:    INCBIN "gfx/pics/piloswine/back.6x6.2bpp.lz"
+UnownMFrontpic:      INCBIN "gfx/pics/unown_m/front.5x5.2bpp.lz"
+UnownFFrontpic:      INCBIN "gfx/pics/unown_f/front.5x5.2bpp.lz"
+NatuBackpic:         INCBIN "gfx/pics/natu/back.6x6.2bpp.lz"
+UnownAFrontpic:      INCBIN "gfx/pics/unown_a/front.5x5.2bpp.lz"
+GolemBackpic:        INCBIN "gfx/pics/golem/back.6x6.2bpp.lz"
+UnownUFrontpic:      INCBIN "gfx/pics/unown_u/front.5x5.2bpp.lz"
+DiglettBackpic:      INCBIN "gfx/pics/diglett/back.6x6.2bpp.lz"
+UnownQFrontpic:      INCBIN "gfx/pics/unown_q/front.5x5.2bpp.lz"
+UnownPFrontpic:      INCBIN "gfx/pics/unown_p/front.5x5.2bpp.lz"
+UnownCBackpic:       INCBIN "gfx/pics/unown_c/back.6x6.2bpp.lz"
+JynxBackpic:         INCBIN "gfx/pics/jynx/back.6x6.2bpp.lz"
+GolbatBackpic:       INCBIN "gfx/pics/golbat/back.6x6.2bpp.lz"
+UnownYFrontpic:      INCBIN "gfx/pics/unown_y/front.5x5.2bpp.lz"
+UnownGBackpic:       INCBIN "gfx/pics/unown_g/back.6x6.2bpp.lz"
+UnownIFrontpic:      INCBIN "gfx/pics/unown_i/front.5x5.2bpp.lz"
+UnownVBackpic:       INCBIN "gfx/pics/unown_v/back.6x6.2bpp.lz"
+ForretressBackpic:   INCBIN "gfx/pics/forretress/back.6x6.2bpp.lz"
+UnownSBackpic:       INCBIN "gfx/pics/unown_s/back.6x6.2bpp.lz"
+UnownRFrontpic:      INCBIN "gfx/pics/unown_r/front.5x5.2bpp.lz"
+UnownEBackpic:       INCBIN "gfx/pics/unown_e/back.6x6.2bpp.lz"
+UnownJBackpic:       INCBIN "gfx/pics/unown_j/back.6x6.2bpp.lz"
+UnownBBackpic:       INCBIN "gfx/pics/unown_b/back.6x6.2bpp.lz"
+UnownOBackpic:       INCBIN "gfx/pics/unown_o/back.6x6.2bpp.lz"
+UnownZBackpic:       INCBIN "gfx/pics/unown_z/back.6x6.2bpp.lz"
+UnownWBackpic:       INCBIN "gfx/pics/unown_w/back.6x6.2bpp.lz"
+UnownNBackpic:       INCBIN "gfx/pics/unown_n/back.6x6.2bpp.lz"
+UnownABackpic:       INCBIN "gfx/pics/unown_a/back.6x6.2bpp.lz"
+UnownMBackpic:       INCBIN "gfx/pics/unown_m/back.6x6.2bpp.lz"
+UnownKBackpic:       INCBIN "gfx/pics/unown_k/back.6x6.2bpp.lz"
+UnownTBackpic:       INCBIN "gfx/pics/unown_t/back.6x6.2bpp.lz"
+UnownXBackpic:       INCBIN "gfx/pics/unown_x/back.6x6.2bpp.lz"
+UnownLBackpic:       INCBIN "gfx/pics/unown_l/back.6x6.2bpp.lz"
+UnownUBackpic:       INCBIN "gfx/pics/unown_u/back.6x6.2bpp.lz"
+UnownQBackpic:       INCBIN "gfx/pics/unown_q/back.6x6.2bpp.lz"
+UnownYBackpic:       INCBIN "gfx/pics/unown_y/back.6x6.2bpp.lz"
+UnownPBackpic:       INCBIN "gfx/pics/unown_p/back.6x6.2bpp.lz"
+UnownIBackpic:       INCBIN "gfx/pics/unown_i/back.6x6.2bpp.lz"
+UnownRBackpic:       INCBIN "gfx/pics/unown_r/back.6x6.2bpp.lz"
 ; 1669d3
 
 
@@ -734,65 +734,66 @@ SECTION "Pics 19", ROMX, BANK[PICS_19]
 
 ; Seems to be an accidental copy of the previous bank
 
-INCBIN "gfx/pics/167/back.lz"
-INCBIN "gfx/pics/243/back.lz"
-INCBIN "gfx/pics/201k/front.lz"
-INCBIN "gfx/pics/228/back.lz"
-INCBIN "gfx/pics/060/back.lz"
-INCBIN "gfx/pics/007/back.lz"
-INCBIN "gfx/pics/213/back.lz"
-INCBIN "gfx/pics/087/back.lz"
-INCBIN "gfx/pics/201b/front.lz"
-INCBIN "gfx/pics/079/back.lz"
-INCBIN "gfx/pics/206/back.lz"
-INCBIN "gfx/pics/232/back.lz"
-INCBIN "gfx/pics/194/back.lz"
-INCBIN "gfx/pics/128/back.lz"
-INCBIN "gfx/pics/201x/front.lz"
-INCBIN "gfx/pics/201n/front.lz"
-INCBIN "gfx/pics/114/back.lz"
-INCBIN "gfx/pics/100/back.lz"
-INCBIN "gfx/pics/201j/front.lz"
-INCBIN "gfx/pics/226/back.lz"
-INCBIN "gfx/pics/201l/front.lz"
-INCBIN "gfx/pics/221/back.lz"
-INCBIN "gfx/pics/201m/front.lz"
-INCBIN "gfx/pics/201f/front.lz"
-INCBIN "gfx/pics/177/back.lz"
-INCBIN "gfx/pics/201a/front.lz"
-INCBIN "gfx/pics/076/back.lz"
-INCBIN "gfx/pics/201u/front.lz"
-INCBIN "gfx/pics/050/back.lz"
-INCBIN "gfx/pics/201q/front.lz"
-INCBIN "gfx/pics/201p/front.lz"
-INCBIN "gfx/pics/201c/back.lz"
-INCBIN "gfx/pics/124/back.lz"
-INCBIN "gfx/pics/042/back.lz"
-INCBIN "gfx/pics/201y/front.lz"
-INCBIN "gfx/pics/201g/back.lz"
-INCBIN "gfx/pics/201i/front.lz"
-INCBIN "gfx/pics/201v/back.lz"
-INCBIN "gfx/pics/205/back.lz"
-INCBIN "gfx/pics/201s/back.lz"
-INCBIN "gfx/pics/201r/front.lz"
-INCBIN "gfx/pics/201e/back.lz"
-INCBIN "gfx/pics/201j/back.lz"
-INCBIN "gfx/pics/201b/back.lz"
-INCBIN "gfx/pics/201o/back.lz"
-INCBIN "gfx/pics/201z/back.lz"
-INCBIN "gfx/pics/201w/back.lz"
-INCBIN "gfx/pics/201n/back.lz"
-INCBIN "gfx/pics/201a/back.lz"
-INCBIN "gfx/pics/201m/back.lz"
-INCBIN "gfx/pics/201k/back.lz"
-INCBIN "gfx/pics/201t/back.lz"
-INCBIN "gfx/pics/201x/back.lz"
-INCBIN "gfx/pics/201l/back.lz"
-INCBIN "gfx/pics/201u/back.lz"
-INCBIN "gfx/pics/201q/back.lz"
-INCBIN "gfx/pics/201y/back.lz"
-INCBIN "gfx/pics/201p/back.lz"
-INCBIN "gfx/pics/201i/back.lz"
-INCBIN "gfx/pics/201r/back.lz"
+INCBIN "gfx/pics/spinarak/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/raikou/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_k/front.5x5.2bpp.lz"
+INCBIN "gfx/pics/houndour/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/poliwag/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/squirtle/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/shuckle/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/dewgong/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_b/front.5x5.2bpp.lz"
+INCBIN "gfx/pics/slowpoke/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/dunsparce/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/donphan/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/wooper/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/tauros/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_x/front.5x5.2bpp.lz"
+INCBIN "gfx/pics/unown_n/front.5x5.2bpp.lz"
+INCBIN "gfx/pics/tangela/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/voltorb/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_j/front.5x5.2bpp.lz"
+INCBIN "gfx/pics/mantine/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_l/front.5x5.2bpp.lz"
+INCBIN "gfx/pics/piloswine/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_m/front.5x5.2bpp.lz"
+INCBIN "gfx/pics/unown_f/front.5x5.2bpp.lz"
+INCBIN "gfx/pics/natu/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_a/front.5x5.2bpp.lz"
+INCBIN "gfx/pics/golem/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_u/front.5x5.2bpp.lz"
+INCBIN "gfx/pics/diglett/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_q/front.5x5.2bpp.lz"
+INCBIN "gfx/pics/unown_p/front.5x5.2bpp.lz"
+INCBIN "gfx/pics/unown_c/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/jynx/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/golbat/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_y/front.5x5.2bpp.lz"
+INCBIN "gfx/pics/unown_g/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_i/front.5x5.2bpp.lz"
+INCBIN "gfx/pics/unown_v/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/forretress/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_s/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_r/front.5x5.2bpp.lz"
+INCBIN "gfx/pics/unown_e/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_j/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_b/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_o/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_z/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_w/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_n/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_a/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_m/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_k/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_t/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_x/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_l/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_u/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_q/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_y/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_p/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_i/back.6x6.2bpp.lz"
+INCBIN "gfx/pics/unown_r/back.6x6.2bpp.lz"
+
 
 
diff --git a/gfx/pics/063/anim0.asm b/gfx/pics/abra/anim0.asm
index 9d37567ac..9d37567ac 100644
--- a/gfx/pics/063/anim0.asm
+++ b/gfx/pics/abra/anim0.asm
diff --git a/gfx/pics/063/anim1.asm b/gfx/pics/abra/anim1.asm
index 796e57f88..796e57f88 100644
--- a/gfx/pics/063/anim1.asm
+++ b/gfx/pics/abra/anim1.asm
diff --git a/gfx/pics/063/back.lz b/gfx/pics/abra/back.6x6.2bpp.lz
index 2df351881..2df351881 100644
--- a/gfx/pics/063/back.lz
+++ b/gfx/pics/abra/back.6x6.2bpp.lz
diff --git a/gfx/pics/063/bitmask.asm b/gfx/pics/abra/bitmask.asm
index 1c164d9e1..1c164d9e1 100644
--- a/gfx/pics/063/bitmask.asm
+++ b/gfx/pics/abra/bitmask.asm
diff --git a/gfx/pics/063/frames.asm b/gfx/pics/abra/frames.asm
index 894102a77..894102a77 100644
--- a/gfx/pics/063/frames.asm
+++ b/gfx/pics/abra/frames.asm
diff --git a/gfx/pics/063/front.lz b/gfx/pics/abra/front.5x5.2bpp.lz
index 2b41c4263..2b41c4263 100644
--- a/gfx/pics/063/front.lz
+++ b/gfx/pics/abra/front.5x5.2bpp.lz
diff --git a/gfx/pics/063/normal.pal b/gfx/pics/abra/normal.pal
index 23f50e983..23f50e983 100644
--- a/gfx/pics/063/normal.pal
+++ b/gfx/pics/abra/normal.pal
diff --git a/gfx/pics/063/shiny.pal b/gfx/pics/abra/shiny.pal
index 328319095..328319095 100644
--- a/gfx/pics/063/shiny.pal
+++ b/gfx/pics/abra/shiny.pal
diff --git a/gfx/pics/142/anim0.asm b/gfx/pics/aerodactyl/anim0.asm
index 515cba043..515cba043 100644
--- a/gfx/pics/142/anim0.asm
+++ b/gfx/pics/aerodactyl/anim0.asm
diff --git a/gfx/pics/142/anim1.asm b/gfx/pics/aerodactyl/anim1.asm
index 4394a8e0c..4394a8e0c 100644
--- a/gfx/pics/142/anim1.asm
+++ b/gfx/pics/aerodactyl/anim1.asm
diff --git a/gfx/pics/142/back.lz b/gfx/pics/aerodactyl/back.6x6.2bpp.lz
index 05536351b..05536351b 100644
--- a/gfx/pics/142/back.lz
+++ b/gfx/pics/aerodactyl/back.6x6.2bpp.lz
diff --git a/gfx/pics/142/bitmask.asm b/gfx/pics/aerodactyl/bitmask.asm
index 76095eb39..76095eb39 100644
--- a/gfx/pics/142/bitmask.asm
+++ b/gfx/pics/aerodactyl/bitmask.asm
diff --git a/gfx/pics/142/frames.asm b/gfx/pics/aerodactyl/frames.asm
index 669d78e38..669d78e38 100644
--- a/gfx/pics/142/frames.asm
+++ b/gfx/pics/aerodactyl/frames.asm
diff --git a/gfx/pics/142/front.lz b/gfx/pics/aerodactyl/front.7x7.2bpp.lz
index ae8d9f8ab..ae8d9f8ab 100644
--- a/gfx/pics/142/front.lz
+++ b/gfx/pics/aerodactyl/front.7x7.2bpp.lz
diff --git a/gfx/pics/142/normal.pal b/gfx/pics/aerodactyl/normal.pal
index a816937e3..a816937e3 100644
--- a/gfx/pics/142/normal.pal
+++ b/gfx/pics/aerodactyl/normal.pal
diff --git a/gfx/pics/142/shiny.pal b/gfx/pics/aerodactyl/shiny.pal
index 6dade0490..6dade0490 100644
--- a/gfx/pics/142/shiny.pal
+++ b/gfx/pics/aerodactyl/shiny.pal
diff --git a/gfx/pics/190/anim0.asm b/gfx/pics/aipom/anim0.asm
index 99556d958..99556d958 100644
--- a/gfx/pics/190/anim0.asm
+++ b/gfx/pics/aipom/anim0.asm
diff --git a/gfx/pics/190/anim1.asm b/gfx/pics/aipom/anim1.asm
index 9685b665d..9685b665d 100644
--- a/gfx/pics/190/anim1.asm
+++ b/gfx/pics/aipom/anim1.asm
diff --git a/gfx/pics/190/back.lz b/gfx/pics/aipom/back.6x6.2bpp.lz
index d6d9fdbc1..d6d9fdbc1 100644
--- a/gfx/pics/190/back.lz
+++ b/gfx/pics/aipom/back.6x6.2bpp.lz
diff --git a/gfx/pics/190/bitmask.asm b/gfx/pics/aipom/bitmask.asm
index ca853fce0..ca853fce0 100644
--- a/gfx/pics/190/bitmask.asm
+++ b/gfx/pics/aipom/bitmask.asm
diff --git a/gfx/pics/190/frames.asm b/gfx/pics/aipom/frames.asm
index d19527468..d19527468 100644
--- a/gfx/pics/190/frames.asm
+++ b/gfx/pics/aipom/frames.asm
diff --git a/gfx/pics/190/front.lz b/gfx/pics/aipom/front.5x5.2bpp.lz
index 58800e5e4..58800e5e4 100644
--- a/gfx/pics/190/front.lz
+++ b/gfx/pics/aipom/front.5x5.2bpp.lz
diff --git a/gfx/pics/190/normal.pal b/gfx/pics/aipom/normal.pal
index 7af3a8f3b..7af3a8f3b 100644
--- a/gfx/pics/190/normal.pal
+++ b/gfx/pics/aipom/normal.pal
diff --git a/gfx/pics/190/shiny.pal b/gfx/pics/aipom/shiny.pal
index a01f18d1a..a01f18d1a 100644
--- a/gfx/pics/190/shiny.pal
+++ b/gfx/pics/aipom/shiny.pal
diff --git a/gfx/pics/065/anim0.asm b/gfx/pics/alakazam/anim0.asm
index fb87afbfe..fb87afbfe 100644
--- a/gfx/pics/065/anim0.asm
+++ b/gfx/pics/alakazam/anim0.asm
diff --git a/gfx/pics/065/anim1.asm b/gfx/pics/alakazam/anim1.asm
index 52cf585fb..52cf585fb 100644
--- a/gfx/pics/065/anim1.asm
+++ b/gfx/pics/alakazam/anim1.asm
diff --git a/gfx/pics/065/back.lz b/gfx/pics/alakazam/back.6x6.2bpp.lz
index 65f1a2729..65f1a2729 100644
--- a/gfx/pics/065/back.lz
+++ b/gfx/pics/alakazam/back.6x6.2bpp.lz
diff --git a/gfx/pics/065/bitmask.asm b/gfx/pics/alakazam/bitmask.asm
index 3e0cd2baf..3e0cd2baf 100644
--- a/gfx/pics/065/bitmask.asm
+++ b/gfx/pics/alakazam/bitmask.asm
diff --git a/gfx/pics/065/frames.asm b/gfx/pics/alakazam/frames.asm
index 80f391217..80f391217 100644
--- a/gfx/pics/065/frames.asm
+++ b/gfx/pics/alakazam/frames.asm
diff --git a/gfx/pics/065/front.lz b/gfx/pics/alakazam/front.7x7.2bpp.lz
index 6272553a7..6272553a7 100644
--- a/gfx/pics/065/front.lz
+++ b/gfx/pics/alakazam/front.7x7.2bpp.lz
diff --git a/gfx/pics/064/normal.pal b/gfx/pics/alakazam/normal.pal
index 23f50e983..23f50e983 100644
--- a/gfx/pics/064/normal.pal
+++ b/gfx/pics/alakazam/normal.pal
diff --git a/gfx/pics/065/shiny.pal b/gfx/pics/alakazam/shiny.pal
index 2e52d97de..2e52d97de 100644
--- a/gfx/pics/065/shiny.pal
+++ b/gfx/pics/alakazam/shiny.pal
diff --git a/gfx/pics/181/anim0.asm b/gfx/pics/ampharos/anim0.asm
index 5e3d6538e..5e3d6538e 100644
--- a/gfx/pics/181/anim0.asm
+++ b/gfx/pics/ampharos/anim0.asm
diff --git a/gfx/pics/181/anim1.asm b/gfx/pics/ampharos/anim1.asm
index 6dcb40d61..6dcb40d61 100644
--- a/gfx/pics/181/anim1.asm
+++ b/gfx/pics/ampharos/anim1.asm
diff --git a/gfx/pics/181/back.lz b/gfx/pics/ampharos/back.6x6.2bpp.lz
index 8d3b42d9b..8d3b42d9b 100644
--- a/gfx/pics/181/back.lz
+++ b/gfx/pics/ampharos/back.6x6.2bpp.lz
diff --git a/gfx/pics/181/bitmask.asm b/gfx/pics/ampharos/bitmask.asm
index 748ca9a41..748ca9a41 100644
--- a/gfx/pics/181/bitmask.asm
+++ b/gfx/pics/ampharos/bitmask.asm
diff --git a/gfx/pics/181/frames.asm b/gfx/pics/ampharos/frames.asm
index 028ddbc8c..028ddbc8c 100644
--- a/gfx/pics/181/frames.asm
+++ b/gfx/pics/ampharos/frames.asm
diff --git a/gfx/pics/181/front.lz b/gfx/pics/ampharos/front.7x7.2bpp.lz
index 84f43c105..84f43c105 100644
--- a/gfx/pics/181/front.lz
+++ b/gfx/pics/ampharos/front.7x7.2bpp.lz
diff --git a/gfx/pics/181/normal.pal b/gfx/pics/ampharos/normal.pal
index 8620983c9..8620983c9 100644
--- a/gfx/pics/181/normal.pal
+++ b/gfx/pics/ampharos/normal.pal
diff --git a/gfx/pics/181/shiny.pal b/gfx/pics/ampharos/shiny.pal
index 67451112f..67451112f 100644
--- a/gfx/pics/181/shiny.pal
+++ b/gfx/pics/ampharos/shiny.pal
diff --git a/gfx/pics/anims.asm b/gfx/pics/anims.asm
index fb60649a3..6ac2be739 100644
--- a/gfx/pics/anims.asm
+++ b/gfx/pics/anims.asm
@@ -1,252 +1,252 @@
-BulbasaurAnimation:  INCLUDE "gfx/pics/001/anim0.asm"
-IvysaurAnimation:    INCLUDE "gfx/pics/002/anim0.asm"
-VenusaurAnimation:   INCLUDE "gfx/pics/003/anim0.asm"
-CharmanderAnimation: INCLUDE "gfx/pics/004/anim0.asm"
-CharmeleonAnimation: INCLUDE "gfx/pics/005/anim0.asm"
-CharizardAnimation:  INCLUDE "gfx/pics/006/anim0.asm"
-SquirtleAnimation:   INCLUDE "gfx/pics/007/anim0.asm"
-WartortleAnimation:  INCLUDE "gfx/pics/008/anim0.asm"
-BlastoiseAnimation:  INCLUDE "gfx/pics/009/anim0.asm"
-CaterpieAnimation:   INCLUDE "gfx/pics/010/anim0.asm"
-MetapodAnimation:    INCLUDE "gfx/pics/011/anim0.asm"
-ButterfreeAnimation: INCLUDE "gfx/pics/012/anim0.asm"
-WeedleAnimation:     INCLUDE "gfx/pics/013/anim0.asm"
-KakunaAnimation:     INCLUDE "gfx/pics/014/anim0.asm"
-BeedrillAnimation:   INCLUDE "gfx/pics/015/anim0.asm"
-PidgeyAnimation:     INCLUDE "gfx/pics/016/anim0.asm"
-PidgeottoAnimation:  INCLUDE "gfx/pics/017/anim0.asm"
-PidgeotAnimation:    INCLUDE "gfx/pics/018/anim0.asm"
-RattataAnimation:    INCLUDE "gfx/pics/019/anim0.asm"
-RaticateAnimation:   INCLUDE "gfx/pics/020/anim0.asm"
-SpearowAnimation:    INCLUDE "gfx/pics/021/anim0.asm"
-FearowAnimation:     INCLUDE "gfx/pics/022/anim0.asm"
-EkansAnimation:      INCLUDE "gfx/pics/023/anim0.asm"
-ArbokAnimation:      INCLUDE "gfx/pics/024/anim0.asm"
-PikachuAnimation:    INCLUDE "gfx/pics/025/anim0.asm"
-RaichuAnimation:     INCLUDE "gfx/pics/026/anim0.asm"
-SandshrewAnimation:  INCLUDE "gfx/pics/027/anim0.asm"
-SandslashAnimation:  INCLUDE "gfx/pics/028/anim0.asm"
-NidoranFAnimation:   INCLUDE "gfx/pics/029/anim0.asm"
-NidorinaAnimation:   INCLUDE "gfx/pics/030/anim0.asm"
-NidoqueenAnimation:  INCLUDE "gfx/pics/031/anim0.asm"
-NidoranMAnimation:   INCLUDE "gfx/pics/032/anim0.asm"
-NidorinoAnimation:   INCLUDE "gfx/pics/033/anim0.asm"
-NidokingAnimation:   INCLUDE "gfx/pics/034/anim0.asm"
-ClefairyAnimation:   INCLUDE "gfx/pics/035/anim0.asm"
-ClefableAnimation:   INCLUDE "gfx/pics/036/anim0.asm"
-VulpixAnimation:     INCLUDE "gfx/pics/037/anim0.asm"
-NinetalesAnimation:  INCLUDE "gfx/pics/038/anim0.asm"
-JigglypuffAnimation: INCLUDE "gfx/pics/039/anim0.asm"
-WigglytuffAnimation: INCLUDE "gfx/pics/040/anim0.asm"
-ZubatAnimation:      INCLUDE "gfx/pics/041/anim0.asm"
-GolbatAnimation:     INCLUDE "gfx/pics/042/anim0.asm"
-OddishAnimation:     INCLUDE "gfx/pics/043/anim0.asm"
-GloomAnimation:      INCLUDE "gfx/pics/044/anim0.asm"
-VileplumeAnimation:  INCLUDE "gfx/pics/045/anim0.asm"
-ParasAnimation:      INCLUDE "gfx/pics/046/anim0.asm"
-ParasectAnimation:   INCLUDE "gfx/pics/047/anim0.asm"
-VenonatAnimation:    INCLUDE "gfx/pics/048/anim0.asm"
-VenomothAnimation:   INCLUDE "gfx/pics/049/anim0.asm"
-DiglettAnimation:    INCLUDE "gfx/pics/050/anim0.asm"
-DugtrioAnimation:    INCLUDE "gfx/pics/051/anim0.asm"
-MeowthAnimation:     INCLUDE "gfx/pics/052/anim0.asm"
-PersianAnimation:    INCLUDE "gfx/pics/053/anim0.asm"
-PsyduckAnimation:    INCLUDE "gfx/pics/054/anim0.asm"
-GolduckAnimation:    INCLUDE "gfx/pics/055/anim0.asm"
-MankeyAnimation:     INCLUDE "gfx/pics/056/anim0.asm"
-PrimeapeAnimation:   INCLUDE "gfx/pics/057/anim0.asm"
-GrowlitheAnimation:  INCLUDE "gfx/pics/058/anim0.asm"
-ArcanineAnimation:   INCLUDE "gfx/pics/059/anim0.asm"
-PoliwagAnimation:    INCLUDE "gfx/pics/060/anim0.asm"
-PoliwhirlAnimation:  INCLUDE "gfx/pics/061/anim0.asm"
-PoliwrathAnimation:  INCLUDE "gfx/pics/062/anim0.asm"
-AbraAnimation:       INCLUDE "gfx/pics/063/anim0.asm"
-KadabraAnimation:    INCLUDE "gfx/pics/064/anim0.asm"
-AlakazamAnimation:   INCLUDE "gfx/pics/065/anim0.asm"
-MachopAnimation:     INCLUDE "gfx/pics/066/anim0.asm"
-MachokeAnimation:    INCLUDE "gfx/pics/067/anim0.asm"
-MachampAnimation:    INCLUDE "gfx/pics/068/anim0.asm"
-BellsproutAnimation: INCLUDE "gfx/pics/069/anim0.asm"
-WeepinbellAnimation: INCLUDE "gfx/pics/070/anim0.asm"
-VictreebelAnimation: INCLUDE "gfx/pics/071/anim0.asm"
-TentacoolAnimation:  INCLUDE "gfx/pics/072/anim0.asm"
-TentacruelAnimation: INCLUDE "gfx/pics/073/anim0.asm"
-GeodudeAnimation:    INCLUDE "gfx/pics/074/anim0.asm"
-GravelerAnimation:   INCLUDE "gfx/pics/075/anim0.asm"
-GolemAnimation:      INCLUDE "gfx/pics/076/anim0.asm"
-PonytaAnimation:     INCLUDE "gfx/pics/077/anim0.asm"
-RapidashAnimation:   INCLUDE "gfx/pics/078/anim0.asm"
-SlowpokeAnimation:   INCLUDE "gfx/pics/079/anim0.asm"
-SlowbroAnimation:    INCLUDE "gfx/pics/080/anim0.asm"
-MagnemiteAnimation:  INCLUDE "gfx/pics/081/anim0.asm"
-MagnetonAnimation:   INCLUDE "gfx/pics/082/anim0.asm"
-FarfetchDAnimation:  INCLUDE "gfx/pics/083/anim0.asm"
-DoduoAnimation:      INCLUDE "gfx/pics/084/anim0.asm"
-DodrioAnimation:     INCLUDE "gfx/pics/085/anim0.asm"
-SeelAnimation:       INCLUDE "gfx/pics/086/anim0.asm"
-DewgongAnimation:    INCLUDE "gfx/pics/087/anim0.asm"
-GrimerAnimation:     INCLUDE "gfx/pics/088/anim0.asm"
-MukAnimation:        INCLUDE "gfx/pics/089/anim0.asm"
-ShellderAnimation:   INCLUDE "gfx/pics/090/anim0.asm"
-CloysterAnimation:   INCLUDE "gfx/pics/091/anim0.asm"
-GastlyAnimation:     INCLUDE "gfx/pics/092/anim0.asm"
-HaunterAnimation:    INCLUDE "gfx/pics/093/anim0.asm"
-GengarAnimation:     INCLUDE "gfx/pics/094/anim0.asm"
-OnixAnimation:       INCLUDE "gfx/pics/095/anim0.asm"
-DrowzeeAnimation:    INCLUDE "gfx/pics/096/anim0.asm"
-HypnoAnimation:      INCLUDE "gfx/pics/097/anim0.asm"
-KrabbyAnimation:     INCLUDE "gfx/pics/098/anim0.asm"
-KinglerAnimation:    INCLUDE "gfx/pics/099/anim0.asm"
-VoltorbAnimation:    INCLUDE "gfx/pics/100/anim0.asm"
-ElectrodeAnimation:  INCLUDE "gfx/pics/101/anim0.asm"
-ExeggcuteAnimation:  INCLUDE "gfx/pics/102/anim0.asm"
-ExeggutorAnimation:  INCLUDE "gfx/pics/103/anim0.asm"
-CuboneAnimation:     INCLUDE "gfx/pics/104/anim0.asm"
-MarowakAnimation:    INCLUDE "gfx/pics/105/anim0.asm"
-HitmonleeAnimation:  INCLUDE "gfx/pics/106/anim0.asm"
-HitmonchanAnimation: INCLUDE "gfx/pics/107/anim0.asm"
-LickitungAnimation:  INCLUDE "gfx/pics/108/anim0.asm"
-KoffingAnimation:    INCLUDE "gfx/pics/109/anim0.asm"
-WeezingAnimation:    INCLUDE "gfx/pics/110/anim0.asm"
-RhyhornAnimation:    INCLUDE "gfx/pics/111/anim0.asm"
-RhydonAnimation:     INCLUDE "gfx/pics/112/anim0.asm"
-ChanseyAnimation:    INCLUDE "gfx/pics/113/anim0.asm"
-TangelaAnimation:    INCLUDE "gfx/pics/114/anim0.asm"
-KangaskhanAnimation: INCLUDE "gfx/pics/115/anim0.asm"
-HorseaAnimation:     INCLUDE "gfx/pics/116/anim0.asm"
-SeadraAnimation:     INCLUDE "gfx/pics/117/anim0.asm"
-GoldeenAnimation:    INCLUDE "gfx/pics/118/anim0.asm"
-SeakingAnimation:    INCLUDE "gfx/pics/119/anim0.asm"
-StaryuAnimation:     INCLUDE "gfx/pics/120/anim0.asm"
-StarmieAnimation:    INCLUDE "gfx/pics/121/anim0.asm"
-MrMimeAnimation:     INCLUDE "gfx/pics/122/anim0.asm"
-ScytherAnimation:    INCLUDE "gfx/pics/123/anim0.asm"
-JynxAnimation:       INCLUDE "gfx/pics/124/anim0.asm"
-ElectabuzzAnimation: INCLUDE "gfx/pics/125/anim0.asm"
-MagmarAnimation:     INCLUDE "gfx/pics/126/anim0.asm"
-PinsirAnimation:     INCLUDE "gfx/pics/127/anim0.asm"
-TaurosAnimation:     INCLUDE "gfx/pics/128/anim0.asm"
-MagikarpAnimation:   INCLUDE "gfx/pics/129/anim0.asm"
-GyaradosAnimation:   INCLUDE "gfx/pics/130/anim0.asm"
-LaprasAnimation:     INCLUDE "gfx/pics/131/anim0.asm"
-DittoAnimation:      INCLUDE "gfx/pics/132/anim0.asm"
-EeveeAnimation:      INCLUDE "gfx/pics/133/anim0.asm"
-VaporeonAnimation:   INCLUDE "gfx/pics/134/anim0.asm"
-JolteonAnimation:    INCLUDE "gfx/pics/135/anim0.asm"
-FlareonAnimation:    INCLUDE "gfx/pics/136/anim0.asm"
-PorygonAnimation:    INCLUDE "gfx/pics/137/anim0.asm"
-OmanyteAnimation:    INCLUDE "gfx/pics/138/anim0.asm"
-OmastarAnimation:    INCLUDE "gfx/pics/139/anim0.asm"
-KabutoAnimation:     INCLUDE "gfx/pics/140/anim0.asm"
-KabutopsAnimation:   INCLUDE "gfx/pics/141/anim0.asm"
-AerodactylAnimation: INCLUDE "gfx/pics/142/anim0.asm"
-SnorlaxAnimation:    INCLUDE "gfx/pics/143/anim0.asm"
-ArticunoAnimation:   INCLUDE "gfx/pics/144/anim0.asm"
-ZapdosAnimation:     INCLUDE "gfx/pics/145/anim0.asm"
-MoltresAnimation:    INCLUDE "gfx/pics/146/anim0.asm"
-DratiniAnimation:    INCLUDE "gfx/pics/147/anim0.asm"
-DragonairAnimation:  INCLUDE "gfx/pics/148/anim0.asm"
-DragoniteAnimation:  INCLUDE "gfx/pics/149/anim0.asm"
-MewtwoAnimation:     INCLUDE "gfx/pics/150/anim0.asm"
-MewAnimation:        INCLUDE "gfx/pics/151/anim0.asm"
-ChikoritaAnimation:  INCLUDE "gfx/pics/152/anim0.asm"
-BayleefAnimation:    INCLUDE "gfx/pics/153/anim0.asm"
-MeganiumAnimation:   INCLUDE "gfx/pics/154/anim0.asm"
-CyndaquilAnimation:  INCLUDE "gfx/pics/155/anim0.asm"
-QuilavaAnimation:    INCLUDE "gfx/pics/156/anim0.asm"
-TyphlosionAnimation: INCLUDE "gfx/pics/157/anim0.asm"
-TotodileAnimation:   INCLUDE "gfx/pics/158/anim0.asm"
-CroconawAnimation:   INCLUDE "gfx/pics/159/anim0.asm"
-FeraligatrAnimation: INCLUDE "gfx/pics/160/anim0.asm"
-SentretAnimation:    INCLUDE "gfx/pics/161/anim0.asm"
-FurretAnimation:     INCLUDE "gfx/pics/162/anim0.asm"
-HoothootAnimation:   INCLUDE "gfx/pics/163/anim0.asm"
-NoctowlAnimation:    INCLUDE "gfx/pics/164/anim0.asm"
-LedybaAnimation:     INCLUDE "gfx/pics/165/anim0.asm"
-LedianAnimation:     INCLUDE "gfx/pics/166/anim0.asm"
-SpinarakAnimation:   INCLUDE "gfx/pics/167/anim0.asm"
-AriadosAnimation:    INCLUDE "gfx/pics/168/anim0.asm"
-CrobatAnimation:     INCLUDE "gfx/pics/169/anim0.asm"
-ChinchouAnimation:   INCLUDE "gfx/pics/170/anim0.asm"
-LanturnAnimation:    INCLUDE "gfx/pics/171/anim0.asm"
-PichuAnimation:      INCLUDE "gfx/pics/172/anim0.asm"
-CleffaAnimation:     INCLUDE "gfx/pics/173/anim0.asm"
-IgglybuffAnimation:  INCLUDE "gfx/pics/174/anim0.asm"
-TogepiAnimation:     INCLUDE "gfx/pics/175/anim0.asm"
-TogeticAnimation:    INCLUDE "gfx/pics/176/anim0.asm"
-NatuAnimation:       INCLUDE "gfx/pics/177/anim0.asm"
-XatuAnimation:       INCLUDE "gfx/pics/178/anim0.asm"
-MareepAnimation:     INCLUDE "gfx/pics/179/anim0.asm"
-FlaaffyAnimation:    INCLUDE "gfx/pics/180/anim0.asm"
-AmpharosAnimation:   INCLUDE "gfx/pics/181/anim0.asm"
-BellossomAnimation:  INCLUDE "gfx/pics/182/anim0.asm"
-MarillAnimation:     INCLUDE "gfx/pics/183/anim0.asm"
-AzumarillAnimation:  INCLUDE "gfx/pics/184/anim0.asm"
-SudowoodoAnimation:  INCLUDE "gfx/pics/185/anim0.asm"
-PolitoedAnimation:   INCLUDE "gfx/pics/186/anim0.asm"
-HoppipAnimation:     INCLUDE "gfx/pics/187/anim0.asm"
-SkiploomAnimation:   INCLUDE "gfx/pics/188/anim0.asm"
-JumpluffAnimation:   INCLUDE "gfx/pics/189/anim0.asm"
-AipomAnimation:      INCLUDE "gfx/pics/190/anim0.asm"
-SunkernAnimation:    INCLUDE "gfx/pics/191/anim0.asm"
-SunfloraAnimation:   INCLUDE "gfx/pics/192/anim0.asm"
-YanmaAnimation:      INCLUDE "gfx/pics/193/anim0.asm"
-WooperAnimation:     INCLUDE "gfx/pics/194/anim0.asm"
-QuagsireAnimation:   INCLUDE "gfx/pics/195/anim0.asm"
-EspeonAnimation:     INCLUDE "gfx/pics/196/anim0.asm"
-UmbreonAnimation:    INCLUDE "gfx/pics/197/anim0.asm"
-MurkrowAnimation:    INCLUDE "gfx/pics/198/anim0.asm"
-SlowkingAnimation:   INCLUDE "gfx/pics/199/anim0.asm"
-MisdreavusAnimation: INCLUDE "gfx/pics/200/anim0.asm"
-UnownAnimation:      INCLUDE "gfx/pics/201/anim0.asm"
-WobbuffetAnimation:  INCLUDE "gfx/pics/202/anim0.asm"
-GirafarigAnimation:  INCLUDE "gfx/pics/203/anim0.asm"
-PinecoAnimation:     INCLUDE "gfx/pics/204/anim0.asm"
-ForretressAnimation: INCLUDE "gfx/pics/205/anim0.asm"
-DunsparceAnimation:  INCLUDE "gfx/pics/206/anim0.asm"
-GligarAnimation:     INCLUDE "gfx/pics/207/anim0.asm"
-SteelixAnimation:    INCLUDE "gfx/pics/208/anim0.asm"
-SnubbullAnimation:   INCLUDE "gfx/pics/209/anim0.asm"
-GranbullAnimation:   INCLUDE "gfx/pics/210/anim0.asm"
-QwilfishAnimation:   INCLUDE "gfx/pics/211/anim0.asm"
-ScizorAnimation:     INCLUDE "gfx/pics/212/anim0.asm"
-ShuckleAnimation:    INCLUDE "gfx/pics/213/anim0.asm"
-HeracrossAnimation:  INCLUDE "gfx/pics/214/anim0.asm"
-SneaselAnimation:    INCLUDE "gfx/pics/215/anim0.asm"
-TeddiursaAnimation:  INCLUDE "gfx/pics/216/anim0.asm"
-UrsaringAnimation:   INCLUDE "gfx/pics/217/anim0.asm"
-SlugmaAnimation:     INCLUDE "gfx/pics/218/anim0.asm"
-MagcargoAnimation:   INCLUDE "gfx/pics/219/anim0.asm"
-SwinubAnimation:     INCLUDE "gfx/pics/220/anim0.asm"
-PiloswineAnimation:  INCLUDE "gfx/pics/221/anim0.asm"
-CorsolaAnimation:    INCLUDE "gfx/pics/222/anim0.asm"
-RemoraidAnimation:   INCLUDE "gfx/pics/223/anim0.asm"
-OctilleryAnimation:  INCLUDE "gfx/pics/224/anim0.asm"
-DelibirdAnimation:   INCLUDE "gfx/pics/225/anim0.asm"
-MantineAnimation:    INCLUDE "gfx/pics/226/anim0.asm"
-SkarmoryAnimation:   INCLUDE "gfx/pics/227/anim0.asm"
-HoundourAnimation:   INCLUDE "gfx/pics/228/anim0.asm"
-HoundoomAnimation:   INCLUDE "gfx/pics/229/anim0.asm"
-KingdraAnimation:    INCLUDE "gfx/pics/230/anim0.asm"
-PhanpyAnimation:     INCLUDE "gfx/pics/231/anim0.asm"
-DonphanAnimation:    INCLUDE "gfx/pics/232/anim0.asm"
-Porygon2Animation:   INCLUDE "gfx/pics/233/anim0.asm"
-StantlerAnimation:   INCLUDE "gfx/pics/234/anim0.asm"
-SmeargleAnimation:   INCLUDE "gfx/pics/235/anim0.asm"
-TyrogueAnimation:    INCLUDE "gfx/pics/236/anim0.asm"
-HitmontopAnimation:  INCLUDE "gfx/pics/237/anim0.asm"
-SmoochumAnimation:   INCLUDE "gfx/pics/238/anim0.asm"
-ElekidAnimation:     INCLUDE "gfx/pics/239/anim0.asm"
-MagbyAnimation:      INCLUDE "gfx/pics/240/anim0.asm"
-MiltankAnimation:    INCLUDE "gfx/pics/241/anim0.asm"
-BlisseyAnimation:    INCLUDE "gfx/pics/242/anim0.asm"
-RaikouAnimation:     INCLUDE "gfx/pics/243/anim0.asm"
-EnteiAnimation:      INCLUDE "gfx/pics/244/anim0.asm"
-SuicuneAnimation:    INCLUDE "gfx/pics/245/anim0.asm"
-LarvitarAnimation:   INCLUDE "gfx/pics/246/anim0.asm"
-PupitarAnimation:    INCLUDE "gfx/pics/247/anim0.asm"
-TyranitarAnimation:  INCLUDE "gfx/pics/248/anim0.asm"
-LugiaAnimation:      INCLUDE "gfx/pics/249/anim0.asm"
-HoOhAnimation:       INCLUDE "gfx/pics/250/anim0.asm"
-CelebiAnimation:     INCLUDE "gfx/pics/251/anim0.asm"
+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/024/anim0.asm b/gfx/pics/arbok/anim0.asm
index 0ceceacac..0ceceacac 100644
--- a/gfx/pics/024/anim0.asm
+++ b/gfx/pics/arbok/anim0.asm
diff --git a/gfx/pics/024/anim1.asm b/gfx/pics/arbok/anim1.asm
index c9f85e238..c9f85e238 100644
--- a/gfx/pics/024/anim1.asm
+++ b/gfx/pics/arbok/anim1.asm
diff --git a/gfx/pics/024/back.lz b/gfx/pics/arbok/back.6x6.2bpp.lz
index 175abb499..175abb499 100644
--- a/gfx/pics/024/back.lz
+++ b/gfx/pics/arbok/back.6x6.2bpp.lz
diff --git a/gfx/pics/024/bitmask.asm b/gfx/pics/arbok/bitmask.asm
index 4a51646d0..4a51646d0 100644
--- a/gfx/pics/024/bitmask.asm
+++ b/gfx/pics/arbok/bitmask.asm
diff --git a/gfx/pics/024/frames.asm b/gfx/pics/arbok/frames.asm
index 011333a05..011333a05 100644
--- a/gfx/pics/024/frames.asm
+++ b/gfx/pics/arbok/frames.asm
diff --git a/gfx/pics/024/front.lz b/gfx/pics/arbok/front.7x7.2bpp.lz
index 8b5918dbd..8b5918dbd 100644
--- a/gfx/pics/024/front.lz
+++ b/gfx/pics/arbok/front.7x7.2bpp.lz
diff --git a/gfx/pics/024/normal.pal b/gfx/pics/arbok/normal.pal
index adae838d4..adae838d4 100644
--- a/gfx/pics/024/normal.pal
+++ b/gfx/pics/arbok/normal.pal
diff --git a/gfx/pics/024/shiny.pal b/gfx/pics/arbok/shiny.pal
index 3c731f915..3c731f915 100644
--- a/gfx/pics/024/shiny.pal
+++ b/gfx/pics/arbok/shiny.pal
diff --git a/gfx/pics/059/anim0.asm b/gfx/pics/arcanine/anim0.asm
index 0dc0dcacc..0dc0dcacc 100644
--- a/gfx/pics/059/anim0.asm
+++ b/gfx/pics/arcanine/anim0.asm
diff --git a/gfx/pics/059/anim1.asm b/gfx/pics/arcanine/anim1.asm
index e178a2d24..e178a2d24 100644
--- a/gfx/pics/059/anim1.asm
+++ b/gfx/pics/arcanine/anim1.asm
diff --git a/gfx/pics/059/back.lz b/gfx/pics/arcanine/back.6x6.2bpp.lz
index a76d64986..a76d64986 100644
--- a/gfx/pics/059/back.lz
+++ b/gfx/pics/arcanine/back.6x6.2bpp.lz
diff --git a/gfx/pics/059/bitmask.asm b/gfx/pics/arcanine/bitmask.asm
index 6489a14e8..6489a14e8 100644
--- a/gfx/pics/059/bitmask.asm
+++ b/gfx/pics/arcanine/bitmask.asm
diff --git a/gfx/pics/059/frames.asm b/gfx/pics/arcanine/frames.asm
index f802d943d..f802d943d 100644
--- a/gfx/pics/059/frames.asm
+++ b/gfx/pics/arcanine/frames.asm
diff --git a/gfx/pics/059/front.lz b/gfx/pics/arcanine/front.7x7.2bpp.lz
index da1784800..da1784800 100644
--- a/gfx/pics/059/front.lz
+++ b/gfx/pics/arcanine/front.7x7.2bpp.lz
diff --git a/gfx/pics/059/normal.pal b/gfx/pics/arcanine/normal.pal
index c7a4f497a..c7a4f497a 100644
--- a/gfx/pics/059/normal.pal
+++ b/gfx/pics/arcanine/normal.pal
diff --git a/gfx/pics/059/shiny.pal b/gfx/pics/arcanine/shiny.pal
index 78da21464..78da21464 100644
--- a/gfx/pics/059/shiny.pal
+++ b/gfx/pics/arcanine/shiny.pal
diff --git a/gfx/pics/168/anim0.asm b/gfx/pics/ariados/anim0.asm
index 9a4d30385..9a4d30385 100644
--- a/gfx/pics/168/anim0.asm
+++ b/gfx/pics/ariados/anim0.asm
diff --git a/gfx/pics/168/anim1.asm b/gfx/pics/ariados/anim1.asm
index 6b9f416be..6b9f416be 100644
--- a/gfx/pics/168/anim1.asm
+++ b/gfx/pics/ariados/anim1.asm
diff --git a/gfx/pics/168/back.lz b/gfx/pics/ariados/back.6x6.2bpp.lz
index ff3aec7fb..ff3aec7fb 100644
--- a/gfx/pics/168/back.lz
+++ b/gfx/pics/ariados/back.6x6.2bpp.lz
diff --git a/gfx/pics/168/bitmask.asm b/gfx/pics/ariados/bitmask.asm
index 7109aa0bb..7109aa0bb 100644
--- a/gfx/pics/168/bitmask.asm
+++ b/gfx/pics/ariados/bitmask.asm
diff --git a/gfx/pics/168/frames.asm b/gfx/pics/ariados/frames.asm
index ec7f6f191..ec7f6f191 100644
--- a/gfx/pics/168/frames.asm
+++ b/gfx/pics/ariados/frames.asm
diff --git a/gfx/pics/168/front.lz b/gfx/pics/ariados/front.7x7.2bpp.lz
index 51039aeb5..51039aeb5 100644
--- a/gfx/pics/168/front.lz
+++ b/gfx/pics/ariados/front.7x7.2bpp.lz
diff --git a/gfx/pics/168/normal.pal b/gfx/pics/ariados/normal.pal
index 211e75004..211e75004 100644
--- a/gfx/pics/168/normal.pal
+++ b/gfx/pics/ariados/normal.pal
diff --git a/gfx/pics/168/shiny.pal b/gfx/pics/ariados/shiny.pal
index 1dae64a4f..1dae64a4f 100644
--- a/gfx/pics/168/shiny.pal
+++ b/gfx/pics/ariados/shiny.pal
diff --git a/gfx/pics/144/anim0.asm b/gfx/pics/articuno/anim0.asm
index ccb583766..ccb583766 100644
--- a/gfx/pics/144/anim0.asm
+++ b/gfx/pics/articuno/anim0.asm
diff --git a/gfx/pics/144/anim1.asm b/gfx/pics/articuno/anim1.asm
index 634d8daff..634d8daff 100644
--- a/gfx/pics/144/anim1.asm
+++ b/gfx/pics/articuno/anim1.asm
diff --git a/gfx/pics/144/back.lz b/gfx/pics/articuno/back.6x6.2bpp.lz
index 87b61ac9d..87b61ac9d 100644
--- a/gfx/pics/144/back.lz
+++ b/gfx/pics/articuno/back.6x6.2bpp.lz
diff --git a/gfx/pics/144/bitmask.asm b/gfx/pics/articuno/bitmask.asm
index 8f81e3092..8f81e3092 100644
--- a/gfx/pics/144/bitmask.asm
+++ b/gfx/pics/articuno/bitmask.asm
diff --git a/gfx/pics/144/frames.asm b/gfx/pics/articuno/frames.asm
index c30536bd3..c30536bd3 100644
--- a/gfx/pics/144/frames.asm
+++ b/gfx/pics/articuno/frames.asm
diff --git a/gfx/pics/144/front.lz b/gfx/pics/articuno/front.7x7.2bpp.lz
index a60367098..a60367098 100644
--- a/gfx/pics/144/front.lz
+++ b/gfx/pics/articuno/front.7x7.2bpp.lz
diff --git a/gfx/pics/144/normal.pal b/gfx/pics/articuno/normal.pal
index 121620e3c..121620e3c 100644
--- a/gfx/pics/144/normal.pal
+++ b/gfx/pics/articuno/normal.pal
diff --git a/gfx/pics/144/shiny.pal b/gfx/pics/articuno/shiny.pal
index d6c56f521..d6c56f521 100644
--- a/gfx/pics/144/shiny.pal
+++ b/gfx/pics/articuno/shiny.pal
diff --git a/gfx/pics/184/anim0.asm b/gfx/pics/azumarill/anim0.asm
index bbe46d4b7..bbe46d4b7 100644
--- a/gfx/pics/184/anim0.asm
+++ b/gfx/pics/azumarill/anim0.asm
diff --git a/gfx/pics/184/anim1.asm b/gfx/pics/azumarill/anim1.asm
index 070e6145f..070e6145f 100644
--- a/gfx/pics/184/anim1.asm
+++ b/gfx/pics/azumarill/anim1.asm
diff --git a/gfx/pics/184/back.lz b/gfx/pics/azumarill/back.6x6.2bpp.lz
index b66df2a71..b66df2a71 100644
--- a/gfx/pics/184/back.lz
+++ b/gfx/pics/azumarill/back.6x6.2bpp.lz
diff --git a/gfx/pics/184/bitmask.asm b/gfx/pics/azumarill/bitmask.asm
index 5e11e0966..5e11e0966 100644
--- a/gfx/pics/184/bitmask.asm
+++ b/gfx/pics/azumarill/bitmask.asm
diff --git a/gfx/pics/184/frames.asm b/gfx/pics/azumarill/frames.asm
index 9019cecf7..9019cecf7 100644
--- a/gfx/pics/184/frames.asm
+++ b/gfx/pics/azumarill/frames.asm
diff --git a/gfx/pics/184/front.lz b/gfx/pics/azumarill/front.7x7.2bpp.lz
index d6f031164..d6f031164 100644
--- a/gfx/pics/184/front.lz
+++ b/gfx/pics/azumarill/front.7x7.2bpp.lz
diff --git a/gfx/pics/184/normal.pal b/gfx/pics/azumarill/normal.pal
index 794d19341..794d19341 100644
--- a/gfx/pics/184/normal.pal
+++ b/gfx/pics/azumarill/normal.pal
diff --git a/gfx/pics/184/shiny.pal b/gfx/pics/azumarill/shiny.pal
index 18cfd1195..18cfd1195 100644
--- a/gfx/pics/184/shiny.pal
+++ b/gfx/pics/azumarill/shiny.pal
diff --git a/gfx/pics/153/anim0.asm b/gfx/pics/bayleef/anim0.asm
index de54fe495..de54fe495 100644
--- a/gfx/pics/153/anim0.asm
+++ b/gfx/pics/bayleef/anim0.asm
diff --git a/gfx/pics/153/anim1.asm b/gfx/pics/bayleef/anim1.asm
index 59d3f1762..59d3f1762 100644
--- a/gfx/pics/153/anim1.asm
+++ b/gfx/pics/bayleef/anim1.asm
diff --git a/gfx/pics/153/back.lz b/gfx/pics/bayleef/back.6x6.2bpp.lz
index 809e5d199..809e5d199 100644
--- a/gfx/pics/153/back.lz
+++ b/gfx/pics/bayleef/back.6x6.2bpp.lz
diff --git a/gfx/pics/153/bitmask.asm b/gfx/pics/bayleef/bitmask.asm
index ad73fdd6a..ad73fdd6a 100644
--- a/gfx/pics/153/bitmask.asm
+++ b/gfx/pics/bayleef/bitmask.asm
diff --git a/gfx/pics/153/frames.asm b/gfx/pics/bayleef/frames.asm
index 2331a584a..2331a584a 100644
--- a/gfx/pics/153/frames.asm
+++ b/gfx/pics/bayleef/frames.asm
diff --git a/gfx/pics/153/front.lz b/gfx/pics/bayleef/front.6x6.2bpp.lz
index 3134f6e16..3134f6e16 100644
--- a/gfx/pics/153/front.lz
+++ b/gfx/pics/bayleef/front.6x6.2bpp.lz
diff --git a/gfx/pics/153/normal.pal b/gfx/pics/bayleef/normal.pal
index 03123d2d2..03123d2d2 100644
--- a/gfx/pics/153/normal.pal
+++ b/gfx/pics/bayleef/normal.pal
diff --git a/gfx/pics/153/shiny.pal b/gfx/pics/bayleef/shiny.pal
index fcacccc19..fcacccc19 100644
--- a/gfx/pics/153/shiny.pal
+++ b/gfx/pics/bayleef/shiny.pal
diff --git a/gfx/pics/015/anim0.asm b/gfx/pics/beedrill/anim0.asm
index 036fbb738..036fbb738 100644
--- a/gfx/pics/015/anim0.asm
+++ b/gfx/pics/beedrill/anim0.asm
diff --git a/gfx/pics/015/anim1.asm b/gfx/pics/beedrill/anim1.asm
index 8205f9a8c..8205f9a8c 100644
--- a/gfx/pics/015/anim1.asm
+++ b/gfx/pics/beedrill/anim1.asm
diff --git a/gfx/pics/015/back.lz b/gfx/pics/beedrill/back.6x6.2bpp.lz
index 492eb64e2..492eb64e2 100644
--- a/gfx/pics/015/back.lz
+++ b/gfx/pics/beedrill/back.6x6.2bpp.lz
diff --git a/gfx/pics/015/bitmask.asm b/gfx/pics/beedrill/bitmask.asm
index c5ec47a67..c5ec47a67 100644
--- a/gfx/pics/015/bitmask.asm
+++ b/gfx/pics/beedrill/bitmask.asm
diff --git a/gfx/pics/015/frames.asm b/gfx/pics/beedrill/frames.asm
index 5110adab0..5110adab0 100644
--- a/gfx/pics/015/frames.asm
+++ b/gfx/pics/beedrill/frames.asm
diff --git a/gfx/pics/015/front.lz b/gfx/pics/beedrill/front.7x7.2bpp.lz
index 55f560521..55f560521 100644
--- a/gfx/pics/015/front.lz
+++ b/gfx/pics/beedrill/front.7x7.2bpp.lz
diff --git a/gfx/pics/015/normal.pal b/gfx/pics/beedrill/normal.pal
index fefb75c12..fefb75c12 100644
--- a/gfx/pics/015/normal.pal
+++ b/gfx/pics/beedrill/normal.pal
diff --git a/gfx/pics/015/shiny.pal b/gfx/pics/beedrill/shiny.pal
index cfbc9997a..cfbc9997a 100644
--- a/gfx/pics/015/shiny.pal
+++ b/gfx/pics/beedrill/shiny.pal
diff --git a/gfx/pics/182/anim0.asm b/gfx/pics/bellossom/anim0.asm
index 7aa2e3568..7aa2e3568 100644
--- a/gfx/pics/182/anim0.asm
+++ b/gfx/pics/bellossom/anim0.asm
diff --git a/gfx/pics/182/anim1.asm b/gfx/pics/bellossom/anim1.asm
index 322fa3758..322fa3758 100644
--- a/gfx/pics/182/anim1.asm
+++ b/gfx/pics/bellossom/anim1.asm
diff --git a/gfx/pics/182/back.lz b/gfx/pics/bellossom/back.6x6.2bpp.lz
index d1a59b617..d1a59b617 100644
--- a/gfx/pics/182/back.lz
+++ b/gfx/pics/bellossom/back.6x6.2bpp.lz
diff --git a/gfx/pics/182/bitmask.asm b/gfx/pics/bellossom/bitmask.asm
index 9a7c93ed3..9a7c93ed3 100644
--- a/gfx/pics/182/bitmask.asm
+++ b/gfx/pics/bellossom/bitmask.asm
diff --git a/gfx/pics/182/frames.asm b/gfx/pics/bellossom/frames.asm
index 0f0379c01..0f0379c01 100644
--- a/gfx/pics/182/frames.asm
+++ b/gfx/pics/bellossom/frames.asm
diff --git a/gfx/pics/182/front.lz b/gfx/pics/bellossom/front.7x7.2bpp.lz
index 9cba9a1c3..9cba9a1c3 100644
--- a/gfx/pics/182/front.lz
+++ b/gfx/pics/bellossom/front.7x7.2bpp.lz
diff --git a/gfx/pics/182/normal.pal b/gfx/pics/bellossom/normal.pal
index ac7b655f6..ac7b655f6 100644
--- a/gfx/pics/182/normal.pal
+++ b/gfx/pics/bellossom/normal.pal
diff --git a/gfx/pics/182/shiny.pal b/gfx/pics/bellossom/shiny.pal
index a099a594e..a099a594e 100644
--- a/gfx/pics/182/shiny.pal
+++ b/gfx/pics/bellossom/shiny.pal
diff --git a/gfx/pics/069/anim0.asm b/gfx/pics/bellsprout/anim0.asm
index 9a71b29ac..9a71b29ac 100644
--- a/gfx/pics/069/anim0.asm
+++ b/gfx/pics/bellsprout/anim0.asm
diff --git a/gfx/pics/069/anim1.asm b/gfx/pics/bellsprout/anim1.asm
index 31ad26997..31ad26997 100644
--- a/gfx/pics/069/anim1.asm
+++ b/gfx/pics/bellsprout/anim1.asm
diff --git a/gfx/pics/069/back.lz b/gfx/pics/bellsprout/back.6x6.2bpp.lz
index ab600f064..ab600f064 100644
--- a/gfx/pics/069/back.lz
+++ b/gfx/pics/bellsprout/back.6x6.2bpp.lz
diff --git a/gfx/pics/069/bitmask.asm b/gfx/pics/bellsprout/bitmask.asm
index c5ba4c4a2..c5ba4c4a2 100644
--- a/gfx/pics/069/bitmask.asm
+++ b/gfx/pics/bellsprout/bitmask.asm
diff --git a/gfx/pics/069/frames.asm b/gfx/pics/bellsprout/frames.asm
index 2bc744afa..2bc744afa 100644
--- a/gfx/pics/069/frames.asm
+++ b/gfx/pics/bellsprout/frames.asm
diff --git a/gfx/pics/069/front.lz b/gfx/pics/bellsprout/front.5x5.2bpp.lz
index 2593fb112..2593fb112 100644
--- a/gfx/pics/069/front.lz
+++ b/gfx/pics/bellsprout/front.5x5.2bpp.lz
diff --git a/gfx/pics/069/normal.pal b/gfx/pics/bellsprout/normal.pal
index 92f55f832..92f55f832 100644
--- a/gfx/pics/069/normal.pal
+++ b/gfx/pics/bellsprout/normal.pal
diff --git a/gfx/pics/069/shiny.pal b/gfx/pics/bellsprout/shiny.pal
index 5a2b267f1..5a2b267f1 100644
--- a/gfx/pics/069/shiny.pal
+++ b/gfx/pics/bellsprout/shiny.pal
diff --git a/gfx/pics/bitmasks.asm b/gfx/pics/bitmasks.asm
index a6c963e7f..4f142431f 100644
--- a/gfx/pics/bitmasks.asm
+++ b/gfx/pics/bitmasks.asm
@@ -1,252 +1,252 @@
-BulbasaurBitmasks:  INCLUDE "gfx/pics/001/bitmask.asm"
-IvysaurBitmasks:    INCLUDE "gfx/pics/002/bitmask.asm"
-VenusaurBitmasks:   INCLUDE "gfx/pics/003/bitmask.asm"
-CharmanderBitmasks: INCLUDE "gfx/pics/004/bitmask.asm"
-CharmeleonBitmasks: INCLUDE "gfx/pics/005/bitmask.asm"
-CharizardBitmasks:  INCLUDE "gfx/pics/006/bitmask.asm"
-SquirtleBitmasks:   INCLUDE "gfx/pics/007/bitmask.asm"
-WartortleBitmasks:  INCLUDE "gfx/pics/008/bitmask.asm"
-BlastoiseBitmasks:  INCLUDE "gfx/pics/009/bitmask.asm"
-CaterpieBitmasks:   INCLUDE "gfx/pics/010/bitmask.asm"
-MetapodBitmasks:    INCLUDE "gfx/pics/011/bitmask.asm"
-ButterfreeBitmasks: INCLUDE "gfx/pics/012/bitmask.asm"
-WeedleBitmasks:     INCLUDE "gfx/pics/013/bitmask.asm"
-KakunaBitmasks:     INCLUDE "gfx/pics/014/bitmask.asm"
-BeedrillBitmasks:   INCLUDE "gfx/pics/015/bitmask.asm"
-PidgeyBitmasks:     INCLUDE "gfx/pics/016/bitmask.asm"
-PidgeottoBitmasks:  INCLUDE "gfx/pics/017/bitmask.asm"
-PidgeotBitmasks:    INCLUDE "gfx/pics/018/bitmask.asm"
-RattataBitmasks:    INCLUDE "gfx/pics/019/bitmask.asm"
-RaticateBitmasks:   INCLUDE "gfx/pics/020/bitmask.asm"
-SpearowBitmasks:    INCLUDE "gfx/pics/021/bitmask.asm"
-FearowBitmasks:     INCLUDE "gfx/pics/022/bitmask.asm"
-EkansBitmasks:      INCLUDE "gfx/pics/023/bitmask.asm"
-ArbokBitmasks:      INCLUDE "gfx/pics/024/bitmask.asm"
-PikachuBitmasks:    INCLUDE "gfx/pics/025/bitmask.asm"
-RaichuBitmasks:     INCLUDE "gfx/pics/026/bitmask.asm"
-SandshrewBitmasks:  INCLUDE "gfx/pics/027/bitmask.asm"
-SandslashBitmasks:  INCLUDE "gfx/pics/028/bitmask.asm"
-NidoranFBitmasks:   INCLUDE "gfx/pics/029/bitmask.asm"
-NidorinaBitmasks:   INCLUDE "gfx/pics/030/bitmask.asm"
-NidoqueenBitmasks:  INCLUDE "gfx/pics/031/bitmask.asm"
-NidoranMBitmasks:   INCLUDE "gfx/pics/032/bitmask.asm"
-NidorinoBitmasks:   INCLUDE "gfx/pics/033/bitmask.asm"
-NidokingBitmasks:   INCLUDE "gfx/pics/034/bitmask.asm"
-ClefairyBitmasks:   INCLUDE "gfx/pics/035/bitmask.asm"
-ClefableBitmasks:   INCLUDE "gfx/pics/036/bitmask.asm"
-VulpixBitmasks:     INCLUDE "gfx/pics/037/bitmask.asm"
-NinetalesBitmasks:  INCLUDE "gfx/pics/038/bitmask.asm"
-JigglypuffBitmasks: INCLUDE "gfx/pics/039/bitmask.asm"
-WigglytuffBitmasks: INCLUDE "gfx/pics/040/bitmask.asm"
-ZubatBitmasks:      INCLUDE "gfx/pics/041/bitmask.asm"
-GolbatBitmasks:     INCLUDE "gfx/pics/042/bitmask.asm"
-OddishBitmasks:     INCLUDE "gfx/pics/043/bitmask.asm"
-GloomBitmasks:      INCLUDE "gfx/pics/044/bitmask.asm"
-VileplumeBitmasks:  INCLUDE "gfx/pics/045/bitmask.asm"
-ParasBitmasks:      INCLUDE "gfx/pics/046/bitmask.asm"
-ParasectBitmasks:   INCLUDE "gfx/pics/047/bitmask.asm"
-VenonatBitmasks:    INCLUDE "gfx/pics/048/bitmask.asm"
-VenomothBitmasks:   INCLUDE "gfx/pics/049/bitmask.asm"
-DiglettBitmasks:    INCLUDE "gfx/pics/050/bitmask.asm"
-DugtrioBitmasks:    INCLUDE "gfx/pics/051/bitmask.asm"
-MeowthBitmasks:     INCLUDE "gfx/pics/052/bitmask.asm"
-PersianBitmasks:    INCLUDE "gfx/pics/053/bitmask.asm"
-PsyduckBitmasks:    INCLUDE "gfx/pics/054/bitmask.asm"
-GolduckBitmasks:    INCLUDE "gfx/pics/055/bitmask.asm"
-MankeyBitmasks:     INCLUDE "gfx/pics/056/bitmask.asm"
-PrimeapeBitmasks:   INCLUDE "gfx/pics/057/bitmask.asm"
-GrowlitheBitmasks:  INCLUDE "gfx/pics/058/bitmask.asm"
-ArcanineBitmasks:   INCLUDE "gfx/pics/059/bitmask.asm"
-PoliwagBitmasks:    INCLUDE "gfx/pics/060/bitmask.asm"
-PoliwhirlBitmasks:  INCLUDE "gfx/pics/061/bitmask.asm"
-PoliwrathBitmasks:  INCLUDE "gfx/pics/062/bitmask.asm"
-AbraBitmasks:       INCLUDE "gfx/pics/063/bitmask.asm"
-KadabraBitmasks:    INCLUDE "gfx/pics/064/bitmask.asm"
-AlakazamBitmasks:   INCLUDE "gfx/pics/065/bitmask.asm"
-MachopBitmasks:     INCLUDE "gfx/pics/066/bitmask.asm"
-MachokeBitmasks:    INCLUDE "gfx/pics/067/bitmask.asm"
-MachampBitmasks:    INCLUDE "gfx/pics/068/bitmask.asm"
-BellsproutBitmasks: INCLUDE "gfx/pics/069/bitmask.asm"
-WeepinbellBitmasks: INCLUDE "gfx/pics/070/bitmask.asm"
-VictreebelBitmasks: INCLUDE "gfx/pics/071/bitmask.asm"
-TentacoolBitmasks:  INCLUDE "gfx/pics/072/bitmask.asm"
-TentacruelBitmasks: INCLUDE "gfx/pics/073/bitmask.asm"
-GeodudeBitmasks:    INCLUDE "gfx/pics/074/bitmask.asm"
-GravelerBitmasks:   INCLUDE "gfx/pics/075/bitmask.asm"
-GolemBitmasks:      INCLUDE "gfx/pics/076/bitmask.asm"
-PonytaBitmasks:     INCLUDE "gfx/pics/077/bitmask.asm"
-RapidashBitmasks:   INCLUDE "gfx/pics/078/bitmask.asm"
-SlowpokeBitmasks:   INCLUDE "gfx/pics/079/bitmask.asm"
-SlowbroBitmasks:    INCLUDE "gfx/pics/080/bitmask.asm"
-MagnemiteBitmasks:  INCLUDE "gfx/pics/081/bitmask.asm"
-MagnetonBitmasks:   INCLUDE "gfx/pics/082/bitmask.asm"
-FarfetchDBitmasks:  INCLUDE "gfx/pics/083/bitmask.asm"
-DoduoBitmasks:      INCLUDE "gfx/pics/084/bitmask.asm"
-DodrioBitmasks:     INCLUDE "gfx/pics/085/bitmask.asm"
-SeelBitmasks:       INCLUDE "gfx/pics/086/bitmask.asm"
-DewgongBitmasks:    INCLUDE "gfx/pics/087/bitmask.asm"
-GrimerBitmasks:     INCLUDE "gfx/pics/088/bitmask.asm"
-MukBitmasks:        INCLUDE "gfx/pics/089/bitmask.asm"
-ShellderBitmasks:   INCLUDE "gfx/pics/090/bitmask.asm"
-CloysterBitmasks:   INCLUDE "gfx/pics/091/bitmask.asm"
-GastlyBitmasks:     INCLUDE "gfx/pics/092/bitmask.asm"
-HaunterBitmasks:    INCLUDE "gfx/pics/093/bitmask.asm"
-GengarBitmasks:     INCLUDE "gfx/pics/094/bitmask.asm"
-OnixBitmasks:       INCLUDE "gfx/pics/095/bitmask.asm"
-DrowzeeBitmasks:    INCLUDE "gfx/pics/096/bitmask.asm"
-HypnoBitmasks:      INCLUDE "gfx/pics/097/bitmask.asm"
-KrabbyBitmasks:     INCLUDE "gfx/pics/098/bitmask.asm"
-KinglerBitmasks:    INCLUDE "gfx/pics/099/bitmask.asm"
-VoltorbBitmasks:    INCLUDE "gfx/pics/100/bitmask.asm"
-ElectrodeBitmasks:  INCLUDE "gfx/pics/101/bitmask.asm"
-ExeggcuteBitmasks:  INCLUDE "gfx/pics/102/bitmask.asm"
-ExeggutorBitmasks:  INCLUDE "gfx/pics/103/bitmask.asm"
-CuboneBitmasks:     INCLUDE "gfx/pics/104/bitmask.asm"
-MarowakBitmasks:    INCLUDE "gfx/pics/105/bitmask.asm"
-HitmonleeBitmasks:  INCLUDE "gfx/pics/106/bitmask.asm"
-HitmonchanBitmasks: INCLUDE "gfx/pics/107/bitmask.asm"
-LickitungBitmasks:  INCLUDE "gfx/pics/108/bitmask.asm"
-KoffingBitmasks:    INCLUDE "gfx/pics/109/bitmask.asm"
-WeezingBitmasks:    INCLUDE "gfx/pics/110/bitmask.asm"
-RhyhornBitmasks:    INCLUDE "gfx/pics/111/bitmask.asm"
-RhydonBitmasks:     INCLUDE "gfx/pics/112/bitmask.asm"
-ChanseyBitmasks:    INCLUDE "gfx/pics/113/bitmask.asm"
-TangelaBitmasks:    INCLUDE "gfx/pics/114/bitmask.asm"
-KangaskhanBitmasks: INCLUDE "gfx/pics/115/bitmask.asm"
-HorseaBitmasks:     INCLUDE "gfx/pics/116/bitmask.asm"
-SeadraBitmasks:     INCLUDE "gfx/pics/117/bitmask.asm"
-GoldeenBitmasks:    INCLUDE "gfx/pics/118/bitmask.asm"
-SeakingBitmasks:    INCLUDE "gfx/pics/119/bitmask.asm"
-StaryuBitmasks:     INCLUDE "gfx/pics/120/bitmask.asm"
-StarmieBitmasks:    INCLUDE "gfx/pics/121/bitmask.asm"
-MrMimeBitmasks:     INCLUDE "gfx/pics/122/bitmask.asm"
-ScytherBitmasks:    INCLUDE "gfx/pics/123/bitmask.asm"
-JynxBitmasks:       INCLUDE "gfx/pics/124/bitmask.asm"
-ElectabuzzBitmasks: INCLUDE "gfx/pics/125/bitmask.asm"
-MagmarBitmasks:     INCLUDE "gfx/pics/126/bitmask.asm"
-PinsirBitmasks:     INCLUDE "gfx/pics/127/bitmask.asm"
-TaurosBitmasks:     INCLUDE "gfx/pics/128/bitmask.asm"
-MagikarpBitmasks:   INCLUDE "gfx/pics/129/bitmask.asm"
-GyaradosBitmasks:   INCLUDE "gfx/pics/130/bitmask.asm"
-LaprasBitmasks:     INCLUDE "gfx/pics/131/bitmask.asm"
-DittoBitmasks:      INCLUDE "gfx/pics/132/bitmask.asm"
-EeveeBitmasks:      INCLUDE "gfx/pics/133/bitmask.asm"
-VaporeonBitmasks:   INCLUDE "gfx/pics/134/bitmask.asm"
-JolteonBitmasks:    INCLUDE "gfx/pics/135/bitmask.asm"
-FlareonBitmasks:    INCLUDE "gfx/pics/136/bitmask.asm"
-PorygonBitmasks:    INCLUDE "gfx/pics/137/bitmask.asm"
-OmanyteBitmasks:    INCLUDE "gfx/pics/138/bitmask.asm"
-OmastarBitmasks:    INCLUDE "gfx/pics/139/bitmask.asm"
-KabutoBitmasks:     INCLUDE "gfx/pics/140/bitmask.asm"
-KabutopsBitmasks:   INCLUDE "gfx/pics/141/bitmask.asm"
-AerodactylBitmasks: INCLUDE "gfx/pics/142/bitmask.asm"
-SnorlaxBitmasks:    INCLUDE "gfx/pics/143/bitmask.asm"
-ArticunoBitmasks:   INCLUDE "gfx/pics/144/bitmask.asm"
-ZapdosBitmasks:     INCLUDE "gfx/pics/145/bitmask.asm"
-MoltresBitmasks:    INCLUDE "gfx/pics/146/bitmask.asm"
-DratiniBitmasks:    INCLUDE "gfx/pics/147/bitmask.asm"
-DragonairBitmasks:  INCLUDE "gfx/pics/148/bitmask.asm"
-DragoniteBitmasks:  INCLUDE "gfx/pics/149/bitmask.asm"
-MewtwoBitmasks:     INCLUDE "gfx/pics/150/bitmask.asm"
-MewBitmasks:        INCLUDE "gfx/pics/151/bitmask.asm"
-ChikoritaBitmasks:  INCLUDE "gfx/pics/152/bitmask.asm"
-BayleefBitmasks:    INCLUDE "gfx/pics/153/bitmask.asm"
-MeganiumBitmasks:   INCLUDE "gfx/pics/154/bitmask.asm"
-CyndaquilBitmasks:  INCLUDE "gfx/pics/155/bitmask.asm"
-QuilavaBitmasks:    INCLUDE "gfx/pics/156/bitmask.asm"
-TyphlosionBitmasks: INCLUDE "gfx/pics/157/bitmask.asm"
-TotodileBitmasks:   INCLUDE "gfx/pics/158/bitmask.asm"
-CroconawBitmasks:   INCLUDE "gfx/pics/159/bitmask.asm"
-FeraligatrBitmasks: INCLUDE "gfx/pics/160/bitmask.asm"
-SentretBitmasks:    INCLUDE "gfx/pics/161/bitmask.asm"
-FurretBitmasks:     INCLUDE "gfx/pics/162/bitmask.asm"
-HoothootBitmasks:   INCLUDE "gfx/pics/163/bitmask.asm"
-NoctowlBitmasks:    INCLUDE "gfx/pics/164/bitmask.asm"
-LedybaBitmasks:     INCLUDE "gfx/pics/165/bitmask.asm"
-LedianBitmasks:     INCLUDE "gfx/pics/166/bitmask.asm"
-SpinarakBitmasks:   INCLUDE "gfx/pics/167/bitmask.asm"
-AriadosBitmasks:    INCLUDE "gfx/pics/168/bitmask.asm"
-CrobatBitmasks:     INCLUDE "gfx/pics/169/bitmask.asm"
-ChinchouBitmasks:   INCLUDE "gfx/pics/170/bitmask.asm"
-LanturnBitmasks:    INCLUDE "gfx/pics/171/bitmask.asm"
-PichuBitmasks:      INCLUDE "gfx/pics/172/bitmask.asm"
-CleffaBitmasks:     INCLUDE "gfx/pics/173/bitmask.asm"
-IgglybuffBitmasks:  INCLUDE "gfx/pics/174/bitmask.asm"
-TogepiBitmasks:     INCLUDE "gfx/pics/175/bitmask.asm"
-TogeticBitmasks:    INCLUDE "gfx/pics/176/bitmask.asm"
-NatuBitmasks:       INCLUDE "gfx/pics/177/bitmask.asm"
-XatuBitmasks:       INCLUDE "gfx/pics/178/bitmask.asm"
-MareepBitmasks:     INCLUDE "gfx/pics/179/bitmask.asm"
-FlaaffyBitmasks:    INCLUDE "gfx/pics/180/bitmask.asm"
-AmpharosBitmasks:   INCLUDE "gfx/pics/181/bitmask.asm"
-BellossomBitmasks:  INCLUDE "gfx/pics/182/bitmask.asm"
-MarillBitmasks:     INCLUDE "gfx/pics/183/bitmask.asm"
-AzumarillBitmasks:  INCLUDE "gfx/pics/184/bitmask.asm"
-SudowoodoBitmasks:  INCLUDE "gfx/pics/185/bitmask.asm"
-PolitoedBitmasks:   INCLUDE "gfx/pics/186/bitmask.asm"
-HoppipBitmasks:     INCLUDE "gfx/pics/187/bitmask.asm"
-SkiploomBitmasks:   INCLUDE "gfx/pics/188/bitmask.asm"
-JumpluffBitmasks:   INCLUDE "gfx/pics/189/bitmask.asm"
-AipomBitmasks:      INCLUDE "gfx/pics/190/bitmask.asm"
-SunkernBitmasks:    INCLUDE "gfx/pics/191/bitmask.asm"
-SunfloraBitmasks:   INCLUDE "gfx/pics/192/bitmask.asm"
-YanmaBitmasks:      INCLUDE "gfx/pics/193/bitmask.asm"
-WooperBitmasks:     INCLUDE "gfx/pics/194/bitmask.asm"
-QuagsireBitmasks:   INCLUDE "gfx/pics/195/bitmask.asm"
-EspeonBitmasks:     INCLUDE "gfx/pics/196/bitmask.asm"
-UmbreonBitmasks:    INCLUDE "gfx/pics/197/bitmask.asm"
-MurkrowBitmasks:    INCLUDE "gfx/pics/198/bitmask.asm"
-SlowkingBitmasks:   INCLUDE "gfx/pics/199/bitmask.asm"
-MisdreavusBitmasks: INCLUDE "gfx/pics/200/bitmask.asm"
-UnownBitmasks:      INCLUDE "gfx/pics/201/bitmask.asm"
-WobbuffetBitmasks:  INCLUDE "gfx/pics/202/bitmask.asm"
-GirafarigBitmasks:  INCLUDE "gfx/pics/203/bitmask.asm"
-PinecoBitmasks:     INCLUDE "gfx/pics/204/bitmask.asm"
-ForretressBitmasks: INCLUDE "gfx/pics/205/bitmask.asm"
-DunsparceBitmasks:  INCLUDE "gfx/pics/206/bitmask.asm"
-GligarBitmasks:     INCLUDE "gfx/pics/207/bitmask.asm"
-SteelixBitmasks:    INCLUDE "gfx/pics/208/bitmask.asm"
-SnubbullBitmasks:   INCLUDE "gfx/pics/209/bitmask.asm"
-GranbullBitmasks:   INCLUDE "gfx/pics/210/bitmask.asm"
-QwilfishBitmasks:   INCLUDE "gfx/pics/211/bitmask.asm"
-ScizorBitmasks:     INCLUDE "gfx/pics/212/bitmask.asm"
-ShuckleBitmasks:    INCLUDE "gfx/pics/213/bitmask.asm"
-HeracrossBitmasks:  INCLUDE "gfx/pics/214/bitmask.asm"
-SneaselBitmasks:    INCLUDE "gfx/pics/215/bitmask.asm"
-TeddiursaBitmasks:  INCLUDE "gfx/pics/216/bitmask.asm"
-UrsaringBitmasks:   INCLUDE "gfx/pics/217/bitmask.asm"
-SlugmaBitmasks:     INCLUDE "gfx/pics/218/bitmask.asm"
-MagcargoBitmasks:   INCLUDE "gfx/pics/219/bitmask.asm"
-SwinubBitmasks:     INCLUDE "gfx/pics/220/bitmask.asm"
-PiloswineBitmasks:  INCLUDE "gfx/pics/221/bitmask.asm"
-CorsolaBitmasks:    INCLUDE "gfx/pics/222/bitmask.asm"
-RemoraidBitmasks:   INCLUDE "gfx/pics/223/bitmask.asm"
-OctilleryBitmasks:  INCLUDE "gfx/pics/224/bitmask.asm"
-DelibirdBitmasks:   INCLUDE "gfx/pics/225/bitmask.asm"
-MantineBitmasks:    INCLUDE "gfx/pics/226/bitmask.asm"
-SkarmoryBitmasks:   INCLUDE "gfx/pics/227/bitmask.asm"
-HoundourBitmasks:   INCLUDE "gfx/pics/228/bitmask.asm"
-HoundoomBitmasks:   INCLUDE "gfx/pics/229/bitmask.asm"
-KingdraBitmasks:    INCLUDE "gfx/pics/230/bitmask.asm"
-PhanpyBitmasks:     INCLUDE "gfx/pics/231/bitmask.asm"
-DonphanBitmasks:    INCLUDE "gfx/pics/232/bitmask.asm"
-Porygon2Bitmasks:   INCLUDE "gfx/pics/233/bitmask.asm"
-StantlerBitmasks:   INCLUDE "gfx/pics/234/bitmask.asm"
-SmeargleBitmasks:   INCLUDE "gfx/pics/235/bitmask.asm"
-TyrogueBitmasks:    INCLUDE "gfx/pics/236/bitmask.asm"
-HitmontopBitmasks:  INCLUDE "gfx/pics/237/bitmask.asm"
-SmoochumBitmasks:   INCLUDE "gfx/pics/238/bitmask.asm"
-ElekidBitmasks:     INCLUDE "gfx/pics/239/bitmask.asm"
-MagbyBitmasks:      INCLUDE "gfx/pics/240/bitmask.asm"
-MiltankBitmasks:    INCLUDE "gfx/pics/241/bitmask.asm"
-BlisseyBitmasks:    INCLUDE "gfx/pics/242/bitmask.asm"
-RaikouBitmasks:     INCLUDE "gfx/pics/243/bitmask.asm"
-EnteiBitmasks:      INCLUDE "gfx/pics/244/bitmask.asm"
-SuicuneBitmasks:    INCLUDE "gfx/pics/245/bitmask.asm"
-LarvitarBitmasks:   INCLUDE "gfx/pics/246/bitmask.asm"
-PupitarBitmasks:    INCLUDE "gfx/pics/247/bitmask.asm"
-TyranitarBitmasks:  INCLUDE "gfx/pics/248/bitmask.asm"
-LugiaBitmasks:      INCLUDE "gfx/pics/249/bitmask.asm"
-HoOhBitmasks:       INCLUDE "gfx/pics/250/bitmask.asm"
-CelebiBitmasks:     INCLUDE "gfx/pics/251/bitmask.asm"
+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/009/anim0.asm b/gfx/pics/blastoise/anim0.asm
index 2d8b464d0..2d8b464d0 100644
--- a/gfx/pics/009/anim0.asm
+++ b/gfx/pics/blastoise/anim0.asm
diff --git a/gfx/pics/009/anim1.asm b/gfx/pics/blastoise/anim1.asm
index b25c75e5a..b25c75e5a 100644
--- a/gfx/pics/009/anim1.asm
+++ b/gfx/pics/blastoise/anim1.asm
diff --git a/gfx/pics/009/back.lz b/gfx/pics/blastoise/back.6x6.2bpp.lz
index 5e27c9989..5e27c9989 100644
--- a/gfx/pics/009/back.lz
+++ b/gfx/pics/blastoise/back.6x6.2bpp.lz
diff --git a/gfx/pics/009/bitmask.asm b/gfx/pics/blastoise/bitmask.asm
index 211912d5c..211912d5c 100644
--- a/gfx/pics/009/bitmask.asm
+++ b/gfx/pics/blastoise/bitmask.asm
diff --git a/gfx/pics/009/frames.asm b/gfx/pics/blastoise/frames.asm
index cbef1366e..cbef1366e 100644
--- a/gfx/pics/009/frames.asm
+++ b/gfx/pics/blastoise/frames.asm
diff --git a/gfx/pics/009/front.lz b/gfx/pics/blastoise/front.7x7.2bpp.lz
index 33148b076..33148b076 100644
--- a/gfx/pics/009/front.lz
+++ b/gfx/pics/blastoise/front.7x7.2bpp.lz
diff --git a/gfx/pics/009/normal.pal b/gfx/pics/blastoise/normal.pal
index 2198d5946..2198d5946 100644
--- a/gfx/pics/009/normal.pal
+++ b/gfx/pics/blastoise/normal.pal
diff --git a/gfx/pics/009/shiny.pal b/gfx/pics/blastoise/shiny.pal
index dbde45ec9..dbde45ec9 100644
--- a/gfx/pics/009/shiny.pal
+++ b/gfx/pics/blastoise/shiny.pal
diff --git a/gfx/pics/242/anim0.asm b/gfx/pics/blissey/anim0.asm
index 097ecc094..097ecc094 100644
--- a/gfx/pics/242/anim0.asm
+++ b/gfx/pics/blissey/anim0.asm
diff --git a/gfx/pics/242/anim1.asm b/gfx/pics/blissey/anim1.asm
index 846d85003..846d85003 100644
--- a/gfx/pics/242/anim1.asm
+++ b/gfx/pics/blissey/anim1.asm
diff --git a/gfx/pics/242/back.lz b/gfx/pics/blissey/back.6x6.2bpp.lz
index 00749ddee..00749ddee 100644
--- a/gfx/pics/242/back.lz
+++ b/gfx/pics/blissey/back.6x6.2bpp.lz
diff --git a/gfx/pics/242/bitmask.asm b/gfx/pics/blissey/bitmask.asm
index 2f60296f3..2f60296f3 100644
--- a/gfx/pics/242/bitmask.asm
+++ b/gfx/pics/blissey/bitmask.asm
diff --git a/gfx/pics/242/frames.asm b/gfx/pics/blissey/frames.asm
index d7df7070c..d7df7070c 100644
--- a/gfx/pics/242/frames.asm
+++ b/gfx/pics/blissey/frames.asm
diff --git a/gfx/pics/242/front.lz b/gfx/pics/blissey/front.7x7.2bpp.lz
index 76f492c43..76f492c43 100644
--- a/gfx/pics/242/front.lz
+++ b/gfx/pics/blissey/front.7x7.2bpp.lz
diff --git a/gfx/pics/242/normal.pal b/gfx/pics/blissey/normal.pal
index af97ddab4..af97ddab4 100644
--- a/gfx/pics/242/normal.pal
+++ b/gfx/pics/blissey/normal.pal
diff --git a/gfx/pics/242/shiny.pal b/gfx/pics/blissey/shiny.pal
index 862858e75..862858e75 100644
--- a/gfx/pics/242/shiny.pal
+++ b/gfx/pics/blissey/shiny.pal
diff --git a/gfx/pics/001/anim0.asm b/gfx/pics/bulbasaur/anim0.asm
index e5c1cbe1e..e5c1cbe1e 100644
--- a/gfx/pics/001/anim0.asm
+++ b/gfx/pics/bulbasaur/anim0.asm
diff --git a/gfx/pics/001/anim1.asm b/gfx/pics/bulbasaur/anim1.asm
index cfc0f54e9..cfc0f54e9 100644
--- a/gfx/pics/001/anim1.asm
+++ b/gfx/pics/bulbasaur/anim1.asm
diff --git a/gfx/pics/001/back.lz b/gfx/pics/bulbasaur/back.6x6.2bpp.lz
index 44f8fa450..44f8fa450 100644
--- a/gfx/pics/001/back.lz
+++ b/gfx/pics/bulbasaur/back.6x6.2bpp.lz
diff --git a/gfx/pics/001/bitmask.asm b/gfx/pics/bulbasaur/bitmask.asm
index c811235df..c811235df 100644
--- a/gfx/pics/001/bitmask.asm
+++ b/gfx/pics/bulbasaur/bitmask.asm
diff --git a/gfx/pics/001/frames.asm b/gfx/pics/bulbasaur/frames.asm
index 99729f703..99729f703 100644
--- a/gfx/pics/001/frames.asm
+++ b/gfx/pics/bulbasaur/frames.asm
diff --git a/gfx/pics/001/front.lz b/gfx/pics/bulbasaur/front.5x5.2bpp.lz
index fc4550001..fc4550001 100644
--- a/gfx/pics/001/front.lz
+++ b/gfx/pics/bulbasaur/front.5x5.2bpp.lz
diff --git a/gfx/pics/001/normal.pal b/gfx/pics/bulbasaur/normal.pal
index 75bb2a401..75bb2a401 100644
--- a/gfx/pics/001/normal.pal
+++ b/gfx/pics/bulbasaur/normal.pal
diff --git a/gfx/pics/001/shiny.pal b/gfx/pics/bulbasaur/shiny.pal
index bcd5ad011..bcd5ad011 100644
--- a/gfx/pics/001/shiny.pal
+++ b/gfx/pics/bulbasaur/shiny.pal
diff --git a/gfx/pics/012/anim0.asm b/gfx/pics/butterfree/anim0.asm
index d31161a28..d31161a28 100644
--- a/gfx/pics/012/anim0.asm
+++ b/gfx/pics/butterfree/anim0.asm
diff --git a/gfx/pics/012/anim1.asm b/gfx/pics/butterfree/anim1.asm
index 1eb152f28..1eb152f28 100644
--- a/gfx/pics/012/anim1.asm
+++ b/gfx/pics/butterfree/anim1.asm
diff --git a/gfx/pics/012/back.lz b/gfx/pics/butterfree/back.6x6.2bpp.lz
index 6d741f493..6d741f493 100644
--- a/gfx/pics/012/back.lz
+++ b/gfx/pics/butterfree/back.6x6.2bpp.lz
diff --git a/gfx/pics/012/bitmask.asm b/gfx/pics/butterfree/bitmask.asm
index fdc1f37ab..fdc1f37ab 100644
--- a/gfx/pics/012/bitmask.asm
+++ b/gfx/pics/butterfree/bitmask.asm
diff --git a/gfx/pics/012/frames.asm b/gfx/pics/butterfree/frames.asm
index aee159cd9..aee159cd9 100644
--- a/gfx/pics/012/frames.asm
+++ b/gfx/pics/butterfree/frames.asm
diff --git a/gfx/pics/012/front.lz b/gfx/pics/butterfree/front.7x7.2bpp.lz
index bf8b7a690..bf8b7a690 100644
--- a/gfx/pics/012/front.lz
+++ b/gfx/pics/butterfree/front.7x7.2bpp.lz
diff --git a/gfx/pics/012/normal.pal b/gfx/pics/butterfree/normal.pal
index bd2d494a2..bd2d494a2 100644
--- a/gfx/pics/012/normal.pal
+++ b/gfx/pics/butterfree/normal.pal
diff --git a/gfx/pics/012/shiny.pal b/gfx/pics/butterfree/shiny.pal
index 75a74906b..75a74906b 100644
--- a/gfx/pics/012/shiny.pal
+++ b/gfx/pics/butterfree/shiny.pal
diff --git a/gfx/pics/010/anim0.asm b/gfx/pics/caterpie/anim0.asm
index a5cf5f238..a5cf5f238 100644
--- a/gfx/pics/010/anim0.asm
+++ b/gfx/pics/caterpie/anim0.asm
diff --git a/gfx/pics/010/anim1.asm b/gfx/pics/caterpie/anim1.asm
index e75b83f5c..e75b83f5c 100644
--- a/gfx/pics/010/anim1.asm
+++ b/gfx/pics/caterpie/anim1.asm
diff --git a/gfx/pics/010/back.lz b/gfx/pics/caterpie/back.6x6.2bpp.lz
index a3788d1e4..a3788d1e4 100644
--- a/gfx/pics/010/back.lz
+++ b/gfx/pics/caterpie/back.6x6.2bpp.lz
diff --git a/gfx/pics/010/bitmask.asm b/gfx/pics/caterpie/bitmask.asm
index e1674dda2..e1674dda2 100644
--- a/gfx/pics/010/bitmask.asm
+++ b/gfx/pics/caterpie/bitmask.asm
diff --git a/gfx/pics/010/frames.asm b/gfx/pics/caterpie/frames.asm
index 4bfa33c38..4bfa33c38 100644
--- a/gfx/pics/010/frames.asm
+++ b/gfx/pics/caterpie/frames.asm
diff --git a/gfx/pics/010/front.lz b/gfx/pics/caterpie/front.5x5.2bpp.lz
index d3036d9ff..d3036d9ff 100644
--- a/gfx/pics/010/front.lz
+++ b/gfx/pics/caterpie/front.5x5.2bpp.lz
diff --git a/gfx/pics/010/normal.pal b/gfx/pics/caterpie/normal.pal
index 51093dd01..51093dd01 100644
--- a/gfx/pics/010/normal.pal
+++ b/gfx/pics/caterpie/normal.pal
diff --git a/gfx/pics/010/shiny.pal b/gfx/pics/caterpie/shiny.pal
index 32410e492..32410e492 100644
--- a/gfx/pics/010/shiny.pal
+++ b/gfx/pics/caterpie/shiny.pal
diff --git a/gfx/pics/251/anim0.asm b/gfx/pics/celebi/anim0.asm
index 9f218a43e..9f218a43e 100644
--- a/gfx/pics/251/anim0.asm
+++ b/gfx/pics/celebi/anim0.asm
diff --git a/gfx/pics/251/anim1.asm b/gfx/pics/celebi/anim1.asm
index 6162488db..6162488db 100644
--- a/gfx/pics/251/anim1.asm
+++ b/gfx/pics/celebi/anim1.asm
diff --git a/gfx/pics/251/back.lz b/gfx/pics/celebi/back.6x6.2bpp.lz
index e8153224c..e8153224c 100644
--- a/gfx/pics/251/back.lz
+++ b/gfx/pics/celebi/back.6x6.2bpp.lz
diff --git a/gfx/pics/251/bitmask.asm b/gfx/pics/celebi/bitmask.asm
index 0a57151d0..0a57151d0 100644
--- a/gfx/pics/251/bitmask.asm
+++ b/gfx/pics/celebi/bitmask.asm
diff --git a/gfx/pics/251/frames.asm b/gfx/pics/celebi/frames.asm
index ef4507647..ef4507647 100644
--- a/gfx/pics/251/frames.asm
+++ b/gfx/pics/celebi/frames.asm
diff --git a/gfx/pics/251/front.lz b/gfx/pics/celebi/front.5x5.2bpp.lz
index afc41bee7..afc41bee7 100644
--- a/gfx/pics/251/front.lz
+++ b/gfx/pics/celebi/front.5x5.2bpp.lz
diff --git a/gfx/pics/251/normal.pal b/gfx/pics/celebi/normal.pal
index df26077cd..df26077cd 100644
--- a/gfx/pics/251/normal.pal
+++ b/gfx/pics/celebi/normal.pal
diff --git a/gfx/pics/251/shiny.pal b/gfx/pics/celebi/shiny.pal
index 1d73c8043..1d73c8043 100644
--- a/gfx/pics/251/shiny.pal
+++ b/gfx/pics/celebi/shiny.pal
diff --git a/gfx/pics/113/anim0.asm b/gfx/pics/chansey/anim0.asm
index 75de3b32b..75de3b32b 100644
--- a/gfx/pics/113/anim0.asm
+++ b/gfx/pics/chansey/anim0.asm
diff --git a/gfx/pics/113/anim1.asm b/gfx/pics/chansey/anim1.asm
index a78f8cf88..a78f8cf88 100644
--- a/gfx/pics/113/anim1.asm
+++ b/gfx/pics/chansey/anim1.asm
diff --git a/gfx/pics/113/back.lz b/gfx/pics/chansey/back.6x6.2bpp.lz
index 239df2d63..239df2d63 100644
--- a/gfx/pics/113/back.lz
+++ b/gfx/pics/chansey/back.6x6.2bpp.lz
diff --git a/gfx/pics/113/bitmask.asm b/gfx/pics/chansey/bitmask.asm
index 28dc212ed..28dc212ed 100644
--- a/gfx/pics/113/bitmask.asm
+++ b/gfx/pics/chansey/bitmask.asm
diff --git a/gfx/pics/113/frames.asm b/gfx/pics/chansey/frames.asm
index ad22cb7eb..ad22cb7eb 100644
--- a/gfx/pics/113/frames.asm
+++ b/gfx/pics/chansey/frames.asm
diff --git a/gfx/pics/113/front.lz b/gfx/pics/chansey/front.6x6.2bpp.lz
index 1fc457f19..1fc457f19 100644
--- a/gfx/pics/113/front.lz
+++ b/gfx/pics/chansey/front.6x6.2bpp.lz
diff --git a/gfx/pics/113/normal.pal b/gfx/pics/chansey/normal.pal
index f7fafd1f7..f7fafd1f7 100644
--- a/gfx/pics/113/normal.pal
+++ b/gfx/pics/chansey/normal.pal
diff --git a/gfx/pics/113/shiny.pal b/gfx/pics/chansey/shiny.pal
index 4d52ad934..4d52ad934 100644
--- a/gfx/pics/113/shiny.pal
+++ b/gfx/pics/chansey/shiny.pal
diff --git a/gfx/pics/006/anim0.asm b/gfx/pics/charizard/anim0.asm
index b258e35c7..b258e35c7 100644
--- a/gfx/pics/006/anim0.asm
+++ b/gfx/pics/charizard/anim0.asm
diff --git a/gfx/pics/006/anim1.asm b/gfx/pics/charizard/anim1.asm
index daffccb9d..daffccb9d 100644
--- a/gfx/pics/006/anim1.asm
+++ b/gfx/pics/charizard/anim1.asm
diff --git a/gfx/pics/006/back.lz b/gfx/pics/charizard/back.6x6.2bpp.lz
index db1d9c9ea..db1d9c9ea 100644
--- a/gfx/pics/006/back.lz
+++ b/gfx/pics/charizard/back.6x6.2bpp.lz
diff --git a/gfx/pics/006/bitmask.asm b/gfx/pics/charizard/bitmask.asm
index 21a615a42..21a615a42 100644
--- a/gfx/pics/006/bitmask.asm
+++ b/gfx/pics/charizard/bitmask.asm
diff --git a/gfx/pics/006/frames.asm b/gfx/pics/charizard/frames.asm
index 8502da5af..8502da5af 100644
--- a/gfx/pics/006/frames.asm
+++ b/gfx/pics/charizard/frames.asm
diff --git a/gfx/pics/006/front.lz b/gfx/pics/charizard/front.7x7.2bpp.lz
index aab0fda99..aab0fda99 100644
--- a/gfx/pics/006/front.lz
+++ b/gfx/pics/charizard/front.7x7.2bpp.lz
diff --git a/gfx/pics/006/normal.pal b/gfx/pics/charizard/normal.pal
index e0658358b..e0658358b 100644
--- a/gfx/pics/006/normal.pal
+++ b/gfx/pics/charizard/normal.pal
diff --git a/gfx/pics/006/shiny.pal b/gfx/pics/charizard/shiny.pal
index 88c195d74..88c195d74 100644
--- a/gfx/pics/006/shiny.pal
+++ b/gfx/pics/charizard/shiny.pal
diff --git a/gfx/pics/004/anim0.asm b/gfx/pics/charmander/anim0.asm
index 72a0fe83d..72a0fe83d 100644
--- a/gfx/pics/004/anim0.asm
+++ b/gfx/pics/charmander/anim0.asm
diff --git a/gfx/pics/004/anim1.asm b/gfx/pics/charmander/anim1.asm
index 219b5407f..219b5407f 100644
--- a/gfx/pics/004/anim1.asm
+++ b/gfx/pics/charmander/anim1.asm
diff --git a/gfx/pics/004/back.lz b/gfx/pics/charmander/back.6x6.2bpp.lz
index e8eb5eb4e..e8eb5eb4e 100644
--- a/gfx/pics/004/back.lz
+++ b/gfx/pics/charmander/back.6x6.2bpp.lz
diff --git a/gfx/pics/004/bitmask.asm b/gfx/pics/charmander/bitmask.asm
index fc93cb7e3..fc93cb7e3 100644
--- a/gfx/pics/004/bitmask.asm
+++ b/gfx/pics/charmander/bitmask.asm
diff --git a/gfx/pics/004/frames.asm b/gfx/pics/charmander/frames.asm
index 30e1c3fb1..30e1c3fb1 100644
--- a/gfx/pics/004/frames.asm
+++ b/gfx/pics/charmander/frames.asm
diff --git a/gfx/pics/004/front.lz b/gfx/pics/charmander/front.5x5.2bpp.lz
index 7cc31694b..7cc31694b 100644
--- a/gfx/pics/004/front.lz
+++ b/gfx/pics/charmander/front.5x5.2bpp.lz
diff --git a/gfx/pics/004/normal.pal b/gfx/pics/charmander/normal.pal
index 9edccc40a..9edccc40a 100644
--- a/gfx/pics/004/normal.pal
+++ b/gfx/pics/charmander/normal.pal
diff --git a/gfx/pics/004/shiny.pal b/gfx/pics/charmander/shiny.pal
index d7a346bd8..d7a346bd8 100644
--- a/gfx/pics/004/shiny.pal
+++ b/gfx/pics/charmander/shiny.pal
diff --git a/gfx/pics/005/anim0.asm b/gfx/pics/charmeleon/anim0.asm
index 30eeae979..30eeae979 100644
--- a/gfx/pics/005/anim0.asm
+++ b/gfx/pics/charmeleon/anim0.asm
diff --git a/gfx/pics/005/anim1.asm b/gfx/pics/charmeleon/anim1.asm
index d3320e33c..d3320e33c 100644
--- a/gfx/pics/005/anim1.asm
+++ b/gfx/pics/charmeleon/anim1.asm
diff --git a/gfx/pics/005/back.lz b/gfx/pics/charmeleon/back.6x6.2bpp.lz
index aec0cd7b2..aec0cd7b2 100644
--- a/gfx/pics/005/back.lz
+++ b/gfx/pics/charmeleon/back.6x6.2bpp.lz
diff --git a/gfx/pics/005/bitmask.asm b/gfx/pics/charmeleon/bitmask.asm
index e9a1b8e47..e9a1b8e47 100644
--- a/gfx/pics/005/bitmask.asm
+++ b/gfx/pics/charmeleon/bitmask.asm
diff --git a/gfx/pics/005/frames.asm b/gfx/pics/charmeleon/frames.asm
index 0b8add687..0b8add687 100644
--- a/gfx/pics/005/frames.asm
+++ b/gfx/pics/charmeleon/frames.asm
diff --git a/gfx/pics/005/front.lz b/gfx/pics/charmeleon/front.6x6.2bpp.lz
index efe789dad..efe789dad 100644
--- a/gfx/pics/005/front.lz
+++ b/gfx/pics/charmeleon/front.6x6.2bpp.lz
diff --git a/gfx/pics/005/normal.pal b/gfx/pics/charmeleon/normal.pal
index 5de328616..5de328616 100644
--- a/gfx/pics/005/normal.pal
+++ b/gfx/pics/charmeleon/normal.pal
diff --git a/gfx/pics/005/shiny.pal b/gfx/pics/charmeleon/shiny.pal
index 7a86d2cb1..7a86d2cb1 100644
--- a/gfx/pics/005/shiny.pal
+++ b/gfx/pics/charmeleon/shiny.pal
diff --git a/gfx/pics/152/anim0.asm b/gfx/pics/chikorita/anim0.asm
index 2b8fa7d35..2b8fa7d35 100644
--- a/gfx/pics/152/anim0.asm
+++ b/gfx/pics/chikorita/anim0.asm
diff --git a/gfx/pics/152/anim1.asm b/gfx/pics/chikorita/anim1.asm
index 9003c3ff2..9003c3ff2 100644
--- a/gfx/pics/152/anim1.asm
+++ b/gfx/pics/chikorita/anim1.asm
diff --git a/gfx/pics/152/back.lz b/gfx/pics/chikorita/back.6x6.2bpp.lz
index e98365a2b..e98365a2b 100644
--- a/gfx/pics/152/back.lz
+++ b/gfx/pics/chikorita/back.6x6.2bpp.lz
diff --git a/gfx/pics/152/bitmask.asm b/gfx/pics/chikorita/bitmask.asm
index 60922b7c0..60922b7c0 100644
--- a/gfx/pics/152/bitmask.asm
+++ b/gfx/pics/chikorita/bitmask.asm
diff --git a/gfx/pics/152/frames.asm b/gfx/pics/chikorita/frames.asm
index 64c07b539..64c07b539 100644
--- a/gfx/pics/152/frames.asm
+++ b/gfx/pics/chikorita/frames.asm
diff --git a/gfx/pics/152/front.lz b/gfx/pics/chikorita/front.5x5.2bpp.lz
index 008c4ec2d..008c4ec2d 100644
--- a/gfx/pics/152/front.lz
+++ b/gfx/pics/chikorita/front.5x5.2bpp.lz
diff --git a/gfx/pics/152/normal.pal b/gfx/pics/chikorita/normal.pal
index 06fdb2171..06fdb2171 100644
--- a/gfx/pics/152/normal.pal
+++ b/gfx/pics/chikorita/normal.pal
diff --git a/gfx/pics/152/shiny.pal b/gfx/pics/chikorita/shiny.pal
index c2ff6a3f8..c2ff6a3f8 100644
--- a/gfx/pics/152/shiny.pal
+++ b/gfx/pics/chikorita/shiny.pal
diff --git a/gfx/pics/170/anim0.asm b/gfx/pics/chinchou/anim0.asm
index f765c151a..f765c151a 100644
--- a/gfx/pics/170/anim0.asm
+++ b/gfx/pics/chinchou/anim0.asm
diff --git a/gfx/pics/170/anim1.asm b/gfx/pics/chinchou/anim1.asm
index bf38f8d87..bf38f8d87 100644
--- a/gfx/pics/170/anim1.asm
+++ b/gfx/pics/chinchou/anim1.asm
diff --git a/gfx/pics/170/back.lz b/gfx/pics/chinchou/back.6x6.2bpp.lz
index 744af1ad4..744af1ad4 100644
--- a/gfx/pics/170/back.lz
+++ b/gfx/pics/chinchou/back.6x6.2bpp.lz
diff --git a/gfx/pics/170/bitmask.asm b/gfx/pics/chinchou/bitmask.asm
index b2045d8b5..b2045d8b5 100644
--- a/gfx/pics/170/bitmask.asm
+++ b/gfx/pics/chinchou/bitmask.asm
diff --git a/gfx/pics/170/frames.asm b/gfx/pics/chinchou/frames.asm
index 748a3d619..748a3d619 100644
--- a/gfx/pics/170/frames.asm
+++ b/gfx/pics/chinchou/frames.asm
diff --git a/gfx/pics/170/front.lz b/gfx/pics/chinchou/front.6x6.2bpp.lz
index b5db65701..b5db65701 100644
--- a/gfx/pics/170/front.lz
+++ b/gfx/pics/chinchou/front.6x6.2bpp.lz
diff --git a/gfx/pics/170/normal.pal b/gfx/pics/chinchou/normal.pal
index 1749e7238..1749e7238 100644
--- a/gfx/pics/170/normal.pal
+++ b/gfx/pics/chinchou/normal.pal
diff --git a/gfx/pics/170/shiny.pal b/gfx/pics/chinchou/shiny.pal
index 334561248..334561248 100644
--- a/gfx/pics/170/shiny.pal
+++ b/gfx/pics/chinchou/shiny.pal
diff --git a/gfx/pics/036/anim0.asm b/gfx/pics/clefable/anim0.asm
index d442807e8..d442807e8 100644
--- a/gfx/pics/036/anim0.asm
+++ b/gfx/pics/clefable/anim0.asm
diff --git a/gfx/pics/036/anim1.asm b/gfx/pics/clefable/anim1.asm
index 2b024ffd8..2b024ffd8 100644
--- a/gfx/pics/036/anim1.asm
+++ b/gfx/pics/clefable/anim1.asm
diff --git a/gfx/pics/036/back.lz b/gfx/pics/clefable/back.6x6.2bpp.lz
index 1bcb8cbcd..1bcb8cbcd 100644
--- a/gfx/pics/036/back.lz
+++ b/gfx/pics/clefable/back.6x6.2bpp.lz
diff --git a/gfx/pics/036/bitmask.asm b/gfx/pics/clefable/bitmask.asm
index b1c1ae623..b1c1ae623 100644
--- a/gfx/pics/036/bitmask.asm
+++ b/gfx/pics/clefable/bitmask.asm
diff --git a/gfx/pics/036/frames.asm b/gfx/pics/clefable/frames.asm
index e1346985d..e1346985d 100644
--- a/gfx/pics/036/frames.asm
+++ b/gfx/pics/clefable/frames.asm
diff --git a/gfx/pics/036/front.lz b/gfx/pics/clefable/front.6x6.2bpp.lz
index 4fb424305..4fb424305 100644
--- a/gfx/pics/036/front.lz
+++ b/gfx/pics/clefable/front.6x6.2bpp.lz
diff --git a/gfx/pics/035/normal.pal b/gfx/pics/clefable/normal.pal
index 295fe98ff..295fe98ff 100644
--- a/gfx/pics/035/normal.pal
+++ b/gfx/pics/clefable/normal.pal
diff --git a/gfx/pics/035/shiny.pal b/gfx/pics/clefable/shiny.pal
index 1c0871557..1c0871557 100644
--- a/gfx/pics/035/shiny.pal
+++ b/gfx/pics/clefable/shiny.pal
diff --git a/gfx/pics/035/anim0.asm b/gfx/pics/clefairy/anim0.asm
index 9905c4fcc..9905c4fcc 100644
--- a/gfx/pics/035/anim0.asm
+++ b/gfx/pics/clefairy/anim0.asm
diff --git a/gfx/pics/035/anim1.asm b/gfx/pics/clefairy/anim1.asm
index c93613467..c93613467 100644
--- a/gfx/pics/035/anim1.asm
+++ b/gfx/pics/clefairy/anim1.asm
diff --git a/gfx/pics/035/back.lz b/gfx/pics/clefairy/back.6x6.2bpp.lz
index a6a5ecb82..a6a5ecb82 100644
--- a/gfx/pics/035/back.lz
+++ b/gfx/pics/clefairy/back.6x6.2bpp.lz
diff --git a/gfx/pics/035/bitmask.asm b/gfx/pics/clefairy/bitmask.asm
index 1c599e334..1c599e334 100644
--- a/gfx/pics/035/bitmask.asm
+++ b/gfx/pics/clefairy/bitmask.asm
diff --git a/gfx/pics/035/frames.asm b/gfx/pics/clefairy/frames.asm
index 88978f35b..88978f35b 100644
--- a/gfx/pics/035/frames.asm
+++ b/gfx/pics/clefairy/frames.asm
diff --git a/gfx/pics/035/front.lz b/gfx/pics/clefairy/front.5x5.2bpp.lz
index d8adc2e2e..d8adc2e2e 100644
--- a/gfx/pics/035/front.lz
+++ b/gfx/pics/clefairy/front.5x5.2bpp.lz
diff --git a/gfx/pics/036/normal.pal b/gfx/pics/clefairy/normal.pal
index 295fe98ff..295fe98ff 100644
--- a/gfx/pics/036/normal.pal
+++ b/gfx/pics/clefairy/normal.pal
diff --git a/gfx/pics/036/shiny.pal b/gfx/pics/clefairy/shiny.pal
index 1c0871557..1c0871557 100644
--- a/gfx/pics/036/shiny.pal
+++ b/gfx/pics/clefairy/shiny.pal
diff --git a/gfx/pics/173/anim0.asm b/gfx/pics/cleffa/anim0.asm
index 37f3da590..37f3da590 100644
--- a/gfx/pics/173/anim0.asm
+++ b/gfx/pics/cleffa/anim0.asm
diff --git a/gfx/pics/173/anim1.asm b/gfx/pics/cleffa/anim1.asm
index 129f123c2..129f123c2 100644
--- a/gfx/pics/173/anim1.asm
+++ b/gfx/pics/cleffa/anim1.asm
diff --git a/gfx/pics/173/back.lz b/gfx/pics/cleffa/back.6x6.2bpp.lz
index 35ec3369b..35ec3369b 100644
--- a/gfx/pics/173/back.lz
+++ b/gfx/pics/cleffa/back.6x6.2bpp.lz
diff --git a/gfx/pics/173/bitmask.asm b/gfx/pics/cleffa/bitmask.asm
index 175ab4893..175ab4893 100644
--- a/gfx/pics/173/bitmask.asm
+++ b/gfx/pics/cleffa/bitmask.asm
diff --git a/gfx/pics/173/frames.asm b/gfx/pics/cleffa/frames.asm
index 53ad1f718..53ad1f718 100644
--- a/gfx/pics/173/frames.asm
+++ b/gfx/pics/cleffa/frames.asm
diff --git a/gfx/pics/173/front.lz b/gfx/pics/cleffa/front.5x5.2bpp.lz
index e8c624069..e8c624069 100644
--- a/gfx/pics/173/front.lz
+++ b/gfx/pics/cleffa/front.5x5.2bpp.lz
diff --git a/gfx/pics/173/normal.pal b/gfx/pics/cleffa/normal.pal
index 7c1e3c7f2..7c1e3c7f2 100644
--- a/gfx/pics/173/normal.pal
+++ b/gfx/pics/cleffa/normal.pal
diff --git a/gfx/pics/173/shiny.pal b/gfx/pics/cleffa/shiny.pal
index 1c0871557..1c0871557 100644
--- a/gfx/pics/173/shiny.pal
+++ b/gfx/pics/cleffa/shiny.pal
diff --git a/gfx/pics/091/anim0.asm b/gfx/pics/cloyster/anim0.asm
index cc338f014..cc338f014 100644
--- a/gfx/pics/091/anim0.asm
+++ b/gfx/pics/cloyster/anim0.asm
diff --git a/gfx/pics/091/anim1.asm b/gfx/pics/cloyster/anim1.asm
index e872bbc59..e872bbc59 100644
--- a/gfx/pics/091/anim1.asm
+++ b/gfx/pics/cloyster/anim1.asm
diff --git a/gfx/pics/091/back.lz b/gfx/pics/cloyster/back.6x6.2bpp.lz
index 655890df8..655890df8 100644
--- a/gfx/pics/091/back.lz
+++ b/gfx/pics/cloyster/back.6x6.2bpp.lz
diff --git a/gfx/pics/091/bitmask.asm b/gfx/pics/cloyster/bitmask.asm
index 3e7e506f8..3e7e506f8 100644
--- a/gfx/pics/091/bitmask.asm
+++ b/gfx/pics/cloyster/bitmask.asm
diff --git a/gfx/pics/091/frames.asm b/gfx/pics/cloyster/frames.asm
index 77b278e8b..77b278e8b 100644
--- a/gfx/pics/091/frames.asm
+++ b/gfx/pics/cloyster/frames.asm
diff --git a/gfx/pics/091/front.lz b/gfx/pics/cloyster/front.7x7.2bpp.lz
index 83991eed6..83991eed6 100644
--- a/gfx/pics/091/front.lz
+++ b/gfx/pics/cloyster/front.7x7.2bpp.lz
diff --git a/gfx/pics/091/normal.pal b/gfx/pics/cloyster/normal.pal
index a0061617c..a0061617c 100644
--- a/gfx/pics/091/normal.pal
+++ b/gfx/pics/cloyster/normal.pal
diff --git a/gfx/pics/091/shiny.pal b/gfx/pics/cloyster/shiny.pal
index 973ccfb8a..973ccfb8a 100644
--- a/gfx/pics/091/shiny.pal
+++ b/gfx/pics/cloyster/shiny.pal
diff --git a/gfx/pics/222/anim0.asm b/gfx/pics/corsola/anim0.asm
index 68182e18e..68182e18e 100644
--- a/gfx/pics/222/anim0.asm
+++ b/gfx/pics/corsola/anim0.asm
diff --git a/gfx/pics/222/anim1.asm b/gfx/pics/corsola/anim1.asm
index 6360176ca..6360176ca 100644
--- a/gfx/pics/222/anim1.asm
+++ b/gfx/pics/corsola/anim1.asm
diff --git a/gfx/pics/222/back.lz b/gfx/pics/corsola/back.6x6.2bpp.lz
index 6707a3538..6707a3538 100644
--- a/gfx/pics/222/back.lz
+++ b/gfx/pics/corsola/back.6x6.2bpp.lz
diff --git a/gfx/pics/222/bitmask.asm b/gfx/pics/corsola/bitmask.asm
index fd9e40e5d..fd9e40e5d 100644
--- a/gfx/pics/222/bitmask.asm
+++ b/gfx/pics/corsola/bitmask.asm
diff --git a/gfx/pics/222/frames.asm b/gfx/pics/corsola/frames.asm
index d1bf55d3d..d1bf55d3d 100644
--- a/gfx/pics/222/frames.asm
+++ b/gfx/pics/corsola/frames.asm
diff --git a/gfx/pics/222/front.lz b/gfx/pics/corsola/front.6x6.2bpp.lz
index afa208922..afa208922 100644
--- a/gfx/pics/222/front.lz
+++ b/gfx/pics/corsola/front.6x6.2bpp.lz
diff --git a/gfx/pics/122/normal.pal b/gfx/pics/corsola/normal.pal
index 8dd10edc5..8dd10edc5 100644
--- a/gfx/pics/122/normal.pal
+++ b/gfx/pics/corsola/normal.pal
diff --git a/gfx/pics/222/shiny.pal b/gfx/pics/corsola/shiny.pal
index 8aec60de2..8aec60de2 100644
--- a/gfx/pics/222/shiny.pal
+++ b/gfx/pics/corsola/shiny.pal
diff --git a/gfx/pics/169/anim0.asm b/gfx/pics/crobat/anim0.asm
index 99888ab81..99888ab81 100644
--- a/gfx/pics/169/anim0.asm
+++ b/gfx/pics/crobat/anim0.asm
diff --git a/gfx/pics/169/anim1.asm b/gfx/pics/crobat/anim1.asm
index ec1dae2ac..ec1dae2ac 100644
--- a/gfx/pics/169/anim1.asm
+++ b/gfx/pics/crobat/anim1.asm
diff --git a/gfx/pics/169/back.lz b/gfx/pics/crobat/back.6x6.2bpp.lz
index a572d93c5..a572d93c5 100644
--- a/gfx/pics/169/back.lz
+++ b/gfx/pics/crobat/back.6x6.2bpp.lz
diff --git a/gfx/pics/169/bitmask.asm b/gfx/pics/crobat/bitmask.asm
index 6db5a3bcc..6db5a3bcc 100644
--- a/gfx/pics/169/bitmask.asm
+++ b/gfx/pics/crobat/bitmask.asm
diff --git a/gfx/pics/169/frames.asm b/gfx/pics/crobat/frames.asm
index c0c95c30e..c0c95c30e 100644
--- a/gfx/pics/169/frames.asm
+++ b/gfx/pics/crobat/frames.asm
diff --git a/gfx/pics/169/front.lz b/gfx/pics/crobat/front.7x7.2bpp.lz
index 1e12aeed2..1e12aeed2 100644
--- a/gfx/pics/169/front.lz
+++ b/gfx/pics/crobat/front.7x7.2bpp.lz
diff --git a/gfx/pics/169/normal.pal b/gfx/pics/crobat/normal.pal
index 667255211..667255211 100644
--- a/gfx/pics/169/normal.pal
+++ b/gfx/pics/crobat/normal.pal
diff --git a/gfx/pics/042/shiny.pal b/gfx/pics/crobat/shiny.pal
index 2cb1d6ced..2cb1d6ced 100644
--- a/gfx/pics/042/shiny.pal
+++ b/gfx/pics/crobat/shiny.pal
diff --git a/gfx/pics/159/anim0.asm b/gfx/pics/croconaw/anim0.asm
index c487abfd9..c487abfd9 100644
--- a/gfx/pics/159/anim0.asm
+++ b/gfx/pics/croconaw/anim0.asm
diff --git a/gfx/pics/159/anim1.asm b/gfx/pics/croconaw/anim1.asm
index 78bd8518e..78bd8518e 100644
--- a/gfx/pics/159/anim1.asm
+++ b/gfx/pics/croconaw/anim1.asm
diff --git a/gfx/pics/159/back.lz b/gfx/pics/croconaw/back.6x6.2bpp.lz
index 7e573e6a0..7e573e6a0 100644
--- a/gfx/pics/159/back.lz
+++ b/gfx/pics/croconaw/back.6x6.2bpp.lz
diff --git a/gfx/pics/159/bitmask.asm b/gfx/pics/croconaw/bitmask.asm
index 22f1cf494..22f1cf494 100644
--- a/gfx/pics/159/bitmask.asm
+++ b/gfx/pics/croconaw/bitmask.asm
diff --git a/gfx/pics/159/frames.asm b/gfx/pics/croconaw/frames.asm
index cda1ed191..cda1ed191 100644
--- a/gfx/pics/159/frames.asm
+++ b/gfx/pics/croconaw/frames.asm
diff --git a/gfx/pics/159/front.lz b/gfx/pics/croconaw/front.6x6.2bpp.lz
index 9c7f511ba..9c7f511ba 100644
--- a/gfx/pics/159/front.lz
+++ b/gfx/pics/croconaw/front.6x6.2bpp.lz
diff --git a/gfx/pics/159/normal.pal b/gfx/pics/croconaw/normal.pal
index 933593e9f..933593e9f 100644
--- a/gfx/pics/159/normal.pal
+++ b/gfx/pics/croconaw/normal.pal
diff --git a/gfx/pics/159/shiny.pal b/gfx/pics/croconaw/shiny.pal
index efba52bea..efba52bea 100644
--- a/gfx/pics/159/shiny.pal
+++ b/gfx/pics/croconaw/shiny.pal
diff --git a/gfx/pics/104/anim0.asm b/gfx/pics/cubone/anim0.asm
index 2af8c522c..2af8c522c 100644
--- a/gfx/pics/104/anim0.asm
+++ b/gfx/pics/cubone/anim0.asm
diff --git a/gfx/pics/104/anim1.asm b/gfx/pics/cubone/anim1.asm
index fb3b0b3ba..fb3b0b3ba 100644
--- a/gfx/pics/104/anim1.asm
+++ b/gfx/pics/cubone/anim1.asm
diff --git a/gfx/pics/104/back.lz b/gfx/pics/cubone/back.6x6.2bpp.lz
index fc9931417..fc9931417 100644
--- a/gfx/pics/104/back.lz
+++ b/gfx/pics/cubone/back.6x6.2bpp.lz
diff --git a/gfx/pics/104/bitmask.asm b/gfx/pics/cubone/bitmask.asm
index 81549a704..81549a704 100644
--- a/gfx/pics/104/bitmask.asm
+++ b/gfx/pics/cubone/bitmask.asm
diff --git a/gfx/pics/104/frames.asm b/gfx/pics/cubone/frames.asm
index e5ef22631..e5ef22631 100644
--- a/gfx/pics/104/frames.asm
+++ b/gfx/pics/cubone/frames.asm
diff --git a/gfx/pics/104/front.lz b/gfx/pics/cubone/front.5x5.2bpp.lz
index 9de9f7732..9de9f7732 100644
--- a/gfx/pics/104/front.lz
+++ b/gfx/pics/cubone/front.5x5.2bpp.lz
diff --git a/gfx/pics/104/normal.pal b/gfx/pics/cubone/normal.pal
index eb2ec4b7b..eb2ec4b7b 100644
--- a/gfx/pics/104/normal.pal
+++ b/gfx/pics/cubone/normal.pal
diff --git a/gfx/pics/104/shiny.pal b/gfx/pics/cubone/shiny.pal
index e27abe43a..e27abe43a 100644
--- a/gfx/pics/104/shiny.pal
+++ b/gfx/pics/cubone/shiny.pal
diff --git a/gfx/pics/155/anim0.asm b/gfx/pics/cyndaquil/anim0.asm
index b069cc300..b069cc300 100644
--- a/gfx/pics/155/anim0.asm
+++ b/gfx/pics/cyndaquil/anim0.asm
diff --git a/gfx/pics/155/anim1.asm b/gfx/pics/cyndaquil/anim1.asm
index 43c4d495a..43c4d495a 100644
--- a/gfx/pics/155/anim1.asm
+++ b/gfx/pics/cyndaquil/anim1.asm
diff --git a/gfx/pics/155/back.lz b/gfx/pics/cyndaquil/back.6x6.2bpp.lz
index 226c41e49..226c41e49 100644
--- a/gfx/pics/155/back.lz
+++ b/gfx/pics/cyndaquil/back.6x6.2bpp.lz
diff --git a/gfx/pics/155/bitmask.asm b/gfx/pics/cyndaquil/bitmask.asm
index 56d89d40a..56d89d40a 100644
--- a/gfx/pics/155/bitmask.asm
+++ b/gfx/pics/cyndaquil/bitmask.asm
diff --git a/gfx/pics/155/frames.asm b/gfx/pics/cyndaquil/frames.asm
index 581669813..581669813 100644
--- a/gfx/pics/155/frames.asm
+++ b/gfx/pics/cyndaquil/frames.asm
diff --git a/gfx/pics/155/front.lz b/gfx/pics/cyndaquil/front.5x5.2bpp.lz
index 3e2886783..3e2886783 100644
--- a/gfx/pics/155/front.lz
+++ b/gfx/pics/cyndaquil/front.5x5.2bpp.lz
diff --git a/gfx/pics/155/normal.pal b/gfx/pics/cyndaquil/normal.pal
index 38028335c..38028335c 100644
--- a/gfx/pics/155/normal.pal
+++ b/gfx/pics/cyndaquil/normal.pal
diff --git a/gfx/pics/155/shiny.pal b/gfx/pics/cyndaquil/shiny.pal
index 5b3df0b4e..5b3df0b4e 100644
--- a/gfx/pics/155/shiny.pal
+++ b/gfx/pics/cyndaquil/shiny.pal
diff --git a/gfx/pics/225/anim0.asm b/gfx/pics/delibird/anim0.asm
index 3431ad1ae..3431ad1ae 100644
--- a/gfx/pics/225/anim0.asm
+++ b/gfx/pics/delibird/anim0.asm
diff --git a/gfx/pics/225/anim1.asm b/gfx/pics/delibird/anim1.asm
index 8a416cc61..8a416cc61 100644
--- a/gfx/pics/225/anim1.asm
+++ b/gfx/pics/delibird/anim1.asm
diff --git a/gfx/pics/225/back.lz b/gfx/pics/delibird/back.6x6.2bpp.lz
index 22f41237c..22f41237c 100644
--- a/gfx/pics/225/back.lz
+++ b/gfx/pics/delibird/back.6x6.2bpp.lz
diff --git a/gfx/pics/225/bitmask.asm b/gfx/pics/delibird/bitmask.asm
index f682bc2fb..f682bc2fb 100644
--- a/gfx/pics/225/bitmask.asm
+++ b/gfx/pics/delibird/bitmask.asm
diff --git a/gfx/pics/225/frames.asm b/gfx/pics/delibird/frames.asm
index 625f5ae8a..625f5ae8a 100644
--- a/gfx/pics/225/frames.asm
+++ b/gfx/pics/delibird/frames.asm
diff --git a/gfx/pics/225/front.lz b/gfx/pics/delibird/front.6x6.2bpp.lz
index 819e46af0..819e46af0 100644
--- a/gfx/pics/225/front.lz
+++ b/gfx/pics/delibird/front.6x6.2bpp.lz
diff --git a/gfx/pics/225/normal.pal b/gfx/pics/delibird/normal.pal
index fb24bd4e1..fb24bd4e1 100644
--- a/gfx/pics/225/normal.pal
+++ b/gfx/pics/delibird/normal.pal
diff --git a/gfx/pics/225/shiny.pal b/gfx/pics/delibird/shiny.pal
index 4c4ee713f..4c4ee713f 100644
--- a/gfx/pics/225/shiny.pal
+++ b/gfx/pics/delibird/shiny.pal
diff --git a/gfx/pics/087/anim0.asm b/gfx/pics/dewgong/anim0.asm
index b7c3efecf..b7c3efecf 100644
--- a/gfx/pics/087/anim0.asm
+++ b/gfx/pics/dewgong/anim0.asm
diff --git a/gfx/pics/087/anim1.asm b/gfx/pics/dewgong/anim1.asm
index 0357ce660..0357ce660 100644
--- a/gfx/pics/087/anim1.asm
+++ b/gfx/pics/dewgong/anim1.asm
diff --git a/gfx/pics/087/back.lz b/gfx/pics/dewgong/back.6x6.2bpp.lz
index bc6842e86..bc6842e86 100644
--- a/gfx/pics/087/back.lz
+++ b/gfx/pics/dewgong/back.6x6.2bpp.lz
diff --git a/gfx/pics/087/bitmask.asm b/gfx/pics/dewgong/bitmask.asm
index 0d29808ea..0d29808ea 100644
--- a/gfx/pics/087/bitmask.asm
+++ b/gfx/pics/dewgong/bitmask.asm
diff --git a/gfx/pics/087/frames.asm b/gfx/pics/dewgong/frames.asm
index 38ca6a78c..38ca6a78c 100644
--- a/gfx/pics/087/frames.asm
+++ b/gfx/pics/dewgong/frames.asm
diff --git a/gfx/pics/087/front.lz b/gfx/pics/dewgong/front.7x7.2bpp.lz
index cbb0ace94..cbb0ace94 100644
--- a/gfx/pics/087/front.lz
+++ b/gfx/pics/dewgong/front.7x7.2bpp.lz
diff --git a/gfx/pics/087/normal.pal b/gfx/pics/dewgong/normal.pal
index 80bca6734..80bca6734 100644
--- a/gfx/pics/087/normal.pal
+++ b/gfx/pics/dewgong/normal.pal
diff --git a/gfx/pics/087/shiny.pal b/gfx/pics/dewgong/shiny.pal
index b9da48134..b9da48134 100644
--- a/gfx/pics/087/shiny.pal
+++ b/gfx/pics/dewgong/shiny.pal
diff --git a/gfx/pics/050/anim0.asm b/gfx/pics/diglett/anim0.asm
index a4d79bd56..a4d79bd56 100644
--- a/gfx/pics/050/anim0.asm
+++ b/gfx/pics/diglett/anim0.asm
diff --git a/gfx/pics/050/anim1.asm b/gfx/pics/diglett/anim1.asm
index bd2a27e03..bd2a27e03 100644
--- a/gfx/pics/050/anim1.asm
+++ b/gfx/pics/diglett/anim1.asm
diff --git a/gfx/pics/050/back.lz b/gfx/pics/diglett/back.6x6.2bpp.lz
index 05625954c..05625954c 100644
--- a/gfx/pics/050/back.lz
+++ b/gfx/pics/diglett/back.6x6.2bpp.lz
diff --git a/gfx/pics/050/bitmask.asm b/gfx/pics/diglett/bitmask.asm
index 54ca8fc52..54ca8fc52 100644
--- a/gfx/pics/050/bitmask.asm
+++ b/gfx/pics/diglett/bitmask.asm
diff --git a/gfx/pics/050/frames.asm b/gfx/pics/diglett/frames.asm
index ec2d64653..ec2d64653 100644
--- a/gfx/pics/050/frames.asm
+++ b/gfx/pics/diglett/frames.asm
diff --git a/gfx/pics/050/front.lz b/gfx/pics/diglett/front.5x5.2bpp.lz
index 5ed5e87ff..5ed5e87ff 100644
--- a/gfx/pics/050/front.lz
+++ b/gfx/pics/diglett/front.5x5.2bpp.lz
diff --git a/gfx/pics/050/normal.pal b/gfx/pics/diglett/normal.pal
index 9eaf1baf0..9eaf1baf0 100644
--- a/gfx/pics/050/normal.pal
+++ b/gfx/pics/diglett/normal.pal
diff --git a/gfx/pics/050/shiny.pal b/gfx/pics/diglett/shiny.pal
index ce41b3928..ce41b3928 100644
--- a/gfx/pics/050/shiny.pal
+++ b/gfx/pics/diglett/shiny.pal
diff --git a/gfx/pics/132/anim0.asm b/gfx/pics/ditto/anim0.asm
index 53f3f9afa..53f3f9afa 100644
--- a/gfx/pics/132/anim0.asm
+++ b/gfx/pics/ditto/anim0.asm
diff --git a/gfx/pics/132/anim1.asm b/gfx/pics/ditto/anim1.asm
index 195808be1..195808be1 100644
--- a/gfx/pics/132/anim1.asm
+++ b/gfx/pics/ditto/anim1.asm
diff --git a/gfx/pics/132/back.lz b/gfx/pics/ditto/back.6x6.2bpp.lz
index ee2a621bf..ee2a621bf 100644
--- a/gfx/pics/132/back.lz
+++ b/gfx/pics/ditto/back.6x6.2bpp.lz
diff --git a/gfx/pics/132/bitmask.asm b/gfx/pics/ditto/bitmask.asm
index 94d8ee8fc..94d8ee8fc 100644
--- a/gfx/pics/132/bitmask.asm
+++ b/gfx/pics/ditto/bitmask.asm
diff --git a/gfx/pics/132/frames.asm b/gfx/pics/ditto/frames.asm
index eabf9f840..eabf9f840 100644
--- a/gfx/pics/132/frames.asm
+++ b/gfx/pics/ditto/frames.asm
diff --git a/gfx/pics/132/front.lz b/gfx/pics/ditto/front.5x5.2bpp.lz
index ef64bd777..ef64bd777 100644
--- a/gfx/pics/132/front.lz
+++ b/gfx/pics/ditto/front.5x5.2bpp.lz
diff --git a/gfx/pics/132/normal.pal b/gfx/pics/ditto/normal.pal
index 00cb0d5e6..00cb0d5e6 100644
--- a/gfx/pics/132/normal.pal
+++ b/gfx/pics/ditto/normal.pal
diff --git a/gfx/pics/132/shiny.pal b/gfx/pics/ditto/shiny.pal
index bcc063864..bcc063864 100644
--- a/gfx/pics/132/shiny.pal
+++ b/gfx/pics/ditto/shiny.pal
diff --git a/gfx/pics/085/anim0.asm b/gfx/pics/dodrio/anim0.asm
index 539f896d7..539f896d7 100644
--- a/gfx/pics/085/anim0.asm
+++ b/gfx/pics/dodrio/anim0.asm
diff --git a/gfx/pics/085/anim1.asm b/gfx/pics/dodrio/anim1.asm
index a921058f3..a921058f3 100644
--- a/gfx/pics/085/anim1.asm
+++ b/gfx/pics/dodrio/anim1.asm
diff --git a/gfx/pics/085/back.lz b/gfx/pics/dodrio/back.6x6.2bpp.lz
index 3b1d80db5..3b1d80db5 100644
--- a/gfx/pics/085/back.lz
+++ b/gfx/pics/dodrio/back.6x6.2bpp.lz
diff --git a/gfx/pics/085/bitmask.asm b/gfx/pics/dodrio/bitmask.asm
index 6af2e59e8..6af2e59e8 100644
--- a/gfx/pics/085/bitmask.asm
+++ b/gfx/pics/dodrio/bitmask.asm
diff --git a/gfx/pics/085/frames.asm b/gfx/pics/dodrio/frames.asm
index e51718307..e51718307 100644
--- a/gfx/pics/085/frames.asm
+++ b/gfx/pics/dodrio/frames.asm
diff --git a/gfx/pics/085/front.lz b/gfx/pics/dodrio/front.7x7.2bpp.lz
index 8de65b2de..8de65b2de 100644
--- a/gfx/pics/085/front.lz
+++ b/gfx/pics/dodrio/front.7x7.2bpp.lz
diff --git a/gfx/pics/085/normal.pal b/gfx/pics/dodrio/normal.pal
index a38c0466c..a38c0466c 100644
--- a/gfx/pics/085/normal.pal
+++ b/gfx/pics/dodrio/normal.pal
diff --git a/gfx/pics/085/shiny.pal b/gfx/pics/dodrio/shiny.pal
index 521bc017b..521bc017b 100644
--- a/gfx/pics/085/shiny.pal
+++ b/gfx/pics/dodrio/shiny.pal
diff --git a/gfx/pics/084/anim0.asm b/gfx/pics/doduo/anim0.asm
index cd38ca192..cd38ca192 100644
--- a/gfx/pics/084/anim0.asm
+++ b/gfx/pics/doduo/anim0.asm
diff --git a/gfx/pics/084/anim1.asm b/gfx/pics/doduo/anim1.asm
index 89715cae8..89715cae8 100644
--- a/gfx/pics/084/anim1.asm
+++ b/gfx/pics/doduo/anim1.asm
diff --git a/gfx/pics/084/back.lz b/gfx/pics/doduo/back.6x6.2bpp.lz
index 8f204150b..8f204150b 100644
--- a/gfx/pics/084/back.lz
+++ b/gfx/pics/doduo/back.6x6.2bpp.lz
diff --git a/gfx/pics/084/bitmask.asm b/gfx/pics/doduo/bitmask.asm
index 0e4fc7906..0e4fc7906 100644
--- a/gfx/pics/084/bitmask.asm
+++ b/gfx/pics/doduo/bitmask.asm
diff --git a/gfx/pics/084/frames.asm b/gfx/pics/doduo/frames.asm
index 1888d2512..1888d2512 100644
--- a/gfx/pics/084/frames.asm
+++ b/gfx/pics/doduo/frames.asm
diff --git a/gfx/pics/084/front.lz b/gfx/pics/doduo/front.5x5.2bpp.lz
index 11d525427..11d525427 100644
--- a/gfx/pics/084/front.lz
+++ b/gfx/pics/doduo/front.5x5.2bpp.lz
diff --git a/gfx/pics/084/normal.pal b/gfx/pics/doduo/normal.pal
index e32cb088f..e32cb088f 100644
--- a/gfx/pics/084/normal.pal
+++ b/gfx/pics/doduo/normal.pal
diff --git a/gfx/pics/084/shiny.pal b/gfx/pics/doduo/shiny.pal
index f8093f636..f8093f636 100644
--- a/gfx/pics/084/shiny.pal
+++ b/gfx/pics/doduo/shiny.pal
diff --git a/gfx/pics/232/anim0.asm b/gfx/pics/donphan/anim0.asm
index fbfbd8d17..fbfbd8d17 100644
--- a/gfx/pics/232/anim0.asm
+++ b/gfx/pics/donphan/anim0.asm
diff --git a/gfx/pics/232/anim1.asm b/gfx/pics/donphan/anim1.asm
index 341013ce9..341013ce9 100644
--- a/gfx/pics/232/anim1.asm
+++ b/gfx/pics/donphan/anim1.asm
diff --git a/gfx/pics/232/back.lz b/gfx/pics/donphan/back.6x6.2bpp.lz
index 4914f03aa..4914f03aa 100644
--- a/gfx/pics/232/back.lz
+++ b/gfx/pics/donphan/back.6x6.2bpp.lz
diff --git a/gfx/pics/232/bitmask.asm b/gfx/pics/donphan/bitmask.asm
index 6891e612a..6891e612a 100644
--- a/gfx/pics/232/bitmask.asm
+++ b/gfx/pics/donphan/bitmask.asm
diff --git a/gfx/pics/232/frames.asm b/gfx/pics/donphan/frames.asm
index b78166e26..b78166e26 100644
--- a/gfx/pics/232/frames.asm
+++ b/gfx/pics/donphan/frames.asm
diff --git a/gfx/pics/232/front.lz b/gfx/pics/donphan/front.7x7.2bpp.lz
index b46d083fc..b46d083fc 100644
--- a/gfx/pics/232/front.lz
+++ b/gfx/pics/donphan/front.7x7.2bpp.lz
diff --git a/gfx/pics/232/normal.pal b/gfx/pics/donphan/normal.pal
index 12e7844dd..12e7844dd 100644
--- a/gfx/pics/232/normal.pal
+++ b/gfx/pics/donphan/normal.pal
diff --git a/gfx/pics/232/shiny.pal b/gfx/pics/donphan/shiny.pal
index d705694c2..d705694c2 100644
--- a/gfx/pics/232/shiny.pal
+++ b/gfx/pics/donphan/shiny.pal
diff --git a/gfx/pics/148/anim0.asm b/gfx/pics/dragonair/anim0.asm
index b7a2be64d..b7a2be64d 100644
--- a/gfx/pics/148/anim0.asm
+++ b/gfx/pics/dragonair/anim0.asm
diff --git a/gfx/pics/148/anim1.asm b/gfx/pics/dragonair/anim1.asm
index afea7ab43..afea7ab43 100644
--- a/gfx/pics/148/anim1.asm
+++ b/gfx/pics/dragonair/anim1.asm
diff --git a/gfx/pics/148/back.lz b/gfx/pics/dragonair/back.6x6.2bpp.lz
index 52094c394..52094c394 100644
--- a/gfx/pics/148/back.lz
+++ b/gfx/pics/dragonair/back.6x6.2bpp.lz
diff --git a/gfx/pics/148/bitmask.asm b/gfx/pics/dragonair/bitmask.asm
index fe0895ff1..fe0895ff1 100644
--- a/gfx/pics/148/bitmask.asm
+++ b/gfx/pics/dragonair/bitmask.asm
diff --git a/gfx/pics/148/frames.asm b/gfx/pics/dragonair/frames.asm
index 3eded4725..3eded4725 100644
--- a/gfx/pics/148/frames.asm
+++ b/gfx/pics/dragonair/frames.asm
diff --git a/gfx/pics/148/front.lz b/gfx/pics/dragonair/front.6x6.2bpp.lz
index aad34536f..aad34536f 100644
--- a/gfx/pics/148/front.lz
+++ b/gfx/pics/dragonair/front.6x6.2bpp.lz
diff --git a/gfx/pics/148/normal.pal b/gfx/pics/dragonair/normal.pal
index ee0234a5e..ee0234a5e 100644
--- a/gfx/pics/148/normal.pal
+++ b/gfx/pics/dragonair/normal.pal
diff --git a/gfx/pics/148/shiny.pal b/gfx/pics/dragonair/shiny.pal
index 744429411..744429411 100644
--- a/gfx/pics/148/shiny.pal
+++ b/gfx/pics/dragonair/shiny.pal
diff --git a/gfx/pics/149/anim0.asm b/gfx/pics/dragonite/anim0.asm
index 9dd6bf84a..9dd6bf84a 100644
--- a/gfx/pics/149/anim0.asm
+++ b/gfx/pics/dragonite/anim0.asm
diff --git a/gfx/pics/149/anim1.asm b/gfx/pics/dragonite/anim1.asm
index fe0d7edbb..fe0d7edbb 100644
--- a/gfx/pics/149/anim1.asm
+++ b/gfx/pics/dragonite/anim1.asm
diff --git a/gfx/pics/149/back.lz b/gfx/pics/dragonite/back.6x6.2bpp.lz
index 09a828dd0..09a828dd0 100644
--- a/gfx/pics/149/back.lz
+++ b/gfx/pics/dragonite/back.6x6.2bpp.lz
diff --git a/gfx/pics/149/bitmask.asm b/gfx/pics/dragonite/bitmask.asm
index 2c426bc4f..2c426bc4f 100644
--- a/gfx/pics/149/bitmask.asm
+++ b/gfx/pics/dragonite/bitmask.asm
diff --git a/gfx/pics/149/frames.asm b/gfx/pics/dragonite/frames.asm
index e07767c56..e07767c56 100644
--- a/gfx/pics/149/frames.asm
+++ b/gfx/pics/dragonite/frames.asm
diff --git a/gfx/pics/149/front.lz b/gfx/pics/dragonite/front.7x7.2bpp.lz
index 730c16739..730c16739 100644
--- a/gfx/pics/149/front.lz
+++ b/gfx/pics/dragonite/front.7x7.2bpp.lz
diff --git a/gfx/pics/149/normal.pal b/gfx/pics/dragonite/normal.pal
index 40f8cf8c8..40f8cf8c8 100644
--- a/gfx/pics/149/normal.pal
+++ b/gfx/pics/dragonite/normal.pal
diff --git a/gfx/pics/149/shiny.pal b/gfx/pics/dragonite/shiny.pal
index f12fb4a7b..f12fb4a7b 100644
--- a/gfx/pics/149/shiny.pal
+++ b/gfx/pics/dragonite/shiny.pal
diff --git a/gfx/pics/147/anim0.asm b/gfx/pics/dratini/anim0.asm
index f844a2eec..f844a2eec 100644
--- a/gfx/pics/147/anim0.asm
+++ b/gfx/pics/dratini/anim0.asm
diff --git a/gfx/pics/147/anim1.asm b/gfx/pics/dratini/anim1.asm
index 441340446..441340446 100644
--- a/gfx/pics/147/anim1.asm
+++ b/gfx/pics/dratini/anim1.asm
diff --git a/gfx/pics/147/back.lz b/gfx/pics/dratini/back.6x6.2bpp.lz
index b40ffcaaf..b40ffcaaf 100644
--- a/gfx/pics/147/back.lz
+++ b/gfx/pics/dratini/back.6x6.2bpp.lz
diff --git a/gfx/pics/147/bitmask.asm b/gfx/pics/dratini/bitmask.asm
index 7a73cf8c5..7a73cf8c5 100644
--- a/gfx/pics/147/bitmask.asm
+++ b/gfx/pics/dratini/bitmask.asm
diff --git a/gfx/pics/147/frames.asm b/gfx/pics/dratini/frames.asm
index fcddd94c3..fcddd94c3 100644
--- a/gfx/pics/147/frames.asm
+++ b/gfx/pics/dratini/frames.asm
diff --git a/gfx/pics/147/front.lz b/gfx/pics/dratini/front.5x5.2bpp.lz
index b933491b7..b933491b7 100644
--- a/gfx/pics/147/front.lz
+++ b/gfx/pics/dratini/front.5x5.2bpp.lz
diff --git a/gfx/pics/147/normal.pal b/gfx/pics/dratini/normal.pal
index d4e9f5109..d4e9f5109 100644
--- a/gfx/pics/147/normal.pal
+++ b/gfx/pics/dratini/normal.pal
diff --git a/gfx/pics/147/shiny.pal b/gfx/pics/dratini/shiny.pal
index e7c9b58a1..e7c9b58a1 100644
--- a/gfx/pics/147/shiny.pal
+++ b/gfx/pics/dratini/shiny.pal
diff --git a/gfx/pics/096/anim0.asm b/gfx/pics/drowzee/anim0.asm
index badc99074..badc99074 100644
--- a/gfx/pics/096/anim0.asm
+++ b/gfx/pics/drowzee/anim0.asm
diff --git a/gfx/pics/096/anim1.asm b/gfx/pics/drowzee/anim1.asm
index 247ecb8fe..247ecb8fe 100644
--- a/gfx/pics/096/anim1.asm
+++ b/gfx/pics/drowzee/anim1.asm
diff --git a/gfx/pics/096/back.lz b/gfx/pics/drowzee/back.6x6.2bpp.lz
index a4218ade7..a4218ade7 100644
--- a/gfx/pics/096/back.lz
+++ b/gfx/pics/drowzee/back.6x6.2bpp.lz
diff --git a/gfx/pics/096/bitmask.asm b/gfx/pics/drowzee/bitmask.asm
index bd9fa59e6..bd9fa59e6 100644
--- a/gfx/pics/096/bitmask.asm
+++ b/gfx/pics/drowzee/bitmask.asm
diff --git a/gfx/pics/096/frames.asm b/gfx/pics/drowzee/frames.asm
index 637706e1b..637706e1b 100644
--- a/gfx/pics/096/frames.asm
+++ b/gfx/pics/drowzee/frames.asm
diff --git a/gfx/pics/096/front.lz b/gfx/pics/drowzee/front.6x6.2bpp.lz
index cf3f87571..cf3f87571 100644
--- a/gfx/pics/096/front.lz
+++ b/gfx/pics/drowzee/front.6x6.2bpp.lz
diff --git a/gfx/pics/096/normal.pal b/gfx/pics/drowzee/normal.pal
index e1e6b8d0c..e1e6b8d0c 100644
--- a/gfx/pics/096/normal.pal
+++ b/gfx/pics/drowzee/normal.pal
diff --git a/gfx/pics/096/shiny.pal b/gfx/pics/drowzee/shiny.pal
index 2b0946ece..2b0946ece 100644
--- a/gfx/pics/096/shiny.pal
+++ b/gfx/pics/drowzee/shiny.pal
diff --git a/gfx/pics/051/anim0.asm b/gfx/pics/dugtrio/anim0.asm
index 7b5038620..7b5038620 100644
--- a/gfx/pics/051/anim0.asm
+++ b/gfx/pics/dugtrio/anim0.asm
diff --git a/gfx/pics/051/anim1.asm b/gfx/pics/dugtrio/anim1.asm
index 1b32b854c..1b32b854c 100644
--- a/gfx/pics/051/anim1.asm
+++ b/gfx/pics/dugtrio/anim1.asm
diff --git a/gfx/pics/051/back.lz b/gfx/pics/dugtrio/back.6x6.2bpp.lz
index 05ad7b1ad..05ad7b1ad 100644
--- a/gfx/pics/051/back.lz
+++ b/gfx/pics/dugtrio/back.6x6.2bpp.lz
diff --git a/gfx/pics/051/bitmask.asm b/gfx/pics/dugtrio/bitmask.asm
index 0a2dc6df2..0a2dc6df2 100644
--- a/gfx/pics/051/bitmask.asm
+++ b/gfx/pics/dugtrio/bitmask.asm
diff --git a/gfx/pics/051/frames.asm b/gfx/pics/dugtrio/frames.asm
index 72cf2e6be..72cf2e6be 100644
--- a/gfx/pics/051/frames.asm
+++ b/gfx/pics/dugtrio/frames.asm
diff --git a/gfx/pics/051/front.lz b/gfx/pics/dugtrio/front.7x7.2bpp.lz
index 7ef2606cd..7ef2606cd 100644
--- a/gfx/pics/051/front.lz
+++ b/gfx/pics/dugtrio/front.7x7.2bpp.lz
diff --git a/gfx/pics/051/normal.pal b/gfx/pics/dugtrio/normal.pal
index 9eaf1baf0..9eaf1baf0 100644
--- a/gfx/pics/051/normal.pal
+++ b/gfx/pics/dugtrio/normal.pal
diff --git a/gfx/pics/051/shiny.pal b/gfx/pics/dugtrio/shiny.pal
index ce41b3928..ce41b3928 100644
--- a/gfx/pics/051/shiny.pal
+++ b/gfx/pics/dugtrio/shiny.pal
diff --git a/gfx/pics/206/anim0.asm b/gfx/pics/dunsparce/anim0.asm
index b4217afbd..b4217afbd 100644
--- a/gfx/pics/206/anim0.asm
+++ b/gfx/pics/dunsparce/anim0.asm
diff --git a/gfx/pics/206/anim1.asm b/gfx/pics/dunsparce/anim1.asm
index f5d6d9b05..f5d6d9b05 100644
--- a/gfx/pics/206/anim1.asm
+++ b/gfx/pics/dunsparce/anim1.asm
diff --git a/gfx/pics/206/back.lz b/gfx/pics/dunsparce/back.6x6.2bpp.lz
index 1042b07f8..1042b07f8 100644
--- a/gfx/pics/206/back.lz
+++ b/gfx/pics/dunsparce/back.6x6.2bpp.lz
diff --git a/gfx/pics/206/bitmask.asm b/gfx/pics/dunsparce/bitmask.asm
index e3c9c1a36..e3c9c1a36 100644
--- a/gfx/pics/206/bitmask.asm
+++ b/gfx/pics/dunsparce/bitmask.asm
diff --git a/gfx/pics/206/frames.asm b/gfx/pics/dunsparce/frames.asm
index 65dfd39cc..65dfd39cc 100644
--- a/gfx/pics/206/frames.asm
+++ b/gfx/pics/dunsparce/frames.asm
diff --git a/gfx/pics/206/front.lz b/gfx/pics/dunsparce/front.6x6.2bpp.lz
index 31e9aa319..31e9aa319 100644
--- a/gfx/pics/206/front.lz
+++ b/gfx/pics/dunsparce/front.6x6.2bpp.lz
diff --git a/gfx/pics/206/normal.pal b/gfx/pics/dunsparce/normal.pal
index c0c5b25d7..c0c5b25d7 100644
--- a/gfx/pics/206/normal.pal
+++ b/gfx/pics/dunsparce/normal.pal
diff --git a/gfx/pics/206/shiny.pal b/gfx/pics/dunsparce/shiny.pal
index a86589ee4..a86589ee4 100644
--- a/gfx/pics/206/shiny.pal
+++ b/gfx/pics/dunsparce/shiny.pal
diff --git a/gfx/pics/133/anim0.asm b/gfx/pics/eevee/anim0.asm
index 537cefb83..537cefb83 100644
--- a/gfx/pics/133/anim0.asm
+++ b/gfx/pics/eevee/anim0.asm
diff --git a/gfx/pics/133/anim1.asm b/gfx/pics/eevee/anim1.asm
index 0f50b3cb8..0f50b3cb8 100644
--- a/gfx/pics/133/anim1.asm
+++ b/gfx/pics/eevee/anim1.asm
diff --git a/gfx/pics/133/back.lz b/gfx/pics/eevee/back.6x6.2bpp.lz
index ddd051f3a..ddd051f3a 100644
--- a/gfx/pics/133/back.lz
+++ b/gfx/pics/eevee/back.6x6.2bpp.lz
diff --git a/gfx/pics/133/bitmask.asm b/gfx/pics/eevee/bitmask.asm
index 654492f61..654492f61 100644
--- a/gfx/pics/133/bitmask.asm
+++ b/gfx/pics/eevee/bitmask.asm
diff --git a/gfx/pics/133/frames.asm b/gfx/pics/eevee/frames.asm
index 61da3fb18..61da3fb18 100644
--- a/gfx/pics/133/frames.asm
+++ b/gfx/pics/eevee/frames.asm
diff --git a/gfx/pics/133/front.lz b/gfx/pics/eevee/front.5x5.2bpp.lz
index aea8d545e..aea8d545e 100644
--- a/gfx/pics/133/front.lz
+++ b/gfx/pics/eevee/front.5x5.2bpp.lz
diff --git a/gfx/pics/133/normal.pal b/gfx/pics/eevee/normal.pal
index d09dba19e..d09dba19e 100644
--- a/gfx/pics/133/normal.pal
+++ b/gfx/pics/eevee/normal.pal
diff --git a/gfx/pics/133/shiny.pal b/gfx/pics/eevee/shiny.pal
index 69759609c..69759609c 100644
--- a/gfx/pics/133/shiny.pal
+++ b/gfx/pics/eevee/shiny.pal
diff --git a/gfx/pics/egg/front.lz b/gfx/pics/egg/front.5x5.2bpp.lz
index 47d8b997e..47d8b997e 100644
--- a/gfx/pics/egg/front.lz
+++ b/gfx/pics/egg/front.5x5.2bpp.lz
diff --git a/gfx/pics/023/anim0.asm b/gfx/pics/ekans/anim0.asm
index 9728434c0..9728434c0 100644
--- a/gfx/pics/023/anim0.asm
+++ b/gfx/pics/ekans/anim0.asm
diff --git a/gfx/pics/023/anim1.asm b/gfx/pics/ekans/anim1.asm
index 660a4f971..660a4f971 100644
--- a/gfx/pics/023/anim1.asm
+++ b/gfx/pics/ekans/anim1.asm
diff --git a/gfx/pics/023/back.lz b/gfx/pics/ekans/back.6x6.2bpp.lz
index 07785737f..07785737f 100644
--- a/gfx/pics/023/back.lz
+++ b/gfx/pics/ekans/back.6x6.2bpp.lz
diff --git a/gfx/pics/023/bitmask.asm b/gfx/pics/ekans/bitmask.asm
index a3c61a4d3..a3c61a4d3 100644
--- a/gfx/pics/023/bitmask.asm
+++ b/gfx/pics/ekans/bitmask.asm
diff --git a/gfx/pics/023/frames.asm b/gfx/pics/ekans/frames.asm
index 6bd3fc1d6..6bd3fc1d6 100644
--- a/gfx/pics/023/frames.asm
+++ b/gfx/pics/ekans/frames.asm
diff --git a/gfx/pics/023/front.lz b/gfx/pics/ekans/front.5x5.2bpp.lz
index efa075fab..efa075fab 100644
--- a/gfx/pics/023/front.lz
+++ b/gfx/pics/ekans/front.5x5.2bpp.lz
diff --git a/gfx/pics/023/normal.pal b/gfx/pics/ekans/normal.pal
index a98f678b9..a98f678b9 100644
--- a/gfx/pics/023/normal.pal
+++ b/gfx/pics/ekans/normal.pal
diff --git a/gfx/pics/023/shiny.pal b/gfx/pics/ekans/shiny.pal
index 6f71f8cbb..6f71f8cbb 100644
--- a/gfx/pics/023/shiny.pal
+++ b/gfx/pics/ekans/shiny.pal
diff --git a/gfx/pics/125/anim0.asm b/gfx/pics/electabuzz/anim0.asm
index 4e2a550ed..4e2a550ed 100644
--- a/gfx/pics/125/anim0.asm
+++ b/gfx/pics/electabuzz/anim0.asm
diff --git a/gfx/pics/125/anim1.asm b/gfx/pics/electabuzz/anim1.asm
index efff4b3db..efff4b3db 100644
--- a/gfx/pics/125/anim1.asm
+++ b/gfx/pics/electabuzz/anim1.asm
diff --git a/gfx/pics/125/back.lz b/gfx/pics/electabuzz/back.6x6.2bpp.lz
index b64bc1ca1..b64bc1ca1 100644
--- a/gfx/pics/125/back.lz
+++ b/gfx/pics/electabuzz/back.6x6.2bpp.lz
diff --git a/gfx/pics/125/bitmask.asm b/gfx/pics/electabuzz/bitmask.asm
index 240c2dd37..240c2dd37 100644
--- a/gfx/pics/125/bitmask.asm
+++ b/gfx/pics/electabuzz/bitmask.asm
diff --git a/gfx/pics/125/frames.asm b/gfx/pics/electabuzz/frames.asm
index 1f3e52ada..1f3e52ada 100644
--- a/gfx/pics/125/frames.asm
+++ b/gfx/pics/electabuzz/frames.asm
diff --git a/gfx/pics/125/front.lz b/gfx/pics/electabuzz/front.6x6.2bpp.lz
index 645db8d4d..645db8d4d 100644
--- a/gfx/pics/125/front.lz
+++ b/gfx/pics/electabuzz/front.6x6.2bpp.lz
diff --git a/gfx/pics/125/normal.pal b/gfx/pics/electabuzz/normal.pal
index 71fecfa13..71fecfa13 100644
--- a/gfx/pics/125/normal.pal
+++ b/gfx/pics/electabuzz/normal.pal
diff --git a/gfx/pics/125/shiny.pal b/gfx/pics/electabuzz/shiny.pal
index e932aa461..e932aa461 100644
--- a/gfx/pics/125/shiny.pal
+++ b/gfx/pics/electabuzz/shiny.pal
diff --git a/gfx/pics/101/anim0.asm b/gfx/pics/electrode/anim0.asm
index 18b31e305..18b31e305 100644
--- a/gfx/pics/101/anim0.asm
+++ b/gfx/pics/electrode/anim0.asm
diff --git a/gfx/pics/101/anim1.asm b/gfx/pics/electrode/anim1.asm
index 30d1b1788..30d1b1788 100644
--- a/gfx/pics/101/anim1.asm
+++ b/gfx/pics/electrode/anim1.asm
diff --git a/gfx/pics/101/back.lz b/gfx/pics/electrode/back.6x6.2bpp.lz
index 9161c8884..9161c8884 100644
--- a/gfx/pics/101/back.lz
+++ b/gfx/pics/electrode/back.6x6.2bpp.lz
diff --git a/gfx/pics/101/bitmask.asm b/gfx/pics/electrode/bitmask.asm
index 00990061d..00990061d 100644
--- a/gfx/pics/101/bitmask.asm
+++ b/gfx/pics/electrode/bitmask.asm
diff --git a/gfx/pics/101/frames.asm b/gfx/pics/electrode/frames.asm
index cdb569481..cdb569481 100644
--- a/gfx/pics/101/frames.asm
+++ b/gfx/pics/electrode/frames.asm
diff --git a/gfx/pics/101/front.lz b/gfx/pics/electrode/front.5x5.2bpp.lz
index 2d86aa4ac..2d86aa4ac 100644
--- a/gfx/pics/101/front.lz
+++ b/gfx/pics/electrode/front.5x5.2bpp.lz
diff --git a/gfx/pics/100/normal.pal b/gfx/pics/electrode/normal.pal
index 07658abee..07658abee 100644
--- a/gfx/pics/100/normal.pal
+++ b/gfx/pics/electrode/normal.pal
diff --git a/gfx/pics/100/shiny.pal b/gfx/pics/electrode/shiny.pal
index b8509a81f..b8509a81f 100644
--- a/gfx/pics/100/shiny.pal
+++ b/gfx/pics/electrode/shiny.pal
diff --git a/gfx/pics/239/anim0.asm b/gfx/pics/elekid/anim0.asm
index 590dccf14..590dccf14 100644
--- a/gfx/pics/239/anim0.asm
+++ b/gfx/pics/elekid/anim0.asm
diff --git a/gfx/pics/239/anim1.asm b/gfx/pics/elekid/anim1.asm
index cd10626f6..cd10626f6 100644
--- a/gfx/pics/239/anim1.asm
+++ b/gfx/pics/elekid/anim1.asm
diff --git a/gfx/pics/239/back.lz b/gfx/pics/elekid/back.6x6.2bpp.lz
index fd8dd04df..fd8dd04df 100644
--- a/gfx/pics/239/back.lz
+++ b/gfx/pics/elekid/back.6x6.2bpp.lz
diff --git a/gfx/pics/239/bitmask.asm b/gfx/pics/elekid/bitmask.asm
index f0f1fc48a..f0f1fc48a 100644
--- a/gfx/pics/239/bitmask.asm
+++ b/gfx/pics/elekid/bitmask.asm
diff --git a/gfx/pics/239/frames.asm b/gfx/pics/elekid/frames.asm
index 22fe6b955..22fe6b955 100644
--- a/gfx/pics/239/frames.asm
+++ b/gfx/pics/elekid/frames.asm
diff --git a/gfx/pics/239/front.lz b/gfx/pics/elekid/front.6x6.2bpp.lz
index dde6b0e0b..dde6b0e0b 100644
--- a/gfx/pics/239/front.lz
+++ b/gfx/pics/elekid/front.6x6.2bpp.lz
diff --git a/gfx/pics/239/normal.pal b/gfx/pics/elekid/normal.pal
index f670fee1c..f670fee1c 100644
--- a/gfx/pics/239/normal.pal
+++ b/gfx/pics/elekid/normal.pal
diff --git a/gfx/pics/239/shiny.pal b/gfx/pics/elekid/shiny.pal
index 4eb42c6d4..4eb42c6d4 100644
--- a/gfx/pics/239/shiny.pal
+++ b/gfx/pics/elekid/shiny.pal
diff --git a/gfx/pics/244/anim0.asm b/gfx/pics/entei/anim0.asm
index 66c2c128d..66c2c128d 100644
--- a/gfx/pics/244/anim0.asm
+++ b/gfx/pics/entei/anim0.asm
diff --git a/gfx/pics/244/anim1.asm b/gfx/pics/entei/anim1.asm
index f20e5d072..f20e5d072 100644
--- a/gfx/pics/244/anim1.asm
+++ b/gfx/pics/entei/anim1.asm
diff --git a/gfx/pics/244/back.lz b/gfx/pics/entei/back.6x6.2bpp.lz
index 7f2440f51..7f2440f51 100644
--- a/gfx/pics/244/back.lz
+++ b/gfx/pics/entei/back.6x6.2bpp.lz
diff --git a/gfx/pics/244/bitmask.asm b/gfx/pics/entei/bitmask.asm
index 87f417106..87f417106 100644
--- a/gfx/pics/244/bitmask.asm
+++ b/gfx/pics/entei/bitmask.asm
diff --git a/gfx/pics/244/frames.asm b/gfx/pics/entei/frames.asm
index 3034f66a3..3034f66a3 100644
--- a/gfx/pics/244/frames.asm
+++ b/gfx/pics/entei/frames.asm
diff --git a/gfx/pics/244/front.lz b/gfx/pics/entei/front.7x7.2bpp.lz
index bc969fe65..bc969fe65 100644
--- a/gfx/pics/244/front.lz
+++ b/gfx/pics/entei/front.7x7.2bpp.lz
diff --git a/gfx/pics/244/normal.pal b/gfx/pics/entei/normal.pal
index 509503c68..509503c68 100644
--- a/gfx/pics/244/normal.pal
+++ b/gfx/pics/entei/normal.pal
diff --git a/gfx/pics/244/shiny.pal b/gfx/pics/entei/shiny.pal
index e806f7e00..e806f7e00 100644
--- a/gfx/pics/244/shiny.pal
+++ b/gfx/pics/entei/shiny.pal
diff --git a/gfx/pics/196/anim0.asm b/gfx/pics/espeon/anim0.asm
index 8a54a9b97..8a54a9b97 100644
--- a/gfx/pics/196/anim0.asm
+++ b/gfx/pics/espeon/anim0.asm
diff --git a/gfx/pics/196/anim1.asm b/gfx/pics/espeon/anim1.asm
index 33c88d1b4..33c88d1b4 100644
--- a/gfx/pics/196/anim1.asm
+++ b/gfx/pics/espeon/anim1.asm
diff --git a/gfx/pics/196/back.lz b/gfx/pics/espeon/back.6x6.2bpp.lz
index 59a69eae1..59a69eae1 100644
--- a/gfx/pics/196/back.lz
+++ b/gfx/pics/espeon/back.6x6.2bpp.lz
diff --git a/gfx/pics/196/bitmask.asm b/gfx/pics/espeon/bitmask.asm
index 48d53b916..48d53b916 100644
--- a/gfx/pics/196/bitmask.asm
+++ b/gfx/pics/espeon/bitmask.asm
diff --git a/gfx/pics/196/frames.asm b/gfx/pics/espeon/frames.asm
index 4fdf41370..4fdf41370 100644
--- a/gfx/pics/196/frames.asm
+++ b/gfx/pics/espeon/frames.asm
diff --git a/gfx/pics/196/front.lz b/gfx/pics/espeon/front.6x6.2bpp.lz
index b7d983e9f..b7d983e9f 100644
--- a/gfx/pics/196/front.lz
+++ b/gfx/pics/espeon/front.6x6.2bpp.lz
diff --git a/gfx/pics/196/normal.pal b/gfx/pics/espeon/normal.pal
index d730e22ce..d730e22ce 100644
--- a/gfx/pics/196/normal.pal
+++ b/gfx/pics/espeon/normal.pal
diff --git a/gfx/pics/196/shiny.pal b/gfx/pics/espeon/shiny.pal
index 8f2343d89..8f2343d89 100644
--- a/gfx/pics/196/shiny.pal
+++ b/gfx/pics/espeon/shiny.pal
diff --git a/gfx/pics/102/anim0.asm b/gfx/pics/exeggcute/anim0.asm
index 0f0c10729..0f0c10729 100644
--- a/gfx/pics/102/anim0.asm
+++ b/gfx/pics/exeggcute/anim0.asm
diff --git a/gfx/pics/102/anim1.asm b/gfx/pics/exeggcute/anim1.asm
index ef839f5d1..ef839f5d1 100644
--- a/gfx/pics/102/anim1.asm
+++ b/gfx/pics/exeggcute/anim1.asm
diff --git a/gfx/pics/102/back.lz b/gfx/pics/exeggcute/back.6x6.2bpp.lz
index 1877fcea1..1877fcea1 100644
--- a/gfx/pics/102/back.lz
+++ b/gfx/pics/exeggcute/back.6x6.2bpp.lz
diff --git a/gfx/pics/102/bitmask.asm b/gfx/pics/exeggcute/bitmask.asm
index 88506f525..88506f525 100644
--- a/gfx/pics/102/bitmask.asm
+++ b/gfx/pics/exeggcute/bitmask.asm
diff --git a/gfx/pics/102/frames.asm b/gfx/pics/exeggcute/frames.asm
index c0ef904a0..c0ef904a0 100644
--- a/gfx/pics/102/frames.asm
+++ b/gfx/pics/exeggcute/frames.asm
diff --git a/gfx/pics/102/front.lz b/gfx/pics/exeggcute/front.7x7.2bpp.lz
index 9d018e7c4..9d018e7c4 100644
--- a/gfx/pics/102/front.lz
+++ b/gfx/pics/exeggcute/front.7x7.2bpp.lz
diff --git a/gfx/pics/102/normal.pal b/gfx/pics/exeggcute/normal.pal
index 539432719..539432719 100644
--- a/gfx/pics/102/normal.pal
+++ b/gfx/pics/exeggcute/normal.pal
diff --git a/gfx/pics/102/shiny.pal b/gfx/pics/exeggcute/shiny.pal
index 63686e6f0..63686e6f0 100644
--- a/gfx/pics/102/shiny.pal
+++ b/gfx/pics/exeggcute/shiny.pal
diff --git a/gfx/pics/103/anim0.asm b/gfx/pics/exeggutor/anim0.asm
index 92f11a117..92f11a117 100644
--- a/gfx/pics/103/anim0.asm
+++ b/gfx/pics/exeggutor/anim0.asm
diff --git a/gfx/pics/103/anim1.asm b/gfx/pics/exeggutor/anim1.asm
index 3e5542c97..3e5542c97 100644
--- a/gfx/pics/103/anim1.asm
+++ b/gfx/pics/exeggutor/anim1.asm
diff --git a/gfx/pics/103/back.lz b/gfx/pics/exeggutor/back.6x6.2bpp.lz
index abf6c97dd..abf6c97dd 100644
--- a/gfx/pics/103/back.lz
+++ b/gfx/pics/exeggutor/back.6x6.2bpp.lz
diff --git a/gfx/pics/103/bitmask.asm b/gfx/pics/exeggutor/bitmask.asm
index 117b07532..117b07532 100644
--- a/gfx/pics/103/bitmask.asm
+++ b/gfx/pics/exeggutor/bitmask.asm
diff --git a/gfx/pics/103/frames.asm b/gfx/pics/exeggutor/frames.asm
index 6b815a8aa..6b815a8aa 100644
--- a/gfx/pics/103/frames.asm
+++ b/gfx/pics/exeggutor/frames.asm
diff --git a/gfx/pics/103/front.lz b/gfx/pics/exeggutor/front.7x7.2bpp.lz
index b4056b175..b4056b175 100644
--- a/gfx/pics/103/front.lz
+++ b/gfx/pics/exeggutor/front.7x7.2bpp.lz
diff --git a/gfx/pics/103/normal.pal b/gfx/pics/exeggutor/normal.pal
index 0318f71a5..0318f71a5 100644
--- a/gfx/pics/103/normal.pal
+++ b/gfx/pics/exeggutor/normal.pal
diff --git a/gfx/pics/103/shiny.pal b/gfx/pics/exeggutor/shiny.pal
index c580552e0..c580552e0 100644
--- a/gfx/pics/103/shiny.pal
+++ b/gfx/pics/exeggutor/shiny.pal
diff --git a/gfx/pics/extras.asm b/gfx/pics/extras.asm
index 8e33b2dfe..682cbb635 100644
--- a/gfx/pics/extras.asm
+++ b/gfx/pics/extras.asm
@@ -1,252 +1,252 @@
-BulbasaurAnimationExtra:  INCLUDE "gfx/pics/001/anim1.asm"
-IvysaurAnimationExtra:    INCLUDE "gfx/pics/002/anim1.asm"
-VenusaurAnimationExtra:   INCLUDE "gfx/pics/003/anim1.asm"
-CharmanderAnimationExtra: INCLUDE "gfx/pics/004/anim1.asm"
-CharmeleonAnimationExtra: INCLUDE "gfx/pics/005/anim1.asm"
-CharizardAnimationExtra:  INCLUDE "gfx/pics/006/anim1.asm"
-SquirtleAnimationExtra:   INCLUDE "gfx/pics/007/anim1.asm"
-WartortleAnimationExtra:  INCLUDE "gfx/pics/008/anim1.asm"
-BlastoiseAnimationExtra:  INCLUDE "gfx/pics/009/anim1.asm"
-CaterpieAnimationExtra:   INCLUDE "gfx/pics/010/anim1.asm"
-MetapodAnimationExtra:    INCLUDE "gfx/pics/011/anim1.asm"
-ButterfreeAnimationExtra: INCLUDE "gfx/pics/012/anim1.asm"
-WeedleAnimationExtra:     INCLUDE "gfx/pics/013/anim1.asm"
-KakunaAnimationExtra:     INCLUDE "gfx/pics/014/anim1.asm"
-BeedrillAnimationExtra:   INCLUDE "gfx/pics/015/anim1.asm"
-PidgeyAnimationExtra:     INCLUDE "gfx/pics/016/anim1.asm"
-PidgeottoAnimationExtra:  INCLUDE "gfx/pics/017/anim1.asm"
-PidgeotAnimationExtra:    INCLUDE "gfx/pics/018/anim1.asm"
-RattataAnimationExtra:    INCLUDE "gfx/pics/019/anim1.asm"
-RaticateAnimationExtra:   INCLUDE "gfx/pics/020/anim1.asm"
-SpearowAnimationExtra:    INCLUDE "gfx/pics/021/anim1.asm"
-FearowAnimationExtra:     INCLUDE "gfx/pics/022/anim1.asm"
-EkansAnimationExtra:      INCLUDE "gfx/pics/023/anim1.asm"
-ArbokAnimationExtra:      INCLUDE "gfx/pics/024/anim1.asm"
-PikachuAnimationExtra:    INCLUDE "gfx/pics/025/anim1.asm"
-RaichuAnimationExtra:     INCLUDE "gfx/pics/026/anim1.asm"
-SandshrewAnimationExtra:  INCLUDE "gfx/pics/027/anim1.asm"
-SandslashAnimationExtra:  INCLUDE "gfx/pics/028/anim1.asm"
-NidoranFAnimationExtra:   INCLUDE "gfx/pics/029/anim1.asm"
-NidorinaAnimationExtra:   INCLUDE "gfx/pics/030/anim1.asm"
-NidoqueenAnimationExtra:  INCLUDE "gfx/pics/031/anim1.asm"
-NidoranMAnimationExtra:   INCLUDE "gfx/pics/032/anim1.asm"
-NidorinoAnimationExtra:   INCLUDE "gfx/pics/033/anim1.asm"
-NidokingAnimationExtra:   INCLUDE "gfx/pics/034/anim1.asm"
-ClefairyAnimationExtra:   INCLUDE "gfx/pics/035/anim1.asm"
-ClefableAnimationExtra:   INCLUDE "gfx/pics/036/anim1.asm"
-VulpixAnimationExtra:     INCLUDE "gfx/pics/037/anim1.asm"
-NinetalesAnimationExtra:  INCLUDE "gfx/pics/038/anim1.asm"
-JigglypuffAnimationExtra: INCLUDE "gfx/pics/039/anim1.asm"
-WigglytuffAnimationExtra: INCLUDE "gfx/pics/040/anim1.asm"
-ZubatAnimationExtra:      INCLUDE "gfx/pics/041/anim1.asm"
-GolbatAnimationExtra:     INCLUDE "gfx/pics/042/anim1.asm"
-OddishAnimationExtra:     INCLUDE "gfx/pics/043/anim1.asm"
-GloomAnimationExtra:      INCLUDE "gfx/pics/044/anim1.asm"
-VileplumeAnimationExtra:  INCLUDE "gfx/pics/045/anim1.asm"
-ParasAnimationExtra:      INCLUDE "gfx/pics/046/anim1.asm"
-ParasectAnimationExtra:   INCLUDE "gfx/pics/047/anim1.asm"
-VenonatAnimationExtra:    INCLUDE "gfx/pics/048/anim1.asm"
-VenomothAnimationExtra:   INCLUDE "gfx/pics/049/anim1.asm"
-DiglettAnimationExtra:    INCLUDE "gfx/pics/050/anim1.asm"
-DugtrioAnimationExtra:    INCLUDE "gfx/pics/051/anim1.asm"
-MeowthAnimationExtra:     INCLUDE "gfx/pics/052/anim1.asm"
-PersianAnimationExtra:    INCLUDE "gfx/pics/053/anim1.asm"
-PsyduckAnimationExtra:    INCLUDE "gfx/pics/054/anim1.asm"
-GolduckAnimationExtra:    INCLUDE "gfx/pics/055/anim1.asm"
-MankeyAnimationExtra:     INCLUDE "gfx/pics/056/anim1.asm"
-PrimeapeAnimationExtra:   INCLUDE "gfx/pics/057/anim1.asm"
-GrowlitheAnimationExtra:  INCLUDE "gfx/pics/058/anim1.asm"
-ArcanineAnimationExtra:   INCLUDE "gfx/pics/059/anim1.asm"
-PoliwagAnimationExtra:    INCLUDE "gfx/pics/060/anim1.asm"
-PoliwhirlAnimationExtra:  INCLUDE "gfx/pics/061/anim1.asm"
-PoliwrathAnimationExtra:  INCLUDE "gfx/pics/062/anim1.asm"
-AbraAnimationExtra:       INCLUDE "gfx/pics/063/anim1.asm"
-KadabraAnimationExtra:    INCLUDE "gfx/pics/064/anim1.asm"
-AlakazamAnimationExtra:   INCLUDE "gfx/pics/065/anim1.asm"
-MachopAnimationExtra:     INCLUDE "gfx/pics/066/anim1.asm"
-MachokeAnimationExtra:    INCLUDE "gfx/pics/067/anim1.asm"
-MachampAnimationExtra:    INCLUDE "gfx/pics/068/anim1.asm"
-BellsproutAnimationExtra: INCLUDE "gfx/pics/069/anim1.asm"
-WeepinbellAnimationExtra: INCLUDE "gfx/pics/070/anim1.asm"
-VictreebelAnimationExtra: INCLUDE "gfx/pics/071/anim1.asm"
-TentacoolAnimationExtra:  INCLUDE "gfx/pics/072/anim1.asm"
-TentacruelAnimationExtra: INCLUDE "gfx/pics/073/anim1.asm"
-GeodudeAnimationExtra:    INCLUDE "gfx/pics/074/anim1.asm"
-GravelerAnimationExtra:   INCLUDE "gfx/pics/075/anim1.asm"
-GolemAnimationExtra:      INCLUDE "gfx/pics/076/anim1.asm"
-PonytaAnimationExtra:     INCLUDE "gfx/pics/077/anim1.asm"
-RapidashAnimationExtra:   INCLUDE "gfx/pics/078/anim1.asm"
-SlowpokeAnimationExtra:   INCLUDE "gfx/pics/079/anim1.asm"
-SlowbroAnimationExtra:    INCLUDE "gfx/pics/080/anim1.asm"
-MagnemiteAnimationExtra:  INCLUDE "gfx/pics/081/anim1.asm"
-MagnetonAnimationExtra:   INCLUDE "gfx/pics/082/anim1.asm"
-FarfetchDAnimationExtra:  INCLUDE "gfx/pics/083/anim1.asm"
-DoduoAnimationExtra:      INCLUDE "gfx/pics/084/anim1.asm"
-DodrioAnimationExtra:     INCLUDE "gfx/pics/085/anim1.asm"
-SeelAnimationExtra:       INCLUDE "gfx/pics/086/anim1.asm"
-DewgongAnimationExtra:    INCLUDE "gfx/pics/087/anim1.asm"
-GrimerAnimationExtra:     INCLUDE "gfx/pics/088/anim1.asm"
-MukAnimationExtra:        INCLUDE "gfx/pics/089/anim1.asm"
-ShellderAnimationExtra:   INCLUDE "gfx/pics/090/anim1.asm"
-CloysterAnimationExtra:   INCLUDE "gfx/pics/091/anim1.asm"
-GastlyAnimationExtra:     INCLUDE "gfx/pics/092/anim1.asm"
-HaunterAnimationExtra:    INCLUDE "gfx/pics/093/anim1.asm"
-GengarAnimationExtra:     INCLUDE "gfx/pics/094/anim1.asm"
-OnixAnimationExtra:       INCLUDE "gfx/pics/095/anim1.asm"
-DrowzeeAnimationExtra:    INCLUDE "gfx/pics/096/anim1.asm"
-HypnoAnimationExtra:      INCLUDE "gfx/pics/097/anim1.asm"
-KrabbyAnimationExtra:     INCLUDE "gfx/pics/098/anim1.asm"
-KinglerAnimationExtra:    INCLUDE "gfx/pics/099/anim1.asm"
-VoltorbAnimationExtra:    INCLUDE "gfx/pics/100/anim1.asm"
-ElectrodeAnimationExtra:  INCLUDE "gfx/pics/101/anim1.asm"
-ExeggcuteAnimationExtra:  INCLUDE "gfx/pics/102/anim1.asm"
-ExeggutorAnimationExtra:  INCLUDE "gfx/pics/103/anim1.asm"
-CuboneAnimationExtra:     INCLUDE "gfx/pics/104/anim1.asm"
-MarowakAnimationExtra:    INCLUDE "gfx/pics/105/anim1.asm"
-HitmonleeAnimationExtra:  INCLUDE "gfx/pics/106/anim1.asm"
-HitmonchanAnimationExtra: INCLUDE "gfx/pics/107/anim1.asm"
-LickitungAnimationExtra:  INCLUDE "gfx/pics/108/anim1.asm"
-KoffingAnimationExtra:    INCLUDE "gfx/pics/109/anim1.asm"
-WeezingAnimationExtra:    INCLUDE "gfx/pics/110/anim1.asm"
-RhyhornAnimationExtra:    INCLUDE "gfx/pics/111/anim1.asm"
-RhydonAnimationExtra:     INCLUDE "gfx/pics/112/anim1.asm"
-ChanseyAnimationExtra:    INCLUDE "gfx/pics/113/anim1.asm"
-TangelaAnimationExtra:    INCLUDE "gfx/pics/114/anim1.asm"
-KangaskhanAnimationExtra: INCLUDE "gfx/pics/115/anim1.asm"
-HorseaAnimationExtra:     INCLUDE "gfx/pics/116/anim1.asm"
-SeadraAnimationExtra:     INCLUDE "gfx/pics/117/anim1.asm"
-GoldeenAnimationExtra:    INCLUDE "gfx/pics/118/anim1.asm"
-SeakingAnimationExtra:    INCLUDE "gfx/pics/119/anim1.asm"
-StaryuAnimationExtra:     INCLUDE "gfx/pics/120/anim1.asm"
-StarmieAnimationExtra:    INCLUDE "gfx/pics/121/anim1.asm"
-MrMimeAnimationExtra:     INCLUDE "gfx/pics/122/anim1.asm"
-ScytherAnimationExtra:    INCLUDE "gfx/pics/123/anim1.asm"
-JynxAnimationExtra:       INCLUDE "gfx/pics/124/anim1.asm"
-ElectabuzzAnimationExtra: INCLUDE "gfx/pics/125/anim1.asm"
-MagmarAnimationExtra:     INCLUDE "gfx/pics/126/anim1.asm"
-PinsirAnimationExtra:     INCLUDE "gfx/pics/127/anim1.asm"
-TaurosAnimationExtra:     INCLUDE "gfx/pics/128/anim1.asm"
-MagikarpAnimationExtra:   INCLUDE "gfx/pics/129/anim1.asm"
-GyaradosAnimationExtra:   INCLUDE "gfx/pics/130/anim1.asm"
-LaprasAnimationExtra:     INCLUDE "gfx/pics/131/anim1.asm"
-DittoAnimationExtra:      INCLUDE "gfx/pics/132/anim1.asm"
-EeveeAnimationExtra:      INCLUDE "gfx/pics/133/anim1.asm"
-VaporeonAnimationExtra:   INCLUDE "gfx/pics/134/anim1.asm"
-JolteonAnimationExtra:    INCLUDE "gfx/pics/135/anim1.asm"
-FlareonAnimationExtra:    INCLUDE "gfx/pics/136/anim1.asm"
-PorygonAnimationExtra:    INCLUDE "gfx/pics/137/anim1.asm"
-OmanyteAnimationExtra:    INCLUDE "gfx/pics/138/anim1.asm"
-OmastarAnimationExtra:    INCLUDE "gfx/pics/139/anim1.asm"
-KabutoAnimationExtra:     INCLUDE "gfx/pics/140/anim1.asm"
-KabutopsAnimationExtra:   INCLUDE "gfx/pics/141/anim1.asm"
-AerodactylAnimationExtra: INCLUDE "gfx/pics/142/anim1.asm"
-SnorlaxAnimationExtra:    INCLUDE "gfx/pics/143/anim1.asm"
-ArticunoAnimationExtra:   INCLUDE "gfx/pics/144/anim1.asm"
-ZapdosAnimationExtra:     INCLUDE "gfx/pics/145/anim1.asm"
-MoltresAnimationExtra:    INCLUDE "gfx/pics/146/anim1.asm"
-DratiniAnimationExtra:    INCLUDE "gfx/pics/147/anim1.asm"
-DragonairAnimationExtra:  INCLUDE "gfx/pics/148/anim1.asm"
-DragoniteAnimationExtra:  INCLUDE "gfx/pics/149/anim1.asm"
-MewtwoAnimationExtra:     INCLUDE "gfx/pics/150/anim1.asm"
-MewAnimationExtra:        INCLUDE "gfx/pics/151/anim1.asm"
-ChikoritaAnimationExtra:  INCLUDE "gfx/pics/152/anim1.asm"
-BayleefAnimationExtra:    INCLUDE "gfx/pics/153/anim1.asm"
-MeganiumAnimationExtra:   INCLUDE "gfx/pics/154/anim1.asm"
-CyndaquilAnimationExtra:  INCLUDE "gfx/pics/155/anim1.asm"
-QuilavaAnimationExtra:    INCLUDE "gfx/pics/156/anim1.asm"
-TyphlosionAnimationExtra: INCLUDE "gfx/pics/157/anim1.asm"
-TotodileAnimationExtra:   INCLUDE "gfx/pics/158/anim1.asm"
-CroconawAnimationExtra:   INCLUDE "gfx/pics/159/anim1.asm"
-FeraligatrAnimationExtra: INCLUDE "gfx/pics/160/anim1.asm"
-SentretAnimationExtra:    INCLUDE "gfx/pics/161/anim1.asm"
-FurretAnimationExtra:     INCLUDE "gfx/pics/162/anim1.asm"
-HoothootAnimationExtra:   INCLUDE "gfx/pics/163/anim1.asm"
-NoctowlAnimationExtra:    INCLUDE "gfx/pics/164/anim1.asm"
-LedybaAnimationExtra:     INCLUDE "gfx/pics/165/anim1.asm"
-LedianAnimationExtra:     INCLUDE "gfx/pics/166/anim1.asm"
-SpinarakAnimationExtra:   INCLUDE "gfx/pics/167/anim1.asm"
-AriadosAnimationExtra:    INCLUDE "gfx/pics/168/anim1.asm"
-CrobatAnimationExtra:     INCLUDE "gfx/pics/169/anim1.asm"
-ChinchouAnimationExtra:   INCLUDE "gfx/pics/170/anim1.asm"
-LanturnAnimationExtra:    INCLUDE "gfx/pics/171/anim1.asm"
-PichuAnimationExtra:      INCLUDE "gfx/pics/172/anim1.asm"
-CleffaAnimationExtra:     INCLUDE "gfx/pics/173/anim1.asm"
-IgglybuffAnimationExtra:  INCLUDE "gfx/pics/174/anim1.asm"
-TogepiAnimationExtra:     INCLUDE "gfx/pics/175/anim1.asm"
-TogeticAnimationExtra:    INCLUDE "gfx/pics/176/anim1.asm"
-NatuAnimationExtra:       INCLUDE "gfx/pics/177/anim1.asm"
-XatuAnimationExtra:       INCLUDE "gfx/pics/178/anim1.asm"
-MareepAnimationExtra:     INCLUDE "gfx/pics/179/anim1.asm"
-FlaaffyAnimationExtra:    INCLUDE "gfx/pics/180/anim1.asm"
-AmpharosAnimationExtra:   INCLUDE "gfx/pics/181/anim1.asm"
-BellossomAnimationExtra:  INCLUDE "gfx/pics/182/anim1.asm"
-MarillAnimationExtra:     INCLUDE "gfx/pics/183/anim1.asm"
-AzumarillAnimationExtra:  INCLUDE "gfx/pics/184/anim1.asm"
-SudowoodoAnimationExtra:  INCLUDE "gfx/pics/185/anim1.asm"
-PolitoedAnimationExtra:   INCLUDE "gfx/pics/186/anim1.asm"
-HoppipAnimationExtra:     INCLUDE "gfx/pics/187/anim1.asm"
-SkiploomAnimationExtra:   INCLUDE "gfx/pics/188/anim1.asm"
-JumpluffAnimationExtra:   INCLUDE "gfx/pics/189/anim1.asm"
-AipomAnimationExtra:      INCLUDE "gfx/pics/190/anim1.asm"
-SunkernAnimationExtra:    INCLUDE "gfx/pics/191/anim1.asm"
-SunfloraAnimationExtra:   INCLUDE "gfx/pics/192/anim1.asm"
-YanmaAnimationExtra:      INCLUDE "gfx/pics/193/anim1.asm"
-WooperAnimationExtra:     INCLUDE "gfx/pics/194/anim1.asm"
-QuagsireAnimationExtra:   INCLUDE "gfx/pics/195/anim1.asm"
-EspeonAnimationExtra:     INCLUDE "gfx/pics/196/anim1.asm"
-UmbreonAnimationExtra:    INCLUDE "gfx/pics/197/anim1.asm"
-MurkrowAnimationExtra:    INCLUDE "gfx/pics/198/anim1.asm"
-SlowkingAnimationExtra:   INCLUDE "gfx/pics/199/anim1.asm"
-MisdreavusAnimationExtra: INCLUDE "gfx/pics/200/anim1.asm"
-UnownAnimationExtra:      INCLUDE "gfx/pics/201/anim1.asm"
-WobbuffetAnimationExtra:  INCLUDE "gfx/pics/202/anim1.asm"
-GirafarigAnimationExtra:  INCLUDE "gfx/pics/203/anim1.asm"
-PinecoAnimationExtra:     INCLUDE "gfx/pics/204/anim1.asm"
-ForretressAnimationExtra: INCLUDE "gfx/pics/205/anim1.asm"
-DunsparceAnimationExtra:  INCLUDE "gfx/pics/206/anim1.asm"
-GligarAnimationExtra:     INCLUDE "gfx/pics/207/anim1.asm"
-SteelixAnimationExtra:    INCLUDE "gfx/pics/208/anim1.asm"
-SnubbullAnimationExtra:   INCLUDE "gfx/pics/209/anim1.asm"
-GranbullAnimationExtra:   INCLUDE "gfx/pics/210/anim1.asm"
-QwilfishAnimationExtra:   INCLUDE "gfx/pics/211/anim1.asm"
-ScizorAnimationExtra:     INCLUDE "gfx/pics/212/anim1.asm"
-ShuckleAnimationExtra:    INCLUDE "gfx/pics/213/anim1.asm"
-HeracrossAnimationExtra:  INCLUDE "gfx/pics/214/anim1.asm"
-SneaselAnimationExtra:    INCLUDE "gfx/pics/215/anim1.asm"
-TeddiursaAnimationExtra:  INCLUDE "gfx/pics/216/anim1.asm"
-UrsaringAnimationExtra:   INCLUDE "gfx/pics/217/anim1.asm"
-SlugmaAnimationExtra:     INCLUDE "gfx/pics/218/anim1.asm"
-MagcargoAnimationExtra:   INCLUDE "gfx/pics/219/anim1.asm"
-SwinubAnimationExtra:     INCLUDE "gfx/pics/220/anim1.asm"
-PiloswineAnimationExtra:  INCLUDE "gfx/pics/221/anim1.asm"
-CorsolaAnimationExtra:    INCLUDE "gfx/pics/222/anim1.asm"
-RemoraidAnimationExtra:   INCLUDE "gfx/pics/223/anim1.asm"
-OctilleryAnimationExtra:  INCLUDE "gfx/pics/224/anim1.asm"
-DelibirdAnimationExtra:   INCLUDE "gfx/pics/225/anim1.asm"
-MantineAnimationExtra:    INCLUDE "gfx/pics/226/anim1.asm"
-SkarmoryAnimationExtra:   INCLUDE "gfx/pics/227/anim1.asm"
-HoundourAnimationExtra:   INCLUDE "gfx/pics/228/anim1.asm"
-HoundoomAnimationExtra:   INCLUDE "gfx/pics/229/anim1.asm"
-KingdraAnimationExtra:    INCLUDE "gfx/pics/230/anim1.asm"
-PhanpyAnimationExtra:     INCLUDE "gfx/pics/231/anim1.asm"
-DonphanAnimationExtra:    INCLUDE "gfx/pics/232/anim1.asm"
-Porygon2AnimationExtra:   INCLUDE "gfx/pics/233/anim1.asm"
-StantlerAnimationExtra:   INCLUDE "gfx/pics/234/anim1.asm"
-SmeargleAnimationExtra:   INCLUDE "gfx/pics/235/anim1.asm"
-TyrogueAnimationExtra:    INCLUDE "gfx/pics/236/anim1.asm"
-HitmontopAnimationExtra:  INCLUDE "gfx/pics/237/anim1.asm"
-SmoochumAnimationExtra:   INCLUDE "gfx/pics/238/anim1.asm"
-ElekidAnimationExtra:     INCLUDE "gfx/pics/239/anim1.asm"
-MagbyAnimationExtra:      INCLUDE "gfx/pics/240/anim1.asm"
-MiltankAnimationExtra:    INCLUDE "gfx/pics/241/anim1.asm"
-BlisseyAnimationExtra:    INCLUDE "gfx/pics/242/anim1.asm"
-RaikouAnimationExtra:     INCLUDE "gfx/pics/243/anim1.asm"
-EnteiAnimationExtra:      INCLUDE "gfx/pics/244/anim1.asm"
-SuicuneAnimationExtra:    INCLUDE "gfx/pics/245/anim1.asm"
-LarvitarAnimationExtra:   INCLUDE "gfx/pics/246/anim1.asm"
-PupitarAnimationExtra:    INCLUDE "gfx/pics/247/anim1.asm"
-TyranitarAnimationExtra:  INCLUDE "gfx/pics/248/anim1.asm"
-LugiaAnimationExtra:      INCLUDE "gfx/pics/249/anim1.asm"
-HoOhAnimationExtra:       INCLUDE "gfx/pics/250/anim1.asm"
-CelebiAnimationExtra:     INCLUDE "gfx/pics/251/anim1.asm"
+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/083/anim0.asm b/gfx/pics/farfetch_d/anim0.asm
index 4dac6c1a4..4dac6c1a4 100644
--- a/gfx/pics/083/anim0.asm
+++ b/gfx/pics/farfetch_d/anim0.asm
diff --git a/gfx/pics/083/anim1.asm b/gfx/pics/farfetch_d/anim1.asm
index 5dcfaa89d..5dcfaa89d 100644
--- a/gfx/pics/083/anim1.asm
+++ b/gfx/pics/farfetch_d/anim1.asm
diff --git a/gfx/pics/083/back.lz b/gfx/pics/farfetch_d/back.6x6.2bpp.lz
index 77dd25ae9..77dd25ae9 100644
--- a/gfx/pics/083/back.lz
+++ b/gfx/pics/farfetch_d/back.6x6.2bpp.lz
diff --git a/gfx/pics/083/bitmask.asm b/gfx/pics/farfetch_d/bitmask.asm
index 82429610d..82429610d 100644
--- a/gfx/pics/083/bitmask.asm
+++ b/gfx/pics/farfetch_d/bitmask.asm
diff --git a/gfx/pics/083/frames.asm b/gfx/pics/farfetch_d/frames.asm
index 698ff1f15..698ff1f15 100644
--- a/gfx/pics/083/frames.asm
+++ b/gfx/pics/farfetch_d/frames.asm
diff --git a/gfx/pics/083/front.lz b/gfx/pics/farfetch_d/front.6x6.2bpp.lz
index d9eeb7489..d9eeb7489 100644
--- a/gfx/pics/083/front.lz
+++ b/gfx/pics/farfetch_d/front.6x6.2bpp.lz
diff --git a/gfx/pics/083/normal.pal b/gfx/pics/farfetch_d/normal.pal
index 17e60c4ce..17e60c4ce 100644
--- a/gfx/pics/083/normal.pal
+++ b/gfx/pics/farfetch_d/normal.pal
diff --git a/gfx/pics/083/shiny.pal b/gfx/pics/farfetch_d/shiny.pal
index 2bae03e7f..2bae03e7f 100644
--- a/gfx/pics/083/shiny.pal
+++ b/gfx/pics/farfetch_d/shiny.pal
diff --git a/gfx/pics/022/anim0.asm b/gfx/pics/fearow/anim0.asm
index 3a689af18..3a689af18 100644
--- a/gfx/pics/022/anim0.asm
+++ b/gfx/pics/fearow/anim0.asm
diff --git a/gfx/pics/022/anim1.asm b/gfx/pics/fearow/anim1.asm
index 0233782c9..0233782c9 100644
--- a/gfx/pics/022/anim1.asm
+++ b/gfx/pics/fearow/anim1.asm
diff --git a/gfx/pics/022/back.lz b/gfx/pics/fearow/back.6x6.2bpp.lz
index 641086eaa..641086eaa 100644
--- a/gfx/pics/022/back.lz
+++ b/gfx/pics/fearow/back.6x6.2bpp.lz
diff --git a/gfx/pics/022/bitmask.asm b/gfx/pics/fearow/bitmask.asm
index a04c00427..a04c00427 100644
--- a/gfx/pics/022/bitmask.asm
+++ b/gfx/pics/fearow/bitmask.asm
diff --git a/gfx/pics/022/frames.asm b/gfx/pics/fearow/frames.asm
index 5d7b5a6a6..5d7b5a6a6 100644
--- a/gfx/pics/022/frames.asm
+++ b/gfx/pics/fearow/frames.asm
diff --git a/gfx/pics/022/front.lz b/gfx/pics/fearow/front.7x7.2bpp.lz
index 4fbf2d47f..4fbf2d47f 100644
--- a/gfx/pics/022/front.lz
+++ b/gfx/pics/fearow/front.7x7.2bpp.lz
diff --git a/gfx/pics/022/normal.pal b/gfx/pics/fearow/normal.pal
index 1d4c56a45..1d4c56a45 100644
--- a/gfx/pics/022/normal.pal
+++ b/gfx/pics/fearow/normal.pal
diff --git a/gfx/pics/022/shiny.pal b/gfx/pics/fearow/shiny.pal
index abc40692b..abc40692b 100644
--- a/gfx/pics/022/shiny.pal
+++ b/gfx/pics/fearow/shiny.pal
diff --git a/gfx/pics/160/anim0.asm b/gfx/pics/feraligatr/anim0.asm
index 1a0cebd2e..1a0cebd2e 100644
--- a/gfx/pics/160/anim0.asm
+++ b/gfx/pics/feraligatr/anim0.asm
diff --git a/gfx/pics/160/anim1.asm b/gfx/pics/feraligatr/anim1.asm
index c1c39258d..c1c39258d 100644
--- a/gfx/pics/160/anim1.asm
+++ b/gfx/pics/feraligatr/anim1.asm
diff --git a/gfx/pics/160/back.lz b/gfx/pics/feraligatr/back.6x6.2bpp.lz
index 4e180d0f5..4e180d0f5 100644
--- a/gfx/pics/160/back.lz
+++ b/gfx/pics/feraligatr/back.6x6.2bpp.lz
diff --git a/gfx/pics/160/bitmask.asm b/gfx/pics/feraligatr/bitmask.asm
index cf22f4db5..cf22f4db5 100644
--- a/gfx/pics/160/bitmask.asm
+++ b/gfx/pics/feraligatr/bitmask.asm
diff --git a/gfx/pics/160/frames.asm b/gfx/pics/feraligatr/frames.asm
index 4ce24fb2c..4ce24fb2c 100644
--- a/gfx/pics/160/frames.asm
+++ b/gfx/pics/feraligatr/frames.asm
diff --git a/gfx/pics/160/front.lz b/gfx/pics/feraligatr/front.7x7.2bpp.lz
index cc055e629..cc055e629 100644
--- a/gfx/pics/160/front.lz
+++ b/gfx/pics/feraligatr/front.7x7.2bpp.lz
diff --git a/gfx/pics/160/normal.pal b/gfx/pics/feraligatr/normal.pal
index 2cbc9b1f5..2cbc9b1f5 100644
--- a/gfx/pics/160/normal.pal
+++ b/gfx/pics/feraligatr/normal.pal
diff --git a/gfx/pics/160/shiny.pal b/gfx/pics/feraligatr/shiny.pal
index afe21b2b2..afe21b2b2 100644
--- a/gfx/pics/160/shiny.pal
+++ b/gfx/pics/feraligatr/shiny.pal
diff --git a/gfx/pics/180/anim0.asm b/gfx/pics/flaaffy/anim0.asm
index c9f1f4e7e..c9f1f4e7e 100644
--- a/gfx/pics/180/anim0.asm
+++ b/gfx/pics/flaaffy/anim0.asm
diff --git a/gfx/pics/180/anim1.asm b/gfx/pics/flaaffy/anim1.asm
index b9ec0d483..b9ec0d483 100644
--- a/gfx/pics/180/anim1.asm
+++ b/gfx/pics/flaaffy/anim1.asm
diff --git a/gfx/pics/180/back.lz b/gfx/pics/flaaffy/back.6x6.2bpp.lz
index 5eec3df7a..5eec3df7a 100644
--- a/gfx/pics/180/back.lz
+++ b/gfx/pics/flaaffy/back.6x6.2bpp.lz
diff --git a/gfx/pics/180/bitmask.asm b/gfx/pics/flaaffy/bitmask.asm
index 85dc68882..85dc68882 100644
--- a/gfx/pics/180/bitmask.asm
+++ b/gfx/pics/flaaffy/bitmask.asm
diff --git a/gfx/pics/180/frames.asm b/gfx/pics/flaaffy/frames.asm
index facb6f888..facb6f888 100644
--- a/gfx/pics/180/frames.asm
+++ b/gfx/pics/flaaffy/frames.asm
diff --git a/gfx/pics/180/front.lz b/gfx/pics/flaaffy/front.6x6.2bpp.lz
index 673155a7e..673155a7e 100644
--- a/gfx/pics/180/front.lz
+++ b/gfx/pics/flaaffy/front.6x6.2bpp.lz
diff --git a/gfx/pics/180/normal.pal b/gfx/pics/flaaffy/normal.pal
index 68cae7d28..68cae7d28 100644
--- a/gfx/pics/180/normal.pal
+++ b/gfx/pics/flaaffy/normal.pal
diff --git a/gfx/pics/180/shiny.pal b/gfx/pics/flaaffy/shiny.pal
index 50c88df2e..50c88df2e 100644
--- a/gfx/pics/180/shiny.pal
+++ b/gfx/pics/flaaffy/shiny.pal
diff --git a/gfx/pics/136/anim0.asm b/gfx/pics/flareon/anim0.asm
index dbefae362..dbefae362 100644
--- a/gfx/pics/136/anim0.asm
+++ b/gfx/pics/flareon/anim0.asm
diff --git a/gfx/pics/136/anim1.asm b/gfx/pics/flareon/anim1.asm
index 431573106..431573106 100644
--- a/gfx/pics/136/anim1.asm
+++ b/gfx/pics/flareon/anim1.asm
diff --git a/gfx/pics/136/back.lz b/gfx/pics/flareon/back.6x6.2bpp.lz
index bafc64cd2..bafc64cd2 100644
--- a/gfx/pics/136/back.lz
+++ b/gfx/pics/flareon/back.6x6.2bpp.lz
diff --git a/gfx/pics/136/bitmask.asm b/gfx/pics/flareon/bitmask.asm
index ffe910631..ffe910631 100644
--- a/gfx/pics/136/bitmask.asm
+++ b/gfx/pics/flareon/bitmask.asm
diff --git a/gfx/pics/136/frames.asm b/gfx/pics/flareon/frames.asm
index ed85e6737..ed85e6737 100644
--- a/gfx/pics/136/frames.asm
+++ b/gfx/pics/flareon/frames.asm
diff --git a/gfx/pics/136/front.lz b/gfx/pics/flareon/front.6x6.2bpp.lz
index d3210b7e3..d3210b7e3 100644
--- a/gfx/pics/136/front.lz
+++ b/gfx/pics/flareon/front.6x6.2bpp.lz
diff --git a/gfx/pics/136/normal.pal b/gfx/pics/flareon/normal.pal
index 2156fb420..2156fb420 100644
--- a/gfx/pics/136/normal.pal
+++ b/gfx/pics/flareon/normal.pal
diff --git a/gfx/pics/136/shiny.pal b/gfx/pics/flareon/shiny.pal
index 7e840a3cd..7e840a3cd 100644
--- a/gfx/pics/136/shiny.pal
+++ b/gfx/pics/flareon/shiny.pal
diff --git a/gfx/pics/205/anim0.asm b/gfx/pics/forretress/anim0.asm
index 74c8e2e12..74c8e2e12 100644
--- a/gfx/pics/205/anim0.asm
+++ b/gfx/pics/forretress/anim0.asm
diff --git a/gfx/pics/205/anim1.asm b/gfx/pics/forretress/anim1.asm
index 4fafa1a3e..4fafa1a3e 100644
--- a/gfx/pics/205/anim1.asm
+++ b/gfx/pics/forretress/anim1.asm
diff --git a/gfx/pics/205/back.lz b/gfx/pics/forretress/back.6x6.2bpp.lz
index 1c4b5d69a..1c4b5d69a 100644
--- a/gfx/pics/205/back.lz
+++ b/gfx/pics/forretress/back.6x6.2bpp.lz
diff --git a/gfx/pics/205/bitmask.asm b/gfx/pics/forretress/bitmask.asm
index f02dcc3a1..f02dcc3a1 100644
--- a/gfx/pics/205/bitmask.asm
+++ b/gfx/pics/forretress/bitmask.asm
diff --git a/gfx/pics/205/frames.asm b/gfx/pics/forretress/frames.asm
index 4c7364a44..4c7364a44 100644
--- a/gfx/pics/205/frames.asm
+++ b/gfx/pics/forretress/frames.asm
diff --git a/gfx/pics/205/front.lz b/gfx/pics/forretress/front.7x7.2bpp.lz
index 239e20532..239e20532 100644
--- a/gfx/pics/205/front.lz
+++ b/gfx/pics/forretress/front.7x7.2bpp.lz
diff --git a/gfx/pics/205/normal.pal b/gfx/pics/forretress/normal.pal
index 79761d2c0..79761d2c0 100644
--- a/gfx/pics/205/normal.pal
+++ b/gfx/pics/forretress/normal.pal
diff --git a/gfx/pics/205/shiny.pal b/gfx/pics/forretress/shiny.pal
index 84aa229d2..84aa229d2 100644
--- a/gfx/pics/205/shiny.pal
+++ b/gfx/pics/forretress/shiny.pal
diff --git a/gfx/pics/162/anim0.asm b/gfx/pics/furret/anim0.asm
index 8503d74ec..8503d74ec 100644
--- a/gfx/pics/162/anim0.asm
+++ b/gfx/pics/furret/anim0.asm
diff --git a/gfx/pics/162/anim1.asm b/gfx/pics/furret/anim1.asm
index e175bf7cc..e175bf7cc 100644
--- a/gfx/pics/162/anim1.asm
+++ b/gfx/pics/furret/anim1.asm
diff --git a/gfx/pics/162/back.lz b/gfx/pics/furret/back.6x6.2bpp.lz
index 0cbe66f49..0cbe66f49 100644
--- a/gfx/pics/162/back.lz
+++ b/gfx/pics/furret/back.6x6.2bpp.lz
diff --git a/gfx/pics/162/bitmask.asm b/gfx/pics/furret/bitmask.asm
index f50245994..f50245994 100644
--- a/gfx/pics/162/bitmask.asm
+++ b/gfx/pics/furret/bitmask.asm
diff --git a/gfx/pics/162/frames.asm b/gfx/pics/furret/frames.asm
index 80060afee..80060afee 100644
--- a/gfx/pics/162/frames.asm
+++ b/gfx/pics/furret/frames.asm
diff --git a/gfx/pics/162/front.lz b/gfx/pics/furret/front.6x6.2bpp.lz
index afba64f59..afba64f59 100644
--- a/gfx/pics/162/front.lz
+++ b/gfx/pics/furret/front.6x6.2bpp.lz
diff --git a/gfx/pics/162/normal.pal b/gfx/pics/furret/normal.pal
index d0bf474c9..d0bf474c9 100644
--- a/gfx/pics/162/normal.pal
+++ b/gfx/pics/furret/normal.pal
diff --git a/gfx/pics/162/shiny.pal b/gfx/pics/furret/shiny.pal
index fe5870bd6..fe5870bd6 100644
--- a/gfx/pics/162/shiny.pal
+++ b/gfx/pics/furret/shiny.pal
diff --git a/gfx/pics/092/anim0.asm b/gfx/pics/gastly/anim0.asm
index d9414d188..d9414d188 100644
--- a/gfx/pics/092/anim0.asm
+++ b/gfx/pics/gastly/anim0.asm
diff --git a/gfx/pics/092/anim1.asm b/gfx/pics/gastly/anim1.asm
index 65dc17abf..65dc17abf 100644
--- a/gfx/pics/092/anim1.asm
+++ b/gfx/pics/gastly/anim1.asm
diff --git a/gfx/pics/092/back.lz b/gfx/pics/gastly/back.6x6.2bpp.lz
index ecb4af90d..ecb4af90d 100644
--- a/gfx/pics/092/back.lz
+++ b/gfx/pics/gastly/back.6x6.2bpp.lz
diff --git a/gfx/pics/092/bitmask.asm b/gfx/pics/gastly/bitmask.asm
index 3f6be31ae..3f6be31ae 100644
--- a/gfx/pics/092/bitmask.asm
+++ b/gfx/pics/gastly/bitmask.asm
diff --git a/gfx/pics/092/frames.asm b/gfx/pics/gastly/frames.asm
index 52ec4e101..52ec4e101 100644
--- a/gfx/pics/092/frames.asm
+++ b/gfx/pics/gastly/frames.asm
diff --git a/gfx/pics/092/front.lz b/gfx/pics/gastly/front.7x7.2bpp.lz
index f3d99339b..f3d99339b 100644
--- a/gfx/pics/092/front.lz
+++ b/gfx/pics/gastly/front.7x7.2bpp.lz
diff --git a/gfx/pics/092/normal.pal b/gfx/pics/gastly/normal.pal
index d91233a51..d91233a51 100644
--- a/gfx/pics/092/normal.pal
+++ b/gfx/pics/gastly/normal.pal
diff --git a/gfx/pics/092/shiny.pal b/gfx/pics/gastly/shiny.pal
index 50e42ab4a..50e42ab4a 100644
--- a/gfx/pics/092/shiny.pal
+++ b/gfx/pics/gastly/shiny.pal
diff --git a/gfx/pics/094/anim0.asm b/gfx/pics/gengar/anim0.asm
index 842c47c76..842c47c76 100644
--- a/gfx/pics/094/anim0.asm
+++ b/gfx/pics/gengar/anim0.asm
diff --git a/gfx/pics/094/anim1.asm b/gfx/pics/gengar/anim1.asm
index 09df5dca3..09df5dca3 100644
--- a/gfx/pics/094/anim1.asm
+++ b/gfx/pics/gengar/anim1.asm
diff --git a/gfx/pics/094/back.lz b/gfx/pics/gengar/back.6x6.2bpp.lz
index d1ecca65e..d1ecca65e 100644
--- a/gfx/pics/094/back.lz
+++ b/gfx/pics/gengar/back.6x6.2bpp.lz
diff --git a/gfx/pics/094/bitmask.asm b/gfx/pics/gengar/bitmask.asm
index 3f1e0dc3a..3f1e0dc3a 100644
--- a/gfx/pics/094/bitmask.asm
+++ b/gfx/pics/gengar/bitmask.asm
diff --git a/gfx/pics/094/frames.asm b/gfx/pics/gengar/frames.asm
index 8e3d48246..8e3d48246 100644
--- a/gfx/pics/094/frames.asm
+++ b/gfx/pics/gengar/frames.asm
diff --git a/gfx/pics/094/front.lz b/gfx/pics/gengar/front.6x6.2bpp.lz
index a11754646..a11754646 100644
--- a/gfx/pics/094/front.lz
+++ b/gfx/pics/gengar/front.6x6.2bpp.lz
diff --git a/gfx/pics/094/normal.pal b/gfx/pics/gengar/normal.pal
index 16a51fce3..16a51fce3 100644
--- a/gfx/pics/094/normal.pal
+++ b/gfx/pics/gengar/normal.pal
diff --git a/gfx/pics/094/shiny.pal b/gfx/pics/gengar/shiny.pal
index ccf6bf685..ccf6bf685 100644
--- a/gfx/pics/094/shiny.pal
+++ b/gfx/pics/gengar/shiny.pal
diff --git a/gfx/pics/074/anim0.asm b/gfx/pics/geodude/anim0.asm
index 3c54bc94e..3c54bc94e 100644
--- a/gfx/pics/074/anim0.asm
+++ b/gfx/pics/geodude/anim0.asm
diff --git a/gfx/pics/074/anim1.asm b/gfx/pics/geodude/anim1.asm
index 4ec72d9b1..4ec72d9b1 100644
--- a/gfx/pics/074/anim1.asm
+++ b/gfx/pics/geodude/anim1.asm
diff --git a/gfx/pics/074/back.lz b/gfx/pics/geodude/back.6x6.2bpp.lz
index 443fd327d..443fd327d 100644
--- a/gfx/pics/074/back.lz
+++ b/gfx/pics/geodude/back.6x6.2bpp.lz
diff --git a/gfx/pics/074/bitmask.asm b/gfx/pics/geodude/bitmask.asm
index fd6285f77..fd6285f77 100644
--- a/gfx/pics/074/bitmask.asm
+++ b/gfx/pics/geodude/bitmask.asm
diff --git a/gfx/pics/074/frames.asm b/gfx/pics/geodude/frames.asm
index 9ba2ed2ba..9ba2ed2ba 100644
--- a/gfx/pics/074/frames.asm
+++ b/gfx/pics/geodude/frames.asm
diff --git a/gfx/pics/074/front.lz b/gfx/pics/geodude/front.5x5.2bpp.lz
index 96bd9f794..96bd9f794 100644
--- a/gfx/pics/074/front.lz
+++ b/gfx/pics/geodude/front.5x5.2bpp.lz
diff --git a/gfx/pics/074/normal.pal b/gfx/pics/geodude/normal.pal
index 8df6a1104..8df6a1104 100644
--- a/gfx/pics/074/normal.pal
+++ b/gfx/pics/geodude/normal.pal
diff --git a/gfx/pics/074/shiny.pal b/gfx/pics/geodude/shiny.pal
index 305e1a362..305e1a362 100644
--- a/gfx/pics/074/shiny.pal
+++ b/gfx/pics/geodude/shiny.pal
diff --git a/gfx/pics/203/anim0.asm b/gfx/pics/girafarig/anim0.asm
index 3a7ebd9fe..3a7ebd9fe 100644
--- a/gfx/pics/203/anim0.asm
+++ b/gfx/pics/girafarig/anim0.asm
diff --git a/gfx/pics/203/anim1.asm b/gfx/pics/girafarig/anim1.asm
index 95b1131ca..95b1131ca 100644
--- a/gfx/pics/203/anim1.asm
+++ b/gfx/pics/girafarig/anim1.asm
diff --git a/gfx/pics/203/back.lz b/gfx/pics/girafarig/back.6x6.2bpp.lz
index aca23f976..aca23f976 100644
--- a/gfx/pics/203/back.lz
+++ b/gfx/pics/girafarig/back.6x6.2bpp.lz
diff --git a/gfx/pics/203/bitmask.asm b/gfx/pics/girafarig/bitmask.asm
index d3629e8dc..d3629e8dc 100644
--- a/gfx/pics/203/bitmask.asm
+++ b/gfx/pics/girafarig/bitmask.asm
diff --git a/gfx/pics/203/frames.asm b/gfx/pics/girafarig/frames.asm
index a89de6374..a89de6374 100644
--- a/gfx/pics/203/frames.asm
+++ b/gfx/pics/girafarig/frames.asm
diff --git a/gfx/pics/203/front.lz b/gfx/pics/girafarig/front.7x7.2bpp.lz
index 48c9fc94a..48c9fc94a 100644
--- a/gfx/pics/203/front.lz
+++ b/gfx/pics/girafarig/front.7x7.2bpp.lz
diff --git a/gfx/pics/203/normal.pal b/gfx/pics/girafarig/normal.pal
index d882c3aeb..d882c3aeb 100644
--- a/gfx/pics/203/normal.pal
+++ b/gfx/pics/girafarig/normal.pal
diff --git a/gfx/pics/203/shiny.pal b/gfx/pics/girafarig/shiny.pal
index 51b7f3847..51b7f3847 100644
--- a/gfx/pics/203/shiny.pal
+++ b/gfx/pics/girafarig/shiny.pal
diff --git a/gfx/pics/207/anim0.asm b/gfx/pics/gligar/anim0.asm
index 1dabf6cbd..1dabf6cbd 100644
--- a/gfx/pics/207/anim0.asm
+++ b/gfx/pics/gligar/anim0.asm
diff --git a/gfx/pics/207/anim1.asm b/gfx/pics/gligar/anim1.asm
index 0cc7c0916..0cc7c0916 100644
--- a/gfx/pics/207/anim1.asm
+++ b/gfx/pics/gligar/anim1.asm
diff --git a/gfx/pics/207/back.lz b/gfx/pics/gligar/back.6x6.2bpp.lz
index 45b7d9b76..45b7d9b76 100644
--- a/gfx/pics/207/back.lz
+++ b/gfx/pics/gligar/back.6x6.2bpp.lz
diff --git a/gfx/pics/207/bitmask.asm b/gfx/pics/gligar/bitmask.asm
index 8a7f6aaa4..8a7f6aaa4 100644
--- a/gfx/pics/207/bitmask.asm
+++ b/gfx/pics/gligar/bitmask.asm
diff --git a/gfx/pics/207/frames.asm b/gfx/pics/gligar/frames.asm
index 4957bf8c2..4957bf8c2 100644
--- a/gfx/pics/207/frames.asm
+++ b/gfx/pics/gligar/frames.asm
diff --git a/gfx/pics/207/front.lz b/gfx/pics/gligar/front.6x6.2bpp.lz
index 4ef9e5398..4ef9e5398 100644
--- a/gfx/pics/207/front.lz
+++ b/gfx/pics/gligar/front.6x6.2bpp.lz
diff --git a/gfx/pics/207/normal.pal b/gfx/pics/gligar/normal.pal
index c6d87495d..c6d87495d 100644
--- a/gfx/pics/207/normal.pal
+++ b/gfx/pics/gligar/normal.pal
diff --git a/gfx/pics/207/shiny.pal b/gfx/pics/gligar/shiny.pal
index b33b2c373..b33b2c373 100644
--- a/gfx/pics/207/shiny.pal
+++ b/gfx/pics/gligar/shiny.pal
diff --git a/gfx/pics/044/anim0.asm b/gfx/pics/gloom/anim0.asm
index 89c6805b9..89c6805b9 100644
--- a/gfx/pics/044/anim0.asm
+++ b/gfx/pics/gloom/anim0.asm
diff --git a/gfx/pics/044/anim1.asm b/gfx/pics/gloom/anim1.asm
index cdb6c5191..cdb6c5191 100644
--- a/gfx/pics/044/anim1.asm
+++ b/gfx/pics/gloom/anim1.asm
diff --git a/gfx/pics/044/back.lz b/gfx/pics/gloom/back.6x6.2bpp.lz
index 7d35e2d82..7d35e2d82 100644
--- a/gfx/pics/044/back.lz
+++ b/gfx/pics/gloom/back.6x6.2bpp.lz
diff --git a/gfx/pics/044/bitmask.asm b/gfx/pics/gloom/bitmask.asm
index c75940997..c75940997 100644
--- a/gfx/pics/044/bitmask.asm
+++ b/gfx/pics/gloom/bitmask.asm
diff --git a/gfx/pics/044/frames.asm b/gfx/pics/gloom/frames.asm
index 97018ccf4..97018ccf4 100644
--- a/gfx/pics/044/frames.asm
+++ b/gfx/pics/gloom/frames.asm
diff --git a/gfx/pics/044/front.lz b/gfx/pics/gloom/front.6x6.2bpp.lz
index a69e4b76c..a69e4b76c 100644
--- a/gfx/pics/044/front.lz
+++ b/gfx/pics/gloom/front.6x6.2bpp.lz
diff --git a/gfx/pics/044/normal.pal b/gfx/pics/gloom/normal.pal
index 28d801aaa..28d801aaa 100644
--- a/gfx/pics/044/normal.pal
+++ b/gfx/pics/gloom/normal.pal
diff --git a/gfx/pics/044/shiny.pal b/gfx/pics/gloom/shiny.pal
index 998bfce6e..998bfce6e 100644
--- a/gfx/pics/044/shiny.pal
+++ b/gfx/pics/gloom/shiny.pal
diff --git a/gfx/pics/042/anim0.asm b/gfx/pics/golbat/anim0.asm
index cb04c1a3b..cb04c1a3b 100644
--- a/gfx/pics/042/anim0.asm
+++ b/gfx/pics/golbat/anim0.asm
diff --git a/gfx/pics/042/anim1.asm b/gfx/pics/golbat/anim1.asm
index 689aed3fd..689aed3fd 100644
--- a/gfx/pics/042/anim1.asm
+++ b/gfx/pics/golbat/anim1.asm
diff --git a/gfx/pics/042/back.lz b/gfx/pics/golbat/back.6x6.2bpp.lz
index e2bd0c367..e2bd0c367 100644
--- a/gfx/pics/042/back.lz
+++ b/gfx/pics/golbat/back.6x6.2bpp.lz
diff --git a/gfx/pics/042/bitmask.asm b/gfx/pics/golbat/bitmask.asm
index b74546ba4..b74546ba4 100644
--- a/gfx/pics/042/bitmask.asm
+++ b/gfx/pics/golbat/bitmask.asm
diff --git a/gfx/pics/042/frames.asm b/gfx/pics/golbat/frames.asm
index 78aeab341..78aeab341 100644
--- a/gfx/pics/042/frames.asm
+++ b/gfx/pics/golbat/frames.asm
diff --git a/gfx/pics/042/front.lz b/gfx/pics/golbat/front.7x7.2bpp.lz
index 94f7d8216..94f7d8216 100644
--- a/gfx/pics/042/front.lz
+++ b/gfx/pics/golbat/front.7x7.2bpp.lz
diff --git a/gfx/pics/041/normal.pal b/gfx/pics/golbat/normal.pal
index d36d0449c..d36d0449c 100644
--- a/gfx/pics/041/normal.pal
+++ b/gfx/pics/golbat/normal.pal
diff --git a/gfx/pics/169/shiny.pal b/gfx/pics/golbat/shiny.pal
index 2cb1d6ced..2cb1d6ced 100644
--- a/gfx/pics/169/shiny.pal
+++ b/gfx/pics/golbat/shiny.pal
diff --git a/gfx/pics/118/anim0.asm b/gfx/pics/goldeen/anim0.asm
index c93141feb..c93141feb 100644
--- a/gfx/pics/118/anim0.asm
+++ b/gfx/pics/goldeen/anim0.asm
diff --git a/gfx/pics/118/anim1.asm b/gfx/pics/goldeen/anim1.asm
index f31dfd1b2..f31dfd1b2 100644
--- a/gfx/pics/118/anim1.asm
+++ b/gfx/pics/goldeen/anim1.asm
diff --git a/gfx/pics/118/back.lz b/gfx/pics/goldeen/back.6x6.2bpp.lz
index 5d00534ec..5d00534ec 100644
--- a/gfx/pics/118/back.lz
+++ b/gfx/pics/goldeen/back.6x6.2bpp.lz
diff --git a/gfx/pics/118/bitmask.asm b/gfx/pics/goldeen/bitmask.asm
index 99a84898f..99a84898f 100644
--- a/gfx/pics/118/bitmask.asm
+++ b/gfx/pics/goldeen/bitmask.asm
diff --git a/gfx/pics/118/frames.asm b/gfx/pics/goldeen/frames.asm
index e38561a7a..e38561a7a 100644
--- a/gfx/pics/118/frames.asm
+++ b/gfx/pics/goldeen/frames.asm
diff --git a/gfx/pics/118/front.lz b/gfx/pics/goldeen/front.6x6.2bpp.lz
index f0090e94e..f0090e94e 100644
--- a/gfx/pics/118/front.lz
+++ b/gfx/pics/goldeen/front.6x6.2bpp.lz
diff --git a/gfx/pics/118/normal.pal b/gfx/pics/goldeen/normal.pal
index 4ada439c0..4ada439c0 100644
--- a/gfx/pics/118/normal.pal
+++ b/gfx/pics/goldeen/normal.pal
diff --git a/gfx/pics/118/shiny.pal b/gfx/pics/goldeen/shiny.pal
index 14910020e..14910020e 100644
--- a/gfx/pics/118/shiny.pal
+++ b/gfx/pics/goldeen/shiny.pal
diff --git a/gfx/pics/055/anim0.asm b/gfx/pics/golduck/anim0.asm
index 41ce17c55..41ce17c55 100644
--- a/gfx/pics/055/anim0.asm
+++ b/gfx/pics/golduck/anim0.asm
diff --git a/gfx/pics/055/anim1.asm b/gfx/pics/golduck/anim1.asm
index a73476ca9..a73476ca9 100644
--- a/gfx/pics/055/anim1.asm
+++ b/gfx/pics/golduck/anim1.asm
diff --git a/gfx/pics/055/back.lz b/gfx/pics/golduck/back.6x6.2bpp.lz
index 13807b9e9..13807b9e9 100644
--- a/gfx/pics/055/back.lz
+++ b/gfx/pics/golduck/back.6x6.2bpp.lz
diff --git a/gfx/pics/055/bitmask.asm b/gfx/pics/golduck/bitmask.asm
index d25464658..d25464658 100644
--- a/gfx/pics/055/bitmask.asm
+++ b/gfx/pics/golduck/bitmask.asm
diff --git a/gfx/pics/055/frames.asm b/gfx/pics/golduck/frames.asm
index 07e5c6f3c..07e5c6f3c 100644
--- a/gfx/pics/055/frames.asm
+++ b/gfx/pics/golduck/frames.asm
diff --git a/gfx/pics/055/front.lz b/gfx/pics/golduck/front.7x7.2bpp.lz
index ff3fa6792..ff3fa6792 100644
--- a/gfx/pics/055/front.lz
+++ b/gfx/pics/golduck/front.7x7.2bpp.lz
diff --git a/gfx/pics/055/normal.pal b/gfx/pics/golduck/normal.pal
index 22099e9bf..22099e9bf 100644
--- a/gfx/pics/055/normal.pal
+++ b/gfx/pics/golduck/normal.pal
diff --git a/gfx/pics/055/shiny.pal b/gfx/pics/golduck/shiny.pal
index cfd29e90e..cfd29e90e 100644
--- a/gfx/pics/055/shiny.pal
+++ b/gfx/pics/golduck/shiny.pal
diff --git a/gfx/pics/076/anim0.asm b/gfx/pics/golem/anim0.asm
index ef21ec211..ef21ec211 100644
--- a/gfx/pics/076/anim0.asm
+++ b/gfx/pics/golem/anim0.asm
diff --git a/gfx/pics/076/anim1.asm b/gfx/pics/golem/anim1.asm
index 9d3c23ba3..9d3c23ba3 100644
--- a/gfx/pics/076/anim1.asm
+++ b/gfx/pics/golem/anim1.asm
diff --git a/gfx/pics/076/back.lz b/gfx/pics/golem/back.6x6.2bpp.lz
index fd1ee3dcb..fd1ee3dcb 100644
--- a/gfx/pics/076/back.lz
+++ b/gfx/pics/golem/back.6x6.2bpp.lz
diff --git a/gfx/pics/076/bitmask.asm b/gfx/pics/golem/bitmask.asm
index 1d3fbfa5e..1d3fbfa5e 100644
--- a/gfx/pics/076/bitmask.asm
+++ b/gfx/pics/golem/bitmask.asm
diff --git a/gfx/pics/076/frames.asm b/gfx/pics/golem/frames.asm
index 03f6e6a5f..03f6e6a5f 100644
--- a/gfx/pics/076/frames.asm
+++ b/gfx/pics/golem/frames.asm
diff --git a/gfx/pics/076/front.lz b/gfx/pics/golem/front.6x6.2bpp.lz
index 0a7bf3369..0a7bf3369 100644
--- a/gfx/pics/076/front.lz
+++ b/gfx/pics/golem/front.6x6.2bpp.lz
diff --git a/gfx/pics/076/normal.pal b/gfx/pics/golem/normal.pal
index be50f4de6..be50f4de6 100644
--- a/gfx/pics/076/normal.pal
+++ b/gfx/pics/golem/normal.pal
diff --git a/gfx/pics/076/shiny.pal b/gfx/pics/golem/shiny.pal
index d50b44fa6..d50b44fa6 100644
--- a/gfx/pics/076/shiny.pal
+++ b/gfx/pics/golem/shiny.pal
diff --git a/gfx/pics/210/anim0.asm b/gfx/pics/granbull/anim0.asm
index 2f412479f..2f412479f 100644
--- a/gfx/pics/210/anim0.asm
+++ b/gfx/pics/granbull/anim0.asm
diff --git a/gfx/pics/210/anim1.asm b/gfx/pics/granbull/anim1.asm
index 22e166977..22e166977 100644
--- a/gfx/pics/210/anim1.asm
+++ b/gfx/pics/granbull/anim1.asm
diff --git a/gfx/pics/210/back.lz b/gfx/pics/granbull/back.6x6.2bpp.lz
index f09d4e7dc..f09d4e7dc 100644
--- a/gfx/pics/210/back.lz
+++ b/gfx/pics/granbull/back.6x6.2bpp.lz
diff --git a/gfx/pics/210/bitmask.asm b/gfx/pics/granbull/bitmask.asm
index f0134ac3d..f0134ac3d 100644
--- a/gfx/pics/210/bitmask.asm
+++ b/gfx/pics/granbull/bitmask.asm
diff --git a/gfx/pics/210/frames.asm b/gfx/pics/granbull/frames.asm
index b52d7bc47..b52d7bc47 100644
--- a/gfx/pics/210/frames.asm
+++ b/gfx/pics/granbull/frames.asm
diff --git a/gfx/pics/210/front.lz b/gfx/pics/granbull/front.6x6.2bpp.lz
index 94062ce3f..94062ce3f 100644
--- a/gfx/pics/210/front.lz
+++ b/gfx/pics/granbull/front.6x6.2bpp.lz
diff --git a/gfx/pics/210/normal.pal b/gfx/pics/granbull/normal.pal
index 4073c9c79..4073c9c79 100644
--- a/gfx/pics/210/normal.pal
+++ b/gfx/pics/granbull/normal.pal
diff --git a/gfx/pics/210/shiny.pal b/gfx/pics/granbull/shiny.pal
index b15bd641c..b15bd641c 100644
--- a/gfx/pics/210/shiny.pal
+++ b/gfx/pics/granbull/shiny.pal
diff --git a/gfx/pics/075/anim0.asm b/gfx/pics/graveler/anim0.asm
index 8c0fba1ac..8c0fba1ac 100644
--- a/gfx/pics/075/anim0.asm
+++ b/gfx/pics/graveler/anim0.asm
diff --git a/gfx/pics/075/anim1.asm b/gfx/pics/graveler/anim1.asm
index e4ebc15e0..e4ebc15e0 100644
--- a/gfx/pics/075/anim1.asm
+++ b/gfx/pics/graveler/anim1.asm
diff --git a/gfx/pics/075/back.lz b/gfx/pics/graveler/back.6x6.2bpp.lz
index ba2fba8e6..ba2fba8e6 100644
--- a/gfx/pics/075/back.lz
+++ b/gfx/pics/graveler/back.6x6.2bpp.lz
diff --git a/gfx/pics/075/bitmask.asm b/gfx/pics/graveler/bitmask.asm
index 8f8129f11..8f8129f11 100644
--- a/gfx/pics/075/bitmask.asm
+++ b/gfx/pics/graveler/bitmask.asm
diff --git a/gfx/pics/075/frames.asm b/gfx/pics/graveler/frames.asm
index 951c9c79e..951c9c79e 100644
--- a/gfx/pics/075/frames.asm
+++ b/gfx/pics/graveler/frames.asm
diff --git a/gfx/pics/075/front.lz b/gfx/pics/graveler/front.6x6.2bpp.lz
index 5dcee6436..5dcee6436 100644
--- a/gfx/pics/075/front.lz
+++ b/gfx/pics/graveler/front.6x6.2bpp.lz
diff --git a/gfx/pics/075/normal.pal b/gfx/pics/graveler/normal.pal
index fb55478b1..fb55478b1 100644
--- a/gfx/pics/075/normal.pal
+++ b/gfx/pics/graveler/normal.pal
diff --git a/gfx/pics/075/shiny.pal b/gfx/pics/graveler/shiny.pal
index 36ba603c5..36ba603c5 100644
--- a/gfx/pics/075/shiny.pal
+++ b/gfx/pics/graveler/shiny.pal
diff --git a/gfx/pics/088/anim0.asm b/gfx/pics/grimer/anim0.asm
index c8edda489..c8edda489 100644
--- a/gfx/pics/088/anim0.asm
+++ b/gfx/pics/grimer/anim0.asm
diff --git a/gfx/pics/088/anim1.asm b/gfx/pics/grimer/anim1.asm
index 50829935e..50829935e 100644
--- a/gfx/pics/088/anim1.asm
+++ b/gfx/pics/grimer/anim1.asm
diff --git a/gfx/pics/088/back.lz b/gfx/pics/grimer/back.6x6.2bpp.lz
index d4494a003..d4494a003 100644
--- a/gfx/pics/088/back.lz
+++ b/gfx/pics/grimer/back.6x6.2bpp.lz
diff --git a/gfx/pics/088/bitmask.asm b/gfx/pics/grimer/bitmask.asm
index 850747202..850747202 100644
--- a/gfx/pics/088/bitmask.asm
+++ b/gfx/pics/grimer/bitmask.asm
diff --git a/gfx/pics/088/frames.asm b/gfx/pics/grimer/frames.asm
index e20152574..e20152574 100644
--- a/gfx/pics/088/frames.asm
+++ b/gfx/pics/grimer/frames.asm
diff --git a/gfx/pics/088/front.lz b/gfx/pics/grimer/front.5x5.2bpp.lz
index 176f2da1c..176f2da1c 100644
--- a/gfx/pics/088/front.lz
+++ b/gfx/pics/grimer/front.5x5.2bpp.lz
diff --git a/gfx/pics/088/normal.pal b/gfx/pics/grimer/normal.pal
index 32df6345f..32df6345f 100644
--- a/gfx/pics/088/normal.pal
+++ b/gfx/pics/grimer/normal.pal
diff --git a/gfx/pics/088/shiny.pal b/gfx/pics/grimer/shiny.pal
index 893276df4..893276df4 100644
--- a/gfx/pics/088/shiny.pal
+++ b/gfx/pics/grimer/shiny.pal
diff --git a/gfx/pics/058/anim0.asm b/gfx/pics/growlithe/anim0.asm
index 333c08e67..333c08e67 100644
--- a/gfx/pics/058/anim0.asm
+++ b/gfx/pics/growlithe/anim0.asm
diff --git a/gfx/pics/058/anim1.asm b/gfx/pics/growlithe/anim1.asm
index bce18fa44..bce18fa44 100644
--- a/gfx/pics/058/anim1.asm
+++ b/gfx/pics/growlithe/anim1.asm
diff --git a/gfx/pics/058/back.lz b/gfx/pics/growlithe/back.6x6.2bpp.lz
index 222250f79..222250f79 100644
--- a/gfx/pics/058/back.lz
+++ b/gfx/pics/growlithe/back.6x6.2bpp.lz
diff --git a/gfx/pics/058/bitmask.asm b/gfx/pics/growlithe/bitmask.asm
index 625b790d7..625b790d7 100644
--- a/gfx/pics/058/bitmask.asm
+++ b/gfx/pics/growlithe/bitmask.asm
diff --git a/gfx/pics/058/frames.asm b/gfx/pics/growlithe/frames.asm
index 510227bc5..510227bc5 100644
--- a/gfx/pics/058/frames.asm
+++ b/gfx/pics/growlithe/frames.asm
diff --git a/gfx/pics/058/front.lz b/gfx/pics/growlithe/front.5x5.2bpp.lz
index a01b4f1fc..a01b4f1fc 100644
--- a/gfx/pics/058/front.lz
+++ b/gfx/pics/growlithe/front.5x5.2bpp.lz
diff --git a/gfx/pics/058/normal.pal b/gfx/pics/growlithe/normal.pal
index 07a6b3878..07a6b3878 100644
--- a/gfx/pics/058/normal.pal
+++ b/gfx/pics/growlithe/normal.pal
diff --git a/gfx/pics/058/shiny.pal b/gfx/pics/growlithe/shiny.pal
index 5033bfda2..5033bfda2 100644
--- a/gfx/pics/058/shiny.pal
+++ b/gfx/pics/growlithe/shiny.pal
diff --git a/gfx/pics/130/anim0.asm b/gfx/pics/gyarados/anim0.asm
index 89195fa31..89195fa31 100644
--- a/gfx/pics/130/anim0.asm
+++ b/gfx/pics/gyarados/anim0.asm
diff --git a/gfx/pics/130/anim1.asm b/gfx/pics/gyarados/anim1.asm
index b33c52080..b33c52080 100644
--- a/gfx/pics/130/anim1.asm
+++ b/gfx/pics/gyarados/anim1.asm
diff --git a/gfx/pics/130/back.lz b/gfx/pics/gyarados/back.6x6.2bpp.lz
index d061ec9b2..d061ec9b2 100644
--- a/gfx/pics/130/back.lz
+++ b/gfx/pics/gyarados/back.6x6.2bpp.lz
diff --git a/gfx/pics/130/bitmask.asm b/gfx/pics/gyarados/bitmask.asm
index 2e55e37e0..2e55e37e0 100644
--- a/gfx/pics/130/bitmask.asm
+++ b/gfx/pics/gyarados/bitmask.asm
diff --git a/gfx/pics/130/frames.asm b/gfx/pics/gyarados/frames.asm
index 7624220e1..7624220e1 100644
--- a/gfx/pics/130/frames.asm
+++ b/gfx/pics/gyarados/frames.asm
diff --git a/gfx/pics/130/front.lz b/gfx/pics/gyarados/front.7x7.2bpp.lz
index 4d66d5814..4d66d5814 100644
--- a/gfx/pics/130/front.lz
+++ b/gfx/pics/gyarados/front.7x7.2bpp.lz
diff --git a/gfx/pics/130/normal.pal b/gfx/pics/gyarados/normal.pal
index 51cc26df9..51cc26df9 100644
--- a/gfx/pics/130/normal.pal
+++ b/gfx/pics/gyarados/normal.pal
diff --git a/gfx/pics/130/shiny.pal b/gfx/pics/gyarados/shiny.pal
index d0599722d..d0599722d 100644
--- a/gfx/pics/130/shiny.pal
+++ b/gfx/pics/gyarados/shiny.pal
diff --git a/gfx/pics/093/anim0.asm b/gfx/pics/haunter/anim0.asm
index a46d0f0bc..a46d0f0bc 100644
--- a/gfx/pics/093/anim0.asm
+++ b/gfx/pics/haunter/anim0.asm
diff --git a/gfx/pics/093/anim1.asm b/gfx/pics/haunter/anim1.asm
index bf439b1e1..bf439b1e1 100644
--- a/gfx/pics/093/anim1.asm
+++ b/gfx/pics/haunter/anim1.asm
diff --git a/gfx/pics/093/back.lz b/gfx/pics/haunter/back.6x6.2bpp.lz
index 660c0408b..660c0408b 100644
--- a/gfx/pics/093/back.lz
+++ b/gfx/pics/haunter/back.6x6.2bpp.lz
diff --git a/gfx/pics/093/bitmask.asm b/gfx/pics/haunter/bitmask.asm
index 99e55965f..99e55965f 100644
--- a/gfx/pics/093/bitmask.asm
+++ b/gfx/pics/haunter/bitmask.asm
diff --git a/gfx/pics/093/frames.asm b/gfx/pics/haunter/frames.asm
index 15c6ab978..15c6ab978 100644
--- a/gfx/pics/093/frames.asm
+++ b/gfx/pics/haunter/frames.asm
diff --git a/gfx/pics/093/front.lz b/gfx/pics/haunter/front.6x6.2bpp.lz
index 6bb6ab582..6bb6ab582 100644
--- a/gfx/pics/093/front.lz
+++ b/gfx/pics/haunter/front.6x6.2bpp.lz
diff --git a/gfx/pics/093/normal.pal b/gfx/pics/haunter/normal.pal
index 7ef36a1c6..7ef36a1c6 100644
--- a/gfx/pics/093/normal.pal
+++ b/gfx/pics/haunter/normal.pal
diff --git a/gfx/pics/093/shiny.pal b/gfx/pics/haunter/shiny.pal
index b8ea0d809..b8ea0d809 100644
--- a/gfx/pics/093/shiny.pal
+++ b/gfx/pics/haunter/shiny.pal
diff --git a/gfx/pics/214/anim0.asm b/gfx/pics/heracross/anim0.asm
index 5bba06fad..5bba06fad 100644
--- a/gfx/pics/214/anim0.asm
+++ b/gfx/pics/heracross/anim0.asm
diff --git a/gfx/pics/214/anim1.asm b/gfx/pics/heracross/anim1.asm
index 6c402379c..6c402379c 100644
--- a/gfx/pics/214/anim1.asm
+++ b/gfx/pics/heracross/anim1.asm
diff --git a/gfx/pics/214/back.lz b/gfx/pics/heracross/back.6x6.2bpp.lz
index da4d40981..da4d40981 100644
--- a/gfx/pics/214/back.lz
+++ b/gfx/pics/heracross/back.6x6.2bpp.lz
diff --git a/gfx/pics/214/bitmask.asm b/gfx/pics/heracross/bitmask.asm
index 024c0880b..024c0880b 100644
--- a/gfx/pics/214/bitmask.asm
+++ b/gfx/pics/heracross/bitmask.asm
diff --git a/gfx/pics/214/frames.asm b/gfx/pics/heracross/frames.asm
index 684c7e82e..684c7e82e 100644
--- a/gfx/pics/214/frames.asm
+++ b/gfx/pics/heracross/frames.asm
diff --git a/gfx/pics/214/front.lz b/gfx/pics/heracross/front.6x6.2bpp.lz
index ad23e01d1..ad23e01d1 100644
--- a/gfx/pics/214/front.lz
+++ b/gfx/pics/heracross/front.6x6.2bpp.lz
diff --git a/gfx/pics/214/normal.pal b/gfx/pics/heracross/normal.pal
index cfc263f77..cfc263f77 100644
--- a/gfx/pics/214/normal.pal
+++ b/gfx/pics/heracross/normal.pal
diff --git a/gfx/pics/214/shiny.pal b/gfx/pics/heracross/shiny.pal
index 3bc81cbdc..3bc81cbdc 100644
--- a/gfx/pics/214/shiny.pal
+++ b/gfx/pics/heracross/shiny.pal
diff --git a/gfx/pics/107/anim0.asm b/gfx/pics/hitmonchan/anim0.asm
index b6ddd647e..b6ddd647e 100644
--- a/gfx/pics/107/anim0.asm
+++ b/gfx/pics/hitmonchan/anim0.asm
diff --git a/gfx/pics/107/anim1.asm b/gfx/pics/hitmonchan/anim1.asm
index 6f67577a0..6f67577a0 100644
--- a/gfx/pics/107/anim1.asm
+++ b/gfx/pics/hitmonchan/anim1.asm
diff --git a/gfx/pics/107/back.lz b/gfx/pics/hitmonchan/back.6x6.2bpp.lz
index f785248c1..f785248c1 100644
--- a/gfx/pics/107/back.lz
+++ b/gfx/pics/hitmonchan/back.6x6.2bpp.lz
diff --git a/gfx/pics/107/bitmask.asm b/gfx/pics/hitmonchan/bitmask.asm
index 522452e67..522452e67 100644
--- a/gfx/pics/107/bitmask.asm
+++ b/gfx/pics/hitmonchan/bitmask.asm
diff --git a/gfx/pics/107/frames.asm b/gfx/pics/hitmonchan/frames.asm
index 90269c7bd..90269c7bd 100644
--- a/gfx/pics/107/frames.asm
+++ b/gfx/pics/hitmonchan/frames.asm
diff --git a/gfx/pics/107/front.lz b/gfx/pics/hitmonchan/front.6x6.2bpp.lz
index e9a77e987..e9a77e987 100644
--- a/gfx/pics/107/front.lz
+++ b/gfx/pics/hitmonchan/front.6x6.2bpp.lz
diff --git a/gfx/pics/107/normal.pal b/gfx/pics/hitmonchan/normal.pal
index b735101e8..b735101e8 100644
--- a/gfx/pics/107/normal.pal
+++ b/gfx/pics/hitmonchan/normal.pal
diff --git a/gfx/pics/107/shiny.pal b/gfx/pics/hitmonchan/shiny.pal
index ff930b7a5..ff930b7a5 100644
--- a/gfx/pics/107/shiny.pal
+++ b/gfx/pics/hitmonchan/shiny.pal
diff --git a/gfx/pics/106/anim0.asm b/gfx/pics/hitmonlee/anim0.asm
index 4260d7753..4260d7753 100644
--- a/gfx/pics/106/anim0.asm
+++ b/gfx/pics/hitmonlee/anim0.asm
diff --git a/gfx/pics/106/anim1.asm b/gfx/pics/hitmonlee/anim1.asm
index 4d7d191bf..4d7d191bf 100644
--- a/gfx/pics/106/anim1.asm
+++ b/gfx/pics/hitmonlee/anim1.asm
diff --git a/gfx/pics/106/back.lz b/gfx/pics/hitmonlee/back.6x6.2bpp.lz
index 4847a1496..4847a1496 100644
--- a/gfx/pics/106/back.lz
+++ b/gfx/pics/hitmonlee/back.6x6.2bpp.lz
diff --git a/gfx/pics/106/bitmask.asm b/gfx/pics/hitmonlee/bitmask.asm
index 752385f96..752385f96 100644
--- a/gfx/pics/106/bitmask.asm
+++ b/gfx/pics/hitmonlee/bitmask.asm
diff --git a/gfx/pics/106/frames.asm b/gfx/pics/hitmonlee/frames.asm
index 6b68838d9..6b68838d9 100644
--- a/gfx/pics/106/frames.asm
+++ b/gfx/pics/hitmonlee/frames.asm
diff --git a/gfx/pics/106/front.lz b/gfx/pics/hitmonlee/front.7x7.2bpp.lz
index c85ec5817..c85ec5817 100644
--- a/gfx/pics/106/front.lz
+++ b/gfx/pics/hitmonlee/front.7x7.2bpp.lz
diff --git a/gfx/pics/106/normal.pal b/gfx/pics/hitmonlee/normal.pal
index f9973fcfd..f9973fcfd 100644
--- a/gfx/pics/106/normal.pal
+++ b/gfx/pics/hitmonlee/normal.pal
diff --git a/gfx/pics/106/shiny.pal b/gfx/pics/hitmonlee/shiny.pal
index c0ee7cc2e..c0ee7cc2e 100644
--- a/gfx/pics/106/shiny.pal
+++ b/gfx/pics/hitmonlee/shiny.pal
diff --git a/gfx/pics/237/anim0.asm b/gfx/pics/hitmontop/anim0.asm
index 195f1554b..195f1554b 100644
--- a/gfx/pics/237/anim0.asm
+++ b/gfx/pics/hitmontop/anim0.asm
diff --git a/gfx/pics/237/anim1.asm b/gfx/pics/hitmontop/anim1.asm
index 3b4f17403..3b4f17403 100644
--- a/gfx/pics/237/anim1.asm
+++ b/gfx/pics/hitmontop/anim1.asm
diff --git a/gfx/pics/237/back.lz b/gfx/pics/hitmontop/back.6x6.2bpp.lz
index 185f08aff..185f08aff 100644
--- a/gfx/pics/237/back.lz
+++ b/gfx/pics/hitmontop/back.6x6.2bpp.lz
diff --git a/gfx/pics/237/bitmask.asm b/gfx/pics/hitmontop/bitmask.asm
index 36c8a6a26..36c8a6a26 100644
--- a/gfx/pics/237/bitmask.asm
+++ b/gfx/pics/hitmontop/bitmask.asm
diff --git a/gfx/pics/237/frames.asm b/gfx/pics/hitmontop/frames.asm
index 74db7ebe7..74db7ebe7 100644
--- a/gfx/pics/237/frames.asm
+++ b/gfx/pics/hitmontop/frames.asm
diff --git a/gfx/pics/237/front.lz b/gfx/pics/hitmontop/front.7x7.2bpp.lz
index d28913fcf..d28913fcf 100644
--- a/gfx/pics/237/front.lz
+++ b/gfx/pics/hitmontop/front.7x7.2bpp.lz
diff --git a/gfx/pics/237/normal.pal b/gfx/pics/hitmontop/normal.pal
index a6621cff6..a6621cff6 100644
--- a/gfx/pics/237/normal.pal
+++ b/gfx/pics/hitmontop/normal.pal
diff --git a/gfx/pics/237/shiny.pal b/gfx/pics/hitmontop/shiny.pal
index 5c88a27e0..5c88a27e0 100644
--- a/gfx/pics/237/shiny.pal
+++ b/gfx/pics/hitmontop/shiny.pal
diff --git a/gfx/pics/250/anim0.asm b/gfx/pics/ho_oh/anim0.asm
index 5ae27b487..5ae27b487 100644
--- a/gfx/pics/250/anim0.asm
+++ b/gfx/pics/ho_oh/anim0.asm
diff --git a/gfx/pics/250/anim1.asm b/gfx/pics/ho_oh/anim1.asm
index d7808f281..d7808f281 100644
--- a/gfx/pics/250/anim1.asm
+++ b/gfx/pics/ho_oh/anim1.asm
diff --git a/gfx/pics/250/back.lz b/gfx/pics/ho_oh/back.6x6.2bpp.lz
index 1d58cf8ac..1d58cf8ac 100644
--- a/gfx/pics/250/back.lz
+++ b/gfx/pics/ho_oh/back.6x6.2bpp.lz
diff --git a/gfx/pics/250/bitmask.asm b/gfx/pics/ho_oh/bitmask.asm
index 4db146ccd..4db146ccd 100644
--- a/gfx/pics/250/bitmask.asm
+++ b/gfx/pics/ho_oh/bitmask.asm
diff --git a/gfx/pics/250/frames.asm b/gfx/pics/ho_oh/frames.asm
index 7b244c4f8..7b244c4f8 100644
--- a/gfx/pics/250/frames.asm
+++ b/gfx/pics/ho_oh/frames.asm
diff --git a/gfx/pics/250/front.lz b/gfx/pics/ho_oh/front.7x7.2bpp.lz
index 40c91739e..40c91739e 100644
--- a/gfx/pics/250/front.lz
+++ b/gfx/pics/ho_oh/front.7x7.2bpp.lz
diff --git a/gfx/pics/250/normal.pal b/gfx/pics/ho_oh/normal.pal
index be2b43d0d..be2b43d0d 100644
--- a/gfx/pics/250/normal.pal
+++ b/gfx/pics/ho_oh/normal.pal
diff --git a/gfx/pics/250/shiny.pal b/gfx/pics/ho_oh/shiny.pal
index 64a56ec52..64a56ec52 100644
--- a/gfx/pics/250/shiny.pal
+++ b/gfx/pics/ho_oh/shiny.pal
diff --git a/gfx/pics/163/anim0.asm b/gfx/pics/hoothoot/anim0.asm
index 813faf909..813faf909 100644
--- a/gfx/pics/163/anim0.asm
+++ b/gfx/pics/hoothoot/anim0.asm
diff --git a/gfx/pics/163/anim1.asm b/gfx/pics/hoothoot/anim1.asm
index 4aaf1a124..4aaf1a124 100644
--- a/gfx/pics/163/anim1.asm
+++ b/gfx/pics/hoothoot/anim1.asm
diff --git a/gfx/pics/163/back.lz b/gfx/pics/hoothoot/back.6x6.2bpp.lz
index e4ca2f37f..e4ca2f37f 100644
--- a/gfx/pics/163/back.lz
+++ b/gfx/pics/hoothoot/back.6x6.2bpp.lz
diff --git a/gfx/pics/163/bitmask.asm b/gfx/pics/hoothoot/bitmask.asm
index e473e1e04..e473e1e04 100644
--- a/gfx/pics/163/bitmask.asm
+++ b/gfx/pics/hoothoot/bitmask.asm
diff --git a/gfx/pics/163/frames.asm b/gfx/pics/hoothoot/frames.asm
index 028590ffc..028590ffc 100644
--- a/gfx/pics/163/frames.asm
+++ b/gfx/pics/hoothoot/frames.asm
diff --git a/gfx/pics/163/front.lz b/gfx/pics/hoothoot/front.5x5.2bpp.lz
index 6abcd37fc..6abcd37fc 100644
--- a/gfx/pics/163/front.lz
+++ b/gfx/pics/hoothoot/front.5x5.2bpp.lz
diff --git a/gfx/pics/163/normal.pal b/gfx/pics/hoothoot/normal.pal
index af1d96c2d..af1d96c2d 100644
--- a/gfx/pics/163/normal.pal
+++ b/gfx/pics/hoothoot/normal.pal
diff --git a/gfx/pics/163/shiny.pal b/gfx/pics/hoothoot/shiny.pal
index 360685581..360685581 100644
--- a/gfx/pics/163/shiny.pal
+++ b/gfx/pics/hoothoot/shiny.pal
diff --git a/gfx/pics/187/anim0.asm b/gfx/pics/hoppip/anim0.asm
index 6af60ab0b..6af60ab0b 100644
--- a/gfx/pics/187/anim0.asm
+++ b/gfx/pics/hoppip/anim0.asm
diff --git a/gfx/pics/187/anim1.asm b/gfx/pics/hoppip/anim1.asm
index d0281ca1c..d0281ca1c 100644
--- a/gfx/pics/187/anim1.asm
+++ b/gfx/pics/hoppip/anim1.asm
diff --git a/gfx/pics/187/back.lz b/gfx/pics/hoppip/back.6x6.2bpp.lz
index c5439118e..c5439118e 100644
--- a/gfx/pics/187/back.lz
+++ b/gfx/pics/hoppip/back.6x6.2bpp.lz
diff --git a/gfx/pics/187/bitmask.asm b/gfx/pics/hoppip/bitmask.asm
index 54cedfdd8..54cedfdd8 100644
--- a/gfx/pics/187/bitmask.asm
+++ b/gfx/pics/hoppip/bitmask.asm
diff --git a/gfx/pics/187/frames.asm b/gfx/pics/hoppip/frames.asm
index 6a0afff92..6a0afff92 100644
--- a/gfx/pics/187/frames.asm
+++ b/gfx/pics/hoppip/frames.asm
diff --git a/gfx/pics/187/front.lz b/gfx/pics/hoppip/front.5x5.2bpp.lz
index 4387e2886..4387e2886 100644
--- a/gfx/pics/187/front.lz
+++ b/gfx/pics/hoppip/front.5x5.2bpp.lz
diff --git a/gfx/pics/187/normal.pal b/gfx/pics/hoppip/normal.pal
index 6f44a59ec..6f44a59ec 100644
--- a/gfx/pics/187/normal.pal
+++ b/gfx/pics/hoppip/normal.pal
diff --git a/gfx/pics/187/shiny.pal b/gfx/pics/hoppip/shiny.pal
index 4a4afec42..4a4afec42 100644
--- a/gfx/pics/187/shiny.pal
+++ b/gfx/pics/hoppip/shiny.pal
diff --git a/gfx/pics/116/anim0.asm b/gfx/pics/horsea/anim0.asm
index 18d51863c..18d51863c 100644
--- a/gfx/pics/116/anim0.asm
+++ b/gfx/pics/horsea/anim0.asm
diff --git a/gfx/pics/116/anim1.asm b/gfx/pics/horsea/anim1.asm
index 2475abfdb..2475abfdb 100644
--- a/gfx/pics/116/anim1.asm
+++ b/gfx/pics/horsea/anim1.asm
diff --git a/gfx/pics/116/back.lz b/gfx/pics/horsea/back.6x6.2bpp.lz
index ae6a2ecab..ae6a2ecab 100644
--- a/gfx/pics/116/back.lz
+++ b/gfx/pics/horsea/back.6x6.2bpp.lz
diff --git a/gfx/pics/116/bitmask.asm b/gfx/pics/horsea/bitmask.asm
index 8c5e6f8ba..8c5e6f8ba 100644
--- a/gfx/pics/116/bitmask.asm
+++ b/gfx/pics/horsea/bitmask.asm
diff --git a/gfx/pics/116/frames.asm b/gfx/pics/horsea/frames.asm
index 3dc3d270e..3dc3d270e 100644
--- a/gfx/pics/116/frames.asm
+++ b/gfx/pics/horsea/frames.asm
diff --git a/gfx/pics/116/front.lz b/gfx/pics/horsea/front.5x5.2bpp.lz
index 7db08094b..7db08094b 100644
--- a/gfx/pics/116/front.lz
+++ b/gfx/pics/horsea/front.5x5.2bpp.lz
diff --git a/gfx/pics/116/normal.pal b/gfx/pics/horsea/normal.pal
index 7a8344a06..7a8344a06 100644
--- a/gfx/pics/116/normal.pal
+++ b/gfx/pics/horsea/normal.pal
diff --git a/gfx/pics/116/shiny.pal b/gfx/pics/horsea/shiny.pal
index 9b9875302..9b9875302 100644
--- a/gfx/pics/116/shiny.pal
+++ b/gfx/pics/horsea/shiny.pal
diff --git a/gfx/pics/229/anim0.asm b/gfx/pics/houndoom/anim0.asm
index 60ad08726..60ad08726 100644
--- a/gfx/pics/229/anim0.asm
+++ b/gfx/pics/houndoom/anim0.asm
diff --git a/gfx/pics/229/anim1.asm b/gfx/pics/houndoom/anim1.asm
index 78fa8610c..78fa8610c 100644
--- a/gfx/pics/229/anim1.asm
+++ b/gfx/pics/houndoom/anim1.asm
diff --git a/gfx/pics/229/back.lz b/gfx/pics/houndoom/back.6x6.2bpp.lz
index 5b7b72ffc..5b7b72ffc 100644
--- a/gfx/pics/229/back.lz
+++ b/gfx/pics/houndoom/back.6x6.2bpp.lz
diff --git a/gfx/pics/229/bitmask.asm b/gfx/pics/houndoom/bitmask.asm
index 8280ba2ce..8280ba2ce 100644
--- a/gfx/pics/229/bitmask.asm
+++ b/gfx/pics/houndoom/bitmask.asm
diff --git a/gfx/pics/229/frames.asm b/gfx/pics/houndoom/frames.asm
index 0241edf36..0241edf36 100644
--- a/gfx/pics/229/frames.asm
+++ b/gfx/pics/houndoom/frames.asm
diff --git a/gfx/pics/229/front.lz b/gfx/pics/houndoom/front.7x7.2bpp.lz
index c2ce34ee3..c2ce34ee3 100644
--- a/gfx/pics/229/front.lz
+++ b/gfx/pics/houndoom/front.7x7.2bpp.lz
diff --git a/gfx/pics/229/normal.pal b/gfx/pics/houndoom/normal.pal
index 6fbf714ba..6fbf714ba 100644
--- a/gfx/pics/229/normal.pal
+++ b/gfx/pics/houndoom/normal.pal
diff --git a/gfx/pics/229/shiny.pal b/gfx/pics/houndoom/shiny.pal
index cf16faf2c..cf16faf2c 100644
--- a/gfx/pics/229/shiny.pal
+++ b/gfx/pics/houndoom/shiny.pal
diff --git a/gfx/pics/228/anim0.asm b/gfx/pics/houndour/anim0.asm
index 2235850c0..2235850c0 100644
--- a/gfx/pics/228/anim0.asm
+++ b/gfx/pics/houndour/anim0.asm
diff --git a/gfx/pics/228/anim1.asm b/gfx/pics/houndour/anim1.asm
index dd8318689..dd8318689 100644
--- a/gfx/pics/228/anim1.asm
+++ b/gfx/pics/houndour/anim1.asm
diff --git a/gfx/pics/228/back.lz b/gfx/pics/houndour/back.6x6.2bpp.lz
index fe3584bd1..fe3584bd1 100644
--- a/gfx/pics/228/back.lz
+++ b/gfx/pics/houndour/back.6x6.2bpp.lz
diff --git a/gfx/pics/228/bitmask.asm b/gfx/pics/houndour/bitmask.asm
index 1542871bd..1542871bd 100644
--- a/gfx/pics/228/bitmask.asm
+++ b/gfx/pics/houndour/bitmask.asm
diff --git a/gfx/pics/228/frames.asm b/gfx/pics/houndour/frames.asm
index 6087e14b7..6087e14b7 100644
--- a/gfx/pics/228/frames.asm
+++ b/gfx/pics/houndour/frames.asm
diff --git a/gfx/pics/228/front.lz b/gfx/pics/houndour/front.6x6.2bpp.lz
index 786c0f9a4..786c0f9a4 100644
--- a/gfx/pics/228/front.lz
+++ b/gfx/pics/houndour/front.6x6.2bpp.lz
diff --git a/gfx/pics/228/normal.pal b/gfx/pics/houndour/normal.pal
index 7ea34334c..7ea34334c 100644
--- a/gfx/pics/228/normal.pal
+++ b/gfx/pics/houndour/normal.pal
diff --git a/gfx/pics/228/shiny.pal b/gfx/pics/houndour/shiny.pal
index c7296ab33..c7296ab33 100644
--- a/gfx/pics/228/shiny.pal
+++ b/gfx/pics/houndour/shiny.pal
diff --git a/gfx/pics/097/anim0.asm b/gfx/pics/hypno/anim0.asm
index b6c3e6463..b6c3e6463 100644
--- a/gfx/pics/097/anim0.asm
+++ b/gfx/pics/hypno/anim0.asm
diff --git a/gfx/pics/097/anim1.asm b/gfx/pics/hypno/anim1.asm
index 4d981c442..4d981c442 100644
--- a/gfx/pics/097/anim1.asm
+++ b/gfx/pics/hypno/anim1.asm
diff --git a/gfx/pics/097/back.lz b/gfx/pics/hypno/back.6x6.2bpp.lz
index b69fcadf7..b69fcadf7 100644
--- a/gfx/pics/097/back.lz
+++ b/gfx/pics/hypno/back.6x6.2bpp.lz
diff --git a/gfx/pics/097/bitmask.asm b/gfx/pics/hypno/bitmask.asm
index 4b510102e..4b510102e 100644
--- a/gfx/pics/097/bitmask.asm
+++ b/gfx/pics/hypno/bitmask.asm
diff --git a/gfx/pics/097/frames.asm b/gfx/pics/hypno/frames.asm
index dd8e204ec..dd8e204ec 100644
--- a/gfx/pics/097/frames.asm
+++ b/gfx/pics/hypno/frames.asm
diff --git a/gfx/pics/097/front.lz b/gfx/pics/hypno/front.7x7.2bpp.lz
index ca6ec0608..ca6ec0608 100644
--- a/gfx/pics/097/front.lz
+++ b/gfx/pics/hypno/front.7x7.2bpp.lz
diff --git a/gfx/pics/097/normal.pal b/gfx/pics/hypno/normal.pal
index ddcd2b573..ddcd2b573 100644
--- a/gfx/pics/097/normal.pal
+++ b/gfx/pics/hypno/normal.pal
diff --git a/gfx/pics/097/shiny.pal b/gfx/pics/hypno/shiny.pal
index 51f14601f..51f14601f 100644
--- a/gfx/pics/097/shiny.pal
+++ b/gfx/pics/hypno/shiny.pal
diff --git a/gfx/pics/174/anim0.asm b/gfx/pics/igglybuff/anim0.asm
index 0b2430e44..0b2430e44 100644
--- a/gfx/pics/174/anim0.asm
+++ b/gfx/pics/igglybuff/anim0.asm
diff --git a/gfx/pics/174/anim1.asm b/gfx/pics/igglybuff/anim1.asm
index 338a0ab2d..338a0ab2d 100644
--- a/gfx/pics/174/anim1.asm
+++ b/gfx/pics/igglybuff/anim1.asm
diff --git a/gfx/pics/174/back.lz b/gfx/pics/igglybuff/back.6x6.2bpp.lz
index b416af3f0..b416af3f0 100644
--- a/gfx/pics/174/back.lz
+++ b/gfx/pics/igglybuff/back.6x6.2bpp.lz
diff --git a/gfx/pics/174/bitmask.asm b/gfx/pics/igglybuff/bitmask.asm
index c5d067fc8..c5d067fc8 100644
--- a/gfx/pics/174/bitmask.asm
+++ b/gfx/pics/igglybuff/bitmask.asm
diff --git a/gfx/pics/174/frames.asm b/gfx/pics/igglybuff/frames.asm
index 3e279f4e8..3e279f4e8 100644
--- a/gfx/pics/174/frames.asm
+++ b/gfx/pics/igglybuff/frames.asm
diff --git a/gfx/pics/174/front.lz b/gfx/pics/igglybuff/front.5x5.2bpp.lz
index 1c4bbefa0..1c4bbefa0 100644
--- a/gfx/pics/174/front.lz
+++ b/gfx/pics/igglybuff/front.5x5.2bpp.lz
diff --git a/gfx/pics/174/normal.pal b/gfx/pics/igglybuff/normal.pal
index e9935054a..e9935054a 100644
--- a/gfx/pics/174/normal.pal
+++ b/gfx/pics/igglybuff/normal.pal
diff --git a/gfx/pics/039/shiny.pal b/gfx/pics/igglybuff/shiny.pal
index 38ce5d76d..38ce5d76d 100644
--- a/gfx/pics/039/shiny.pal
+++ b/gfx/pics/igglybuff/shiny.pal
diff --git a/gfx/pics/002/anim0.asm b/gfx/pics/ivysaur/anim0.asm
index 65e89f5ab..65e89f5ab 100644
--- a/gfx/pics/002/anim0.asm
+++ b/gfx/pics/ivysaur/anim0.asm
diff --git a/gfx/pics/002/anim1.asm b/gfx/pics/ivysaur/anim1.asm
index 3df18b2cd..3df18b2cd 100644
--- a/gfx/pics/002/anim1.asm
+++ b/gfx/pics/ivysaur/anim1.asm
diff --git a/gfx/pics/002/back.lz b/gfx/pics/ivysaur/back.6x6.2bpp.lz
index 34557d9dd..34557d9dd 100644
--- a/gfx/pics/002/back.lz
+++ b/gfx/pics/ivysaur/back.6x6.2bpp.lz
diff --git a/gfx/pics/002/bitmask.asm b/gfx/pics/ivysaur/bitmask.asm
index fa0421574..fa0421574 100644
--- a/gfx/pics/002/bitmask.asm
+++ b/gfx/pics/ivysaur/bitmask.asm
diff --git a/gfx/pics/002/frames.asm b/gfx/pics/ivysaur/frames.asm
index 074875072..074875072 100644
--- a/gfx/pics/002/frames.asm
+++ b/gfx/pics/ivysaur/frames.asm
diff --git a/gfx/pics/002/front.lz b/gfx/pics/ivysaur/front.6x6.2bpp.lz
index 7b9c8f9d9..7b9c8f9d9 100644
--- a/gfx/pics/002/front.lz
+++ b/gfx/pics/ivysaur/front.6x6.2bpp.lz
diff --git a/gfx/pics/002/normal.pal b/gfx/pics/ivysaur/normal.pal
index 31f0796cb..31f0796cb 100644
--- a/gfx/pics/002/normal.pal
+++ b/gfx/pics/ivysaur/normal.pal
diff --git a/gfx/pics/002/shiny.pal b/gfx/pics/ivysaur/shiny.pal
index 04c81cf45..04c81cf45 100644
--- a/gfx/pics/002/shiny.pal
+++ b/gfx/pics/ivysaur/shiny.pal
diff --git a/gfx/pics/039/anim0.asm b/gfx/pics/jigglypuff/anim0.asm
index ada7e0d99..ada7e0d99 100644
--- a/gfx/pics/039/anim0.asm
+++ b/gfx/pics/jigglypuff/anim0.asm
diff --git a/gfx/pics/039/anim1.asm b/gfx/pics/jigglypuff/anim1.asm
index 40584de87..40584de87 100644
--- a/gfx/pics/039/anim1.asm
+++ b/gfx/pics/jigglypuff/anim1.asm
diff --git a/gfx/pics/039/back.lz b/gfx/pics/jigglypuff/back.6x6.2bpp.lz
index e551afaf6..e551afaf6 100644
--- a/gfx/pics/039/back.lz
+++ b/gfx/pics/jigglypuff/back.6x6.2bpp.lz
diff --git a/gfx/pics/039/bitmask.asm b/gfx/pics/jigglypuff/bitmask.asm
index ae2e23c9f..ae2e23c9f 100644
--- a/gfx/pics/039/bitmask.asm
+++ b/gfx/pics/jigglypuff/bitmask.asm
diff --git a/gfx/pics/039/frames.asm b/gfx/pics/jigglypuff/frames.asm
index eb10d6d58..eb10d6d58 100644
--- a/gfx/pics/039/frames.asm
+++ b/gfx/pics/jigglypuff/frames.asm
diff --git a/gfx/pics/039/front.lz b/gfx/pics/jigglypuff/front.5x5.2bpp.lz
index 4367e41d8..4367e41d8 100644
--- a/gfx/pics/039/front.lz
+++ b/gfx/pics/jigglypuff/front.5x5.2bpp.lz
diff --git a/gfx/pics/039/normal.pal b/gfx/pics/jigglypuff/normal.pal
index 47aab43ae..47aab43ae 100644
--- a/gfx/pics/039/normal.pal
+++ b/gfx/pics/jigglypuff/normal.pal
diff --git a/gfx/pics/040/shiny.pal b/gfx/pics/jigglypuff/shiny.pal
index 38ce5d76d..38ce5d76d 100644
--- a/gfx/pics/040/shiny.pal
+++ b/gfx/pics/jigglypuff/shiny.pal
diff --git a/gfx/pics/johto_frames.asm b/gfx/pics/johto_frames.asm
index a66e7a2c3..3213b472f 100644
--- a/gfx/pics/johto_frames.asm
+++ b/gfx/pics/johto_frames.asm
@@ -1,101 +1,101 @@
-ChikoritaFrames:  INCLUDE "gfx/pics/152/frames.asm"
-BayleefFrames:    INCLUDE "gfx/pics/153/frames.asm"
-MeganiumFrames:   INCLUDE "gfx/pics/154/frames.asm"
-CyndaquilFrames:  INCLUDE "gfx/pics/155/frames.asm"
-QuilavaFrames:    INCLUDE "gfx/pics/156/frames.asm"
-TyphlosionFrames: INCLUDE "gfx/pics/157/frames.asm"
-TotodileFrames:   INCLUDE "gfx/pics/158/frames.asm"
-CroconawFrames:   INCLUDE "gfx/pics/159/frames.asm"
-FeraligatrFrames: INCLUDE "gfx/pics/160/frames.asm"
-SentretFrames:    INCLUDE "gfx/pics/161/frames.asm"
-FurretFrames:     INCLUDE "gfx/pics/162/frames.asm"
-HoothootFrames:   INCLUDE "gfx/pics/163/frames.asm"
-NoctowlFrames:    INCLUDE "gfx/pics/164/frames.asm"
-LedybaFrames:     INCLUDE "gfx/pics/165/frames.asm"
-LedianFrames:     INCLUDE "gfx/pics/166/frames.asm"
-SpinarakFrames:   INCLUDE "gfx/pics/167/frames.asm"
-AriadosFrames:    INCLUDE "gfx/pics/168/frames.asm"
-CrobatFrames:     INCLUDE "gfx/pics/169/frames.asm"
-ChinchouFrames:   INCLUDE "gfx/pics/170/frames.asm"
-LanturnFrames:    INCLUDE "gfx/pics/171/frames.asm"
-PichuFrames:      INCLUDE "gfx/pics/172/frames.asm"
-CleffaFrames:     INCLUDE "gfx/pics/173/frames.asm"
-IgglybuffFrames:  INCLUDE "gfx/pics/174/frames.asm"
-TogepiFrames:     INCLUDE "gfx/pics/175/frames.asm"
-TogeticFrames:    INCLUDE "gfx/pics/176/frames.asm"
-NatuFrames:       INCLUDE "gfx/pics/177/frames.asm"
-XatuFrames:       INCLUDE "gfx/pics/178/frames.asm"
-MareepFrames:     INCLUDE "gfx/pics/179/frames.asm"
-FlaaffyFrames:    INCLUDE "gfx/pics/180/frames.asm"
-AmpharosFrames:   INCLUDE "gfx/pics/181/frames.asm"
-BellossomFrames:  INCLUDE "gfx/pics/182/frames.asm"
-MarillFrames:     INCLUDE "gfx/pics/183/frames.asm"
-AzumarillFrames:  INCLUDE "gfx/pics/184/frames.asm"
-SudowoodoFrames:  INCLUDE "gfx/pics/185/frames.asm"
-PolitoedFrames:   INCLUDE "gfx/pics/186/frames.asm"
-HoppipFrames:     INCLUDE "gfx/pics/187/frames.asm"
-SkiploomFrames:   INCLUDE "gfx/pics/188/frames.asm"
-JumpluffFrames:   INCLUDE "gfx/pics/189/frames.asm"
-AipomFrames:      INCLUDE "gfx/pics/190/frames.asm"
-SunkernFrames:    INCLUDE "gfx/pics/191/frames.asm"
-SunfloraFrames:   INCLUDE "gfx/pics/192/frames.asm"
-YanmaFrames:      INCLUDE "gfx/pics/193/frames.asm"
-WooperFrames:     INCLUDE "gfx/pics/194/frames.asm"
-QuagsireFrames:   INCLUDE "gfx/pics/195/frames.asm"
-EspeonFrames:     INCLUDE "gfx/pics/196/frames.asm"
-UmbreonFrames:    INCLUDE "gfx/pics/197/frames.asm"
-MurkrowFrames:    INCLUDE "gfx/pics/198/frames.asm"
-SlowkingFrames:   INCLUDE "gfx/pics/199/frames.asm"
-MisdreavusFrames: INCLUDE "gfx/pics/200/frames.asm"
-UnownFrames:      INCLUDE "gfx/pics/201/frames.asm"
-WobbuffetFrames:  INCLUDE "gfx/pics/202/frames.asm"
-GirafarigFrames:  INCLUDE "gfx/pics/203/frames.asm"
-PinecoFrames:     INCLUDE "gfx/pics/204/frames.asm"
-ForretressFrames: INCLUDE "gfx/pics/205/frames.asm"
-DunsparceFrames:  INCLUDE "gfx/pics/206/frames.asm"
-GligarFrames:     INCLUDE "gfx/pics/207/frames.asm"
-SteelixFrames:    INCLUDE "gfx/pics/208/frames.asm"
-SnubbullFrames:   INCLUDE "gfx/pics/209/frames.asm"
-GranbullFrames:   INCLUDE "gfx/pics/210/frames.asm"
-QwilfishFrames:   INCLUDE "gfx/pics/211/frames.asm"
-ScizorFrames:     INCLUDE "gfx/pics/212/frames.asm"
-ShuckleFrames:    INCLUDE "gfx/pics/213/frames.asm"
-HeracrossFrames:  INCLUDE "gfx/pics/214/frames.asm"
-SneaselFrames:    INCLUDE "gfx/pics/215/frames.asm"
-TeddiursaFrames:  INCLUDE "gfx/pics/216/frames.asm"
-UrsaringFrames:   INCLUDE "gfx/pics/217/frames.asm"
-SlugmaFrames:     INCLUDE "gfx/pics/218/frames.asm"
-MagcargoFrames:   INCLUDE "gfx/pics/219/frames.asm"
-SwinubFrames:     INCLUDE "gfx/pics/220/frames.asm"
-PiloswineFrames:  INCLUDE "gfx/pics/221/frames.asm"
-CorsolaFrames:    INCLUDE "gfx/pics/222/frames.asm"
-RemoraidFrames:   INCLUDE "gfx/pics/223/frames.asm"
-OctilleryFrames:  INCLUDE "gfx/pics/224/frames.asm"
-DelibirdFrames:   INCLUDE "gfx/pics/225/frames.asm"
-MantineFrames:    INCLUDE "gfx/pics/226/frames.asm"
-SkarmoryFrames:   INCLUDE "gfx/pics/227/frames.asm"
-HoundourFrames:   INCLUDE "gfx/pics/228/frames.asm"
-HoundoomFrames:   INCLUDE "gfx/pics/229/frames.asm"
-KingdraFrames:    INCLUDE "gfx/pics/230/frames.asm"
-PhanpyFrames:     INCLUDE "gfx/pics/231/frames.asm"
-DonphanFrames:    INCLUDE "gfx/pics/232/frames.asm"
-Porygon2Frames:   INCLUDE "gfx/pics/233/frames.asm"
-StantlerFrames:   INCLUDE "gfx/pics/234/frames.asm"
-SmeargleFrames:   INCLUDE "gfx/pics/235/frames.asm"
-TyrogueFrames:    INCLUDE "gfx/pics/236/frames.asm"
-HitmontopFrames:  INCLUDE "gfx/pics/237/frames.asm"
-SmoochumFrames:   INCLUDE "gfx/pics/238/frames.asm"
-ElekidFrames:     INCLUDE "gfx/pics/239/frames.asm"
-MagbyFrames:      INCLUDE "gfx/pics/240/frames.asm"
-MiltankFrames:    INCLUDE "gfx/pics/241/frames.asm"
-BlisseyFrames:    INCLUDE "gfx/pics/242/frames.asm"
-RaikouFrames:     INCLUDE "gfx/pics/243/frames.asm"
-EnteiFrames:      INCLUDE "gfx/pics/244/frames.asm"
-SuicuneFrames:    INCLUDE "gfx/pics/245/frames.asm"
-LarvitarFrames:   INCLUDE "gfx/pics/246/frames.asm"
-PupitarFrames:    INCLUDE "gfx/pics/247/frames.asm"
-TyranitarFrames:  INCLUDE "gfx/pics/248/frames.asm"
-LugiaFrames:      INCLUDE "gfx/pics/249/frames.asm"
-HoOhFrames:       INCLUDE "gfx/pics/250/frames.asm"
-CelebiFrames:     INCLUDE "gfx/pics/251/frames.asm"
+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/135/anim0.asm b/gfx/pics/jolteon/anim0.asm
index c4c01e60a..c4c01e60a 100644
--- a/gfx/pics/135/anim0.asm
+++ b/gfx/pics/jolteon/anim0.asm
diff --git a/gfx/pics/135/anim1.asm b/gfx/pics/jolteon/anim1.asm
index 0b5481afd..0b5481afd 100644
--- a/gfx/pics/135/anim1.asm
+++ b/gfx/pics/jolteon/anim1.asm
diff --git a/gfx/pics/135/back.lz b/gfx/pics/jolteon/back.6x6.2bpp.lz
index e95f893ce..e95f893ce 100644
--- a/gfx/pics/135/back.lz
+++ b/gfx/pics/jolteon/back.6x6.2bpp.lz
diff --git a/gfx/pics/135/bitmask.asm b/gfx/pics/jolteon/bitmask.asm
index 7d7c181cd..7d7c181cd 100644
--- a/gfx/pics/135/bitmask.asm
+++ b/gfx/pics/jolteon/bitmask.asm
diff --git a/gfx/pics/135/frames.asm b/gfx/pics/jolteon/frames.asm
index 95447944a..95447944a 100644
--- a/gfx/pics/135/frames.asm
+++ b/gfx/pics/jolteon/frames.asm
diff --git a/gfx/pics/135/front.lz b/gfx/pics/jolteon/front.6x6.2bpp.lz
index 32d271390..32d271390 100644
--- a/gfx/pics/135/front.lz
+++ b/gfx/pics/jolteon/front.6x6.2bpp.lz
diff --git a/gfx/pics/135/normal.pal b/gfx/pics/jolteon/normal.pal
index 81c384474..81c384474 100644
--- a/gfx/pics/135/normal.pal
+++ b/gfx/pics/jolteon/normal.pal
diff --git a/gfx/pics/135/shiny.pal b/gfx/pics/jolteon/shiny.pal
index 81d8eda41..81d8eda41 100644
--- a/gfx/pics/135/shiny.pal
+++ b/gfx/pics/jolteon/shiny.pal
diff --git a/gfx/pics/189/anim0.asm b/gfx/pics/jumpluff/anim0.asm
index c4161560e..c4161560e 100644
--- a/gfx/pics/189/anim0.asm
+++ b/gfx/pics/jumpluff/anim0.asm
diff --git a/gfx/pics/189/anim1.asm b/gfx/pics/jumpluff/anim1.asm
index 5013b953f..5013b953f 100644
--- a/gfx/pics/189/anim1.asm
+++ b/gfx/pics/jumpluff/anim1.asm
diff --git a/gfx/pics/189/back.lz b/gfx/pics/jumpluff/back.6x6.2bpp.lz
index 57ae8b890..57ae8b890 100644
--- a/gfx/pics/189/back.lz
+++ b/gfx/pics/jumpluff/back.6x6.2bpp.lz
diff --git a/gfx/pics/189/bitmask.asm b/gfx/pics/jumpluff/bitmask.asm
index 9d54f0fa4..9d54f0fa4 100644
--- a/gfx/pics/189/bitmask.asm
+++ b/gfx/pics/jumpluff/bitmask.asm
diff --git a/gfx/pics/189/frames.asm b/gfx/pics/jumpluff/frames.asm
index 0a46d384c..0a46d384c 100644
--- a/gfx/pics/189/frames.asm
+++ b/gfx/pics/jumpluff/frames.asm
diff --git a/gfx/pics/189/front.lz b/gfx/pics/jumpluff/front.7x7.2bpp.lz
index c3570ed09..c3570ed09 100644
--- a/gfx/pics/189/front.lz
+++ b/gfx/pics/jumpluff/front.7x7.2bpp.lz
diff --git a/gfx/pics/189/normal.pal b/gfx/pics/jumpluff/normal.pal
index 582553eb9..582553eb9 100644
--- a/gfx/pics/189/normal.pal
+++ b/gfx/pics/jumpluff/normal.pal
diff --git a/gfx/pics/189/shiny.pal b/gfx/pics/jumpluff/shiny.pal
index c553ebebf..c553ebebf 100644
--- a/gfx/pics/189/shiny.pal
+++ b/gfx/pics/jumpluff/shiny.pal
diff --git a/gfx/pics/124/anim0.asm b/gfx/pics/jynx/anim0.asm
index 78f0e63ed..78f0e63ed 100644
--- a/gfx/pics/124/anim0.asm
+++ b/gfx/pics/jynx/anim0.asm
diff --git a/gfx/pics/124/anim1.asm b/gfx/pics/jynx/anim1.asm
index 42f42859c..42f42859c 100644
--- a/gfx/pics/124/anim1.asm
+++ b/gfx/pics/jynx/anim1.asm
diff --git a/gfx/pics/124/back.lz b/gfx/pics/jynx/back.6x6.2bpp.lz
index 4642ecda7..4642ecda7 100644
--- a/gfx/pics/124/back.lz
+++ b/gfx/pics/jynx/back.6x6.2bpp.lz
diff --git a/gfx/pics/124/bitmask.asm b/gfx/pics/jynx/bitmask.asm
index 1843c8556..1843c8556 100644
--- a/gfx/pics/124/bitmask.asm
+++ b/gfx/pics/jynx/bitmask.asm
diff --git a/gfx/pics/124/frames.asm b/gfx/pics/jynx/frames.asm
index 7aa0496d0..7aa0496d0 100644
--- a/gfx/pics/124/frames.asm
+++ b/gfx/pics/jynx/frames.asm
diff --git a/gfx/pics/124/front.lz b/gfx/pics/jynx/front.6x6.2bpp.lz
index 78a436494..78a436494 100644
--- a/gfx/pics/124/front.lz
+++ b/gfx/pics/jynx/front.6x6.2bpp.lz
diff --git a/gfx/pics/124/normal.pal b/gfx/pics/jynx/normal.pal
index 6ae162f94..6ae162f94 100644
--- a/gfx/pics/124/normal.pal
+++ b/gfx/pics/jynx/normal.pal
diff --git a/gfx/pics/124/shiny.pal b/gfx/pics/jynx/shiny.pal
index 7e6ad315e..7e6ad315e 100644
--- a/gfx/pics/124/shiny.pal
+++ b/gfx/pics/jynx/shiny.pal
diff --git a/gfx/pics/140/anim0.asm b/gfx/pics/kabuto/anim0.asm
index de308c900..de308c900 100644
--- a/gfx/pics/140/anim0.asm
+++ b/gfx/pics/kabuto/anim0.asm
diff --git a/gfx/pics/140/anim1.asm b/gfx/pics/kabuto/anim1.asm
index 0e347c87d..0e347c87d 100644
--- a/gfx/pics/140/anim1.asm
+++ b/gfx/pics/kabuto/anim1.asm
diff --git a/gfx/pics/140/back.lz b/gfx/pics/kabuto/back.6x6.2bpp.lz
index 61390a32e..61390a32e 100644
--- a/gfx/pics/140/back.lz
+++ b/gfx/pics/kabuto/back.6x6.2bpp.lz
diff --git a/gfx/pics/140/bitmask.asm b/gfx/pics/kabuto/bitmask.asm
index 7cdb4204f..7cdb4204f 100644
--- a/gfx/pics/140/bitmask.asm
+++ b/gfx/pics/kabuto/bitmask.asm
diff --git a/gfx/pics/140/frames.asm b/gfx/pics/kabuto/frames.asm
index 482d0069c..482d0069c 100644
--- a/gfx/pics/140/frames.asm
+++ b/gfx/pics/kabuto/frames.asm
diff --git a/gfx/pics/140/front.lz b/gfx/pics/kabuto/front.5x5.2bpp.lz
index 24a9376c8..24a9376c8 100644
--- a/gfx/pics/140/front.lz
+++ b/gfx/pics/kabuto/front.5x5.2bpp.lz
diff --git a/gfx/pics/140/normal.pal b/gfx/pics/kabuto/normal.pal
index a8935ce9c..a8935ce9c 100644
--- a/gfx/pics/140/normal.pal
+++ b/gfx/pics/kabuto/normal.pal
diff --git a/gfx/pics/140/shiny.pal b/gfx/pics/kabuto/shiny.pal
index 1248ce809..1248ce809 100644
--- a/gfx/pics/140/shiny.pal
+++ b/gfx/pics/kabuto/shiny.pal
diff --git a/gfx/pics/141/anim0.asm b/gfx/pics/kabutops/anim0.asm
index f5812126a..f5812126a 100644
--- a/gfx/pics/141/anim0.asm
+++ b/gfx/pics/kabutops/anim0.asm
diff --git a/gfx/pics/141/anim1.asm b/gfx/pics/kabutops/anim1.asm
index 32a70f827..32a70f827 100644
--- a/gfx/pics/141/anim1.asm
+++ b/gfx/pics/kabutops/anim1.asm
diff --git a/gfx/pics/141/back.lz b/gfx/pics/kabutops/back.6x6.2bpp.lz
index 507c10e2f..507c10e2f 100644
--- a/gfx/pics/141/back.lz
+++ b/gfx/pics/kabutops/back.6x6.2bpp.lz
diff --git a/gfx/pics/141/bitmask.asm b/gfx/pics/kabutops/bitmask.asm
index 34b29ddb0..34b29ddb0 100644
--- a/gfx/pics/141/bitmask.asm
+++ b/gfx/pics/kabutops/bitmask.asm
diff --git a/gfx/pics/141/frames.asm b/gfx/pics/kabutops/frames.asm
index 2881f9fe1..2881f9fe1 100644
--- a/gfx/pics/141/frames.asm
+++ b/gfx/pics/kabutops/frames.asm
diff --git a/gfx/pics/141/front.lz b/gfx/pics/kabutops/front.6x6.2bpp.lz
index 38d21fa16..38d21fa16 100644
--- a/gfx/pics/141/front.lz
+++ b/gfx/pics/kabutops/front.6x6.2bpp.lz
diff --git a/gfx/pics/141/normal.pal b/gfx/pics/kabutops/normal.pal
index a8935ce9c..a8935ce9c 100644
--- a/gfx/pics/141/normal.pal
+++ b/gfx/pics/kabutops/normal.pal
diff --git a/gfx/pics/141/shiny.pal b/gfx/pics/kabutops/shiny.pal
index 5c7ac28cf..5c7ac28cf 100644
--- a/gfx/pics/141/shiny.pal
+++ b/gfx/pics/kabutops/shiny.pal
diff --git a/gfx/pics/064/anim0.asm b/gfx/pics/kadabra/anim0.asm
index 9b132e26b..9b132e26b 100644
--- a/gfx/pics/064/anim0.asm
+++ b/gfx/pics/kadabra/anim0.asm
diff --git a/gfx/pics/064/anim1.asm b/gfx/pics/kadabra/anim1.asm
index eabcdb07d..eabcdb07d 100644
--- a/gfx/pics/064/anim1.asm
+++ b/gfx/pics/kadabra/anim1.asm
diff --git a/gfx/pics/064/back.lz b/gfx/pics/kadabra/back.6x6.2bpp.lz
index 0092147d7..0092147d7 100644
--- a/gfx/pics/064/back.lz
+++ b/gfx/pics/kadabra/back.6x6.2bpp.lz
diff --git a/gfx/pics/064/bitmask.asm b/gfx/pics/kadabra/bitmask.asm
index aa938440f..aa938440f 100644
--- a/gfx/pics/064/bitmask.asm
+++ b/gfx/pics/kadabra/bitmask.asm
diff --git a/gfx/pics/064/frames.asm b/gfx/pics/kadabra/frames.asm
index 9cdcc0526..9cdcc0526 100644
--- a/gfx/pics/064/frames.asm
+++ b/gfx/pics/kadabra/frames.asm
diff --git a/gfx/pics/064/front.lz b/gfx/pics/kadabra/front.6x6.2bpp.lz
index 54f47795d..54f47795d 100644
--- a/gfx/pics/064/front.lz
+++ b/gfx/pics/kadabra/front.6x6.2bpp.lz
diff --git a/gfx/pics/065/normal.pal b/gfx/pics/kadabra/normal.pal
index 23f50e983..23f50e983 100644
--- a/gfx/pics/065/normal.pal
+++ b/gfx/pics/kadabra/normal.pal
diff --git a/gfx/pics/064/shiny.pal b/gfx/pics/kadabra/shiny.pal
index 328319095..328319095 100644
--- a/gfx/pics/064/shiny.pal
+++ b/gfx/pics/kadabra/shiny.pal
diff --git a/gfx/pics/014/anim0.asm b/gfx/pics/kakuna/anim0.asm
index b67e66e26..b67e66e26 100644
--- a/gfx/pics/014/anim0.asm
+++ b/gfx/pics/kakuna/anim0.asm
diff --git a/gfx/pics/014/anim1.asm b/gfx/pics/kakuna/anim1.asm
index a7ca98540..a7ca98540 100644
--- a/gfx/pics/014/anim1.asm
+++ b/gfx/pics/kakuna/anim1.asm
diff --git a/gfx/pics/014/back.lz b/gfx/pics/kakuna/back.6x6.2bpp.lz
index b369857d5..b369857d5 100644
--- a/gfx/pics/014/back.lz
+++ b/gfx/pics/kakuna/back.6x6.2bpp.lz
diff --git a/gfx/pics/014/bitmask.asm b/gfx/pics/kakuna/bitmask.asm
index c44358546..c44358546 100644
--- a/gfx/pics/014/bitmask.asm
+++ b/gfx/pics/kakuna/bitmask.asm
diff --git a/gfx/pics/014/frames.asm b/gfx/pics/kakuna/frames.asm
index afe506784..afe506784 100644
--- a/gfx/pics/014/frames.asm
+++ b/gfx/pics/kakuna/frames.asm
diff --git a/gfx/pics/014/front.lz b/gfx/pics/kakuna/front.5x5.2bpp.lz
index 2f2431edf..2f2431edf 100644
--- a/gfx/pics/014/front.lz
+++ b/gfx/pics/kakuna/front.5x5.2bpp.lz
diff --git a/gfx/pics/014/normal.pal b/gfx/pics/kakuna/normal.pal
index 6760123ec..6760123ec 100644
--- a/gfx/pics/014/normal.pal
+++ b/gfx/pics/kakuna/normal.pal
diff --git a/gfx/pics/014/shiny.pal b/gfx/pics/kakuna/shiny.pal
index 335bdffe9..335bdffe9 100644
--- a/gfx/pics/014/shiny.pal
+++ b/gfx/pics/kakuna/shiny.pal
diff --git a/gfx/pics/115/anim0.asm b/gfx/pics/kangaskhan/anim0.asm
index 34363f893..34363f893 100644
--- a/gfx/pics/115/anim0.asm
+++ b/gfx/pics/kangaskhan/anim0.asm
diff --git a/gfx/pics/115/anim1.asm b/gfx/pics/kangaskhan/anim1.asm
index 0da29ec4a..0da29ec4a 100644
--- a/gfx/pics/115/anim1.asm
+++ b/gfx/pics/kangaskhan/anim1.asm
diff --git a/gfx/pics/115/back.lz b/gfx/pics/kangaskhan/back.6x6.2bpp.lz
index c7ff00272..c7ff00272 100644
--- a/gfx/pics/115/back.lz
+++ b/gfx/pics/kangaskhan/back.6x6.2bpp.lz
diff --git a/gfx/pics/115/bitmask.asm b/gfx/pics/kangaskhan/bitmask.asm
index 3ab57899a..3ab57899a 100644
--- a/gfx/pics/115/bitmask.asm
+++ b/gfx/pics/kangaskhan/bitmask.asm
diff --git a/gfx/pics/115/frames.asm b/gfx/pics/kangaskhan/frames.asm
index 155ac059e..155ac059e 100644
--- a/gfx/pics/115/frames.asm
+++ b/gfx/pics/kangaskhan/frames.asm
diff --git a/gfx/pics/115/front.lz b/gfx/pics/kangaskhan/front.7x7.2bpp.lz
index 1ec58169d..1ec58169d 100644
--- a/gfx/pics/115/front.lz
+++ b/gfx/pics/kangaskhan/front.7x7.2bpp.lz
diff --git a/gfx/pics/115/normal.pal b/gfx/pics/kangaskhan/normal.pal
index 06a80fc6d..06a80fc6d 100644
--- a/gfx/pics/115/normal.pal
+++ b/gfx/pics/kangaskhan/normal.pal
diff --git a/gfx/pics/115/shiny.pal b/gfx/pics/kangaskhan/shiny.pal
index 492559959..492559959 100644
--- a/gfx/pics/115/shiny.pal
+++ b/gfx/pics/kangaskhan/shiny.pal
diff --git a/gfx/pics/kanto_frames.asm b/gfx/pics/kanto_frames.asm
index 22b9419a0..17df9fab0 100644
--- a/gfx/pics/kanto_frames.asm
+++ b/gfx/pics/kanto_frames.asm
@@ -1,151 +1,151 @@
-BulbasaurFrames:  INCLUDE "gfx/pics/001/frames.asm"
-IvysaurFrames:    INCLUDE "gfx/pics/002/frames.asm"
-VenusaurFrames:   INCLUDE "gfx/pics/003/frames.asm"
-CharmanderFrames: INCLUDE "gfx/pics/004/frames.asm"
-CharmeleonFrames: INCLUDE "gfx/pics/005/frames.asm"
-CharizardFrames:  INCLUDE "gfx/pics/006/frames.asm"
-SquirtleFrames:   INCLUDE "gfx/pics/007/frames.asm"
-WartortleFrames:  INCLUDE "gfx/pics/008/frames.asm"
-BlastoiseFrames:  INCLUDE "gfx/pics/009/frames.asm"
-CaterpieFrames:   INCLUDE "gfx/pics/010/frames.asm"
-MetapodFrames:    INCLUDE "gfx/pics/011/frames.asm"
-ButterfreeFrames: INCLUDE "gfx/pics/012/frames.asm"
-WeedleFrames:     INCLUDE "gfx/pics/013/frames.asm"
-KakunaFrames:     INCLUDE "gfx/pics/014/frames.asm"
-BeedrillFrames:   INCLUDE "gfx/pics/015/frames.asm"
-PidgeyFrames:     INCLUDE "gfx/pics/016/frames.asm"
-PidgeottoFrames:  INCLUDE "gfx/pics/017/frames.asm"
-PidgeotFrames:    INCLUDE "gfx/pics/018/frames.asm"
-RattataFrames:    INCLUDE "gfx/pics/019/frames.asm"
-RaticateFrames:   INCLUDE "gfx/pics/020/frames.asm"
-SpearowFrames:    INCLUDE "gfx/pics/021/frames.asm"
-FearowFrames:     INCLUDE "gfx/pics/022/frames.asm"
-EkansFrames:      INCLUDE "gfx/pics/023/frames.asm"
-ArbokFrames:      INCLUDE "gfx/pics/024/frames.asm"
-PikachuFrames:    INCLUDE "gfx/pics/025/frames.asm"
-RaichuFrames:     INCLUDE "gfx/pics/026/frames.asm"
-SandshrewFrames:  INCLUDE "gfx/pics/027/frames.asm"
-SandslashFrames:  INCLUDE "gfx/pics/028/frames.asm"
-NidoranFFrames:   INCLUDE "gfx/pics/029/frames.asm"
-NidorinaFrames:   INCLUDE "gfx/pics/030/frames.asm"
-NidoqueenFrames:  INCLUDE "gfx/pics/031/frames.asm"
-NidoranMFrames:   INCLUDE "gfx/pics/032/frames.asm"
-NidorinoFrames:   INCLUDE "gfx/pics/033/frames.asm"
-NidokingFrames:   INCLUDE "gfx/pics/034/frames.asm"
-ClefairyFrames:   INCLUDE "gfx/pics/035/frames.asm"
-ClefableFrames:   INCLUDE "gfx/pics/036/frames.asm"
-VulpixFrames:     INCLUDE "gfx/pics/037/frames.asm"
-NinetalesFrames:  INCLUDE "gfx/pics/038/frames.asm"
-JigglypuffFrames: INCLUDE "gfx/pics/039/frames.asm"
-WigglytuffFrames: INCLUDE "gfx/pics/040/frames.asm"
-ZubatFrames:      INCLUDE "gfx/pics/041/frames.asm"
-GolbatFrames:     INCLUDE "gfx/pics/042/frames.asm"
-OddishFrames:     INCLUDE "gfx/pics/043/frames.asm"
-GloomFrames:      INCLUDE "gfx/pics/044/frames.asm"
-VileplumeFrames:  INCLUDE "gfx/pics/045/frames.asm"
-ParasFrames:      INCLUDE "gfx/pics/046/frames.asm"
-ParasectFrames:   INCLUDE "gfx/pics/047/frames.asm"
-VenonatFrames:    INCLUDE "gfx/pics/048/frames.asm"
-VenomothFrames:   INCLUDE "gfx/pics/049/frames.asm"
-DiglettFrames:    INCLUDE "gfx/pics/050/frames.asm"
-DugtrioFrames:    INCLUDE "gfx/pics/051/frames.asm"
-MeowthFrames:     INCLUDE "gfx/pics/052/frames.asm"
-PersianFrames:    INCLUDE "gfx/pics/053/frames.asm"
-PsyduckFrames:    INCLUDE "gfx/pics/054/frames.asm"
-GolduckFrames:    INCLUDE "gfx/pics/055/frames.asm"
-MankeyFrames:     INCLUDE "gfx/pics/056/frames.asm"
-PrimeapeFrames:   INCLUDE "gfx/pics/057/frames.asm"
-GrowlitheFrames:  INCLUDE "gfx/pics/058/frames.asm"
-ArcanineFrames:   INCLUDE "gfx/pics/059/frames.asm"
-PoliwagFrames:    INCLUDE "gfx/pics/060/frames.asm"
-PoliwhirlFrames:  INCLUDE "gfx/pics/061/frames.asm"
-PoliwrathFrames:  INCLUDE "gfx/pics/062/frames.asm"
-AbraFrames:       INCLUDE "gfx/pics/063/frames.asm"
-KadabraFrames:    INCLUDE "gfx/pics/064/frames.asm"
-AlakazamFrames:   INCLUDE "gfx/pics/065/frames.asm"
-MachopFrames:     INCLUDE "gfx/pics/066/frames.asm"
-MachokeFrames:    INCLUDE "gfx/pics/067/frames.asm"
-MachampFrames:    INCLUDE "gfx/pics/068/frames.asm"
-BellsproutFrames: INCLUDE "gfx/pics/069/frames.asm"
-WeepinbellFrames: INCLUDE "gfx/pics/070/frames.asm"
-VictreebelFrames: INCLUDE "gfx/pics/071/frames.asm"
-TentacoolFrames:  INCLUDE "gfx/pics/072/frames.asm"
-TentacruelFrames: INCLUDE "gfx/pics/073/frames.asm"
-GeodudeFrames:    INCLUDE "gfx/pics/074/frames.asm"
-GravelerFrames:   INCLUDE "gfx/pics/075/frames.asm"
-GolemFrames:      INCLUDE "gfx/pics/076/frames.asm"
-PonytaFrames:     INCLUDE "gfx/pics/077/frames.asm"
-RapidashFrames:   INCLUDE "gfx/pics/078/frames.asm"
-SlowpokeFrames:   INCLUDE "gfx/pics/079/frames.asm"
-SlowbroFrames:    INCLUDE "gfx/pics/080/frames.asm"
-MagnemiteFrames:  INCLUDE "gfx/pics/081/frames.asm"
-MagnetonFrames:   INCLUDE "gfx/pics/082/frames.asm"
-FarfetchDFrames:  INCLUDE "gfx/pics/083/frames.asm"
-DoduoFrames:      INCLUDE "gfx/pics/084/frames.asm"
-DodrioFrames:     INCLUDE "gfx/pics/085/frames.asm"
-SeelFrames:       INCLUDE "gfx/pics/086/frames.asm"
-DewgongFrames:    INCLUDE "gfx/pics/087/frames.asm"
-GrimerFrames:     INCLUDE "gfx/pics/088/frames.asm"
-MukFrames:        INCLUDE "gfx/pics/089/frames.asm"
-ShellderFrames:   INCLUDE "gfx/pics/090/frames.asm"
-CloysterFrames:   INCLUDE "gfx/pics/091/frames.asm"
-GastlyFrames:     INCLUDE "gfx/pics/092/frames.asm"
-HaunterFrames:    INCLUDE "gfx/pics/093/frames.asm"
-GengarFrames:     INCLUDE "gfx/pics/094/frames.asm"
-OnixFrames:       INCLUDE "gfx/pics/095/frames.asm"
-DrowzeeFrames:    INCLUDE "gfx/pics/096/frames.asm"
-HypnoFrames:      INCLUDE "gfx/pics/097/frames.asm"
-KrabbyFrames:     INCLUDE "gfx/pics/098/frames.asm"
-KinglerFrames:    INCLUDE "gfx/pics/099/frames.asm"
-VoltorbFrames:    INCLUDE "gfx/pics/100/frames.asm"
-ElectrodeFrames:  INCLUDE "gfx/pics/101/frames.asm"
-ExeggcuteFrames:  INCLUDE "gfx/pics/102/frames.asm"
-ExeggutorFrames:  INCLUDE "gfx/pics/103/frames.asm"
-CuboneFrames:     INCLUDE "gfx/pics/104/frames.asm"
-MarowakFrames:    INCLUDE "gfx/pics/105/frames.asm"
-HitmonleeFrames:  INCLUDE "gfx/pics/106/frames.asm"
-HitmonchanFrames: INCLUDE "gfx/pics/107/frames.asm"
-LickitungFrames:  INCLUDE "gfx/pics/108/frames.asm"
-KoffingFrames:    INCLUDE "gfx/pics/109/frames.asm"
-WeezingFrames:    INCLUDE "gfx/pics/110/frames.asm"
-RhyhornFrames:    INCLUDE "gfx/pics/111/frames.asm"
-RhydonFrames:     INCLUDE "gfx/pics/112/frames.asm"
-ChanseyFrames:    INCLUDE "gfx/pics/113/frames.asm"
-TangelaFrames:    INCLUDE "gfx/pics/114/frames.asm"
-KangaskhanFrames: INCLUDE "gfx/pics/115/frames.asm"
-HorseaFrames:     INCLUDE "gfx/pics/116/frames.asm"
-SeadraFrames:     INCLUDE "gfx/pics/117/frames.asm"
-GoldeenFrames:    INCLUDE "gfx/pics/118/frames.asm"
-SeakingFrames:    INCLUDE "gfx/pics/119/frames.asm"
-StaryuFrames:     INCLUDE "gfx/pics/120/frames.asm"
-StarmieFrames:    INCLUDE "gfx/pics/121/frames.asm"
-MrMimeFrames:     INCLUDE "gfx/pics/122/frames.asm"
-ScytherFrames:    INCLUDE "gfx/pics/123/frames.asm"
-JynxFrames:       INCLUDE "gfx/pics/124/frames.asm"
-ElectabuzzFrames: INCLUDE "gfx/pics/125/frames.asm"
-MagmarFrames:     INCLUDE "gfx/pics/126/frames.asm"
-PinsirFrames:     INCLUDE "gfx/pics/127/frames.asm"
-TaurosFrames:     INCLUDE "gfx/pics/128/frames.asm"
-MagikarpFrames:   INCLUDE "gfx/pics/129/frames.asm"
-GyaradosFrames:   INCLUDE "gfx/pics/130/frames.asm"
-LaprasFrames:     INCLUDE "gfx/pics/131/frames.asm"
-DittoFrames:      INCLUDE "gfx/pics/132/frames.asm"
-EeveeFrames:      INCLUDE "gfx/pics/133/frames.asm"
-VaporeonFrames:   INCLUDE "gfx/pics/134/frames.asm"
-JolteonFrames:    INCLUDE "gfx/pics/135/frames.asm"
-FlareonFrames:    INCLUDE "gfx/pics/136/frames.asm"
-PorygonFrames:    INCLUDE "gfx/pics/137/frames.asm"
-OmanyteFrames:    INCLUDE "gfx/pics/138/frames.asm"
-OmastarFrames:    INCLUDE "gfx/pics/139/frames.asm"
-KabutoFrames:     INCLUDE "gfx/pics/140/frames.asm"
-KabutopsFrames:   INCLUDE "gfx/pics/141/frames.asm"
-AerodactylFrames: INCLUDE "gfx/pics/142/frames.asm"
-SnorlaxFrames:    INCLUDE "gfx/pics/143/frames.asm"
-ArticunoFrames:   INCLUDE "gfx/pics/144/frames.asm"
-ZapdosFrames:     INCLUDE "gfx/pics/145/frames.asm"
-MoltresFrames:    INCLUDE "gfx/pics/146/frames.asm"
-DratiniFrames:    INCLUDE "gfx/pics/147/frames.asm"
-DragonairFrames:  INCLUDE "gfx/pics/148/frames.asm"
-DragoniteFrames:  INCLUDE "gfx/pics/149/frames.asm"
-MewtwoFrames:     INCLUDE "gfx/pics/150/frames.asm"
-MewFrames:        INCLUDE "gfx/pics/151/frames.asm"
+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/230/anim0.asm b/gfx/pics/kingdra/anim0.asm
index c7bc2991f..c7bc2991f 100644
--- a/gfx/pics/230/anim0.asm
+++ b/gfx/pics/kingdra/anim0.asm
diff --git a/gfx/pics/230/anim1.asm b/gfx/pics/kingdra/anim1.asm
index 2ec7e99ae..2ec7e99ae 100644
--- a/gfx/pics/230/anim1.asm
+++ b/gfx/pics/kingdra/anim1.asm
diff --git a/gfx/pics/230/back.lz b/gfx/pics/kingdra/back.6x6.2bpp.lz
index 9f2c38b6c..9f2c38b6c 100644
--- a/gfx/pics/230/back.lz
+++ b/gfx/pics/kingdra/back.6x6.2bpp.lz
diff --git a/gfx/pics/230/bitmask.asm b/gfx/pics/kingdra/bitmask.asm
index 0c9026f1e..0c9026f1e 100644
--- a/gfx/pics/230/bitmask.asm
+++ b/gfx/pics/kingdra/bitmask.asm
diff --git a/gfx/pics/230/frames.asm b/gfx/pics/kingdra/frames.asm
index f4e3d8d77..f4e3d8d77 100644
--- a/gfx/pics/230/frames.asm
+++ b/gfx/pics/kingdra/frames.asm
diff --git a/gfx/pics/230/front.lz b/gfx/pics/kingdra/front.7x7.2bpp.lz
index d28a4dc78..d28a4dc78 100644
--- a/gfx/pics/230/front.lz
+++ b/gfx/pics/kingdra/front.7x7.2bpp.lz
diff --git a/gfx/pics/230/normal.pal b/gfx/pics/kingdra/normal.pal
index 3e7449818..3e7449818 100644
--- a/gfx/pics/230/normal.pal
+++ b/gfx/pics/kingdra/normal.pal
diff --git a/gfx/pics/230/shiny.pal b/gfx/pics/kingdra/shiny.pal
index 2a65783f1..2a65783f1 100644
--- a/gfx/pics/230/shiny.pal
+++ b/gfx/pics/kingdra/shiny.pal
diff --git a/gfx/pics/099/anim0.asm b/gfx/pics/kingler/anim0.asm
index 2be7b62be..2be7b62be 100644
--- a/gfx/pics/099/anim0.asm
+++ b/gfx/pics/kingler/anim0.asm
diff --git a/gfx/pics/099/anim1.asm b/gfx/pics/kingler/anim1.asm
index 25af73bc9..25af73bc9 100644
--- a/gfx/pics/099/anim1.asm
+++ b/gfx/pics/kingler/anim1.asm
diff --git a/gfx/pics/099/back.lz b/gfx/pics/kingler/back.6x6.2bpp.lz
index aceed0679..aceed0679 100644
--- a/gfx/pics/099/back.lz
+++ b/gfx/pics/kingler/back.6x6.2bpp.lz
diff --git a/gfx/pics/099/bitmask.asm b/gfx/pics/kingler/bitmask.asm
index b8672c447..b8672c447 100644
--- a/gfx/pics/099/bitmask.asm
+++ b/gfx/pics/kingler/bitmask.asm
diff --git a/gfx/pics/099/frames.asm b/gfx/pics/kingler/frames.asm
index 160c92a57..160c92a57 100644
--- a/gfx/pics/099/frames.asm
+++ b/gfx/pics/kingler/frames.asm
diff --git a/gfx/pics/099/front.lz b/gfx/pics/kingler/front.7x7.2bpp.lz
index 590bd05ee..590bd05ee 100644
--- a/gfx/pics/099/front.lz
+++ b/gfx/pics/kingler/front.7x7.2bpp.lz
diff --git a/gfx/pics/098/normal.pal b/gfx/pics/kingler/normal.pal
index a347ecf9c..a347ecf9c 100644
--- a/gfx/pics/098/normal.pal
+++ b/gfx/pics/kingler/normal.pal
diff --git a/gfx/pics/099/shiny.pal b/gfx/pics/kingler/shiny.pal
index 9a9c3818b..9a9c3818b 100644
--- a/gfx/pics/099/shiny.pal
+++ b/gfx/pics/kingler/shiny.pal
diff --git a/gfx/pics/109/anim0.asm b/gfx/pics/koffing/anim0.asm
index fc574f528..fc574f528 100644
--- a/gfx/pics/109/anim0.asm
+++ b/gfx/pics/koffing/anim0.asm
diff --git a/gfx/pics/109/anim1.asm b/gfx/pics/koffing/anim1.asm
index e0e81b4d3..e0e81b4d3 100644
--- a/gfx/pics/109/anim1.asm
+++ b/gfx/pics/koffing/anim1.asm
diff --git a/gfx/pics/109/back.lz b/gfx/pics/koffing/back.6x6.2bpp.lz
index 2e8762565..2e8762565 100644
--- a/gfx/pics/109/back.lz
+++ b/gfx/pics/koffing/back.6x6.2bpp.lz
diff --git a/gfx/pics/109/bitmask.asm b/gfx/pics/koffing/bitmask.asm
index d6d2f747d..d6d2f747d 100644
--- a/gfx/pics/109/bitmask.asm
+++ b/gfx/pics/koffing/bitmask.asm
diff --git a/gfx/pics/109/frames.asm b/gfx/pics/koffing/frames.asm
index ef58ddc50..ef58ddc50 100644
--- a/gfx/pics/109/frames.asm
+++ b/gfx/pics/koffing/frames.asm
diff --git a/gfx/pics/109/front.lz b/gfx/pics/koffing/front.6x6.2bpp.lz
index 78de37eeb..78de37eeb 100644
--- a/gfx/pics/109/front.lz
+++ b/gfx/pics/koffing/front.6x6.2bpp.lz
diff --git a/gfx/pics/109/normal.pal b/gfx/pics/koffing/normal.pal
index a4df75fdc..a4df75fdc 100644
--- a/gfx/pics/109/normal.pal
+++ b/gfx/pics/koffing/normal.pal
diff --git a/gfx/pics/109/shiny.pal b/gfx/pics/koffing/shiny.pal
index 8132fea04..8132fea04 100644
--- a/gfx/pics/109/shiny.pal
+++ b/gfx/pics/koffing/shiny.pal
diff --git a/gfx/pics/098/anim0.asm b/gfx/pics/krabby/anim0.asm
index 22f5657e5..22f5657e5 100644
--- a/gfx/pics/098/anim0.asm
+++ b/gfx/pics/krabby/anim0.asm
diff --git a/gfx/pics/098/anim1.asm b/gfx/pics/krabby/anim1.asm
index 0b89ffc33..0b89ffc33 100644
--- a/gfx/pics/098/anim1.asm
+++ b/gfx/pics/krabby/anim1.asm
diff --git a/gfx/pics/098/back.lz b/gfx/pics/krabby/back.6x6.2bpp.lz
index 5954b413d..5954b413d 100644
--- a/gfx/pics/098/back.lz
+++ b/gfx/pics/krabby/back.6x6.2bpp.lz
diff --git a/gfx/pics/098/bitmask.asm b/gfx/pics/krabby/bitmask.asm
index 377109d09..377109d09 100644
--- a/gfx/pics/098/bitmask.asm
+++ b/gfx/pics/krabby/bitmask.asm
diff --git a/gfx/pics/098/frames.asm b/gfx/pics/krabby/frames.asm
index 07bd6171a..07bd6171a 100644
--- a/gfx/pics/098/frames.asm
+++ b/gfx/pics/krabby/frames.asm
diff --git a/gfx/pics/098/front.lz b/gfx/pics/krabby/front.5x5.2bpp.lz
index c0f968fa5..c0f968fa5 100644
--- a/gfx/pics/098/front.lz
+++ b/gfx/pics/krabby/front.5x5.2bpp.lz
diff --git a/gfx/pics/099/normal.pal b/gfx/pics/krabby/normal.pal
index a347ecf9c..a347ecf9c 100644
--- a/gfx/pics/099/normal.pal
+++ b/gfx/pics/krabby/normal.pal
diff --git a/gfx/pics/098/shiny.pal b/gfx/pics/krabby/shiny.pal
index 57fd91a81..57fd91a81 100644
--- a/gfx/pics/098/shiny.pal
+++ b/gfx/pics/krabby/shiny.pal
diff --git a/gfx/pics/171/anim0.asm b/gfx/pics/lanturn/anim0.asm
index 18882deb5..18882deb5 100644
--- a/gfx/pics/171/anim0.asm
+++ b/gfx/pics/lanturn/anim0.asm
diff --git a/gfx/pics/171/anim1.asm b/gfx/pics/lanturn/anim1.asm
index d57dd04b1..d57dd04b1 100644
--- a/gfx/pics/171/anim1.asm
+++ b/gfx/pics/lanturn/anim1.asm
diff --git a/gfx/pics/171/back.lz b/gfx/pics/lanturn/back.6x6.2bpp.lz
index ea916b7ea..ea916b7ea 100644
--- a/gfx/pics/171/back.lz
+++ b/gfx/pics/lanturn/back.6x6.2bpp.lz
diff --git a/gfx/pics/171/bitmask.asm b/gfx/pics/lanturn/bitmask.asm
index 5294c2ebc..5294c2ebc 100644
--- a/gfx/pics/171/bitmask.asm
+++ b/gfx/pics/lanturn/bitmask.asm
diff --git a/gfx/pics/171/frames.asm b/gfx/pics/lanturn/frames.asm
index efce13663..efce13663 100644
--- a/gfx/pics/171/frames.asm
+++ b/gfx/pics/lanturn/frames.asm
diff --git a/gfx/pics/171/front.lz b/gfx/pics/lanturn/front.6x6.2bpp.lz
index ba57a1569..ba57a1569 100644
--- a/gfx/pics/171/front.lz
+++ b/gfx/pics/lanturn/front.6x6.2bpp.lz
diff --git a/gfx/pics/171/normal.pal b/gfx/pics/lanturn/normal.pal
index a61eb7237..a61eb7237 100644
--- a/gfx/pics/171/normal.pal
+++ b/gfx/pics/lanturn/normal.pal
diff --git a/gfx/pics/171/shiny.pal b/gfx/pics/lanturn/shiny.pal
index e1e3e4fe8..e1e3e4fe8 100644
--- a/gfx/pics/171/shiny.pal
+++ b/gfx/pics/lanturn/shiny.pal
diff --git a/gfx/pics/131/anim0.asm b/gfx/pics/lapras/anim0.asm
index 9ae8f4e5c..9ae8f4e5c 100644
--- a/gfx/pics/131/anim0.asm
+++ b/gfx/pics/lapras/anim0.asm
diff --git a/gfx/pics/131/anim1.asm b/gfx/pics/lapras/anim1.asm
index 790cccf05..790cccf05 100644
--- a/gfx/pics/131/anim1.asm
+++ b/gfx/pics/lapras/anim1.asm
diff --git a/gfx/pics/131/back.lz b/gfx/pics/lapras/back.6x6.2bpp.lz
index 00f6b4329..00f6b4329 100644
--- a/gfx/pics/131/back.lz
+++ b/gfx/pics/lapras/back.6x6.2bpp.lz
diff --git a/gfx/pics/131/bitmask.asm b/gfx/pics/lapras/bitmask.asm
index 82d831e3c..82d831e3c 100644
--- a/gfx/pics/131/bitmask.asm
+++ b/gfx/pics/lapras/bitmask.asm
diff --git a/gfx/pics/131/frames.asm b/gfx/pics/lapras/frames.asm
index 6f399dbc1..6f399dbc1 100644
--- a/gfx/pics/131/frames.asm
+++ b/gfx/pics/lapras/frames.asm
diff --git a/gfx/pics/131/front.lz b/gfx/pics/lapras/front.7x7.2bpp.lz
index 0c20fc0be..0c20fc0be 100644
--- a/gfx/pics/131/front.lz
+++ b/gfx/pics/lapras/front.7x7.2bpp.lz
diff --git a/gfx/pics/131/normal.pal b/gfx/pics/lapras/normal.pal
index 9e617a3ef..9e617a3ef 100644
--- a/gfx/pics/131/normal.pal
+++ b/gfx/pics/lapras/normal.pal
diff --git a/gfx/pics/131/shiny.pal b/gfx/pics/lapras/shiny.pal
index 58fa3bc59..58fa3bc59 100644
--- a/gfx/pics/131/shiny.pal
+++ b/gfx/pics/lapras/shiny.pal
diff --git a/gfx/pics/246/anim0.asm b/gfx/pics/larvitar/anim0.asm
index bb861f733..bb861f733 100644
--- a/gfx/pics/246/anim0.asm
+++ b/gfx/pics/larvitar/anim0.asm
diff --git a/gfx/pics/246/anim1.asm b/gfx/pics/larvitar/anim1.asm
index 2b87de7be..2b87de7be 100644
--- a/gfx/pics/246/anim1.asm
+++ b/gfx/pics/larvitar/anim1.asm
diff --git a/gfx/pics/246/back.lz b/gfx/pics/larvitar/back.6x6.2bpp.lz
index b4122419b..b4122419b 100644
--- a/gfx/pics/246/back.lz
+++ b/gfx/pics/larvitar/back.6x6.2bpp.lz
diff --git a/gfx/pics/246/bitmask.asm b/gfx/pics/larvitar/bitmask.asm
index 9ff8d5535..9ff8d5535 100644
--- a/gfx/pics/246/bitmask.asm
+++ b/gfx/pics/larvitar/bitmask.asm
diff --git a/gfx/pics/246/frames.asm b/gfx/pics/larvitar/frames.asm
index 17da6e97b..17da6e97b 100644
--- a/gfx/pics/246/frames.asm
+++ b/gfx/pics/larvitar/frames.asm
diff --git a/gfx/pics/246/front.lz b/gfx/pics/larvitar/front.5x5.2bpp.lz
index deba5d5a2..deba5d5a2 100644
--- a/gfx/pics/246/front.lz
+++ b/gfx/pics/larvitar/front.5x5.2bpp.lz
diff --git a/gfx/pics/246/normal.pal b/gfx/pics/larvitar/normal.pal
index 04a460b3e..04a460b3e 100644
--- a/gfx/pics/246/normal.pal
+++ b/gfx/pics/larvitar/normal.pal
diff --git a/gfx/pics/246/shiny.pal b/gfx/pics/larvitar/shiny.pal
index 025a819dc..025a819dc 100644
--- a/gfx/pics/246/shiny.pal
+++ b/gfx/pics/larvitar/shiny.pal
diff --git a/gfx/pics/166/anim0.asm b/gfx/pics/ledian/anim0.asm
index ece77ff44..ece77ff44 100644
--- a/gfx/pics/166/anim0.asm
+++ b/gfx/pics/ledian/anim0.asm
diff --git a/gfx/pics/166/anim1.asm b/gfx/pics/ledian/anim1.asm
index cf5a0e011..cf5a0e011 100644
--- a/gfx/pics/166/anim1.asm
+++ b/gfx/pics/ledian/anim1.asm
diff --git a/gfx/pics/166/back.lz b/gfx/pics/ledian/back.6x6.2bpp.lz
index eb996b4e3..eb996b4e3 100644
--- a/gfx/pics/166/back.lz
+++ b/gfx/pics/ledian/back.6x6.2bpp.lz
diff --git a/gfx/pics/166/bitmask.asm b/gfx/pics/ledian/bitmask.asm
index 658c703c0..658c703c0 100644
--- a/gfx/pics/166/bitmask.asm
+++ b/gfx/pics/ledian/bitmask.asm
diff --git a/gfx/pics/166/frames.asm b/gfx/pics/ledian/frames.asm
index 9dd6ff763..9dd6ff763 100644
--- a/gfx/pics/166/frames.asm
+++ b/gfx/pics/ledian/frames.asm
diff --git a/gfx/pics/166/front.lz b/gfx/pics/ledian/front.6x6.2bpp.lz
index 117d19c14..117d19c14 100644
--- a/gfx/pics/166/front.lz
+++ b/gfx/pics/ledian/front.6x6.2bpp.lz
diff --git a/gfx/pics/166/normal.pal b/gfx/pics/ledian/normal.pal
index 09164a55c..09164a55c 100644
--- a/gfx/pics/166/normal.pal
+++ b/gfx/pics/ledian/normal.pal
diff --git a/gfx/pics/165/shiny.pal b/gfx/pics/ledian/shiny.pal
index f404bc1d1..f404bc1d1 100644
--- a/gfx/pics/165/shiny.pal
+++ b/gfx/pics/ledian/shiny.pal
diff --git a/gfx/pics/165/anim0.asm b/gfx/pics/ledyba/anim0.asm
index ac4c8e154..ac4c8e154 100644
--- a/gfx/pics/165/anim0.asm
+++ b/gfx/pics/ledyba/anim0.asm
diff --git a/gfx/pics/165/anim1.asm b/gfx/pics/ledyba/anim1.asm
index d493c5fbc..d493c5fbc 100644
--- a/gfx/pics/165/anim1.asm
+++ b/gfx/pics/ledyba/anim1.asm
diff --git a/gfx/pics/165/back.lz b/gfx/pics/ledyba/back.6x6.2bpp.lz
index 728f4dedb..728f4dedb 100644
--- a/gfx/pics/165/back.lz
+++ b/gfx/pics/ledyba/back.6x6.2bpp.lz
diff --git a/gfx/pics/165/bitmask.asm b/gfx/pics/ledyba/bitmask.asm
index 8a59736ef..8a59736ef 100644
--- a/gfx/pics/165/bitmask.asm
+++ b/gfx/pics/ledyba/bitmask.asm
diff --git a/gfx/pics/165/frames.asm b/gfx/pics/ledyba/frames.asm
index afa489121..afa489121 100644
--- a/gfx/pics/165/frames.asm
+++ b/gfx/pics/ledyba/frames.asm
diff --git a/gfx/pics/165/front.lz b/gfx/pics/ledyba/front.6x6.2bpp.lz
index fc15ab1ba..fc15ab1ba 100644
--- a/gfx/pics/165/front.lz
+++ b/gfx/pics/ledyba/front.6x6.2bpp.lz
diff --git a/gfx/pics/165/normal.pal b/gfx/pics/ledyba/normal.pal
index e761d076a..e761d076a 100644
--- a/gfx/pics/165/normal.pal
+++ b/gfx/pics/ledyba/normal.pal
diff --git a/gfx/pics/166/shiny.pal b/gfx/pics/ledyba/shiny.pal
index f404bc1d1..f404bc1d1 100644
--- a/gfx/pics/166/shiny.pal
+++ b/gfx/pics/ledyba/shiny.pal
diff --git a/gfx/pics/108/anim0.asm b/gfx/pics/lickitung/anim0.asm
index 2fb31e50b..2fb31e50b 100644
--- a/gfx/pics/108/anim0.asm
+++ b/gfx/pics/lickitung/anim0.asm
diff --git a/gfx/pics/108/anim1.asm b/gfx/pics/lickitung/anim1.asm
index cf0355a03..cf0355a03 100644
--- a/gfx/pics/108/anim1.asm
+++ b/gfx/pics/lickitung/anim1.asm
diff --git a/gfx/pics/108/back.lz b/gfx/pics/lickitung/back.6x6.2bpp.lz
index 85764655a..85764655a 100644
--- a/gfx/pics/108/back.lz
+++ b/gfx/pics/lickitung/back.6x6.2bpp.lz
diff --git a/gfx/pics/108/bitmask.asm b/gfx/pics/lickitung/bitmask.asm
index 856fb977e..856fb977e 100644
--- a/gfx/pics/108/bitmask.asm
+++ b/gfx/pics/lickitung/bitmask.asm
diff --git a/gfx/pics/108/frames.asm b/gfx/pics/lickitung/frames.asm
index feb42d080..feb42d080 100644
--- a/gfx/pics/108/frames.asm
+++ b/gfx/pics/lickitung/frames.asm
diff --git a/gfx/pics/108/front.lz b/gfx/pics/lickitung/front.7x7.2bpp.lz
index f7e2f4f43..f7e2f4f43 100644
--- a/gfx/pics/108/front.lz
+++ b/gfx/pics/lickitung/front.7x7.2bpp.lz
diff --git a/gfx/pics/108/normal.pal b/gfx/pics/lickitung/normal.pal
index 75782a5b8..75782a5b8 100644
--- a/gfx/pics/108/normal.pal
+++ b/gfx/pics/lickitung/normal.pal
diff --git a/gfx/pics/108/shiny.pal b/gfx/pics/lickitung/shiny.pal
index 214a63264..214a63264 100644
--- a/gfx/pics/108/shiny.pal
+++ b/gfx/pics/lickitung/shiny.pal
diff --git a/gfx/pics/249/anim0.asm b/gfx/pics/lugia/anim0.asm
index 3c3c021a5..3c3c021a5 100644
--- a/gfx/pics/249/anim0.asm
+++ b/gfx/pics/lugia/anim0.asm
diff --git a/gfx/pics/249/anim1.asm b/gfx/pics/lugia/anim1.asm
index 31f2ea09c..31f2ea09c 100644
--- a/gfx/pics/249/anim1.asm
+++ b/gfx/pics/lugia/anim1.asm
diff --git a/gfx/pics/249/back.lz b/gfx/pics/lugia/back.6x6.2bpp.lz
index 8f7134e13..8f7134e13 100644
--- a/gfx/pics/249/back.lz
+++ b/gfx/pics/lugia/back.6x6.2bpp.lz
diff --git a/gfx/pics/249/bitmask.asm b/gfx/pics/lugia/bitmask.asm
index 3270ceba6..3270ceba6 100644
--- a/gfx/pics/249/bitmask.asm
+++ b/gfx/pics/lugia/bitmask.asm
diff --git a/gfx/pics/249/frames.asm b/gfx/pics/lugia/frames.asm
index a13767189..a13767189 100644
--- a/gfx/pics/249/frames.asm
+++ b/gfx/pics/lugia/frames.asm
diff --git a/gfx/pics/249/front.lz b/gfx/pics/lugia/front.7x7.2bpp.lz
index b1b300304..b1b300304 100644
--- a/gfx/pics/249/front.lz
+++ b/gfx/pics/lugia/front.7x7.2bpp.lz
diff --git a/gfx/pics/249/normal.pal b/gfx/pics/lugia/normal.pal
index 74bf84625..74bf84625 100644
--- a/gfx/pics/249/normal.pal
+++ b/gfx/pics/lugia/normal.pal
diff --git a/gfx/pics/249/shiny.pal b/gfx/pics/lugia/shiny.pal
index 22a7970ff..22a7970ff 100644
--- a/gfx/pics/249/shiny.pal
+++ b/gfx/pics/lugia/shiny.pal
diff --git a/gfx/pics/068/anim0.asm b/gfx/pics/machamp/anim0.asm
index 6202aefe5..6202aefe5 100644
--- a/gfx/pics/068/anim0.asm
+++ b/gfx/pics/machamp/anim0.asm
diff --git a/gfx/pics/068/anim1.asm b/gfx/pics/machamp/anim1.asm
index 5171d3966..5171d3966 100644
--- a/gfx/pics/068/anim1.asm
+++ b/gfx/pics/machamp/anim1.asm
diff --git a/gfx/pics/068/back.lz b/gfx/pics/machamp/back.6x6.2bpp.lz
index b82d09cce..b82d09cce 100644
--- a/gfx/pics/068/back.lz
+++ b/gfx/pics/machamp/back.6x6.2bpp.lz
diff --git a/gfx/pics/068/bitmask.asm b/gfx/pics/machamp/bitmask.asm
index a8960834d..a8960834d 100644
--- a/gfx/pics/068/bitmask.asm
+++ b/gfx/pics/machamp/bitmask.asm
diff --git a/gfx/pics/068/frames.asm b/gfx/pics/machamp/frames.asm
index 53963eb10..53963eb10 100644
--- a/gfx/pics/068/frames.asm
+++ b/gfx/pics/machamp/frames.asm
diff --git a/gfx/pics/068/front.lz b/gfx/pics/machamp/front.7x7.2bpp.lz
index aa1b12edb..aa1b12edb 100644
--- a/gfx/pics/068/front.lz
+++ b/gfx/pics/machamp/front.7x7.2bpp.lz
diff --git a/gfx/pics/068/normal.pal b/gfx/pics/machamp/normal.pal
index d9ba2de40..d9ba2de40 100644
--- a/gfx/pics/068/normal.pal
+++ b/gfx/pics/machamp/normal.pal
diff --git a/gfx/pics/068/shiny.pal b/gfx/pics/machamp/shiny.pal
index afe8a06a6..afe8a06a6 100644
--- a/gfx/pics/068/shiny.pal
+++ b/gfx/pics/machamp/shiny.pal
diff --git a/gfx/pics/067/anim0.asm b/gfx/pics/machoke/anim0.asm
index 6d89ab174..6d89ab174 100644
--- a/gfx/pics/067/anim0.asm
+++ b/gfx/pics/machoke/anim0.asm
diff --git a/gfx/pics/067/anim1.asm b/gfx/pics/machoke/anim1.asm
index c79f108d7..c79f108d7 100644
--- a/gfx/pics/067/anim1.asm
+++ b/gfx/pics/machoke/anim1.asm
diff --git a/gfx/pics/067/back.lz b/gfx/pics/machoke/back.6x6.2bpp.lz
index e6a0015ed..e6a0015ed 100644
--- a/gfx/pics/067/back.lz
+++ b/gfx/pics/machoke/back.6x6.2bpp.lz
diff --git a/gfx/pics/067/bitmask.asm b/gfx/pics/machoke/bitmask.asm
index 59bdaaea8..59bdaaea8 100644
--- a/gfx/pics/067/bitmask.asm
+++ b/gfx/pics/machoke/bitmask.asm
diff --git a/gfx/pics/067/frames.asm b/gfx/pics/machoke/frames.asm
index 72af5035f..72af5035f 100644
--- a/gfx/pics/067/frames.asm
+++ b/gfx/pics/machoke/frames.asm
diff --git a/gfx/pics/067/front.lz b/gfx/pics/machoke/front.7x7.2bpp.lz
index 984f1601f..984f1601f 100644
--- a/gfx/pics/067/front.lz
+++ b/gfx/pics/machoke/front.7x7.2bpp.lz
diff --git a/gfx/pics/067/normal.pal b/gfx/pics/machoke/normal.pal
index 85f98ff06..85f98ff06 100644
--- a/gfx/pics/067/normal.pal
+++ b/gfx/pics/machoke/normal.pal
diff --git a/gfx/pics/067/shiny.pal b/gfx/pics/machoke/shiny.pal
index 7dceaa4c1..7dceaa4c1 100644
--- a/gfx/pics/067/shiny.pal
+++ b/gfx/pics/machoke/shiny.pal
diff --git a/gfx/pics/066/anim0.asm b/gfx/pics/machop/anim0.asm
index 8fee766ce..8fee766ce 100644
--- a/gfx/pics/066/anim0.asm
+++ b/gfx/pics/machop/anim0.asm
diff --git a/gfx/pics/066/anim1.asm b/gfx/pics/machop/anim1.asm
index 20658284d..20658284d 100644
--- a/gfx/pics/066/anim1.asm
+++ b/gfx/pics/machop/anim1.asm
diff --git a/gfx/pics/066/back.lz b/gfx/pics/machop/back.6x6.2bpp.lz
index 96e6d00c6..96e6d00c6 100644
--- a/gfx/pics/066/back.lz
+++ b/gfx/pics/machop/back.6x6.2bpp.lz
diff --git a/gfx/pics/066/bitmask.asm b/gfx/pics/machop/bitmask.asm
index f82751c8f..f82751c8f 100644
--- a/gfx/pics/066/bitmask.asm
+++ b/gfx/pics/machop/bitmask.asm
diff --git a/gfx/pics/066/frames.asm b/gfx/pics/machop/frames.asm
index 6b834110a..6b834110a 100644
--- a/gfx/pics/066/frames.asm
+++ b/gfx/pics/machop/frames.asm
diff --git a/gfx/pics/066/front.lz b/gfx/pics/machop/front.5x5.2bpp.lz
index 3b5404276..3b5404276 100644
--- a/gfx/pics/066/front.lz
+++ b/gfx/pics/machop/front.5x5.2bpp.lz
diff --git a/gfx/pics/066/normal.pal b/gfx/pics/machop/normal.pal
index 75548c0a3..75548c0a3 100644
--- a/gfx/pics/066/normal.pal
+++ b/gfx/pics/machop/normal.pal
diff --git a/gfx/pics/066/shiny.pal b/gfx/pics/machop/shiny.pal
index 0b940effd..0b940effd 100644
--- a/gfx/pics/066/shiny.pal
+++ b/gfx/pics/machop/shiny.pal
diff --git a/gfx/pics/240/anim0.asm b/gfx/pics/magby/anim0.asm
index b0f8c7a10..b0f8c7a10 100644
--- a/gfx/pics/240/anim0.asm
+++ b/gfx/pics/magby/anim0.asm
diff --git a/gfx/pics/240/anim1.asm b/gfx/pics/magby/anim1.asm
index 20b2b7997..20b2b7997 100644
--- a/gfx/pics/240/anim1.asm
+++ b/gfx/pics/magby/anim1.asm
diff --git a/gfx/pics/240/back.lz b/gfx/pics/magby/back.6x6.2bpp.lz
index 8746c640e..8746c640e 100644
--- a/gfx/pics/240/back.lz
+++ b/gfx/pics/magby/back.6x6.2bpp.lz
diff --git a/gfx/pics/240/bitmask.asm b/gfx/pics/magby/bitmask.asm
index f65cfcd03..f65cfcd03 100644
--- a/gfx/pics/240/bitmask.asm
+++ b/gfx/pics/magby/bitmask.asm
diff --git a/gfx/pics/240/frames.asm b/gfx/pics/magby/frames.asm
index 48e013637..48e013637 100644
--- a/gfx/pics/240/frames.asm
+++ b/gfx/pics/magby/frames.asm
diff --git a/gfx/pics/240/front.lz b/gfx/pics/magby/front.6x6.2bpp.lz
index b4eac5040..b4eac5040 100644
--- a/gfx/pics/240/front.lz
+++ b/gfx/pics/magby/front.6x6.2bpp.lz
diff --git a/gfx/pics/240/normal.pal b/gfx/pics/magby/normal.pal
index 3a37ffe0d..3a37ffe0d 100644
--- a/gfx/pics/240/normal.pal
+++ b/gfx/pics/magby/normal.pal
diff --git a/gfx/pics/240/shiny.pal b/gfx/pics/magby/shiny.pal
index ee96fafd2..ee96fafd2 100644
--- a/gfx/pics/240/shiny.pal
+++ b/gfx/pics/magby/shiny.pal
diff --git a/gfx/pics/219/anim0.asm b/gfx/pics/magcargo/anim0.asm
index d6bf7543a..d6bf7543a 100644
--- a/gfx/pics/219/anim0.asm
+++ b/gfx/pics/magcargo/anim0.asm
diff --git a/gfx/pics/219/anim1.asm b/gfx/pics/magcargo/anim1.asm
index 3c76a44df..3c76a44df 100644
--- a/gfx/pics/219/anim1.asm
+++ b/gfx/pics/magcargo/anim1.asm
diff --git a/gfx/pics/219/back.lz b/gfx/pics/magcargo/back.6x6.2bpp.lz
index 5cafe687a..5cafe687a 100644
--- a/gfx/pics/219/back.lz
+++ b/gfx/pics/magcargo/back.6x6.2bpp.lz
diff --git a/gfx/pics/219/bitmask.asm b/gfx/pics/magcargo/bitmask.asm
index 3c212b320..3c212b320 100644
--- a/gfx/pics/219/bitmask.asm
+++ b/gfx/pics/magcargo/bitmask.asm
diff --git a/gfx/pics/219/frames.asm b/gfx/pics/magcargo/frames.asm
index d23c44950..d23c44950 100644
--- a/gfx/pics/219/frames.asm
+++ b/gfx/pics/magcargo/frames.asm
diff --git a/gfx/pics/219/front.lz b/gfx/pics/magcargo/front.6x6.2bpp.lz
index 8b2cda00e..8b2cda00e 100644
--- a/gfx/pics/219/front.lz
+++ b/gfx/pics/magcargo/front.6x6.2bpp.lz
diff --git a/gfx/pics/219/normal.pal b/gfx/pics/magcargo/normal.pal
index 572d0464a..572d0464a 100644
--- a/gfx/pics/219/normal.pal
+++ b/gfx/pics/magcargo/normal.pal
diff --git a/gfx/pics/219/shiny.pal b/gfx/pics/magcargo/shiny.pal
index a31d8288f..a31d8288f 100644
--- a/gfx/pics/219/shiny.pal
+++ b/gfx/pics/magcargo/shiny.pal
diff --git a/gfx/pics/129/anim0.asm b/gfx/pics/magikarp/anim0.asm
index f06f21a40..f06f21a40 100644
--- a/gfx/pics/129/anim0.asm
+++ b/gfx/pics/magikarp/anim0.asm
diff --git a/gfx/pics/129/anim1.asm b/gfx/pics/magikarp/anim1.asm
index 7c3f5cb76..7c3f5cb76 100644
--- a/gfx/pics/129/anim1.asm
+++ b/gfx/pics/magikarp/anim1.asm
diff --git a/gfx/pics/129/back.lz b/gfx/pics/magikarp/back.6x6.2bpp.lz
index 17100a9c5..17100a9c5 100644
--- a/gfx/pics/129/back.lz
+++ b/gfx/pics/magikarp/back.6x6.2bpp.lz
diff --git a/gfx/pics/129/bitmask.asm b/gfx/pics/magikarp/bitmask.asm
index 9cd807e7b..9cd807e7b 100644
--- a/gfx/pics/129/bitmask.asm
+++ b/gfx/pics/magikarp/bitmask.asm
diff --git a/gfx/pics/129/frames.asm b/gfx/pics/magikarp/frames.asm
index cfc25cf10..cfc25cf10 100644
--- a/gfx/pics/129/frames.asm
+++ b/gfx/pics/magikarp/frames.asm
diff --git a/gfx/pics/129/front.lz b/gfx/pics/magikarp/front.6x6.2bpp.lz
index 3ec963c7f..3ec963c7f 100644
--- a/gfx/pics/129/front.lz
+++ b/gfx/pics/magikarp/front.6x6.2bpp.lz
diff --git a/gfx/pics/129/normal.pal b/gfx/pics/magikarp/normal.pal
index 225333e20..225333e20 100644
--- a/gfx/pics/129/normal.pal
+++ b/gfx/pics/magikarp/normal.pal
diff --git a/gfx/pics/129/shiny.pal b/gfx/pics/magikarp/shiny.pal
index 24fb00761..24fb00761 100644
--- a/gfx/pics/129/shiny.pal
+++ b/gfx/pics/magikarp/shiny.pal
diff --git a/gfx/pics/126/anim0.asm b/gfx/pics/magmar/anim0.asm
index 8fde5d3b5..8fde5d3b5 100644
--- a/gfx/pics/126/anim0.asm
+++ b/gfx/pics/magmar/anim0.asm
diff --git a/gfx/pics/126/anim1.asm b/gfx/pics/magmar/anim1.asm
index 784bdcd3d..784bdcd3d 100644
--- a/gfx/pics/126/anim1.asm
+++ b/gfx/pics/magmar/anim1.asm
diff --git a/gfx/pics/126/back.lz b/gfx/pics/magmar/back.6x6.2bpp.lz
index 9b44bab34..9b44bab34 100644
--- a/gfx/pics/126/back.lz
+++ b/gfx/pics/magmar/back.6x6.2bpp.lz
diff --git a/gfx/pics/126/bitmask.asm b/gfx/pics/magmar/bitmask.asm
index 83d8877b0..83d8877b0 100644
--- a/gfx/pics/126/bitmask.asm
+++ b/gfx/pics/magmar/bitmask.asm
diff --git a/gfx/pics/126/frames.asm b/gfx/pics/magmar/frames.asm
index cfe2d76e5..cfe2d76e5 100644
--- a/gfx/pics/126/frames.asm
+++ b/gfx/pics/magmar/frames.asm
diff --git a/gfx/pics/126/front.lz b/gfx/pics/magmar/front.6x6.2bpp.lz
index 178afc45f..178afc45f 100644
--- a/gfx/pics/126/front.lz
+++ b/gfx/pics/magmar/front.6x6.2bpp.lz
diff --git a/gfx/pics/126/normal.pal b/gfx/pics/magmar/normal.pal
index 71372fd59..71372fd59 100644
--- a/gfx/pics/126/normal.pal
+++ b/gfx/pics/magmar/normal.pal
diff --git a/gfx/pics/126/shiny.pal b/gfx/pics/magmar/shiny.pal
index 0ccf2a2dd..0ccf2a2dd 100644
--- a/gfx/pics/126/shiny.pal
+++ b/gfx/pics/magmar/shiny.pal
diff --git a/gfx/pics/081/anim0.asm b/gfx/pics/magnemite/anim0.asm
index 4f038b0ed..4f038b0ed 100644
--- a/gfx/pics/081/anim0.asm
+++ b/gfx/pics/magnemite/anim0.asm
diff --git a/gfx/pics/081/anim1.asm b/gfx/pics/magnemite/anim1.asm
index a41239563..a41239563 100644
--- a/gfx/pics/081/anim1.asm
+++ b/gfx/pics/magnemite/anim1.asm
diff --git a/gfx/pics/081/back.lz b/gfx/pics/magnemite/back.6x6.2bpp.lz
index f5cb4f801..f5cb4f801 100644
--- a/gfx/pics/081/back.lz
+++ b/gfx/pics/magnemite/back.6x6.2bpp.lz
diff --git a/gfx/pics/081/bitmask.asm b/gfx/pics/magnemite/bitmask.asm
index e1a59970a..e1a59970a 100644
--- a/gfx/pics/081/bitmask.asm
+++ b/gfx/pics/magnemite/bitmask.asm
diff --git a/gfx/pics/081/frames.asm b/gfx/pics/magnemite/frames.asm
index 8bad75545..8bad75545 100644
--- a/gfx/pics/081/frames.asm
+++ b/gfx/pics/magnemite/frames.asm
diff --git a/gfx/pics/081/front.lz b/gfx/pics/magnemite/front.5x5.2bpp.lz
index fb221be89..fb221be89 100644
--- a/gfx/pics/081/front.lz
+++ b/gfx/pics/magnemite/front.5x5.2bpp.lz
diff --git a/gfx/pics/081/normal.pal b/gfx/pics/magnemite/normal.pal
index 0ac1c9c8e..0ac1c9c8e 100644
--- a/gfx/pics/081/normal.pal
+++ b/gfx/pics/magnemite/normal.pal
diff --git a/gfx/pics/081/shiny.pal b/gfx/pics/magnemite/shiny.pal
index 1ebbee13f..1ebbee13f 100644
--- a/gfx/pics/081/shiny.pal
+++ b/gfx/pics/magnemite/shiny.pal
diff --git a/gfx/pics/082/anim0.asm b/gfx/pics/magneton/anim0.asm
index 26b34d4ec..26b34d4ec 100644
--- a/gfx/pics/082/anim0.asm
+++ b/gfx/pics/magneton/anim0.asm
diff --git a/gfx/pics/082/anim1.asm b/gfx/pics/magneton/anim1.asm
index 6045d8fae..6045d8fae 100644
--- a/gfx/pics/082/anim1.asm
+++ b/gfx/pics/magneton/anim1.asm
diff --git a/gfx/pics/082/back.lz b/gfx/pics/magneton/back.6x6.2bpp.lz
index c029f8cef..c029f8cef 100644
--- a/gfx/pics/082/back.lz
+++ b/gfx/pics/magneton/back.6x6.2bpp.lz
diff --git a/gfx/pics/082/bitmask.asm b/gfx/pics/magneton/bitmask.asm
index 907401be7..907401be7 100644
--- a/gfx/pics/082/bitmask.asm
+++ b/gfx/pics/magneton/bitmask.asm
diff --git a/gfx/pics/082/frames.asm b/gfx/pics/magneton/frames.asm
index 845c96593..845c96593 100644
--- a/gfx/pics/082/frames.asm
+++ b/gfx/pics/magneton/frames.asm
diff --git a/gfx/pics/082/front.lz b/gfx/pics/magneton/front.6x6.2bpp.lz
index f7b7a0be0..f7b7a0be0 100644
--- a/gfx/pics/082/front.lz
+++ b/gfx/pics/magneton/front.6x6.2bpp.lz
diff --git a/gfx/pics/082/normal.pal b/gfx/pics/magneton/normal.pal
index 0ac1c9c8e..0ac1c9c8e 100644
--- a/gfx/pics/082/normal.pal
+++ b/gfx/pics/magneton/normal.pal
diff --git a/gfx/pics/082/shiny.pal b/gfx/pics/magneton/shiny.pal
index 54c3a94ac..54c3a94ac 100644
--- a/gfx/pics/082/shiny.pal
+++ b/gfx/pics/magneton/shiny.pal
diff --git a/gfx/pics/056/anim0.asm b/gfx/pics/mankey/anim0.asm
index 7d6ef1fa5..7d6ef1fa5 100644
--- a/gfx/pics/056/anim0.asm
+++ b/gfx/pics/mankey/anim0.asm
diff --git a/gfx/pics/056/anim1.asm b/gfx/pics/mankey/anim1.asm
index c5874fc6d..c5874fc6d 100644
--- a/gfx/pics/056/anim1.asm
+++ b/gfx/pics/mankey/anim1.asm
diff --git a/gfx/pics/056/back.lz b/gfx/pics/mankey/back.6x6.2bpp.lz
index 62989a377..62989a377 100644
--- a/gfx/pics/056/back.lz
+++ b/gfx/pics/mankey/back.6x6.2bpp.lz
diff --git a/gfx/pics/056/bitmask.asm b/gfx/pics/mankey/bitmask.asm
index 51c0e405c..51c0e405c 100644
--- a/gfx/pics/056/bitmask.asm
+++ b/gfx/pics/mankey/bitmask.asm
diff --git a/gfx/pics/056/frames.asm b/gfx/pics/mankey/frames.asm
index 9c18dcf86..9c18dcf86 100644
--- a/gfx/pics/056/frames.asm
+++ b/gfx/pics/mankey/frames.asm
diff --git a/gfx/pics/056/front.lz b/gfx/pics/mankey/front.5x5.2bpp.lz
index 03d014d87..03d014d87 100644
--- a/gfx/pics/056/front.lz
+++ b/gfx/pics/mankey/front.5x5.2bpp.lz
diff --git a/gfx/pics/056/normal.pal b/gfx/pics/mankey/normal.pal
index 3e432d117..3e432d117 100644
--- a/gfx/pics/056/normal.pal
+++ b/gfx/pics/mankey/normal.pal
diff --git a/gfx/pics/056/shiny.pal b/gfx/pics/mankey/shiny.pal
index 455125489..455125489 100644
--- a/gfx/pics/056/shiny.pal
+++ b/gfx/pics/mankey/shiny.pal
diff --git a/gfx/pics/226/anim0.asm b/gfx/pics/mantine/anim0.asm
index d0a51de3e..d0a51de3e 100644
--- a/gfx/pics/226/anim0.asm
+++ b/gfx/pics/mantine/anim0.asm
diff --git a/gfx/pics/226/anim1.asm b/gfx/pics/mantine/anim1.asm
index f552b1f09..f552b1f09 100644
--- a/gfx/pics/226/anim1.asm
+++ b/gfx/pics/mantine/anim1.asm
diff --git a/gfx/pics/226/back.lz b/gfx/pics/mantine/back.6x6.2bpp.lz
index 3378e2df5..3378e2df5 100644
--- a/gfx/pics/226/back.lz
+++ b/gfx/pics/mantine/back.6x6.2bpp.lz
diff --git a/gfx/pics/226/bitmask.asm b/gfx/pics/mantine/bitmask.asm
index 30756d325..30756d325 100644
--- a/gfx/pics/226/bitmask.asm
+++ b/gfx/pics/mantine/bitmask.asm
diff --git a/gfx/pics/226/frames.asm b/gfx/pics/mantine/frames.asm
index 37768e7e5..37768e7e5 100644
--- a/gfx/pics/226/frames.asm
+++ b/gfx/pics/mantine/frames.asm
diff --git a/gfx/pics/226/front.lz b/gfx/pics/mantine/front.7x7.2bpp.lz
index 6ebc14050..6ebc14050 100644
--- a/gfx/pics/226/front.lz
+++ b/gfx/pics/mantine/front.7x7.2bpp.lz
diff --git a/gfx/pics/226/normal.pal b/gfx/pics/mantine/normal.pal
index ff9214da9..ff9214da9 100644
--- a/gfx/pics/226/normal.pal
+++ b/gfx/pics/mantine/normal.pal
diff --git a/gfx/pics/226/shiny.pal b/gfx/pics/mantine/shiny.pal
index cd743d8ba..cd743d8ba 100644
--- a/gfx/pics/226/shiny.pal
+++ b/gfx/pics/mantine/shiny.pal
diff --git a/gfx/pics/179/anim0.asm b/gfx/pics/mareep/anim0.asm
index e74a78cad..e74a78cad 100644
--- a/gfx/pics/179/anim0.asm
+++ b/gfx/pics/mareep/anim0.asm
diff --git a/gfx/pics/179/anim1.asm b/gfx/pics/mareep/anim1.asm
index 21d7a79f8..21d7a79f8 100644
--- a/gfx/pics/179/anim1.asm
+++ b/gfx/pics/mareep/anim1.asm
diff --git a/gfx/pics/179/back.lz b/gfx/pics/mareep/back.6x6.2bpp.lz
index e703d450f..e703d450f 100644
--- a/gfx/pics/179/back.lz
+++ b/gfx/pics/mareep/back.6x6.2bpp.lz
diff --git a/gfx/pics/179/bitmask.asm b/gfx/pics/mareep/bitmask.asm
index 7dcdb9300..7dcdb9300 100644
--- a/gfx/pics/179/bitmask.asm
+++ b/gfx/pics/mareep/bitmask.asm
diff --git a/gfx/pics/179/frames.asm b/gfx/pics/mareep/frames.asm
index 180c3e45f..180c3e45f 100644
--- a/gfx/pics/179/frames.asm
+++ b/gfx/pics/mareep/frames.asm
diff --git a/gfx/pics/179/front.lz b/gfx/pics/mareep/front.5x5.2bpp.lz
index 0245a96cd..0245a96cd 100644
--- a/gfx/pics/179/front.lz
+++ b/gfx/pics/mareep/front.5x5.2bpp.lz
diff --git a/gfx/pics/179/normal.pal b/gfx/pics/mareep/normal.pal
index 9b9174f67..9b9174f67 100644
--- a/gfx/pics/179/normal.pal
+++ b/gfx/pics/mareep/normal.pal
diff --git a/gfx/pics/179/shiny.pal b/gfx/pics/mareep/shiny.pal
index 7e4fe925b..7e4fe925b 100644
--- a/gfx/pics/179/shiny.pal
+++ b/gfx/pics/mareep/shiny.pal
diff --git a/gfx/pics/183/anim0.asm b/gfx/pics/marill/anim0.asm
index 5b8c7fc2a..5b8c7fc2a 100644
--- a/gfx/pics/183/anim0.asm
+++ b/gfx/pics/marill/anim0.asm
diff --git a/gfx/pics/183/anim1.asm b/gfx/pics/marill/anim1.asm
index 3be2dd1dc..3be2dd1dc 100644
--- a/gfx/pics/183/anim1.asm
+++ b/gfx/pics/marill/anim1.asm
diff --git a/gfx/pics/183/back.lz b/gfx/pics/marill/back.6x6.2bpp.lz
index 699fdaf6c..699fdaf6c 100644
--- a/gfx/pics/183/back.lz
+++ b/gfx/pics/marill/back.6x6.2bpp.lz
diff --git a/gfx/pics/183/bitmask.asm b/gfx/pics/marill/bitmask.asm
index 8c8fc0802..8c8fc0802 100644
--- a/gfx/pics/183/bitmask.asm
+++ b/gfx/pics/marill/bitmask.asm
diff --git a/gfx/pics/183/frames.asm b/gfx/pics/marill/frames.asm
index 04ab38489..04ab38489 100644
--- a/gfx/pics/183/frames.asm
+++ b/gfx/pics/marill/frames.asm
diff --git a/gfx/pics/183/front.lz b/gfx/pics/marill/front.5x5.2bpp.lz
index abe4c982a..abe4c982a 100644
--- a/gfx/pics/183/front.lz
+++ b/gfx/pics/marill/front.5x5.2bpp.lz
diff --git a/gfx/pics/183/normal.pal b/gfx/pics/marill/normal.pal
index 048adb0fd..048adb0fd 100644
--- a/gfx/pics/183/normal.pal
+++ b/gfx/pics/marill/normal.pal
diff --git a/gfx/pics/183/shiny.pal b/gfx/pics/marill/shiny.pal
index e75fe9208..e75fe9208 100644
--- a/gfx/pics/183/shiny.pal
+++ b/gfx/pics/marill/shiny.pal
diff --git a/gfx/pics/105/anim0.asm b/gfx/pics/marowak/anim0.asm
index 23c9d2f92..23c9d2f92 100644
--- a/gfx/pics/105/anim0.asm
+++ b/gfx/pics/marowak/anim0.asm
diff --git a/gfx/pics/105/anim1.asm b/gfx/pics/marowak/anim1.asm
index 5cdcd7594..5cdcd7594 100644
--- a/gfx/pics/105/anim1.asm
+++ b/gfx/pics/marowak/anim1.asm
diff --git a/gfx/pics/105/back.lz b/gfx/pics/marowak/back.6x6.2bpp.lz
index 90a297b3d..90a297b3d 100644
--- a/gfx/pics/105/back.lz
+++ b/gfx/pics/marowak/back.6x6.2bpp.lz
diff --git a/gfx/pics/105/bitmask.asm b/gfx/pics/marowak/bitmask.asm
index 2d53ac4d7..2d53ac4d7 100644
--- a/gfx/pics/105/bitmask.asm
+++ b/gfx/pics/marowak/bitmask.asm
diff --git a/gfx/pics/105/frames.asm b/gfx/pics/marowak/frames.asm
index 7f0a506f1..7f0a506f1 100644
--- a/gfx/pics/105/frames.asm
+++ b/gfx/pics/marowak/frames.asm
diff --git a/gfx/pics/105/front.lz b/gfx/pics/marowak/front.6x6.2bpp.lz
index 59f984bcd..59f984bcd 100644
--- a/gfx/pics/105/front.lz
+++ b/gfx/pics/marowak/front.6x6.2bpp.lz
diff --git a/gfx/pics/105/normal.pal b/gfx/pics/marowak/normal.pal
index eb2ec4b7b..eb2ec4b7b 100644
--- a/gfx/pics/105/normal.pal
+++ b/gfx/pics/marowak/normal.pal
diff --git a/gfx/pics/105/shiny.pal b/gfx/pics/marowak/shiny.pal
index 2f2093469..2f2093469 100644
--- a/gfx/pics/105/shiny.pal
+++ b/gfx/pics/marowak/shiny.pal
diff --git a/gfx/pics/154/anim0.asm b/gfx/pics/meganium/anim0.asm
index adf80db8f..adf80db8f 100644
--- a/gfx/pics/154/anim0.asm
+++ b/gfx/pics/meganium/anim0.asm
diff --git a/gfx/pics/154/anim1.asm b/gfx/pics/meganium/anim1.asm
index f28c9d97a..f28c9d97a 100644
--- a/gfx/pics/154/anim1.asm
+++ b/gfx/pics/meganium/anim1.asm
diff --git a/gfx/pics/154/back.lz b/gfx/pics/meganium/back.6x6.2bpp.lz
index 718f66f87..718f66f87 100644
--- a/gfx/pics/154/back.lz
+++ b/gfx/pics/meganium/back.6x6.2bpp.lz
diff --git a/gfx/pics/154/bitmask.asm b/gfx/pics/meganium/bitmask.asm
index 166f67518..166f67518 100644
--- a/gfx/pics/154/bitmask.asm
+++ b/gfx/pics/meganium/bitmask.asm
diff --git a/gfx/pics/154/frames.asm b/gfx/pics/meganium/frames.asm
index f167fec7c..f167fec7c 100644
--- a/gfx/pics/154/frames.asm
+++ b/gfx/pics/meganium/frames.asm
diff --git a/gfx/pics/154/front.lz b/gfx/pics/meganium/front.7x7.2bpp.lz
index 84f600d60..84f600d60 100644
--- a/gfx/pics/154/front.lz
+++ b/gfx/pics/meganium/front.7x7.2bpp.lz
diff --git a/gfx/pics/154/normal.pal b/gfx/pics/meganium/normal.pal
index 2186bdc28..2186bdc28 100644
--- a/gfx/pics/154/normal.pal
+++ b/gfx/pics/meganium/normal.pal
diff --git a/gfx/pics/154/shiny.pal b/gfx/pics/meganium/shiny.pal
index b09a172f6..b09a172f6 100644
--- a/gfx/pics/154/shiny.pal
+++ b/gfx/pics/meganium/shiny.pal
diff --git a/gfx/pics/052/anim0.asm b/gfx/pics/meowth/anim0.asm
index ff95e9c6d..ff95e9c6d 100644
--- a/gfx/pics/052/anim0.asm
+++ b/gfx/pics/meowth/anim0.asm
diff --git a/gfx/pics/052/anim1.asm b/gfx/pics/meowth/anim1.asm
index 7f1e9eba8..7f1e9eba8 100644
--- a/gfx/pics/052/anim1.asm
+++ b/gfx/pics/meowth/anim1.asm
diff --git a/gfx/pics/052/back.lz b/gfx/pics/meowth/back.6x6.2bpp.lz
index 205b106e9..205b106e9 100644
--- a/gfx/pics/052/back.lz
+++ b/gfx/pics/meowth/back.6x6.2bpp.lz
diff --git a/gfx/pics/052/bitmask.asm b/gfx/pics/meowth/bitmask.asm
index cde515e01..cde515e01 100644
--- a/gfx/pics/052/bitmask.asm
+++ b/gfx/pics/meowth/bitmask.asm
diff --git a/gfx/pics/052/frames.asm b/gfx/pics/meowth/frames.asm
index 26c2aaea9..26c2aaea9 100644
--- a/gfx/pics/052/frames.asm
+++ b/gfx/pics/meowth/frames.asm
diff --git a/gfx/pics/052/front.lz b/gfx/pics/meowth/front.5x5.2bpp.lz
index 87ff35366..87ff35366 100644
--- a/gfx/pics/052/front.lz
+++ b/gfx/pics/meowth/front.5x5.2bpp.lz
diff --git a/gfx/pics/052/normal.pal b/gfx/pics/meowth/normal.pal
index ed418e46d..ed418e46d 100644
--- a/gfx/pics/052/normal.pal
+++ b/gfx/pics/meowth/normal.pal
diff --git a/gfx/pics/052/shiny.pal b/gfx/pics/meowth/shiny.pal
index 3ca34fc76..3ca34fc76 100644
--- a/gfx/pics/052/shiny.pal
+++ b/gfx/pics/meowth/shiny.pal
diff --git a/gfx/pics/011/anim0.asm b/gfx/pics/metapod/anim0.asm
index da76c7094..da76c7094 100644
--- a/gfx/pics/011/anim0.asm
+++ b/gfx/pics/metapod/anim0.asm
diff --git a/gfx/pics/011/anim1.asm b/gfx/pics/metapod/anim1.asm
index e22d46cb7..e22d46cb7 100644
--- a/gfx/pics/011/anim1.asm
+++ b/gfx/pics/metapod/anim1.asm
diff --git a/gfx/pics/011/back.lz b/gfx/pics/metapod/back.6x6.2bpp.lz
index a2a446960..a2a446960 100644
--- a/gfx/pics/011/back.lz
+++ b/gfx/pics/metapod/back.6x6.2bpp.lz
diff --git a/gfx/pics/011/bitmask.asm b/gfx/pics/metapod/bitmask.asm
index 1041f7ee5..1041f7ee5 100644
--- a/gfx/pics/011/bitmask.asm
+++ b/gfx/pics/metapod/bitmask.asm
diff --git a/gfx/pics/011/frames.asm b/gfx/pics/metapod/frames.asm
index acde5cf10..acde5cf10 100644
--- a/gfx/pics/011/frames.asm
+++ b/gfx/pics/metapod/frames.asm
diff --git a/gfx/pics/011/front.lz b/gfx/pics/metapod/front.5x5.2bpp.lz
index 1dcd7a501..1dcd7a501 100644
--- a/gfx/pics/011/front.lz
+++ b/gfx/pics/metapod/front.5x5.2bpp.lz
diff --git a/gfx/pics/011/normal.pal b/gfx/pics/metapod/normal.pal
index c171dafcc..c171dafcc 100644
--- a/gfx/pics/011/normal.pal
+++ b/gfx/pics/metapod/normal.pal
diff --git a/gfx/pics/011/shiny.pal b/gfx/pics/metapod/shiny.pal
index 4d0b72658..4d0b72658 100644
--- a/gfx/pics/011/shiny.pal
+++ b/gfx/pics/metapod/shiny.pal
diff --git a/gfx/pics/151/anim0.asm b/gfx/pics/mew/anim0.asm
index b01e307de..b01e307de 100644
--- a/gfx/pics/151/anim0.asm
+++ b/gfx/pics/mew/anim0.asm
diff --git a/gfx/pics/151/anim1.asm b/gfx/pics/mew/anim1.asm
index c22e552cb..c22e552cb 100644
--- a/gfx/pics/151/anim1.asm
+++ b/gfx/pics/mew/anim1.asm
diff --git a/gfx/pics/151/back.lz b/gfx/pics/mew/back.6x6.2bpp.lz
index 388a8de9e..388a8de9e 100644
--- a/gfx/pics/151/back.lz
+++ b/gfx/pics/mew/back.6x6.2bpp.lz
diff --git a/gfx/pics/151/bitmask.asm b/gfx/pics/mew/bitmask.asm
index 2d76b105a..2d76b105a 100644
--- a/gfx/pics/151/bitmask.asm
+++ b/gfx/pics/mew/bitmask.asm
diff --git a/gfx/pics/151/frames.asm b/gfx/pics/mew/frames.asm
index 712e7dd40..712e7dd40 100644
--- a/gfx/pics/151/frames.asm
+++ b/gfx/pics/mew/frames.asm
diff --git a/gfx/pics/151/front.lz b/gfx/pics/mew/front.5x5.2bpp.lz
index 240965783..240965783 100644
--- a/gfx/pics/151/front.lz
+++ b/gfx/pics/mew/front.5x5.2bpp.lz
diff --git a/gfx/pics/151/normal.pal b/gfx/pics/mew/normal.pal
index c01d4ab54..c01d4ab54 100644
--- a/gfx/pics/151/normal.pal
+++ b/gfx/pics/mew/normal.pal
diff --git a/gfx/pics/151/shiny.pal b/gfx/pics/mew/shiny.pal
index 9b1a1cced..9b1a1cced 100644
--- a/gfx/pics/151/shiny.pal
+++ b/gfx/pics/mew/shiny.pal
diff --git a/gfx/pics/150/anim0.asm b/gfx/pics/mewtwo/anim0.asm
index 78682c111..78682c111 100644
--- a/gfx/pics/150/anim0.asm
+++ b/gfx/pics/mewtwo/anim0.asm
diff --git a/gfx/pics/150/anim1.asm b/gfx/pics/mewtwo/anim1.asm
index a80a56899..a80a56899 100644
--- a/gfx/pics/150/anim1.asm
+++ b/gfx/pics/mewtwo/anim1.asm
diff --git a/gfx/pics/150/back.lz b/gfx/pics/mewtwo/back.6x6.2bpp.lz
index 3be56c470..3be56c470 100644
--- a/gfx/pics/150/back.lz
+++ b/gfx/pics/mewtwo/back.6x6.2bpp.lz
diff --git a/gfx/pics/150/bitmask.asm b/gfx/pics/mewtwo/bitmask.asm
index 738bcddf3..738bcddf3 100644
--- a/gfx/pics/150/bitmask.asm
+++ b/gfx/pics/mewtwo/bitmask.asm
diff --git a/gfx/pics/150/frames.asm b/gfx/pics/mewtwo/frames.asm
index e948bc6ab..e948bc6ab 100644
--- a/gfx/pics/150/frames.asm
+++ b/gfx/pics/mewtwo/frames.asm
diff --git a/gfx/pics/150/front.lz b/gfx/pics/mewtwo/front.7x7.2bpp.lz
index 35cc2c378..35cc2c378 100644
--- a/gfx/pics/150/front.lz
+++ b/gfx/pics/mewtwo/front.7x7.2bpp.lz
diff --git a/gfx/pics/150/normal.pal b/gfx/pics/mewtwo/normal.pal
index b32f017f5..b32f017f5 100644
--- a/gfx/pics/150/normal.pal
+++ b/gfx/pics/mewtwo/normal.pal
diff --git a/gfx/pics/150/shiny.pal b/gfx/pics/mewtwo/shiny.pal
index c5dec4c3b..c5dec4c3b 100644
--- a/gfx/pics/150/shiny.pal
+++ b/gfx/pics/mewtwo/shiny.pal
diff --git a/gfx/pics/241/anim0.asm b/gfx/pics/miltank/anim0.asm
index 6d12f2d5d..6d12f2d5d 100644
--- a/gfx/pics/241/anim0.asm
+++ b/gfx/pics/miltank/anim0.asm
diff --git a/gfx/pics/241/anim1.asm b/gfx/pics/miltank/anim1.asm
index a6a76db7b..a6a76db7b 100644
--- a/gfx/pics/241/anim1.asm
+++ b/gfx/pics/miltank/anim1.asm
diff --git a/gfx/pics/241/back.lz b/gfx/pics/miltank/back.6x6.2bpp.lz
index 150f65c54..150f65c54 100644
--- a/gfx/pics/241/back.lz
+++ b/gfx/pics/miltank/back.6x6.2bpp.lz
diff --git a/gfx/pics/241/bitmask.asm b/gfx/pics/miltank/bitmask.asm
index ad082638a..ad082638a 100644
--- a/gfx/pics/241/bitmask.asm
+++ b/gfx/pics/miltank/bitmask.asm
diff --git a/gfx/pics/241/frames.asm b/gfx/pics/miltank/frames.asm
index 04b5427d0..04b5427d0 100644
--- a/gfx/pics/241/frames.asm
+++ b/gfx/pics/miltank/frames.asm
diff --git a/gfx/pics/241/front.lz b/gfx/pics/miltank/front.6x6.2bpp.lz
index 969d04fcd..969d04fcd 100644
--- a/gfx/pics/241/front.lz
+++ b/gfx/pics/miltank/front.6x6.2bpp.lz
diff --git a/gfx/pics/241/normal.pal b/gfx/pics/miltank/normal.pal
index a3669a307..a3669a307 100644
--- a/gfx/pics/241/normal.pal
+++ b/gfx/pics/miltank/normal.pal
diff --git a/gfx/pics/241/shiny.pal b/gfx/pics/miltank/shiny.pal
index 37792fe7e..37792fe7e 100644
--- a/gfx/pics/241/shiny.pal
+++ b/gfx/pics/miltank/shiny.pal
diff --git a/gfx/pics/200/anim0.asm b/gfx/pics/misdreavus/anim0.asm
index d833c96fb..d833c96fb 100644
--- a/gfx/pics/200/anim0.asm
+++ b/gfx/pics/misdreavus/anim0.asm
diff --git a/gfx/pics/200/anim1.asm b/gfx/pics/misdreavus/anim1.asm
index 3f0ee9517..3f0ee9517 100644
--- a/gfx/pics/200/anim1.asm
+++ b/gfx/pics/misdreavus/anim1.asm
diff --git a/gfx/pics/200/back.lz b/gfx/pics/misdreavus/back.6x6.2bpp.lz
index 5cf96e821..5cf96e821 100644
--- a/gfx/pics/200/back.lz
+++ b/gfx/pics/misdreavus/back.6x6.2bpp.lz
diff --git a/gfx/pics/200/bitmask.asm b/gfx/pics/misdreavus/bitmask.asm
index 4f05efbf4..4f05efbf4 100644
--- a/gfx/pics/200/bitmask.asm
+++ b/gfx/pics/misdreavus/bitmask.asm
diff --git a/gfx/pics/200/frames.asm b/gfx/pics/misdreavus/frames.asm
index f5507980b..f5507980b 100644
--- a/gfx/pics/200/frames.asm
+++ b/gfx/pics/misdreavus/frames.asm
diff --git a/gfx/pics/200/front.lz b/gfx/pics/misdreavus/front.6x6.2bpp.lz
index 76f5c6919..76f5c6919 100644
--- a/gfx/pics/200/front.lz
+++ b/gfx/pics/misdreavus/front.6x6.2bpp.lz
diff --git a/gfx/pics/200/normal.pal b/gfx/pics/misdreavus/normal.pal
index dc04cfdbf..dc04cfdbf 100644
--- a/gfx/pics/200/normal.pal
+++ b/gfx/pics/misdreavus/normal.pal
diff --git a/gfx/pics/200/shiny.pal b/gfx/pics/misdreavus/shiny.pal
index dbd1aac54..dbd1aac54 100644
--- a/gfx/pics/200/shiny.pal
+++ b/gfx/pics/misdreavus/shiny.pal
diff --git a/gfx/pics/146/anim0.asm b/gfx/pics/moltres/anim0.asm
index 220626749..220626749 100644
--- a/gfx/pics/146/anim0.asm
+++ b/gfx/pics/moltres/anim0.asm
diff --git a/gfx/pics/146/anim1.asm b/gfx/pics/moltres/anim1.asm
index 258191b6e..258191b6e 100644
--- a/gfx/pics/146/anim1.asm
+++ b/gfx/pics/moltres/anim1.asm
diff --git a/gfx/pics/146/back.lz b/gfx/pics/moltres/back.6x6.2bpp.lz
index 542a73138..542a73138 100644
--- a/gfx/pics/146/back.lz
+++ b/gfx/pics/moltres/back.6x6.2bpp.lz
diff --git a/gfx/pics/146/bitmask.asm b/gfx/pics/moltres/bitmask.asm
index b5cf7908e..b5cf7908e 100644
--- a/gfx/pics/146/bitmask.asm
+++ b/gfx/pics/moltres/bitmask.asm
diff --git a/gfx/pics/146/frames.asm b/gfx/pics/moltres/frames.asm
index 2db9205cb..2db9205cb 100644
--- a/gfx/pics/146/frames.asm
+++ b/gfx/pics/moltres/frames.asm
diff --git a/gfx/pics/146/front.lz b/gfx/pics/moltres/front.7x7.2bpp.lz
index ec03e4653..ec03e4653 100644
--- a/gfx/pics/146/front.lz
+++ b/gfx/pics/moltres/front.7x7.2bpp.lz
diff --git a/gfx/pics/146/normal.pal b/gfx/pics/moltres/normal.pal
index 74fbaa204..74fbaa204 100644
--- a/gfx/pics/146/normal.pal
+++ b/gfx/pics/moltres/normal.pal
diff --git a/gfx/pics/146/shiny.pal b/gfx/pics/moltres/shiny.pal
index 523732d45..523732d45 100644
--- a/gfx/pics/146/shiny.pal
+++ b/gfx/pics/moltres/shiny.pal
diff --git a/gfx/pics/122/anim0.asm b/gfx/pics/mr__mime/anim0.asm
index fcb597a5a..fcb597a5a 100644
--- a/gfx/pics/122/anim0.asm
+++ b/gfx/pics/mr__mime/anim0.asm
diff --git a/gfx/pics/122/anim1.asm b/gfx/pics/mr__mime/anim1.asm
index c3747ac1e..c3747ac1e 100644
--- a/gfx/pics/122/anim1.asm
+++ b/gfx/pics/mr__mime/anim1.asm
diff --git a/gfx/pics/122/back.lz b/gfx/pics/mr__mime/back.6x6.2bpp.lz
index eb1647580..eb1647580 100644
--- a/gfx/pics/122/back.lz
+++ b/gfx/pics/mr__mime/back.6x6.2bpp.lz
diff --git a/gfx/pics/122/bitmask.asm b/gfx/pics/mr__mime/bitmask.asm
index b401ed87b..b401ed87b 100644
--- a/gfx/pics/122/bitmask.asm
+++ b/gfx/pics/mr__mime/bitmask.asm
diff --git a/gfx/pics/122/frames.asm b/gfx/pics/mr__mime/frames.asm
index d4bbe4b31..d4bbe4b31 100644
--- a/gfx/pics/122/frames.asm
+++ b/gfx/pics/mr__mime/frames.asm
diff --git a/gfx/pics/122/front.lz b/gfx/pics/mr__mime/front.6x6.2bpp.lz
index 48555cbe0..48555cbe0 100644
--- a/gfx/pics/122/front.lz
+++ b/gfx/pics/mr__mime/front.6x6.2bpp.lz
diff --git a/gfx/pics/222/normal.pal b/gfx/pics/mr__mime/normal.pal
index 8dd10edc5..8dd10edc5 100644
--- a/gfx/pics/222/normal.pal
+++ b/gfx/pics/mr__mime/normal.pal
diff --git a/gfx/pics/122/shiny.pal b/gfx/pics/mr__mime/shiny.pal
index d9a2accd2..d9a2accd2 100644
--- a/gfx/pics/122/shiny.pal
+++ b/gfx/pics/mr__mime/shiny.pal
diff --git a/gfx/pics/089/anim0.asm b/gfx/pics/muk/anim0.asm
index 1bacba421..1bacba421 100644
--- a/gfx/pics/089/anim0.asm
+++ b/gfx/pics/muk/anim0.asm
diff --git a/gfx/pics/089/anim1.asm b/gfx/pics/muk/anim1.asm
index db37bf515..db37bf515 100644
--- a/gfx/pics/089/anim1.asm
+++ b/gfx/pics/muk/anim1.asm
diff --git a/gfx/pics/089/back.lz b/gfx/pics/muk/back.6x6.2bpp.lz
index 63a6aa8de..63a6aa8de 100644
--- a/gfx/pics/089/back.lz
+++ b/gfx/pics/muk/back.6x6.2bpp.lz
diff --git a/gfx/pics/089/bitmask.asm b/gfx/pics/muk/bitmask.asm
index 7530a8adf..7530a8adf 100644
--- a/gfx/pics/089/bitmask.asm
+++ b/gfx/pics/muk/bitmask.asm
diff --git a/gfx/pics/089/frames.asm b/gfx/pics/muk/frames.asm
index 1cab5f1f9..1cab5f1f9 100644
--- a/gfx/pics/089/frames.asm
+++ b/gfx/pics/muk/frames.asm
diff --git a/gfx/pics/089/front.lz b/gfx/pics/muk/front.7x7.2bpp.lz
index 3a4280270..3a4280270 100644
--- a/gfx/pics/089/front.lz
+++ b/gfx/pics/muk/front.7x7.2bpp.lz
diff --git a/gfx/pics/089/normal.pal b/gfx/pics/muk/normal.pal
index 32df6345f..32df6345f 100644
--- a/gfx/pics/089/normal.pal
+++ b/gfx/pics/muk/normal.pal
diff --git a/gfx/pics/089/shiny.pal b/gfx/pics/muk/shiny.pal
index 34c8de27e..34c8de27e 100644
--- a/gfx/pics/089/shiny.pal
+++ b/gfx/pics/muk/shiny.pal
diff --git a/gfx/pics/198/anim0.asm b/gfx/pics/murkrow/anim0.asm
index 8f0ca6a72..8f0ca6a72 100644
--- a/gfx/pics/198/anim0.asm
+++ b/gfx/pics/murkrow/anim0.asm
diff --git a/gfx/pics/198/anim1.asm b/gfx/pics/murkrow/anim1.asm
index 85e2f9c56..85e2f9c56 100644
--- a/gfx/pics/198/anim1.asm
+++ b/gfx/pics/murkrow/anim1.asm
diff --git a/gfx/pics/198/back.lz b/gfx/pics/murkrow/back.6x6.2bpp.lz
index b99287081..b99287081 100644
--- a/gfx/pics/198/back.lz
+++ b/gfx/pics/murkrow/back.6x6.2bpp.lz
diff --git a/gfx/pics/198/bitmask.asm b/gfx/pics/murkrow/bitmask.asm
index 064e41955..064e41955 100644
--- a/gfx/pics/198/bitmask.asm
+++ b/gfx/pics/murkrow/bitmask.asm
diff --git a/gfx/pics/198/frames.asm b/gfx/pics/murkrow/frames.asm
index e7efcf1d5..e7efcf1d5 100644
--- a/gfx/pics/198/frames.asm
+++ b/gfx/pics/murkrow/frames.asm
diff --git a/gfx/pics/198/front.lz b/gfx/pics/murkrow/front.6x6.2bpp.lz
index e7ae99387..e7ae99387 100644
--- a/gfx/pics/198/front.lz
+++ b/gfx/pics/murkrow/front.6x6.2bpp.lz
diff --git a/gfx/pics/198/normal.pal b/gfx/pics/murkrow/normal.pal
index c32f0fa7b..c32f0fa7b 100644
--- a/gfx/pics/198/normal.pal
+++ b/gfx/pics/murkrow/normal.pal
diff --git a/gfx/pics/198/shiny.pal b/gfx/pics/murkrow/shiny.pal
index 8f015f0fe..8f015f0fe 100644
--- a/gfx/pics/198/shiny.pal
+++ b/gfx/pics/murkrow/shiny.pal
diff --git a/gfx/pics/177/anim0.asm b/gfx/pics/natu/anim0.asm
index 22c2659db..22c2659db 100644
--- a/gfx/pics/177/anim0.asm
+++ b/gfx/pics/natu/anim0.asm
diff --git a/gfx/pics/177/anim1.asm b/gfx/pics/natu/anim1.asm
index a4a974877..a4a974877 100644
--- a/gfx/pics/177/anim1.asm
+++ b/gfx/pics/natu/anim1.asm
diff --git a/gfx/pics/177/back.lz b/gfx/pics/natu/back.6x6.2bpp.lz
index b4ba45c14..b4ba45c14 100644
--- a/gfx/pics/177/back.lz
+++ b/gfx/pics/natu/back.6x6.2bpp.lz
diff --git a/gfx/pics/177/bitmask.asm b/gfx/pics/natu/bitmask.asm
index 258acf82b..258acf82b 100644
--- a/gfx/pics/177/bitmask.asm
+++ b/gfx/pics/natu/bitmask.asm
diff --git a/gfx/pics/177/frames.asm b/gfx/pics/natu/frames.asm
index 4cd8f77b2..4cd8f77b2 100644
--- a/gfx/pics/177/frames.asm
+++ b/gfx/pics/natu/frames.asm
diff --git a/gfx/pics/177/front.lz b/gfx/pics/natu/front.5x5.2bpp.lz
index adebc8879..adebc8879 100644
--- a/gfx/pics/177/front.lz
+++ b/gfx/pics/natu/front.5x5.2bpp.lz
diff --git a/gfx/pics/177/normal.pal b/gfx/pics/natu/normal.pal
index 9f85159c1..9f85159c1 100644
--- a/gfx/pics/177/normal.pal
+++ b/gfx/pics/natu/normal.pal
diff --git a/gfx/pics/177/shiny.pal b/gfx/pics/natu/shiny.pal
index 0ee2b82af..0ee2b82af 100644
--- a/gfx/pics/177/shiny.pal
+++ b/gfx/pics/natu/shiny.pal
diff --git a/gfx/pics/034/anim0.asm b/gfx/pics/nidoking/anim0.asm
index a32945d49..a32945d49 100644
--- a/gfx/pics/034/anim0.asm
+++ b/gfx/pics/nidoking/anim0.asm
diff --git a/gfx/pics/034/anim1.asm b/gfx/pics/nidoking/anim1.asm
index 4e56028e1..4e56028e1 100644
--- a/gfx/pics/034/anim1.asm
+++ b/gfx/pics/nidoking/anim1.asm
diff --git a/gfx/pics/034/back.lz b/gfx/pics/nidoking/back.6x6.2bpp.lz
index b3f35b5a1..b3f35b5a1 100644
--- a/gfx/pics/034/back.lz
+++ b/gfx/pics/nidoking/back.6x6.2bpp.lz
diff --git a/gfx/pics/034/bitmask.asm b/gfx/pics/nidoking/bitmask.asm
index fbd26cedc..fbd26cedc 100644
--- a/gfx/pics/034/bitmask.asm
+++ b/gfx/pics/nidoking/bitmask.asm
diff --git a/gfx/pics/034/frames.asm b/gfx/pics/nidoking/frames.asm
index 812c4aaee..812c4aaee 100644
--- a/gfx/pics/034/frames.asm
+++ b/gfx/pics/nidoking/frames.asm
diff --git a/gfx/pics/034/front.lz b/gfx/pics/nidoking/front.7x7.2bpp.lz
index aad75774c..aad75774c 100644
--- a/gfx/pics/034/front.lz
+++ b/gfx/pics/nidoking/front.7x7.2bpp.lz
diff --git a/gfx/pics/034/normal.pal b/gfx/pics/nidoking/normal.pal
index b9ab02b8c..b9ab02b8c 100644
--- a/gfx/pics/034/normal.pal
+++ b/gfx/pics/nidoking/normal.pal
diff --git a/gfx/pics/034/shiny.pal b/gfx/pics/nidoking/shiny.pal
index 61991fb6f..61991fb6f 100644
--- a/gfx/pics/034/shiny.pal
+++ b/gfx/pics/nidoking/shiny.pal
diff --git a/gfx/pics/031/anim0.asm b/gfx/pics/nidoqueen/anim0.asm
index bd9d8eee8..bd9d8eee8 100644
--- a/gfx/pics/031/anim0.asm
+++ b/gfx/pics/nidoqueen/anim0.asm
diff --git a/gfx/pics/031/anim1.asm b/gfx/pics/nidoqueen/anim1.asm
index 1cc934c42..1cc934c42 100644
--- a/gfx/pics/031/anim1.asm
+++ b/gfx/pics/nidoqueen/anim1.asm
diff --git a/gfx/pics/031/back.lz b/gfx/pics/nidoqueen/back.6x6.2bpp.lz
index b363f089e..b363f089e 100644
--- a/gfx/pics/031/back.lz
+++ b/gfx/pics/nidoqueen/back.6x6.2bpp.lz
diff --git a/gfx/pics/031/bitmask.asm b/gfx/pics/nidoqueen/bitmask.asm
index ba1c8fffb..ba1c8fffb 100644
--- a/gfx/pics/031/bitmask.asm
+++ b/gfx/pics/nidoqueen/bitmask.asm
diff --git a/gfx/pics/031/frames.asm b/gfx/pics/nidoqueen/frames.asm
index 6414018cc..6414018cc 100644
--- a/gfx/pics/031/frames.asm
+++ b/gfx/pics/nidoqueen/frames.asm
diff --git a/gfx/pics/031/front.lz b/gfx/pics/nidoqueen/front.7x7.2bpp.lz
index d02a553d5..d02a553d5 100644
--- a/gfx/pics/031/front.lz
+++ b/gfx/pics/nidoqueen/front.7x7.2bpp.lz
diff --git a/gfx/pics/031/normal.pal b/gfx/pics/nidoqueen/normal.pal
index 3e1053bfb..3e1053bfb 100644
--- a/gfx/pics/031/normal.pal
+++ b/gfx/pics/nidoqueen/normal.pal
diff --git a/gfx/pics/031/shiny.pal b/gfx/pics/nidoqueen/shiny.pal
index b27c118a6..b27c118a6 100644
--- a/gfx/pics/031/shiny.pal
+++ b/gfx/pics/nidoqueen/shiny.pal
diff --git a/gfx/pics/029/anim0.asm b/gfx/pics/nidoran_f/anim0.asm
index 623db13d1..623db13d1 100644
--- a/gfx/pics/029/anim0.asm
+++ b/gfx/pics/nidoran_f/anim0.asm
diff --git a/gfx/pics/029/anim1.asm b/gfx/pics/nidoran_f/anim1.asm
index 348179aac..348179aac 100644
--- a/gfx/pics/029/anim1.asm
+++ b/gfx/pics/nidoran_f/anim1.asm
diff --git a/gfx/pics/029/back.lz b/gfx/pics/nidoran_f/back.6x6.2bpp.lz
index df43f06a1..df43f06a1 100644
--- a/gfx/pics/029/back.lz
+++ b/gfx/pics/nidoran_f/back.6x6.2bpp.lz
diff --git a/gfx/pics/029/bitmask.asm b/gfx/pics/nidoran_f/bitmask.asm
index db5ecae05..db5ecae05 100644
--- a/gfx/pics/029/bitmask.asm
+++ b/gfx/pics/nidoran_f/bitmask.asm
diff --git a/gfx/pics/029/frames.asm b/gfx/pics/nidoran_f/frames.asm
index dd6a6ae74..dd6a6ae74 100644
--- a/gfx/pics/029/frames.asm
+++ b/gfx/pics/nidoran_f/frames.asm
diff --git a/gfx/pics/029/front.lz b/gfx/pics/nidoran_f/front.5x5.2bpp.lz
index 477857691..477857691 100644
--- a/gfx/pics/029/front.lz
+++ b/gfx/pics/nidoran_f/front.5x5.2bpp.lz
diff --git a/gfx/pics/029/normal.pal b/gfx/pics/nidoran_f/normal.pal
index d70e16ccb..d70e16ccb 100644
--- a/gfx/pics/029/normal.pal
+++ b/gfx/pics/nidoran_f/normal.pal
diff --git a/gfx/pics/029/shiny.pal b/gfx/pics/nidoran_f/shiny.pal
index 06dc1de15..06dc1de15 100644
--- a/gfx/pics/029/shiny.pal
+++ b/gfx/pics/nidoran_f/shiny.pal
diff --git a/gfx/pics/032/anim0.asm b/gfx/pics/nidoran_m/anim0.asm
index 9b8a38133..9b8a38133 100644
--- a/gfx/pics/032/anim0.asm
+++ b/gfx/pics/nidoran_m/anim0.asm
diff --git a/gfx/pics/032/anim1.asm b/gfx/pics/nidoran_m/anim1.asm
index 20b437f6a..20b437f6a 100644
--- a/gfx/pics/032/anim1.asm
+++ b/gfx/pics/nidoran_m/anim1.asm
diff --git a/gfx/pics/032/back.lz b/gfx/pics/nidoran_m/back.6x6.2bpp.lz
index 4b3be9a60..4b3be9a60 100644
--- a/gfx/pics/032/back.lz
+++ b/gfx/pics/nidoran_m/back.6x6.2bpp.lz
diff --git a/gfx/pics/032/bitmask.asm b/gfx/pics/nidoran_m/bitmask.asm
index 738e90471..738e90471 100644
--- a/gfx/pics/032/bitmask.asm
+++ b/gfx/pics/nidoran_m/bitmask.asm
diff --git a/gfx/pics/032/frames.asm b/gfx/pics/nidoran_m/frames.asm
index 87b496efc..87b496efc 100644
--- a/gfx/pics/032/frames.asm
+++ b/gfx/pics/nidoran_m/frames.asm
diff --git a/gfx/pics/032/front.lz b/gfx/pics/nidoran_m/front.5x5.2bpp.lz
index 661dadada..661dadada 100644
--- a/gfx/pics/032/front.lz
+++ b/gfx/pics/nidoran_m/front.5x5.2bpp.lz
diff --git a/gfx/pics/032/normal.pal b/gfx/pics/nidoran_m/normal.pal
index 6b057e894..6b057e894 100644
--- a/gfx/pics/032/normal.pal
+++ b/gfx/pics/nidoran_m/normal.pal
diff --git a/gfx/pics/032/shiny.pal b/gfx/pics/nidoran_m/shiny.pal
index 771fd4e31..771fd4e31 100644
--- a/gfx/pics/032/shiny.pal
+++ b/gfx/pics/nidoran_m/shiny.pal
diff --git a/gfx/pics/030/anim0.asm b/gfx/pics/nidorina/anim0.asm
index 6ab079db4..6ab079db4 100644
--- a/gfx/pics/030/anim0.asm
+++ b/gfx/pics/nidorina/anim0.asm
diff --git a/gfx/pics/030/anim1.asm b/gfx/pics/nidorina/anim1.asm
index 6afb1cbc8..6afb1cbc8 100644
--- a/gfx/pics/030/anim1.asm
+++ b/gfx/pics/nidorina/anim1.asm
diff --git a/gfx/pics/030/back.lz b/gfx/pics/nidorina/back.6x6.2bpp.lz
index 141d61f81..141d61f81 100644
--- a/gfx/pics/030/back.lz
+++ b/gfx/pics/nidorina/back.6x6.2bpp.lz
diff --git a/gfx/pics/030/bitmask.asm b/gfx/pics/nidorina/bitmask.asm
index e365847fa..e365847fa 100644
--- a/gfx/pics/030/bitmask.asm
+++ b/gfx/pics/nidorina/bitmask.asm
diff --git a/gfx/pics/030/frames.asm b/gfx/pics/nidorina/frames.asm
index 26ffbea56..26ffbea56 100644
--- a/gfx/pics/030/frames.asm
+++ b/gfx/pics/nidorina/frames.asm
diff --git a/gfx/pics/030/front.lz b/gfx/pics/nidorina/front.6x6.2bpp.lz
index 04523a52b..04523a52b 100644
--- a/gfx/pics/030/front.lz
+++ b/gfx/pics/nidorina/front.6x6.2bpp.lz
diff --git a/gfx/pics/030/normal.pal b/gfx/pics/nidorina/normal.pal
index 917840667..917840667 100644
--- a/gfx/pics/030/normal.pal
+++ b/gfx/pics/nidorina/normal.pal
diff --git a/gfx/pics/030/shiny.pal b/gfx/pics/nidorina/shiny.pal
index ae93e6242..ae93e6242 100644
--- a/gfx/pics/030/shiny.pal
+++ b/gfx/pics/nidorina/shiny.pal
diff --git a/gfx/pics/033/anim0.asm b/gfx/pics/nidorino/anim0.asm
index 16a6cb1dc..16a6cb1dc 100644
--- a/gfx/pics/033/anim0.asm
+++ b/gfx/pics/nidorino/anim0.asm
diff --git a/gfx/pics/033/anim1.asm b/gfx/pics/nidorino/anim1.asm
index 40e17f454..40e17f454 100644
--- a/gfx/pics/033/anim1.asm
+++ b/gfx/pics/nidorino/anim1.asm
diff --git a/gfx/pics/033/back.lz b/gfx/pics/nidorino/back.6x6.2bpp.lz
index 6e6a841e9..6e6a841e9 100644
--- a/gfx/pics/033/back.lz
+++ b/gfx/pics/nidorino/back.6x6.2bpp.lz
diff --git a/gfx/pics/033/bitmask.asm b/gfx/pics/nidorino/bitmask.asm
index fac9808aa..fac9808aa 100644
--- a/gfx/pics/033/bitmask.asm
+++ b/gfx/pics/nidorino/bitmask.asm
diff --git a/gfx/pics/033/frames.asm b/gfx/pics/nidorino/frames.asm
index 3f5dca2ae..3f5dca2ae 100644
--- a/gfx/pics/033/frames.asm
+++ b/gfx/pics/nidorino/frames.asm
diff --git a/gfx/pics/033/front.lz b/gfx/pics/nidorino/front.6x6.2bpp.lz
index 228c93b52..228c93b52 100644
--- a/gfx/pics/033/front.lz
+++ b/gfx/pics/nidorino/front.6x6.2bpp.lz
diff --git a/gfx/pics/033/normal.pal b/gfx/pics/nidorino/normal.pal
index 039e46d34..039e46d34 100644
--- a/gfx/pics/033/normal.pal
+++ b/gfx/pics/nidorino/normal.pal
diff --git a/gfx/pics/033/shiny.pal b/gfx/pics/nidorino/shiny.pal
index b6d2e6fe9..b6d2e6fe9 100644
--- a/gfx/pics/033/shiny.pal
+++ b/gfx/pics/nidorino/shiny.pal
diff --git a/gfx/pics/038/anim0.asm b/gfx/pics/ninetales/anim0.asm
index 0d691ee9d..0d691ee9d 100644
--- a/gfx/pics/038/anim0.asm
+++ b/gfx/pics/ninetales/anim0.asm
diff --git a/gfx/pics/038/anim1.asm b/gfx/pics/ninetales/anim1.asm
index 68d1e8051..68d1e8051 100644
--- a/gfx/pics/038/anim1.asm
+++ b/gfx/pics/ninetales/anim1.asm
diff --git a/gfx/pics/038/back.lz b/gfx/pics/ninetales/back.6x6.2bpp.lz
index e6b264033..e6b264033 100644
--- a/gfx/pics/038/back.lz
+++ b/gfx/pics/ninetales/back.6x6.2bpp.lz
diff --git a/gfx/pics/038/bitmask.asm b/gfx/pics/ninetales/bitmask.asm
index 434f61e97..434f61e97 100644
--- a/gfx/pics/038/bitmask.asm
+++ b/gfx/pics/ninetales/bitmask.asm
diff --git a/gfx/pics/038/frames.asm b/gfx/pics/ninetales/frames.asm
index 90c846aa2..90c846aa2 100644
--- a/gfx/pics/038/frames.asm
+++ b/gfx/pics/ninetales/frames.asm
diff --git a/gfx/pics/038/front.lz b/gfx/pics/ninetales/front.7x7.2bpp.lz
index 4865c6d82..4865c6d82 100644
--- a/gfx/pics/038/front.lz
+++ b/gfx/pics/ninetales/front.7x7.2bpp.lz
diff --git a/gfx/pics/038/normal.pal b/gfx/pics/ninetales/normal.pal
index 54de8db00..54de8db00 100644
--- a/gfx/pics/038/normal.pal
+++ b/gfx/pics/ninetales/normal.pal
diff --git a/gfx/pics/038/shiny.pal b/gfx/pics/ninetales/shiny.pal
index 6b0dafcc8..6b0dafcc8 100644
--- a/gfx/pics/038/shiny.pal
+++ b/gfx/pics/ninetales/shiny.pal
diff --git a/gfx/pics/164/anim0.asm b/gfx/pics/noctowl/anim0.asm
index ce19c30a5..ce19c30a5 100644
--- a/gfx/pics/164/anim0.asm
+++ b/gfx/pics/noctowl/anim0.asm
diff --git a/gfx/pics/164/anim1.asm b/gfx/pics/noctowl/anim1.asm
index 4fe81f336..4fe81f336 100644
--- a/gfx/pics/164/anim1.asm
+++ b/gfx/pics/noctowl/anim1.asm
diff --git a/gfx/pics/164/back.lz b/gfx/pics/noctowl/back.6x6.2bpp.lz
index 9ef83c86e..9ef83c86e 100644
--- a/gfx/pics/164/back.lz
+++ b/gfx/pics/noctowl/back.6x6.2bpp.lz
diff --git a/gfx/pics/164/bitmask.asm b/gfx/pics/noctowl/bitmask.asm
index 231f4dbd5..231f4dbd5 100644
--- a/gfx/pics/164/bitmask.asm
+++ b/gfx/pics/noctowl/bitmask.asm
diff --git a/gfx/pics/164/frames.asm b/gfx/pics/noctowl/frames.asm
index 86b15a845..86b15a845 100644
--- a/gfx/pics/164/frames.asm
+++ b/gfx/pics/noctowl/frames.asm
diff --git a/gfx/pics/164/front.lz b/gfx/pics/noctowl/front.7x7.2bpp.lz
index cd0d1313b..cd0d1313b 100644
--- a/gfx/pics/164/front.lz
+++ b/gfx/pics/noctowl/front.7x7.2bpp.lz
diff --git a/gfx/pics/164/normal.pal b/gfx/pics/noctowl/normal.pal
index 93785d70f..93785d70f 100644
--- a/gfx/pics/164/normal.pal
+++ b/gfx/pics/noctowl/normal.pal
diff --git a/gfx/pics/164/shiny.pal b/gfx/pics/noctowl/shiny.pal
index d53a230e7..d53a230e7 100644
--- a/gfx/pics/164/shiny.pal
+++ b/gfx/pics/noctowl/shiny.pal
diff --git a/gfx/pics/224/anim0.asm b/gfx/pics/octillery/anim0.asm
index 2405d46a1..2405d46a1 100644
--- a/gfx/pics/224/anim0.asm
+++ b/gfx/pics/octillery/anim0.asm
diff --git a/gfx/pics/224/anim1.asm b/gfx/pics/octillery/anim1.asm
index 0903a867a..0903a867a 100644
--- a/gfx/pics/224/anim1.asm
+++ b/gfx/pics/octillery/anim1.asm
diff --git a/gfx/pics/224/back.lz b/gfx/pics/octillery/back.6x6.2bpp.lz
index 2d12597ca..2d12597ca 100644
--- a/gfx/pics/224/back.lz
+++ b/gfx/pics/octillery/back.6x6.2bpp.lz
diff --git a/gfx/pics/224/bitmask.asm b/gfx/pics/octillery/bitmask.asm
index 904bdcd1f..904bdcd1f 100644
--- a/gfx/pics/224/bitmask.asm
+++ b/gfx/pics/octillery/bitmask.asm
diff --git a/gfx/pics/224/frames.asm b/gfx/pics/octillery/frames.asm
index ebfdd43ae..ebfdd43ae 100644
--- a/gfx/pics/224/frames.asm
+++ b/gfx/pics/octillery/frames.asm
diff --git a/gfx/pics/224/front.lz b/gfx/pics/octillery/front.6x6.2bpp.lz
index 9ffec9b38..9ffec9b38 100644
--- a/gfx/pics/224/front.lz
+++ b/gfx/pics/octillery/front.6x6.2bpp.lz
diff --git a/gfx/pics/224/normal.pal b/gfx/pics/octillery/normal.pal
index 8073454d1..8073454d1 100644
--- a/gfx/pics/224/normal.pal
+++ b/gfx/pics/octillery/normal.pal
diff --git a/gfx/pics/224/shiny.pal b/gfx/pics/octillery/shiny.pal
index a5bdc9b71..a5bdc9b71 100644
--- a/gfx/pics/224/shiny.pal
+++ b/gfx/pics/octillery/shiny.pal
diff --git a/gfx/pics/043/anim0.asm b/gfx/pics/oddish/anim0.asm
index 338771fce..338771fce 100644
--- a/gfx/pics/043/anim0.asm
+++ b/gfx/pics/oddish/anim0.asm
diff --git a/gfx/pics/043/anim1.asm b/gfx/pics/oddish/anim1.asm
index 92d041ff5..92d041ff5 100644
--- a/gfx/pics/043/anim1.asm
+++ b/gfx/pics/oddish/anim1.asm
diff --git a/gfx/pics/043/back.lz b/gfx/pics/oddish/back.6x6.2bpp.lz
index 81ba4e5f3..81ba4e5f3 100644
--- a/gfx/pics/043/back.lz
+++ b/gfx/pics/oddish/back.6x6.2bpp.lz
diff --git a/gfx/pics/043/bitmask.asm b/gfx/pics/oddish/bitmask.asm
index d9d298ed4..d9d298ed4 100644
--- a/gfx/pics/043/bitmask.asm
+++ b/gfx/pics/oddish/bitmask.asm
diff --git a/gfx/pics/043/frames.asm b/gfx/pics/oddish/frames.asm
index 96561fe6d..96561fe6d 100644
--- a/gfx/pics/043/frames.asm
+++ b/gfx/pics/oddish/frames.asm
diff --git a/gfx/pics/043/front.lz b/gfx/pics/oddish/front.5x5.2bpp.lz
index 3864c0b7a..3864c0b7a 100644
--- a/gfx/pics/043/front.lz
+++ b/gfx/pics/oddish/front.5x5.2bpp.lz
diff --git a/gfx/pics/043/normal.pal b/gfx/pics/oddish/normal.pal
index 9371027e6..9371027e6 100644
--- a/gfx/pics/043/normal.pal
+++ b/gfx/pics/oddish/normal.pal
diff --git a/gfx/pics/043/shiny.pal b/gfx/pics/oddish/shiny.pal
index 6e1d339b4..6e1d339b4 100644
--- a/gfx/pics/043/shiny.pal
+++ b/gfx/pics/oddish/shiny.pal
diff --git a/gfx/pics/138/anim0.asm b/gfx/pics/omanyte/anim0.asm
index 5863efecc..5863efecc 100644
--- a/gfx/pics/138/anim0.asm
+++ b/gfx/pics/omanyte/anim0.asm
diff --git a/gfx/pics/138/anim1.asm b/gfx/pics/omanyte/anim1.asm
index ffdce5abd..ffdce5abd 100644
--- a/gfx/pics/138/anim1.asm
+++ b/gfx/pics/omanyte/anim1.asm
diff --git a/gfx/pics/138/back.lz b/gfx/pics/omanyte/back.6x6.2bpp.lz
index 0ee462eaf..0ee462eaf 100644
--- a/gfx/pics/138/back.lz
+++ b/gfx/pics/omanyte/back.6x6.2bpp.lz
diff --git a/gfx/pics/138/bitmask.asm b/gfx/pics/omanyte/bitmask.asm
index c0f074898..c0f074898 100644
--- a/gfx/pics/138/bitmask.asm
+++ b/gfx/pics/omanyte/bitmask.asm
diff --git a/gfx/pics/138/frames.asm b/gfx/pics/omanyte/frames.asm
index 525d1d93c..525d1d93c 100644
--- a/gfx/pics/138/frames.asm
+++ b/gfx/pics/omanyte/frames.asm
diff --git a/gfx/pics/138/front.lz b/gfx/pics/omanyte/front.5x5.2bpp.lz
index 7673b2390..7673b2390 100644
--- a/gfx/pics/138/front.lz
+++ b/gfx/pics/omanyte/front.5x5.2bpp.lz
diff --git a/gfx/pics/138/normal.pal b/gfx/pics/omanyte/normal.pal
index b0df7149b..b0df7149b 100644
--- a/gfx/pics/138/normal.pal
+++ b/gfx/pics/omanyte/normal.pal
diff --git a/gfx/pics/138/shiny.pal b/gfx/pics/omanyte/shiny.pal
index cc1531b57..cc1531b57 100644
--- a/gfx/pics/138/shiny.pal
+++ b/gfx/pics/omanyte/shiny.pal
diff --git a/gfx/pics/139/anim0.asm b/gfx/pics/omastar/anim0.asm
index 76d8c3aa8..76d8c3aa8 100644
--- a/gfx/pics/139/anim0.asm
+++ b/gfx/pics/omastar/anim0.asm
diff --git a/gfx/pics/139/anim1.asm b/gfx/pics/omastar/anim1.asm
index 60bcf04d2..60bcf04d2 100644
--- a/gfx/pics/139/anim1.asm
+++ b/gfx/pics/omastar/anim1.asm
diff --git a/gfx/pics/139/back.lz b/gfx/pics/omastar/back.6x6.2bpp.lz
index b41a828c5..b41a828c5 100644
--- a/gfx/pics/139/back.lz
+++ b/gfx/pics/omastar/back.6x6.2bpp.lz
diff --git a/gfx/pics/139/bitmask.asm b/gfx/pics/omastar/bitmask.asm
index abc37f8f8..abc37f8f8 100644
--- a/gfx/pics/139/bitmask.asm
+++ b/gfx/pics/omastar/bitmask.asm
diff --git a/gfx/pics/139/frames.asm b/gfx/pics/omastar/frames.asm
index 92ef4b589..92ef4b589 100644
--- a/gfx/pics/139/frames.asm
+++ b/gfx/pics/omastar/frames.asm
diff --git a/gfx/pics/139/front.lz b/gfx/pics/omastar/front.6x6.2bpp.lz
index 544e2d87b..544e2d87b 100644
--- a/gfx/pics/139/front.lz
+++ b/gfx/pics/omastar/front.6x6.2bpp.lz
diff --git a/gfx/pics/139/normal.pal b/gfx/pics/omastar/normal.pal
index b0df7149b..b0df7149b 100644
--- a/gfx/pics/139/normal.pal
+++ b/gfx/pics/omastar/normal.pal
diff --git a/gfx/pics/139/shiny.pal b/gfx/pics/omastar/shiny.pal
index 2b8017338..2b8017338 100644
--- a/gfx/pics/139/shiny.pal
+++ b/gfx/pics/omastar/shiny.pal
diff --git a/gfx/pics/095/anim0.asm b/gfx/pics/onix/anim0.asm
index a5b18f5b6..a5b18f5b6 100644
--- a/gfx/pics/095/anim0.asm
+++ b/gfx/pics/onix/anim0.asm
diff --git a/gfx/pics/095/anim1.asm b/gfx/pics/onix/anim1.asm
index e4ae7acac..e4ae7acac 100644
--- a/gfx/pics/095/anim1.asm
+++ b/gfx/pics/onix/anim1.asm
diff --git a/gfx/pics/095/back.lz b/gfx/pics/onix/back.6x6.2bpp.lz
index 05df1a96b..05df1a96b 100644
--- a/gfx/pics/095/back.lz
+++ b/gfx/pics/onix/back.6x6.2bpp.lz
diff --git a/gfx/pics/095/bitmask.asm b/gfx/pics/onix/bitmask.asm
index 20de1aacf..20de1aacf 100644
--- a/gfx/pics/095/bitmask.asm
+++ b/gfx/pics/onix/bitmask.asm
diff --git a/gfx/pics/095/frames.asm b/gfx/pics/onix/frames.asm
index 4ed313016..4ed313016 100644
--- a/gfx/pics/095/frames.asm
+++ b/gfx/pics/onix/frames.asm
diff --git a/gfx/pics/095/front.lz b/gfx/pics/onix/front.7x7.2bpp.lz
index dc3bfca6e..dc3bfca6e 100644
--- a/gfx/pics/095/front.lz
+++ b/gfx/pics/onix/front.7x7.2bpp.lz
diff --git a/gfx/pics/095/normal.pal b/gfx/pics/onix/normal.pal
index 2b8c1b6b9..2b8c1b6b9 100644
--- a/gfx/pics/095/normal.pal
+++ b/gfx/pics/onix/normal.pal
diff --git a/gfx/pics/095/shiny.pal b/gfx/pics/onix/shiny.pal
index 66935962c..66935962c 100644
--- a/gfx/pics/095/shiny.pal
+++ b/gfx/pics/onix/shiny.pal
diff --git a/gfx/pics/palette_pointers.asm b/gfx/pics/palette_pointers.asm
index 17b586109..880cc6731 100644
--- a/gfx/pics/palette_pointers.asm
+++ b/gfx/pics/palette_pointers.asm
@@ -1,507 +1,507 @@
 PokemonPalettes: ; a8d6
 
-BulbasaurPalette:       INCLUDE "gfx/pics/001/normal.pal"
-BulbasaurShinyPalette:  INCLUDE "gfx/pics/001/shiny.pal"
-IvysaurPalette:         INCLUDE "gfx/pics/002/normal.pal"
-IvysaurShinyPalette:    INCLUDE "gfx/pics/002/shiny.pal"
-VenusaurPalette:        INCLUDE "gfx/pics/003/normal.pal"
-VenusaurShinyPalette:   INCLUDE "gfx/pics/003/shiny.pal"
-CharmanderPalette:      INCLUDE "gfx/pics/004/normal.pal"
-CharmanderShinyPalette: INCLUDE "gfx/pics/004/shiny.pal"
-CharmeleonPalette:      INCLUDE "gfx/pics/005/normal.pal"
-CharmeleonShinyPalette: INCLUDE "gfx/pics/005/shiny.pal"
-CharizardPalette:       INCLUDE "gfx/pics/006/normal.pal"
-CharizardShinyPalette:  INCLUDE "gfx/pics/006/shiny.pal"
-SquirtlePalette:        INCLUDE "gfx/pics/007/normal.pal"
-SquirtleShinyPalette:   INCLUDE "gfx/pics/007/shiny.pal"
-WartortlePalette:       INCLUDE "gfx/pics/008/normal.pal"
-WartortleShinyPalette:  INCLUDE "gfx/pics/008/shiny.pal"
-BlastoisePalette:       INCLUDE "gfx/pics/009/normal.pal"
-BlastoiseShinyPalette:  INCLUDE "gfx/pics/009/shiny.pal"
-CaterpiePalette:        INCLUDE "gfx/pics/010/normal.pal"
-CaterpieShinyPalette:   INCLUDE "gfx/pics/010/shiny.pal"
-MetapodPalette:         INCLUDE "gfx/pics/011/normal.pal"
-MetapodShinyPalette:    INCLUDE "gfx/pics/011/shiny.pal"
-ButterfreePalette:      INCLUDE "gfx/pics/012/normal.pal"
-ButterfreeShinyPalette: INCLUDE "gfx/pics/012/shiny.pal"
-WeedlePalette:          INCLUDE "gfx/pics/013/normal.pal"
-WeedleShinyPalette:     INCLUDE "gfx/pics/013/shiny.pal"
-KakunaPalette:          INCLUDE "gfx/pics/014/normal.pal"
-KakunaShinyPalette:     INCLUDE "gfx/pics/014/shiny.pal"
-BeedrillPalette:        INCLUDE "gfx/pics/015/normal.pal"
-BeedrillShinyPalette:   INCLUDE "gfx/pics/015/shiny.pal"
-PidgeyPalette:          INCLUDE "gfx/pics/016/normal.pal"
-PidgeyShinyPalette:     INCLUDE "gfx/pics/016/shiny.pal"
-PidgeottoPalette:       INCLUDE "gfx/pics/017/normal.pal"
-PidgeottoShinyPalette:  INCLUDE "gfx/pics/017/shiny.pal"
-PidgeotPalette:         INCLUDE "gfx/pics/018/normal.pal"
-PidgeotShinyPalette:    INCLUDE "gfx/pics/018/shiny.pal"
-RattataPalette:         INCLUDE "gfx/pics/019/normal.pal"
-RattataShinyPalette:    INCLUDE "gfx/pics/019/shiny.pal"
-RaticatePalette:        INCLUDE "gfx/pics/020/normal.pal"
-RaticateShinyPalette:   INCLUDE "gfx/pics/020/shiny.pal"
-SpearowPalette:         INCLUDE "gfx/pics/021/normal.pal"
-SpearowShinyPalette:    INCLUDE "gfx/pics/021/shiny.pal"
-FearowPalette:          INCLUDE "gfx/pics/022/normal.pal"
-FearowShinyPalette:     INCLUDE "gfx/pics/022/shiny.pal"
-EkansPalette:           INCLUDE "gfx/pics/023/normal.pal"
-EkansShinyPalette:      INCLUDE "gfx/pics/023/shiny.pal"
-ArbokPalette:           INCLUDE "gfx/pics/024/normal.pal"
-ArbokShinyPalette:      INCLUDE "gfx/pics/024/shiny.pal"
-PikachuPalette:         INCLUDE "gfx/pics/025/normal.pal"
-PikachuShinyPalette:    INCLUDE "gfx/pics/025/shiny.pal"
-RaichuPalette:          INCLUDE "gfx/pics/026/normal.pal"
-RaichuShinyPalette:     INCLUDE "gfx/pics/026/shiny.pal"
-SandshrewPalette:       INCLUDE "gfx/pics/027/normal.pal"
-SandshrewShinyPalette:  INCLUDE "gfx/pics/027/shiny.pal"
-SandslashPalette:       INCLUDE "gfx/pics/028/normal.pal"
-SandslashShinyPalette:  INCLUDE "gfx/pics/028/shiny.pal"
-NidoranFPalette:        INCLUDE "gfx/pics/029/normal.pal"
-NidoranFShinyPalette:   INCLUDE "gfx/pics/029/shiny.pal"
-NidorinaPalette:        INCLUDE "gfx/pics/030/normal.pal"
-NidorinaShinyPalette:   INCLUDE "gfx/pics/030/shiny.pal"
-NidoqueenPalette:       INCLUDE "gfx/pics/031/normal.pal"
-NidoqueenShinyPalette:  INCLUDE "gfx/pics/031/shiny.pal"
-NidoranMPalette:        INCLUDE "gfx/pics/032/normal.pal"
-NidoranMShinyPalette:   INCLUDE "gfx/pics/032/shiny.pal"
-NidorinoPalette:        INCLUDE "gfx/pics/033/normal.pal"
-NidorinoShinyPalette:   INCLUDE "gfx/pics/033/shiny.pal"
-NidokingPalette:        INCLUDE "gfx/pics/034/normal.pal"
-NidokingShinyPalette:   INCLUDE "gfx/pics/034/shiny.pal"
-ClefairyPalette:        INCLUDE "gfx/pics/035/normal.pal"
-ClefairyShinyPalette:   INCLUDE "gfx/pics/035/shiny.pal"
-ClefablePalette:        INCLUDE "gfx/pics/036/normal.pal"
-ClefableShinyPalette:   INCLUDE "gfx/pics/036/shiny.pal"
-VulpixPalette:          INCLUDE "gfx/pics/037/normal.pal"
-VulpixShinyPalette:     INCLUDE "gfx/pics/037/shiny.pal"
-NinetalesPalette:       INCLUDE "gfx/pics/038/normal.pal"
-NinetalesShinyPalette:  INCLUDE "gfx/pics/038/shiny.pal"
-JigglypuffPalette:      INCLUDE "gfx/pics/039/normal.pal"
-JigglypuffShinyPalette: INCLUDE "gfx/pics/039/shiny.pal"
-WigglytuffPalette:      INCLUDE "gfx/pics/040/normal.pal"
-WigglytuffShinyPalette: INCLUDE "gfx/pics/040/shiny.pal"
-ZubatPalette:           INCLUDE "gfx/pics/041/normal.pal"
-ZubatShinyPalette:      INCLUDE "gfx/pics/041/shiny.pal"
-GolbatPalette:          INCLUDE "gfx/pics/042/normal.pal"
-GolbatShinyPalette:     INCLUDE "gfx/pics/042/shiny.pal"
-OddishPalette:          INCLUDE "gfx/pics/043/normal.pal"
-OddishShinyPalette:     INCLUDE "gfx/pics/043/shiny.pal"
-GloomPalette:           INCLUDE "gfx/pics/044/normal.pal"
-GloomShinyPalette:      INCLUDE "gfx/pics/044/shiny.pal"
-VileplumePalette:       INCLUDE "gfx/pics/045/normal.pal"
-VileplumeShinyPalette:  INCLUDE "gfx/pics/045/shiny.pal"
-ParasPalette:           INCLUDE "gfx/pics/046/normal.pal"
-ParasShinyPalette:      INCLUDE "gfx/pics/046/shiny.pal"
-ParasectPalette:        INCLUDE "gfx/pics/047/normal.pal"
-ParasectShinyPalette:   INCLUDE "gfx/pics/047/shiny.pal"
-VenonatPalette:         INCLUDE "gfx/pics/048/normal.pal"
-VenonatShinyPalette:    INCLUDE "gfx/pics/048/shiny.pal"
-VenomothPalette:        INCLUDE "gfx/pics/049/normal.pal"
-VenomothShinyPalette:   INCLUDE "gfx/pics/049/shiny.pal"
-DiglettPalette:         INCLUDE "gfx/pics/050/normal.pal"
-DiglettShinyPalette:    INCLUDE "gfx/pics/050/shiny.pal"
-DugtrioPalette:         INCLUDE "gfx/pics/051/normal.pal"
-DugtrioShinyPalette:    INCLUDE "gfx/pics/051/shiny.pal"
-MeowthPalette:          INCLUDE "gfx/pics/052/normal.pal"
-MeowthShinyPalette:     INCLUDE "gfx/pics/052/shiny.pal"
-PersianPalette:         INCLUDE "gfx/pics/053/normal.pal"
-PersianShinyPalette:    INCLUDE "gfx/pics/053/shiny.pal"
-PsyduckPalette:         INCLUDE "gfx/pics/054/normal.pal"
-PsyduckShinyPalette:    INCLUDE "gfx/pics/054/shiny.pal"
-GolduckPalette:         INCLUDE "gfx/pics/055/normal.pal"
-GolduckShinyPalette:    INCLUDE "gfx/pics/055/shiny.pal"
-MankeyPalette:          INCLUDE "gfx/pics/056/normal.pal"
-MankeyShinyPalette:     INCLUDE "gfx/pics/056/shiny.pal"
-PrimeapePalette:        INCLUDE "gfx/pics/057/normal.pal"
-PrimeapeShinyPalette:   INCLUDE "gfx/pics/057/shiny.pal"
-GrowlithePalette:       INCLUDE "gfx/pics/058/normal.pal"
-GrowlitheShinyPalette:  INCLUDE "gfx/pics/058/shiny.pal"
-ArcaninePalette:        INCLUDE "gfx/pics/059/normal.pal"
-ArcanineShinyPalette:   INCLUDE "gfx/pics/059/shiny.pal"
-PoliwagPalette:         INCLUDE "gfx/pics/060/normal.pal"
-PoliwagShinyPalette:    INCLUDE "gfx/pics/060/shiny.pal"
-PoliwhirlPalette:       INCLUDE "gfx/pics/061/normal.pal"
-PoliwhirlShinyPalette:  INCLUDE "gfx/pics/061/shiny.pal"
-PoliwrathPalette:       INCLUDE "gfx/pics/062/normal.pal"
-PoliwrathShinyPalette:  INCLUDE "gfx/pics/062/shiny.pal"
-AbraPalette:            INCLUDE "gfx/pics/063/normal.pal"
-AbraShinyPalette:       INCLUDE "gfx/pics/063/shiny.pal"
-KadabraPalette:         INCLUDE "gfx/pics/064/normal.pal"
-KadabraShinyPalette:    INCLUDE "gfx/pics/064/shiny.pal"
-AlakazamPalette:        INCLUDE "gfx/pics/065/normal.pal"
-AlakazamShinyPalette:   INCLUDE "gfx/pics/065/shiny.pal"
-MachopPalette:          INCLUDE "gfx/pics/066/normal.pal"
-MachopShinyPalette:     INCLUDE "gfx/pics/066/shiny.pal"
-MachokePalette:         INCLUDE "gfx/pics/067/normal.pal"
-MachokeShinyPalette:    INCLUDE "gfx/pics/067/shiny.pal"
-MachampPalette:         INCLUDE "gfx/pics/068/normal.pal"
-MachampShinyPalette:    INCLUDE "gfx/pics/068/shiny.pal"
-BellsproutPalette:      INCLUDE "gfx/pics/069/normal.pal"
-BellsproutShinyPalette: INCLUDE "gfx/pics/069/shiny.pal"
-WeepinbellPalette:      INCLUDE "gfx/pics/070/normal.pal"
-WeepinbellShinyPalette: INCLUDE "gfx/pics/070/shiny.pal"
-VictreebelPalette:      INCLUDE "gfx/pics/071/normal.pal"
-VictreebelShinyPalette: INCLUDE "gfx/pics/071/shiny.pal"
-TentacoolPalette:       INCLUDE "gfx/pics/072/normal.pal"
-TentacoolShinyPalette:  INCLUDE "gfx/pics/072/shiny.pal"
-TentacruelPalette:      INCLUDE "gfx/pics/073/normal.pal"
-TentacruelShinyPalette: INCLUDE "gfx/pics/073/shiny.pal"
-GeodudePalette:         INCLUDE "gfx/pics/074/normal.pal"
-GeodudeShinyPalette:    INCLUDE "gfx/pics/074/shiny.pal"
-GravelerPalette:        INCLUDE "gfx/pics/075/normal.pal"
-GravelerShinyPalette:   INCLUDE "gfx/pics/075/shiny.pal"
-GolemPalette:           INCLUDE "gfx/pics/076/normal.pal"
-GolemShinyPalette:      INCLUDE "gfx/pics/076/shiny.pal"
-PonytaPalette:          INCLUDE "gfx/pics/077/normal.pal"
-PonytaShinyPalette:     INCLUDE "gfx/pics/077/shiny.pal"
-RapidashPalette:        INCLUDE "gfx/pics/078/normal.pal"
-RapidashShinyPalette:   INCLUDE "gfx/pics/078/shiny.pal"
-SlowpokePalette:        INCLUDE "gfx/pics/079/normal.pal"
-SlowpokeShinyPalette:   INCLUDE "gfx/pics/079/shiny.pal"
-SlowbroPalette:         INCLUDE "gfx/pics/080/normal.pal"
-SlowbroShinyPalette:    INCLUDE "gfx/pics/080/shiny.pal"
-MagnemitePalette:       INCLUDE "gfx/pics/081/normal.pal"
-MagnemiteShinyPalette:  INCLUDE "gfx/pics/081/shiny.pal"
-MagnetonPalette:        INCLUDE "gfx/pics/082/normal.pal"
-MagnetonShinyPalette:   INCLUDE "gfx/pics/082/shiny.pal"
-FarfetchDPalette:       INCLUDE "gfx/pics/083/normal.pal"
-FarfetchDShinyPalette:  INCLUDE "gfx/pics/083/shiny.pal"
-DoduoPalette:           INCLUDE "gfx/pics/084/normal.pal"
-DoduoShinyPalette:      INCLUDE "gfx/pics/084/shiny.pal"
-DodrioPalette:          INCLUDE "gfx/pics/085/normal.pal"
-DodrioShinyPalette:     INCLUDE "gfx/pics/085/shiny.pal"
-SeelPalette:            INCLUDE "gfx/pics/086/normal.pal"
-SeelShinyPalette:       INCLUDE "gfx/pics/086/shiny.pal"
-DewgongPalette:         INCLUDE "gfx/pics/087/normal.pal"
-DewgongShinyPalette:    INCLUDE "gfx/pics/087/shiny.pal"
-GrimerPalette:          INCLUDE "gfx/pics/088/normal.pal"
-GrimerShinyPalette:     INCLUDE "gfx/pics/088/shiny.pal"
-MukPalette:             INCLUDE "gfx/pics/089/normal.pal"
-MukShinyPalette:        INCLUDE "gfx/pics/089/shiny.pal"
-ShellderPalette:        INCLUDE "gfx/pics/090/normal.pal"
-ShellderShinyPalette:   INCLUDE "gfx/pics/090/shiny.pal"
-CloysterPalette:        INCLUDE "gfx/pics/091/normal.pal"
-CloysterShinyPalette:   INCLUDE "gfx/pics/091/shiny.pal"
-GastlyPalette:          INCLUDE "gfx/pics/092/normal.pal"
-GastlyShinyPalette:     INCLUDE "gfx/pics/092/shiny.pal"
-HaunterPalette:         INCLUDE "gfx/pics/093/normal.pal"
-HaunterShinyPalette:    INCLUDE "gfx/pics/093/shiny.pal"
-GengarPalette:          INCLUDE "gfx/pics/094/normal.pal"
-GengarShinyPalette:     INCLUDE "gfx/pics/094/shiny.pal"
-OnixPalette:            INCLUDE "gfx/pics/095/normal.pal"
-OnixShinyPalette:       INCLUDE "gfx/pics/095/shiny.pal"
-DrowzeePalette:         INCLUDE "gfx/pics/096/normal.pal"
-DrowzeeShinyPalette:    INCLUDE "gfx/pics/096/shiny.pal"
-HypnoPalette:           INCLUDE "gfx/pics/097/normal.pal"
-HypnoShinyPalette:      INCLUDE "gfx/pics/097/shiny.pal"
-KrabbyPalette:          INCLUDE "gfx/pics/098/normal.pal"
-KrabbyShinyPalette:     INCLUDE "gfx/pics/098/shiny.pal"
-KinglerPalette:         INCLUDE "gfx/pics/099/normal.pal"
-KinglerShinyPalette:    INCLUDE "gfx/pics/099/shiny.pal"
-VoltorbPalette:         INCLUDE "gfx/pics/100/normal.pal"
-VoltorbShinyPalette:    INCLUDE "gfx/pics/100/shiny.pal"
-ElectrodePalette:       INCLUDE "gfx/pics/101/normal.pal"
-ElectrodeShinyPalette:  INCLUDE "gfx/pics/101/shiny.pal"
-ExeggcutePalette:       INCLUDE "gfx/pics/102/normal.pal"
-ExeggcuteShinyPalette:  INCLUDE "gfx/pics/102/shiny.pal"
-ExeggutorPalette:       INCLUDE "gfx/pics/103/normal.pal"
-ExeggutorShinyPalette:  INCLUDE "gfx/pics/103/shiny.pal"
-CubonePalette:          INCLUDE "gfx/pics/104/normal.pal"
-CuboneShinyPalette:     INCLUDE "gfx/pics/104/shiny.pal"
-MarowakPalette:         INCLUDE "gfx/pics/105/normal.pal"
-MarowakShinyPalette:    INCLUDE "gfx/pics/105/shiny.pal"
-HitmonleePalette:       INCLUDE "gfx/pics/106/normal.pal"
-HitmonleeShinyPalette:  INCLUDE "gfx/pics/106/shiny.pal"
-HitmonchanPalette:      INCLUDE "gfx/pics/107/normal.pal"
-HitmonchanShinyPalette: INCLUDE "gfx/pics/107/shiny.pal"
-LickitungPalette:       INCLUDE "gfx/pics/108/normal.pal"
-LickitungShinyPalette:  INCLUDE "gfx/pics/108/shiny.pal"
-KoffingPalette:         INCLUDE "gfx/pics/109/normal.pal"
-KoffingShinyPalette:    INCLUDE "gfx/pics/109/shiny.pal"
-WeezingPalette:         INCLUDE "gfx/pics/110/normal.pal"
-WeezingShinyPalette:    INCLUDE "gfx/pics/110/shiny.pal"
-RhyhornPalette:         INCLUDE "gfx/pics/111/normal.pal"
-RhyhornShinyPalette:    INCLUDE "gfx/pics/111/shiny.pal"
-RhydonPalette:          INCLUDE "gfx/pics/112/normal.pal"
-RhydonShinyPalette:     INCLUDE "gfx/pics/112/shiny.pal"
-ChanseyPalette:         INCLUDE "gfx/pics/113/normal.pal"
-ChanseyShinyPalette:    INCLUDE "gfx/pics/113/shiny.pal"
-TangelaPalette:         INCLUDE "gfx/pics/114/normal.pal"
-TangelaShinyPalette:    INCLUDE "gfx/pics/114/shiny.pal"
-KangaskhanPalette:      INCLUDE "gfx/pics/115/normal.pal"
-KangaskhanShinyPalette: INCLUDE "gfx/pics/115/shiny.pal"
-HorseaPalette:          INCLUDE "gfx/pics/116/normal.pal"
-HorseaShinyPalette:     INCLUDE "gfx/pics/116/shiny.pal"
-SeadraPalette:          INCLUDE "gfx/pics/117/normal.pal"
-SeadraShinyPalette:     INCLUDE "gfx/pics/117/shiny.pal"
-GoldeenPalette:         INCLUDE "gfx/pics/118/normal.pal"
-GoldeenShinyPalette:    INCLUDE "gfx/pics/118/shiny.pal"
-SeakingPalette:         INCLUDE "gfx/pics/119/normal.pal"
-SeakingShinyPalette:    INCLUDE "gfx/pics/119/shiny.pal"
-StaryuPalette:          INCLUDE "gfx/pics/120/normal.pal"
-StaryuShinyPalette:     INCLUDE "gfx/pics/120/shiny.pal"
-StarmiePalette:         INCLUDE "gfx/pics/121/normal.pal"
-StarmieShinyPalette:    INCLUDE "gfx/pics/121/shiny.pal"
-MrMimePalette:          INCLUDE "gfx/pics/122/normal.pal"
-MrMimeShinyPalette:     INCLUDE "gfx/pics/122/shiny.pal"
-ScytherPalette:         INCLUDE "gfx/pics/123/normal.pal"
-ScytherShinyPalette:    INCLUDE "gfx/pics/123/shiny.pal"
-JynxPalette:            INCLUDE "gfx/pics/124/normal.pal"
-JynxShinyPalette:       INCLUDE "gfx/pics/124/shiny.pal"
-ElectabuzzPalette:      INCLUDE "gfx/pics/125/normal.pal"
-ElectabuzzShinyPalette: INCLUDE "gfx/pics/125/shiny.pal"
-MagmarPalette:          INCLUDE "gfx/pics/126/normal.pal"
-MagmarShinyPalette:     INCLUDE "gfx/pics/126/shiny.pal"
-PinsirPalette:          INCLUDE "gfx/pics/127/normal.pal"
-PinsirShinyPalette:     INCLUDE "gfx/pics/127/shiny.pal"
-TaurosPalette:          INCLUDE "gfx/pics/128/normal.pal"
-TaurosShinyPalette:     INCLUDE "gfx/pics/128/shiny.pal"
-MagikarpPalette:        INCLUDE "gfx/pics/129/normal.pal"
-MagikarpShinyPalette:   INCLUDE "gfx/pics/129/shiny.pal"
-GyaradosPalette:        INCLUDE "gfx/pics/130/normal.pal"
-GyaradosShinyPalette:   INCLUDE "gfx/pics/130/shiny.pal"
-LaprasPalette:          INCLUDE "gfx/pics/131/normal.pal"
-LaprasShinyPalette:     INCLUDE "gfx/pics/131/shiny.pal"
-DittoPalette:           INCLUDE "gfx/pics/132/normal.pal"
-DittoShinyPalette:      INCLUDE "gfx/pics/132/shiny.pal"
-EeveePalette:           INCLUDE "gfx/pics/133/normal.pal"
-EeveeShinyPalette:      INCLUDE "gfx/pics/133/shiny.pal"
-VaporeonPalette:        INCLUDE "gfx/pics/134/normal.pal"
-VaporeonShinyPalette:   INCLUDE "gfx/pics/134/shiny.pal"
-JolteonPalette:         INCLUDE "gfx/pics/135/normal.pal"
-JolteonShinyPalette:    INCLUDE "gfx/pics/135/shiny.pal"
-FlareonPalette:         INCLUDE "gfx/pics/136/normal.pal"
-FlareonShinyPalette:    INCLUDE "gfx/pics/136/shiny.pal"
-PorygonPalette:         INCLUDE "gfx/pics/137/normal.pal"
-PorygonShinyPalette:    INCLUDE "gfx/pics/137/shiny.pal"
-OmanytePalette:         INCLUDE "gfx/pics/138/normal.pal"
-OmanyteShinyPalette:    INCLUDE "gfx/pics/138/shiny.pal"
-OmastarPalette:         INCLUDE "gfx/pics/139/normal.pal"
-OmastarShinyPalette:    INCLUDE "gfx/pics/139/shiny.pal"
-KabutoPalette:          INCLUDE "gfx/pics/140/normal.pal"
-KabutoShinyPalette:     INCLUDE "gfx/pics/140/shiny.pal"
-KabutopsPalette:        INCLUDE "gfx/pics/141/normal.pal"
-KabutopsShinyPalette:   INCLUDE "gfx/pics/141/shiny.pal"
-AerodactylPalette:      INCLUDE "gfx/pics/142/normal.pal"
-AerodactylShinyPalette: INCLUDE "gfx/pics/142/shiny.pal"
-SnorlaxPalette:         INCLUDE "gfx/pics/143/normal.pal"
-SnorlaxShinyPalette:    INCLUDE "gfx/pics/143/shiny.pal"
-ArticunoPalette:        INCLUDE "gfx/pics/144/normal.pal"
-ArticunoShinyPalette:   INCLUDE "gfx/pics/144/shiny.pal"
-ZapdosPalette:          INCLUDE "gfx/pics/145/normal.pal"
-ZapdosShinyPalette:     INCLUDE "gfx/pics/145/shiny.pal"
-MoltresPalette:         INCLUDE "gfx/pics/146/normal.pal"
-MoltresShinyPalette:    INCLUDE "gfx/pics/146/shiny.pal"
-DratiniPalette:         INCLUDE "gfx/pics/147/normal.pal"
-DratiniShinyPalette:    INCLUDE "gfx/pics/147/shiny.pal"
-DragonairPalette:       INCLUDE "gfx/pics/148/normal.pal"
-DragonairShinyPalette:  INCLUDE "gfx/pics/148/shiny.pal"
-DragonitePalette:       INCLUDE "gfx/pics/149/normal.pal"
-DragoniteShinyPalette:  INCLUDE "gfx/pics/149/shiny.pal"
-MewtwoPalette:          INCLUDE "gfx/pics/150/normal.pal"
-MewtwoShinyPalette:     INCLUDE "gfx/pics/150/shiny.pal"
-MewPalette:             INCLUDE "gfx/pics/151/normal.pal"
-MewShinyPalette:        INCLUDE "gfx/pics/151/shiny.pal"
-ChikoritaPalette:       INCLUDE "gfx/pics/152/normal.pal"
-ChikoritaShinyPalette:  INCLUDE "gfx/pics/152/shiny.pal"
-BayleefPalette:         INCLUDE "gfx/pics/153/normal.pal"
-BayleefShinyPalette:    INCLUDE "gfx/pics/153/shiny.pal"
-MeganiumPalette:        INCLUDE "gfx/pics/154/normal.pal"
-MeganiumShinyPalette:   INCLUDE "gfx/pics/154/shiny.pal"
-CyndaquilPalette:       INCLUDE "gfx/pics/155/normal.pal"
-CyndaquilShinyPalette:  INCLUDE "gfx/pics/155/shiny.pal"
-QuilavaPalette:         INCLUDE "gfx/pics/156/normal.pal"
-QuilavaShinyPalette:    INCLUDE "gfx/pics/156/shiny.pal"
-TyphlosionPalette:      INCLUDE "gfx/pics/157/normal.pal"
-TyphlosionShinyPalette: INCLUDE "gfx/pics/157/shiny.pal"
-TotodilePalette:        INCLUDE "gfx/pics/158/normal.pal"
-TotodileShinyPalette:   INCLUDE "gfx/pics/158/shiny.pal"
-CroconawPalette:        INCLUDE "gfx/pics/159/normal.pal"
-CroconawShinyPalette:   INCLUDE "gfx/pics/159/shiny.pal"
-FeraligatrPalette:      INCLUDE "gfx/pics/160/normal.pal"
-FeraligatrShinyPalette: INCLUDE "gfx/pics/160/shiny.pal"
-SentretPalette:         INCLUDE "gfx/pics/161/normal.pal"
-SentretShinyPalette:    INCLUDE "gfx/pics/161/shiny.pal"
-FurretPalette:          INCLUDE "gfx/pics/162/normal.pal"
-FurretShinyPalette:     INCLUDE "gfx/pics/162/shiny.pal"
-HoothootPalette:        INCLUDE "gfx/pics/163/normal.pal"
-HoothootShinyPalette:   INCLUDE "gfx/pics/163/shiny.pal"
-NoctowlPalette:         INCLUDE "gfx/pics/164/normal.pal"
-NoctowlShinyPalette:    INCLUDE "gfx/pics/164/shiny.pal"
-LedybaPalette:          INCLUDE "gfx/pics/165/normal.pal"
-LedybaShinyPalette:     INCLUDE "gfx/pics/165/shiny.pal"
-LedianPalette:          INCLUDE "gfx/pics/166/normal.pal"
-LedianShinyPalette:     INCLUDE "gfx/pics/166/shiny.pal"
-SpinarakPalette:        INCLUDE "gfx/pics/167/normal.pal"
-SpinarakShinyPalette:   INCLUDE "gfx/pics/167/shiny.pal"
-AriadosPalette:         INCLUDE "gfx/pics/168/normal.pal"
-AriadosShinyPalette:    INCLUDE "gfx/pics/168/shiny.pal"
-CrobatPalette:          INCLUDE "gfx/pics/169/normal.pal"
-CrobatShinyPalette:     INCLUDE "gfx/pics/169/shiny.pal"
-ChinchouPalette:        INCLUDE "gfx/pics/170/normal.pal"
-ChinchouShinyPalette:   INCLUDE "gfx/pics/170/shiny.pal"
-LanturnPalette:         INCLUDE "gfx/pics/171/normal.pal"
-LanturnShinyPalette:    INCLUDE "gfx/pics/171/shiny.pal"
-PichuPalette:           INCLUDE "gfx/pics/172/normal.pal"
-PichuShinyPalette:      INCLUDE "gfx/pics/172/shiny.pal"
-CleffaPalette:          INCLUDE "gfx/pics/173/normal.pal"
-CleffaShinyPalette:     INCLUDE "gfx/pics/173/shiny.pal"
-IgglybuffPalette:       INCLUDE "gfx/pics/174/normal.pal"
-IgglybuffShinyPalette:  INCLUDE "gfx/pics/174/shiny.pal"
-TogepiPalette:          INCLUDE "gfx/pics/175/normal.pal"
-TogepiShinyPalette:     INCLUDE "gfx/pics/175/shiny.pal"
-TogeticPalette:         INCLUDE "gfx/pics/176/normal.pal"
-TogeticShinyPalette:    INCLUDE "gfx/pics/176/shiny.pal"
-NatuPalette:            INCLUDE "gfx/pics/177/normal.pal"
-NatuShinyPalette:       INCLUDE "gfx/pics/177/shiny.pal"
-XatuPalette:            INCLUDE "gfx/pics/178/normal.pal"
-XatuShinyPalette:       INCLUDE "gfx/pics/178/shiny.pal"
-MareepPalette:          INCLUDE "gfx/pics/179/normal.pal"
-MareepShinyPalette:     INCLUDE "gfx/pics/179/shiny.pal"
-FlaaffyPalette:         INCLUDE "gfx/pics/180/normal.pal"
-FlaaffyShinyPalette:    INCLUDE "gfx/pics/180/shiny.pal"
-AmpharosPalette:        INCLUDE "gfx/pics/181/normal.pal"
-AmpharosShinyPalette:   INCLUDE "gfx/pics/181/shiny.pal"
-BellossomPalette:       INCLUDE "gfx/pics/182/normal.pal"
-BellossomShinyPalette:  INCLUDE "gfx/pics/182/shiny.pal"
-MarillPalette:          INCLUDE "gfx/pics/183/normal.pal"
-MarillShinyPalette:     INCLUDE "gfx/pics/183/shiny.pal"
-AzumarillPalette:       INCLUDE "gfx/pics/184/normal.pal"
-AzumarillShinyPalette:  INCLUDE "gfx/pics/184/shiny.pal"
-SudowoodoPalette:       INCLUDE "gfx/pics/185/normal.pal"
-SudowoodoShinyPalette:  INCLUDE "gfx/pics/185/shiny.pal"
-PolitoedPalette:        INCLUDE "gfx/pics/186/normal.pal"
-PolitoedShinyPalette:   INCLUDE "gfx/pics/186/shiny.pal"
-HoppipPalette:          INCLUDE "gfx/pics/187/normal.pal"
-HoppipShinyPalette:     INCLUDE "gfx/pics/187/shiny.pal"
-SkiploomPalette:        INCLUDE "gfx/pics/188/normal.pal"
-SkiploomShinyPalette:   INCLUDE "gfx/pics/188/shiny.pal"
-JumpluffPalette:        INCLUDE "gfx/pics/189/normal.pal"
-JumpluffShinyPalette:   INCLUDE "gfx/pics/189/shiny.pal"
-AipomPalette:           INCLUDE "gfx/pics/190/normal.pal"
-AipomShinyPalette:      INCLUDE "gfx/pics/190/shiny.pal"
-SunkernPalette:         INCLUDE "gfx/pics/191/normal.pal"
-SunkernShinyPalette:    INCLUDE "gfx/pics/191/shiny.pal"
-SunfloraPalette:        INCLUDE "gfx/pics/192/normal.pal"
-SunfloraShinyPalette:   INCLUDE "gfx/pics/192/shiny.pal"
-YanmaPalette:           INCLUDE "gfx/pics/193/normal.pal"
-YanmaShinyPalette:      INCLUDE "gfx/pics/193/shiny.pal"
-WooperPalette:          INCLUDE "gfx/pics/194/normal.pal"
-WooperShinyPalette:     INCLUDE "gfx/pics/194/shiny.pal"
-QuagsirePalette:        INCLUDE "gfx/pics/195/normal.pal"
-QuagsireShinyPalette:   INCLUDE "gfx/pics/195/shiny.pal"
-EspeonPalette:          INCLUDE "gfx/pics/196/normal.pal"
-EspeonShinyPalette:     INCLUDE "gfx/pics/196/shiny.pal"
-UmbreonPalette:         INCLUDE "gfx/pics/197/normal.pal"
-UmbreonShinyPalette:    INCLUDE "gfx/pics/197/shiny.pal"
-MurkrowPalette:         INCLUDE "gfx/pics/198/normal.pal"
-MurkrowShinyPalette:    INCLUDE "gfx/pics/198/shiny.pal"
-SlowkingPalette:        INCLUDE "gfx/pics/199/normal.pal"
-SlowkingShinyPalette:   INCLUDE "gfx/pics/199/shiny.pal"
-MisdreavusPalette:      INCLUDE "gfx/pics/200/normal.pal"
-MisdreavusShinyPalette: INCLUDE "gfx/pics/200/shiny.pal"
-UnownPalette:           INCLUDE "gfx/pics/201/normal.pal"
-UnownShinyPalette:      INCLUDE "gfx/pics/201/shiny.pal"
-WobbuffetPalette:       INCLUDE "gfx/pics/202/normal.pal"
-WobbuffetShinyPalette:  INCLUDE "gfx/pics/202/shiny.pal"
-GirafarigPalette:       INCLUDE "gfx/pics/203/normal.pal"
-GirafarigShinyPalette:  INCLUDE "gfx/pics/203/shiny.pal"
-PinecoPalette:          INCLUDE "gfx/pics/204/normal.pal"
-PinecoShinyPalette:     INCLUDE "gfx/pics/204/shiny.pal"
-ForretressPalette:      INCLUDE "gfx/pics/205/normal.pal"
-ForretressShinyPalette: INCLUDE "gfx/pics/205/shiny.pal"
-DunsparcePalette:       INCLUDE "gfx/pics/206/normal.pal"
-DunsparceShinyPalette:  INCLUDE "gfx/pics/206/shiny.pal"
-GligarPalette:          INCLUDE "gfx/pics/207/normal.pal"
-GligarShinyPalette:     INCLUDE "gfx/pics/207/shiny.pal"
-SteelixPalette:         INCLUDE "gfx/pics/208/normal.pal"
-SteelixShinyPalette:    INCLUDE "gfx/pics/208/shiny.pal"
-SnubbullPalette:        INCLUDE "gfx/pics/209/normal.pal"
-SnubbullShinyPalette:   INCLUDE "gfx/pics/209/shiny.pal"
-GranbullPalette:        INCLUDE "gfx/pics/210/normal.pal"
-GranbullShinyPalette:   INCLUDE "gfx/pics/210/shiny.pal"
-QwilfishPalette:        INCLUDE "gfx/pics/211/normal.pal"
-QwilfishShinyPalette:   INCLUDE "gfx/pics/211/shiny.pal"
-ScizorPalette:          INCLUDE "gfx/pics/212/normal.pal"
-ScizorShinyPalette:     INCLUDE "gfx/pics/212/shiny.pal"
-ShucklePalette:         INCLUDE "gfx/pics/213/normal.pal"
-ShuckleShinyPalette:    INCLUDE "gfx/pics/213/shiny.pal"
-HeracrossPalette:       INCLUDE "gfx/pics/214/normal.pal"
-HeracrossShinyPalette:  INCLUDE "gfx/pics/214/shiny.pal"
-SneaselPalette:         INCLUDE "gfx/pics/215/normal.pal"
-SneaselShinyPalette:    INCLUDE "gfx/pics/215/shiny.pal"
-TeddiursaPalette:       INCLUDE "gfx/pics/216/normal.pal"
-TeddiursaShinyPalette:  INCLUDE "gfx/pics/216/shiny.pal"
-UrsaringPalette:        INCLUDE "gfx/pics/217/normal.pal"
-UrsaringShinyPalette:   INCLUDE "gfx/pics/217/shiny.pal"
-SlugmaPalette:          INCLUDE "gfx/pics/218/normal.pal"
-SlugmaShinyPalette:     INCLUDE "gfx/pics/218/shiny.pal"
-MagcargoPalette:        INCLUDE "gfx/pics/219/normal.pal"
-MagcargoShinyPalette:   INCLUDE "gfx/pics/219/shiny.pal"
-SwinubPalette:          INCLUDE "gfx/pics/220/normal.pal"
-SwinubShinyPalette:     INCLUDE "gfx/pics/220/shiny.pal"
-PiloswinePalette:       INCLUDE "gfx/pics/221/normal.pal"
-PiloswineShinyPalette:  INCLUDE "gfx/pics/221/shiny.pal"
-CorsolaPalette:         INCLUDE "gfx/pics/222/normal.pal"
-CorsolaShinyPalette:    INCLUDE "gfx/pics/222/shiny.pal"
-RemoraidPalette:        INCLUDE "gfx/pics/223/normal.pal"
-RemoraidShinyPalette:   INCLUDE "gfx/pics/223/shiny.pal"
-OctilleryPalette:       INCLUDE "gfx/pics/224/normal.pal"
-OctilleryShinyPalette:  INCLUDE "gfx/pics/224/shiny.pal"
-DelibirdPalette:        INCLUDE "gfx/pics/225/normal.pal"
-DelibirdShinyPalette:   INCLUDE "gfx/pics/225/shiny.pal"
-MantinePalette:         INCLUDE "gfx/pics/226/normal.pal"
-MantineShinyPalette:    INCLUDE "gfx/pics/226/shiny.pal"
-SkarmoryPalette:        INCLUDE "gfx/pics/227/normal.pal"
-SkarmoryShinyPalette:   INCLUDE "gfx/pics/227/shiny.pal"
-HoundourPalette:        INCLUDE "gfx/pics/228/normal.pal"
-HoundourShinyPalette:   INCLUDE "gfx/pics/228/shiny.pal"
-HoundoomPalette:        INCLUDE "gfx/pics/229/normal.pal"
-HoundoomShinyPalette:   INCLUDE "gfx/pics/229/shiny.pal"
-KingdraPalette:         INCLUDE "gfx/pics/230/normal.pal"
-KingdraShinyPalette:    INCLUDE "gfx/pics/230/shiny.pal"
-PhanpyPalette:          INCLUDE "gfx/pics/231/normal.pal"
-PhanpyShinyPalette:     INCLUDE "gfx/pics/231/shiny.pal"
-DonphanPalette:         INCLUDE "gfx/pics/232/normal.pal"
-DonphanShinyPalette:    INCLUDE "gfx/pics/232/shiny.pal"
-Porygon2Palette:        INCLUDE "gfx/pics/233/normal.pal"
-Porygon2ShinyPalette:   INCLUDE "gfx/pics/233/shiny.pal"
-StantlerPalette:        INCLUDE "gfx/pics/234/normal.pal"
-StantlerShinyPalette:   INCLUDE "gfx/pics/234/shiny.pal"
-SmearglePalette:        INCLUDE "gfx/pics/235/normal.pal"
-SmeargleShinyPalette:   INCLUDE "gfx/pics/235/shiny.pal"
-TyroguePalette:         INCLUDE "gfx/pics/236/normal.pal"
-TyrogueShinyPalette:    INCLUDE "gfx/pics/236/shiny.pal"
-HitmontopPalette:       INCLUDE "gfx/pics/237/normal.pal"
-HitmontopShinyPalette:  INCLUDE "gfx/pics/237/shiny.pal"
-SmoochumPalette:        INCLUDE "gfx/pics/238/normal.pal"
-SmoochumShinyPalette:   INCLUDE "gfx/pics/238/shiny.pal"
-ElekidPalette:          INCLUDE "gfx/pics/239/normal.pal"
-ElekidShinyPalette:     INCLUDE "gfx/pics/239/shiny.pal"
-MagbyPalette:           INCLUDE "gfx/pics/240/normal.pal"
-MagbyShinyPalette:      INCLUDE "gfx/pics/240/shiny.pal"
-MiltankPalette:         INCLUDE "gfx/pics/241/normal.pal"
-MiltankShinyPalette:    INCLUDE "gfx/pics/241/shiny.pal"
-BlisseyPalette:         INCLUDE "gfx/pics/242/normal.pal"
-BlisseyShinyPalette:    INCLUDE "gfx/pics/242/shiny.pal"
-RaikouPalette:          INCLUDE "gfx/pics/243/normal.pal"
-RaikouShinyPalette:     INCLUDE "gfx/pics/243/shiny.pal"
-EnteiPalette:           INCLUDE "gfx/pics/244/normal.pal"
-EnteiShinyPalette:      INCLUDE "gfx/pics/244/shiny.pal"
-SuicunePalette:         INCLUDE "gfx/pics/245/normal.pal"
-SuicuneShinyPalette:    INCLUDE "gfx/pics/245/shiny.pal"
-LarvitarPalette:        INCLUDE "gfx/pics/246/normal.pal"
-LarvitarShinyPalette:   INCLUDE "gfx/pics/246/shiny.pal"
-PupitarPalette:         INCLUDE "gfx/pics/247/normal.pal"
-PupitarShinyPalette:    INCLUDE "gfx/pics/247/shiny.pal"
-TyranitarPalette:       INCLUDE "gfx/pics/248/normal.pal"
-TyranitarShinyPalette:  INCLUDE "gfx/pics/248/shiny.pal"
-LugiaPalette:           INCLUDE "gfx/pics/249/normal.pal"
-LugiaShinyPalette:      INCLUDE "gfx/pics/249/shiny.pal"
-HoOhPalette:            INCLUDE "gfx/pics/250/normal.pal"
-HoOhShinyPalette:       INCLUDE "gfx/pics/250/shiny.pal"
-CelebiPalette:          INCLUDE "gfx/pics/251/normal.pal"
-CelebiShinyPalette:     INCLUDE "gfx/pics/251/shiny.pal"
+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
diff --git a/gfx/pics/046/anim0.asm b/gfx/pics/paras/anim0.asm
index 6fcc935e9..6fcc935e9 100644
--- a/gfx/pics/046/anim0.asm
+++ b/gfx/pics/paras/anim0.asm
diff --git a/gfx/pics/046/anim1.asm b/gfx/pics/paras/anim1.asm
index 3ce495f04..3ce495f04 100644
--- a/gfx/pics/046/anim1.asm
+++ b/gfx/pics/paras/anim1.asm
diff --git a/gfx/pics/046/back.lz b/gfx/pics/paras/back.6x6.2bpp.lz
index d6c3d4a62..d6c3d4a62 100644
--- a/gfx/pics/046/back.lz
+++ b/gfx/pics/paras/back.6x6.2bpp.lz
diff --git a/gfx/pics/046/bitmask.asm b/gfx/pics/paras/bitmask.asm
index 49d9d811e..49d9d811e 100644
--- a/gfx/pics/046/bitmask.asm
+++ b/gfx/pics/paras/bitmask.asm
diff --git a/gfx/pics/046/frames.asm b/gfx/pics/paras/frames.asm
index 345ef88b5..345ef88b5 100644
--- a/gfx/pics/046/frames.asm
+++ b/gfx/pics/paras/frames.asm
diff --git a/gfx/pics/046/front.lz b/gfx/pics/paras/front.5x5.2bpp.lz
index 927c831d0..927c831d0 100644
--- a/gfx/pics/046/front.lz
+++ b/gfx/pics/paras/front.5x5.2bpp.lz
diff --git a/gfx/pics/046/normal.pal b/gfx/pics/paras/normal.pal
index dcfb3fd8e..dcfb3fd8e 100644
--- a/gfx/pics/046/normal.pal
+++ b/gfx/pics/paras/normal.pal
diff --git a/gfx/pics/046/shiny.pal b/gfx/pics/paras/shiny.pal
index 7a63c68d7..7a63c68d7 100644
--- a/gfx/pics/046/shiny.pal
+++ b/gfx/pics/paras/shiny.pal
diff --git a/gfx/pics/047/anim0.asm b/gfx/pics/parasect/anim0.asm
index e9e253cee..e9e253cee 100644
--- a/gfx/pics/047/anim0.asm
+++ b/gfx/pics/parasect/anim0.asm
diff --git a/gfx/pics/047/anim1.asm b/gfx/pics/parasect/anim1.asm
index 8275690a6..8275690a6 100644
--- a/gfx/pics/047/anim1.asm
+++ b/gfx/pics/parasect/anim1.asm
diff --git a/gfx/pics/047/back.lz b/gfx/pics/parasect/back.6x6.2bpp.lz
index a63677ff7..a63677ff7 100644
--- a/gfx/pics/047/back.lz
+++ b/gfx/pics/parasect/back.6x6.2bpp.lz
diff --git a/gfx/pics/047/bitmask.asm b/gfx/pics/parasect/bitmask.asm
index 84c7ad6f4..84c7ad6f4 100644
--- a/gfx/pics/047/bitmask.asm
+++ b/gfx/pics/parasect/bitmask.asm
diff --git a/gfx/pics/047/frames.asm b/gfx/pics/parasect/frames.asm
index 08d9da8e7..08d9da8e7 100644
--- a/gfx/pics/047/frames.asm
+++ b/gfx/pics/parasect/frames.asm
diff --git a/gfx/pics/047/front.lz b/gfx/pics/parasect/front.7x7.2bpp.lz
index f1743d07e..f1743d07e 100644
--- a/gfx/pics/047/front.lz
+++ b/gfx/pics/parasect/front.7x7.2bpp.lz
diff --git a/gfx/pics/047/normal.pal b/gfx/pics/parasect/normal.pal
index 91c779584..91c779584 100644
--- a/gfx/pics/047/normal.pal
+++ b/gfx/pics/parasect/normal.pal
diff --git a/gfx/pics/047/shiny.pal b/gfx/pics/parasect/shiny.pal
index 343a793bb..343a793bb 100644
--- a/gfx/pics/047/shiny.pal
+++ b/gfx/pics/parasect/shiny.pal
diff --git a/gfx/pics/053/anim0.asm b/gfx/pics/persian/anim0.asm
index ae771c09c..ae771c09c 100644
--- a/gfx/pics/053/anim0.asm
+++ b/gfx/pics/persian/anim0.asm
diff --git a/gfx/pics/053/anim1.asm b/gfx/pics/persian/anim1.asm
index ca9129bfa..ca9129bfa 100644
--- a/gfx/pics/053/anim1.asm
+++ b/gfx/pics/persian/anim1.asm
diff --git a/gfx/pics/053/back.lz b/gfx/pics/persian/back.6x6.2bpp.lz
index e615d47fb..e615d47fb 100644
--- a/gfx/pics/053/back.lz
+++ b/gfx/pics/persian/back.6x6.2bpp.lz
diff --git a/gfx/pics/053/bitmask.asm b/gfx/pics/persian/bitmask.asm
index 94554310e..94554310e 100644
--- a/gfx/pics/053/bitmask.asm
+++ b/gfx/pics/persian/bitmask.asm
diff --git a/gfx/pics/053/frames.asm b/gfx/pics/persian/frames.asm
index 43f353608..43f353608 100644
--- a/gfx/pics/053/frames.asm
+++ b/gfx/pics/persian/frames.asm
diff --git a/gfx/pics/053/front.lz b/gfx/pics/persian/front.7x7.2bpp.lz
index 1f13a0cca..1f13a0cca 100644
--- a/gfx/pics/053/front.lz
+++ b/gfx/pics/persian/front.7x7.2bpp.lz
diff --git a/gfx/pics/053/normal.pal b/gfx/pics/persian/normal.pal
index 3c3a068a9..3c3a068a9 100644
--- a/gfx/pics/053/normal.pal
+++ b/gfx/pics/persian/normal.pal
diff --git a/gfx/pics/053/shiny.pal b/gfx/pics/persian/shiny.pal
index 6ede92a01..6ede92a01 100644
--- a/gfx/pics/053/shiny.pal
+++ b/gfx/pics/persian/shiny.pal
diff --git a/gfx/pics/231/anim0.asm b/gfx/pics/phanpy/anim0.asm
index 7ec513762..7ec513762 100644
--- a/gfx/pics/231/anim0.asm
+++ b/gfx/pics/phanpy/anim0.asm
diff --git a/gfx/pics/231/anim1.asm b/gfx/pics/phanpy/anim1.asm
index 43148da49..43148da49 100644
--- a/gfx/pics/231/anim1.asm
+++ b/gfx/pics/phanpy/anim1.asm
diff --git a/gfx/pics/231/back.lz b/gfx/pics/phanpy/back.6x6.2bpp.lz
index cef1bf442..cef1bf442 100644
--- a/gfx/pics/231/back.lz
+++ b/gfx/pics/phanpy/back.6x6.2bpp.lz
diff --git a/gfx/pics/231/bitmask.asm b/gfx/pics/phanpy/bitmask.asm
index d0f5c0721..d0f5c0721 100644
--- a/gfx/pics/231/bitmask.asm
+++ b/gfx/pics/phanpy/bitmask.asm
diff --git a/gfx/pics/231/frames.asm b/gfx/pics/phanpy/frames.asm
index f41904d8b..f41904d8b 100644
--- a/gfx/pics/231/frames.asm
+++ b/gfx/pics/phanpy/frames.asm
diff --git a/gfx/pics/231/front.lz b/gfx/pics/phanpy/front.5x5.2bpp.lz
index d919487b8..d919487b8 100644
--- a/gfx/pics/231/front.lz
+++ b/gfx/pics/phanpy/front.5x5.2bpp.lz
diff --git a/gfx/pics/231/normal.pal b/gfx/pics/phanpy/normal.pal
index 1952a6537..1952a6537 100644
--- a/gfx/pics/231/normal.pal
+++ b/gfx/pics/phanpy/normal.pal
diff --git a/gfx/pics/231/shiny.pal b/gfx/pics/phanpy/shiny.pal
index 64b15d904..64b15d904 100644
--- a/gfx/pics/231/shiny.pal
+++ b/gfx/pics/phanpy/shiny.pal
diff --git a/gfx/pics/172/anim0.asm b/gfx/pics/pichu/anim0.asm
index 50a1ae73c..50a1ae73c 100644
--- a/gfx/pics/172/anim0.asm
+++ b/gfx/pics/pichu/anim0.asm
diff --git a/gfx/pics/172/anim1.asm b/gfx/pics/pichu/anim1.asm
index dd39adcab..dd39adcab 100644
--- a/gfx/pics/172/anim1.asm
+++ b/gfx/pics/pichu/anim1.asm
diff --git a/gfx/pics/172/back.lz b/gfx/pics/pichu/back.6x6.2bpp.lz
index 61ab083b3..61ab083b3 100644
--- a/gfx/pics/172/back.lz
+++ b/gfx/pics/pichu/back.6x6.2bpp.lz
diff --git a/gfx/pics/172/bitmask.asm b/gfx/pics/pichu/bitmask.asm
index 8396728bf..8396728bf 100644
--- a/gfx/pics/172/bitmask.asm
+++ b/gfx/pics/pichu/bitmask.asm
diff --git a/gfx/pics/172/frames.asm b/gfx/pics/pichu/frames.asm
index 8d82f908c..8d82f908c 100644
--- a/gfx/pics/172/frames.asm
+++ b/gfx/pics/pichu/frames.asm
diff --git a/gfx/pics/172/front.lz b/gfx/pics/pichu/front.5x5.2bpp.lz
index 06712d244..06712d244 100644
--- a/gfx/pics/172/front.lz
+++ b/gfx/pics/pichu/front.5x5.2bpp.lz
diff --git a/gfx/pics/025/normal.pal b/gfx/pics/pichu/normal.pal
index 0ec212f83..0ec212f83 100644
--- a/gfx/pics/025/normal.pal
+++ b/gfx/pics/pichu/normal.pal
diff --git a/gfx/pics/025/shiny.pal b/gfx/pics/pichu/shiny.pal
index a89172f54..a89172f54 100644
--- a/gfx/pics/025/shiny.pal
+++ b/gfx/pics/pichu/shiny.pal
diff --git a/gfx/pics/018/anim0.asm b/gfx/pics/pidgeot/anim0.asm
index 34d5d3a98..34d5d3a98 100644
--- a/gfx/pics/018/anim0.asm
+++ b/gfx/pics/pidgeot/anim0.asm
diff --git a/gfx/pics/018/anim1.asm b/gfx/pics/pidgeot/anim1.asm
index 6ba60e83e..6ba60e83e 100644
--- a/gfx/pics/018/anim1.asm
+++ b/gfx/pics/pidgeot/anim1.asm
diff --git a/gfx/pics/018/back.lz b/gfx/pics/pidgeot/back.6x6.2bpp.lz
index a464dd7d1..a464dd7d1 100644
--- a/gfx/pics/018/back.lz
+++ b/gfx/pics/pidgeot/back.6x6.2bpp.lz
diff --git a/gfx/pics/018/bitmask.asm b/gfx/pics/pidgeot/bitmask.asm
index 521f3ad93..521f3ad93 100644
--- a/gfx/pics/018/bitmask.asm
+++ b/gfx/pics/pidgeot/bitmask.asm
diff --git a/gfx/pics/018/frames.asm b/gfx/pics/pidgeot/frames.asm
index 2d0ef5719..2d0ef5719 100644
--- a/gfx/pics/018/frames.asm
+++ b/gfx/pics/pidgeot/frames.asm
diff --git a/gfx/pics/018/front.lz b/gfx/pics/pidgeot/front.7x7.2bpp.lz
index f5cbb3f56..f5cbb3f56 100644
--- a/gfx/pics/018/front.lz
+++ b/gfx/pics/pidgeot/front.7x7.2bpp.lz
diff --git a/gfx/pics/017/normal.pal b/gfx/pics/pidgeot/normal.pal
index 70fd6b8ce..70fd6b8ce 100644
--- a/gfx/pics/017/normal.pal
+++ b/gfx/pics/pidgeot/normal.pal
diff --git a/gfx/pics/018/shiny.pal b/gfx/pics/pidgeot/shiny.pal
index 68eefb13f..68eefb13f 100644
--- a/gfx/pics/018/shiny.pal
+++ b/gfx/pics/pidgeot/shiny.pal
diff --git a/gfx/pics/017/anim0.asm b/gfx/pics/pidgeotto/anim0.asm
index 53008855f..53008855f 100644
--- a/gfx/pics/017/anim0.asm
+++ b/gfx/pics/pidgeotto/anim0.asm
diff --git a/gfx/pics/017/anim1.asm b/gfx/pics/pidgeotto/anim1.asm
index 95a27bb15..95a27bb15 100644
--- a/gfx/pics/017/anim1.asm
+++ b/gfx/pics/pidgeotto/anim1.asm
diff --git a/gfx/pics/017/back.lz b/gfx/pics/pidgeotto/back.6x6.2bpp.lz
index d766747ef..d766747ef 100644
--- a/gfx/pics/017/back.lz
+++ b/gfx/pics/pidgeotto/back.6x6.2bpp.lz
diff --git a/gfx/pics/017/bitmask.asm b/gfx/pics/pidgeotto/bitmask.asm
index 76d3df735..76d3df735 100644
--- a/gfx/pics/017/bitmask.asm
+++ b/gfx/pics/pidgeotto/bitmask.asm
diff --git a/gfx/pics/017/frames.asm b/gfx/pics/pidgeotto/frames.asm
index 83c0ef529..83c0ef529 100644
--- a/gfx/pics/017/frames.asm
+++ b/gfx/pics/pidgeotto/frames.asm
diff --git a/gfx/pics/017/front.lz b/gfx/pics/pidgeotto/front.6x6.2bpp.lz
index 0fc3a94fd..0fc3a94fd 100644
--- a/gfx/pics/017/front.lz
+++ b/gfx/pics/pidgeotto/front.6x6.2bpp.lz
diff --git a/gfx/pics/018/normal.pal b/gfx/pics/pidgeotto/normal.pal
index 70fd6b8ce..70fd6b8ce 100644
--- a/gfx/pics/018/normal.pal
+++ b/gfx/pics/pidgeotto/normal.pal
diff --git a/gfx/pics/017/shiny.pal b/gfx/pics/pidgeotto/shiny.pal
index 56a28e867..56a28e867 100644
--- a/gfx/pics/017/shiny.pal
+++ b/gfx/pics/pidgeotto/shiny.pal
diff --git a/gfx/pics/016/anim0.asm b/gfx/pics/pidgey/anim0.asm
index 4ca6553d2..4ca6553d2 100644
--- a/gfx/pics/016/anim0.asm
+++ b/gfx/pics/pidgey/anim0.asm
diff --git a/gfx/pics/016/anim1.asm b/gfx/pics/pidgey/anim1.asm
index 25a55fb45..25a55fb45 100644
--- a/gfx/pics/016/anim1.asm
+++ b/gfx/pics/pidgey/anim1.asm
diff --git a/gfx/pics/016/back.lz b/gfx/pics/pidgey/back.6x6.2bpp.lz
index 48669456e..48669456e 100644
--- a/gfx/pics/016/back.lz
+++ b/gfx/pics/pidgey/back.6x6.2bpp.lz
diff --git a/gfx/pics/016/bitmask.asm b/gfx/pics/pidgey/bitmask.asm
index c1b5e0610..c1b5e0610 100644
--- a/gfx/pics/016/bitmask.asm
+++ b/gfx/pics/pidgey/bitmask.asm
diff --git a/gfx/pics/016/frames.asm b/gfx/pics/pidgey/frames.asm
index 58fdd0d12..58fdd0d12 100644
--- a/gfx/pics/016/frames.asm
+++ b/gfx/pics/pidgey/frames.asm
diff --git a/gfx/pics/016/front.lz b/gfx/pics/pidgey/front.5x5.2bpp.lz
index 03c579dbf..03c579dbf 100644
--- a/gfx/pics/016/front.lz
+++ b/gfx/pics/pidgey/front.5x5.2bpp.lz
diff --git a/gfx/pics/016/normal.pal b/gfx/pics/pidgey/normal.pal
index affaa4265..affaa4265 100644
--- a/gfx/pics/016/normal.pal
+++ b/gfx/pics/pidgey/normal.pal
diff --git a/gfx/pics/016/shiny.pal b/gfx/pics/pidgey/shiny.pal
index e209bc93f..e209bc93f 100644
--- a/gfx/pics/016/shiny.pal
+++ b/gfx/pics/pidgey/shiny.pal
diff --git a/gfx/pics/025/anim0.asm b/gfx/pics/pikachu/anim0.asm
index 6a1ac0954..6a1ac0954 100644
--- a/gfx/pics/025/anim0.asm
+++ b/gfx/pics/pikachu/anim0.asm
diff --git a/gfx/pics/025/anim1.asm b/gfx/pics/pikachu/anim1.asm
index 0454a2855..0454a2855 100644
--- a/gfx/pics/025/anim1.asm
+++ b/gfx/pics/pikachu/anim1.asm
diff --git a/gfx/pics/025/back.lz b/gfx/pics/pikachu/back.6x6.2bpp.lz
index 3f74382ae..3f74382ae 100644
--- a/gfx/pics/025/back.lz
+++ b/gfx/pics/pikachu/back.6x6.2bpp.lz
diff --git a/gfx/pics/025/bitmask.asm b/gfx/pics/pikachu/bitmask.asm
index 24ea202e9..24ea202e9 100644
--- a/gfx/pics/025/bitmask.asm
+++ b/gfx/pics/pikachu/bitmask.asm
diff --git a/gfx/pics/025/frames.asm b/gfx/pics/pikachu/frames.asm
index f46e5181c..f46e5181c 100644
--- a/gfx/pics/025/frames.asm
+++ b/gfx/pics/pikachu/frames.asm
diff --git a/gfx/pics/025/front.lz b/gfx/pics/pikachu/front.5x5.2bpp.lz
index 1dbea0496..1dbea0496 100644
--- a/gfx/pics/025/front.lz
+++ b/gfx/pics/pikachu/front.5x5.2bpp.lz
diff --git a/gfx/pics/172/normal.pal b/gfx/pics/pikachu/normal.pal
index 0ec212f83..0ec212f83 100644
--- a/gfx/pics/172/normal.pal
+++ b/gfx/pics/pikachu/normal.pal
diff --git a/gfx/pics/172/shiny.pal b/gfx/pics/pikachu/shiny.pal
index a89172f54..a89172f54 100644
--- a/gfx/pics/172/shiny.pal
+++ b/gfx/pics/pikachu/shiny.pal
diff --git a/gfx/pics/221/anim0.asm b/gfx/pics/piloswine/anim0.asm
index 5b57b3ef9..5b57b3ef9 100644
--- a/gfx/pics/221/anim0.asm
+++ b/gfx/pics/piloswine/anim0.asm
diff --git a/gfx/pics/221/anim1.asm b/gfx/pics/piloswine/anim1.asm
index c1cba5ee2..c1cba5ee2 100644
--- a/gfx/pics/221/anim1.asm
+++ b/gfx/pics/piloswine/anim1.asm
diff --git a/gfx/pics/221/back.lz b/gfx/pics/piloswine/back.6x6.2bpp.lz
index 2bdbd05b7..2bdbd05b7 100644
--- a/gfx/pics/221/back.lz
+++ b/gfx/pics/piloswine/back.6x6.2bpp.lz
diff --git a/gfx/pics/221/bitmask.asm b/gfx/pics/piloswine/bitmask.asm
index ffad2c6c2..ffad2c6c2 100644
--- a/gfx/pics/221/bitmask.asm
+++ b/gfx/pics/piloswine/bitmask.asm
diff --git a/gfx/pics/221/frames.asm b/gfx/pics/piloswine/frames.asm
index 4600445b9..4600445b9 100644
--- a/gfx/pics/221/frames.asm
+++ b/gfx/pics/piloswine/frames.asm
diff --git a/gfx/pics/221/front.lz b/gfx/pics/piloswine/front.6x6.2bpp.lz
index 45b87144e..45b87144e 100644
--- a/gfx/pics/221/front.lz
+++ b/gfx/pics/piloswine/front.6x6.2bpp.lz
diff --git a/gfx/pics/221/normal.pal b/gfx/pics/piloswine/normal.pal
index 6df5615c0..6df5615c0 100644
--- a/gfx/pics/221/normal.pal
+++ b/gfx/pics/piloswine/normal.pal
diff --git a/gfx/pics/221/shiny.pal b/gfx/pics/piloswine/shiny.pal
index 3afb0539d..3afb0539d 100644
--- a/gfx/pics/221/shiny.pal
+++ b/gfx/pics/piloswine/shiny.pal
diff --git a/gfx/pics/204/anim0.asm b/gfx/pics/pineco/anim0.asm
index 4579032ec..4579032ec 100644
--- a/gfx/pics/204/anim0.asm
+++ b/gfx/pics/pineco/anim0.asm
diff --git a/gfx/pics/204/anim1.asm b/gfx/pics/pineco/anim1.asm
index f1b4e949e..f1b4e949e 100644
--- a/gfx/pics/204/anim1.asm
+++ b/gfx/pics/pineco/anim1.asm
diff --git a/gfx/pics/204/back.lz b/gfx/pics/pineco/back.6x6.2bpp.lz
index f4baaadb9..f4baaadb9 100644
--- a/gfx/pics/204/back.lz
+++ b/gfx/pics/pineco/back.6x6.2bpp.lz
diff --git a/gfx/pics/204/bitmask.asm b/gfx/pics/pineco/bitmask.asm
index 30b51cece..30b51cece 100644
--- a/gfx/pics/204/bitmask.asm
+++ b/gfx/pics/pineco/bitmask.asm
diff --git a/gfx/pics/204/frames.asm b/gfx/pics/pineco/frames.asm
index 97093c2c4..97093c2c4 100644
--- a/gfx/pics/204/frames.asm
+++ b/gfx/pics/pineco/frames.asm
diff --git a/gfx/pics/204/front.lz b/gfx/pics/pineco/front.5x5.2bpp.lz
index c36a27807..c36a27807 100644
--- a/gfx/pics/204/front.lz
+++ b/gfx/pics/pineco/front.5x5.2bpp.lz
diff --git a/gfx/pics/204/normal.pal b/gfx/pics/pineco/normal.pal
index 159e2d51f..159e2d51f 100644
--- a/gfx/pics/204/normal.pal
+++ b/gfx/pics/pineco/normal.pal
diff --git a/gfx/pics/204/shiny.pal b/gfx/pics/pineco/shiny.pal
index 33ee632d5..33ee632d5 100644
--- a/gfx/pics/204/shiny.pal
+++ b/gfx/pics/pineco/shiny.pal
diff --git a/gfx/pics/127/anim0.asm b/gfx/pics/pinsir/anim0.asm
index f45752006..f45752006 100644
--- a/gfx/pics/127/anim0.asm
+++ b/gfx/pics/pinsir/anim0.asm
diff --git a/gfx/pics/127/anim1.asm b/gfx/pics/pinsir/anim1.asm
index 73895c2e0..73895c2e0 100644
--- a/gfx/pics/127/anim1.asm
+++ b/gfx/pics/pinsir/anim1.asm
diff --git a/gfx/pics/127/back.lz b/gfx/pics/pinsir/back.6x6.2bpp.lz
index 8803c8a0a..8803c8a0a 100644
--- a/gfx/pics/127/back.lz
+++ b/gfx/pics/pinsir/back.6x6.2bpp.lz
diff --git a/gfx/pics/127/bitmask.asm b/gfx/pics/pinsir/bitmask.asm
index 4f51b7d09..4f51b7d09 100644
--- a/gfx/pics/127/bitmask.asm
+++ b/gfx/pics/pinsir/bitmask.asm
diff --git a/gfx/pics/127/frames.asm b/gfx/pics/pinsir/frames.asm
index ee3927896..ee3927896 100644
--- a/gfx/pics/127/frames.asm
+++ b/gfx/pics/pinsir/frames.asm
diff --git a/gfx/pics/127/front.lz b/gfx/pics/pinsir/front.7x7.2bpp.lz
index d2ec9ecd9..d2ec9ecd9 100644
--- a/gfx/pics/127/front.lz
+++ b/gfx/pics/pinsir/front.7x7.2bpp.lz
diff --git a/gfx/pics/127/normal.pal b/gfx/pics/pinsir/normal.pal
index 09bf39ff4..09bf39ff4 100644
--- a/gfx/pics/127/normal.pal
+++ b/gfx/pics/pinsir/normal.pal
diff --git a/gfx/pics/127/shiny.pal b/gfx/pics/pinsir/shiny.pal
index 4f586775a..4f586775a 100644
--- a/gfx/pics/127/shiny.pal
+++ b/gfx/pics/pinsir/shiny.pal
diff --git a/gfx/pics/186/anim0.asm b/gfx/pics/politoed/anim0.asm
index 72347714f..72347714f 100644
--- a/gfx/pics/186/anim0.asm
+++ b/gfx/pics/politoed/anim0.asm
diff --git a/gfx/pics/186/anim1.asm b/gfx/pics/politoed/anim1.asm
index 8ec01df37..8ec01df37 100644
--- a/gfx/pics/186/anim1.asm
+++ b/gfx/pics/politoed/anim1.asm
diff --git a/gfx/pics/186/back.lz b/gfx/pics/politoed/back.6x6.2bpp.lz
index 2c492fcaf..2c492fcaf 100644
--- a/gfx/pics/186/back.lz
+++ b/gfx/pics/politoed/back.6x6.2bpp.lz
diff --git a/gfx/pics/186/bitmask.asm b/gfx/pics/politoed/bitmask.asm
index 94e4243c1..94e4243c1 100644
--- a/gfx/pics/186/bitmask.asm
+++ b/gfx/pics/politoed/bitmask.asm
diff --git a/gfx/pics/186/frames.asm b/gfx/pics/politoed/frames.asm
index 0d4b546a7..0d4b546a7 100644
--- a/gfx/pics/186/frames.asm
+++ b/gfx/pics/politoed/frames.asm
diff --git a/gfx/pics/186/front.lz b/gfx/pics/politoed/front.7x7.2bpp.lz
index 8890a7ed4..8890a7ed4 100644
--- a/gfx/pics/186/front.lz
+++ b/gfx/pics/politoed/front.7x7.2bpp.lz
diff --git a/gfx/pics/186/normal.pal b/gfx/pics/politoed/normal.pal
index 31ed84e91..31ed84e91 100644
--- a/gfx/pics/186/normal.pal
+++ b/gfx/pics/politoed/normal.pal
diff --git a/gfx/pics/186/shiny.pal b/gfx/pics/politoed/shiny.pal
index 1ba49cbc5..1ba49cbc5 100644
--- a/gfx/pics/186/shiny.pal
+++ b/gfx/pics/politoed/shiny.pal
diff --git a/gfx/pics/060/anim0.asm b/gfx/pics/poliwag/anim0.asm
index 8446897c0..8446897c0 100644
--- a/gfx/pics/060/anim0.asm
+++ b/gfx/pics/poliwag/anim0.asm
diff --git a/gfx/pics/060/anim1.asm b/gfx/pics/poliwag/anim1.asm
index 839e57e87..839e57e87 100644
--- a/gfx/pics/060/anim1.asm
+++ b/gfx/pics/poliwag/anim1.asm
diff --git a/gfx/pics/060/back.lz b/gfx/pics/poliwag/back.6x6.2bpp.lz
index 58d039d16..58d039d16 100644
--- a/gfx/pics/060/back.lz
+++ b/gfx/pics/poliwag/back.6x6.2bpp.lz
diff --git a/gfx/pics/060/bitmask.asm b/gfx/pics/poliwag/bitmask.asm
index 5f28e8a8f..5f28e8a8f 100644
--- a/gfx/pics/060/bitmask.asm
+++ b/gfx/pics/poliwag/bitmask.asm
diff --git a/gfx/pics/060/frames.asm b/gfx/pics/poliwag/frames.asm
index a45bf4b23..a45bf4b23 100644
--- a/gfx/pics/060/frames.asm
+++ b/gfx/pics/poliwag/frames.asm
diff --git a/gfx/pics/060/front.lz b/gfx/pics/poliwag/front.5x5.2bpp.lz
index df9741516..df9741516 100644
--- a/gfx/pics/060/front.lz
+++ b/gfx/pics/poliwag/front.5x5.2bpp.lz
diff --git a/gfx/pics/060/normal.pal b/gfx/pics/poliwag/normal.pal
index 20896080e..20896080e 100644
--- a/gfx/pics/060/normal.pal
+++ b/gfx/pics/poliwag/normal.pal
diff --git a/gfx/pics/060/shiny.pal b/gfx/pics/poliwag/shiny.pal
index a6dbd0cfd..a6dbd0cfd 100644
--- a/gfx/pics/060/shiny.pal
+++ b/gfx/pics/poliwag/shiny.pal
diff --git a/gfx/pics/061/anim0.asm b/gfx/pics/poliwhirl/anim0.asm
index 14cb89029..14cb89029 100644
--- a/gfx/pics/061/anim0.asm
+++ b/gfx/pics/poliwhirl/anim0.asm
diff --git a/gfx/pics/061/anim1.asm b/gfx/pics/poliwhirl/anim1.asm
index 72ba07245..72ba07245 100644
--- a/gfx/pics/061/anim1.asm
+++ b/gfx/pics/poliwhirl/anim1.asm
diff --git a/gfx/pics/061/back.lz b/gfx/pics/poliwhirl/back.6x6.2bpp.lz
index a78a2cfff..a78a2cfff 100644
--- a/gfx/pics/061/back.lz
+++ b/gfx/pics/poliwhirl/back.6x6.2bpp.lz
diff --git a/gfx/pics/061/bitmask.asm b/gfx/pics/poliwhirl/bitmask.asm
index 93480693c..93480693c 100644
--- a/gfx/pics/061/bitmask.asm
+++ b/gfx/pics/poliwhirl/bitmask.asm
diff --git a/gfx/pics/061/frames.asm b/gfx/pics/poliwhirl/frames.asm
index 5dbc0d7d4..5dbc0d7d4 100644
--- a/gfx/pics/061/frames.asm
+++ b/gfx/pics/poliwhirl/frames.asm
diff --git a/gfx/pics/061/front.lz b/gfx/pics/poliwhirl/front.6x6.2bpp.lz
index b06f41441..b06f41441 100644
--- a/gfx/pics/061/front.lz
+++ b/gfx/pics/poliwhirl/front.6x6.2bpp.lz
diff --git a/gfx/pics/061/normal.pal b/gfx/pics/poliwhirl/normal.pal
index 37c6af44e..37c6af44e 100644
--- a/gfx/pics/061/normal.pal
+++ b/gfx/pics/poliwhirl/normal.pal
diff --git a/gfx/pics/061/shiny.pal b/gfx/pics/poliwhirl/shiny.pal
index 1a5ee7b27..1a5ee7b27 100644
--- a/gfx/pics/061/shiny.pal
+++ b/gfx/pics/poliwhirl/shiny.pal
diff --git a/gfx/pics/062/anim0.asm b/gfx/pics/poliwrath/anim0.asm
index 2b5fb0eef..2b5fb0eef 100644
--- a/gfx/pics/062/anim0.asm
+++ b/gfx/pics/poliwrath/anim0.asm
diff --git a/gfx/pics/062/anim1.asm b/gfx/pics/poliwrath/anim1.asm
index f709ea35c..f709ea35c 100644
--- a/gfx/pics/062/anim1.asm
+++ b/gfx/pics/poliwrath/anim1.asm
diff --git a/gfx/pics/062/back.lz b/gfx/pics/poliwrath/back.6x6.2bpp.lz
index eab9164aa..eab9164aa 100644
--- a/gfx/pics/062/back.lz
+++ b/gfx/pics/poliwrath/back.6x6.2bpp.lz
diff --git a/gfx/pics/062/bitmask.asm b/gfx/pics/poliwrath/bitmask.asm
index 3053f8119..3053f8119 100644
--- a/gfx/pics/062/bitmask.asm
+++ b/gfx/pics/poliwrath/bitmask.asm
diff --git a/gfx/pics/062/frames.asm b/gfx/pics/poliwrath/frames.asm
index e48981a22..e48981a22 100644
--- a/gfx/pics/062/frames.asm
+++ b/gfx/pics/poliwrath/frames.asm
diff --git a/gfx/pics/062/front.lz b/gfx/pics/poliwrath/front.7x7.2bpp.lz
index 601937221..601937221 100644
--- a/gfx/pics/062/front.lz
+++ b/gfx/pics/poliwrath/front.7x7.2bpp.lz
diff --git a/gfx/pics/062/normal.pal b/gfx/pics/poliwrath/normal.pal
index 9968e69e6..9968e69e6 100644
--- a/gfx/pics/062/normal.pal
+++ b/gfx/pics/poliwrath/normal.pal
diff --git a/gfx/pics/062/shiny.pal b/gfx/pics/poliwrath/shiny.pal
index f9da6007b..f9da6007b 100644
--- a/gfx/pics/062/shiny.pal
+++ b/gfx/pics/poliwrath/shiny.pal
diff --git a/gfx/pics/077/anim0.asm b/gfx/pics/ponyta/anim0.asm
index 34c3a82b6..34c3a82b6 100644
--- a/gfx/pics/077/anim0.asm
+++ b/gfx/pics/ponyta/anim0.asm
diff --git a/gfx/pics/077/anim1.asm b/gfx/pics/ponyta/anim1.asm
index 10c9f42dd..10c9f42dd 100644
--- a/gfx/pics/077/anim1.asm
+++ b/gfx/pics/ponyta/anim1.asm
diff --git a/gfx/pics/077/back.lz b/gfx/pics/ponyta/back.6x6.2bpp.lz
index 5d7ecaa93..5d7ecaa93 100644
--- a/gfx/pics/077/back.lz
+++ b/gfx/pics/ponyta/back.6x6.2bpp.lz
diff --git a/gfx/pics/077/bitmask.asm b/gfx/pics/ponyta/bitmask.asm
index cc2749572..cc2749572 100644
--- a/gfx/pics/077/bitmask.asm
+++ b/gfx/pics/ponyta/bitmask.asm
diff --git a/gfx/pics/077/frames.asm b/gfx/pics/ponyta/frames.asm
index d56e0dc21..d56e0dc21 100644
--- a/gfx/pics/077/frames.asm
+++ b/gfx/pics/ponyta/frames.asm
diff --git a/gfx/pics/077/front.lz b/gfx/pics/ponyta/front.6x6.2bpp.lz
index 5d3aa48db..5d3aa48db 100644
--- a/gfx/pics/077/front.lz
+++ b/gfx/pics/ponyta/front.6x6.2bpp.lz
diff --git a/gfx/pics/077/normal.pal b/gfx/pics/ponyta/normal.pal
index da67a88f7..da67a88f7 100644
--- a/gfx/pics/077/normal.pal
+++ b/gfx/pics/ponyta/normal.pal
diff --git a/gfx/pics/077/shiny.pal b/gfx/pics/ponyta/shiny.pal
index 0358f40dd..0358f40dd 100644
--- a/gfx/pics/077/shiny.pal
+++ b/gfx/pics/ponyta/shiny.pal
diff --git a/gfx/pics/137/anim0.asm b/gfx/pics/porygon/anim0.asm
index 0246a5621..0246a5621 100644
--- a/gfx/pics/137/anim0.asm
+++ b/gfx/pics/porygon/anim0.asm
diff --git a/gfx/pics/137/anim1.asm b/gfx/pics/porygon/anim1.asm
index 89af5d13f..89af5d13f 100644
--- a/gfx/pics/137/anim1.asm
+++ b/gfx/pics/porygon/anim1.asm
diff --git a/gfx/pics/137/back.lz b/gfx/pics/porygon/back.6x6.2bpp.lz
index 5f0a47032..5f0a47032 100644
--- a/gfx/pics/137/back.lz
+++ b/gfx/pics/porygon/back.6x6.2bpp.lz
diff --git a/gfx/pics/137/bitmask.asm b/gfx/pics/porygon/bitmask.asm
index 3cbd5be4e..3cbd5be4e 100644
--- a/gfx/pics/137/bitmask.asm
+++ b/gfx/pics/porygon/bitmask.asm
diff --git a/gfx/pics/137/frames.asm b/gfx/pics/porygon/frames.asm
index 885a011f2..885a011f2 100644
--- a/gfx/pics/137/frames.asm
+++ b/gfx/pics/porygon/frames.asm
diff --git a/gfx/pics/137/front.lz b/gfx/pics/porygon/front.6x6.2bpp.lz
index 734305a14..734305a14 100644
--- a/gfx/pics/137/front.lz
+++ b/gfx/pics/porygon/front.6x6.2bpp.lz
diff --git a/gfx/pics/137/normal.pal b/gfx/pics/porygon/normal.pal
index 61ca2eef9..61ca2eef9 100644
--- a/gfx/pics/137/normal.pal
+++ b/gfx/pics/porygon/normal.pal
diff --git a/gfx/pics/137/shiny.pal b/gfx/pics/porygon/shiny.pal
index bea4751bf..bea4751bf 100644
--- a/gfx/pics/137/shiny.pal
+++ b/gfx/pics/porygon/shiny.pal
diff --git a/gfx/pics/233/anim0.asm b/gfx/pics/porygon2/anim0.asm
index b94920e29..b94920e29 100644
--- a/gfx/pics/233/anim0.asm
+++ b/gfx/pics/porygon2/anim0.asm
diff --git a/gfx/pics/233/anim1.asm b/gfx/pics/porygon2/anim1.asm
index b3a029047..b3a029047 100644
--- a/gfx/pics/233/anim1.asm
+++ b/gfx/pics/porygon2/anim1.asm
diff --git a/gfx/pics/233/back.lz b/gfx/pics/porygon2/back.6x6.2bpp.lz
index 5be528963..5be528963 100644
--- a/gfx/pics/233/back.lz
+++ b/gfx/pics/porygon2/back.6x6.2bpp.lz
diff --git a/gfx/pics/233/bitmask.asm b/gfx/pics/porygon2/bitmask.asm
index c20f48420..c20f48420 100644
--- a/gfx/pics/233/bitmask.asm
+++ b/gfx/pics/porygon2/bitmask.asm
diff --git a/gfx/pics/233/frames.asm b/gfx/pics/porygon2/frames.asm
index 52d425937..52d425937 100644
--- a/gfx/pics/233/frames.asm
+++ b/gfx/pics/porygon2/frames.asm
diff --git a/gfx/pics/233/front.lz b/gfx/pics/porygon2/front.6x6.2bpp.lz
index 5e66bb54d..5e66bb54d 100644
--- a/gfx/pics/233/front.lz
+++ b/gfx/pics/porygon2/front.6x6.2bpp.lz
diff --git a/gfx/pics/233/normal.pal b/gfx/pics/porygon2/normal.pal
index 8dafc26b4..8dafc26b4 100644
--- a/gfx/pics/233/normal.pal
+++ b/gfx/pics/porygon2/normal.pal
diff --git a/gfx/pics/233/shiny.pal b/gfx/pics/porygon2/shiny.pal
index 3b0c4dabe..3b0c4dabe 100644
--- a/gfx/pics/233/shiny.pal
+++ b/gfx/pics/porygon2/shiny.pal
diff --git a/gfx/pics/057/anim0.asm b/gfx/pics/primeape/anim0.asm
index a2a427059..a2a427059 100644
--- a/gfx/pics/057/anim0.asm
+++ b/gfx/pics/primeape/anim0.asm
diff --git a/gfx/pics/057/anim1.asm b/gfx/pics/primeape/anim1.asm
index 7d1c8a2d7..7d1c8a2d7 100644
--- a/gfx/pics/057/anim1.asm
+++ b/gfx/pics/primeape/anim1.asm
diff --git a/gfx/pics/057/back.lz b/gfx/pics/primeape/back.6x6.2bpp.lz
index c0937a9ae..c0937a9ae 100644
--- a/gfx/pics/057/back.lz
+++ b/gfx/pics/primeape/back.6x6.2bpp.lz
diff --git a/gfx/pics/057/bitmask.asm b/gfx/pics/primeape/bitmask.asm
index 50865ad0f..50865ad0f 100644
--- a/gfx/pics/057/bitmask.asm
+++ b/gfx/pics/primeape/bitmask.asm
diff --git a/gfx/pics/057/frames.asm b/gfx/pics/primeape/frames.asm
index 70fefd629..70fefd629 100644
--- a/gfx/pics/057/frames.asm
+++ b/gfx/pics/primeape/frames.asm
diff --git a/gfx/pics/057/front.lz b/gfx/pics/primeape/front.7x7.2bpp.lz
index 8f513878f..8f513878f 100644
--- a/gfx/pics/057/front.lz
+++ b/gfx/pics/primeape/front.7x7.2bpp.lz
diff --git a/gfx/pics/057/normal.pal b/gfx/pics/primeape/normal.pal
index 9888864e2..9888864e2 100644
--- a/gfx/pics/057/normal.pal
+++ b/gfx/pics/primeape/normal.pal
diff --git a/gfx/pics/057/shiny.pal b/gfx/pics/primeape/shiny.pal
index ee3d37e93..ee3d37e93 100644
--- a/gfx/pics/057/shiny.pal
+++ b/gfx/pics/primeape/shiny.pal
diff --git a/gfx/pics/054/anim0.asm b/gfx/pics/psyduck/anim0.asm
index da6f3aec6..da6f3aec6 100644
--- a/gfx/pics/054/anim0.asm
+++ b/gfx/pics/psyduck/anim0.asm
diff --git a/gfx/pics/054/anim1.asm b/gfx/pics/psyduck/anim1.asm
index 2fabc5b19..2fabc5b19 100644
--- a/gfx/pics/054/anim1.asm
+++ b/gfx/pics/psyduck/anim1.asm
diff --git a/gfx/pics/054/back.lz b/gfx/pics/psyduck/back.6x6.2bpp.lz
index d627a146c..d627a146c 100644
--- a/gfx/pics/054/back.lz
+++ b/gfx/pics/psyduck/back.6x6.2bpp.lz
diff --git a/gfx/pics/054/bitmask.asm b/gfx/pics/psyduck/bitmask.asm
index 87fe02311..87fe02311 100644
--- a/gfx/pics/054/bitmask.asm
+++ b/gfx/pics/psyduck/bitmask.asm
diff --git a/gfx/pics/054/frames.asm b/gfx/pics/psyduck/frames.asm
index 12409bdb8..12409bdb8 100644
--- a/gfx/pics/054/frames.asm
+++ b/gfx/pics/psyduck/frames.asm
diff --git a/gfx/pics/054/front.lz b/gfx/pics/psyduck/front.5x5.2bpp.lz
index 7988f1b0c..7988f1b0c 100644
--- a/gfx/pics/054/front.lz
+++ b/gfx/pics/psyduck/front.5x5.2bpp.lz
diff --git a/gfx/pics/054/normal.pal b/gfx/pics/psyduck/normal.pal
index 794efb73e..794efb73e 100644
--- a/gfx/pics/054/normal.pal
+++ b/gfx/pics/psyduck/normal.pal
diff --git a/gfx/pics/054/shiny.pal b/gfx/pics/psyduck/shiny.pal
index 27cbf08c4..27cbf08c4 100644
--- a/gfx/pics/054/shiny.pal
+++ b/gfx/pics/psyduck/shiny.pal
diff --git a/gfx/pics/247/anim0.asm b/gfx/pics/pupitar/anim0.asm
index c3ea44bc9..c3ea44bc9 100644
--- a/gfx/pics/247/anim0.asm
+++ b/gfx/pics/pupitar/anim0.asm
diff --git a/gfx/pics/247/anim1.asm b/gfx/pics/pupitar/anim1.asm
index efc0f3bb4..efc0f3bb4 100644
--- a/gfx/pics/247/anim1.asm
+++ b/gfx/pics/pupitar/anim1.asm
diff --git a/gfx/pics/247/back.lz b/gfx/pics/pupitar/back.6x6.2bpp.lz
index 46cf0e240..46cf0e240 100644
--- a/gfx/pics/247/back.lz
+++ b/gfx/pics/pupitar/back.6x6.2bpp.lz
diff --git a/gfx/pics/247/bitmask.asm b/gfx/pics/pupitar/bitmask.asm
index 8d0fa45ba..8d0fa45ba 100644
--- a/gfx/pics/247/bitmask.asm
+++ b/gfx/pics/pupitar/bitmask.asm
diff --git a/gfx/pics/247/frames.asm b/gfx/pics/pupitar/frames.asm
index 20234c804..20234c804 100644
--- a/gfx/pics/247/frames.asm
+++ b/gfx/pics/pupitar/frames.asm
diff --git a/gfx/pics/247/front.lz b/gfx/pics/pupitar/front.6x6.2bpp.lz
index c39582db6..c39582db6 100644
--- a/gfx/pics/247/front.lz
+++ b/gfx/pics/pupitar/front.6x6.2bpp.lz
diff --git a/gfx/pics/247/normal.pal b/gfx/pics/pupitar/normal.pal
index 2b92d0804..2b92d0804 100644
--- a/gfx/pics/247/normal.pal
+++ b/gfx/pics/pupitar/normal.pal
diff --git a/gfx/pics/247/shiny.pal b/gfx/pics/pupitar/shiny.pal
index a8c6cb74f..a8c6cb74f 100644
--- a/gfx/pics/247/shiny.pal
+++ b/gfx/pics/pupitar/shiny.pal
diff --git a/gfx/pics/195/anim0.asm b/gfx/pics/quagsire/anim0.asm
index 852780069..852780069 100644
--- a/gfx/pics/195/anim0.asm
+++ b/gfx/pics/quagsire/anim0.asm
diff --git a/gfx/pics/195/anim1.asm b/gfx/pics/quagsire/anim1.asm
index f5c2ed31b..f5c2ed31b 100644
--- a/gfx/pics/195/anim1.asm
+++ b/gfx/pics/quagsire/anim1.asm
diff --git a/gfx/pics/195/back.lz b/gfx/pics/quagsire/back.6x6.2bpp.lz
index 543ce394f..543ce394f 100644
--- a/gfx/pics/195/back.lz
+++ b/gfx/pics/quagsire/back.6x6.2bpp.lz
diff --git a/gfx/pics/195/bitmask.asm b/gfx/pics/quagsire/bitmask.asm
index afd00bc28..afd00bc28 100644
--- a/gfx/pics/195/bitmask.asm
+++ b/gfx/pics/quagsire/bitmask.asm
diff --git a/gfx/pics/195/frames.asm b/gfx/pics/quagsire/frames.asm
index aa0fada5a..aa0fada5a 100644
--- a/gfx/pics/195/frames.asm
+++ b/gfx/pics/quagsire/frames.asm
diff --git a/gfx/pics/195/front.lz b/gfx/pics/quagsire/front.6x6.2bpp.lz
index d1f42f064..d1f42f064 100644
--- a/gfx/pics/195/front.lz
+++ b/gfx/pics/quagsire/front.6x6.2bpp.lz
diff --git a/gfx/pics/195/normal.pal b/gfx/pics/quagsire/normal.pal
index 22f75da58..22f75da58 100644
--- a/gfx/pics/195/normal.pal
+++ b/gfx/pics/quagsire/normal.pal
diff --git a/gfx/pics/195/shiny.pal b/gfx/pics/quagsire/shiny.pal
index 05ed0f64a..05ed0f64a 100644
--- a/gfx/pics/195/shiny.pal
+++ b/gfx/pics/quagsire/shiny.pal
diff --git a/gfx/pics/156/anim0.asm b/gfx/pics/quilava/anim0.asm
index b5df67978..b5df67978 100644
--- a/gfx/pics/156/anim0.asm
+++ b/gfx/pics/quilava/anim0.asm
diff --git a/gfx/pics/156/anim1.asm b/gfx/pics/quilava/anim1.asm
index 09f187796..09f187796 100644
--- a/gfx/pics/156/anim1.asm
+++ b/gfx/pics/quilava/anim1.asm
diff --git a/gfx/pics/156/back.lz b/gfx/pics/quilava/back.6x6.2bpp.lz
index 8514a77c7..8514a77c7 100644
--- a/gfx/pics/156/back.lz
+++ b/gfx/pics/quilava/back.6x6.2bpp.lz
diff --git a/gfx/pics/156/bitmask.asm b/gfx/pics/quilava/bitmask.asm
index 816878203..816878203 100644
--- a/gfx/pics/156/bitmask.asm
+++ b/gfx/pics/quilava/bitmask.asm
diff --git a/gfx/pics/156/frames.asm b/gfx/pics/quilava/frames.asm
index 624a20abc..624a20abc 100644
--- a/gfx/pics/156/frames.asm
+++ b/gfx/pics/quilava/frames.asm
diff --git a/gfx/pics/156/front.lz b/gfx/pics/quilava/front.6x6.2bpp.lz
index 33aebb81c..33aebb81c 100644
--- a/gfx/pics/156/front.lz
+++ b/gfx/pics/quilava/front.6x6.2bpp.lz
diff --git a/gfx/pics/156/normal.pal b/gfx/pics/quilava/normal.pal
index bee6c6eba..bee6c6eba 100644
--- a/gfx/pics/156/normal.pal
+++ b/gfx/pics/quilava/normal.pal
diff --git a/gfx/pics/156/shiny.pal b/gfx/pics/quilava/shiny.pal
index 5b3df0b4e..5b3df0b4e 100644
--- a/gfx/pics/156/shiny.pal
+++ b/gfx/pics/quilava/shiny.pal
diff --git a/gfx/pics/211/anim0.asm b/gfx/pics/qwilfish/anim0.asm
index 6e5d62d04..6e5d62d04 100644
--- a/gfx/pics/211/anim0.asm
+++ b/gfx/pics/qwilfish/anim0.asm
diff --git a/gfx/pics/211/anim1.asm b/gfx/pics/qwilfish/anim1.asm
index 4330e80cc..4330e80cc 100644
--- a/gfx/pics/211/anim1.asm
+++ b/gfx/pics/qwilfish/anim1.asm
diff --git a/gfx/pics/211/back.lz b/gfx/pics/qwilfish/back.6x6.2bpp.lz
index 09f793f47..09f793f47 100644
--- a/gfx/pics/211/back.lz
+++ b/gfx/pics/qwilfish/back.6x6.2bpp.lz
diff --git a/gfx/pics/211/bitmask.asm b/gfx/pics/qwilfish/bitmask.asm
index 64d0473cf..64d0473cf 100644
--- a/gfx/pics/211/bitmask.asm
+++ b/gfx/pics/qwilfish/bitmask.asm
diff --git a/gfx/pics/211/frames.asm b/gfx/pics/qwilfish/frames.asm
index ea01f63bb..ea01f63bb 100644
--- a/gfx/pics/211/frames.asm
+++ b/gfx/pics/qwilfish/frames.asm
diff --git a/gfx/pics/211/front.lz b/gfx/pics/qwilfish/front.5x5.2bpp.lz
index 02370c7ba..02370c7ba 100644
--- a/gfx/pics/211/front.lz
+++ b/gfx/pics/qwilfish/front.5x5.2bpp.lz
diff --git a/gfx/pics/211/normal.pal b/gfx/pics/qwilfish/normal.pal
index e6ba82ca6..e6ba82ca6 100644
--- a/gfx/pics/211/normal.pal
+++ b/gfx/pics/qwilfish/normal.pal
diff --git a/gfx/pics/211/shiny.pal b/gfx/pics/qwilfish/shiny.pal
index 97c36795e..97c36795e 100644
--- a/gfx/pics/211/shiny.pal
+++ b/gfx/pics/qwilfish/shiny.pal
diff --git a/gfx/pics/026/anim0.asm b/gfx/pics/raichu/anim0.asm
index a7312c7ae..a7312c7ae 100644
--- a/gfx/pics/026/anim0.asm
+++ b/gfx/pics/raichu/anim0.asm
diff --git a/gfx/pics/026/anim1.asm b/gfx/pics/raichu/anim1.asm
index 87f07ce9c..87f07ce9c 100644
--- a/gfx/pics/026/anim1.asm
+++ b/gfx/pics/raichu/anim1.asm
diff --git a/gfx/pics/026/back.lz b/gfx/pics/raichu/back.6x6.2bpp.lz
index 912c378e8..912c378e8 100644
--- a/gfx/pics/026/back.lz
+++ b/gfx/pics/raichu/back.6x6.2bpp.lz
diff --git a/gfx/pics/026/bitmask.asm b/gfx/pics/raichu/bitmask.asm
index 544cfb180..544cfb180 100644
--- a/gfx/pics/026/bitmask.asm
+++ b/gfx/pics/raichu/bitmask.asm
diff --git a/gfx/pics/026/frames.asm b/gfx/pics/raichu/frames.asm
index 7045cf9f5..7045cf9f5 100644
--- a/gfx/pics/026/frames.asm
+++ b/gfx/pics/raichu/frames.asm
diff --git a/gfx/pics/026/front.lz b/gfx/pics/raichu/front.7x7.2bpp.lz
index 84115fb00..84115fb00 100644
--- a/gfx/pics/026/front.lz
+++ b/gfx/pics/raichu/front.7x7.2bpp.lz
diff --git a/gfx/pics/026/normal.pal b/gfx/pics/raichu/normal.pal
index f03f62b08..f03f62b08 100644
--- a/gfx/pics/026/normal.pal
+++ b/gfx/pics/raichu/normal.pal
diff --git a/gfx/pics/026/shiny.pal b/gfx/pics/raichu/shiny.pal
index 0491d1ee2..0491d1ee2 100644
--- a/gfx/pics/026/shiny.pal
+++ b/gfx/pics/raichu/shiny.pal
diff --git a/gfx/pics/243/anim0.asm b/gfx/pics/raikou/anim0.asm
index 91931b3ef..91931b3ef 100644
--- a/gfx/pics/243/anim0.asm
+++ b/gfx/pics/raikou/anim0.asm
diff --git a/gfx/pics/243/anim1.asm b/gfx/pics/raikou/anim1.asm
index ec54577cd..ec54577cd 100644
--- a/gfx/pics/243/anim1.asm
+++ b/gfx/pics/raikou/anim1.asm
diff --git a/gfx/pics/243/back.lz b/gfx/pics/raikou/back.6x6.2bpp.lz
index 23fd5c471..23fd5c471 100644
--- a/gfx/pics/243/back.lz
+++ b/gfx/pics/raikou/back.6x6.2bpp.lz
diff --git a/gfx/pics/243/bitmask.asm b/gfx/pics/raikou/bitmask.asm
index 7daef5b70..7daef5b70 100644
--- a/gfx/pics/243/bitmask.asm
+++ b/gfx/pics/raikou/bitmask.asm
diff --git a/gfx/pics/243/frames.asm b/gfx/pics/raikou/frames.asm
index d23459811..d23459811 100644
--- a/gfx/pics/243/frames.asm
+++ b/gfx/pics/raikou/frames.asm
diff --git a/gfx/pics/243/front.lz b/gfx/pics/raikou/front.7x7.2bpp.lz
index dba4517aa..dba4517aa 100644
--- a/gfx/pics/243/front.lz
+++ b/gfx/pics/raikou/front.7x7.2bpp.lz
diff --git a/gfx/pics/243/normal.pal b/gfx/pics/raikou/normal.pal
index d357a2df0..d357a2df0 100644
--- a/gfx/pics/243/normal.pal
+++ b/gfx/pics/raikou/normal.pal
diff --git a/gfx/pics/243/shiny.pal b/gfx/pics/raikou/shiny.pal
index 509a54c48..509a54c48 100644
--- a/gfx/pics/243/shiny.pal
+++ b/gfx/pics/raikou/shiny.pal
diff --git a/gfx/pics/078/anim0.asm b/gfx/pics/rapidash/anim0.asm
index 6fe29db8f..6fe29db8f 100644
--- a/gfx/pics/078/anim0.asm
+++ b/gfx/pics/rapidash/anim0.asm
diff --git a/gfx/pics/078/anim1.asm b/gfx/pics/rapidash/anim1.asm
index 0105673c9..0105673c9 100644
--- a/gfx/pics/078/anim1.asm
+++ b/gfx/pics/rapidash/anim1.asm
diff --git a/gfx/pics/078/back.lz b/gfx/pics/rapidash/back.6x6.2bpp.lz
index 3854c29e5..3854c29e5 100644
--- a/gfx/pics/078/back.lz
+++ b/gfx/pics/rapidash/back.6x6.2bpp.lz
diff --git a/gfx/pics/078/bitmask.asm b/gfx/pics/rapidash/bitmask.asm
index 7463fcdbe..7463fcdbe 100644
--- a/gfx/pics/078/bitmask.asm
+++ b/gfx/pics/rapidash/bitmask.asm
diff --git a/gfx/pics/078/frames.asm b/gfx/pics/rapidash/frames.asm
index 5072bbd78..5072bbd78 100644
--- a/gfx/pics/078/frames.asm
+++ b/gfx/pics/rapidash/frames.asm
diff --git a/gfx/pics/078/front.lz b/gfx/pics/rapidash/front.7x7.2bpp.lz
index 231e312fb..231e312fb 100644
--- a/gfx/pics/078/front.lz
+++ b/gfx/pics/rapidash/front.7x7.2bpp.lz
diff --git a/gfx/pics/078/normal.pal b/gfx/pics/rapidash/normal.pal
index da67a88f7..da67a88f7 100644
--- a/gfx/pics/078/normal.pal
+++ b/gfx/pics/rapidash/normal.pal
diff --git a/gfx/pics/078/shiny.pal b/gfx/pics/rapidash/shiny.pal
index f6ae96e3c..f6ae96e3c 100644
--- a/gfx/pics/078/shiny.pal
+++ b/gfx/pics/rapidash/shiny.pal
diff --git a/gfx/pics/020/anim0.asm b/gfx/pics/raticate/anim0.asm
index ad6450f27..ad6450f27 100644
--- a/gfx/pics/020/anim0.asm
+++ b/gfx/pics/raticate/anim0.asm
diff --git a/gfx/pics/020/anim1.asm b/gfx/pics/raticate/anim1.asm
index 3ff83aa1c..3ff83aa1c 100644
--- a/gfx/pics/020/anim1.asm
+++ b/gfx/pics/raticate/anim1.asm
diff --git a/gfx/pics/020/back.lz b/gfx/pics/raticate/back.6x6.2bpp.lz
index 4e69587dd..4e69587dd 100644
--- a/gfx/pics/020/back.lz
+++ b/gfx/pics/raticate/back.6x6.2bpp.lz
diff --git a/gfx/pics/020/bitmask.asm b/gfx/pics/raticate/bitmask.asm
index e4a839f64..e4a839f64 100644
--- a/gfx/pics/020/bitmask.asm
+++ b/gfx/pics/raticate/bitmask.asm
diff --git a/gfx/pics/020/frames.asm b/gfx/pics/raticate/frames.asm
index e2da8a1e1..e2da8a1e1 100644
--- a/gfx/pics/020/frames.asm
+++ b/gfx/pics/raticate/frames.asm
diff --git a/gfx/pics/020/front.lz b/gfx/pics/raticate/front.6x6.2bpp.lz
index 5b426cbdd..5b426cbdd 100644
--- a/gfx/pics/020/front.lz
+++ b/gfx/pics/raticate/front.6x6.2bpp.lz
diff --git a/gfx/pics/020/normal.pal b/gfx/pics/raticate/normal.pal
index 769c93f9e..769c93f9e 100644
--- a/gfx/pics/020/normal.pal
+++ b/gfx/pics/raticate/normal.pal
diff --git a/gfx/pics/020/shiny.pal b/gfx/pics/raticate/shiny.pal
index a0c0f5546..a0c0f5546 100644
--- a/gfx/pics/020/shiny.pal
+++ b/gfx/pics/raticate/shiny.pal
diff --git a/gfx/pics/019/anim0.asm b/gfx/pics/rattata/anim0.asm
index 0c72f16f9..0c72f16f9 100644
--- a/gfx/pics/019/anim0.asm
+++ b/gfx/pics/rattata/anim0.asm
diff --git a/gfx/pics/019/anim1.asm b/gfx/pics/rattata/anim1.asm
index a760b136e..a760b136e 100644
--- a/gfx/pics/019/anim1.asm
+++ b/gfx/pics/rattata/anim1.asm
diff --git a/gfx/pics/019/back.lz b/gfx/pics/rattata/back.6x6.2bpp.lz
index a06c5f1f8..a06c5f1f8 100644
--- a/gfx/pics/019/back.lz
+++ b/gfx/pics/rattata/back.6x6.2bpp.lz
diff --git a/gfx/pics/019/bitmask.asm b/gfx/pics/rattata/bitmask.asm
index b15445e5c..b15445e5c 100644
--- a/gfx/pics/019/bitmask.asm
+++ b/gfx/pics/rattata/bitmask.asm
diff --git a/gfx/pics/019/frames.asm b/gfx/pics/rattata/frames.asm
index 621d4fb5d..621d4fb5d 100644
--- a/gfx/pics/019/frames.asm
+++ b/gfx/pics/rattata/frames.asm
diff --git a/gfx/pics/019/front.lz b/gfx/pics/rattata/front.5x5.2bpp.lz
index 7bb18d542..7bb18d542 100644
--- a/gfx/pics/019/front.lz
+++ b/gfx/pics/rattata/front.5x5.2bpp.lz
diff --git a/gfx/pics/019/normal.pal b/gfx/pics/rattata/normal.pal
index 8b71d7ccc..8b71d7ccc 100644
--- a/gfx/pics/019/normal.pal
+++ b/gfx/pics/rattata/normal.pal
diff --git a/gfx/pics/019/shiny.pal b/gfx/pics/rattata/shiny.pal
index 834a29cf0..834a29cf0 100644
--- a/gfx/pics/019/shiny.pal
+++ b/gfx/pics/rattata/shiny.pal
diff --git a/gfx/pics/223/anim0.asm b/gfx/pics/remoraid/anim0.asm
index 5fca75d12..5fca75d12 100644
--- a/gfx/pics/223/anim0.asm
+++ b/gfx/pics/remoraid/anim0.asm
diff --git a/gfx/pics/223/anim1.asm b/gfx/pics/remoraid/anim1.asm
index cb14bb7a7..cb14bb7a7 100644
--- a/gfx/pics/223/anim1.asm
+++ b/gfx/pics/remoraid/anim1.asm
diff --git a/gfx/pics/223/back.lz b/gfx/pics/remoraid/back.6x6.2bpp.lz
index 414d65a14..414d65a14 100644
--- a/gfx/pics/223/back.lz
+++ b/gfx/pics/remoraid/back.6x6.2bpp.lz
diff --git a/gfx/pics/223/bitmask.asm b/gfx/pics/remoraid/bitmask.asm
index d9beafdb2..d9beafdb2 100644
--- a/gfx/pics/223/bitmask.asm
+++ b/gfx/pics/remoraid/bitmask.asm
diff --git a/gfx/pics/223/frames.asm b/gfx/pics/remoraid/frames.asm
index 97dc49c3b..97dc49c3b 100644
--- a/gfx/pics/223/frames.asm
+++ b/gfx/pics/remoraid/frames.asm
diff --git a/gfx/pics/223/front.lz b/gfx/pics/remoraid/front.5x5.2bpp.lz
index 6d702b4a1..6d702b4a1 100644
--- a/gfx/pics/223/front.lz
+++ b/gfx/pics/remoraid/front.5x5.2bpp.lz
diff --git a/gfx/pics/223/normal.pal b/gfx/pics/remoraid/normal.pal
index 5373535b1..5373535b1 100644
--- a/gfx/pics/223/normal.pal
+++ b/gfx/pics/remoraid/normal.pal
diff --git a/gfx/pics/223/shiny.pal b/gfx/pics/remoraid/shiny.pal
index 669e14e4a..669e14e4a 100644
--- a/gfx/pics/223/shiny.pal
+++ b/gfx/pics/remoraid/shiny.pal
diff --git a/gfx/pics/112/anim0.asm b/gfx/pics/rhydon/anim0.asm
index 77d736a55..77d736a55 100644
--- a/gfx/pics/112/anim0.asm
+++ b/gfx/pics/rhydon/anim0.asm
diff --git a/gfx/pics/112/anim1.asm b/gfx/pics/rhydon/anim1.asm
index b572a54ed..b572a54ed 100644
--- a/gfx/pics/112/anim1.asm
+++ b/gfx/pics/rhydon/anim1.asm
diff --git a/gfx/pics/112/back.lz b/gfx/pics/rhydon/back.6x6.2bpp.lz
index b626f4ce6..b626f4ce6 100644
--- a/gfx/pics/112/back.lz
+++ b/gfx/pics/rhydon/back.6x6.2bpp.lz
diff --git a/gfx/pics/112/bitmask.asm b/gfx/pics/rhydon/bitmask.asm
index 1a5064c1d..1a5064c1d 100644
--- a/gfx/pics/112/bitmask.asm
+++ b/gfx/pics/rhydon/bitmask.asm
diff --git a/gfx/pics/112/frames.asm b/gfx/pics/rhydon/frames.asm
index a87f8370a..a87f8370a 100644
--- a/gfx/pics/112/frames.asm
+++ b/gfx/pics/rhydon/frames.asm
diff --git a/gfx/pics/112/front.lz b/gfx/pics/rhydon/front.7x7.2bpp.lz
index 0ad1c221b..0ad1c221b 100644
--- a/gfx/pics/112/front.lz
+++ b/gfx/pics/rhydon/front.7x7.2bpp.lz
diff --git a/gfx/pics/111/normal.pal b/gfx/pics/rhydon/normal.pal
index 5dbf17032..5dbf17032 100644
--- a/gfx/pics/111/normal.pal
+++ b/gfx/pics/rhydon/normal.pal
diff --git a/gfx/pics/112/shiny.pal b/gfx/pics/rhydon/shiny.pal
index b036be1f3..b036be1f3 100644
--- a/gfx/pics/112/shiny.pal
+++ b/gfx/pics/rhydon/shiny.pal
diff --git a/gfx/pics/111/anim0.asm b/gfx/pics/rhyhorn/anim0.asm
index b966557c4..b966557c4 100644
--- a/gfx/pics/111/anim0.asm
+++ b/gfx/pics/rhyhorn/anim0.asm
diff --git a/gfx/pics/111/anim1.asm b/gfx/pics/rhyhorn/anim1.asm
index 66e53642e..66e53642e 100644
--- a/gfx/pics/111/anim1.asm
+++ b/gfx/pics/rhyhorn/anim1.asm
diff --git a/gfx/pics/111/back.lz b/gfx/pics/rhyhorn/back.6x6.2bpp.lz
index bfcafdcb4..bfcafdcb4 100644
--- a/gfx/pics/111/back.lz
+++ b/gfx/pics/rhyhorn/back.6x6.2bpp.lz
diff --git a/gfx/pics/111/bitmask.asm b/gfx/pics/rhyhorn/bitmask.asm
index b5c02fc90..b5c02fc90 100644
--- a/gfx/pics/111/bitmask.asm
+++ b/gfx/pics/rhyhorn/bitmask.asm
diff --git a/gfx/pics/111/frames.asm b/gfx/pics/rhyhorn/frames.asm
index 93875b4dd..93875b4dd 100644
--- a/gfx/pics/111/frames.asm
+++ b/gfx/pics/rhyhorn/frames.asm
diff --git a/gfx/pics/111/front.lz b/gfx/pics/rhyhorn/front.7x7.2bpp.lz
index 62a2e8919..62a2e8919 100644
--- a/gfx/pics/111/front.lz
+++ b/gfx/pics/rhyhorn/front.7x7.2bpp.lz
diff --git a/gfx/pics/112/normal.pal b/gfx/pics/rhyhorn/normal.pal
index 5dbf17032..5dbf17032 100644
--- a/gfx/pics/112/normal.pal
+++ b/gfx/pics/rhyhorn/normal.pal
diff --git a/gfx/pics/111/shiny.pal b/gfx/pics/rhyhorn/shiny.pal
index 4b11a7f20..4b11a7f20 100644
--- a/gfx/pics/111/shiny.pal
+++ b/gfx/pics/rhyhorn/shiny.pal
diff --git a/gfx/pics/027/anim0.asm b/gfx/pics/sandshrew/anim0.asm
index 01827dda4..01827dda4 100644
--- a/gfx/pics/027/anim0.asm
+++ b/gfx/pics/sandshrew/anim0.asm
diff --git a/gfx/pics/027/anim1.asm b/gfx/pics/sandshrew/anim1.asm
index 545b445bd..545b445bd 100644
--- a/gfx/pics/027/anim1.asm
+++ b/gfx/pics/sandshrew/anim1.asm
diff --git a/gfx/pics/027/back.lz b/gfx/pics/sandshrew/back.6x6.2bpp.lz
index 63ddb82a1..63ddb82a1 100644
--- a/gfx/pics/027/back.lz
+++ b/gfx/pics/sandshrew/back.6x6.2bpp.lz
diff --git a/gfx/pics/027/bitmask.asm b/gfx/pics/sandshrew/bitmask.asm
index 42e84c4ab..42e84c4ab 100644
--- a/gfx/pics/027/bitmask.asm
+++ b/gfx/pics/sandshrew/bitmask.asm
diff --git a/gfx/pics/027/frames.asm b/gfx/pics/sandshrew/frames.asm
index a4d496760..a4d496760 100644
--- a/gfx/pics/027/frames.asm
+++ b/gfx/pics/sandshrew/frames.asm
diff --git a/gfx/pics/027/front.lz b/gfx/pics/sandshrew/front.5x5.2bpp.lz
index 3d1da3087..3d1da3087 100644
--- a/gfx/pics/027/front.lz
+++ b/gfx/pics/sandshrew/front.5x5.2bpp.lz
diff --git a/gfx/pics/027/normal.pal b/gfx/pics/sandshrew/normal.pal
index 8039e0086..8039e0086 100644
--- a/gfx/pics/027/normal.pal
+++ b/gfx/pics/sandshrew/normal.pal
diff --git a/gfx/pics/027/shiny.pal b/gfx/pics/sandshrew/shiny.pal
index 86d48731e..86d48731e 100644
--- a/gfx/pics/027/shiny.pal
+++ b/gfx/pics/sandshrew/shiny.pal
diff --git a/gfx/pics/028/anim0.asm b/gfx/pics/sandslash/anim0.asm
index 040c0c429..040c0c429 100644
--- a/gfx/pics/028/anim0.asm
+++ b/gfx/pics/sandslash/anim0.asm
diff --git a/gfx/pics/028/anim1.asm b/gfx/pics/sandslash/anim1.asm
index b3480762d..b3480762d 100644
--- a/gfx/pics/028/anim1.asm
+++ b/gfx/pics/sandslash/anim1.asm
diff --git a/gfx/pics/028/back.lz b/gfx/pics/sandslash/back.6x6.2bpp.lz
index 52bb7ce7d..52bb7ce7d 100644
--- a/gfx/pics/028/back.lz
+++ b/gfx/pics/sandslash/back.6x6.2bpp.lz
diff --git a/gfx/pics/028/bitmask.asm b/gfx/pics/sandslash/bitmask.asm
index f09f721bb..f09f721bb 100644
--- a/gfx/pics/028/bitmask.asm
+++ b/gfx/pics/sandslash/bitmask.asm
diff --git a/gfx/pics/028/frames.asm b/gfx/pics/sandslash/frames.asm
index ba6a1d8f8..ba6a1d8f8 100644
--- a/gfx/pics/028/frames.asm
+++ b/gfx/pics/sandslash/frames.asm
diff --git a/gfx/pics/028/front.lz b/gfx/pics/sandslash/front.6x6.2bpp.lz
index cdffe9baf..cdffe9baf 100644
--- a/gfx/pics/028/front.lz
+++ b/gfx/pics/sandslash/front.6x6.2bpp.lz
diff --git a/gfx/pics/028/normal.pal b/gfx/pics/sandslash/normal.pal
index 0c2b451d9..0c2b451d9 100644
--- a/gfx/pics/028/normal.pal
+++ b/gfx/pics/sandslash/normal.pal
diff --git a/gfx/pics/028/shiny.pal b/gfx/pics/sandslash/shiny.pal
index db584124b..db584124b 100644
--- a/gfx/pics/028/shiny.pal
+++ b/gfx/pics/sandslash/shiny.pal
diff --git a/gfx/pics/212/anim0.asm b/gfx/pics/scizor/anim0.asm
index d269c91d1..d269c91d1 100644
--- a/gfx/pics/212/anim0.asm
+++ b/gfx/pics/scizor/anim0.asm
diff --git a/gfx/pics/212/anim1.asm b/gfx/pics/scizor/anim1.asm
index 744d6cafc..744d6cafc 100644
--- a/gfx/pics/212/anim1.asm
+++ b/gfx/pics/scizor/anim1.asm
diff --git a/gfx/pics/212/back.lz b/gfx/pics/scizor/back.6x6.2bpp.lz
index 5a02e7000..5a02e7000 100644
--- a/gfx/pics/212/back.lz
+++ b/gfx/pics/scizor/back.6x6.2bpp.lz
diff --git a/gfx/pics/212/bitmask.asm b/gfx/pics/scizor/bitmask.asm
index 628329295..628329295 100644
--- a/gfx/pics/212/bitmask.asm
+++ b/gfx/pics/scizor/bitmask.asm
diff --git a/gfx/pics/212/frames.asm b/gfx/pics/scizor/frames.asm
index aeae2522f..aeae2522f 100644
--- a/gfx/pics/212/frames.asm
+++ b/gfx/pics/scizor/frames.asm
diff --git a/gfx/pics/212/front.lz b/gfx/pics/scizor/front.7x7.2bpp.lz
index e7d506f48..e7d506f48 100644
--- a/gfx/pics/212/front.lz
+++ b/gfx/pics/scizor/front.7x7.2bpp.lz
diff --git a/gfx/pics/212/normal.pal b/gfx/pics/scizor/normal.pal
index 6dd98afbb..6dd98afbb 100644
--- a/gfx/pics/212/normal.pal
+++ b/gfx/pics/scizor/normal.pal
diff --git a/gfx/pics/212/shiny.pal b/gfx/pics/scizor/shiny.pal
index e4f5cf30e..e4f5cf30e 100644
--- a/gfx/pics/212/shiny.pal
+++ b/gfx/pics/scizor/shiny.pal
diff --git a/gfx/pics/123/anim0.asm b/gfx/pics/scyther/anim0.asm
index 572161065..572161065 100644
--- a/gfx/pics/123/anim0.asm
+++ b/gfx/pics/scyther/anim0.asm
diff --git a/gfx/pics/123/anim1.asm b/gfx/pics/scyther/anim1.asm
index e251a964d..e251a964d 100644
--- a/gfx/pics/123/anim1.asm
+++ b/gfx/pics/scyther/anim1.asm
diff --git a/gfx/pics/123/back.lz b/gfx/pics/scyther/back.6x6.2bpp.lz
index 421fc4ed0..421fc4ed0 100644
--- a/gfx/pics/123/back.lz
+++ b/gfx/pics/scyther/back.6x6.2bpp.lz
diff --git a/gfx/pics/123/bitmask.asm b/gfx/pics/scyther/bitmask.asm
index 7463aafd1..7463aafd1 100644
--- a/gfx/pics/123/bitmask.asm
+++ b/gfx/pics/scyther/bitmask.asm
diff --git a/gfx/pics/123/frames.asm b/gfx/pics/scyther/frames.asm
index 4668c0ff1..4668c0ff1 100644
--- a/gfx/pics/123/frames.asm
+++ b/gfx/pics/scyther/frames.asm
diff --git a/gfx/pics/123/front.lz b/gfx/pics/scyther/front.7x7.2bpp.lz
index 02773fc11..02773fc11 100644
--- a/gfx/pics/123/front.lz
+++ b/gfx/pics/scyther/front.7x7.2bpp.lz
diff --git a/gfx/pics/123/normal.pal b/gfx/pics/scyther/normal.pal
index ce30374e5..ce30374e5 100644
--- a/gfx/pics/123/normal.pal
+++ b/gfx/pics/scyther/normal.pal
diff --git a/gfx/pics/123/shiny.pal b/gfx/pics/scyther/shiny.pal
index 550d6dece..550d6dece 100644
--- a/gfx/pics/123/shiny.pal
+++ b/gfx/pics/scyther/shiny.pal
diff --git a/gfx/pics/117/anim0.asm b/gfx/pics/seadra/anim0.asm
index d06adbdb0..d06adbdb0 100644
--- a/gfx/pics/117/anim0.asm
+++ b/gfx/pics/seadra/anim0.asm
diff --git a/gfx/pics/117/anim1.asm b/gfx/pics/seadra/anim1.asm
index d4c171276..d4c171276 100644
--- a/gfx/pics/117/anim1.asm
+++ b/gfx/pics/seadra/anim1.asm
diff --git a/gfx/pics/117/back.lz b/gfx/pics/seadra/back.6x6.2bpp.lz
index ba9025832..ba9025832 100644
--- a/gfx/pics/117/back.lz
+++ b/gfx/pics/seadra/back.6x6.2bpp.lz
diff --git a/gfx/pics/117/bitmask.asm b/gfx/pics/seadra/bitmask.asm
index 35c11d467..35c11d467 100644
--- a/gfx/pics/117/bitmask.asm
+++ b/gfx/pics/seadra/bitmask.asm
diff --git a/gfx/pics/117/frames.asm b/gfx/pics/seadra/frames.asm
index 13b4878c4..13b4878c4 100644
--- a/gfx/pics/117/frames.asm
+++ b/gfx/pics/seadra/frames.asm
diff --git a/gfx/pics/117/front.lz b/gfx/pics/seadra/front.6x6.2bpp.lz
index 6d63f3645..6d63f3645 100644
--- a/gfx/pics/117/front.lz
+++ b/gfx/pics/seadra/front.6x6.2bpp.lz
diff --git a/gfx/pics/117/normal.pal b/gfx/pics/seadra/normal.pal
index 93b323071..93b323071 100644
--- a/gfx/pics/117/normal.pal
+++ b/gfx/pics/seadra/normal.pal
diff --git a/gfx/pics/117/shiny.pal b/gfx/pics/seadra/shiny.pal
index 7dab3b2ec..7dab3b2ec 100644
--- a/gfx/pics/117/shiny.pal
+++ b/gfx/pics/seadra/shiny.pal
diff --git a/gfx/pics/119/anim0.asm b/gfx/pics/seaking/anim0.asm
index a147346e2..a147346e2 100644
--- a/gfx/pics/119/anim0.asm
+++ b/gfx/pics/seaking/anim0.asm
diff --git a/gfx/pics/119/anim1.asm b/gfx/pics/seaking/anim1.asm
index 3d949a4bb..3d949a4bb 100644
--- a/gfx/pics/119/anim1.asm
+++ b/gfx/pics/seaking/anim1.asm
diff --git a/gfx/pics/119/back.lz b/gfx/pics/seaking/back.6x6.2bpp.lz
index 328a1fb55..328a1fb55 100644
--- a/gfx/pics/119/back.lz
+++ b/gfx/pics/seaking/back.6x6.2bpp.lz
diff --git a/gfx/pics/119/bitmask.asm b/gfx/pics/seaking/bitmask.asm
index 6a4a854e3..6a4a854e3 100644
--- a/gfx/pics/119/bitmask.asm
+++ b/gfx/pics/seaking/bitmask.asm
diff --git a/gfx/pics/119/frames.asm b/gfx/pics/seaking/frames.asm
index 0bef27ed1..0bef27ed1 100644
--- a/gfx/pics/119/frames.asm
+++ b/gfx/pics/seaking/frames.asm
diff --git a/gfx/pics/119/front.lz b/gfx/pics/seaking/front.7x7.2bpp.lz
index e204f1025..e204f1025 100644
--- a/gfx/pics/119/front.lz
+++ b/gfx/pics/seaking/front.7x7.2bpp.lz
diff --git a/gfx/pics/119/normal.pal b/gfx/pics/seaking/normal.pal
index 2adfee5c9..2adfee5c9 100644
--- a/gfx/pics/119/normal.pal
+++ b/gfx/pics/seaking/normal.pal
diff --git a/gfx/pics/119/shiny.pal b/gfx/pics/seaking/shiny.pal
index be7291e84..be7291e84 100644
--- a/gfx/pics/119/shiny.pal
+++ b/gfx/pics/seaking/shiny.pal
diff --git a/gfx/pics/086/anim0.asm b/gfx/pics/seel/anim0.asm
index ea92a35be..ea92a35be 100644
--- a/gfx/pics/086/anim0.asm
+++ b/gfx/pics/seel/anim0.asm
diff --git a/gfx/pics/086/anim1.asm b/gfx/pics/seel/anim1.asm
index c601e55e5..c601e55e5 100644
--- a/gfx/pics/086/anim1.asm
+++ b/gfx/pics/seel/anim1.asm
diff --git a/gfx/pics/086/back.lz b/gfx/pics/seel/back.6x6.2bpp.lz
index 0d5b89dae..0d5b89dae 100644
--- a/gfx/pics/086/back.lz
+++ b/gfx/pics/seel/back.6x6.2bpp.lz
diff --git a/gfx/pics/086/bitmask.asm b/gfx/pics/seel/bitmask.asm
index 057a06a50..057a06a50 100644
--- a/gfx/pics/086/bitmask.asm
+++ b/gfx/pics/seel/bitmask.asm
diff --git a/gfx/pics/086/frames.asm b/gfx/pics/seel/frames.asm
index 48af98244..48af98244 100644
--- a/gfx/pics/086/frames.asm
+++ b/gfx/pics/seel/frames.asm
diff --git a/gfx/pics/086/front.lz b/gfx/pics/seel/front.6x6.2bpp.lz
index c8f1343d6..c8f1343d6 100644
--- a/gfx/pics/086/front.lz
+++ b/gfx/pics/seel/front.6x6.2bpp.lz
diff --git a/gfx/pics/086/normal.pal b/gfx/pics/seel/normal.pal
index 9c09450cb..9c09450cb 100644
--- a/gfx/pics/086/normal.pal
+++ b/gfx/pics/seel/normal.pal
diff --git a/gfx/pics/086/shiny.pal b/gfx/pics/seel/shiny.pal
index bee98179f..bee98179f 100644
--- a/gfx/pics/086/shiny.pal
+++ b/gfx/pics/seel/shiny.pal
diff --git a/gfx/pics/161/anim0.asm b/gfx/pics/sentret/anim0.asm
index 8080c7303..8080c7303 100644
--- a/gfx/pics/161/anim0.asm
+++ b/gfx/pics/sentret/anim0.asm
diff --git a/gfx/pics/161/anim1.asm b/gfx/pics/sentret/anim1.asm
index 9fcaecad0..9fcaecad0 100644
--- a/gfx/pics/161/anim1.asm
+++ b/gfx/pics/sentret/anim1.asm
diff --git a/gfx/pics/161/back.lz b/gfx/pics/sentret/back.6x6.2bpp.lz
index 511ba5465..511ba5465 100644
--- a/gfx/pics/161/back.lz
+++ b/gfx/pics/sentret/back.6x6.2bpp.lz
diff --git a/gfx/pics/161/bitmask.asm b/gfx/pics/sentret/bitmask.asm
index d50ae28c1..d50ae28c1 100644
--- a/gfx/pics/161/bitmask.asm
+++ b/gfx/pics/sentret/bitmask.asm
diff --git a/gfx/pics/161/frames.asm b/gfx/pics/sentret/frames.asm
index ef9ce4b84..ef9ce4b84 100644
--- a/gfx/pics/161/frames.asm
+++ b/gfx/pics/sentret/frames.asm
diff --git a/gfx/pics/161/front.lz b/gfx/pics/sentret/front.6x6.2bpp.lz
index 229aa430c..229aa430c 100644
--- a/gfx/pics/161/front.lz
+++ b/gfx/pics/sentret/front.6x6.2bpp.lz
diff --git a/gfx/pics/161/normal.pal b/gfx/pics/sentret/normal.pal
index 2d0891fb6..2d0891fb6 100644
--- a/gfx/pics/161/normal.pal
+++ b/gfx/pics/sentret/normal.pal
diff --git a/gfx/pics/161/shiny.pal b/gfx/pics/sentret/shiny.pal
index 86ba2ffba..86ba2ffba 100644
--- a/gfx/pics/161/shiny.pal
+++ b/gfx/pics/sentret/shiny.pal
diff --git a/gfx/pics/090/anim0.asm b/gfx/pics/shellder/anim0.asm
index 71aa3d358..71aa3d358 100644
--- a/gfx/pics/090/anim0.asm
+++ b/gfx/pics/shellder/anim0.asm
diff --git a/gfx/pics/090/anim1.asm b/gfx/pics/shellder/anim1.asm
index c32e9d19c..c32e9d19c 100644
--- a/gfx/pics/090/anim1.asm
+++ b/gfx/pics/shellder/anim1.asm
diff --git a/gfx/pics/090/back.lz b/gfx/pics/shellder/back.6x6.2bpp.lz
index f0d93b8a8..f0d93b8a8 100644
--- a/gfx/pics/090/back.lz
+++ b/gfx/pics/shellder/back.6x6.2bpp.lz
diff --git a/gfx/pics/090/bitmask.asm b/gfx/pics/shellder/bitmask.asm
index a925781f8..a925781f8 100644
--- a/gfx/pics/090/bitmask.asm
+++ b/gfx/pics/shellder/bitmask.asm
diff --git a/gfx/pics/090/frames.asm b/gfx/pics/shellder/frames.asm
index 7896b134e..7896b134e 100644
--- a/gfx/pics/090/frames.asm
+++ b/gfx/pics/shellder/frames.asm
diff --git a/gfx/pics/090/front.lz b/gfx/pics/shellder/front.5x5.2bpp.lz
index 5a444cfa6..5a444cfa6 100644
--- a/gfx/pics/090/front.lz
+++ b/gfx/pics/shellder/front.5x5.2bpp.lz
diff --git a/gfx/pics/090/normal.pal b/gfx/pics/shellder/normal.pal
index c36e0c685..c36e0c685 100644
--- a/gfx/pics/090/normal.pal
+++ b/gfx/pics/shellder/normal.pal
diff --git a/gfx/pics/090/shiny.pal b/gfx/pics/shellder/shiny.pal
index 21c389b28..21c389b28 100644
--- a/gfx/pics/090/shiny.pal
+++ b/gfx/pics/shellder/shiny.pal
diff --git a/gfx/pics/213/anim0.asm b/gfx/pics/shuckle/anim0.asm
index 148d2bf7d..148d2bf7d 100644
--- a/gfx/pics/213/anim0.asm
+++ b/gfx/pics/shuckle/anim0.asm
diff --git a/gfx/pics/213/anim1.asm b/gfx/pics/shuckle/anim1.asm
index 4dd072951..4dd072951 100644
--- a/gfx/pics/213/anim1.asm
+++ b/gfx/pics/shuckle/anim1.asm
diff --git a/gfx/pics/213/back.lz b/gfx/pics/shuckle/back.6x6.2bpp.lz
index 1cc4efcea..1cc4efcea 100644
--- a/gfx/pics/213/back.lz
+++ b/gfx/pics/shuckle/back.6x6.2bpp.lz
diff --git a/gfx/pics/213/bitmask.asm b/gfx/pics/shuckle/bitmask.asm
index 70510aaf6..70510aaf6 100644
--- a/gfx/pics/213/bitmask.asm
+++ b/gfx/pics/shuckle/bitmask.asm
diff --git a/gfx/pics/213/frames.asm b/gfx/pics/shuckle/frames.asm
index 803bd56a6..803bd56a6 100644
--- a/gfx/pics/213/frames.asm
+++ b/gfx/pics/shuckle/frames.asm
diff --git a/gfx/pics/213/front.lz b/gfx/pics/shuckle/front.5x5.2bpp.lz
index 95e78302a..95e78302a 100644
--- a/gfx/pics/213/front.lz
+++ b/gfx/pics/shuckle/front.5x5.2bpp.lz
diff --git a/gfx/pics/213/normal.pal b/gfx/pics/shuckle/normal.pal
index b52e7ed89..b52e7ed89 100644
--- a/gfx/pics/213/normal.pal
+++ b/gfx/pics/shuckle/normal.pal
diff --git a/gfx/pics/213/shiny.pal b/gfx/pics/shuckle/shiny.pal
index 63b3644ab..63b3644ab 100644
--- a/gfx/pics/213/shiny.pal
+++ b/gfx/pics/shuckle/shiny.pal
diff --git a/gfx/pics/227/anim0.asm b/gfx/pics/skarmory/anim0.asm
index 64c2bfaf0..64c2bfaf0 100644
--- a/gfx/pics/227/anim0.asm
+++ b/gfx/pics/skarmory/anim0.asm
diff --git a/gfx/pics/227/anim1.asm b/gfx/pics/skarmory/anim1.asm
index 1853c881f..1853c881f 100644
--- a/gfx/pics/227/anim1.asm
+++ b/gfx/pics/skarmory/anim1.asm
diff --git a/gfx/pics/227/back.lz b/gfx/pics/skarmory/back.6x6.2bpp.lz
index fca13d16a..fca13d16a 100644
--- a/gfx/pics/227/back.lz
+++ b/gfx/pics/skarmory/back.6x6.2bpp.lz
diff --git a/gfx/pics/227/bitmask.asm b/gfx/pics/skarmory/bitmask.asm
index e31550d83..e31550d83 100644
--- a/gfx/pics/227/bitmask.asm
+++ b/gfx/pics/skarmory/bitmask.asm
diff --git a/gfx/pics/227/frames.asm b/gfx/pics/skarmory/frames.asm
index f0eb2f4c6..f0eb2f4c6 100644
--- a/gfx/pics/227/frames.asm
+++ b/gfx/pics/skarmory/frames.asm
diff --git a/gfx/pics/227/front.lz b/gfx/pics/skarmory/front.7x7.2bpp.lz
index e53f5a9ef..e53f5a9ef 100644
--- a/gfx/pics/227/front.lz
+++ b/gfx/pics/skarmory/front.7x7.2bpp.lz
diff --git a/gfx/pics/227/normal.pal b/gfx/pics/skarmory/normal.pal
index 92f01660d..92f01660d 100644
--- a/gfx/pics/227/normal.pal
+++ b/gfx/pics/skarmory/normal.pal
diff --git a/gfx/pics/227/shiny.pal b/gfx/pics/skarmory/shiny.pal
index 80c53554d..80c53554d 100644
--- a/gfx/pics/227/shiny.pal
+++ b/gfx/pics/skarmory/shiny.pal
diff --git a/gfx/pics/188/anim0.asm b/gfx/pics/skiploom/anim0.asm
index 2ab6422e5..2ab6422e5 100644
--- a/gfx/pics/188/anim0.asm
+++ b/gfx/pics/skiploom/anim0.asm
diff --git a/gfx/pics/188/anim1.asm b/gfx/pics/skiploom/anim1.asm
index d26d1717e..d26d1717e 100644
--- a/gfx/pics/188/anim1.asm
+++ b/gfx/pics/skiploom/anim1.asm
diff --git a/gfx/pics/188/back.lz b/gfx/pics/skiploom/back.6x6.2bpp.lz
index 8b197406c..8b197406c 100644
--- a/gfx/pics/188/back.lz
+++ b/gfx/pics/skiploom/back.6x6.2bpp.lz
diff --git a/gfx/pics/188/bitmask.asm b/gfx/pics/skiploom/bitmask.asm
index 9569dffdd..9569dffdd 100644
--- a/gfx/pics/188/bitmask.asm
+++ b/gfx/pics/skiploom/bitmask.asm
diff --git a/gfx/pics/188/frames.asm b/gfx/pics/skiploom/frames.asm
index c552a3f81..c552a3f81 100644
--- a/gfx/pics/188/frames.asm
+++ b/gfx/pics/skiploom/frames.asm
diff --git a/gfx/pics/188/front.lz b/gfx/pics/skiploom/front.6x6.2bpp.lz
index f48561c76..f48561c76 100644
--- a/gfx/pics/188/front.lz
+++ b/gfx/pics/skiploom/front.6x6.2bpp.lz
diff --git a/gfx/pics/188/normal.pal b/gfx/pics/skiploom/normal.pal
index d03c99e28..d03c99e28 100644
--- a/gfx/pics/188/normal.pal
+++ b/gfx/pics/skiploom/normal.pal
diff --git a/gfx/pics/188/shiny.pal b/gfx/pics/skiploom/shiny.pal
index 3165d8ee7..3165d8ee7 100644
--- a/gfx/pics/188/shiny.pal
+++ b/gfx/pics/skiploom/shiny.pal
diff --git a/gfx/pics/080/anim0.asm b/gfx/pics/slowbro/anim0.asm
index cc288a464..cc288a464 100644
--- a/gfx/pics/080/anim0.asm
+++ b/gfx/pics/slowbro/anim0.asm
diff --git a/gfx/pics/080/anim1.asm b/gfx/pics/slowbro/anim1.asm
index 9e793ee00..9e793ee00 100644
--- a/gfx/pics/080/anim1.asm
+++ b/gfx/pics/slowbro/anim1.asm
diff --git a/gfx/pics/080/back.lz b/gfx/pics/slowbro/back.6x6.2bpp.lz
index af1d60999..af1d60999 100644
--- a/gfx/pics/080/back.lz
+++ b/gfx/pics/slowbro/back.6x6.2bpp.lz
diff --git a/gfx/pics/080/bitmask.asm b/gfx/pics/slowbro/bitmask.asm
index 78605e6c9..78605e6c9 100644
--- a/gfx/pics/080/bitmask.asm
+++ b/gfx/pics/slowbro/bitmask.asm
diff --git a/gfx/pics/080/frames.asm b/gfx/pics/slowbro/frames.asm
index fca2a0a8c..fca2a0a8c 100644
--- a/gfx/pics/080/frames.asm
+++ b/gfx/pics/slowbro/frames.asm
diff --git a/gfx/pics/080/front.lz b/gfx/pics/slowbro/front.7x7.2bpp.lz
index 0a6d1ac2c..0a6d1ac2c 100644
--- a/gfx/pics/080/front.lz
+++ b/gfx/pics/slowbro/front.7x7.2bpp.lz
diff --git a/gfx/pics/080/normal.pal b/gfx/pics/slowbro/normal.pal
index 5f6dd1da4..5f6dd1da4 100644
--- a/gfx/pics/080/normal.pal
+++ b/gfx/pics/slowbro/normal.pal
diff --git a/gfx/pics/080/shiny.pal b/gfx/pics/slowbro/shiny.pal
index 7c1a1e020..7c1a1e020 100644
--- a/gfx/pics/080/shiny.pal
+++ b/gfx/pics/slowbro/shiny.pal
diff --git a/gfx/pics/199/anim0.asm b/gfx/pics/slowking/anim0.asm
index d7ab700bd..d7ab700bd 100644
--- a/gfx/pics/199/anim0.asm
+++ b/gfx/pics/slowking/anim0.asm
diff --git a/gfx/pics/199/anim1.asm b/gfx/pics/slowking/anim1.asm
index 36fd7cd7a..36fd7cd7a 100644
--- a/gfx/pics/199/anim1.asm
+++ b/gfx/pics/slowking/anim1.asm
diff --git a/gfx/pics/199/back.lz b/gfx/pics/slowking/back.6x6.2bpp.lz
index e6342e434..e6342e434 100644
--- a/gfx/pics/199/back.lz
+++ b/gfx/pics/slowking/back.6x6.2bpp.lz
diff --git a/gfx/pics/199/bitmask.asm b/gfx/pics/slowking/bitmask.asm
index cdf11aeb2..cdf11aeb2 100644
--- a/gfx/pics/199/bitmask.asm
+++ b/gfx/pics/slowking/bitmask.asm
diff --git a/gfx/pics/199/frames.asm b/gfx/pics/slowking/frames.asm
index ea0548561..ea0548561 100644
--- a/gfx/pics/199/frames.asm
+++ b/gfx/pics/slowking/frames.asm
diff --git a/gfx/pics/199/front.lz b/gfx/pics/slowking/front.7x7.2bpp.lz
index 2f9bd1654..2f9bd1654 100644
--- a/gfx/pics/199/front.lz
+++ b/gfx/pics/slowking/front.7x7.2bpp.lz
diff --git a/gfx/pics/199/normal.pal b/gfx/pics/slowking/normal.pal
index 1b1aa9fbe..1b1aa9fbe 100644
--- a/gfx/pics/199/normal.pal
+++ b/gfx/pics/slowking/normal.pal
diff --git a/gfx/pics/199/shiny.pal b/gfx/pics/slowking/shiny.pal
index 6a893a090..6a893a090 100644
--- a/gfx/pics/199/shiny.pal
+++ b/gfx/pics/slowking/shiny.pal
diff --git a/gfx/pics/079/anim0.asm b/gfx/pics/slowpoke/anim0.asm
index fa391743c..fa391743c 100644
--- a/gfx/pics/079/anim0.asm
+++ b/gfx/pics/slowpoke/anim0.asm
diff --git a/gfx/pics/079/anim1.asm b/gfx/pics/slowpoke/anim1.asm
index 805a281c5..805a281c5 100644
--- a/gfx/pics/079/anim1.asm
+++ b/gfx/pics/slowpoke/anim1.asm
diff --git a/gfx/pics/079/back.lz b/gfx/pics/slowpoke/back.6x6.2bpp.lz
index cdaa2178d..cdaa2178d 100644
--- a/gfx/pics/079/back.lz
+++ b/gfx/pics/slowpoke/back.6x6.2bpp.lz
diff --git a/gfx/pics/079/bitmask.asm b/gfx/pics/slowpoke/bitmask.asm
index 6fab14881..6fab14881 100644
--- a/gfx/pics/079/bitmask.asm
+++ b/gfx/pics/slowpoke/bitmask.asm
diff --git a/gfx/pics/079/frames.asm b/gfx/pics/slowpoke/frames.asm
index 53a0bda39..53a0bda39 100644
--- a/gfx/pics/079/frames.asm
+++ b/gfx/pics/slowpoke/frames.asm
diff --git a/gfx/pics/079/front.lz b/gfx/pics/slowpoke/front.5x5.2bpp.lz
index 23d8e22f2..23d8e22f2 100644
--- a/gfx/pics/079/front.lz
+++ b/gfx/pics/slowpoke/front.5x5.2bpp.lz
diff --git a/gfx/pics/079/normal.pal b/gfx/pics/slowpoke/normal.pal
index e11055a37..e11055a37 100644
--- a/gfx/pics/079/normal.pal
+++ b/gfx/pics/slowpoke/normal.pal
diff --git a/gfx/pics/079/shiny.pal b/gfx/pics/slowpoke/shiny.pal
index a70e0d0ed..a70e0d0ed 100644
--- a/gfx/pics/079/shiny.pal
+++ b/gfx/pics/slowpoke/shiny.pal
diff --git a/gfx/pics/218/anim0.asm b/gfx/pics/slugma/anim0.asm
index 1c867ec37..1c867ec37 100644
--- a/gfx/pics/218/anim0.asm
+++ b/gfx/pics/slugma/anim0.asm
diff --git a/gfx/pics/218/anim1.asm b/gfx/pics/slugma/anim1.asm
index 5bfe4e799..5bfe4e799 100644
--- a/gfx/pics/218/anim1.asm
+++ b/gfx/pics/slugma/anim1.asm
diff --git a/gfx/pics/218/back.lz b/gfx/pics/slugma/back.6x6.2bpp.lz
index 949fbc218..949fbc218 100644
--- a/gfx/pics/218/back.lz
+++ b/gfx/pics/slugma/back.6x6.2bpp.lz
diff --git a/gfx/pics/218/bitmask.asm b/gfx/pics/slugma/bitmask.asm
index ef60f1d3f..ef60f1d3f 100644
--- a/gfx/pics/218/bitmask.asm
+++ b/gfx/pics/slugma/bitmask.asm
diff --git a/gfx/pics/218/frames.asm b/gfx/pics/slugma/frames.asm
index 37242d2c4..37242d2c4 100644
--- a/gfx/pics/218/frames.asm
+++ b/gfx/pics/slugma/frames.asm
diff --git a/gfx/pics/218/front.lz b/gfx/pics/slugma/front.5x5.2bpp.lz
index 4c9a0078e..4c9a0078e 100644
--- a/gfx/pics/218/front.lz
+++ b/gfx/pics/slugma/front.5x5.2bpp.lz
diff --git a/gfx/pics/218/normal.pal b/gfx/pics/slugma/normal.pal
index e20c176a3..e20c176a3 100644
--- a/gfx/pics/218/normal.pal
+++ b/gfx/pics/slugma/normal.pal
diff --git a/gfx/pics/218/shiny.pal b/gfx/pics/slugma/shiny.pal
index b66ef094d..b66ef094d 100644
--- a/gfx/pics/218/shiny.pal
+++ b/gfx/pics/slugma/shiny.pal
diff --git a/gfx/pics/235/anim0.asm b/gfx/pics/smeargle/anim0.asm
index 2144197fc..2144197fc 100644
--- a/gfx/pics/235/anim0.asm
+++ b/gfx/pics/smeargle/anim0.asm
diff --git a/gfx/pics/235/anim1.asm b/gfx/pics/smeargle/anim1.asm
index 178b14959..178b14959 100644
--- a/gfx/pics/235/anim1.asm
+++ b/gfx/pics/smeargle/anim1.asm
diff --git a/gfx/pics/235/back.lz b/gfx/pics/smeargle/back.6x6.2bpp.lz
index eb96bfd07..eb96bfd07 100644
--- a/gfx/pics/235/back.lz
+++ b/gfx/pics/smeargle/back.6x6.2bpp.lz
diff --git a/gfx/pics/235/bitmask.asm b/gfx/pics/smeargle/bitmask.asm
index 3832cd2d6..3832cd2d6 100644
--- a/gfx/pics/235/bitmask.asm
+++ b/gfx/pics/smeargle/bitmask.asm
diff --git a/gfx/pics/235/frames.asm b/gfx/pics/smeargle/frames.asm
index 902177d75..902177d75 100644
--- a/gfx/pics/235/frames.asm
+++ b/gfx/pics/smeargle/frames.asm
diff --git a/gfx/pics/235/front.lz b/gfx/pics/smeargle/front.7x7.2bpp.lz
index 81be921d5..81be921d5 100644
--- a/gfx/pics/235/front.lz
+++ b/gfx/pics/smeargle/front.7x7.2bpp.lz
diff --git a/gfx/pics/235/normal.pal b/gfx/pics/smeargle/normal.pal
index 76ba4c95c..76ba4c95c 100644
--- a/gfx/pics/235/normal.pal
+++ b/gfx/pics/smeargle/normal.pal
diff --git a/gfx/pics/235/shiny.pal b/gfx/pics/smeargle/shiny.pal
index 3b0290ba1..3b0290ba1 100644
--- a/gfx/pics/235/shiny.pal
+++ b/gfx/pics/smeargle/shiny.pal
diff --git a/gfx/pics/238/anim0.asm b/gfx/pics/smoochum/anim0.asm
index 39f5e7ebe..39f5e7ebe 100644
--- a/gfx/pics/238/anim0.asm
+++ b/gfx/pics/smoochum/anim0.asm
diff --git a/gfx/pics/238/anim1.asm b/gfx/pics/smoochum/anim1.asm
index 5ba02f113..5ba02f113 100644
--- a/gfx/pics/238/anim1.asm
+++ b/gfx/pics/smoochum/anim1.asm
diff --git a/gfx/pics/238/back.lz b/gfx/pics/smoochum/back.6x6.2bpp.lz
index 52c256c16..52c256c16 100644
--- a/gfx/pics/238/back.lz
+++ b/gfx/pics/smoochum/back.6x6.2bpp.lz
diff --git a/gfx/pics/238/bitmask.asm b/gfx/pics/smoochum/bitmask.asm
index 5d4f3f9bd..5d4f3f9bd 100644
--- a/gfx/pics/238/bitmask.asm
+++ b/gfx/pics/smoochum/bitmask.asm
diff --git a/gfx/pics/238/frames.asm b/gfx/pics/smoochum/frames.asm
index 53f48d1b8..53f48d1b8 100644
--- a/gfx/pics/238/frames.asm
+++ b/gfx/pics/smoochum/frames.asm
diff --git a/gfx/pics/238/front.lz b/gfx/pics/smoochum/front.5x5.2bpp.lz
index cd4b75761..cd4b75761 100644
--- a/gfx/pics/238/front.lz
+++ b/gfx/pics/smoochum/front.5x5.2bpp.lz
diff --git a/gfx/pics/238/normal.pal b/gfx/pics/smoochum/normal.pal
index 21867063d..21867063d 100644
--- a/gfx/pics/238/normal.pal
+++ b/gfx/pics/smoochum/normal.pal
diff --git a/gfx/pics/238/shiny.pal b/gfx/pics/smoochum/shiny.pal
index ee3baba53..ee3baba53 100644
--- a/gfx/pics/238/shiny.pal
+++ b/gfx/pics/smoochum/shiny.pal
diff --git a/gfx/pics/215/anim0.asm b/gfx/pics/sneasel/anim0.asm
index 5b7f3fb79..5b7f3fb79 100644
--- a/gfx/pics/215/anim0.asm
+++ b/gfx/pics/sneasel/anim0.asm
diff --git a/gfx/pics/215/anim1.asm b/gfx/pics/sneasel/anim1.asm
index 1d3e3a41d..1d3e3a41d 100644
--- a/gfx/pics/215/anim1.asm
+++ b/gfx/pics/sneasel/anim1.asm
diff --git a/gfx/pics/215/back.lz b/gfx/pics/sneasel/back.6x6.2bpp.lz
index be5ad2304..be5ad2304 100644
--- a/gfx/pics/215/back.lz
+++ b/gfx/pics/sneasel/back.6x6.2bpp.lz
diff --git a/gfx/pics/215/bitmask.asm b/gfx/pics/sneasel/bitmask.asm
index 49dcabe1d..49dcabe1d 100644
--- a/gfx/pics/215/bitmask.asm
+++ b/gfx/pics/sneasel/bitmask.asm
diff --git a/gfx/pics/215/frames.asm b/gfx/pics/sneasel/frames.asm
index 88dbe408c..88dbe408c 100644
--- a/gfx/pics/215/frames.asm
+++ b/gfx/pics/sneasel/frames.asm
diff --git a/gfx/pics/215/front.lz b/gfx/pics/sneasel/front.6x6.2bpp.lz
index 4add5f2e0..4add5f2e0 100644
--- a/gfx/pics/215/front.lz
+++ b/gfx/pics/sneasel/front.6x6.2bpp.lz
diff --git a/gfx/pics/215/normal.pal b/gfx/pics/sneasel/normal.pal
index 1d1728090..1d1728090 100644
--- a/gfx/pics/215/normal.pal
+++ b/gfx/pics/sneasel/normal.pal
diff --git a/gfx/pics/215/shiny.pal b/gfx/pics/sneasel/shiny.pal
index 951cc3786..951cc3786 100644
--- a/gfx/pics/215/shiny.pal
+++ b/gfx/pics/sneasel/shiny.pal
diff --git a/gfx/pics/143/anim0.asm b/gfx/pics/snorlax/anim0.asm
index 3825f3bca..3825f3bca 100644
--- a/gfx/pics/143/anim0.asm
+++ b/gfx/pics/snorlax/anim0.asm
diff --git a/gfx/pics/143/anim1.asm b/gfx/pics/snorlax/anim1.asm
index 4969f8f1f..4969f8f1f 100644
--- a/gfx/pics/143/anim1.asm
+++ b/gfx/pics/snorlax/anim1.asm
diff --git a/gfx/pics/143/back.lz b/gfx/pics/snorlax/back.6x6.2bpp.lz
index dfbfcbb50..dfbfcbb50 100644
--- a/gfx/pics/143/back.lz
+++ b/gfx/pics/snorlax/back.6x6.2bpp.lz
diff --git a/gfx/pics/143/bitmask.asm b/gfx/pics/snorlax/bitmask.asm
index 1f456ab16..1f456ab16 100644
--- a/gfx/pics/143/bitmask.asm
+++ b/gfx/pics/snorlax/bitmask.asm
diff --git a/gfx/pics/143/frames.asm b/gfx/pics/snorlax/frames.asm
index 004a1a4c1..004a1a4c1 100644
--- a/gfx/pics/143/frames.asm
+++ b/gfx/pics/snorlax/frames.asm
diff --git a/gfx/pics/143/front.lz b/gfx/pics/snorlax/front.7x7.2bpp.lz
index 7c610f46c..7c610f46c 100644
--- a/gfx/pics/143/front.lz
+++ b/gfx/pics/snorlax/front.7x7.2bpp.lz
diff --git a/gfx/pics/143/normal.pal b/gfx/pics/snorlax/normal.pal
index af1845a65..af1845a65 100644
--- a/gfx/pics/143/normal.pal
+++ b/gfx/pics/snorlax/normal.pal
diff --git a/gfx/pics/143/shiny.pal b/gfx/pics/snorlax/shiny.pal
index 9a3ed5d55..9a3ed5d55 100644
--- a/gfx/pics/143/shiny.pal
+++ b/gfx/pics/snorlax/shiny.pal
diff --git a/gfx/pics/209/anim0.asm b/gfx/pics/snubbull/anim0.asm
index d97f9b354..d97f9b354 100644
--- a/gfx/pics/209/anim0.asm
+++ b/gfx/pics/snubbull/anim0.asm
diff --git a/gfx/pics/209/anim1.asm b/gfx/pics/snubbull/anim1.asm
index 08cae5b71..08cae5b71 100644
--- a/gfx/pics/209/anim1.asm
+++ b/gfx/pics/snubbull/anim1.asm
diff --git a/gfx/pics/209/back.lz b/gfx/pics/snubbull/back.6x6.2bpp.lz
index 5b020db5e..5b020db5e 100644
--- a/gfx/pics/209/back.lz
+++ b/gfx/pics/snubbull/back.6x6.2bpp.lz
diff --git a/gfx/pics/209/bitmask.asm b/gfx/pics/snubbull/bitmask.asm
index 69b0ad890..69b0ad890 100644
--- a/gfx/pics/209/bitmask.asm
+++ b/gfx/pics/snubbull/bitmask.asm
diff --git a/gfx/pics/209/frames.asm b/gfx/pics/snubbull/frames.asm
index 0444a0a39..0444a0a39 100644
--- a/gfx/pics/209/frames.asm
+++ b/gfx/pics/snubbull/frames.asm
diff --git a/gfx/pics/209/front.lz b/gfx/pics/snubbull/front.6x6.2bpp.lz
index 69a534e2c..69a534e2c 100644
--- a/gfx/pics/209/front.lz
+++ b/gfx/pics/snubbull/front.6x6.2bpp.lz
diff --git a/gfx/pics/209/normal.pal b/gfx/pics/snubbull/normal.pal
index 52aee4079..52aee4079 100644
--- a/gfx/pics/209/normal.pal
+++ b/gfx/pics/snubbull/normal.pal
diff --git a/gfx/pics/209/shiny.pal b/gfx/pics/snubbull/shiny.pal
index 04cda49ec..04cda49ec 100644
--- a/gfx/pics/209/shiny.pal
+++ b/gfx/pics/snubbull/shiny.pal
diff --git a/gfx/pics/021/anim0.asm b/gfx/pics/spearow/anim0.asm
index 35780c784..35780c784 100644
--- a/gfx/pics/021/anim0.asm
+++ b/gfx/pics/spearow/anim0.asm
diff --git a/gfx/pics/021/anim1.asm b/gfx/pics/spearow/anim1.asm
index ed487ecc3..ed487ecc3 100644
--- a/gfx/pics/021/anim1.asm
+++ b/gfx/pics/spearow/anim1.asm
diff --git a/gfx/pics/021/back.lz b/gfx/pics/spearow/back.6x6.2bpp.lz
index 9411f32bd..9411f32bd 100644
--- a/gfx/pics/021/back.lz
+++ b/gfx/pics/spearow/back.6x6.2bpp.lz
diff --git a/gfx/pics/021/bitmask.asm b/gfx/pics/spearow/bitmask.asm
index 108ace244..108ace244 100644
--- a/gfx/pics/021/bitmask.asm
+++ b/gfx/pics/spearow/bitmask.asm
diff --git a/gfx/pics/021/frames.asm b/gfx/pics/spearow/frames.asm
index 0aa724bc5..0aa724bc5 100644
--- a/gfx/pics/021/frames.asm
+++ b/gfx/pics/spearow/frames.asm
diff --git a/gfx/pics/021/front.lz b/gfx/pics/spearow/front.5x5.2bpp.lz
index 8def69a01..8def69a01 100644
--- a/gfx/pics/021/front.lz
+++ b/gfx/pics/spearow/front.5x5.2bpp.lz
diff --git a/gfx/pics/021/normal.pal b/gfx/pics/spearow/normal.pal
index 4f4bcc66b..4f4bcc66b 100644
--- a/gfx/pics/021/normal.pal
+++ b/gfx/pics/spearow/normal.pal
diff --git a/gfx/pics/021/shiny.pal b/gfx/pics/spearow/shiny.pal
index 188394e5f..188394e5f 100644
--- a/gfx/pics/021/shiny.pal
+++ b/gfx/pics/spearow/shiny.pal
diff --git a/gfx/pics/167/anim0.asm b/gfx/pics/spinarak/anim0.asm
index be299fc49..be299fc49 100644
--- a/gfx/pics/167/anim0.asm
+++ b/gfx/pics/spinarak/anim0.asm
diff --git a/gfx/pics/167/anim1.asm b/gfx/pics/spinarak/anim1.asm
index c605578ef..c605578ef 100644
--- a/gfx/pics/167/anim1.asm
+++ b/gfx/pics/spinarak/anim1.asm
diff --git a/gfx/pics/167/back.lz b/gfx/pics/spinarak/back.6x6.2bpp.lz
index 3fa2e3b12..3fa2e3b12 100644
--- a/gfx/pics/167/back.lz
+++ b/gfx/pics/spinarak/back.6x6.2bpp.lz
diff --git a/gfx/pics/167/bitmask.asm b/gfx/pics/spinarak/bitmask.asm
index 57cae087c..57cae087c 100644
--- a/gfx/pics/167/bitmask.asm
+++ b/gfx/pics/spinarak/bitmask.asm
diff --git a/gfx/pics/167/frames.asm b/gfx/pics/spinarak/frames.asm
index da8ad1961..da8ad1961 100644
--- a/gfx/pics/167/frames.asm
+++ b/gfx/pics/spinarak/frames.asm
diff --git a/gfx/pics/167/front.lz b/gfx/pics/spinarak/front.5x5.2bpp.lz
index edbe6e1ce..edbe6e1ce 100644
--- a/gfx/pics/167/front.lz
+++ b/gfx/pics/spinarak/front.5x5.2bpp.lz
diff --git a/gfx/pics/167/normal.pal b/gfx/pics/spinarak/normal.pal
index 92041eaac..92041eaac 100644
--- a/gfx/pics/167/normal.pal
+++ b/gfx/pics/spinarak/normal.pal
diff --git a/gfx/pics/167/shiny.pal b/gfx/pics/spinarak/shiny.pal
index 931425e3c..931425e3c 100644
--- a/gfx/pics/167/shiny.pal
+++ b/gfx/pics/spinarak/shiny.pal
diff --git a/gfx/pics/007/anim0.asm b/gfx/pics/squirtle/anim0.asm
index 9969d4263..9969d4263 100644
--- a/gfx/pics/007/anim0.asm
+++ b/gfx/pics/squirtle/anim0.asm
diff --git a/gfx/pics/007/anim1.asm b/gfx/pics/squirtle/anim1.asm
index de24c37a6..de24c37a6 100644
--- a/gfx/pics/007/anim1.asm
+++ b/gfx/pics/squirtle/anim1.asm
diff --git a/gfx/pics/007/back.lz b/gfx/pics/squirtle/back.6x6.2bpp.lz
index a8fa8d3fd..a8fa8d3fd 100644
--- a/gfx/pics/007/back.lz
+++ b/gfx/pics/squirtle/back.6x6.2bpp.lz
diff --git a/gfx/pics/007/bitmask.asm b/gfx/pics/squirtle/bitmask.asm
index a33cd7afb..a33cd7afb 100644
--- a/gfx/pics/007/bitmask.asm
+++ b/gfx/pics/squirtle/bitmask.asm
diff --git a/gfx/pics/007/frames.asm b/gfx/pics/squirtle/frames.asm
index e30af6db2..e30af6db2 100644
--- a/gfx/pics/007/frames.asm
+++ b/gfx/pics/squirtle/frames.asm
diff --git a/gfx/pics/007/front.lz b/gfx/pics/squirtle/front.5x5.2bpp.lz
index 175cc5e0d..175cc5e0d 100644
--- a/gfx/pics/007/front.lz
+++ b/gfx/pics/squirtle/front.5x5.2bpp.lz
diff --git a/gfx/pics/007/normal.pal b/gfx/pics/squirtle/normal.pal
index 04b589372..04b589372 100644
--- a/gfx/pics/007/normal.pal
+++ b/gfx/pics/squirtle/normal.pal
diff --git a/gfx/pics/007/shiny.pal b/gfx/pics/squirtle/shiny.pal
index 8df9f8263..8df9f8263 100644
--- a/gfx/pics/007/shiny.pal
+++ b/gfx/pics/squirtle/shiny.pal
diff --git a/gfx/pics/234/anim0.asm b/gfx/pics/stantler/anim0.asm
index 8f4c133d8..8f4c133d8 100644
--- a/gfx/pics/234/anim0.asm
+++ b/gfx/pics/stantler/anim0.asm
diff --git a/gfx/pics/234/anim1.asm b/gfx/pics/stantler/anim1.asm
index 7444d761a..7444d761a 100644
--- a/gfx/pics/234/anim1.asm
+++ b/gfx/pics/stantler/anim1.asm
diff --git a/gfx/pics/234/back.lz b/gfx/pics/stantler/back.6x6.2bpp.lz
index a0ab53039..a0ab53039 100644
--- a/gfx/pics/234/back.lz
+++ b/gfx/pics/stantler/back.6x6.2bpp.lz
diff --git a/gfx/pics/234/bitmask.asm b/gfx/pics/stantler/bitmask.asm
index 3387fe45d..3387fe45d 100644
--- a/gfx/pics/234/bitmask.asm
+++ b/gfx/pics/stantler/bitmask.asm
diff --git a/gfx/pics/234/frames.asm b/gfx/pics/stantler/frames.asm
index 4a82b45b2..4a82b45b2 100644
--- a/gfx/pics/234/frames.asm
+++ b/gfx/pics/stantler/frames.asm
diff --git a/gfx/pics/234/front.lz b/gfx/pics/stantler/front.7x7.2bpp.lz
index 87a56e667..87a56e667 100644
--- a/gfx/pics/234/front.lz
+++ b/gfx/pics/stantler/front.7x7.2bpp.lz
diff --git a/gfx/pics/234/normal.pal b/gfx/pics/stantler/normal.pal
index 3d036062d..3d036062d 100644
--- a/gfx/pics/234/normal.pal
+++ b/gfx/pics/stantler/normal.pal
diff --git a/gfx/pics/234/shiny.pal b/gfx/pics/stantler/shiny.pal
index efdc404e9..efdc404e9 100644
--- a/gfx/pics/234/shiny.pal
+++ b/gfx/pics/stantler/shiny.pal
diff --git a/gfx/pics/121/anim0.asm b/gfx/pics/starmie/anim0.asm
index c81477807..c81477807 100644
--- a/gfx/pics/121/anim0.asm
+++ b/gfx/pics/starmie/anim0.asm
diff --git a/gfx/pics/121/anim1.asm b/gfx/pics/starmie/anim1.asm
index 7508e6e10..7508e6e10 100644
--- a/gfx/pics/121/anim1.asm
+++ b/gfx/pics/starmie/anim1.asm
diff --git a/gfx/pics/121/back.lz b/gfx/pics/starmie/back.6x6.2bpp.lz
index 8085f0f44..8085f0f44 100644
--- a/gfx/pics/121/back.lz
+++ b/gfx/pics/starmie/back.6x6.2bpp.lz
diff --git a/gfx/pics/121/bitmask.asm b/gfx/pics/starmie/bitmask.asm
index 24c51b53d..24c51b53d 100644
--- a/gfx/pics/121/bitmask.asm
+++ b/gfx/pics/starmie/bitmask.asm
diff --git a/gfx/pics/121/frames.asm b/gfx/pics/starmie/frames.asm
index a040d7310..a040d7310 100644
--- a/gfx/pics/121/frames.asm
+++ b/gfx/pics/starmie/frames.asm
diff --git a/gfx/pics/121/front.lz b/gfx/pics/starmie/front.6x6.2bpp.lz
index b9019f6c6..b9019f6c6 100644
--- a/gfx/pics/121/front.lz
+++ b/gfx/pics/starmie/front.6x6.2bpp.lz
diff --git a/gfx/pics/121/normal.pal b/gfx/pics/starmie/normal.pal
index caaf43505..caaf43505 100644
--- a/gfx/pics/121/normal.pal
+++ b/gfx/pics/starmie/normal.pal
diff --git a/gfx/pics/121/shiny.pal b/gfx/pics/starmie/shiny.pal
index c9932cd86..c9932cd86 100644
--- a/gfx/pics/121/shiny.pal
+++ b/gfx/pics/starmie/shiny.pal
diff --git a/gfx/pics/120/anim0.asm b/gfx/pics/staryu/anim0.asm
index d257949e7..d257949e7 100644
--- a/gfx/pics/120/anim0.asm
+++ b/gfx/pics/staryu/anim0.asm
diff --git a/gfx/pics/120/anim1.asm b/gfx/pics/staryu/anim1.asm
index 184806574..184806574 100644
--- a/gfx/pics/120/anim1.asm
+++ b/gfx/pics/staryu/anim1.asm
diff --git a/gfx/pics/120/back.lz b/gfx/pics/staryu/back.6x6.2bpp.lz
index 65366eb7c..65366eb7c 100644
--- a/gfx/pics/120/back.lz
+++ b/gfx/pics/staryu/back.6x6.2bpp.lz
diff --git a/gfx/pics/120/bitmask.asm b/gfx/pics/staryu/bitmask.asm
index fe0e0f218..fe0e0f218 100644
--- a/gfx/pics/120/bitmask.asm
+++ b/gfx/pics/staryu/bitmask.asm
diff --git a/gfx/pics/120/frames.asm b/gfx/pics/staryu/frames.asm
index d86e5eb62..d86e5eb62 100644
--- a/gfx/pics/120/frames.asm
+++ b/gfx/pics/staryu/frames.asm
diff --git a/gfx/pics/120/front.lz b/gfx/pics/staryu/front.6x6.2bpp.lz
index 8d0bdacb9..8d0bdacb9 100644
--- a/gfx/pics/120/front.lz
+++ b/gfx/pics/staryu/front.6x6.2bpp.lz
diff --git a/gfx/pics/120/normal.pal b/gfx/pics/staryu/normal.pal
index 59f7cc477..59f7cc477 100644
--- a/gfx/pics/120/normal.pal
+++ b/gfx/pics/staryu/normal.pal
diff --git a/gfx/pics/120/shiny.pal b/gfx/pics/staryu/shiny.pal
index 11546faee..11546faee 100644
--- a/gfx/pics/120/shiny.pal
+++ b/gfx/pics/staryu/shiny.pal
diff --git a/gfx/pics/208/anim0.asm b/gfx/pics/steelix/anim0.asm
index 9acb2af0a..9acb2af0a 100644
--- a/gfx/pics/208/anim0.asm
+++ b/gfx/pics/steelix/anim0.asm
diff --git a/gfx/pics/208/anim1.asm b/gfx/pics/steelix/anim1.asm
index 3c1de78fb..3c1de78fb 100644
--- a/gfx/pics/208/anim1.asm
+++ b/gfx/pics/steelix/anim1.asm
diff --git a/gfx/pics/208/back.lz b/gfx/pics/steelix/back.6x6.2bpp.lz
index e4cb2d6dc..e4cb2d6dc 100644
--- a/gfx/pics/208/back.lz
+++ b/gfx/pics/steelix/back.6x6.2bpp.lz
diff --git a/gfx/pics/208/bitmask.asm b/gfx/pics/steelix/bitmask.asm
index e66a1f07e..e66a1f07e 100644
--- a/gfx/pics/208/bitmask.asm
+++ b/gfx/pics/steelix/bitmask.asm
diff --git a/gfx/pics/208/frames.asm b/gfx/pics/steelix/frames.asm
index 8f352b5fa..8f352b5fa 100644
--- a/gfx/pics/208/frames.asm
+++ b/gfx/pics/steelix/frames.asm
diff --git a/gfx/pics/208/front.lz b/gfx/pics/steelix/front.7x7.2bpp.lz
index 2da642f04..2da642f04 100644
--- a/gfx/pics/208/front.lz
+++ b/gfx/pics/steelix/front.7x7.2bpp.lz
diff --git a/gfx/pics/208/normal.pal b/gfx/pics/steelix/normal.pal
index ee5eb6d6f..ee5eb6d6f 100644
--- a/gfx/pics/208/normal.pal
+++ b/gfx/pics/steelix/normal.pal
diff --git a/gfx/pics/208/shiny.pal b/gfx/pics/steelix/shiny.pal
index d929c214f..d929c214f 100644
--- a/gfx/pics/208/shiny.pal
+++ b/gfx/pics/steelix/shiny.pal
diff --git a/gfx/pics/185/anim0.asm b/gfx/pics/sudowoodo/anim0.asm
index 8e974a074..8e974a074 100644
--- a/gfx/pics/185/anim0.asm
+++ b/gfx/pics/sudowoodo/anim0.asm
diff --git a/gfx/pics/185/anim1.asm b/gfx/pics/sudowoodo/anim1.asm
index e42e960f9..e42e960f9 100644
--- a/gfx/pics/185/anim1.asm
+++ b/gfx/pics/sudowoodo/anim1.asm
diff --git a/gfx/pics/185/back.lz b/gfx/pics/sudowoodo/back.6x6.2bpp.lz
index c10731ea9..c10731ea9 100644
--- a/gfx/pics/185/back.lz
+++ b/gfx/pics/sudowoodo/back.6x6.2bpp.lz
diff --git a/gfx/pics/185/bitmask.asm b/gfx/pics/sudowoodo/bitmask.asm
index 9508b9cef..9508b9cef 100644
--- a/gfx/pics/185/bitmask.asm
+++ b/gfx/pics/sudowoodo/bitmask.asm
diff --git a/gfx/pics/185/frames.asm b/gfx/pics/sudowoodo/frames.asm
index aeafdfd38..aeafdfd38 100644
--- a/gfx/pics/185/frames.asm
+++ b/gfx/pics/sudowoodo/frames.asm
diff --git a/gfx/pics/185/front.lz b/gfx/pics/sudowoodo/front.6x6.2bpp.lz
index 160f800cf..160f800cf 100644
--- a/gfx/pics/185/front.lz
+++ b/gfx/pics/sudowoodo/front.6x6.2bpp.lz
diff --git a/gfx/pics/185/normal.pal b/gfx/pics/sudowoodo/normal.pal
index 009408311..009408311 100644
--- a/gfx/pics/185/normal.pal
+++ b/gfx/pics/sudowoodo/normal.pal
diff --git a/gfx/pics/185/shiny.pal b/gfx/pics/sudowoodo/shiny.pal
index b82128b50..b82128b50 100644
--- a/gfx/pics/185/shiny.pal
+++ b/gfx/pics/sudowoodo/shiny.pal
diff --git a/gfx/pics/245/anim0.asm b/gfx/pics/suicune/anim0.asm
index 0f2528116..0f2528116 100644
--- a/gfx/pics/245/anim0.asm
+++ b/gfx/pics/suicune/anim0.asm
diff --git a/gfx/pics/245/anim1.asm b/gfx/pics/suicune/anim1.asm
index 9e018683a..9e018683a 100644
--- a/gfx/pics/245/anim1.asm
+++ b/gfx/pics/suicune/anim1.asm
diff --git a/gfx/pics/245/back.lz b/gfx/pics/suicune/back.6x6.2bpp.lz
index a8106fbb4..a8106fbb4 100644
--- a/gfx/pics/245/back.lz
+++ b/gfx/pics/suicune/back.6x6.2bpp.lz
diff --git a/gfx/pics/245/bitmask.asm b/gfx/pics/suicune/bitmask.asm
index 1b3c4f555..1b3c4f555 100644
--- a/gfx/pics/245/bitmask.asm
+++ b/gfx/pics/suicune/bitmask.asm
diff --git a/gfx/pics/245/frames.asm b/gfx/pics/suicune/frames.asm
index 7532ed312..7532ed312 100644
--- a/gfx/pics/245/frames.asm
+++ b/gfx/pics/suicune/frames.asm
diff --git a/gfx/pics/245/front.lz b/gfx/pics/suicune/front.7x7.2bpp.lz
index cbc9dfdbf..cbc9dfdbf 100644
--- a/gfx/pics/245/front.lz
+++ b/gfx/pics/suicune/front.7x7.2bpp.lz
diff --git a/gfx/pics/245/normal.pal b/gfx/pics/suicune/normal.pal
index aaa246989..aaa246989 100644
--- a/gfx/pics/245/normal.pal
+++ b/gfx/pics/suicune/normal.pal
diff --git a/gfx/pics/245/shiny.pal b/gfx/pics/suicune/shiny.pal
index 776effbc3..776effbc3 100644
--- a/gfx/pics/245/shiny.pal
+++ b/gfx/pics/suicune/shiny.pal
diff --git a/gfx/pics/192/anim0.asm b/gfx/pics/sunflora/anim0.asm
index aad8ddadd..aad8ddadd 100644
--- a/gfx/pics/192/anim0.asm
+++ b/gfx/pics/sunflora/anim0.asm
diff --git a/gfx/pics/192/anim1.asm b/gfx/pics/sunflora/anim1.asm
index e78d5449e..e78d5449e 100644
--- a/gfx/pics/192/anim1.asm
+++ b/gfx/pics/sunflora/anim1.asm
diff --git a/gfx/pics/192/back.lz b/gfx/pics/sunflora/back.6x6.2bpp.lz
index 3fb3432ba..3fb3432ba 100644
--- a/gfx/pics/192/back.lz
+++ b/gfx/pics/sunflora/back.6x6.2bpp.lz
diff --git a/gfx/pics/192/bitmask.asm b/gfx/pics/sunflora/bitmask.asm
index f0b71e34a..f0b71e34a 100644
--- a/gfx/pics/192/bitmask.asm
+++ b/gfx/pics/sunflora/bitmask.asm
diff --git a/gfx/pics/192/frames.asm b/gfx/pics/sunflora/frames.asm
index 3cb42d83e..3cb42d83e 100644
--- a/gfx/pics/192/frames.asm
+++ b/gfx/pics/sunflora/frames.asm
diff --git a/gfx/pics/192/front.lz b/gfx/pics/sunflora/front.6x6.2bpp.lz
index 1026c3719..1026c3719 100644
--- a/gfx/pics/192/front.lz
+++ b/gfx/pics/sunflora/front.6x6.2bpp.lz
diff --git a/gfx/pics/192/normal.pal b/gfx/pics/sunflora/normal.pal
index 24b040e73..24b040e73 100644
--- a/gfx/pics/192/normal.pal
+++ b/gfx/pics/sunflora/normal.pal
diff --git a/gfx/pics/192/shiny.pal b/gfx/pics/sunflora/shiny.pal
index a52ad6f96..a52ad6f96 100644
--- a/gfx/pics/192/shiny.pal
+++ b/gfx/pics/sunflora/shiny.pal
diff --git a/gfx/pics/191/anim0.asm b/gfx/pics/sunkern/anim0.asm
index c282b1fb2..c282b1fb2 100644
--- a/gfx/pics/191/anim0.asm
+++ b/gfx/pics/sunkern/anim0.asm
diff --git a/gfx/pics/191/anim1.asm b/gfx/pics/sunkern/anim1.asm
index f92d267a1..f92d267a1 100644
--- a/gfx/pics/191/anim1.asm
+++ b/gfx/pics/sunkern/anim1.asm
diff --git a/gfx/pics/191/back.lz b/gfx/pics/sunkern/back.6x6.2bpp.lz
index a9ba0f738..a9ba0f738 100644
--- a/gfx/pics/191/back.lz
+++ b/gfx/pics/sunkern/back.6x6.2bpp.lz
diff --git a/gfx/pics/191/bitmask.asm b/gfx/pics/sunkern/bitmask.asm
index 058b53861..058b53861 100644
--- a/gfx/pics/191/bitmask.asm
+++ b/gfx/pics/sunkern/bitmask.asm
diff --git a/gfx/pics/191/frames.asm b/gfx/pics/sunkern/frames.asm
index ddbd59bf3..ddbd59bf3 100644
--- a/gfx/pics/191/frames.asm
+++ b/gfx/pics/sunkern/frames.asm
diff --git a/gfx/pics/191/front.lz b/gfx/pics/sunkern/front.5x5.2bpp.lz
index 77a21af73..77a21af73 100644
--- a/gfx/pics/191/front.lz
+++ b/gfx/pics/sunkern/front.5x5.2bpp.lz
diff --git a/gfx/pics/191/normal.pal b/gfx/pics/sunkern/normal.pal
index 51e641e15..51e641e15 100644
--- a/gfx/pics/191/normal.pal
+++ b/gfx/pics/sunkern/normal.pal
diff --git a/gfx/pics/191/shiny.pal b/gfx/pics/sunkern/shiny.pal
index 3215a861c..3215a861c 100644
--- a/gfx/pics/191/shiny.pal
+++ b/gfx/pics/sunkern/shiny.pal
diff --git a/gfx/pics/220/anim0.asm b/gfx/pics/swinub/anim0.asm
index f1d93138a..f1d93138a 100644
--- a/gfx/pics/220/anim0.asm
+++ b/gfx/pics/swinub/anim0.asm
diff --git a/gfx/pics/220/anim1.asm b/gfx/pics/swinub/anim1.asm
index 5fe97a2ba..5fe97a2ba 100644
--- a/gfx/pics/220/anim1.asm
+++ b/gfx/pics/swinub/anim1.asm
diff --git a/gfx/pics/220/back.lz b/gfx/pics/swinub/back.6x6.2bpp.lz
index 51b90aae2..51b90aae2 100644
--- a/gfx/pics/220/back.lz
+++ b/gfx/pics/swinub/back.6x6.2bpp.lz
diff --git a/gfx/pics/220/bitmask.asm b/gfx/pics/swinub/bitmask.asm
index e0a852068..e0a852068 100644
--- a/gfx/pics/220/bitmask.asm
+++ b/gfx/pics/swinub/bitmask.asm
diff --git a/gfx/pics/220/frames.asm b/gfx/pics/swinub/frames.asm
index 9e55f046d..9e55f046d 100644
--- a/gfx/pics/220/frames.asm
+++ b/gfx/pics/swinub/frames.asm
diff --git a/gfx/pics/220/front.lz b/gfx/pics/swinub/front.5x5.2bpp.lz
index 00171e0f3..00171e0f3 100644
--- a/gfx/pics/220/front.lz
+++ b/gfx/pics/swinub/front.5x5.2bpp.lz
diff --git a/gfx/pics/220/normal.pal b/gfx/pics/swinub/normal.pal
index c560793f1..c560793f1 100644
--- a/gfx/pics/220/normal.pal
+++ b/gfx/pics/swinub/normal.pal
diff --git a/gfx/pics/220/shiny.pal b/gfx/pics/swinub/shiny.pal
index 4e3eadacb..4e3eadacb 100644
--- a/gfx/pics/220/shiny.pal
+++ b/gfx/pics/swinub/shiny.pal
diff --git a/gfx/pics/114/anim0.asm b/gfx/pics/tangela/anim0.asm
index 57a237afe..57a237afe 100644
--- a/gfx/pics/114/anim0.asm
+++ b/gfx/pics/tangela/anim0.asm
diff --git a/gfx/pics/114/anim1.asm b/gfx/pics/tangela/anim1.asm
index 7d8b2550f..7d8b2550f 100644
--- a/gfx/pics/114/anim1.asm
+++ b/gfx/pics/tangela/anim1.asm
diff --git a/gfx/pics/114/back.lz b/gfx/pics/tangela/back.6x6.2bpp.lz
index 9ad73a0b6..9ad73a0b6 100644
--- a/gfx/pics/114/back.lz
+++ b/gfx/pics/tangela/back.6x6.2bpp.lz
diff --git a/gfx/pics/114/bitmask.asm b/gfx/pics/tangela/bitmask.asm
index 36344a16b..36344a16b 100644
--- a/gfx/pics/114/bitmask.asm
+++ b/gfx/pics/tangela/bitmask.asm
diff --git a/gfx/pics/114/frames.asm b/gfx/pics/tangela/frames.asm
index 96a52cafe..96a52cafe 100644
--- a/gfx/pics/114/frames.asm
+++ b/gfx/pics/tangela/frames.asm
diff --git a/gfx/pics/114/front.lz b/gfx/pics/tangela/front.6x6.2bpp.lz
index 345732b84..345732b84 100644
--- a/gfx/pics/114/front.lz
+++ b/gfx/pics/tangela/front.6x6.2bpp.lz
diff --git a/gfx/pics/114/normal.pal b/gfx/pics/tangela/normal.pal
index c742f093f..c742f093f 100644
--- a/gfx/pics/114/normal.pal
+++ b/gfx/pics/tangela/normal.pal
diff --git a/gfx/pics/114/shiny.pal b/gfx/pics/tangela/shiny.pal
index 089ec35c4..089ec35c4 100644
--- a/gfx/pics/114/shiny.pal
+++ b/gfx/pics/tangela/shiny.pal
diff --git a/gfx/pics/128/anim0.asm b/gfx/pics/tauros/anim0.asm
index 52c9264c3..52c9264c3 100644
--- a/gfx/pics/128/anim0.asm
+++ b/gfx/pics/tauros/anim0.asm
diff --git a/gfx/pics/128/anim1.asm b/gfx/pics/tauros/anim1.asm
index ab6608d0d..ab6608d0d 100644
--- a/gfx/pics/128/anim1.asm
+++ b/gfx/pics/tauros/anim1.asm
diff --git a/gfx/pics/128/back.lz b/gfx/pics/tauros/back.6x6.2bpp.lz
index 219aee479..219aee479 100644
--- a/gfx/pics/128/back.lz
+++ b/gfx/pics/tauros/back.6x6.2bpp.lz
diff --git a/gfx/pics/128/bitmask.asm b/gfx/pics/tauros/bitmask.asm
index 2e5fc87ff..2e5fc87ff 100644
--- a/gfx/pics/128/bitmask.asm
+++ b/gfx/pics/tauros/bitmask.asm
diff --git a/gfx/pics/128/frames.asm b/gfx/pics/tauros/frames.asm
index 26f8df20a..26f8df20a 100644
--- a/gfx/pics/128/frames.asm
+++ b/gfx/pics/tauros/frames.asm
diff --git a/gfx/pics/128/front.lz b/gfx/pics/tauros/front.7x7.2bpp.lz
index d395b145b..d395b145b 100644
--- a/gfx/pics/128/front.lz
+++ b/gfx/pics/tauros/front.7x7.2bpp.lz
diff --git a/gfx/pics/128/normal.pal b/gfx/pics/tauros/normal.pal
index 396e765e2..396e765e2 100644
--- a/gfx/pics/128/normal.pal
+++ b/gfx/pics/tauros/normal.pal
diff --git a/gfx/pics/128/shiny.pal b/gfx/pics/tauros/shiny.pal
index cc360615c..cc360615c 100644
--- a/gfx/pics/128/shiny.pal
+++ b/gfx/pics/tauros/shiny.pal
diff --git a/gfx/pics/216/anim0.asm b/gfx/pics/teddiursa/anim0.asm
index 78bbeae60..78bbeae60 100644
--- a/gfx/pics/216/anim0.asm
+++ b/gfx/pics/teddiursa/anim0.asm
diff --git a/gfx/pics/216/anim1.asm b/gfx/pics/teddiursa/anim1.asm
index 85cae5284..85cae5284 100644
--- a/gfx/pics/216/anim1.asm
+++ b/gfx/pics/teddiursa/anim1.asm
diff --git a/gfx/pics/216/back.lz b/gfx/pics/teddiursa/back.6x6.2bpp.lz
index a6d267ef8..a6d267ef8 100644
--- a/gfx/pics/216/back.lz
+++ b/gfx/pics/teddiursa/back.6x6.2bpp.lz
diff --git a/gfx/pics/216/bitmask.asm b/gfx/pics/teddiursa/bitmask.asm
index e5f542110..e5f542110 100644
--- a/gfx/pics/216/bitmask.asm
+++ b/gfx/pics/teddiursa/bitmask.asm
diff --git a/gfx/pics/216/frames.asm b/gfx/pics/teddiursa/frames.asm
index 542906c4c..542906c4c 100644
--- a/gfx/pics/216/frames.asm
+++ b/gfx/pics/teddiursa/frames.asm
diff --git a/gfx/pics/216/front.lz b/gfx/pics/teddiursa/front.5x5.2bpp.lz
index 40c22315e..40c22315e 100644
--- a/gfx/pics/216/front.lz
+++ b/gfx/pics/teddiursa/front.5x5.2bpp.lz
diff --git a/gfx/pics/216/normal.pal b/gfx/pics/teddiursa/normal.pal
index 07a1d3622..07a1d3622 100644
--- a/gfx/pics/216/normal.pal
+++ b/gfx/pics/teddiursa/normal.pal
diff --git a/gfx/pics/216/shiny.pal b/gfx/pics/teddiursa/shiny.pal
index f3b997329..f3b997329 100644
--- a/gfx/pics/216/shiny.pal
+++ b/gfx/pics/teddiursa/shiny.pal
diff --git a/gfx/pics/072/anim0.asm b/gfx/pics/tentacool/anim0.asm
index 19b7d3a14..19b7d3a14 100644
--- a/gfx/pics/072/anim0.asm
+++ b/gfx/pics/tentacool/anim0.asm
diff --git a/gfx/pics/072/anim1.asm b/gfx/pics/tentacool/anim1.asm
index 4e9ba0b11..4e9ba0b11 100644
--- a/gfx/pics/072/anim1.asm
+++ b/gfx/pics/tentacool/anim1.asm
diff --git a/gfx/pics/072/back.lz b/gfx/pics/tentacool/back.6x6.2bpp.lz
index c0b615905..c0b615905 100644
--- a/gfx/pics/072/back.lz
+++ b/gfx/pics/tentacool/back.6x6.2bpp.lz
diff --git a/gfx/pics/072/bitmask.asm b/gfx/pics/tentacool/bitmask.asm
index 36a68c87e..36a68c87e 100644
--- a/gfx/pics/072/bitmask.asm
+++ b/gfx/pics/tentacool/bitmask.asm
diff --git a/gfx/pics/072/frames.asm b/gfx/pics/tentacool/frames.asm
index bb7e38266..bb7e38266 100644
--- a/gfx/pics/072/frames.asm
+++ b/gfx/pics/tentacool/frames.asm
diff --git a/gfx/pics/072/front.lz b/gfx/pics/tentacool/front.5x5.2bpp.lz
index 57916e4e9..57916e4e9 100644
--- a/gfx/pics/072/front.lz
+++ b/gfx/pics/tentacool/front.5x5.2bpp.lz
diff --git a/gfx/pics/072/normal.pal b/gfx/pics/tentacool/normal.pal
index 91a11c6b7..91a11c6b7 100644
--- a/gfx/pics/072/normal.pal
+++ b/gfx/pics/tentacool/normal.pal
diff --git a/gfx/pics/072/shiny.pal b/gfx/pics/tentacool/shiny.pal
index 1fec33a22..1fec33a22 100644
--- a/gfx/pics/072/shiny.pal
+++ b/gfx/pics/tentacool/shiny.pal
diff --git a/gfx/pics/073/anim0.asm b/gfx/pics/tentacruel/anim0.asm
index 4fed8e9d4..4fed8e9d4 100644
--- a/gfx/pics/073/anim0.asm
+++ b/gfx/pics/tentacruel/anim0.asm
diff --git a/gfx/pics/073/anim1.asm b/gfx/pics/tentacruel/anim1.asm
index fd8d510b4..fd8d510b4 100644
--- a/gfx/pics/073/anim1.asm
+++ b/gfx/pics/tentacruel/anim1.asm
diff --git a/gfx/pics/073/back.lz b/gfx/pics/tentacruel/back.6x6.2bpp.lz
index 89d7a492d..89d7a492d 100644
--- a/gfx/pics/073/back.lz
+++ b/gfx/pics/tentacruel/back.6x6.2bpp.lz
diff --git a/gfx/pics/073/bitmask.asm b/gfx/pics/tentacruel/bitmask.asm
index 54d28d36d..54d28d36d 100644
--- a/gfx/pics/073/bitmask.asm
+++ b/gfx/pics/tentacruel/bitmask.asm
diff --git a/gfx/pics/073/frames.asm b/gfx/pics/tentacruel/frames.asm
index 124520e2f..124520e2f 100644
--- a/gfx/pics/073/frames.asm
+++ b/gfx/pics/tentacruel/frames.asm
diff --git a/gfx/pics/073/front.lz b/gfx/pics/tentacruel/front.6x6.2bpp.lz
index ec6f4c2c8..ec6f4c2c8 100644
--- a/gfx/pics/073/front.lz
+++ b/gfx/pics/tentacruel/front.6x6.2bpp.lz
diff --git a/gfx/pics/073/normal.pal b/gfx/pics/tentacruel/normal.pal
index 98f28bd61..98f28bd61 100644
--- a/gfx/pics/073/normal.pal
+++ b/gfx/pics/tentacruel/normal.pal
diff --git a/gfx/pics/073/shiny.pal b/gfx/pics/tentacruel/shiny.pal
index afe40aff6..afe40aff6 100644
--- a/gfx/pics/073/shiny.pal
+++ b/gfx/pics/tentacruel/shiny.pal
diff --git a/gfx/pics/175/anim0.asm b/gfx/pics/togepi/anim0.asm
index a09192323..a09192323 100644
--- a/gfx/pics/175/anim0.asm
+++ b/gfx/pics/togepi/anim0.asm
diff --git a/gfx/pics/175/anim1.asm b/gfx/pics/togepi/anim1.asm
index e3bd76591..e3bd76591 100644
--- a/gfx/pics/175/anim1.asm
+++ b/gfx/pics/togepi/anim1.asm
diff --git a/gfx/pics/175/back.lz b/gfx/pics/togepi/back.6x6.2bpp.lz
index ed6fab2ec..ed6fab2ec 100644
--- a/gfx/pics/175/back.lz
+++ b/gfx/pics/togepi/back.6x6.2bpp.lz
diff --git a/gfx/pics/175/bitmask.asm b/gfx/pics/togepi/bitmask.asm
index dfe406529..dfe406529 100644
--- a/gfx/pics/175/bitmask.asm
+++ b/gfx/pics/togepi/bitmask.asm
diff --git a/gfx/pics/175/frames.asm b/gfx/pics/togepi/frames.asm
index e75a9860b..e75a9860b 100644
--- a/gfx/pics/175/frames.asm
+++ b/gfx/pics/togepi/frames.asm
diff --git a/gfx/pics/175/front.lz b/gfx/pics/togepi/front.5x5.2bpp.lz
index 8ceaf38bf..8ceaf38bf 100644
--- a/gfx/pics/175/front.lz
+++ b/gfx/pics/togepi/front.5x5.2bpp.lz
diff --git a/gfx/pics/175/normal.pal b/gfx/pics/togepi/normal.pal
index 670ccdfaa..670ccdfaa 100644
--- a/gfx/pics/175/normal.pal
+++ b/gfx/pics/togepi/normal.pal
diff --git a/gfx/pics/175/shiny.pal b/gfx/pics/togepi/shiny.pal
index 6e194e5d9..6e194e5d9 100644
--- a/gfx/pics/175/shiny.pal
+++ b/gfx/pics/togepi/shiny.pal
diff --git a/gfx/pics/176/anim0.asm b/gfx/pics/togetic/anim0.asm
index cd1ac8f9b..cd1ac8f9b 100644
--- a/gfx/pics/176/anim0.asm
+++ b/gfx/pics/togetic/anim0.asm
diff --git a/gfx/pics/176/anim1.asm b/gfx/pics/togetic/anim1.asm
index 543befa82..543befa82 100644
--- a/gfx/pics/176/anim1.asm
+++ b/gfx/pics/togetic/anim1.asm
diff --git a/gfx/pics/176/back.lz b/gfx/pics/togetic/back.6x6.2bpp.lz
index 134d5718a..134d5718a 100644
--- a/gfx/pics/176/back.lz
+++ b/gfx/pics/togetic/back.6x6.2bpp.lz
diff --git a/gfx/pics/176/bitmask.asm b/gfx/pics/togetic/bitmask.asm
index bf7c7ce1a..bf7c7ce1a 100644
--- a/gfx/pics/176/bitmask.asm
+++ b/gfx/pics/togetic/bitmask.asm
diff --git a/gfx/pics/176/frames.asm b/gfx/pics/togetic/frames.asm
index b5513420a..b5513420a 100644
--- a/gfx/pics/176/frames.asm
+++ b/gfx/pics/togetic/frames.asm
diff --git a/gfx/pics/176/front.lz b/gfx/pics/togetic/front.7x7.2bpp.lz
index 13e98ae1d..13e98ae1d 100644
--- a/gfx/pics/176/front.lz
+++ b/gfx/pics/togetic/front.7x7.2bpp.lz
diff --git a/gfx/pics/176/normal.pal b/gfx/pics/togetic/normal.pal
index c968300f4..c968300f4 100644
--- a/gfx/pics/176/normal.pal
+++ b/gfx/pics/togetic/normal.pal
diff --git a/gfx/pics/176/shiny.pal b/gfx/pics/togetic/shiny.pal
index 10e7182f5..10e7182f5 100644
--- a/gfx/pics/176/shiny.pal
+++ b/gfx/pics/togetic/shiny.pal
diff --git a/gfx/pics/158/anim0.asm b/gfx/pics/totodile/anim0.asm
index c320f4646..c320f4646 100644
--- a/gfx/pics/158/anim0.asm
+++ b/gfx/pics/totodile/anim0.asm
diff --git a/gfx/pics/158/anim1.asm b/gfx/pics/totodile/anim1.asm
index 35379db93..35379db93 100644
--- a/gfx/pics/158/anim1.asm
+++ b/gfx/pics/totodile/anim1.asm
diff --git a/gfx/pics/158/back.lz b/gfx/pics/totodile/back.6x6.2bpp.lz
index 6d73c934f..6d73c934f 100644
--- a/gfx/pics/158/back.lz
+++ b/gfx/pics/totodile/back.6x6.2bpp.lz
diff --git a/gfx/pics/158/bitmask.asm b/gfx/pics/totodile/bitmask.asm
index 1d81390e3..1d81390e3 100644
--- a/gfx/pics/158/bitmask.asm
+++ b/gfx/pics/totodile/bitmask.asm
diff --git a/gfx/pics/158/frames.asm b/gfx/pics/totodile/frames.asm
index fbce8e2c8..fbce8e2c8 100644
--- a/gfx/pics/158/frames.asm
+++ b/gfx/pics/totodile/frames.asm
diff --git a/gfx/pics/158/front.lz b/gfx/pics/totodile/front.5x5.2bpp.lz
index 8e1ebd2f5..8e1ebd2f5 100644
--- a/gfx/pics/158/front.lz
+++ b/gfx/pics/totodile/front.5x5.2bpp.lz
diff --git a/gfx/pics/158/normal.pal b/gfx/pics/totodile/normal.pal
index a07351f43..a07351f43 100644
--- a/gfx/pics/158/normal.pal
+++ b/gfx/pics/totodile/normal.pal
diff --git a/gfx/pics/158/shiny.pal b/gfx/pics/totodile/shiny.pal
index c947fe43a..c947fe43a 100644
--- a/gfx/pics/158/shiny.pal
+++ b/gfx/pics/totodile/shiny.pal
diff --git a/gfx/pics/157/anim0.asm b/gfx/pics/typhlosion/anim0.asm
index bb4b30d6c..bb4b30d6c 100644
--- a/gfx/pics/157/anim0.asm
+++ b/gfx/pics/typhlosion/anim0.asm
diff --git a/gfx/pics/157/anim1.asm b/gfx/pics/typhlosion/anim1.asm
index 2f7ed3abc..2f7ed3abc 100644
--- a/gfx/pics/157/anim1.asm
+++ b/gfx/pics/typhlosion/anim1.asm
diff --git a/gfx/pics/157/back.lz b/gfx/pics/typhlosion/back.6x6.2bpp.lz
index 592306fa6..592306fa6 100644
--- a/gfx/pics/157/back.lz
+++ b/gfx/pics/typhlosion/back.6x6.2bpp.lz
diff --git a/gfx/pics/157/bitmask.asm b/gfx/pics/typhlosion/bitmask.asm
index bcbfa43cf..bcbfa43cf 100644
--- a/gfx/pics/157/bitmask.asm
+++ b/gfx/pics/typhlosion/bitmask.asm
diff --git a/gfx/pics/157/frames.asm b/gfx/pics/typhlosion/frames.asm
index 152772e7d..152772e7d 100644
--- a/gfx/pics/157/frames.asm
+++ b/gfx/pics/typhlosion/frames.asm
diff --git a/gfx/pics/157/front.lz b/gfx/pics/typhlosion/front.7x7.2bpp.lz
index 9dba415ad..9dba415ad 100644
--- a/gfx/pics/157/front.lz
+++ b/gfx/pics/typhlosion/front.7x7.2bpp.lz
diff --git a/gfx/pics/157/normal.pal b/gfx/pics/typhlosion/normal.pal
index 6b3f9efe7..6b3f9efe7 100644
--- a/gfx/pics/157/normal.pal
+++ b/gfx/pics/typhlosion/normal.pal
diff --git a/gfx/pics/157/shiny.pal b/gfx/pics/typhlosion/shiny.pal
index 5b3df0b4e..5b3df0b4e 100644
--- a/gfx/pics/157/shiny.pal
+++ b/gfx/pics/typhlosion/shiny.pal
diff --git a/gfx/pics/248/anim0.asm b/gfx/pics/tyranitar/anim0.asm
index f345bdd8e..f345bdd8e 100644
--- a/gfx/pics/248/anim0.asm
+++ b/gfx/pics/tyranitar/anim0.asm
diff --git a/gfx/pics/248/anim1.asm b/gfx/pics/tyranitar/anim1.asm
index 29788fd1d..29788fd1d 100644
--- a/gfx/pics/248/anim1.asm
+++ b/gfx/pics/tyranitar/anim1.asm
diff --git a/gfx/pics/248/back.lz b/gfx/pics/tyranitar/back.6x6.2bpp.lz
index 572e56d69..572e56d69 100644
--- a/gfx/pics/248/back.lz
+++ b/gfx/pics/tyranitar/back.6x6.2bpp.lz
diff --git a/gfx/pics/248/bitmask.asm b/gfx/pics/tyranitar/bitmask.asm
index 446e83c42..446e83c42 100644
--- a/gfx/pics/248/bitmask.asm
+++ b/gfx/pics/tyranitar/bitmask.asm
diff --git a/gfx/pics/248/frames.asm b/gfx/pics/tyranitar/frames.asm
index b9d6d7da5..b9d6d7da5 100644
--- a/gfx/pics/248/frames.asm
+++ b/gfx/pics/tyranitar/frames.asm
diff --git a/gfx/pics/248/front.lz b/gfx/pics/tyranitar/front.7x7.2bpp.lz
index 07d48a5fe..07d48a5fe 100644
--- a/gfx/pics/248/front.lz
+++ b/gfx/pics/tyranitar/front.7x7.2bpp.lz
diff --git a/gfx/pics/248/normal.pal b/gfx/pics/tyranitar/normal.pal
index 5c02e7683..5c02e7683 100644
--- a/gfx/pics/248/normal.pal
+++ b/gfx/pics/tyranitar/normal.pal
diff --git a/gfx/pics/248/shiny.pal b/gfx/pics/tyranitar/shiny.pal
index 4eebd8b4f..4eebd8b4f 100644
--- a/gfx/pics/248/shiny.pal
+++ b/gfx/pics/tyranitar/shiny.pal
diff --git a/gfx/pics/236/anim0.asm b/gfx/pics/tyrogue/anim0.asm
index e1470d816..e1470d816 100644
--- a/gfx/pics/236/anim0.asm
+++ b/gfx/pics/tyrogue/anim0.asm
diff --git a/gfx/pics/236/anim1.asm b/gfx/pics/tyrogue/anim1.asm
index da73f62e3..da73f62e3 100644
--- a/gfx/pics/236/anim1.asm
+++ b/gfx/pics/tyrogue/anim1.asm
diff --git a/gfx/pics/236/back.lz b/gfx/pics/tyrogue/back.6x6.2bpp.lz
index 9c9a0babc..9c9a0babc 100644
--- a/gfx/pics/236/back.lz
+++ b/gfx/pics/tyrogue/back.6x6.2bpp.lz
diff --git a/gfx/pics/236/bitmask.asm b/gfx/pics/tyrogue/bitmask.asm
index df8e0658d..df8e0658d 100644
--- a/gfx/pics/236/bitmask.asm
+++ b/gfx/pics/tyrogue/bitmask.asm
diff --git a/gfx/pics/236/frames.asm b/gfx/pics/tyrogue/frames.asm
index 9ed82ce41..9ed82ce41 100644
--- a/gfx/pics/236/frames.asm
+++ b/gfx/pics/tyrogue/frames.asm
diff --git a/gfx/pics/236/front.lz b/gfx/pics/tyrogue/front.5x5.2bpp.lz
index 8245825fb..8245825fb 100644
--- a/gfx/pics/236/front.lz
+++ b/gfx/pics/tyrogue/front.5x5.2bpp.lz
diff --git a/gfx/pics/236/normal.pal b/gfx/pics/tyrogue/normal.pal
index 686526e1b..686526e1b 100644
--- a/gfx/pics/236/normal.pal
+++ b/gfx/pics/tyrogue/normal.pal
diff --git a/gfx/pics/236/shiny.pal b/gfx/pics/tyrogue/shiny.pal
index 53e0a5c1e..53e0a5c1e 100644
--- a/gfx/pics/236/shiny.pal
+++ b/gfx/pics/tyrogue/shiny.pal
diff --git a/gfx/pics/197/anim0.asm b/gfx/pics/umbreon/anim0.asm
index 541539979..541539979 100644
--- a/gfx/pics/197/anim0.asm
+++ b/gfx/pics/umbreon/anim0.asm
diff --git a/gfx/pics/197/anim1.asm b/gfx/pics/umbreon/anim1.asm
index adb0158e2..adb0158e2 100644
--- a/gfx/pics/197/anim1.asm
+++ b/gfx/pics/umbreon/anim1.asm
diff --git a/gfx/pics/197/back.lz b/gfx/pics/umbreon/back.6x6.2bpp.lz
index cf39af2c6..cf39af2c6 100644
--- a/gfx/pics/197/back.lz
+++ b/gfx/pics/umbreon/back.6x6.2bpp.lz
diff --git a/gfx/pics/197/bitmask.asm b/gfx/pics/umbreon/bitmask.asm
index 91184a50e..91184a50e 100644
--- a/gfx/pics/197/bitmask.asm
+++ b/gfx/pics/umbreon/bitmask.asm
diff --git a/gfx/pics/197/frames.asm b/gfx/pics/umbreon/frames.asm
index 0696ed38a..0696ed38a 100644
--- a/gfx/pics/197/frames.asm
+++ b/gfx/pics/umbreon/frames.asm
diff --git a/gfx/pics/197/front.lz b/gfx/pics/umbreon/front.6x6.2bpp.lz
index 64a338138..64a338138 100644
--- a/gfx/pics/197/front.lz
+++ b/gfx/pics/umbreon/front.6x6.2bpp.lz
diff --git a/gfx/pics/197/normal.pal b/gfx/pics/umbreon/normal.pal
index b3d692a12..b3d692a12 100644
--- a/gfx/pics/197/normal.pal
+++ b/gfx/pics/umbreon/normal.pal
diff --git a/gfx/pics/197/shiny.pal b/gfx/pics/umbreon/shiny.pal
index 9173bbb15..9173bbb15 100644
--- a/gfx/pics/197/shiny.pal
+++ b/gfx/pics/umbreon/shiny.pal
diff --git a/gfx/pics/201/anim0.asm b/gfx/pics/unown/anim0.asm
index 510d2751c..510d2751c 100644
--- a/gfx/pics/201/anim0.asm
+++ b/gfx/pics/unown/anim0.asm
diff --git a/gfx/pics/201/anim1.asm b/gfx/pics/unown/anim1.asm
index 3d0f65488..3d0f65488 100644
--- a/gfx/pics/201/anim1.asm
+++ b/gfx/pics/unown/anim1.asm
diff --git a/gfx/pics/201/bitmask.asm b/gfx/pics/unown/bitmask.asm
index f0ae4e5b2..f0ae4e5b2 100644
--- a/gfx/pics/201/bitmask.asm
+++ b/gfx/pics/unown/bitmask.asm
diff --git a/gfx/pics/201/frames.asm b/gfx/pics/unown/frames.asm
index ca996e90a..ca996e90a 100644
--- a/gfx/pics/201/frames.asm
+++ b/gfx/pics/unown/frames.asm
diff --git a/gfx/pics/201/normal.pal b/gfx/pics/unown/normal.pal
index 19f5252a7..19f5252a7 100644
--- a/gfx/pics/201/normal.pal
+++ b/gfx/pics/unown/normal.pal
diff --git a/gfx/pics/201/shiny.pal b/gfx/pics/unown/shiny.pal
index 6a30f11e6..6a30f11e6 100644
--- a/gfx/pics/201/shiny.pal
+++ b/gfx/pics/unown/shiny.pal
diff --git a/gfx/pics/201a/anim0.asm b/gfx/pics/unown_a/anim0.asm
index 7243ed0fb..7243ed0fb 100644
--- a/gfx/pics/201a/anim0.asm
+++ b/gfx/pics/unown_a/anim0.asm
diff --git a/gfx/pics/201a/anim1.asm b/gfx/pics/unown_a/anim1.asm
index d995ba44d..d995ba44d 100644
--- a/gfx/pics/201a/anim1.asm
+++ b/gfx/pics/unown_a/anim1.asm
diff --git a/gfx/pics/201a/back.lz b/gfx/pics/unown_a/back.6x6.2bpp.lz
index 08833e3e2..08833e3e2 100644
--- a/gfx/pics/201a/back.lz
+++ b/gfx/pics/unown_a/back.6x6.2bpp.lz
diff --git a/gfx/pics/201a/bitmask.asm b/gfx/pics/unown_a/bitmask.asm
index 892ca25d3..892ca25d3 100644
--- a/gfx/pics/201a/bitmask.asm
+++ b/gfx/pics/unown_a/bitmask.asm
diff --git a/gfx/pics/201a/frames.asm b/gfx/pics/unown_a/frames.asm
index a603a605b..a603a605b 100644
--- a/gfx/pics/201a/frames.asm
+++ b/gfx/pics/unown_a/frames.asm
diff --git a/gfx/pics/201a/front.lz b/gfx/pics/unown_a/front.5x5.2bpp.lz
index 6f0639575..6f0639575 100644
--- a/gfx/pics/201a/front.lz
+++ b/gfx/pics/unown_a/front.5x5.2bpp.lz
diff --git a/gfx/pics/unown_anims.asm b/gfx/pics/unown_anims.asm
index b0cbd521d..2bae95eeb 100644
--- a/gfx/pics/unown_anims.asm
+++ b/gfx/pics/unown_anims.asm
@@ -1,26 +1,26 @@
-UnownAAnimation: INCLUDE "gfx/pics/201a/anim0.asm"
-UnownBAnimation: INCLUDE "gfx/pics/201b/anim0.asm"
-UnownCAnimation: INCLUDE "gfx/pics/201c/anim0.asm"
-UnownDAnimation: INCLUDE "gfx/pics/201d/anim0.asm"
-UnownEAnimation: INCLUDE "gfx/pics/201e/anim0.asm"
-UnownFAnimation: INCLUDE "gfx/pics/201f/anim0.asm"
-UnownGAnimation: INCLUDE "gfx/pics/201g/anim0.asm"
-UnownHAnimation: INCLUDE "gfx/pics/201h/anim0.asm"
-UnownIAnimation: INCLUDE "gfx/pics/201i/anim0.asm"
-UnownJAnimation: INCLUDE "gfx/pics/201j/anim0.asm"
-UnownKAnimation: INCLUDE "gfx/pics/201k/anim0.asm"
-UnownLAnimation: INCLUDE "gfx/pics/201l/anim0.asm"
-UnownMAnimation: INCLUDE "gfx/pics/201m/anim0.asm"
-UnownNAnimation: INCLUDE "gfx/pics/201n/anim0.asm"
-UnownOAnimation: INCLUDE "gfx/pics/201o/anim0.asm"
-UnownPAnimation: INCLUDE "gfx/pics/201p/anim0.asm"
-UnownQAnimation: INCLUDE "gfx/pics/201q/anim0.asm"
-UnownRAnimation: INCLUDE "gfx/pics/201r/anim0.asm"
-UnownSAnimation: INCLUDE "gfx/pics/201s/anim0.asm"
-UnownTAnimation: INCLUDE "gfx/pics/201t/anim0.asm"
-UnownUAnimation: INCLUDE "gfx/pics/201u/anim0.asm"
-UnownVAnimation: INCLUDE "gfx/pics/201v/anim0.asm"
-UnownWAnimation: INCLUDE "gfx/pics/201w/anim0.asm"
-UnownXAnimation: INCLUDE "gfx/pics/201x/anim0.asm"
-UnownYAnimation: INCLUDE "gfx/pics/201y/anim0.asm"
-UnownZAnimation: INCLUDE "gfx/pics/201z/anim0.asm"
+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/201b/anim0.asm b/gfx/pics/unown_b/anim0.asm
index 7683b9e84..7683b9e84 100644
--- a/gfx/pics/201b/anim0.asm
+++ b/gfx/pics/unown_b/anim0.asm
diff --git a/gfx/pics/201b/anim1.asm b/gfx/pics/unown_b/anim1.asm
index b8e03b299..b8e03b299 100644
--- a/gfx/pics/201b/anim1.asm
+++ b/gfx/pics/unown_b/anim1.asm
diff --git a/gfx/pics/201b/back.lz b/gfx/pics/unown_b/back.6x6.2bpp.lz
index 46375f630..46375f630 100644
--- a/gfx/pics/201b/back.lz
+++ b/gfx/pics/unown_b/back.6x6.2bpp.lz
diff --git a/gfx/pics/201b/bitmask.asm b/gfx/pics/unown_b/bitmask.asm
index 71d442b6a..71d442b6a 100644
--- a/gfx/pics/201b/bitmask.asm
+++ b/gfx/pics/unown_b/bitmask.asm
diff --git a/gfx/pics/201b/frames.asm b/gfx/pics/unown_b/frames.asm
index b9235dd59..b9235dd59 100644
--- a/gfx/pics/201b/frames.asm
+++ b/gfx/pics/unown_b/frames.asm
diff --git a/gfx/pics/201b/front.lz b/gfx/pics/unown_b/front.5x5.2bpp.lz
index 661c64a9e..661c64a9e 100644
--- a/gfx/pics/201b/front.lz
+++ b/gfx/pics/unown_b/front.5x5.2bpp.lz
diff --git a/gfx/pics/unown_bitmasks.asm b/gfx/pics/unown_bitmasks.asm
index 6094939cb..5df6b7463 100644
--- a/gfx/pics/unown_bitmasks.asm
+++ b/gfx/pics/unown_bitmasks.asm
@@ -1,26 +1,26 @@
-UnownABitmasks: INCLUDE "gfx/pics/201a/bitmask.asm"
-UnownBBitmasks: INCLUDE "gfx/pics/201b/bitmask.asm"
-UnownCBitmasks: INCLUDE "gfx/pics/201c/bitmask.asm"
-UnownDBitmasks: INCLUDE "gfx/pics/201d/bitmask.asm"
-UnownEBitmasks: INCLUDE "gfx/pics/201e/bitmask.asm"
-UnownFBitmasks: INCLUDE "gfx/pics/201f/bitmask.asm"
-UnownGBitmasks: INCLUDE "gfx/pics/201g/bitmask.asm"
-UnownHBitmasks: INCLUDE "gfx/pics/201h/bitmask.asm"
-UnownIBitmasks: INCLUDE "gfx/pics/201i/bitmask.asm"
-UnownJBitmasks: INCLUDE "gfx/pics/201j/bitmask.asm"
-UnownKBitmasks: INCLUDE "gfx/pics/201k/bitmask.asm"
-UnownLBitmasks: INCLUDE "gfx/pics/201l/bitmask.asm"
-UnownMBitmasks: INCLUDE "gfx/pics/201m/bitmask.asm"
-UnownNBitmasks: INCLUDE "gfx/pics/201n/bitmask.asm"
-UnownOBitmasks: INCLUDE "gfx/pics/201o/bitmask.asm"
-UnownPBitmasks: INCLUDE "gfx/pics/201p/bitmask.asm"
-UnownQBitmasks: INCLUDE "gfx/pics/201q/bitmask.asm"
-UnownRBitmasks: INCLUDE "gfx/pics/201r/bitmask.asm"
-UnownSBitmasks: INCLUDE "gfx/pics/201s/bitmask.asm"
-UnownTBitmasks: INCLUDE "gfx/pics/201t/bitmask.asm"
-UnownUBitmasks: INCLUDE "gfx/pics/201u/bitmask.asm"
-UnownVBitmasks: INCLUDE "gfx/pics/201v/bitmask.asm"
-UnownWBitmasks: INCLUDE "gfx/pics/201w/bitmask.asm"
-UnownXBitmasks: INCLUDE "gfx/pics/201x/bitmask.asm"
-UnownYBitmasks: INCLUDE "gfx/pics/201y/bitmask.asm"
-UnownZBitmasks: INCLUDE "gfx/pics/201z/bitmask.asm"
+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/201c/anim0.asm b/gfx/pics/unown_c/anim0.asm
index 1e8b894ab..1e8b894ab 100644
--- a/gfx/pics/201c/anim0.asm
+++ b/gfx/pics/unown_c/anim0.asm
diff --git a/gfx/pics/201c/anim1.asm b/gfx/pics/unown_c/anim1.asm
index fcf07ced3..fcf07ced3 100644
--- a/gfx/pics/201c/anim1.asm
+++ b/gfx/pics/unown_c/anim1.asm
diff --git a/gfx/pics/201c/back.lz b/gfx/pics/unown_c/back.6x6.2bpp.lz
index 796ba6d6a..796ba6d6a 100644
--- a/gfx/pics/201c/back.lz
+++ b/gfx/pics/unown_c/back.6x6.2bpp.lz
diff --git a/gfx/pics/201c/bitmask.asm b/gfx/pics/unown_c/bitmask.asm
index 864b1f9ae..864b1f9ae 100644
--- a/gfx/pics/201c/bitmask.asm
+++ b/gfx/pics/unown_c/bitmask.asm
diff --git a/gfx/pics/201c/frames.asm b/gfx/pics/unown_c/frames.asm
index ea3cce54a..ea3cce54a 100644
--- a/gfx/pics/201c/frames.asm
+++ b/gfx/pics/unown_c/frames.asm
diff --git a/gfx/pics/201c/front.lz b/gfx/pics/unown_c/front.5x5.2bpp.lz
index 18fb3b48b..18fb3b48b 100644
--- a/gfx/pics/201c/front.lz
+++ b/gfx/pics/unown_c/front.5x5.2bpp.lz
diff --git a/gfx/pics/201d/anim0.asm b/gfx/pics/unown_d/anim0.asm
index 51c3b2de1..51c3b2de1 100644
--- a/gfx/pics/201d/anim0.asm
+++ b/gfx/pics/unown_d/anim0.asm
diff --git a/gfx/pics/201d/anim1.asm b/gfx/pics/unown_d/anim1.asm
index 17604ce36..17604ce36 100644
--- a/gfx/pics/201d/anim1.asm
+++ b/gfx/pics/unown_d/anim1.asm
diff --git a/gfx/pics/201d/back.lz b/gfx/pics/unown_d/back.6x6.2bpp.lz
index 8a967332f..8a967332f 100644
--- a/gfx/pics/201d/back.lz
+++ b/gfx/pics/unown_d/back.6x6.2bpp.lz
diff --git a/gfx/pics/201d/bitmask.asm b/gfx/pics/unown_d/bitmask.asm
index 7aa8f58ef..7aa8f58ef 100644
--- a/gfx/pics/201d/bitmask.asm
+++ b/gfx/pics/unown_d/bitmask.asm
diff --git a/gfx/pics/201d/frames.asm b/gfx/pics/unown_d/frames.asm
index 6c110241e..6c110241e 100644
--- a/gfx/pics/201d/frames.asm
+++ b/gfx/pics/unown_d/frames.asm
diff --git a/gfx/pics/201d/front.lz b/gfx/pics/unown_d/front.5x5.2bpp.lz
index d8004662d..d8004662d 100644
--- a/gfx/pics/201d/front.lz
+++ b/gfx/pics/unown_d/front.5x5.2bpp.lz
diff --git a/gfx/pics/201e/anim0.asm b/gfx/pics/unown_e/anim0.asm
index 0a58feb4d..0a58feb4d 100644
--- a/gfx/pics/201e/anim0.asm
+++ b/gfx/pics/unown_e/anim0.asm
diff --git a/gfx/pics/201e/anim1.asm b/gfx/pics/unown_e/anim1.asm
index 53db93c1f..53db93c1f 100644
--- a/gfx/pics/201e/anim1.asm
+++ b/gfx/pics/unown_e/anim1.asm
diff --git a/gfx/pics/201e/back.lz b/gfx/pics/unown_e/back.6x6.2bpp.lz
index dfc768a1e..dfc768a1e 100644
--- a/gfx/pics/201e/back.lz
+++ b/gfx/pics/unown_e/back.6x6.2bpp.lz
diff --git a/gfx/pics/201e/bitmask.asm b/gfx/pics/unown_e/bitmask.asm
index b54fa3f0c..b54fa3f0c 100644
--- a/gfx/pics/201e/bitmask.asm
+++ b/gfx/pics/unown_e/bitmask.asm
diff --git a/gfx/pics/201e/frames.asm b/gfx/pics/unown_e/frames.asm
index 8374cad6e..8374cad6e 100644
--- a/gfx/pics/201e/frames.asm
+++ b/gfx/pics/unown_e/frames.asm
diff --git a/gfx/pics/201e/front.lz b/gfx/pics/unown_e/front.5x5.2bpp.lz
index 5358f5ff9..5358f5ff9 100644
--- a/gfx/pics/201e/front.lz
+++ b/gfx/pics/unown_e/front.5x5.2bpp.lz
diff --git a/gfx/pics/unown_extras.asm b/gfx/pics/unown_extras.asm
index 3574a13c7..2609afe46 100644
--- a/gfx/pics/unown_extras.asm
+++ b/gfx/pics/unown_extras.asm
@@ -1,26 +1,26 @@
-UnownAAnimationExtra: INCLUDE "gfx/pics/201a/anim1.asm"
-UnownBAnimationExtra: INCLUDE "gfx/pics/201b/anim1.asm"
-UnownCAnimationExtra: INCLUDE "gfx/pics/201c/anim1.asm"
-UnownDAnimationExtra: INCLUDE "gfx/pics/201d/anim1.asm"
-UnownEAnimationExtra: INCLUDE "gfx/pics/201e/anim1.asm"
-UnownFAnimationExtra: INCLUDE "gfx/pics/201f/anim1.asm"
-UnownGAnimationExtra: INCLUDE "gfx/pics/201g/anim1.asm"
-UnownHAnimationExtra: INCLUDE "gfx/pics/201h/anim1.asm"
-UnownIAnimationExtra: INCLUDE "gfx/pics/201i/anim1.asm"
-UnownJAnimationExtra: INCLUDE "gfx/pics/201j/anim1.asm"
-UnownKAnimationExtra: INCLUDE "gfx/pics/201k/anim1.asm"
-UnownLAnimationExtra: INCLUDE "gfx/pics/201l/anim1.asm"
-UnownMAnimationExtra: INCLUDE "gfx/pics/201m/anim1.asm"
-UnownNAnimationExtra: INCLUDE "gfx/pics/201n/anim1.asm"
-UnownOAnimationExtra: INCLUDE "gfx/pics/201o/anim1.asm"
-UnownPAnimationExtra: INCLUDE "gfx/pics/201p/anim1.asm"
-UnownQAnimationExtra: INCLUDE "gfx/pics/201q/anim1.asm"
-UnownRAnimationExtra: INCLUDE "gfx/pics/201r/anim1.asm"
-UnownSAnimationExtra: INCLUDE "gfx/pics/201s/anim1.asm"
-UnownTAnimationExtra: INCLUDE "gfx/pics/201t/anim1.asm"
-UnownUAnimationExtra: INCLUDE "gfx/pics/201u/anim1.asm"
-UnownVAnimationExtra: INCLUDE "gfx/pics/201v/anim1.asm"
-UnownWAnimationExtra: INCLUDE "gfx/pics/201w/anim1.asm"
-UnownXAnimationExtra: INCLUDE "gfx/pics/201x/anim1.asm"
-UnownYAnimationExtra: INCLUDE "gfx/pics/201y/anim1.asm"
-UnownZAnimationExtra: INCLUDE "gfx/pics/201z/anim1.asm"
+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/201f/anim0.asm b/gfx/pics/unown_f/anim0.asm
index f81c298a6..f81c298a6 100644
--- a/gfx/pics/201f/anim0.asm
+++ b/gfx/pics/unown_f/anim0.asm
diff --git a/gfx/pics/201f/anim1.asm b/gfx/pics/unown_f/anim1.asm
index a75176981..a75176981 100644
--- a/gfx/pics/201f/anim1.asm
+++ b/gfx/pics/unown_f/anim1.asm
diff --git a/gfx/pics/201f/back.lz b/gfx/pics/unown_f/back.6x6.2bpp.lz
index 47e54ab66..47e54ab66 100644
--- a/gfx/pics/201f/back.lz
+++ b/gfx/pics/unown_f/back.6x6.2bpp.lz
diff --git a/gfx/pics/201f/bitmask.asm b/gfx/pics/unown_f/bitmask.asm
index f8f337564..f8f337564 100644
--- a/gfx/pics/201f/bitmask.asm
+++ b/gfx/pics/unown_f/bitmask.asm
diff --git a/gfx/pics/201f/frames.asm b/gfx/pics/unown_f/frames.asm
index 7247d1f2d..7247d1f2d 100644
--- a/gfx/pics/201f/frames.asm
+++ b/gfx/pics/unown_f/frames.asm
diff --git a/gfx/pics/201f/front.lz b/gfx/pics/unown_f/front.5x5.2bpp.lz
index 4e0339419..4e0339419 100644
--- a/gfx/pics/201f/front.lz
+++ b/gfx/pics/unown_f/front.5x5.2bpp.lz
diff --git a/gfx/pics/unown_frames.asm b/gfx/pics/unown_frames.asm
index 286cc6766..e14f5ce5a 100644
--- a/gfx/pics/unown_frames.asm
+++ b/gfx/pics/unown_frames.asm
@@ -1,26 +1,26 @@
-UnownAFrames: INCLUDE "gfx/pics/201a/frames.asm"
-UnownBFrames: INCLUDE "gfx/pics/201b/frames.asm"
-UnownCFrames: INCLUDE "gfx/pics/201c/frames.asm"
-UnownDFrames: INCLUDE "gfx/pics/201d/frames.asm"
-UnownEFrames: INCLUDE "gfx/pics/201e/frames.asm"
-UnownFFrames: INCLUDE "gfx/pics/201f/frames.asm"
-UnownGFrames: INCLUDE "gfx/pics/201g/frames.asm"
-UnownHFrames: INCLUDE "gfx/pics/201h/frames.asm"
-UnownIFrames: INCLUDE "gfx/pics/201i/frames.asm"
-UnownJFrames: INCLUDE "gfx/pics/201j/frames.asm"
-UnownKFrames: INCLUDE "gfx/pics/201k/frames.asm"
-UnownLFrames: INCLUDE "gfx/pics/201l/frames.asm"
-UnownMFrames: INCLUDE "gfx/pics/201m/frames.asm"
-UnownNFrames: INCLUDE "gfx/pics/201n/frames.asm"
-UnownOFrames: INCLUDE "gfx/pics/201o/frames.asm"
-UnownPFrames: INCLUDE "gfx/pics/201p/frames.asm"
-UnownQFrames: INCLUDE "gfx/pics/201q/frames.asm"
-UnownRFrames: INCLUDE "gfx/pics/201r/frames.asm"
-UnownSFrames: INCLUDE "gfx/pics/201s/frames.asm"
-UnownTFrames: INCLUDE "gfx/pics/201t/frames.asm"
-UnownUFrames: INCLUDE "gfx/pics/201u/frames.asm"
-UnownVFrames: INCLUDE "gfx/pics/201v/frames.asm"
-UnownWFrames: INCLUDE "gfx/pics/201w/frames.asm"
-UnownXFrames: INCLUDE "gfx/pics/201x/frames.asm"
-UnownYFrames: INCLUDE "gfx/pics/201y/frames.asm"
-UnownZFrames: INCLUDE "gfx/pics/201z/frames.asm"
+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/201g/anim0.asm b/gfx/pics/unown_g/anim0.asm
index 48100274f..48100274f 100644
--- a/gfx/pics/201g/anim0.asm
+++ b/gfx/pics/unown_g/anim0.asm
diff --git a/gfx/pics/201g/anim1.asm b/gfx/pics/unown_g/anim1.asm
index 45906aed4..45906aed4 100644
--- a/gfx/pics/201g/anim1.asm
+++ b/gfx/pics/unown_g/anim1.asm
diff --git a/gfx/pics/201g/back.lz b/gfx/pics/unown_g/back.6x6.2bpp.lz
index 1f380f3ba..1f380f3ba 100644
--- a/gfx/pics/201g/back.lz
+++ b/gfx/pics/unown_g/back.6x6.2bpp.lz
diff --git a/gfx/pics/201g/bitmask.asm b/gfx/pics/unown_g/bitmask.asm
index 476a9c0a1..476a9c0a1 100644
--- a/gfx/pics/201g/bitmask.asm
+++ b/gfx/pics/unown_g/bitmask.asm
diff --git a/gfx/pics/201g/frames.asm b/gfx/pics/unown_g/frames.asm
index 993e7eb5c..993e7eb5c 100644
--- a/gfx/pics/201g/frames.asm
+++ b/gfx/pics/unown_g/frames.asm
diff --git a/gfx/pics/201g/front.lz b/gfx/pics/unown_g/front.5x5.2bpp.lz
index 0e6e343f9..0e6e343f9 100644
--- a/gfx/pics/201g/front.lz
+++ b/gfx/pics/unown_g/front.5x5.2bpp.lz
diff --git a/gfx/pics/201h/anim0.asm b/gfx/pics/unown_h/anim0.asm
index fdee3822b..fdee3822b 100644
--- a/gfx/pics/201h/anim0.asm
+++ b/gfx/pics/unown_h/anim0.asm
diff --git a/gfx/pics/201h/anim1.asm b/gfx/pics/unown_h/anim1.asm
index e6fb90d5e..e6fb90d5e 100644
--- a/gfx/pics/201h/anim1.asm
+++ b/gfx/pics/unown_h/anim1.asm
diff --git a/gfx/pics/201h/back.lz b/gfx/pics/unown_h/back.6x6.2bpp.lz
index 926bf5757..926bf5757 100644
--- a/gfx/pics/201h/back.lz
+++ b/gfx/pics/unown_h/back.6x6.2bpp.lz
diff --git a/gfx/pics/201h/bitmask.asm b/gfx/pics/unown_h/bitmask.asm
index 6559dc960..6559dc960 100644
--- a/gfx/pics/201h/bitmask.asm
+++ b/gfx/pics/unown_h/bitmask.asm
diff --git a/gfx/pics/201h/frames.asm b/gfx/pics/unown_h/frames.asm
index 405dd7733..405dd7733 100644
--- a/gfx/pics/201h/frames.asm
+++ b/gfx/pics/unown_h/frames.asm
diff --git a/gfx/pics/201h/front.lz b/gfx/pics/unown_h/front.5x5.2bpp.lz
index be2d0293c..be2d0293c 100644
--- a/gfx/pics/201h/front.lz
+++ b/gfx/pics/unown_h/front.5x5.2bpp.lz
diff --git a/gfx/pics/201i/anim0.asm b/gfx/pics/unown_i/anim0.asm
index 38e19a0c9..38e19a0c9 100644
--- a/gfx/pics/201i/anim0.asm
+++ b/gfx/pics/unown_i/anim0.asm
diff --git a/gfx/pics/201i/anim1.asm b/gfx/pics/unown_i/anim1.asm
index 1d5ce67ad..1d5ce67ad 100644
--- a/gfx/pics/201i/anim1.asm
+++ b/gfx/pics/unown_i/anim1.asm
diff --git a/gfx/pics/201i/back.lz b/gfx/pics/unown_i/back.6x6.2bpp.lz
index 7dcea181f..7dcea181f 100644
--- a/gfx/pics/201i/back.lz
+++ b/gfx/pics/unown_i/back.6x6.2bpp.lz
diff --git a/gfx/pics/201i/bitmask.asm b/gfx/pics/unown_i/bitmask.asm
index f9537943b..f9537943b 100644
--- a/gfx/pics/201i/bitmask.asm
+++ b/gfx/pics/unown_i/bitmask.asm
diff --git a/gfx/pics/201i/frames.asm b/gfx/pics/unown_i/frames.asm
index 6df0064a0..6df0064a0 100644
--- a/gfx/pics/201i/frames.asm
+++ b/gfx/pics/unown_i/frames.asm
diff --git a/gfx/pics/201i/front.lz b/gfx/pics/unown_i/front.5x5.2bpp.lz
index dfd89c266..dfd89c266 100644
--- a/gfx/pics/201i/front.lz
+++ b/gfx/pics/unown_i/front.5x5.2bpp.lz
diff --git a/gfx/pics/201j/anim0.asm b/gfx/pics/unown_j/anim0.asm
index 3a7467d45..3a7467d45 100644
--- a/gfx/pics/201j/anim0.asm
+++ b/gfx/pics/unown_j/anim0.asm
diff --git a/gfx/pics/201j/anim1.asm b/gfx/pics/unown_j/anim1.asm
index d46b36028..d46b36028 100644
--- a/gfx/pics/201j/anim1.asm
+++ b/gfx/pics/unown_j/anim1.asm
diff --git a/gfx/pics/201j/back.lz b/gfx/pics/unown_j/back.6x6.2bpp.lz
index c0eabf3ba..c0eabf3ba 100644
--- a/gfx/pics/201j/back.lz
+++ b/gfx/pics/unown_j/back.6x6.2bpp.lz
diff --git a/gfx/pics/201j/bitmask.asm b/gfx/pics/unown_j/bitmask.asm
index bc3d59792..bc3d59792 100644
--- a/gfx/pics/201j/bitmask.asm
+++ b/gfx/pics/unown_j/bitmask.asm
diff --git a/gfx/pics/201j/frames.asm b/gfx/pics/unown_j/frames.asm
index 6f196f838..6f196f838 100644
--- a/gfx/pics/201j/frames.asm
+++ b/gfx/pics/unown_j/frames.asm
diff --git a/gfx/pics/201j/front.lz b/gfx/pics/unown_j/front.5x5.2bpp.lz
index ec8e536d3..ec8e536d3 100644
--- a/gfx/pics/201j/front.lz
+++ b/gfx/pics/unown_j/front.5x5.2bpp.lz
diff --git a/gfx/pics/201k/anim0.asm b/gfx/pics/unown_k/anim0.asm
index 0948f212d..0948f212d 100644
--- a/gfx/pics/201k/anim0.asm
+++ b/gfx/pics/unown_k/anim0.asm
diff --git a/gfx/pics/201k/anim1.asm b/gfx/pics/unown_k/anim1.asm
index 8f8a4acb1..8f8a4acb1 100644
--- a/gfx/pics/201k/anim1.asm
+++ b/gfx/pics/unown_k/anim1.asm
diff --git a/gfx/pics/201k/back.lz b/gfx/pics/unown_k/back.6x6.2bpp.lz
index 0f4e8fda7..0f4e8fda7 100644
--- a/gfx/pics/201k/back.lz
+++ b/gfx/pics/unown_k/back.6x6.2bpp.lz
diff --git a/gfx/pics/201k/bitmask.asm b/gfx/pics/unown_k/bitmask.asm
index 4970cdf72..4970cdf72 100644
--- a/gfx/pics/201k/bitmask.asm
+++ b/gfx/pics/unown_k/bitmask.asm
diff --git a/gfx/pics/201k/frames.asm b/gfx/pics/unown_k/frames.asm
index b322962db..b322962db 100644
--- a/gfx/pics/201k/frames.asm
+++ b/gfx/pics/unown_k/frames.asm
diff --git a/gfx/pics/201k/front.lz b/gfx/pics/unown_k/front.5x5.2bpp.lz
index b617e898c..b617e898c 100644
--- a/gfx/pics/201k/front.lz
+++ b/gfx/pics/unown_k/front.5x5.2bpp.lz
diff --git a/gfx/pics/201l/anim0.asm b/gfx/pics/unown_l/anim0.asm
index 7b4e5e21c..7b4e5e21c 100644
--- a/gfx/pics/201l/anim0.asm
+++ b/gfx/pics/unown_l/anim0.asm
diff --git a/gfx/pics/201l/anim1.asm b/gfx/pics/unown_l/anim1.asm
index 859dec2ec..859dec2ec 100644
--- a/gfx/pics/201l/anim1.asm
+++ b/gfx/pics/unown_l/anim1.asm
diff --git a/gfx/pics/201l/back.lz b/gfx/pics/unown_l/back.6x6.2bpp.lz
index 4f48955df..4f48955df 100644
--- a/gfx/pics/201l/back.lz
+++ b/gfx/pics/unown_l/back.6x6.2bpp.lz
diff --git a/gfx/pics/201l/bitmask.asm b/gfx/pics/unown_l/bitmask.asm
index 769936bb8..769936bb8 100644
--- a/gfx/pics/201l/bitmask.asm
+++ b/gfx/pics/unown_l/bitmask.asm
diff --git a/gfx/pics/201l/frames.asm b/gfx/pics/unown_l/frames.asm
index 8f8edb031..8f8edb031 100644
--- a/gfx/pics/201l/frames.asm
+++ b/gfx/pics/unown_l/frames.asm
diff --git a/gfx/pics/201l/front.lz b/gfx/pics/unown_l/front.5x5.2bpp.lz
index d0eee7516..d0eee7516 100644
--- a/gfx/pics/201l/front.lz
+++ b/gfx/pics/unown_l/front.5x5.2bpp.lz
diff --git a/gfx/pics/201m/anim0.asm b/gfx/pics/unown_m/anim0.asm
index bb5292446..bb5292446 100644
--- a/gfx/pics/201m/anim0.asm
+++ b/gfx/pics/unown_m/anim0.asm
diff --git a/gfx/pics/201m/anim1.asm b/gfx/pics/unown_m/anim1.asm
index 710300f20..710300f20 100644
--- a/gfx/pics/201m/anim1.asm
+++ b/gfx/pics/unown_m/anim1.asm
diff --git a/gfx/pics/201m/back.lz b/gfx/pics/unown_m/back.6x6.2bpp.lz
index 3ab40cb03..3ab40cb03 100644
--- a/gfx/pics/201m/back.lz
+++ b/gfx/pics/unown_m/back.6x6.2bpp.lz
diff --git a/gfx/pics/201m/bitmask.asm b/gfx/pics/unown_m/bitmask.asm
index 5638e6bd8..5638e6bd8 100644
--- a/gfx/pics/201m/bitmask.asm
+++ b/gfx/pics/unown_m/bitmask.asm
diff --git a/gfx/pics/201m/frames.asm b/gfx/pics/unown_m/frames.asm
index 341e6840b..341e6840b 100644
--- a/gfx/pics/201m/frames.asm
+++ b/gfx/pics/unown_m/frames.asm
diff --git a/gfx/pics/201m/front.lz b/gfx/pics/unown_m/front.5x5.2bpp.lz
index 04e1592ce..04e1592ce 100644
--- a/gfx/pics/201m/front.lz
+++ b/gfx/pics/unown_m/front.5x5.2bpp.lz
diff --git a/gfx/pics/201n/anim0.asm b/gfx/pics/unown_n/anim0.asm
index 1f6924926..1f6924926 100644
--- a/gfx/pics/201n/anim0.asm
+++ b/gfx/pics/unown_n/anim0.asm
diff --git a/gfx/pics/201n/anim1.asm b/gfx/pics/unown_n/anim1.asm
index 5275e3463..5275e3463 100644
--- a/gfx/pics/201n/anim1.asm
+++ b/gfx/pics/unown_n/anim1.asm
diff --git a/gfx/pics/201n/back.lz b/gfx/pics/unown_n/back.6x6.2bpp.lz
index c39417aa8..c39417aa8 100644
--- a/gfx/pics/201n/back.lz
+++ b/gfx/pics/unown_n/back.6x6.2bpp.lz
diff --git a/gfx/pics/201n/bitmask.asm b/gfx/pics/unown_n/bitmask.asm
index f2dc23c34..f2dc23c34 100644
--- a/gfx/pics/201n/bitmask.asm
+++ b/gfx/pics/unown_n/bitmask.asm
diff --git a/gfx/pics/201n/frames.asm b/gfx/pics/unown_n/frames.asm
index b656f81c0..b656f81c0 100644
--- a/gfx/pics/201n/frames.asm
+++ b/gfx/pics/unown_n/frames.asm
diff --git a/gfx/pics/201n/front.lz b/gfx/pics/unown_n/front.5x5.2bpp.lz
index ec17bff9f..ec17bff9f 100644
--- a/gfx/pics/201n/front.lz
+++ b/gfx/pics/unown_n/front.5x5.2bpp.lz
diff --git a/gfx/pics/201o/anim0.asm b/gfx/pics/unown_o/anim0.asm
index 581d47b9d..581d47b9d 100644
--- a/gfx/pics/201o/anim0.asm
+++ b/gfx/pics/unown_o/anim0.asm
diff --git a/gfx/pics/201o/anim1.asm b/gfx/pics/unown_o/anim1.asm
index fec231c84..fec231c84 100644
--- a/gfx/pics/201o/anim1.asm
+++ b/gfx/pics/unown_o/anim1.asm
diff --git a/gfx/pics/201o/back.lz b/gfx/pics/unown_o/back.6x6.2bpp.lz
index 4d4b4fd4f..4d4b4fd4f 100644
--- a/gfx/pics/201o/back.lz
+++ b/gfx/pics/unown_o/back.6x6.2bpp.lz
diff --git a/gfx/pics/201o/bitmask.asm b/gfx/pics/unown_o/bitmask.asm
index 5a36a12a1..5a36a12a1 100644
--- a/gfx/pics/201o/bitmask.asm
+++ b/gfx/pics/unown_o/bitmask.asm
diff --git a/gfx/pics/201o/frames.asm b/gfx/pics/unown_o/frames.asm
index 1258d1a06..1258d1a06 100644
--- a/gfx/pics/201o/frames.asm
+++ b/gfx/pics/unown_o/frames.asm
diff --git a/gfx/pics/201o/front.lz b/gfx/pics/unown_o/front.5x5.2bpp.lz
index 66b6b8141..66b6b8141 100644
--- a/gfx/pics/201o/front.lz
+++ b/gfx/pics/unown_o/front.5x5.2bpp.lz
diff --git a/gfx/pics/201p/anim0.asm b/gfx/pics/unown_p/anim0.asm
index 0cbaf30ed..0cbaf30ed 100644
--- a/gfx/pics/201p/anim0.asm
+++ b/gfx/pics/unown_p/anim0.asm
diff --git a/gfx/pics/201p/anim1.asm b/gfx/pics/unown_p/anim1.asm
index 51e0e0941..51e0e0941 100644
--- a/gfx/pics/201p/anim1.asm
+++ b/gfx/pics/unown_p/anim1.asm
diff --git a/gfx/pics/201p/back.lz b/gfx/pics/unown_p/back.6x6.2bpp.lz
index 19fd45591..19fd45591 100644
--- a/gfx/pics/201p/back.lz
+++ b/gfx/pics/unown_p/back.6x6.2bpp.lz
diff --git a/gfx/pics/201p/bitmask.asm b/gfx/pics/unown_p/bitmask.asm
index e4606936b..e4606936b 100644
--- a/gfx/pics/201p/bitmask.asm
+++ b/gfx/pics/unown_p/bitmask.asm
diff --git a/gfx/pics/201p/frames.asm b/gfx/pics/unown_p/frames.asm
index c9e27bfbd..c9e27bfbd 100644
--- a/gfx/pics/201p/frames.asm
+++ b/gfx/pics/unown_p/frames.asm
diff --git a/gfx/pics/201p/front.lz b/gfx/pics/unown_p/front.5x5.2bpp.lz
index 53d4bfbcd..53d4bfbcd 100644
--- a/gfx/pics/201p/front.lz
+++ b/gfx/pics/unown_p/front.5x5.2bpp.lz
diff --git a/gfx/pics/201q/anim0.asm b/gfx/pics/unown_q/anim0.asm
index 555f61cf3..555f61cf3 100644
--- a/gfx/pics/201q/anim0.asm
+++ b/gfx/pics/unown_q/anim0.asm
diff --git a/gfx/pics/201q/anim1.asm b/gfx/pics/unown_q/anim1.asm
index a17caa474..a17caa474 100644
--- a/gfx/pics/201q/anim1.asm
+++ b/gfx/pics/unown_q/anim1.asm
diff --git a/gfx/pics/201q/back.lz b/gfx/pics/unown_q/back.6x6.2bpp.lz
index 5199cdc6c..5199cdc6c 100644
--- a/gfx/pics/201q/back.lz
+++ b/gfx/pics/unown_q/back.6x6.2bpp.lz
diff --git a/gfx/pics/201q/bitmask.asm b/gfx/pics/unown_q/bitmask.asm
index a8f4d5c61..a8f4d5c61 100644
--- a/gfx/pics/201q/bitmask.asm
+++ b/gfx/pics/unown_q/bitmask.asm
diff --git a/gfx/pics/201q/frames.asm b/gfx/pics/unown_q/frames.asm
index 065ef139e..065ef139e 100644
--- a/gfx/pics/201q/frames.asm
+++ b/gfx/pics/unown_q/frames.asm
diff --git a/gfx/pics/201q/front.lz b/gfx/pics/unown_q/front.5x5.2bpp.lz
index 65536e23f..65536e23f 100644
--- a/gfx/pics/201q/front.lz
+++ b/gfx/pics/unown_q/front.5x5.2bpp.lz
diff --git a/gfx/pics/201r/anim0.asm b/gfx/pics/unown_r/anim0.asm
index fde5a58ab..fde5a58ab 100644
--- a/gfx/pics/201r/anim0.asm
+++ b/gfx/pics/unown_r/anim0.asm
diff --git a/gfx/pics/201r/anim1.asm b/gfx/pics/unown_r/anim1.asm
index b1db8166a..b1db8166a 100644
--- a/gfx/pics/201r/anim1.asm
+++ b/gfx/pics/unown_r/anim1.asm
diff --git a/gfx/pics/201r/back.lz b/gfx/pics/unown_r/back.6x6.2bpp.lz
index a8a243e0b..a8a243e0b 100644
--- a/gfx/pics/201r/back.lz
+++ b/gfx/pics/unown_r/back.6x6.2bpp.lz
diff --git a/gfx/pics/201r/bitmask.asm b/gfx/pics/unown_r/bitmask.asm
index 2a1130ae3..2a1130ae3 100644
--- a/gfx/pics/201r/bitmask.asm
+++ b/gfx/pics/unown_r/bitmask.asm
diff --git a/gfx/pics/201r/frames.asm b/gfx/pics/unown_r/frames.asm
index 99113f145..99113f145 100644
--- a/gfx/pics/201r/frames.asm
+++ b/gfx/pics/unown_r/frames.asm
diff --git a/gfx/pics/201r/front.lz b/gfx/pics/unown_r/front.5x5.2bpp.lz
index 9e76761d1..9e76761d1 100644
--- a/gfx/pics/201r/front.lz
+++ b/gfx/pics/unown_r/front.5x5.2bpp.lz
diff --git a/gfx/pics/201s/anim0.asm b/gfx/pics/unown_s/anim0.asm
index 9cac3910d..9cac3910d 100644
--- a/gfx/pics/201s/anim0.asm
+++ b/gfx/pics/unown_s/anim0.asm
diff --git a/gfx/pics/201s/anim1.asm b/gfx/pics/unown_s/anim1.asm
index 49483f8f5..49483f8f5 100644
--- a/gfx/pics/201s/anim1.asm
+++ b/gfx/pics/unown_s/anim1.asm
diff --git a/gfx/pics/201s/back.lz b/gfx/pics/unown_s/back.6x6.2bpp.lz
index 8441f2519..8441f2519 100644
--- a/gfx/pics/201s/back.lz
+++ b/gfx/pics/unown_s/back.6x6.2bpp.lz
diff --git a/gfx/pics/201s/bitmask.asm b/gfx/pics/unown_s/bitmask.asm
index 0d4a9a75b..0d4a9a75b 100644
--- a/gfx/pics/201s/bitmask.asm
+++ b/gfx/pics/unown_s/bitmask.asm
diff --git a/gfx/pics/201s/frames.asm b/gfx/pics/unown_s/frames.asm
index 0331a18ea..0331a18ea 100644
--- a/gfx/pics/201s/frames.asm
+++ b/gfx/pics/unown_s/frames.asm
diff --git a/gfx/pics/201s/front.lz b/gfx/pics/unown_s/front.5x5.2bpp.lz
index d16dea5e9..d16dea5e9 100644
--- a/gfx/pics/201s/front.lz
+++ b/gfx/pics/unown_s/front.5x5.2bpp.lz
diff --git a/gfx/pics/201t/anim0.asm b/gfx/pics/unown_t/anim0.asm
index feba7be07..feba7be07 100644
--- a/gfx/pics/201t/anim0.asm
+++ b/gfx/pics/unown_t/anim0.asm
diff --git a/gfx/pics/201t/anim1.asm b/gfx/pics/unown_t/anim1.asm
index d295d6830..d295d6830 100644
--- a/gfx/pics/201t/anim1.asm
+++ b/gfx/pics/unown_t/anim1.asm
diff --git a/gfx/pics/201t/back.lz b/gfx/pics/unown_t/back.6x6.2bpp.lz
index 8d415b53d..8d415b53d 100644
--- a/gfx/pics/201t/back.lz
+++ b/gfx/pics/unown_t/back.6x6.2bpp.lz
diff --git a/gfx/pics/201t/bitmask.asm b/gfx/pics/unown_t/bitmask.asm
index d889d2035..d889d2035 100644
--- a/gfx/pics/201t/bitmask.asm
+++ b/gfx/pics/unown_t/bitmask.asm
diff --git a/gfx/pics/201t/frames.asm b/gfx/pics/unown_t/frames.asm
index a2e406f8c..a2e406f8c 100644
--- a/gfx/pics/201t/frames.asm
+++ b/gfx/pics/unown_t/frames.asm
diff --git a/gfx/pics/201t/front.lz b/gfx/pics/unown_t/front.5x5.2bpp.lz
index 83100fbdb..83100fbdb 100644
--- a/gfx/pics/201t/front.lz
+++ b/gfx/pics/unown_t/front.5x5.2bpp.lz
diff --git a/gfx/pics/201u/anim0.asm b/gfx/pics/unown_u/anim0.asm
index 12c53636d..12c53636d 100644
--- a/gfx/pics/201u/anim0.asm
+++ b/gfx/pics/unown_u/anim0.asm
diff --git a/gfx/pics/201u/anim1.asm b/gfx/pics/unown_u/anim1.asm
index 834e75999..834e75999 100644
--- a/gfx/pics/201u/anim1.asm
+++ b/gfx/pics/unown_u/anim1.asm
diff --git a/gfx/pics/201u/back.lz b/gfx/pics/unown_u/back.6x6.2bpp.lz
index ad395b7ec..ad395b7ec 100644
--- a/gfx/pics/201u/back.lz
+++ b/gfx/pics/unown_u/back.6x6.2bpp.lz
diff --git a/gfx/pics/201u/bitmask.asm b/gfx/pics/unown_u/bitmask.asm
index 82874fdca..82874fdca 100644
--- a/gfx/pics/201u/bitmask.asm
+++ b/gfx/pics/unown_u/bitmask.asm
diff --git a/gfx/pics/201u/frames.asm b/gfx/pics/unown_u/frames.asm
index 5653b37c1..5653b37c1 100644
--- a/gfx/pics/201u/frames.asm
+++ b/gfx/pics/unown_u/frames.asm
diff --git a/gfx/pics/201u/front.lz b/gfx/pics/unown_u/front.5x5.2bpp.lz
index 622825cbe..622825cbe 100644
--- a/gfx/pics/201u/front.lz
+++ b/gfx/pics/unown_u/front.5x5.2bpp.lz
diff --git a/gfx/pics/201v/anim0.asm b/gfx/pics/unown_v/anim0.asm
index acc500009..acc500009 100644
--- a/gfx/pics/201v/anim0.asm
+++ b/gfx/pics/unown_v/anim0.asm
diff --git a/gfx/pics/201v/anim1.asm b/gfx/pics/unown_v/anim1.asm
index 818f727ea..818f727ea 100644
--- a/gfx/pics/201v/anim1.asm
+++ b/gfx/pics/unown_v/anim1.asm
diff --git a/gfx/pics/201v/back.lz b/gfx/pics/unown_v/back.6x6.2bpp.lz
index 21c3191f2..21c3191f2 100644
--- a/gfx/pics/201v/back.lz
+++ b/gfx/pics/unown_v/back.6x6.2bpp.lz
diff --git a/gfx/pics/201v/bitmask.asm b/gfx/pics/unown_v/bitmask.asm
index 4cae8c07c..4cae8c07c 100644
--- a/gfx/pics/201v/bitmask.asm
+++ b/gfx/pics/unown_v/bitmask.asm
diff --git a/gfx/pics/201v/frames.asm b/gfx/pics/unown_v/frames.asm
index 06e06247f..06e06247f 100644
--- a/gfx/pics/201v/frames.asm
+++ b/gfx/pics/unown_v/frames.asm
diff --git a/gfx/pics/201v/front.lz b/gfx/pics/unown_v/front.5x5.2bpp.lz
index aee5ce362..aee5ce362 100644
--- a/gfx/pics/201v/front.lz
+++ b/gfx/pics/unown_v/front.5x5.2bpp.lz
diff --git a/gfx/pics/201w/anim0.asm b/gfx/pics/unown_w/anim0.asm
index 620ff03e5..620ff03e5 100644
--- a/gfx/pics/201w/anim0.asm
+++ b/gfx/pics/unown_w/anim0.asm
diff --git a/gfx/pics/201w/anim1.asm b/gfx/pics/unown_w/anim1.asm
index b43d44bbc..b43d44bbc 100644
--- a/gfx/pics/201w/anim1.asm
+++ b/gfx/pics/unown_w/anim1.asm
diff --git a/gfx/pics/201w/back.lz b/gfx/pics/unown_w/back.6x6.2bpp.lz
index 882648c4d..882648c4d 100644
--- a/gfx/pics/201w/back.lz
+++ b/gfx/pics/unown_w/back.6x6.2bpp.lz
diff --git a/gfx/pics/201w/bitmask.asm b/gfx/pics/unown_w/bitmask.asm
index fdb9854eb..fdb9854eb 100644
--- a/gfx/pics/201w/bitmask.asm
+++ b/gfx/pics/unown_w/bitmask.asm
diff --git a/gfx/pics/201w/frames.asm b/gfx/pics/unown_w/frames.asm
index f19bd1620..f19bd1620 100644
--- a/gfx/pics/201w/frames.asm
+++ b/gfx/pics/unown_w/frames.asm
diff --git a/gfx/pics/201w/front.lz b/gfx/pics/unown_w/front.5x5.2bpp.lz
index 78a7fefac..78a7fefac 100644
--- a/gfx/pics/201w/front.lz
+++ b/gfx/pics/unown_w/front.5x5.2bpp.lz
diff --git a/gfx/pics/201x/anim0.asm b/gfx/pics/unown_x/anim0.asm
index 0bb204da6..0bb204da6 100644
--- a/gfx/pics/201x/anim0.asm
+++ b/gfx/pics/unown_x/anim0.asm
diff --git a/gfx/pics/201x/anim1.asm b/gfx/pics/unown_x/anim1.asm
index 22b15a504..22b15a504 100644
--- a/gfx/pics/201x/anim1.asm
+++ b/gfx/pics/unown_x/anim1.asm
diff --git a/gfx/pics/201x/back.lz b/gfx/pics/unown_x/back.6x6.2bpp.lz
index 591af9668..591af9668 100644
--- a/gfx/pics/201x/back.lz
+++ b/gfx/pics/unown_x/back.6x6.2bpp.lz
diff --git a/gfx/pics/201x/bitmask.asm b/gfx/pics/unown_x/bitmask.asm
index 501e3c22c..501e3c22c 100644
--- a/gfx/pics/201x/bitmask.asm
+++ b/gfx/pics/unown_x/bitmask.asm
diff --git a/gfx/pics/201x/frames.asm b/gfx/pics/unown_x/frames.asm
index a6b94c147..a6b94c147 100644
--- a/gfx/pics/201x/frames.asm
+++ b/gfx/pics/unown_x/frames.asm
diff --git a/gfx/pics/201x/front.lz b/gfx/pics/unown_x/front.5x5.2bpp.lz
index 11adc7c6f..11adc7c6f 100644
--- a/gfx/pics/201x/front.lz
+++ b/gfx/pics/unown_x/front.5x5.2bpp.lz
diff --git a/gfx/pics/201y/anim0.asm b/gfx/pics/unown_y/anim0.asm
index e65aa4134..e65aa4134 100644
--- a/gfx/pics/201y/anim0.asm
+++ b/gfx/pics/unown_y/anim0.asm
diff --git a/gfx/pics/201y/anim1.asm b/gfx/pics/unown_y/anim1.asm
index e1a9a2acb..e1a9a2acb 100644
--- a/gfx/pics/201y/anim1.asm
+++ b/gfx/pics/unown_y/anim1.asm
diff --git a/gfx/pics/201y/back.lz b/gfx/pics/unown_y/back.6x6.2bpp.lz
index ab7563e0d..ab7563e0d 100644
--- a/gfx/pics/201y/back.lz
+++ b/gfx/pics/unown_y/back.6x6.2bpp.lz
diff --git a/gfx/pics/201y/bitmask.asm b/gfx/pics/unown_y/bitmask.asm
index 01f68f558..01f68f558 100644
--- a/gfx/pics/201y/bitmask.asm
+++ b/gfx/pics/unown_y/bitmask.asm
diff --git a/gfx/pics/201y/frames.asm b/gfx/pics/unown_y/frames.asm
index a6608e4fe..a6608e4fe 100644
--- a/gfx/pics/201y/frames.asm
+++ b/gfx/pics/unown_y/frames.asm
diff --git a/gfx/pics/201y/front.lz b/gfx/pics/unown_y/front.5x5.2bpp.lz
index 1604f7e7b..1604f7e7b 100644
--- a/gfx/pics/201y/front.lz
+++ b/gfx/pics/unown_y/front.5x5.2bpp.lz
diff --git a/gfx/pics/201z/anim0.asm b/gfx/pics/unown_z/anim0.asm
index 197978f9b..197978f9b 100644
--- a/gfx/pics/201z/anim0.asm
+++ b/gfx/pics/unown_z/anim0.asm
diff --git a/gfx/pics/201z/anim1.asm b/gfx/pics/unown_z/anim1.asm
index 4eb7513f6..4eb7513f6 100644
--- a/gfx/pics/201z/anim1.asm
+++ b/gfx/pics/unown_z/anim1.asm
diff --git a/gfx/pics/201z/back.lz b/gfx/pics/unown_z/back.6x6.2bpp.lz
index 31bcb7baa..31bcb7baa 100644
--- a/gfx/pics/201z/back.lz
+++ b/gfx/pics/unown_z/back.6x6.2bpp.lz
diff --git a/gfx/pics/201z/bitmask.asm b/gfx/pics/unown_z/bitmask.asm
index 46231fc95..46231fc95 100644
--- a/gfx/pics/201z/bitmask.asm
+++ b/gfx/pics/unown_z/bitmask.asm
diff --git a/gfx/pics/201z/frames.asm b/gfx/pics/unown_z/frames.asm
index 215e4ca8b..215e4ca8b 100644
--- a/gfx/pics/201z/frames.asm
+++ b/gfx/pics/unown_z/frames.asm
diff --git a/gfx/pics/201z/front.lz b/gfx/pics/unown_z/front.5x5.2bpp.lz
index 0d9b8b4f8..0d9b8b4f8 100644
--- a/gfx/pics/201z/front.lz
+++ b/gfx/pics/unown_z/front.5x5.2bpp.lz
diff --git a/gfx/pics/217/anim0.asm b/gfx/pics/ursaring/anim0.asm
index f571913ea..f571913ea 100644
--- a/gfx/pics/217/anim0.asm
+++ b/gfx/pics/ursaring/anim0.asm
diff --git a/gfx/pics/217/anim1.asm b/gfx/pics/ursaring/anim1.asm
index 01ebc0f1a..01ebc0f1a 100644
--- a/gfx/pics/217/anim1.asm
+++ b/gfx/pics/ursaring/anim1.asm
diff --git a/gfx/pics/217/back.lz b/gfx/pics/ursaring/back.6x6.2bpp.lz
index 263eac805..263eac805 100644
--- a/gfx/pics/217/back.lz
+++ b/gfx/pics/ursaring/back.6x6.2bpp.lz
diff --git a/gfx/pics/217/bitmask.asm b/gfx/pics/ursaring/bitmask.asm
index 397b66f94..397b66f94 100644
--- a/gfx/pics/217/bitmask.asm
+++ b/gfx/pics/ursaring/bitmask.asm
diff --git a/gfx/pics/217/frames.asm b/gfx/pics/ursaring/frames.asm
index 537e485ed..537e485ed 100644
--- a/gfx/pics/217/frames.asm
+++ b/gfx/pics/ursaring/frames.asm
diff --git a/gfx/pics/217/front.lz b/gfx/pics/ursaring/front.7x7.2bpp.lz
index f98dd0cb0..f98dd0cb0 100644
--- a/gfx/pics/217/front.lz
+++ b/gfx/pics/ursaring/front.7x7.2bpp.lz
diff --git a/gfx/pics/217/normal.pal b/gfx/pics/ursaring/normal.pal
index ce64ebf28..ce64ebf28 100644
--- a/gfx/pics/217/normal.pal
+++ b/gfx/pics/ursaring/normal.pal
diff --git a/gfx/pics/217/shiny.pal b/gfx/pics/ursaring/shiny.pal
index b2e472ea3..b2e472ea3 100644
--- a/gfx/pics/217/shiny.pal
+++ b/gfx/pics/ursaring/shiny.pal
diff --git a/gfx/pics/134/anim0.asm b/gfx/pics/vaporeon/anim0.asm
index d13f1dd94..d13f1dd94 100644
--- a/gfx/pics/134/anim0.asm
+++ b/gfx/pics/vaporeon/anim0.asm
diff --git a/gfx/pics/134/anim1.asm b/gfx/pics/vaporeon/anim1.asm
index 79c386650..79c386650 100644
--- a/gfx/pics/134/anim1.asm
+++ b/gfx/pics/vaporeon/anim1.asm
diff --git a/gfx/pics/134/back.lz b/gfx/pics/vaporeon/back.6x6.2bpp.lz
index 9ea248261..9ea248261 100644
--- a/gfx/pics/134/back.lz
+++ b/gfx/pics/vaporeon/back.6x6.2bpp.lz
diff --git a/gfx/pics/134/bitmask.asm b/gfx/pics/vaporeon/bitmask.asm
index 05dbd7e0f..05dbd7e0f 100644
--- a/gfx/pics/134/bitmask.asm
+++ b/gfx/pics/vaporeon/bitmask.asm
diff --git a/gfx/pics/134/frames.asm b/gfx/pics/vaporeon/frames.asm
index 0cc0568e7..0cc0568e7 100644
--- a/gfx/pics/134/frames.asm
+++ b/gfx/pics/vaporeon/frames.asm
diff --git a/gfx/pics/134/front.lz b/gfx/pics/vaporeon/front.6x6.2bpp.lz
index 67793c7ec..67793c7ec 100644
--- a/gfx/pics/134/front.lz
+++ b/gfx/pics/vaporeon/front.6x6.2bpp.lz
diff --git a/gfx/pics/134/normal.pal b/gfx/pics/vaporeon/normal.pal
index b910e1146..b910e1146 100644
--- a/gfx/pics/134/normal.pal
+++ b/gfx/pics/vaporeon/normal.pal
diff --git a/gfx/pics/134/shiny.pal b/gfx/pics/vaporeon/shiny.pal
index b8571c740..b8571c740 100644
--- a/gfx/pics/134/shiny.pal
+++ b/gfx/pics/vaporeon/shiny.pal
diff --git a/gfx/pics/049/anim0.asm b/gfx/pics/venomoth/anim0.asm
index ba6014d59..ba6014d59 100644
--- a/gfx/pics/049/anim0.asm
+++ b/gfx/pics/venomoth/anim0.asm
diff --git a/gfx/pics/049/anim1.asm b/gfx/pics/venomoth/anim1.asm
index 619c19b73..619c19b73 100644
--- a/gfx/pics/049/anim1.asm
+++ b/gfx/pics/venomoth/anim1.asm
diff --git a/gfx/pics/049/back.lz b/gfx/pics/venomoth/back.6x6.2bpp.lz
index 721527c2a..721527c2a 100644
--- a/gfx/pics/049/back.lz
+++ b/gfx/pics/venomoth/back.6x6.2bpp.lz
diff --git a/gfx/pics/049/bitmask.asm b/gfx/pics/venomoth/bitmask.asm
index 5621f6eb7..5621f6eb7 100644
--- a/gfx/pics/049/bitmask.asm
+++ b/gfx/pics/venomoth/bitmask.asm
diff --git a/gfx/pics/049/frames.asm b/gfx/pics/venomoth/frames.asm
index e077653ca..e077653ca 100644
--- a/gfx/pics/049/frames.asm
+++ b/gfx/pics/venomoth/frames.asm
diff --git a/gfx/pics/049/front.lz b/gfx/pics/venomoth/front.7x7.2bpp.lz
index 5f32ad682..5f32ad682 100644
--- a/gfx/pics/049/front.lz
+++ b/gfx/pics/venomoth/front.7x7.2bpp.lz
diff --git a/gfx/pics/049/normal.pal b/gfx/pics/venomoth/normal.pal
index 8b1e77e73..8b1e77e73 100644
--- a/gfx/pics/049/normal.pal
+++ b/gfx/pics/venomoth/normal.pal
diff --git a/gfx/pics/049/shiny.pal b/gfx/pics/venomoth/shiny.pal
index 50d971276..50d971276 100644
--- a/gfx/pics/049/shiny.pal
+++ b/gfx/pics/venomoth/shiny.pal
diff --git a/gfx/pics/048/anim0.asm b/gfx/pics/venonat/anim0.asm
index 508cbd84a..508cbd84a 100644
--- a/gfx/pics/048/anim0.asm
+++ b/gfx/pics/venonat/anim0.asm
diff --git a/gfx/pics/048/anim1.asm b/gfx/pics/venonat/anim1.asm
index ecd7a45f1..ecd7a45f1 100644
--- a/gfx/pics/048/anim1.asm
+++ b/gfx/pics/venonat/anim1.asm
diff --git a/gfx/pics/048/back.lz b/gfx/pics/venonat/back.6x6.2bpp.lz
index b28c7523d..b28c7523d 100644
--- a/gfx/pics/048/back.lz
+++ b/gfx/pics/venonat/back.6x6.2bpp.lz
diff --git a/gfx/pics/048/bitmask.asm b/gfx/pics/venonat/bitmask.asm
index 2ee6c413a..2ee6c413a 100644
--- a/gfx/pics/048/bitmask.asm
+++ b/gfx/pics/venonat/bitmask.asm
diff --git a/gfx/pics/048/frames.asm b/gfx/pics/venonat/frames.asm
index 46272e84f..46272e84f 100644
--- a/gfx/pics/048/frames.asm
+++ b/gfx/pics/venonat/frames.asm
diff --git a/gfx/pics/048/front.lz b/gfx/pics/venonat/front.5x5.2bpp.lz
index f6b057e8f..f6b057e8f 100644
--- a/gfx/pics/048/front.lz
+++ b/gfx/pics/venonat/front.5x5.2bpp.lz
diff --git a/gfx/pics/048/normal.pal b/gfx/pics/venonat/normal.pal
index 90e24bc9d..90e24bc9d 100644
--- a/gfx/pics/048/normal.pal
+++ b/gfx/pics/venonat/normal.pal
diff --git a/gfx/pics/048/shiny.pal b/gfx/pics/venonat/shiny.pal
index 0660ed752..0660ed752 100644
--- a/gfx/pics/048/shiny.pal
+++ b/gfx/pics/venonat/shiny.pal
diff --git a/gfx/pics/003/anim0.asm b/gfx/pics/venusaur/anim0.asm
index 9ee74b6c0..9ee74b6c0 100644
--- a/gfx/pics/003/anim0.asm
+++ b/gfx/pics/venusaur/anim0.asm
diff --git a/gfx/pics/003/anim1.asm b/gfx/pics/venusaur/anim1.asm
index 6eebd7cd3..6eebd7cd3 100644
--- a/gfx/pics/003/anim1.asm
+++ b/gfx/pics/venusaur/anim1.asm
diff --git a/gfx/pics/003/back.lz b/gfx/pics/venusaur/back.6x6.2bpp.lz
index 27ca82e8a..27ca82e8a 100644
--- a/gfx/pics/003/back.lz
+++ b/gfx/pics/venusaur/back.6x6.2bpp.lz
diff --git a/gfx/pics/003/bitmask.asm b/gfx/pics/venusaur/bitmask.asm
index bfdf4f1b5..bfdf4f1b5 100644
--- a/gfx/pics/003/bitmask.asm
+++ b/gfx/pics/venusaur/bitmask.asm
diff --git a/gfx/pics/003/frames.asm b/gfx/pics/venusaur/frames.asm
index 504f80202..504f80202 100644
--- a/gfx/pics/003/frames.asm
+++ b/gfx/pics/venusaur/frames.asm
diff --git a/gfx/pics/003/front.lz b/gfx/pics/venusaur/front.7x7.2bpp.lz
index d436da0bd..d436da0bd 100644
--- a/gfx/pics/003/front.lz
+++ b/gfx/pics/venusaur/front.7x7.2bpp.lz
diff --git a/gfx/pics/003/normal.pal b/gfx/pics/venusaur/normal.pal
index 3d53b905f..3d53b905f 100644
--- a/gfx/pics/003/normal.pal
+++ b/gfx/pics/venusaur/normal.pal
diff --git a/gfx/pics/003/shiny.pal b/gfx/pics/venusaur/shiny.pal
index 6cffe65cb..6cffe65cb 100644
--- a/gfx/pics/003/shiny.pal
+++ b/gfx/pics/venusaur/shiny.pal
diff --git a/gfx/pics/071/anim0.asm b/gfx/pics/victreebel/anim0.asm
index ec490f7fb..ec490f7fb 100644
--- a/gfx/pics/071/anim0.asm
+++ b/gfx/pics/victreebel/anim0.asm
diff --git a/gfx/pics/071/anim1.asm b/gfx/pics/victreebel/anim1.asm
index 121550865..121550865 100644
--- a/gfx/pics/071/anim1.asm
+++ b/gfx/pics/victreebel/anim1.asm
diff --git a/gfx/pics/071/back.lz b/gfx/pics/victreebel/back.6x6.2bpp.lz
index d4b014f67..d4b014f67 100644
--- a/gfx/pics/071/back.lz
+++ b/gfx/pics/victreebel/back.6x6.2bpp.lz
diff --git a/gfx/pics/071/bitmask.asm b/gfx/pics/victreebel/bitmask.asm
index 418d3c056..418d3c056 100644
--- a/gfx/pics/071/bitmask.asm
+++ b/gfx/pics/victreebel/bitmask.asm
diff --git a/gfx/pics/071/frames.asm b/gfx/pics/victreebel/frames.asm
index 302053cba..302053cba 100644
--- a/gfx/pics/071/frames.asm
+++ b/gfx/pics/victreebel/frames.asm
diff --git a/gfx/pics/071/front.lz b/gfx/pics/victreebel/front.7x7.2bpp.lz
index c53114990..c53114990 100644
--- a/gfx/pics/071/front.lz
+++ b/gfx/pics/victreebel/front.7x7.2bpp.lz
diff --git a/gfx/pics/071/normal.pal b/gfx/pics/victreebel/normal.pal
index 6e9844ba3..6e9844ba3 100644
--- a/gfx/pics/071/normal.pal
+++ b/gfx/pics/victreebel/normal.pal
diff --git a/gfx/pics/071/shiny.pal b/gfx/pics/victreebel/shiny.pal
index c538a41fa..c538a41fa 100644
--- a/gfx/pics/071/shiny.pal
+++ b/gfx/pics/victreebel/shiny.pal
diff --git a/gfx/pics/045/anim0.asm b/gfx/pics/vileplume/anim0.asm
index 98c2a86de..98c2a86de 100644
--- a/gfx/pics/045/anim0.asm
+++ b/gfx/pics/vileplume/anim0.asm
diff --git a/gfx/pics/045/anim1.asm b/gfx/pics/vileplume/anim1.asm
index e57622363..e57622363 100644
--- a/gfx/pics/045/anim1.asm
+++ b/gfx/pics/vileplume/anim1.asm
diff --git a/gfx/pics/045/back.lz b/gfx/pics/vileplume/back.6x6.2bpp.lz
index 823f0e112..823f0e112 100644
--- a/gfx/pics/045/back.lz
+++ b/gfx/pics/vileplume/back.6x6.2bpp.lz
diff --git a/gfx/pics/045/bitmask.asm b/gfx/pics/vileplume/bitmask.asm
index 71a97597a..71a97597a 100644
--- a/gfx/pics/045/bitmask.asm
+++ b/gfx/pics/vileplume/bitmask.asm
diff --git a/gfx/pics/045/frames.asm b/gfx/pics/vileplume/frames.asm
index 35a7708aa..35a7708aa 100644
--- a/gfx/pics/045/frames.asm
+++ b/gfx/pics/vileplume/frames.asm
diff --git a/gfx/pics/045/front.lz b/gfx/pics/vileplume/front.7x7.2bpp.lz
index 05ca10ba5..05ca10ba5 100644
--- a/gfx/pics/045/front.lz
+++ b/gfx/pics/vileplume/front.7x7.2bpp.lz
diff --git a/gfx/pics/045/normal.pal b/gfx/pics/vileplume/normal.pal
index 4af23de91..4af23de91 100644
--- a/gfx/pics/045/normal.pal
+++ b/gfx/pics/vileplume/normal.pal
diff --git a/gfx/pics/045/shiny.pal b/gfx/pics/vileplume/shiny.pal
index d65151640..d65151640 100644
--- a/gfx/pics/045/shiny.pal
+++ b/gfx/pics/vileplume/shiny.pal
diff --git a/gfx/pics/100/anim0.asm b/gfx/pics/voltorb/anim0.asm
index fdb49b9af..fdb49b9af 100644
--- a/gfx/pics/100/anim0.asm
+++ b/gfx/pics/voltorb/anim0.asm
diff --git a/gfx/pics/100/anim1.asm b/gfx/pics/voltorb/anim1.asm
index be799fe4a..be799fe4a 100644
--- a/gfx/pics/100/anim1.asm
+++ b/gfx/pics/voltorb/anim1.asm
diff --git a/gfx/pics/100/back.lz b/gfx/pics/voltorb/back.6x6.2bpp.lz
index fe102da9a..fe102da9a 100644
--- a/gfx/pics/100/back.lz
+++ b/gfx/pics/voltorb/back.6x6.2bpp.lz
diff --git a/gfx/pics/100/bitmask.asm b/gfx/pics/voltorb/bitmask.asm
index 509d7b623..509d7b623 100644
--- a/gfx/pics/100/bitmask.asm
+++ b/gfx/pics/voltorb/bitmask.asm
diff --git a/gfx/pics/100/frames.asm b/gfx/pics/voltorb/frames.asm
index 79cad4ecd..79cad4ecd 100644
--- a/gfx/pics/100/frames.asm
+++ b/gfx/pics/voltorb/frames.asm
diff --git a/gfx/pics/100/front.lz b/gfx/pics/voltorb/front.5x5.2bpp.lz
index 94f35f9aa..94f35f9aa 100644
--- a/gfx/pics/100/front.lz
+++ b/gfx/pics/voltorb/front.5x5.2bpp.lz
diff --git a/gfx/pics/101/normal.pal b/gfx/pics/voltorb/normal.pal
index 07658abee..07658abee 100644
--- a/gfx/pics/101/normal.pal
+++ b/gfx/pics/voltorb/normal.pal
diff --git a/gfx/pics/101/shiny.pal b/gfx/pics/voltorb/shiny.pal
index b8509a81f..b8509a81f 100644
--- a/gfx/pics/101/shiny.pal
+++ b/gfx/pics/voltorb/shiny.pal
diff --git a/gfx/pics/037/anim0.asm b/gfx/pics/vulpix/anim0.asm
index 878054202..878054202 100644
--- a/gfx/pics/037/anim0.asm
+++ b/gfx/pics/vulpix/anim0.asm
diff --git a/gfx/pics/037/anim1.asm b/gfx/pics/vulpix/anim1.asm
index f7c9e3671..f7c9e3671 100644
--- a/gfx/pics/037/anim1.asm
+++ b/gfx/pics/vulpix/anim1.asm
diff --git a/gfx/pics/037/back.lz b/gfx/pics/vulpix/back.6x6.2bpp.lz
index ce2535141..ce2535141 100644
--- a/gfx/pics/037/back.lz
+++ b/gfx/pics/vulpix/back.6x6.2bpp.lz
diff --git a/gfx/pics/037/bitmask.asm b/gfx/pics/vulpix/bitmask.asm
index 170eac783..170eac783 100644
--- a/gfx/pics/037/bitmask.asm
+++ b/gfx/pics/vulpix/bitmask.asm
diff --git a/gfx/pics/037/frames.asm b/gfx/pics/vulpix/frames.asm
index b0cf1935a..b0cf1935a 100644
--- a/gfx/pics/037/frames.asm
+++ b/gfx/pics/vulpix/frames.asm
diff --git a/gfx/pics/037/front.lz b/gfx/pics/vulpix/front.6x6.2bpp.lz
index 9248ce808..9248ce808 100644
--- a/gfx/pics/037/front.lz
+++ b/gfx/pics/vulpix/front.6x6.2bpp.lz
diff --git a/gfx/pics/037/normal.pal b/gfx/pics/vulpix/normal.pal
index bd887146d..bd887146d 100644
--- a/gfx/pics/037/normal.pal
+++ b/gfx/pics/vulpix/normal.pal
diff --git a/gfx/pics/037/shiny.pal b/gfx/pics/vulpix/shiny.pal
index 0084507cd..0084507cd 100644
--- a/gfx/pics/037/shiny.pal
+++ b/gfx/pics/vulpix/shiny.pal
diff --git a/gfx/pics/008/anim0.asm b/gfx/pics/wartortle/anim0.asm
index 832b87b88..832b87b88 100644
--- a/gfx/pics/008/anim0.asm
+++ b/gfx/pics/wartortle/anim0.asm
diff --git a/gfx/pics/008/anim1.asm b/gfx/pics/wartortle/anim1.asm
index 40c4fcd14..40c4fcd14 100644
--- a/gfx/pics/008/anim1.asm
+++ b/gfx/pics/wartortle/anim1.asm
diff --git a/gfx/pics/008/back.lz b/gfx/pics/wartortle/back.6x6.2bpp.lz
index 5734c20cb..5734c20cb 100644
--- a/gfx/pics/008/back.lz
+++ b/gfx/pics/wartortle/back.6x6.2bpp.lz
diff --git a/gfx/pics/008/bitmask.asm b/gfx/pics/wartortle/bitmask.asm
index ed46271e8..ed46271e8 100644
--- a/gfx/pics/008/bitmask.asm
+++ b/gfx/pics/wartortle/bitmask.asm
diff --git a/gfx/pics/008/frames.asm b/gfx/pics/wartortle/frames.asm
index 9ebf74b9b..9ebf74b9b 100644
--- a/gfx/pics/008/frames.asm
+++ b/gfx/pics/wartortle/frames.asm
diff --git a/gfx/pics/008/front.lz b/gfx/pics/wartortle/front.6x6.2bpp.lz
index 29642807d..29642807d 100644
--- a/gfx/pics/008/front.lz
+++ b/gfx/pics/wartortle/front.6x6.2bpp.lz
diff --git a/gfx/pics/008/normal.pal b/gfx/pics/wartortle/normal.pal
index 0615b9ec0..0615b9ec0 100644
--- a/gfx/pics/008/normal.pal
+++ b/gfx/pics/wartortle/normal.pal
diff --git a/gfx/pics/008/shiny.pal b/gfx/pics/wartortle/shiny.pal
index c108dfdbf..c108dfdbf 100644
--- a/gfx/pics/008/shiny.pal
+++ b/gfx/pics/wartortle/shiny.pal
diff --git a/gfx/pics/013/anim0.asm b/gfx/pics/weedle/anim0.asm
index 5d959a772..5d959a772 100644
--- a/gfx/pics/013/anim0.asm
+++ b/gfx/pics/weedle/anim0.asm
diff --git a/gfx/pics/013/anim1.asm b/gfx/pics/weedle/anim1.asm
index 30dcb9185..30dcb9185 100644
--- a/gfx/pics/013/anim1.asm
+++ b/gfx/pics/weedle/anim1.asm
diff --git a/gfx/pics/013/back.lz b/gfx/pics/weedle/back.6x6.2bpp.lz
index 64decb914..64decb914 100644
--- a/gfx/pics/013/back.lz
+++ b/gfx/pics/weedle/back.6x6.2bpp.lz
diff --git a/gfx/pics/013/bitmask.asm b/gfx/pics/weedle/bitmask.asm
index defd3d5cd..defd3d5cd 100644
--- a/gfx/pics/013/bitmask.asm
+++ b/gfx/pics/weedle/bitmask.asm
diff --git a/gfx/pics/013/frames.asm b/gfx/pics/weedle/frames.asm
index c7a2a34a2..c7a2a34a2 100644
--- a/gfx/pics/013/frames.asm
+++ b/gfx/pics/weedle/frames.asm
diff --git a/gfx/pics/013/front.lz b/gfx/pics/weedle/front.5x5.2bpp.lz
index 091df588a..091df588a 100644
--- a/gfx/pics/013/front.lz
+++ b/gfx/pics/weedle/front.5x5.2bpp.lz
diff --git a/gfx/pics/013/normal.pal b/gfx/pics/weedle/normal.pal
index 9adb83b51..9adb83b51 100644
--- a/gfx/pics/013/normal.pal
+++ b/gfx/pics/weedle/normal.pal
diff --git a/gfx/pics/013/shiny.pal b/gfx/pics/weedle/shiny.pal
index 45cc7073c..45cc7073c 100644
--- a/gfx/pics/013/shiny.pal
+++ b/gfx/pics/weedle/shiny.pal
diff --git a/gfx/pics/070/anim0.asm b/gfx/pics/weepinbell/anim0.asm
index 6f710d29a..6f710d29a 100644
--- a/gfx/pics/070/anim0.asm
+++ b/gfx/pics/weepinbell/anim0.asm
diff --git a/gfx/pics/070/anim1.asm b/gfx/pics/weepinbell/anim1.asm
index 0e56c9cc1..0e56c9cc1 100644
--- a/gfx/pics/070/anim1.asm
+++ b/gfx/pics/weepinbell/anim1.asm
diff --git a/gfx/pics/070/back.lz b/gfx/pics/weepinbell/back.6x6.2bpp.lz
index 26e44257c..26e44257c 100644
--- a/gfx/pics/070/back.lz
+++ b/gfx/pics/weepinbell/back.6x6.2bpp.lz
diff --git a/gfx/pics/070/bitmask.asm b/gfx/pics/weepinbell/bitmask.asm
index 4af94c390..4af94c390 100644
--- a/gfx/pics/070/bitmask.asm
+++ b/gfx/pics/weepinbell/bitmask.asm
diff --git a/gfx/pics/070/frames.asm b/gfx/pics/weepinbell/frames.asm
index 9d67bd4eb..9d67bd4eb 100644
--- a/gfx/pics/070/frames.asm
+++ b/gfx/pics/weepinbell/frames.asm
diff --git a/gfx/pics/070/front.lz b/gfx/pics/weepinbell/front.6x6.2bpp.lz
index a7e7d60b5..a7e7d60b5 100644
--- a/gfx/pics/070/front.lz
+++ b/gfx/pics/weepinbell/front.6x6.2bpp.lz
diff --git a/gfx/pics/070/normal.pal b/gfx/pics/weepinbell/normal.pal
index 803367e69..803367e69 100644
--- a/gfx/pics/070/normal.pal
+++ b/gfx/pics/weepinbell/normal.pal
diff --git a/gfx/pics/070/shiny.pal b/gfx/pics/weepinbell/shiny.pal
index e4f10596c..e4f10596c 100644
--- a/gfx/pics/070/shiny.pal
+++ b/gfx/pics/weepinbell/shiny.pal
diff --git a/gfx/pics/110/anim0.asm b/gfx/pics/weezing/anim0.asm
index e64ca5d37..e64ca5d37 100644
--- a/gfx/pics/110/anim0.asm
+++ b/gfx/pics/weezing/anim0.asm
diff --git a/gfx/pics/110/anim1.asm b/gfx/pics/weezing/anim1.asm
index 1ba31dd74..1ba31dd74 100644
--- a/gfx/pics/110/anim1.asm
+++ b/gfx/pics/weezing/anim1.asm
diff --git a/gfx/pics/110/back.lz b/gfx/pics/weezing/back.6x6.2bpp.lz
index a85124f3a..a85124f3a 100644
--- a/gfx/pics/110/back.lz
+++ b/gfx/pics/weezing/back.6x6.2bpp.lz
diff --git a/gfx/pics/110/bitmask.asm b/gfx/pics/weezing/bitmask.asm
index 0877082a9..0877082a9 100644
--- a/gfx/pics/110/bitmask.asm
+++ b/gfx/pics/weezing/bitmask.asm
diff --git a/gfx/pics/110/frames.asm b/gfx/pics/weezing/frames.asm
index 1bb1b5710..1bb1b5710 100644
--- a/gfx/pics/110/frames.asm
+++ b/gfx/pics/weezing/frames.asm
diff --git a/gfx/pics/110/front.lz b/gfx/pics/weezing/front.7x7.2bpp.lz
index 3c6f24a41..3c6f24a41 100644
--- a/gfx/pics/110/front.lz
+++ b/gfx/pics/weezing/front.7x7.2bpp.lz
diff --git a/gfx/pics/110/normal.pal b/gfx/pics/weezing/normal.pal
index 38c816da2..38c816da2 100644
--- a/gfx/pics/110/normal.pal
+++ b/gfx/pics/weezing/normal.pal
diff --git a/gfx/pics/110/shiny.pal b/gfx/pics/weezing/shiny.pal
index 8132fea04..8132fea04 100644
--- a/gfx/pics/110/shiny.pal
+++ b/gfx/pics/weezing/shiny.pal
diff --git a/gfx/pics/040/anim0.asm b/gfx/pics/wigglytuff/anim0.asm
index 53b468fdd..53b468fdd 100644
--- a/gfx/pics/040/anim0.asm
+++ b/gfx/pics/wigglytuff/anim0.asm
diff --git a/gfx/pics/040/anim1.asm b/gfx/pics/wigglytuff/anim1.asm
index b99bf002c..b99bf002c 100644
--- a/gfx/pics/040/anim1.asm
+++ b/gfx/pics/wigglytuff/anim1.asm
diff --git a/gfx/pics/040/back.lz b/gfx/pics/wigglytuff/back.6x6.2bpp.lz
index 3b3732986..3b3732986 100644
--- a/gfx/pics/040/back.lz
+++ b/gfx/pics/wigglytuff/back.6x6.2bpp.lz
diff --git a/gfx/pics/040/bitmask.asm b/gfx/pics/wigglytuff/bitmask.asm
index 5cde27270..5cde27270 100644
--- a/gfx/pics/040/bitmask.asm
+++ b/gfx/pics/wigglytuff/bitmask.asm
diff --git a/gfx/pics/040/frames.asm b/gfx/pics/wigglytuff/frames.asm
index 131fc589c..131fc589c 100644
--- a/gfx/pics/040/frames.asm
+++ b/gfx/pics/wigglytuff/frames.asm
diff --git a/gfx/pics/040/front.lz b/gfx/pics/wigglytuff/front.6x6.2bpp.lz
index c633d2a0a..c633d2a0a 100644
--- a/gfx/pics/040/front.lz
+++ b/gfx/pics/wigglytuff/front.6x6.2bpp.lz
diff --git a/gfx/pics/040/normal.pal b/gfx/pics/wigglytuff/normal.pal
index 47aab43ae..47aab43ae 100644
--- a/gfx/pics/040/normal.pal
+++ b/gfx/pics/wigglytuff/normal.pal
diff --git a/gfx/pics/174/shiny.pal b/gfx/pics/wigglytuff/shiny.pal
index 38ce5d76d..38ce5d76d 100644
--- a/gfx/pics/174/shiny.pal
+++ b/gfx/pics/wigglytuff/shiny.pal
diff --git a/gfx/pics/202/anim0.asm b/gfx/pics/wobbuffet/anim0.asm
index 340f3df46..340f3df46 100644
--- a/gfx/pics/202/anim0.asm
+++ b/gfx/pics/wobbuffet/anim0.asm
diff --git a/gfx/pics/202/anim1.asm b/gfx/pics/wobbuffet/anim1.asm
index 8a3564daa..8a3564daa 100644
--- a/gfx/pics/202/anim1.asm
+++ b/gfx/pics/wobbuffet/anim1.asm
diff --git a/gfx/pics/202/back.lz b/gfx/pics/wobbuffet/back.6x6.2bpp.lz
index 87dba2049..87dba2049 100644
--- a/gfx/pics/202/back.lz
+++ b/gfx/pics/wobbuffet/back.6x6.2bpp.lz
diff --git a/gfx/pics/202/bitmask.asm b/gfx/pics/wobbuffet/bitmask.asm
index d1fa8121f..d1fa8121f 100644
--- a/gfx/pics/202/bitmask.asm
+++ b/gfx/pics/wobbuffet/bitmask.asm
diff --git a/gfx/pics/202/frames.asm b/gfx/pics/wobbuffet/frames.asm
index efe0d1e6d..efe0d1e6d 100644
--- a/gfx/pics/202/frames.asm
+++ b/gfx/pics/wobbuffet/frames.asm
diff --git a/gfx/pics/202/front.lz b/gfx/pics/wobbuffet/front.6x6.2bpp.lz
index ce7aa46c8..ce7aa46c8 100644
--- a/gfx/pics/202/front.lz
+++ b/gfx/pics/wobbuffet/front.6x6.2bpp.lz
diff --git a/gfx/pics/202/normal.pal b/gfx/pics/wobbuffet/normal.pal
index 71304f147..71304f147 100644
--- a/gfx/pics/202/normal.pal
+++ b/gfx/pics/wobbuffet/normal.pal
diff --git a/gfx/pics/202/shiny.pal b/gfx/pics/wobbuffet/shiny.pal
index c721c9ba6..c721c9ba6 100644
--- a/gfx/pics/202/shiny.pal
+++ b/gfx/pics/wobbuffet/shiny.pal
diff --git a/gfx/pics/194/anim0.asm b/gfx/pics/wooper/anim0.asm
index 2c9becf9e..2c9becf9e 100644
--- a/gfx/pics/194/anim0.asm
+++ b/gfx/pics/wooper/anim0.asm
diff --git a/gfx/pics/194/anim1.asm b/gfx/pics/wooper/anim1.asm
index 3f152d035..3f152d035 100644
--- a/gfx/pics/194/anim1.asm
+++ b/gfx/pics/wooper/anim1.asm
diff --git a/gfx/pics/194/back.lz b/gfx/pics/wooper/back.6x6.2bpp.lz
index 973037f02..973037f02 100644
--- a/gfx/pics/194/back.lz
+++ b/gfx/pics/wooper/back.6x6.2bpp.lz
diff --git a/gfx/pics/194/bitmask.asm b/gfx/pics/wooper/bitmask.asm
index 15731d45a..15731d45a 100644
--- a/gfx/pics/194/bitmask.asm
+++ b/gfx/pics/wooper/bitmask.asm
diff --git a/gfx/pics/194/frames.asm b/gfx/pics/wooper/frames.asm
index fd7dcc8bf..fd7dcc8bf 100644
--- a/gfx/pics/194/frames.asm
+++ b/gfx/pics/wooper/frames.asm
diff --git a/gfx/pics/194/front.lz b/gfx/pics/wooper/front.5x5.2bpp.lz
index 3d5d53c1b..3d5d53c1b 100644
--- a/gfx/pics/194/front.lz
+++ b/gfx/pics/wooper/front.5x5.2bpp.lz
diff --git a/gfx/pics/194/normal.pal b/gfx/pics/wooper/normal.pal
index ec098b1cf..ec098b1cf 100644
--- a/gfx/pics/194/normal.pal
+++ b/gfx/pics/wooper/normal.pal
diff --git a/gfx/pics/194/shiny.pal b/gfx/pics/wooper/shiny.pal
index aa3475256..aa3475256 100644
--- a/gfx/pics/194/shiny.pal
+++ b/gfx/pics/wooper/shiny.pal
diff --git a/gfx/pics/178/anim0.asm b/gfx/pics/xatu/anim0.asm
index 002f905b8..002f905b8 100644
--- a/gfx/pics/178/anim0.asm
+++ b/gfx/pics/xatu/anim0.asm
diff --git a/gfx/pics/178/anim1.asm b/gfx/pics/xatu/anim1.asm
index 3fa8d7875..3fa8d7875 100644
--- a/gfx/pics/178/anim1.asm
+++ b/gfx/pics/xatu/anim1.asm
diff --git a/gfx/pics/178/back.lz b/gfx/pics/xatu/back.6x6.2bpp.lz
index 8b6889ffb..8b6889ffb 100644
--- a/gfx/pics/178/back.lz
+++ b/gfx/pics/xatu/back.6x6.2bpp.lz
diff --git a/gfx/pics/178/bitmask.asm b/gfx/pics/xatu/bitmask.asm
index 3b59b58c6..3b59b58c6 100644
--- a/gfx/pics/178/bitmask.asm
+++ b/gfx/pics/xatu/bitmask.asm
diff --git a/gfx/pics/178/frames.asm b/gfx/pics/xatu/frames.asm
index fffa25793..fffa25793 100644
--- a/gfx/pics/178/frames.asm
+++ b/gfx/pics/xatu/frames.asm
diff --git a/gfx/pics/178/front.lz b/gfx/pics/xatu/front.6x6.2bpp.lz
index 4b5918b3a..4b5918b3a 100644
--- a/gfx/pics/178/front.lz
+++ b/gfx/pics/xatu/front.6x6.2bpp.lz
diff --git a/gfx/pics/178/normal.pal b/gfx/pics/xatu/normal.pal
index 9f85159c1..9f85159c1 100644
--- a/gfx/pics/178/normal.pal
+++ b/gfx/pics/xatu/normal.pal
diff --git a/gfx/pics/178/shiny.pal b/gfx/pics/xatu/shiny.pal
index 00ac32371..00ac32371 100644
--- a/gfx/pics/178/shiny.pal
+++ b/gfx/pics/xatu/shiny.pal
diff --git a/gfx/pics/193/anim0.asm b/gfx/pics/yanma/anim0.asm
index 4f1aaa929..4f1aaa929 100644
--- a/gfx/pics/193/anim0.asm
+++ b/gfx/pics/yanma/anim0.asm
diff --git a/gfx/pics/193/anim1.asm b/gfx/pics/yanma/anim1.asm
index 75464b3f1..75464b3f1 100644
--- a/gfx/pics/193/anim1.asm
+++ b/gfx/pics/yanma/anim1.asm
diff --git a/gfx/pics/193/back.lz b/gfx/pics/yanma/back.6x6.2bpp.lz
index 47105f12f..47105f12f 100644
--- a/gfx/pics/193/back.lz
+++ b/gfx/pics/yanma/back.6x6.2bpp.lz
diff --git a/gfx/pics/193/bitmask.asm b/gfx/pics/yanma/bitmask.asm
index a2bfcf8ce..a2bfcf8ce 100644
--- a/gfx/pics/193/bitmask.asm
+++ b/gfx/pics/yanma/bitmask.asm
diff --git a/gfx/pics/193/frames.asm b/gfx/pics/yanma/frames.asm
index 7512a5e8f..7512a5e8f 100644
--- a/gfx/pics/193/frames.asm
+++ b/gfx/pics/yanma/frames.asm
diff --git a/gfx/pics/193/front.lz b/gfx/pics/yanma/front.6x6.2bpp.lz
index 1987afdc9..1987afdc9 100644
--- a/gfx/pics/193/front.lz
+++ b/gfx/pics/yanma/front.6x6.2bpp.lz
diff --git a/gfx/pics/193/normal.pal b/gfx/pics/yanma/normal.pal
index dc054a54f..dc054a54f 100644
--- a/gfx/pics/193/normal.pal
+++ b/gfx/pics/yanma/normal.pal
diff --git a/gfx/pics/193/shiny.pal b/gfx/pics/yanma/shiny.pal
index cbbdc755b..cbbdc755b 100644
--- a/gfx/pics/193/shiny.pal
+++ b/gfx/pics/yanma/shiny.pal
diff --git a/gfx/pics/145/anim0.asm b/gfx/pics/zapdos/anim0.asm
index a22540c2a..a22540c2a 100644
--- a/gfx/pics/145/anim0.asm
+++ b/gfx/pics/zapdos/anim0.asm
diff --git a/gfx/pics/145/anim1.asm b/gfx/pics/zapdos/anim1.asm
index 3d8c8fd57..3d8c8fd57 100644
--- a/gfx/pics/145/anim1.asm
+++ b/gfx/pics/zapdos/anim1.asm
diff --git a/gfx/pics/145/back.lz b/gfx/pics/zapdos/back.6x6.2bpp.lz
index 2f2167941..2f2167941 100644
--- a/gfx/pics/145/back.lz
+++ b/gfx/pics/zapdos/back.6x6.2bpp.lz
diff --git a/gfx/pics/145/bitmask.asm b/gfx/pics/zapdos/bitmask.asm
index e1362fa79..e1362fa79 100644
--- a/gfx/pics/145/bitmask.asm
+++ b/gfx/pics/zapdos/bitmask.asm
diff --git a/gfx/pics/145/frames.asm b/gfx/pics/zapdos/frames.asm
index f22a9680c..f22a9680c 100644
--- a/gfx/pics/145/frames.asm
+++ b/gfx/pics/zapdos/frames.asm
diff --git a/gfx/pics/145/front.lz b/gfx/pics/zapdos/front.7x7.2bpp.lz
index 0f048171c..0f048171c 100644
--- a/gfx/pics/145/front.lz
+++ b/gfx/pics/zapdos/front.7x7.2bpp.lz
diff --git a/gfx/pics/145/normal.pal b/gfx/pics/zapdos/normal.pal
index fdfcd0418..fdfcd0418 100644
--- a/gfx/pics/145/normal.pal
+++ b/gfx/pics/zapdos/normal.pal
diff --git a/gfx/pics/145/shiny.pal b/gfx/pics/zapdos/shiny.pal
index e73dbe6ff..e73dbe6ff 100644
--- a/gfx/pics/145/shiny.pal
+++ b/gfx/pics/zapdos/shiny.pal
diff --git a/gfx/pics/041/anim0.asm b/gfx/pics/zubat/anim0.asm
index a34a66671..a34a66671 100644
--- a/gfx/pics/041/anim0.asm
+++ b/gfx/pics/zubat/anim0.asm
diff --git a/gfx/pics/041/anim1.asm b/gfx/pics/zubat/anim1.asm
index cfba587f9..cfba587f9 100644
--- a/gfx/pics/041/anim1.asm
+++ b/gfx/pics/zubat/anim1.asm
diff --git a/gfx/pics/041/back.lz b/gfx/pics/zubat/back.6x6.2bpp.lz
index d50e00e90..d50e00e90 100644
--- a/gfx/pics/041/back.lz
+++ b/gfx/pics/zubat/back.6x6.2bpp.lz
diff --git a/gfx/pics/041/bitmask.asm b/gfx/pics/zubat/bitmask.asm
index bf6109784..bf6109784 100644
--- a/gfx/pics/041/bitmask.asm
+++ b/gfx/pics/zubat/bitmask.asm
diff --git a/gfx/pics/041/frames.asm b/gfx/pics/zubat/frames.asm
index 8fa207006..8fa207006 100644
--- a/gfx/pics/041/frames.asm
+++ b/gfx/pics/zubat/frames.asm
diff --git a/gfx/pics/041/front.lz b/gfx/pics/zubat/front.5x5.2bpp.lz
index b22e1d971..b22e1d971 100644
--- a/gfx/pics/041/front.lz
+++ b/gfx/pics/zubat/front.5x5.2bpp.lz
diff --git a/gfx/pics/042/normal.pal b/gfx/pics/zubat/normal.pal
index d36d0449c..d36d0449c 100644
--- a/gfx/pics/042/normal.pal
+++ b/gfx/pics/zubat/normal.pal
diff --git a/gfx/pics/041/shiny.pal b/gfx/pics/zubat/shiny.pal
index 722f84ed2..722f84ed2 100644
--- a/gfx/pics/041/shiny.pal
+++ b/gfx/pics/zubat/shiny.pal
diff --git a/gfx/tilesets/00.lz b/gfx/tilesets/00.2bpp.lz
index 9821e1433..9821e1433 100644
--- a/gfx/tilesets/00.lz
+++ b/gfx/tilesets/00.2bpp.lz
diff --git a/gfx/tilesets/01.lz b/gfx/tilesets/01.2bpp.lz
index 9821e1433..9821e1433 100644
--- a/gfx/tilesets/01.lz
+++ b/gfx/tilesets/01.2bpp.lz
diff --git a/gfx/tilesets/02.lz b/gfx/tilesets/02.2bpp.lz
index 64f23e23b..64f23e23b 100644
--- a/gfx/tilesets/02.lz
+++ b/gfx/tilesets/02.2bpp.lz
diff --git a/gfx/tilesets/03.lz b/gfx/tilesets/03.2bpp.lz
index d925ee111..d925ee111 100644
--- a/gfx/tilesets/03.lz
+++ b/gfx/tilesets/03.2bpp.lz
diff --git a/gfx/tilesets/04.lz b/gfx/tilesets/04.2bpp.lz
index 64f23e23b..64f23e23b 100644
--- a/gfx/tilesets/04.lz
+++ b/gfx/tilesets/04.2bpp.lz
diff --git a/gfx/tilesets/05.lz b/gfx/tilesets/05.2bpp.lz
index f9afaf70d..f9afaf70d 100644
--- a/gfx/tilesets/05.lz
+++ b/gfx/tilesets/05.2bpp.lz
diff --git a/gfx/tilesets/06.lz b/gfx/tilesets/06.2bpp.lz
index 17c64de65..17c64de65 100644
--- a/gfx/tilesets/06.lz
+++ b/gfx/tilesets/06.2bpp.lz
diff --git a/gfx/tilesets/07.lz b/gfx/tilesets/07.2bpp.lz
index 71783d9f2..71783d9f2 100644
--- a/gfx/tilesets/07.lz
+++ b/gfx/tilesets/07.2bpp.lz
diff --git a/gfx/tilesets/08.lz b/gfx/tilesets/08.2bpp.lz
index 724b6b8b7..724b6b8b7 100644
--- a/gfx/tilesets/08.lz
+++ b/gfx/tilesets/08.2bpp.lz
diff --git a/gfx/tilesets/09.lz b/gfx/tilesets/09.2bpp.lz
index 96dd2e594..96dd2e594 100644
--- a/gfx/tilesets/09.lz
+++ b/gfx/tilesets/09.2bpp.lz
diff --git a/gfx/tilesets/10.lz b/gfx/tilesets/10.2bpp.lz
index cd0f43861..cd0f43861 100644
--- a/gfx/tilesets/10.lz
+++ b/gfx/tilesets/10.2bpp.lz
diff --git a/gfx/tilesets/11.lz b/gfx/tilesets/11.2bpp.lz
index 584e54dd2..584e54dd2 100644
--- a/gfx/tilesets/11.lz
+++ b/gfx/tilesets/11.2bpp.lz
diff --git a/gfx/tilesets/12.lz b/gfx/tilesets/12.2bpp.lz
index e8091a899..e8091a899 100644
--- a/gfx/tilesets/12.lz
+++ b/gfx/tilesets/12.2bpp.lz
diff --git a/gfx/tilesets/13.lz b/gfx/tilesets/13.2bpp.lz
index b68f147d0..b68f147d0 100644
--- a/gfx/tilesets/13.lz
+++ b/gfx/tilesets/13.2bpp.lz
diff --git a/gfx/tilesets/14.lz b/gfx/tilesets/14.2bpp.lz
index f7e185b4e..f7e185b4e 100644
--- a/gfx/tilesets/14.lz
+++ b/gfx/tilesets/14.2bpp.lz
diff --git a/gfx/tilesets/15.lz b/gfx/tilesets/15.2bpp.lz
index 6b45c769d..6b45c769d 100644
--- a/gfx/tilesets/15.lz
+++ b/gfx/tilesets/15.2bpp.lz
diff --git a/gfx/tilesets/16.lz b/gfx/tilesets/16.2bpp.lz
index 28f025413..28f025413 100644
--- a/gfx/tilesets/16.lz
+++ b/gfx/tilesets/16.2bpp.lz
diff --git a/gfx/tilesets/17.lz b/gfx/tilesets/17.2bpp.lz
index 56e509f5e..56e509f5e 100644
--- a/gfx/tilesets/17.lz
+++ b/gfx/tilesets/17.2bpp.lz
diff --git a/gfx/tilesets/18.lz b/gfx/tilesets/18.2bpp.lz
index e19994f37..e19994f37 100644
--- a/gfx/tilesets/18.lz
+++ b/gfx/tilesets/18.2bpp.lz
diff --git a/gfx/tilesets/19.lz b/gfx/tilesets/19.2bpp.lz
index d208e65c3..d208e65c3 100644
--- a/gfx/tilesets/19.lz
+++ b/gfx/tilesets/19.2bpp.lz
diff --git a/gfx/tilesets/20.lz b/gfx/tilesets/20.2bpp.lz
index b458a501d..b458a501d 100644
--- a/gfx/tilesets/20.lz
+++ b/gfx/tilesets/20.2bpp.lz
diff --git a/gfx/tilesets/21.lz b/gfx/tilesets/21.2bpp.lz
index 5b787c854..5b787c854 100644
--- a/gfx/tilesets/21.lz
+++ b/gfx/tilesets/21.2bpp.lz
diff --git a/gfx/tilesets/22.lz b/gfx/tilesets/22.2bpp.lz
index fa5d0a9f0..fa5d0a9f0 100644
--- a/gfx/tilesets/22.lz
+++ b/gfx/tilesets/22.2bpp.lz
diff --git a/gfx/tilesets/23.lz b/gfx/tilesets/23.2bpp.lz
index 2033306e3..2033306e3 100644
--- a/gfx/tilesets/23.lz
+++ b/gfx/tilesets/23.2bpp.lz
diff --git a/gfx/tilesets/24.lz b/gfx/tilesets/24.2bpp.lz
index 69069fb75..69069fb75 100644
--- a/gfx/tilesets/24.lz
+++ b/gfx/tilesets/24.2bpp.lz
diff --git a/gfx/tilesets/25.lz b/gfx/tilesets/25.2bpp.lz
index 01a0e56bd..01a0e56bd 100644
--- a/gfx/tilesets/25.lz
+++ b/gfx/tilesets/25.2bpp.lz
diff --git a/gfx/tilesets/26.lz b/gfx/tilesets/26.2bpp.lz
index 68a4fdad0..68a4fdad0 100644
--- a/gfx/tilesets/26.lz
+++ b/gfx/tilesets/26.2bpp.lz
diff --git a/gfx/tilesets/27.lz b/gfx/tilesets/27.2bpp.lz
index 34be33856..34be33856 100644
--- a/gfx/tilesets/27.lz
+++ b/gfx/tilesets/27.2bpp.lz
diff --git a/gfx/tilesets/28.lz b/gfx/tilesets/28.2bpp.lz
index c204dca26..c204dca26 100644
--- a/gfx/tilesets/28.lz
+++ b/gfx/tilesets/28.2bpp.lz
diff --git a/gfx/tilesets/29.lz b/gfx/tilesets/29.2bpp.lz
index 25cc45c85..25cc45c85 100644
--- a/gfx/tilesets/29.lz
+++ b/gfx/tilesets/29.2bpp.lz
diff --git a/gfx/tilesets/30.lz b/gfx/tilesets/30.2bpp.lz
index 50a5ab9ac..50a5ab9ac 100644
--- a/gfx/tilesets/30.lz
+++ b/gfx/tilesets/30.2bpp.lz
diff --git a/gfx/tilesets/31.lz b/gfx/tilesets/31.2bpp.lz
index 7b5355705..7b5355705 100644
--- a/gfx/tilesets/31.lz
+++ b/gfx/tilesets/31.2bpp.lz
diff --git a/gfx/tilesets/32.lz b/gfx/tilesets/32.2bpp.lz
index 68a4fdad0..68a4fdad0 100644
--- a/gfx/tilesets/32.lz
+++ b/gfx/tilesets/32.2bpp.lz
diff --git a/gfx/tilesets/33.lz b/gfx/tilesets/33.2bpp.lz
index 68a4fdad0..68a4fdad0 100644
--- a/gfx/tilesets/33.lz
+++ b/gfx/tilesets/33.2bpp.lz
diff --git a/gfx/tilesets/34.lz b/gfx/tilesets/34.2bpp.lz
index 68a4fdad0..68a4fdad0 100644
--- a/gfx/tilesets/34.lz
+++ b/gfx/tilesets/34.2bpp.lz
diff --git a/gfx/tilesets/35.lz b/gfx/tilesets/35.2bpp.lz
index 68a4fdad0..68a4fdad0 100644
--- a/gfx/tilesets/35.lz
+++ b/gfx/tilesets/35.2bpp.lz
diff --git a/gfx/tilesets/36.lz b/gfx/tilesets/36.2bpp.lz
index 68a4fdad0..68a4fdad0 100644
--- a/gfx/tilesets/36.lz
+++ b/gfx/tilesets/36.2bpp.lz
diff --git a/gfx/title/crystal.lz b/gfx/title/crystal.w48.interleave.2bpp.lz
index 9dcbafc86..9dcbafc86 100644
--- a/gfx/title/crystal.lz
+++ b/gfx/title/crystal.w48.interleave.2bpp.lz
diff --git a/gfx/title/logo.lz b/gfx/title/logo.w160.t4.2bpp.lz
index 0fa7d7744..0fa7d7744 100644
--- a/gfx/title/logo.lz
+++ b/gfx/title/logo.w160.t4.2bpp.lz
diff --git a/gfx/title/suicune.lz b/gfx/title/suicune.w128.2bpp.lz
index 359fd93ca..359fd93ca 100644
--- a/gfx/title/suicune.lz
+++ b/gfx/title/suicune.w128.2bpp.lz
diff --git a/gfx/trade/game_boy.lz b/gfx/trade/game_boy.2bpp.lz
index 832164306..832164306 100644
--- a/gfx/trade/game_boy.lz
+++ b/gfx/trade/game_boy.2bpp.lz
diff --git a/gfx/trainers/028.lz b/gfx/trainers/beauty.7x7.2bpp.lz
index 8c5d30ee6..8c5d30ee6 100644
--- a/gfx/trainers/028.lz
+++ b/gfx/trainers/beauty.7x7.2bpp.lz
diff --git a/gfx/trainers/044.lz b/gfx/trainers/biker.7x7.2bpp.lz
index 07ad8621b..07ad8621b 100644
--- a/gfx/trainers/044.lz
+++ b/gfx/trainers/biker.7x7.2bpp.lz
diff --git a/gfx/trainers/023.lz b/gfx/trainers/bird_keeper.7x7.2bpp.lz
index 48b505847..48b505847 100644
--- a/gfx/trainers/023.lz
+++ b/gfx/trainers/bird_keeper.7x7.2bpp.lz
diff --git a/gfx/trainers/049.lz b/gfx/trainers/blackbelt_t.7x7.2bpp.lz
index 086b8fc02..086b8fc02 100644
--- a/gfx/trainers/049.lz
+++ b/gfx/trainers/blackbelt_t.7x7.2bpp.lz
diff --git a/gfx/trainers/045.lz b/gfx/trainers/blaine.7x7.2bpp.lz
index d967bb3ba..d967bb3ba 100644
--- a/gfx/trainers/045.lz
+++ b/gfx/trainers/blaine.7x7.2bpp.lz
diff --git a/gfx/trainers/063.lz b/gfx/trainers/blue.7x7.2bpp.lz
index 9d4cb50c6..9d4cb50c6 100644
--- a/gfx/trainers/063.lz
+++ b/gfx/trainers/blue.7x7.2bpp.lz
diff --git a/gfx/trainers/057.lz b/gfx/trainers/boarder.7x7.2bpp.lz
index a6dc315d8..a6dc315d8 100644
--- a/gfx/trainers/057.lz
+++ b/gfx/trainers/boarder.7x7.2bpp.lz
diff --git a/gfx/trainers/016.lz b/gfx/trainers/brock.7x7.2bpp.lz
index d7a4e29bf..d7a4e29bf 100644
--- a/gfx/trainers/016.lz
+++ b/gfx/trainers/brock.7x7.2bpp.lz
diff --git a/gfx/trainers/012.lz b/gfx/trainers/bruno.7x7.2bpp.lz
index 69406d11d..69406d11d 100644
--- a/gfx/trainers/012.lz
+++ b/gfx/trainers/bruno.7x7.2bpp.lz
diff --git a/gfx/trainers/035.lz b/gfx/trainers/bug_catcher.7x7.2bpp.lz
index cea17dbac..cea17dbac 100644
--- a/gfx/trainers/035.lz
+++ b/gfx/trainers/bug_catcher.7x7.2bpp.lz
diff --git a/gfx/trainers/002.lz b/gfx/trainers/bugsy.7x7.2bpp.lz
index 7910628aa..7910628aa 100644
--- a/gfx/trainers/002.lz
+++ b/gfx/trainers/bugsy.7x7.2bpp.lz
diff --git a/gfx/trainers/046.lz b/gfx/trainers/burglar.7x7.2bpp.lz
index 45da954d9..45da954d9 100644
--- a/gfx/trainers/046.lz
+++ b/gfx/trainers/burglar.7x7.2bpp.lz
diff --git a/gfx/trainers/011.lz b/gfx/trainers/cal.7x7.2bpp.lz
index f7d3570ae..f7d3570ae 100644
--- a/gfx/trainers/011.lz
+++ b/gfx/trainers/cal.7x7.2bpp.lz
diff --git a/gfx/trainers/053.lz b/gfx/trainers/camper.7x7.2bpp.lz
index a8963bae7..a8963bae7 100644
--- a/gfx/trainers/053.lz
+++ b/gfx/trainers/camper.7x7.2bpp.lz
diff --git a/gfx/trainers/015.lz b/gfx/trainers/champion.7x7.2bpp.lz
index c5840a676..c5840a676 100644
--- a/gfx/trainers/015.lz
+++ b/gfx/trainers/champion.7x7.2bpp.lz
diff --git a/gfx/trainers/006.lz b/gfx/trainers/chuck.7x7.2bpp.lz
index 0a92c7074..0a92c7074 100644
--- a/gfx/trainers/006.lz
+++ b/gfx/trainers/chuck.7x7.2bpp.lz
diff --git a/gfx/trainers/007.lz b/gfx/trainers/clair.7x7.2bpp.lz
index bbc463594..bbc463594 100644
--- a/gfx/trainers/007.lz
+++ b/gfx/trainers/clair.7x7.2bpp.lz
diff --git a/gfx/trainers/027.lz b/gfx/trainers/cooltrainer_f.7x7.2bpp.lz
index cb41d74ee..cb41d74ee 100644
--- a/gfx/trainers/027.lz
+++ b/gfx/trainers/cooltrainer_f.7x7.2bpp.lz
diff --git a/gfx/trainers/026.lz b/gfx/trainers/cooltrainer_m.7x7.2bpp.lz
index 93dad0319..93dad0319 100644
--- a/gfx/trainers/026.lz
+++ b/gfx/trainers/cooltrainer_m.7x7.2bpp.lz
diff --git a/gfx/trainers/020.lz b/gfx/trainers/erika.7x7.2bpp.lz
index 963363d26..963363d26 100644
--- a/gfx/trainers/020.lz
+++ b/gfx/trainers/erika.7x7.2bpp.lz
diff --git a/gfx/trainers/054.lz b/gfx/trainers/executive_f.7x7.2bpp.lz
index b823ddaab..b823ddaab 100644
--- a/gfx/trainers/054.lz
+++ b/gfx/trainers/executive_f.7x7.2bpp.lz
diff --git a/gfx/trainers/050.lz b/gfx/trainers/executive_m.7x7.2bpp.lz
index e10b588cc..e10b588cc 100644
--- a/gfx/trainers/050.lz
+++ b/gfx/trainers/executive_m.7x7.2bpp.lz
diff --git a/gfx/trainers/000.lz b/gfx/trainers/falkner.7x7.2bpp.lz
index 323587e3a..323587e3a 100644
--- a/gfx/trainers/000.lz
+++ b/gfx/trainers/falkner.7x7.2bpp.lz
diff --git a/gfx/trainers/047.lz b/gfx/trainers/firebreather.7x7.2bpp.lz
index a0f853a9d..a0f853a9d 100644
--- a/gfx/trainers/047.lz
+++ b/gfx/trainers/firebreather.7x7.2bpp.lz
diff --git a/gfx/trainers/036.lz b/gfx/trainers/fisher.7x7.2bpp.lz
index b210aeda1..b210aeda1 100644
--- a/gfx/trainers/036.lz
+++ b/gfx/trainers/fisher.7x7.2bpp.lz
diff --git a/gfx/trainers/031.lz b/gfx/trainers/gentleman.7x7.2bpp.lz
index 153720e71..153720e71 100644
--- a/gfx/trainers/031.lz
+++ b/gfx/trainers/gentleman.7x7.2bpp.lz
diff --git a/gfx/trainers/065.lz b/gfx/trainers/grunt_f.7x7.2bpp.lz
index beee0721b..beee0721b 100644
--- a/gfx/trainers/065.lz
+++ b/gfx/trainers/grunt_f.7x7.2bpp.lz
diff --git a/gfx/trainers/030.lz b/gfx/trainers/grunt_m.7x7.2bpp.lz
index 5ac5597b0..5ac5597b0 100644
--- a/gfx/trainers/030.lz
+++ b/gfx/trainers/grunt_m.7x7.2bpp.lz
diff --git a/gfx/trainers/042.lz b/gfx/trainers/guitarist.7x7.2bpp.lz
index d67e6ea98..d67e6ea98 100644
--- a/gfx/trainers/042.lz
+++ b/gfx/trainers/guitarist.7x7.2bpp.lz
diff --git a/gfx/trainers/043.lz b/gfx/trainers/hiker.7x7.2bpp.lz
index c7cecda28..c7cecda28 100644
--- a/gfx/trainers/043.lz
+++ b/gfx/trainers/hiker.7x7.2bpp.lz
diff --git a/gfx/trainers/025.lz b/gfx/trainers/janine.7x7.2bpp.lz
index d6249eba3..d6249eba3 100644
--- a/gfx/trainers/025.lz
+++ b/gfx/trainers/janine.7x7.2bpp.lz
diff --git a/gfx/trainers/005.lz b/gfx/trainers/jasmine.7x7.2bpp.lz
index 7c08ded94..7c08ded94 100644
--- a/gfx/trainers/005.lz
+++ b/gfx/trainers/jasmine.7x7.2bpp.lz
diff --git a/gfx/trainers/048.lz b/gfx/trainers/juggler.7x7.2bpp.lz
index d64ed1f0b..d64ed1f0b 100644
--- a/gfx/trainers/048.lz
+++ b/gfx/trainers/juggler.7x7.2bpp.lz
diff --git a/gfx/trainers/013.lz b/gfx/trainers/karen.7x7.2bpp.lz
index a0bd871f7..a0bd871f7 100644
--- a/gfx/trainers/013.lz
+++ b/gfx/trainers/karen.7x7.2bpp.lz
diff --git a/gfx/trainers/059.lz b/gfx/trainers/kimono_girl.7x7.2bpp.lz
index 465ccb111..465ccb111 100644
--- a/gfx/trainers/059.lz
+++ b/gfx/trainers/kimono_girl.7x7.2bpp.lz
diff --git a/gfx/trainers/014.lz b/gfx/trainers/koga.7x7.2bpp.lz
index bc4501f08..bc4501f08 100644
--- a/gfx/trainers/014.lz
+++ b/gfx/trainers/koga.7x7.2bpp.lz
diff --git a/gfx/trainers/024.lz b/gfx/trainers/lass.7x7.2bpp.lz
index 0c7cffa79..0c7cffa79 100644
--- a/gfx/trainers/024.lz
+++ b/gfx/trainers/lass.7x7.2bpp.lz
diff --git a/gfx/trainers/018.lz b/gfx/trainers/lt_surge.7x7.2bpp.lz
index 9a3df5d3f..9a3df5d3f 100644
--- a/gfx/trainers/018.lz
+++ b/gfx/trainers/lt_surge.7x7.2bpp.lz
diff --git a/gfx/trainers/056.lz b/gfx/trainers/medium.7x7.2bpp.lz
index 4aaa71326..4aaa71326 100644
--- a/gfx/trainers/056.lz
+++ b/gfx/trainers/medium.7x7.2bpp.lz
diff --git a/gfx/trainers/017.lz b/gfx/trainers/misty.7x7.2bpp.lz
index 1a96cdddd..1a96cdddd 100644
--- a/gfx/trainers/017.lz
+++ b/gfx/trainers/misty.7x7.2bpp.lz
diff --git a/gfx/trainers/003.lz b/gfx/trainers/morty.7x7.2bpp.lz
index 67999aeb8..67999aeb8 100644
--- a/gfx/trainers/003.lz
+++ b/gfx/trainers/morty.7x7.2bpp.lz
diff --git a/gfx/trainers/066.lz b/gfx/trainers/mysticalman.7x7.2bpp.lz
index 38296bc91..38296bc91 100644
--- a/gfx/trainers/066.lz
+++ b/gfx/trainers/mysticalman.7x7.2bpp.lz
diff --git a/gfx/trainers/009.lz b/gfx/trainers/oak.7x7.2bpp.lz
index 276f7c533..276f7c533 100644
--- a/gfx/trainers/009.lz
+++ b/gfx/trainers/oak.7x7.2bpp.lz
diff --git a/gfx/trainers/064.lz b/gfx/trainers/officer.7x7.2bpp.lz
index e3e22f870..e3e22f870 100644
--- a/gfx/trainers/064.lz
+++ b/gfx/trainers/officer.7x7.2bpp.lz
diff --git a/gfx/trainers/052.lz b/gfx/trainers/picnicker.7x7.2bpp.lz
index 81ee09ab7..81ee09ab7 100644
--- a/gfx/trainers/052.lz
+++ b/gfx/trainers/picnicker.7x7.2bpp.lz
diff --git a/gfx/trainers/061.lz b/gfx/trainers/pokefan_f.7x7.2bpp.lz
index 2ab555a85..2ab555a85 100644
--- a/gfx/trainers/061.lz
+++ b/gfx/trainers/pokefan_f.7x7.2bpp.lz
diff --git a/gfx/trainers/058.lz b/gfx/trainers/pokefan_m.7x7.2bpp.lz
index 25b4a9ff7..25b4a9ff7 100644
--- a/gfx/trainers/058.lz
+++ b/gfx/trainers/pokefan_m.7x7.2bpp.lz
diff --git a/gfx/trainers/029.lz b/gfx/trainers/pokemaniac.7x7.2bpp.lz
index 78fb417f4..78fb417f4 100644
--- a/gfx/trainers/029.lz
+++ b/gfx/trainers/pokemaniac.7x7.2bpp.lz
diff --git a/gfx/trainers/004.lz b/gfx/trainers/pryce.7x7.2bpp.lz
index ca69273e0..ca69273e0 100644
--- a/gfx/trainers/004.lz
+++ b/gfx/trainers/pryce.7x7.2bpp.lz
diff --git a/gfx/trainers/051.lz b/gfx/trainers/psychic_t.7x7.2bpp.lz
index c1123a84e..c1123a84e 100644
--- a/gfx/trainers/051.lz
+++ b/gfx/trainers/psychic_t.7x7.2bpp.lz
diff --git a/gfx/trainers/062.lz b/gfx/trainers/red.7x7.2bpp.lz
index 15a8dcf88..15a8dcf88 100644
--- a/gfx/trainers/062.lz
+++ b/gfx/trainers/red.7x7.2bpp.lz
diff --git a/gfx/trainers/008.lz b/gfx/trainers/rival1.7x7.2bpp.lz
index 9a5b99abc..9a5b99abc 100644
--- a/gfx/trainers/008.lz
+++ b/gfx/trainers/rival1.7x7.2bpp.lz
diff --git a/gfx/trainers/041.lz b/gfx/trainers/rival2.7x7.2bpp.lz
index 683ec66bb..683ec66bb 100644
--- a/gfx/trainers/041.lz
+++ b/gfx/trainers/rival2.7x7.2bpp.lz
diff --git a/gfx/trainers/034.lz b/gfx/trainers/sabrina.7x7.2bpp.lz
index bee6dd0e9..bee6dd0e9 100644
--- a/gfx/trainers/034.lz
+++ b/gfx/trainers/sabrina.7x7.2bpp.lz
diff --git a/gfx/trainers/055.lz b/gfx/trainers/sage.7x7.2bpp.lz
index aff9d4589..aff9d4589 100644
--- a/gfx/trainers/055.lz
+++ b/gfx/trainers/sage.7x7.2bpp.lz
diff --git a/gfx/trainers/039.lz b/gfx/trainers/sailor.7x7.2bpp.lz
index 425667a73..425667a73 100644
--- a/gfx/trainers/039.lz
+++ b/gfx/trainers/sailor.7x7.2bpp.lz
diff --git a/gfx/trainers/022.lz b/gfx/trainers/schoolboy.7x7.2bpp.lz
index 7d9bd00a3..7d9bd00a3 100644
--- a/gfx/trainers/022.lz
+++ b/gfx/trainers/schoolboy.7x7.2bpp.lz
diff --git a/gfx/trainers/019.lz b/gfx/trainers/scientist.7x7.2bpp.lz
index 033f421b5..033f421b5 100644
--- a/gfx/trainers/019.lz
+++ b/gfx/trainers/scientist.7x7.2bpp.lz
diff --git a/gfx/trainers/032.lz b/gfx/trainers/skier.7x7.2bpp.lz
index 42be70abe..42be70abe 100644
--- a/gfx/trainers/032.lz
+++ b/gfx/trainers/skier.7x7.2bpp.lz
diff --git a/gfx/trainers/040.lz b/gfx/trainers/super_nerd.7x7.2bpp.lz
index dbdb4ca46..dbdb4ca46 100644
--- a/gfx/trainers/040.lz
+++ b/gfx/trainers/super_nerd.7x7.2bpp.lz
diff --git a/gfx/trainers/038.lz b/gfx/trainers/swimmer_f.7x7.2bpp.lz
index 3f27a6d42..3f27a6d42 100644
--- a/gfx/trainers/038.lz
+++ b/gfx/trainers/swimmer_f.7x7.2bpp.lz
diff --git a/gfx/trainers/037.lz b/gfx/trainers/swimmer_m.7x7.2bpp.lz
index b162cadca..b162cadca 100644
--- a/gfx/trainers/037.lz
+++ b/gfx/trainers/swimmer_m.7x7.2bpp.lz
diff --git a/gfx/trainers/033.lz b/gfx/trainers/teacher.7x7.2bpp.lz
index 92151f891..92151f891 100644
--- a/gfx/trainers/033.lz
+++ b/gfx/trainers/teacher.7x7.2bpp.lz
diff --git a/gfx/trainers/060.lz b/gfx/trainers/twins.7x7.2bpp.lz
index 1bdf29c7d..1bdf29c7d 100644
--- a/gfx/trainers/060.lz
+++ b/gfx/trainers/twins.7x7.2bpp.lz
diff --git a/gfx/trainers/001.lz b/gfx/trainers/whitney.7x7.2bpp.lz
index 9564767a8..9564767a8 100644
--- a/gfx/trainers/001.lz
+++ b/gfx/trainers/whitney.7x7.2bpp.lz
diff --git a/gfx/trainers/010.lz b/gfx/trainers/will.7x7.2bpp.lz
index 3de211cd4..3de211cd4 100644
--- a/gfx/trainers/010.lz
+++ b/gfx/trainers/will.7x7.2bpp.lz
diff --git a/gfx/trainers/021.lz b/gfx/trainers/youngster.7x7.2bpp.lz
index ec742f9f3..ec742f9f3 100644
--- a/gfx/trainers/021.lz
+++ b/gfx/trainers/youngster.7x7.2bpp.lz
diff --git a/main.asm b/main.asm
index 2c8bfb8f1..efe74a039 100644
--- a/main.asm
+++ b/main.asm
@@ -16425,7 +16425,7 @@ PackMenuGFX:
 INCBIN "gfx/misc/pack_menu.2bpp"
 
 PackGFX:
-INCBIN "gfx/misc/pack.2bpp"
+INCBIN "gfx/misc/pack.w40.2bpp"
 
 Function113d6: ; 113d6
 	call Function114dd
@@ -34515,10 +34515,10 @@ Unknown_254c9: ; 254c9
 
 CardStatusGFX: INCBIN "gfx/misc/card_status.2bpp"
 
-LeaderGFX:  INCBIN "gfx/misc/leaders.2bpp"
-LeaderGFX2: INCBIN "gfx/misc/leaders.2bpp"
-BadgeGFX:   INCBIN "gfx/misc/badges.2bpp"
-BadgeGFX2:  INCBIN "gfx/misc/badges.2bpp"
+LeaderGFX:  INCBIN "gfx/misc/leaders.w24.2bpp"
+LeaderGFX2: INCBIN "gfx/misc/leaders.w24.2bpp"
+BadgeGFX:   INCBIN "gfx/misc/badges.w16.2bpp"
+BadgeGFX2:  INCBIN "gfx/misc/badges.w16.2bpp"
 
 CardRightCornerGFX: INCBIN "gfx/misc/card_right_corner.2bpp"
 
@@ -39881,7 +39881,7 @@ Tilemap_298f7: ; 297f7
 TradeArrowGFX:  INCBIN "gfx/trade/arrow.2bpp"
 TradeCableGFX:  INCBIN "gfx/trade/cable.2bpp"
 TradeBubbleGFX: INCBIN "gfx/trade/bubble.2bpp"
-TradeGameBoyLZ: INCBIN "gfx/trade/game_boy.lz"
+TradeGameBoyLZ: INCBIN "gfx/trade/game_boy.2bpp.lz"
 TradeBallGFX:   INCBIN "gfx/trade/ball.2bpp"
 TradePoofGFX:   INCBIN "gfx/trade/poof.2bpp"
 
@@ -41629,11 +41629,11 @@ Function2ba01: ; 2ba01
 
 
 ChrisBackpic: ; 2ba1a
-INCBIN "gfx/misc/player.lz"
+INCBIN "gfx/misc/player.6x6.2bpp.lz"
 ; 2bbaa
 
 DudeBackpic: ; 2bbaa
-INCBIN "gfx/misc/dude.lz"
+INCBIN "gfx/misc/dude.6x6.2bpp.lz"
 ; 2bcea
 
 
@@ -51182,7 +51182,7 @@ PackFGFXPointers: ; 48e93
 ; 48e9b
 
 PackFGFX: ; 48e9b
-INCBIN "gfx/misc/pack_f.2bpp"
+INCBIN "gfx/misc/pack_f.w40.2bpp"
 ; 4925b
 
 Function4925b: ; 4925b
@@ -57876,7 +57876,7 @@ WritePartyMenuTilemap: ; 0x5005f
 	cp $ff
 	jr z, .asm_50084 ; 0x5007a $8
 	push hl
-	ld hl, Table50089
+	ld hl, Jumptable_50089
 	rst JumpTable
 	pop hl
 	jr .asm_50077 ; 0x50082 $f3
@@ -57886,7 +57886,7 @@ WritePartyMenuTilemap: ; 0x5005f
 	ret
 ; 0x50089
 
-Table50089: ; 50089
+Jumptable_50089: ; 50089
 	dw Function5009b
 	dw Function500cf
 	dw Function50138
@@ -57925,12 +57925,14 @@ Function5009b: ; 5009b
 .asm_500bf
 	dec hl
 	dec hl
-	ld de, $40c8
+	ld de, String_500c8
 	call PlaceString
 	ret
 ; 500c8
 
-INCBIN "baserom.gbc",$500c8,$500cf - $500c8
+String_500c8: ; 500c8
+	db "CANCEL@"
+; 500cf
 
 
 Function500cf: ; 500cf
@@ -58162,15 +58164,21 @@ Function50215: ; 50215
 	ld a, c
 	and a
 	jr nz, .asm_5021d
-	ld de, $4226
+	ld de, String_50226
 	ret
 
 .asm_5021d
-	ld de, $4221
+	ld de, String_50221
 	ret
 ; 50221
 
-INCBIN "baserom.gbc",$50221,$5022f - $50221
+String_50221: ; 50221
+	db "ABLE@"
+; 50226
+
+String_50226: ; 50226
+	db "NOT ABLE@"
+; 5022f
 
 
 Function5022f: ; 5022f
@@ -58178,7 +58186,7 @@ Function5022f: ; 5022f
 	and a
 	ret z
 	ld c, a
-	ld b, $0
+	ld b, 0
 	ld hl, $c4d4
 .asm_5023a
 	push bc
@@ -58193,8 +58201,8 @@ Function5022f: ; 5022f
 	ld a, [hl]
 	dec a
 	ld e, a
-	ld d, $0
-	ld hl, $65b1
+	ld d, 0
+	ld hl, EvosAttacksPointers
 	add hl, de
 	add hl, de
 	call Function50268
@@ -58214,16 +58222,16 @@ Function5022f: ; 5022f
 
 Function50268: ; 50268
 	ld de, StringBuffer1
-	ld a, $10
-	ld bc, $0002
+	ld a, BANK(EvosAttacksPointers)
+	ld bc, 2
 	call FarCopyBytes
 	ld hl, StringBuffer1
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
 	ld de, StringBuffer1
-	ld a, $10
-	ld bc, $000a
+	ld a, BANK(EvosAttacks)
+	ld bc, $a
 	call FarCopyBytes
 	ld hl, StringBuffer1
 .asm_50287
@@ -58232,7 +58240,7 @@ Function50268: ; 50268
 	jr z, .asm_5029f
 	inc hl
 	inc hl
-	cp $2
+	cp EVOLVE_ITEM
 	jr nz, .asm_50287
 	dec hl
 	dec hl
@@ -58241,15 +58249,20 @@ Function50268: ; 50268
 	inc hl
 	inc hl
 	jr nz, .asm_50287
-	ld de, $42a3
+	ld de, String_502a3
 	ret
 
 .asm_5029f
-	ld de, $42a8
+	ld de, String_502a8
 	ret
 ; 502a3
 
-INCBIN "baserom.gbc",$502a3,$502b1 - $502a3
+String_502a3: ; 502a3
+	db "ABLE@"
+; 502a8
+String_502a8: ; 502a8
+	db "NOT ABLE@"
+; 502b1
 
 
 Function502b1: ; 502b1
@@ -58257,7 +58270,7 @@ Function502b1: ; 502b1
 	and a
 	ret z
 	ld c, a
-	ld b, $0
+	ld b, 0
 	ld hl, $c4d4
 .asm_502bc
 	push bc
@@ -58271,11 +58284,11 @@ Function502b1: ; 502b1
 	xor a
 	ld [MonType], a
 	call GetGender
-	ld de, $42fe
+	ld de, String_502fe
 	jr c, .asm_502df
-	ld de, $42ee
+	ld de, String_502ee
 	jr nz, .asm_502df
-	ld de, $42f5
+	ld de, String_502f5
 
 .asm_502df
 	pop hl
@@ -58292,7 +58305,17 @@ Function502b1: ; 502b1
 	ret
 ; 502ee
 
-INCBIN "baserom.gbc",$502ee,$50307 - $502ee
+String_502ee: ; 502ee
+	db "♂…MALE@"
+; 502f5
+
+String_502f5: ; 502f5
+	db "♀…FEMALE@"
+; 502fe
+
+String_502fe: ; 502fe
+	db "…UNKNOWN@"
+; 50307
 
 
 Function50307: ; 50307
@@ -58300,12 +58323,12 @@ Function50307: ; 50307
 	and a
 	ret z
 	ld c, a
-	ld b, $0
+	ld b, 0
 	ld hl, $c4c0
 .asm_50312
 	push bc
 	push hl
-	ld de, $4372
+	ld de, String_50372
 	call PlaceString
 	pop hl
 	ld de, $0028
@@ -58321,7 +58344,7 @@ Function50307: ; 50307
 	ld a, h
 	sbc $0
 	ld h, a
-	ld de, $4379
+	ld de, String_50379
 	call PlaceString
 	ld b, $3
 	ld c, $0
@@ -58340,7 +58363,7 @@ Function50307: ; 50307
 	jr .asm_50340
 
 .asm_5034a
-	ld de, $436b
+	ld de, String_5036b
 	push hl
 	call PlaceString
 	pop hl
@@ -58348,7 +58371,7 @@ Function50307: ; 50307
 	push bc
 	push hl
 	ld a, c
-	ld hl, $4383
+	ld hl, Strings_50383
 	call GetNthString
 	ld d, h
 	ld e, l
@@ -58364,14 +58387,25 @@ Function50307: ; 50307
 	jr .asm_5033b
 ; 5036b
 
-INCBIN "baserom.gbc",$5036b,$50389 - $5036b
+String_5036b: ; 5036b
+	db " ばんめ  @" ; Place
+; 50372
+String_50372: ; 50372
+	db "さんかしない@" ; Cancel
+; 50379
+String_50379: ; 50379
+	db "けってい  やめる@" ; Quit
+; 50383
+Strings_50383: ; 50383
+	db "1@", "2@", "3@" ; 1st, 2nd, 3rd
+; 50389
 
 
 Function50389: ; 50389
-	ld a, PartySpecies & $ff
+	ld a, PartySpecies % $100
 	add b
 	ld e, a
-	ld a, PartySpecies >> 8
+	ld a, PartySpecies / $100
 	adc 0
 	ld d, a
 	ld a, [de]
@@ -58387,7 +58421,7 @@ Function50396: ; 50396
 	and $f
 	ld e, a
 	ld d, 0
-	ld hl, $43b2
+	ld hl, Unknown_503b2
 	add hl, de
 	add hl, de
 	ld a, [hli]
@@ -58396,11 +58430,29 @@ Function50396: ; 50396
 	ret
 
 .asm_503ae
-	ld hl, $43c6
+	ld hl, Unknown_503c6
 	ret
 ; 503b2
 
-INCBIN "baserom.gbc",$503b2,$503e0 - $503b2
+Unknown_503b2: ; 503b2
+	dw Unknown_503c6
+	dw Unknown_503c6
+	dw Unknown_503c6
+	dw Unknown_503cc
+	dw Unknown_503c6
+	dw Unknown_503d1
+	dw Unknown_503d6
+	dw Unknown_503d6
+	dw Unknown_503c6
+	dw Unknown_503db
+; 503c6
+
+Unknown_503c6: db 0, 1, 2, 3, 4, $ff
+Unknown_503cc: db 0, 5, 3, 4, $ff
+Unknown_503d1: db 0, 6, 3, 4, $ff
+Unknown_503d6: db 0, 7, 3, 4, $ff
+Unknown_503db: db 0, 8, 3, 4, $ff
+; 503e0
 
 
 Function503e0: ; 503e0
@@ -58432,7 +58484,7 @@ Function503e0: ; 503e0
 Function50405: ; 50405
 	xor a
 	ld [$d0e3], a
-	ld de, $444f
+	ld de, Unknown_5044f
 	call Function1bb1
 	ld a, [PartyCount]
 	inc a
@@ -58457,7 +58509,7 @@ Function50405: ; 50405
 ; 5042d
 
 Function5042d: ; 0x5042d
-	ld de, $444f
+	ld de, Unknown_5044f
 	call Function1bb1
 	ld a, [PartyCount] ; $dcd7
 	ld [$cfa3], a
@@ -58477,7 +58529,17 @@ Function5042d: ; 0x5042d
 	ret
 ; 5044f (14:444f)
 
-INCBIN "baserom.gbc",$5044f,$50457 - $5044f
+Unknown_5044f: ; 5044f
+; cursor y
+; cursor x
+; list length
+; ?
+; bit 6: animate sprites  bit 5: wrap around
+; ?
+; distance between items (hi: y, lo: x)
+; allowed buttons (mask)
+	db $01, $00, $00, $01, $60, $00, $20, $00
+; 50457
 
 PartyMenuSelect: ; 0x50457
 ; sets carry if exitted menu.
@@ -61795,8 +61857,8 @@ Function84000: ; 84000
 Function84022: ; 84022
 	ld a, [$cf63]
 	ld e, a
-	ld d, $0
-	ld hl, $4031
+	ld d, 0
+	ld hl, Jumptable_84031
 	add hl, de
 	add hl, de
 	ld a, [hli]
@@ -76351,7 +76413,7 @@ Function914bb: ; 914bb (24:54bb)
 INCBIN "baserom.gbc",$914ce,$914dd - $914ce
 
 PokegearSpritesGFX: ; 914dd
-INCBIN "gfx/misc/pokegear_sprites.lz"
+INCBIN "gfx/misc/pokegear_sprites.2bpp.lz"
 ; 91508
 
 INCBIN "baserom.gbc",$91508,$9163e - $91508
@@ -81473,7 +81535,7 @@ Functioncbce5: ; cbce5
 ; cbd2e
 
 TheEndGFX:: ; cbd2e
-INCBIN "gfx/credits/theend.2bpp"
+INCBIN "gfx/credits/theend.w64.2bpp"
 ; cbe2e
 
 
@@ -81648,7 +81710,7 @@ INCLUDE "gfx/pics/kanto_frames.asm"
 
 SECTION "bank36", ROMX, BANK[$36]
 
-FontInversed: INCBIN "gfx/misc/font_inversed.1bpp"
+FontInversed: INCBIN "gfx/misc/font_inversed.w128.1bpp"
 
 
 SECTION "Pic Animations 3", ROMX, BANK[$36]
@@ -87718,122 +87780,122 @@ Functione552f: ; e552f (39:552f)
 	ret
 
 IntroSuicuneRunGFX: ; e555d
-INCBIN "gfx/intro/suicune_run.lz"
+INCBIN "gfx/intro/suicune_run.2bpp.lz"
 ; e592d
 
 IntroPichuWooperGFX: ; e592d
-INCBIN "gfx/intro/pichu_wooper.lz"
+INCBIN "gfx/intro/pichu_wooper.2bpp.lz"
 ; e5c7d
 
 IntroBackgroundGFX: ; e5c7d
-INCBIN "gfx/intro/background.lz"
+INCBIN "gfx/intro/background.2bpp.lz"
 ; e5e6d
 
 IntroTilemap004: ; e5e6d
-INCBIN "gfx/intro/004.lz"
+INCBIN "gfx/intro/004.tilemap.lz"
 ; e5ecd
 
 IntroTilemap003: ; e5ecd
-INCBIN "gfx/intro/003.lz"
+INCBIN "gfx/intro/003.tilemap.lz"
 ; e5edd
 
 UnknownDatae5edd: ; e5edd
 INCBIN "baserom.gbc", $e5edd, $e5f5d - $e5edd
 
 IntroUnownsGFX: ; e5f5d
-INCBIN "gfx/intro/unowns.lz"
+INCBIN "gfx/intro/unowns.2bpp.lz"
 ; e634d
 
 IntroPulseGFX: ; e634d
-INCBIN "gfx/intro/pulse.lz"
+INCBIN "gfx/intro/pulse.2bpp.lz"
 ; e63dd
 
 IntroTilemap002: ; e63dd
-INCBIN "gfx/intro/002.lz"
+INCBIN "gfx/intro/002.tilemap.lz"
 ; e641d
 
 IntroTilemap001: ; e641d
-INCBIN "gfx/intro/001.lz"
+INCBIN "gfx/intro/001.tilemap.lz"
 ; e642d
 
 IntroTilemap006: ; e642d
-INCBIN "gfx/intro/006.lz"
+INCBIN "gfx/intro/006.tilemap.lz"
 ; e647d
 
 IntroTilemap005: ; e647d
-INCBIN "gfx/intro/005.lz"
+INCBIN "gfx/intro/005.tilemap.lz"
 ; e649d
 
 IntroTilemap008: ; e649d
-INCBIN "gfx/intro/008.lz"
+INCBIN "gfx/intro/008.tilemap.lz"
 ; e655d
 
 IntroTilemap007: ; e655d
-INCBIN "gfx/intro/007.lz"
+INCBIN "gfx/intro/007.tilemap.lz"
 ; e65ad
 
 UnknownDatae65ad: ; e65ad
 INCBIN "baserom.gbc", $e65ad, $e662d - $e65ad
 
 IntroCrystalUnownsGFX: ; e662d
-INCBIN "gfx/intro/crystal_unowns.lz"
+INCBIN "gfx/intro/crystal_unowns.2bpp.lz"
 ; e672d
 
 IntroTilemap017: ; e672d
-INCBIN "gfx/intro/017.lz"
+INCBIN "gfx/intro/017.tilemap.lz"
 ; e676d
 
 IntroTilemap015: ; e676d
-INCBIN "gfx/intro/015.lz"
+INCBIN "gfx/intro/015.tilemap.lz"
 ; e679d
 
 UnknownDatae679d: ; e679d
 INCBIN "baserom.gbc", $e679d, $e681d - $e679d
 
 IntroSuicuneCloseGFX: ; e681d
-INCBIN "gfx/intro/suicune_close.lz"
+INCBIN "gfx/intro/suicune_close.2bpp.lz"
 ; e6c3d
 
 IntroTilemap012: ; e6c3d
-INCBIN "gfx/intro/012.lz"
+INCBIN "gfx/intro/012.tilemap.lz"
 ; e6d0d
 
 IntroTilemap011: ; e6d0d
-INCBIN "gfx/intro/011.lz"
+INCBIN "gfx/intro/011.tilemap.lz"
 ; e6d6d
 
 UnknownDatae6d6d: ; e6d6d
 INCBIN "baserom.gbc", $e6d6d, $e6ded - $e6d6d
 
 IntroSuicuneJumpGFX: ; e6ded
-INCBIN "gfx/intro/suicune_jump.lz"
+INCBIN "gfx/intro/suicune_jump.2bpp.lz"
 ; e72ad
 
 IntroSuicuneBackGFX: ; e72ad
-INCBIN "gfx/intro/suicune_back.lz"
+INCBIN "gfx/intro/suicune_back.2bpp.lz"
 ; e764d
 
 IntroTilemap010: ; e764d
-INCBIN "gfx/intro/010.lz"
+INCBIN "gfx/intro/010.tilemap.lz"
 ; e76ad
 
 IntroTilemap009: ; e76ad
-INCBIN "gfx/intro/009.lz"
+INCBIN "gfx/intro/009.tilemap.lz"
 ; e76bd
 
 IntroTilemap014: ; e76bd
-INCBIN "gfx/intro/014.lz"
+INCBIN "gfx/intro/014.tilemap.lz"
 ; e778d
 
 IntroTilemap013: ; e778d
-INCBIN "gfx/intro/013.lz"
+INCBIN "gfx/intro/013.tilemap.lz"
 ; e77dd
 
 UnknownDatae77dd: ; e77dd
 INCBIN "baserom.gbc", $e77dd, $e785d - $e77dd
 
 IntroUnownBackGFX: ; e785d
-INCBIN "gfx/intro/unown_back.lz"
+INCBIN "gfx/intro/unown_back.2bpp.lz"
 ; e799d
 
 INCBIN "baserom.gbc", $e799d, $e7a5d - $e799d
@@ -87849,7 +87911,7 @@ FontExtra:
 INCBIN "gfx/misc/font_extra.2bpp"
 
 Font:
-INCBIN "gfx/misc/font.1bpp"
+INCBIN "gfx/misc/font.w128.1bpp"
 
 FontBattleExtra:
 INCBIN "gfx/misc/font_battle_extra.2bpp"
@@ -87892,7 +87954,7 @@ INCBIN "baserom.gbc", $f8b10, $f8ba0 - $f8b10
 ; f8ba0
 
 TownMapGFX: ; f8ba0
-INCBIN "gfx/misc/town_map.lz"
+INCBIN "gfx/misc/town_map.2bpp.lz"
 ; f8ea4
 
 GFX_f8ea4: ; f8ea4
@@ -87924,7 +87986,7 @@ INCBIN "baserom.gbc", $f9424, $f9434 - $f9424
 ; f9434
 
 Footprints: ; f9434
-INCBIN "gfx/misc/footprints.1bpp"
+INCBIN "gfx/misc/footprints.w128.1bpp"
 ; fb434
 
 INCBIN "baserom.gbc", $fb434, $fb449 - $fb434
@@ -96675,7 +96737,7 @@ Function108be0: ; 108be0 (42:4be0)
 INCBIN "baserom.gbc",$108bec,$109407 - $108bec
 
 IntroLogoGFX: ; 109407
-INCBIN "gfx/intro/logo.lz"
+INCBIN "gfx/intro/logo.2bpp.lz"
 ; 109847
 
 
@@ -107031,7 +107093,7 @@ Function1de2c5: ; 1de2c5
 ; 1de2e4
 
 PokegearGFX: ; 1de2e4
-INCBIN "gfx/misc/pokegear.lz"
+INCBIN "gfx/misc/pokegear.2bpp.lz"
 ; 1de5c7
 
 INCBIN "baserom.gbc",$1de5c7,$1de5c8 - $1de5c7
diff --git a/misc/gbc_only.asm b/misc/gbc_only.asm
index dfe9e2fb6..d642d6c24 100644
--- a/misc/gbc_only.asm
+++ b/misc/gbc_only.asm
@@ -137,14 +137,14 @@ DrawGBCOnlyGraphic: ; 4eb27
 
 
 GBCOnlyString: ; 4eb38
-	db "This Game Pak is", $4e
-	db "designed only for", $4e
-	db "use on the", $4e
-	db "Game Boy Color.@"
+	db   "This Game Pak is"
+	next "designed only for"
+	next "use on the"
+	next "Game Boy Color.@"
 ; 4eb76
 
 
 GBCOnlyGFX: ; 4eb76
-INCBIN "gfx/misc/gbc_only.lz"
+INCBIN "gfx/misc/gbc_only.w112.2bpp.lz"
 ; 4f0bc
 
diff --git a/tilesets/data_1.asm b/tilesets/data_1.asm
index 1124b3f2e..658a782ed 100644
--- a/tilesets/data_1.asm
+++ b/tilesets/data_1.asm
@@ -1,5 +1,5 @@
 Tileset03GFX: ; 0x18000
-INCBIN "gfx/tilesets/03.lz"
+INCBIN "gfx/tilesets/03.2bpp.lz"
 ; 0x18606
 
 Tileset03Meta: ; 0x18606
@@ -12,7 +12,7 @@ INCBIN "tilesets/03_collision.bin"
 
 Tileset00GFX: ; 0x19006
 Tileset01GFX: ; 0x19006
-INCBIN "gfx/tilesets/01.lz"
+INCBIN "gfx/tilesets/01.2bpp.lz"
 ; 0x19c0e
 
 Tileset00Meta: ; 0x19c0e
@@ -26,7 +26,7 @@ INCBIN "tilesets/01_collision.bin"
 ; 0x1a60e
 
 Tileset29GFX: ; 0x1a60e
-INCBIN "gfx/tilesets/29.lz"
+INCBIN "gfx/tilesets/29.2bpp.lz"
 ; 0x1af3e
 
 Tileset29Meta: ; 0x1af3e
@@ -38,7 +38,7 @@ INCBIN "tilesets/29_collision.bin"
 ; 0x1b43e
 
 Tileset20GFX: ; 0x1b43e
-INCBIN "gfx/tilesets/20.lz"
+INCBIN "gfx/tilesets/20.2bpp.lz"
 ; 0x1b8fe
 
 Tileset20Meta: ; 0x1b8fe
diff --git a/tilesets/data_2.asm b/tilesets/data_2.asm
index ab02b8b7f..c9ab4cdce 100644
--- a/tilesets/data_2.asm
+++ b/tilesets/data_2.asm
@@ -1,5 +1,5 @@
 Tileset07GFX: ; 0x1c30c
-INCBIN "gfx/tilesets/07.lz"
+INCBIN "gfx/tilesets/07.2bpp.lz"
 ; 0x1c73c
 
 Tileset07Meta: ; 0x1c73c
@@ -11,7 +11,7 @@ INCBIN "tilesets/07_collision.bin"
 ; 0x1cc3c
 
 Tileset09GFX: ; 0x1cc3c
-INCBIN "gfx/tilesets/09.lz"
+INCBIN "gfx/tilesets/09.2bpp.lz"
 ; 0x1d04c
 
 Tileset09Meta: ; 0x1d04c
@@ -23,7 +23,7 @@ INCBIN "tilesets/09_collision.bin"
 ; 0x1d54c
 
 Tileset06GFX: ; 0x1d54c
-INCBIN "gfx/tilesets/06.lz"
+INCBIN "gfx/tilesets/06.2bpp.lz"
 ; 0x1d92c
 
 Tileset06Meta: ; 0x1d92c
@@ -35,7 +35,7 @@ INCBIN "tilesets/06_collision.bin"
 ; 0x1de2c
 
 Tileset13GFX: ; 0x1de2c
-INCBIN "gfx/tilesets/13.lz"
+INCBIN "gfx/tilesets/13.2bpp.lz"
 ; 0x1e58c
 
 Tileset13Meta: ; 0x1e58c
@@ -47,7 +47,7 @@ INCBIN "tilesets/13_collision.bin"
 ; 0x1ea8c
 
 Tileset24GFX: ; 0x1ea8c
-INCBIN "gfx/tilesets/24.lz"
+INCBIN "gfx/tilesets/24.2bpp.lz"
 ; 0x1ee1c
 
 Tileset24Meta: ; 0x1ee1c
diff --git a/tilesets/data_3.asm b/tilesets/data_3.asm
index 337573d20..b97d4587d 100644
--- a/tilesets/data_3.asm
+++ b/tilesets/data_3.asm
@@ -1,5 +1,5 @@
 Tileset23GFX: ; 0x20181
-INCBIN "gfx/tilesets/23.lz"
+INCBIN "gfx/tilesets/23.2bpp.lz"
 ; 0x206e1
 
 Tileset23Meta: ; 0x206e1
@@ -11,7 +11,7 @@ INCBIN "tilesets/23_collision.bin"
 ; 0x20be1
 
 Tileset10GFX: ; 0x20be1
-INCBIN "gfx/tilesets/10.lz"
+INCBIN "gfx/tilesets/10.2bpp.lz"
 ; 0x213e1
 
 Tileset10Meta: ; 0x213e1
@@ -23,7 +23,7 @@ INCBIN "tilesets/10_collision.bin"
 ; 0x218e1
 
 Tileset12GFX: ; 0x218e1
-INCBIN "gfx/tilesets/12.lz"
+INCBIN "gfx/tilesets/12.2bpp.lz"
 ; 0x22031
 
 Tileset12Meta: ; 0x22031
@@ -35,7 +35,7 @@ INCBIN "tilesets/12_collision.bin"
 ; 0x22531
 
 Tileset14GFX: ; 0x22531
-INCBIN "gfx/tilesets/14.lz"
+INCBIN "gfx/tilesets/14.2bpp.lz"
 ; 0x22af1
 
 Tileset14Meta: ; 0x22af1
@@ -47,7 +47,7 @@ INCBIN "tilesets/14_collision.bin"
 ; 0x22ff1
 
 Tileset17GFX: ; 0x22ff1
-INCBIN "gfx/tilesets/17.lz"
+INCBIN "gfx/tilesets/17.2bpp.lz"
 ; 0x23391
 
 Tileset17Meta: ; 0x23391
diff --git a/tilesets/data_4.asm b/tilesets/data_4.asm
index f6e490f77..c427d0bf6 100644
--- a/tilesets/data_4.asm
+++ b/tilesets/data_4.asm
@@ -1,5 +1,5 @@
 Tileset15GFX: ; 0x30000
-INCBIN "gfx/tilesets/15.lz"
+INCBIN "gfx/tilesets/15.2bpp.lz"
 ; 0x304e0
 
 Tileset15Meta: ; 0x304e0
@@ -11,7 +11,7 @@ INCBIN "tilesets/15_collision.bin"
 ; 0x309e0
 
 Tileset25GFX: ; 0x309e0
-INCBIN "gfx/tilesets/25.lz"
+INCBIN "gfx/tilesets/25.2bpp.lz"
 ; 0x30e80
 
 Tileset25Meta: ; 0x30e80
@@ -23,7 +23,7 @@ INCBIN "tilesets/25_collision.bin"
 ; 0x31380
 
 Tileset27GFX: ; 0x31380
-INCBIN "gfx/tilesets/27.lz"
+INCBIN "gfx/tilesets/27.2bpp.lz"
 ; 0x318e0
 
 Tileset27Meta: ; 0x318e0
@@ -35,7 +35,7 @@ INCBIN "tilesets/27_collision.bin"
 ; 0x31de0
 
 Tileset28GFX: ; 0x31de0
-INCBIN "gfx/tilesets/28.lz"
+INCBIN "gfx/tilesets/28.2bpp.lz"
 ; 0x321b0
 
 Tileset28Meta: ; 0x321b0
@@ -47,7 +47,7 @@ INCBIN "tilesets/28_collision.bin"
 ; 0x326b0
 
 Tileset30GFX: ; 0x326b0
-INCBIN "gfx/tilesets/30.lz"
+INCBIN "gfx/tilesets/30.2bpp.lz"
 ; 0x329f0
 
 UnusedTileset30Meta: ; 0x329f0
diff --git a/tilesets/data_5.asm b/tilesets/data_5.asm
index 00cc1b956..a985b0b3d 100644
--- a/tilesets/data_5.asm
+++ b/tilesets/data_5.asm
@@ -1,5 +1,5 @@
 Tileset21GFX: ; 0xb4000
-INCBIN "gfx/tilesets/21.lz"
+INCBIN "gfx/tilesets/21.2bpp.lz"
 ; 0xb48a0
 
 Tileset21Meta: ; 0xb48a0
@@ -11,7 +11,7 @@ INCBIN "tilesets/21_collision.bin"
 ; 0xb4da0
 
 Tileset22GFX: ; 0xb4da0
-INCBIN "gfx/tilesets/22.lz"
+INCBIN "gfx/tilesets/22.2bpp.lz"
 ; 0xb50e0
 
 Tileset22Meta: ; 0xb50e0
@@ -23,7 +23,7 @@ INCBIN "tilesets/22_collision.bin"
 ; 0xb55e0
 
 Tileset08GFX: ; 0xb55e0
-INCBIN "gfx/tilesets/08.lz"
+INCBIN "gfx/tilesets/08.2bpp.lz"
 ; 0xb59e0
 
 Tileset08Meta: ; 0xb59e0
@@ -36,7 +36,7 @@ INCBIN "tilesets/08_collision.bin"
 
 Tileset02GFX: ; 0xb5ee0
 Tileset04GFX: ; 0xb5ee0
-INCBIN "gfx/tilesets/04.lz"
+INCBIN "gfx/tilesets/04.2bpp.lz"
 ; 0xb6ae8
 
 Tileset02Meta: ; 0xb6ae8
@@ -48,7 +48,7 @@ INCBIN "tilesets/02_collision.bin"
 ; 0xb74e8
 
 Tileset16GFX: ; 0xb74e8
-INCBIN "gfx/tilesets/16.lz"
+INCBIN "gfx/tilesets/16.2bpp.lz"
 ; 0xb79a8
 
 Tileset16Meta: ; 0xb79a8
diff --git a/tilesets/data_6.asm b/tilesets/data_6.asm
index 93d3b75af..40245b5ca 100644
--- a/tilesets/data_6.asm
+++ b/tilesets/data_6.asm
@@ -1,9 +1,9 @@
 Tileset31GFX: ; 0xdc000
-INCBIN "gfx/tilesets/31.lz"
+INCBIN "gfx/tilesets/31.2bpp.lz"
 ; 0xdc3d0
 
 Tileset18GFX: ; 0xdc3d0
-INCBIN "gfx/tilesets/18.lz"
+INCBIN "gfx/tilesets/18.2bpp.lz"
 ; 0xdcc50
 
 Tileset18Meta: ; 0xdcc50
@@ -15,7 +15,7 @@ INCBIN "tilesets/18_collision.bin"
 ; 0xdd150
 
 Tileset05GFX: ; 0xdd150
-INCBIN "gfx/tilesets/05.lz"
+INCBIN "gfx/tilesets/05.2bpp.lz"
 ; 0xdd600
 
 Tileset05Meta: ; 0xdd600
@@ -27,7 +27,7 @@ INCBIN "tilesets/05_collision.bin"
 ; 0xddb00
 
 Tileset19GFX: ; 0xddb00
-INCBIN "gfx/tilesets/19.lz"
+INCBIN "gfx/tilesets/19.2bpp.lz"
 ; 0xddf70
 
 Tileset19Meta: ; 0xddf70
@@ -43,7 +43,7 @@ INCBIN "tilesets/31_collision.bin"
 ; 0xde570
 
 Tileset11GFX: ; 0xde570
-INCBIN "gfx/tilesets/11.lz"
+INCBIN "gfx/tilesets/11.2bpp.lz"
 ; 0xde990
 
 Tileset11Meta: ; 0xde990
diff --git a/tilesets/data_7.asm b/tilesets/data_7.asm
index 418ecec98..d2d216fc6 100644
--- a/tilesets/data_7.asm
+++ b/tilesets/data_7.asm
@@ -4,7 +4,7 @@ Tileset33GFX: ; 0x1dc5a1
 Tileset34GFX: ; 0x1dc5a1
 Tileset35GFX: ; 0x1dc5a1
 Tileset36GFX: ; 0x1dc5a1
-INCBIN "gfx/tilesets/26.lz"
+INCBIN "gfx/tilesets/26.2bpp.lz"
 ; 0x1dd1a9
 
 Tileset26Meta: ; 0x1dd1a9