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
+	find . -iname "*.lz"      -exec $(GFX) unlz {} +
+	find . -iname "*.[12]bpp" -exec $(GFX) png  {} +
+	find . -iname "*.[12]bpp" -exec touch {} +
+	find . -iname "*.lz"      -exec touch {} +
 
-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 $<
+%.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
index c9f9d7f28..b73c30966 160000
--- a/extras
+++ b/extras
@@ -1 +1 @@
-Subproject commit c9f9d7f280e177855e8120f50f770630b881ca74
+Subproject commit b73c3096662c243fc5d76046e960d7f80d09dfe7
diff --git a/gfx/credits/border.2bpp b/gfx/credits/border.w72.2bpp
similarity index 100%
rename from gfx/credits/border.2bpp
rename to gfx/credits/border.w72.2bpp
diff --git a/gfx/credits/ditto.2bpp b/gfx/credits/ditto.w32.2bpp
similarity index 100%
rename from gfx/credits/ditto.2bpp
rename to gfx/credits/ditto.w32.2bpp
diff --git a/gfx/credits/igglybuff.2bpp b/gfx/credits/igglybuff.w32.2bpp
similarity index 100%
rename from gfx/credits/igglybuff.2bpp
rename to gfx/credits/igglybuff.w32.2bpp
diff --git a/gfx/credits/pichu.2bpp b/gfx/credits/pichu.w32.2bpp
similarity index 100%
rename from gfx/credits/pichu.2bpp
rename to gfx/credits/pichu.w32.2bpp
diff --git a/gfx/credits/smoochum.2bpp b/gfx/credits/smoochum.w32.2bpp
similarity index 100%
rename from gfx/credits/smoochum.2bpp
rename to gfx/credits/smoochum.w32.2bpp
diff --git a/gfx/credits/theend.2bpp b/gfx/credits/theend.w64.2bpp
similarity index 100%
rename from gfx/credits/theend.2bpp
rename to gfx/credits/theend.w64.2bpp
diff --git a/gfx/fx/000.lz b/gfx/fx/000.2bpp.lz
similarity index 100%
rename from gfx/fx/000.lz
rename to gfx/fx/000.2bpp.lz
diff --git a/gfx/fx/001.lz b/gfx/fx/001.2bpp.lz
similarity index 100%
rename from gfx/fx/001.lz
rename to gfx/fx/001.2bpp.lz
diff --git a/gfx/fx/002.lz b/gfx/fx/002.2bpp.lz
similarity index 100%
rename from gfx/fx/002.lz
rename to gfx/fx/002.2bpp.lz
diff --git a/gfx/fx/003.lz b/gfx/fx/003.2bpp.lz
similarity index 100%
rename from gfx/fx/003.lz
rename to gfx/fx/003.2bpp.lz
diff --git a/gfx/fx/004.lz b/gfx/fx/004.2bpp.lz
similarity index 100%
rename from gfx/fx/004.lz
rename to gfx/fx/004.2bpp.lz
diff --git a/gfx/fx/005.lz b/gfx/fx/005.2bpp.lz
similarity index 100%
rename from gfx/fx/005.lz
rename to gfx/fx/005.2bpp.lz
diff --git a/gfx/fx/006.lz b/gfx/fx/006.2bpp.lz
similarity index 100%
rename from gfx/fx/006.lz
rename to gfx/fx/006.2bpp.lz
diff --git a/gfx/fx/007.lz b/gfx/fx/007.2bpp.lz
similarity index 100%
rename from gfx/fx/007.lz
rename to gfx/fx/007.2bpp.lz
diff --git a/gfx/fx/008.lz b/gfx/fx/008.2bpp.lz
similarity index 100%
rename from gfx/fx/008.lz
rename to gfx/fx/008.2bpp.lz
diff --git a/gfx/fx/009.lz b/gfx/fx/009.2bpp.lz
similarity index 100%
rename from gfx/fx/009.lz
rename to gfx/fx/009.2bpp.lz
diff --git a/gfx/fx/010.lz b/gfx/fx/010.2bpp.lz
similarity index 100%
rename from gfx/fx/010.lz
rename to gfx/fx/010.2bpp.lz
diff --git a/gfx/fx/011.lz b/gfx/fx/011.2bpp.lz
similarity index 100%
rename from gfx/fx/011.lz
rename to gfx/fx/011.2bpp.lz
diff --git a/gfx/fx/012.lz b/gfx/fx/012.2bpp.lz
similarity index 100%
rename from gfx/fx/012.lz
rename to gfx/fx/012.2bpp.lz
diff --git a/gfx/fx/013.lz b/gfx/fx/013.2bpp.lz
similarity index 100%
rename from gfx/fx/013.lz
rename to gfx/fx/013.2bpp.lz
diff --git a/gfx/fx/014.lz b/gfx/fx/014.2bpp.lz
similarity index 100%
rename from gfx/fx/014.lz
rename to gfx/fx/014.2bpp.lz
diff --git a/gfx/fx/015.lz b/gfx/fx/015.2bpp.lz
similarity index 100%
rename from gfx/fx/015.lz
rename to gfx/fx/015.2bpp.lz
diff --git a/gfx/fx/016.lz b/gfx/fx/016.2bpp.lz
similarity index 100%
rename from gfx/fx/016.lz
rename to gfx/fx/016.2bpp.lz
diff --git a/gfx/fx/017.lz b/gfx/fx/017.2bpp.lz
similarity index 100%
rename from gfx/fx/017.lz
rename to gfx/fx/017.2bpp.lz
diff --git a/gfx/fx/018.lz b/gfx/fx/018.2bpp.lz
similarity index 100%
rename from gfx/fx/018.lz
rename to gfx/fx/018.2bpp.lz
diff --git a/gfx/fx/019.lz b/gfx/fx/019.2bpp.lz
similarity index 100%
rename from gfx/fx/019.lz
rename to gfx/fx/019.2bpp.lz
diff --git a/gfx/fx/020.lz b/gfx/fx/020.2bpp.lz
similarity index 100%
rename from gfx/fx/020.lz
rename to gfx/fx/020.2bpp.lz
diff --git a/gfx/fx/021.lz b/gfx/fx/021.2bpp.lz
similarity index 100%
rename from gfx/fx/021.lz
rename to gfx/fx/021.2bpp.lz
diff --git a/gfx/fx/022.lz b/gfx/fx/022.2bpp.lz
similarity index 100%
rename from gfx/fx/022.lz
rename to gfx/fx/022.2bpp.lz
diff --git a/gfx/fx/023.lz b/gfx/fx/023.2bpp.lz
similarity index 100%
rename from gfx/fx/023.lz
rename to gfx/fx/023.2bpp.lz
diff --git a/gfx/fx/024.lz b/gfx/fx/024.2bpp.lz
similarity index 100%
rename from gfx/fx/024.lz
rename to gfx/fx/024.2bpp.lz
diff --git a/gfx/fx/025.lz b/gfx/fx/025.2bpp.lz
similarity index 100%
rename from gfx/fx/025.lz
rename to gfx/fx/025.2bpp.lz
diff --git a/gfx/fx/026.lz b/gfx/fx/026.2bpp.lz
similarity index 100%
rename from gfx/fx/026.lz
rename to gfx/fx/026.2bpp.lz
diff --git a/gfx/fx/027.lz b/gfx/fx/027.2bpp.lz
similarity index 100%
rename from gfx/fx/027.lz
rename to gfx/fx/027.2bpp.lz
diff --git a/gfx/fx/028.lz b/gfx/fx/028.2bpp.lz
similarity index 100%
rename from gfx/fx/028.lz
rename to gfx/fx/028.2bpp.lz
diff --git a/gfx/fx/029.lz b/gfx/fx/029.2bpp.lz
similarity index 100%
rename from gfx/fx/029.lz
rename to gfx/fx/029.2bpp.lz
diff --git a/gfx/fx/030.lz b/gfx/fx/030.2bpp.lz
similarity index 100%
rename from gfx/fx/030.lz
rename to gfx/fx/030.2bpp.lz
diff --git a/gfx/fx/031.lz b/gfx/fx/031.2bpp.lz
similarity index 100%
rename from gfx/fx/031.lz
rename to gfx/fx/031.2bpp.lz
diff --git a/gfx/fx/032.lz b/gfx/fx/032.2bpp.lz
similarity index 100%
rename from gfx/fx/032.lz
rename to gfx/fx/032.2bpp.lz
diff --git a/gfx/fx/033.lz b/gfx/fx/033.2bpp.lz
similarity index 100%
rename from gfx/fx/033.lz
rename to gfx/fx/033.2bpp.lz
diff --git a/gfx/fx/034.lz b/gfx/fx/034.2bpp.lz
similarity index 100%
rename from gfx/fx/034.lz
rename to gfx/fx/034.2bpp.lz
diff --git a/gfx/fx/035.lz b/gfx/fx/035.2bpp.lz
similarity index 100%
rename from gfx/fx/035.lz
rename to gfx/fx/035.2bpp.lz
diff --git a/gfx/fx/036.lz b/gfx/fx/036.2bpp.lz
similarity index 100%
rename from gfx/fx/036.lz
rename to gfx/fx/036.2bpp.lz
diff --git a/gfx/fx/037.lz b/gfx/fx/037.2bpp.lz
similarity index 100%
rename from gfx/fx/037.lz
rename to gfx/fx/037.2bpp.lz
diff --git a/gfx/fx/038.lz b/gfx/fx/038.2bpp.lz
similarity index 100%
rename from gfx/fx/038.lz
rename to gfx/fx/038.2bpp.lz
diff --git a/gfx/fx/039.lz b/gfx/fx/039.2bpp.lz
similarity index 100%
rename from gfx/fx/039.lz
rename to gfx/fx/039.2bpp.lz
diff --git a/gfx/intro/001.lz b/gfx/intro/001.tilemap.lz
similarity index 100%
rename from gfx/intro/001.lz
rename to gfx/intro/001.tilemap.lz
diff --git a/gfx/intro/002.lz b/gfx/intro/002.tilemap.lz
similarity index 100%
rename from gfx/intro/002.lz
rename to gfx/intro/002.tilemap.lz
diff --git a/gfx/intro/003.lz b/gfx/intro/003.tilemap.lz
similarity index 100%
rename from gfx/intro/003.lz
rename to gfx/intro/003.tilemap.lz
diff --git a/gfx/intro/004.lz b/gfx/intro/004.tilemap.lz
similarity index 100%
rename from gfx/intro/004.lz
rename to gfx/intro/004.tilemap.lz
diff --git a/gfx/intro/005.lz b/gfx/intro/005.tilemap.lz
similarity index 100%
rename from gfx/intro/005.lz
rename to gfx/intro/005.tilemap.lz
diff --git a/gfx/intro/006.lz b/gfx/intro/006.tilemap.lz
similarity index 100%
rename from gfx/intro/006.lz
rename to gfx/intro/006.tilemap.lz
diff --git a/gfx/intro/007.lz b/gfx/intro/007.tilemap.lz
similarity index 100%
rename from gfx/intro/007.lz
rename to gfx/intro/007.tilemap.lz
diff --git a/gfx/intro/008.lz b/gfx/intro/008.tilemap.lz
similarity index 100%
rename from gfx/intro/008.lz
rename to gfx/intro/008.tilemap.lz
diff --git a/gfx/intro/009.lz b/gfx/intro/009.tilemap.lz
similarity index 100%
rename from gfx/intro/009.lz
rename to gfx/intro/009.tilemap.lz
diff --git a/gfx/intro/010.lz b/gfx/intro/010.tilemap.lz
similarity index 100%
rename from gfx/intro/010.lz
rename to gfx/intro/010.tilemap.lz
diff --git a/gfx/intro/011.lz b/gfx/intro/011.tilemap.lz
similarity index 100%
rename from gfx/intro/011.lz
rename to gfx/intro/011.tilemap.lz
diff --git a/gfx/intro/012.lz b/gfx/intro/012.tilemap.lz
similarity index 100%
rename from gfx/intro/012.lz
rename to gfx/intro/012.tilemap.lz
diff --git a/gfx/intro/013.lz b/gfx/intro/013.tilemap.lz
similarity index 100%
rename from gfx/intro/013.lz
rename to gfx/intro/013.tilemap.lz
diff --git a/gfx/intro/014.lz b/gfx/intro/014.tilemap.lz
similarity index 100%
rename from gfx/intro/014.lz
rename to gfx/intro/014.tilemap.lz
diff --git a/gfx/intro/015.lz b/gfx/intro/015.tilemap.lz
similarity index 100%
rename from gfx/intro/015.lz
rename to gfx/intro/015.tilemap.lz
diff --git a/gfx/intro/017.lz b/gfx/intro/017.tilemap.lz
similarity index 100%
rename from gfx/intro/017.lz
rename to gfx/intro/017.tilemap.lz
diff --git a/gfx/intro/background.lz b/gfx/intro/background.2bpp.lz
similarity index 100%
rename from gfx/intro/background.lz
rename to gfx/intro/background.2bpp.lz
diff --git a/gfx/intro/crystal_unowns.lz b/gfx/intro/crystal_unowns.2bpp.lz
similarity index 100%
rename from gfx/intro/crystal_unowns.lz
rename to gfx/intro/crystal_unowns.2bpp.lz
diff --git a/gfx/intro/logo.lz b/gfx/intro/logo.2bpp.lz
similarity index 100%
rename from gfx/intro/logo.lz
rename to gfx/intro/logo.2bpp.lz
diff --git a/gfx/intro/pichu_wooper.lz b/gfx/intro/pichu_wooper.2bpp.lz
similarity index 100%
rename from gfx/intro/pichu_wooper.lz
rename to gfx/intro/pichu_wooper.2bpp.lz
diff --git a/gfx/intro/pulse.lz b/gfx/intro/pulse.2bpp.lz
similarity index 100%
rename from gfx/intro/pulse.lz
rename to gfx/intro/pulse.2bpp.lz
diff --git a/gfx/intro/suicune_back.lz b/gfx/intro/suicune_back.2bpp.lz
similarity index 100%
rename from gfx/intro/suicune_back.lz
rename to gfx/intro/suicune_back.2bpp.lz
diff --git a/gfx/intro/suicune_close.lz b/gfx/intro/suicune_close.2bpp.lz
similarity index 100%
rename from gfx/intro/suicune_close.lz
rename to gfx/intro/suicune_close.2bpp.lz
diff --git a/gfx/intro/suicune_jump.lz b/gfx/intro/suicune_jump.2bpp.lz
similarity index 100%
rename from gfx/intro/suicune_jump.lz
rename to gfx/intro/suicune_jump.2bpp.lz
diff --git a/gfx/intro/suicune_run.lz b/gfx/intro/suicune_run.2bpp.lz
similarity index 100%
rename from gfx/intro/suicune_run.lz
rename to gfx/intro/suicune_run.2bpp.lz
diff --git a/gfx/intro/unown_back.lz b/gfx/intro/unown_back.2bpp.lz
similarity index 100%
rename from gfx/intro/unown_back.lz
rename to gfx/intro/unown_back.2bpp.lz
diff --git a/gfx/intro/unowns.lz b/gfx/intro/unowns.2bpp.lz
similarity index 100%
rename from gfx/intro/unowns.lz
rename to gfx/intro/unowns.2bpp.lz
diff --git a/gfx/misc/badges.2bpp b/gfx/misc/badges.w16.2bpp
similarity index 100%
rename from gfx/misc/badges.2bpp
rename to gfx/misc/badges.w16.2bpp
diff --git a/gfx/misc/dude.lz b/gfx/misc/dude.6x6.2bpp.lz
similarity index 100%
rename from gfx/misc/dude.lz
rename to gfx/misc/dude.6x6.2bpp.lz
diff --git a/gfx/misc/font.1bpp b/gfx/misc/font.w128.1bpp
similarity index 100%
rename from gfx/misc/font.1bpp
rename to gfx/misc/font.w128.1bpp
diff --git a/gfx/misc/font_inversed.1bpp b/gfx/misc/font_inversed.w128.1bpp
similarity index 100%
rename from gfx/misc/font_inversed.1bpp
rename to gfx/misc/font_inversed.w128.1bpp
diff --git a/gfx/misc/footprints.1bpp b/gfx/misc/footprints.w128.1bpp
similarity index 100%
rename from gfx/misc/footprints.1bpp
rename to gfx/misc/footprints.w128.1bpp
diff --git a/gfx/misc/gbc_only.lz b/gfx/misc/gbc_only.w112.2bpp.lz
similarity index 100%
rename from gfx/misc/gbc_only.lz
rename to gfx/misc/gbc_only.w112.2bpp.lz
diff --git a/gfx/misc/leaders.2bpp b/gfx/misc/leaders.w24.2bpp
similarity index 100%
rename from gfx/misc/leaders.2bpp
rename to gfx/misc/leaders.w24.2bpp
diff --git a/gfx/misc/pack.2bpp b/gfx/misc/pack.w40.2bpp
similarity index 100%
rename from gfx/misc/pack.2bpp
rename to gfx/misc/pack.w40.2bpp
diff --git a/gfx/misc/pack_f.2bpp b/gfx/misc/pack_f.w40.2bpp
similarity index 100%
rename from gfx/misc/pack_f.2bpp
rename to gfx/misc/pack_f.w40.2bpp
diff --git a/gfx/misc/player.lz b/gfx/misc/player.6x6.2bpp.lz
similarity index 100%
rename from gfx/misc/player.lz
rename to gfx/misc/player.6x6.2bpp.lz
diff --git a/gfx/misc/pokegear.lz b/gfx/misc/pokegear.2bpp.lz
similarity index 100%
rename from gfx/misc/pokegear.lz
rename to gfx/misc/pokegear.2bpp.lz
diff --git a/gfx/misc/pokegear_sprites.lz b/gfx/misc/pokegear_sprites.2bpp.lz
similarity index 100%
rename from gfx/misc/pokegear_sprites.lz
rename to gfx/misc/pokegear_sprites.2bpp.lz
diff --git a/gfx/misc/town_map.lz b/gfx/misc/town_map.2bpp.lz
similarity index 100%
rename from gfx/misc/town_map.lz
rename to 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
similarity index 100%
rename from gfx/pics/063/anim0.asm
rename to gfx/pics/abra/anim0.asm
diff --git a/gfx/pics/063/anim1.asm b/gfx/pics/abra/anim1.asm
similarity index 100%
rename from gfx/pics/063/anim1.asm
rename to gfx/pics/abra/anim1.asm
diff --git a/gfx/pics/063/back.lz b/gfx/pics/abra/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/063/back.lz
rename to gfx/pics/abra/back.6x6.2bpp.lz
diff --git a/gfx/pics/063/bitmask.asm b/gfx/pics/abra/bitmask.asm
similarity index 100%
rename from gfx/pics/063/bitmask.asm
rename to gfx/pics/abra/bitmask.asm
diff --git a/gfx/pics/063/frames.asm b/gfx/pics/abra/frames.asm
similarity index 100%
rename from gfx/pics/063/frames.asm
rename to gfx/pics/abra/frames.asm
diff --git a/gfx/pics/063/front.lz b/gfx/pics/abra/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/063/front.lz
rename to gfx/pics/abra/front.5x5.2bpp.lz
diff --git a/gfx/pics/063/normal.pal b/gfx/pics/abra/normal.pal
similarity index 100%
rename from gfx/pics/063/normal.pal
rename to gfx/pics/abra/normal.pal
diff --git a/gfx/pics/063/shiny.pal b/gfx/pics/abra/shiny.pal
similarity index 100%
rename from gfx/pics/063/shiny.pal
rename to gfx/pics/abra/shiny.pal
diff --git a/gfx/pics/142/anim0.asm b/gfx/pics/aerodactyl/anim0.asm
similarity index 100%
rename from gfx/pics/142/anim0.asm
rename to gfx/pics/aerodactyl/anim0.asm
diff --git a/gfx/pics/142/anim1.asm b/gfx/pics/aerodactyl/anim1.asm
similarity index 100%
rename from gfx/pics/142/anim1.asm
rename to gfx/pics/aerodactyl/anim1.asm
diff --git a/gfx/pics/142/back.lz b/gfx/pics/aerodactyl/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/142/back.lz
rename to gfx/pics/aerodactyl/back.6x6.2bpp.lz
diff --git a/gfx/pics/142/bitmask.asm b/gfx/pics/aerodactyl/bitmask.asm
similarity index 100%
rename from gfx/pics/142/bitmask.asm
rename to gfx/pics/aerodactyl/bitmask.asm
diff --git a/gfx/pics/142/frames.asm b/gfx/pics/aerodactyl/frames.asm
similarity index 100%
rename from gfx/pics/142/frames.asm
rename to gfx/pics/aerodactyl/frames.asm
diff --git a/gfx/pics/142/front.lz b/gfx/pics/aerodactyl/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/142/front.lz
rename to gfx/pics/aerodactyl/front.7x7.2bpp.lz
diff --git a/gfx/pics/142/normal.pal b/gfx/pics/aerodactyl/normal.pal
similarity index 100%
rename from gfx/pics/142/normal.pal
rename to gfx/pics/aerodactyl/normal.pal
diff --git a/gfx/pics/142/shiny.pal b/gfx/pics/aerodactyl/shiny.pal
similarity index 100%
rename from gfx/pics/142/shiny.pal
rename to gfx/pics/aerodactyl/shiny.pal
diff --git a/gfx/pics/190/anim0.asm b/gfx/pics/aipom/anim0.asm
similarity index 100%
rename from gfx/pics/190/anim0.asm
rename to gfx/pics/aipom/anim0.asm
diff --git a/gfx/pics/190/anim1.asm b/gfx/pics/aipom/anim1.asm
similarity index 100%
rename from gfx/pics/190/anim1.asm
rename to gfx/pics/aipom/anim1.asm
diff --git a/gfx/pics/190/back.lz b/gfx/pics/aipom/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/190/back.lz
rename to gfx/pics/aipom/back.6x6.2bpp.lz
diff --git a/gfx/pics/190/bitmask.asm b/gfx/pics/aipom/bitmask.asm
similarity index 100%
rename from gfx/pics/190/bitmask.asm
rename to gfx/pics/aipom/bitmask.asm
diff --git a/gfx/pics/190/frames.asm b/gfx/pics/aipom/frames.asm
similarity index 100%
rename from gfx/pics/190/frames.asm
rename to gfx/pics/aipom/frames.asm
diff --git a/gfx/pics/190/front.lz b/gfx/pics/aipom/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/190/front.lz
rename to gfx/pics/aipom/front.5x5.2bpp.lz
diff --git a/gfx/pics/190/normal.pal b/gfx/pics/aipom/normal.pal
similarity index 100%
rename from gfx/pics/190/normal.pal
rename to gfx/pics/aipom/normal.pal
diff --git a/gfx/pics/190/shiny.pal b/gfx/pics/aipom/shiny.pal
similarity index 100%
rename from gfx/pics/190/shiny.pal
rename to gfx/pics/aipom/shiny.pal
diff --git a/gfx/pics/065/anim0.asm b/gfx/pics/alakazam/anim0.asm
similarity index 100%
rename from gfx/pics/065/anim0.asm
rename to gfx/pics/alakazam/anim0.asm
diff --git a/gfx/pics/065/anim1.asm b/gfx/pics/alakazam/anim1.asm
similarity index 100%
rename from gfx/pics/065/anim1.asm
rename to gfx/pics/alakazam/anim1.asm
diff --git a/gfx/pics/065/back.lz b/gfx/pics/alakazam/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/065/back.lz
rename to gfx/pics/alakazam/back.6x6.2bpp.lz
diff --git a/gfx/pics/065/bitmask.asm b/gfx/pics/alakazam/bitmask.asm
similarity index 100%
rename from gfx/pics/065/bitmask.asm
rename to gfx/pics/alakazam/bitmask.asm
diff --git a/gfx/pics/065/frames.asm b/gfx/pics/alakazam/frames.asm
similarity index 100%
rename from gfx/pics/065/frames.asm
rename to gfx/pics/alakazam/frames.asm
diff --git a/gfx/pics/065/front.lz b/gfx/pics/alakazam/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/065/front.lz
rename to gfx/pics/alakazam/front.7x7.2bpp.lz
diff --git a/gfx/pics/064/normal.pal b/gfx/pics/alakazam/normal.pal
similarity index 100%
rename from gfx/pics/064/normal.pal
rename to gfx/pics/alakazam/normal.pal
diff --git a/gfx/pics/065/shiny.pal b/gfx/pics/alakazam/shiny.pal
similarity index 100%
rename from gfx/pics/065/shiny.pal
rename to gfx/pics/alakazam/shiny.pal
diff --git a/gfx/pics/181/anim0.asm b/gfx/pics/ampharos/anim0.asm
similarity index 100%
rename from gfx/pics/181/anim0.asm
rename to gfx/pics/ampharos/anim0.asm
diff --git a/gfx/pics/181/anim1.asm b/gfx/pics/ampharos/anim1.asm
similarity index 100%
rename from gfx/pics/181/anim1.asm
rename to gfx/pics/ampharos/anim1.asm
diff --git a/gfx/pics/181/back.lz b/gfx/pics/ampharos/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/181/back.lz
rename to gfx/pics/ampharos/back.6x6.2bpp.lz
diff --git a/gfx/pics/181/bitmask.asm b/gfx/pics/ampharos/bitmask.asm
similarity index 100%
rename from gfx/pics/181/bitmask.asm
rename to gfx/pics/ampharos/bitmask.asm
diff --git a/gfx/pics/181/frames.asm b/gfx/pics/ampharos/frames.asm
similarity index 100%
rename from gfx/pics/181/frames.asm
rename to gfx/pics/ampharos/frames.asm
diff --git a/gfx/pics/181/front.lz b/gfx/pics/ampharos/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/181/front.lz
rename to gfx/pics/ampharos/front.7x7.2bpp.lz
diff --git a/gfx/pics/181/normal.pal b/gfx/pics/ampharos/normal.pal
similarity index 100%
rename from gfx/pics/181/normal.pal
rename to gfx/pics/ampharos/normal.pal
diff --git a/gfx/pics/181/shiny.pal b/gfx/pics/ampharos/shiny.pal
similarity index 100%
rename from gfx/pics/181/shiny.pal
rename to 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
similarity index 100%
rename from gfx/pics/024/anim0.asm
rename to gfx/pics/arbok/anim0.asm
diff --git a/gfx/pics/024/anim1.asm b/gfx/pics/arbok/anim1.asm
similarity index 100%
rename from gfx/pics/024/anim1.asm
rename to gfx/pics/arbok/anim1.asm
diff --git a/gfx/pics/024/back.lz b/gfx/pics/arbok/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/024/back.lz
rename to gfx/pics/arbok/back.6x6.2bpp.lz
diff --git a/gfx/pics/024/bitmask.asm b/gfx/pics/arbok/bitmask.asm
similarity index 100%
rename from gfx/pics/024/bitmask.asm
rename to gfx/pics/arbok/bitmask.asm
diff --git a/gfx/pics/024/frames.asm b/gfx/pics/arbok/frames.asm
similarity index 100%
rename from gfx/pics/024/frames.asm
rename to gfx/pics/arbok/frames.asm
diff --git a/gfx/pics/024/front.lz b/gfx/pics/arbok/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/024/front.lz
rename to gfx/pics/arbok/front.7x7.2bpp.lz
diff --git a/gfx/pics/024/normal.pal b/gfx/pics/arbok/normal.pal
similarity index 100%
rename from gfx/pics/024/normal.pal
rename to gfx/pics/arbok/normal.pal
diff --git a/gfx/pics/024/shiny.pal b/gfx/pics/arbok/shiny.pal
similarity index 100%
rename from gfx/pics/024/shiny.pal
rename to gfx/pics/arbok/shiny.pal
diff --git a/gfx/pics/059/anim0.asm b/gfx/pics/arcanine/anim0.asm
similarity index 100%
rename from gfx/pics/059/anim0.asm
rename to gfx/pics/arcanine/anim0.asm
diff --git a/gfx/pics/059/anim1.asm b/gfx/pics/arcanine/anim1.asm
similarity index 100%
rename from gfx/pics/059/anim1.asm
rename to gfx/pics/arcanine/anim1.asm
diff --git a/gfx/pics/059/back.lz b/gfx/pics/arcanine/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/059/back.lz
rename to gfx/pics/arcanine/back.6x6.2bpp.lz
diff --git a/gfx/pics/059/bitmask.asm b/gfx/pics/arcanine/bitmask.asm
similarity index 100%
rename from gfx/pics/059/bitmask.asm
rename to gfx/pics/arcanine/bitmask.asm
diff --git a/gfx/pics/059/frames.asm b/gfx/pics/arcanine/frames.asm
similarity index 100%
rename from gfx/pics/059/frames.asm
rename to gfx/pics/arcanine/frames.asm
diff --git a/gfx/pics/059/front.lz b/gfx/pics/arcanine/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/059/front.lz
rename to gfx/pics/arcanine/front.7x7.2bpp.lz
diff --git a/gfx/pics/059/normal.pal b/gfx/pics/arcanine/normal.pal
similarity index 100%
rename from gfx/pics/059/normal.pal
rename to gfx/pics/arcanine/normal.pal
diff --git a/gfx/pics/059/shiny.pal b/gfx/pics/arcanine/shiny.pal
similarity index 100%
rename from gfx/pics/059/shiny.pal
rename to gfx/pics/arcanine/shiny.pal
diff --git a/gfx/pics/168/anim0.asm b/gfx/pics/ariados/anim0.asm
similarity index 100%
rename from gfx/pics/168/anim0.asm
rename to gfx/pics/ariados/anim0.asm
diff --git a/gfx/pics/168/anim1.asm b/gfx/pics/ariados/anim1.asm
similarity index 100%
rename from gfx/pics/168/anim1.asm
rename to gfx/pics/ariados/anim1.asm
diff --git a/gfx/pics/168/back.lz b/gfx/pics/ariados/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/168/back.lz
rename to gfx/pics/ariados/back.6x6.2bpp.lz
diff --git a/gfx/pics/168/bitmask.asm b/gfx/pics/ariados/bitmask.asm
similarity index 100%
rename from gfx/pics/168/bitmask.asm
rename to gfx/pics/ariados/bitmask.asm
diff --git a/gfx/pics/168/frames.asm b/gfx/pics/ariados/frames.asm
similarity index 100%
rename from gfx/pics/168/frames.asm
rename to gfx/pics/ariados/frames.asm
diff --git a/gfx/pics/168/front.lz b/gfx/pics/ariados/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/168/front.lz
rename to gfx/pics/ariados/front.7x7.2bpp.lz
diff --git a/gfx/pics/168/normal.pal b/gfx/pics/ariados/normal.pal
similarity index 100%
rename from gfx/pics/168/normal.pal
rename to gfx/pics/ariados/normal.pal
diff --git a/gfx/pics/168/shiny.pal b/gfx/pics/ariados/shiny.pal
similarity index 100%
rename from gfx/pics/168/shiny.pal
rename to gfx/pics/ariados/shiny.pal
diff --git a/gfx/pics/144/anim0.asm b/gfx/pics/articuno/anim0.asm
similarity index 100%
rename from gfx/pics/144/anim0.asm
rename to gfx/pics/articuno/anim0.asm
diff --git a/gfx/pics/144/anim1.asm b/gfx/pics/articuno/anim1.asm
similarity index 100%
rename from gfx/pics/144/anim1.asm
rename to gfx/pics/articuno/anim1.asm
diff --git a/gfx/pics/144/back.lz b/gfx/pics/articuno/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/144/back.lz
rename to gfx/pics/articuno/back.6x6.2bpp.lz
diff --git a/gfx/pics/144/bitmask.asm b/gfx/pics/articuno/bitmask.asm
similarity index 100%
rename from gfx/pics/144/bitmask.asm
rename to gfx/pics/articuno/bitmask.asm
diff --git a/gfx/pics/144/frames.asm b/gfx/pics/articuno/frames.asm
similarity index 100%
rename from gfx/pics/144/frames.asm
rename to gfx/pics/articuno/frames.asm
diff --git a/gfx/pics/144/front.lz b/gfx/pics/articuno/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/144/front.lz
rename to gfx/pics/articuno/front.7x7.2bpp.lz
diff --git a/gfx/pics/144/normal.pal b/gfx/pics/articuno/normal.pal
similarity index 100%
rename from gfx/pics/144/normal.pal
rename to gfx/pics/articuno/normal.pal
diff --git a/gfx/pics/144/shiny.pal b/gfx/pics/articuno/shiny.pal
similarity index 100%
rename from gfx/pics/144/shiny.pal
rename to gfx/pics/articuno/shiny.pal
diff --git a/gfx/pics/184/anim0.asm b/gfx/pics/azumarill/anim0.asm
similarity index 100%
rename from gfx/pics/184/anim0.asm
rename to gfx/pics/azumarill/anim0.asm
diff --git a/gfx/pics/184/anim1.asm b/gfx/pics/azumarill/anim1.asm
similarity index 100%
rename from gfx/pics/184/anim1.asm
rename to gfx/pics/azumarill/anim1.asm
diff --git a/gfx/pics/184/back.lz b/gfx/pics/azumarill/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/184/back.lz
rename to gfx/pics/azumarill/back.6x6.2bpp.lz
diff --git a/gfx/pics/184/bitmask.asm b/gfx/pics/azumarill/bitmask.asm
similarity index 100%
rename from gfx/pics/184/bitmask.asm
rename to gfx/pics/azumarill/bitmask.asm
diff --git a/gfx/pics/184/frames.asm b/gfx/pics/azumarill/frames.asm
similarity index 100%
rename from gfx/pics/184/frames.asm
rename to gfx/pics/azumarill/frames.asm
diff --git a/gfx/pics/184/front.lz b/gfx/pics/azumarill/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/184/front.lz
rename to gfx/pics/azumarill/front.7x7.2bpp.lz
diff --git a/gfx/pics/184/normal.pal b/gfx/pics/azumarill/normal.pal
similarity index 100%
rename from gfx/pics/184/normal.pal
rename to gfx/pics/azumarill/normal.pal
diff --git a/gfx/pics/184/shiny.pal b/gfx/pics/azumarill/shiny.pal
similarity index 100%
rename from gfx/pics/184/shiny.pal
rename to gfx/pics/azumarill/shiny.pal
diff --git a/gfx/pics/153/anim0.asm b/gfx/pics/bayleef/anim0.asm
similarity index 100%
rename from gfx/pics/153/anim0.asm
rename to gfx/pics/bayleef/anim0.asm
diff --git a/gfx/pics/153/anim1.asm b/gfx/pics/bayleef/anim1.asm
similarity index 100%
rename from gfx/pics/153/anim1.asm
rename to gfx/pics/bayleef/anim1.asm
diff --git a/gfx/pics/153/back.lz b/gfx/pics/bayleef/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/153/back.lz
rename to gfx/pics/bayleef/back.6x6.2bpp.lz
diff --git a/gfx/pics/153/bitmask.asm b/gfx/pics/bayleef/bitmask.asm
similarity index 100%
rename from gfx/pics/153/bitmask.asm
rename to gfx/pics/bayleef/bitmask.asm
diff --git a/gfx/pics/153/frames.asm b/gfx/pics/bayleef/frames.asm
similarity index 100%
rename from gfx/pics/153/frames.asm
rename to gfx/pics/bayleef/frames.asm
diff --git a/gfx/pics/153/front.lz b/gfx/pics/bayleef/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/153/front.lz
rename to gfx/pics/bayleef/front.6x6.2bpp.lz
diff --git a/gfx/pics/153/normal.pal b/gfx/pics/bayleef/normal.pal
similarity index 100%
rename from gfx/pics/153/normal.pal
rename to gfx/pics/bayleef/normal.pal
diff --git a/gfx/pics/153/shiny.pal b/gfx/pics/bayleef/shiny.pal
similarity index 100%
rename from gfx/pics/153/shiny.pal
rename to gfx/pics/bayleef/shiny.pal
diff --git a/gfx/pics/015/anim0.asm b/gfx/pics/beedrill/anim0.asm
similarity index 100%
rename from gfx/pics/015/anim0.asm
rename to gfx/pics/beedrill/anim0.asm
diff --git a/gfx/pics/015/anim1.asm b/gfx/pics/beedrill/anim1.asm
similarity index 100%
rename from gfx/pics/015/anim1.asm
rename to gfx/pics/beedrill/anim1.asm
diff --git a/gfx/pics/015/back.lz b/gfx/pics/beedrill/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/015/back.lz
rename to gfx/pics/beedrill/back.6x6.2bpp.lz
diff --git a/gfx/pics/015/bitmask.asm b/gfx/pics/beedrill/bitmask.asm
similarity index 100%
rename from gfx/pics/015/bitmask.asm
rename to gfx/pics/beedrill/bitmask.asm
diff --git a/gfx/pics/015/frames.asm b/gfx/pics/beedrill/frames.asm
similarity index 100%
rename from gfx/pics/015/frames.asm
rename to gfx/pics/beedrill/frames.asm
diff --git a/gfx/pics/015/front.lz b/gfx/pics/beedrill/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/015/front.lz
rename to gfx/pics/beedrill/front.7x7.2bpp.lz
diff --git a/gfx/pics/015/normal.pal b/gfx/pics/beedrill/normal.pal
similarity index 100%
rename from gfx/pics/015/normal.pal
rename to gfx/pics/beedrill/normal.pal
diff --git a/gfx/pics/015/shiny.pal b/gfx/pics/beedrill/shiny.pal
similarity index 100%
rename from gfx/pics/015/shiny.pal
rename to gfx/pics/beedrill/shiny.pal
diff --git a/gfx/pics/182/anim0.asm b/gfx/pics/bellossom/anim0.asm
similarity index 100%
rename from gfx/pics/182/anim0.asm
rename to gfx/pics/bellossom/anim0.asm
diff --git a/gfx/pics/182/anim1.asm b/gfx/pics/bellossom/anim1.asm
similarity index 100%
rename from gfx/pics/182/anim1.asm
rename to gfx/pics/bellossom/anim1.asm
diff --git a/gfx/pics/182/back.lz b/gfx/pics/bellossom/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/182/back.lz
rename to gfx/pics/bellossom/back.6x6.2bpp.lz
diff --git a/gfx/pics/182/bitmask.asm b/gfx/pics/bellossom/bitmask.asm
similarity index 100%
rename from gfx/pics/182/bitmask.asm
rename to gfx/pics/bellossom/bitmask.asm
diff --git a/gfx/pics/182/frames.asm b/gfx/pics/bellossom/frames.asm
similarity index 100%
rename from gfx/pics/182/frames.asm
rename to gfx/pics/bellossom/frames.asm
diff --git a/gfx/pics/182/front.lz b/gfx/pics/bellossom/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/182/front.lz
rename to gfx/pics/bellossom/front.7x7.2bpp.lz
diff --git a/gfx/pics/182/normal.pal b/gfx/pics/bellossom/normal.pal
similarity index 100%
rename from gfx/pics/182/normal.pal
rename to gfx/pics/bellossom/normal.pal
diff --git a/gfx/pics/182/shiny.pal b/gfx/pics/bellossom/shiny.pal
similarity index 100%
rename from gfx/pics/182/shiny.pal
rename to gfx/pics/bellossom/shiny.pal
diff --git a/gfx/pics/069/anim0.asm b/gfx/pics/bellsprout/anim0.asm
similarity index 100%
rename from gfx/pics/069/anim0.asm
rename to gfx/pics/bellsprout/anim0.asm
diff --git a/gfx/pics/069/anim1.asm b/gfx/pics/bellsprout/anim1.asm
similarity index 100%
rename from gfx/pics/069/anim1.asm
rename to gfx/pics/bellsprout/anim1.asm
diff --git a/gfx/pics/069/back.lz b/gfx/pics/bellsprout/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/069/back.lz
rename to gfx/pics/bellsprout/back.6x6.2bpp.lz
diff --git a/gfx/pics/069/bitmask.asm b/gfx/pics/bellsprout/bitmask.asm
similarity index 100%
rename from gfx/pics/069/bitmask.asm
rename to gfx/pics/bellsprout/bitmask.asm
diff --git a/gfx/pics/069/frames.asm b/gfx/pics/bellsprout/frames.asm
similarity index 100%
rename from gfx/pics/069/frames.asm
rename to gfx/pics/bellsprout/frames.asm
diff --git a/gfx/pics/069/front.lz b/gfx/pics/bellsprout/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/069/front.lz
rename to gfx/pics/bellsprout/front.5x5.2bpp.lz
diff --git a/gfx/pics/069/normal.pal b/gfx/pics/bellsprout/normal.pal
similarity index 100%
rename from gfx/pics/069/normal.pal
rename to gfx/pics/bellsprout/normal.pal
diff --git a/gfx/pics/069/shiny.pal b/gfx/pics/bellsprout/shiny.pal
similarity index 100%
rename from gfx/pics/069/shiny.pal
rename to 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
similarity index 100%
rename from gfx/pics/009/anim0.asm
rename to gfx/pics/blastoise/anim0.asm
diff --git a/gfx/pics/009/anim1.asm b/gfx/pics/blastoise/anim1.asm
similarity index 100%
rename from gfx/pics/009/anim1.asm
rename to gfx/pics/blastoise/anim1.asm
diff --git a/gfx/pics/009/back.lz b/gfx/pics/blastoise/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/009/back.lz
rename to gfx/pics/blastoise/back.6x6.2bpp.lz
diff --git a/gfx/pics/009/bitmask.asm b/gfx/pics/blastoise/bitmask.asm
similarity index 100%
rename from gfx/pics/009/bitmask.asm
rename to gfx/pics/blastoise/bitmask.asm
diff --git a/gfx/pics/009/frames.asm b/gfx/pics/blastoise/frames.asm
similarity index 100%
rename from gfx/pics/009/frames.asm
rename to gfx/pics/blastoise/frames.asm
diff --git a/gfx/pics/009/front.lz b/gfx/pics/blastoise/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/009/front.lz
rename to gfx/pics/blastoise/front.7x7.2bpp.lz
diff --git a/gfx/pics/009/normal.pal b/gfx/pics/blastoise/normal.pal
similarity index 100%
rename from gfx/pics/009/normal.pal
rename to gfx/pics/blastoise/normal.pal
diff --git a/gfx/pics/009/shiny.pal b/gfx/pics/blastoise/shiny.pal
similarity index 100%
rename from gfx/pics/009/shiny.pal
rename to gfx/pics/blastoise/shiny.pal
diff --git a/gfx/pics/242/anim0.asm b/gfx/pics/blissey/anim0.asm
similarity index 100%
rename from gfx/pics/242/anim0.asm
rename to gfx/pics/blissey/anim0.asm
diff --git a/gfx/pics/242/anim1.asm b/gfx/pics/blissey/anim1.asm
similarity index 100%
rename from gfx/pics/242/anim1.asm
rename to gfx/pics/blissey/anim1.asm
diff --git a/gfx/pics/242/back.lz b/gfx/pics/blissey/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/242/back.lz
rename to gfx/pics/blissey/back.6x6.2bpp.lz
diff --git a/gfx/pics/242/bitmask.asm b/gfx/pics/blissey/bitmask.asm
similarity index 100%
rename from gfx/pics/242/bitmask.asm
rename to gfx/pics/blissey/bitmask.asm
diff --git a/gfx/pics/242/frames.asm b/gfx/pics/blissey/frames.asm
similarity index 100%
rename from gfx/pics/242/frames.asm
rename to gfx/pics/blissey/frames.asm
diff --git a/gfx/pics/242/front.lz b/gfx/pics/blissey/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/242/front.lz
rename to gfx/pics/blissey/front.7x7.2bpp.lz
diff --git a/gfx/pics/242/normal.pal b/gfx/pics/blissey/normal.pal
similarity index 100%
rename from gfx/pics/242/normal.pal
rename to gfx/pics/blissey/normal.pal
diff --git a/gfx/pics/242/shiny.pal b/gfx/pics/blissey/shiny.pal
similarity index 100%
rename from gfx/pics/242/shiny.pal
rename to gfx/pics/blissey/shiny.pal
diff --git a/gfx/pics/001/anim0.asm b/gfx/pics/bulbasaur/anim0.asm
similarity index 100%
rename from gfx/pics/001/anim0.asm
rename to gfx/pics/bulbasaur/anim0.asm
diff --git a/gfx/pics/001/anim1.asm b/gfx/pics/bulbasaur/anim1.asm
similarity index 100%
rename from gfx/pics/001/anim1.asm
rename to gfx/pics/bulbasaur/anim1.asm
diff --git a/gfx/pics/001/back.lz b/gfx/pics/bulbasaur/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/001/back.lz
rename to gfx/pics/bulbasaur/back.6x6.2bpp.lz
diff --git a/gfx/pics/001/bitmask.asm b/gfx/pics/bulbasaur/bitmask.asm
similarity index 100%
rename from gfx/pics/001/bitmask.asm
rename to gfx/pics/bulbasaur/bitmask.asm
diff --git a/gfx/pics/001/frames.asm b/gfx/pics/bulbasaur/frames.asm
similarity index 100%
rename from gfx/pics/001/frames.asm
rename to gfx/pics/bulbasaur/frames.asm
diff --git a/gfx/pics/001/front.lz b/gfx/pics/bulbasaur/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/001/front.lz
rename to gfx/pics/bulbasaur/front.5x5.2bpp.lz
diff --git a/gfx/pics/001/normal.pal b/gfx/pics/bulbasaur/normal.pal
similarity index 100%
rename from gfx/pics/001/normal.pal
rename to gfx/pics/bulbasaur/normal.pal
diff --git a/gfx/pics/001/shiny.pal b/gfx/pics/bulbasaur/shiny.pal
similarity index 100%
rename from gfx/pics/001/shiny.pal
rename to gfx/pics/bulbasaur/shiny.pal
diff --git a/gfx/pics/012/anim0.asm b/gfx/pics/butterfree/anim0.asm
similarity index 100%
rename from gfx/pics/012/anim0.asm
rename to gfx/pics/butterfree/anim0.asm
diff --git a/gfx/pics/012/anim1.asm b/gfx/pics/butterfree/anim1.asm
similarity index 100%
rename from gfx/pics/012/anim1.asm
rename to gfx/pics/butterfree/anim1.asm
diff --git a/gfx/pics/012/back.lz b/gfx/pics/butterfree/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/012/back.lz
rename to gfx/pics/butterfree/back.6x6.2bpp.lz
diff --git a/gfx/pics/012/bitmask.asm b/gfx/pics/butterfree/bitmask.asm
similarity index 100%
rename from gfx/pics/012/bitmask.asm
rename to gfx/pics/butterfree/bitmask.asm
diff --git a/gfx/pics/012/frames.asm b/gfx/pics/butterfree/frames.asm
similarity index 100%
rename from gfx/pics/012/frames.asm
rename to gfx/pics/butterfree/frames.asm
diff --git a/gfx/pics/012/front.lz b/gfx/pics/butterfree/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/012/front.lz
rename to gfx/pics/butterfree/front.7x7.2bpp.lz
diff --git a/gfx/pics/012/normal.pal b/gfx/pics/butterfree/normal.pal
similarity index 100%
rename from gfx/pics/012/normal.pal
rename to gfx/pics/butterfree/normal.pal
diff --git a/gfx/pics/012/shiny.pal b/gfx/pics/butterfree/shiny.pal
similarity index 100%
rename from gfx/pics/012/shiny.pal
rename to gfx/pics/butterfree/shiny.pal
diff --git a/gfx/pics/010/anim0.asm b/gfx/pics/caterpie/anim0.asm
similarity index 100%
rename from gfx/pics/010/anim0.asm
rename to gfx/pics/caterpie/anim0.asm
diff --git a/gfx/pics/010/anim1.asm b/gfx/pics/caterpie/anim1.asm
similarity index 100%
rename from gfx/pics/010/anim1.asm
rename to gfx/pics/caterpie/anim1.asm
diff --git a/gfx/pics/010/back.lz b/gfx/pics/caterpie/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/010/back.lz
rename to gfx/pics/caterpie/back.6x6.2bpp.lz
diff --git a/gfx/pics/010/bitmask.asm b/gfx/pics/caterpie/bitmask.asm
similarity index 100%
rename from gfx/pics/010/bitmask.asm
rename to gfx/pics/caterpie/bitmask.asm
diff --git a/gfx/pics/010/frames.asm b/gfx/pics/caterpie/frames.asm
similarity index 100%
rename from gfx/pics/010/frames.asm
rename to gfx/pics/caterpie/frames.asm
diff --git a/gfx/pics/010/front.lz b/gfx/pics/caterpie/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/010/front.lz
rename to gfx/pics/caterpie/front.5x5.2bpp.lz
diff --git a/gfx/pics/010/normal.pal b/gfx/pics/caterpie/normal.pal
similarity index 100%
rename from gfx/pics/010/normal.pal
rename to gfx/pics/caterpie/normal.pal
diff --git a/gfx/pics/010/shiny.pal b/gfx/pics/caterpie/shiny.pal
similarity index 100%
rename from gfx/pics/010/shiny.pal
rename to gfx/pics/caterpie/shiny.pal
diff --git a/gfx/pics/251/anim0.asm b/gfx/pics/celebi/anim0.asm
similarity index 100%
rename from gfx/pics/251/anim0.asm
rename to gfx/pics/celebi/anim0.asm
diff --git a/gfx/pics/251/anim1.asm b/gfx/pics/celebi/anim1.asm
similarity index 100%
rename from gfx/pics/251/anim1.asm
rename to gfx/pics/celebi/anim1.asm
diff --git a/gfx/pics/251/back.lz b/gfx/pics/celebi/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/251/back.lz
rename to gfx/pics/celebi/back.6x6.2bpp.lz
diff --git a/gfx/pics/251/bitmask.asm b/gfx/pics/celebi/bitmask.asm
similarity index 100%
rename from gfx/pics/251/bitmask.asm
rename to gfx/pics/celebi/bitmask.asm
diff --git a/gfx/pics/251/frames.asm b/gfx/pics/celebi/frames.asm
similarity index 100%
rename from gfx/pics/251/frames.asm
rename to gfx/pics/celebi/frames.asm
diff --git a/gfx/pics/251/front.lz b/gfx/pics/celebi/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/251/front.lz
rename to gfx/pics/celebi/front.5x5.2bpp.lz
diff --git a/gfx/pics/251/normal.pal b/gfx/pics/celebi/normal.pal
similarity index 100%
rename from gfx/pics/251/normal.pal
rename to gfx/pics/celebi/normal.pal
diff --git a/gfx/pics/251/shiny.pal b/gfx/pics/celebi/shiny.pal
similarity index 100%
rename from gfx/pics/251/shiny.pal
rename to gfx/pics/celebi/shiny.pal
diff --git a/gfx/pics/113/anim0.asm b/gfx/pics/chansey/anim0.asm
similarity index 100%
rename from gfx/pics/113/anim0.asm
rename to gfx/pics/chansey/anim0.asm
diff --git a/gfx/pics/113/anim1.asm b/gfx/pics/chansey/anim1.asm
similarity index 100%
rename from gfx/pics/113/anim1.asm
rename to gfx/pics/chansey/anim1.asm
diff --git a/gfx/pics/113/back.lz b/gfx/pics/chansey/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/113/back.lz
rename to gfx/pics/chansey/back.6x6.2bpp.lz
diff --git a/gfx/pics/113/bitmask.asm b/gfx/pics/chansey/bitmask.asm
similarity index 100%
rename from gfx/pics/113/bitmask.asm
rename to gfx/pics/chansey/bitmask.asm
diff --git a/gfx/pics/113/frames.asm b/gfx/pics/chansey/frames.asm
similarity index 100%
rename from gfx/pics/113/frames.asm
rename to gfx/pics/chansey/frames.asm
diff --git a/gfx/pics/113/front.lz b/gfx/pics/chansey/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/113/front.lz
rename to gfx/pics/chansey/front.6x6.2bpp.lz
diff --git a/gfx/pics/113/normal.pal b/gfx/pics/chansey/normal.pal
similarity index 100%
rename from gfx/pics/113/normal.pal
rename to gfx/pics/chansey/normal.pal
diff --git a/gfx/pics/113/shiny.pal b/gfx/pics/chansey/shiny.pal
similarity index 100%
rename from gfx/pics/113/shiny.pal
rename to gfx/pics/chansey/shiny.pal
diff --git a/gfx/pics/006/anim0.asm b/gfx/pics/charizard/anim0.asm
similarity index 100%
rename from gfx/pics/006/anim0.asm
rename to gfx/pics/charizard/anim0.asm
diff --git a/gfx/pics/006/anim1.asm b/gfx/pics/charizard/anim1.asm
similarity index 100%
rename from gfx/pics/006/anim1.asm
rename to gfx/pics/charizard/anim1.asm
diff --git a/gfx/pics/006/back.lz b/gfx/pics/charizard/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/006/back.lz
rename to gfx/pics/charizard/back.6x6.2bpp.lz
diff --git a/gfx/pics/006/bitmask.asm b/gfx/pics/charizard/bitmask.asm
similarity index 100%
rename from gfx/pics/006/bitmask.asm
rename to gfx/pics/charizard/bitmask.asm
diff --git a/gfx/pics/006/frames.asm b/gfx/pics/charizard/frames.asm
similarity index 100%
rename from gfx/pics/006/frames.asm
rename to gfx/pics/charizard/frames.asm
diff --git a/gfx/pics/006/front.lz b/gfx/pics/charizard/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/006/front.lz
rename to gfx/pics/charizard/front.7x7.2bpp.lz
diff --git a/gfx/pics/006/normal.pal b/gfx/pics/charizard/normal.pal
similarity index 100%
rename from gfx/pics/006/normal.pal
rename to gfx/pics/charizard/normal.pal
diff --git a/gfx/pics/006/shiny.pal b/gfx/pics/charizard/shiny.pal
similarity index 100%
rename from gfx/pics/006/shiny.pal
rename to gfx/pics/charizard/shiny.pal
diff --git a/gfx/pics/004/anim0.asm b/gfx/pics/charmander/anim0.asm
similarity index 100%
rename from gfx/pics/004/anim0.asm
rename to gfx/pics/charmander/anim0.asm
diff --git a/gfx/pics/004/anim1.asm b/gfx/pics/charmander/anim1.asm
similarity index 100%
rename from gfx/pics/004/anim1.asm
rename to gfx/pics/charmander/anim1.asm
diff --git a/gfx/pics/004/back.lz b/gfx/pics/charmander/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/004/back.lz
rename to gfx/pics/charmander/back.6x6.2bpp.lz
diff --git a/gfx/pics/004/bitmask.asm b/gfx/pics/charmander/bitmask.asm
similarity index 100%
rename from gfx/pics/004/bitmask.asm
rename to gfx/pics/charmander/bitmask.asm
diff --git a/gfx/pics/004/frames.asm b/gfx/pics/charmander/frames.asm
similarity index 100%
rename from gfx/pics/004/frames.asm
rename to gfx/pics/charmander/frames.asm
diff --git a/gfx/pics/004/front.lz b/gfx/pics/charmander/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/004/front.lz
rename to gfx/pics/charmander/front.5x5.2bpp.lz
diff --git a/gfx/pics/004/normal.pal b/gfx/pics/charmander/normal.pal
similarity index 100%
rename from gfx/pics/004/normal.pal
rename to gfx/pics/charmander/normal.pal
diff --git a/gfx/pics/004/shiny.pal b/gfx/pics/charmander/shiny.pal
similarity index 100%
rename from gfx/pics/004/shiny.pal
rename to gfx/pics/charmander/shiny.pal
diff --git a/gfx/pics/005/anim0.asm b/gfx/pics/charmeleon/anim0.asm
similarity index 100%
rename from gfx/pics/005/anim0.asm
rename to gfx/pics/charmeleon/anim0.asm
diff --git a/gfx/pics/005/anim1.asm b/gfx/pics/charmeleon/anim1.asm
similarity index 100%
rename from gfx/pics/005/anim1.asm
rename to gfx/pics/charmeleon/anim1.asm
diff --git a/gfx/pics/005/back.lz b/gfx/pics/charmeleon/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/005/back.lz
rename to gfx/pics/charmeleon/back.6x6.2bpp.lz
diff --git a/gfx/pics/005/bitmask.asm b/gfx/pics/charmeleon/bitmask.asm
similarity index 100%
rename from gfx/pics/005/bitmask.asm
rename to gfx/pics/charmeleon/bitmask.asm
diff --git a/gfx/pics/005/frames.asm b/gfx/pics/charmeleon/frames.asm
similarity index 100%
rename from gfx/pics/005/frames.asm
rename to gfx/pics/charmeleon/frames.asm
diff --git a/gfx/pics/005/front.lz b/gfx/pics/charmeleon/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/005/front.lz
rename to gfx/pics/charmeleon/front.6x6.2bpp.lz
diff --git a/gfx/pics/005/normal.pal b/gfx/pics/charmeleon/normal.pal
similarity index 100%
rename from gfx/pics/005/normal.pal
rename to gfx/pics/charmeleon/normal.pal
diff --git a/gfx/pics/005/shiny.pal b/gfx/pics/charmeleon/shiny.pal
similarity index 100%
rename from gfx/pics/005/shiny.pal
rename to gfx/pics/charmeleon/shiny.pal
diff --git a/gfx/pics/152/anim0.asm b/gfx/pics/chikorita/anim0.asm
similarity index 100%
rename from gfx/pics/152/anim0.asm
rename to gfx/pics/chikorita/anim0.asm
diff --git a/gfx/pics/152/anim1.asm b/gfx/pics/chikorita/anim1.asm
similarity index 100%
rename from gfx/pics/152/anim1.asm
rename to gfx/pics/chikorita/anim1.asm
diff --git a/gfx/pics/152/back.lz b/gfx/pics/chikorita/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/152/back.lz
rename to gfx/pics/chikorita/back.6x6.2bpp.lz
diff --git a/gfx/pics/152/bitmask.asm b/gfx/pics/chikorita/bitmask.asm
similarity index 100%
rename from gfx/pics/152/bitmask.asm
rename to gfx/pics/chikorita/bitmask.asm
diff --git a/gfx/pics/152/frames.asm b/gfx/pics/chikorita/frames.asm
similarity index 100%
rename from gfx/pics/152/frames.asm
rename to gfx/pics/chikorita/frames.asm
diff --git a/gfx/pics/152/front.lz b/gfx/pics/chikorita/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/152/front.lz
rename to gfx/pics/chikorita/front.5x5.2bpp.lz
diff --git a/gfx/pics/152/normal.pal b/gfx/pics/chikorita/normal.pal
similarity index 100%
rename from gfx/pics/152/normal.pal
rename to gfx/pics/chikorita/normal.pal
diff --git a/gfx/pics/152/shiny.pal b/gfx/pics/chikorita/shiny.pal
similarity index 100%
rename from gfx/pics/152/shiny.pal
rename to gfx/pics/chikorita/shiny.pal
diff --git a/gfx/pics/170/anim0.asm b/gfx/pics/chinchou/anim0.asm
similarity index 100%
rename from gfx/pics/170/anim0.asm
rename to gfx/pics/chinchou/anim0.asm
diff --git a/gfx/pics/170/anim1.asm b/gfx/pics/chinchou/anim1.asm
similarity index 100%
rename from gfx/pics/170/anim1.asm
rename to gfx/pics/chinchou/anim1.asm
diff --git a/gfx/pics/170/back.lz b/gfx/pics/chinchou/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/170/back.lz
rename to gfx/pics/chinchou/back.6x6.2bpp.lz
diff --git a/gfx/pics/170/bitmask.asm b/gfx/pics/chinchou/bitmask.asm
similarity index 100%
rename from gfx/pics/170/bitmask.asm
rename to gfx/pics/chinchou/bitmask.asm
diff --git a/gfx/pics/170/frames.asm b/gfx/pics/chinchou/frames.asm
similarity index 100%
rename from gfx/pics/170/frames.asm
rename to gfx/pics/chinchou/frames.asm
diff --git a/gfx/pics/170/front.lz b/gfx/pics/chinchou/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/170/front.lz
rename to gfx/pics/chinchou/front.6x6.2bpp.lz
diff --git a/gfx/pics/170/normal.pal b/gfx/pics/chinchou/normal.pal
similarity index 100%
rename from gfx/pics/170/normal.pal
rename to gfx/pics/chinchou/normal.pal
diff --git a/gfx/pics/170/shiny.pal b/gfx/pics/chinchou/shiny.pal
similarity index 100%
rename from gfx/pics/170/shiny.pal
rename to gfx/pics/chinchou/shiny.pal
diff --git a/gfx/pics/036/anim0.asm b/gfx/pics/clefable/anim0.asm
similarity index 100%
rename from gfx/pics/036/anim0.asm
rename to gfx/pics/clefable/anim0.asm
diff --git a/gfx/pics/036/anim1.asm b/gfx/pics/clefable/anim1.asm
similarity index 100%
rename from gfx/pics/036/anim1.asm
rename to gfx/pics/clefable/anim1.asm
diff --git a/gfx/pics/036/back.lz b/gfx/pics/clefable/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/036/back.lz
rename to gfx/pics/clefable/back.6x6.2bpp.lz
diff --git a/gfx/pics/036/bitmask.asm b/gfx/pics/clefable/bitmask.asm
similarity index 100%
rename from gfx/pics/036/bitmask.asm
rename to gfx/pics/clefable/bitmask.asm
diff --git a/gfx/pics/036/frames.asm b/gfx/pics/clefable/frames.asm
similarity index 100%
rename from gfx/pics/036/frames.asm
rename to gfx/pics/clefable/frames.asm
diff --git a/gfx/pics/036/front.lz b/gfx/pics/clefable/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/036/front.lz
rename to gfx/pics/clefable/front.6x6.2bpp.lz
diff --git a/gfx/pics/035/normal.pal b/gfx/pics/clefable/normal.pal
similarity index 100%
rename from gfx/pics/035/normal.pal
rename to gfx/pics/clefable/normal.pal
diff --git a/gfx/pics/035/shiny.pal b/gfx/pics/clefable/shiny.pal
similarity index 100%
rename from gfx/pics/035/shiny.pal
rename to gfx/pics/clefable/shiny.pal
diff --git a/gfx/pics/035/anim0.asm b/gfx/pics/clefairy/anim0.asm
similarity index 100%
rename from gfx/pics/035/anim0.asm
rename to gfx/pics/clefairy/anim0.asm
diff --git a/gfx/pics/035/anim1.asm b/gfx/pics/clefairy/anim1.asm
similarity index 100%
rename from gfx/pics/035/anim1.asm
rename to gfx/pics/clefairy/anim1.asm
diff --git a/gfx/pics/035/back.lz b/gfx/pics/clefairy/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/035/back.lz
rename to gfx/pics/clefairy/back.6x6.2bpp.lz
diff --git a/gfx/pics/035/bitmask.asm b/gfx/pics/clefairy/bitmask.asm
similarity index 100%
rename from gfx/pics/035/bitmask.asm
rename to gfx/pics/clefairy/bitmask.asm
diff --git a/gfx/pics/035/frames.asm b/gfx/pics/clefairy/frames.asm
similarity index 100%
rename from gfx/pics/035/frames.asm
rename to gfx/pics/clefairy/frames.asm
diff --git a/gfx/pics/035/front.lz b/gfx/pics/clefairy/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/035/front.lz
rename to gfx/pics/clefairy/front.5x5.2bpp.lz
diff --git a/gfx/pics/036/normal.pal b/gfx/pics/clefairy/normal.pal
similarity index 100%
rename from gfx/pics/036/normal.pal
rename to gfx/pics/clefairy/normal.pal
diff --git a/gfx/pics/036/shiny.pal b/gfx/pics/clefairy/shiny.pal
similarity index 100%
rename from gfx/pics/036/shiny.pal
rename to gfx/pics/clefairy/shiny.pal
diff --git a/gfx/pics/173/anim0.asm b/gfx/pics/cleffa/anim0.asm
similarity index 100%
rename from gfx/pics/173/anim0.asm
rename to gfx/pics/cleffa/anim0.asm
diff --git a/gfx/pics/173/anim1.asm b/gfx/pics/cleffa/anim1.asm
similarity index 100%
rename from gfx/pics/173/anim1.asm
rename to gfx/pics/cleffa/anim1.asm
diff --git a/gfx/pics/173/back.lz b/gfx/pics/cleffa/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/173/back.lz
rename to gfx/pics/cleffa/back.6x6.2bpp.lz
diff --git a/gfx/pics/173/bitmask.asm b/gfx/pics/cleffa/bitmask.asm
similarity index 100%
rename from gfx/pics/173/bitmask.asm
rename to gfx/pics/cleffa/bitmask.asm
diff --git a/gfx/pics/173/frames.asm b/gfx/pics/cleffa/frames.asm
similarity index 100%
rename from gfx/pics/173/frames.asm
rename to gfx/pics/cleffa/frames.asm
diff --git a/gfx/pics/173/front.lz b/gfx/pics/cleffa/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/173/front.lz
rename to gfx/pics/cleffa/front.5x5.2bpp.lz
diff --git a/gfx/pics/173/normal.pal b/gfx/pics/cleffa/normal.pal
similarity index 100%
rename from gfx/pics/173/normal.pal
rename to gfx/pics/cleffa/normal.pal
diff --git a/gfx/pics/173/shiny.pal b/gfx/pics/cleffa/shiny.pal
similarity index 100%
rename from gfx/pics/173/shiny.pal
rename to gfx/pics/cleffa/shiny.pal
diff --git a/gfx/pics/091/anim0.asm b/gfx/pics/cloyster/anim0.asm
similarity index 100%
rename from gfx/pics/091/anim0.asm
rename to gfx/pics/cloyster/anim0.asm
diff --git a/gfx/pics/091/anim1.asm b/gfx/pics/cloyster/anim1.asm
similarity index 100%
rename from gfx/pics/091/anim1.asm
rename to gfx/pics/cloyster/anim1.asm
diff --git a/gfx/pics/091/back.lz b/gfx/pics/cloyster/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/091/back.lz
rename to gfx/pics/cloyster/back.6x6.2bpp.lz
diff --git a/gfx/pics/091/bitmask.asm b/gfx/pics/cloyster/bitmask.asm
similarity index 100%
rename from gfx/pics/091/bitmask.asm
rename to gfx/pics/cloyster/bitmask.asm
diff --git a/gfx/pics/091/frames.asm b/gfx/pics/cloyster/frames.asm
similarity index 100%
rename from gfx/pics/091/frames.asm
rename to gfx/pics/cloyster/frames.asm
diff --git a/gfx/pics/091/front.lz b/gfx/pics/cloyster/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/091/front.lz
rename to gfx/pics/cloyster/front.7x7.2bpp.lz
diff --git a/gfx/pics/091/normal.pal b/gfx/pics/cloyster/normal.pal
similarity index 100%
rename from gfx/pics/091/normal.pal
rename to gfx/pics/cloyster/normal.pal
diff --git a/gfx/pics/091/shiny.pal b/gfx/pics/cloyster/shiny.pal
similarity index 100%
rename from gfx/pics/091/shiny.pal
rename to gfx/pics/cloyster/shiny.pal
diff --git a/gfx/pics/222/anim0.asm b/gfx/pics/corsola/anim0.asm
similarity index 100%
rename from gfx/pics/222/anim0.asm
rename to gfx/pics/corsola/anim0.asm
diff --git a/gfx/pics/222/anim1.asm b/gfx/pics/corsola/anim1.asm
similarity index 100%
rename from gfx/pics/222/anim1.asm
rename to gfx/pics/corsola/anim1.asm
diff --git a/gfx/pics/222/back.lz b/gfx/pics/corsola/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/222/back.lz
rename to gfx/pics/corsola/back.6x6.2bpp.lz
diff --git a/gfx/pics/222/bitmask.asm b/gfx/pics/corsola/bitmask.asm
similarity index 100%
rename from gfx/pics/222/bitmask.asm
rename to gfx/pics/corsola/bitmask.asm
diff --git a/gfx/pics/222/frames.asm b/gfx/pics/corsola/frames.asm
similarity index 100%
rename from gfx/pics/222/frames.asm
rename to gfx/pics/corsola/frames.asm
diff --git a/gfx/pics/222/front.lz b/gfx/pics/corsola/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/222/front.lz
rename to gfx/pics/corsola/front.6x6.2bpp.lz
diff --git a/gfx/pics/122/normal.pal b/gfx/pics/corsola/normal.pal
similarity index 100%
rename from gfx/pics/122/normal.pal
rename to gfx/pics/corsola/normal.pal
diff --git a/gfx/pics/222/shiny.pal b/gfx/pics/corsola/shiny.pal
similarity index 100%
rename from gfx/pics/222/shiny.pal
rename to gfx/pics/corsola/shiny.pal
diff --git a/gfx/pics/169/anim0.asm b/gfx/pics/crobat/anim0.asm
similarity index 100%
rename from gfx/pics/169/anim0.asm
rename to gfx/pics/crobat/anim0.asm
diff --git a/gfx/pics/169/anim1.asm b/gfx/pics/crobat/anim1.asm
similarity index 100%
rename from gfx/pics/169/anim1.asm
rename to gfx/pics/crobat/anim1.asm
diff --git a/gfx/pics/169/back.lz b/gfx/pics/crobat/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/169/back.lz
rename to gfx/pics/crobat/back.6x6.2bpp.lz
diff --git a/gfx/pics/169/bitmask.asm b/gfx/pics/crobat/bitmask.asm
similarity index 100%
rename from gfx/pics/169/bitmask.asm
rename to gfx/pics/crobat/bitmask.asm
diff --git a/gfx/pics/169/frames.asm b/gfx/pics/crobat/frames.asm
similarity index 100%
rename from gfx/pics/169/frames.asm
rename to gfx/pics/crobat/frames.asm
diff --git a/gfx/pics/169/front.lz b/gfx/pics/crobat/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/169/front.lz
rename to gfx/pics/crobat/front.7x7.2bpp.lz
diff --git a/gfx/pics/169/normal.pal b/gfx/pics/crobat/normal.pal
similarity index 100%
rename from gfx/pics/169/normal.pal
rename to gfx/pics/crobat/normal.pal
diff --git a/gfx/pics/042/shiny.pal b/gfx/pics/crobat/shiny.pal
similarity index 100%
rename from gfx/pics/042/shiny.pal
rename to gfx/pics/crobat/shiny.pal
diff --git a/gfx/pics/159/anim0.asm b/gfx/pics/croconaw/anim0.asm
similarity index 100%
rename from gfx/pics/159/anim0.asm
rename to gfx/pics/croconaw/anim0.asm
diff --git a/gfx/pics/159/anim1.asm b/gfx/pics/croconaw/anim1.asm
similarity index 100%
rename from gfx/pics/159/anim1.asm
rename to gfx/pics/croconaw/anim1.asm
diff --git a/gfx/pics/159/back.lz b/gfx/pics/croconaw/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/159/back.lz
rename to gfx/pics/croconaw/back.6x6.2bpp.lz
diff --git a/gfx/pics/159/bitmask.asm b/gfx/pics/croconaw/bitmask.asm
similarity index 100%
rename from gfx/pics/159/bitmask.asm
rename to gfx/pics/croconaw/bitmask.asm
diff --git a/gfx/pics/159/frames.asm b/gfx/pics/croconaw/frames.asm
similarity index 100%
rename from gfx/pics/159/frames.asm
rename to gfx/pics/croconaw/frames.asm
diff --git a/gfx/pics/159/front.lz b/gfx/pics/croconaw/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/159/front.lz
rename to gfx/pics/croconaw/front.6x6.2bpp.lz
diff --git a/gfx/pics/159/normal.pal b/gfx/pics/croconaw/normal.pal
similarity index 100%
rename from gfx/pics/159/normal.pal
rename to gfx/pics/croconaw/normal.pal
diff --git a/gfx/pics/159/shiny.pal b/gfx/pics/croconaw/shiny.pal
similarity index 100%
rename from gfx/pics/159/shiny.pal
rename to gfx/pics/croconaw/shiny.pal
diff --git a/gfx/pics/104/anim0.asm b/gfx/pics/cubone/anim0.asm
similarity index 100%
rename from gfx/pics/104/anim0.asm
rename to gfx/pics/cubone/anim0.asm
diff --git a/gfx/pics/104/anim1.asm b/gfx/pics/cubone/anim1.asm
similarity index 100%
rename from gfx/pics/104/anim1.asm
rename to gfx/pics/cubone/anim1.asm
diff --git a/gfx/pics/104/back.lz b/gfx/pics/cubone/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/104/back.lz
rename to gfx/pics/cubone/back.6x6.2bpp.lz
diff --git a/gfx/pics/104/bitmask.asm b/gfx/pics/cubone/bitmask.asm
similarity index 100%
rename from gfx/pics/104/bitmask.asm
rename to gfx/pics/cubone/bitmask.asm
diff --git a/gfx/pics/104/frames.asm b/gfx/pics/cubone/frames.asm
similarity index 100%
rename from gfx/pics/104/frames.asm
rename to gfx/pics/cubone/frames.asm
diff --git a/gfx/pics/104/front.lz b/gfx/pics/cubone/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/104/front.lz
rename to gfx/pics/cubone/front.5x5.2bpp.lz
diff --git a/gfx/pics/104/normal.pal b/gfx/pics/cubone/normal.pal
similarity index 100%
rename from gfx/pics/104/normal.pal
rename to gfx/pics/cubone/normal.pal
diff --git a/gfx/pics/104/shiny.pal b/gfx/pics/cubone/shiny.pal
similarity index 100%
rename from gfx/pics/104/shiny.pal
rename to gfx/pics/cubone/shiny.pal
diff --git a/gfx/pics/155/anim0.asm b/gfx/pics/cyndaquil/anim0.asm
similarity index 100%
rename from gfx/pics/155/anim0.asm
rename to gfx/pics/cyndaquil/anim0.asm
diff --git a/gfx/pics/155/anim1.asm b/gfx/pics/cyndaquil/anim1.asm
similarity index 100%
rename from gfx/pics/155/anim1.asm
rename to gfx/pics/cyndaquil/anim1.asm
diff --git a/gfx/pics/155/back.lz b/gfx/pics/cyndaquil/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/155/back.lz
rename to gfx/pics/cyndaquil/back.6x6.2bpp.lz
diff --git a/gfx/pics/155/bitmask.asm b/gfx/pics/cyndaquil/bitmask.asm
similarity index 100%
rename from gfx/pics/155/bitmask.asm
rename to gfx/pics/cyndaquil/bitmask.asm
diff --git a/gfx/pics/155/frames.asm b/gfx/pics/cyndaquil/frames.asm
similarity index 100%
rename from gfx/pics/155/frames.asm
rename to gfx/pics/cyndaquil/frames.asm
diff --git a/gfx/pics/155/front.lz b/gfx/pics/cyndaquil/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/155/front.lz
rename to gfx/pics/cyndaquil/front.5x5.2bpp.lz
diff --git a/gfx/pics/155/normal.pal b/gfx/pics/cyndaquil/normal.pal
similarity index 100%
rename from gfx/pics/155/normal.pal
rename to gfx/pics/cyndaquil/normal.pal
diff --git a/gfx/pics/155/shiny.pal b/gfx/pics/cyndaquil/shiny.pal
similarity index 100%
rename from gfx/pics/155/shiny.pal
rename to gfx/pics/cyndaquil/shiny.pal
diff --git a/gfx/pics/225/anim0.asm b/gfx/pics/delibird/anim0.asm
similarity index 100%
rename from gfx/pics/225/anim0.asm
rename to gfx/pics/delibird/anim0.asm
diff --git a/gfx/pics/225/anim1.asm b/gfx/pics/delibird/anim1.asm
similarity index 100%
rename from gfx/pics/225/anim1.asm
rename to gfx/pics/delibird/anim1.asm
diff --git a/gfx/pics/225/back.lz b/gfx/pics/delibird/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/225/back.lz
rename to gfx/pics/delibird/back.6x6.2bpp.lz
diff --git a/gfx/pics/225/bitmask.asm b/gfx/pics/delibird/bitmask.asm
similarity index 100%
rename from gfx/pics/225/bitmask.asm
rename to gfx/pics/delibird/bitmask.asm
diff --git a/gfx/pics/225/frames.asm b/gfx/pics/delibird/frames.asm
similarity index 100%
rename from gfx/pics/225/frames.asm
rename to gfx/pics/delibird/frames.asm
diff --git a/gfx/pics/225/front.lz b/gfx/pics/delibird/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/225/front.lz
rename to gfx/pics/delibird/front.6x6.2bpp.lz
diff --git a/gfx/pics/225/normal.pal b/gfx/pics/delibird/normal.pal
similarity index 100%
rename from gfx/pics/225/normal.pal
rename to gfx/pics/delibird/normal.pal
diff --git a/gfx/pics/225/shiny.pal b/gfx/pics/delibird/shiny.pal
similarity index 100%
rename from gfx/pics/225/shiny.pal
rename to gfx/pics/delibird/shiny.pal
diff --git a/gfx/pics/087/anim0.asm b/gfx/pics/dewgong/anim0.asm
similarity index 100%
rename from gfx/pics/087/anim0.asm
rename to gfx/pics/dewgong/anim0.asm
diff --git a/gfx/pics/087/anim1.asm b/gfx/pics/dewgong/anim1.asm
similarity index 100%
rename from gfx/pics/087/anim1.asm
rename to gfx/pics/dewgong/anim1.asm
diff --git a/gfx/pics/087/back.lz b/gfx/pics/dewgong/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/087/back.lz
rename to gfx/pics/dewgong/back.6x6.2bpp.lz
diff --git a/gfx/pics/087/bitmask.asm b/gfx/pics/dewgong/bitmask.asm
similarity index 100%
rename from gfx/pics/087/bitmask.asm
rename to gfx/pics/dewgong/bitmask.asm
diff --git a/gfx/pics/087/frames.asm b/gfx/pics/dewgong/frames.asm
similarity index 100%
rename from gfx/pics/087/frames.asm
rename to gfx/pics/dewgong/frames.asm
diff --git a/gfx/pics/087/front.lz b/gfx/pics/dewgong/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/087/front.lz
rename to gfx/pics/dewgong/front.7x7.2bpp.lz
diff --git a/gfx/pics/087/normal.pal b/gfx/pics/dewgong/normal.pal
similarity index 100%
rename from gfx/pics/087/normal.pal
rename to gfx/pics/dewgong/normal.pal
diff --git a/gfx/pics/087/shiny.pal b/gfx/pics/dewgong/shiny.pal
similarity index 100%
rename from gfx/pics/087/shiny.pal
rename to gfx/pics/dewgong/shiny.pal
diff --git a/gfx/pics/050/anim0.asm b/gfx/pics/diglett/anim0.asm
similarity index 100%
rename from gfx/pics/050/anim0.asm
rename to gfx/pics/diglett/anim0.asm
diff --git a/gfx/pics/050/anim1.asm b/gfx/pics/diglett/anim1.asm
similarity index 100%
rename from gfx/pics/050/anim1.asm
rename to gfx/pics/diglett/anim1.asm
diff --git a/gfx/pics/050/back.lz b/gfx/pics/diglett/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/050/back.lz
rename to gfx/pics/diglett/back.6x6.2bpp.lz
diff --git a/gfx/pics/050/bitmask.asm b/gfx/pics/diglett/bitmask.asm
similarity index 100%
rename from gfx/pics/050/bitmask.asm
rename to gfx/pics/diglett/bitmask.asm
diff --git a/gfx/pics/050/frames.asm b/gfx/pics/diglett/frames.asm
similarity index 100%
rename from gfx/pics/050/frames.asm
rename to gfx/pics/diglett/frames.asm
diff --git a/gfx/pics/050/front.lz b/gfx/pics/diglett/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/050/front.lz
rename to gfx/pics/diglett/front.5x5.2bpp.lz
diff --git a/gfx/pics/050/normal.pal b/gfx/pics/diglett/normal.pal
similarity index 100%
rename from gfx/pics/050/normal.pal
rename to gfx/pics/diglett/normal.pal
diff --git a/gfx/pics/050/shiny.pal b/gfx/pics/diglett/shiny.pal
similarity index 100%
rename from gfx/pics/050/shiny.pal
rename to gfx/pics/diglett/shiny.pal
diff --git a/gfx/pics/132/anim0.asm b/gfx/pics/ditto/anim0.asm
similarity index 100%
rename from gfx/pics/132/anim0.asm
rename to gfx/pics/ditto/anim0.asm
diff --git a/gfx/pics/132/anim1.asm b/gfx/pics/ditto/anim1.asm
similarity index 100%
rename from gfx/pics/132/anim1.asm
rename to gfx/pics/ditto/anim1.asm
diff --git a/gfx/pics/132/back.lz b/gfx/pics/ditto/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/132/back.lz
rename to gfx/pics/ditto/back.6x6.2bpp.lz
diff --git a/gfx/pics/132/bitmask.asm b/gfx/pics/ditto/bitmask.asm
similarity index 100%
rename from gfx/pics/132/bitmask.asm
rename to gfx/pics/ditto/bitmask.asm
diff --git a/gfx/pics/132/frames.asm b/gfx/pics/ditto/frames.asm
similarity index 100%
rename from gfx/pics/132/frames.asm
rename to gfx/pics/ditto/frames.asm
diff --git a/gfx/pics/132/front.lz b/gfx/pics/ditto/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/132/front.lz
rename to gfx/pics/ditto/front.5x5.2bpp.lz
diff --git a/gfx/pics/132/normal.pal b/gfx/pics/ditto/normal.pal
similarity index 100%
rename from gfx/pics/132/normal.pal
rename to gfx/pics/ditto/normal.pal
diff --git a/gfx/pics/132/shiny.pal b/gfx/pics/ditto/shiny.pal
similarity index 100%
rename from gfx/pics/132/shiny.pal
rename to gfx/pics/ditto/shiny.pal
diff --git a/gfx/pics/085/anim0.asm b/gfx/pics/dodrio/anim0.asm
similarity index 100%
rename from gfx/pics/085/anim0.asm
rename to gfx/pics/dodrio/anim0.asm
diff --git a/gfx/pics/085/anim1.asm b/gfx/pics/dodrio/anim1.asm
similarity index 100%
rename from gfx/pics/085/anim1.asm
rename to gfx/pics/dodrio/anim1.asm
diff --git a/gfx/pics/085/back.lz b/gfx/pics/dodrio/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/085/back.lz
rename to gfx/pics/dodrio/back.6x6.2bpp.lz
diff --git a/gfx/pics/085/bitmask.asm b/gfx/pics/dodrio/bitmask.asm
similarity index 100%
rename from gfx/pics/085/bitmask.asm
rename to gfx/pics/dodrio/bitmask.asm
diff --git a/gfx/pics/085/frames.asm b/gfx/pics/dodrio/frames.asm
similarity index 100%
rename from gfx/pics/085/frames.asm
rename to gfx/pics/dodrio/frames.asm
diff --git a/gfx/pics/085/front.lz b/gfx/pics/dodrio/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/085/front.lz
rename to gfx/pics/dodrio/front.7x7.2bpp.lz
diff --git a/gfx/pics/085/normal.pal b/gfx/pics/dodrio/normal.pal
similarity index 100%
rename from gfx/pics/085/normal.pal
rename to gfx/pics/dodrio/normal.pal
diff --git a/gfx/pics/085/shiny.pal b/gfx/pics/dodrio/shiny.pal
similarity index 100%
rename from gfx/pics/085/shiny.pal
rename to gfx/pics/dodrio/shiny.pal
diff --git a/gfx/pics/084/anim0.asm b/gfx/pics/doduo/anim0.asm
similarity index 100%
rename from gfx/pics/084/anim0.asm
rename to gfx/pics/doduo/anim0.asm
diff --git a/gfx/pics/084/anim1.asm b/gfx/pics/doduo/anim1.asm
similarity index 100%
rename from gfx/pics/084/anim1.asm
rename to gfx/pics/doduo/anim1.asm
diff --git a/gfx/pics/084/back.lz b/gfx/pics/doduo/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/084/back.lz
rename to gfx/pics/doduo/back.6x6.2bpp.lz
diff --git a/gfx/pics/084/bitmask.asm b/gfx/pics/doduo/bitmask.asm
similarity index 100%
rename from gfx/pics/084/bitmask.asm
rename to gfx/pics/doduo/bitmask.asm
diff --git a/gfx/pics/084/frames.asm b/gfx/pics/doduo/frames.asm
similarity index 100%
rename from gfx/pics/084/frames.asm
rename to gfx/pics/doduo/frames.asm
diff --git a/gfx/pics/084/front.lz b/gfx/pics/doduo/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/084/front.lz
rename to gfx/pics/doduo/front.5x5.2bpp.lz
diff --git a/gfx/pics/084/normal.pal b/gfx/pics/doduo/normal.pal
similarity index 100%
rename from gfx/pics/084/normal.pal
rename to gfx/pics/doduo/normal.pal
diff --git a/gfx/pics/084/shiny.pal b/gfx/pics/doduo/shiny.pal
similarity index 100%
rename from gfx/pics/084/shiny.pal
rename to gfx/pics/doduo/shiny.pal
diff --git a/gfx/pics/232/anim0.asm b/gfx/pics/donphan/anim0.asm
similarity index 100%
rename from gfx/pics/232/anim0.asm
rename to gfx/pics/donphan/anim0.asm
diff --git a/gfx/pics/232/anim1.asm b/gfx/pics/donphan/anim1.asm
similarity index 100%
rename from gfx/pics/232/anim1.asm
rename to gfx/pics/donphan/anim1.asm
diff --git a/gfx/pics/232/back.lz b/gfx/pics/donphan/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/232/back.lz
rename to gfx/pics/donphan/back.6x6.2bpp.lz
diff --git a/gfx/pics/232/bitmask.asm b/gfx/pics/donphan/bitmask.asm
similarity index 100%
rename from gfx/pics/232/bitmask.asm
rename to gfx/pics/donphan/bitmask.asm
diff --git a/gfx/pics/232/frames.asm b/gfx/pics/donphan/frames.asm
similarity index 100%
rename from gfx/pics/232/frames.asm
rename to gfx/pics/donphan/frames.asm
diff --git a/gfx/pics/232/front.lz b/gfx/pics/donphan/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/232/front.lz
rename to gfx/pics/donphan/front.7x7.2bpp.lz
diff --git a/gfx/pics/232/normal.pal b/gfx/pics/donphan/normal.pal
similarity index 100%
rename from gfx/pics/232/normal.pal
rename to gfx/pics/donphan/normal.pal
diff --git a/gfx/pics/232/shiny.pal b/gfx/pics/donphan/shiny.pal
similarity index 100%
rename from gfx/pics/232/shiny.pal
rename to gfx/pics/donphan/shiny.pal
diff --git a/gfx/pics/148/anim0.asm b/gfx/pics/dragonair/anim0.asm
similarity index 100%
rename from gfx/pics/148/anim0.asm
rename to gfx/pics/dragonair/anim0.asm
diff --git a/gfx/pics/148/anim1.asm b/gfx/pics/dragonair/anim1.asm
similarity index 100%
rename from gfx/pics/148/anim1.asm
rename to gfx/pics/dragonair/anim1.asm
diff --git a/gfx/pics/148/back.lz b/gfx/pics/dragonair/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/148/back.lz
rename to gfx/pics/dragonair/back.6x6.2bpp.lz
diff --git a/gfx/pics/148/bitmask.asm b/gfx/pics/dragonair/bitmask.asm
similarity index 100%
rename from gfx/pics/148/bitmask.asm
rename to gfx/pics/dragonair/bitmask.asm
diff --git a/gfx/pics/148/frames.asm b/gfx/pics/dragonair/frames.asm
similarity index 100%
rename from gfx/pics/148/frames.asm
rename to gfx/pics/dragonair/frames.asm
diff --git a/gfx/pics/148/front.lz b/gfx/pics/dragonair/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/148/front.lz
rename to gfx/pics/dragonair/front.6x6.2bpp.lz
diff --git a/gfx/pics/148/normal.pal b/gfx/pics/dragonair/normal.pal
similarity index 100%
rename from gfx/pics/148/normal.pal
rename to gfx/pics/dragonair/normal.pal
diff --git a/gfx/pics/148/shiny.pal b/gfx/pics/dragonair/shiny.pal
similarity index 100%
rename from gfx/pics/148/shiny.pal
rename to gfx/pics/dragonair/shiny.pal
diff --git a/gfx/pics/149/anim0.asm b/gfx/pics/dragonite/anim0.asm
similarity index 100%
rename from gfx/pics/149/anim0.asm
rename to gfx/pics/dragonite/anim0.asm
diff --git a/gfx/pics/149/anim1.asm b/gfx/pics/dragonite/anim1.asm
similarity index 100%
rename from gfx/pics/149/anim1.asm
rename to gfx/pics/dragonite/anim1.asm
diff --git a/gfx/pics/149/back.lz b/gfx/pics/dragonite/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/149/back.lz
rename to gfx/pics/dragonite/back.6x6.2bpp.lz
diff --git a/gfx/pics/149/bitmask.asm b/gfx/pics/dragonite/bitmask.asm
similarity index 100%
rename from gfx/pics/149/bitmask.asm
rename to gfx/pics/dragonite/bitmask.asm
diff --git a/gfx/pics/149/frames.asm b/gfx/pics/dragonite/frames.asm
similarity index 100%
rename from gfx/pics/149/frames.asm
rename to gfx/pics/dragonite/frames.asm
diff --git a/gfx/pics/149/front.lz b/gfx/pics/dragonite/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/149/front.lz
rename to gfx/pics/dragonite/front.7x7.2bpp.lz
diff --git a/gfx/pics/149/normal.pal b/gfx/pics/dragonite/normal.pal
similarity index 100%
rename from gfx/pics/149/normal.pal
rename to gfx/pics/dragonite/normal.pal
diff --git a/gfx/pics/149/shiny.pal b/gfx/pics/dragonite/shiny.pal
similarity index 100%
rename from gfx/pics/149/shiny.pal
rename to gfx/pics/dragonite/shiny.pal
diff --git a/gfx/pics/147/anim0.asm b/gfx/pics/dratini/anim0.asm
similarity index 100%
rename from gfx/pics/147/anim0.asm
rename to gfx/pics/dratini/anim0.asm
diff --git a/gfx/pics/147/anim1.asm b/gfx/pics/dratini/anim1.asm
similarity index 100%
rename from gfx/pics/147/anim1.asm
rename to gfx/pics/dratini/anim1.asm
diff --git a/gfx/pics/147/back.lz b/gfx/pics/dratini/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/147/back.lz
rename to gfx/pics/dratini/back.6x6.2bpp.lz
diff --git a/gfx/pics/147/bitmask.asm b/gfx/pics/dratini/bitmask.asm
similarity index 100%
rename from gfx/pics/147/bitmask.asm
rename to gfx/pics/dratini/bitmask.asm
diff --git a/gfx/pics/147/frames.asm b/gfx/pics/dratini/frames.asm
similarity index 100%
rename from gfx/pics/147/frames.asm
rename to gfx/pics/dratini/frames.asm
diff --git a/gfx/pics/147/front.lz b/gfx/pics/dratini/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/147/front.lz
rename to gfx/pics/dratini/front.5x5.2bpp.lz
diff --git a/gfx/pics/147/normal.pal b/gfx/pics/dratini/normal.pal
similarity index 100%
rename from gfx/pics/147/normal.pal
rename to gfx/pics/dratini/normal.pal
diff --git a/gfx/pics/147/shiny.pal b/gfx/pics/dratini/shiny.pal
similarity index 100%
rename from gfx/pics/147/shiny.pal
rename to gfx/pics/dratini/shiny.pal
diff --git a/gfx/pics/096/anim0.asm b/gfx/pics/drowzee/anim0.asm
similarity index 100%
rename from gfx/pics/096/anim0.asm
rename to gfx/pics/drowzee/anim0.asm
diff --git a/gfx/pics/096/anim1.asm b/gfx/pics/drowzee/anim1.asm
similarity index 100%
rename from gfx/pics/096/anim1.asm
rename to gfx/pics/drowzee/anim1.asm
diff --git a/gfx/pics/096/back.lz b/gfx/pics/drowzee/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/096/back.lz
rename to gfx/pics/drowzee/back.6x6.2bpp.lz
diff --git a/gfx/pics/096/bitmask.asm b/gfx/pics/drowzee/bitmask.asm
similarity index 100%
rename from gfx/pics/096/bitmask.asm
rename to gfx/pics/drowzee/bitmask.asm
diff --git a/gfx/pics/096/frames.asm b/gfx/pics/drowzee/frames.asm
similarity index 100%
rename from gfx/pics/096/frames.asm
rename to gfx/pics/drowzee/frames.asm
diff --git a/gfx/pics/096/front.lz b/gfx/pics/drowzee/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/096/front.lz
rename to gfx/pics/drowzee/front.6x6.2bpp.lz
diff --git a/gfx/pics/096/normal.pal b/gfx/pics/drowzee/normal.pal
similarity index 100%
rename from gfx/pics/096/normal.pal
rename to gfx/pics/drowzee/normal.pal
diff --git a/gfx/pics/096/shiny.pal b/gfx/pics/drowzee/shiny.pal
similarity index 100%
rename from gfx/pics/096/shiny.pal
rename to gfx/pics/drowzee/shiny.pal
diff --git a/gfx/pics/051/anim0.asm b/gfx/pics/dugtrio/anim0.asm
similarity index 100%
rename from gfx/pics/051/anim0.asm
rename to gfx/pics/dugtrio/anim0.asm
diff --git a/gfx/pics/051/anim1.asm b/gfx/pics/dugtrio/anim1.asm
similarity index 100%
rename from gfx/pics/051/anim1.asm
rename to gfx/pics/dugtrio/anim1.asm
diff --git a/gfx/pics/051/back.lz b/gfx/pics/dugtrio/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/051/back.lz
rename to gfx/pics/dugtrio/back.6x6.2bpp.lz
diff --git a/gfx/pics/051/bitmask.asm b/gfx/pics/dugtrio/bitmask.asm
similarity index 100%
rename from gfx/pics/051/bitmask.asm
rename to gfx/pics/dugtrio/bitmask.asm
diff --git a/gfx/pics/051/frames.asm b/gfx/pics/dugtrio/frames.asm
similarity index 100%
rename from gfx/pics/051/frames.asm
rename to gfx/pics/dugtrio/frames.asm
diff --git a/gfx/pics/051/front.lz b/gfx/pics/dugtrio/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/051/front.lz
rename to gfx/pics/dugtrio/front.7x7.2bpp.lz
diff --git a/gfx/pics/051/normal.pal b/gfx/pics/dugtrio/normal.pal
similarity index 100%
rename from gfx/pics/051/normal.pal
rename to gfx/pics/dugtrio/normal.pal
diff --git a/gfx/pics/051/shiny.pal b/gfx/pics/dugtrio/shiny.pal
similarity index 100%
rename from gfx/pics/051/shiny.pal
rename to gfx/pics/dugtrio/shiny.pal
diff --git a/gfx/pics/206/anim0.asm b/gfx/pics/dunsparce/anim0.asm
similarity index 100%
rename from gfx/pics/206/anim0.asm
rename to gfx/pics/dunsparce/anim0.asm
diff --git a/gfx/pics/206/anim1.asm b/gfx/pics/dunsparce/anim1.asm
similarity index 100%
rename from gfx/pics/206/anim1.asm
rename to gfx/pics/dunsparce/anim1.asm
diff --git a/gfx/pics/206/back.lz b/gfx/pics/dunsparce/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/206/back.lz
rename to gfx/pics/dunsparce/back.6x6.2bpp.lz
diff --git a/gfx/pics/206/bitmask.asm b/gfx/pics/dunsparce/bitmask.asm
similarity index 100%
rename from gfx/pics/206/bitmask.asm
rename to gfx/pics/dunsparce/bitmask.asm
diff --git a/gfx/pics/206/frames.asm b/gfx/pics/dunsparce/frames.asm
similarity index 100%
rename from gfx/pics/206/frames.asm
rename to gfx/pics/dunsparce/frames.asm
diff --git a/gfx/pics/206/front.lz b/gfx/pics/dunsparce/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/206/front.lz
rename to gfx/pics/dunsparce/front.6x6.2bpp.lz
diff --git a/gfx/pics/206/normal.pal b/gfx/pics/dunsparce/normal.pal
similarity index 100%
rename from gfx/pics/206/normal.pal
rename to gfx/pics/dunsparce/normal.pal
diff --git a/gfx/pics/206/shiny.pal b/gfx/pics/dunsparce/shiny.pal
similarity index 100%
rename from gfx/pics/206/shiny.pal
rename to gfx/pics/dunsparce/shiny.pal
diff --git a/gfx/pics/133/anim0.asm b/gfx/pics/eevee/anim0.asm
similarity index 100%
rename from gfx/pics/133/anim0.asm
rename to gfx/pics/eevee/anim0.asm
diff --git a/gfx/pics/133/anim1.asm b/gfx/pics/eevee/anim1.asm
similarity index 100%
rename from gfx/pics/133/anim1.asm
rename to gfx/pics/eevee/anim1.asm
diff --git a/gfx/pics/133/back.lz b/gfx/pics/eevee/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/133/back.lz
rename to gfx/pics/eevee/back.6x6.2bpp.lz
diff --git a/gfx/pics/133/bitmask.asm b/gfx/pics/eevee/bitmask.asm
similarity index 100%
rename from gfx/pics/133/bitmask.asm
rename to gfx/pics/eevee/bitmask.asm
diff --git a/gfx/pics/133/frames.asm b/gfx/pics/eevee/frames.asm
similarity index 100%
rename from gfx/pics/133/frames.asm
rename to gfx/pics/eevee/frames.asm
diff --git a/gfx/pics/133/front.lz b/gfx/pics/eevee/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/133/front.lz
rename to gfx/pics/eevee/front.5x5.2bpp.lz
diff --git a/gfx/pics/133/normal.pal b/gfx/pics/eevee/normal.pal
similarity index 100%
rename from gfx/pics/133/normal.pal
rename to gfx/pics/eevee/normal.pal
diff --git a/gfx/pics/133/shiny.pal b/gfx/pics/eevee/shiny.pal
similarity index 100%
rename from gfx/pics/133/shiny.pal
rename to gfx/pics/eevee/shiny.pal
diff --git a/gfx/pics/egg/front.lz b/gfx/pics/egg/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/egg/front.lz
rename to gfx/pics/egg/front.5x5.2bpp.lz
diff --git a/gfx/pics/023/anim0.asm b/gfx/pics/ekans/anim0.asm
similarity index 100%
rename from gfx/pics/023/anim0.asm
rename to gfx/pics/ekans/anim0.asm
diff --git a/gfx/pics/023/anim1.asm b/gfx/pics/ekans/anim1.asm
similarity index 100%
rename from gfx/pics/023/anim1.asm
rename to gfx/pics/ekans/anim1.asm
diff --git a/gfx/pics/023/back.lz b/gfx/pics/ekans/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/023/back.lz
rename to gfx/pics/ekans/back.6x6.2bpp.lz
diff --git a/gfx/pics/023/bitmask.asm b/gfx/pics/ekans/bitmask.asm
similarity index 100%
rename from gfx/pics/023/bitmask.asm
rename to gfx/pics/ekans/bitmask.asm
diff --git a/gfx/pics/023/frames.asm b/gfx/pics/ekans/frames.asm
similarity index 100%
rename from gfx/pics/023/frames.asm
rename to gfx/pics/ekans/frames.asm
diff --git a/gfx/pics/023/front.lz b/gfx/pics/ekans/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/023/front.lz
rename to gfx/pics/ekans/front.5x5.2bpp.lz
diff --git a/gfx/pics/023/normal.pal b/gfx/pics/ekans/normal.pal
similarity index 100%
rename from gfx/pics/023/normal.pal
rename to gfx/pics/ekans/normal.pal
diff --git a/gfx/pics/023/shiny.pal b/gfx/pics/ekans/shiny.pal
similarity index 100%
rename from gfx/pics/023/shiny.pal
rename to gfx/pics/ekans/shiny.pal
diff --git a/gfx/pics/125/anim0.asm b/gfx/pics/electabuzz/anim0.asm
similarity index 100%
rename from gfx/pics/125/anim0.asm
rename to gfx/pics/electabuzz/anim0.asm
diff --git a/gfx/pics/125/anim1.asm b/gfx/pics/electabuzz/anim1.asm
similarity index 100%
rename from gfx/pics/125/anim1.asm
rename to gfx/pics/electabuzz/anim1.asm
diff --git a/gfx/pics/125/back.lz b/gfx/pics/electabuzz/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/125/back.lz
rename to gfx/pics/electabuzz/back.6x6.2bpp.lz
diff --git a/gfx/pics/125/bitmask.asm b/gfx/pics/electabuzz/bitmask.asm
similarity index 100%
rename from gfx/pics/125/bitmask.asm
rename to gfx/pics/electabuzz/bitmask.asm
diff --git a/gfx/pics/125/frames.asm b/gfx/pics/electabuzz/frames.asm
similarity index 100%
rename from gfx/pics/125/frames.asm
rename to gfx/pics/electabuzz/frames.asm
diff --git a/gfx/pics/125/front.lz b/gfx/pics/electabuzz/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/125/front.lz
rename to gfx/pics/electabuzz/front.6x6.2bpp.lz
diff --git a/gfx/pics/125/normal.pal b/gfx/pics/electabuzz/normal.pal
similarity index 100%
rename from gfx/pics/125/normal.pal
rename to gfx/pics/electabuzz/normal.pal
diff --git a/gfx/pics/125/shiny.pal b/gfx/pics/electabuzz/shiny.pal
similarity index 100%
rename from gfx/pics/125/shiny.pal
rename to gfx/pics/electabuzz/shiny.pal
diff --git a/gfx/pics/101/anim0.asm b/gfx/pics/electrode/anim0.asm
similarity index 100%
rename from gfx/pics/101/anim0.asm
rename to gfx/pics/electrode/anim0.asm
diff --git a/gfx/pics/101/anim1.asm b/gfx/pics/electrode/anim1.asm
similarity index 100%
rename from gfx/pics/101/anim1.asm
rename to gfx/pics/electrode/anim1.asm
diff --git a/gfx/pics/101/back.lz b/gfx/pics/electrode/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/101/back.lz
rename to gfx/pics/electrode/back.6x6.2bpp.lz
diff --git a/gfx/pics/101/bitmask.asm b/gfx/pics/electrode/bitmask.asm
similarity index 100%
rename from gfx/pics/101/bitmask.asm
rename to gfx/pics/electrode/bitmask.asm
diff --git a/gfx/pics/101/frames.asm b/gfx/pics/electrode/frames.asm
similarity index 100%
rename from gfx/pics/101/frames.asm
rename to gfx/pics/electrode/frames.asm
diff --git a/gfx/pics/101/front.lz b/gfx/pics/electrode/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/101/front.lz
rename to gfx/pics/electrode/front.5x5.2bpp.lz
diff --git a/gfx/pics/100/normal.pal b/gfx/pics/electrode/normal.pal
similarity index 100%
rename from gfx/pics/100/normal.pal
rename to gfx/pics/electrode/normal.pal
diff --git a/gfx/pics/100/shiny.pal b/gfx/pics/electrode/shiny.pal
similarity index 100%
rename from gfx/pics/100/shiny.pal
rename to gfx/pics/electrode/shiny.pal
diff --git a/gfx/pics/239/anim0.asm b/gfx/pics/elekid/anim0.asm
similarity index 100%
rename from gfx/pics/239/anim0.asm
rename to gfx/pics/elekid/anim0.asm
diff --git a/gfx/pics/239/anim1.asm b/gfx/pics/elekid/anim1.asm
similarity index 100%
rename from gfx/pics/239/anim1.asm
rename to gfx/pics/elekid/anim1.asm
diff --git a/gfx/pics/239/back.lz b/gfx/pics/elekid/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/239/back.lz
rename to gfx/pics/elekid/back.6x6.2bpp.lz
diff --git a/gfx/pics/239/bitmask.asm b/gfx/pics/elekid/bitmask.asm
similarity index 100%
rename from gfx/pics/239/bitmask.asm
rename to gfx/pics/elekid/bitmask.asm
diff --git a/gfx/pics/239/frames.asm b/gfx/pics/elekid/frames.asm
similarity index 100%
rename from gfx/pics/239/frames.asm
rename to gfx/pics/elekid/frames.asm
diff --git a/gfx/pics/239/front.lz b/gfx/pics/elekid/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/239/front.lz
rename to gfx/pics/elekid/front.6x6.2bpp.lz
diff --git a/gfx/pics/239/normal.pal b/gfx/pics/elekid/normal.pal
similarity index 100%
rename from gfx/pics/239/normal.pal
rename to gfx/pics/elekid/normal.pal
diff --git a/gfx/pics/239/shiny.pal b/gfx/pics/elekid/shiny.pal
similarity index 100%
rename from gfx/pics/239/shiny.pal
rename to gfx/pics/elekid/shiny.pal
diff --git a/gfx/pics/244/anim0.asm b/gfx/pics/entei/anim0.asm
similarity index 100%
rename from gfx/pics/244/anim0.asm
rename to gfx/pics/entei/anim0.asm
diff --git a/gfx/pics/244/anim1.asm b/gfx/pics/entei/anim1.asm
similarity index 100%
rename from gfx/pics/244/anim1.asm
rename to gfx/pics/entei/anim1.asm
diff --git a/gfx/pics/244/back.lz b/gfx/pics/entei/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/244/back.lz
rename to gfx/pics/entei/back.6x6.2bpp.lz
diff --git a/gfx/pics/244/bitmask.asm b/gfx/pics/entei/bitmask.asm
similarity index 100%
rename from gfx/pics/244/bitmask.asm
rename to gfx/pics/entei/bitmask.asm
diff --git a/gfx/pics/244/frames.asm b/gfx/pics/entei/frames.asm
similarity index 100%
rename from gfx/pics/244/frames.asm
rename to gfx/pics/entei/frames.asm
diff --git a/gfx/pics/244/front.lz b/gfx/pics/entei/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/244/front.lz
rename to gfx/pics/entei/front.7x7.2bpp.lz
diff --git a/gfx/pics/244/normal.pal b/gfx/pics/entei/normal.pal
similarity index 100%
rename from gfx/pics/244/normal.pal
rename to gfx/pics/entei/normal.pal
diff --git a/gfx/pics/244/shiny.pal b/gfx/pics/entei/shiny.pal
similarity index 100%
rename from gfx/pics/244/shiny.pal
rename to gfx/pics/entei/shiny.pal
diff --git a/gfx/pics/196/anim0.asm b/gfx/pics/espeon/anim0.asm
similarity index 100%
rename from gfx/pics/196/anim0.asm
rename to gfx/pics/espeon/anim0.asm
diff --git a/gfx/pics/196/anim1.asm b/gfx/pics/espeon/anim1.asm
similarity index 100%
rename from gfx/pics/196/anim1.asm
rename to gfx/pics/espeon/anim1.asm
diff --git a/gfx/pics/196/back.lz b/gfx/pics/espeon/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/196/back.lz
rename to gfx/pics/espeon/back.6x6.2bpp.lz
diff --git a/gfx/pics/196/bitmask.asm b/gfx/pics/espeon/bitmask.asm
similarity index 100%
rename from gfx/pics/196/bitmask.asm
rename to gfx/pics/espeon/bitmask.asm
diff --git a/gfx/pics/196/frames.asm b/gfx/pics/espeon/frames.asm
similarity index 100%
rename from gfx/pics/196/frames.asm
rename to gfx/pics/espeon/frames.asm
diff --git a/gfx/pics/196/front.lz b/gfx/pics/espeon/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/196/front.lz
rename to gfx/pics/espeon/front.6x6.2bpp.lz
diff --git a/gfx/pics/196/normal.pal b/gfx/pics/espeon/normal.pal
similarity index 100%
rename from gfx/pics/196/normal.pal
rename to gfx/pics/espeon/normal.pal
diff --git a/gfx/pics/196/shiny.pal b/gfx/pics/espeon/shiny.pal
similarity index 100%
rename from gfx/pics/196/shiny.pal
rename to gfx/pics/espeon/shiny.pal
diff --git a/gfx/pics/102/anim0.asm b/gfx/pics/exeggcute/anim0.asm
similarity index 100%
rename from gfx/pics/102/anim0.asm
rename to gfx/pics/exeggcute/anim0.asm
diff --git a/gfx/pics/102/anim1.asm b/gfx/pics/exeggcute/anim1.asm
similarity index 100%
rename from gfx/pics/102/anim1.asm
rename to gfx/pics/exeggcute/anim1.asm
diff --git a/gfx/pics/102/back.lz b/gfx/pics/exeggcute/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/102/back.lz
rename to gfx/pics/exeggcute/back.6x6.2bpp.lz
diff --git a/gfx/pics/102/bitmask.asm b/gfx/pics/exeggcute/bitmask.asm
similarity index 100%
rename from gfx/pics/102/bitmask.asm
rename to gfx/pics/exeggcute/bitmask.asm
diff --git a/gfx/pics/102/frames.asm b/gfx/pics/exeggcute/frames.asm
similarity index 100%
rename from gfx/pics/102/frames.asm
rename to gfx/pics/exeggcute/frames.asm
diff --git a/gfx/pics/102/front.lz b/gfx/pics/exeggcute/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/102/front.lz
rename to gfx/pics/exeggcute/front.7x7.2bpp.lz
diff --git a/gfx/pics/102/normal.pal b/gfx/pics/exeggcute/normal.pal
similarity index 100%
rename from gfx/pics/102/normal.pal
rename to gfx/pics/exeggcute/normal.pal
diff --git a/gfx/pics/102/shiny.pal b/gfx/pics/exeggcute/shiny.pal
similarity index 100%
rename from gfx/pics/102/shiny.pal
rename to gfx/pics/exeggcute/shiny.pal
diff --git a/gfx/pics/103/anim0.asm b/gfx/pics/exeggutor/anim0.asm
similarity index 100%
rename from gfx/pics/103/anim0.asm
rename to gfx/pics/exeggutor/anim0.asm
diff --git a/gfx/pics/103/anim1.asm b/gfx/pics/exeggutor/anim1.asm
similarity index 100%
rename from gfx/pics/103/anim1.asm
rename to gfx/pics/exeggutor/anim1.asm
diff --git a/gfx/pics/103/back.lz b/gfx/pics/exeggutor/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/103/back.lz
rename to gfx/pics/exeggutor/back.6x6.2bpp.lz
diff --git a/gfx/pics/103/bitmask.asm b/gfx/pics/exeggutor/bitmask.asm
similarity index 100%
rename from gfx/pics/103/bitmask.asm
rename to gfx/pics/exeggutor/bitmask.asm
diff --git a/gfx/pics/103/frames.asm b/gfx/pics/exeggutor/frames.asm
similarity index 100%
rename from gfx/pics/103/frames.asm
rename to gfx/pics/exeggutor/frames.asm
diff --git a/gfx/pics/103/front.lz b/gfx/pics/exeggutor/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/103/front.lz
rename to gfx/pics/exeggutor/front.7x7.2bpp.lz
diff --git a/gfx/pics/103/normal.pal b/gfx/pics/exeggutor/normal.pal
similarity index 100%
rename from gfx/pics/103/normal.pal
rename to gfx/pics/exeggutor/normal.pal
diff --git a/gfx/pics/103/shiny.pal b/gfx/pics/exeggutor/shiny.pal
similarity index 100%
rename from gfx/pics/103/shiny.pal
rename to 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
similarity index 100%
rename from gfx/pics/083/anim0.asm
rename to gfx/pics/farfetch_d/anim0.asm
diff --git a/gfx/pics/083/anim1.asm b/gfx/pics/farfetch_d/anim1.asm
similarity index 100%
rename from gfx/pics/083/anim1.asm
rename to gfx/pics/farfetch_d/anim1.asm
diff --git a/gfx/pics/083/back.lz b/gfx/pics/farfetch_d/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/083/back.lz
rename to gfx/pics/farfetch_d/back.6x6.2bpp.lz
diff --git a/gfx/pics/083/bitmask.asm b/gfx/pics/farfetch_d/bitmask.asm
similarity index 100%
rename from gfx/pics/083/bitmask.asm
rename to gfx/pics/farfetch_d/bitmask.asm
diff --git a/gfx/pics/083/frames.asm b/gfx/pics/farfetch_d/frames.asm
similarity index 100%
rename from gfx/pics/083/frames.asm
rename to gfx/pics/farfetch_d/frames.asm
diff --git a/gfx/pics/083/front.lz b/gfx/pics/farfetch_d/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/083/front.lz
rename to gfx/pics/farfetch_d/front.6x6.2bpp.lz
diff --git a/gfx/pics/083/normal.pal b/gfx/pics/farfetch_d/normal.pal
similarity index 100%
rename from gfx/pics/083/normal.pal
rename to gfx/pics/farfetch_d/normal.pal
diff --git a/gfx/pics/083/shiny.pal b/gfx/pics/farfetch_d/shiny.pal
similarity index 100%
rename from gfx/pics/083/shiny.pal
rename to gfx/pics/farfetch_d/shiny.pal
diff --git a/gfx/pics/022/anim0.asm b/gfx/pics/fearow/anim0.asm
similarity index 100%
rename from gfx/pics/022/anim0.asm
rename to gfx/pics/fearow/anim0.asm
diff --git a/gfx/pics/022/anim1.asm b/gfx/pics/fearow/anim1.asm
similarity index 100%
rename from gfx/pics/022/anim1.asm
rename to gfx/pics/fearow/anim1.asm
diff --git a/gfx/pics/022/back.lz b/gfx/pics/fearow/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/022/back.lz
rename to gfx/pics/fearow/back.6x6.2bpp.lz
diff --git a/gfx/pics/022/bitmask.asm b/gfx/pics/fearow/bitmask.asm
similarity index 100%
rename from gfx/pics/022/bitmask.asm
rename to gfx/pics/fearow/bitmask.asm
diff --git a/gfx/pics/022/frames.asm b/gfx/pics/fearow/frames.asm
similarity index 100%
rename from gfx/pics/022/frames.asm
rename to gfx/pics/fearow/frames.asm
diff --git a/gfx/pics/022/front.lz b/gfx/pics/fearow/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/022/front.lz
rename to gfx/pics/fearow/front.7x7.2bpp.lz
diff --git a/gfx/pics/022/normal.pal b/gfx/pics/fearow/normal.pal
similarity index 100%
rename from gfx/pics/022/normal.pal
rename to gfx/pics/fearow/normal.pal
diff --git a/gfx/pics/022/shiny.pal b/gfx/pics/fearow/shiny.pal
similarity index 100%
rename from gfx/pics/022/shiny.pal
rename to gfx/pics/fearow/shiny.pal
diff --git a/gfx/pics/160/anim0.asm b/gfx/pics/feraligatr/anim0.asm
similarity index 100%
rename from gfx/pics/160/anim0.asm
rename to gfx/pics/feraligatr/anim0.asm
diff --git a/gfx/pics/160/anim1.asm b/gfx/pics/feraligatr/anim1.asm
similarity index 100%
rename from gfx/pics/160/anim1.asm
rename to gfx/pics/feraligatr/anim1.asm
diff --git a/gfx/pics/160/back.lz b/gfx/pics/feraligatr/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/160/back.lz
rename to gfx/pics/feraligatr/back.6x6.2bpp.lz
diff --git a/gfx/pics/160/bitmask.asm b/gfx/pics/feraligatr/bitmask.asm
similarity index 100%
rename from gfx/pics/160/bitmask.asm
rename to gfx/pics/feraligatr/bitmask.asm
diff --git a/gfx/pics/160/frames.asm b/gfx/pics/feraligatr/frames.asm
similarity index 100%
rename from gfx/pics/160/frames.asm
rename to gfx/pics/feraligatr/frames.asm
diff --git a/gfx/pics/160/front.lz b/gfx/pics/feraligatr/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/160/front.lz
rename to gfx/pics/feraligatr/front.7x7.2bpp.lz
diff --git a/gfx/pics/160/normal.pal b/gfx/pics/feraligatr/normal.pal
similarity index 100%
rename from gfx/pics/160/normal.pal
rename to gfx/pics/feraligatr/normal.pal
diff --git a/gfx/pics/160/shiny.pal b/gfx/pics/feraligatr/shiny.pal
similarity index 100%
rename from gfx/pics/160/shiny.pal
rename to gfx/pics/feraligatr/shiny.pal
diff --git a/gfx/pics/180/anim0.asm b/gfx/pics/flaaffy/anim0.asm
similarity index 100%
rename from gfx/pics/180/anim0.asm
rename to gfx/pics/flaaffy/anim0.asm
diff --git a/gfx/pics/180/anim1.asm b/gfx/pics/flaaffy/anim1.asm
similarity index 100%
rename from gfx/pics/180/anim1.asm
rename to gfx/pics/flaaffy/anim1.asm
diff --git a/gfx/pics/180/back.lz b/gfx/pics/flaaffy/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/180/back.lz
rename to gfx/pics/flaaffy/back.6x6.2bpp.lz
diff --git a/gfx/pics/180/bitmask.asm b/gfx/pics/flaaffy/bitmask.asm
similarity index 100%
rename from gfx/pics/180/bitmask.asm
rename to gfx/pics/flaaffy/bitmask.asm
diff --git a/gfx/pics/180/frames.asm b/gfx/pics/flaaffy/frames.asm
similarity index 100%
rename from gfx/pics/180/frames.asm
rename to gfx/pics/flaaffy/frames.asm
diff --git a/gfx/pics/180/front.lz b/gfx/pics/flaaffy/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/180/front.lz
rename to gfx/pics/flaaffy/front.6x6.2bpp.lz
diff --git a/gfx/pics/180/normal.pal b/gfx/pics/flaaffy/normal.pal
similarity index 100%
rename from gfx/pics/180/normal.pal
rename to gfx/pics/flaaffy/normal.pal
diff --git a/gfx/pics/180/shiny.pal b/gfx/pics/flaaffy/shiny.pal
similarity index 100%
rename from gfx/pics/180/shiny.pal
rename to gfx/pics/flaaffy/shiny.pal
diff --git a/gfx/pics/136/anim0.asm b/gfx/pics/flareon/anim0.asm
similarity index 100%
rename from gfx/pics/136/anim0.asm
rename to gfx/pics/flareon/anim0.asm
diff --git a/gfx/pics/136/anim1.asm b/gfx/pics/flareon/anim1.asm
similarity index 100%
rename from gfx/pics/136/anim1.asm
rename to gfx/pics/flareon/anim1.asm
diff --git a/gfx/pics/136/back.lz b/gfx/pics/flareon/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/136/back.lz
rename to gfx/pics/flareon/back.6x6.2bpp.lz
diff --git a/gfx/pics/136/bitmask.asm b/gfx/pics/flareon/bitmask.asm
similarity index 100%
rename from gfx/pics/136/bitmask.asm
rename to gfx/pics/flareon/bitmask.asm
diff --git a/gfx/pics/136/frames.asm b/gfx/pics/flareon/frames.asm
similarity index 100%
rename from gfx/pics/136/frames.asm
rename to gfx/pics/flareon/frames.asm
diff --git a/gfx/pics/136/front.lz b/gfx/pics/flareon/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/136/front.lz
rename to gfx/pics/flareon/front.6x6.2bpp.lz
diff --git a/gfx/pics/136/normal.pal b/gfx/pics/flareon/normal.pal
similarity index 100%
rename from gfx/pics/136/normal.pal
rename to gfx/pics/flareon/normal.pal
diff --git a/gfx/pics/136/shiny.pal b/gfx/pics/flareon/shiny.pal
similarity index 100%
rename from gfx/pics/136/shiny.pal
rename to gfx/pics/flareon/shiny.pal
diff --git a/gfx/pics/205/anim0.asm b/gfx/pics/forretress/anim0.asm
similarity index 100%
rename from gfx/pics/205/anim0.asm
rename to gfx/pics/forretress/anim0.asm
diff --git a/gfx/pics/205/anim1.asm b/gfx/pics/forretress/anim1.asm
similarity index 100%
rename from gfx/pics/205/anim1.asm
rename to gfx/pics/forretress/anim1.asm
diff --git a/gfx/pics/205/back.lz b/gfx/pics/forretress/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/205/back.lz
rename to gfx/pics/forretress/back.6x6.2bpp.lz
diff --git a/gfx/pics/205/bitmask.asm b/gfx/pics/forretress/bitmask.asm
similarity index 100%
rename from gfx/pics/205/bitmask.asm
rename to gfx/pics/forretress/bitmask.asm
diff --git a/gfx/pics/205/frames.asm b/gfx/pics/forretress/frames.asm
similarity index 100%
rename from gfx/pics/205/frames.asm
rename to gfx/pics/forretress/frames.asm
diff --git a/gfx/pics/205/front.lz b/gfx/pics/forretress/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/205/front.lz
rename to gfx/pics/forretress/front.7x7.2bpp.lz
diff --git a/gfx/pics/205/normal.pal b/gfx/pics/forretress/normal.pal
similarity index 100%
rename from gfx/pics/205/normal.pal
rename to gfx/pics/forretress/normal.pal
diff --git a/gfx/pics/205/shiny.pal b/gfx/pics/forretress/shiny.pal
similarity index 100%
rename from gfx/pics/205/shiny.pal
rename to gfx/pics/forretress/shiny.pal
diff --git a/gfx/pics/162/anim0.asm b/gfx/pics/furret/anim0.asm
similarity index 100%
rename from gfx/pics/162/anim0.asm
rename to gfx/pics/furret/anim0.asm
diff --git a/gfx/pics/162/anim1.asm b/gfx/pics/furret/anim1.asm
similarity index 100%
rename from gfx/pics/162/anim1.asm
rename to gfx/pics/furret/anim1.asm
diff --git a/gfx/pics/162/back.lz b/gfx/pics/furret/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/162/back.lz
rename to gfx/pics/furret/back.6x6.2bpp.lz
diff --git a/gfx/pics/162/bitmask.asm b/gfx/pics/furret/bitmask.asm
similarity index 100%
rename from gfx/pics/162/bitmask.asm
rename to gfx/pics/furret/bitmask.asm
diff --git a/gfx/pics/162/frames.asm b/gfx/pics/furret/frames.asm
similarity index 100%
rename from gfx/pics/162/frames.asm
rename to gfx/pics/furret/frames.asm
diff --git a/gfx/pics/162/front.lz b/gfx/pics/furret/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/162/front.lz
rename to gfx/pics/furret/front.6x6.2bpp.lz
diff --git a/gfx/pics/162/normal.pal b/gfx/pics/furret/normal.pal
similarity index 100%
rename from gfx/pics/162/normal.pal
rename to gfx/pics/furret/normal.pal
diff --git a/gfx/pics/162/shiny.pal b/gfx/pics/furret/shiny.pal
similarity index 100%
rename from gfx/pics/162/shiny.pal
rename to gfx/pics/furret/shiny.pal
diff --git a/gfx/pics/092/anim0.asm b/gfx/pics/gastly/anim0.asm
similarity index 100%
rename from gfx/pics/092/anim0.asm
rename to gfx/pics/gastly/anim0.asm
diff --git a/gfx/pics/092/anim1.asm b/gfx/pics/gastly/anim1.asm
similarity index 100%
rename from gfx/pics/092/anim1.asm
rename to gfx/pics/gastly/anim1.asm
diff --git a/gfx/pics/092/back.lz b/gfx/pics/gastly/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/092/back.lz
rename to gfx/pics/gastly/back.6x6.2bpp.lz
diff --git a/gfx/pics/092/bitmask.asm b/gfx/pics/gastly/bitmask.asm
similarity index 100%
rename from gfx/pics/092/bitmask.asm
rename to gfx/pics/gastly/bitmask.asm
diff --git a/gfx/pics/092/frames.asm b/gfx/pics/gastly/frames.asm
similarity index 100%
rename from gfx/pics/092/frames.asm
rename to gfx/pics/gastly/frames.asm
diff --git a/gfx/pics/092/front.lz b/gfx/pics/gastly/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/092/front.lz
rename to gfx/pics/gastly/front.7x7.2bpp.lz
diff --git a/gfx/pics/092/normal.pal b/gfx/pics/gastly/normal.pal
similarity index 100%
rename from gfx/pics/092/normal.pal
rename to gfx/pics/gastly/normal.pal
diff --git a/gfx/pics/092/shiny.pal b/gfx/pics/gastly/shiny.pal
similarity index 100%
rename from gfx/pics/092/shiny.pal
rename to gfx/pics/gastly/shiny.pal
diff --git a/gfx/pics/094/anim0.asm b/gfx/pics/gengar/anim0.asm
similarity index 100%
rename from gfx/pics/094/anim0.asm
rename to gfx/pics/gengar/anim0.asm
diff --git a/gfx/pics/094/anim1.asm b/gfx/pics/gengar/anim1.asm
similarity index 100%
rename from gfx/pics/094/anim1.asm
rename to gfx/pics/gengar/anim1.asm
diff --git a/gfx/pics/094/back.lz b/gfx/pics/gengar/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/094/back.lz
rename to gfx/pics/gengar/back.6x6.2bpp.lz
diff --git a/gfx/pics/094/bitmask.asm b/gfx/pics/gengar/bitmask.asm
similarity index 100%
rename from gfx/pics/094/bitmask.asm
rename to gfx/pics/gengar/bitmask.asm
diff --git a/gfx/pics/094/frames.asm b/gfx/pics/gengar/frames.asm
similarity index 100%
rename from gfx/pics/094/frames.asm
rename to gfx/pics/gengar/frames.asm
diff --git a/gfx/pics/094/front.lz b/gfx/pics/gengar/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/094/front.lz
rename to gfx/pics/gengar/front.6x6.2bpp.lz
diff --git a/gfx/pics/094/normal.pal b/gfx/pics/gengar/normal.pal
similarity index 100%
rename from gfx/pics/094/normal.pal
rename to gfx/pics/gengar/normal.pal
diff --git a/gfx/pics/094/shiny.pal b/gfx/pics/gengar/shiny.pal
similarity index 100%
rename from gfx/pics/094/shiny.pal
rename to gfx/pics/gengar/shiny.pal
diff --git a/gfx/pics/074/anim0.asm b/gfx/pics/geodude/anim0.asm
similarity index 100%
rename from gfx/pics/074/anim0.asm
rename to gfx/pics/geodude/anim0.asm
diff --git a/gfx/pics/074/anim1.asm b/gfx/pics/geodude/anim1.asm
similarity index 100%
rename from gfx/pics/074/anim1.asm
rename to gfx/pics/geodude/anim1.asm
diff --git a/gfx/pics/074/back.lz b/gfx/pics/geodude/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/074/back.lz
rename to gfx/pics/geodude/back.6x6.2bpp.lz
diff --git a/gfx/pics/074/bitmask.asm b/gfx/pics/geodude/bitmask.asm
similarity index 100%
rename from gfx/pics/074/bitmask.asm
rename to gfx/pics/geodude/bitmask.asm
diff --git a/gfx/pics/074/frames.asm b/gfx/pics/geodude/frames.asm
similarity index 100%
rename from gfx/pics/074/frames.asm
rename to gfx/pics/geodude/frames.asm
diff --git a/gfx/pics/074/front.lz b/gfx/pics/geodude/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/074/front.lz
rename to gfx/pics/geodude/front.5x5.2bpp.lz
diff --git a/gfx/pics/074/normal.pal b/gfx/pics/geodude/normal.pal
similarity index 100%
rename from gfx/pics/074/normal.pal
rename to gfx/pics/geodude/normal.pal
diff --git a/gfx/pics/074/shiny.pal b/gfx/pics/geodude/shiny.pal
similarity index 100%
rename from gfx/pics/074/shiny.pal
rename to gfx/pics/geodude/shiny.pal
diff --git a/gfx/pics/203/anim0.asm b/gfx/pics/girafarig/anim0.asm
similarity index 100%
rename from gfx/pics/203/anim0.asm
rename to gfx/pics/girafarig/anim0.asm
diff --git a/gfx/pics/203/anim1.asm b/gfx/pics/girafarig/anim1.asm
similarity index 100%
rename from gfx/pics/203/anim1.asm
rename to gfx/pics/girafarig/anim1.asm
diff --git a/gfx/pics/203/back.lz b/gfx/pics/girafarig/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/203/back.lz
rename to gfx/pics/girafarig/back.6x6.2bpp.lz
diff --git a/gfx/pics/203/bitmask.asm b/gfx/pics/girafarig/bitmask.asm
similarity index 100%
rename from gfx/pics/203/bitmask.asm
rename to gfx/pics/girafarig/bitmask.asm
diff --git a/gfx/pics/203/frames.asm b/gfx/pics/girafarig/frames.asm
similarity index 100%
rename from gfx/pics/203/frames.asm
rename to gfx/pics/girafarig/frames.asm
diff --git a/gfx/pics/203/front.lz b/gfx/pics/girafarig/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/203/front.lz
rename to gfx/pics/girafarig/front.7x7.2bpp.lz
diff --git a/gfx/pics/203/normal.pal b/gfx/pics/girafarig/normal.pal
similarity index 100%
rename from gfx/pics/203/normal.pal
rename to gfx/pics/girafarig/normal.pal
diff --git a/gfx/pics/203/shiny.pal b/gfx/pics/girafarig/shiny.pal
similarity index 100%
rename from gfx/pics/203/shiny.pal
rename to gfx/pics/girafarig/shiny.pal
diff --git a/gfx/pics/207/anim0.asm b/gfx/pics/gligar/anim0.asm
similarity index 100%
rename from gfx/pics/207/anim0.asm
rename to gfx/pics/gligar/anim0.asm
diff --git a/gfx/pics/207/anim1.asm b/gfx/pics/gligar/anim1.asm
similarity index 100%
rename from gfx/pics/207/anim1.asm
rename to gfx/pics/gligar/anim1.asm
diff --git a/gfx/pics/207/back.lz b/gfx/pics/gligar/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/207/back.lz
rename to gfx/pics/gligar/back.6x6.2bpp.lz
diff --git a/gfx/pics/207/bitmask.asm b/gfx/pics/gligar/bitmask.asm
similarity index 100%
rename from gfx/pics/207/bitmask.asm
rename to gfx/pics/gligar/bitmask.asm
diff --git a/gfx/pics/207/frames.asm b/gfx/pics/gligar/frames.asm
similarity index 100%
rename from gfx/pics/207/frames.asm
rename to gfx/pics/gligar/frames.asm
diff --git a/gfx/pics/207/front.lz b/gfx/pics/gligar/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/207/front.lz
rename to gfx/pics/gligar/front.6x6.2bpp.lz
diff --git a/gfx/pics/207/normal.pal b/gfx/pics/gligar/normal.pal
similarity index 100%
rename from gfx/pics/207/normal.pal
rename to gfx/pics/gligar/normal.pal
diff --git a/gfx/pics/207/shiny.pal b/gfx/pics/gligar/shiny.pal
similarity index 100%
rename from gfx/pics/207/shiny.pal
rename to gfx/pics/gligar/shiny.pal
diff --git a/gfx/pics/044/anim0.asm b/gfx/pics/gloom/anim0.asm
similarity index 100%
rename from gfx/pics/044/anim0.asm
rename to gfx/pics/gloom/anim0.asm
diff --git a/gfx/pics/044/anim1.asm b/gfx/pics/gloom/anim1.asm
similarity index 100%
rename from gfx/pics/044/anim1.asm
rename to gfx/pics/gloom/anim1.asm
diff --git a/gfx/pics/044/back.lz b/gfx/pics/gloom/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/044/back.lz
rename to gfx/pics/gloom/back.6x6.2bpp.lz
diff --git a/gfx/pics/044/bitmask.asm b/gfx/pics/gloom/bitmask.asm
similarity index 100%
rename from gfx/pics/044/bitmask.asm
rename to gfx/pics/gloom/bitmask.asm
diff --git a/gfx/pics/044/frames.asm b/gfx/pics/gloom/frames.asm
similarity index 100%
rename from gfx/pics/044/frames.asm
rename to gfx/pics/gloom/frames.asm
diff --git a/gfx/pics/044/front.lz b/gfx/pics/gloom/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/044/front.lz
rename to gfx/pics/gloom/front.6x6.2bpp.lz
diff --git a/gfx/pics/044/normal.pal b/gfx/pics/gloom/normal.pal
similarity index 100%
rename from gfx/pics/044/normal.pal
rename to gfx/pics/gloom/normal.pal
diff --git a/gfx/pics/044/shiny.pal b/gfx/pics/gloom/shiny.pal
similarity index 100%
rename from gfx/pics/044/shiny.pal
rename to gfx/pics/gloom/shiny.pal
diff --git a/gfx/pics/042/anim0.asm b/gfx/pics/golbat/anim0.asm
similarity index 100%
rename from gfx/pics/042/anim0.asm
rename to gfx/pics/golbat/anim0.asm
diff --git a/gfx/pics/042/anim1.asm b/gfx/pics/golbat/anim1.asm
similarity index 100%
rename from gfx/pics/042/anim1.asm
rename to gfx/pics/golbat/anim1.asm
diff --git a/gfx/pics/042/back.lz b/gfx/pics/golbat/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/042/back.lz
rename to gfx/pics/golbat/back.6x6.2bpp.lz
diff --git a/gfx/pics/042/bitmask.asm b/gfx/pics/golbat/bitmask.asm
similarity index 100%
rename from gfx/pics/042/bitmask.asm
rename to gfx/pics/golbat/bitmask.asm
diff --git a/gfx/pics/042/frames.asm b/gfx/pics/golbat/frames.asm
similarity index 100%
rename from gfx/pics/042/frames.asm
rename to gfx/pics/golbat/frames.asm
diff --git a/gfx/pics/042/front.lz b/gfx/pics/golbat/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/042/front.lz
rename to gfx/pics/golbat/front.7x7.2bpp.lz
diff --git a/gfx/pics/041/normal.pal b/gfx/pics/golbat/normal.pal
similarity index 100%
rename from gfx/pics/041/normal.pal
rename to gfx/pics/golbat/normal.pal
diff --git a/gfx/pics/169/shiny.pal b/gfx/pics/golbat/shiny.pal
similarity index 100%
rename from gfx/pics/169/shiny.pal
rename to gfx/pics/golbat/shiny.pal
diff --git a/gfx/pics/118/anim0.asm b/gfx/pics/goldeen/anim0.asm
similarity index 100%
rename from gfx/pics/118/anim0.asm
rename to gfx/pics/goldeen/anim0.asm
diff --git a/gfx/pics/118/anim1.asm b/gfx/pics/goldeen/anim1.asm
similarity index 100%
rename from gfx/pics/118/anim1.asm
rename to gfx/pics/goldeen/anim1.asm
diff --git a/gfx/pics/118/back.lz b/gfx/pics/goldeen/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/118/back.lz
rename to gfx/pics/goldeen/back.6x6.2bpp.lz
diff --git a/gfx/pics/118/bitmask.asm b/gfx/pics/goldeen/bitmask.asm
similarity index 100%
rename from gfx/pics/118/bitmask.asm
rename to gfx/pics/goldeen/bitmask.asm
diff --git a/gfx/pics/118/frames.asm b/gfx/pics/goldeen/frames.asm
similarity index 100%
rename from gfx/pics/118/frames.asm
rename to gfx/pics/goldeen/frames.asm
diff --git a/gfx/pics/118/front.lz b/gfx/pics/goldeen/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/118/front.lz
rename to gfx/pics/goldeen/front.6x6.2bpp.lz
diff --git a/gfx/pics/118/normal.pal b/gfx/pics/goldeen/normal.pal
similarity index 100%
rename from gfx/pics/118/normal.pal
rename to gfx/pics/goldeen/normal.pal
diff --git a/gfx/pics/118/shiny.pal b/gfx/pics/goldeen/shiny.pal
similarity index 100%
rename from gfx/pics/118/shiny.pal
rename to gfx/pics/goldeen/shiny.pal
diff --git a/gfx/pics/055/anim0.asm b/gfx/pics/golduck/anim0.asm
similarity index 100%
rename from gfx/pics/055/anim0.asm
rename to gfx/pics/golduck/anim0.asm
diff --git a/gfx/pics/055/anim1.asm b/gfx/pics/golduck/anim1.asm
similarity index 100%
rename from gfx/pics/055/anim1.asm
rename to gfx/pics/golduck/anim1.asm
diff --git a/gfx/pics/055/back.lz b/gfx/pics/golduck/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/055/back.lz
rename to gfx/pics/golduck/back.6x6.2bpp.lz
diff --git a/gfx/pics/055/bitmask.asm b/gfx/pics/golduck/bitmask.asm
similarity index 100%
rename from gfx/pics/055/bitmask.asm
rename to gfx/pics/golduck/bitmask.asm
diff --git a/gfx/pics/055/frames.asm b/gfx/pics/golduck/frames.asm
similarity index 100%
rename from gfx/pics/055/frames.asm
rename to gfx/pics/golduck/frames.asm
diff --git a/gfx/pics/055/front.lz b/gfx/pics/golduck/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/055/front.lz
rename to gfx/pics/golduck/front.7x7.2bpp.lz
diff --git a/gfx/pics/055/normal.pal b/gfx/pics/golduck/normal.pal
similarity index 100%
rename from gfx/pics/055/normal.pal
rename to gfx/pics/golduck/normal.pal
diff --git a/gfx/pics/055/shiny.pal b/gfx/pics/golduck/shiny.pal
similarity index 100%
rename from gfx/pics/055/shiny.pal
rename to gfx/pics/golduck/shiny.pal
diff --git a/gfx/pics/076/anim0.asm b/gfx/pics/golem/anim0.asm
similarity index 100%
rename from gfx/pics/076/anim0.asm
rename to gfx/pics/golem/anim0.asm
diff --git a/gfx/pics/076/anim1.asm b/gfx/pics/golem/anim1.asm
similarity index 100%
rename from gfx/pics/076/anim1.asm
rename to gfx/pics/golem/anim1.asm
diff --git a/gfx/pics/076/back.lz b/gfx/pics/golem/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/076/back.lz
rename to gfx/pics/golem/back.6x6.2bpp.lz
diff --git a/gfx/pics/076/bitmask.asm b/gfx/pics/golem/bitmask.asm
similarity index 100%
rename from gfx/pics/076/bitmask.asm
rename to gfx/pics/golem/bitmask.asm
diff --git a/gfx/pics/076/frames.asm b/gfx/pics/golem/frames.asm
similarity index 100%
rename from gfx/pics/076/frames.asm
rename to gfx/pics/golem/frames.asm
diff --git a/gfx/pics/076/front.lz b/gfx/pics/golem/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/076/front.lz
rename to gfx/pics/golem/front.6x6.2bpp.lz
diff --git a/gfx/pics/076/normal.pal b/gfx/pics/golem/normal.pal
similarity index 100%
rename from gfx/pics/076/normal.pal
rename to gfx/pics/golem/normal.pal
diff --git a/gfx/pics/076/shiny.pal b/gfx/pics/golem/shiny.pal
similarity index 100%
rename from gfx/pics/076/shiny.pal
rename to gfx/pics/golem/shiny.pal
diff --git a/gfx/pics/210/anim0.asm b/gfx/pics/granbull/anim0.asm
similarity index 100%
rename from gfx/pics/210/anim0.asm
rename to gfx/pics/granbull/anim0.asm
diff --git a/gfx/pics/210/anim1.asm b/gfx/pics/granbull/anim1.asm
similarity index 100%
rename from gfx/pics/210/anim1.asm
rename to gfx/pics/granbull/anim1.asm
diff --git a/gfx/pics/210/back.lz b/gfx/pics/granbull/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/210/back.lz
rename to gfx/pics/granbull/back.6x6.2bpp.lz
diff --git a/gfx/pics/210/bitmask.asm b/gfx/pics/granbull/bitmask.asm
similarity index 100%
rename from gfx/pics/210/bitmask.asm
rename to gfx/pics/granbull/bitmask.asm
diff --git a/gfx/pics/210/frames.asm b/gfx/pics/granbull/frames.asm
similarity index 100%
rename from gfx/pics/210/frames.asm
rename to gfx/pics/granbull/frames.asm
diff --git a/gfx/pics/210/front.lz b/gfx/pics/granbull/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/210/front.lz
rename to gfx/pics/granbull/front.6x6.2bpp.lz
diff --git a/gfx/pics/210/normal.pal b/gfx/pics/granbull/normal.pal
similarity index 100%
rename from gfx/pics/210/normal.pal
rename to gfx/pics/granbull/normal.pal
diff --git a/gfx/pics/210/shiny.pal b/gfx/pics/granbull/shiny.pal
similarity index 100%
rename from gfx/pics/210/shiny.pal
rename to gfx/pics/granbull/shiny.pal
diff --git a/gfx/pics/075/anim0.asm b/gfx/pics/graveler/anim0.asm
similarity index 100%
rename from gfx/pics/075/anim0.asm
rename to gfx/pics/graveler/anim0.asm
diff --git a/gfx/pics/075/anim1.asm b/gfx/pics/graveler/anim1.asm
similarity index 100%
rename from gfx/pics/075/anim1.asm
rename to gfx/pics/graveler/anim1.asm
diff --git a/gfx/pics/075/back.lz b/gfx/pics/graveler/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/075/back.lz
rename to gfx/pics/graveler/back.6x6.2bpp.lz
diff --git a/gfx/pics/075/bitmask.asm b/gfx/pics/graveler/bitmask.asm
similarity index 100%
rename from gfx/pics/075/bitmask.asm
rename to gfx/pics/graveler/bitmask.asm
diff --git a/gfx/pics/075/frames.asm b/gfx/pics/graveler/frames.asm
similarity index 100%
rename from gfx/pics/075/frames.asm
rename to gfx/pics/graveler/frames.asm
diff --git a/gfx/pics/075/front.lz b/gfx/pics/graveler/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/075/front.lz
rename to gfx/pics/graveler/front.6x6.2bpp.lz
diff --git a/gfx/pics/075/normal.pal b/gfx/pics/graveler/normal.pal
similarity index 100%
rename from gfx/pics/075/normal.pal
rename to gfx/pics/graveler/normal.pal
diff --git a/gfx/pics/075/shiny.pal b/gfx/pics/graveler/shiny.pal
similarity index 100%
rename from gfx/pics/075/shiny.pal
rename to gfx/pics/graveler/shiny.pal
diff --git a/gfx/pics/088/anim0.asm b/gfx/pics/grimer/anim0.asm
similarity index 100%
rename from gfx/pics/088/anim0.asm
rename to gfx/pics/grimer/anim0.asm
diff --git a/gfx/pics/088/anim1.asm b/gfx/pics/grimer/anim1.asm
similarity index 100%
rename from gfx/pics/088/anim1.asm
rename to gfx/pics/grimer/anim1.asm
diff --git a/gfx/pics/088/back.lz b/gfx/pics/grimer/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/088/back.lz
rename to gfx/pics/grimer/back.6x6.2bpp.lz
diff --git a/gfx/pics/088/bitmask.asm b/gfx/pics/grimer/bitmask.asm
similarity index 100%
rename from gfx/pics/088/bitmask.asm
rename to gfx/pics/grimer/bitmask.asm
diff --git a/gfx/pics/088/frames.asm b/gfx/pics/grimer/frames.asm
similarity index 100%
rename from gfx/pics/088/frames.asm
rename to gfx/pics/grimer/frames.asm
diff --git a/gfx/pics/088/front.lz b/gfx/pics/grimer/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/088/front.lz
rename to gfx/pics/grimer/front.5x5.2bpp.lz
diff --git a/gfx/pics/088/normal.pal b/gfx/pics/grimer/normal.pal
similarity index 100%
rename from gfx/pics/088/normal.pal
rename to gfx/pics/grimer/normal.pal
diff --git a/gfx/pics/088/shiny.pal b/gfx/pics/grimer/shiny.pal
similarity index 100%
rename from gfx/pics/088/shiny.pal
rename to gfx/pics/grimer/shiny.pal
diff --git a/gfx/pics/058/anim0.asm b/gfx/pics/growlithe/anim0.asm
similarity index 100%
rename from gfx/pics/058/anim0.asm
rename to gfx/pics/growlithe/anim0.asm
diff --git a/gfx/pics/058/anim1.asm b/gfx/pics/growlithe/anim1.asm
similarity index 100%
rename from gfx/pics/058/anim1.asm
rename to gfx/pics/growlithe/anim1.asm
diff --git a/gfx/pics/058/back.lz b/gfx/pics/growlithe/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/058/back.lz
rename to gfx/pics/growlithe/back.6x6.2bpp.lz
diff --git a/gfx/pics/058/bitmask.asm b/gfx/pics/growlithe/bitmask.asm
similarity index 100%
rename from gfx/pics/058/bitmask.asm
rename to gfx/pics/growlithe/bitmask.asm
diff --git a/gfx/pics/058/frames.asm b/gfx/pics/growlithe/frames.asm
similarity index 100%
rename from gfx/pics/058/frames.asm
rename to gfx/pics/growlithe/frames.asm
diff --git a/gfx/pics/058/front.lz b/gfx/pics/growlithe/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/058/front.lz
rename to gfx/pics/growlithe/front.5x5.2bpp.lz
diff --git a/gfx/pics/058/normal.pal b/gfx/pics/growlithe/normal.pal
similarity index 100%
rename from gfx/pics/058/normal.pal
rename to gfx/pics/growlithe/normal.pal
diff --git a/gfx/pics/058/shiny.pal b/gfx/pics/growlithe/shiny.pal
similarity index 100%
rename from gfx/pics/058/shiny.pal
rename to gfx/pics/growlithe/shiny.pal
diff --git a/gfx/pics/130/anim0.asm b/gfx/pics/gyarados/anim0.asm
similarity index 100%
rename from gfx/pics/130/anim0.asm
rename to gfx/pics/gyarados/anim0.asm
diff --git a/gfx/pics/130/anim1.asm b/gfx/pics/gyarados/anim1.asm
similarity index 100%
rename from gfx/pics/130/anim1.asm
rename to gfx/pics/gyarados/anim1.asm
diff --git a/gfx/pics/130/back.lz b/gfx/pics/gyarados/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/130/back.lz
rename to gfx/pics/gyarados/back.6x6.2bpp.lz
diff --git a/gfx/pics/130/bitmask.asm b/gfx/pics/gyarados/bitmask.asm
similarity index 100%
rename from gfx/pics/130/bitmask.asm
rename to gfx/pics/gyarados/bitmask.asm
diff --git a/gfx/pics/130/frames.asm b/gfx/pics/gyarados/frames.asm
similarity index 100%
rename from gfx/pics/130/frames.asm
rename to gfx/pics/gyarados/frames.asm
diff --git a/gfx/pics/130/front.lz b/gfx/pics/gyarados/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/130/front.lz
rename to gfx/pics/gyarados/front.7x7.2bpp.lz
diff --git a/gfx/pics/130/normal.pal b/gfx/pics/gyarados/normal.pal
similarity index 100%
rename from gfx/pics/130/normal.pal
rename to gfx/pics/gyarados/normal.pal
diff --git a/gfx/pics/130/shiny.pal b/gfx/pics/gyarados/shiny.pal
similarity index 100%
rename from gfx/pics/130/shiny.pal
rename to gfx/pics/gyarados/shiny.pal
diff --git a/gfx/pics/093/anim0.asm b/gfx/pics/haunter/anim0.asm
similarity index 100%
rename from gfx/pics/093/anim0.asm
rename to gfx/pics/haunter/anim0.asm
diff --git a/gfx/pics/093/anim1.asm b/gfx/pics/haunter/anim1.asm
similarity index 100%
rename from gfx/pics/093/anim1.asm
rename to gfx/pics/haunter/anim1.asm
diff --git a/gfx/pics/093/back.lz b/gfx/pics/haunter/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/093/back.lz
rename to gfx/pics/haunter/back.6x6.2bpp.lz
diff --git a/gfx/pics/093/bitmask.asm b/gfx/pics/haunter/bitmask.asm
similarity index 100%
rename from gfx/pics/093/bitmask.asm
rename to gfx/pics/haunter/bitmask.asm
diff --git a/gfx/pics/093/frames.asm b/gfx/pics/haunter/frames.asm
similarity index 100%
rename from gfx/pics/093/frames.asm
rename to gfx/pics/haunter/frames.asm
diff --git a/gfx/pics/093/front.lz b/gfx/pics/haunter/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/093/front.lz
rename to gfx/pics/haunter/front.6x6.2bpp.lz
diff --git a/gfx/pics/093/normal.pal b/gfx/pics/haunter/normal.pal
similarity index 100%
rename from gfx/pics/093/normal.pal
rename to gfx/pics/haunter/normal.pal
diff --git a/gfx/pics/093/shiny.pal b/gfx/pics/haunter/shiny.pal
similarity index 100%
rename from gfx/pics/093/shiny.pal
rename to gfx/pics/haunter/shiny.pal
diff --git a/gfx/pics/214/anim0.asm b/gfx/pics/heracross/anim0.asm
similarity index 100%
rename from gfx/pics/214/anim0.asm
rename to gfx/pics/heracross/anim0.asm
diff --git a/gfx/pics/214/anim1.asm b/gfx/pics/heracross/anim1.asm
similarity index 100%
rename from gfx/pics/214/anim1.asm
rename to gfx/pics/heracross/anim1.asm
diff --git a/gfx/pics/214/back.lz b/gfx/pics/heracross/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/214/back.lz
rename to gfx/pics/heracross/back.6x6.2bpp.lz
diff --git a/gfx/pics/214/bitmask.asm b/gfx/pics/heracross/bitmask.asm
similarity index 100%
rename from gfx/pics/214/bitmask.asm
rename to gfx/pics/heracross/bitmask.asm
diff --git a/gfx/pics/214/frames.asm b/gfx/pics/heracross/frames.asm
similarity index 100%
rename from gfx/pics/214/frames.asm
rename to gfx/pics/heracross/frames.asm
diff --git a/gfx/pics/214/front.lz b/gfx/pics/heracross/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/214/front.lz
rename to gfx/pics/heracross/front.6x6.2bpp.lz
diff --git a/gfx/pics/214/normal.pal b/gfx/pics/heracross/normal.pal
similarity index 100%
rename from gfx/pics/214/normal.pal
rename to gfx/pics/heracross/normal.pal
diff --git a/gfx/pics/214/shiny.pal b/gfx/pics/heracross/shiny.pal
similarity index 100%
rename from gfx/pics/214/shiny.pal
rename to gfx/pics/heracross/shiny.pal
diff --git a/gfx/pics/107/anim0.asm b/gfx/pics/hitmonchan/anim0.asm
similarity index 100%
rename from gfx/pics/107/anim0.asm
rename to gfx/pics/hitmonchan/anim0.asm
diff --git a/gfx/pics/107/anim1.asm b/gfx/pics/hitmonchan/anim1.asm
similarity index 100%
rename from gfx/pics/107/anim1.asm
rename to gfx/pics/hitmonchan/anim1.asm
diff --git a/gfx/pics/107/back.lz b/gfx/pics/hitmonchan/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/107/back.lz
rename to gfx/pics/hitmonchan/back.6x6.2bpp.lz
diff --git a/gfx/pics/107/bitmask.asm b/gfx/pics/hitmonchan/bitmask.asm
similarity index 100%
rename from gfx/pics/107/bitmask.asm
rename to gfx/pics/hitmonchan/bitmask.asm
diff --git a/gfx/pics/107/frames.asm b/gfx/pics/hitmonchan/frames.asm
similarity index 100%
rename from gfx/pics/107/frames.asm
rename to gfx/pics/hitmonchan/frames.asm
diff --git a/gfx/pics/107/front.lz b/gfx/pics/hitmonchan/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/107/front.lz
rename to gfx/pics/hitmonchan/front.6x6.2bpp.lz
diff --git a/gfx/pics/107/normal.pal b/gfx/pics/hitmonchan/normal.pal
similarity index 100%
rename from gfx/pics/107/normal.pal
rename to gfx/pics/hitmonchan/normal.pal
diff --git a/gfx/pics/107/shiny.pal b/gfx/pics/hitmonchan/shiny.pal
similarity index 100%
rename from gfx/pics/107/shiny.pal
rename to gfx/pics/hitmonchan/shiny.pal
diff --git a/gfx/pics/106/anim0.asm b/gfx/pics/hitmonlee/anim0.asm
similarity index 100%
rename from gfx/pics/106/anim0.asm
rename to gfx/pics/hitmonlee/anim0.asm
diff --git a/gfx/pics/106/anim1.asm b/gfx/pics/hitmonlee/anim1.asm
similarity index 100%
rename from gfx/pics/106/anim1.asm
rename to gfx/pics/hitmonlee/anim1.asm
diff --git a/gfx/pics/106/back.lz b/gfx/pics/hitmonlee/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/106/back.lz
rename to gfx/pics/hitmonlee/back.6x6.2bpp.lz
diff --git a/gfx/pics/106/bitmask.asm b/gfx/pics/hitmonlee/bitmask.asm
similarity index 100%
rename from gfx/pics/106/bitmask.asm
rename to gfx/pics/hitmonlee/bitmask.asm
diff --git a/gfx/pics/106/frames.asm b/gfx/pics/hitmonlee/frames.asm
similarity index 100%
rename from gfx/pics/106/frames.asm
rename to gfx/pics/hitmonlee/frames.asm
diff --git a/gfx/pics/106/front.lz b/gfx/pics/hitmonlee/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/106/front.lz
rename to gfx/pics/hitmonlee/front.7x7.2bpp.lz
diff --git a/gfx/pics/106/normal.pal b/gfx/pics/hitmonlee/normal.pal
similarity index 100%
rename from gfx/pics/106/normal.pal
rename to gfx/pics/hitmonlee/normal.pal
diff --git a/gfx/pics/106/shiny.pal b/gfx/pics/hitmonlee/shiny.pal
similarity index 100%
rename from gfx/pics/106/shiny.pal
rename to gfx/pics/hitmonlee/shiny.pal
diff --git a/gfx/pics/237/anim0.asm b/gfx/pics/hitmontop/anim0.asm
similarity index 100%
rename from gfx/pics/237/anim0.asm
rename to gfx/pics/hitmontop/anim0.asm
diff --git a/gfx/pics/237/anim1.asm b/gfx/pics/hitmontop/anim1.asm
similarity index 100%
rename from gfx/pics/237/anim1.asm
rename to gfx/pics/hitmontop/anim1.asm
diff --git a/gfx/pics/237/back.lz b/gfx/pics/hitmontop/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/237/back.lz
rename to gfx/pics/hitmontop/back.6x6.2bpp.lz
diff --git a/gfx/pics/237/bitmask.asm b/gfx/pics/hitmontop/bitmask.asm
similarity index 100%
rename from gfx/pics/237/bitmask.asm
rename to gfx/pics/hitmontop/bitmask.asm
diff --git a/gfx/pics/237/frames.asm b/gfx/pics/hitmontop/frames.asm
similarity index 100%
rename from gfx/pics/237/frames.asm
rename to gfx/pics/hitmontop/frames.asm
diff --git a/gfx/pics/237/front.lz b/gfx/pics/hitmontop/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/237/front.lz
rename to gfx/pics/hitmontop/front.7x7.2bpp.lz
diff --git a/gfx/pics/237/normal.pal b/gfx/pics/hitmontop/normal.pal
similarity index 100%
rename from gfx/pics/237/normal.pal
rename to gfx/pics/hitmontop/normal.pal
diff --git a/gfx/pics/237/shiny.pal b/gfx/pics/hitmontop/shiny.pal
similarity index 100%
rename from gfx/pics/237/shiny.pal
rename to gfx/pics/hitmontop/shiny.pal
diff --git a/gfx/pics/250/anim0.asm b/gfx/pics/ho_oh/anim0.asm
similarity index 100%
rename from gfx/pics/250/anim0.asm
rename to gfx/pics/ho_oh/anim0.asm
diff --git a/gfx/pics/250/anim1.asm b/gfx/pics/ho_oh/anim1.asm
similarity index 100%
rename from gfx/pics/250/anim1.asm
rename to gfx/pics/ho_oh/anim1.asm
diff --git a/gfx/pics/250/back.lz b/gfx/pics/ho_oh/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/250/back.lz
rename to gfx/pics/ho_oh/back.6x6.2bpp.lz
diff --git a/gfx/pics/250/bitmask.asm b/gfx/pics/ho_oh/bitmask.asm
similarity index 100%
rename from gfx/pics/250/bitmask.asm
rename to gfx/pics/ho_oh/bitmask.asm
diff --git a/gfx/pics/250/frames.asm b/gfx/pics/ho_oh/frames.asm
similarity index 100%
rename from gfx/pics/250/frames.asm
rename to gfx/pics/ho_oh/frames.asm
diff --git a/gfx/pics/250/front.lz b/gfx/pics/ho_oh/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/250/front.lz
rename to gfx/pics/ho_oh/front.7x7.2bpp.lz
diff --git a/gfx/pics/250/normal.pal b/gfx/pics/ho_oh/normal.pal
similarity index 100%
rename from gfx/pics/250/normal.pal
rename to gfx/pics/ho_oh/normal.pal
diff --git a/gfx/pics/250/shiny.pal b/gfx/pics/ho_oh/shiny.pal
similarity index 100%
rename from gfx/pics/250/shiny.pal
rename to gfx/pics/ho_oh/shiny.pal
diff --git a/gfx/pics/163/anim0.asm b/gfx/pics/hoothoot/anim0.asm
similarity index 100%
rename from gfx/pics/163/anim0.asm
rename to gfx/pics/hoothoot/anim0.asm
diff --git a/gfx/pics/163/anim1.asm b/gfx/pics/hoothoot/anim1.asm
similarity index 100%
rename from gfx/pics/163/anim1.asm
rename to gfx/pics/hoothoot/anim1.asm
diff --git a/gfx/pics/163/back.lz b/gfx/pics/hoothoot/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/163/back.lz
rename to gfx/pics/hoothoot/back.6x6.2bpp.lz
diff --git a/gfx/pics/163/bitmask.asm b/gfx/pics/hoothoot/bitmask.asm
similarity index 100%
rename from gfx/pics/163/bitmask.asm
rename to gfx/pics/hoothoot/bitmask.asm
diff --git a/gfx/pics/163/frames.asm b/gfx/pics/hoothoot/frames.asm
similarity index 100%
rename from gfx/pics/163/frames.asm
rename to gfx/pics/hoothoot/frames.asm
diff --git a/gfx/pics/163/front.lz b/gfx/pics/hoothoot/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/163/front.lz
rename to gfx/pics/hoothoot/front.5x5.2bpp.lz
diff --git a/gfx/pics/163/normal.pal b/gfx/pics/hoothoot/normal.pal
similarity index 100%
rename from gfx/pics/163/normal.pal
rename to gfx/pics/hoothoot/normal.pal
diff --git a/gfx/pics/163/shiny.pal b/gfx/pics/hoothoot/shiny.pal
similarity index 100%
rename from gfx/pics/163/shiny.pal
rename to gfx/pics/hoothoot/shiny.pal
diff --git a/gfx/pics/187/anim0.asm b/gfx/pics/hoppip/anim0.asm
similarity index 100%
rename from gfx/pics/187/anim0.asm
rename to gfx/pics/hoppip/anim0.asm
diff --git a/gfx/pics/187/anim1.asm b/gfx/pics/hoppip/anim1.asm
similarity index 100%
rename from gfx/pics/187/anim1.asm
rename to gfx/pics/hoppip/anim1.asm
diff --git a/gfx/pics/187/back.lz b/gfx/pics/hoppip/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/187/back.lz
rename to gfx/pics/hoppip/back.6x6.2bpp.lz
diff --git a/gfx/pics/187/bitmask.asm b/gfx/pics/hoppip/bitmask.asm
similarity index 100%
rename from gfx/pics/187/bitmask.asm
rename to gfx/pics/hoppip/bitmask.asm
diff --git a/gfx/pics/187/frames.asm b/gfx/pics/hoppip/frames.asm
similarity index 100%
rename from gfx/pics/187/frames.asm
rename to gfx/pics/hoppip/frames.asm
diff --git a/gfx/pics/187/front.lz b/gfx/pics/hoppip/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/187/front.lz
rename to gfx/pics/hoppip/front.5x5.2bpp.lz
diff --git a/gfx/pics/187/normal.pal b/gfx/pics/hoppip/normal.pal
similarity index 100%
rename from gfx/pics/187/normal.pal
rename to gfx/pics/hoppip/normal.pal
diff --git a/gfx/pics/187/shiny.pal b/gfx/pics/hoppip/shiny.pal
similarity index 100%
rename from gfx/pics/187/shiny.pal
rename to gfx/pics/hoppip/shiny.pal
diff --git a/gfx/pics/116/anim0.asm b/gfx/pics/horsea/anim0.asm
similarity index 100%
rename from gfx/pics/116/anim0.asm
rename to gfx/pics/horsea/anim0.asm
diff --git a/gfx/pics/116/anim1.asm b/gfx/pics/horsea/anim1.asm
similarity index 100%
rename from gfx/pics/116/anim1.asm
rename to gfx/pics/horsea/anim1.asm
diff --git a/gfx/pics/116/back.lz b/gfx/pics/horsea/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/116/back.lz
rename to gfx/pics/horsea/back.6x6.2bpp.lz
diff --git a/gfx/pics/116/bitmask.asm b/gfx/pics/horsea/bitmask.asm
similarity index 100%
rename from gfx/pics/116/bitmask.asm
rename to gfx/pics/horsea/bitmask.asm
diff --git a/gfx/pics/116/frames.asm b/gfx/pics/horsea/frames.asm
similarity index 100%
rename from gfx/pics/116/frames.asm
rename to gfx/pics/horsea/frames.asm
diff --git a/gfx/pics/116/front.lz b/gfx/pics/horsea/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/116/front.lz
rename to gfx/pics/horsea/front.5x5.2bpp.lz
diff --git a/gfx/pics/116/normal.pal b/gfx/pics/horsea/normal.pal
similarity index 100%
rename from gfx/pics/116/normal.pal
rename to gfx/pics/horsea/normal.pal
diff --git a/gfx/pics/116/shiny.pal b/gfx/pics/horsea/shiny.pal
similarity index 100%
rename from gfx/pics/116/shiny.pal
rename to gfx/pics/horsea/shiny.pal
diff --git a/gfx/pics/229/anim0.asm b/gfx/pics/houndoom/anim0.asm
similarity index 100%
rename from gfx/pics/229/anim0.asm
rename to gfx/pics/houndoom/anim0.asm
diff --git a/gfx/pics/229/anim1.asm b/gfx/pics/houndoom/anim1.asm
similarity index 100%
rename from gfx/pics/229/anim1.asm
rename to gfx/pics/houndoom/anim1.asm
diff --git a/gfx/pics/229/back.lz b/gfx/pics/houndoom/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/229/back.lz
rename to gfx/pics/houndoom/back.6x6.2bpp.lz
diff --git a/gfx/pics/229/bitmask.asm b/gfx/pics/houndoom/bitmask.asm
similarity index 100%
rename from gfx/pics/229/bitmask.asm
rename to gfx/pics/houndoom/bitmask.asm
diff --git a/gfx/pics/229/frames.asm b/gfx/pics/houndoom/frames.asm
similarity index 100%
rename from gfx/pics/229/frames.asm
rename to gfx/pics/houndoom/frames.asm
diff --git a/gfx/pics/229/front.lz b/gfx/pics/houndoom/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/229/front.lz
rename to gfx/pics/houndoom/front.7x7.2bpp.lz
diff --git a/gfx/pics/229/normal.pal b/gfx/pics/houndoom/normal.pal
similarity index 100%
rename from gfx/pics/229/normal.pal
rename to gfx/pics/houndoom/normal.pal
diff --git a/gfx/pics/229/shiny.pal b/gfx/pics/houndoom/shiny.pal
similarity index 100%
rename from gfx/pics/229/shiny.pal
rename to gfx/pics/houndoom/shiny.pal
diff --git a/gfx/pics/228/anim0.asm b/gfx/pics/houndour/anim0.asm
similarity index 100%
rename from gfx/pics/228/anim0.asm
rename to gfx/pics/houndour/anim0.asm
diff --git a/gfx/pics/228/anim1.asm b/gfx/pics/houndour/anim1.asm
similarity index 100%
rename from gfx/pics/228/anim1.asm
rename to gfx/pics/houndour/anim1.asm
diff --git a/gfx/pics/228/back.lz b/gfx/pics/houndour/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/228/back.lz
rename to gfx/pics/houndour/back.6x6.2bpp.lz
diff --git a/gfx/pics/228/bitmask.asm b/gfx/pics/houndour/bitmask.asm
similarity index 100%
rename from gfx/pics/228/bitmask.asm
rename to gfx/pics/houndour/bitmask.asm
diff --git a/gfx/pics/228/frames.asm b/gfx/pics/houndour/frames.asm
similarity index 100%
rename from gfx/pics/228/frames.asm
rename to gfx/pics/houndour/frames.asm
diff --git a/gfx/pics/228/front.lz b/gfx/pics/houndour/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/228/front.lz
rename to gfx/pics/houndour/front.6x6.2bpp.lz
diff --git a/gfx/pics/228/normal.pal b/gfx/pics/houndour/normal.pal
similarity index 100%
rename from gfx/pics/228/normal.pal
rename to gfx/pics/houndour/normal.pal
diff --git a/gfx/pics/228/shiny.pal b/gfx/pics/houndour/shiny.pal
similarity index 100%
rename from gfx/pics/228/shiny.pal
rename to gfx/pics/houndour/shiny.pal
diff --git a/gfx/pics/097/anim0.asm b/gfx/pics/hypno/anim0.asm
similarity index 100%
rename from gfx/pics/097/anim0.asm
rename to gfx/pics/hypno/anim0.asm
diff --git a/gfx/pics/097/anim1.asm b/gfx/pics/hypno/anim1.asm
similarity index 100%
rename from gfx/pics/097/anim1.asm
rename to gfx/pics/hypno/anim1.asm
diff --git a/gfx/pics/097/back.lz b/gfx/pics/hypno/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/097/back.lz
rename to gfx/pics/hypno/back.6x6.2bpp.lz
diff --git a/gfx/pics/097/bitmask.asm b/gfx/pics/hypno/bitmask.asm
similarity index 100%
rename from gfx/pics/097/bitmask.asm
rename to gfx/pics/hypno/bitmask.asm
diff --git a/gfx/pics/097/frames.asm b/gfx/pics/hypno/frames.asm
similarity index 100%
rename from gfx/pics/097/frames.asm
rename to gfx/pics/hypno/frames.asm
diff --git a/gfx/pics/097/front.lz b/gfx/pics/hypno/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/097/front.lz
rename to gfx/pics/hypno/front.7x7.2bpp.lz
diff --git a/gfx/pics/097/normal.pal b/gfx/pics/hypno/normal.pal
similarity index 100%
rename from gfx/pics/097/normal.pal
rename to gfx/pics/hypno/normal.pal
diff --git a/gfx/pics/097/shiny.pal b/gfx/pics/hypno/shiny.pal
similarity index 100%
rename from gfx/pics/097/shiny.pal
rename to gfx/pics/hypno/shiny.pal
diff --git a/gfx/pics/174/anim0.asm b/gfx/pics/igglybuff/anim0.asm
similarity index 100%
rename from gfx/pics/174/anim0.asm
rename to gfx/pics/igglybuff/anim0.asm
diff --git a/gfx/pics/174/anim1.asm b/gfx/pics/igglybuff/anim1.asm
similarity index 100%
rename from gfx/pics/174/anim1.asm
rename to gfx/pics/igglybuff/anim1.asm
diff --git a/gfx/pics/174/back.lz b/gfx/pics/igglybuff/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/174/back.lz
rename to gfx/pics/igglybuff/back.6x6.2bpp.lz
diff --git a/gfx/pics/174/bitmask.asm b/gfx/pics/igglybuff/bitmask.asm
similarity index 100%
rename from gfx/pics/174/bitmask.asm
rename to gfx/pics/igglybuff/bitmask.asm
diff --git a/gfx/pics/174/frames.asm b/gfx/pics/igglybuff/frames.asm
similarity index 100%
rename from gfx/pics/174/frames.asm
rename to gfx/pics/igglybuff/frames.asm
diff --git a/gfx/pics/174/front.lz b/gfx/pics/igglybuff/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/174/front.lz
rename to gfx/pics/igglybuff/front.5x5.2bpp.lz
diff --git a/gfx/pics/174/normal.pal b/gfx/pics/igglybuff/normal.pal
similarity index 100%
rename from gfx/pics/174/normal.pal
rename to gfx/pics/igglybuff/normal.pal
diff --git a/gfx/pics/039/shiny.pal b/gfx/pics/igglybuff/shiny.pal
similarity index 100%
rename from gfx/pics/039/shiny.pal
rename to gfx/pics/igglybuff/shiny.pal
diff --git a/gfx/pics/002/anim0.asm b/gfx/pics/ivysaur/anim0.asm
similarity index 100%
rename from gfx/pics/002/anim0.asm
rename to gfx/pics/ivysaur/anim0.asm
diff --git a/gfx/pics/002/anim1.asm b/gfx/pics/ivysaur/anim1.asm
similarity index 100%
rename from gfx/pics/002/anim1.asm
rename to gfx/pics/ivysaur/anim1.asm
diff --git a/gfx/pics/002/back.lz b/gfx/pics/ivysaur/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/002/back.lz
rename to gfx/pics/ivysaur/back.6x6.2bpp.lz
diff --git a/gfx/pics/002/bitmask.asm b/gfx/pics/ivysaur/bitmask.asm
similarity index 100%
rename from gfx/pics/002/bitmask.asm
rename to gfx/pics/ivysaur/bitmask.asm
diff --git a/gfx/pics/002/frames.asm b/gfx/pics/ivysaur/frames.asm
similarity index 100%
rename from gfx/pics/002/frames.asm
rename to gfx/pics/ivysaur/frames.asm
diff --git a/gfx/pics/002/front.lz b/gfx/pics/ivysaur/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/002/front.lz
rename to gfx/pics/ivysaur/front.6x6.2bpp.lz
diff --git a/gfx/pics/002/normal.pal b/gfx/pics/ivysaur/normal.pal
similarity index 100%
rename from gfx/pics/002/normal.pal
rename to gfx/pics/ivysaur/normal.pal
diff --git a/gfx/pics/002/shiny.pal b/gfx/pics/ivysaur/shiny.pal
similarity index 100%
rename from gfx/pics/002/shiny.pal
rename to gfx/pics/ivysaur/shiny.pal
diff --git a/gfx/pics/039/anim0.asm b/gfx/pics/jigglypuff/anim0.asm
similarity index 100%
rename from gfx/pics/039/anim0.asm
rename to gfx/pics/jigglypuff/anim0.asm
diff --git a/gfx/pics/039/anim1.asm b/gfx/pics/jigglypuff/anim1.asm
similarity index 100%
rename from gfx/pics/039/anim1.asm
rename to gfx/pics/jigglypuff/anim1.asm
diff --git a/gfx/pics/039/back.lz b/gfx/pics/jigglypuff/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/039/back.lz
rename to gfx/pics/jigglypuff/back.6x6.2bpp.lz
diff --git a/gfx/pics/039/bitmask.asm b/gfx/pics/jigglypuff/bitmask.asm
similarity index 100%
rename from gfx/pics/039/bitmask.asm
rename to gfx/pics/jigglypuff/bitmask.asm
diff --git a/gfx/pics/039/frames.asm b/gfx/pics/jigglypuff/frames.asm
similarity index 100%
rename from gfx/pics/039/frames.asm
rename to gfx/pics/jigglypuff/frames.asm
diff --git a/gfx/pics/039/front.lz b/gfx/pics/jigglypuff/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/039/front.lz
rename to gfx/pics/jigglypuff/front.5x5.2bpp.lz
diff --git a/gfx/pics/039/normal.pal b/gfx/pics/jigglypuff/normal.pal
similarity index 100%
rename from gfx/pics/039/normal.pal
rename to gfx/pics/jigglypuff/normal.pal
diff --git a/gfx/pics/040/shiny.pal b/gfx/pics/jigglypuff/shiny.pal
similarity index 100%
rename from gfx/pics/040/shiny.pal
rename to 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
similarity index 100%
rename from gfx/pics/135/anim0.asm
rename to gfx/pics/jolteon/anim0.asm
diff --git a/gfx/pics/135/anim1.asm b/gfx/pics/jolteon/anim1.asm
similarity index 100%
rename from gfx/pics/135/anim1.asm
rename to gfx/pics/jolteon/anim1.asm
diff --git a/gfx/pics/135/back.lz b/gfx/pics/jolteon/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/135/back.lz
rename to gfx/pics/jolteon/back.6x6.2bpp.lz
diff --git a/gfx/pics/135/bitmask.asm b/gfx/pics/jolteon/bitmask.asm
similarity index 100%
rename from gfx/pics/135/bitmask.asm
rename to gfx/pics/jolteon/bitmask.asm
diff --git a/gfx/pics/135/frames.asm b/gfx/pics/jolteon/frames.asm
similarity index 100%
rename from gfx/pics/135/frames.asm
rename to gfx/pics/jolteon/frames.asm
diff --git a/gfx/pics/135/front.lz b/gfx/pics/jolteon/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/135/front.lz
rename to gfx/pics/jolteon/front.6x6.2bpp.lz
diff --git a/gfx/pics/135/normal.pal b/gfx/pics/jolteon/normal.pal
similarity index 100%
rename from gfx/pics/135/normal.pal
rename to gfx/pics/jolteon/normal.pal
diff --git a/gfx/pics/135/shiny.pal b/gfx/pics/jolteon/shiny.pal
similarity index 100%
rename from gfx/pics/135/shiny.pal
rename to gfx/pics/jolteon/shiny.pal
diff --git a/gfx/pics/189/anim0.asm b/gfx/pics/jumpluff/anim0.asm
similarity index 100%
rename from gfx/pics/189/anim0.asm
rename to gfx/pics/jumpluff/anim0.asm
diff --git a/gfx/pics/189/anim1.asm b/gfx/pics/jumpluff/anim1.asm
similarity index 100%
rename from gfx/pics/189/anim1.asm
rename to gfx/pics/jumpluff/anim1.asm
diff --git a/gfx/pics/189/back.lz b/gfx/pics/jumpluff/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/189/back.lz
rename to gfx/pics/jumpluff/back.6x6.2bpp.lz
diff --git a/gfx/pics/189/bitmask.asm b/gfx/pics/jumpluff/bitmask.asm
similarity index 100%
rename from gfx/pics/189/bitmask.asm
rename to gfx/pics/jumpluff/bitmask.asm
diff --git a/gfx/pics/189/frames.asm b/gfx/pics/jumpluff/frames.asm
similarity index 100%
rename from gfx/pics/189/frames.asm
rename to gfx/pics/jumpluff/frames.asm
diff --git a/gfx/pics/189/front.lz b/gfx/pics/jumpluff/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/189/front.lz
rename to gfx/pics/jumpluff/front.7x7.2bpp.lz
diff --git a/gfx/pics/189/normal.pal b/gfx/pics/jumpluff/normal.pal
similarity index 100%
rename from gfx/pics/189/normal.pal
rename to gfx/pics/jumpluff/normal.pal
diff --git a/gfx/pics/189/shiny.pal b/gfx/pics/jumpluff/shiny.pal
similarity index 100%
rename from gfx/pics/189/shiny.pal
rename to gfx/pics/jumpluff/shiny.pal
diff --git a/gfx/pics/124/anim0.asm b/gfx/pics/jynx/anim0.asm
similarity index 100%
rename from gfx/pics/124/anim0.asm
rename to gfx/pics/jynx/anim0.asm
diff --git a/gfx/pics/124/anim1.asm b/gfx/pics/jynx/anim1.asm
similarity index 100%
rename from gfx/pics/124/anim1.asm
rename to gfx/pics/jynx/anim1.asm
diff --git a/gfx/pics/124/back.lz b/gfx/pics/jynx/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/124/back.lz
rename to gfx/pics/jynx/back.6x6.2bpp.lz
diff --git a/gfx/pics/124/bitmask.asm b/gfx/pics/jynx/bitmask.asm
similarity index 100%
rename from gfx/pics/124/bitmask.asm
rename to gfx/pics/jynx/bitmask.asm
diff --git a/gfx/pics/124/frames.asm b/gfx/pics/jynx/frames.asm
similarity index 100%
rename from gfx/pics/124/frames.asm
rename to gfx/pics/jynx/frames.asm
diff --git a/gfx/pics/124/front.lz b/gfx/pics/jynx/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/124/front.lz
rename to gfx/pics/jynx/front.6x6.2bpp.lz
diff --git a/gfx/pics/124/normal.pal b/gfx/pics/jynx/normal.pal
similarity index 100%
rename from gfx/pics/124/normal.pal
rename to gfx/pics/jynx/normal.pal
diff --git a/gfx/pics/124/shiny.pal b/gfx/pics/jynx/shiny.pal
similarity index 100%
rename from gfx/pics/124/shiny.pal
rename to gfx/pics/jynx/shiny.pal
diff --git a/gfx/pics/140/anim0.asm b/gfx/pics/kabuto/anim0.asm
similarity index 100%
rename from gfx/pics/140/anim0.asm
rename to gfx/pics/kabuto/anim0.asm
diff --git a/gfx/pics/140/anim1.asm b/gfx/pics/kabuto/anim1.asm
similarity index 100%
rename from gfx/pics/140/anim1.asm
rename to gfx/pics/kabuto/anim1.asm
diff --git a/gfx/pics/140/back.lz b/gfx/pics/kabuto/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/140/back.lz
rename to gfx/pics/kabuto/back.6x6.2bpp.lz
diff --git a/gfx/pics/140/bitmask.asm b/gfx/pics/kabuto/bitmask.asm
similarity index 100%
rename from gfx/pics/140/bitmask.asm
rename to gfx/pics/kabuto/bitmask.asm
diff --git a/gfx/pics/140/frames.asm b/gfx/pics/kabuto/frames.asm
similarity index 100%
rename from gfx/pics/140/frames.asm
rename to gfx/pics/kabuto/frames.asm
diff --git a/gfx/pics/140/front.lz b/gfx/pics/kabuto/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/140/front.lz
rename to gfx/pics/kabuto/front.5x5.2bpp.lz
diff --git a/gfx/pics/140/normal.pal b/gfx/pics/kabuto/normal.pal
similarity index 100%
rename from gfx/pics/140/normal.pal
rename to gfx/pics/kabuto/normal.pal
diff --git a/gfx/pics/140/shiny.pal b/gfx/pics/kabuto/shiny.pal
similarity index 100%
rename from gfx/pics/140/shiny.pal
rename to gfx/pics/kabuto/shiny.pal
diff --git a/gfx/pics/141/anim0.asm b/gfx/pics/kabutops/anim0.asm
similarity index 100%
rename from gfx/pics/141/anim0.asm
rename to gfx/pics/kabutops/anim0.asm
diff --git a/gfx/pics/141/anim1.asm b/gfx/pics/kabutops/anim1.asm
similarity index 100%
rename from gfx/pics/141/anim1.asm
rename to gfx/pics/kabutops/anim1.asm
diff --git a/gfx/pics/141/back.lz b/gfx/pics/kabutops/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/141/back.lz
rename to gfx/pics/kabutops/back.6x6.2bpp.lz
diff --git a/gfx/pics/141/bitmask.asm b/gfx/pics/kabutops/bitmask.asm
similarity index 100%
rename from gfx/pics/141/bitmask.asm
rename to gfx/pics/kabutops/bitmask.asm
diff --git a/gfx/pics/141/frames.asm b/gfx/pics/kabutops/frames.asm
similarity index 100%
rename from gfx/pics/141/frames.asm
rename to gfx/pics/kabutops/frames.asm
diff --git a/gfx/pics/141/front.lz b/gfx/pics/kabutops/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/141/front.lz
rename to gfx/pics/kabutops/front.6x6.2bpp.lz
diff --git a/gfx/pics/141/normal.pal b/gfx/pics/kabutops/normal.pal
similarity index 100%
rename from gfx/pics/141/normal.pal
rename to gfx/pics/kabutops/normal.pal
diff --git a/gfx/pics/141/shiny.pal b/gfx/pics/kabutops/shiny.pal
similarity index 100%
rename from gfx/pics/141/shiny.pal
rename to gfx/pics/kabutops/shiny.pal
diff --git a/gfx/pics/064/anim0.asm b/gfx/pics/kadabra/anim0.asm
similarity index 100%
rename from gfx/pics/064/anim0.asm
rename to gfx/pics/kadabra/anim0.asm
diff --git a/gfx/pics/064/anim1.asm b/gfx/pics/kadabra/anim1.asm
similarity index 100%
rename from gfx/pics/064/anim1.asm
rename to gfx/pics/kadabra/anim1.asm
diff --git a/gfx/pics/064/back.lz b/gfx/pics/kadabra/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/064/back.lz
rename to gfx/pics/kadabra/back.6x6.2bpp.lz
diff --git a/gfx/pics/064/bitmask.asm b/gfx/pics/kadabra/bitmask.asm
similarity index 100%
rename from gfx/pics/064/bitmask.asm
rename to gfx/pics/kadabra/bitmask.asm
diff --git a/gfx/pics/064/frames.asm b/gfx/pics/kadabra/frames.asm
similarity index 100%
rename from gfx/pics/064/frames.asm
rename to gfx/pics/kadabra/frames.asm
diff --git a/gfx/pics/064/front.lz b/gfx/pics/kadabra/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/064/front.lz
rename to gfx/pics/kadabra/front.6x6.2bpp.lz
diff --git a/gfx/pics/065/normal.pal b/gfx/pics/kadabra/normal.pal
similarity index 100%
rename from gfx/pics/065/normal.pal
rename to gfx/pics/kadabra/normal.pal
diff --git a/gfx/pics/064/shiny.pal b/gfx/pics/kadabra/shiny.pal
similarity index 100%
rename from gfx/pics/064/shiny.pal
rename to gfx/pics/kadabra/shiny.pal
diff --git a/gfx/pics/014/anim0.asm b/gfx/pics/kakuna/anim0.asm
similarity index 100%
rename from gfx/pics/014/anim0.asm
rename to gfx/pics/kakuna/anim0.asm
diff --git a/gfx/pics/014/anim1.asm b/gfx/pics/kakuna/anim1.asm
similarity index 100%
rename from gfx/pics/014/anim1.asm
rename to gfx/pics/kakuna/anim1.asm
diff --git a/gfx/pics/014/back.lz b/gfx/pics/kakuna/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/014/back.lz
rename to gfx/pics/kakuna/back.6x6.2bpp.lz
diff --git a/gfx/pics/014/bitmask.asm b/gfx/pics/kakuna/bitmask.asm
similarity index 100%
rename from gfx/pics/014/bitmask.asm
rename to gfx/pics/kakuna/bitmask.asm
diff --git a/gfx/pics/014/frames.asm b/gfx/pics/kakuna/frames.asm
similarity index 100%
rename from gfx/pics/014/frames.asm
rename to gfx/pics/kakuna/frames.asm
diff --git a/gfx/pics/014/front.lz b/gfx/pics/kakuna/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/014/front.lz
rename to gfx/pics/kakuna/front.5x5.2bpp.lz
diff --git a/gfx/pics/014/normal.pal b/gfx/pics/kakuna/normal.pal
similarity index 100%
rename from gfx/pics/014/normal.pal
rename to gfx/pics/kakuna/normal.pal
diff --git a/gfx/pics/014/shiny.pal b/gfx/pics/kakuna/shiny.pal
similarity index 100%
rename from gfx/pics/014/shiny.pal
rename to gfx/pics/kakuna/shiny.pal
diff --git a/gfx/pics/115/anim0.asm b/gfx/pics/kangaskhan/anim0.asm
similarity index 100%
rename from gfx/pics/115/anim0.asm
rename to gfx/pics/kangaskhan/anim0.asm
diff --git a/gfx/pics/115/anim1.asm b/gfx/pics/kangaskhan/anim1.asm
similarity index 100%
rename from gfx/pics/115/anim1.asm
rename to gfx/pics/kangaskhan/anim1.asm
diff --git a/gfx/pics/115/back.lz b/gfx/pics/kangaskhan/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/115/back.lz
rename to gfx/pics/kangaskhan/back.6x6.2bpp.lz
diff --git a/gfx/pics/115/bitmask.asm b/gfx/pics/kangaskhan/bitmask.asm
similarity index 100%
rename from gfx/pics/115/bitmask.asm
rename to gfx/pics/kangaskhan/bitmask.asm
diff --git a/gfx/pics/115/frames.asm b/gfx/pics/kangaskhan/frames.asm
similarity index 100%
rename from gfx/pics/115/frames.asm
rename to gfx/pics/kangaskhan/frames.asm
diff --git a/gfx/pics/115/front.lz b/gfx/pics/kangaskhan/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/115/front.lz
rename to gfx/pics/kangaskhan/front.7x7.2bpp.lz
diff --git a/gfx/pics/115/normal.pal b/gfx/pics/kangaskhan/normal.pal
similarity index 100%
rename from gfx/pics/115/normal.pal
rename to gfx/pics/kangaskhan/normal.pal
diff --git a/gfx/pics/115/shiny.pal b/gfx/pics/kangaskhan/shiny.pal
similarity index 100%
rename from gfx/pics/115/shiny.pal
rename to 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
similarity index 100%
rename from gfx/pics/230/anim0.asm
rename to gfx/pics/kingdra/anim0.asm
diff --git a/gfx/pics/230/anim1.asm b/gfx/pics/kingdra/anim1.asm
similarity index 100%
rename from gfx/pics/230/anim1.asm
rename to gfx/pics/kingdra/anim1.asm
diff --git a/gfx/pics/230/back.lz b/gfx/pics/kingdra/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/230/back.lz
rename to gfx/pics/kingdra/back.6x6.2bpp.lz
diff --git a/gfx/pics/230/bitmask.asm b/gfx/pics/kingdra/bitmask.asm
similarity index 100%
rename from gfx/pics/230/bitmask.asm
rename to gfx/pics/kingdra/bitmask.asm
diff --git a/gfx/pics/230/frames.asm b/gfx/pics/kingdra/frames.asm
similarity index 100%
rename from gfx/pics/230/frames.asm
rename to gfx/pics/kingdra/frames.asm
diff --git a/gfx/pics/230/front.lz b/gfx/pics/kingdra/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/230/front.lz
rename to gfx/pics/kingdra/front.7x7.2bpp.lz
diff --git a/gfx/pics/230/normal.pal b/gfx/pics/kingdra/normal.pal
similarity index 100%
rename from gfx/pics/230/normal.pal
rename to gfx/pics/kingdra/normal.pal
diff --git a/gfx/pics/230/shiny.pal b/gfx/pics/kingdra/shiny.pal
similarity index 100%
rename from gfx/pics/230/shiny.pal
rename to gfx/pics/kingdra/shiny.pal
diff --git a/gfx/pics/099/anim0.asm b/gfx/pics/kingler/anim0.asm
similarity index 100%
rename from gfx/pics/099/anim0.asm
rename to gfx/pics/kingler/anim0.asm
diff --git a/gfx/pics/099/anim1.asm b/gfx/pics/kingler/anim1.asm
similarity index 100%
rename from gfx/pics/099/anim1.asm
rename to gfx/pics/kingler/anim1.asm
diff --git a/gfx/pics/099/back.lz b/gfx/pics/kingler/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/099/back.lz
rename to gfx/pics/kingler/back.6x6.2bpp.lz
diff --git a/gfx/pics/099/bitmask.asm b/gfx/pics/kingler/bitmask.asm
similarity index 100%
rename from gfx/pics/099/bitmask.asm
rename to gfx/pics/kingler/bitmask.asm
diff --git a/gfx/pics/099/frames.asm b/gfx/pics/kingler/frames.asm
similarity index 100%
rename from gfx/pics/099/frames.asm
rename to gfx/pics/kingler/frames.asm
diff --git a/gfx/pics/099/front.lz b/gfx/pics/kingler/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/099/front.lz
rename to gfx/pics/kingler/front.7x7.2bpp.lz
diff --git a/gfx/pics/098/normal.pal b/gfx/pics/kingler/normal.pal
similarity index 100%
rename from gfx/pics/098/normal.pal
rename to gfx/pics/kingler/normal.pal
diff --git a/gfx/pics/099/shiny.pal b/gfx/pics/kingler/shiny.pal
similarity index 100%
rename from gfx/pics/099/shiny.pal
rename to gfx/pics/kingler/shiny.pal
diff --git a/gfx/pics/109/anim0.asm b/gfx/pics/koffing/anim0.asm
similarity index 100%
rename from gfx/pics/109/anim0.asm
rename to gfx/pics/koffing/anim0.asm
diff --git a/gfx/pics/109/anim1.asm b/gfx/pics/koffing/anim1.asm
similarity index 100%
rename from gfx/pics/109/anim1.asm
rename to gfx/pics/koffing/anim1.asm
diff --git a/gfx/pics/109/back.lz b/gfx/pics/koffing/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/109/back.lz
rename to gfx/pics/koffing/back.6x6.2bpp.lz
diff --git a/gfx/pics/109/bitmask.asm b/gfx/pics/koffing/bitmask.asm
similarity index 100%
rename from gfx/pics/109/bitmask.asm
rename to gfx/pics/koffing/bitmask.asm
diff --git a/gfx/pics/109/frames.asm b/gfx/pics/koffing/frames.asm
similarity index 100%
rename from gfx/pics/109/frames.asm
rename to gfx/pics/koffing/frames.asm
diff --git a/gfx/pics/109/front.lz b/gfx/pics/koffing/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/109/front.lz
rename to gfx/pics/koffing/front.6x6.2bpp.lz
diff --git a/gfx/pics/109/normal.pal b/gfx/pics/koffing/normal.pal
similarity index 100%
rename from gfx/pics/109/normal.pal
rename to gfx/pics/koffing/normal.pal
diff --git a/gfx/pics/109/shiny.pal b/gfx/pics/koffing/shiny.pal
similarity index 100%
rename from gfx/pics/109/shiny.pal
rename to gfx/pics/koffing/shiny.pal
diff --git a/gfx/pics/098/anim0.asm b/gfx/pics/krabby/anim0.asm
similarity index 100%
rename from gfx/pics/098/anim0.asm
rename to gfx/pics/krabby/anim0.asm
diff --git a/gfx/pics/098/anim1.asm b/gfx/pics/krabby/anim1.asm
similarity index 100%
rename from gfx/pics/098/anim1.asm
rename to gfx/pics/krabby/anim1.asm
diff --git a/gfx/pics/098/back.lz b/gfx/pics/krabby/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/098/back.lz
rename to gfx/pics/krabby/back.6x6.2bpp.lz
diff --git a/gfx/pics/098/bitmask.asm b/gfx/pics/krabby/bitmask.asm
similarity index 100%
rename from gfx/pics/098/bitmask.asm
rename to gfx/pics/krabby/bitmask.asm
diff --git a/gfx/pics/098/frames.asm b/gfx/pics/krabby/frames.asm
similarity index 100%
rename from gfx/pics/098/frames.asm
rename to gfx/pics/krabby/frames.asm
diff --git a/gfx/pics/098/front.lz b/gfx/pics/krabby/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/098/front.lz
rename to gfx/pics/krabby/front.5x5.2bpp.lz
diff --git a/gfx/pics/099/normal.pal b/gfx/pics/krabby/normal.pal
similarity index 100%
rename from gfx/pics/099/normal.pal
rename to gfx/pics/krabby/normal.pal
diff --git a/gfx/pics/098/shiny.pal b/gfx/pics/krabby/shiny.pal
similarity index 100%
rename from gfx/pics/098/shiny.pal
rename to gfx/pics/krabby/shiny.pal
diff --git a/gfx/pics/171/anim0.asm b/gfx/pics/lanturn/anim0.asm
similarity index 100%
rename from gfx/pics/171/anim0.asm
rename to gfx/pics/lanturn/anim0.asm
diff --git a/gfx/pics/171/anim1.asm b/gfx/pics/lanturn/anim1.asm
similarity index 100%
rename from gfx/pics/171/anim1.asm
rename to gfx/pics/lanturn/anim1.asm
diff --git a/gfx/pics/171/back.lz b/gfx/pics/lanturn/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/171/back.lz
rename to gfx/pics/lanturn/back.6x6.2bpp.lz
diff --git a/gfx/pics/171/bitmask.asm b/gfx/pics/lanturn/bitmask.asm
similarity index 100%
rename from gfx/pics/171/bitmask.asm
rename to gfx/pics/lanturn/bitmask.asm
diff --git a/gfx/pics/171/frames.asm b/gfx/pics/lanturn/frames.asm
similarity index 100%
rename from gfx/pics/171/frames.asm
rename to gfx/pics/lanturn/frames.asm
diff --git a/gfx/pics/171/front.lz b/gfx/pics/lanturn/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/171/front.lz
rename to gfx/pics/lanturn/front.6x6.2bpp.lz
diff --git a/gfx/pics/171/normal.pal b/gfx/pics/lanturn/normal.pal
similarity index 100%
rename from gfx/pics/171/normal.pal
rename to gfx/pics/lanturn/normal.pal
diff --git a/gfx/pics/171/shiny.pal b/gfx/pics/lanturn/shiny.pal
similarity index 100%
rename from gfx/pics/171/shiny.pal
rename to gfx/pics/lanturn/shiny.pal
diff --git a/gfx/pics/131/anim0.asm b/gfx/pics/lapras/anim0.asm
similarity index 100%
rename from gfx/pics/131/anim0.asm
rename to gfx/pics/lapras/anim0.asm
diff --git a/gfx/pics/131/anim1.asm b/gfx/pics/lapras/anim1.asm
similarity index 100%
rename from gfx/pics/131/anim1.asm
rename to gfx/pics/lapras/anim1.asm
diff --git a/gfx/pics/131/back.lz b/gfx/pics/lapras/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/131/back.lz
rename to gfx/pics/lapras/back.6x6.2bpp.lz
diff --git a/gfx/pics/131/bitmask.asm b/gfx/pics/lapras/bitmask.asm
similarity index 100%
rename from gfx/pics/131/bitmask.asm
rename to gfx/pics/lapras/bitmask.asm
diff --git a/gfx/pics/131/frames.asm b/gfx/pics/lapras/frames.asm
similarity index 100%
rename from gfx/pics/131/frames.asm
rename to gfx/pics/lapras/frames.asm
diff --git a/gfx/pics/131/front.lz b/gfx/pics/lapras/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/131/front.lz
rename to gfx/pics/lapras/front.7x7.2bpp.lz
diff --git a/gfx/pics/131/normal.pal b/gfx/pics/lapras/normal.pal
similarity index 100%
rename from gfx/pics/131/normal.pal
rename to gfx/pics/lapras/normal.pal
diff --git a/gfx/pics/131/shiny.pal b/gfx/pics/lapras/shiny.pal
similarity index 100%
rename from gfx/pics/131/shiny.pal
rename to gfx/pics/lapras/shiny.pal
diff --git a/gfx/pics/246/anim0.asm b/gfx/pics/larvitar/anim0.asm
similarity index 100%
rename from gfx/pics/246/anim0.asm
rename to gfx/pics/larvitar/anim0.asm
diff --git a/gfx/pics/246/anim1.asm b/gfx/pics/larvitar/anim1.asm
similarity index 100%
rename from gfx/pics/246/anim1.asm
rename to gfx/pics/larvitar/anim1.asm
diff --git a/gfx/pics/246/back.lz b/gfx/pics/larvitar/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/246/back.lz
rename to gfx/pics/larvitar/back.6x6.2bpp.lz
diff --git a/gfx/pics/246/bitmask.asm b/gfx/pics/larvitar/bitmask.asm
similarity index 100%
rename from gfx/pics/246/bitmask.asm
rename to gfx/pics/larvitar/bitmask.asm
diff --git a/gfx/pics/246/frames.asm b/gfx/pics/larvitar/frames.asm
similarity index 100%
rename from gfx/pics/246/frames.asm
rename to gfx/pics/larvitar/frames.asm
diff --git a/gfx/pics/246/front.lz b/gfx/pics/larvitar/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/246/front.lz
rename to gfx/pics/larvitar/front.5x5.2bpp.lz
diff --git a/gfx/pics/246/normal.pal b/gfx/pics/larvitar/normal.pal
similarity index 100%
rename from gfx/pics/246/normal.pal
rename to gfx/pics/larvitar/normal.pal
diff --git a/gfx/pics/246/shiny.pal b/gfx/pics/larvitar/shiny.pal
similarity index 100%
rename from gfx/pics/246/shiny.pal
rename to gfx/pics/larvitar/shiny.pal
diff --git a/gfx/pics/166/anim0.asm b/gfx/pics/ledian/anim0.asm
similarity index 100%
rename from gfx/pics/166/anim0.asm
rename to gfx/pics/ledian/anim0.asm
diff --git a/gfx/pics/166/anim1.asm b/gfx/pics/ledian/anim1.asm
similarity index 100%
rename from gfx/pics/166/anim1.asm
rename to gfx/pics/ledian/anim1.asm
diff --git a/gfx/pics/166/back.lz b/gfx/pics/ledian/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/166/back.lz
rename to gfx/pics/ledian/back.6x6.2bpp.lz
diff --git a/gfx/pics/166/bitmask.asm b/gfx/pics/ledian/bitmask.asm
similarity index 100%
rename from gfx/pics/166/bitmask.asm
rename to gfx/pics/ledian/bitmask.asm
diff --git a/gfx/pics/166/frames.asm b/gfx/pics/ledian/frames.asm
similarity index 100%
rename from gfx/pics/166/frames.asm
rename to gfx/pics/ledian/frames.asm
diff --git a/gfx/pics/166/front.lz b/gfx/pics/ledian/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/166/front.lz
rename to gfx/pics/ledian/front.6x6.2bpp.lz
diff --git a/gfx/pics/166/normal.pal b/gfx/pics/ledian/normal.pal
similarity index 100%
rename from gfx/pics/166/normal.pal
rename to gfx/pics/ledian/normal.pal
diff --git a/gfx/pics/165/shiny.pal b/gfx/pics/ledian/shiny.pal
similarity index 100%
rename from gfx/pics/165/shiny.pal
rename to gfx/pics/ledian/shiny.pal
diff --git a/gfx/pics/165/anim0.asm b/gfx/pics/ledyba/anim0.asm
similarity index 100%
rename from gfx/pics/165/anim0.asm
rename to gfx/pics/ledyba/anim0.asm
diff --git a/gfx/pics/165/anim1.asm b/gfx/pics/ledyba/anim1.asm
similarity index 100%
rename from gfx/pics/165/anim1.asm
rename to gfx/pics/ledyba/anim1.asm
diff --git a/gfx/pics/165/back.lz b/gfx/pics/ledyba/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/165/back.lz
rename to gfx/pics/ledyba/back.6x6.2bpp.lz
diff --git a/gfx/pics/165/bitmask.asm b/gfx/pics/ledyba/bitmask.asm
similarity index 100%
rename from gfx/pics/165/bitmask.asm
rename to gfx/pics/ledyba/bitmask.asm
diff --git a/gfx/pics/165/frames.asm b/gfx/pics/ledyba/frames.asm
similarity index 100%
rename from gfx/pics/165/frames.asm
rename to gfx/pics/ledyba/frames.asm
diff --git a/gfx/pics/165/front.lz b/gfx/pics/ledyba/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/165/front.lz
rename to gfx/pics/ledyba/front.6x6.2bpp.lz
diff --git a/gfx/pics/165/normal.pal b/gfx/pics/ledyba/normal.pal
similarity index 100%
rename from gfx/pics/165/normal.pal
rename to gfx/pics/ledyba/normal.pal
diff --git a/gfx/pics/166/shiny.pal b/gfx/pics/ledyba/shiny.pal
similarity index 100%
rename from gfx/pics/166/shiny.pal
rename to gfx/pics/ledyba/shiny.pal
diff --git a/gfx/pics/108/anim0.asm b/gfx/pics/lickitung/anim0.asm
similarity index 100%
rename from gfx/pics/108/anim0.asm
rename to gfx/pics/lickitung/anim0.asm
diff --git a/gfx/pics/108/anim1.asm b/gfx/pics/lickitung/anim1.asm
similarity index 100%
rename from gfx/pics/108/anim1.asm
rename to gfx/pics/lickitung/anim1.asm
diff --git a/gfx/pics/108/back.lz b/gfx/pics/lickitung/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/108/back.lz
rename to gfx/pics/lickitung/back.6x6.2bpp.lz
diff --git a/gfx/pics/108/bitmask.asm b/gfx/pics/lickitung/bitmask.asm
similarity index 100%
rename from gfx/pics/108/bitmask.asm
rename to gfx/pics/lickitung/bitmask.asm
diff --git a/gfx/pics/108/frames.asm b/gfx/pics/lickitung/frames.asm
similarity index 100%
rename from gfx/pics/108/frames.asm
rename to gfx/pics/lickitung/frames.asm
diff --git a/gfx/pics/108/front.lz b/gfx/pics/lickitung/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/108/front.lz
rename to gfx/pics/lickitung/front.7x7.2bpp.lz
diff --git a/gfx/pics/108/normal.pal b/gfx/pics/lickitung/normal.pal
similarity index 100%
rename from gfx/pics/108/normal.pal
rename to gfx/pics/lickitung/normal.pal
diff --git a/gfx/pics/108/shiny.pal b/gfx/pics/lickitung/shiny.pal
similarity index 100%
rename from gfx/pics/108/shiny.pal
rename to gfx/pics/lickitung/shiny.pal
diff --git a/gfx/pics/249/anim0.asm b/gfx/pics/lugia/anim0.asm
similarity index 100%
rename from gfx/pics/249/anim0.asm
rename to gfx/pics/lugia/anim0.asm
diff --git a/gfx/pics/249/anim1.asm b/gfx/pics/lugia/anim1.asm
similarity index 100%
rename from gfx/pics/249/anim1.asm
rename to gfx/pics/lugia/anim1.asm
diff --git a/gfx/pics/249/back.lz b/gfx/pics/lugia/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/249/back.lz
rename to gfx/pics/lugia/back.6x6.2bpp.lz
diff --git a/gfx/pics/249/bitmask.asm b/gfx/pics/lugia/bitmask.asm
similarity index 100%
rename from gfx/pics/249/bitmask.asm
rename to gfx/pics/lugia/bitmask.asm
diff --git a/gfx/pics/249/frames.asm b/gfx/pics/lugia/frames.asm
similarity index 100%
rename from gfx/pics/249/frames.asm
rename to gfx/pics/lugia/frames.asm
diff --git a/gfx/pics/249/front.lz b/gfx/pics/lugia/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/249/front.lz
rename to gfx/pics/lugia/front.7x7.2bpp.lz
diff --git a/gfx/pics/249/normal.pal b/gfx/pics/lugia/normal.pal
similarity index 100%
rename from gfx/pics/249/normal.pal
rename to gfx/pics/lugia/normal.pal
diff --git a/gfx/pics/249/shiny.pal b/gfx/pics/lugia/shiny.pal
similarity index 100%
rename from gfx/pics/249/shiny.pal
rename to gfx/pics/lugia/shiny.pal
diff --git a/gfx/pics/068/anim0.asm b/gfx/pics/machamp/anim0.asm
similarity index 100%
rename from gfx/pics/068/anim0.asm
rename to gfx/pics/machamp/anim0.asm
diff --git a/gfx/pics/068/anim1.asm b/gfx/pics/machamp/anim1.asm
similarity index 100%
rename from gfx/pics/068/anim1.asm
rename to gfx/pics/machamp/anim1.asm
diff --git a/gfx/pics/068/back.lz b/gfx/pics/machamp/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/068/back.lz
rename to gfx/pics/machamp/back.6x6.2bpp.lz
diff --git a/gfx/pics/068/bitmask.asm b/gfx/pics/machamp/bitmask.asm
similarity index 100%
rename from gfx/pics/068/bitmask.asm
rename to gfx/pics/machamp/bitmask.asm
diff --git a/gfx/pics/068/frames.asm b/gfx/pics/machamp/frames.asm
similarity index 100%
rename from gfx/pics/068/frames.asm
rename to gfx/pics/machamp/frames.asm
diff --git a/gfx/pics/068/front.lz b/gfx/pics/machamp/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/068/front.lz
rename to gfx/pics/machamp/front.7x7.2bpp.lz
diff --git a/gfx/pics/068/normal.pal b/gfx/pics/machamp/normal.pal
similarity index 100%
rename from gfx/pics/068/normal.pal
rename to gfx/pics/machamp/normal.pal
diff --git a/gfx/pics/068/shiny.pal b/gfx/pics/machamp/shiny.pal
similarity index 100%
rename from gfx/pics/068/shiny.pal
rename to gfx/pics/machamp/shiny.pal
diff --git a/gfx/pics/067/anim0.asm b/gfx/pics/machoke/anim0.asm
similarity index 100%
rename from gfx/pics/067/anim0.asm
rename to gfx/pics/machoke/anim0.asm
diff --git a/gfx/pics/067/anim1.asm b/gfx/pics/machoke/anim1.asm
similarity index 100%
rename from gfx/pics/067/anim1.asm
rename to gfx/pics/machoke/anim1.asm
diff --git a/gfx/pics/067/back.lz b/gfx/pics/machoke/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/067/back.lz
rename to gfx/pics/machoke/back.6x6.2bpp.lz
diff --git a/gfx/pics/067/bitmask.asm b/gfx/pics/machoke/bitmask.asm
similarity index 100%
rename from gfx/pics/067/bitmask.asm
rename to gfx/pics/machoke/bitmask.asm
diff --git a/gfx/pics/067/frames.asm b/gfx/pics/machoke/frames.asm
similarity index 100%
rename from gfx/pics/067/frames.asm
rename to gfx/pics/machoke/frames.asm
diff --git a/gfx/pics/067/front.lz b/gfx/pics/machoke/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/067/front.lz
rename to gfx/pics/machoke/front.7x7.2bpp.lz
diff --git a/gfx/pics/067/normal.pal b/gfx/pics/machoke/normal.pal
similarity index 100%
rename from gfx/pics/067/normal.pal
rename to gfx/pics/machoke/normal.pal
diff --git a/gfx/pics/067/shiny.pal b/gfx/pics/machoke/shiny.pal
similarity index 100%
rename from gfx/pics/067/shiny.pal
rename to gfx/pics/machoke/shiny.pal
diff --git a/gfx/pics/066/anim0.asm b/gfx/pics/machop/anim0.asm
similarity index 100%
rename from gfx/pics/066/anim0.asm
rename to gfx/pics/machop/anim0.asm
diff --git a/gfx/pics/066/anim1.asm b/gfx/pics/machop/anim1.asm
similarity index 100%
rename from gfx/pics/066/anim1.asm
rename to gfx/pics/machop/anim1.asm
diff --git a/gfx/pics/066/back.lz b/gfx/pics/machop/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/066/back.lz
rename to gfx/pics/machop/back.6x6.2bpp.lz
diff --git a/gfx/pics/066/bitmask.asm b/gfx/pics/machop/bitmask.asm
similarity index 100%
rename from gfx/pics/066/bitmask.asm
rename to gfx/pics/machop/bitmask.asm
diff --git a/gfx/pics/066/frames.asm b/gfx/pics/machop/frames.asm
similarity index 100%
rename from gfx/pics/066/frames.asm
rename to gfx/pics/machop/frames.asm
diff --git a/gfx/pics/066/front.lz b/gfx/pics/machop/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/066/front.lz
rename to gfx/pics/machop/front.5x5.2bpp.lz
diff --git a/gfx/pics/066/normal.pal b/gfx/pics/machop/normal.pal
similarity index 100%
rename from gfx/pics/066/normal.pal
rename to gfx/pics/machop/normal.pal
diff --git a/gfx/pics/066/shiny.pal b/gfx/pics/machop/shiny.pal
similarity index 100%
rename from gfx/pics/066/shiny.pal
rename to gfx/pics/machop/shiny.pal
diff --git a/gfx/pics/240/anim0.asm b/gfx/pics/magby/anim0.asm
similarity index 100%
rename from gfx/pics/240/anim0.asm
rename to gfx/pics/magby/anim0.asm
diff --git a/gfx/pics/240/anim1.asm b/gfx/pics/magby/anim1.asm
similarity index 100%
rename from gfx/pics/240/anim1.asm
rename to gfx/pics/magby/anim1.asm
diff --git a/gfx/pics/240/back.lz b/gfx/pics/magby/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/240/back.lz
rename to gfx/pics/magby/back.6x6.2bpp.lz
diff --git a/gfx/pics/240/bitmask.asm b/gfx/pics/magby/bitmask.asm
similarity index 100%
rename from gfx/pics/240/bitmask.asm
rename to gfx/pics/magby/bitmask.asm
diff --git a/gfx/pics/240/frames.asm b/gfx/pics/magby/frames.asm
similarity index 100%
rename from gfx/pics/240/frames.asm
rename to gfx/pics/magby/frames.asm
diff --git a/gfx/pics/240/front.lz b/gfx/pics/magby/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/240/front.lz
rename to gfx/pics/magby/front.6x6.2bpp.lz
diff --git a/gfx/pics/240/normal.pal b/gfx/pics/magby/normal.pal
similarity index 100%
rename from gfx/pics/240/normal.pal
rename to gfx/pics/magby/normal.pal
diff --git a/gfx/pics/240/shiny.pal b/gfx/pics/magby/shiny.pal
similarity index 100%
rename from gfx/pics/240/shiny.pal
rename to gfx/pics/magby/shiny.pal
diff --git a/gfx/pics/219/anim0.asm b/gfx/pics/magcargo/anim0.asm
similarity index 100%
rename from gfx/pics/219/anim0.asm
rename to gfx/pics/magcargo/anim0.asm
diff --git a/gfx/pics/219/anim1.asm b/gfx/pics/magcargo/anim1.asm
similarity index 100%
rename from gfx/pics/219/anim1.asm
rename to gfx/pics/magcargo/anim1.asm
diff --git a/gfx/pics/219/back.lz b/gfx/pics/magcargo/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/219/back.lz
rename to gfx/pics/magcargo/back.6x6.2bpp.lz
diff --git a/gfx/pics/219/bitmask.asm b/gfx/pics/magcargo/bitmask.asm
similarity index 100%
rename from gfx/pics/219/bitmask.asm
rename to gfx/pics/magcargo/bitmask.asm
diff --git a/gfx/pics/219/frames.asm b/gfx/pics/magcargo/frames.asm
similarity index 100%
rename from gfx/pics/219/frames.asm
rename to gfx/pics/magcargo/frames.asm
diff --git a/gfx/pics/219/front.lz b/gfx/pics/magcargo/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/219/front.lz
rename to gfx/pics/magcargo/front.6x6.2bpp.lz
diff --git a/gfx/pics/219/normal.pal b/gfx/pics/magcargo/normal.pal
similarity index 100%
rename from gfx/pics/219/normal.pal
rename to gfx/pics/magcargo/normal.pal
diff --git a/gfx/pics/219/shiny.pal b/gfx/pics/magcargo/shiny.pal
similarity index 100%
rename from gfx/pics/219/shiny.pal
rename to gfx/pics/magcargo/shiny.pal
diff --git a/gfx/pics/129/anim0.asm b/gfx/pics/magikarp/anim0.asm
similarity index 100%
rename from gfx/pics/129/anim0.asm
rename to gfx/pics/magikarp/anim0.asm
diff --git a/gfx/pics/129/anim1.asm b/gfx/pics/magikarp/anim1.asm
similarity index 100%
rename from gfx/pics/129/anim1.asm
rename to gfx/pics/magikarp/anim1.asm
diff --git a/gfx/pics/129/back.lz b/gfx/pics/magikarp/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/129/back.lz
rename to gfx/pics/magikarp/back.6x6.2bpp.lz
diff --git a/gfx/pics/129/bitmask.asm b/gfx/pics/magikarp/bitmask.asm
similarity index 100%
rename from gfx/pics/129/bitmask.asm
rename to gfx/pics/magikarp/bitmask.asm
diff --git a/gfx/pics/129/frames.asm b/gfx/pics/magikarp/frames.asm
similarity index 100%
rename from gfx/pics/129/frames.asm
rename to gfx/pics/magikarp/frames.asm
diff --git a/gfx/pics/129/front.lz b/gfx/pics/magikarp/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/129/front.lz
rename to gfx/pics/magikarp/front.6x6.2bpp.lz
diff --git a/gfx/pics/129/normal.pal b/gfx/pics/magikarp/normal.pal
similarity index 100%
rename from gfx/pics/129/normal.pal
rename to gfx/pics/magikarp/normal.pal
diff --git a/gfx/pics/129/shiny.pal b/gfx/pics/magikarp/shiny.pal
similarity index 100%
rename from gfx/pics/129/shiny.pal
rename to gfx/pics/magikarp/shiny.pal
diff --git a/gfx/pics/126/anim0.asm b/gfx/pics/magmar/anim0.asm
similarity index 100%
rename from gfx/pics/126/anim0.asm
rename to gfx/pics/magmar/anim0.asm
diff --git a/gfx/pics/126/anim1.asm b/gfx/pics/magmar/anim1.asm
similarity index 100%
rename from gfx/pics/126/anim1.asm
rename to gfx/pics/magmar/anim1.asm
diff --git a/gfx/pics/126/back.lz b/gfx/pics/magmar/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/126/back.lz
rename to gfx/pics/magmar/back.6x6.2bpp.lz
diff --git a/gfx/pics/126/bitmask.asm b/gfx/pics/magmar/bitmask.asm
similarity index 100%
rename from gfx/pics/126/bitmask.asm
rename to gfx/pics/magmar/bitmask.asm
diff --git a/gfx/pics/126/frames.asm b/gfx/pics/magmar/frames.asm
similarity index 100%
rename from gfx/pics/126/frames.asm
rename to gfx/pics/magmar/frames.asm
diff --git a/gfx/pics/126/front.lz b/gfx/pics/magmar/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/126/front.lz
rename to gfx/pics/magmar/front.6x6.2bpp.lz
diff --git a/gfx/pics/126/normal.pal b/gfx/pics/magmar/normal.pal
similarity index 100%
rename from gfx/pics/126/normal.pal
rename to gfx/pics/magmar/normal.pal
diff --git a/gfx/pics/126/shiny.pal b/gfx/pics/magmar/shiny.pal
similarity index 100%
rename from gfx/pics/126/shiny.pal
rename to gfx/pics/magmar/shiny.pal
diff --git a/gfx/pics/081/anim0.asm b/gfx/pics/magnemite/anim0.asm
similarity index 100%
rename from gfx/pics/081/anim0.asm
rename to gfx/pics/magnemite/anim0.asm
diff --git a/gfx/pics/081/anim1.asm b/gfx/pics/magnemite/anim1.asm
similarity index 100%
rename from gfx/pics/081/anim1.asm
rename to gfx/pics/magnemite/anim1.asm
diff --git a/gfx/pics/081/back.lz b/gfx/pics/magnemite/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/081/back.lz
rename to gfx/pics/magnemite/back.6x6.2bpp.lz
diff --git a/gfx/pics/081/bitmask.asm b/gfx/pics/magnemite/bitmask.asm
similarity index 100%
rename from gfx/pics/081/bitmask.asm
rename to gfx/pics/magnemite/bitmask.asm
diff --git a/gfx/pics/081/frames.asm b/gfx/pics/magnemite/frames.asm
similarity index 100%
rename from gfx/pics/081/frames.asm
rename to gfx/pics/magnemite/frames.asm
diff --git a/gfx/pics/081/front.lz b/gfx/pics/magnemite/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/081/front.lz
rename to gfx/pics/magnemite/front.5x5.2bpp.lz
diff --git a/gfx/pics/081/normal.pal b/gfx/pics/magnemite/normal.pal
similarity index 100%
rename from gfx/pics/081/normal.pal
rename to gfx/pics/magnemite/normal.pal
diff --git a/gfx/pics/081/shiny.pal b/gfx/pics/magnemite/shiny.pal
similarity index 100%
rename from gfx/pics/081/shiny.pal
rename to gfx/pics/magnemite/shiny.pal
diff --git a/gfx/pics/082/anim0.asm b/gfx/pics/magneton/anim0.asm
similarity index 100%
rename from gfx/pics/082/anim0.asm
rename to gfx/pics/magneton/anim0.asm
diff --git a/gfx/pics/082/anim1.asm b/gfx/pics/magneton/anim1.asm
similarity index 100%
rename from gfx/pics/082/anim1.asm
rename to gfx/pics/magneton/anim1.asm
diff --git a/gfx/pics/082/back.lz b/gfx/pics/magneton/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/082/back.lz
rename to gfx/pics/magneton/back.6x6.2bpp.lz
diff --git a/gfx/pics/082/bitmask.asm b/gfx/pics/magneton/bitmask.asm
similarity index 100%
rename from gfx/pics/082/bitmask.asm
rename to gfx/pics/magneton/bitmask.asm
diff --git a/gfx/pics/082/frames.asm b/gfx/pics/magneton/frames.asm
similarity index 100%
rename from gfx/pics/082/frames.asm
rename to gfx/pics/magneton/frames.asm
diff --git a/gfx/pics/082/front.lz b/gfx/pics/magneton/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/082/front.lz
rename to gfx/pics/magneton/front.6x6.2bpp.lz
diff --git a/gfx/pics/082/normal.pal b/gfx/pics/magneton/normal.pal
similarity index 100%
rename from gfx/pics/082/normal.pal
rename to gfx/pics/magneton/normal.pal
diff --git a/gfx/pics/082/shiny.pal b/gfx/pics/magneton/shiny.pal
similarity index 100%
rename from gfx/pics/082/shiny.pal
rename to gfx/pics/magneton/shiny.pal
diff --git a/gfx/pics/056/anim0.asm b/gfx/pics/mankey/anim0.asm
similarity index 100%
rename from gfx/pics/056/anim0.asm
rename to gfx/pics/mankey/anim0.asm
diff --git a/gfx/pics/056/anim1.asm b/gfx/pics/mankey/anim1.asm
similarity index 100%
rename from gfx/pics/056/anim1.asm
rename to gfx/pics/mankey/anim1.asm
diff --git a/gfx/pics/056/back.lz b/gfx/pics/mankey/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/056/back.lz
rename to gfx/pics/mankey/back.6x6.2bpp.lz
diff --git a/gfx/pics/056/bitmask.asm b/gfx/pics/mankey/bitmask.asm
similarity index 100%
rename from gfx/pics/056/bitmask.asm
rename to gfx/pics/mankey/bitmask.asm
diff --git a/gfx/pics/056/frames.asm b/gfx/pics/mankey/frames.asm
similarity index 100%
rename from gfx/pics/056/frames.asm
rename to gfx/pics/mankey/frames.asm
diff --git a/gfx/pics/056/front.lz b/gfx/pics/mankey/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/056/front.lz
rename to gfx/pics/mankey/front.5x5.2bpp.lz
diff --git a/gfx/pics/056/normal.pal b/gfx/pics/mankey/normal.pal
similarity index 100%
rename from gfx/pics/056/normal.pal
rename to gfx/pics/mankey/normal.pal
diff --git a/gfx/pics/056/shiny.pal b/gfx/pics/mankey/shiny.pal
similarity index 100%
rename from gfx/pics/056/shiny.pal
rename to gfx/pics/mankey/shiny.pal
diff --git a/gfx/pics/226/anim0.asm b/gfx/pics/mantine/anim0.asm
similarity index 100%
rename from gfx/pics/226/anim0.asm
rename to gfx/pics/mantine/anim0.asm
diff --git a/gfx/pics/226/anim1.asm b/gfx/pics/mantine/anim1.asm
similarity index 100%
rename from gfx/pics/226/anim1.asm
rename to gfx/pics/mantine/anim1.asm
diff --git a/gfx/pics/226/back.lz b/gfx/pics/mantine/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/226/back.lz
rename to gfx/pics/mantine/back.6x6.2bpp.lz
diff --git a/gfx/pics/226/bitmask.asm b/gfx/pics/mantine/bitmask.asm
similarity index 100%
rename from gfx/pics/226/bitmask.asm
rename to gfx/pics/mantine/bitmask.asm
diff --git a/gfx/pics/226/frames.asm b/gfx/pics/mantine/frames.asm
similarity index 100%
rename from gfx/pics/226/frames.asm
rename to gfx/pics/mantine/frames.asm
diff --git a/gfx/pics/226/front.lz b/gfx/pics/mantine/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/226/front.lz
rename to gfx/pics/mantine/front.7x7.2bpp.lz
diff --git a/gfx/pics/226/normal.pal b/gfx/pics/mantine/normal.pal
similarity index 100%
rename from gfx/pics/226/normal.pal
rename to gfx/pics/mantine/normal.pal
diff --git a/gfx/pics/226/shiny.pal b/gfx/pics/mantine/shiny.pal
similarity index 100%
rename from gfx/pics/226/shiny.pal
rename to gfx/pics/mantine/shiny.pal
diff --git a/gfx/pics/179/anim0.asm b/gfx/pics/mareep/anim0.asm
similarity index 100%
rename from gfx/pics/179/anim0.asm
rename to gfx/pics/mareep/anim0.asm
diff --git a/gfx/pics/179/anim1.asm b/gfx/pics/mareep/anim1.asm
similarity index 100%
rename from gfx/pics/179/anim1.asm
rename to gfx/pics/mareep/anim1.asm
diff --git a/gfx/pics/179/back.lz b/gfx/pics/mareep/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/179/back.lz
rename to gfx/pics/mareep/back.6x6.2bpp.lz
diff --git a/gfx/pics/179/bitmask.asm b/gfx/pics/mareep/bitmask.asm
similarity index 100%
rename from gfx/pics/179/bitmask.asm
rename to gfx/pics/mareep/bitmask.asm
diff --git a/gfx/pics/179/frames.asm b/gfx/pics/mareep/frames.asm
similarity index 100%
rename from gfx/pics/179/frames.asm
rename to gfx/pics/mareep/frames.asm
diff --git a/gfx/pics/179/front.lz b/gfx/pics/mareep/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/179/front.lz
rename to gfx/pics/mareep/front.5x5.2bpp.lz
diff --git a/gfx/pics/179/normal.pal b/gfx/pics/mareep/normal.pal
similarity index 100%
rename from gfx/pics/179/normal.pal
rename to gfx/pics/mareep/normal.pal
diff --git a/gfx/pics/179/shiny.pal b/gfx/pics/mareep/shiny.pal
similarity index 100%
rename from gfx/pics/179/shiny.pal
rename to gfx/pics/mareep/shiny.pal
diff --git a/gfx/pics/183/anim0.asm b/gfx/pics/marill/anim0.asm
similarity index 100%
rename from gfx/pics/183/anim0.asm
rename to gfx/pics/marill/anim0.asm
diff --git a/gfx/pics/183/anim1.asm b/gfx/pics/marill/anim1.asm
similarity index 100%
rename from gfx/pics/183/anim1.asm
rename to gfx/pics/marill/anim1.asm
diff --git a/gfx/pics/183/back.lz b/gfx/pics/marill/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/183/back.lz
rename to gfx/pics/marill/back.6x6.2bpp.lz
diff --git a/gfx/pics/183/bitmask.asm b/gfx/pics/marill/bitmask.asm
similarity index 100%
rename from gfx/pics/183/bitmask.asm
rename to gfx/pics/marill/bitmask.asm
diff --git a/gfx/pics/183/frames.asm b/gfx/pics/marill/frames.asm
similarity index 100%
rename from gfx/pics/183/frames.asm
rename to gfx/pics/marill/frames.asm
diff --git a/gfx/pics/183/front.lz b/gfx/pics/marill/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/183/front.lz
rename to gfx/pics/marill/front.5x5.2bpp.lz
diff --git a/gfx/pics/183/normal.pal b/gfx/pics/marill/normal.pal
similarity index 100%
rename from gfx/pics/183/normal.pal
rename to gfx/pics/marill/normal.pal
diff --git a/gfx/pics/183/shiny.pal b/gfx/pics/marill/shiny.pal
similarity index 100%
rename from gfx/pics/183/shiny.pal
rename to gfx/pics/marill/shiny.pal
diff --git a/gfx/pics/105/anim0.asm b/gfx/pics/marowak/anim0.asm
similarity index 100%
rename from gfx/pics/105/anim0.asm
rename to gfx/pics/marowak/anim0.asm
diff --git a/gfx/pics/105/anim1.asm b/gfx/pics/marowak/anim1.asm
similarity index 100%
rename from gfx/pics/105/anim1.asm
rename to gfx/pics/marowak/anim1.asm
diff --git a/gfx/pics/105/back.lz b/gfx/pics/marowak/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/105/back.lz
rename to gfx/pics/marowak/back.6x6.2bpp.lz
diff --git a/gfx/pics/105/bitmask.asm b/gfx/pics/marowak/bitmask.asm
similarity index 100%
rename from gfx/pics/105/bitmask.asm
rename to gfx/pics/marowak/bitmask.asm
diff --git a/gfx/pics/105/frames.asm b/gfx/pics/marowak/frames.asm
similarity index 100%
rename from gfx/pics/105/frames.asm
rename to gfx/pics/marowak/frames.asm
diff --git a/gfx/pics/105/front.lz b/gfx/pics/marowak/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/105/front.lz
rename to gfx/pics/marowak/front.6x6.2bpp.lz
diff --git a/gfx/pics/105/normal.pal b/gfx/pics/marowak/normal.pal
similarity index 100%
rename from gfx/pics/105/normal.pal
rename to gfx/pics/marowak/normal.pal
diff --git a/gfx/pics/105/shiny.pal b/gfx/pics/marowak/shiny.pal
similarity index 100%
rename from gfx/pics/105/shiny.pal
rename to gfx/pics/marowak/shiny.pal
diff --git a/gfx/pics/154/anim0.asm b/gfx/pics/meganium/anim0.asm
similarity index 100%
rename from gfx/pics/154/anim0.asm
rename to gfx/pics/meganium/anim0.asm
diff --git a/gfx/pics/154/anim1.asm b/gfx/pics/meganium/anim1.asm
similarity index 100%
rename from gfx/pics/154/anim1.asm
rename to gfx/pics/meganium/anim1.asm
diff --git a/gfx/pics/154/back.lz b/gfx/pics/meganium/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/154/back.lz
rename to gfx/pics/meganium/back.6x6.2bpp.lz
diff --git a/gfx/pics/154/bitmask.asm b/gfx/pics/meganium/bitmask.asm
similarity index 100%
rename from gfx/pics/154/bitmask.asm
rename to gfx/pics/meganium/bitmask.asm
diff --git a/gfx/pics/154/frames.asm b/gfx/pics/meganium/frames.asm
similarity index 100%
rename from gfx/pics/154/frames.asm
rename to gfx/pics/meganium/frames.asm
diff --git a/gfx/pics/154/front.lz b/gfx/pics/meganium/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/154/front.lz
rename to gfx/pics/meganium/front.7x7.2bpp.lz
diff --git a/gfx/pics/154/normal.pal b/gfx/pics/meganium/normal.pal
similarity index 100%
rename from gfx/pics/154/normal.pal
rename to gfx/pics/meganium/normal.pal
diff --git a/gfx/pics/154/shiny.pal b/gfx/pics/meganium/shiny.pal
similarity index 100%
rename from gfx/pics/154/shiny.pal
rename to gfx/pics/meganium/shiny.pal
diff --git a/gfx/pics/052/anim0.asm b/gfx/pics/meowth/anim0.asm
similarity index 100%
rename from gfx/pics/052/anim0.asm
rename to gfx/pics/meowth/anim0.asm
diff --git a/gfx/pics/052/anim1.asm b/gfx/pics/meowth/anim1.asm
similarity index 100%
rename from gfx/pics/052/anim1.asm
rename to gfx/pics/meowth/anim1.asm
diff --git a/gfx/pics/052/back.lz b/gfx/pics/meowth/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/052/back.lz
rename to gfx/pics/meowth/back.6x6.2bpp.lz
diff --git a/gfx/pics/052/bitmask.asm b/gfx/pics/meowth/bitmask.asm
similarity index 100%
rename from gfx/pics/052/bitmask.asm
rename to gfx/pics/meowth/bitmask.asm
diff --git a/gfx/pics/052/frames.asm b/gfx/pics/meowth/frames.asm
similarity index 100%
rename from gfx/pics/052/frames.asm
rename to gfx/pics/meowth/frames.asm
diff --git a/gfx/pics/052/front.lz b/gfx/pics/meowth/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/052/front.lz
rename to gfx/pics/meowth/front.5x5.2bpp.lz
diff --git a/gfx/pics/052/normal.pal b/gfx/pics/meowth/normal.pal
similarity index 100%
rename from gfx/pics/052/normal.pal
rename to gfx/pics/meowth/normal.pal
diff --git a/gfx/pics/052/shiny.pal b/gfx/pics/meowth/shiny.pal
similarity index 100%
rename from gfx/pics/052/shiny.pal
rename to gfx/pics/meowth/shiny.pal
diff --git a/gfx/pics/011/anim0.asm b/gfx/pics/metapod/anim0.asm
similarity index 100%
rename from gfx/pics/011/anim0.asm
rename to gfx/pics/metapod/anim0.asm
diff --git a/gfx/pics/011/anim1.asm b/gfx/pics/metapod/anim1.asm
similarity index 100%
rename from gfx/pics/011/anim1.asm
rename to gfx/pics/metapod/anim1.asm
diff --git a/gfx/pics/011/back.lz b/gfx/pics/metapod/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/011/back.lz
rename to gfx/pics/metapod/back.6x6.2bpp.lz
diff --git a/gfx/pics/011/bitmask.asm b/gfx/pics/metapod/bitmask.asm
similarity index 100%
rename from gfx/pics/011/bitmask.asm
rename to gfx/pics/metapod/bitmask.asm
diff --git a/gfx/pics/011/frames.asm b/gfx/pics/metapod/frames.asm
similarity index 100%
rename from gfx/pics/011/frames.asm
rename to gfx/pics/metapod/frames.asm
diff --git a/gfx/pics/011/front.lz b/gfx/pics/metapod/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/011/front.lz
rename to gfx/pics/metapod/front.5x5.2bpp.lz
diff --git a/gfx/pics/011/normal.pal b/gfx/pics/metapod/normal.pal
similarity index 100%
rename from gfx/pics/011/normal.pal
rename to gfx/pics/metapod/normal.pal
diff --git a/gfx/pics/011/shiny.pal b/gfx/pics/metapod/shiny.pal
similarity index 100%
rename from gfx/pics/011/shiny.pal
rename to gfx/pics/metapod/shiny.pal
diff --git a/gfx/pics/151/anim0.asm b/gfx/pics/mew/anim0.asm
similarity index 100%
rename from gfx/pics/151/anim0.asm
rename to gfx/pics/mew/anim0.asm
diff --git a/gfx/pics/151/anim1.asm b/gfx/pics/mew/anim1.asm
similarity index 100%
rename from gfx/pics/151/anim1.asm
rename to gfx/pics/mew/anim1.asm
diff --git a/gfx/pics/151/back.lz b/gfx/pics/mew/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/151/back.lz
rename to gfx/pics/mew/back.6x6.2bpp.lz
diff --git a/gfx/pics/151/bitmask.asm b/gfx/pics/mew/bitmask.asm
similarity index 100%
rename from gfx/pics/151/bitmask.asm
rename to gfx/pics/mew/bitmask.asm
diff --git a/gfx/pics/151/frames.asm b/gfx/pics/mew/frames.asm
similarity index 100%
rename from gfx/pics/151/frames.asm
rename to gfx/pics/mew/frames.asm
diff --git a/gfx/pics/151/front.lz b/gfx/pics/mew/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/151/front.lz
rename to gfx/pics/mew/front.5x5.2bpp.lz
diff --git a/gfx/pics/151/normal.pal b/gfx/pics/mew/normal.pal
similarity index 100%
rename from gfx/pics/151/normal.pal
rename to gfx/pics/mew/normal.pal
diff --git a/gfx/pics/151/shiny.pal b/gfx/pics/mew/shiny.pal
similarity index 100%
rename from gfx/pics/151/shiny.pal
rename to gfx/pics/mew/shiny.pal
diff --git a/gfx/pics/150/anim0.asm b/gfx/pics/mewtwo/anim0.asm
similarity index 100%
rename from gfx/pics/150/anim0.asm
rename to gfx/pics/mewtwo/anim0.asm
diff --git a/gfx/pics/150/anim1.asm b/gfx/pics/mewtwo/anim1.asm
similarity index 100%
rename from gfx/pics/150/anim1.asm
rename to gfx/pics/mewtwo/anim1.asm
diff --git a/gfx/pics/150/back.lz b/gfx/pics/mewtwo/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/150/back.lz
rename to gfx/pics/mewtwo/back.6x6.2bpp.lz
diff --git a/gfx/pics/150/bitmask.asm b/gfx/pics/mewtwo/bitmask.asm
similarity index 100%
rename from gfx/pics/150/bitmask.asm
rename to gfx/pics/mewtwo/bitmask.asm
diff --git a/gfx/pics/150/frames.asm b/gfx/pics/mewtwo/frames.asm
similarity index 100%
rename from gfx/pics/150/frames.asm
rename to gfx/pics/mewtwo/frames.asm
diff --git a/gfx/pics/150/front.lz b/gfx/pics/mewtwo/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/150/front.lz
rename to gfx/pics/mewtwo/front.7x7.2bpp.lz
diff --git a/gfx/pics/150/normal.pal b/gfx/pics/mewtwo/normal.pal
similarity index 100%
rename from gfx/pics/150/normal.pal
rename to gfx/pics/mewtwo/normal.pal
diff --git a/gfx/pics/150/shiny.pal b/gfx/pics/mewtwo/shiny.pal
similarity index 100%
rename from gfx/pics/150/shiny.pal
rename to gfx/pics/mewtwo/shiny.pal
diff --git a/gfx/pics/241/anim0.asm b/gfx/pics/miltank/anim0.asm
similarity index 100%
rename from gfx/pics/241/anim0.asm
rename to gfx/pics/miltank/anim0.asm
diff --git a/gfx/pics/241/anim1.asm b/gfx/pics/miltank/anim1.asm
similarity index 100%
rename from gfx/pics/241/anim1.asm
rename to gfx/pics/miltank/anim1.asm
diff --git a/gfx/pics/241/back.lz b/gfx/pics/miltank/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/241/back.lz
rename to gfx/pics/miltank/back.6x6.2bpp.lz
diff --git a/gfx/pics/241/bitmask.asm b/gfx/pics/miltank/bitmask.asm
similarity index 100%
rename from gfx/pics/241/bitmask.asm
rename to gfx/pics/miltank/bitmask.asm
diff --git a/gfx/pics/241/frames.asm b/gfx/pics/miltank/frames.asm
similarity index 100%
rename from gfx/pics/241/frames.asm
rename to gfx/pics/miltank/frames.asm
diff --git a/gfx/pics/241/front.lz b/gfx/pics/miltank/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/241/front.lz
rename to gfx/pics/miltank/front.6x6.2bpp.lz
diff --git a/gfx/pics/241/normal.pal b/gfx/pics/miltank/normal.pal
similarity index 100%
rename from gfx/pics/241/normal.pal
rename to gfx/pics/miltank/normal.pal
diff --git a/gfx/pics/241/shiny.pal b/gfx/pics/miltank/shiny.pal
similarity index 100%
rename from gfx/pics/241/shiny.pal
rename to gfx/pics/miltank/shiny.pal
diff --git a/gfx/pics/200/anim0.asm b/gfx/pics/misdreavus/anim0.asm
similarity index 100%
rename from gfx/pics/200/anim0.asm
rename to gfx/pics/misdreavus/anim0.asm
diff --git a/gfx/pics/200/anim1.asm b/gfx/pics/misdreavus/anim1.asm
similarity index 100%
rename from gfx/pics/200/anim1.asm
rename to gfx/pics/misdreavus/anim1.asm
diff --git a/gfx/pics/200/back.lz b/gfx/pics/misdreavus/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/200/back.lz
rename to gfx/pics/misdreavus/back.6x6.2bpp.lz
diff --git a/gfx/pics/200/bitmask.asm b/gfx/pics/misdreavus/bitmask.asm
similarity index 100%
rename from gfx/pics/200/bitmask.asm
rename to gfx/pics/misdreavus/bitmask.asm
diff --git a/gfx/pics/200/frames.asm b/gfx/pics/misdreavus/frames.asm
similarity index 100%
rename from gfx/pics/200/frames.asm
rename to gfx/pics/misdreavus/frames.asm
diff --git a/gfx/pics/200/front.lz b/gfx/pics/misdreavus/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/200/front.lz
rename to gfx/pics/misdreavus/front.6x6.2bpp.lz
diff --git a/gfx/pics/200/normal.pal b/gfx/pics/misdreavus/normal.pal
similarity index 100%
rename from gfx/pics/200/normal.pal
rename to gfx/pics/misdreavus/normal.pal
diff --git a/gfx/pics/200/shiny.pal b/gfx/pics/misdreavus/shiny.pal
similarity index 100%
rename from gfx/pics/200/shiny.pal
rename to gfx/pics/misdreavus/shiny.pal
diff --git a/gfx/pics/146/anim0.asm b/gfx/pics/moltres/anim0.asm
similarity index 100%
rename from gfx/pics/146/anim0.asm
rename to gfx/pics/moltres/anim0.asm
diff --git a/gfx/pics/146/anim1.asm b/gfx/pics/moltres/anim1.asm
similarity index 100%
rename from gfx/pics/146/anim1.asm
rename to gfx/pics/moltres/anim1.asm
diff --git a/gfx/pics/146/back.lz b/gfx/pics/moltres/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/146/back.lz
rename to gfx/pics/moltres/back.6x6.2bpp.lz
diff --git a/gfx/pics/146/bitmask.asm b/gfx/pics/moltres/bitmask.asm
similarity index 100%
rename from gfx/pics/146/bitmask.asm
rename to gfx/pics/moltres/bitmask.asm
diff --git a/gfx/pics/146/frames.asm b/gfx/pics/moltres/frames.asm
similarity index 100%
rename from gfx/pics/146/frames.asm
rename to gfx/pics/moltres/frames.asm
diff --git a/gfx/pics/146/front.lz b/gfx/pics/moltres/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/146/front.lz
rename to gfx/pics/moltres/front.7x7.2bpp.lz
diff --git a/gfx/pics/146/normal.pal b/gfx/pics/moltres/normal.pal
similarity index 100%
rename from gfx/pics/146/normal.pal
rename to gfx/pics/moltres/normal.pal
diff --git a/gfx/pics/146/shiny.pal b/gfx/pics/moltres/shiny.pal
similarity index 100%
rename from gfx/pics/146/shiny.pal
rename to gfx/pics/moltres/shiny.pal
diff --git a/gfx/pics/122/anim0.asm b/gfx/pics/mr__mime/anim0.asm
similarity index 100%
rename from gfx/pics/122/anim0.asm
rename to gfx/pics/mr__mime/anim0.asm
diff --git a/gfx/pics/122/anim1.asm b/gfx/pics/mr__mime/anim1.asm
similarity index 100%
rename from gfx/pics/122/anim1.asm
rename to gfx/pics/mr__mime/anim1.asm
diff --git a/gfx/pics/122/back.lz b/gfx/pics/mr__mime/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/122/back.lz
rename to gfx/pics/mr__mime/back.6x6.2bpp.lz
diff --git a/gfx/pics/122/bitmask.asm b/gfx/pics/mr__mime/bitmask.asm
similarity index 100%
rename from gfx/pics/122/bitmask.asm
rename to gfx/pics/mr__mime/bitmask.asm
diff --git a/gfx/pics/122/frames.asm b/gfx/pics/mr__mime/frames.asm
similarity index 100%
rename from gfx/pics/122/frames.asm
rename to gfx/pics/mr__mime/frames.asm
diff --git a/gfx/pics/122/front.lz b/gfx/pics/mr__mime/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/122/front.lz
rename to gfx/pics/mr__mime/front.6x6.2bpp.lz
diff --git a/gfx/pics/222/normal.pal b/gfx/pics/mr__mime/normal.pal
similarity index 100%
rename from gfx/pics/222/normal.pal
rename to gfx/pics/mr__mime/normal.pal
diff --git a/gfx/pics/122/shiny.pal b/gfx/pics/mr__mime/shiny.pal
similarity index 100%
rename from gfx/pics/122/shiny.pal
rename to gfx/pics/mr__mime/shiny.pal
diff --git a/gfx/pics/089/anim0.asm b/gfx/pics/muk/anim0.asm
similarity index 100%
rename from gfx/pics/089/anim0.asm
rename to gfx/pics/muk/anim0.asm
diff --git a/gfx/pics/089/anim1.asm b/gfx/pics/muk/anim1.asm
similarity index 100%
rename from gfx/pics/089/anim1.asm
rename to gfx/pics/muk/anim1.asm
diff --git a/gfx/pics/089/back.lz b/gfx/pics/muk/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/089/back.lz
rename to gfx/pics/muk/back.6x6.2bpp.lz
diff --git a/gfx/pics/089/bitmask.asm b/gfx/pics/muk/bitmask.asm
similarity index 100%
rename from gfx/pics/089/bitmask.asm
rename to gfx/pics/muk/bitmask.asm
diff --git a/gfx/pics/089/frames.asm b/gfx/pics/muk/frames.asm
similarity index 100%
rename from gfx/pics/089/frames.asm
rename to gfx/pics/muk/frames.asm
diff --git a/gfx/pics/089/front.lz b/gfx/pics/muk/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/089/front.lz
rename to gfx/pics/muk/front.7x7.2bpp.lz
diff --git a/gfx/pics/089/normal.pal b/gfx/pics/muk/normal.pal
similarity index 100%
rename from gfx/pics/089/normal.pal
rename to gfx/pics/muk/normal.pal
diff --git a/gfx/pics/089/shiny.pal b/gfx/pics/muk/shiny.pal
similarity index 100%
rename from gfx/pics/089/shiny.pal
rename to gfx/pics/muk/shiny.pal
diff --git a/gfx/pics/198/anim0.asm b/gfx/pics/murkrow/anim0.asm
similarity index 100%
rename from gfx/pics/198/anim0.asm
rename to gfx/pics/murkrow/anim0.asm
diff --git a/gfx/pics/198/anim1.asm b/gfx/pics/murkrow/anim1.asm
similarity index 100%
rename from gfx/pics/198/anim1.asm
rename to gfx/pics/murkrow/anim1.asm
diff --git a/gfx/pics/198/back.lz b/gfx/pics/murkrow/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/198/back.lz
rename to gfx/pics/murkrow/back.6x6.2bpp.lz
diff --git a/gfx/pics/198/bitmask.asm b/gfx/pics/murkrow/bitmask.asm
similarity index 100%
rename from gfx/pics/198/bitmask.asm
rename to gfx/pics/murkrow/bitmask.asm
diff --git a/gfx/pics/198/frames.asm b/gfx/pics/murkrow/frames.asm
similarity index 100%
rename from gfx/pics/198/frames.asm
rename to gfx/pics/murkrow/frames.asm
diff --git a/gfx/pics/198/front.lz b/gfx/pics/murkrow/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/198/front.lz
rename to gfx/pics/murkrow/front.6x6.2bpp.lz
diff --git a/gfx/pics/198/normal.pal b/gfx/pics/murkrow/normal.pal
similarity index 100%
rename from gfx/pics/198/normal.pal
rename to gfx/pics/murkrow/normal.pal
diff --git a/gfx/pics/198/shiny.pal b/gfx/pics/murkrow/shiny.pal
similarity index 100%
rename from gfx/pics/198/shiny.pal
rename to gfx/pics/murkrow/shiny.pal
diff --git a/gfx/pics/177/anim0.asm b/gfx/pics/natu/anim0.asm
similarity index 100%
rename from gfx/pics/177/anim0.asm
rename to gfx/pics/natu/anim0.asm
diff --git a/gfx/pics/177/anim1.asm b/gfx/pics/natu/anim1.asm
similarity index 100%
rename from gfx/pics/177/anim1.asm
rename to gfx/pics/natu/anim1.asm
diff --git a/gfx/pics/177/back.lz b/gfx/pics/natu/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/177/back.lz
rename to gfx/pics/natu/back.6x6.2bpp.lz
diff --git a/gfx/pics/177/bitmask.asm b/gfx/pics/natu/bitmask.asm
similarity index 100%
rename from gfx/pics/177/bitmask.asm
rename to gfx/pics/natu/bitmask.asm
diff --git a/gfx/pics/177/frames.asm b/gfx/pics/natu/frames.asm
similarity index 100%
rename from gfx/pics/177/frames.asm
rename to gfx/pics/natu/frames.asm
diff --git a/gfx/pics/177/front.lz b/gfx/pics/natu/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/177/front.lz
rename to gfx/pics/natu/front.5x5.2bpp.lz
diff --git a/gfx/pics/177/normal.pal b/gfx/pics/natu/normal.pal
similarity index 100%
rename from gfx/pics/177/normal.pal
rename to gfx/pics/natu/normal.pal
diff --git a/gfx/pics/177/shiny.pal b/gfx/pics/natu/shiny.pal
similarity index 100%
rename from gfx/pics/177/shiny.pal
rename to gfx/pics/natu/shiny.pal
diff --git a/gfx/pics/034/anim0.asm b/gfx/pics/nidoking/anim0.asm
similarity index 100%
rename from gfx/pics/034/anim0.asm
rename to gfx/pics/nidoking/anim0.asm
diff --git a/gfx/pics/034/anim1.asm b/gfx/pics/nidoking/anim1.asm
similarity index 100%
rename from gfx/pics/034/anim1.asm
rename to gfx/pics/nidoking/anim1.asm
diff --git a/gfx/pics/034/back.lz b/gfx/pics/nidoking/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/034/back.lz
rename to gfx/pics/nidoking/back.6x6.2bpp.lz
diff --git a/gfx/pics/034/bitmask.asm b/gfx/pics/nidoking/bitmask.asm
similarity index 100%
rename from gfx/pics/034/bitmask.asm
rename to gfx/pics/nidoking/bitmask.asm
diff --git a/gfx/pics/034/frames.asm b/gfx/pics/nidoking/frames.asm
similarity index 100%
rename from gfx/pics/034/frames.asm
rename to gfx/pics/nidoking/frames.asm
diff --git a/gfx/pics/034/front.lz b/gfx/pics/nidoking/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/034/front.lz
rename to gfx/pics/nidoking/front.7x7.2bpp.lz
diff --git a/gfx/pics/034/normal.pal b/gfx/pics/nidoking/normal.pal
similarity index 100%
rename from gfx/pics/034/normal.pal
rename to gfx/pics/nidoking/normal.pal
diff --git a/gfx/pics/034/shiny.pal b/gfx/pics/nidoking/shiny.pal
similarity index 100%
rename from gfx/pics/034/shiny.pal
rename to gfx/pics/nidoking/shiny.pal
diff --git a/gfx/pics/031/anim0.asm b/gfx/pics/nidoqueen/anim0.asm
similarity index 100%
rename from gfx/pics/031/anim0.asm
rename to gfx/pics/nidoqueen/anim0.asm
diff --git a/gfx/pics/031/anim1.asm b/gfx/pics/nidoqueen/anim1.asm
similarity index 100%
rename from gfx/pics/031/anim1.asm
rename to gfx/pics/nidoqueen/anim1.asm
diff --git a/gfx/pics/031/back.lz b/gfx/pics/nidoqueen/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/031/back.lz
rename to gfx/pics/nidoqueen/back.6x6.2bpp.lz
diff --git a/gfx/pics/031/bitmask.asm b/gfx/pics/nidoqueen/bitmask.asm
similarity index 100%
rename from gfx/pics/031/bitmask.asm
rename to gfx/pics/nidoqueen/bitmask.asm
diff --git a/gfx/pics/031/frames.asm b/gfx/pics/nidoqueen/frames.asm
similarity index 100%
rename from gfx/pics/031/frames.asm
rename to gfx/pics/nidoqueen/frames.asm
diff --git a/gfx/pics/031/front.lz b/gfx/pics/nidoqueen/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/031/front.lz
rename to gfx/pics/nidoqueen/front.7x7.2bpp.lz
diff --git a/gfx/pics/031/normal.pal b/gfx/pics/nidoqueen/normal.pal
similarity index 100%
rename from gfx/pics/031/normal.pal
rename to gfx/pics/nidoqueen/normal.pal
diff --git a/gfx/pics/031/shiny.pal b/gfx/pics/nidoqueen/shiny.pal
similarity index 100%
rename from gfx/pics/031/shiny.pal
rename to gfx/pics/nidoqueen/shiny.pal
diff --git a/gfx/pics/029/anim0.asm b/gfx/pics/nidoran_f/anim0.asm
similarity index 100%
rename from gfx/pics/029/anim0.asm
rename to gfx/pics/nidoran_f/anim0.asm
diff --git a/gfx/pics/029/anim1.asm b/gfx/pics/nidoran_f/anim1.asm
similarity index 100%
rename from gfx/pics/029/anim1.asm
rename to gfx/pics/nidoran_f/anim1.asm
diff --git a/gfx/pics/029/back.lz b/gfx/pics/nidoran_f/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/029/back.lz
rename to gfx/pics/nidoran_f/back.6x6.2bpp.lz
diff --git a/gfx/pics/029/bitmask.asm b/gfx/pics/nidoran_f/bitmask.asm
similarity index 100%
rename from gfx/pics/029/bitmask.asm
rename to gfx/pics/nidoran_f/bitmask.asm
diff --git a/gfx/pics/029/frames.asm b/gfx/pics/nidoran_f/frames.asm
similarity index 100%
rename from gfx/pics/029/frames.asm
rename to gfx/pics/nidoran_f/frames.asm
diff --git a/gfx/pics/029/front.lz b/gfx/pics/nidoran_f/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/029/front.lz
rename to gfx/pics/nidoran_f/front.5x5.2bpp.lz
diff --git a/gfx/pics/029/normal.pal b/gfx/pics/nidoran_f/normal.pal
similarity index 100%
rename from gfx/pics/029/normal.pal
rename to gfx/pics/nidoran_f/normal.pal
diff --git a/gfx/pics/029/shiny.pal b/gfx/pics/nidoran_f/shiny.pal
similarity index 100%
rename from gfx/pics/029/shiny.pal
rename to gfx/pics/nidoran_f/shiny.pal
diff --git a/gfx/pics/032/anim0.asm b/gfx/pics/nidoran_m/anim0.asm
similarity index 100%
rename from gfx/pics/032/anim0.asm
rename to gfx/pics/nidoran_m/anim0.asm
diff --git a/gfx/pics/032/anim1.asm b/gfx/pics/nidoran_m/anim1.asm
similarity index 100%
rename from gfx/pics/032/anim1.asm
rename to gfx/pics/nidoran_m/anim1.asm
diff --git a/gfx/pics/032/back.lz b/gfx/pics/nidoran_m/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/032/back.lz
rename to gfx/pics/nidoran_m/back.6x6.2bpp.lz
diff --git a/gfx/pics/032/bitmask.asm b/gfx/pics/nidoran_m/bitmask.asm
similarity index 100%
rename from gfx/pics/032/bitmask.asm
rename to gfx/pics/nidoran_m/bitmask.asm
diff --git a/gfx/pics/032/frames.asm b/gfx/pics/nidoran_m/frames.asm
similarity index 100%
rename from gfx/pics/032/frames.asm
rename to gfx/pics/nidoran_m/frames.asm
diff --git a/gfx/pics/032/front.lz b/gfx/pics/nidoran_m/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/032/front.lz
rename to gfx/pics/nidoran_m/front.5x5.2bpp.lz
diff --git a/gfx/pics/032/normal.pal b/gfx/pics/nidoran_m/normal.pal
similarity index 100%
rename from gfx/pics/032/normal.pal
rename to gfx/pics/nidoran_m/normal.pal
diff --git a/gfx/pics/032/shiny.pal b/gfx/pics/nidoran_m/shiny.pal
similarity index 100%
rename from gfx/pics/032/shiny.pal
rename to gfx/pics/nidoran_m/shiny.pal
diff --git a/gfx/pics/030/anim0.asm b/gfx/pics/nidorina/anim0.asm
similarity index 100%
rename from gfx/pics/030/anim0.asm
rename to gfx/pics/nidorina/anim0.asm
diff --git a/gfx/pics/030/anim1.asm b/gfx/pics/nidorina/anim1.asm
similarity index 100%
rename from gfx/pics/030/anim1.asm
rename to gfx/pics/nidorina/anim1.asm
diff --git a/gfx/pics/030/back.lz b/gfx/pics/nidorina/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/030/back.lz
rename to gfx/pics/nidorina/back.6x6.2bpp.lz
diff --git a/gfx/pics/030/bitmask.asm b/gfx/pics/nidorina/bitmask.asm
similarity index 100%
rename from gfx/pics/030/bitmask.asm
rename to gfx/pics/nidorina/bitmask.asm
diff --git a/gfx/pics/030/frames.asm b/gfx/pics/nidorina/frames.asm
similarity index 100%
rename from gfx/pics/030/frames.asm
rename to gfx/pics/nidorina/frames.asm
diff --git a/gfx/pics/030/front.lz b/gfx/pics/nidorina/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/030/front.lz
rename to gfx/pics/nidorina/front.6x6.2bpp.lz
diff --git a/gfx/pics/030/normal.pal b/gfx/pics/nidorina/normal.pal
similarity index 100%
rename from gfx/pics/030/normal.pal
rename to gfx/pics/nidorina/normal.pal
diff --git a/gfx/pics/030/shiny.pal b/gfx/pics/nidorina/shiny.pal
similarity index 100%
rename from gfx/pics/030/shiny.pal
rename to gfx/pics/nidorina/shiny.pal
diff --git a/gfx/pics/033/anim0.asm b/gfx/pics/nidorino/anim0.asm
similarity index 100%
rename from gfx/pics/033/anim0.asm
rename to gfx/pics/nidorino/anim0.asm
diff --git a/gfx/pics/033/anim1.asm b/gfx/pics/nidorino/anim1.asm
similarity index 100%
rename from gfx/pics/033/anim1.asm
rename to gfx/pics/nidorino/anim1.asm
diff --git a/gfx/pics/033/back.lz b/gfx/pics/nidorino/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/033/back.lz
rename to gfx/pics/nidorino/back.6x6.2bpp.lz
diff --git a/gfx/pics/033/bitmask.asm b/gfx/pics/nidorino/bitmask.asm
similarity index 100%
rename from gfx/pics/033/bitmask.asm
rename to gfx/pics/nidorino/bitmask.asm
diff --git a/gfx/pics/033/frames.asm b/gfx/pics/nidorino/frames.asm
similarity index 100%
rename from gfx/pics/033/frames.asm
rename to gfx/pics/nidorino/frames.asm
diff --git a/gfx/pics/033/front.lz b/gfx/pics/nidorino/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/033/front.lz
rename to gfx/pics/nidorino/front.6x6.2bpp.lz
diff --git a/gfx/pics/033/normal.pal b/gfx/pics/nidorino/normal.pal
similarity index 100%
rename from gfx/pics/033/normal.pal
rename to gfx/pics/nidorino/normal.pal
diff --git a/gfx/pics/033/shiny.pal b/gfx/pics/nidorino/shiny.pal
similarity index 100%
rename from gfx/pics/033/shiny.pal
rename to gfx/pics/nidorino/shiny.pal
diff --git a/gfx/pics/038/anim0.asm b/gfx/pics/ninetales/anim0.asm
similarity index 100%
rename from gfx/pics/038/anim0.asm
rename to gfx/pics/ninetales/anim0.asm
diff --git a/gfx/pics/038/anim1.asm b/gfx/pics/ninetales/anim1.asm
similarity index 100%
rename from gfx/pics/038/anim1.asm
rename to gfx/pics/ninetales/anim1.asm
diff --git a/gfx/pics/038/back.lz b/gfx/pics/ninetales/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/038/back.lz
rename to gfx/pics/ninetales/back.6x6.2bpp.lz
diff --git a/gfx/pics/038/bitmask.asm b/gfx/pics/ninetales/bitmask.asm
similarity index 100%
rename from gfx/pics/038/bitmask.asm
rename to gfx/pics/ninetales/bitmask.asm
diff --git a/gfx/pics/038/frames.asm b/gfx/pics/ninetales/frames.asm
similarity index 100%
rename from gfx/pics/038/frames.asm
rename to gfx/pics/ninetales/frames.asm
diff --git a/gfx/pics/038/front.lz b/gfx/pics/ninetales/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/038/front.lz
rename to gfx/pics/ninetales/front.7x7.2bpp.lz
diff --git a/gfx/pics/038/normal.pal b/gfx/pics/ninetales/normal.pal
similarity index 100%
rename from gfx/pics/038/normal.pal
rename to gfx/pics/ninetales/normal.pal
diff --git a/gfx/pics/038/shiny.pal b/gfx/pics/ninetales/shiny.pal
similarity index 100%
rename from gfx/pics/038/shiny.pal
rename to gfx/pics/ninetales/shiny.pal
diff --git a/gfx/pics/164/anim0.asm b/gfx/pics/noctowl/anim0.asm
similarity index 100%
rename from gfx/pics/164/anim0.asm
rename to gfx/pics/noctowl/anim0.asm
diff --git a/gfx/pics/164/anim1.asm b/gfx/pics/noctowl/anim1.asm
similarity index 100%
rename from gfx/pics/164/anim1.asm
rename to gfx/pics/noctowl/anim1.asm
diff --git a/gfx/pics/164/back.lz b/gfx/pics/noctowl/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/164/back.lz
rename to gfx/pics/noctowl/back.6x6.2bpp.lz
diff --git a/gfx/pics/164/bitmask.asm b/gfx/pics/noctowl/bitmask.asm
similarity index 100%
rename from gfx/pics/164/bitmask.asm
rename to gfx/pics/noctowl/bitmask.asm
diff --git a/gfx/pics/164/frames.asm b/gfx/pics/noctowl/frames.asm
similarity index 100%
rename from gfx/pics/164/frames.asm
rename to gfx/pics/noctowl/frames.asm
diff --git a/gfx/pics/164/front.lz b/gfx/pics/noctowl/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/164/front.lz
rename to gfx/pics/noctowl/front.7x7.2bpp.lz
diff --git a/gfx/pics/164/normal.pal b/gfx/pics/noctowl/normal.pal
similarity index 100%
rename from gfx/pics/164/normal.pal
rename to gfx/pics/noctowl/normal.pal
diff --git a/gfx/pics/164/shiny.pal b/gfx/pics/noctowl/shiny.pal
similarity index 100%
rename from gfx/pics/164/shiny.pal
rename to gfx/pics/noctowl/shiny.pal
diff --git a/gfx/pics/224/anim0.asm b/gfx/pics/octillery/anim0.asm
similarity index 100%
rename from gfx/pics/224/anim0.asm
rename to gfx/pics/octillery/anim0.asm
diff --git a/gfx/pics/224/anim1.asm b/gfx/pics/octillery/anim1.asm
similarity index 100%
rename from gfx/pics/224/anim1.asm
rename to gfx/pics/octillery/anim1.asm
diff --git a/gfx/pics/224/back.lz b/gfx/pics/octillery/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/224/back.lz
rename to gfx/pics/octillery/back.6x6.2bpp.lz
diff --git a/gfx/pics/224/bitmask.asm b/gfx/pics/octillery/bitmask.asm
similarity index 100%
rename from gfx/pics/224/bitmask.asm
rename to gfx/pics/octillery/bitmask.asm
diff --git a/gfx/pics/224/frames.asm b/gfx/pics/octillery/frames.asm
similarity index 100%
rename from gfx/pics/224/frames.asm
rename to gfx/pics/octillery/frames.asm
diff --git a/gfx/pics/224/front.lz b/gfx/pics/octillery/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/224/front.lz
rename to gfx/pics/octillery/front.6x6.2bpp.lz
diff --git a/gfx/pics/224/normal.pal b/gfx/pics/octillery/normal.pal
similarity index 100%
rename from gfx/pics/224/normal.pal
rename to gfx/pics/octillery/normal.pal
diff --git a/gfx/pics/224/shiny.pal b/gfx/pics/octillery/shiny.pal
similarity index 100%
rename from gfx/pics/224/shiny.pal
rename to gfx/pics/octillery/shiny.pal
diff --git a/gfx/pics/043/anim0.asm b/gfx/pics/oddish/anim0.asm
similarity index 100%
rename from gfx/pics/043/anim0.asm
rename to gfx/pics/oddish/anim0.asm
diff --git a/gfx/pics/043/anim1.asm b/gfx/pics/oddish/anim1.asm
similarity index 100%
rename from gfx/pics/043/anim1.asm
rename to gfx/pics/oddish/anim1.asm
diff --git a/gfx/pics/043/back.lz b/gfx/pics/oddish/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/043/back.lz
rename to gfx/pics/oddish/back.6x6.2bpp.lz
diff --git a/gfx/pics/043/bitmask.asm b/gfx/pics/oddish/bitmask.asm
similarity index 100%
rename from gfx/pics/043/bitmask.asm
rename to gfx/pics/oddish/bitmask.asm
diff --git a/gfx/pics/043/frames.asm b/gfx/pics/oddish/frames.asm
similarity index 100%
rename from gfx/pics/043/frames.asm
rename to gfx/pics/oddish/frames.asm
diff --git a/gfx/pics/043/front.lz b/gfx/pics/oddish/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/043/front.lz
rename to gfx/pics/oddish/front.5x5.2bpp.lz
diff --git a/gfx/pics/043/normal.pal b/gfx/pics/oddish/normal.pal
similarity index 100%
rename from gfx/pics/043/normal.pal
rename to gfx/pics/oddish/normal.pal
diff --git a/gfx/pics/043/shiny.pal b/gfx/pics/oddish/shiny.pal
similarity index 100%
rename from gfx/pics/043/shiny.pal
rename to gfx/pics/oddish/shiny.pal
diff --git a/gfx/pics/138/anim0.asm b/gfx/pics/omanyte/anim0.asm
similarity index 100%
rename from gfx/pics/138/anim0.asm
rename to gfx/pics/omanyte/anim0.asm
diff --git a/gfx/pics/138/anim1.asm b/gfx/pics/omanyte/anim1.asm
similarity index 100%
rename from gfx/pics/138/anim1.asm
rename to gfx/pics/omanyte/anim1.asm
diff --git a/gfx/pics/138/back.lz b/gfx/pics/omanyte/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/138/back.lz
rename to gfx/pics/omanyte/back.6x6.2bpp.lz
diff --git a/gfx/pics/138/bitmask.asm b/gfx/pics/omanyte/bitmask.asm
similarity index 100%
rename from gfx/pics/138/bitmask.asm
rename to gfx/pics/omanyte/bitmask.asm
diff --git a/gfx/pics/138/frames.asm b/gfx/pics/omanyte/frames.asm
similarity index 100%
rename from gfx/pics/138/frames.asm
rename to gfx/pics/omanyte/frames.asm
diff --git a/gfx/pics/138/front.lz b/gfx/pics/omanyte/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/138/front.lz
rename to gfx/pics/omanyte/front.5x5.2bpp.lz
diff --git a/gfx/pics/138/normal.pal b/gfx/pics/omanyte/normal.pal
similarity index 100%
rename from gfx/pics/138/normal.pal
rename to gfx/pics/omanyte/normal.pal
diff --git a/gfx/pics/138/shiny.pal b/gfx/pics/omanyte/shiny.pal
similarity index 100%
rename from gfx/pics/138/shiny.pal
rename to gfx/pics/omanyte/shiny.pal
diff --git a/gfx/pics/139/anim0.asm b/gfx/pics/omastar/anim0.asm
similarity index 100%
rename from gfx/pics/139/anim0.asm
rename to gfx/pics/omastar/anim0.asm
diff --git a/gfx/pics/139/anim1.asm b/gfx/pics/omastar/anim1.asm
similarity index 100%
rename from gfx/pics/139/anim1.asm
rename to gfx/pics/omastar/anim1.asm
diff --git a/gfx/pics/139/back.lz b/gfx/pics/omastar/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/139/back.lz
rename to gfx/pics/omastar/back.6x6.2bpp.lz
diff --git a/gfx/pics/139/bitmask.asm b/gfx/pics/omastar/bitmask.asm
similarity index 100%
rename from gfx/pics/139/bitmask.asm
rename to gfx/pics/omastar/bitmask.asm
diff --git a/gfx/pics/139/frames.asm b/gfx/pics/omastar/frames.asm
similarity index 100%
rename from gfx/pics/139/frames.asm
rename to gfx/pics/omastar/frames.asm
diff --git a/gfx/pics/139/front.lz b/gfx/pics/omastar/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/139/front.lz
rename to gfx/pics/omastar/front.6x6.2bpp.lz
diff --git a/gfx/pics/139/normal.pal b/gfx/pics/omastar/normal.pal
similarity index 100%
rename from gfx/pics/139/normal.pal
rename to gfx/pics/omastar/normal.pal
diff --git a/gfx/pics/139/shiny.pal b/gfx/pics/omastar/shiny.pal
similarity index 100%
rename from gfx/pics/139/shiny.pal
rename to gfx/pics/omastar/shiny.pal
diff --git a/gfx/pics/095/anim0.asm b/gfx/pics/onix/anim0.asm
similarity index 100%
rename from gfx/pics/095/anim0.asm
rename to gfx/pics/onix/anim0.asm
diff --git a/gfx/pics/095/anim1.asm b/gfx/pics/onix/anim1.asm
similarity index 100%
rename from gfx/pics/095/anim1.asm
rename to gfx/pics/onix/anim1.asm
diff --git a/gfx/pics/095/back.lz b/gfx/pics/onix/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/095/back.lz
rename to gfx/pics/onix/back.6x6.2bpp.lz
diff --git a/gfx/pics/095/bitmask.asm b/gfx/pics/onix/bitmask.asm
similarity index 100%
rename from gfx/pics/095/bitmask.asm
rename to gfx/pics/onix/bitmask.asm
diff --git a/gfx/pics/095/frames.asm b/gfx/pics/onix/frames.asm
similarity index 100%
rename from gfx/pics/095/frames.asm
rename to gfx/pics/onix/frames.asm
diff --git a/gfx/pics/095/front.lz b/gfx/pics/onix/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/095/front.lz
rename to gfx/pics/onix/front.7x7.2bpp.lz
diff --git a/gfx/pics/095/normal.pal b/gfx/pics/onix/normal.pal
similarity index 100%
rename from gfx/pics/095/normal.pal
rename to gfx/pics/onix/normal.pal
diff --git a/gfx/pics/095/shiny.pal b/gfx/pics/onix/shiny.pal
similarity index 100%
rename from gfx/pics/095/shiny.pal
rename to 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
similarity index 100%
rename from gfx/pics/046/anim0.asm
rename to gfx/pics/paras/anim0.asm
diff --git a/gfx/pics/046/anim1.asm b/gfx/pics/paras/anim1.asm
similarity index 100%
rename from gfx/pics/046/anim1.asm
rename to gfx/pics/paras/anim1.asm
diff --git a/gfx/pics/046/back.lz b/gfx/pics/paras/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/046/back.lz
rename to gfx/pics/paras/back.6x6.2bpp.lz
diff --git a/gfx/pics/046/bitmask.asm b/gfx/pics/paras/bitmask.asm
similarity index 100%
rename from gfx/pics/046/bitmask.asm
rename to gfx/pics/paras/bitmask.asm
diff --git a/gfx/pics/046/frames.asm b/gfx/pics/paras/frames.asm
similarity index 100%
rename from gfx/pics/046/frames.asm
rename to gfx/pics/paras/frames.asm
diff --git a/gfx/pics/046/front.lz b/gfx/pics/paras/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/046/front.lz
rename to gfx/pics/paras/front.5x5.2bpp.lz
diff --git a/gfx/pics/046/normal.pal b/gfx/pics/paras/normal.pal
similarity index 100%
rename from gfx/pics/046/normal.pal
rename to gfx/pics/paras/normal.pal
diff --git a/gfx/pics/046/shiny.pal b/gfx/pics/paras/shiny.pal
similarity index 100%
rename from gfx/pics/046/shiny.pal
rename to gfx/pics/paras/shiny.pal
diff --git a/gfx/pics/047/anim0.asm b/gfx/pics/parasect/anim0.asm
similarity index 100%
rename from gfx/pics/047/anim0.asm
rename to gfx/pics/parasect/anim0.asm
diff --git a/gfx/pics/047/anim1.asm b/gfx/pics/parasect/anim1.asm
similarity index 100%
rename from gfx/pics/047/anim1.asm
rename to gfx/pics/parasect/anim1.asm
diff --git a/gfx/pics/047/back.lz b/gfx/pics/parasect/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/047/back.lz
rename to gfx/pics/parasect/back.6x6.2bpp.lz
diff --git a/gfx/pics/047/bitmask.asm b/gfx/pics/parasect/bitmask.asm
similarity index 100%
rename from gfx/pics/047/bitmask.asm
rename to gfx/pics/parasect/bitmask.asm
diff --git a/gfx/pics/047/frames.asm b/gfx/pics/parasect/frames.asm
similarity index 100%
rename from gfx/pics/047/frames.asm
rename to gfx/pics/parasect/frames.asm
diff --git a/gfx/pics/047/front.lz b/gfx/pics/parasect/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/047/front.lz
rename to gfx/pics/parasect/front.7x7.2bpp.lz
diff --git a/gfx/pics/047/normal.pal b/gfx/pics/parasect/normal.pal
similarity index 100%
rename from gfx/pics/047/normal.pal
rename to gfx/pics/parasect/normal.pal
diff --git a/gfx/pics/047/shiny.pal b/gfx/pics/parasect/shiny.pal
similarity index 100%
rename from gfx/pics/047/shiny.pal
rename to gfx/pics/parasect/shiny.pal
diff --git a/gfx/pics/053/anim0.asm b/gfx/pics/persian/anim0.asm
similarity index 100%
rename from gfx/pics/053/anim0.asm
rename to gfx/pics/persian/anim0.asm
diff --git a/gfx/pics/053/anim1.asm b/gfx/pics/persian/anim1.asm
similarity index 100%
rename from gfx/pics/053/anim1.asm
rename to gfx/pics/persian/anim1.asm
diff --git a/gfx/pics/053/back.lz b/gfx/pics/persian/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/053/back.lz
rename to gfx/pics/persian/back.6x6.2bpp.lz
diff --git a/gfx/pics/053/bitmask.asm b/gfx/pics/persian/bitmask.asm
similarity index 100%
rename from gfx/pics/053/bitmask.asm
rename to gfx/pics/persian/bitmask.asm
diff --git a/gfx/pics/053/frames.asm b/gfx/pics/persian/frames.asm
similarity index 100%
rename from gfx/pics/053/frames.asm
rename to gfx/pics/persian/frames.asm
diff --git a/gfx/pics/053/front.lz b/gfx/pics/persian/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/053/front.lz
rename to gfx/pics/persian/front.7x7.2bpp.lz
diff --git a/gfx/pics/053/normal.pal b/gfx/pics/persian/normal.pal
similarity index 100%
rename from gfx/pics/053/normal.pal
rename to gfx/pics/persian/normal.pal
diff --git a/gfx/pics/053/shiny.pal b/gfx/pics/persian/shiny.pal
similarity index 100%
rename from gfx/pics/053/shiny.pal
rename to gfx/pics/persian/shiny.pal
diff --git a/gfx/pics/231/anim0.asm b/gfx/pics/phanpy/anim0.asm
similarity index 100%
rename from gfx/pics/231/anim0.asm
rename to gfx/pics/phanpy/anim0.asm
diff --git a/gfx/pics/231/anim1.asm b/gfx/pics/phanpy/anim1.asm
similarity index 100%
rename from gfx/pics/231/anim1.asm
rename to gfx/pics/phanpy/anim1.asm
diff --git a/gfx/pics/231/back.lz b/gfx/pics/phanpy/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/231/back.lz
rename to gfx/pics/phanpy/back.6x6.2bpp.lz
diff --git a/gfx/pics/231/bitmask.asm b/gfx/pics/phanpy/bitmask.asm
similarity index 100%
rename from gfx/pics/231/bitmask.asm
rename to gfx/pics/phanpy/bitmask.asm
diff --git a/gfx/pics/231/frames.asm b/gfx/pics/phanpy/frames.asm
similarity index 100%
rename from gfx/pics/231/frames.asm
rename to gfx/pics/phanpy/frames.asm
diff --git a/gfx/pics/231/front.lz b/gfx/pics/phanpy/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/231/front.lz
rename to gfx/pics/phanpy/front.5x5.2bpp.lz
diff --git a/gfx/pics/231/normal.pal b/gfx/pics/phanpy/normal.pal
similarity index 100%
rename from gfx/pics/231/normal.pal
rename to gfx/pics/phanpy/normal.pal
diff --git a/gfx/pics/231/shiny.pal b/gfx/pics/phanpy/shiny.pal
similarity index 100%
rename from gfx/pics/231/shiny.pal
rename to gfx/pics/phanpy/shiny.pal
diff --git a/gfx/pics/172/anim0.asm b/gfx/pics/pichu/anim0.asm
similarity index 100%
rename from gfx/pics/172/anim0.asm
rename to gfx/pics/pichu/anim0.asm
diff --git a/gfx/pics/172/anim1.asm b/gfx/pics/pichu/anim1.asm
similarity index 100%
rename from gfx/pics/172/anim1.asm
rename to gfx/pics/pichu/anim1.asm
diff --git a/gfx/pics/172/back.lz b/gfx/pics/pichu/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/172/back.lz
rename to gfx/pics/pichu/back.6x6.2bpp.lz
diff --git a/gfx/pics/172/bitmask.asm b/gfx/pics/pichu/bitmask.asm
similarity index 100%
rename from gfx/pics/172/bitmask.asm
rename to gfx/pics/pichu/bitmask.asm
diff --git a/gfx/pics/172/frames.asm b/gfx/pics/pichu/frames.asm
similarity index 100%
rename from gfx/pics/172/frames.asm
rename to gfx/pics/pichu/frames.asm
diff --git a/gfx/pics/172/front.lz b/gfx/pics/pichu/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/172/front.lz
rename to gfx/pics/pichu/front.5x5.2bpp.lz
diff --git a/gfx/pics/025/normal.pal b/gfx/pics/pichu/normal.pal
similarity index 100%
rename from gfx/pics/025/normal.pal
rename to gfx/pics/pichu/normal.pal
diff --git a/gfx/pics/025/shiny.pal b/gfx/pics/pichu/shiny.pal
similarity index 100%
rename from gfx/pics/025/shiny.pal
rename to gfx/pics/pichu/shiny.pal
diff --git a/gfx/pics/018/anim0.asm b/gfx/pics/pidgeot/anim0.asm
similarity index 100%
rename from gfx/pics/018/anim0.asm
rename to gfx/pics/pidgeot/anim0.asm
diff --git a/gfx/pics/018/anim1.asm b/gfx/pics/pidgeot/anim1.asm
similarity index 100%
rename from gfx/pics/018/anim1.asm
rename to gfx/pics/pidgeot/anim1.asm
diff --git a/gfx/pics/018/back.lz b/gfx/pics/pidgeot/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/018/back.lz
rename to gfx/pics/pidgeot/back.6x6.2bpp.lz
diff --git a/gfx/pics/018/bitmask.asm b/gfx/pics/pidgeot/bitmask.asm
similarity index 100%
rename from gfx/pics/018/bitmask.asm
rename to gfx/pics/pidgeot/bitmask.asm
diff --git a/gfx/pics/018/frames.asm b/gfx/pics/pidgeot/frames.asm
similarity index 100%
rename from gfx/pics/018/frames.asm
rename to gfx/pics/pidgeot/frames.asm
diff --git a/gfx/pics/018/front.lz b/gfx/pics/pidgeot/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/018/front.lz
rename to gfx/pics/pidgeot/front.7x7.2bpp.lz
diff --git a/gfx/pics/017/normal.pal b/gfx/pics/pidgeot/normal.pal
similarity index 100%
rename from gfx/pics/017/normal.pal
rename to gfx/pics/pidgeot/normal.pal
diff --git a/gfx/pics/018/shiny.pal b/gfx/pics/pidgeot/shiny.pal
similarity index 100%
rename from gfx/pics/018/shiny.pal
rename to gfx/pics/pidgeot/shiny.pal
diff --git a/gfx/pics/017/anim0.asm b/gfx/pics/pidgeotto/anim0.asm
similarity index 100%
rename from gfx/pics/017/anim0.asm
rename to gfx/pics/pidgeotto/anim0.asm
diff --git a/gfx/pics/017/anim1.asm b/gfx/pics/pidgeotto/anim1.asm
similarity index 100%
rename from gfx/pics/017/anim1.asm
rename to gfx/pics/pidgeotto/anim1.asm
diff --git a/gfx/pics/017/back.lz b/gfx/pics/pidgeotto/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/017/back.lz
rename to gfx/pics/pidgeotto/back.6x6.2bpp.lz
diff --git a/gfx/pics/017/bitmask.asm b/gfx/pics/pidgeotto/bitmask.asm
similarity index 100%
rename from gfx/pics/017/bitmask.asm
rename to gfx/pics/pidgeotto/bitmask.asm
diff --git a/gfx/pics/017/frames.asm b/gfx/pics/pidgeotto/frames.asm
similarity index 100%
rename from gfx/pics/017/frames.asm
rename to gfx/pics/pidgeotto/frames.asm
diff --git a/gfx/pics/017/front.lz b/gfx/pics/pidgeotto/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/017/front.lz
rename to gfx/pics/pidgeotto/front.6x6.2bpp.lz
diff --git a/gfx/pics/018/normal.pal b/gfx/pics/pidgeotto/normal.pal
similarity index 100%
rename from gfx/pics/018/normal.pal
rename to gfx/pics/pidgeotto/normal.pal
diff --git a/gfx/pics/017/shiny.pal b/gfx/pics/pidgeotto/shiny.pal
similarity index 100%
rename from gfx/pics/017/shiny.pal
rename to gfx/pics/pidgeotto/shiny.pal
diff --git a/gfx/pics/016/anim0.asm b/gfx/pics/pidgey/anim0.asm
similarity index 100%
rename from gfx/pics/016/anim0.asm
rename to gfx/pics/pidgey/anim0.asm
diff --git a/gfx/pics/016/anim1.asm b/gfx/pics/pidgey/anim1.asm
similarity index 100%
rename from gfx/pics/016/anim1.asm
rename to gfx/pics/pidgey/anim1.asm
diff --git a/gfx/pics/016/back.lz b/gfx/pics/pidgey/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/016/back.lz
rename to gfx/pics/pidgey/back.6x6.2bpp.lz
diff --git a/gfx/pics/016/bitmask.asm b/gfx/pics/pidgey/bitmask.asm
similarity index 100%
rename from gfx/pics/016/bitmask.asm
rename to gfx/pics/pidgey/bitmask.asm
diff --git a/gfx/pics/016/frames.asm b/gfx/pics/pidgey/frames.asm
similarity index 100%
rename from gfx/pics/016/frames.asm
rename to gfx/pics/pidgey/frames.asm
diff --git a/gfx/pics/016/front.lz b/gfx/pics/pidgey/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/016/front.lz
rename to gfx/pics/pidgey/front.5x5.2bpp.lz
diff --git a/gfx/pics/016/normal.pal b/gfx/pics/pidgey/normal.pal
similarity index 100%
rename from gfx/pics/016/normal.pal
rename to gfx/pics/pidgey/normal.pal
diff --git a/gfx/pics/016/shiny.pal b/gfx/pics/pidgey/shiny.pal
similarity index 100%
rename from gfx/pics/016/shiny.pal
rename to gfx/pics/pidgey/shiny.pal
diff --git a/gfx/pics/025/anim0.asm b/gfx/pics/pikachu/anim0.asm
similarity index 100%
rename from gfx/pics/025/anim0.asm
rename to gfx/pics/pikachu/anim0.asm
diff --git a/gfx/pics/025/anim1.asm b/gfx/pics/pikachu/anim1.asm
similarity index 100%
rename from gfx/pics/025/anim1.asm
rename to gfx/pics/pikachu/anim1.asm
diff --git a/gfx/pics/025/back.lz b/gfx/pics/pikachu/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/025/back.lz
rename to gfx/pics/pikachu/back.6x6.2bpp.lz
diff --git a/gfx/pics/025/bitmask.asm b/gfx/pics/pikachu/bitmask.asm
similarity index 100%
rename from gfx/pics/025/bitmask.asm
rename to gfx/pics/pikachu/bitmask.asm
diff --git a/gfx/pics/025/frames.asm b/gfx/pics/pikachu/frames.asm
similarity index 100%
rename from gfx/pics/025/frames.asm
rename to gfx/pics/pikachu/frames.asm
diff --git a/gfx/pics/025/front.lz b/gfx/pics/pikachu/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/025/front.lz
rename to gfx/pics/pikachu/front.5x5.2bpp.lz
diff --git a/gfx/pics/172/normal.pal b/gfx/pics/pikachu/normal.pal
similarity index 100%
rename from gfx/pics/172/normal.pal
rename to gfx/pics/pikachu/normal.pal
diff --git a/gfx/pics/172/shiny.pal b/gfx/pics/pikachu/shiny.pal
similarity index 100%
rename from gfx/pics/172/shiny.pal
rename to gfx/pics/pikachu/shiny.pal
diff --git a/gfx/pics/221/anim0.asm b/gfx/pics/piloswine/anim0.asm
similarity index 100%
rename from gfx/pics/221/anim0.asm
rename to gfx/pics/piloswine/anim0.asm
diff --git a/gfx/pics/221/anim1.asm b/gfx/pics/piloswine/anim1.asm
similarity index 100%
rename from gfx/pics/221/anim1.asm
rename to gfx/pics/piloswine/anim1.asm
diff --git a/gfx/pics/221/back.lz b/gfx/pics/piloswine/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/221/back.lz
rename to gfx/pics/piloswine/back.6x6.2bpp.lz
diff --git a/gfx/pics/221/bitmask.asm b/gfx/pics/piloswine/bitmask.asm
similarity index 100%
rename from gfx/pics/221/bitmask.asm
rename to gfx/pics/piloswine/bitmask.asm
diff --git a/gfx/pics/221/frames.asm b/gfx/pics/piloswine/frames.asm
similarity index 100%
rename from gfx/pics/221/frames.asm
rename to gfx/pics/piloswine/frames.asm
diff --git a/gfx/pics/221/front.lz b/gfx/pics/piloswine/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/221/front.lz
rename to gfx/pics/piloswine/front.6x6.2bpp.lz
diff --git a/gfx/pics/221/normal.pal b/gfx/pics/piloswine/normal.pal
similarity index 100%
rename from gfx/pics/221/normal.pal
rename to gfx/pics/piloswine/normal.pal
diff --git a/gfx/pics/221/shiny.pal b/gfx/pics/piloswine/shiny.pal
similarity index 100%
rename from gfx/pics/221/shiny.pal
rename to gfx/pics/piloswine/shiny.pal
diff --git a/gfx/pics/204/anim0.asm b/gfx/pics/pineco/anim0.asm
similarity index 100%
rename from gfx/pics/204/anim0.asm
rename to gfx/pics/pineco/anim0.asm
diff --git a/gfx/pics/204/anim1.asm b/gfx/pics/pineco/anim1.asm
similarity index 100%
rename from gfx/pics/204/anim1.asm
rename to gfx/pics/pineco/anim1.asm
diff --git a/gfx/pics/204/back.lz b/gfx/pics/pineco/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/204/back.lz
rename to gfx/pics/pineco/back.6x6.2bpp.lz
diff --git a/gfx/pics/204/bitmask.asm b/gfx/pics/pineco/bitmask.asm
similarity index 100%
rename from gfx/pics/204/bitmask.asm
rename to gfx/pics/pineco/bitmask.asm
diff --git a/gfx/pics/204/frames.asm b/gfx/pics/pineco/frames.asm
similarity index 100%
rename from gfx/pics/204/frames.asm
rename to gfx/pics/pineco/frames.asm
diff --git a/gfx/pics/204/front.lz b/gfx/pics/pineco/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/204/front.lz
rename to gfx/pics/pineco/front.5x5.2bpp.lz
diff --git a/gfx/pics/204/normal.pal b/gfx/pics/pineco/normal.pal
similarity index 100%
rename from gfx/pics/204/normal.pal
rename to gfx/pics/pineco/normal.pal
diff --git a/gfx/pics/204/shiny.pal b/gfx/pics/pineco/shiny.pal
similarity index 100%
rename from gfx/pics/204/shiny.pal
rename to gfx/pics/pineco/shiny.pal
diff --git a/gfx/pics/127/anim0.asm b/gfx/pics/pinsir/anim0.asm
similarity index 100%
rename from gfx/pics/127/anim0.asm
rename to gfx/pics/pinsir/anim0.asm
diff --git a/gfx/pics/127/anim1.asm b/gfx/pics/pinsir/anim1.asm
similarity index 100%
rename from gfx/pics/127/anim1.asm
rename to gfx/pics/pinsir/anim1.asm
diff --git a/gfx/pics/127/back.lz b/gfx/pics/pinsir/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/127/back.lz
rename to gfx/pics/pinsir/back.6x6.2bpp.lz
diff --git a/gfx/pics/127/bitmask.asm b/gfx/pics/pinsir/bitmask.asm
similarity index 100%
rename from gfx/pics/127/bitmask.asm
rename to gfx/pics/pinsir/bitmask.asm
diff --git a/gfx/pics/127/frames.asm b/gfx/pics/pinsir/frames.asm
similarity index 100%
rename from gfx/pics/127/frames.asm
rename to gfx/pics/pinsir/frames.asm
diff --git a/gfx/pics/127/front.lz b/gfx/pics/pinsir/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/127/front.lz
rename to gfx/pics/pinsir/front.7x7.2bpp.lz
diff --git a/gfx/pics/127/normal.pal b/gfx/pics/pinsir/normal.pal
similarity index 100%
rename from gfx/pics/127/normal.pal
rename to gfx/pics/pinsir/normal.pal
diff --git a/gfx/pics/127/shiny.pal b/gfx/pics/pinsir/shiny.pal
similarity index 100%
rename from gfx/pics/127/shiny.pal
rename to gfx/pics/pinsir/shiny.pal
diff --git a/gfx/pics/186/anim0.asm b/gfx/pics/politoed/anim0.asm
similarity index 100%
rename from gfx/pics/186/anim0.asm
rename to gfx/pics/politoed/anim0.asm
diff --git a/gfx/pics/186/anim1.asm b/gfx/pics/politoed/anim1.asm
similarity index 100%
rename from gfx/pics/186/anim1.asm
rename to gfx/pics/politoed/anim1.asm
diff --git a/gfx/pics/186/back.lz b/gfx/pics/politoed/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/186/back.lz
rename to gfx/pics/politoed/back.6x6.2bpp.lz
diff --git a/gfx/pics/186/bitmask.asm b/gfx/pics/politoed/bitmask.asm
similarity index 100%
rename from gfx/pics/186/bitmask.asm
rename to gfx/pics/politoed/bitmask.asm
diff --git a/gfx/pics/186/frames.asm b/gfx/pics/politoed/frames.asm
similarity index 100%
rename from gfx/pics/186/frames.asm
rename to gfx/pics/politoed/frames.asm
diff --git a/gfx/pics/186/front.lz b/gfx/pics/politoed/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/186/front.lz
rename to gfx/pics/politoed/front.7x7.2bpp.lz
diff --git a/gfx/pics/186/normal.pal b/gfx/pics/politoed/normal.pal
similarity index 100%
rename from gfx/pics/186/normal.pal
rename to gfx/pics/politoed/normal.pal
diff --git a/gfx/pics/186/shiny.pal b/gfx/pics/politoed/shiny.pal
similarity index 100%
rename from gfx/pics/186/shiny.pal
rename to gfx/pics/politoed/shiny.pal
diff --git a/gfx/pics/060/anim0.asm b/gfx/pics/poliwag/anim0.asm
similarity index 100%
rename from gfx/pics/060/anim0.asm
rename to gfx/pics/poliwag/anim0.asm
diff --git a/gfx/pics/060/anim1.asm b/gfx/pics/poliwag/anim1.asm
similarity index 100%
rename from gfx/pics/060/anim1.asm
rename to gfx/pics/poliwag/anim1.asm
diff --git a/gfx/pics/060/back.lz b/gfx/pics/poliwag/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/060/back.lz
rename to gfx/pics/poliwag/back.6x6.2bpp.lz
diff --git a/gfx/pics/060/bitmask.asm b/gfx/pics/poliwag/bitmask.asm
similarity index 100%
rename from gfx/pics/060/bitmask.asm
rename to gfx/pics/poliwag/bitmask.asm
diff --git a/gfx/pics/060/frames.asm b/gfx/pics/poliwag/frames.asm
similarity index 100%
rename from gfx/pics/060/frames.asm
rename to gfx/pics/poliwag/frames.asm
diff --git a/gfx/pics/060/front.lz b/gfx/pics/poliwag/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/060/front.lz
rename to gfx/pics/poliwag/front.5x5.2bpp.lz
diff --git a/gfx/pics/060/normal.pal b/gfx/pics/poliwag/normal.pal
similarity index 100%
rename from gfx/pics/060/normal.pal
rename to gfx/pics/poliwag/normal.pal
diff --git a/gfx/pics/060/shiny.pal b/gfx/pics/poliwag/shiny.pal
similarity index 100%
rename from gfx/pics/060/shiny.pal
rename to gfx/pics/poliwag/shiny.pal
diff --git a/gfx/pics/061/anim0.asm b/gfx/pics/poliwhirl/anim0.asm
similarity index 100%
rename from gfx/pics/061/anim0.asm
rename to gfx/pics/poliwhirl/anim0.asm
diff --git a/gfx/pics/061/anim1.asm b/gfx/pics/poliwhirl/anim1.asm
similarity index 100%
rename from gfx/pics/061/anim1.asm
rename to gfx/pics/poliwhirl/anim1.asm
diff --git a/gfx/pics/061/back.lz b/gfx/pics/poliwhirl/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/061/back.lz
rename to gfx/pics/poliwhirl/back.6x6.2bpp.lz
diff --git a/gfx/pics/061/bitmask.asm b/gfx/pics/poliwhirl/bitmask.asm
similarity index 100%
rename from gfx/pics/061/bitmask.asm
rename to gfx/pics/poliwhirl/bitmask.asm
diff --git a/gfx/pics/061/frames.asm b/gfx/pics/poliwhirl/frames.asm
similarity index 100%
rename from gfx/pics/061/frames.asm
rename to gfx/pics/poliwhirl/frames.asm
diff --git a/gfx/pics/061/front.lz b/gfx/pics/poliwhirl/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/061/front.lz
rename to gfx/pics/poliwhirl/front.6x6.2bpp.lz
diff --git a/gfx/pics/061/normal.pal b/gfx/pics/poliwhirl/normal.pal
similarity index 100%
rename from gfx/pics/061/normal.pal
rename to gfx/pics/poliwhirl/normal.pal
diff --git a/gfx/pics/061/shiny.pal b/gfx/pics/poliwhirl/shiny.pal
similarity index 100%
rename from gfx/pics/061/shiny.pal
rename to gfx/pics/poliwhirl/shiny.pal
diff --git a/gfx/pics/062/anim0.asm b/gfx/pics/poliwrath/anim0.asm
similarity index 100%
rename from gfx/pics/062/anim0.asm
rename to gfx/pics/poliwrath/anim0.asm
diff --git a/gfx/pics/062/anim1.asm b/gfx/pics/poliwrath/anim1.asm
similarity index 100%
rename from gfx/pics/062/anim1.asm
rename to gfx/pics/poliwrath/anim1.asm
diff --git a/gfx/pics/062/back.lz b/gfx/pics/poliwrath/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/062/back.lz
rename to gfx/pics/poliwrath/back.6x6.2bpp.lz
diff --git a/gfx/pics/062/bitmask.asm b/gfx/pics/poliwrath/bitmask.asm
similarity index 100%
rename from gfx/pics/062/bitmask.asm
rename to gfx/pics/poliwrath/bitmask.asm
diff --git a/gfx/pics/062/frames.asm b/gfx/pics/poliwrath/frames.asm
similarity index 100%
rename from gfx/pics/062/frames.asm
rename to gfx/pics/poliwrath/frames.asm
diff --git a/gfx/pics/062/front.lz b/gfx/pics/poliwrath/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/062/front.lz
rename to gfx/pics/poliwrath/front.7x7.2bpp.lz
diff --git a/gfx/pics/062/normal.pal b/gfx/pics/poliwrath/normal.pal
similarity index 100%
rename from gfx/pics/062/normal.pal
rename to gfx/pics/poliwrath/normal.pal
diff --git a/gfx/pics/062/shiny.pal b/gfx/pics/poliwrath/shiny.pal
similarity index 100%
rename from gfx/pics/062/shiny.pal
rename to gfx/pics/poliwrath/shiny.pal
diff --git a/gfx/pics/077/anim0.asm b/gfx/pics/ponyta/anim0.asm
similarity index 100%
rename from gfx/pics/077/anim0.asm
rename to gfx/pics/ponyta/anim0.asm
diff --git a/gfx/pics/077/anim1.asm b/gfx/pics/ponyta/anim1.asm
similarity index 100%
rename from gfx/pics/077/anim1.asm
rename to gfx/pics/ponyta/anim1.asm
diff --git a/gfx/pics/077/back.lz b/gfx/pics/ponyta/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/077/back.lz
rename to gfx/pics/ponyta/back.6x6.2bpp.lz
diff --git a/gfx/pics/077/bitmask.asm b/gfx/pics/ponyta/bitmask.asm
similarity index 100%
rename from gfx/pics/077/bitmask.asm
rename to gfx/pics/ponyta/bitmask.asm
diff --git a/gfx/pics/077/frames.asm b/gfx/pics/ponyta/frames.asm
similarity index 100%
rename from gfx/pics/077/frames.asm
rename to gfx/pics/ponyta/frames.asm
diff --git a/gfx/pics/077/front.lz b/gfx/pics/ponyta/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/077/front.lz
rename to gfx/pics/ponyta/front.6x6.2bpp.lz
diff --git a/gfx/pics/077/normal.pal b/gfx/pics/ponyta/normal.pal
similarity index 100%
rename from gfx/pics/077/normal.pal
rename to gfx/pics/ponyta/normal.pal
diff --git a/gfx/pics/077/shiny.pal b/gfx/pics/ponyta/shiny.pal
similarity index 100%
rename from gfx/pics/077/shiny.pal
rename to gfx/pics/ponyta/shiny.pal
diff --git a/gfx/pics/137/anim0.asm b/gfx/pics/porygon/anim0.asm
similarity index 100%
rename from gfx/pics/137/anim0.asm
rename to gfx/pics/porygon/anim0.asm
diff --git a/gfx/pics/137/anim1.asm b/gfx/pics/porygon/anim1.asm
similarity index 100%
rename from gfx/pics/137/anim1.asm
rename to gfx/pics/porygon/anim1.asm
diff --git a/gfx/pics/137/back.lz b/gfx/pics/porygon/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/137/back.lz
rename to gfx/pics/porygon/back.6x6.2bpp.lz
diff --git a/gfx/pics/137/bitmask.asm b/gfx/pics/porygon/bitmask.asm
similarity index 100%
rename from gfx/pics/137/bitmask.asm
rename to gfx/pics/porygon/bitmask.asm
diff --git a/gfx/pics/137/frames.asm b/gfx/pics/porygon/frames.asm
similarity index 100%
rename from gfx/pics/137/frames.asm
rename to gfx/pics/porygon/frames.asm
diff --git a/gfx/pics/137/front.lz b/gfx/pics/porygon/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/137/front.lz
rename to gfx/pics/porygon/front.6x6.2bpp.lz
diff --git a/gfx/pics/137/normal.pal b/gfx/pics/porygon/normal.pal
similarity index 100%
rename from gfx/pics/137/normal.pal
rename to gfx/pics/porygon/normal.pal
diff --git a/gfx/pics/137/shiny.pal b/gfx/pics/porygon/shiny.pal
similarity index 100%
rename from gfx/pics/137/shiny.pal
rename to gfx/pics/porygon/shiny.pal
diff --git a/gfx/pics/233/anim0.asm b/gfx/pics/porygon2/anim0.asm
similarity index 100%
rename from gfx/pics/233/anim0.asm
rename to gfx/pics/porygon2/anim0.asm
diff --git a/gfx/pics/233/anim1.asm b/gfx/pics/porygon2/anim1.asm
similarity index 100%
rename from gfx/pics/233/anim1.asm
rename to gfx/pics/porygon2/anim1.asm
diff --git a/gfx/pics/233/back.lz b/gfx/pics/porygon2/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/233/back.lz
rename to gfx/pics/porygon2/back.6x6.2bpp.lz
diff --git a/gfx/pics/233/bitmask.asm b/gfx/pics/porygon2/bitmask.asm
similarity index 100%
rename from gfx/pics/233/bitmask.asm
rename to gfx/pics/porygon2/bitmask.asm
diff --git a/gfx/pics/233/frames.asm b/gfx/pics/porygon2/frames.asm
similarity index 100%
rename from gfx/pics/233/frames.asm
rename to gfx/pics/porygon2/frames.asm
diff --git a/gfx/pics/233/front.lz b/gfx/pics/porygon2/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/233/front.lz
rename to gfx/pics/porygon2/front.6x6.2bpp.lz
diff --git a/gfx/pics/233/normal.pal b/gfx/pics/porygon2/normal.pal
similarity index 100%
rename from gfx/pics/233/normal.pal
rename to gfx/pics/porygon2/normal.pal
diff --git a/gfx/pics/233/shiny.pal b/gfx/pics/porygon2/shiny.pal
similarity index 100%
rename from gfx/pics/233/shiny.pal
rename to gfx/pics/porygon2/shiny.pal
diff --git a/gfx/pics/057/anim0.asm b/gfx/pics/primeape/anim0.asm
similarity index 100%
rename from gfx/pics/057/anim0.asm
rename to gfx/pics/primeape/anim0.asm
diff --git a/gfx/pics/057/anim1.asm b/gfx/pics/primeape/anim1.asm
similarity index 100%
rename from gfx/pics/057/anim1.asm
rename to gfx/pics/primeape/anim1.asm
diff --git a/gfx/pics/057/back.lz b/gfx/pics/primeape/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/057/back.lz
rename to gfx/pics/primeape/back.6x6.2bpp.lz
diff --git a/gfx/pics/057/bitmask.asm b/gfx/pics/primeape/bitmask.asm
similarity index 100%
rename from gfx/pics/057/bitmask.asm
rename to gfx/pics/primeape/bitmask.asm
diff --git a/gfx/pics/057/frames.asm b/gfx/pics/primeape/frames.asm
similarity index 100%
rename from gfx/pics/057/frames.asm
rename to gfx/pics/primeape/frames.asm
diff --git a/gfx/pics/057/front.lz b/gfx/pics/primeape/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/057/front.lz
rename to gfx/pics/primeape/front.7x7.2bpp.lz
diff --git a/gfx/pics/057/normal.pal b/gfx/pics/primeape/normal.pal
similarity index 100%
rename from gfx/pics/057/normal.pal
rename to gfx/pics/primeape/normal.pal
diff --git a/gfx/pics/057/shiny.pal b/gfx/pics/primeape/shiny.pal
similarity index 100%
rename from gfx/pics/057/shiny.pal
rename to gfx/pics/primeape/shiny.pal
diff --git a/gfx/pics/054/anim0.asm b/gfx/pics/psyduck/anim0.asm
similarity index 100%
rename from gfx/pics/054/anim0.asm
rename to gfx/pics/psyduck/anim0.asm
diff --git a/gfx/pics/054/anim1.asm b/gfx/pics/psyduck/anim1.asm
similarity index 100%
rename from gfx/pics/054/anim1.asm
rename to gfx/pics/psyduck/anim1.asm
diff --git a/gfx/pics/054/back.lz b/gfx/pics/psyduck/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/054/back.lz
rename to gfx/pics/psyduck/back.6x6.2bpp.lz
diff --git a/gfx/pics/054/bitmask.asm b/gfx/pics/psyduck/bitmask.asm
similarity index 100%
rename from gfx/pics/054/bitmask.asm
rename to gfx/pics/psyduck/bitmask.asm
diff --git a/gfx/pics/054/frames.asm b/gfx/pics/psyduck/frames.asm
similarity index 100%
rename from gfx/pics/054/frames.asm
rename to gfx/pics/psyduck/frames.asm
diff --git a/gfx/pics/054/front.lz b/gfx/pics/psyduck/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/054/front.lz
rename to gfx/pics/psyduck/front.5x5.2bpp.lz
diff --git a/gfx/pics/054/normal.pal b/gfx/pics/psyduck/normal.pal
similarity index 100%
rename from gfx/pics/054/normal.pal
rename to gfx/pics/psyduck/normal.pal
diff --git a/gfx/pics/054/shiny.pal b/gfx/pics/psyduck/shiny.pal
similarity index 100%
rename from gfx/pics/054/shiny.pal
rename to gfx/pics/psyduck/shiny.pal
diff --git a/gfx/pics/247/anim0.asm b/gfx/pics/pupitar/anim0.asm
similarity index 100%
rename from gfx/pics/247/anim0.asm
rename to gfx/pics/pupitar/anim0.asm
diff --git a/gfx/pics/247/anim1.asm b/gfx/pics/pupitar/anim1.asm
similarity index 100%
rename from gfx/pics/247/anim1.asm
rename to gfx/pics/pupitar/anim1.asm
diff --git a/gfx/pics/247/back.lz b/gfx/pics/pupitar/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/247/back.lz
rename to gfx/pics/pupitar/back.6x6.2bpp.lz
diff --git a/gfx/pics/247/bitmask.asm b/gfx/pics/pupitar/bitmask.asm
similarity index 100%
rename from gfx/pics/247/bitmask.asm
rename to gfx/pics/pupitar/bitmask.asm
diff --git a/gfx/pics/247/frames.asm b/gfx/pics/pupitar/frames.asm
similarity index 100%
rename from gfx/pics/247/frames.asm
rename to gfx/pics/pupitar/frames.asm
diff --git a/gfx/pics/247/front.lz b/gfx/pics/pupitar/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/247/front.lz
rename to gfx/pics/pupitar/front.6x6.2bpp.lz
diff --git a/gfx/pics/247/normal.pal b/gfx/pics/pupitar/normal.pal
similarity index 100%
rename from gfx/pics/247/normal.pal
rename to gfx/pics/pupitar/normal.pal
diff --git a/gfx/pics/247/shiny.pal b/gfx/pics/pupitar/shiny.pal
similarity index 100%
rename from gfx/pics/247/shiny.pal
rename to gfx/pics/pupitar/shiny.pal
diff --git a/gfx/pics/195/anim0.asm b/gfx/pics/quagsire/anim0.asm
similarity index 100%
rename from gfx/pics/195/anim0.asm
rename to gfx/pics/quagsire/anim0.asm
diff --git a/gfx/pics/195/anim1.asm b/gfx/pics/quagsire/anim1.asm
similarity index 100%
rename from gfx/pics/195/anim1.asm
rename to gfx/pics/quagsire/anim1.asm
diff --git a/gfx/pics/195/back.lz b/gfx/pics/quagsire/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/195/back.lz
rename to gfx/pics/quagsire/back.6x6.2bpp.lz
diff --git a/gfx/pics/195/bitmask.asm b/gfx/pics/quagsire/bitmask.asm
similarity index 100%
rename from gfx/pics/195/bitmask.asm
rename to gfx/pics/quagsire/bitmask.asm
diff --git a/gfx/pics/195/frames.asm b/gfx/pics/quagsire/frames.asm
similarity index 100%
rename from gfx/pics/195/frames.asm
rename to gfx/pics/quagsire/frames.asm
diff --git a/gfx/pics/195/front.lz b/gfx/pics/quagsire/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/195/front.lz
rename to gfx/pics/quagsire/front.6x6.2bpp.lz
diff --git a/gfx/pics/195/normal.pal b/gfx/pics/quagsire/normal.pal
similarity index 100%
rename from gfx/pics/195/normal.pal
rename to gfx/pics/quagsire/normal.pal
diff --git a/gfx/pics/195/shiny.pal b/gfx/pics/quagsire/shiny.pal
similarity index 100%
rename from gfx/pics/195/shiny.pal
rename to gfx/pics/quagsire/shiny.pal
diff --git a/gfx/pics/156/anim0.asm b/gfx/pics/quilava/anim0.asm
similarity index 100%
rename from gfx/pics/156/anim0.asm
rename to gfx/pics/quilava/anim0.asm
diff --git a/gfx/pics/156/anim1.asm b/gfx/pics/quilava/anim1.asm
similarity index 100%
rename from gfx/pics/156/anim1.asm
rename to gfx/pics/quilava/anim1.asm
diff --git a/gfx/pics/156/back.lz b/gfx/pics/quilava/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/156/back.lz
rename to gfx/pics/quilava/back.6x6.2bpp.lz
diff --git a/gfx/pics/156/bitmask.asm b/gfx/pics/quilava/bitmask.asm
similarity index 100%
rename from gfx/pics/156/bitmask.asm
rename to gfx/pics/quilava/bitmask.asm
diff --git a/gfx/pics/156/frames.asm b/gfx/pics/quilava/frames.asm
similarity index 100%
rename from gfx/pics/156/frames.asm
rename to gfx/pics/quilava/frames.asm
diff --git a/gfx/pics/156/front.lz b/gfx/pics/quilava/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/156/front.lz
rename to gfx/pics/quilava/front.6x6.2bpp.lz
diff --git a/gfx/pics/156/normal.pal b/gfx/pics/quilava/normal.pal
similarity index 100%
rename from gfx/pics/156/normal.pal
rename to gfx/pics/quilava/normal.pal
diff --git a/gfx/pics/156/shiny.pal b/gfx/pics/quilava/shiny.pal
similarity index 100%
rename from gfx/pics/156/shiny.pal
rename to gfx/pics/quilava/shiny.pal
diff --git a/gfx/pics/211/anim0.asm b/gfx/pics/qwilfish/anim0.asm
similarity index 100%
rename from gfx/pics/211/anim0.asm
rename to gfx/pics/qwilfish/anim0.asm
diff --git a/gfx/pics/211/anim1.asm b/gfx/pics/qwilfish/anim1.asm
similarity index 100%
rename from gfx/pics/211/anim1.asm
rename to gfx/pics/qwilfish/anim1.asm
diff --git a/gfx/pics/211/back.lz b/gfx/pics/qwilfish/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/211/back.lz
rename to gfx/pics/qwilfish/back.6x6.2bpp.lz
diff --git a/gfx/pics/211/bitmask.asm b/gfx/pics/qwilfish/bitmask.asm
similarity index 100%
rename from gfx/pics/211/bitmask.asm
rename to gfx/pics/qwilfish/bitmask.asm
diff --git a/gfx/pics/211/frames.asm b/gfx/pics/qwilfish/frames.asm
similarity index 100%
rename from gfx/pics/211/frames.asm
rename to gfx/pics/qwilfish/frames.asm
diff --git a/gfx/pics/211/front.lz b/gfx/pics/qwilfish/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/211/front.lz
rename to gfx/pics/qwilfish/front.5x5.2bpp.lz
diff --git a/gfx/pics/211/normal.pal b/gfx/pics/qwilfish/normal.pal
similarity index 100%
rename from gfx/pics/211/normal.pal
rename to gfx/pics/qwilfish/normal.pal
diff --git a/gfx/pics/211/shiny.pal b/gfx/pics/qwilfish/shiny.pal
similarity index 100%
rename from gfx/pics/211/shiny.pal
rename to gfx/pics/qwilfish/shiny.pal
diff --git a/gfx/pics/026/anim0.asm b/gfx/pics/raichu/anim0.asm
similarity index 100%
rename from gfx/pics/026/anim0.asm
rename to gfx/pics/raichu/anim0.asm
diff --git a/gfx/pics/026/anim1.asm b/gfx/pics/raichu/anim1.asm
similarity index 100%
rename from gfx/pics/026/anim1.asm
rename to gfx/pics/raichu/anim1.asm
diff --git a/gfx/pics/026/back.lz b/gfx/pics/raichu/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/026/back.lz
rename to gfx/pics/raichu/back.6x6.2bpp.lz
diff --git a/gfx/pics/026/bitmask.asm b/gfx/pics/raichu/bitmask.asm
similarity index 100%
rename from gfx/pics/026/bitmask.asm
rename to gfx/pics/raichu/bitmask.asm
diff --git a/gfx/pics/026/frames.asm b/gfx/pics/raichu/frames.asm
similarity index 100%
rename from gfx/pics/026/frames.asm
rename to gfx/pics/raichu/frames.asm
diff --git a/gfx/pics/026/front.lz b/gfx/pics/raichu/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/026/front.lz
rename to gfx/pics/raichu/front.7x7.2bpp.lz
diff --git a/gfx/pics/026/normal.pal b/gfx/pics/raichu/normal.pal
similarity index 100%
rename from gfx/pics/026/normal.pal
rename to gfx/pics/raichu/normal.pal
diff --git a/gfx/pics/026/shiny.pal b/gfx/pics/raichu/shiny.pal
similarity index 100%
rename from gfx/pics/026/shiny.pal
rename to gfx/pics/raichu/shiny.pal
diff --git a/gfx/pics/243/anim0.asm b/gfx/pics/raikou/anim0.asm
similarity index 100%
rename from gfx/pics/243/anim0.asm
rename to gfx/pics/raikou/anim0.asm
diff --git a/gfx/pics/243/anim1.asm b/gfx/pics/raikou/anim1.asm
similarity index 100%
rename from gfx/pics/243/anim1.asm
rename to gfx/pics/raikou/anim1.asm
diff --git a/gfx/pics/243/back.lz b/gfx/pics/raikou/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/243/back.lz
rename to gfx/pics/raikou/back.6x6.2bpp.lz
diff --git a/gfx/pics/243/bitmask.asm b/gfx/pics/raikou/bitmask.asm
similarity index 100%
rename from gfx/pics/243/bitmask.asm
rename to gfx/pics/raikou/bitmask.asm
diff --git a/gfx/pics/243/frames.asm b/gfx/pics/raikou/frames.asm
similarity index 100%
rename from gfx/pics/243/frames.asm
rename to gfx/pics/raikou/frames.asm
diff --git a/gfx/pics/243/front.lz b/gfx/pics/raikou/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/243/front.lz
rename to gfx/pics/raikou/front.7x7.2bpp.lz
diff --git a/gfx/pics/243/normal.pal b/gfx/pics/raikou/normal.pal
similarity index 100%
rename from gfx/pics/243/normal.pal
rename to gfx/pics/raikou/normal.pal
diff --git a/gfx/pics/243/shiny.pal b/gfx/pics/raikou/shiny.pal
similarity index 100%
rename from gfx/pics/243/shiny.pal
rename to gfx/pics/raikou/shiny.pal
diff --git a/gfx/pics/078/anim0.asm b/gfx/pics/rapidash/anim0.asm
similarity index 100%
rename from gfx/pics/078/anim0.asm
rename to gfx/pics/rapidash/anim0.asm
diff --git a/gfx/pics/078/anim1.asm b/gfx/pics/rapidash/anim1.asm
similarity index 100%
rename from gfx/pics/078/anim1.asm
rename to gfx/pics/rapidash/anim1.asm
diff --git a/gfx/pics/078/back.lz b/gfx/pics/rapidash/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/078/back.lz
rename to gfx/pics/rapidash/back.6x6.2bpp.lz
diff --git a/gfx/pics/078/bitmask.asm b/gfx/pics/rapidash/bitmask.asm
similarity index 100%
rename from gfx/pics/078/bitmask.asm
rename to gfx/pics/rapidash/bitmask.asm
diff --git a/gfx/pics/078/frames.asm b/gfx/pics/rapidash/frames.asm
similarity index 100%
rename from gfx/pics/078/frames.asm
rename to gfx/pics/rapidash/frames.asm
diff --git a/gfx/pics/078/front.lz b/gfx/pics/rapidash/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/078/front.lz
rename to gfx/pics/rapidash/front.7x7.2bpp.lz
diff --git a/gfx/pics/078/normal.pal b/gfx/pics/rapidash/normal.pal
similarity index 100%
rename from gfx/pics/078/normal.pal
rename to gfx/pics/rapidash/normal.pal
diff --git a/gfx/pics/078/shiny.pal b/gfx/pics/rapidash/shiny.pal
similarity index 100%
rename from gfx/pics/078/shiny.pal
rename to gfx/pics/rapidash/shiny.pal
diff --git a/gfx/pics/020/anim0.asm b/gfx/pics/raticate/anim0.asm
similarity index 100%
rename from gfx/pics/020/anim0.asm
rename to gfx/pics/raticate/anim0.asm
diff --git a/gfx/pics/020/anim1.asm b/gfx/pics/raticate/anim1.asm
similarity index 100%
rename from gfx/pics/020/anim1.asm
rename to gfx/pics/raticate/anim1.asm
diff --git a/gfx/pics/020/back.lz b/gfx/pics/raticate/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/020/back.lz
rename to gfx/pics/raticate/back.6x6.2bpp.lz
diff --git a/gfx/pics/020/bitmask.asm b/gfx/pics/raticate/bitmask.asm
similarity index 100%
rename from gfx/pics/020/bitmask.asm
rename to gfx/pics/raticate/bitmask.asm
diff --git a/gfx/pics/020/frames.asm b/gfx/pics/raticate/frames.asm
similarity index 100%
rename from gfx/pics/020/frames.asm
rename to gfx/pics/raticate/frames.asm
diff --git a/gfx/pics/020/front.lz b/gfx/pics/raticate/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/020/front.lz
rename to gfx/pics/raticate/front.6x6.2bpp.lz
diff --git a/gfx/pics/020/normal.pal b/gfx/pics/raticate/normal.pal
similarity index 100%
rename from gfx/pics/020/normal.pal
rename to gfx/pics/raticate/normal.pal
diff --git a/gfx/pics/020/shiny.pal b/gfx/pics/raticate/shiny.pal
similarity index 100%
rename from gfx/pics/020/shiny.pal
rename to gfx/pics/raticate/shiny.pal
diff --git a/gfx/pics/019/anim0.asm b/gfx/pics/rattata/anim0.asm
similarity index 100%
rename from gfx/pics/019/anim0.asm
rename to gfx/pics/rattata/anim0.asm
diff --git a/gfx/pics/019/anim1.asm b/gfx/pics/rattata/anim1.asm
similarity index 100%
rename from gfx/pics/019/anim1.asm
rename to gfx/pics/rattata/anim1.asm
diff --git a/gfx/pics/019/back.lz b/gfx/pics/rattata/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/019/back.lz
rename to gfx/pics/rattata/back.6x6.2bpp.lz
diff --git a/gfx/pics/019/bitmask.asm b/gfx/pics/rattata/bitmask.asm
similarity index 100%
rename from gfx/pics/019/bitmask.asm
rename to gfx/pics/rattata/bitmask.asm
diff --git a/gfx/pics/019/frames.asm b/gfx/pics/rattata/frames.asm
similarity index 100%
rename from gfx/pics/019/frames.asm
rename to gfx/pics/rattata/frames.asm
diff --git a/gfx/pics/019/front.lz b/gfx/pics/rattata/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/019/front.lz
rename to gfx/pics/rattata/front.5x5.2bpp.lz
diff --git a/gfx/pics/019/normal.pal b/gfx/pics/rattata/normal.pal
similarity index 100%
rename from gfx/pics/019/normal.pal
rename to gfx/pics/rattata/normal.pal
diff --git a/gfx/pics/019/shiny.pal b/gfx/pics/rattata/shiny.pal
similarity index 100%
rename from gfx/pics/019/shiny.pal
rename to gfx/pics/rattata/shiny.pal
diff --git a/gfx/pics/223/anim0.asm b/gfx/pics/remoraid/anim0.asm
similarity index 100%
rename from gfx/pics/223/anim0.asm
rename to gfx/pics/remoraid/anim0.asm
diff --git a/gfx/pics/223/anim1.asm b/gfx/pics/remoraid/anim1.asm
similarity index 100%
rename from gfx/pics/223/anim1.asm
rename to gfx/pics/remoraid/anim1.asm
diff --git a/gfx/pics/223/back.lz b/gfx/pics/remoraid/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/223/back.lz
rename to gfx/pics/remoraid/back.6x6.2bpp.lz
diff --git a/gfx/pics/223/bitmask.asm b/gfx/pics/remoraid/bitmask.asm
similarity index 100%
rename from gfx/pics/223/bitmask.asm
rename to gfx/pics/remoraid/bitmask.asm
diff --git a/gfx/pics/223/frames.asm b/gfx/pics/remoraid/frames.asm
similarity index 100%
rename from gfx/pics/223/frames.asm
rename to gfx/pics/remoraid/frames.asm
diff --git a/gfx/pics/223/front.lz b/gfx/pics/remoraid/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/223/front.lz
rename to gfx/pics/remoraid/front.5x5.2bpp.lz
diff --git a/gfx/pics/223/normal.pal b/gfx/pics/remoraid/normal.pal
similarity index 100%
rename from gfx/pics/223/normal.pal
rename to gfx/pics/remoraid/normal.pal
diff --git a/gfx/pics/223/shiny.pal b/gfx/pics/remoraid/shiny.pal
similarity index 100%
rename from gfx/pics/223/shiny.pal
rename to gfx/pics/remoraid/shiny.pal
diff --git a/gfx/pics/112/anim0.asm b/gfx/pics/rhydon/anim0.asm
similarity index 100%
rename from gfx/pics/112/anim0.asm
rename to gfx/pics/rhydon/anim0.asm
diff --git a/gfx/pics/112/anim1.asm b/gfx/pics/rhydon/anim1.asm
similarity index 100%
rename from gfx/pics/112/anim1.asm
rename to gfx/pics/rhydon/anim1.asm
diff --git a/gfx/pics/112/back.lz b/gfx/pics/rhydon/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/112/back.lz
rename to gfx/pics/rhydon/back.6x6.2bpp.lz
diff --git a/gfx/pics/112/bitmask.asm b/gfx/pics/rhydon/bitmask.asm
similarity index 100%
rename from gfx/pics/112/bitmask.asm
rename to gfx/pics/rhydon/bitmask.asm
diff --git a/gfx/pics/112/frames.asm b/gfx/pics/rhydon/frames.asm
similarity index 100%
rename from gfx/pics/112/frames.asm
rename to gfx/pics/rhydon/frames.asm
diff --git a/gfx/pics/112/front.lz b/gfx/pics/rhydon/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/112/front.lz
rename to gfx/pics/rhydon/front.7x7.2bpp.lz
diff --git a/gfx/pics/111/normal.pal b/gfx/pics/rhydon/normal.pal
similarity index 100%
rename from gfx/pics/111/normal.pal
rename to gfx/pics/rhydon/normal.pal
diff --git a/gfx/pics/112/shiny.pal b/gfx/pics/rhydon/shiny.pal
similarity index 100%
rename from gfx/pics/112/shiny.pal
rename to gfx/pics/rhydon/shiny.pal
diff --git a/gfx/pics/111/anim0.asm b/gfx/pics/rhyhorn/anim0.asm
similarity index 100%
rename from gfx/pics/111/anim0.asm
rename to gfx/pics/rhyhorn/anim0.asm
diff --git a/gfx/pics/111/anim1.asm b/gfx/pics/rhyhorn/anim1.asm
similarity index 100%
rename from gfx/pics/111/anim1.asm
rename to gfx/pics/rhyhorn/anim1.asm
diff --git a/gfx/pics/111/back.lz b/gfx/pics/rhyhorn/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/111/back.lz
rename to gfx/pics/rhyhorn/back.6x6.2bpp.lz
diff --git a/gfx/pics/111/bitmask.asm b/gfx/pics/rhyhorn/bitmask.asm
similarity index 100%
rename from gfx/pics/111/bitmask.asm
rename to gfx/pics/rhyhorn/bitmask.asm
diff --git a/gfx/pics/111/frames.asm b/gfx/pics/rhyhorn/frames.asm
similarity index 100%
rename from gfx/pics/111/frames.asm
rename to gfx/pics/rhyhorn/frames.asm
diff --git a/gfx/pics/111/front.lz b/gfx/pics/rhyhorn/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/111/front.lz
rename to gfx/pics/rhyhorn/front.7x7.2bpp.lz
diff --git a/gfx/pics/112/normal.pal b/gfx/pics/rhyhorn/normal.pal
similarity index 100%
rename from gfx/pics/112/normal.pal
rename to gfx/pics/rhyhorn/normal.pal
diff --git a/gfx/pics/111/shiny.pal b/gfx/pics/rhyhorn/shiny.pal
similarity index 100%
rename from gfx/pics/111/shiny.pal
rename to gfx/pics/rhyhorn/shiny.pal
diff --git a/gfx/pics/027/anim0.asm b/gfx/pics/sandshrew/anim0.asm
similarity index 100%
rename from gfx/pics/027/anim0.asm
rename to gfx/pics/sandshrew/anim0.asm
diff --git a/gfx/pics/027/anim1.asm b/gfx/pics/sandshrew/anim1.asm
similarity index 100%
rename from gfx/pics/027/anim1.asm
rename to gfx/pics/sandshrew/anim1.asm
diff --git a/gfx/pics/027/back.lz b/gfx/pics/sandshrew/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/027/back.lz
rename to gfx/pics/sandshrew/back.6x6.2bpp.lz
diff --git a/gfx/pics/027/bitmask.asm b/gfx/pics/sandshrew/bitmask.asm
similarity index 100%
rename from gfx/pics/027/bitmask.asm
rename to gfx/pics/sandshrew/bitmask.asm
diff --git a/gfx/pics/027/frames.asm b/gfx/pics/sandshrew/frames.asm
similarity index 100%
rename from gfx/pics/027/frames.asm
rename to gfx/pics/sandshrew/frames.asm
diff --git a/gfx/pics/027/front.lz b/gfx/pics/sandshrew/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/027/front.lz
rename to gfx/pics/sandshrew/front.5x5.2bpp.lz
diff --git a/gfx/pics/027/normal.pal b/gfx/pics/sandshrew/normal.pal
similarity index 100%
rename from gfx/pics/027/normal.pal
rename to gfx/pics/sandshrew/normal.pal
diff --git a/gfx/pics/027/shiny.pal b/gfx/pics/sandshrew/shiny.pal
similarity index 100%
rename from gfx/pics/027/shiny.pal
rename to gfx/pics/sandshrew/shiny.pal
diff --git a/gfx/pics/028/anim0.asm b/gfx/pics/sandslash/anim0.asm
similarity index 100%
rename from gfx/pics/028/anim0.asm
rename to gfx/pics/sandslash/anim0.asm
diff --git a/gfx/pics/028/anim1.asm b/gfx/pics/sandslash/anim1.asm
similarity index 100%
rename from gfx/pics/028/anim1.asm
rename to gfx/pics/sandslash/anim1.asm
diff --git a/gfx/pics/028/back.lz b/gfx/pics/sandslash/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/028/back.lz
rename to gfx/pics/sandslash/back.6x6.2bpp.lz
diff --git a/gfx/pics/028/bitmask.asm b/gfx/pics/sandslash/bitmask.asm
similarity index 100%
rename from gfx/pics/028/bitmask.asm
rename to gfx/pics/sandslash/bitmask.asm
diff --git a/gfx/pics/028/frames.asm b/gfx/pics/sandslash/frames.asm
similarity index 100%
rename from gfx/pics/028/frames.asm
rename to gfx/pics/sandslash/frames.asm
diff --git a/gfx/pics/028/front.lz b/gfx/pics/sandslash/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/028/front.lz
rename to gfx/pics/sandslash/front.6x6.2bpp.lz
diff --git a/gfx/pics/028/normal.pal b/gfx/pics/sandslash/normal.pal
similarity index 100%
rename from gfx/pics/028/normal.pal
rename to gfx/pics/sandslash/normal.pal
diff --git a/gfx/pics/028/shiny.pal b/gfx/pics/sandslash/shiny.pal
similarity index 100%
rename from gfx/pics/028/shiny.pal
rename to gfx/pics/sandslash/shiny.pal
diff --git a/gfx/pics/212/anim0.asm b/gfx/pics/scizor/anim0.asm
similarity index 100%
rename from gfx/pics/212/anim0.asm
rename to gfx/pics/scizor/anim0.asm
diff --git a/gfx/pics/212/anim1.asm b/gfx/pics/scizor/anim1.asm
similarity index 100%
rename from gfx/pics/212/anim1.asm
rename to gfx/pics/scizor/anim1.asm
diff --git a/gfx/pics/212/back.lz b/gfx/pics/scizor/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/212/back.lz
rename to gfx/pics/scizor/back.6x6.2bpp.lz
diff --git a/gfx/pics/212/bitmask.asm b/gfx/pics/scizor/bitmask.asm
similarity index 100%
rename from gfx/pics/212/bitmask.asm
rename to gfx/pics/scizor/bitmask.asm
diff --git a/gfx/pics/212/frames.asm b/gfx/pics/scizor/frames.asm
similarity index 100%
rename from gfx/pics/212/frames.asm
rename to gfx/pics/scizor/frames.asm
diff --git a/gfx/pics/212/front.lz b/gfx/pics/scizor/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/212/front.lz
rename to gfx/pics/scizor/front.7x7.2bpp.lz
diff --git a/gfx/pics/212/normal.pal b/gfx/pics/scizor/normal.pal
similarity index 100%
rename from gfx/pics/212/normal.pal
rename to gfx/pics/scizor/normal.pal
diff --git a/gfx/pics/212/shiny.pal b/gfx/pics/scizor/shiny.pal
similarity index 100%
rename from gfx/pics/212/shiny.pal
rename to gfx/pics/scizor/shiny.pal
diff --git a/gfx/pics/123/anim0.asm b/gfx/pics/scyther/anim0.asm
similarity index 100%
rename from gfx/pics/123/anim0.asm
rename to gfx/pics/scyther/anim0.asm
diff --git a/gfx/pics/123/anim1.asm b/gfx/pics/scyther/anim1.asm
similarity index 100%
rename from gfx/pics/123/anim1.asm
rename to gfx/pics/scyther/anim1.asm
diff --git a/gfx/pics/123/back.lz b/gfx/pics/scyther/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/123/back.lz
rename to gfx/pics/scyther/back.6x6.2bpp.lz
diff --git a/gfx/pics/123/bitmask.asm b/gfx/pics/scyther/bitmask.asm
similarity index 100%
rename from gfx/pics/123/bitmask.asm
rename to gfx/pics/scyther/bitmask.asm
diff --git a/gfx/pics/123/frames.asm b/gfx/pics/scyther/frames.asm
similarity index 100%
rename from gfx/pics/123/frames.asm
rename to gfx/pics/scyther/frames.asm
diff --git a/gfx/pics/123/front.lz b/gfx/pics/scyther/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/123/front.lz
rename to gfx/pics/scyther/front.7x7.2bpp.lz
diff --git a/gfx/pics/123/normal.pal b/gfx/pics/scyther/normal.pal
similarity index 100%
rename from gfx/pics/123/normal.pal
rename to gfx/pics/scyther/normal.pal
diff --git a/gfx/pics/123/shiny.pal b/gfx/pics/scyther/shiny.pal
similarity index 100%
rename from gfx/pics/123/shiny.pal
rename to gfx/pics/scyther/shiny.pal
diff --git a/gfx/pics/117/anim0.asm b/gfx/pics/seadra/anim0.asm
similarity index 100%
rename from gfx/pics/117/anim0.asm
rename to gfx/pics/seadra/anim0.asm
diff --git a/gfx/pics/117/anim1.asm b/gfx/pics/seadra/anim1.asm
similarity index 100%
rename from gfx/pics/117/anim1.asm
rename to gfx/pics/seadra/anim1.asm
diff --git a/gfx/pics/117/back.lz b/gfx/pics/seadra/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/117/back.lz
rename to gfx/pics/seadra/back.6x6.2bpp.lz
diff --git a/gfx/pics/117/bitmask.asm b/gfx/pics/seadra/bitmask.asm
similarity index 100%
rename from gfx/pics/117/bitmask.asm
rename to gfx/pics/seadra/bitmask.asm
diff --git a/gfx/pics/117/frames.asm b/gfx/pics/seadra/frames.asm
similarity index 100%
rename from gfx/pics/117/frames.asm
rename to gfx/pics/seadra/frames.asm
diff --git a/gfx/pics/117/front.lz b/gfx/pics/seadra/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/117/front.lz
rename to gfx/pics/seadra/front.6x6.2bpp.lz
diff --git a/gfx/pics/117/normal.pal b/gfx/pics/seadra/normal.pal
similarity index 100%
rename from gfx/pics/117/normal.pal
rename to gfx/pics/seadra/normal.pal
diff --git a/gfx/pics/117/shiny.pal b/gfx/pics/seadra/shiny.pal
similarity index 100%
rename from gfx/pics/117/shiny.pal
rename to gfx/pics/seadra/shiny.pal
diff --git a/gfx/pics/119/anim0.asm b/gfx/pics/seaking/anim0.asm
similarity index 100%
rename from gfx/pics/119/anim0.asm
rename to gfx/pics/seaking/anim0.asm
diff --git a/gfx/pics/119/anim1.asm b/gfx/pics/seaking/anim1.asm
similarity index 100%
rename from gfx/pics/119/anim1.asm
rename to gfx/pics/seaking/anim1.asm
diff --git a/gfx/pics/119/back.lz b/gfx/pics/seaking/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/119/back.lz
rename to gfx/pics/seaking/back.6x6.2bpp.lz
diff --git a/gfx/pics/119/bitmask.asm b/gfx/pics/seaking/bitmask.asm
similarity index 100%
rename from gfx/pics/119/bitmask.asm
rename to gfx/pics/seaking/bitmask.asm
diff --git a/gfx/pics/119/frames.asm b/gfx/pics/seaking/frames.asm
similarity index 100%
rename from gfx/pics/119/frames.asm
rename to gfx/pics/seaking/frames.asm
diff --git a/gfx/pics/119/front.lz b/gfx/pics/seaking/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/119/front.lz
rename to gfx/pics/seaking/front.7x7.2bpp.lz
diff --git a/gfx/pics/119/normal.pal b/gfx/pics/seaking/normal.pal
similarity index 100%
rename from gfx/pics/119/normal.pal
rename to gfx/pics/seaking/normal.pal
diff --git a/gfx/pics/119/shiny.pal b/gfx/pics/seaking/shiny.pal
similarity index 100%
rename from gfx/pics/119/shiny.pal
rename to gfx/pics/seaking/shiny.pal
diff --git a/gfx/pics/086/anim0.asm b/gfx/pics/seel/anim0.asm
similarity index 100%
rename from gfx/pics/086/anim0.asm
rename to gfx/pics/seel/anim0.asm
diff --git a/gfx/pics/086/anim1.asm b/gfx/pics/seel/anim1.asm
similarity index 100%
rename from gfx/pics/086/anim1.asm
rename to gfx/pics/seel/anim1.asm
diff --git a/gfx/pics/086/back.lz b/gfx/pics/seel/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/086/back.lz
rename to gfx/pics/seel/back.6x6.2bpp.lz
diff --git a/gfx/pics/086/bitmask.asm b/gfx/pics/seel/bitmask.asm
similarity index 100%
rename from gfx/pics/086/bitmask.asm
rename to gfx/pics/seel/bitmask.asm
diff --git a/gfx/pics/086/frames.asm b/gfx/pics/seel/frames.asm
similarity index 100%
rename from gfx/pics/086/frames.asm
rename to gfx/pics/seel/frames.asm
diff --git a/gfx/pics/086/front.lz b/gfx/pics/seel/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/086/front.lz
rename to gfx/pics/seel/front.6x6.2bpp.lz
diff --git a/gfx/pics/086/normal.pal b/gfx/pics/seel/normal.pal
similarity index 100%
rename from gfx/pics/086/normal.pal
rename to gfx/pics/seel/normal.pal
diff --git a/gfx/pics/086/shiny.pal b/gfx/pics/seel/shiny.pal
similarity index 100%
rename from gfx/pics/086/shiny.pal
rename to gfx/pics/seel/shiny.pal
diff --git a/gfx/pics/161/anim0.asm b/gfx/pics/sentret/anim0.asm
similarity index 100%
rename from gfx/pics/161/anim0.asm
rename to gfx/pics/sentret/anim0.asm
diff --git a/gfx/pics/161/anim1.asm b/gfx/pics/sentret/anim1.asm
similarity index 100%
rename from gfx/pics/161/anim1.asm
rename to gfx/pics/sentret/anim1.asm
diff --git a/gfx/pics/161/back.lz b/gfx/pics/sentret/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/161/back.lz
rename to gfx/pics/sentret/back.6x6.2bpp.lz
diff --git a/gfx/pics/161/bitmask.asm b/gfx/pics/sentret/bitmask.asm
similarity index 100%
rename from gfx/pics/161/bitmask.asm
rename to gfx/pics/sentret/bitmask.asm
diff --git a/gfx/pics/161/frames.asm b/gfx/pics/sentret/frames.asm
similarity index 100%
rename from gfx/pics/161/frames.asm
rename to gfx/pics/sentret/frames.asm
diff --git a/gfx/pics/161/front.lz b/gfx/pics/sentret/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/161/front.lz
rename to gfx/pics/sentret/front.6x6.2bpp.lz
diff --git a/gfx/pics/161/normal.pal b/gfx/pics/sentret/normal.pal
similarity index 100%
rename from gfx/pics/161/normal.pal
rename to gfx/pics/sentret/normal.pal
diff --git a/gfx/pics/161/shiny.pal b/gfx/pics/sentret/shiny.pal
similarity index 100%
rename from gfx/pics/161/shiny.pal
rename to gfx/pics/sentret/shiny.pal
diff --git a/gfx/pics/090/anim0.asm b/gfx/pics/shellder/anim0.asm
similarity index 100%
rename from gfx/pics/090/anim0.asm
rename to gfx/pics/shellder/anim0.asm
diff --git a/gfx/pics/090/anim1.asm b/gfx/pics/shellder/anim1.asm
similarity index 100%
rename from gfx/pics/090/anim1.asm
rename to gfx/pics/shellder/anim1.asm
diff --git a/gfx/pics/090/back.lz b/gfx/pics/shellder/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/090/back.lz
rename to gfx/pics/shellder/back.6x6.2bpp.lz
diff --git a/gfx/pics/090/bitmask.asm b/gfx/pics/shellder/bitmask.asm
similarity index 100%
rename from gfx/pics/090/bitmask.asm
rename to gfx/pics/shellder/bitmask.asm
diff --git a/gfx/pics/090/frames.asm b/gfx/pics/shellder/frames.asm
similarity index 100%
rename from gfx/pics/090/frames.asm
rename to gfx/pics/shellder/frames.asm
diff --git a/gfx/pics/090/front.lz b/gfx/pics/shellder/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/090/front.lz
rename to gfx/pics/shellder/front.5x5.2bpp.lz
diff --git a/gfx/pics/090/normal.pal b/gfx/pics/shellder/normal.pal
similarity index 100%
rename from gfx/pics/090/normal.pal
rename to gfx/pics/shellder/normal.pal
diff --git a/gfx/pics/090/shiny.pal b/gfx/pics/shellder/shiny.pal
similarity index 100%
rename from gfx/pics/090/shiny.pal
rename to gfx/pics/shellder/shiny.pal
diff --git a/gfx/pics/213/anim0.asm b/gfx/pics/shuckle/anim0.asm
similarity index 100%
rename from gfx/pics/213/anim0.asm
rename to gfx/pics/shuckle/anim0.asm
diff --git a/gfx/pics/213/anim1.asm b/gfx/pics/shuckle/anim1.asm
similarity index 100%
rename from gfx/pics/213/anim1.asm
rename to gfx/pics/shuckle/anim1.asm
diff --git a/gfx/pics/213/back.lz b/gfx/pics/shuckle/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/213/back.lz
rename to gfx/pics/shuckle/back.6x6.2bpp.lz
diff --git a/gfx/pics/213/bitmask.asm b/gfx/pics/shuckle/bitmask.asm
similarity index 100%
rename from gfx/pics/213/bitmask.asm
rename to gfx/pics/shuckle/bitmask.asm
diff --git a/gfx/pics/213/frames.asm b/gfx/pics/shuckle/frames.asm
similarity index 100%
rename from gfx/pics/213/frames.asm
rename to gfx/pics/shuckle/frames.asm
diff --git a/gfx/pics/213/front.lz b/gfx/pics/shuckle/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/213/front.lz
rename to gfx/pics/shuckle/front.5x5.2bpp.lz
diff --git a/gfx/pics/213/normal.pal b/gfx/pics/shuckle/normal.pal
similarity index 100%
rename from gfx/pics/213/normal.pal
rename to gfx/pics/shuckle/normal.pal
diff --git a/gfx/pics/213/shiny.pal b/gfx/pics/shuckle/shiny.pal
similarity index 100%
rename from gfx/pics/213/shiny.pal
rename to gfx/pics/shuckle/shiny.pal
diff --git a/gfx/pics/227/anim0.asm b/gfx/pics/skarmory/anim0.asm
similarity index 100%
rename from gfx/pics/227/anim0.asm
rename to gfx/pics/skarmory/anim0.asm
diff --git a/gfx/pics/227/anim1.asm b/gfx/pics/skarmory/anim1.asm
similarity index 100%
rename from gfx/pics/227/anim1.asm
rename to gfx/pics/skarmory/anim1.asm
diff --git a/gfx/pics/227/back.lz b/gfx/pics/skarmory/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/227/back.lz
rename to gfx/pics/skarmory/back.6x6.2bpp.lz
diff --git a/gfx/pics/227/bitmask.asm b/gfx/pics/skarmory/bitmask.asm
similarity index 100%
rename from gfx/pics/227/bitmask.asm
rename to gfx/pics/skarmory/bitmask.asm
diff --git a/gfx/pics/227/frames.asm b/gfx/pics/skarmory/frames.asm
similarity index 100%
rename from gfx/pics/227/frames.asm
rename to gfx/pics/skarmory/frames.asm
diff --git a/gfx/pics/227/front.lz b/gfx/pics/skarmory/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/227/front.lz
rename to gfx/pics/skarmory/front.7x7.2bpp.lz
diff --git a/gfx/pics/227/normal.pal b/gfx/pics/skarmory/normal.pal
similarity index 100%
rename from gfx/pics/227/normal.pal
rename to gfx/pics/skarmory/normal.pal
diff --git a/gfx/pics/227/shiny.pal b/gfx/pics/skarmory/shiny.pal
similarity index 100%
rename from gfx/pics/227/shiny.pal
rename to gfx/pics/skarmory/shiny.pal
diff --git a/gfx/pics/188/anim0.asm b/gfx/pics/skiploom/anim0.asm
similarity index 100%
rename from gfx/pics/188/anim0.asm
rename to gfx/pics/skiploom/anim0.asm
diff --git a/gfx/pics/188/anim1.asm b/gfx/pics/skiploom/anim1.asm
similarity index 100%
rename from gfx/pics/188/anim1.asm
rename to gfx/pics/skiploom/anim1.asm
diff --git a/gfx/pics/188/back.lz b/gfx/pics/skiploom/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/188/back.lz
rename to gfx/pics/skiploom/back.6x6.2bpp.lz
diff --git a/gfx/pics/188/bitmask.asm b/gfx/pics/skiploom/bitmask.asm
similarity index 100%
rename from gfx/pics/188/bitmask.asm
rename to gfx/pics/skiploom/bitmask.asm
diff --git a/gfx/pics/188/frames.asm b/gfx/pics/skiploom/frames.asm
similarity index 100%
rename from gfx/pics/188/frames.asm
rename to gfx/pics/skiploom/frames.asm
diff --git a/gfx/pics/188/front.lz b/gfx/pics/skiploom/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/188/front.lz
rename to gfx/pics/skiploom/front.6x6.2bpp.lz
diff --git a/gfx/pics/188/normal.pal b/gfx/pics/skiploom/normal.pal
similarity index 100%
rename from gfx/pics/188/normal.pal
rename to gfx/pics/skiploom/normal.pal
diff --git a/gfx/pics/188/shiny.pal b/gfx/pics/skiploom/shiny.pal
similarity index 100%
rename from gfx/pics/188/shiny.pal
rename to gfx/pics/skiploom/shiny.pal
diff --git a/gfx/pics/080/anim0.asm b/gfx/pics/slowbro/anim0.asm
similarity index 100%
rename from gfx/pics/080/anim0.asm
rename to gfx/pics/slowbro/anim0.asm
diff --git a/gfx/pics/080/anim1.asm b/gfx/pics/slowbro/anim1.asm
similarity index 100%
rename from gfx/pics/080/anim1.asm
rename to gfx/pics/slowbro/anim1.asm
diff --git a/gfx/pics/080/back.lz b/gfx/pics/slowbro/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/080/back.lz
rename to gfx/pics/slowbro/back.6x6.2bpp.lz
diff --git a/gfx/pics/080/bitmask.asm b/gfx/pics/slowbro/bitmask.asm
similarity index 100%
rename from gfx/pics/080/bitmask.asm
rename to gfx/pics/slowbro/bitmask.asm
diff --git a/gfx/pics/080/frames.asm b/gfx/pics/slowbro/frames.asm
similarity index 100%
rename from gfx/pics/080/frames.asm
rename to gfx/pics/slowbro/frames.asm
diff --git a/gfx/pics/080/front.lz b/gfx/pics/slowbro/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/080/front.lz
rename to gfx/pics/slowbro/front.7x7.2bpp.lz
diff --git a/gfx/pics/080/normal.pal b/gfx/pics/slowbro/normal.pal
similarity index 100%
rename from gfx/pics/080/normal.pal
rename to gfx/pics/slowbro/normal.pal
diff --git a/gfx/pics/080/shiny.pal b/gfx/pics/slowbro/shiny.pal
similarity index 100%
rename from gfx/pics/080/shiny.pal
rename to gfx/pics/slowbro/shiny.pal
diff --git a/gfx/pics/199/anim0.asm b/gfx/pics/slowking/anim0.asm
similarity index 100%
rename from gfx/pics/199/anim0.asm
rename to gfx/pics/slowking/anim0.asm
diff --git a/gfx/pics/199/anim1.asm b/gfx/pics/slowking/anim1.asm
similarity index 100%
rename from gfx/pics/199/anim1.asm
rename to gfx/pics/slowking/anim1.asm
diff --git a/gfx/pics/199/back.lz b/gfx/pics/slowking/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/199/back.lz
rename to gfx/pics/slowking/back.6x6.2bpp.lz
diff --git a/gfx/pics/199/bitmask.asm b/gfx/pics/slowking/bitmask.asm
similarity index 100%
rename from gfx/pics/199/bitmask.asm
rename to gfx/pics/slowking/bitmask.asm
diff --git a/gfx/pics/199/frames.asm b/gfx/pics/slowking/frames.asm
similarity index 100%
rename from gfx/pics/199/frames.asm
rename to gfx/pics/slowking/frames.asm
diff --git a/gfx/pics/199/front.lz b/gfx/pics/slowking/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/199/front.lz
rename to gfx/pics/slowking/front.7x7.2bpp.lz
diff --git a/gfx/pics/199/normal.pal b/gfx/pics/slowking/normal.pal
similarity index 100%
rename from gfx/pics/199/normal.pal
rename to gfx/pics/slowking/normal.pal
diff --git a/gfx/pics/199/shiny.pal b/gfx/pics/slowking/shiny.pal
similarity index 100%
rename from gfx/pics/199/shiny.pal
rename to gfx/pics/slowking/shiny.pal
diff --git a/gfx/pics/079/anim0.asm b/gfx/pics/slowpoke/anim0.asm
similarity index 100%
rename from gfx/pics/079/anim0.asm
rename to gfx/pics/slowpoke/anim0.asm
diff --git a/gfx/pics/079/anim1.asm b/gfx/pics/slowpoke/anim1.asm
similarity index 100%
rename from gfx/pics/079/anim1.asm
rename to gfx/pics/slowpoke/anim1.asm
diff --git a/gfx/pics/079/back.lz b/gfx/pics/slowpoke/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/079/back.lz
rename to gfx/pics/slowpoke/back.6x6.2bpp.lz
diff --git a/gfx/pics/079/bitmask.asm b/gfx/pics/slowpoke/bitmask.asm
similarity index 100%
rename from gfx/pics/079/bitmask.asm
rename to gfx/pics/slowpoke/bitmask.asm
diff --git a/gfx/pics/079/frames.asm b/gfx/pics/slowpoke/frames.asm
similarity index 100%
rename from gfx/pics/079/frames.asm
rename to gfx/pics/slowpoke/frames.asm
diff --git a/gfx/pics/079/front.lz b/gfx/pics/slowpoke/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/079/front.lz
rename to gfx/pics/slowpoke/front.5x5.2bpp.lz
diff --git a/gfx/pics/079/normal.pal b/gfx/pics/slowpoke/normal.pal
similarity index 100%
rename from gfx/pics/079/normal.pal
rename to gfx/pics/slowpoke/normal.pal
diff --git a/gfx/pics/079/shiny.pal b/gfx/pics/slowpoke/shiny.pal
similarity index 100%
rename from gfx/pics/079/shiny.pal
rename to gfx/pics/slowpoke/shiny.pal
diff --git a/gfx/pics/218/anim0.asm b/gfx/pics/slugma/anim0.asm
similarity index 100%
rename from gfx/pics/218/anim0.asm
rename to gfx/pics/slugma/anim0.asm
diff --git a/gfx/pics/218/anim1.asm b/gfx/pics/slugma/anim1.asm
similarity index 100%
rename from gfx/pics/218/anim1.asm
rename to gfx/pics/slugma/anim1.asm
diff --git a/gfx/pics/218/back.lz b/gfx/pics/slugma/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/218/back.lz
rename to gfx/pics/slugma/back.6x6.2bpp.lz
diff --git a/gfx/pics/218/bitmask.asm b/gfx/pics/slugma/bitmask.asm
similarity index 100%
rename from gfx/pics/218/bitmask.asm
rename to gfx/pics/slugma/bitmask.asm
diff --git a/gfx/pics/218/frames.asm b/gfx/pics/slugma/frames.asm
similarity index 100%
rename from gfx/pics/218/frames.asm
rename to gfx/pics/slugma/frames.asm
diff --git a/gfx/pics/218/front.lz b/gfx/pics/slugma/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/218/front.lz
rename to gfx/pics/slugma/front.5x5.2bpp.lz
diff --git a/gfx/pics/218/normal.pal b/gfx/pics/slugma/normal.pal
similarity index 100%
rename from gfx/pics/218/normal.pal
rename to gfx/pics/slugma/normal.pal
diff --git a/gfx/pics/218/shiny.pal b/gfx/pics/slugma/shiny.pal
similarity index 100%
rename from gfx/pics/218/shiny.pal
rename to gfx/pics/slugma/shiny.pal
diff --git a/gfx/pics/235/anim0.asm b/gfx/pics/smeargle/anim0.asm
similarity index 100%
rename from gfx/pics/235/anim0.asm
rename to gfx/pics/smeargle/anim0.asm
diff --git a/gfx/pics/235/anim1.asm b/gfx/pics/smeargle/anim1.asm
similarity index 100%
rename from gfx/pics/235/anim1.asm
rename to gfx/pics/smeargle/anim1.asm
diff --git a/gfx/pics/235/back.lz b/gfx/pics/smeargle/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/235/back.lz
rename to gfx/pics/smeargle/back.6x6.2bpp.lz
diff --git a/gfx/pics/235/bitmask.asm b/gfx/pics/smeargle/bitmask.asm
similarity index 100%
rename from gfx/pics/235/bitmask.asm
rename to gfx/pics/smeargle/bitmask.asm
diff --git a/gfx/pics/235/frames.asm b/gfx/pics/smeargle/frames.asm
similarity index 100%
rename from gfx/pics/235/frames.asm
rename to gfx/pics/smeargle/frames.asm
diff --git a/gfx/pics/235/front.lz b/gfx/pics/smeargle/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/235/front.lz
rename to gfx/pics/smeargle/front.7x7.2bpp.lz
diff --git a/gfx/pics/235/normal.pal b/gfx/pics/smeargle/normal.pal
similarity index 100%
rename from gfx/pics/235/normal.pal
rename to gfx/pics/smeargle/normal.pal
diff --git a/gfx/pics/235/shiny.pal b/gfx/pics/smeargle/shiny.pal
similarity index 100%
rename from gfx/pics/235/shiny.pal
rename to gfx/pics/smeargle/shiny.pal
diff --git a/gfx/pics/238/anim0.asm b/gfx/pics/smoochum/anim0.asm
similarity index 100%
rename from gfx/pics/238/anim0.asm
rename to gfx/pics/smoochum/anim0.asm
diff --git a/gfx/pics/238/anim1.asm b/gfx/pics/smoochum/anim1.asm
similarity index 100%
rename from gfx/pics/238/anim1.asm
rename to gfx/pics/smoochum/anim1.asm
diff --git a/gfx/pics/238/back.lz b/gfx/pics/smoochum/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/238/back.lz
rename to gfx/pics/smoochum/back.6x6.2bpp.lz
diff --git a/gfx/pics/238/bitmask.asm b/gfx/pics/smoochum/bitmask.asm
similarity index 100%
rename from gfx/pics/238/bitmask.asm
rename to gfx/pics/smoochum/bitmask.asm
diff --git a/gfx/pics/238/frames.asm b/gfx/pics/smoochum/frames.asm
similarity index 100%
rename from gfx/pics/238/frames.asm
rename to gfx/pics/smoochum/frames.asm
diff --git a/gfx/pics/238/front.lz b/gfx/pics/smoochum/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/238/front.lz
rename to gfx/pics/smoochum/front.5x5.2bpp.lz
diff --git a/gfx/pics/238/normal.pal b/gfx/pics/smoochum/normal.pal
similarity index 100%
rename from gfx/pics/238/normal.pal
rename to gfx/pics/smoochum/normal.pal
diff --git a/gfx/pics/238/shiny.pal b/gfx/pics/smoochum/shiny.pal
similarity index 100%
rename from gfx/pics/238/shiny.pal
rename to gfx/pics/smoochum/shiny.pal
diff --git a/gfx/pics/215/anim0.asm b/gfx/pics/sneasel/anim0.asm
similarity index 100%
rename from gfx/pics/215/anim0.asm
rename to gfx/pics/sneasel/anim0.asm
diff --git a/gfx/pics/215/anim1.asm b/gfx/pics/sneasel/anim1.asm
similarity index 100%
rename from gfx/pics/215/anim1.asm
rename to gfx/pics/sneasel/anim1.asm
diff --git a/gfx/pics/215/back.lz b/gfx/pics/sneasel/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/215/back.lz
rename to gfx/pics/sneasel/back.6x6.2bpp.lz
diff --git a/gfx/pics/215/bitmask.asm b/gfx/pics/sneasel/bitmask.asm
similarity index 100%
rename from gfx/pics/215/bitmask.asm
rename to gfx/pics/sneasel/bitmask.asm
diff --git a/gfx/pics/215/frames.asm b/gfx/pics/sneasel/frames.asm
similarity index 100%
rename from gfx/pics/215/frames.asm
rename to gfx/pics/sneasel/frames.asm
diff --git a/gfx/pics/215/front.lz b/gfx/pics/sneasel/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/215/front.lz
rename to gfx/pics/sneasel/front.6x6.2bpp.lz
diff --git a/gfx/pics/215/normal.pal b/gfx/pics/sneasel/normal.pal
similarity index 100%
rename from gfx/pics/215/normal.pal
rename to gfx/pics/sneasel/normal.pal
diff --git a/gfx/pics/215/shiny.pal b/gfx/pics/sneasel/shiny.pal
similarity index 100%
rename from gfx/pics/215/shiny.pal
rename to gfx/pics/sneasel/shiny.pal
diff --git a/gfx/pics/143/anim0.asm b/gfx/pics/snorlax/anim0.asm
similarity index 100%
rename from gfx/pics/143/anim0.asm
rename to gfx/pics/snorlax/anim0.asm
diff --git a/gfx/pics/143/anim1.asm b/gfx/pics/snorlax/anim1.asm
similarity index 100%
rename from gfx/pics/143/anim1.asm
rename to gfx/pics/snorlax/anim1.asm
diff --git a/gfx/pics/143/back.lz b/gfx/pics/snorlax/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/143/back.lz
rename to gfx/pics/snorlax/back.6x6.2bpp.lz
diff --git a/gfx/pics/143/bitmask.asm b/gfx/pics/snorlax/bitmask.asm
similarity index 100%
rename from gfx/pics/143/bitmask.asm
rename to gfx/pics/snorlax/bitmask.asm
diff --git a/gfx/pics/143/frames.asm b/gfx/pics/snorlax/frames.asm
similarity index 100%
rename from gfx/pics/143/frames.asm
rename to gfx/pics/snorlax/frames.asm
diff --git a/gfx/pics/143/front.lz b/gfx/pics/snorlax/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/143/front.lz
rename to gfx/pics/snorlax/front.7x7.2bpp.lz
diff --git a/gfx/pics/143/normal.pal b/gfx/pics/snorlax/normal.pal
similarity index 100%
rename from gfx/pics/143/normal.pal
rename to gfx/pics/snorlax/normal.pal
diff --git a/gfx/pics/143/shiny.pal b/gfx/pics/snorlax/shiny.pal
similarity index 100%
rename from gfx/pics/143/shiny.pal
rename to gfx/pics/snorlax/shiny.pal
diff --git a/gfx/pics/209/anim0.asm b/gfx/pics/snubbull/anim0.asm
similarity index 100%
rename from gfx/pics/209/anim0.asm
rename to gfx/pics/snubbull/anim0.asm
diff --git a/gfx/pics/209/anim1.asm b/gfx/pics/snubbull/anim1.asm
similarity index 100%
rename from gfx/pics/209/anim1.asm
rename to gfx/pics/snubbull/anim1.asm
diff --git a/gfx/pics/209/back.lz b/gfx/pics/snubbull/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/209/back.lz
rename to gfx/pics/snubbull/back.6x6.2bpp.lz
diff --git a/gfx/pics/209/bitmask.asm b/gfx/pics/snubbull/bitmask.asm
similarity index 100%
rename from gfx/pics/209/bitmask.asm
rename to gfx/pics/snubbull/bitmask.asm
diff --git a/gfx/pics/209/frames.asm b/gfx/pics/snubbull/frames.asm
similarity index 100%
rename from gfx/pics/209/frames.asm
rename to gfx/pics/snubbull/frames.asm
diff --git a/gfx/pics/209/front.lz b/gfx/pics/snubbull/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/209/front.lz
rename to gfx/pics/snubbull/front.6x6.2bpp.lz
diff --git a/gfx/pics/209/normal.pal b/gfx/pics/snubbull/normal.pal
similarity index 100%
rename from gfx/pics/209/normal.pal
rename to gfx/pics/snubbull/normal.pal
diff --git a/gfx/pics/209/shiny.pal b/gfx/pics/snubbull/shiny.pal
similarity index 100%
rename from gfx/pics/209/shiny.pal
rename to gfx/pics/snubbull/shiny.pal
diff --git a/gfx/pics/021/anim0.asm b/gfx/pics/spearow/anim0.asm
similarity index 100%
rename from gfx/pics/021/anim0.asm
rename to gfx/pics/spearow/anim0.asm
diff --git a/gfx/pics/021/anim1.asm b/gfx/pics/spearow/anim1.asm
similarity index 100%
rename from gfx/pics/021/anim1.asm
rename to gfx/pics/spearow/anim1.asm
diff --git a/gfx/pics/021/back.lz b/gfx/pics/spearow/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/021/back.lz
rename to gfx/pics/spearow/back.6x6.2bpp.lz
diff --git a/gfx/pics/021/bitmask.asm b/gfx/pics/spearow/bitmask.asm
similarity index 100%
rename from gfx/pics/021/bitmask.asm
rename to gfx/pics/spearow/bitmask.asm
diff --git a/gfx/pics/021/frames.asm b/gfx/pics/spearow/frames.asm
similarity index 100%
rename from gfx/pics/021/frames.asm
rename to gfx/pics/spearow/frames.asm
diff --git a/gfx/pics/021/front.lz b/gfx/pics/spearow/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/021/front.lz
rename to gfx/pics/spearow/front.5x5.2bpp.lz
diff --git a/gfx/pics/021/normal.pal b/gfx/pics/spearow/normal.pal
similarity index 100%
rename from gfx/pics/021/normal.pal
rename to gfx/pics/spearow/normal.pal
diff --git a/gfx/pics/021/shiny.pal b/gfx/pics/spearow/shiny.pal
similarity index 100%
rename from gfx/pics/021/shiny.pal
rename to gfx/pics/spearow/shiny.pal
diff --git a/gfx/pics/167/anim0.asm b/gfx/pics/spinarak/anim0.asm
similarity index 100%
rename from gfx/pics/167/anim0.asm
rename to gfx/pics/spinarak/anim0.asm
diff --git a/gfx/pics/167/anim1.asm b/gfx/pics/spinarak/anim1.asm
similarity index 100%
rename from gfx/pics/167/anim1.asm
rename to gfx/pics/spinarak/anim1.asm
diff --git a/gfx/pics/167/back.lz b/gfx/pics/spinarak/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/167/back.lz
rename to gfx/pics/spinarak/back.6x6.2bpp.lz
diff --git a/gfx/pics/167/bitmask.asm b/gfx/pics/spinarak/bitmask.asm
similarity index 100%
rename from gfx/pics/167/bitmask.asm
rename to gfx/pics/spinarak/bitmask.asm
diff --git a/gfx/pics/167/frames.asm b/gfx/pics/spinarak/frames.asm
similarity index 100%
rename from gfx/pics/167/frames.asm
rename to gfx/pics/spinarak/frames.asm
diff --git a/gfx/pics/167/front.lz b/gfx/pics/spinarak/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/167/front.lz
rename to gfx/pics/spinarak/front.5x5.2bpp.lz
diff --git a/gfx/pics/167/normal.pal b/gfx/pics/spinarak/normal.pal
similarity index 100%
rename from gfx/pics/167/normal.pal
rename to gfx/pics/spinarak/normal.pal
diff --git a/gfx/pics/167/shiny.pal b/gfx/pics/spinarak/shiny.pal
similarity index 100%
rename from gfx/pics/167/shiny.pal
rename to gfx/pics/spinarak/shiny.pal
diff --git a/gfx/pics/007/anim0.asm b/gfx/pics/squirtle/anim0.asm
similarity index 100%
rename from gfx/pics/007/anim0.asm
rename to gfx/pics/squirtle/anim0.asm
diff --git a/gfx/pics/007/anim1.asm b/gfx/pics/squirtle/anim1.asm
similarity index 100%
rename from gfx/pics/007/anim1.asm
rename to gfx/pics/squirtle/anim1.asm
diff --git a/gfx/pics/007/back.lz b/gfx/pics/squirtle/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/007/back.lz
rename to gfx/pics/squirtle/back.6x6.2bpp.lz
diff --git a/gfx/pics/007/bitmask.asm b/gfx/pics/squirtle/bitmask.asm
similarity index 100%
rename from gfx/pics/007/bitmask.asm
rename to gfx/pics/squirtle/bitmask.asm
diff --git a/gfx/pics/007/frames.asm b/gfx/pics/squirtle/frames.asm
similarity index 100%
rename from gfx/pics/007/frames.asm
rename to gfx/pics/squirtle/frames.asm
diff --git a/gfx/pics/007/front.lz b/gfx/pics/squirtle/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/007/front.lz
rename to gfx/pics/squirtle/front.5x5.2bpp.lz
diff --git a/gfx/pics/007/normal.pal b/gfx/pics/squirtle/normal.pal
similarity index 100%
rename from gfx/pics/007/normal.pal
rename to gfx/pics/squirtle/normal.pal
diff --git a/gfx/pics/007/shiny.pal b/gfx/pics/squirtle/shiny.pal
similarity index 100%
rename from gfx/pics/007/shiny.pal
rename to gfx/pics/squirtle/shiny.pal
diff --git a/gfx/pics/234/anim0.asm b/gfx/pics/stantler/anim0.asm
similarity index 100%
rename from gfx/pics/234/anim0.asm
rename to gfx/pics/stantler/anim0.asm
diff --git a/gfx/pics/234/anim1.asm b/gfx/pics/stantler/anim1.asm
similarity index 100%
rename from gfx/pics/234/anim1.asm
rename to gfx/pics/stantler/anim1.asm
diff --git a/gfx/pics/234/back.lz b/gfx/pics/stantler/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/234/back.lz
rename to gfx/pics/stantler/back.6x6.2bpp.lz
diff --git a/gfx/pics/234/bitmask.asm b/gfx/pics/stantler/bitmask.asm
similarity index 100%
rename from gfx/pics/234/bitmask.asm
rename to gfx/pics/stantler/bitmask.asm
diff --git a/gfx/pics/234/frames.asm b/gfx/pics/stantler/frames.asm
similarity index 100%
rename from gfx/pics/234/frames.asm
rename to gfx/pics/stantler/frames.asm
diff --git a/gfx/pics/234/front.lz b/gfx/pics/stantler/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/234/front.lz
rename to gfx/pics/stantler/front.7x7.2bpp.lz
diff --git a/gfx/pics/234/normal.pal b/gfx/pics/stantler/normal.pal
similarity index 100%
rename from gfx/pics/234/normal.pal
rename to gfx/pics/stantler/normal.pal
diff --git a/gfx/pics/234/shiny.pal b/gfx/pics/stantler/shiny.pal
similarity index 100%
rename from gfx/pics/234/shiny.pal
rename to gfx/pics/stantler/shiny.pal
diff --git a/gfx/pics/121/anim0.asm b/gfx/pics/starmie/anim0.asm
similarity index 100%
rename from gfx/pics/121/anim0.asm
rename to gfx/pics/starmie/anim0.asm
diff --git a/gfx/pics/121/anim1.asm b/gfx/pics/starmie/anim1.asm
similarity index 100%
rename from gfx/pics/121/anim1.asm
rename to gfx/pics/starmie/anim1.asm
diff --git a/gfx/pics/121/back.lz b/gfx/pics/starmie/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/121/back.lz
rename to gfx/pics/starmie/back.6x6.2bpp.lz
diff --git a/gfx/pics/121/bitmask.asm b/gfx/pics/starmie/bitmask.asm
similarity index 100%
rename from gfx/pics/121/bitmask.asm
rename to gfx/pics/starmie/bitmask.asm
diff --git a/gfx/pics/121/frames.asm b/gfx/pics/starmie/frames.asm
similarity index 100%
rename from gfx/pics/121/frames.asm
rename to gfx/pics/starmie/frames.asm
diff --git a/gfx/pics/121/front.lz b/gfx/pics/starmie/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/121/front.lz
rename to gfx/pics/starmie/front.6x6.2bpp.lz
diff --git a/gfx/pics/121/normal.pal b/gfx/pics/starmie/normal.pal
similarity index 100%
rename from gfx/pics/121/normal.pal
rename to gfx/pics/starmie/normal.pal
diff --git a/gfx/pics/121/shiny.pal b/gfx/pics/starmie/shiny.pal
similarity index 100%
rename from gfx/pics/121/shiny.pal
rename to gfx/pics/starmie/shiny.pal
diff --git a/gfx/pics/120/anim0.asm b/gfx/pics/staryu/anim0.asm
similarity index 100%
rename from gfx/pics/120/anim0.asm
rename to gfx/pics/staryu/anim0.asm
diff --git a/gfx/pics/120/anim1.asm b/gfx/pics/staryu/anim1.asm
similarity index 100%
rename from gfx/pics/120/anim1.asm
rename to gfx/pics/staryu/anim1.asm
diff --git a/gfx/pics/120/back.lz b/gfx/pics/staryu/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/120/back.lz
rename to gfx/pics/staryu/back.6x6.2bpp.lz
diff --git a/gfx/pics/120/bitmask.asm b/gfx/pics/staryu/bitmask.asm
similarity index 100%
rename from gfx/pics/120/bitmask.asm
rename to gfx/pics/staryu/bitmask.asm
diff --git a/gfx/pics/120/frames.asm b/gfx/pics/staryu/frames.asm
similarity index 100%
rename from gfx/pics/120/frames.asm
rename to gfx/pics/staryu/frames.asm
diff --git a/gfx/pics/120/front.lz b/gfx/pics/staryu/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/120/front.lz
rename to gfx/pics/staryu/front.6x6.2bpp.lz
diff --git a/gfx/pics/120/normal.pal b/gfx/pics/staryu/normal.pal
similarity index 100%
rename from gfx/pics/120/normal.pal
rename to gfx/pics/staryu/normal.pal
diff --git a/gfx/pics/120/shiny.pal b/gfx/pics/staryu/shiny.pal
similarity index 100%
rename from gfx/pics/120/shiny.pal
rename to gfx/pics/staryu/shiny.pal
diff --git a/gfx/pics/208/anim0.asm b/gfx/pics/steelix/anim0.asm
similarity index 100%
rename from gfx/pics/208/anim0.asm
rename to gfx/pics/steelix/anim0.asm
diff --git a/gfx/pics/208/anim1.asm b/gfx/pics/steelix/anim1.asm
similarity index 100%
rename from gfx/pics/208/anim1.asm
rename to gfx/pics/steelix/anim1.asm
diff --git a/gfx/pics/208/back.lz b/gfx/pics/steelix/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/208/back.lz
rename to gfx/pics/steelix/back.6x6.2bpp.lz
diff --git a/gfx/pics/208/bitmask.asm b/gfx/pics/steelix/bitmask.asm
similarity index 100%
rename from gfx/pics/208/bitmask.asm
rename to gfx/pics/steelix/bitmask.asm
diff --git a/gfx/pics/208/frames.asm b/gfx/pics/steelix/frames.asm
similarity index 100%
rename from gfx/pics/208/frames.asm
rename to gfx/pics/steelix/frames.asm
diff --git a/gfx/pics/208/front.lz b/gfx/pics/steelix/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/208/front.lz
rename to gfx/pics/steelix/front.7x7.2bpp.lz
diff --git a/gfx/pics/208/normal.pal b/gfx/pics/steelix/normal.pal
similarity index 100%
rename from gfx/pics/208/normal.pal
rename to gfx/pics/steelix/normal.pal
diff --git a/gfx/pics/208/shiny.pal b/gfx/pics/steelix/shiny.pal
similarity index 100%
rename from gfx/pics/208/shiny.pal
rename to gfx/pics/steelix/shiny.pal
diff --git a/gfx/pics/185/anim0.asm b/gfx/pics/sudowoodo/anim0.asm
similarity index 100%
rename from gfx/pics/185/anim0.asm
rename to gfx/pics/sudowoodo/anim0.asm
diff --git a/gfx/pics/185/anim1.asm b/gfx/pics/sudowoodo/anim1.asm
similarity index 100%
rename from gfx/pics/185/anim1.asm
rename to gfx/pics/sudowoodo/anim1.asm
diff --git a/gfx/pics/185/back.lz b/gfx/pics/sudowoodo/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/185/back.lz
rename to gfx/pics/sudowoodo/back.6x6.2bpp.lz
diff --git a/gfx/pics/185/bitmask.asm b/gfx/pics/sudowoodo/bitmask.asm
similarity index 100%
rename from gfx/pics/185/bitmask.asm
rename to gfx/pics/sudowoodo/bitmask.asm
diff --git a/gfx/pics/185/frames.asm b/gfx/pics/sudowoodo/frames.asm
similarity index 100%
rename from gfx/pics/185/frames.asm
rename to gfx/pics/sudowoodo/frames.asm
diff --git a/gfx/pics/185/front.lz b/gfx/pics/sudowoodo/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/185/front.lz
rename to gfx/pics/sudowoodo/front.6x6.2bpp.lz
diff --git a/gfx/pics/185/normal.pal b/gfx/pics/sudowoodo/normal.pal
similarity index 100%
rename from gfx/pics/185/normal.pal
rename to gfx/pics/sudowoodo/normal.pal
diff --git a/gfx/pics/185/shiny.pal b/gfx/pics/sudowoodo/shiny.pal
similarity index 100%
rename from gfx/pics/185/shiny.pal
rename to gfx/pics/sudowoodo/shiny.pal
diff --git a/gfx/pics/245/anim0.asm b/gfx/pics/suicune/anim0.asm
similarity index 100%
rename from gfx/pics/245/anim0.asm
rename to gfx/pics/suicune/anim0.asm
diff --git a/gfx/pics/245/anim1.asm b/gfx/pics/suicune/anim1.asm
similarity index 100%
rename from gfx/pics/245/anim1.asm
rename to gfx/pics/suicune/anim1.asm
diff --git a/gfx/pics/245/back.lz b/gfx/pics/suicune/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/245/back.lz
rename to gfx/pics/suicune/back.6x6.2bpp.lz
diff --git a/gfx/pics/245/bitmask.asm b/gfx/pics/suicune/bitmask.asm
similarity index 100%
rename from gfx/pics/245/bitmask.asm
rename to gfx/pics/suicune/bitmask.asm
diff --git a/gfx/pics/245/frames.asm b/gfx/pics/suicune/frames.asm
similarity index 100%
rename from gfx/pics/245/frames.asm
rename to gfx/pics/suicune/frames.asm
diff --git a/gfx/pics/245/front.lz b/gfx/pics/suicune/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/245/front.lz
rename to gfx/pics/suicune/front.7x7.2bpp.lz
diff --git a/gfx/pics/245/normal.pal b/gfx/pics/suicune/normal.pal
similarity index 100%
rename from gfx/pics/245/normal.pal
rename to gfx/pics/suicune/normal.pal
diff --git a/gfx/pics/245/shiny.pal b/gfx/pics/suicune/shiny.pal
similarity index 100%
rename from gfx/pics/245/shiny.pal
rename to gfx/pics/suicune/shiny.pal
diff --git a/gfx/pics/192/anim0.asm b/gfx/pics/sunflora/anim0.asm
similarity index 100%
rename from gfx/pics/192/anim0.asm
rename to gfx/pics/sunflora/anim0.asm
diff --git a/gfx/pics/192/anim1.asm b/gfx/pics/sunflora/anim1.asm
similarity index 100%
rename from gfx/pics/192/anim1.asm
rename to gfx/pics/sunflora/anim1.asm
diff --git a/gfx/pics/192/back.lz b/gfx/pics/sunflora/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/192/back.lz
rename to gfx/pics/sunflora/back.6x6.2bpp.lz
diff --git a/gfx/pics/192/bitmask.asm b/gfx/pics/sunflora/bitmask.asm
similarity index 100%
rename from gfx/pics/192/bitmask.asm
rename to gfx/pics/sunflora/bitmask.asm
diff --git a/gfx/pics/192/frames.asm b/gfx/pics/sunflora/frames.asm
similarity index 100%
rename from gfx/pics/192/frames.asm
rename to gfx/pics/sunflora/frames.asm
diff --git a/gfx/pics/192/front.lz b/gfx/pics/sunflora/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/192/front.lz
rename to gfx/pics/sunflora/front.6x6.2bpp.lz
diff --git a/gfx/pics/192/normal.pal b/gfx/pics/sunflora/normal.pal
similarity index 100%
rename from gfx/pics/192/normal.pal
rename to gfx/pics/sunflora/normal.pal
diff --git a/gfx/pics/192/shiny.pal b/gfx/pics/sunflora/shiny.pal
similarity index 100%
rename from gfx/pics/192/shiny.pal
rename to gfx/pics/sunflora/shiny.pal
diff --git a/gfx/pics/191/anim0.asm b/gfx/pics/sunkern/anim0.asm
similarity index 100%
rename from gfx/pics/191/anim0.asm
rename to gfx/pics/sunkern/anim0.asm
diff --git a/gfx/pics/191/anim1.asm b/gfx/pics/sunkern/anim1.asm
similarity index 100%
rename from gfx/pics/191/anim1.asm
rename to gfx/pics/sunkern/anim1.asm
diff --git a/gfx/pics/191/back.lz b/gfx/pics/sunkern/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/191/back.lz
rename to gfx/pics/sunkern/back.6x6.2bpp.lz
diff --git a/gfx/pics/191/bitmask.asm b/gfx/pics/sunkern/bitmask.asm
similarity index 100%
rename from gfx/pics/191/bitmask.asm
rename to gfx/pics/sunkern/bitmask.asm
diff --git a/gfx/pics/191/frames.asm b/gfx/pics/sunkern/frames.asm
similarity index 100%
rename from gfx/pics/191/frames.asm
rename to gfx/pics/sunkern/frames.asm
diff --git a/gfx/pics/191/front.lz b/gfx/pics/sunkern/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/191/front.lz
rename to gfx/pics/sunkern/front.5x5.2bpp.lz
diff --git a/gfx/pics/191/normal.pal b/gfx/pics/sunkern/normal.pal
similarity index 100%
rename from gfx/pics/191/normal.pal
rename to gfx/pics/sunkern/normal.pal
diff --git a/gfx/pics/191/shiny.pal b/gfx/pics/sunkern/shiny.pal
similarity index 100%
rename from gfx/pics/191/shiny.pal
rename to gfx/pics/sunkern/shiny.pal
diff --git a/gfx/pics/220/anim0.asm b/gfx/pics/swinub/anim0.asm
similarity index 100%
rename from gfx/pics/220/anim0.asm
rename to gfx/pics/swinub/anim0.asm
diff --git a/gfx/pics/220/anim1.asm b/gfx/pics/swinub/anim1.asm
similarity index 100%
rename from gfx/pics/220/anim1.asm
rename to gfx/pics/swinub/anim1.asm
diff --git a/gfx/pics/220/back.lz b/gfx/pics/swinub/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/220/back.lz
rename to gfx/pics/swinub/back.6x6.2bpp.lz
diff --git a/gfx/pics/220/bitmask.asm b/gfx/pics/swinub/bitmask.asm
similarity index 100%
rename from gfx/pics/220/bitmask.asm
rename to gfx/pics/swinub/bitmask.asm
diff --git a/gfx/pics/220/frames.asm b/gfx/pics/swinub/frames.asm
similarity index 100%
rename from gfx/pics/220/frames.asm
rename to gfx/pics/swinub/frames.asm
diff --git a/gfx/pics/220/front.lz b/gfx/pics/swinub/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/220/front.lz
rename to gfx/pics/swinub/front.5x5.2bpp.lz
diff --git a/gfx/pics/220/normal.pal b/gfx/pics/swinub/normal.pal
similarity index 100%
rename from gfx/pics/220/normal.pal
rename to gfx/pics/swinub/normal.pal
diff --git a/gfx/pics/220/shiny.pal b/gfx/pics/swinub/shiny.pal
similarity index 100%
rename from gfx/pics/220/shiny.pal
rename to gfx/pics/swinub/shiny.pal
diff --git a/gfx/pics/114/anim0.asm b/gfx/pics/tangela/anim0.asm
similarity index 100%
rename from gfx/pics/114/anim0.asm
rename to gfx/pics/tangela/anim0.asm
diff --git a/gfx/pics/114/anim1.asm b/gfx/pics/tangela/anim1.asm
similarity index 100%
rename from gfx/pics/114/anim1.asm
rename to gfx/pics/tangela/anim1.asm
diff --git a/gfx/pics/114/back.lz b/gfx/pics/tangela/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/114/back.lz
rename to gfx/pics/tangela/back.6x6.2bpp.lz
diff --git a/gfx/pics/114/bitmask.asm b/gfx/pics/tangela/bitmask.asm
similarity index 100%
rename from gfx/pics/114/bitmask.asm
rename to gfx/pics/tangela/bitmask.asm
diff --git a/gfx/pics/114/frames.asm b/gfx/pics/tangela/frames.asm
similarity index 100%
rename from gfx/pics/114/frames.asm
rename to gfx/pics/tangela/frames.asm
diff --git a/gfx/pics/114/front.lz b/gfx/pics/tangela/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/114/front.lz
rename to gfx/pics/tangela/front.6x6.2bpp.lz
diff --git a/gfx/pics/114/normal.pal b/gfx/pics/tangela/normal.pal
similarity index 100%
rename from gfx/pics/114/normal.pal
rename to gfx/pics/tangela/normal.pal
diff --git a/gfx/pics/114/shiny.pal b/gfx/pics/tangela/shiny.pal
similarity index 100%
rename from gfx/pics/114/shiny.pal
rename to gfx/pics/tangela/shiny.pal
diff --git a/gfx/pics/128/anim0.asm b/gfx/pics/tauros/anim0.asm
similarity index 100%
rename from gfx/pics/128/anim0.asm
rename to gfx/pics/tauros/anim0.asm
diff --git a/gfx/pics/128/anim1.asm b/gfx/pics/tauros/anim1.asm
similarity index 100%
rename from gfx/pics/128/anim1.asm
rename to gfx/pics/tauros/anim1.asm
diff --git a/gfx/pics/128/back.lz b/gfx/pics/tauros/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/128/back.lz
rename to gfx/pics/tauros/back.6x6.2bpp.lz
diff --git a/gfx/pics/128/bitmask.asm b/gfx/pics/tauros/bitmask.asm
similarity index 100%
rename from gfx/pics/128/bitmask.asm
rename to gfx/pics/tauros/bitmask.asm
diff --git a/gfx/pics/128/frames.asm b/gfx/pics/tauros/frames.asm
similarity index 100%
rename from gfx/pics/128/frames.asm
rename to gfx/pics/tauros/frames.asm
diff --git a/gfx/pics/128/front.lz b/gfx/pics/tauros/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/128/front.lz
rename to gfx/pics/tauros/front.7x7.2bpp.lz
diff --git a/gfx/pics/128/normal.pal b/gfx/pics/tauros/normal.pal
similarity index 100%
rename from gfx/pics/128/normal.pal
rename to gfx/pics/tauros/normal.pal
diff --git a/gfx/pics/128/shiny.pal b/gfx/pics/tauros/shiny.pal
similarity index 100%
rename from gfx/pics/128/shiny.pal
rename to gfx/pics/tauros/shiny.pal
diff --git a/gfx/pics/216/anim0.asm b/gfx/pics/teddiursa/anim0.asm
similarity index 100%
rename from gfx/pics/216/anim0.asm
rename to gfx/pics/teddiursa/anim0.asm
diff --git a/gfx/pics/216/anim1.asm b/gfx/pics/teddiursa/anim1.asm
similarity index 100%
rename from gfx/pics/216/anim1.asm
rename to gfx/pics/teddiursa/anim1.asm
diff --git a/gfx/pics/216/back.lz b/gfx/pics/teddiursa/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/216/back.lz
rename to gfx/pics/teddiursa/back.6x6.2bpp.lz
diff --git a/gfx/pics/216/bitmask.asm b/gfx/pics/teddiursa/bitmask.asm
similarity index 100%
rename from gfx/pics/216/bitmask.asm
rename to gfx/pics/teddiursa/bitmask.asm
diff --git a/gfx/pics/216/frames.asm b/gfx/pics/teddiursa/frames.asm
similarity index 100%
rename from gfx/pics/216/frames.asm
rename to gfx/pics/teddiursa/frames.asm
diff --git a/gfx/pics/216/front.lz b/gfx/pics/teddiursa/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/216/front.lz
rename to gfx/pics/teddiursa/front.5x5.2bpp.lz
diff --git a/gfx/pics/216/normal.pal b/gfx/pics/teddiursa/normal.pal
similarity index 100%
rename from gfx/pics/216/normal.pal
rename to gfx/pics/teddiursa/normal.pal
diff --git a/gfx/pics/216/shiny.pal b/gfx/pics/teddiursa/shiny.pal
similarity index 100%
rename from gfx/pics/216/shiny.pal
rename to gfx/pics/teddiursa/shiny.pal
diff --git a/gfx/pics/072/anim0.asm b/gfx/pics/tentacool/anim0.asm
similarity index 100%
rename from gfx/pics/072/anim0.asm
rename to gfx/pics/tentacool/anim0.asm
diff --git a/gfx/pics/072/anim1.asm b/gfx/pics/tentacool/anim1.asm
similarity index 100%
rename from gfx/pics/072/anim1.asm
rename to gfx/pics/tentacool/anim1.asm
diff --git a/gfx/pics/072/back.lz b/gfx/pics/tentacool/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/072/back.lz
rename to gfx/pics/tentacool/back.6x6.2bpp.lz
diff --git a/gfx/pics/072/bitmask.asm b/gfx/pics/tentacool/bitmask.asm
similarity index 100%
rename from gfx/pics/072/bitmask.asm
rename to gfx/pics/tentacool/bitmask.asm
diff --git a/gfx/pics/072/frames.asm b/gfx/pics/tentacool/frames.asm
similarity index 100%
rename from gfx/pics/072/frames.asm
rename to gfx/pics/tentacool/frames.asm
diff --git a/gfx/pics/072/front.lz b/gfx/pics/tentacool/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/072/front.lz
rename to gfx/pics/tentacool/front.5x5.2bpp.lz
diff --git a/gfx/pics/072/normal.pal b/gfx/pics/tentacool/normal.pal
similarity index 100%
rename from gfx/pics/072/normal.pal
rename to gfx/pics/tentacool/normal.pal
diff --git a/gfx/pics/072/shiny.pal b/gfx/pics/tentacool/shiny.pal
similarity index 100%
rename from gfx/pics/072/shiny.pal
rename to gfx/pics/tentacool/shiny.pal
diff --git a/gfx/pics/073/anim0.asm b/gfx/pics/tentacruel/anim0.asm
similarity index 100%
rename from gfx/pics/073/anim0.asm
rename to gfx/pics/tentacruel/anim0.asm
diff --git a/gfx/pics/073/anim1.asm b/gfx/pics/tentacruel/anim1.asm
similarity index 100%
rename from gfx/pics/073/anim1.asm
rename to gfx/pics/tentacruel/anim1.asm
diff --git a/gfx/pics/073/back.lz b/gfx/pics/tentacruel/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/073/back.lz
rename to gfx/pics/tentacruel/back.6x6.2bpp.lz
diff --git a/gfx/pics/073/bitmask.asm b/gfx/pics/tentacruel/bitmask.asm
similarity index 100%
rename from gfx/pics/073/bitmask.asm
rename to gfx/pics/tentacruel/bitmask.asm
diff --git a/gfx/pics/073/frames.asm b/gfx/pics/tentacruel/frames.asm
similarity index 100%
rename from gfx/pics/073/frames.asm
rename to gfx/pics/tentacruel/frames.asm
diff --git a/gfx/pics/073/front.lz b/gfx/pics/tentacruel/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/073/front.lz
rename to gfx/pics/tentacruel/front.6x6.2bpp.lz
diff --git a/gfx/pics/073/normal.pal b/gfx/pics/tentacruel/normal.pal
similarity index 100%
rename from gfx/pics/073/normal.pal
rename to gfx/pics/tentacruel/normal.pal
diff --git a/gfx/pics/073/shiny.pal b/gfx/pics/tentacruel/shiny.pal
similarity index 100%
rename from gfx/pics/073/shiny.pal
rename to gfx/pics/tentacruel/shiny.pal
diff --git a/gfx/pics/175/anim0.asm b/gfx/pics/togepi/anim0.asm
similarity index 100%
rename from gfx/pics/175/anim0.asm
rename to gfx/pics/togepi/anim0.asm
diff --git a/gfx/pics/175/anim1.asm b/gfx/pics/togepi/anim1.asm
similarity index 100%
rename from gfx/pics/175/anim1.asm
rename to gfx/pics/togepi/anim1.asm
diff --git a/gfx/pics/175/back.lz b/gfx/pics/togepi/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/175/back.lz
rename to gfx/pics/togepi/back.6x6.2bpp.lz
diff --git a/gfx/pics/175/bitmask.asm b/gfx/pics/togepi/bitmask.asm
similarity index 100%
rename from gfx/pics/175/bitmask.asm
rename to gfx/pics/togepi/bitmask.asm
diff --git a/gfx/pics/175/frames.asm b/gfx/pics/togepi/frames.asm
similarity index 100%
rename from gfx/pics/175/frames.asm
rename to gfx/pics/togepi/frames.asm
diff --git a/gfx/pics/175/front.lz b/gfx/pics/togepi/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/175/front.lz
rename to gfx/pics/togepi/front.5x5.2bpp.lz
diff --git a/gfx/pics/175/normal.pal b/gfx/pics/togepi/normal.pal
similarity index 100%
rename from gfx/pics/175/normal.pal
rename to gfx/pics/togepi/normal.pal
diff --git a/gfx/pics/175/shiny.pal b/gfx/pics/togepi/shiny.pal
similarity index 100%
rename from gfx/pics/175/shiny.pal
rename to gfx/pics/togepi/shiny.pal
diff --git a/gfx/pics/176/anim0.asm b/gfx/pics/togetic/anim0.asm
similarity index 100%
rename from gfx/pics/176/anim0.asm
rename to gfx/pics/togetic/anim0.asm
diff --git a/gfx/pics/176/anim1.asm b/gfx/pics/togetic/anim1.asm
similarity index 100%
rename from gfx/pics/176/anim1.asm
rename to gfx/pics/togetic/anim1.asm
diff --git a/gfx/pics/176/back.lz b/gfx/pics/togetic/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/176/back.lz
rename to gfx/pics/togetic/back.6x6.2bpp.lz
diff --git a/gfx/pics/176/bitmask.asm b/gfx/pics/togetic/bitmask.asm
similarity index 100%
rename from gfx/pics/176/bitmask.asm
rename to gfx/pics/togetic/bitmask.asm
diff --git a/gfx/pics/176/frames.asm b/gfx/pics/togetic/frames.asm
similarity index 100%
rename from gfx/pics/176/frames.asm
rename to gfx/pics/togetic/frames.asm
diff --git a/gfx/pics/176/front.lz b/gfx/pics/togetic/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/176/front.lz
rename to gfx/pics/togetic/front.7x7.2bpp.lz
diff --git a/gfx/pics/176/normal.pal b/gfx/pics/togetic/normal.pal
similarity index 100%
rename from gfx/pics/176/normal.pal
rename to gfx/pics/togetic/normal.pal
diff --git a/gfx/pics/176/shiny.pal b/gfx/pics/togetic/shiny.pal
similarity index 100%
rename from gfx/pics/176/shiny.pal
rename to gfx/pics/togetic/shiny.pal
diff --git a/gfx/pics/158/anim0.asm b/gfx/pics/totodile/anim0.asm
similarity index 100%
rename from gfx/pics/158/anim0.asm
rename to gfx/pics/totodile/anim0.asm
diff --git a/gfx/pics/158/anim1.asm b/gfx/pics/totodile/anim1.asm
similarity index 100%
rename from gfx/pics/158/anim1.asm
rename to gfx/pics/totodile/anim1.asm
diff --git a/gfx/pics/158/back.lz b/gfx/pics/totodile/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/158/back.lz
rename to gfx/pics/totodile/back.6x6.2bpp.lz
diff --git a/gfx/pics/158/bitmask.asm b/gfx/pics/totodile/bitmask.asm
similarity index 100%
rename from gfx/pics/158/bitmask.asm
rename to gfx/pics/totodile/bitmask.asm
diff --git a/gfx/pics/158/frames.asm b/gfx/pics/totodile/frames.asm
similarity index 100%
rename from gfx/pics/158/frames.asm
rename to gfx/pics/totodile/frames.asm
diff --git a/gfx/pics/158/front.lz b/gfx/pics/totodile/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/158/front.lz
rename to gfx/pics/totodile/front.5x5.2bpp.lz
diff --git a/gfx/pics/158/normal.pal b/gfx/pics/totodile/normal.pal
similarity index 100%
rename from gfx/pics/158/normal.pal
rename to gfx/pics/totodile/normal.pal
diff --git a/gfx/pics/158/shiny.pal b/gfx/pics/totodile/shiny.pal
similarity index 100%
rename from gfx/pics/158/shiny.pal
rename to gfx/pics/totodile/shiny.pal
diff --git a/gfx/pics/157/anim0.asm b/gfx/pics/typhlosion/anim0.asm
similarity index 100%
rename from gfx/pics/157/anim0.asm
rename to gfx/pics/typhlosion/anim0.asm
diff --git a/gfx/pics/157/anim1.asm b/gfx/pics/typhlosion/anim1.asm
similarity index 100%
rename from gfx/pics/157/anim1.asm
rename to gfx/pics/typhlosion/anim1.asm
diff --git a/gfx/pics/157/back.lz b/gfx/pics/typhlosion/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/157/back.lz
rename to gfx/pics/typhlosion/back.6x6.2bpp.lz
diff --git a/gfx/pics/157/bitmask.asm b/gfx/pics/typhlosion/bitmask.asm
similarity index 100%
rename from gfx/pics/157/bitmask.asm
rename to gfx/pics/typhlosion/bitmask.asm
diff --git a/gfx/pics/157/frames.asm b/gfx/pics/typhlosion/frames.asm
similarity index 100%
rename from gfx/pics/157/frames.asm
rename to gfx/pics/typhlosion/frames.asm
diff --git a/gfx/pics/157/front.lz b/gfx/pics/typhlosion/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/157/front.lz
rename to gfx/pics/typhlosion/front.7x7.2bpp.lz
diff --git a/gfx/pics/157/normal.pal b/gfx/pics/typhlosion/normal.pal
similarity index 100%
rename from gfx/pics/157/normal.pal
rename to gfx/pics/typhlosion/normal.pal
diff --git a/gfx/pics/157/shiny.pal b/gfx/pics/typhlosion/shiny.pal
similarity index 100%
rename from gfx/pics/157/shiny.pal
rename to gfx/pics/typhlosion/shiny.pal
diff --git a/gfx/pics/248/anim0.asm b/gfx/pics/tyranitar/anim0.asm
similarity index 100%
rename from gfx/pics/248/anim0.asm
rename to gfx/pics/tyranitar/anim0.asm
diff --git a/gfx/pics/248/anim1.asm b/gfx/pics/tyranitar/anim1.asm
similarity index 100%
rename from gfx/pics/248/anim1.asm
rename to gfx/pics/tyranitar/anim1.asm
diff --git a/gfx/pics/248/back.lz b/gfx/pics/tyranitar/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/248/back.lz
rename to gfx/pics/tyranitar/back.6x6.2bpp.lz
diff --git a/gfx/pics/248/bitmask.asm b/gfx/pics/tyranitar/bitmask.asm
similarity index 100%
rename from gfx/pics/248/bitmask.asm
rename to gfx/pics/tyranitar/bitmask.asm
diff --git a/gfx/pics/248/frames.asm b/gfx/pics/tyranitar/frames.asm
similarity index 100%
rename from gfx/pics/248/frames.asm
rename to gfx/pics/tyranitar/frames.asm
diff --git a/gfx/pics/248/front.lz b/gfx/pics/tyranitar/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/248/front.lz
rename to gfx/pics/tyranitar/front.7x7.2bpp.lz
diff --git a/gfx/pics/248/normal.pal b/gfx/pics/tyranitar/normal.pal
similarity index 100%
rename from gfx/pics/248/normal.pal
rename to gfx/pics/tyranitar/normal.pal
diff --git a/gfx/pics/248/shiny.pal b/gfx/pics/tyranitar/shiny.pal
similarity index 100%
rename from gfx/pics/248/shiny.pal
rename to gfx/pics/tyranitar/shiny.pal
diff --git a/gfx/pics/236/anim0.asm b/gfx/pics/tyrogue/anim0.asm
similarity index 100%
rename from gfx/pics/236/anim0.asm
rename to gfx/pics/tyrogue/anim0.asm
diff --git a/gfx/pics/236/anim1.asm b/gfx/pics/tyrogue/anim1.asm
similarity index 100%
rename from gfx/pics/236/anim1.asm
rename to gfx/pics/tyrogue/anim1.asm
diff --git a/gfx/pics/236/back.lz b/gfx/pics/tyrogue/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/236/back.lz
rename to gfx/pics/tyrogue/back.6x6.2bpp.lz
diff --git a/gfx/pics/236/bitmask.asm b/gfx/pics/tyrogue/bitmask.asm
similarity index 100%
rename from gfx/pics/236/bitmask.asm
rename to gfx/pics/tyrogue/bitmask.asm
diff --git a/gfx/pics/236/frames.asm b/gfx/pics/tyrogue/frames.asm
similarity index 100%
rename from gfx/pics/236/frames.asm
rename to gfx/pics/tyrogue/frames.asm
diff --git a/gfx/pics/236/front.lz b/gfx/pics/tyrogue/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/236/front.lz
rename to gfx/pics/tyrogue/front.5x5.2bpp.lz
diff --git a/gfx/pics/236/normal.pal b/gfx/pics/tyrogue/normal.pal
similarity index 100%
rename from gfx/pics/236/normal.pal
rename to gfx/pics/tyrogue/normal.pal
diff --git a/gfx/pics/236/shiny.pal b/gfx/pics/tyrogue/shiny.pal
similarity index 100%
rename from gfx/pics/236/shiny.pal
rename to gfx/pics/tyrogue/shiny.pal
diff --git a/gfx/pics/197/anim0.asm b/gfx/pics/umbreon/anim0.asm
similarity index 100%
rename from gfx/pics/197/anim0.asm
rename to gfx/pics/umbreon/anim0.asm
diff --git a/gfx/pics/197/anim1.asm b/gfx/pics/umbreon/anim1.asm
similarity index 100%
rename from gfx/pics/197/anim1.asm
rename to gfx/pics/umbreon/anim1.asm
diff --git a/gfx/pics/197/back.lz b/gfx/pics/umbreon/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/197/back.lz
rename to gfx/pics/umbreon/back.6x6.2bpp.lz
diff --git a/gfx/pics/197/bitmask.asm b/gfx/pics/umbreon/bitmask.asm
similarity index 100%
rename from gfx/pics/197/bitmask.asm
rename to gfx/pics/umbreon/bitmask.asm
diff --git a/gfx/pics/197/frames.asm b/gfx/pics/umbreon/frames.asm
similarity index 100%
rename from gfx/pics/197/frames.asm
rename to gfx/pics/umbreon/frames.asm
diff --git a/gfx/pics/197/front.lz b/gfx/pics/umbreon/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/197/front.lz
rename to gfx/pics/umbreon/front.6x6.2bpp.lz
diff --git a/gfx/pics/197/normal.pal b/gfx/pics/umbreon/normal.pal
similarity index 100%
rename from gfx/pics/197/normal.pal
rename to gfx/pics/umbreon/normal.pal
diff --git a/gfx/pics/197/shiny.pal b/gfx/pics/umbreon/shiny.pal
similarity index 100%
rename from gfx/pics/197/shiny.pal
rename to gfx/pics/umbreon/shiny.pal
diff --git a/gfx/pics/201/anim0.asm b/gfx/pics/unown/anim0.asm
similarity index 100%
rename from gfx/pics/201/anim0.asm
rename to gfx/pics/unown/anim0.asm
diff --git a/gfx/pics/201/anim1.asm b/gfx/pics/unown/anim1.asm
similarity index 100%
rename from gfx/pics/201/anim1.asm
rename to gfx/pics/unown/anim1.asm
diff --git a/gfx/pics/201/bitmask.asm b/gfx/pics/unown/bitmask.asm
similarity index 100%
rename from gfx/pics/201/bitmask.asm
rename to gfx/pics/unown/bitmask.asm
diff --git a/gfx/pics/201/frames.asm b/gfx/pics/unown/frames.asm
similarity index 100%
rename from gfx/pics/201/frames.asm
rename to gfx/pics/unown/frames.asm
diff --git a/gfx/pics/201/normal.pal b/gfx/pics/unown/normal.pal
similarity index 100%
rename from gfx/pics/201/normal.pal
rename to gfx/pics/unown/normal.pal
diff --git a/gfx/pics/201/shiny.pal b/gfx/pics/unown/shiny.pal
similarity index 100%
rename from gfx/pics/201/shiny.pal
rename to gfx/pics/unown/shiny.pal
diff --git a/gfx/pics/201a/anim0.asm b/gfx/pics/unown_a/anim0.asm
similarity index 100%
rename from gfx/pics/201a/anim0.asm
rename to gfx/pics/unown_a/anim0.asm
diff --git a/gfx/pics/201a/anim1.asm b/gfx/pics/unown_a/anim1.asm
similarity index 100%
rename from gfx/pics/201a/anim1.asm
rename to gfx/pics/unown_a/anim1.asm
diff --git a/gfx/pics/201a/back.lz b/gfx/pics/unown_a/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201a/back.lz
rename to gfx/pics/unown_a/back.6x6.2bpp.lz
diff --git a/gfx/pics/201a/bitmask.asm b/gfx/pics/unown_a/bitmask.asm
similarity index 100%
rename from gfx/pics/201a/bitmask.asm
rename to gfx/pics/unown_a/bitmask.asm
diff --git a/gfx/pics/201a/frames.asm b/gfx/pics/unown_a/frames.asm
similarity index 100%
rename from gfx/pics/201a/frames.asm
rename to gfx/pics/unown_a/frames.asm
diff --git a/gfx/pics/201a/front.lz b/gfx/pics/unown_a/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201a/front.lz
rename to 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
similarity index 100%
rename from gfx/pics/201b/anim0.asm
rename to gfx/pics/unown_b/anim0.asm
diff --git a/gfx/pics/201b/anim1.asm b/gfx/pics/unown_b/anim1.asm
similarity index 100%
rename from gfx/pics/201b/anim1.asm
rename to gfx/pics/unown_b/anim1.asm
diff --git a/gfx/pics/201b/back.lz b/gfx/pics/unown_b/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201b/back.lz
rename to gfx/pics/unown_b/back.6x6.2bpp.lz
diff --git a/gfx/pics/201b/bitmask.asm b/gfx/pics/unown_b/bitmask.asm
similarity index 100%
rename from gfx/pics/201b/bitmask.asm
rename to gfx/pics/unown_b/bitmask.asm
diff --git a/gfx/pics/201b/frames.asm b/gfx/pics/unown_b/frames.asm
similarity index 100%
rename from gfx/pics/201b/frames.asm
rename to gfx/pics/unown_b/frames.asm
diff --git a/gfx/pics/201b/front.lz b/gfx/pics/unown_b/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201b/front.lz
rename to 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
similarity index 100%
rename from gfx/pics/201c/anim0.asm
rename to gfx/pics/unown_c/anim0.asm
diff --git a/gfx/pics/201c/anim1.asm b/gfx/pics/unown_c/anim1.asm
similarity index 100%
rename from gfx/pics/201c/anim1.asm
rename to gfx/pics/unown_c/anim1.asm
diff --git a/gfx/pics/201c/back.lz b/gfx/pics/unown_c/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201c/back.lz
rename to gfx/pics/unown_c/back.6x6.2bpp.lz
diff --git a/gfx/pics/201c/bitmask.asm b/gfx/pics/unown_c/bitmask.asm
similarity index 100%
rename from gfx/pics/201c/bitmask.asm
rename to gfx/pics/unown_c/bitmask.asm
diff --git a/gfx/pics/201c/frames.asm b/gfx/pics/unown_c/frames.asm
similarity index 100%
rename from gfx/pics/201c/frames.asm
rename to gfx/pics/unown_c/frames.asm
diff --git a/gfx/pics/201c/front.lz b/gfx/pics/unown_c/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201c/front.lz
rename to gfx/pics/unown_c/front.5x5.2bpp.lz
diff --git a/gfx/pics/201d/anim0.asm b/gfx/pics/unown_d/anim0.asm
similarity index 100%
rename from gfx/pics/201d/anim0.asm
rename to gfx/pics/unown_d/anim0.asm
diff --git a/gfx/pics/201d/anim1.asm b/gfx/pics/unown_d/anim1.asm
similarity index 100%
rename from gfx/pics/201d/anim1.asm
rename to gfx/pics/unown_d/anim1.asm
diff --git a/gfx/pics/201d/back.lz b/gfx/pics/unown_d/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201d/back.lz
rename to gfx/pics/unown_d/back.6x6.2bpp.lz
diff --git a/gfx/pics/201d/bitmask.asm b/gfx/pics/unown_d/bitmask.asm
similarity index 100%
rename from gfx/pics/201d/bitmask.asm
rename to gfx/pics/unown_d/bitmask.asm
diff --git a/gfx/pics/201d/frames.asm b/gfx/pics/unown_d/frames.asm
similarity index 100%
rename from gfx/pics/201d/frames.asm
rename to gfx/pics/unown_d/frames.asm
diff --git a/gfx/pics/201d/front.lz b/gfx/pics/unown_d/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201d/front.lz
rename to gfx/pics/unown_d/front.5x5.2bpp.lz
diff --git a/gfx/pics/201e/anim0.asm b/gfx/pics/unown_e/anim0.asm
similarity index 100%
rename from gfx/pics/201e/anim0.asm
rename to gfx/pics/unown_e/anim0.asm
diff --git a/gfx/pics/201e/anim1.asm b/gfx/pics/unown_e/anim1.asm
similarity index 100%
rename from gfx/pics/201e/anim1.asm
rename to gfx/pics/unown_e/anim1.asm
diff --git a/gfx/pics/201e/back.lz b/gfx/pics/unown_e/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201e/back.lz
rename to gfx/pics/unown_e/back.6x6.2bpp.lz
diff --git a/gfx/pics/201e/bitmask.asm b/gfx/pics/unown_e/bitmask.asm
similarity index 100%
rename from gfx/pics/201e/bitmask.asm
rename to gfx/pics/unown_e/bitmask.asm
diff --git a/gfx/pics/201e/frames.asm b/gfx/pics/unown_e/frames.asm
similarity index 100%
rename from gfx/pics/201e/frames.asm
rename to gfx/pics/unown_e/frames.asm
diff --git a/gfx/pics/201e/front.lz b/gfx/pics/unown_e/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201e/front.lz
rename to 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
similarity index 100%
rename from gfx/pics/201f/anim0.asm
rename to gfx/pics/unown_f/anim0.asm
diff --git a/gfx/pics/201f/anim1.asm b/gfx/pics/unown_f/anim1.asm
similarity index 100%
rename from gfx/pics/201f/anim1.asm
rename to gfx/pics/unown_f/anim1.asm
diff --git a/gfx/pics/201f/back.lz b/gfx/pics/unown_f/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201f/back.lz
rename to gfx/pics/unown_f/back.6x6.2bpp.lz
diff --git a/gfx/pics/201f/bitmask.asm b/gfx/pics/unown_f/bitmask.asm
similarity index 100%
rename from gfx/pics/201f/bitmask.asm
rename to gfx/pics/unown_f/bitmask.asm
diff --git a/gfx/pics/201f/frames.asm b/gfx/pics/unown_f/frames.asm
similarity index 100%
rename from gfx/pics/201f/frames.asm
rename to gfx/pics/unown_f/frames.asm
diff --git a/gfx/pics/201f/front.lz b/gfx/pics/unown_f/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201f/front.lz
rename to 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
similarity index 100%
rename from gfx/pics/201g/anim0.asm
rename to gfx/pics/unown_g/anim0.asm
diff --git a/gfx/pics/201g/anim1.asm b/gfx/pics/unown_g/anim1.asm
similarity index 100%
rename from gfx/pics/201g/anim1.asm
rename to gfx/pics/unown_g/anim1.asm
diff --git a/gfx/pics/201g/back.lz b/gfx/pics/unown_g/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201g/back.lz
rename to gfx/pics/unown_g/back.6x6.2bpp.lz
diff --git a/gfx/pics/201g/bitmask.asm b/gfx/pics/unown_g/bitmask.asm
similarity index 100%
rename from gfx/pics/201g/bitmask.asm
rename to gfx/pics/unown_g/bitmask.asm
diff --git a/gfx/pics/201g/frames.asm b/gfx/pics/unown_g/frames.asm
similarity index 100%
rename from gfx/pics/201g/frames.asm
rename to gfx/pics/unown_g/frames.asm
diff --git a/gfx/pics/201g/front.lz b/gfx/pics/unown_g/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201g/front.lz
rename to gfx/pics/unown_g/front.5x5.2bpp.lz
diff --git a/gfx/pics/201h/anim0.asm b/gfx/pics/unown_h/anim0.asm
similarity index 100%
rename from gfx/pics/201h/anim0.asm
rename to gfx/pics/unown_h/anim0.asm
diff --git a/gfx/pics/201h/anim1.asm b/gfx/pics/unown_h/anim1.asm
similarity index 100%
rename from gfx/pics/201h/anim1.asm
rename to gfx/pics/unown_h/anim1.asm
diff --git a/gfx/pics/201h/back.lz b/gfx/pics/unown_h/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201h/back.lz
rename to gfx/pics/unown_h/back.6x6.2bpp.lz
diff --git a/gfx/pics/201h/bitmask.asm b/gfx/pics/unown_h/bitmask.asm
similarity index 100%
rename from gfx/pics/201h/bitmask.asm
rename to gfx/pics/unown_h/bitmask.asm
diff --git a/gfx/pics/201h/frames.asm b/gfx/pics/unown_h/frames.asm
similarity index 100%
rename from gfx/pics/201h/frames.asm
rename to gfx/pics/unown_h/frames.asm
diff --git a/gfx/pics/201h/front.lz b/gfx/pics/unown_h/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201h/front.lz
rename to gfx/pics/unown_h/front.5x5.2bpp.lz
diff --git a/gfx/pics/201i/anim0.asm b/gfx/pics/unown_i/anim0.asm
similarity index 100%
rename from gfx/pics/201i/anim0.asm
rename to gfx/pics/unown_i/anim0.asm
diff --git a/gfx/pics/201i/anim1.asm b/gfx/pics/unown_i/anim1.asm
similarity index 100%
rename from gfx/pics/201i/anim1.asm
rename to gfx/pics/unown_i/anim1.asm
diff --git a/gfx/pics/201i/back.lz b/gfx/pics/unown_i/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201i/back.lz
rename to gfx/pics/unown_i/back.6x6.2bpp.lz
diff --git a/gfx/pics/201i/bitmask.asm b/gfx/pics/unown_i/bitmask.asm
similarity index 100%
rename from gfx/pics/201i/bitmask.asm
rename to gfx/pics/unown_i/bitmask.asm
diff --git a/gfx/pics/201i/frames.asm b/gfx/pics/unown_i/frames.asm
similarity index 100%
rename from gfx/pics/201i/frames.asm
rename to gfx/pics/unown_i/frames.asm
diff --git a/gfx/pics/201i/front.lz b/gfx/pics/unown_i/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201i/front.lz
rename to gfx/pics/unown_i/front.5x5.2bpp.lz
diff --git a/gfx/pics/201j/anim0.asm b/gfx/pics/unown_j/anim0.asm
similarity index 100%
rename from gfx/pics/201j/anim0.asm
rename to gfx/pics/unown_j/anim0.asm
diff --git a/gfx/pics/201j/anim1.asm b/gfx/pics/unown_j/anim1.asm
similarity index 100%
rename from gfx/pics/201j/anim1.asm
rename to gfx/pics/unown_j/anim1.asm
diff --git a/gfx/pics/201j/back.lz b/gfx/pics/unown_j/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201j/back.lz
rename to gfx/pics/unown_j/back.6x6.2bpp.lz
diff --git a/gfx/pics/201j/bitmask.asm b/gfx/pics/unown_j/bitmask.asm
similarity index 100%
rename from gfx/pics/201j/bitmask.asm
rename to gfx/pics/unown_j/bitmask.asm
diff --git a/gfx/pics/201j/frames.asm b/gfx/pics/unown_j/frames.asm
similarity index 100%
rename from gfx/pics/201j/frames.asm
rename to gfx/pics/unown_j/frames.asm
diff --git a/gfx/pics/201j/front.lz b/gfx/pics/unown_j/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201j/front.lz
rename to gfx/pics/unown_j/front.5x5.2bpp.lz
diff --git a/gfx/pics/201k/anim0.asm b/gfx/pics/unown_k/anim0.asm
similarity index 100%
rename from gfx/pics/201k/anim0.asm
rename to gfx/pics/unown_k/anim0.asm
diff --git a/gfx/pics/201k/anim1.asm b/gfx/pics/unown_k/anim1.asm
similarity index 100%
rename from gfx/pics/201k/anim1.asm
rename to gfx/pics/unown_k/anim1.asm
diff --git a/gfx/pics/201k/back.lz b/gfx/pics/unown_k/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201k/back.lz
rename to gfx/pics/unown_k/back.6x6.2bpp.lz
diff --git a/gfx/pics/201k/bitmask.asm b/gfx/pics/unown_k/bitmask.asm
similarity index 100%
rename from gfx/pics/201k/bitmask.asm
rename to gfx/pics/unown_k/bitmask.asm
diff --git a/gfx/pics/201k/frames.asm b/gfx/pics/unown_k/frames.asm
similarity index 100%
rename from gfx/pics/201k/frames.asm
rename to gfx/pics/unown_k/frames.asm
diff --git a/gfx/pics/201k/front.lz b/gfx/pics/unown_k/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201k/front.lz
rename to gfx/pics/unown_k/front.5x5.2bpp.lz
diff --git a/gfx/pics/201l/anim0.asm b/gfx/pics/unown_l/anim0.asm
similarity index 100%
rename from gfx/pics/201l/anim0.asm
rename to gfx/pics/unown_l/anim0.asm
diff --git a/gfx/pics/201l/anim1.asm b/gfx/pics/unown_l/anim1.asm
similarity index 100%
rename from gfx/pics/201l/anim1.asm
rename to gfx/pics/unown_l/anim1.asm
diff --git a/gfx/pics/201l/back.lz b/gfx/pics/unown_l/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201l/back.lz
rename to gfx/pics/unown_l/back.6x6.2bpp.lz
diff --git a/gfx/pics/201l/bitmask.asm b/gfx/pics/unown_l/bitmask.asm
similarity index 100%
rename from gfx/pics/201l/bitmask.asm
rename to gfx/pics/unown_l/bitmask.asm
diff --git a/gfx/pics/201l/frames.asm b/gfx/pics/unown_l/frames.asm
similarity index 100%
rename from gfx/pics/201l/frames.asm
rename to gfx/pics/unown_l/frames.asm
diff --git a/gfx/pics/201l/front.lz b/gfx/pics/unown_l/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201l/front.lz
rename to gfx/pics/unown_l/front.5x5.2bpp.lz
diff --git a/gfx/pics/201m/anim0.asm b/gfx/pics/unown_m/anim0.asm
similarity index 100%
rename from gfx/pics/201m/anim0.asm
rename to gfx/pics/unown_m/anim0.asm
diff --git a/gfx/pics/201m/anim1.asm b/gfx/pics/unown_m/anim1.asm
similarity index 100%
rename from gfx/pics/201m/anim1.asm
rename to gfx/pics/unown_m/anim1.asm
diff --git a/gfx/pics/201m/back.lz b/gfx/pics/unown_m/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201m/back.lz
rename to gfx/pics/unown_m/back.6x6.2bpp.lz
diff --git a/gfx/pics/201m/bitmask.asm b/gfx/pics/unown_m/bitmask.asm
similarity index 100%
rename from gfx/pics/201m/bitmask.asm
rename to gfx/pics/unown_m/bitmask.asm
diff --git a/gfx/pics/201m/frames.asm b/gfx/pics/unown_m/frames.asm
similarity index 100%
rename from gfx/pics/201m/frames.asm
rename to gfx/pics/unown_m/frames.asm
diff --git a/gfx/pics/201m/front.lz b/gfx/pics/unown_m/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201m/front.lz
rename to gfx/pics/unown_m/front.5x5.2bpp.lz
diff --git a/gfx/pics/201n/anim0.asm b/gfx/pics/unown_n/anim0.asm
similarity index 100%
rename from gfx/pics/201n/anim0.asm
rename to gfx/pics/unown_n/anim0.asm
diff --git a/gfx/pics/201n/anim1.asm b/gfx/pics/unown_n/anim1.asm
similarity index 100%
rename from gfx/pics/201n/anim1.asm
rename to gfx/pics/unown_n/anim1.asm
diff --git a/gfx/pics/201n/back.lz b/gfx/pics/unown_n/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201n/back.lz
rename to gfx/pics/unown_n/back.6x6.2bpp.lz
diff --git a/gfx/pics/201n/bitmask.asm b/gfx/pics/unown_n/bitmask.asm
similarity index 100%
rename from gfx/pics/201n/bitmask.asm
rename to gfx/pics/unown_n/bitmask.asm
diff --git a/gfx/pics/201n/frames.asm b/gfx/pics/unown_n/frames.asm
similarity index 100%
rename from gfx/pics/201n/frames.asm
rename to gfx/pics/unown_n/frames.asm
diff --git a/gfx/pics/201n/front.lz b/gfx/pics/unown_n/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201n/front.lz
rename to gfx/pics/unown_n/front.5x5.2bpp.lz
diff --git a/gfx/pics/201o/anim0.asm b/gfx/pics/unown_o/anim0.asm
similarity index 100%
rename from gfx/pics/201o/anim0.asm
rename to gfx/pics/unown_o/anim0.asm
diff --git a/gfx/pics/201o/anim1.asm b/gfx/pics/unown_o/anim1.asm
similarity index 100%
rename from gfx/pics/201o/anim1.asm
rename to gfx/pics/unown_o/anim1.asm
diff --git a/gfx/pics/201o/back.lz b/gfx/pics/unown_o/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201o/back.lz
rename to gfx/pics/unown_o/back.6x6.2bpp.lz
diff --git a/gfx/pics/201o/bitmask.asm b/gfx/pics/unown_o/bitmask.asm
similarity index 100%
rename from gfx/pics/201o/bitmask.asm
rename to gfx/pics/unown_o/bitmask.asm
diff --git a/gfx/pics/201o/frames.asm b/gfx/pics/unown_o/frames.asm
similarity index 100%
rename from gfx/pics/201o/frames.asm
rename to gfx/pics/unown_o/frames.asm
diff --git a/gfx/pics/201o/front.lz b/gfx/pics/unown_o/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201o/front.lz
rename to gfx/pics/unown_o/front.5x5.2bpp.lz
diff --git a/gfx/pics/201p/anim0.asm b/gfx/pics/unown_p/anim0.asm
similarity index 100%
rename from gfx/pics/201p/anim0.asm
rename to gfx/pics/unown_p/anim0.asm
diff --git a/gfx/pics/201p/anim1.asm b/gfx/pics/unown_p/anim1.asm
similarity index 100%
rename from gfx/pics/201p/anim1.asm
rename to gfx/pics/unown_p/anim1.asm
diff --git a/gfx/pics/201p/back.lz b/gfx/pics/unown_p/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201p/back.lz
rename to gfx/pics/unown_p/back.6x6.2bpp.lz
diff --git a/gfx/pics/201p/bitmask.asm b/gfx/pics/unown_p/bitmask.asm
similarity index 100%
rename from gfx/pics/201p/bitmask.asm
rename to gfx/pics/unown_p/bitmask.asm
diff --git a/gfx/pics/201p/frames.asm b/gfx/pics/unown_p/frames.asm
similarity index 100%
rename from gfx/pics/201p/frames.asm
rename to gfx/pics/unown_p/frames.asm
diff --git a/gfx/pics/201p/front.lz b/gfx/pics/unown_p/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201p/front.lz
rename to gfx/pics/unown_p/front.5x5.2bpp.lz
diff --git a/gfx/pics/201q/anim0.asm b/gfx/pics/unown_q/anim0.asm
similarity index 100%
rename from gfx/pics/201q/anim0.asm
rename to gfx/pics/unown_q/anim0.asm
diff --git a/gfx/pics/201q/anim1.asm b/gfx/pics/unown_q/anim1.asm
similarity index 100%
rename from gfx/pics/201q/anim1.asm
rename to gfx/pics/unown_q/anim1.asm
diff --git a/gfx/pics/201q/back.lz b/gfx/pics/unown_q/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201q/back.lz
rename to gfx/pics/unown_q/back.6x6.2bpp.lz
diff --git a/gfx/pics/201q/bitmask.asm b/gfx/pics/unown_q/bitmask.asm
similarity index 100%
rename from gfx/pics/201q/bitmask.asm
rename to gfx/pics/unown_q/bitmask.asm
diff --git a/gfx/pics/201q/frames.asm b/gfx/pics/unown_q/frames.asm
similarity index 100%
rename from gfx/pics/201q/frames.asm
rename to gfx/pics/unown_q/frames.asm
diff --git a/gfx/pics/201q/front.lz b/gfx/pics/unown_q/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201q/front.lz
rename to gfx/pics/unown_q/front.5x5.2bpp.lz
diff --git a/gfx/pics/201r/anim0.asm b/gfx/pics/unown_r/anim0.asm
similarity index 100%
rename from gfx/pics/201r/anim0.asm
rename to gfx/pics/unown_r/anim0.asm
diff --git a/gfx/pics/201r/anim1.asm b/gfx/pics/unown_r/anim1.asm
similarity index 100%
rename from gfx/pics/201r/anim1.asm
rename to gfx/pics/unown_r/anim1.asm
diff --git a/gfx/pics/201r/back.lz b/gfx/pics/unown_r/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201r/back.lz
rename to gfx/pics/unown_r/back.6x6.2bpp.lz
diff --git a/gfx/pics/201r/bitmask.asm b/gfx/pics/unown_r/bitmask.asm
similarity index 100%
rename from gfx/pics/201r/bitmask.asm
rename to gfx/pics/unown_r/bitmask.asm
diff --git a/gfx/pics/201r/frames.asm b/gfx/pics/unown_r/frames.asm
similarity index 100%
rename from gfx/pics/201r/frames.asm
rename to gfx/pics/unown_r/frames.asm
diff --git a/gfx/pics/201r/front.lz b/gfx/pics/unown_r/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201r/front.lz
rename to gfx/pics/unown_r/front.5x5.2bpp.lz
diff --git a/gfx/pics/201s/anim0.asm b/gfx/pics/unown_s/anim0.asm
similarity index 100%
rename from gfx/pics/201s/anim0.asm
rename to gfx/pics/unown_s/anim0.asm
diff --git a/gfx/pics/201s/anim1.asm b/gfx/pics/unown_s/anim1.asm
similarity index 100%
rename from gfx/pics/201s/anim1.asm
rename to gfx/pics/unown_s/anim1.asm
diff --git a/gfx/pics/201s/back.lz b/gfx/pics/unown_s/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201s/back.lz
rename to gfx/pics/unown_s/back.6x6.2bpp.lz
diff --git a/gfx/pics/201s/bitmask.asm b/gfx/pics/unown_s/bitmask.asm
similarity index 100%
rename from gfx/pics/201s/bitmask.asm
rename to gfx/pics/unown_s/bitmask.asm
diff --git a/gfx/pics/201s/frames.asm b/gfx/pics/unown_s/frames.asm
similarity index 100%
rename from gfx/pics/201s/frames.asm
rename to gfx/pics/unown_s/frames.asm
diff --git a/gfx/pics/201s/front.lz b/gfx/pics/unown_s/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201s/front.lz
rename to gfx/pics/unown_s/front.5x5.2bpp.lz
diff --git a/gfx/pics/201t/anim0.asm b/gfx/pics/unown_t/anim0.asm
similarity index 100%
rename from gfx/pics/201t/anim0.asm
rename to gfx/pics/unown_t/anim0.asm
diff --git a/gfx/pics/201t/anim1.asm b/gfx/pics/unown_t/anim1.asm
similarity index 100%
rename from gfx/pics/201t/anim1.asm
rename to gfx/pics/unown_t/anim1.asm
diff --git a/gfx/pics/201t/back.lz b/gfx/pics/unown_t/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201t/back.lz
rename to gfx/pics/unown_t/back.6x6.2bpp.lz
diff --git a/gfx/pics/201t/bitmask.asm b/gfx/pics/unown_t/bitmask.asm
similarity index 100%
rename from gfx/pics/201t/bitmask.asm
rename to gfx/pics/unown_t/bitmask.asm
diff --git a/gfx/pics/201t/frames.asm b/gfx/pics/unown_t/frames.asm
similarity index 100%
rename from gfx/pics/201t/frames.asm
rename to gfx/pics/unown_t/frames.asm
diff --git a/gfx/pics/201t/front.lz b/gfx/pics/unown_t/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201t/front.lz
rename to gfx/pics/unown_t/front.5x5.2bpp.lz
diff --git a/gfx/pics/201u/anim0.asm b/gfx/pics/unown_u/anim0.asm
similarity index 100%
rename from gfx/pics/201u/anim0.asm
rename to gfx/pics/unown_u/anim0.asm
diff --git a/gfx/pics/201u/anim1.asm b/gfx/pics/unown_u/anim1.asm
similarity index 100%
rename from gfx/pics/201u/anim1.asm
rename to gfx/pics/unown_u/anim1.asm
diff --git a/gfx/pics/201u/back.lz b/gfx/pics/unown_u/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201u/back.lz
rename to gfx/pics/unown_u/back.6x6.2bpp.lz
diff --git a/gfx/pics/201u/bitmask.asm b/gfx/pics/unown_u/bitmask.asm
similarity index 100%
rename from gfx/pics/201u/bitmask.asm
rename to gfx/pics/unown_u/bitmask.asm
diff --git a/gfx/pics/201u/frames.asm b/gfx/pics/unown_u/frames.asm
similarity index 100%
rename from gfx/pics/201u/frames.asm
rename to gfx/pics/unown_u/frames.asm
diff --git a/gfx/pics/201u/front.lz b/gfx/pics/unown_u/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201u/front.lz
rename to gfx/pics/unown_u/front.5x5.2bpp.lz
diff --git a/gfx/pics/201v/anim0.asm b/gfx/pics/unown_v/anim0.asm
similarity index 100%
rename from gfx/pics/201v/anim0.asm
rename to gfx/pics/unown_v/anim0.asm
diff --git a/gfx/pics/201v/anim1.asm b/gfx/pics/unown_v/anim1.asm
similarity index 100%
rename from gfx/pics/201v/anim1.asm
rename to gfx/pics/unown_v/anim1.asm
diff --git a/gfx/pics/201v/back.lz b/gfx/pics/unown_v/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201v/back.lz
rename to gfx/pics/unown_v/back.6x6.2bpp.lz
diff --git a/gfx/pics/201v/bitmask.asm b/gfx/pics/unown_v/bitmask.asm
similarity index 100%
rename from gfx/pics/201v/bitmask.asm
rename to gfx/pics/unown_v/bitmask.asm
diff --git a/gfx/pics/201v/frames.asm b/gfx/pics/unown_v/frames.asm
similarity index 100%
rename from gfx/pics/201v/frames.asm
rename to gfx/pics/unown_v/frames.asm
diff --git a/gfx/pics/201v/front.lz b/gfx/pics/unown_v/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201v/front.lz
rename to gfx/pics/unown_v/front.5x5.2bpp.lz
diff --git a/gfx/pics/201w/anim0.asm b/gfx/pics/unown_w/anim0.asm
similarity index 100%
rename from gfx/pics/201w/anim0.asm
rename to gfx/pics/unown_w/anim0.asm
diff --git a/gfx/pics/201w/anim1.asm b/gfx/pics/unown_w/anim1.asm
similarity index 100%
rename from gfx/pics/201w/anim1.asm
rename to gfx/pics/unown_w/anim1.asm
diff --git a/gfx/pics/201w/back.lz b/gfx/pics/unown_w/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201w/back.lz
rename to gfx/pics/unown_w/back.6x6.2bpp.lz
diff --git a/gfx/pics/201w/bitmask.asm b/gfx/pics/unown_w/bitmask.asm
similarity index 100%
rename from gfx/pics/201w/bitmask.asm
rename to gfx/pics/unown_w/bitmask.asm
diff --git a/gfx/pics/201w/frames.asm b/gfx/pics/unown_w/frames.asm
similarity index 100%
rename from gfx/pics/201w/frames.asm
rename to gfx/pics/unown_w/frames.asm
diff --git a/gfx/pics/201w/front.lz b/gfx/pics/unown_w/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201w/front.lz
rename to gfx/pics/unown_w/front.5x5.2bpp.lz
diff --git a/gfx/pics/201x/anim0.asm b/gfx/pics/unown_x/anim0.asm
similarity index 100%
rename from gfx/pics/201x/anim0.asm
rename to gfx/pics/unown_x/anim0.asm
diff --git a/gfx/pics/201x/anim1.asm b/gfx/pics/unown_x/anim1.asm
similarity index 100%
rename from gfx/pics/201x/anim1.asm
rename to gfx/pics/unown_x/anim1.asm
diff --git a/gfx/pics/201x/back.lz b/gfx/pics/unown_x/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201x/back.lz
rename to gfx/pics/unown_x/back.6x6.2bpp.lz
diff --git a/gfx/pics/201x/bitmask.asm b/gfx/pics/unown_x/bitmask.asm
similarity index 100%
rename from gfx/pics/201x/bitmask.asm
rename to gfx/pics/unown_x/bitmask.asm
diff --git a/gfx/pics/201x/frames.asm b/gfx/pics/unown_x/frames.asm
similarity index 100%
rename from gfx/pics/201x/frames.asm
rename to gfx/pics/unown_x/frames.asm
diff --git a/gfx/pics/201x/front.lz b/gfx/pics/unown_x/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201x/front.lz
rename to gfx/pics/unown_x/front.5x5.2bpp.lz
diff --git a/gfx/pics/201y/anim0.asm b/gfx/pics/unown_y/anim0.asm
similarity index 100%
rename from gfx/pics/201y/anim0.asm
rename to gfx/pics/unown_y/anim0.asm
diff --git a/gfx/pics/201y/anim1.asm b/gfx/pics/unown_y/anim1.asm
similarity index 100%
rename from gfx/pics/201y/anim1.asm
rename to gfx/pics/unown_y/anim1.asm
diff --git a/gfx/pics/201y/back.lz b/gfx/pics/unown_y/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201y/back.lz
rename to gfx/pics/unown_y/back.6x6.2bpp.lz
diff --git a/gfx/pics/201y/bitmask.asm b/gfx/pics/unown_y/bitmask.asm
similarity index 100%
rename from gfx/pics/201y/bitmask.asm
rename to gfx/pics/unown_y/bitmask.asm
diff --git a/gfx/pics/201y/frames.asm b/gfx/pics/unown_y/frames.asm
similarity index 100%
rename from gfx/pics/201y/frames.asm
rename to gfx/pics/unown_y/frames.asm
diff --git a/gfx/pics/201y/front.lz b/gfx/pics/unown_y/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201y/front.lz
rename to gfx/pics/unown_y/front.5x5.2bpp.lz
diff --git a/gfx/pics/201z/anim0.asm b/gfx/pics/unown_z/anim0.asm
similarity index 100%
rename from gfx/pics/201z/anim0.asm
rename to gfx/pics/unown_z/anim0.asm
diff --git a/gfx/pics/201z/anim1.asm b/gfx/pics/unown_z/anim1.asm
similarity index 100%
rename from gfx/pics/201z/anim1.asm
rename to gfx/pics/unown_z/anim1.asm
diff --git a/gfx/pics/201z/back.lz b/gfx/pics/unown_z/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/201z/back.lz
rename to gfx/pics/unown_z/back.6x6.2bpp.lz
diff --git a/gfx/pics/201z/bitmask.asm b/gfx/pics/unown_z/bitmask.asm
similarity index 100%
rename from gfx/pics/201z/bitmask.asm
rename to gfx/pics/unown_z/bitmask.asm
diff --git a/gfx/pics/201z/frames.asm b/gfx/pics/unown_z/frames.asm
similarity index 100%
rename from gfx/pics/201z/frames.asm
rename to gfx/pics/unown_z/frames.asm
diff --git a/gfx/pics/201z/front.lz b/gfx/pics/unown_z/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/201z/front.lz
rename to gfx/pics/unown_z/front.5x5.2bpp.lz
diff --git a/gfx/pics/217/anim0.asm b/gfx/pics/ursaring/anim0.asm
similarity index 100%
rename from gfx/pics/217/anim0.asm
rename to gfx/pics/ursaring/anim0.asm
diff --git a/gfx/pics/217/anim1.asm b/gfx/pics/ursaring/anim1.asm
similarity index 100%
rename from gfx/pics/217/anim1.asm
rename to gfx/pics/ursaring/anim1.asm
diff --git a/gfx/pics/217/back.lz b/gfx/pics/ursaring/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/217/back.lz
rename to gfx/pics/ursaring/back.6x6.2bpp.lz
diff --git a/gfx/pics/217/bitmask.asm b/gfx/pics/ursaring/bitmask.asm
similarity index 100%
rename from gfx/pics/217/bitmask.asm
rename to gfx/pics/ursaring/bitmask.asm
diff --git a/gfx/pics/217/frames.asm b/gfx/pics/ursaring/frames.asm
similarity index 100%
rename from gfx/pics/217/frames.asm
rename to gfx/pics/ursaring/frames.asm
diff --git a/gfx/pics/217/front.lz b/gfx/pics/ursaring/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/217/front.lz
rename to gfx/pics/ursaring/front.7x7.2bpp.lz
diff --git a/gfx/pics/217/normal.pal b/gfx/pics/ursaring/normal.pal
similarity index 100%
rename from gfx/pics/217/normal.pal
rename to gfx/pics/ursaring/normal.pal
diff --git a/gfx/pics/217/shiny.pal b/gfx/pics/ursaring/shiny.pal
similarity index 100%
rename from gfx/pics/217/shiny.pal
rename to gfx/pics/ursaring/shiny.pal
diff --git a/gfx/pics/134/anim0.asm b/gfx/pics/vaporeon/anim0.asm
similarity index 100%
rename from gfx/pics/134/anim0.asm
rename to gfx/pics/vaporeon/anim0.asm
diff --git a/gfx/pics/134/anim1.asm b/gfx/pics/vaporeon/anim1.asm
similarity index 100%
rename from gfx/pics/134/anim1.asm
rename to gfx/pics/vaporeon/anim1.asm
diff --git a/gfx/pics/134/back.lz b/gfx/pics/vaporeon/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/134/back.lz
rename to gfx/pics/vaporeon/back.6x6.2bpp.lz
diff --git a/gfx/pics/134/bitmask.asm b/gfx/pics/vaporeon/bitmask.asm
similarity index 100%
rename from gfx/pics/134/bitmask.asm
rename to gfx/pics/vaporeon/bitmask.asm
diff --git a/gfx/pics/134/frames.asm b/gfx/pics/vaporeon/frames.asm
similarity index 100%
rename from gfx/pics/134/frames.asm
rename to gfx/pics/vaporeon/frames.asm
diff --git a/gfx/pics/134/front.lz b/gfx/pics/vaporeon/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/134/front.lz
rename to gfx/pics/vaporeon/front.6x6.2bpp.lz
diff --git a/gfx/pics/134/normal.pal b/gfx/pics/vaporeon/normal.pal
similarity index 100%
rename from gfx/pics/134/normal.pal
rename to gfx/pics/vaporeon/normal.pal
diff --git a/gfx/pics/134/shiny.pal b/gfx/pics/vaporeon/shiny.pal
similarity index 100%
rename from gfx/pics/134/shiny.pal
rename to gfx/pics/vaporeon/shiny.pal
diff --git a/gfx/pics/049/anim0.asm b/gfx/pics/venomoth/anim0.asm
similarity index 100%
rename from gfx/pics/049/anim0.asm
rename to gfx/pics/venomoth/anim0.asm
diff --git a/gfx/pics/049/anim1.asm b/gfx/pics/venomoth/anim1.asm
similarity index 100%
rename from gfx/pics/049/anim1.asm
rename to gfx/pics/venomoth/anim1.asm
diff --git a/gfx/pics/049/back.lz b/gfx/pics/venomoth/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/049/back.lz
rename to gfx/pics/venomoth/back.6x6.2bpp.lz
diff --git a/gfx/pics/049/bitmask.asm b/gfx/pics/venomoth/bitmask.asm
similarity index 100%
rename from gfx/pics/049/bitmask.asm
rename to gfx/pics/venomoth/bitmask.asm
diff --git a/gfx/pics/049/frames.asm b/gfx/pics/venomoth/frames.asm
similarity index 100%
rename from gfx/pics/049/frames.asm
rename to gfx/pics/venomoth/frames.asm
diff --git a/gfx/pics/049/front.lz b/gfx/pics/venomoth/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/049/front.lz
rename to gfx/pics/venomoth/front.7x7.2bpp.lz
diff --git a/gfx/pics/049/normal.pal b/gfx/pics/venomoth/normal.pal
similarity index 100%
rename from gfx/pics/049/normal.pal
rename to gfx/pics/venomoth/normal.pal
diff --git a/gfx/pics/049/shiny.pal b/gfx/pics/venomoth/shiny.pal
similarity index 100%
rename from gfx/pics/049/shiny.pal
rename to gfx/pics/venomoth/shiny.pal
diff --git a/gfx/pics/048/anim0.asm b/gfx/pics/venonat/anim0.asm
similarity index 100%
rename from gfx/pics/048/anim0.asm
rename to gfx/pics/venonat/anim0.asm
diff --git a/gfx/pics/048/anim1.asm b/gfx/pics/venonat/anim1.asm
similarity index 100%
rename from gfx/pics/048/anim1.asm
rename to gfx/pics/venonat/anim1.asm
diff --git a/gfx/pics/048/back.lz b/gfx/pics/venonat/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/048/back.lz
rename to gfx/pics/venonat/back.6x6.2bpp.lz
diff --git a/gfx/pics/048/bitmask.asm b/gfx/pics/venonat/bitmask.asm
similarity index 100%
rename from gfx/pics/048/bitmask.asm
rename to gfx/pics/venonat/bitmask.asm
diff --git a/gfx/pics/048/frames.asm b/gfx/pics/venonat/frames.asm
similarity index 100%
rename from gfx/pics/048/frames.asm
rename to gfx/pics/venonat/frames.asm
diff --git a/gfx/pics/048/front.lz b/gfx/pics/venonat/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/048/front.lz
rename to gfx/pics/venonat/front.5x5.2bpp.lz
diff --git a/gfx/pics/048/normal.pal b/gfx/pics/venonat/normal.pal
similarity index 100%
rename from gfx/pics/048/normal.pal
rename to gfx/pics/venonat/normal.pal
diff --git a/gfx/pics/048/shiny.pal b/gfx/pics/venonat/shiny.pal
similarity index 100%
rename from gfx/pics/048/shiny.pal
rename to gfx/pics/venonat/shiny.pal
diff --git a/gfx/pics/003/anim0.asm b/gfx/pics/venusaur/anim0.asm
similarity index 100%
rename from gfx/pics/003/anim0.asm
rename to gfx/pics/venusaur/anim0.asm
diff --git a/gfx/pics/003/anim1.asm b/gfx/pics/venusaur/anim1.asm
similarity index 100%
rename from gfx/pics/003/anim1.asm
rename to gfx/pics/venusaur/anim1.asm
diff --git a/gfx/pics/003/back.lz b/gfx/pics/venusaur/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/003/back.lz
rename to gfx/pics/venusaur/back.6x6.2bpp.lz
diff --git a/gfx/pics/003/bitmask.asm b/gfx/pics/venusaur/bitmask.asm
similarity index 100%
rename from gfx/pics/003/bitmask.asm
rename to gfx/pics/venusaur/bitmask.asm
diff --git a/gfx/pics/003/frames.asm b/gfx/pics/venusaur/frames.asm
similarity index 100%
rename from gfx/pics/003/frames.asm
rename to gfx/pics/venusaur/frames.asm
diff --git a/gfx/pics/003/front.lz b/gfx/pics/venusaur/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/003/front.lz
rename to gfx/pics/venusaur/front.7x7.2bpp.lz
diff --git a/gfx/pics/003/normal.pal b/gfx/pics/venusaur/normal.pal
similarity index 100%
rename from gfx/pics/003/normal.pal
rename to gfx/pics/venusaur/normal.pal
diff --git a/gfx/pics/003/shiny.pal b/gfx/pics/venusaur/shiny.pal
similarity index 100%
rename from gfx/pics/003/shiny.pal
rename to gfx/pics/venusaur/shiny.pal
diff --git a/gfx/pics/071/anim0.asm b/gfx/pics/victreebel/anim0.asm
similarity index 100%
rename from gfx/pics/071/anim0.asm
rename to gfx/pics/victreebel/anim0.asm
diff --git a/gfx/pics/071/anim1.asm b/gfx/pics/victreebel/anim1.asm
similarity index 100%
rename from gfx/pics/071/anim1.asm
rename to gfx/pics/victreebel/anim1.asm
diff --git a/gfx/pics/071/back.lz b/gfx/pics/victreebel/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/071/back.lz
rename to gfx/pics/victreebel/back.6x6.2bpp.lz
diff --git a/gfx/pics/071/bitmask.asm b/gfx/pics/victreebel/bitmask.asm
similarity index 100%
rename from gfx/pics/071/bitmask.asm
rename to gfx/pics/victreebel/bitmask.asm
diff --git a/gfx/pics/071/frames.asm b/gfx/pics/victreebel/frames.asm
similarity index 100%
rename from gfx/pics/071/frames.asm
rename to gfx/pics/victreebel/frames.asm
diff --git a/gfx/pics/071/front.lz b/gfx/pics/victreebel/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/071/front.lz
rename to gfx/pics/victreebel/front.7x7.2bpp.lz
diff --git a/gfx/pics/071/normal.pal b/gfx/pics/victreebel/normal.pal
similarity index 100%
rename from gfx/pics/071/normal.pal
rename to gfx/pics/victreebel/normal.pal
diff --git a/gfx/pics/071/shiny.pal b/gfx/pics/victreebel/shiny.pal
similarity index 100%
rename from gfx/pics/071/shiny.pal
rename to gfx/pics/victreebel/shiny.pal
diff --git a/gfx/pics/045/anim0.asm b/gfx/pics/vileplume/anim0.asm
similarity index 100%
rename from gfx/pics/045/anim0.asm
rename to gfx/pics/vileplume/anim0.asm
diff --git a/gfx/pics/045/anim1.asm b/gfx/pics/vileplume/anim1.asm
similarity index 100%
rename from gfx/pics/045/anim1.asm
rename to gfx/pics/vileplume/anim1.asm
diff --git a/gfx/pics/045/back.lz b/gfx/pics/vileplume/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/045/back.lz
rename to gfx/pics/vileplume/back.6x6.2bpp.lz
diff --git a/gfx/pics/045/bitmask.asm b/gfx/pics/vileplume/bitmask.asm
similarity index 100%
rename from gfx/pics/045/bitmask.asm
rename to gfx/pics/vileplume/bitmask.asm
diff --git a/gfx/pics/045/frames.asm b/gfx/pics/vileplume/frames.asm
similarity index 100%
rename from gfx/pics/045/frames.asm
rename to gfx/pics/vileplume/frames.asm
diff --git a/gfx/pics/045/front.lz b/gfx/pics/vileplume/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/045/front.lz
rename to gfx/pics/vileplume/front.7x7.2bpp.lz
diff --git a/gfx/pics/045/normal.pal b/gfx/pics/vileplume/normal.pal
similarity index 100%
rename from gfx/pics/045/normal.pal
rename to gfx/pics/vileplume/normal.pal
diff --git a/gfx/pics/045/shiny.pal b/gfx/pics/vileplume/shiny.pal
similarity index 100%
rename from gfx/pics/045/shiny.pal
rename to gfx/pics/vileplume/shiny.pal
diff --git a/gfx/pics/100/anim0.asm b/gfx/pics/voltorb/anim0.asm
similarity index 100%
rename from gfx/pics/100/anim0.asm
rename to gfx/pics/voltorb/anim0.asm
diff --git a/gfx/pics/100/anim1.asm b/gfx/pics/voltorb/anim1.asm
similarity index 100%
rename from gfx/pics/100/anim1.asm
rename to gfx/pics/voltorb/anim1.asm
diff --git a/gfx/pics/100/back.lz b/gfx/pics/voltorb/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/100/back.lz
rename to gfx/pics/voltorb/back.6x6.2bpp.lz
diff --git a/gfx/pics/100/bitmask.asm b/gfx/pics/voltorb/bitmask.asm
similarity index 100%
rename from gfx/pics/100/bitmask.asm
rename to gfx/pics/voltorb/bitmask.asm
diff --git a/gfx/pics/100/frames.asm b/gfx/pics/voltorb/frames.asm
similarity index 100%
rename from gfx/pics/100/frames.asm
rename to gfx/pics/voltorb/frames.asm
diff --git a/gfx/pics/100/front.lz b/gfx/pics/voltorb/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/100/front.lz
rename to gfx/pics/voltorb/front.5x5.2bpp.lz
diff --git a/gfx/pics/101/normal.pal b/gfx/pics/voltorb/normal.pal
similarity index 100%
rename from gfx/pics/101/normal.pal
rename to gfx/pics/voltorb/normal.pal
diff --git a/gfx/pics/101/shiny.pal b/gfx/pics/voltorb/shiny.pal
similarity index 100%
rename from gfx/pics/101/shiny.pal
rename to gfx/pics/voltorb/shiny.pal
diff --git a/gfx/pics/037/anim0.asm b/gfx/pics/vulpix/anim0.asm
similarity index 100%
rename from gfx/pics/037/anim0.asm
rename to gfx/pics/vulpix/anim0.asm
diff --git a/gfx/pics/037/anim1.asm b/gfx/pics/vulpix/anim1.asm
similarity index 100%
rename from gfx/pics/037/anim1.asm
rename to gfx/pics/vulpix/anim1.asm
diff --git a/gfx/pics/037/back.lz b/gfx/pics/vulpix/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/037/back.lz
rename to gfx/pics/vulpix/back.6x6.2bpp.lz
diff --git a/gfx/pics/037/bitmask.asm b/gfx/pics/vulpix/bitmask.asm
similarity index 100%
rename from gfx/pics/037/bitmask.asm
rename to gfx/pics/vulpix/bitmask.asm
diff --git a/gfx/pics/037/frames.asm b/gfx/pics/vulpix/frames.asm
similarity index 100%
rename from gfx/pics/037/frames.asm
rename to gfx/pics/vulpix/frames.asm
diff --git a/gfx/pics/037/front.lz b/gfx/pics/vulpix/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/037/front.lz
rename to gfx/pics/vulpix/front.6x6.2bpp.lz
diff --git a/gfx/pics/037/normal.pal b/gfx/pics/vulpix/normal.pal
similarity index 100%
rename from gfx/pics/037/normal.pal
rename to gfx/pics/vulpix/normal.pal
diff --git a/gfx/pics/037/shiny.pal b/gfx/pics/vulpix/shiny.pal
similarity index 100%
rename from gfx/pics/037/shiny.pal
rename to gfx/pics/vulpix/shiny.pal
diff --git a/gfx/pics/008/anim0.asm b/gfx/pics/wartortle/anim0.asm
similarity index 100%
rename from gfx/pics/008/anim0.asm
rename to gfx/pics/wartortle/anim0.asm
diff --git a/gfx/pics/008/anim1.asm b/gfx/pics/wartortle/anim1.asm
similarity index 100%
rename from gfx/pics/008/anim1.asm
rename to gfx/pics/wartortle/anim1.asm
diff --git a/gfx/pics/008/back.lz b/gfx/pics/wartortle/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/008/back.lz
rename to gfx/pics/wartortle/back.6x6.2bpp.lz
diff --git a/gfx/pics/008/bitmask.asm b/gfx/pics/wartortle/bitmask.asm
similarity index 100%
rename from gfx/pics/008/bitmask.asm
rename to gfx/pics/wartortle/bitmask.asm
diff --git a/gfx/pics/008/frames.asm b/gfx/pics/wartortle/frames.asm
similarity index 100%
rename from gfx/pics/008/frames.asm
rename to gfx/pics/wartortle/frames.asm
diff --git a/gfx/pics/008/front.lz b/gfx/pics/wartortle/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/008/front.lz
rename to gfx/pics/wartortle/front.6x6.2bpp.lz
diff --git a/gfx/pics/008/normal.pal b/gfx/pics/wartortle/normal.pal
similarity index 100%
rename from gfx/pics/008/normal.pal
rename to gfx/pics/wartortle/normal.pal
diff --git a/gfx/pics/008/shiny.pal b/gfx/pics/wartortle/shiny.pal
similarity index 100%
rename from gfx/pics/008/shiny.pal
rename to gfx/pics/wartortle/shiny.pal
diff --git a/gfx/pics/013/anim0.asm b/gfx/pics/weedle/anim0.asm
similarity index 100%
rename from gfx/pics/013/anim0.asm
rename to gfx/pics/weedle/anim0.asm
diff --git a/gfx/pics/013/anim1.asm b/gfx/pics/weedle/anim1.asm
similarity index 100%
rename from gfx/pics/013/anim1.asm
rename to gfx/pics/weedle/anim1.asm
diff --git a/gfx/pics/013/back.lz b/gfx/pics/weedle/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/013/back.lz
rename to gfx/pics/weedle/back.6x6.2bpp.lz
diff --git a/gfx/pics/013/bitmask.asm b/gfx/pics/weedle/bitmask.asm
similarity index 100%
rename from gfx/pics/013/bitmask.asm
rename to gfx/pics/weedle/bitmask.asm
diff --git a/gfx/pics/013/frames.asm b/gfx/pics/weedle/frames.asm
similarity index 100%
rename from gfx/pics/013/frames.asm
rename to gfx/pics/weedle/frames.asm
diff --git a/gfx/pics/013/front.lz b/gfx/pics/weedle/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/013/front.lz
rename to gfx/pics/weedle/front.5x5.2bpp.lz
diff --git a/gfx/pics/013/normal.pal b/gfx/pics/weedle/normal.pal
similarity index 100%
rename from gfx/pics/013/normal.pal
rename to gfx/pics/weedle/normal.pal
diff --git a/gfx/pics/013/shiny.pal b/gfx/pics/weedle/shiny.pal
similarity index 100%
rename from gfx/pics/013/shiny.pal
rename to gfx/pics/weedle/shiny.pal
diff --git a/gfx/pics/070/anim0.asm b/gfx/pics/weepinbell/anim0.asm
similarity index 100%
rename from gfx/pics/070/anim0.asm
rename to gfx/pics/weepinbell/anim0.asm
diff --git a/gfx/pics/070/anim1.asm b/gfx/pics/weepinbell/anim1.asm
similarity index 100%
rename from gfx/pics/070/anim1.asm
rename to gfx/pics/weepinbell/anim1.asm
diff --git a/gfx/pics/070/back.lz b/gfx/pics/weepinbell/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/070/back.lz
rename to gfx/pics/weepinbell/back.6x6.2bpp.lz
diff --git a/gfx/pics/070/bitmask.asm b/gfx/pics/weepinbell/bitmask.asm
similarity index 100%
rename from gfx/pics/070/bitmask.asm
rename to gfx/pics/weepinbell/bitmask.asm
diff --git a/gfx/pics/070/frames.asm b/gfx/pics/weepinbell/frames.asm
similarity index 100%
rename from gfx/pics/070/frames.asm
rename to gfx/pics/weepinbell/frames.asm
diff --git a/gfx/pics/070/front.lz b/gfx/pics/weepinbell/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/070/front.lz
rename to gfx/pics/weepinbell/front.6x6.2bpp.lz
diff --git a/gfx/pics/070/normal.pal b/gfx/pics/weepinbell/normal.pal
similarity index 100%
rename from gfx/pics/070/normal.pal
rename to gfx/pics/weepinbell/normal.pal
diff --git a/gfx/pics/070/shiny.pal b/gfx/pics/weepinbell/shiny.pal
similarity index 100%
rename from gfx/pics/070/shiny.pal
rename to gfx/pics/weepinbell/shiny.pal
diff --git a/gfx/pics/110/anim0.asm b/gfx/pics/weezing/anim0.asm
similarity index 100%
rename from gfx/pics/110/anim0.asm
rename to gfx/pics/weezing/anim0.asm
diff --git a/gfx/pics/110/anim1.asm b/gfx/pics/weezing/anim1.asm
similarity index 100%
rename from gfx/pics/110/anim1.asm
rename to gfx/pics/weezing/anim1.asm
diff --git a/gfx/pics/110/back.lz b/gfx/pics/weezing/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/110/back.lz
rename to gfx/pics/weezing/back.6x6.2bpp.lz
diff --git a/gfx/pics/110/bitmask.asm b/gfx/pics/weezing/bitmask.asm
similarity index 100%
rename from gfx/pics/110/bitmask.asm
rename to gfx/pics/weezing/bitmask.asm
diff --git a/gfx/pics/110/frames.asm b/gfx/pics/weezing/frames.asm
similarity index 100%
rename from gfx/pics/110/frames.asm
rename to gfx/pics/weezing/frames.asm
diff --git a/gfx/pics/110/front.lz b/gfx/pics/weezing/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/110/front.lz
rename to gfx/pics/weezing/front.7x7.2bpp.lz
diff --git a/gfx/pics/110/normal.pal b/gfx/pics/weezing/normal.pal
similarity index 100%
rename from gfx/pics/110/normal.pal
rename to gfx/pics/weezing/normal.pal
diff --git a/gfx/pics/110/shiny.pal b/gfx/pics/weezing/shiny.pal
similarity index 100%
rename from gfx/pics/110/shiny.pal
rename to gfx/pics/weezing/shiny.pal
diff --git a/gfx/pics/040/anim0.asm b/gfx/pics/wigglytuff/anim0.asm
similarity index 100%
rename from gfx/pics/040/anim0.asm
rename to gfx/pics/wigglytuff/anim0.asm
diff --git a/gfx/pics/040/anim1.asm b/gfx/pics/wigglytuff/anim1.asm
similarity index 100%
rename from gfx/pics/040/anim1.asm
rename to gfx/pics/wigglytuff/anim1.asm
diff --git a/gfx/pics/040/back.lz b/gfx/pics/wigglytuff/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/040/back.lz
rename to gfx/pics/wigglytuff/back.6x6.2bpp.lz
diff --git a/gfx/pics/040/bitmask.asm b/gfx/pics/wigglytuff/bitmask.asm
similarity index 100%
rename from gfx/pics/040/bitmask.asm
rename to gfx/pics/wigglytuff/bitmask.asm
diff --git a/gfx/pics/040/frames.asm b/gfx/pics/wigglytuff/frames.asm
similarity index 100%
rename from gfx/pics/040/frames.asm
rename to gfx/pics/wigglytuff/frames.asm
diff --git a/gfx/pics/040/front.lz b/gfx/pics/wigglytuff/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/040/front.lz
rename to gfx/pics/wigglytuff/front.6x6.2bpp.lz
diff --git a/gfx/pics/040/normal.pal b/gfx/pics/wigglytuff/normal.pal
similarity index 100%
rename from gfx/pics/040/normal.pal
rename to gfx/pics/wigglytuff/normal.pal
diff --git a/gfx/pics/174/shiny.pal b/gfx/pics/wigglytuff/shiny.pal
similarity index 100%
rename from gfx/pics/174/shiny.pal
rename to gfx/pics/wigglytuff/shiny.pal
diff --git a/gfx/pics/202/anim0.asm b/gfx/pics/wobbuffet/anim0.asm
similarity index 100%
rename from gfx/pics/202/anim0.asm
rename to gfx/pics/wobbuffet/anim0.asm
diff --git a/gfx/pics/202/anim1.asm b/gfx/pics/wobbuffet/anim1.asm
similarity index 100%
rename from gfx/pics/202/anim1.asm
rename to gfx/pics/wobbuffet/anim1.asm
diff --git a/gfx/pics/202/back.lz b/gfx/pics/wobbuffet/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/202/back.lz
rename to gfx/pics/wobbuffet/back.6x6.2bpp.lz
diff --git a/gfx/pics/202/bitmask.asm b/gfx/pics/wobbuffet/bitmask.asm
similarity index 100%
rename from gfx/pics/202/bitmask.asm
rename to gfx/pics/wobbuffet/bitmask.asm
diff --git a/gfx/pics/202/frames.asm b/gfx/pics/wobbuffet/frames.asm
similarity index 100%
rename from gfx/pics/202/frames.asm
rename to gfx/pics/wobbuffet/frames.asm
diff --git a/gfx/pics/202/front.lz b/gfx/pics/wobbuffet/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/202/front.lz
rename to gfx/pics/wobbuffet/front.6x6.2bpp.lz
diff --git a/gfx/pics/202/normal.pal b/gfx/pics/wobbuffet/normal.pal
similarity index 100%
rename from gfx/pics/202/normal.pal
rename to gfx/pics/wobbuffet/normal.pal
diff --git a/gfx/pics/202/shiny.pal b/gfx/pics/wobbuffet/shiny.pal
similarity index 100%
rename from gfx/pics/202/shiny.pal
rename to gfx/pics/wobbuffet/shiny.pal
diff --git a/gfx/pics/194/anim0.asm b/gfx/pics/wooper/anim0.asm
similarity index 100%
rename from gfx/pics/194/anim0.asm
rename to gfx/pics/wooper/anim0.asm
diff --git a/gfx/pics/194/anim1.asm b/gfx/pics/wooper/anim1.asm
similarity index 100%
rename from gfx/pics/194/anim1.asm
rename to gfx/pics/wooper/anim1.asm
diff --git a/gfx/pics/194/back.lz b/gfx/pics/wooper/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/194/back.lz
rename to gfx/pics/wooper/back.6x6.2bpp.lz
diff --git a/gfx/pics/194/bitmask.asm b/gfx/pics/wooper/bitmask.asm
similarity index 100%
rename from gfx/pics/194/bitmask.asm
rename to gfx/pics/wooper/bitmask.asm
diff --git a/gfx/pics/194/frames.asm b/gfx/pics/wooper/frames.asm
similarity index 100%
rename from gfx/pics/194/frames.asm
rename to gfx/pics/wooper/frames.asm
diff --git a/gfx/pics/194/front.lz b/gfx/pics/wooper/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/194/front.lz
rename to gfx/pics/wooper/front.5x5.2bpp.lz
diff --git a/gfx/pics/194/normal.pal b/gfx/pics/wooper/normal.pal
similarity index 100%
rename from gfx/pics/194/normal.pal
rename to gfx/pics/wooper/normal.pal
diff --git a/gfx/pics/194/shiny.pal b/gfx/pics/wooper/shiny.pal
similarity index 100%
rename from gfx/pics/194/shiny.pal
rename to gfx/pics/wooper/shiny.pal
diff --git a/gfx/pics/178/anim0.asm b/gfx/pics/xatu/anim0.asm
similarity index 100%
rename from gfx/pics/178/anim0.asm
rename to gfx/pics/xatu/anim0.asm
diff --git a/gfx/pics/178/anim1.asm b/gfx/pics/xatu/anim1.asm
similarity index 100%
rename from gfx/pics/178/anim1.asm
rename to gfx/pics/xatu/anim1.asm
diff --git a/gfx/pics/178/back.lz b/gfx/pics/xatu/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/178/back.lz
rename to gfx/pics/xatu/back.6x6.2bpp.lz
diff --git a/gfx/pics/178/bitmask.asm b/gfx/pics/xatu/bitmask.asm
similarity index 100%
rename from gfx/pics/178/bitmask.asm
rename to gfx/pics/xatu/bitmask.asm
diff --git a/gfx/pics/178/frames.asm b/gfx/pics/xatu/frames.asm
similarity index 100%
rename from gfx/pics/178/frames.asm
rename to gfx/pics/xatu/frames.asm
diff --git a/gfx/pics/178/front.lz b/gfx/pics/xatu/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/178/front.lz
rename to gfx/pics/xatu/front.6x6.2bpp.lz
diff --git a/gfx/pics/178/normal.pal b/gfx/pics/xatu/normal.pal
similarity index 100%
rename from gfx/pics/178/normal.pal
rename to gfx/pics/xatu/normal.pal
diff --git a/gfx/pics/178/shiny.pal b/gfx/pics/xatu/shiny.pal
similarity index 100%
rename from gfx/pics/178/shiny.pal
rename to gfx/pics/xatu/shiny.pal
diff --git a/gfx/pics/193/anim0.asm b/gfx/pics/yanma/anim0.asm
similarity index 100%
rename from gfx/pics/193/anim0.asm
rename to gfx/pics/yanma/anim0.asm
diff --git a/gfx/pics/193/anim1.asm b/gfx/pics/yanma/anim1.asm
similarity index 100%
rename from gfx/pics/193/anim1.asm
rename to gfx/pics/yanma/anim1.asm
diff --git a/gfx/pics/193/back.lz b/gfx/pics/yanma/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/193/back.lz
rename to gfx/pics/yanma/back.6x6.2bpp.lz
diff --git a/gfx/pics/193/bitmask.asm b/gfx/pics/yanma/bitmask.asm
similarity index 100%
rename from gfx/pics/193/bitmask.asm
rename to gfx/pics/yanma/bitmask.asm
diff --git a/gfx/pics/193/frames.asm b/gfx/pics/yanma/frames.asm
similarity index 100%
rename from gfx/pics/193/frames.asm
rename to gfx/pics/yanma/frames.asm
diff --git a/gfx/pics/193/front.lz b/gfx/pics/yanma/front.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/193/front.lz
rename to gfx/pics/yanma/front.6x6.2bpp.lz
diff --git a/gfx/pics/193/normal.pal b/gfx/pics/yanma/normal.pal
similarity index 100%
rename from gfx/pics/193/normal.pal
rename to gfx/pics/yanma/normal.pal
diff --git a/gfx/pics/193/shiny.pal b/gfx/pics/yanma/shiny.pal
similarity index 100%
rename from gfx/pics/193/shiny.pal
rename to gfx/pics/yanma/shiny.pal
diff --git a/gfx/pics/145/anim0.asm b/gfx/pics/zapdos/anim0.asm
similarity index 100%
rename from gfx/pics/145/anim0.asm
rename to gfx/pics/zapdos/anim0.asm
diff --git a/gfx/pics/145/anim1.asm b/gfx/pics/zapdos/anim1.asm
similarity index 100%
rename from gfx/pics/145/anim1.asm
rename to gfx/pics/zapdos/anim1.asm
diff --git a/gfx/pics/145/back.lz b/gfx/pics/zapdos/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/145/back.lz
rename to gfx/pics/zapdos/back.6x6.2bpp.lz
diff --git a/gfx/pics/145/bitmask.asm b/gfx/pics/zapdos/bitmask.asm
similarity index 100%
rename from gfx/pics/145/bitmask.asm
rename to gfx/pics/zapdos/bitmask.asm
diff --git a/gfx/pics/145/frames.asm b/gfx/pics/zapdos/frames.asm
similarity index 100%
rename from gfx/pics/145/frames.asm
rename to gfx/pics/zapdos/frames.asm
diff --git a/gfx/pics/145/front.lz b/gfx/pics/zapdos/front.7x7.2bpp.lz
similarity index 100%
rename from gfx/pics/145/front.lz
rename to gfx/pics/zapdos/front.7x7.2bpp.lz
diff --git a/gfx/pics/145/normal.pal b/gfx/pics/zapdos/normal.pal
similarity index 100%
rename from gfx/pics/145/normal.pal
rename to gfx/pics/zapdos/normal.pal
diff --git a/gfx/pics/145/shiny.pal b/gfx/pics/zapdos/shiny.pal
similarity index 100%
rename from gfx/pics/145/shiny.pal
rename to gfx/pics/zapdos/shiny.pal
diff --git a/gfx/pics/041/anim0.asm b/gfx/pics/zubat/anim0.asm
similarity index 100%
rename from gfx/pics/041/anim0.asm
rename to gfx/pics/zubat/anim0.asm
diff --git a/gfx/pics/041/anim1.asm b/gfx/pics/zubat/anim1.asm
similarity index 100%
rename from gfx/pics/041/anim1.asm
rename to gfx/pics/zubat/anim1.asm
diff --git a/gfx/pics/041/back.lz b/gfx/pics/zubat/back.6x6.2bpp.lz
similarity index 100%
rename from gfx/pics/041/back.lz
rename to gfx/pics/zubat/back.6x6.2bpp.lz
diff --git a/gfx/pics/041/bitmask.asm b/gfx/pics/zubat/bitmask.asm
similarity index 100%
rename from gfx/pics/041/bitmask.asm
rename to gfx/pics/zubat/bitmask.asm
diff --git a/gfx/pics/041/frames.asm b/gfx/pics/zubat/frames.asm
similarity index 100%
rename from gfx/pics/041/frames.asm
rename to gfx/pics/zubat/frames.asm
diff --git a/gfx/pics/041/front.lz b/gfx/pics/zubat/front.5x5.2bpp.lz
similarity index 100%
rename from gfx/pics/041/front.lz
rename to gfx/pics/zubat/front.5x5.2bpp.lz
diff --git a/gfx/pics/042/normal.pal b/gfx/pics/zubat/normal.pal
similarity index 100%
rename from gfx/pics/042/normal.pal
rename to gfx/pics/zubat/normal.pal
diff --git a/gfx/pics/041/shiny.pal b/gfx/pics/zubat/shiny.pal
similarity index 100%
rename from gfx/pics/041/shiny.pal
rename to gfx/pics/zubat/shiny.pal
diff --git a/gfx/tilesets/00.lz b/gfx/tilesets/00.2bpp.lz
similarity index 100%
rename from gfx/tilesets/00.lz
rename to gfx/tilesets/00.2bpp.lz
diff --git a/gfx/tilesets/01.lz b/gfx/tilesets/01.2bpp.lz
similarity index 100%
rename from gfx/tilesets/01.lz
rename to gfx/tilesets/01.2bpp.lz
diff --git a/gfx/tilesets/02.lz b/gfx/tilesets/02.2bpp.lz
similarity index 100%
rename from gfx/tilesets/02.lz
rename to gfx/tilesets/02.2bpp.lz
diff --git a/gfx/tilesets/03.lz b/gfx/tilesets/03.2bpp.lz
similarity index 100%
rename from gfx/tilesets/03.lz
rename to gfx/tilesets/03.2bpp.lz
diff --git a/gfx/tilesets/04.lz b/gfx/tilesets/04.2bpp.lz
similarity index 100%
rename from gfx/tilesets/04.lz
rename to gfx/tilesets/04.2bpp.lz
diff --git a/gfx/tilesets/05.lz b/gfx/tilesets/05.2bpp.lz
similarity index 100%
rename from gfx/tilesets/05.lz
rename to gfx/tilesets/05.2bpp.lz
diff --git a/gfx/tilesets/06.lz b/gfx/tilesets/06.2bpp.lz
similarity index 100%
rename from gfx/tilesets/06.lz
rename to gfx/tilesets/06.2bpp.lz
diff --git a/gfx/tilesets/07.lz b/gfx/tilesets/07.2bpp.lz
similarity index 100%
rename from gfx/tilesets/07.lz
rename to gfx/tilesets/07.2bpp.lz
diff --git a/gfx/tilesets/08.lz b/gfx/tilesets/08.2bpp.lz
similarity index 100%
rename from gfx/tilesets/08.lz
rename to gfx/tilesets/08.2bpp.lz
diff --git a/gfx/tilesets/09.lz b/gfx/tilesets/09.2bpp.lz
similarity index 100%
rename from gfx/tilesets/09.lz
rename to gfx/tilesets/09.2bpp.lz
diff --git a/gfx/tilesets/10.lz b/gfx/tilesets/10.2bpp.lz
similarity index 100%
rename from gfx/tilesets/10.lz
rename to gfx/tilesets/10.2bpp.lz
diff --git a/gfx/tilesets/11.lz b/gfx/tilesets/11.2bpp.lz
similarity index 100%
rename from gfx/tilesets/11.lz
rename to gfx/tilesets/11.2bpp.lz
diff --git a/gfx/tilesets/12.lz b/gfx/tilesets/12.2bpp.lz
similarity index 100%
rename from gfx/tilesets/12.lz
rename to gfx/tilesets/12.2bpp.lz
diff --git a/gfx/tilesets/13.lz b/gfx/tilesets/13.2bpp.lz
similarity index 100%
rename from gfx/tilesets/13.lz
rename to gfx/tilesets/13.2bpp.lz
diff --git a/gfx/tilesets/14.lz b/gfx/tilesets/14.2bpp.lz
similarity index 100%
rename from gfx/tilesets/14.lz
rename to gfx/tilesets/14.2bpp.lz
diff --git a/gfx/tilesets/15.lz b/gfx/tilesets/15.2bpp.lz
similarity index 100%
rename from gfx/tilesets/15.lz
rename to gfx/tilesets/15.2bpp.lz
diff --git a/gfx/tilesets/16.lz b/gfx/tilesets/16.2bpp.lz
similarity index 100%
rename from gfx/tilesets/16.lz
rename to gfx/tilesets/16.2bpp.lz
diff --git a/gfx/tilesets/17.lz b/gfx/tilesets/17.2bpp.lz
similarity index 100%
rename from gfx/tilesets/17.lz
rename to gfx/tilesets/17.2bpp.lz
diff --git a/gfx/tilesets/18.lz b/gfx/tilesets/18.2bpp.lz
similarity index 100%
rename from gfx/tilesets/18.lz
rename to gfx/tilesets/18.2bpp.lz
diff --git a/gfx/tilesets/19.lz b/gfx/tilesets/19.2bpp.lz
similarity index 100%
rename from gfx/tilesets/19.lz
rename to gfx/tilesets/19.2bpp.lz
diff --git a/gfx/tilesets/20.lz b/gfx/tilesets/20.2bpp.lz
similarity index 100%
rename from gfx/tilesets/20.lz
rename to gfx/tilesets/20.2bpp.lz
diff --git a/gfx/tilesets/21.lz b/gfx/tilesets/21.2bpp.lz
similarity index 100%
rename from gfx/tilesets/21.lz
rename to gfx/tilesets/21.2bpp.lz
diff --git a/gfx/tilesets/22.lz b/gfx/tilesets/22.2bpp.lz
similarity index 100%
rename from gfx/tilesets/22.lz
rename to gfx/tilesets/22.2bpp.lz
diff --git a/gfx/tilesets/23.lz b/gfx/tilesets/23.2bpp.lz
similarity index 100%
rename from gfx/tilesets/23.lz
rename to gfx/tilesets/23.2bpp.lz
diff --git a/gfx/tilesets/24.lz b/gfx/tilesets/24.2bpp.lz
similarity index 100%
rename from gfx/tilesets/24.lz
rename to gfx/tilesets/24.2bpp.lz
diff --git a/gfx/tilesets/25.lz b/gfx/tilesets/25.2bpp.lz
similarity index 100%
rename from gfx/tilesets/25.lz
rename to gfx/tilesets/25.2bpp.lz
diff --git a/gfx/tilesets/26.lz b/gfx/tilesets/26.2bpp.lz
similarity index 100%
rename from gfx/tilesets/26.lz
rename to gfx/tilesets/26.2bpp.lz
diff --git a/gfx/tilesets/27.lz b/gfx/tilesets/27.2bpp.lz
similarity index 100%
rename from gfx/tilesets/27.lz
rename to gfx/tilesets/27.2bpp.lz
diff --git a/gfx/tilesets/28.lz b/gfx/tilesets/28.2bpp.lz
similarity index 100%
rename from gfx/tilesets/28.lz
rename to gfx/tilesets/28.2bpp.lz
diff --git a/gfx/tilesets/29.lz b/gfx/tilesets/29.2bpp.lz
similarity index 100%
rename from gfx/tilesets/29.lz
rename to gfx/tilesets/29.2bpp.lz
diff --git a/gfx/tilesets/30.lz b/gfx/tilesets/30.2bpp.lz
similarity index 100%
rename from gfx/tilesets/30.lz
rename to gfx/tilesets/30.2bpp.lz
diff --git a/gfx/tilesets/31.lz b/gfx/tilesets/31.2bpp.lz
similarity index 100%
rename from gfx/tilesets/31.lz
rename to gfx/tilesets/31.2bpp.lz
diff --git a/gfx/tilesets/32.lz b/gfx/tilesets/32.2bpp.lz
similarity index 100%
rename from gfx/tilesets/32.lz
rename to gfx/tilesets/32.2bpp.lz
diff --git a/gfx/tilesets/33.lz b/gfx/tilesets/33.2bpp.lz
similarity index 100%
rename from gfx/tilesets/33.lz
rename to gfx/tilesets/33.2bpp.lz
diff --git a/gfx/tilesets/34.lz b/gfx/tilesets/34.2bpp.lz
similarity index 100%
rename from gfx/tilesets/34.lz
rename to gfx/tilesets/34.2bpp.lz
diff --git a/gfx/tilesets/35.lz b/gfx/tilesets/35.2bpp.lz
similarity index 100%
rename from gfx/tilesets/35.lz
rename to gfx/tilesets/35.2bpp.lz
diff --git a/gfx/tilesets/36.lz b/gfx/tilesets/36.2bpp.lz
similarity index 100%
rename from gfx/tilesets/36.lz
rename to gfx/tilesets/36.2bpp.lz
diff --git a/gfx/title/crystal.lz b/gfx/title/crystal.w48.interleave.2bpp.lz
similarity index 100%
rename from gfx/title/crystal.lz
rename to gfx/title/crystal.w48.interleave.2bpp.lz
diff --git a/gfx/title/logo.lz b/gfx/title/logo.w160.t4.2bpp.lz
similarity index 100%
rename from gfx/title/logo.lz
rename to gfx/title/logo.w160.t4.2bpp.lz
diff --git a/gfx/title/suicune.lz b/gfx/title/suicune.w128.2bpp.lz
similarity index 100%
rename from gfx/title/suicune.lz
rename to gfx/title/suicune.w128.2bpp.lz
diff --git a/gfx/trade/game_boy.lz b/gfx/trade/game_boy.2bpp.lz
similarity index 100%
rename from gfx/trade/game_boy.lz
rename to gfx/trade/game_boy.2bpp.lz
diff --git a/gfx/trainers/028.lz b/gfx/trainers/beauty.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/028.lz
rename to gfx/trainers/beauty.7x7.2bpp.lz
diff --git a/gfx/trainers/044.lz b/gfx/trainers/biker.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/044.lz
rename to gfx/trainers/biker.7x7.2bpp.lz
diff --git a/gfx/trainers/023.lz b/gfx/trainers/bird_keeper.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/023.lz
rename to gfx/trainers/bird_keeper.7x7.2bpp.lz
diff --git a/gfx/trainers/049.lz b/gfx/trainers/blackbelt_t.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/049.lz
rename to gfx/trainers/blackbelt_t.7x7.2bpp.lz
diff --git a/gfx/trainers/045.lz b/gfx/trainers/blaine.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/045.lz
rename to gfx/trainers/blaine.7x7.2bpp.lz
diff --git a/gfx/trainers/063.lz b/gfx/trainers/blue.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/063.lz
rename to gfx/trainers/blue.7x7.2bpp.lz
diff --git a/gfx/trainers/057.lz b/gfx/trainers/boarder.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/057.lz
rename to gfx/trainers/boarder.7x7.2bpp.lz
diff --git a/gfx/trainers/016.lz b/gfx/trainers/brock.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/016.lz
rename to gfx/trainers/brock.7x7.2bpp.lz
diff --git a/gfx/trainers/012.lz b/gfx/trainers/bruno.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/012.lz
rename to gfx/trainers/bruno.7x7.2bpp.lz
diff --git a/gfx/trainers/035.lz b/gfx/trainers/bug_catcher.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/035.lz
rename to gfx/trainers/bug_catcher.7x7.2bpp.lz
diff --git a/gfx/trainers/002.lz b/gfx/trainers/bugsy.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/002.lz
rename to gfx/trainers/bugsy.7x7.2bpp.lz
diff --git a/gfx/trainers/046.lz b/gfx/trainers/burglar.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/046.lz
rename to gfx/trainers/burglar.7x7.2bpp.lz
diff --git a/gfx/trainers/011.lz b/gfx/trainers/cal.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/011.lz
rename to gfx/trainers/cal.7x7.2bpp.lz
diff --git a/gfx/trainers/053.lz b/gfx/trainers/camper.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/053.lz
rename to gfx/trainers/camper.7x7.2bpp.lz
diff --git a/gfx/trainers/015.lz b/gfx/trainers/champion.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/015.lz
rename to gfx/trainers/champion.7x7.2bpp.lz
diff --git a/gfx/trainers/006.lz b/gfx/trainers/chuck.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/006.lz
rename to gfx/trainers/chuck.7x7.2bpp.lz
diff --git a/gfx/trainers/007.lz b/gfx/trainers/clair.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/007.lz
rename to gfx/trainers/clair.7x7.2bpp.lz
diff --git a/gfx/trainers/027.lz b/gfx/trainers/cooltrainer_f.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/027.lz
rename to gfx/trainers/cooltrainer_f.7x7.2bpp.lz
diff --git a/gfx/trainers/026.lz b/gfx/trainers/cooltrainer_m.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/026.lz
rename to gfx/trainers/cooltrainer_m.7x7.2bpp.lz
diff --git a/gfx/trainers/020.lz b/gfx/trainers/erika.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/020.lz
rename to gfx/trainers/erika.7x7.2bpp.lz
diff --git a/gfx/trainers/054.lz b/gfx/trainers/executive_f.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/054.lz
rename to gfx/trainers/executive_f.7x7.2bpp.lz
diff --git a/gfx/trainers/050.lz b/gfx/trainers/executive_m.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/050.lz
rename to gfx/trainers/executive_m.7x7.2bpp.lz
diff --git a/gfx/trainers/000.lz b/gfx/trainers/falkner.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/000.lz
rename to gfx/trainers/falkner.7x7.2bpp.lz
diff --git a/gfx/trainers/047.lz b/gfx/trainers/firebreather.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/047.lz
rename to gfx/trainers/firebreather.7x7.2bpp.lz
diff --git a/gfx/trainers/036.lz b/gfx/trainers/fisher.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/036.lz
rename to gfx/trainers/fisher.7x7.2bpp.lz
diff --git a/gfx/trainers/031.lz b/gfx/trainers/gentleman.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/031.lz
rename to gfx/trainers/gentleman.7x7.2bpp.lz
diff --git a/gfx/trainers/065.lz b/gfx/trainers/grunt_f.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/065.lz
rename to gfx/trainers/grunt_f.7x7.2bpp.lz
diff --git a/gfx/trainers/030.lz b/gfx/trainers/grunt_m.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/030.lz
rename to gfx/trainers/grunt_m.7x7.2bpp.lz
diff --git a/gfx/trainers/042.lz b/gfx/trainers/guitarist.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/042.lz
rename to gfx/trainers/guitarist.7x7.2bpp.lz
diff --git a/gfx/trainers/043.lz b/gfx/trainers/hiker.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/043.lz
rename to gfx/trainers/hiker.7x7.2bpp.lz
diff --git a/gfx/trainers/025.lz b/gfx/trainers/janine.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/025.lz
rename to gfx/trainers/janine.7x7.2bpp.lz
diff --git a/gfx/trainers/005.lz b/gfx/trainers/jasmine.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/005.lz
rename to gfx/trainers/jasmine.7x7.2bpp.lz
diff --git a/gfx/trainers/048.lz b/gfx/trainers/juggler.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/048.lz
rename to gfx/trainers/juggler.7x7.2bpp.lz
diff --git a/gfx/trainers/013.lz b/gfx/trainers/karen.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/013.lz
rename to gfx/trainers/karen.7x7.2bpp.lz
diff --git a/gfx/trainers/059.lz b/gfx/trainers/kimono_girl.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/059.lz
rename to gfx/trainers/kimono_girl.7x7.2bpp.lz
diff --git a/gfx/trainers/014.lz b/gfx/trainers/koga.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/014.lz
rename to gfx/trainers/koga.7x7.2bpp.lz
diff --git a/gfx/trainers/024.lz b/gfx/trainers/lass.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/024.lz
rename to gfx/trainers/lass.7x7.2bpp.lz
diff --git a/gfx/trainers/018.lz b/gfx/trainers/lt_surge.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/018.lz
rename to gfx/trainers/lt_surge.7x7.2bpp.lz
diff --git a/gfx/trainers/056.lz b/gfx/trainers/medium.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/056.lz
rename to gfx/trainers/medium.7x7.2bpp.lz
diff --git a/gfx/trainers/017.lz b/gfx/trainers/misty.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/017.lz
rename to gfx/trainers/misty.7x7.2bpp.lz
diff --git a/gfx/trainers/003.lz b/gfx/trainers/morty.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/003.lz
rename to gfx/trainers/morty.7x7.2bpp.lz
diff --git a/gfx/trainers/066.lz b/gfx/trainers/mysticalman.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/066.lz
rename to gfx/trainers/mysticalman.7x7.2bpp.lz
diff --git a/gfx/trainers/009.lz b/gfx/trainers/oak.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/009.lz
rename to gfx/trainers/oak.7x7.2bpp.lz
diff --git a/gfx/trainers/064.lz b/gfx/trainers/officer.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/064.lz
rename to gfx/trainers/officer.7x7.2bpp.lz
diff --git a/gfx/trainers/052.lz b/gfx/trainers/picnicker.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/052.lz
rename to gfx/trainers/picnicker.7x7.2bpp.lz
diff --git a/gfx/trainers/061.lz b/gfx/trainers/pokefan_f.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/061.lz
rename to gfx/trainers/pokefan_f.7x7.2bpp.lz
diff --git a/gfx/trainers/058.lz b/gfx/trainers/pokefan_m.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/058.lz
rename to gfx/trainers/pokefan_m.7x7.2bpp.lz
diff --git a/gfx/trainers/029.lz b/gfx/trainers/pokemaniac.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/029.lz
rename to gfx/trainers/pokemaniac.7x7.2bpp.lz
diff --git a/gfx/trainers/004.lz b/gfx/trainers/pryce.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/004.lz
rename to gfx/trainers/pryce.7x7.2bpp.lz
diff --git a/gfx/trainers/051.lz b/gfx/trainers/psychic_t.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/051.lz
rename to gfx/trainers/psychic_t.7x7.2bpp.lz
diff --git a/gfx/trainers/062.lz b/gfx/trainers/red.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/062.lz
rename to gfx/trainers/red.7x7.2bpp.lz
diff --git a/gfx/trainers/008.lz b/gfx/trainers/rival1.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/008.lz
rename to gfx/trainers/rival1.7x7.2bpp.lz
diff --git a/gfx/trainers/041.lz b/gfx/trainers/rival2.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/041.lz
rename to gfx/trainers/rival2.7x7.2bpp.lz
diff --git a/gfx/trainers/034.lz b/gfx/trainers/sabrina.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/034.lz
rename to gfx/trainers/sabrina.7x7.2bpp.lz
diff --git a/gfx/trainers/055.lz b/gfx/trainers/sage.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/055.lz
rename to gfx/trainers/sage.7x7.2bpp.lz
diff --git a/gfx/trainers/039.lz b/gfx/trainers/sailor.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/039.lz
rename to gfx/trainers/sailor.7x7.2bpp.lz
diff --git a/gfx/trainers/022.lz b/gfx/trainers/schoolboy.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/022.lz
rename to gfx/trainers/schoolboy.7x7.2bpp.lz
diff --git a/gfx/trainers/019.lz b/gfx/trainers/scientist.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/019.lz
rename to gfx/trainers/scientist.7x7.2bpp.lz
diff --git a/gfx/trainers/032.lz b/gfx/trainers/skier.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/032.lz
rename to gfx/trainers/skier.7x7.2bpp.lz
diff --git a/gfx/trainers/040.lz b/gfx/trainers/super_nerd.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/040.lz
rename to gfx/trainers/super_nerd.7x7.2bpp.lz
diff --git a/gfx/trainers/038.lz b/gfx/trainers/swimmer_f.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/038.lz
rename to gfx/trainers/swimmer_f.7x7.2bpp.lz
diff --git a/gfx/trainers/037.lz b/gfx/trainers/swimmer_m.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/037.lz
rename to gfx/trainers/swimmer_m.7x7.2bpp.lz
diff --git a/gfx/trainers/033.lz b/gfx/trainers/teacher.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/033.lz
rename to gfx/trainers/teacher.7x7.2bpp.lz
diff --git a/gfx/trainers/060.lz b/gfx/trainers/twins.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/060.lz
rename to gfx/trainers/twins.7x7.2bpp.lz
diff --git a/gfx/trainers/001.lz b/gfx/trainers/whitney.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/001.lz
rename to gfx/trainers/whitney.7x7.2bpp.lz
diff --git a/gfx/trainers/010.lz b/gfx/trainers/will.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/010.lz
rename to gfx/trainers/will.7x7.2bpp.lz
diff --git a/gfx/trainers/021.lz b/gfx/trainers/youngster.7x7.2bpp.lz
similarity index 100%
rename from gfx/trainers/021.lz
rename to 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