657 files changed, 806 insertions, 705 deletions

diff --git a/Makefile b/Makefile
index f6407e70f..e9a324c9c 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ MD5 := md5sum -c --quiet
 .SECONDEXPANSION:
 
 poketools := extras/pokemontools
-gfx       := $(PYTHON) $(poketools)/gfx.py
+gfx       := $(PYTHON) gfx.py
 includes  := $(PYTHON) $(poketools)/scan_includes.py
 
 
@@ -79,12 +79,13 @@ pngs:
 	find . -iname "*.[12]bpp" -exec touch {} +
 	find . -iname "*.lz"      -exec touch {} +
 
-%.2bpp: %.png ; @$(gfx) 2bpp $<
-%.1bpp: %.png ; @$(gfx) 1bpp $<
-%.lz:   %     ; @$(gfx) lz $<
+%.2bpp: %.png ; $(gfx) 2bpp $<
+%.1bpp: %.png ; $(gfx) 1bpp $<
+%.lz:   %     ; $(gfx) lz $<
 
 
-%.pal: ;
+%.pal: %.2bpp ;
+gfx/pics/%/normal.pal gfx/pics/%/bitmask.asm gfx/pics/%/frames.asm: gfx/pics/%/front.2bpp ;
 %.bin: ;
 %.blk: ;
 %.tilemap: ;
diff --git a/engine/credits.asm b/engine/credits.asm
index 3454e00b5..449fc0ac0 100644
--- a/engine/credits.asm
+++ b/engine/credits.asm
@@ -792,13 +792,13 @@ Function109c1c: ; 109c1c (42:5c1c)
 ; 109c24 (42:5c24)
 
 
-CreditsBorderGFX:    INCBIN "gfx/credits/border.w72.2bpp"
+CreditsBorderGFX:    INCBIN "gfx/credits/border.2bpp"
 
 CreditsMonsGFX:
-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"
+CreditsPichuGFX:     INCBIN "gfx/credits/pichu.2bpp"
+CreditsSmoochumGFX:  INCBIN "gfx/credits/smoochum.2bpp"
+CreditsDittoGFX:     INCBIN "gfx/credits/ditto.2bpp"
+CreditsIgglybuffGFX: INCBIN "gfx/credits/igglybuff.2bpp"
 
 
 CreditsScript: ; 10acb4
diff --git a/engine/pack.asm b/engine/pack.asm
index a50612bb8..84413e1cb 100644
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -1690,4 +1690,4 @@ PackMenuGFX:
 INCBIN "gfx/misc/pack_menu.2bpp"
 
 PackGFX:
-INCBIN "gfx/misc/pack.w40.2bpp"
+INCBIN "gfx/misc/pack.2bpp"
diff --git a/extras b/extras
-Subproject bf76a6b84a2f57edbcd01d6b2841cb813b2afce
+Subproject 5ad74a89aee5181b30eed0b11ef75c1b01ed41e
diff --git a/gfx.py b/gfx.py
new file mode 100644
index 000000000..730c73451
--- /dev/null
+++ b/gfx.py
@@ -0,0 +1,102 @@
+"""Supplementary scripts for graphics conversion."""
+
+import os
+import argparse
+
+from extras.pokemontools import gfx, lz
+
+
+# Graphics with inverted tilemaps that aren't covered by filepath_rules.
+pics = [
+	'gfx/shrink1',
+	'gfx/shrink2',
+]
+
+def filepath_rules(filepath):
+	"""Infer attributes of certain graphics by their location in the filesystem."""
+	args = {}
+
+	filedir, filename = os.path.split(filepath)
+	name, ext = os.path.splitext(filename)
+
+	if 'gfx/pics/' in filedir:
+		if name == 'front':
+			args['pal_file'] = os.path.join(filedir, 'normal.pal')
+			args['pic'] = True
+			args['animate'] = True
+		elif name == 'back':
+			args['pal_file'] = os.path.join(filedir, 'shiny.pal')
+			args['pic'] = True
+
+	elif 'gfx/trainers' in filedir:
+		args['pic'] = True
+
+	elif os.path.join(filedir, name) in pics:
+		args['pic'] = True
+
+	if args.get('pal_file'):
+		args['palout'] = args['pal_file']
+
+	if args.get('pic'):
+		if ext == '.png':
+			w, h = gfx.png.Reader(filepath).asRGBA8()[:2]
+			w = min(w/8, h/8)
+			args['pic_dimensions'] = w, w
+	return args
+
+
+def to_1bpp(filename, **kwargs):
+	_, ext = os.path.splitext(filename)
+	if   ext == '.1bpp': pass
+	elif ext == '.2bpp': gfx.export_2bpp_to_1bpp(filename, **kwargs)
+	elif ext == '.png':  gfx.export_png_to_1bpp(filename, **kwargs)
+
+def to_2bpp(filename, **kwargs):
+	_, ext = os.path.splitext(filename)
+	if   ext == '.1bpp': gfx.export_1bpp_to_2bpp(filename, **kwargs)
+	elif ext == '.2bpp': pass
+	elif ext == '.png':  gfx.export_png_to_2bpp(filename, **kwargs)
+
+def to_png(filename, **kwargs):
+	_, ext = os.path.splitext(filename)
+	if   ext == '.1bpp': gfx.export_1bpp_to_png(filename, **kwargs)
+	elif ext == '.2bpp': gfx.export_2bpp_to_png(filename, **kwargs)
+	elif ext == '.png':  pass
+
+def compress(filename, **kwargs):
+	data = open(filename, 'rb').read()
+	lz_data = lz.Compressed(data).output
+	open(filename + '.lz', 'wb').write(bytearray(lz_data))
+
+def decompress(filename, **kwargs):
+	lz_data = open(filename, 'rb').read()
+	data = lz.Decompressed(lz_data).output
+	name, ext = os.path.splitext(filename)
+	open(name, 'wb').write(bytearray(data))
+
+
+methods = {
+	'2bpp': to_2bpp,
+	'1bpp': to_1bpp,
+	'png':  to_png,
+	'lz':   compress,
+	'unlz': decompress,
+}
+
+def main(method_name, filenames=None):
+	if filenames is None: filenames = []
+	for filename in filenames:
+		args = filepath_rules(filename)
+		method = methods.get(method_name)
+		if method:
+			method(filename, **args)
+
+def get_args():
+	ap = argparse.ArgumentParser()
+	ap.add_argument('method_name')
+	ap.add_argument('filenames', nargs='*')
+	args = ap.parse_args()
+	return args
+
+if __name__ == '__main__':
+	main(**get_args().__dict__)
diff --git a/gfx/credits/border.png b/gfx/credits/border.png
new file mode 100644
index 000000000..d93bddc8a
--- /dev/null
+++ b/gfx/credits/border.png
diff --git a/gfx/credits/border.w72.2bpp b/gfx/credits/border.w72.2bpp
deleted file mode 100644
index 32b3fead9..000000000
--- a/gfx/credits/border.w72.2bpp
+++ /dev/null
diff --git a/gfx/credits/ditto.png b/gfx/credits/ditto.png
new file mode 100644
index 000000000..17a1191b0
--- /dev/null
+++ b/gfx/credits/ditto.png
diff --git a/gfx/credits/ditto.w32.2bpp b/gfx/credits/ditto.w32.2bpp
deleted file mode 100644
index 59677a90f..000000000
--- a/gfx/credits/ditto.w32.2bpp
+++ /dev/null
diff --git a/gfx/credits/igglybuff.png b/gfx/credits/igglybuff.png
new file mode 100644
index 000000000..3a6d00194
--- /dev/null
+++ b/gfx/credits/igglybuff.png
diff --git a/gfx/credits/igglybuff.w32.2bpp b/gfx/credits/igglybuff.w32.2bpp
deleted file mode 100644
index a626c758d..000000000
--- a/gfx/credits/igglybuff.w32.2bpp
+++ /dev/null
diff --git a/gfx/credits/pichu.png b/gfx/credits/pichu.png
new file mode 100644
index 000000000..f98642ec8
--- /dev/null
+++ b/gfx/credits/pichu.png
diff --git a/gfx/credits/pichu.w32.2bpp b/gfx/credits/pichu.w32.2bpp
deleted file mode 100644
index da635e6b4..000000000
--- a/gfx/credits/pichu.w32.2bpp
+++ /dev/null
diff --git a/gfx/credits/smoochum.png b/gfx/credits/smoochum.png
new file mode 100644
index 000000000..415bac268
--- /dev/null
+++ b/gfx/credits/smoochum.png
diff --git a/gfx/credits/smoochum.w32.2bpp b/gfx/credits/smoochum.w32.2bpp
deleted file mode 100644
index 83926ec95..000000000
--- a/gfx/credits/smoochum.w32.2bpp
+++ /dev/null
diff --git a/gfx/credits/theend.png b/gfx/credits/theend.png
new file mode 100644
index 000000000..165f8ba8e
--- /dev/null
+++ b/gfx/credits/theend.png
diff --git a/gfx/credits/theend.w64.2bpp b/gfx/credits/theend.w64.2bpp
deleted file mode 100644
index b689688ba..000000000
--- a/gfx/credits/theend.w64.2bpp
+++ /dev/null
diff --git a/gfx/misc/badges.png b/gfx/misc/badges.png
new file mode 100644
index 000000000..4e5820da8
--- /dev/null
+++ b/gfx/misc/badges.png
diff --git a/gfx/misc/badges.w16.2bpp b/gfx/misc/badges.w16.2bpp
deleted file mode 100644
index 52cf24e1b..000000000
--- a/gfx/misc/badges.w16.2bpp
+++ /dev/null
diff --git a/gfx/misc/font.png b/gfx/misc/font.png
new file mode 100644
index 000000000..7119c0691
--- /dev/null
+++ b/gfx/misc/font.png
diff --git a/gfx/misc/font.w128.1bpp b/gfx/misc/font.w128.1bpp
deleted file mode 100644
index ff8d2d4fe..000000000
--- a/gfx/misc/font.w128.1bpp
+++ /dev/null
diff --git a/gfx/misc/font_battle_extra.2bpp b/gfx/misc/font_battle_extra.2bpp
deleted file mode 100644
index 77c2f3576..000000000
--- a/gfx/misc/font_battle_extra.2bpp
+++ /dev/null
diff --git a/gfx/misc/font_battle_extra.png b/gfx/misc/font_battle_extra.png
new file mode 100644
index 000000000..15e25a40c
--- /dev/null
+++ b/gfx/misc/font_battle_extra.png
diff --git a/gfx/misc/font_extra.2bpp b/gfx/misc/font_extra.2bpp
deleted file mode 100644
index 50d66916f..000000000
--- a/gfx/misc/font_extra.2bpp
+++ /dev/null
diff --git a/gfx/misc/font_extra.png b/gfx/misc/font_extra.png
new file mode 100644
index 000000000..7ca840c3a
--- /dev/null
+++ b/gfx/misc/font_extra.png
diff --git a/gfx/misc/font_inversed.png b/gfx/misc/font_inversed.png
new file mode 100644
index 000000000..519339f39
--- /dev/null
+++ b/gfx/misc/font_inversed.png
diff --git a/gfx/misc/font_inversed.w128.1bpp b/gfx/misc/font_inversed.w128.1bpp
deleted file mode 100644
index 39a7e73d6..000000000
--- a/gfx/misc/font_inversed.w128.1bpp
+++ /dev/null
@@ -1 +0,0 @@
-��׻�}}�{{}}�ý���{}}}{�

�
�ýa}���}}}
}}}�����������www��{woO7{}�
�}9Um}}}�}=]muy}�ǻ}}}���}}�ǻ}}u���}}w{}��{��}��
�������}}}}}���}}������}}mU99}�9���׻9�}�������
���߿
���������������������������������������������������û����������������������������ý�������������������������������������������������������������mmmm�����������ý������������������������������ÿ�����������������������������}mmU����;��׹��������������߁���������������������������������������������������׻�}}��ǻ}}����}}}}�������û����ý��������������������������������������������������������������������������������������������=�}�����7�w�����?�i�����?�l�����?�a�����?�A�����?�]�������������������������������������������������������������������������������������ouu���'Www�����������������������������1���������������������ϗ�ͥ3���?ý�����������������������������

������ǫmǻ�����ߏߏ������׻�������������߿���������ǻ������dz99������������9�
������9����Ó3
����9����?99���
9�������9�99����99����
\ No newline at end of file
diff --git a/gfx/misc/footprints.png b/gfx/misc/footprints.png
new file mode 100644
index 000000000..b1e350436
--- /dev/null
+++ b/gfx/misc/footprints.png
diff --git a/gfx/misc/footprints.w128.1bpp b/gfx/misc/footprints.w128.1bpp
deleted file mode 100644
index 005bfee0f..000000000
--- a/gfx/misc/footprints.w128.1bpp
+++ /dev/null
@@ -1 +0,0 @@
-������������/�����������w'����������7'
�����������o/����������7'���������7'�������������_�����������o/��������?������������?����������


����������?����������?����������?���������?������������?�����������?'#��������������?���������������������������??��������������?�����������������������������?�����������������������??���������?������������������������������??�����������?������������������������������??�������������??�������������������������w7##���������������?�����������o'�������������������������ogGG����������������������������������������???���������???���������?��������������?������������??����������??�����������������������������������������������_�����������?������������������������������������������?������������oO������������������������?��������?������������?����������?�����������?����������?�������������������������������??��������������oG�������������������??����������χ��������������O�����������O����������?��������?�����������������������������?���������������?�������������?������������ϟ?�����������???����������???����������������������������??��������������??������������?���������?�����������������������������???����������?������������������������?�������������?��������������??�������������???�����������?����������������������������??�������������������������������������������������������������_��������'����������7'�ތ�������ccC�����������Ç��������������������������������������������������������??��??���������????����������?�����������?����������?��������������������������/���������'



��������������������������������������������������?���������ߟ����������????���������?������������?�����������������������?�������������?����������?������������?�������������LJ������������?�����������/�������������������������o����������������������������������������������������������?���������?�����������??����������??�����������������������������������������������������������������������������������������������������������OG������������������������?���������?������������??�����������ߏ����������������������������������������?����������?���������������������������������?�������������������������������������������?��������������sC�������������ϟ���������?=q������������������������������������������������������������������������?������������?���������
?�����������?�������������������������������������������������������������������������������������������������������������������������������������������������_O��������������������������������������������������������������������������������������������������������������������?�������������������������������������OG��������������?������������������������������������������������������������������������������������??��������?���������g������������������������������������������������������������������������������?���������?����������������?�����������oO����������?����������?�������������������������������������������ߏ���������ߏ���������?��������������ߟ��������???������������Ϗ���������������������������������������������������������������?�������������������??������������������������������������������������������������������������������?��������???�����������?�����������?��������������������������������������������������������������������������?��������������������?����������??���������;37������������������������???���������ߟ�����������������������������?���������?��������������???����������������������������������???������������?������������???����������������������������������������������������������������������������������������������O������������O������������O������������O�������������������������������������������������������������������������Ϗ����������?����������?�������������Ϗ?�������������������������??�������������?��������������������������ߏ���������������������������oO��������733cgG���������������������������������?�����������������������������????���������???������������LJ?����������?�����������{913#���������o''''g�����������������������������������������/''���������χ������������????���������������?��������???���������OO?��������������������������������������������������?????��������������������?������������������?����������'�������������?�������������_�����������??�����������_�����������?���������??��������?������������?����������?������������?������������??����������??�����������??����������???���������������?�������������??�������������ϟ������������sc������������������������?�����������������������������O��������??�������������??�������������
�����������?������������?������������?��������������������������������������������������������������������������������������������???���������������?�������������?�����������������������������������������������������������������������������������??�������������?��������������?�������������?������������?����������������������������������������������������������������������?���������������������������????����������?��������??����������������������������?�������������????�����������?��������������������������������������???�������������?���·���??s�
��������������?�������������?�������������?������������?�������������������������?��������??������������??????���������??�������������??������������?������������????���������������������������???����������������?�����������7''���������_O���������������?��������������_����������wgoO?������������?������������������������?��������������?���������?���������?�������������������������???����������?��������������������������������������������������?��������������?�������������������������������������������������������������?�����������������������������������������������������??�������������������������������������������������������������??��������������������������������_�����������OG���������������������������??������������?���������???������������??������������O�?��������?������������?��������������������������?������������?������������?����������??�����������?���������������c�7�����������������������������������������������?�������������O��������������?������������������������������
��������������������������������������������������?�����������������������?��������������������������������?��������������????�����������������������������??�������������?����������?���������������������������������������??���������?��������������������������?��������������?�����������?�������������������������?�������������Ç?�����������?������������������������O��������������?�����������G�����������������?����������?����������������������?���������g''o������������???���������?�����������Ǐ�����������???������������?���������������������������ߟ����������������������_���������?'�������������������������������������������������������?��������?�������������?�����������?����������?���������?������������?������������������������������?�����������OG����������oggOO��������������?����������7#�����������7#�����������7#�+����������7#�#����������7#�#��������?���������O??��������?�����������������?�������������?�������������?�������������?�������������?��
\ No newline at end of file
diff --git a/gfx/misc/pack.png b/gfx/misc/pack.png
new file mode 100644
index 000000000..b85fc0990
--- /dev/null
+++ b/gfx/misc/pack.png
diff --git a/gfx/misc/pack.w40.2bpp b/gfx/misc/pack.w40.2bpp
deleted file mode 100644
index 22be55081..000000000
--- a/gfx/misc/pack.w40.2bpp
+++ /dev/null
diff --git a/gfx/misc/pack_f.png b/gfx/misc/pack_f.png
new file mode 100644
index 000000000..fbe120bd1
--- /dev/null
+++ b/gfx/misc/pack_f.png
diff --git a/gfx/misc/pack_f.w40.2bpp b/gfx/misc/pack_f.w40.2bpp
deleted file mode 100644
index 60d6b7f91..000000000
--- a/gfx/misc/pack_f.w40.2bpp
+++ /dev/null
diff --git a/gfx/pics.asm b/gfx/pics.asm
index 051ae6500..eaf65b7e3 100644
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@@ -17,711 +17,711 @@ TrainerPicPointers:: INCLUDE "gfx/pics/trainer_pic_pointers.asm"
 
 SECTION "Pics 1", ROMX, BANK[PICS_1]
 
-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"
+HoOhFrontpic:        INCBIN "gfx/pics/ho_oh/front.2bpp.lz"
+MachampFrontpic:     INCBIN "gfx/pics/machamp/front.2bpp.lz"
+NinetalesFrontpic:   INCBIN "gfx/pics/ninetales/front.2bpp.lz"
+FeraligatrFrontpic:  INCBIN "gfx/pics/feraligatr/front.2bpp.lz"
+NidokingFrontpic:    INCBIN "gfx/pics/nidoking/front.2bpp.lz"
+RaikouFrontpic:      INCBIN "gfx/pics/raikou/front.2bpp.lz"
+LugiaFrontpic:       INCBIN "gfx/pics/lugia/front.2bpp.lz"
+ArticunoFrontpic:    INCBIN "gfx/pics/articuno/front.2bpp.lz"
+TaurosFrontpic:      INCBIN "gfx/pics/tauros/front.2bpp.lz"
+VenusaurFrontpic:    INCBIN "gfx/pics/venusaur/front.2bpp.lz"
+EnteiFrontpic:       INCBIN "gfx/pics/entei/front.2bpp.lz"
+SuicuneFrontpic:     INCBIN "gfx/pics/suicune/front.2bpp.lz"
+TyphlosionFrontpic:  INCBIN "gfx/pics/typhlosion/front.2bpp.lz"
 ; 123ffa
 
 
 SECTION "Pics 2", ROMX, BANK[PICS_2]
 
-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"
+BlastoiseFrontpic:   INCBIN "gfx/pics/blastoise/front.2bpp.lz"
+RapidashFrontpic:    INCBIN "gfx/pics/rapidash/front.2bpp.lz"
+MeganiumFrontpic:    INCBIN "gfx/pics/meganium/front.2bpp.lz"
+NidoqueenFrontpic:   INCBIN "gfx/pics/nidoqueen/front.2bpp.lz"
+HitmonleeFrontpic:   INCBIN "gfx/pics/hitmonlee/front.2bpp.lz"
+ScizorFrontpic:      INCBIN "gfx/pics/scizor/front.2bpp.lz"
+BeedrillFrontpic:    INCBIN "gfx/pics/beedrill/front.2bpp.lz"
+ArcanineFrontpic:    INCBIN "gfx/pics/arcanine/front.2bpp.lz"
+TyranitarFrontpic:   INCBIN "gfx/pics/tyranitar/front.2bpp.lz"
+MoltresFrontpic:     INCBIN "gfx/pics/moltres/front.2bpp.lz"
+ZapdosFrontpic:      INCBIN "gfx/pics/zapdos/front.2bpp.lz"
+ArbokFrontpic:       INCBIN "gfx/pics/arbok/front.2bpp.lz"
+MewtwoFrontpic:      INCBIN "gfx/pics/mewtwo/front.2bpp.lz"
+FearowFrontpic:      INCBIN "gfx/pics/fearow/front.2bpp.lz"
+CharizardFrontpic:   INCBIN "gfx/pics/charizard/front.2bpp.lz"
+QuilavaFrontpic:     INCBIN "gfx/pics/quilava/front.2bpp.lz"
 ; 127ffe
 
 
 SECTION "Pics 3", ROMX, BANK[PICS_3]
 
-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"
+SteelixFrontpic:     INCBIN "gfx/pics/steelix/front.2bpp.lz"
+AlakazamFrontpic:    INCBIN "gfx/pics/alakazam/front.2bpp.lz"
+GyaradosFrontpic:    INCBIN "gfx/pics/gyarados/front.2bpp.lz"
+KangaskhanFrontpic:  INCBIN "gfx/pics/kangaskhan/front.2bpp.lz"
+RhydonFrontpic:      INCBIN "gfx/pics/rhydon/front.2bpp.lz"
+GolduckFrontpic:     INCBIN "gfx/pics/golduck/front.2bpp.lz"
+RhyhornFrontpic:     INCBIN "gfx/pics/rhyhorn/front.2bpp.lz"
+PidgeotFrontpic:     INCBIN "gfx/pics/pidgeot/front.2bpp.lz"
+SlowbroFrontpic:     INCBIN "gfx/pics/slowbro/front.2bpp.lz"
+ButterfreeFrontpic:  INCBIN "gfx/pics/butterfree/front.2bpp.lz"
+WeezingFrontpic:     INCBIN "gfx/pics/weezing/front.2bpp.lz"
+CloysterFrontpic:    INCBIN "gfx/pics/cloyster/front.2bpp.lz"
+SkarmoryFrontpic:    INCBIN "gfx/pics/skarmory/front.2bpp.lz"
+DewgongFrontpic:     INCBIN "gfx/pics/dewgong/front.2bpp.lz"
+VictreebelFrontpic:  INCBIN "gfx/pics/victreebel/front.2bpp.lz"
+RaichuFrontpic:      INCBIN "gfx/pics/raichu/front.2bpp.lz"
+PrimeapeFrontpic:    INCBIN "gfx/pics/primeape/front.2bpp.lz"
+OmastarBackpic:      INCBIN "gfx/pics/omastar/back.2bpp.lz"
 ; 12bffe
 
 
 SECTION "Pics 4", ROMX, BANK[PICS_4]
 
-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"
+DodrioFrontpic:      INCBIN "gfx/pics/dodrio/front.2bpp.lz"
+SlowkingFrontpic:    INCBIN "gfx/pics/slowking/front.2bpp.lz"
+HitmontopFrontpic:   INCBIN "gfx/pics/hitmontop/front.2bpp.lz"
+OnixFrontpic:        INCBIN "gfx/pics/onix/front.2bpp.lz"
+BlisseyFrontpic:     INCBIN "gfx/pics/blissey/front.2bpp.lz"
+MachokeFrontpic:     INCBIN "gfx/pics/machoke/front.2bpp.lz"
+DragoniteFrontpic:   INCBIN "gfx/pics/dragonite/front.2bpp.lz"
+PoliwrathFrontpic:   INCBIN "gfx/pics/poliwrath/front.2bpp.lz"
+ScytherFrontpic:     INCBIN "gfx/pics/scyther/front.2bpp.lz"
+AerodactylFrontpic:  INCBIN "gfx/pics/aerodactyl/front.2bpp.lz"
+SeakingFrontpic:     INCBIN "gfx/pics/seaking/front.2bpp.lz"
+MukFrontpic:         INCBIN "gfx/pics/muk/front.2bpp.lz"
+CroconawFrontpic:    INCBIN "gfx/pics/croconaw/front.2bpp.lz"
+HypnoFrontpic:       INCBIN "gfx/pics/hypno/front.2bpp.lz"
+NidorinoFrontpic:    INCBIN "gfx/pics/nidorino/front.2bpp.lz"
+SandslashFrontpic:   INCBIN "gfx/pics/sandslash/front.2bpp.lz"
+JolteonFrontpic:     INCBIN "gfx/pics/jolteon/front.2bpp.lz"
+DonphanFrontpic:     INCBIN "gfx/pics/donphan/front.2bpp.lz"
+PinsirFrontpic:      INCBIN "gfx/pics/pinsir/front.2bpp.lz"
+UnownEFrontpic:      INCBIN "gfx/pics/unown_e/front.2bpp.lz"
 ; 130000
 
 
 SECTION "Pics 5", ROMX, BANK[PICS_5]
 
-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"
+GolbatFrontpic:      INCBIN "gfx/pics/golbat/front.2bpp.lz"
+KinglerFrontpic:     INCBIN "gfx/pics/kingler/front.2bpp.lz"
+ExeggcuteFrontpic:   INCBIN "gfx/pics/exeggcute/front.2bpp.lz"
+MagcargoFrontpic:    INCBIN "gfx/pics/magcargo/front.2bpp.lz"
+PersianFrontpic:     INCBIN "gfx/pics/persian/front.2bpp.lz"
+StantlerFrontpic:    INCBIN "gfx/pics/stantler/front.2bpp.lz"
+RaticateFrontpic:    INCBIN "gfx/pics/raticate/front.2bpp.lz"
+VenomothFrontpic:    INCBIN "gfx/pics/venomoth/front.2bpp.lz"
+PolitoedFrontpic:    INCBIN "gfx/pics/politoed/front.2bpp.lz"
+ElectabuzzFrontpic:  INCBIN "gfx/pics/electabuzz/front.2bpp.lz"
+MantineFrontpic:     INCBIN "gfx/pics/mantine/front.2bpp.lz"
+LickitungFrontpic:   INCBIN "gfx/pics/lickitung/front.2bpp.lz"
+KingdraFrontpic:     INCBIN "gfx/pics/kingdra/front.2bpp.lz"
+CharmeleonFrontpic:  INCBIN "gfx/pics/charmeleon/front.2bpp.lz"
+KadabraFrontpic:     INCBIN "gfx/pics/kadabra/front.2bpp.lz"
+ExeggutorFrontpic:   INCBIN "gfx/pics/exeggutor/front.2bpp.lz"
+GastlyFrontpic:      INCBIN "gfx/pics/gastly/front.2bpp.lz"
+AzumarillFrontpic:   INCBIN "gfx/pics/azumarill/front.2bpp.lz"
+ParasectFrontpic:    INCBIN "gfx/pics/parasect/front.2bpp.lz"
+MrMimeFrontpic:      INCBIN "gfx/pics/mr__mime/front.2bpp.lz"
+HeracrossFrontpic:   INCBIN "gfx/pics/heracross/front.2bpp.lz"
 ; 133fff
 
 
 SECTION "Pics 6", ROMX, BANK[PICS_6]
 
-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"
+AriadosFrontpic:     INCBIN "gfx/pics/ariados/front.2bpp.lz"
+NoctowlFrontpic:     INCBIN "gfx/pics/noctowl/front.2bpp.lz"
+WartortleFrontpic:   INCBIN "gfx/pics/wartortle/front.2bpp.lz"
+LaprasFrontpic:      INCBIN "gfx/pics/lapras/front.2bpp.lz"
+GolemFrontpic:       INCBIN "gfx/pics/golem/front.2bpp.lz"
+PoliwhirlFrontpic:   INCBIN "gfx/pics/poliwhirl/front.2bpp.lz"
+UrsaringFrontpic:    INCBIN "gfx/pics/ursaring/front.2bpp.lz"
+HoundoomFrontpic:    INCBIN "gfx/pics/houndoom/front.2bpp.lz"
+KabutopsFrontpic:    INCBIN "gfx/pics/kabutops/front.2bpp.lz"
+AmpharosFrontpic:    INCBIN "gfx/pics/ampharos/front.2bpp.lz"
+NidorinaFrontpic:    INCBIN "gfx/pics/nidorina/front.2bpp.lz"
+FlareonFrontpic:     INCBIN "gfx/pics/flareon/front.2bpp.lz"
+FarfetchDFrontpic:   INCBIN "gfx/pics/farfetch_d/front.2bpp.lz"
+VileplumeFrontpic:   INCBIN "gfx/pics/vileplume/front.2bpp.lz"
+BayleefFrontpic:     INCBIN "gfx/pics/bayleef/front.2bpp.lz"
+MagmarFrontpic:      INCBIN "gfx/pics/magmar/front.2bpp.lz"
+TentacruelFrontpic:  INCBIN "gfx/pics/tentacruel/front.2bpp.lz"
+ElekidFrontpic:      INCBIN "gfx/pics/elekid/front.2bpp.lz"
+JumpluffFrontpic:    INCBIN "gfx/pics/jumpluff/front.2bpp.lz"
+MarowakFrontpic:     INCBIN "gfx/pics/marowak/front.2bpp.lz"
+VulpixFrontpic:      INCBIN "gfx/pics/vulpix/front.2bpp.lz"
+GligarFrontpic:      INCBIN "gfx/pics/gligar/front.2bpp.lz"
+DunsparceFrontpic:   INCBIN "gfx/pics/dunsparce/front.2bpp.lz"
 ; 137fff
 
 
 SECTION "Pics 7", ROMX, BANK[PICS_7]
 
-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"
+VaporeonFrontpic:    INCBIN "gfx/pics/vaporeon/front.2bpp.lz"
+GirafarigFrontpic:   INCBIN "gfx/pics/girafarig/front.2bpp.lz"
+DrowzeeFrontpic:     INCBIN "gfx/pics/drowzee/front.2bpp.lz"
+SneaselFrontpic:     INCBIN "gfx/pics/sneasel/front.2bpp.lz"
+BellossomFrontpic:   INCBIN "gfx/pics/bellossom/front.2bpp.lz"
+SnorlaxFrontpic:     INCBIN "gfx/pics/snorlax/front.2bpp.lz"
+WigglytuffFrontpic:  INCBIN "gfx/pics/wigglytuff/front.2bpp.lz"
+YanmaFrontpic:       INCBIN "gfx/pics/yanma/front.2bpp.lz"
+SmeargleFrontpic:    INCBIN "gfx/pics/smeargle/front.2bpp.lz"
+ClefableFrontpic:    INCBIN "gfx/pics/clefable/front.2bpp.lz"
+PonytaFrontpic:      INCBIN "gfx/pics/ponyta/front.2bpp.lz"
+MurkrowFrontpic:     INCBIN "gfx/pics/murkrow/front.2bpp.lz"
+GravelerFrontpic:    INCBIN "gfx/pics/graveler/front.2bpp.lz"
+StarmieFrontpic:     INCBIN "gfx/pics/starmie/front.2bpp.lz"
+PidgeottoFrontpic:   INCBIN "gfx/pics/pidgeotto/front.2bpp.lz"
+LedybaFrontpic:      INCBIN "gfx/pics/ledyba/front.2bpp.lz"
+GengarFrontpic:      INCBIN "gfx/pics/gengar/front.2bpp.lz"
+OmastarFrontpic:     INCBIN "gfx/pics/omastar/front.2bpp.lz"
+PiloswineFrontpic:   INCBIN "gfx/pics/piloswine/front.2bpp.lz"
+DugtrioFrontpic:     INCBIN "gfx/pics/dugtrio/front.2bpp.lz"
+MagnetonFrontpic:    INCBIN "gfx/pics/magneton/front.2bpp.lz"
+DragonairFrontpic:   INCBIN "gfx/pics/dragonair/front.2bpp.lz"
+ForretressFrontpic:  INCBIN "gfx/pics/forretress/front.2bpp.lz"
+TogeticFrontpic:     INCBIN "gfx/pics/togetic/front.2bpp.lz"
+KangaskhanBackpic:   INCBIN "gfx/pics/kangaskhan/back.2bpp.lz"
 ; 13c000
 
 
 SECTION "Pics 8", ROMX, BANK[PICS_8]
 
-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"
+SeelFrontpic:        INCBIN "gfx/pics/seel/front.2bpp.lz"
+CrobatFrontpic:      INCBIN "gfx/pics/crobat/front.2bpp.lz"
+ChanseyFrontpic:     INCBIN "gfx/pics/chansey/front.2bpp.lz"
+TangelaFrontpic:     INCBIN "gfx/pics/tangela/front.2bpp.lz"
+SnubbullFrontpic:    INCBIN "gfx/pics/snubbull/front.2bpp.lz"
+GranbullFrontpic:    INCBIN "gfx/pics/granbull/front.2bpp.lz"
+MiltankFrontpic:     INCBIN "gfx/pics/miltank/front.2bpp.lz"
+HaunterFrontpic:     INCBIN "gfx/pics/haunter/front.2bpp.lz"
+SunfloraFrontpic:    INCBIN "gfx/pics/sunflora/front.2bpp.lz"
+UmbreonFrontpic:     INCBIN "gfx/pics/umbreon/front.2bpp.lz"
+ChikoritaFrontpic:   INCBIN "gfx/pics/chikorita/front.2bpp.lz"
+GoldeenFrontpic:     INCBIN "gfx/pics/goldeen/front.2bpp.lz"
+EspeonFrontpic:      INCBIN "gfx/pics/espeon/front.2bpp.lz"
+XatuFrontpic:        INCBIN "gfx/pics/xatu/front.2bpp.lz"
+MewFrontpic:         INCBIN "gfx/pics/mew/front.2bpp.lz"
+OctilleryFrontpic:   INCBIN "gfx/pics/octillery/front.2bpp.lz"
+JynxFrontpic:        INCBIN "gfx/pics/jynx/front.2bpp.lz"
+WobbuffetFrontpic:   INCBIN "gfx/pics/wobbuffet/front.2bpp.lz"
+DelibirdFrontpic:    INCBIN "gfx/pics/delibird/front.2bpp.lz"
+LedianFrontpic:      INCBIN "gfx/pics/ledian/front.2bpp.lz"
+GloomFrontpic:       INCBIN "gfx/pics/gloom/front.2bpp.lz"
+FlaaffyFrontpic:     INCBIN "gfx/pics/flaaffy/front.2bpp.lz"
+IvysaurFrontpic:     INCBIN "gfx/pics/ivysaur/front.2bpp.lz"
+FurretFrontpic:      INCBIN "gfx/pics/furret/front.2bpp.lz"
+CyndaquilFrontpic:   INCBIN "gfx/pics/cyndaquil/front.2bpp.lz"
+HitmonchanFrontpic:  INCBIN "gfx/pics/hitmonchan/front.2bpp.lz"
+QuagsireFrontpic:    INCBIN "gfx/pics/quagsire/front.2bpp.lz"
 ; 13fff7
 
 
 SECTION "Pics 9", ROMX, BANK[PICS_9]
 
-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"
+EkansFrontpic:       INCBIN "gfx/pics/ekans/front.2bpp.lz"
+SudowoodoFrontpic:   INCBIN "gfx/pics/sudowoodo/front.2bpp.lz"
+PikachuFrontpic:     INCBIN "gfx/pics/pikachu/front.2bpp.lz"
+SeadraFrontpic:      INCBIN "gfx/pics/seadra/front.2bpp.lz"
+MagbyFrontpic:       INCBIN "gfx/pics/magby/front.2bpp.lz"
+WeepinbellFrontpic:  INCBIN "gfx/pics/weepinbell/front.2bpp.lz"
+TotodileFrontpic:    INCBIN "gfx/pics/totodile/front.2bpp.lz"
+CorsolaFrontpic:     INCBIN "gfx/pics/corsola/front.2bpp.lz"
+FirebreatherPic:     INCBIN "gfx/trainers/firebreather.2bpp.lz"
+MachopFrontpic:      INCBIN "gfx/pics/machop/front.2bpp.lz"
+ChinchouFrontpic:    INCBIN "gfx/pics/chinchou/front.2bpp.lz"
+RattataFrontpic:     INCBIN "gfx/pics/rattata/front.2bpp.lz"
+ChampionPic:         INCBIN "gfx/trainers/champion.2bpp.lz"
+SpearowFrontpic:     INCBIN "gfx/pics/spearow/front.2bpp.lz"
+MagikarpFrontpic:    INCBIN "gfx/pics/magikarp/front.2bpp.lz"
+CharmanderFrontpic:  INCBIN "gfx/pics/charmander/front.2bpp.lz"
+CuboneFrontpic:      INCBIN "gfx/pics/cubone/front.2bpp.lz"
+BlackbeltTPic:       INCBIN "gfx/trainers/blackbelt_t.2bpp.lz"
+BikerPic:            INCBIN "gfx/trainers/biker.2bpp.lz"
+NidoranMFrontpic:    INCBIN "gfx/pics/nidoran_m/front.2bpp.lz"
+PorygonFrontpic:     INCBIN "gfx/pics/porygon/front.2bpp.lz"
+BrunoPic:            INCBIN "gfx/trainers/bruno.2bpp.lz"
+GrimerFrontpic:      INCBIN "gfx/pics/grimer/front.2bpp.lz"
+StaryuFrontpic:      INCBIN "gfx/pics/staryu/front.2bpp.lz"
+HikerPic:            INCBIN "gfx/trainers/hiker.2bpp.lz"
+MeowthFrontpic:      INCBIN "gfx/pics/meowth/front.2bpp.lz"
+Porygon2Frontpic:    INCBIN "gfx/pics/porygon2/front.2bpp.lz"
+SandshrewFrontpic:   INCBIN "gfx/pics/sandshrew/front.2bpp.lz"
+NidoranFFrontpic:    INCBIN "gfx/pics/nidoran_f/front.2bpp.lz"
+PidgeyFrontpic:      INCBIN "gfx/pics/pidgey/front.2bpp.lz"
+ParasectBackpic:     INCBIN "gfx/pics/parasect/back.2bpp.lz"
 ; 144000
 
 
 SECTION "Pics 10", ROMX, BANK[PICS_10]
 
-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"
+MisdreavusFrontpic:  INCBIN "gfx/pics/misdreavus/front.2bpp.lz"
+HoundourFrontpic:    INCBIN "gfx/pics/houndour/front.2bpp.lz"
+MankeyFrontpic:      INCBIN "gfx/pics/mankey/front.2bpp.lz"
+CelebiFrontpic:      INCBIN "gfx/pics/celebi/front.2bpp.lz"
+MediumPic:           INCBIN "gfx/trainers/medium.2bpp.lz"
+PinecoFrontpic:      INCBIN "gfx/pics/pineco/front.2bpp.lz"
+KrabbyFrontpic:      INCBIN "gfx/pics/krabby/front.2bpp.lz"
+FisherPic:           INCBIN "gfx/trainers/fisher.2bpp.lz"
+JigglypuffFrontpic:  INCBIN "gfx/pics/jigglypuff/front.2bpp.lz"
+ParasFrontpic:       INCBIN "gfx/pics/paras/front.2bpp.lz"
+NidokingBackpic:     INCBIN "gfx/pics/nidoking/back.2bpp.lz"
+PokefanmPic:         INCBIN "gfx/trainers/pokefan_m.2bpp.lz"
+BoarderPic:          INCBIN "gfx/trainers/boarder.2bpp.lz"
+PsyduckFrontpic:     INCBIN "gfx/pics/psyduck/front.2bpp.lz"
+SquirtleFrontpic:    INCBIN "gfx/pics/squirtle/front.2bpp.lz"
+MachampBackpic:      INCBIN "gfx/pics/machamp/back.2bpp.lz"
+KoffingFrontpic:     INCBIN "gfx/pics/koffing/front.2bpp.lz"
+VenonatFrontpic:     INCBIN "gfx/pics/venonat/front.2bpp.lz"
+ExeggutorBackpic:    INCBIN "gfx/pics/exeggutor/back.2bpp.lz"
+LanturnFrontpic:     INCBIN "gfx/pics/lanturn/front.2bpp.lz"
+TyrogueFrontpic:     INCBIN "gfx/pics/tyrogue/front.2bpp.lz"
+SkiploomFrontpic:    INCBIN "gfx/pics/skiploom/front.2bpp.lz"
+MareepFrontpic:      INCBIN "gfx/pics/mareep/front.2bpp.lz"
+ChuckPic:            INCBIN "gfx/trainers/chuck.2bpp.lz"
+EeveeFrontpic:       INCBIN "gfx/pics/eevee/front.2bpp.lz"
+ButterfreeBackpic:   INCBIN "gfx/pics/butterfree/back.2bpp.lz"
+ZubatFrontpic:       INCBIN "gfx/pics/zubat/front.2bpp.lz"
+KimonoGirlPic:       INCBIN "gfx/trainers/kimono_girl.2bpp.lz"
+AlakazamBackpic:     INCBIN "gfx/pics/alakazam/back.2bpp.lz"
+AipomFrontpic:       INCBIN "gfx/pics/aipom/front.2bpp.lz"
+AbraFrontpic:        INCBIN "gfx/pics/abra/front.2bpp.lz"
+HitmontopBackpic:    INCBIN "gfx/pics/hitmontop/back.2bpp.lz"
+CloysterBackpic:     INCBIN "gfx/pics/cloyster/back.2bpp.lz"
+HoothootFrontpic:    INCBIN "gfx/pics/hoothoot/front.2bpp.lz"
+UnownFBackpic:       INCBIN "gfx/pics/unown_f/back.2bpp.lz"
 ; 148000
 
 
 SECTION "Pics 11", ROMX, BANK[PICS_11]
 
-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"
+DodrioBackpic:       INCBIN "gfx/pics/dodrio/back.2bpp.lz"
+ClefairyFrontpic:    INCBIN "gfx/pics/clefairy/front.2bpp.lz"
+SlugmaFrontpic:      INCBIN "gfx/pics/slugma/front.2bpp.lz"
+GrowlitheFrontpic:   INCBIN "gfx/pics/growlithe/front.2bpp.lz"
+SlowpokeFrontpic:    INCBIN "gfx/pics/slowpoke/front.2bpp.lz"
+SmoochumFrontpic:    INCBIN "gfx/pics/smoochum/front.2bpp.lz"
+JugglerPic:          INCBIN "gfx/trainers/juggler.2bpp.lz"
+MarillFrontpic:      INCBIN "gfx/pics/marill/front.2bpp.lz"
+GuitaristPic:        INCBIN "gfx/trainers/guitarist.2bpp.lz"
+PokefanfPic:         INCBIN "gfx/trainers/pokefan_f.2bpp.lz"
+VenomothBackpic:     INCBIN "gfx/pics/venomoth/back.2bpp.lz"
+ClairPic:            INCBIN "gfx/trainers/clair.2bpp.lz"
+PokemaniacPic:       INCBIN "gfx/trainers/pokemaniac.2bpp.lz"
+OmanyteFrontpic:     INCBIN "gfx/pics/omanyte/front.2bpp.lz"
+SkierPic:            INCBIN "gfx/trainers/skier.2bpp.lz"
+PupitarFrontpic:     INCBIN "gfx/pics/pupitar/front.2bpp.lz"
+BellsproutFrontpic:  INCBIN "gfx/pics/bellsprout/front.2bpp.lz"
+ShellderFrontpic:    INCBIN "gfx/pics/shellder/front.2bpp.lz"
+TentacoolFrontpic:   INCBIN "gfx/pics/tentacool/front.2bpp.lz"
+CleffaFrontpic:      INCBIN "gfx/pics/cleffa/front.2bpp.lz"
+GyaradosBackpic:     INCBIN "gfx/pics/gyarados/back.2bpp.lz"
+NinetalesBackpic:    INCBIN "gfx/pics/ninetales/back.2bpp.lz"
+YanmaBackpic:        INCBIN "gfx/pics/yanma/back.2bpp.lz"
+PinsirBackpic:       INCBIN "gfx/pics/pinsir/back.2bpp.lz"
+LassPic:             INCBIN "gfx/trainers/lass.2bpp.lz"
+ClefableBackpic:     INCBIN "gfx/pics/clefable/back.2bpp.lz"
+DoduoFrontpic:       INCBIN "gfx/pics/doduo/front.2bpp.lz"
+FeraligatrBackpic:   INCBIN "gfx/pics/feraligatr/back.2bpp.lz"
+DratiniFrontpic:     INCBIN "gfx/pics/dratini/front.2bpp.lz"
+MagnetonBackpic:     INCBIN "gfx/pics/magneton/back.2bpp.lz"
+QwilfishFrontpic:    INCBIN "gfx/pics/qwilfish/front.2bpp.lz"
+SuicuneBackpic:      INCBIN "gfx/pics/suicune/back.2bpp.lz"
+SlowkingBackpic:     INCBIN "gfx/pics/slowking/back.2bpp.lz"
+ElekidBackpic:       INCBIN "gfx/pics/elekid/back.2bpp.lz"
+CelebiBackpic:       INCBIN "gfx/pics/celebi/back.2bpp.lz"
+KrabbyBackpic:       INCBIN "gfx/pics/krabby/back.2bpp.lz"
+BugCatcherPic:       INCBIN "gfx/trainers/bug_catcher.2bpp.lz"
+SnorlaxBackpic:      INCBIN "gfx/pics/snorlax/back.2bpp.lz"
 ; 14bffb
 
 
 SECTION "Pics 12", ROMX, BANK[PICS_12]
 
-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"
+VenusaurBackpic:     INCBIN "gfx/pics/venusaur/back.2bpp.lz"
+MoltresBackpic:      INCBIN "gfx/pics/moltres/back.2bpp.lz"
+SunfloraBackpic:     INCBIN "gfx/pics/sunflora/back.2bpp.lz"
+PhanpyFrontpic:      INCBIN "gfx/pics/phanpy/front.2bpp.lz"
+RhydonBackpic:       INCBIN "gfx/pics/rhydon/back.2bpp.lz"
+LarvitarFrontpic:    INCBIN "gfx/pics/larvitar/front.2bpp.lz"
+TyranitarBackpic:    INCBIN "gfx/pics/tyranitar/back.2bpp.lz"
+SandslashBackpic:    INCBIN "gfx/pics/sandslash/back.2bpp.lz"
+SeadraBackpic:       INCBIN "gfx/pics/seadra/back.2bpp.lz"
+TwinsPic:            INCBIN "gfx/trainers/twins.2bpp.lz"
+FarfetchDBackpic:    INCBIN "gfx/pics/farfetch_d/back.2bpp.lz"
+NidoranMBackpic:     INCBIN "gfx/pics/nidoran_m/back.2bpp.lz"
+LedybaBackpic:       INCBIN "gfx/pics/ledyba/back.2bpp.lz"
+CyndaquilBackpic:    INCBIN "gfx/pics/cyndaquil/back.2bpp.lz"
+BayleefBackpic:      INCBIN "gfx/pics/bayleef/back.2bpp.lz"
+OddishFrontpic:      INCBIN "gfx/pics/oddish/front.2bpp.lz"
+RapidashBackpic:     INCBIN "gfx/pics/rapidash/back.2bpp.lz"
+DoduoBackpic:        INCBIN "gfx/pics/doduo/back.2bpp.lz"
+HoppipFrontpic:      INCBIN "gfx/pics/hoppip/front.2bpp.lz"
+MankeyBackpic:       INCBIN "gfx/pics/mankey/back.2bpp.lz"
+MagmarBackpic:       INCBIN "gfx/pics/magmar/back.2bpp.lz"
+HypnoBackpic:        INCBIN "gfx/pics/hypno/back.2bpp.lz"
+QuilavaBackpic:      INCBIN "gfx/pics/quilava/back.2bpp.lz"
+CroconawBackpic:     INCBIN "gfx/pics/croconaw/back.2bpp.lz"
+SandshrewBackpic:    INCBIN "gfx/pics/sandshrew/back.2bpp.lz"
+SailorPic:           INCBIN "gfx/trainers/sailor.2bpp.lz"
+BeautyPic:           INCBIN "gfx/trainers/beauty.2bpp.lz"
+ShellderBackpic:     INCBIN "gfx/pics/shellder/back.2bpp.lz"
+ZubatBackpic:        INCBIN "gfx/pics/zubat/back.2bpp.lz"
+TeddiursaFrontpic:   INCBIN "gfx/pics/teddiursa/front.2bpp.lz"
+CuboneBackpic:       INCBIN "gfx/pics/cubone/back.2bpp.lz"
+GruntmPic:           INCBIN "gfx/trainers/grunt_m.2bpp.lz"
+GloomBackpic:        INCBIN "gfx/pics/gloom/back.2bpp.lz"
+MagcargoBackpic:     INCBIN "gfx/pics/magcargo/back.2bpp.lz"
+KabutopsBackpic:     INCBIN "gfx/pics/kabutops/back.2bpp.lz"
+BeedrillBackpic:     INCBIN "gfx/pics/beedrill/back.2bpp.lz"
+ArcanineBackpic:     INCBIN "gfx/pics/arcanine/back.2bpp.lz"
+FlareonBackpic:      INCBIN "gfx/pics/flareon/back.2bpp.lz"
+GoldeenBackpic:      INCBIN "gfx/pics/goldeen/back.2bpp.lz"
+BulbasaurFrontpic:   INCBIN "gfx/pics/bulbasaur/front.2bpp.lz"
+StarmieBackpic:      INCBIN "gfx/pics/starmie/back.2bpp.lz"
 ; 150000
 
 
 SECTION "Pics 13", ROMX, BANK[PICS_13]
 
-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"
+OmanyteBackpic:      INCBIN "gfx/pics/omanyte/back.2bpp.lz"
+PidgeyBackpic:       INCBIN "gfx/pics/pidgey/back.2bpp.lz"
+ScientistPic:        INCBIN "gfx/trainers/scientist.2bpp.lz"
+QwilfishBackpic:     INCBIN "gfx/pics/qwilfish/back.2bpp.lz"
+GligarBackpic:       INCBIN "gfx/pics/gligar/back.2bpp.lz"
+TyphlosionBackpic:   INCBIN "gfx/pics/typhlosion/back.2bpp.lz"
+CharmeleonBackpic:   INCBIN "gfx/pics/charmeleon/back.2bpp.lz"
+NidoqueenBackpic:    INCBIN "gfx/pics/nidoqueen/back.2bpp.lz"
+PichuFrontpic:       INCBIN "gfx/pics/pichu/front.2bpp.lz"
+ElectabuzzBackpic:   INCBIN "gfx/pics/electabuzz/back.2bpp.lz"
+LedianBackpic:       INCBIN "gfx/pics/ledian/back.2bpp.lz"
+PupitarBackpic:      INCBIN "gfx/pics/pupitar/back.2bpp.lz"
+HeracrossBackpic:    INCBIN "gfx/pics/heracross/back.2bpp.lz"
+UnownDFrontpic:      INCBIN "gfx/pics/unown_d/front.2bpp.lz"
+MiltankBackpic:      INCBIN "gfx/pics/miltank/back.2bpp.lz"
+SteelixBackpic:      INCBIN "gfx/pics/steelix/back.2bpp.lz"
+PersianBackpic:      INCBIN "gfx/pics/persian/back.2bpp.lz"
+LtSurgePic:          INCBIN "gfx/trainers/lt_surge.2bpp.lz"
+TeacherPic:          INCBIN "gfx/trainers/teacher.2bpp.lz"
+EggPic:              INCBIN "gfx/pics/egg/front.2bpp.lz"
+EeveeBackpic:        INCBIN "gfx/pics/eevee/back.2bpp.lz"
+ShuckleFrontpic:     INCBIN "gfx/pics/shuckle/front.2bpp.lz"
+PonytaBackpic:       INCBIN "gfx/pics/ponyta/back.2bpp.lz"
+RemoraidFrontpic:    INCBIN "gfx/pics/remoraid/front.2bpp.lz"
+PoliwagFrontpic:     INCBIN "gfx/pics/poliwag/front.2bpp.lz"
+OnixBackpic:         INCBIN "gfx/pics/onix/back.2bpp.lz"
+KoffingBackpic:      INCBIN "gfx/pics/koffing/back.2bpp.lz"
+BirdKeeperPic:       INCBIN "gfx/trainers/bird_keeper.2bpp.lz"
+FalknerPic:          INCBIN "gfx/trainers/falkner.2bpp.lz"
+KarenPic:            INCBIN "gfx/trainers/karen.2bpp.lz"
+NidorinaBackpic:     INCBIN "gfx/pics/nidorina/back.2bpp.lz"
+TentacruelBackpic:   INCBIN "gfx/pics/tentacruel/back.2bpp.lz"
+GrowlitheBackpic:    INCBIN "gfx/pics/growlithe/back.2bpp.lz"
+KogaPic:             INCBIN "gfx/trainers/koga.2bpp.lz"
+MachokeBackpic:      INCBIN "gfx/pics/machoke/back.2bpp.lz"
+RaichuBackpic:       INCBIN "gfx/pics/raichu/back.2bpp.lz"
+PoliwrathBackpic:    INCBIN "gfx/pics/poliwrath/back.2bpp.lz"
+SwimmermPic:         INCBIN "gfx/trainers/swimmer_m.2bpp.lz"
+SunkernFrontpic:     INCBIN "gfx/pics/sunkern/front.2bpp.lz"
+NidorinoBackpic:     INCBIN "gfx/pics/nidorino/back.2bpp.lz"
+MysticalmanPic:      INCBIN "gfx/trainers/mysticalman.2bpp.lz"
+CooltrainerfPic:     INCBIN "gfx/trainers/cooltrainer_f.2bpp.lz"
+ElectrodeFrontpic:   INCBIN "gfx/pics/electrode/front.2bpp.lz"
 ; 153fe3
 
 
 SECTION "Pics 14", ROMX, BANK[PICS_14]
 
-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"
+SudowoodoBackpic:    INCBIN "gfx/pics/sudowoodo/back.2bpp.lz"
+FlaaffyBackpic:      INCBIN "gfx/pics/flaaffy/back.2bpp.lz"
+SentretFrontpic:     INCBIN "gfx/pics/sentret/front.2bpp.lz"
+TogeticBackpic:      INCBIN "gfx/pics/togetic/back.2bpp.lz"
+BugsyPic:            INCBIN "gfx/trainers/bugsy.2bpp.lz"
+MarowakBackpic:      INCBIN "gfx/pics/marowak/back.2bpp.lz"
+GeodudeBackpic:      INCBIN "gfx/pics/geodude/back.2bpp.lz"
+ScytherBackpic:      INCBIN "gfx/pics/scyther/back.2bpp.lz"
+VileplumeBackpic:    INCBIN "gfx/pics/vileplume/back.2bpp.lz"
+HitmonchanBackpic:   INCBIN "gfx/pics/hitmonchan/back.2bpp.lz"
+JumpluffBackpic:     INCBIN "gfx/pics/jumpluff/back.2bpp.lz"
+CooltrainermPic:     INCBIN "gfx/trainers/cooltrainer_m.2bpp.lz"
+BlastoiseBackpic:    INCBIN "gfx/pics/blastoise/back.2bpp.lz"
+MisdreavusBackpic:   INCBIN "gfx/pics/misdreavus/back.2bpp.lz"
+TyrogueBackpic:      INCBIN "gfx/pics/tyrogue/back.2bpp.lz"
+GeodudeFrontpic:     INCBIN "gfx/pics/geodude/front.2bpp.lz"
+ScizorBackpic:       INCBIN "gfx/pics/scizor/back.2bpp.lz"
+GirafarigBackpic:    INCBIN "gfx/pics/girafarig/back.2bpp.lz"
+StantlerBackpic:     INCBIN "gfx/pics/stantler/back.2bpp.lz"
+SmeargleBackpic:     INCBIN "gfx/pics/smeargle/back.2bpp.lz"
+CharizardBackpic:    INCBIN "gfx/pics/charizard/back.2bpp.lz"
+KadabraBackpic:      INCBIN "gfx/pics/kadabra/back.2bpp.lz"
+PrimeapeBackpic:     INCBIN "gfx/pics/primeape/back.2bpp.lz"
+FurretBackpic:       INCBIN "gfx/pics/furret/back.2bpp.lz"
+WartortleBackpic:    INCBIN "gfx/pics/wartortle/back.2bpp.lz"
+ExeggcuteBackpic:    INCBIN "gfx/pics/exeggcute/back.2bpp.lz"
+IgglybuffFrontpic:   INCBIN "gfx/pics/igglybuff/front.2bpp.lz"
+RaticateBackpic:     INCBIN "gfx/pics/raticate/back.2bpp.lz"
+VulpixBackpic:       INCBIN "gfx/pics/vulpix/back.2bpp.lz"
+EkansBackpic:        INCBIN "gfx/pics/ekans/back.2bpp.lz"
+SeakingBackpic:      INCBIN "gfx/pics/seaking/back.2bpp.lz"
+BurglarPic:          INCBIN "gfx/trainers/burglar.2bpp.lz"
+PsyduckBackpic:      INCBIN "gfx/pics/psyduck/back.2bpp.lz"
+PikachuBackpic:      INCBIN "gfx/pics/pikachu/back.2bpp.lz"
+KabutoFrontpic:      INCBIN "gfx/pics/kabuto/front.2bpp.lz"
+MareepBackpic:       INCBIN "gfx/pics/mareep/back.2bpp.lz"
+RemoraidBackpic:     INCBIN "gfx/pics/remoraid/back.2bpp.lz"
+DittoFrontpic:       INCBIN "gfx/pics/ditto/front.2bpp.lz"
+KingdraBackpic:      INCBIN "gfx/pics/kingdra/back.2bpp.lz"
+CamperPic:           INCBIN "gfx/trainers/camper.2bpp.lz"
+WooperFrontpic:      INCBIN "gfx/pics/wooper/front.2bpp.lz"
+ClefairyBackpic:     INCBIN "gfx/pics/clefairy/back.2bpp.lz"
+VenonatBackpic:      INCBIN "gfx/pics/venonat/back.2bpp.lz"
+BellossomBackpic:    INCBIN "gfx/pics/bellossom/back.2bpp.lz"
+Rival1Pic:           INCBIN "gfx/trainers/rival1.2bpp.lz"
+SwinubBackpic:       INCBIN "gfx/pics/swinub/back.2bpp.lz"
 ; 158000
 
 
 SECTION "Pics 15", ROMX, BANK[PICS_15]
 
-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"
+MewtwoBackpic:       INCBIN "gfx/pics/mewtwo/back.2bpp.lz"
+PokemonProfPic:      INCBIN "gfx/trainers/oak.2bpp.lz"
+CalPic:              INCBIN "gfx/trainers/cal.2bpp.lz"
+SwimmerfPic:         INCBIN "gfx/trainers/swimmer_f.2bpp.lz"
+DiglettFrontpic:     INCBIN "gfx/pics/diglett/front.2bpp.lz"
+OfficerPic:          INCBIN "gfx/trainers/officer.2bpp.lz"
+MukBackpic:          INCBIN "gfx/pics/muk/back.2bpp.lz"
+DelibirdBackpic:     INCBIN "gfx/pics/delibird/back.2bpp.lz"
+SabrinaPic:          INCBIN "gfx/trainers/sabrina.2bpp.lz"
+MagikarpBackpic:     INCBIN "gfx/pics/magikarp/back.2bpp.lz"
+AriadosBackpic:      INCBIN "gfx/pics/ariados/back.2bpp.lz"
+SneaselBackpic:      INCBIN "gfx/pics/sneasel/back.2bpp.lz"
+UmbreonBackpic:      INCBIN "gfx/pics/umbreon/back.2bpp.lz"
+MurkrowBackpic:      INCBIN "gfx/pics/murkrow/back.2bpp.lz"
+IvysaurBackpic:      INCBIN "gfx/pics/ivysaur/back.2bpp.lz"
+SlowbroBackpic:      INCBIN "gfx/pics/slowbro/back.2bpp.lz"
+PsychicTPic:         INCBIN "gfx/trainers/psychic_t.2bpp.lz"
+GolduckBackpic:      INCBIN "gfx/pics/golduck/back.2bpp.lz"
+WeezingBackpic:      INCBIN "gfx/pics/weezing/back.2bpp.lz"
+EnteiBackpic:        INCBIN "gfx/pics/entei/back.2bpp.lz"
+GruntfPic:           INCBIN "gfx/trainers/grunt_f.2bpp.lz"
+HorseaFrontpic:      INCBIN "gfx/pics/horsea/front.2bpp.lz"
+PidgeotBackpic:      INCBIN "gfx/pics/pidgeot/back.2bpp.lz"
+HoOhBackpic:         INCBIN "gfx/pics/ho_oh/back.2bpp.lz"
+PoliwhirlBackpic:    INCBIN "gfx/pics/poliwhirl/back.2bpp.lz"
+MewBackpic:          INCBIN "gfx/pics/mew/back.2bpp.lz"
+MachopBackpic:       INCBIN "gfx/pics/machop/back.2bpp.lz"
+AbraBackpic:         INCBIN "gfx/pics/abra/back.2bpp.lz"
+AerodactylBackpic:   INCBIN "gfx/pics/aerodactyl/back.2bpp.lz"
+KakunaFrontpic:      INCBIN "gfx/pics/kakuna/front.2bpp.lz"
+DugtrioBackpic:      INCBIN "gfx/pics/dugtrio/back.2bpp.lz"
+WeepinbellBackpic:   INCBIN "gfx/pics/weepinbell/back.2bpp.lz"
+NidoranFBackpic:     INCBIN "gfx/pics/nidoran_f/back.2bpp.lz"
+GravelerBackpic:     INCBIN "gfx/pics/graveler/back.2bpp.lz"
+AipomBackpic:        INCBIN "gfx/pics/aipom/back.2bpp.lz"
+EspeonBackpic:       INCBIN "gfx/pics/espeon/back.2bpp.lz"
+WeedleFrontpic:      INCBIN "gfx/pics/weedle/front.2bpp.lz"
+TotodileBackpic:     INCBIN "gfx/pics/totodile/back.2bpp.lz"
+SnubbullBackpic:     INCBIN "gfx/pics/snubbull/back.2bpp.lz"
+KinglerBackpic:      INCBIN "gfx/pics/kingler/back.2bpp.lz"
+GengarBackpic:       INCBIN "gfx/pics/gengar/back.2bpp.lz"
+RattataBackpic:      INCBIN "gfx/pics/rattata/back.2bpp.lz"
+YoungsterPic:        INCBIN "gfx/trainers/youngster.2bpp.lz"
+WillPic:             INCBIN "gfx/trainers/will.2bpp.lz"
+SchoolboyPic:        INCBIN "gfx/trainers/schoolboy.2bpp.lz"
+MagnemiteFrontpic:   INCBIN "gfx/pics/magnemite/front.2bpp.lz"
+ErikaPic:            INCBIN "gfx/trainers/erika.2bpp.lz"
+JaninePic:           INCBIN "gfx/trainers/janine.2bpp.lz"
+MagnemiteBackpic:    INCBIN "gfx/pics/magnemite/back.2bpp.lz"
 ; 15bffa
 
 
 SECTION "Pics 16", ROMX, BANK[PICS_16]
 
-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"
+HoothootBackpic:     INCBIN "gfx/pics/hoothoot/back.2bpp.lz"
+NoctowlBackpic:      INCBIN "gfx/pics/noctowl/back.2bpp.lz"
+MortyPic:            INCBIN "gfx/trainers/morty.2bpp.lz"
+SlugmaBackpic:       INCBIN "gfx/pics/slugma/back.2bpp.lz"
+KabutoBackpic:       INCBIN "gfx/pics/kabuto/back.2bpp.lz"
+VictreebelBackpic:   INCBIN "gfx/pics/victreebel/back.2bpp.lz"
+MeowthBackpic:       INCBIN "gfx/pics/meowth/back.2bpp.lz"
+MeganiumBackpic:     INCBIN "gfx/pics/meganium/back.2bpp.lz"
+PicnickerPic:        INCBIN "gfx/trainers/picnicker.2bpp.lz"
+LickitungBackpic:    INCBIN "gfx/pics/lickitung/back.2bpp.lz"
+TogepiFrontpic:      INCBIN "gfx/pics/togepi/front.2bpp.lz"
+SuperNerdPic:        INCBIN "gfx/trainers/super_nerd.2bpp.lz"
+HaunterBackpic:      INCBIN "gfx/pics/haunter/back.2bpp.lz"
+XatuBackpic:         INCBIN "gfx/pics/xatu/back.2bpp.lz"
+RedPic:              INCBIN "gfx/trainers/red.2bpp.lz"
+Porygon2Backpic:     INCBIN "gfx/pics/porygon2/back.2bpp.lz"
+JasminePic:          INCBIN "gfx/trainers/jasmine.2bpp.lz"
+PinecoBackpic:       INCBIN "gfx/pics/pineco/back.2bpp.lz"
+MetapodFrontpic:     INCBIN "gfx/pics/metapod/front.2bpp.lz"
+SeelBackpic:         INCBIN "gfx/pics/seel/back.2bpp.lz"
+QuagsireBackpic:     INCBIN "gfx/pics/quagsire/back.2bpp.lz"
+WhitneyPic:          INCBIN "gfx/trainers/whitney.2bpp.lz"
+JolteonBackpic:      INCBIN "gfx/pics/jolteon/back.2bpp.lz"
+CaterpieFrontpic:    INCBIN "gfx/pics/caterpie/front.2bpp.lz"
+HoppipBackpic:       INCBIN "gfx/pics/hoppip/back.2bpp.lz"
+BluePic:             INCBIN "gfx/trainers/blue.2bpp.lz"
+GranbullBackpic:     INCBIN "gfx/pics/granbull/back.2bpp.lz"
+GentlemanPic:        INCBIN "gfx/trainers/gentleman.2bpp.lz"
+ExecutivemPic:       INCBIN "gfx/trainers/executive_m.2bpp.lz"
+SpearowBackpic:      INCBIN "gfx/pics/spearow/back.2bpp.lz"
+SunkernBackpic:      INCBIN "gfx/pics/sunkern/back.2bpp.lz"
+LaprasBackpic:       INCBIN "gfx/pics/lapras/back.2bpp.lz"
+MagbyBackpic:        INCBIN "gfx/pics/magby/back.2bpp.lz"
+DragonairBackpic:    INCBIN "gfx/pics/dragonair/back.2bpp.lz"
+ZapdosBackpic:       INCBIN "gfx/pics/zapdos/back.2bpp.lz"
+ChikoritaBackpic:    INCBIN "gfx/pics/chikorita/back.2bpp.lz"
+CorsolaBackpic:      INCBIN "gfx/pics/corsola/back.2bpp.lz"
+ChinchouBackpic:     INCBIN "gfx/pics/chinchou/back.2bpp.lz"
+ChanseyBackpic:      INCBIN "gfx/pics/chansey/back.2bpp.lz"
+SkiploomBackpic:     INCBIN "gfx/pics/skiploom/back.2bpp.lz"
+SpinarakFrontpic:    INCBIN "gfx/pics/spinarak/front.2bpp.lz"
+Rival2Pic:           INCBIN "gfx/trainers/rival2.2bpp.lz"
+UnownWFrontpic:      INCBIN "gfx/pics/unown_w/front.2bpp.lz"
+CharmanderBackpic:   INCBIN "gfx/pics/charmander/back.2bpp.lz"
+RhyhornBackpic:      INCBIN "gfx/pics/rhyhorn/back.2bpp.lz"
+UnownCFrontpic:      INCBIN "gfx/pics/unown_c/front.2bpp.lz"
+MistyPic:            INCBIN "gfx/trainers/misty.2bpp.lz"
+BlainePic:           INCBIN "gfx/trainers/blaine.2bpp.lz"
+UnownZFrontpic:      INCBIN "gfx/pics/unown_z/front.2bpp.lz"
+SwinubFrontpic:      INCBIN "gfx/pics/swinub/front.2bpp.lz"
+LarvitarBackpic:     INCBIN "gfx/pics/larvitar/back.2bpp.lz"
+PorygonBackpic:      INCBIN "gfx/pics/porygon/back.2bpp.lz"
+UnownHBackpic:       INCBIN "gfx/pics/unown_h/back.2bpp.lz"
 ; 15ffff
 
 
 SECTION "Pics 17", ROMX, BANK[PICS_17]
 
-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"
+ParasBackpic:        INCBIN "gfx/pics/paras/back.2bpp.lz"
+VaporeonBackpic:     INCBIN "gfx/pics/vaporeon/back.2bpp.lz"
+TentacoolBackpic:    INCBIN "gfx/pics/tentacool/back.2bpp.lz"
+ExecutivefPic:       INCBIN "gfx/trainers/executive_f.2bpp.lz"
+BulbasaurBackpic:    INCBIN "gfx/pics/bulbasaur/back.2bpp.lz"
+SmoochumBackpic:     INCBIN "gfx/pics/smoochum/back.2bpp.lz"
+PichuBackpic:        INCBIN "gfx/pics/pichu/back.2bpp.lz"
+HoundoomBackpic:     INCBIN "gfx/pics/houndoom/back.2bpp.lz"
+BellsproutBackpic:   INCBIN "gfx/pics/bellsprout/back.2bpp.lz"
+GrimerBackpic:       INCBIN "gfx/pics/grimer/back.2bpp.lz"
+LanturnBackpic:      INCBIN "gfx/pics/lanturn/back.2bpp.lz"
+PidgeottoBackpic:    INCBIN "gfx/pics/pidgeotto/back.2bpp.lz"
+StaryuBackpic:       INCBIN "gfx/pics/staryu/back.2bpp.lz"
+MrMimeBackpic:       INCBIN "gfx/pics/mr__mime/back.2bpp.lz"
+CaterpieBackpic:     INCBIN "gfx/pics/caterpie/back.2bpp.lz"
+VoltorbFrontpic:     INCBIN "gfx/pics/voltorb/front.2bpp.lz"
+LugiaBackpic:        INCBIN "gfx/pics/lugia/back.2bpp.lz"
+PrycePic:            INCBIN "gfx/trainers/pryce.2bpp.lz"
+BrockPic:            INCBIN "gfx/trainers/brock.2bpp.lz"
+UnownGFrontpic:      INCBIN "gfx/pics/unown_g/front.2bpp.lz"
+ArbokBackpic:        INCBIN "gfx/pics/arbok/back.2bpp.lz"
+PolitoedBackpic:     INCBIN "gfx/pics/politoed/back.2bpp.lz"
+DragoniteBackpic:    INCBIN "gfx/pics/dragonite/back.2bpp.lz"
+HitmonleeBackpic:    INCBIN "gfx/pics/hitmonlee/back.2bpp.lz"
+NatuFrontpic:        INCBIN "gfx/pics/natu/front.2bpp.lz"
+UrsaringBackpic:     INCBIN "gfx/pics/ursaring/back.2bpp.lz"
+SagePic:             INCBIN "gfx/trainers/sage.2bpp.lz"
+TeddiursaBackpic:    INCBIN "gfx/pics/teddiursa/back.2bpp.lz"
+PhanpyBackpic:       INCBIN "gfx/pics/phanpy/back.2bpp.lz"
+UnownVFrontpic:      INCBIN "gfx/pics/unown_v/front.2bpp.lz"
+KakunaBackpic:       INCBIN "gfx/pics/kakuna/back.2bpp.lz"
+WobbuffetBackpic:    INCBIN "gfx/pics/wobbuffet/back.2bpp.lz"
+TogepiBackpic:       INCBIN "gfx/pics/togepi/back.2bpp.lz"
+CrobatBackpic:       INCBIN "gfx/pics/crobat/back.2bpp.lz"
+BlisseyBackpic:      INCBIN "gfx/pics/blissey/back.2bpp.lz"
+AmpharosBackpic:     INCBIN "gfx/pics/ampharos/back.2bpp.lz"
+IgglybuffBackpic:    INCBIN "gfx/pics/igglybuff/back.2bpp.lz"
+AzumarillBackpic:    INCBIN "gfx/pics/azumarill/back.2bpp.lz"
+OctilleryBackpic:    INCBIN "gfx/pics/octillery/back.2bpp.lz"
+UnownSFrontpic:      INCBIN "gfx/pics/unown_s/front.2bpp.lz"
+HorseaBackpic:       INCBIN "gfx/pics/horsea/back.2bpp.lz"
+SentretBackpic:      INCBIN "gfx/pics/sentret/back.2bpp.lz"
+UnownOFrontpic:      INCBIN "gfx/pics/unown_o/front.2bpp.lz"
+UnownTFrontpic:      INCBIN "gfx/pics/unown_t/front.2bpp.lz"
+WigglytuffBackpic:   INCBIN "gfx/pics/wigglytuff/back.2bpp.lz"
+ArticunoBackpic:     INCBIN "gfx/pics/articuno/back.2bpp.lz"
+DittoBackpic:        INCBIN "gfx/pics/ditto/back.2bpp.lz"
+WeedleBackpic:       INCBIN "gfx/pics/weedle/back.2bpp.lz"
+UnownHFrontpic:      INCBIN "gfx/pics/unown_h/front.2bpp.lz"
+CleffaBackpic:       INCBIN "gfx/pics/cleffa/back.2bpp.lz"
+DrowzeeBackpic:      INCBIN "gfx/pics/drowzee/back.2bpp.lz"
+GastlyBackpic:       INCBIN "gfx/pics/gastly/back.2bpp.lz"
+FearowBackpic:       INCBIN "gfx/pics/fearow/back.2bpp.lz"
+MarillBackpic:       INCBIN "gfx/pics/marill/back.2bpp.lz"
+DratiniBackpic:      INCBIN "gfx/pics/dratini/back.2bpp.lz"
+ElectrodeBackpic:    INCBIN "gfx/pics/electrode/back.2bpp.lz"
+SkarmoryBackpic:     INCBIN "gfx/pics/skarmory/back.2bpp.lz"
+MetapodBackpic:      INCBIN "gfx/pics/metapod/back.2bpp.lz"
+JigglypuffBackpic:   INCBIN "gfx/pics/jigglypuff/back.2bpp.lz"
+OddishBackpic:       INCBIN "gfx/pics/oddish/back.2bpp.lz"
+UnownDBackpic:       INCBIN "gfx/pics/unown_d/back.2bpp.lz"
 ; 163ffc
 
 
 SECTION "Pics 18", ROMX, BANK[PICS_18]
 
-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"
+SpinarakBackpic:     INCBIN "gfx/pics/spinarak/back.2bpp.lz"
+RaikouBackpic:       INCBIN "gfx/pics/raikou/back.2bpp.lz"
+UnownKFrontpic:      INCBIN "gfx/pics/unown_k/front.2bpp.lz"
+HoundourBackpic:     INCBIN "gfx/pics/houndour/back.2bpp.lz"
+PoliwagBackpic:      INCBIN "gfx/pics/poliwag/back.2bpp.lz"
+SquirtleBackpic:     INCBIN "gfx/pics/squirtle/back.2bpp.lz"
+ShuckleBackpic:      INCBIN "gfx/pics/shuckle/back.2bpp.lz"
+DewgongBackpic:      INCBIN "gfx/pics/dewgong/back.2bpp.lz"
+UnownBFrontpic:      INCBIN "gfx/pics/unown_b/front.2bpp.lz"
+SlowpokeBackpic:     INCBIN "gfx/pics/slowpoke/back.2bpp.lz"
+DunsparceBackpic:    INCBIN "gfx/pics/dunsparce/back.2bpp.lz"
+DonphanBackpic:      INCBIN "gfx/pics/donphan/back.2bpp.lz"
+WooperBackpic:       INCBIN "gfx/pics/wooper/back.2bpp.lz"
+TaurosBackpic:       INCBIN "gfx/pics/tauros/back.2bpp.lz"
+UnownXFrontpic:      INCBIN "gfx/pics/unown_x/front.2bpp.lz"
+UnownNFrontpic:      INCBIN "gfx/pics/unown_n/front.2bpp.lz"
+TangelaBackpic:      INCBIN "gfx/pics/tangela/back.2bpp.lz"
+VoltorbBackpic:      INCBIN "gfx/pics/voltorb/back.2bpp.lz"
+UnownJFrontpic:      INCBIN "gfx/pics/unown_j/front.2bpp.lz"
+MantineBackpic:      INCBIN "gfx/pics/mantine/back.2bpp.lz"
+UnownLFrontpic:      INCBIN "gfx/pics/unown_l/front.2bpp.lz"
+PiloswineBackpic:    INCBIN "gfx/pics/piloswine/back.2bpp.lz"
+UnownMFrontpic:      INCBIN "gfx/pics/unown_m/front.2bpp.lz"
+UnownFFrontpic:      INCBIN "gfx/pics/unown_f/front.2bpp.lz"
+NatuBackpic:         INCBIN "gfx/pics/natu/back.2bpp.lz"
+UnownAFrontpic:      INCBIN "gfx/pics/unown_a/front.2bpp.lz"
+GolemBackpic:        INCBIN "gfx/pics/golem/back.2bpp.lz"
+UnownUFrontpic:      INCBIN "gfx/pics/unown_u/front.2bpp.lz"
+DiglettBackpic:      INCBIN "gfx/pics/diglett/back.2bpp.lz"
+UnownQFrontpic:      INCBIN "gfx/pics/unown_q/front.2bpp.lz"
+UnownPFrontpic:      INCBIN "gfx/pics/unown_p/front.2bpp.lz"
+UnownCBackpic:       INCBIN "gfx/pics/unown_c/back.2bpp.lz"
+JynxBackpic:         INCBIN "gfx/pics/jynx/back.2bpp.lz"
+GolbatBackpic:       INCBIN "gfx/pics/golbat/back.2bpp.lz"
+UnownYFrontpic:      INCBIN "gfx/pics/unown_y/front.2bpp.lz"
+UnownGBackpic:       INCBIN "gfx/pics/unown_g/back.2bpp.lz"
+UnownIFrontpic:      INCBIN "gfx/pics/unown_i/front.2bpp.lz"
+UnownVBackpic:       INCBIN "gfx/pics/unown_v/back.2bpp.lz"
+ForretressBackpic:   INCBIN "gfx/pics/forretress/back.2bpp.lz"
+UnownSBackpic:       INCBIN "gfx/pics/unown_s/back.2bpp.lz"
+UnownRFrontpic:      INCBIN "gfx/pics/unown_r/front.2bpp.lz"
+UnownEBackpic:       INCBIN "gfx/pics/unown_e/back.2bpp.lz"
+UnownJBackpic:       INCBIN "gfx/pics/unown_j/back.2bpp.lz"
+UnownBBackpic:       INCBIN "gfx/pics/unown_b/back.2bpp.lz"
+UnownOBackpic:       INCBIN "gfx/pics/unown_o/back.2bpp.lz"
+UnownZBackpic:       INCBIN "gfx/pics/unown_z/back.2bpp.lz"
+UnownWBackpic:       INCBIN "gfx/pics/unown_w/back.2bpp.lz"
+UnownNBackpic:       INCBIN "gfx/pics/unown_n/back.2bpp.lz"
+UnownABackpic:       INCBIN "gfx/pics/unown_a/back.2bpp.lz"
+UnownMBackpic:       INCBIN "gfx/pics/unown_m/back.2bpp.lz"
+UnownKBackpic:       INCBIN "gfx/pics/unown_k/back.2bpp.lz"
+UnownTBackpic:       INCBIN "gfx/pics/unown_t/back.2bpp.lz"
+UnownXBackpic:       INCBIN "gfx/pics/unown_x/back.2bpp.lz"
+UnownLBackpic:       INCBIN "gfx/pics/unown_l/back.2bpp.lz"
+UnownUBackpic:       INCBIN "gfx/pics/unown_u/back.2bpp.lz"
+UnownQBackpic:       INCBIN "gfx/pics/unown_q/back.2bpp.lz"
+UnownYBackpic:       INCBIN "gfx/pics/unown_y/back.2bpp.lz"
+UnownPBackpic:       INCBIN "gfx/pics/unown_p/back.2bpp.lz"
+UnownIBackpic:       INCBIN "gfx/pics/unown_i/back.2bpp.lz"
+UnownRBackpic:       INCBIN "gfx/pics/unown_r/back.2bpp.lz"
 ; 1669d3
 
 
@@ -729,63 +729,63 @@ SECTION "Pics 19", ROMX, BANK[PICS_19]
 
 ; Seems to be an accidental copy of the previous bank
 
-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"
+INCBIN "gfx/pics/spinarak/back.2bpp.lz"
+INCBIN "gfx/pics/raikou/back.2bpp.lz"
+INCBIN "gfx/pics/unown_k/front.2bpp.lz"
+INCBIN "gfx/pics/houndour/back.2bpp.lz"
+INCBIN "gfx/pics/poliwag/back.2bpp.lz"
+INCBIN "gfx/pics/squirtle/back.2bpp.lz"
+INCBIN "gfx/pics/shuckle/back.2bpp.lz"
+INCBIN "gfx/pics/dewgong/back.2bpp.lz"
+INCBIN "gfx/pics/unown_b/front.2bpp.lz"
+INCBIN "gfx/pics/slowpoke/back.2bpp.lz"
+INCBIN "gfx/pics/dunsparce/back.2bpp.lz"
+INCBIN "gfx/pics/donphan/back.2bpp.lz"
+INCBIN "gfx/pics/wooper/back.2bpp.lz"
+INCBIN "gfx/pics/tauros/back.2bpp.lz"
+INCBIN "gfx/pics/unown_x/front.2bpp.lz"
+INCBIN "gfx/pics/unown_n/front.2bpp.lz"
+INCBIN "gfx/pics/tangela/back.2bpp.lz"
+INCBIN "gfx/pics/voltorb/back.2bpp.lz"
+INCBIN "gfx/pics/unown_j/front.2bpp.lz"
+INCBIN "gfx/pics/mantine/back.2bpp.lz"
+INCBIN "gfx/pics/unown_l/front.2bpp.lz"
+INCBIN "gfx/pics/piloswine/back.2bpp.lz"
+INCBIN "gfx/pics/unown_m/front.2bpp.lz"
+INCBIN "gfx/pics/unown_f/front.2bpp.lz"
+INCBIN "gfx/pics/natu/back.2bpp.lz"
+INCBIN "gfx/pics/unown_a/front.2bpp.lz"
+INCBIN "gfx/pics/golem/back.2bpp.lz"
+INCBIN "gfx/pics/unown_u/front.2bpp.lz"
+INCBIN "gfx/pics/diglett/back.2bpp.lz"
+INCBIN "gfx/pics/unown_q/front.2bpp.lz"
+INCBIN "gfx/pics/unown_p/front.2bpp.lz"
+INCBIN "gfx/pics/unown_c/back.2bpp.lz"
+INCBIN "gfx/pics/jynx/back.2bpp.lz"
+INCBIN "gfx/pics/golbat/back.2bpp.lz"
+INCBIN "gfx/pics/unown_y/front.2bpp.lz"
+INCBIN "gfx/pics/unown_g/back.2bpp.lz"
+INCBIN "gfx/pics/unown_i/front.2bpp.lz"
+INCBIN "gfx/pics/unown_v/back.2bpp.lz"
+INCBIN "gfx/pics/forretress/back.2bpp.lz"
+INCBIN "gfx/pics/unown_s/back.2bpp.lz"
+INCBIN "gfx/pics/unown_r/front.2bpp.lz"
+INCBIN "gfx/pics/unown_e/back.2bpp.lz"
+INCBIN "gfx/pics/unown_j/back.2bpp.lz"
+INCBIN "gfx/pics/unown_b/back.2bpp.lz"
+INCBIN "gfx/pics/unown_o/back.2bpp.lz"
+INCBIN "gfx/pics/unown_z/back.2bpp.lz"
+INCBIN "gfx/pics/unown_w/back.2bpp.lz"
+INCBIN "gfx/pics/unown_n/back.2bpp.lz"
+INCBIN "gfx/pics/unown_a/back.2bpp.lz"
+INCBIN "gfx/pics/unown_m/back.2bpp.lz"
+INCBIN "gfx/pics/unown_k/back.2bpp.lz"
+INCBIN "gfx/pics/unown_t/back.2bpp.lz"
+INCBIN "gfx/pics/unown_x/back.2bpp.lz"
+INCBIN "gfx/pics/unown_l/back.2bpp.lz"
+INCBIN "gfx/pics/unown_u/back.2bpp.lz"
+INCBIN "gfx/pics/unown_q/back.2bpp.lz"
+INCBIN "gfx/pics/unown_y/back.2bpp.lz"
+INCBIN "gfx/pics/unown_p/back.2bpp.lz"
+INCBIN "gfx/pics/unown_i/back.2bpp.lz"
+INCBIN "gfx/pics/unown_r/back.2bpp.lz"
diff --git a/gfx/pics/abra/back.6x6.2bpp.lz b/gfx/pics/abra/back.2bpp.lz
index 2df351881..2df351881 100644
--- a/gfx/pics/abra/back.6x6.2bpp.lz
+++ b/gfx/pics/abra/back.2bpp.lz
diff --git a/gfx/pics/abra/front.5x5.2bpp.lz b/gfx/pics/abra/front.2bpp.lz
index 2b41c4263..2b41c4263 100644
--- a/gfx/pics/abra/front.5x5.2bpp.lz
+++ b/gfx/pics/abra/front.2bpp.lz
diff --git a/gfx/pics/aerodactyl/back.6x6.2bpp.lz b/gfx/pics/aerodactyl/back.2bpp.lz
index 05536351b..05536351b 100644
--- a/gfx/pics/aerodactyl/back.6x6.2bpp.lz
+++ b/gfx/pics/aerodactyl/back.2bpp.lz
diff --git a/gfx/pics/aerodactyl/front.7x7.2bpp.lz b/gfx/pics/aerodactyl/front.2bpp.lz
index ae8d9f8ab..ae8d9f8ab 100644
--- a/gfx/pics/aerodactyl/front.7x7.2bpp.lz
+++ b/gfx/pics/aerodactyl/front.2bpp.lz
diff --git a/gfx/pics/aipom/back.6x6.2bpp.lz b/gfx/pics/aipom/back.2bpp.lz
index d6d9fdbc1..d6d9fdbc1 100644
--- a/gfx/pics/aipom/back.6x6.2bpp.lz
+++ b/gfx/pics/aipom/back.2bpp.lz
diff --git a/gfx/pics/aipom/front.5x5.2bpp.lz b/gfx/pics/aipom/front.2bpp.lz
index 58800e5e4..58800e5e4 100644
--- a/gfx/pics/aipom/front.5x5.2bpp.lz
+++ b/gfx/pics/aipom/front.2bpp.lz
diff --git a/gfx/pics/alakazam/back.6x6.2bpp.lz b/gfx/pics/alakazam/back.2bpp.lz
index 65f1a2729..65f1a2729 100644
--- a/gfx/pics/alakazam/back.6x6.2bpp.lz
+++ b/gfx/pics/alakazam/back.2bpp.lz
diff --git a/gfx/pics/alakazam/front.7x7.2bpp.lz b/gfx/pics/alakazam/front.2bpp.lz
index 6272553a7..6272553a7 100644
--- a/gfx/pics/alakazam/front.7x7.2bpp.lz
+++ b/gfx/pics/alakazam/front.2bpp.lz
diff --git a/gfx/pics/ampharos/back.6x6.2bpp.lz b/gfx/pics/ampharos/back.2bpp.lz
index 8d3b42d9b..8d3b42d9b 100644
--- a/gfx/pics/ampharos/back.6x6.2bpp.lz
+++ b/gfx/pics/ampharos/back.2bpp.lz
diff --git a/gfx/pics/ampharos/front.7x7.2bpp.lz b/gfx/pics/ampharos/front.2bpp.lz
index 84f43c105..84f43c105 100644
--- a/gfx/pics/ampharos/front.7x7.2bpp.lz
+++ b/gfx/pics/ampharos/front.2bpp.lz
diff --git a/gfx/pics/arbok/back.6x6.2bpp.lz b/gfx/pics/arbok/back.2bpp.lz
index 175abb499..175abb499 100644
--- a/gfx/pics/arbok/back.6x6.2bpp.lz
+++ b/gfx/pics/arbok/back.2bpp.lz
diff --git a/gfx/pics/arbok/front.7x7.2bpp.lz b/gfx/pics/arbok/front.2bpp.lz
index 8b5918dbd..8b5918dbd 100644
--- a/gfx/pics/arbok/front.7x7.2bpp.lz
+++ b/gfx/pics/arbok/front.2bpp.lz
diff --git a/gfx/pics/arcanine/back.6x6.2bpp.lz b/gfx/pics/arcanine/back.2bpp.lz
index a76d64986..a76d64986 100644
--- a/gfx/pics/arcanine/back.6x6.2bpp.lz
+++ b/gfx/pics/arcanine/back.2bpp.lz
diff --git a/gfx/pics/arcanine/front.7x7.2bpp.lz b/gfx/pics/arcanine/front.2bpp.lz
index da1784800..da1784800 100644
--- a/gfx/pics/arcanine/front.7x7.2bpp.lz
+++ b/gfx/pics/arcanine/front.2bpp.lz
diff --git a/gfx/pics/ariados/back.6x6.2bpp.lz b/gfx/pics/ariados/back.2bpp.lz
index ff3aec7fb..ff3aec7fb 100644
--- a/gfx/pics/ariados/back.6x6.2bpp.lz
+++ b/gfx/pics/ariados/back.2bpp.lz
diff --git a/gfx/pics/ariados/front.7x7.2bpp.lz b/gfx/pics/ariados/front.2bpp.lz
index 51039aeb5..51039aeb5 100644
--- a/gfx/pics/ariados/front.7x7.2bpp.lz
+++ b/gfx/pics/ariados/front.2bpp.lz
diff --git a/gfx/pics/articuno/back.6x6.2bpp.lz b/gfx/pics/articuno/back.2bpp.lz
index 87b61ac9d..87b61ac9d 100644
--- a/gfx/pics/articuno/back.6x6.2bpp.lz
+++ b/gfx/pics/articuno/back.2bpp.lz
diff --git a/gfx/pics/articuno/front.7x7.2bpp.lz b/gfx/pics/articuno/front.2bpp.lz
index a60367098..a60367098 100644
--- a/gfx/pics/articuno/front.7x7.2bpp.lz
+++ b/gfx/pics/articuno/front.2bpp.lz
diff --git a/gfx/pics/azumarill/back.6x6.2bpp.lz b/gfx/pics/azumarill/back.2bpp.lz
index b66df2a71..b66df2a71 100644
--- a/gfx/pics/azumarill/back.6x6.2bpp.lz
+++ b/gfx/pics/azumarill/back.2bpp.lz
diff --git a/gfx/pics/azumarill/front.7x7.2bpp.lz b/gfx/pics/azumarill/front.2bpp.lz
index d6f031164..d6f031164 100644
--- a/gfx/pics/azumarill/front.7x7.2bpp.lz
+++ b/gfx/pics/azumarill/front.2bpp.lz
diff --git a/gfx/pics/bayleef/back.6x6.2bpp.lz b/gfx/pics/bayleef/back.2bpp.lz
index 809e5d199..809e5d199 100644
--- a/gfx/pics/bayleef/back.6x6.2bpp.lz
+++ b/gfx/pics/bayleef/back.2bpp.lz
diff --git a/gfx/pics/bayleef/front.6x6.2bpp.lz b/gfx/pics/bayleef/front.2bpp.lz
index 3134f6e16..3134f6e16 100644
--- a/gfx/pics/bayleef/front.6x6.2bpp.lz
+++ b/gfx/pics/bayleef/front.2bpp.lz
diff --git a/gfx/pics/beedrill/back.6x6.2bpp.lz b/gfx/pics/beedrill/back.2bpp.lz
index 492eb64e2..492eb64e2 100644
--- a/gfx/pics/beedrill/back.6x6.2bpp.lz
+++ b/gfx/pics/beedrill/back.2bpp.lz
diff --git a/gfx/pics/beedrill/front.7x7.2bpp.lz b/gfx/pics/beedrill/front.2bpp.lz
index 55f560521..55f560521 100644
--- a/gfx/pics/beedrill/front.7x7.2bpp.lz
+++ b/gfx/pics/beedrill/front.2bpp.lz
diff --git a/gfx/pics/bellossom/back.6x6.2bpp.lz b/gfx/pics/bellossom/back.2bpp.lz
index d1a59b617..d1a59b617 100644
--- a/gfx/pics/bellossom/back.6x6.2bpp.lz
+++ b/gfx/pics/bellossom/back.2bpp.lz
diff --git a/gfx/pics/bellossom/front.7x7.2bpp.lz b/gfx/pics/bellossom/front.2bpp.lz
index 9cba9a1c3..9cba9a1c3 100644
--- a/gfx/pics/bellossom/front.7x7.2bpp.lz
+++ b/gfx/pics/bellossom/front.2bpp.lz
diff --git a/gfx/pics/bellsprout/back.6x6.2bpp.lz b/gfx/pics/bellsprout/back.2bpp.lz
index ab600f064..ab600f064 100644
--- a/gfx/pics/bellsprout/back.6x6.2bpp.lz
+++ b/gfx/pics/bellsprout/back.2bpp.lz
diff --git a/gfx/pics/bellsprout/front.5x5.2bpp.lz b/gfx/pics/bellsprout/front.2bpp.lz
index 2593fb112..2593fb112 100644
--- a/gfx/pics/bellsprout/front.5x5.2bpp.lz
+++ b/gfx/pics/bellsprout/front.2bpp.lz
diff --git a/gfx/pics/blastoise/back.6x6.2bpp.lz b/gfx/pics/blastoise/back.2bpp.lz
index 5e27c9989..5e27c9989 100644
--- a/gfx/pics/blastoise/back.6x6.2bpp.lz
+++ b/gfx/pics/blastoise/back.2bpp.lz
diff --git a/gfx/pics/blastoise/front.7x7.2bpp.lz b/gfx/pics/blastoise/front.2bpp.lz
index 33148b076..33148b076 100644
--- a/gfx/pics/blastoise/front.7x7.2bpp.lz
+++ b/gfx/pics/blastoise/front.2bpp.lz
diff --git a/gfx/pics/blissey/back.6x6.2bpp.lz b/gfx/pics/blissey/back.2bpp.lz
index 00749ddee..00749ddee 100644
--- a/gfx/pics/blissey/back.6x6.2bpp.lz
+++ b/gfx/pics/blissey/back.2bpp.lz
diff --git a/gfx/pics/blissey/front.7x7.2bpp.lz b/gfx/pics/blissey/front.2bpp.lz
index 76f492c43..76f492c43 100644
--- a/gfx/pics/blissey/front.7x7.2bpp.lz
+++ b/gfx/pics/blissey/front.2bpp.lz
diff --git a/gfx/pics/bulbasaur/back.6x6.2bpp.lz b/gfx/pics/bulbasaur/back.2bpp.lz
index 44f8fa450..44f8fa450 100644
--- a/gfx/pics/bulbasaur/back.6x6.2bpp.lz
+++ b/gfx/pics/bulbasaur/back.2bpp.lz
diff --git a/gfx/pics/bulbasaur/front.5x5.2bpp.lz b/gfx/pics/bulbasaur/front.2bpp.lz
index fc4550001..fc4550001 100644
--- a/gfx/pics/bulbasaur/front.5x5.2bpp.lz
+++ b/gfx/pics/bulbasaur/front.2bpp.lz
diff --git a/gfx/pics/butterfree/back.6x6.2bpp.lz b/gfx/pics/butterfree/back.2bpp.lz
index 6d741f493..6d741f493 100644
--- a/gfx/pics/butterfree/back.6x6.2bpp.lz
+++ b/gfx/pics/butterfree/back.2bpp.lz
diff --git a/gfx/pics/butterfree/front.7x7.2bpp.lz b/gfx/pics/butterfree/front.2bpp.lz
index bf8b7a690..bf8b7a690 100644
--- a/gfx/pics/butterfree/front.7x7.2bpp.lz
+++ b/gfx/pics/butterfree/front.2bpp.lz
diff --git a/gfx/pics/caterpie/back.6x6.2bpp.lz b/gfx/pics/caterpie/back.2bpp.lz
index a3788d1e4..a3788d1e4 100644
--- a/gfx/pics/caterpie/back.6x6.2bpp.lz
+++ b/gfx/pics/caterpie/back.2bpp.lz
diff --git a/gfx/pics/caterpie/front.5x5.2bpp.lz b/gfx/pics/caterpie/front.2bpp.lz
index d3036d9ff..d3036d9ff 100644
--- a/gfx/pics/caterpie/front.5x5.2bpp.lz
+++ b/gfx/pics/caterpie/front.2bpp.lz
diff --git a/gfx/pics/celebi/back.6x6.2bpp.lz b/gfx/pics/celebi/back.2bpp.lz
index e8153224c..e8153224c 100644
--- a/gfx/pics/celebi/back.6x6.2bpp.lz
+++ b/gfx/pics/celebi/back.2bpp.lz
diff --git a/gfx/pics/celebi/front.5x5.2bpp.lz b/gfx/pics/celebi/front.2bpp.lz
index afc41bee7..afc41bee7 100644
--- a/gfx/pics/celebi/front.5x5.2bpp.lz
+++ b/gfx/pics/celebi/front.2bpp.lz
diff --git a/gfx/pics/chansey/back.6x6.2bpp.lz b/gfx/pics/chansey/back.2bpp.lz
index 239df2d63..239df2d63 100644
--- a/gfx/pics/chansey/back.6x6.2bpp.lz
+++ b/gfx/pics/chansey/back.2bpp.lz
diff --git a/gfx/pics/chansey/front.6x6.2bpp.lz b/gfx/pics/chansey/front.2bpp.lz
index 1fc457f19..1fc457f19 100644
--- a/gfx/pics/chansey/front.6x6.2bpp.lz
+++ b/gfx/pics/chansey/front.2bpp.lz
diff --git a/gfx/pics/charizard/back.6x6.2bpp.lz b/gfx/pics/charizard/back.2bpp.lz
index db1d9c9ea..db1d9c9ea 100644
--- a/gfx/pics/charizard/back.6x6.2bpp.lz
+++ b/gfx/pics/charizard/back.2bpp.lz
diff --git a/gfx/pics/charizard/front.7x7.2bpp.lz b/gfx/pics/charizard/front.2bpp.lz
index aab0fda99..aab0fda99 100644
--- a/gfx/pics/charizard/front.7x7.2bpp.lz
+++ b/gfx/pics/charizard/front.2bpp.lz
diff --git a/gfx/pics/charmander/back.6x6.2bpp.lz b/gfx/pics/charmander/back.2bpp.lz
index e8eb5eb4e..e8eb5eb4e 100644
--- a/gfx/pics/charmander/back.6x6.2bpp.lz
+++ b/gfx/pics/charmander/back.2bpp.lz
diff --git a/gfx/pics/charmander/front.5x5.2bpp.lz b/gfx/pics/charmander/front.2bpp.lz
index 7cc31694b..7cc31694b 100644
--- a/gfx/pics/charmander/front.5x5.2bpp.lz
+++ b/gfx/pics/charmander/front.2bpp.lz
diff --git a/gfx/pics/charmeleon/back.6x6.2bpp.lz b/gfx/pics/charmeleon/back.2bpp.lz
index aec0cd7b2..aec0cd7b2 100644
--- a/gfx/pics/charmeleon/back.6x6.2bpp.lz
+++ b/gfx/pics/charmeleon/back.2bpp.lz
diff --git a/gfx/pics/charmeleon/front.6x6.2bpp.lz b/gfx/pics/charmeleon/front.2bpp.lz
index efe789dad..efe789dad 100644
--- a/gfx/pics/charmeleon/front.6x6.2bpp.lz
+++ b/gfx/pics/charmeleon/front.2bpp.lz
diff --git a/gfx/pics/chikorita/back.6x6.2bpp.lz b/gfx/pics/chikorita/back.2bpp.lz
index e98365a2b..e98365a2b 100644
--- a/gfx/pics/chikorita/back.6x6.2bpp.lz
+++ b/gfx/pics/chikorita/back.2bpp.lz
diff --git a/gfx/pics/chikorita/front.5x5.2bpp.lz b/gfx/pics/chikorita/front.2bpp.lz
index 008c4ec2d..008c4ec2d 100644
--- a/gfx/pics/chikorita/front.5x5.2bpp.lz
+++ b/gfx/pics/chikorita/front.2bpp.lz
diff --git a/gfx/pics/chinchou/back.6x6.2bpp.lz b/gfx/pics/chinchou/back.2bpp.lz
index 744af1ad4..744af1ad4 100644
--- a/gfx/pics/chinchou/back.6x6.2bpp.lz
+++ b/gfx/pics/chinchou/back.2bpp.lz
diff --git a/gfx/pics/chinchou/front.6x6.2bpp.lz b/gfx/pics/chinchou/front.2bpp.lz
index b5db65701..b5db65701 100644
--- a/gfx/pics/chinchou/front.6x6.2bpp.lz
+++ b/gfx/pics/chinchou/front.2bpp.lz
diff --git a/gfx/pics/clefable/back.6x6.2bpp.lz b/gfx/pics/clefable/back.2bpp.lz
index 1bcb8cbcd..1bcb8cbcd 100644
--- a/gfx/pics/clefable/back.6x6.2bpp.lz
+++ b/gfx/pics/clefable/back.2bpp.lz
diff --git a/gfx/pics/clefable/front.6x6.2bpp.lz b/gfx/pics/clefable/front.2bpp.lz
index 4fb424305..4fb424305 100644
--- a/gfx/pics/clefable/front.6x6.2bpp.lz
+++ b/gfx/pics/clefable/front.2bpp.lz
diff --git a/gfx/pics/clefairy/back.6x6.2bpp.lz b/gfx/pics/clefairy/back.2bpp.lz
index a6a5ecb82..a6a5ecb82 100644
--- a/gfx/pics/clefairy/back.6x6.2bpp.lz
+++ b/gfx/pics/clefairy/back.2bpp.lz
diff --git a/gfx/pics/clefairy/front.5x5.2bpp.lz b/gfx/pics/clefairy/front.2bpp.lz
index d8adc2e2e..d8adc2e2e 100644
--- a/gfx/pics/clefairy/front.5x5.2bpp.lz
+++ b/gfx/pics/clefairy/front.2bpp.lz
diff --git a/gfx/pics/cleffa/back.6x6.2bpp.lz b/gfx/pics/cleffa/back.2bpp.lz
index 35ec3369b..35ec3369b 100644
--- a/gfx/pics/cleffa/back.6x6.2bpp.lz
+++ b/gfx/pics/cleffa/back.2bpp.lz
diff --git a/gfx/pics/cleffa/front.5x5.2bpp.lz b/gfx/pics/cleffa/front.2bpp.lz
index e8c624069..e8c624069 100644
--- a/gfx/pics/cleffa/front.5x5.2bpp.lz
+++ b/gfx/pics/cleffa/front.2bpp.lz
diff --git a/gfx/pics/cloyster/back.6x6.2bpp.lz b/gfx/pics/cloyster/back.2bpp.lz
index 655890df8..655890df8 100644
--- a/gfx/pics/cloyster/back.6x6.2bpp.lz
+++ b/gfx/pics/cloyster/back.2bpp.lz
diff --git a/gfx/pics/cloyster/front.7x7.2bpp.lz b/gfx/pics/cloyster/front.2bpp.lz
index 83991eed6..83991eed6 100644
--- a/gfx/pics/cloyster/front.7x7.2bpp.lz
+++ b/gfx/pics/cloyster/front.2bpp.lz
diff --git a/gfx/pics/corsola/back.6x6.2bpp.lz b/gfx/pics/corsola/back.2bpp.lz
index 6707a3538..6707a3538 100644
--- a/gfx/pics/corsola/back.6x6.2bpp.lz
+++ b/gfx/pics/corsola/back.2bpp.lz
diff --git a/gfx/pics/corsola/front.6x6.2bpp.lz b/gfx/pics/corsola/front.2bpp.lz
index afa208922..afa208922 100644
--- a/gfx/pics/corsola/front.6x6.2bpp.lz
+++ b/gfx/pics/corsola/front.2bpp.lz
diff --git a/gfx/pics/crobat/back.6x6.2bpp.lz b/gfx/pics/crobat/back.2bpp.lz
index a572d93c5..a572d93c5 100644
--- a/gfx/pics/crobat/back.6x6.2bpp.lz
+++ b/gfx/pics/crobat/back.2bpp.lz
diff --git a/gfx/pics/crobat/front.7x7.2bpp.lz b/gfx/pics/crobat/front.2bpp.lz
index 1e12aeed2..1e12aeed2 100644
--- a/gfx/pics/crobat/front.7x7.2bpp.lz
+++ b/gfx/pics/crobat/front.2bpp.lz
diff --git a/gfx/pics/croconaw/back.6x6.2bpp.lz b/gfx/pics/croconaw/back.2bpp.lz
index 7e573e6a0..7e573e6a0 100644
--- a/gfx/pics/croconaw/back.6x6.2bpp.lz
+++ b/gfx/pics/croconaw/back.2bpp.lz
diff --git a/gfx/pics/croconaw/front.6x6.2bpp.lz b/gfx/pics/croconaw/front.2bpp.lz
index 9c7f511ba..9c7f511ba 100644
--- a/gfx/pics/croconaw/front.6x6.2bpp.lz
+++ b/gfx/pics/croconaw/front.2bpp.lz
diff --git a/gfx/pics/cubone/back.6x6.2bpp.lz b/gfx/pics/cubone/back.2bpp.lz
index fc9931417..fc9931417 100644
--- a/gfx/pics/cubone/back.6x6.2bpp.lz
+++ b/gfx/pics/cubone/back.2bpp.lz
diff --git a/gfx/pics/cubone/front.5x5.2bpp.lz b/gfx/pics/cubone/front.2bpp.lz
index 9de9f7732..9de9f7732 100644
--- a/gfx/pics/cubone/front.5x5.2bpp.lz
+++ b/gfx/pics/cubone/front.2bpp.lz
diff --git a/gfx/pics/cyndaquil/back.6x6.2bpp.lz b/gfx/pics/cyndaquil/back.2bpp.lz
index 226c41e49..226c41e49 100644
--- a/gfx/pics/cyndaquil/back.6x6.2bpp.lz
+++ b/gfx/pics/cyndaquil/back.2bpp.lz
diff --git a/gfx/pics/cyndaquil/front.5x5.2bpp.lz b/gfx/pics/cyndaquil/front.2bpp.lz
index 3e2886783..3e2886783 100644
--- a/gfx/pics/cyndaquil/front.5x5.2bpp.lz
+++ b/gfx/pics/cyndaquil/front.2bpp.lz
diff --git a/gfx/pics/delibird/back.6x6.2bpp.lz b/gfx/pics/delibird/back.2bpp.lz
index 22f41237c..22f41237c 100644
--- a/gfx/pics/delibird/back.6x6.2bpp.lz
+++ b/gfx/pics/delibird/back.2bpp.lz
diff --git a/gfx/pics/delibird/front.6x6.2bpp.lz b/gfx/pics/delibird/front.2bpp.lz
index 819e46af0..819e46af0 100644
--- a/gfx/pics/delibird/front.6x6.2bpp.lz
+++ b/gfx/pics/delibird/front.2bpp.lz
diff --git a/gfx/pics/dewgong/back.6x6.2bpp.lz b/gfx/pics/dewgong/back.2bpp.lz
index bc6842e86..bc6842e86 100644
--- a/gfx/pics/dewgong/back.6x6.2bpp.lz
+++ b/gfx/pics/dewgong/back.2bpp.lz
diff --git a/gfx/pics/dewgong/front.7x7.2bpp.lz b/gfx/pics/dewgong/front.2bpp.lz
index cbb0ace94..cbb0ace94 100644
--- a/gfx/pics/dewgong/front.7x7.2bpp.lz
+++ b/gfx/pics/dewgong/front.2bpp.lz
diff --git a/gfx/pics/diglett/back.6x6.2bpp.lz b/gfx/pics/diglett/back.2bpp.lz
index 05625954c..05625954c 100644
--- a/gfx/pics/diglett/back.6x6.2bpp.lz
+++ b/gfx/pics/diglett/back.2bpp.lz
diff --git a/gfx/pics/diglett/front.5x5.2bpp.lz b/gfx/pics/diglett/front.2bpp.lz
index 5ed5e87ff..5ed5e87ff 100644
--- a/gfx/pics/diglett/front.5x5.2bpp.lz
+++ b/gfx/pics/diglett/front.2bpp.lz
diff --git a/gfx/pics/ditto/back.6x6.2bpp.lz b/gfx/pics/ditto/back.2bpp.lz
index ee2a621bf..ee2a621bf 100644
--- a/gfx/pics/ditto/back.6x6.2bpp.lz
+++ b/gfx/pics/ditto/back.2bpp.lz
diff --git a/gfx/pics/ditto/front.5x5.2bpp.lz b/gfx/pics/ditto/front.2bpp.lz
index ef64bd777..ef64bd777 100644
--- a/gfx/pics/ditto/front.5x5.2bpp.lz
+++ b/gfx/pics/ditto/front.2bpp.lz
diff --git a/gfx/pics/dodrio/back.6x6.2bpp.lz b/gfx/pics/dodrio/back.2bpp.lz
index 3b1d80db5..3b1d80db5 100644
--- a/gfx/pics/dodrio/back.6x6.2bpp.lz
+++ b/gfx/pics/dodrio/back.2bpp.lz
diff --git a/gfx/pics/dodrio/front.7x7.2bpp.lz b/gfx/pics/dodrio/front.2bpp.lz
index 8de65b2de..8de65b2de 100644
--- a/gfx/pics/dodrio/front.7x7.2bpp.lz
+++ b/gfx/pics/dodrio/front.2bpp.lz
diff --git a/gfx/pics/doduo/back.6x6.2bpp.lz b/gfx/pics/doduo/back.2bpp.lz
index 8f204150b..8f204150b 100644
--- a/gfx/pics/doduo/back.6x6.2bpp.lz
+++ b/gfx/pics/doduo/back.2bpp.lz
diff --git a/gfx/pics/doduo/front.5x5.2bpp.lz b/gfx/pics/doduo/front.2bpp.lz
index 11d525427..11d525427 100644
--- a/gfx/pics/doduo/front.5x5.2bpp.lz
+++ b/gfx/pics/doduo/front.2bpp.lz
diff --git a/gfx/pics/donphan/back.6x6.2bpp.lz b/gfx/pics/donphan/back.2bpp.lz
index 4914f03aa..4914f03aa 100644
--- a/gfx/pics/donphan/back.6x6.2bpp.lz
+++ b/gfx/pics/donphan/back.2bpp.lz
diff --git a/gfx/pics/donphan/front.7x7.2bpp.lz b/gfx/pics/donphan/front.2bpp.lz
index b46d083fc..b46d083fc 100644
--- a/gfx/pics/donphan/front.7x7.2bpp.lz
+++ b/gfx/pics/donphan/front.2bpp.lz
diff --git a/gfx/pics/dragonair/back.6x6.2bpp.lz b/gfx/pics/dragonair/back.2bpp.lz
index 52094c394..52094c394 100644
--- a/gfx/pics/dragonair/back.6x6.2bpp.lz
+++ b/gfx/pics/dragonair/back.2bpp.lz
diff --git a/gfx/pics/dragonair/front.6x6.2bpp.lz b/gfx/pics/dragonair/front.2bpp.lz
index aad34536f..aad34536f 100644
--- a/gfx/pics/dragonair/front.6x6.2bpp.lz
+++ b/gfx/pics/dragonair/front.2bpp.lz
diff --git a/gfx/pics/dragonite/back.6x6.2bpp.lz b/gfx/pics/dragonite/back.2bpp.lz
index 09a828dd0..09a828dd0 100644
--- a/gfx/pics/dragonite/back.6x6.2bpp.lz
+++ b/gfx/pics/dragonite/back.2bpp.lz
diff --git a/gfx/pics/dragonite/front.7x7.2bpp.lz b/gfx/pics/dragonite/front.2bpp.lz
index 730c16739..730c16739 100644
--- a/gfx/pics/dragonite/front.7x7.2bpp.lz
+++ b/gfx/pics/dragonite/front.2bpp.lz
diff --git a/gfx/pics/dratini/back.6x6.2bpp.lz b/gfx/pics/dratini/back.2bpp.lz
index b40ffcaaf..b40ffcaaf 100644
--- a/gfx/pics/dratini/back.6x6.2bpp.lz
+++ b/gfx/pics/dratini/back.2bpp.lz
diff --git a/gfx/pics/dratini/front.5x5.2bpp.lz b/gfx/pics/dratini/front.2bpp.lz
index b933491b7..b933491b7 100644
--- a/gfx/pics/dratini/front.5x5.2bpp.lz
+++ b/gfx/pics/dratini/front.2bpp.lz
diff --git a/gfx/pics/drowzee/back.6x6.2bpp.lz b/gfx/pics/drowzee/back.2bpp.lz
index a4218ade7..a4218ade7 100644
--- a/gfx/pics/drowzee/back.6x6.2bpp.lz
+++ b/gfx/pics/drowzee/back.2bpp.lz
diff --git a/gfx/pics/drowzee/front.6x6.2bpp.lz b/gfx/pics/drowzee/front.2bpp.lz
index cf3f87571..cf3f87571 100644
--- a/gfx/pics/drowzee/front.6x6.2bpp.lz
+++ b/gfx/pics/drowzee/front.2bpp.lz
diff --git a/gfx/pics/dugtrio/back.6x6.2bpp.lz b/gfx/pics/dugtrio/back.2bpp.lz
index 05ad7b1ad..05ad7b1ad 100644
--- a/gfx/pics/dugtrio/back.6x6.2bpp.lz
+++ b/gfx/pics/dugtrio/back.2bpp.lz
diff --git a/gfx/pics/dugtrio/front.7x7.2bpp.lz b/gfx/pics/dugtrio/front.2bpp.lz
index 7ef2606cd..7ef2606cd 100644
--- a/gfx/pics/dugtrio/front.7x7.2bpp.lz
+++ b/gfx/pics/dugtrio/front.2bpp.lz
diff --git a/gfx/pics/dunsparce/back.6x6.2bpp.lz b/gfx/pics/dunsparce/back.2bpp.lz
index 1042b07f8..1042b07f8 100644
--- a/gfx/pics/dunsparce/back.6x6.2bpp.lz
+++ b/gfx/pics/dunsparce/back.2bpp.lz
diff --git a/gfx/pics/dunsparce/front.6x6.2bpp.lz b/gfx/pics/dunsparce/front.2bpp.lz
index 31e9aa319..31e9aa319 100644
--- a/gfx/pics/dunsparce/front.6x6.2bpp.lz
+++ b/gfx/pics/dunsparce/front.2bpp.lz
diff --git a/gfx/pics/eevee/back.6x6.2bpp.lz b/gfx/pics/eevee/back.2bpp.lz
index ddd051f3a..ddd051f3a 100644
--- a/gfx/pics/eevee/back.6x6.2bpp.lz
+++ b/gfx/pics/eevee/back.2bpp.lz
diff --git a/gfx/pics/eevee/front.5x5.2bpp.lz b/gfx/pics/eevee/front.2bpp.lz
index aea8d545e..aea8d545e 100644
--- a/gfx/pics/eevee/front.5x5.2bpp.lz
+++ b/gfx/pics/eevee/front.2bpp.lz
diff --git a/gfx/pics/egg/front.5x5.2bpp.lz b/gfx/pics/egg/front.2bpp.lz
index 47d8b997e..47d8b997e 100644
--- a/gfx/pics/egg/front.5x5.2bpp.lz
+++ b/gfx/pics/egg/front.2bpp.lz
diff --git a/gfx/pics/ekans/back.6x6.2bpp.lz b/gfx/pics/ekans/back.2bpp.lz
index 07785737f..07785737f 100644
--- a/gfx/pics/ekans/back.6x6.2bpp.lz
+++ b/gfx/pics/ekans/back.2bpp.lz
diff --git a/gfx/pics/ekans/front.5x5.2bpp.lz b/gfx/pics/ekans/front.2bpp.lz
index efa075fab..efa075fab 100644
--- a/gfx/pics/ekans/front.5x5.2bpp.lz
+++ b/gfx/pics/ekans/front.2bpp.lz
diff --git a/gfx/pics/electabuzz/back.6x6.2bpp.lz b/gfx/pics/electabuzz/back.2bpp.lz
index b64bc1ca1..b64bc1ca1 100644
--- a/gfx/pics/electabuzz/back.6x6.2bpp.lz
+++ b/gfx/pics/electabuzz/back.2bpp.lz
diff --git a/gfx/pics/electabuzz/front.6x6.2bpp.lz b/gfx/pics/electabuzz/front.2bpp.lz
index 645db8d4d..645db8d4d 100644
--- a/gfx/pics/electabuzz/front.6x6.2bpp.lz
+++ b/gfx/pics/electabuzz/front.2bpp.lz
diff --git a/gfx/pics/electrode/back.6x6.2bpp.lz b/gfx/pics/electrode/back.2bpp.lz
index 9161c8884..9161c8884 100644
--- a/gfx/pics/electrode/back.6x6.2bpp.lz
+++ b/gfx/pics/electrode/back.2bpp.lz
diff --git a/gfx/pics/electrode/front.5x5.2bpp.lz b/gfx/pics/electrode/front.2bpp.lz
index 2d86aa4ac..2d86aa4ac 100644
--- a/gfx/pics/electrode/front.5x5.2bpp.lz
+++ b/gfx/pics/electrode/front.2bpp.lz
diff --git a/gfx/pics/elekid/back.6x6.2bpp.lz b/gfx/pics/elekid/back.2bpp.lz
index fd8dd04df..fd8dd04df 100644
--- a/gfx/pics/elekid/back.6x6.2bpp.lz
+++ b/gfx/pics/elekid/back.2bpp.lz
diff --git a/gfx/pics/elekid/front.6x6.2bpp.lz b/gfx/pics/elekid/front.2bpp.lz
index dde6b0e0b..dde6b0e0b 100644
--- a/gfx/pics/elekid/front.6x6.2bpp.lz
+++ b/gfx/pics/elekid/front.2bpp.lz
diff --git a/gfx/pics/entei/back.6x6.2bpp.lz b/gfx/pics/entei/back.2bpp.lz
index 7f2440f51..7f2440f51 100644
--- a/gfx/pics/entei/back.6x6.2bpp.lz
+++ b/gfx/pics/entei/back.2bpp.lz
diff --git a/gfx/pics/entei/front.7x7.2bpp.lz b/gfx/pics/entei/front.2bpp.lz
index bc969fe65..bc969fe65 100644
--- a/gfx/pics/entei/front.7x7.2bpp.lz
+++ b/gfx/pics/entei/front.2bpp.lz
diff --git a/gfx/pics/espeon/back.6x6.2bpp.lz b/gfx/pics/espeon/back.2bpp.lz
index 59a69eae1..59a69eae1 100644
--- a/gfx/pics/espeon/back.6x6.2bpp.lz
+++ b/gfx/pics/espeon/back.2bpp.lz
diff --git a/gfx/pics/espeon/front.6x6.2bpp.lz b/gfx/pics/espeon/front.2bpp.lz
index b7d983e9f..b7d983e9f 100644
--- a/gfx/pics/espeon/front.6x6.2bpp.lz
+++ b/gfx/pics/espeon/front.2bpp.lz
diff --git a/gfx/pics/exeggcute/back.6x6.2bpp.lz b/gfx/pics/exeggcute/back.2bpp.lz
index 1877fcea1..1877fcea1 100644
--- a/gfx/pics/exeggcute/back.6x6.2bpp.lz
+++ b/gfx/pics/exeggcute/back.2bpp.lz
diff --git a/gfx/pics/exeggcute/front.7x7.2bpp.lz b/gfx/pics/exeggcute/front.2bpp.lz
index 9d018e7c4..9d018e7c4 100644
--- a/gfx/pics/exeggcute/front.7x7.2bpp.lz
+++ b/gfx/pics/exeggcute/front.2bpp.lz
diff --git a/gfx/pics/exeggutor/back.6x6.2bpp.lz b/gfx/pics/exeggutor/back.2bpp.lz
index abf6c97dd..abf6c97dd 100644
--- a/gfx/pics/exeggutor/back.6x6.2bpp.lz
+++ b/gfx/pics/exeggutor/back.2bpp.lz
diff --git a/gfx/pics/exeggutor/front.7x7.2bpp.lz b/gfx/pics/exeggutor/front.2bpp.lz
index b4056b175..b4056b175 100644
--- a/gfx/pics/exeggutor/front.7x7.2bpp.lz
+++ b/gfx/pics/exeggutor/front.2bpp.lz
diff --git a/gfx/pics/farfetch_d/back.6x6.2bpp.lz b/gfx/pics/farfetch_d/back.2bpp.lz
index 77dd25ae9..77dd25ae9 100644
--- a/gfx/pics/farfetch_d/back.6x6.2bpp.lz
+++ b/gfx/pics/farfetch_d/back.2bpp.lz
diff --git a/gfx/pics/farfetch_d/front.6x6.2bpp.lz b/gfx/pics/farfetch_d/front.2bpp.lz
index d9eeb7489..d9eeb7489 100644
--- a/gfx/pics/farfetch_d/front.6x6.2bpp.lz
+++ b/gfx/pics/farfetch_d/front.2bpp.lz
diff --git a/gfx/pics/fearow/back.6x6.2bpp.lz b/gfx/pics/fearow/back.2bpp.lz
index 641086eaa..641086eaa 100644
--- a/gfx/pics/fearow/back.6x6.2bpp.lz
+++ b/gfx/pics/fearow/back.2bpp.lz
diff --git a/gfx/pics/fearow/front.7x7.2bpp.lz b/gfx/pics/fearow/front.2bpp.lz
index 4fbf2d47f..4fbf2d47f 100644
--- a/gfx/pics/fearow/front.7x7.2bpp.lz
+++ b/gfx/pics/fearow/front.2bpp.lz
diff --git a/gfx/pics/feraligatr/back.6x6.2bpp.lz b/gfx/pics/feraligatr/back.2bpp.lz
index 4e180d0f5..4e180d0f5 100644
--- a/gfx/pics/feraligatr/back.6x6.2bpp.lz
+++ b/gfx/pics/feraligatr/back.2bpp.lz
diff --git a/gfx/pics/feraligatr/front.7x7.2bpp.lz b/gfx/pics/feraligatr/front.2bpp.lz
index cc055e629..cc055e629 100644
--- a/gfx/pics/feraligatr/front.7x7.2bpp.lz
+++ b/gfx/pics/feraligatr/front.2bpp.lz
diff --git a/gfx/pics/flaaffy/back.6x6.2bpp.lz b/gfx/pics/flaaffy/back.2bpp.lz
index 5eec3df7a..5eec3df7a 100644
--- a/gfx/pics/flaaffy/back.6x6.2bpp.lz
+++ b/gfx/pics/flaaffy/back.2bpp.lz
diff --git a/gfx/pics/flaaffy/front.6x6.2bpp.lz b/gfx/pics/flaaffy/front.2bpp.lz
index 673155a7e..673155a7e 100644
--- a/gfx/pics/flaaffy/front.6x6.2bpp.lz
+++ b/gfx/pics/flaaffy/front.2bpp.lz
diff --git a/gfx/pics/flareon/back.6x6.2bpp.lz b/gfx/pics/flareon/back.2bpp.lz
index bafc64cd2..bafc64cd2 100644
--- a/gfx/pics/flareon/back.6x6.2bpp.lz
+++ b/gfx/pics/flareon/back.2bpp.lz
diff --git a/gfx/pics/flareon/front.6x6.2bpp.lz b/gfx/pics/flareon/front.2bpp.lz
index d3210b7e3..d3210b7e3 100644
--- a/gfx/pics/flareon/front.6x6.2bpp.lz
+++ b/gfx/pics/flareon/front.2bpp.lz
diff --git a/gfx/pics/forretress/back.6x6.2bpp.lz b/gfx/pics/forretress/back.2bpp.lz
index 1c4b5d69a..1c4b5d69a 100644
--- a/gfx/pics/forretress/back.6x6.2bpp.lz
+++ b/gfx/pics/forretress/back.2bpp.lz
diff --git a/gfx/pics/forretress/front.7x7.2bpp.lz b/gfx/pics/forretress/front.2bpp.lz
index 239e20532..239e20532 100644
--- a/gfx/pics/forretress/front.7x7.2bpp.lz
+++ b/gfx/pics/forretress/front.2bpp.lz
diff --git a/gfx/pics/furret/back.6x6.2bpp.lz b/gfx/pics/furret/back.2bpp.lz
index 0cbe66f49..0cbe66f49 100644
--- a/gfx/pics/furret/back.6x6.2bpp.lz
+++ b/gfx/pics/furret/back.2bpp.lz
diff --git a/gfx/pics/furret/front.6x6.2bpp.lz b/gfx/pics/furret/front.2bpp.lz
index afba64f59..afba64f59 100644
--- a/gfx/pics/furret/front.6x6.2bpp.lz
+++ b/gfx/pics/furret/front.2bpp.lz
diff --git a/gfx/pics/gastly/back.6x6.2bpp.lz b/gfx/pics/gastly/back.2bpp.lz
index ecb4af90d..ecb4af90d 100644
--- a/gfx/pics/gastly/back.6x6.2bpp.lz
+++ b/gfx/pics/gastly/back.2bpp.lz
diff --git a/gfx/pics/gastly/front.7x7.2bpp.lz b/gfx/pics/gastly/front.2bpp.lz
index f3d99339b..f3d99339b 100644
--- a/gfx/pics/gastly/front.7x7.2bpp.lz
+++ b/gfx/pics/gastly/front.2bpp.lz
diff --git a/gfx/pics/gengar/back.6x6.2bpp.lz b/gfx/pics/gengar/back.2bpp.lz
index d1ecca65e..d1ecca65e 100644
--- a/gfx/pics/gengar/back.6x6.2bpp.lz
+++ b/gfx/pics/gengar/back.2bpp.lz
diff --git a/gfx/pics/gengar/front.6x6.2bpp.lz b/gfx/pics/gengar/front.2bpp.lz
index a11754646..a11754646 100644
--- a/gfx/pics/gengar/front.6x6.2bpp.lz
+++ b/gfx/pics/gengar/front.2bpp.lz
diff --git a/gfx/pics/geodude/back.6x6.2bpp.lz b/gfx/pics/geodude/back.2bpp.lz
index 443fd327d..443fd327d 100644
--- a/gfx/pics/geodude/back.6x6.2bpp.lz
+++ b/gfx/pics/geodude/back.2bpp.lz
diff --git a/gfx/pics/geodude/front.5x5.2bpp.lz b/gfx/pics/geodude/front.2bpp.lz
index 96bd9f794..96bd9f794 100644
--- a/gfx/pics/geodude/front.5x5.2bpp.lz
+++ b/gfx/pics/geodude/front.2bpp.lz
diff --git a/gfx/pics/girafarig/back.6x6.2bpp.lz b/gfx/pics/girafarig/back.2bpp.lz
index aca23f976..aca23f976 100644
--- a/gfx/pics/girafarig/back.6x6.2bpp.lz
+++ b/gfx/pics/girafarig/back.2bpp.lz
diff --git a/gfx/pics/girafarig/front.7x7.2bpp.lz b/gfx/pics/girafarig/front.2bpp.lz
index 48c9fc94a..48c9fc94a 100644
--- a/gfx/pics/girafarig/front.7x7.2bpp.lz
+++ b/gfx/pics/girafarig/front.2bpp.lz
diff --git a/gfx/pics/gligar/back.6x6.2bpp.lz b/gfx/pics/gligar/back.2bpp.lz
index 45b7d9b76..45b7d9b76 100644
--- a/gfx/pics/gligar/back.6x6.2bpp.lz
+++ b/gfx/pics/gligar/back.2bpp.lz
diff --git a/gfx/pics/gligar/front.6x6.2bpp.lz b/gfx/pics/gligar/front.2bpp.lz
index 4ef9e5398..4ef9e5398 100644
--- a/gfx/pics/gligar/front.6x6.2bpp.lz
+++ b/gfx/pics/gligar/front.2bpp.lz
diff --git a/gfx/pics/gloom/back.6x6.2bpp.lz b/gfx/pics/gloom/back.2bpp.lz
index 7d35e2d82..7d35e2d82 100644
--- a/gfx/pics/gloom/back.6x6.2bpp.lz
+++ b/gfx/pics/gloom/back.2bpp.lz
diff --git a/gfx/pics/gloom/front.6x6.2bpp.lz b/gfx/pics/gloom/front.2bpp.lz
index a69e4b76c..a69e4b76c 100644
--- a/gfx/pics/gloom/front.6x6.2bpp.lz
+++ b/gfx/pics/gloom/front.2bpp.lz
diff --git a/gfx/pics/golbat/back.6x6.2bpp.lz b/gfx/pics/golbat/back.2bpp.lz
index e2bd0c367..e2bd0c367 100644
--- a/gfx/pics/golbat/back.6x6.2bpp.lz
+++ b/gfx/pics/golbat/back.2bpp.lz
diff --git a/gfx/pics/golbat/front.7x7.2bpp.lz b/gfx/pics/golbat/front.2bpp.lz
index 94f7d8216..94f7d8216 100644
--- a/gfx/pics/golbat/front.7x7.2bpp.lz
+++ b/gfx/pics/golbat/front.2bpp.lz
diff --git a/gfx/pics/goldeen/back.6x6.2bpp.lz b/gfx/pics/goldeen/back.2bpp.lz
index 5d00534ec..5d00534ec 100644
--- a/gfx/pics/goldeen/back.6x6.2bpp.lz
+++ b/gfx/pics/goldeen/back.2bpp.lz
diff --git a/gfx/pics/goldeen/front.6x6.2bpp.lz b/gfx/pics/goldeen/front.2bpp.lz
index f0090e94e..f0090e94e 100644
--- a/gfx/pics/goldeen/front.6x6.2bpp.lz
+++ b/gfx/pics/goldeen/front.2bpp.lz
diff --git a/gfx/pics/golduck/back.6x6.2bpp.lz b/gfx/pics/golduck/back.2bpp.lz
index 13807b9e9..13807b9e9 100644
--- a/gfx/pics/golduck/back.6x6.2bpp.lz
+++ b/gfx/pics/golduck/back.2bpp.lz
diff --git a/gfx/pics/golduck/front.7x7.2bpp.lz b/gfx/pics/golduck/front.2bpp.lz
index ff3fa6792..ff3fa6792 100644
--- a/gfx/pics/golduck/front.7x7.2bpp.lz
+++ b/gfx/pics/golduck/front.2bpp.lz
diff --git a/gfx/pics/golem/back.6x6.2bpp.lz b/gfx/pics/golem/back.2bpp.lz
index fd1ee3dcb..fd1ee3dcb 100644
--- a/gfx/pics/golem/back.6x6.2bpp.lz
+++ b/gfx/pics/golem/back.2bpp.lz
diff --git a/gfx/pics/golem/front.6x6.2bpp.lz b/gfx/pics/golem/front.2bpp.lz
index 0a7bf3369..0a7bf3369 100644
--- a/gfx/pics/golem/front.6x6.2bpp.lz
+++ b/gfx/pics/golem/front.2bpp.lz
diff --git a/gfx/pics/granbull/back.6x6.2bpp.lz b/gfx/pics/granbull/back.2bpp.lz
index f09d4e7dc..f09d4e7dc 100644
--- a/gfx/pics/granbull/back.6x6.2bpp.lz
+++ b/gfx/pics/granbull/back.2bpp.lz
diff --git a/gfx/pics/granbull/front.6x6.2bpp.lz b/gfx/pics/granbull/front.2bpp.lz
index 94062ce3f..94062ce3f 100644
--- a/gfx/pics/granbull/front.6x6.2bpp.lz
+++ b/gfx/pics/granbull/front.2bpp.lz
diff --git a/gfx/pics/graveler/back.6x6.2bpp.lz b/gfx/pics/graveler/back.2bpp.lz
index ba2fba8e6..ba2fba8e6 100644
--- a/gfx/pics/graveler/back.6x6.2bpp.lz
+++ b/gfx/pics/graveler/back.2bpp.lz
diff --git a/gfx/pics/graveler/front.6x6.2bpp.lz b/gfx/pics/graveler/front.2bpp.lz
index 5dcee6436..5dcee6436 100644
--- a/gfx/pics/graveler/front.6x6.2bpp.lz
+++ b/gfx/pics/graveler/front.2bpp.lz
diff --git a/gfx/pics/grimer/back.6x6.2bpp.lz b/gfx/pics/grimer/back.2bpp.lz
index d4494a003..d4494a003 100644
--- a/gfx/pics/grimer/back.6x6.2bpp.lz
+++ b/gfx/pics/grimer/back.2bpp.lz
diff --git a/gfx/pics/grimer/front.5x5.2bpp.lz b/gfx/pics/grimer/front.2bpp.lz
index 176f2da1c..176f2da1c 100644
--- a/gfx/pics/grimer/front.5x5.2bpp.lz
+++ b/gfx/pics/grimer/front.2bpp.lz
diff --git a/gfx/pics/growlithe/back.6x6.2bpp.lz b/gfx/pics/growlithe/back.2bpp.lz
index 222250f79..222250f79 100644
--- a/gfx/pics/growlithe/back.6x6.2bpp.lz
+++ b/gfx/pics/growlithe/back.2bpp.lz
diff --git a/gfx/pics/growlithe/front.5x5.2bpp.lz b/gfx/pics/growlithe/front.2bpp.lz
index a01b4f1fc..a01b4f1fc 100644
--- a/gfx/pics/growlithe/front.5x5.2bpp.lz
+++ b/gfx/pics/growlithe/front.2bpp.lz
diff --git a/gfx/pics/gyarados/back.6x6.2bpp.lz b/gfx/pics/gyarados/back.2bpp.lz
index d061ec9b2..d061ec9b2 100644
--- a/gfx/pics/gyarados/back.6x6.2bpp.lz
+++ b/gfx/pics/gyarados/back.2bpp.lz
diff --git a/gfx/pics/gyarados/front.7x7.2bpp.lz b/gfx/pics/gyarados/front.2bpp.lz
index 4d66d5814..4d66d5814 100644
--- a/gfx/pics/gyarados/front.7x7.2bpp.lz
+++ b/gfx/pics/gyarados/front.2bpp.lz
diff --git a/gfx/pics/haunter/back.6x6.2bpp.lz b/gfx/pics/haunter/back.2bpp.lz
index 660c0408b..660c0408b 100644
--- a/gfx/pics/haunter/back.6x6.2bpp.lz
+++ b/gfx/pics/haunter/back.2bpp.lz
diff --git a/gfx/pics/haunter/front.6x6.2bpp.lz b/gfx/pics/haunter/front.2bpp.lz
index 6bb6ab582..6bb6ab582 100644
--- a/gfx/pics/haunter/front.6x6.2bpp.lz
+++ b/gfx/pics/haunter/front.2bpp.lz
diff --git a/gfx/pics/heracross/back.6x6.2bpp.lz b/gfx/pics/heracross/back.2bpp.lz
index da4d40981..da4d40981 100644
--- a/gfx/pics/heracross/back.6x6.2bpp.lz
+++ b/gfx/pics/heracross/back.2bpp.lz
diff --git a/gfx/pics/heracross/front.6x6.2bpp.lz b/gfx/pics/heracross/front.2bpp.lz
index ad23e01d1..ad23e01d1 100644
--- a/gfx/pics/heracross/front.6x6.2bpp.lz
+++ b/gfx/pics/heracross/front.2bpp.lz
diff --git a/gfx/pics/hitmonchan/back.6x6.2bpp.lz b/gfx/pics/hitmonchan/back.2bpp.lz
index f785248c1..f785248c1 100644
--- a/gfx/pics/hitmonchan/back.6x6.2bpp.lz
+++ b/gfx/pics/hitmonchan/back.2bpp.lz
diff --git a/gfx/pics/hitmonchan/front.6x6.2bpp.lz b/gfx/pics/hitmonchan/front.2bpp.lz
index e9a77e987..e9a77e987 100644
--- a/gfx/pics/hitmonchan/front.6x6.2bpp.lz
+++ b/gfx/pics/hitmonchan/front.2bpp.lz
diff --git a/gfx/pics/hitmonlee/back.6x6.2bpp.lz b/gfx/pics/hitmonlee/back.2bpp.lz
index 4847a1496..4847a1496 100644
--- a/gfx/pics/hitmonlee/back.6x6.2bpp.lz
+++ b/gfx/pics/hitmonlee/back.2bpp.lz
diff --git a/gfx/pics/hitmonlee/front.7x7.2bpp.lz b/gfx/pics/hitmonlee/front.2bpp.lz
index c85ec5817..c85ec5817 100644
--- a/gfx/pics/hitmonlee/front.7x7.2bpp.lz
+++ b/gfx/pics/hitmonlee/front.2bpp.lz
diff --git a/gfx/pics/hitmontop/back.6x6.2bpp.lz b/gfx/pics/hitmontop/back.2bpp.lz
index 185f08aff..185f08aff 100644
--- a/gfx/pics/hitmontop/back.6x6.2bpp.lz
+++ b/gfx/pics/hitmontop/back.2bpp.lz
diff --git a/gfx/pics/hitmontop/front.7x7.2bpp.lz b/gfx/pics/hitmontop/front.2bpp.lz
index d28913fcf..d28913fcf 100644
--- a/gfx/pics/hitmontop/front.7x7.2bpp.lz
+++ b/gfx/pics/hitmontop/front.2bpp.lz
diff --git a/gfx/pics/ho_oh/back.6x6.2bpp.lz b/gfx/pics/ho_oh/back.2bpp.lz
index 1d58cf8ac..1d58cf8ac 100644
--- a/gfx/pics/ho_oh/back.6x6.2bpp.lz
+++ b/gfx/pics/ho_oh/back.2bpp.lz
diff --git a/gfx/pics/ho_oh/front.7x7.2bpp.lz b/gfx/pics/ho_oh/front.2bpp.lz
index 40c91739e..40c91739e 100644
--- a/gfx/pics/ho_oh/front.7x7.2bpp.lz
+++ b/gfx/pics/ho_oh/front.2bpp.lz
diff --git a/gfx/pics/hoothoot/back.6x6.2bpp.lz b/gfx/pics/hoothoot/back.2bpp.lz
index e4ca2f37f..e4ca2f37f 100644
--- a/gfx/pics/hoothoot/back.6x6.2bpp.lz
+++ b/gfx/pics/hoothoot/back.2bpp.lz
diff --git a/gfx/pics/hoothoot/front.5x5.2bpp.lz b/gfx/pics/hoothoot/front.2bpp.lz
index 6abcd37fc..6abcd37fc 100644
--- a/gfx/pics/hoothoot/front.5x5.2bpp.lz
+++ b/gfx/pics/hoothoot/front.2bpp.lz
diff --git a/gfx/pics/hoppip/back.6x6.2bpp.lz b/gfx/pics/hoppip/back.2bpp.lz
index c5439118e..c5439118e 100644
--- a/gfx/pics/hoppip/back.6x6.2bpp.lz
+++ b/gfx/pics/hoppip/back.2bpp.lz
diff --git a/gfx/pics/hoppip/front.5x5.2bpp.lz b/gfx/pics/hoppip/front.2bpp.lz
index 4387e2886..4387e2886 100644
--- a/gfx/pics/hoppip/front.5x5.2bpp.lz
+++ b/gfx/pics/hoppip/front.2bpp.lz
diff --git a/gfx/pics/horsea/back.6x6.2bpp.lz b/gfx/pics/horsea/back.2bpp.lz
index ae6a2ecab..ae6a2ecab 100644
--- a/gfx/pics/horsea/back.6x6.2bpp.lz
+++ b/gfx/pics/horsea/back.2bpp.lz
diff --git a/gfx/pics/horsea/front.5x5.2bpp.lz b/gfx/pics/horsea/front.2bpp.lz
index 7db08094b..7db08094b 100644
--- a/gfx/pics/horsea/front.5x5.2bpp.lz
+++ b/gfx/pics/horsea/front.2bpp.lz
diff --git a/gfx/pics/houndoom/back.6x6.2bpp.lz b/gfx/pics/houndoom/back.2bpp.lz
index 5b7b72ffc..5b7b72ffc 100644
--- a/gfx/pics/houndoom/back.6x6.2bpp.lz
+++ b/gfx/pics/houndoom/back.2bpp.lz
diff --git a/gfx/pics/houndoom/front.7x7.2bpp.lz b/gfx/pics/houndoom/front.2bpp.lz
index c2ce34ee3..c2ce34ee3 100644
--- a/gfx/pics/houndoom/front.7x7.2bpp.lz
+++ b/gfx/pics/houndoom/front.2bpp.lz
diff --git a/gfx/pics/houndour/back.6x6.2bpp.lz b/gfx/pics/houndour/back.2bpp.lz
index fe3584bd1..fe3584bd1 100644
--- a/gfx/pics/houndour/back.6x6.2bpp.lz
+++ b/gfx/pics/houndour/back.2bpp.lz
diff --git a/gfx/pics/houndour/front.6x6.2bpp.lz b/gfx/pics/houndour/front.2bpp.lz
index 786c0f9a4..786c0f9a4 100644
--- a/gfx/pics/houndour/front.6x6.2bpp.lz
+++ b/gfx/pics/houndour/front.2bpp.lz
diff --git a/gfx/pics/hypno/back.6x6.2bpp.lz b/gfx/pics/hypno/back.2bpp.lz
index b69fcadf7..b69fcadf7 100644
--- a/gfx/pics/hypno/back.6x6.2bpp.lz
+++ b/gfx/pics/hypno/back.2bpp.lz
diff --git a/gfx/pics/hypno/front.7x7.2bpp.lz b/gfx/pics/hypno/front.2bpp.lz
index ca6ec0608..ca6ec0608 100644
--- a/gfx/pics/hypno/front.7x7.2bpp.lz
+++ b/gfx/pics/hypno/front.2bpp.lz
diff --git a/gfx/pics/igglybuff/back.6x6.2bpp.lz b/gfx/pics/igglybuff/back.2bpp.lz
index b416af3f0..b416af3f0 100644
--- a/gfx/pics/igglybuff/back.6x6.2bpp.lz
+++ b/gfx/pics/igglybuff/back.2bpp.lz
diff --git a/gfx/pics/igglybuff/front.5x5.2bpp.lz b/gfx/pics/igglybuff/front.2bpp.lz
index 1c4bbefa0..1c4bbefa0 100644
--- a/gfx/pics/igglybuff/front.5x5.2bpp.lz
+++ b/gfx/pics/igglybuff/front.2bpp.lz
diff --git a/gfx/pics/ivysaur/back.6x6.2bpp.lz b/gfx/pics/ivysaur/back.2bpp.lz
index 34557d9dd..34557d9dd 100644
--- a/gfx/pics/ivysaur/back.6x6.2bpp.lz
+++ b/gfx/pics/ivysaur/back.2bpp.lz
diff --git a/gfx/pics/ivysaur/front.6x6.2bpp.lz b/gfx/pics/ivysaur/front.2bpp.lz
index 7b9c8f9d9..7b9c8f9d9 100644
--- a/gfx/pics/ivysaur/front.6x6.2bpp.lz
+++ b/gfx/pics/ivysaur/front.2bpp.lz
diff --git a/gfx/pics/jigglypuff/back.6x6.2bpp.lz b/gfx/pics/jigglypuff/back.2bpp.lz
index e551afaf6..e551afaf6 100644
--- a/gfx/pics/jigglypuff/back.6x6.2bpp.lz
+++ b/gfx/pics/jigglypuff/back.2bpp.lz
diff --git a/gfx/pics/jigglypuff/front.5x5.2bpp.lz b/gfx/pics/jigglypuff/front.2bpp.lz
index 4367e41d8..4367e41d8 100644
--- a/gfx/pics/jigglypuff/front.5x5.2bpp.lz
+++ b/gfx/pics/jigglypuff/front.2bpp.lz
diff --git a/gfx/pics/jolteon/back.6x6.2bpp.lz b/gfx/pics/jolteon/back.2bpp.lz
index e95f893ce..e95f893ce 100644
--- a/gfx/pics/jolteon/back.6x6.2bpp.lz
+++ b/gfx/pics/jolteon/back.2bpp.lz
diff --git a/gfx/pics/jolteon/front.6x6.2bpp.lz b/gfx/pics/jolteon/front.2bpp.lz
index 32d271390..32d271390 100644
--- a/gfx/pics/jolteon/front.6x6.2bpp.lz
+++ b/gfx/pics/jolteon/front.2bpp.lz
diff --git a/gfx/pics/jumpluff/back.6x6.2bpp.lz b/gfx/pics/jumpluff/back.2bpp.lz
index 57ae8b890..57ae8b890 100644
--- a/gfx/pics/jumpluff/back.6x6.2bpp.lz
+++ b/gfx/pics/jumpluff/back.2bpp.lz
diff --git a/gfx/pics/jumpluff/front.7x7.2bpp.lz b/gfx/pics/jumpluff/front.2bpp.lz
index c3570ed09..c3570ed09 100644
--- a/gfx/pics/jumpluff/front.7x7.2bpp.lz
+++ b/gfx/pics/jumpluff/front.2bpp.lz
diff --git a/gfx/pics/jynx/back.6x6.2bpp.lz b/gfx/pics/jynx/back.2bpp.lz
index 4642ecda7..4642ecda7 100644
--- a/gfx/pics/jynx/back.6x6.2bpp.lz
+++ b/gfx/pics/jynx/back.2bpp.lz
diff --git a/gfx/pics/jynx/front.6x6.2bpp.lz b/gfx/pics/jynx/front.2bpp.lz
index 78a436494..78a436494 100644
--- a/gfx/pics/jynx/front.6x6.2bpp.lz
+++ b/gfx/pics/jynx/front.2bpp.lz
diff --git a/gfx/pics/kabuto/back.6x6.2bpp.lz b/gfx/pics/kabuto/back.2bpp.lz
index 61390a32e..61390a32e 100644
--- a/gfx/pics/kabuto/back.6x6.2bpp.lz
+++ b/gfx/pics/kabuto/back.2bpp.lz
diff --git a/gfx/pics/kabuto/front.5x5.2bpp.lz b/gfx/pics/kabuto/front.2bpp.lz
index 24a9376c8..24a9376c8 100644
--- a/gfx/pics/kabuto/front.5x5.2bpp.lz
+++ b/gfx/pics/kabuto/front.2bpp.lz
diff --git a/gfx/pics/kabutops/back.6x6.2bpp.lz b/gfx/pics/kabutops/back.2bpp.lz
index 507c10e2f..507c10e2f 100644
--- a/gfx/pics/kabutops/back.6x6.2bpp.lz
+++ b/gfx/pics/kabutops/back.2bpp.lz
diff --git a/gfx/pics/kabutops/front.6x6.2bpp.lz b/gfx/pics/kabutops/front.2bpp.lz
index 38d21fa16..38d21fa16 100644
--- a/gfx/pics/kabutops/front.6x6.2bpp.lz
+++ b/gfx/pics/kabutops/front.2bpp.lz
diff --git a/gfx/pics/kadabra/back.6x6.2bpp.lz b/gfx/pics/kadabra/back.2bpp.lz
index 0092147d7..0092147d7 100644
--- a/gfx/pics/kadabra/back.6x6.2bpp.lz
+++ b/gfx/pics/kadabra/back.2bpp.lz
diff --git a/gfx/pics/kadabra/front.6x6.2bpp.lz b/gfx/pics/kadabra/front.2bpp.lz
index 54f47795d..54f47795d 100644
--- a/gfx/pics/kadabra/front.6x6.2bpp.lz
+++ b/gfx/pics/kadabra/front.2bpp.lz
diff --git a/gfx/pics/kakuna/back.6x6.2bpp.lz b/gfx/pics/kakuna/back.2bpp.lz
index b369857d5..b369857d5 100644
--- a/gfx/pics/kakuna/back.6x6.2bpp.lz
+++ b/gfx/pics/kakuna/back.2bpp.lz
diff --git a/gfx/pics/kakuna/front.5x5.2bpp.lz b/gfx/pics/kakuna/front.2bpp.lz
index 2f2431edf..2f2431edf 100644
--- a/gfx/pics/kakuna/front.5x5.2bpp.lz
+++ b/gfx/pics/kakuna/front.2bpp.lz
diff --git a/gfx/pics/kangaskhan/back.6x6.2bpp.lz b/gfx/pics/kangaskhan/back.2bpp.lz
index c7ff00272..c7ff00272 100644
--- a/gfx/pics/kangaskhan/back.6x6.2bpp.lz
+++ b/gfx/pics/kangaskhan/back.2bpp.lz
diff --git a/gfx/pics/kangaskhan/front.7x7.2bpp.lz b/gfx/pics/kangaskhan/front.2bpp.lz
index 1ec58169d..1ec58169d 100644
--- a/gfx/pics/kangaskhan/front.7x7.2bpp.lz
+++ b/gfx/pics/kangaskhan/front.2bpp.lz
diff --git a/gfx/pics/kingdra/back.6x6.2bpp.lz b/gfx/pics/kingdra/back.2bpp.lz
index 9f2c38b6c..9f2c38b6c 100644
--- a/gfx/pics/kingdra/back.6x6.2bpp.lz
+++ b/gfx/pics/kingdra/back.2bpp.lz
diff --git a/gfx/pics/kingdra/front.7x7.2bpp.lz b/gfx/pics/kingdra/front.2bpp.lz
index d28a4dc78..d28a4dc78 100644
--- a/gfx/pics/kingdra/front.7x7.2bpp.lz
+++ b/gfx/pics/kingdra/front.2bpp.lz
diff --git a/gfx/pics/kingler/back.6x6.2bpp.lz b/gfx/pics/kingler/back.2bpp.lz
index aceed0679..aceed0679 100644
--- a/gfx/pics/kingler/back.6x6.2bpp.lz
+++ b/gfx/pics/kingler/back.2bpp.lz
diff --git a/gfx/pics/kingler/front.7x7.2bpp.lz b/gfx/pics/kingler/front.2bpp.lz
index 590bd05ee..590bd05ee 100644
--- a/gfx/pics/kingler/front.7x7.2bpp.lz
+++ b/gfx/pics/kingler/front.2bpp.lz
diff --git a/gfx/pics/koffing/back.6x6.2bpp.lz b/gfx/pics/koffing/back.2bpp.lz
index 2e8762565..2e8762565 100644
--- a/gfx/pics/koffing/back.6x6.2bpp.lz
+++ b/gfx/pics/koffing/back.2bpp.lz
diff --git a/gfx/pics/koffing/front.6x6.2bpp.lz b/gfx/pics/koffing/front.2bpp.lz
index 78de37eeb..78de37eeb 100644
--- a/gfx/pics/koffing/front.6x6.2bpp.lz
+++ b/gfx/pics/koffing/front.2bpp.lz
diff --git a/gfx/pics/krabby/back.6x6.2bpp.lz b/gfx/pics/krabby/back.2bpp.lz
index 5954b413d..5954b413d 100644
--- a/gfx/pics/krabby/back.6x6.2bpp.lz
+++ b/gfx/pics/krabby/back.2bpp.lz
diff --git a/gfx/pics/krabby/front.5x5.2bpp.lz b/gfx/pics/krabby/front.2bpp.lz
index c0f968fa5..c0f968fa5 100644
--- a/gfx/pics/krabby/front.5x5.2bpp.lz
+++ b/gfx/pics/krabby/front.2bpp.lz
diff --git a/gfx/pics/lanturn/back.6x6.2bpp.lz b/gfx/pics/lanturn/back.2bpp.lz
index ea916b7ea..ea916b7ea 100644
--- a/gfx/pics/lanturn/back.6x6.2bpp.lz
+++ b/gfx/pics/lanturn/back.2bpp.lz
diff --git a/gfx/pics/lanturn/front.6x6.2bpp.lz b/gfx/pics/lanturn/front.2bpp.lz
index ba57a1569..ba57a1569 100644
--- a/gfx/pics/lanturn/front.6x6.2bpp.lz
+++ b/gfx/pics/lanturn/front.2bpp.lz
diff --git a/gfx/pics/lapras/back.6x6.2bpp.lz b/gfx/pics/lapras/back.2bpp.lz
index 00f6b4329..00f6b4329 100644
--- a/gfx/pics/lapras/back.6x6.2bpp.lz
+++ b/gfx/pics/lapras/back.2bpp.lz
diff --git a/gfx/pics/lapras/front.7x7.2bpp.lz b/gfx/pics/lapras/front.2bpp.lz
index 0c20fc0be..0c20fc0be 100644
--- a/gfx/pics/lapras/front.7x7.2bpp.lz
+++ b/gfx/pics/lapras/front.2bpp.lz
diff --git a/gfx/pics/larvitar/back.6x6.2bpp.lz b/gfx/pics/larvitar/back.2bpp.lz
index b4122419b..b4122419b 100644
--- a/gfx/pics/larvitar/back.6x6.2bpp.lz
+++ b/gfx/pics/larvitar/back.2bpp.lz
diff --git a/gfx/pics/larvitar/front.5x5.2bpp.lz b/gfx/pics/larvitar/front.2bpp.lz
index deba5d5a2..deba5d5a2 100644
--- a/gfx/pics/larvitar/front.5x5.2bpp.lz
+++ b/gfx/pics/larvitar/front.2bpp.lz
diff --git a/gfx/pics/ledian/back.6x6.2bpp.lz b/gfx/pics/ledian/back.2bpp.lz
index eb996b4e3..eb996b4e3 100644
--- a/gfx/pics/ledian/back.6x6.2bpp.lz
+++ b/gfx/pics/ledian/back.2bpp.lz
diff --git a/gfx/pics/ledian/front.6x6.2bpp.lz b/gfx/pics/ledian/front.2bpp.lz
index 117d19c14..117d19c14 100644
--- a/gfx/pics/ledian/front.6x6.2bpp.lz
+++ b/gfx/pics/ledian/front.2bpp.lz
diff --git a/gfx/pics/ledyba/back.6x6.2bpp.lz b/gfx/pics/ledyba/back.2bpp.lz
index 728f4dedb..728f4dedb 100644
--- a/gfx/pics/ledyba/back.6x6.2bpp.lz
+++ b/gfx/pics/ledyba/back.2bpp.lz
diff --git a/gfx/pics/ledyba/front.6x6.2bpp.lz b/gfx/pics/ledyba/front.2bpp.lz
index fc15ab1ba..fc15ab1ba 100644
--- a/gfx/pics/ledyba/front.6x6.2bpp.lz
+++ b/gfx/pics/ledyba/front.2bpp.lz
diff --git a/gfx/pics/lickitung/back.6x6.2bpp.lz b/gfx/pics/lickitung/back.2bpp.lz
index 85764655a..85764655a 100644
--- a/gfx/pics/lickitung/back.6x6.2bpp.lz
+++ b/gfx/pics/lickitung/back.2bpp.lz
diff --git a/gfx/pics/lickitung/front.7x7.2bpp.lz b/gfx/pics/lickitung/front.2bpp.lz
index f7e2f4f43..f7e2f4f43 100644
--- a/gfx/pics/lickitung/front.7x7.2bpp.lz
+++ b/gfx/pics/lickitung/front.2bpp.lz
diff --git a/gfx/pics/lugia/back.6x6.2bpp.lz b/gfx/pics/lugia/back.2bpp.lz
index 8f7134e13..8f7134e13 100644
--- a/gfx/pics/lugia/back.6x6.2bpp.lz
+++ b/gfx/pics/lugia/back.2bpp.lz
diff --git a/gfx/pics/lugia/front.7x7.2bpp.lz b/gfx/pics/lugia/front.2bpp.lz
index b1b300304..b1b300304 100644
--- a/gfx/pics/lugia/front.7x7.2bpp.lz
+++ b/gfx/pics/lugia/front.2bpp.lz
diff --git a/gfx/pics/machamp/back.6x6.2bpp.lz b/gfx/pics/machamp/back.2bpp.lz
index b82d09cce..b82d09cce 100644
--- a/gfx/pics/machamp/back.6x6.2bpp.lz
+++ b/gfx/pics/machamp/back.2bpp.lz
diff --git a/gfx/pics/machamp/front.7x7.2bpp.lz b/gfx/pics/machamp/front.2bpp.lz
index aa1b12edb..aa1b12edb 100644
--- a/gfx/pics/machamp/front.7x7.2bpp.lz
+++ b/gfx/pics/machamp/front.2bpp.lz
diff --git a/gfx/pics/machoke/back.6x6.2bpp.lz b/gfx/pics/machoke/back.2bpp.lz
index e6a0015ed..e6a0015ed 100644
--- a/gfx/pics/machoke/back.6x6.2bpp.lz
+++ b/gfx/pics/machoke/back.2bpp.lz
diff --git a/gfx/pics/machoke/front.7x7.2bpp.lz b/gfx/pics/machoke/front.2bpp.lz
index 984f1601f..984f1601f 100644
--- a/gfx/pics/machoke/front.7x7.2bpp.lz
+++ b/gfx/pics/machoke/front.2bpp.lz
diff --git a/gfx/pics/machop/back.6x6.2bpp.lz b/gfx/pics/machop/back.2bpp.lz
index 96e6d00c6..96e6d00c6 100644
--- a/gfx/pics/machop/back.6x6.2bpp.lz
+++ b/gfx/pics/machop/back.2bpp.lz
diff --git a/gfx/pics/machop/front.5x5.2bpp.lz b/gfx/pics/machop/front.2bpp.lz
index 3b5404276..3b5404276 100644
--- a/gfx/pics/machop/front.5x5.2bpp.lz
+++ b/gfx/pics/machop/front.2bpp.lz
diff --git a/gfx/pics/magby/back.6x6.2bpp.lz b/gfx/pics/magby/back.2bpp.lz
index 8746c640e..8746c640e 100644
--- a/gfx/pics/magby/back.6x6.2bpp.lz
+++ b/gfx/pics/magby/back.2bpp.lz
diff --git a/gfx/pics/magby/front.6x6.2bpp.lz b/gfx/pics/magby/front.2bpp.lz
index b4eac5040..b4eac5040 100644
--- a/gfx/pics/magby/front.6x6.2bpp.lz
+++ b/gfx/pics/magby/front.2bpp.lz
diff --git a/gfx/pics/magcargo/back.6x6.2bpp.lz b/gfx/pics/magcargo/back.2bpp.lz
index 5cafe687a..5cafe687a 100644
--- a/gfx/pics/magcargo/back.6x6.2bpp.lz
+++ b/gfx/pics/magcargo/back.2bpp.lz
diff --git a/gfx/pics/magcargo/front.6x6.2bpp.lz b/gfx/pics/magcargo/front.2bpp.lz
index 8b2cda00e..8b2cda00e 100644
--- a/gfx/pics/magcargo/front.6x6.2bpp.lz
+++ b/gfx/pics/magcargo/front.2bpp.lz
diff --git a/gfx/pics/magikarp/back.6x6.2bpp.lz b/gfx/pics/magikarp/back.2bpp.lz
index 17100a9c5..17100a9c5 100644
--- a/gfx/pics/magikarp/back.6x6.2bpp.lz
+++ b/gfx/pics/magikarp/back.2bpp.lz
diff --git a/gfx/pics/magikarp/front.6x6.2bpp.lz b/gfx/pics/magikarp/front.2bpp.lz
index 3ec963c7f..3ec963c7f 100644
--- a/gfx/pics/magikarp/front.6x6.2bpp.lz
+++ b/gfx/pics/magikarp/front.2bpp.lz
diff --git a/gfx/pics/magmar/back.6x6.2bpp.lz b/gfx/pics/magmar/back.2bpp.lz
index 9b44bab34..9b44bab34 100644
--- a/gfx/pics/magmar/back.6x6.2bpp.lz
+++ b/gfx/pics/magmar/back.2bpp.lz
diff --git a/gfx/pics/magmar/front.6x6.2bpp.lz b/gfx/pics/magmar/front.2bpp.lz
index 178afc45f..178afc45f 100644
--- a/gfx/pics/magmar/front.6x6.2bpp.lz
+++ b/gfx/pics/magmar/front.2bpp.lz
diff --git a/gfx/pics/magnemite/back.6x6.2bpp.lz b/gfx/pics/magnemite/back.2bpp.lz
index f5cb4f801..f5cb4f801 100644
--- a/gfx/pics/magnemite/back.6x6.2bpp.lz
+++ b/gfx/pics/magnemite/back.2bpp.lz
diff --git a/gfx/pics/magnemite/front.5x5.2bpp.lz b/gfx/pics/magnemite/front.2bpp.lz
index fb221be89..fb221be89 100644
--- a/gfx/pics/magnemite/front.5x5.2bpp.lz
+++ b/gfx/pics/magnemite/front.2bpp.lz
diff --git a/gfx/pics/magneton/back.6x6.2bpp.lz b/gfx/pics/magneton/back.2bpp.lz
index c029f8cef..c029f8cef 100644
--- a/gfx/pics/magneton/back.6x6.2bpp.lz
+++ b/gfx/pics/magneton/back.2bpp.lz
diff --git a/gfx/pics/magneton/front.6x6.2bpp.lz b/gfx/pics/magneton/front.2bpp.lz
index f7b7a0be0..f7b7a0be0 100644
--- a/gfx/pics/magneton/front.6x6.2bpp.lz
+++ b/gfx/pics/magneton/front.2bpp.lz
diff --git a/gfx/pics/mankey/back.6x6.2bpp.lz b/gfx/pics/mankey/back.2bpp.lz
index 62989a377..62989a377 100644
--- a/gfx/pics/mankey/back.6x6.2bpp.lz
+++ b/gfx/pics/mankey/back.2bpp.lz
diff --git a/gfx/pics/mankey/front.5x5.2bpp.lz b/gfx/pics/mankey/front.2bpp.lz
index 03d014d87..03d014d87 100644
--- a/gfx/pics/mankey/front.5x5.2bpp.lz
+++ b/gfx/pics/mankey/front.2bpp.lz
diff --git a/gfx/pics/mantine/back.6x6.2bpp.lz b/gfx/pics/mantine/back.2bpp.lz
index 3378e2df5..3378e2df5 100644
--- a/gfx/pics/mantine/back.6x6.2bpp.lz
+++ b/gfx/pics/mantine/back.2bpp.lz
diff --git a/gfx/pics/mantine/front.7x7.2bpp.lz b/gfx/pics/mantine/front.2bpp.lz
index 6ebc14050..6ebc14050 100644
--- a/gfx/pics/mantine/front.7x7.2bpp.lz
+++ b/gfx/pics/mantine/front.2bpp.lz
diff --git a/gfx/pics/mareep/back.6x6.2bpp.lz b/gfx/pics/mareep/back.2bpp.lz
index e703d450f..e703d450f 100644
--- a/gfx/pics/mareep/back.6x6.2bpp.lz
+++ b/gfx/pics/mareep/back.2bpp.lz
diff --git a/gfx/pics/mareep/front.5x5.2bpp.lz b/gfx/pics/mareep/front.2bpp.lz
index 0245a96cd..0245a96cd 100644
--- a/gfx/pics/mareep/front.5x5.2bpp.lz
+++ b/gfx/pics/mareep/front.2bpp.lz
diff --git a/gfx/pics/marill/back.6x6.2bpp.lz b/gfx/pics/marill/back.2bpp.lz
index 699fdaf6c..699fdaf6c 100644
--- a/gfx/pics/marill/back.6x6.2bpp.lz
+++ b/gfx/pics/marill/back.2bpp.lz
diff --git a/gfx/pics/marill/front.5x5.2bpp.lz b/gfx/pics/marill/front.2bpp.lz
index abe4c982a..abe4c982a 100644
--- a/gfx/pics/marill/front.5x5.2bpp.lz
+++ b/gfx/pics/marill/front.2bpp.lz
diff --git a/gfx/pics/marowak/back.6x6.2bpp.lz b/gfx/pics/marowak/back.2bpp.lz
index 90a297b3d..90a297b3d 100644
--- a/gfx/pics/marowak/back.6x6.2bpp.lz
+++ b/gfx/pics/marowak/back.2bpp.lz
diff --git a/gfx/pics/marowak/front.6x6.2bpp.lz b/gfx/pics/marowak/front.2bpp.lz
index 59f984bcd..59f984bcd 100644
--- a/gfx/pics/marowak/front.6x6.2bpp.lz
+++ b/gfx/pics/marowak/front.2bpp.lz
diff --git a/gfx/pics/meganium/back.6x6.2bpp.lz b/gfx/pics/meganium/back.2bpp.lz
index 718f66f87..718f66f87 100644
--- a/gfx/pics/meganium/back.6x6.2bpp.lz
+++ b/gfx/pics/meganium/back.2bpp.lz
diff --git a/gfx/pics/meganium/front.7x7.2bpp.lz b/gfx/pics/meganium/front.2bpp.lz
index 84f600d60..84f600d60 100644
--- a/gfx/pics/meganium/front.7x7.2bpp.lz
+++ b/gfx/pics/meganium/front.2bpp.lz
diff --git a/gfx/pics/meowth/back.6x6.2bpp.lz b/gfx/pics/meowth/back.2bpp.lz
index 205b106e9..205b106e9 100644
--- a/gfx/pics/meowth/back.6x6.2bpp.lz
+++ b/gfx/pics/meowth/back.2bpp.lz
diff --git a/gfx/pics/meowth/front.5x5.2bpp.lz b/gfx/pics/meowth/front.2bpp.lz
index 87ff35366..87ff35366 100644
--- a/gfx/pics/meowth/front.5x5.2bpp.lz
+++ b/gfx/pics/meowth/front.2bpp.lz
diff --git a/gfx/pics/metapod/back.6x6.2bpp.lz b/gfx/pics/metapod/back.2bpp.lz
index a2a446960..a2a446960 100644
--- a/gfx/pics/metapod/back.6x6.2bpp.lz
+++ b/gfx/pics/metapod/back.2bpp.lz
diff --git a/gfx/pics/metapod/front.5x5.2bpp.lz b/gfx/pics/metapod/front.2bpp.lz
index 1dcd7a501..1dcd7a501 100644
--- a/gfx/pics/metapod/front.5x5.2bpp.lz
+++ b/gfx/pics/metapod/front.2bpp.lz
diff --git a/gfx/pics/mew/back.6x6.2bpp.lz b/gfx/pics/mew/back.2bpp.lz
index 388a8de9e..388a8de9e 100644
--- a/gfx/pics/mew/back.6x6.2bpp.lz
+++ b/gfx/pics/mew/back.2bpp.lz
diff --git a/gfx/pics/mew/front.5x5.2bpp.lz b/gfx/pics/mew/front.2bpp.lz
index 240965783..240965783 100644
--- a/gfx/pics/mew/front.5x5.2bpp.lz
+++ b/gfx/pics/mew/front.2bpp.lz
diff --git a/gfx/pics/mewtwo/back.6x6.2bpp.lz b/gfx/pics/mewtwo/back.2bpp.lz
index 3be56c470..3be56c470 100644
--- a/gfx/pics/mewtwo/back.6x6.2bpp.lz
+++ b/gfx/pics/mewtwo/back.2bpp.lz
diff --git a/gfx/pics/mewtwo/front.7x7.2bpp.lz b/gfx/pics/mewtwo/front.2bpp.lz
index 35cc2c378..35cc2c378 100644
--- a/gfx/pics/mewtwo/front.7x7.2bpp.lz
+++ b/gfx/pics/mewtwo/front.2bpp.lz
diff --git a/gfx/pics/miltank/back.6x6.2bpp.lz b/gfx/pics/miltank/back.2bpp.lz
index 150f65c54..150f65c54 100644
--- a/gfx/pics/miltank/back.6x6.2bpp.lz
+++ b/gfx/pics/miltank/back.2bpp.lz
diff --git a/gfx/pics/miltank/front.6x6.2bpp.lz b/gfx/pics/miltank/front.2bpp.lz
index 969d04fcd..969d04fcd 100644
--- a/gfx/pics/miltank/front.6x6.2bpp.lz
+++ b/gfx/pics/miltank/front.2bpp.lz
diff --git a/gfx/pics/misdreavus/back.6x6.2bpp.lz b/gfx/pics/misdreavus/back.2bpp.lz
index 5cf96e821..5cf96e821 100644
--- a/gfx/pics/misdreavus/back.6x6.2bpp.lz
+++ b/gfx/pics/misdreavus/back.2bpp.lz
diff --git a/gfx/pics/misdreavus/front.6x6.2bpp.lz b/gfx/pics/misdreavus/front.2bpp.lz
index 76f5c6919..76f5c6919 100644
--- a/gfx/pics/misdreavus/front.6x6.2bpp.lz
+++ b/gfx/pics/misdreavus/front.2bpp.lz
diff --git a/gfx/pics/moltres/back.6x6.2bpp.lz b/gfx/pics/moltres/back.2bpp.lz
index 542a73138..542a73138 100644
--- a/gfx/pics/moltres/back.6x6.2bpp.lz
+++ b/gfx/pics/moltres/back.2bpp.lz
diff --git a/gfx/pics/moltres/front.7x7.2bpp.lz b/gfx/pics/moltres/front.2bpp.lz
index ec03e4653..ec03e4653 100644
--- a/gfx/pics/moltres/front.7x7.2bpp.lz
+++ b/gfx/pics/moltres/front.2bpp.lz
diff --git a/gfx/pics/mr__mime/back.6x6.2bpp.lz b/gfx/pics/mr__mime/back.2bpp.lz
index eb1647580..eb1647580 100644
--- a/gfx/pics/mr__mime/back.6x6.2bpp.lz
+++ b/gfx/pics/mr__mime/back.2bpp.lz
diff --git a/gfx/pics/mr__mime/front.6x6.2bpp.lz b/gfx/pics/mr__mime/front.2bpp.lz
index 48555cbe0..48555cbe0 100644
--- a/gfx/pics/mr__mime/front.6x6.2bpp.lz
+++ b/gfx/pics/mr__mime/front.2bpp.lz
diff --git a/gfx/pics/muk/back.6x6.2bpp.lz b/gfx/pics/muk/back.2bpp.lz
index 63a6aa8de..63a6aa8de 100644
--- a/gfx/pics/muk/back.6x6.2bpp.lz
+++ b/gfx/pics/muk/back.2bpp.lz
diff --git a/gfx/pics/muk/front.7x7.2bpp.lz b/gfx/pics/muk/front.2bpp.lz
index 3a4280270..3a4280270 100644
--- a/gfx/pics/muk/front.7x7.2bpp.lz
+++ b/gfx/pics/muk/front.2bpp.lz
diff --git a/gfx/pics/murkrow/back.6x6.2bpp.lz b/gfx/pics/murkrow/back.2bpp.lz
index b99287081..b99287081 100644
--- a/gfx/pics/murkrow/back.6x6.2bpp.lz
+++ b/gfx/pics/murkrow/back.2bpp.lz
diff --git a/gfx/pics/murkrow/front.6x6.2bpp.lz b/gfx/pics/murkrow/front.2bpp.lz
index e7ae99387..e7ae99387 100644
--- a/gfx/pics/murkrow/front.6x6.2bpp.lz
+++ b/gfx/pics/murkrow/front.2bpp.lz
diff --git a/gfx/pics/natu/back.6x6.2bpp.lz b/gfx/pics/natu/back.2bpp.lz
index b4ba45c14..b4ba45c14 100644
--- a/gfx/pics/natu/back.6x6.2bpp.lz
+++ b/gfx/pics/natu/back.2bpp.lz
diff --git a/gfx/pics/natu/front.5x5.2bpp.lz b/gfx/pics/natu/front.2bpp.lz
index adebc8879..adebc8879 100644
--- a/gfx/pics/natu/front.5x5.2bpp.lz
+++ b/gfx/pics/natu/front.2bpp.lz
diff --git a/gfx/pics/nidoking/back.6x6.2bpp.lz b/gfx/pics/nidoking/back.2bpp.lz
index b3f35b5a1..b3f35b5a1 100644
--- a/gfx/pics/nidoking/back.6x6.2bpp.lz
+++ b/gfx/pics/nidoking/back.2bpp.lz
diff --git a/gfx/pics/nidoking/front.7x7.2bpp.lz b/gfx/pics/nidoking/front.2bpp.lz
index aad75774c..aad75774c 100644
--- a/gfx/pics/nidoking/front.7x7.2bpp.lz
+++ b/gfx/pics/nidoking/front.2bpp.lz
diff --git a/gfx/pics/nidoqueen/back.6x6.2bpp.lz b/gfx/pics/nidoqueen/back.2bpp.lz
index b363f089e..b363f089e 100644
--- a/gfx/pics/nidoqueen/back.6x6.2bpp.lz
+++ b/gfx/pics/nidoqueen/back.2bpp.lz
diff --git a/gfx/pics/nidoqueen/front.7x7.2bpp.lz b/gfx/pics/nidoqueen/front.2bpp.lz
index d02a553d5..d02a553d5 100644
--- a/gfx/pics/nidoqueen/front.7x7.2bpp.lz
+++ b/gfx/pics/nidoqueen/front.2bpp.lz
diff --git a/gfx/pics/nidoran_f/back.6x6.2bpp.lz b/gfx/pics/nidoran_f/back.2bpp.lz
index df43f06a1..df43f06a1 100644
--- a/gfx/pics/nidoran_f/back.6x6.2bpp.lz
+++ b/gfx/pics/nidoran_f/back.2bpp.lz
diff --git a/gfx/pics/nidoran_f/front.5x5.2bpp.lz b/gfx/pics/nidoran_f/front.2bpp.lz
index 477857691..477857691 100644
--- a/gfx/pics/nidoran_f/front.5x5.2bpp.lz
+++ b/gfx/pics/nidoran_f/front.2bpp.lz
diff --git a/gfx/pics/nidoran_m/back.6x6.2bpp.lz b/gfx/pics/nidoran_m/back.2bpp.lz
index 4b3be9a60..4b3be9a60 100644
--- a/gfx/pics/nidoran_m/back.6x6.2bpp.lz
+++ b/gfx/pics/nidoran_m/back.2bpp.lz
diff --git a/gfx/pics/nidoran_m/front.5x5.2bpp.lz b/gfx/pics/nidoran_m/front.2bpp.lz
index 661dadada..661dadada 100644
--- a/gfx/pics/nidoran_m/front.5x5.2bpp.lz
+++ b/gfx/pics/nidoran_m/front.2bpp.lz
diff --git a/gfx/pics/nidorina/back.6x6.2bpp.lz b/gfx/pics/nidorina/back.2bpp.lz
index 141d61f81..141d61f81 100644
--- a/gfx/pics/nidorina/back.6x6.2bpp.lz
+++ b/gfx/pics/nidorina/back.2bpp.lz
diff --git a/gfx/pics/nidorina/front.6x6.2bpp.lz b/gfx/pics/nidorina/front.2bpp.lz
index 04523a52b..04523a52b 100644
--- a/gfx/pics/nidorina/front.6x6.2bpp.lz
+++ b/gfx/pics/nidorina/front.2bpp.lz
diff --git a/gfx/pics/nidorino/back.6x6.2bpp.lz b/gfx/pics/nidorino/back.2bpp.lz
index 6e6a841e9..6e6a841e9 100644
--- a/gfx/pics/nidorino/back.6x6.2bpp.lz
+++ b/gfx/pics/nidorino/back.2bpp.lz
diff --git a/gfx/pics/nidorino/front.6x6.2bpp.lz b/gfx/pics/nidorino/front.2bpp.lz
index 228c93b52..228c93b52 100644
--- a/gfx/pics/nidorino/front.6x6.2bpp.lz
+++ b/gfx/pics/nidorino/front.2bpp.lz
diff --git a/gfx/pics/ninetales/back.6x6.2bpp.lz b/gfx/pics/ninetales/back.2bpp.lz
index e6b264033..e6b264033 100644
--- a/gfx/pics/ninetales/back.6x6.2bpp.lz
+++ b/gfx/pics/ninetales/back.2bpp.lz
diff --git a/gfx/pics/ninetales/front.7x7.2bpp.lz b/gfx/pics/ninetales/front.2bpp.lz
index 4865c6d82..4865c6d82 100644
--- a/gfx/pics/ninetales/front.7x7.2bpp.lz
+++ b/gfx/pics/ninetales/front.2bpp.lz
diff --git a/gfx/pics/noctowl/back.6x6.2bpp.lz b/gfx/pics/noctowl/back.2bpp.lz
index 9ef83c86e..9ef83c86e 100644
--- a/gfx/pics/noctowl/back.6x6.2bpp.lz
+++ b/gfx/pics/noctowl/back.2bpp.lz
diff --git a/gfx/pics/noctowl/front.7x7.2bpp.lz b/gfx/pics/noctowl/front.2bpp.lz
index cd0d1313b..cd0d1313b 100644
--- a/gfx/pics/noctowl/front.7x7.2bpp.lz
+++ b/gfx/pics/noctowl/front.2bpp.lz
diff --git a/gfx/pics/octillery/back.6x6.2bpp.lz b/gfx/pics/octillery/back.2bpp.lz
index 2d12597ca..2d12597ca 100644
--- a/gfx/pics/octillery/back.6x6.2bpp.lz
+++ b/gfx/pics/octillery/back.2bpp.lz
diff --git a/gfx/pics/octillery/front.6x6.2bpp.lz b/gfx/pics/octillery/front.2bpp.lz
index 9ffec9b38..9ffec9b38 100644
--- a/gfx/pics/octillery/front.6x6.2bpp.lz
+++ b/gfx/pics/octillery/front.2bpp.lz
diff --git a/gfx/pics/oddish/back.6x6.2bpp.lz b/gfx/pics/oddish/back.2bpp.lz
index 81ba4e5f3..81ba4e5f3 100644
--- a/gfx/pics/oddish/back.6x6.2bpp.lz
+++ b/gfx/pics/oddish/back.2bpp.lz
diff --git a/gfx/pics/oddish/front.5x5.2bpp.lz b/gfx/pics/oddish/front.2bpp.lz
index 3864c0b7a..3864c0b7a 100644
--- a/gfx/pics/oddish/front.5x5.2bpp.lz
+++ b/gfx/pics/oddish/front.2bpp.lz
diff --git a/gfx/pics/omanyte/back.6x6.2bpp.lz b/gfx/pics/omanyte/back.2bpp.lz
index 0ee462eaf..0ee462eaf 100644
--- a/gfx/pics/omanyte/back.6x6.2bpp.lz
+++ b/gfx/pics/omanyte/back.2bpp.lz
diff --git a/gfx/pics/omanyte/front.5x5.2bpp.lz b/gfx/pics/omanyte/front.2bpp.lz
index 7673b2390..7673b2390 100644
--- a/gfx/pics/omanyte/front.5x5.2bpp.lz
+++ b/gfx/pics/omanyte/front.2bpp.lz
diff --git a/gfx/pics/omastar/back.6x6.2bpp.lz b/gfx/pics/omastar/back.2bpp.lz
index b41a828c5..b41a828c5 100644
--- a/gfx/pics/omastar/back.6x6.2bpp.lz
+++ b/gfx/pics/omastar/back.2bpp.lz
diff --git a/gfx/pics/omastar/front.6x6.2bpp.lz b/gfx/pics/omastar/front.2bpp.lz
index 544e2d87b..544e2d87b 100644
--- a/gfx/pics/omastar/front.6x6.2bpp.lz
+++ b/gfx/pics/omastar/front.2bpp.lz
diff --git a/gfx/pics/onix/back.6x6.2bpp.lz b/gfx/pics/onix/back.2bpp.lz
index 05df1a96b..05df1a96b 100644
--- a/gfx/pics/onix/back.6x6.2bpp.lz
+++ b/gfx/pics/onix/back.2bpp.lz
diff --git a/gfx/pics/onix/front.7x7.2bpp.lz b/gfx/pics/onix/front.2bpp.lz
index dc3bfca6e..dc3bfca6e 100644
--- a/gfx/pics/onix/front.7x7.2bpp.lz
+++ b/gfx/pics/onix/front.2bpp.lz
diff --git a/gfx/pics/paras/back.6x6.2bpp.lz b/gfx/pics/paras/back.2bpp.lz
index d6c3d4a62..d6c3d4a62 100644
--- a/gfx/pics/paras/back.6x6.2bpp.lz
+++ b/gfx/pics/paras/back.2bpp.lz
diff --git a/gfx/pics/paras/front.5x5.2bpp.lz b/gfx/pics/paras/front.2bpp.lz
index 927c831d0..927c831d0 100644
--- a/gfx/pics/paras/front.5x5.2bpp.lz
+++ b/gfx/pics/paras/front.2bpp.lz
diff --git a/gfx/pics/parasect/back.6x6.2bpp.lz b/gfx/pics/parasect/back.2bpp.lz
index a63677ff7..a63677ff7 100644
--- a/gfx/pics/parasect/back.6x6.2bpp.lz
+++ b/gfx/pics/parasect/back.2bpp.lz
diff --git a/gfx/pics/parasect/front.7x7.2bpp.lz b/gfx/pics/parasect/front.2bpp.lz
index f1743d07e..f1743d07e 100644
--- a/gfx/pics/parasect/front.7x7.2bpp.lz
+++ b/gfx/pics/parasect/front.2bpp.lz
diff --git a/gfx/pics/persian/back.6x6.2bpp.lz b/gfx/pics/persian/back.2bpp.lz
index e615d47fb..e615d47fb 100644
--- a/gfx/pics/persian/back.6x6.2bpp.lz
+++ b/gfx/pics/persian/back.2bpp.lz
diff --git a/gfx/pics/persian/front.7x7.2bpp.lz b/gfx/pics/persian/front.2bpp.lz
index 1f13a0cca..1f13a0cca 100644
--- a/gfx/pics/persian/front.7x7.2bpp.lz
+++ b/gfx/pics/persian/front.2bpp.lz
diff --git a/gfx/pics/phanpy/back.6x6.2bpp.lz b/gfx/pics/phanpy/back.2bpp.lz
index cef1bf442..cef1bf442 100644
--- a/gfx/pics/phanpy/back.6x6.2bpp.lz
+++ b/gfx/pics/phanpy/back.2bpp.lz
diff --git a/gfx/pics/phanpy/front.5x5.2bpp.lz b/gfx/pics/phanpy/front.2bpp.lz
index d919487b8..d919487b8 100644
--- a/gfx/pics/phanpy/front.5x5.2bpp.lz
+++ b/gfx/pics/phanpy/front.2bpp.lz
diff --git a/gfx/pics/pichu/back.6x6.2bpp.lz b/gfx/pics/pichu/back.2bpp.lz
index 61ab083b3..61ab083b3 100644
--- a/gfx/pics/pichu/back.6x6.2bpp.lz
+++ b/gfx/pics/pichu/back.2bpp.lz
diff --git a/gfx/pics/pichu/front.5x5.2bpp.lz b/gfx/pics/pichu/front.2bpp.lz
index 06712d244..06712d244 100644
--- a/gfx/pics/pichu/front.5x5.2bpp.lz
+++ b/gfx/pics/pichu/front.2bpp.lz
diff --git a/gfx/pics/pidgeot/back.6x6.2bpp.lz b/gfx/pics/pidgeot/back.2bpp.lz
index a464dd7d1..a464dd7d1 100644
--- a/gfx/pics/pidgeot/back.6x6.2bpp.lz
+++ b/gfx/pics/pidgeot/back.2bpp.lz
diff --git a/gfx/pics/pidgeot/front.7x7.2bpp.lz b/gfx/pics/pidgeot/front.2bpp.lz
index f5cbb3f56..f5cbb3f56 100644
--- a/gfx/pics/pidgeot/front.7x7.2bpp.lz
+++ b/gfx/pics/pidgeot/front.2bpp.lz
diff --git a/gfx/pics/pidgeotto/back.6x6.2bpp.lz b/gfx/pics/pidgeotto/back.2bpp.lz
index d766747ef..d766747ef 100644
--- a/gfx/pics/pidgeotto/back.6x6.2bpp.lz
+++ b/gfx/pics/pidgeotto/back.2bpp.lz
diff --git a/gfx/pics/pidgeotto/front.6x6.2bpp.lz b/gfx/pics/pidgeotto/front.2bpp.lz
index 0fc3a94fd..0fc3a94fd 100644
--- a/gfx/pics/pidgeotto/front.6x6.2bpp.lz
+++ b/gfx/pics/pidgeotto/front.2bpp.lz
diff --git a/gfx/pics/pidgey/back.6x6.2bpp.lz b/gfx/pics/pidgey/back.2bpp.lz
index 48669456e..48669456e 100644
--- a/gfx/pics/pidgey/back.6x6.2bpp.lz
+++ b/gfx/pics/pidgey/back.2bpp.lz
diff --git a/gfx/pics/pidgey/front.5x5.2bpp.lz b/gfx/pics/pidgey/front.2bpp.lz
index 03c579dbf..03c579dbf 100644
--- a/gfx/pics/pidgey/front.5x5.2bpp.lz
+++ b/gfx/pics/pidgey/front.2bpp.lz
diff --git a/gfx/pics/pikachu/back.6x6.2bpp.lz b/gfx/pics/pikachu/back.2bpp.lz
index 3f74382ae..3f74382ae 100644
--- a/gfx/pics/pikachu/back.6x6.2bpp.lz
+++ b/gfx/pics/pikachu/back.2bpp.lz
diff --git a/gfx/pics/pikachu/front.5x5.2bpp.lz b/gfx/pics/pikachu/front.2bpp.lz
index 1dbea0496..1dbea0496 100644
--- a/gfx/pics/pikachu/front.5x5.2bpp.lz
+++ b/gfx/pics/pikachu/front.2bpp.lz
diff --git a/gfx/pics/piloswine/back.6x6.2bpp.lz b/gfx/pics/piloswine/back.2bpp.lz
index 2bdbd05b7..2bdbd05b7 100644
--- a/gfx/pics/piloswine/back.6x6.2bpp.lz
+++ b/gfx/pics/piloswine/back.2bpp.lz
diff --git a/gfx/pics/piloswine/front.6x6.2bpp.lz b/gfx/pics/piloswine/front.2bpp.lz
index 45b87144e..45b87144e 100644
--- a/gfx/pics/piloswine/front.6x6.2bpp.lz
+++ b/gfx/pics/piloswine/front.2bpp.lz
diff --git a/gfx/pics/pineco/back.6x6.2bpp.lz b/gfx/pics/pineco/back.2bpp.lz
index f4baaadb9..f4baaadb9 100644
--- a/gfx/pics/pineco/back.6x6.2bpp.lz
+++ b/gfx/pics/pineco/back.2bpp.lz
diff --git a/gfx/pics/pineco/front.5x5.2bpp.lz b/gfx/pics/pineco/front.2bpp.lz
index c36a27807..c36a27807 100644
--- a/gfx/pics/pineco/front.5x5.2bpp.lz
+++ b/gfx/pics/pineco/front.2bpp.lz
diff --git a/gfx/pics/pinsir/back.6x6.2bpp.lz b/gfx/pics/pinsir/back.2bpp.lz
index 8803c8a0a..8803c8a0a 100644
--- a/gfx/pics/pinsir/back.6x6.2bpp.lz
+++ b/gfx/pics/pinsir/back.2bpp.lz
diff --git a/gfx/pics/pinsir/front.7x7.2bpp.lz b/gfx/pics/pinsir/front.2bpp.lz
index d2ec9ecd9..d2ec9ecd9 100644
--- a/gfx/pics/pinsir/front.7x7.2bpp.lz
+++ b/gfx/pics/pinsir/front.2bpp.lz
diff --git a/gfx/pics/politoed/back.6x6.2bpp.lz b/gfx/pics/politoed/back.2bpp.lz
index 2c492fcaf..2c492fcaf 100644
--- a/gfx/pics/politoed/back.6x6.2bpp.lz
+++ b/gfx/pics/politoed/back.2bpp.lz
diff --git a/gfx/pics/politoed/front.7x7.2bpp.lz b/gfx/pics/politoed/front.2bpp.lz
index 8890a7ed4..8890a7ed4 100644
--- a/gfx/pics/politoed/front.7x7.2bpp.lz
+++ b/gfx/pics/politoed/front.2bpp.lz
diff --git a/gfx/pics/poliwag/back.6x6.2bpp.lz b/gfx/pics/poliwag/back.2bpp.lz
index 58d039d16..58d039d16 100644
--- a/gfx/pics/poliwag/back.6x6.2bpp.lz
+++ b/gfx/pics/poliwag/back.2bpp.lz
diff --git a/gfx/pics/poliwag/front.5x5.2bpp.lz b/gfx/pics/poliwag/front.2bpp.lz
index df9741516..df9741516 100644
--- a/gfx/pics/poliwag/front.5x5.2bpp.lz
+++ b/gfx/pics/poliwag/front.2bpp.lz
diff --git a/gfx/pics/poliwhirl/back.6x6.2bpp.lz b/gfx/pics/poliwhirl/back.2bpp.lz
index a78a2cfff..a78a2cfff 100644
--- a/gfx/pics/poliwhirl/back.6x6.2bpp.lz
+++ b/gfx/pics/poliwhirl/back.2bpp.lz
diff --git a/gfx/pics/poliwhirl/front.6x6.2bpp.lz b/gfx/pics/poliwhirl/front.2bpp.lz
index b06f41441..b06f41441 100644
--- a/gfx/pics/poliwhirl/front.6x6.2bpp.lz
+++ b/gfx/pics/poliwhirl/front.2bpp.lz
diff --git a/gfx/pics/poliwrath/back.6x6.2bpp.lz b/gfx/pics/poliwrath/back.2bpp.lz
index eab9164aa..eab9164aa 100644
--- a/gfx/pics/poliwrath/back.6x6.2bpp.lz
+++ b/gfx/pics/poliwrath/back.2bpp.lz
diff --git a/gfx/pics/poliwrath/front.7x7.2bpp.lz b/gfx/pics/poliwrath/front.2bpp.lz
index 601937221..601937221 100644
--- a/gfx/pics/poliwrath/front.7x7.2bpp.lz
+++ b/gfx/pics/poliwrath/front.2bpp.lz
diff --git a/gfx/pics/ponyta/back.6x6.2bpp.lz b/gfx/pics/ponyta/back.2bpp.lz
index 5d7ecaa93..5d7ecaa93 100644
--- a/gfx/pics/ponyta/back.6x6.2bpp.lz
+++ b/gfx/pics/ponyta/back.2bpp.lz
diff --git a/gfx/pics/ponyta/front.6x6.2bpp.lz b/gfx/pics/ponyta/front.2bpp.lz
index 5d3aa48db..5d3aa48db 100644
--- a/gfx/pics/ponyta/front.6x6.2bpp.lz
+++ b/gfx/pics/ponyta/front.2bpp.lz
diff --git a/gfx/pics/porygon/back.6x6.2bpp.lz b/gfx/pics/porygon/back.2bpp.lz
index 5f0a47032..5f0a47032 100644
--- a/gfx/pics/porygon/back.6x6.2bpp.lz
+++ b/gfx/pics/porygon/back.2bpp.lz
diff --git a/gfx/pics/porygon/front.6x6.2bpp.lz b/gfx/pics/porygon/front.2bpp.lz
index 734305a14..734305a14 100644
--- a/gfx/pics/porygon/front.6x6.2bpp.lz
+++ b/gfx/pics/porygon/front.2bpp.lz
diff --git a/gfx/pics/porygon2/back.6x6.2bpp.lz b/gfx/pics/porygon2/back.2bpp.lz
index 5be528963..5be528963 100644
--- a/gfx/pics/porygon2/back.6x6.2bpp.lz
+++ b/gfx/pics/porygon2/back.2bpp.lz
diff --git a/gfx/pics/porygon2/front.6x6.2bpp.lz b/gfx/pics/porygon2/front.2bpp.lz
index 5e66bb54d..5e66bb54d 100644
--- a/gfx/pics/porygon2/front.6x6.2bpp.lz
+++ b/gfx/pics/porygon2/front.2bpp.lz
diff --git a/gfx/pics/primeape/back.6x6.2bpp.lz b/gfx/pics/primeape/back.2bpp.lz
index c0937a9ae..c0937a9ae 100644
--- a/gfx/pics/primeape/back.6x6.2bpp.lz
+++ b/gfx/pics/primeape/back.2bpp.lz
diff --git a/gfx/pics/primeape/front.7x7.2bpp.lz b/gfx/pics/primeape/front.2bpp.lz
index 8f513878f..8f513878f 100644
--- a/gfx/pics/primeape/front.7x7.2bpp.lz
+++ b/gfx/pics/primeape/front.2bpp.lz
diff --git a/gfx/pics/psyduck/back.6x6.2bpp.lz b/gfx/pics/psyduck/back.2bpp.lz
index d627a146c..d627a146c 100644
--- a/gfx/pics/psyduck/back.6x6.2bpp.lz
+++ b/gfx/pics/psyduck/back.2bpp.lz
diff --git a/gfx/pics/psyduck/front.5x5.2bpp.lz b/gfx/pics/psyduck/front.2bpp.lz
index 7988f1b0c..7988f1b0c 100644
--- a/gfx/pics/psyduck/front.5x5.2bpp.lz
+++ b/gfx/pics/psyduck/front.2bpp.lz
diff --git a/gfx/pics/pupitar/back.6x6.2bpp.lz b/gfx/pics/pupitar/back.2bpp.lz
index 46cf0e240..46cf0e240 100644
--- a/gfx/pics/pupitar/back.6x6.2bpp.lz
+++ b/gfx/pics/pupitar/back.2bpp.lz
diff --git a/gfx/pics/pupitar/front.6x6.2bpp.lz b/gfx/pics/pupitar/front.2bpp.lz
index c39582db6..c39582db6 100644
--- a/gfx/pics/pupitar/front.6x6.2bpp.lz
+++ b/gfx/pics/pupitar/front.2bpp.lz
diff --git a/gfx/pics/quagsire/back.6x6.2bpp.lz b/gfx/pics/quagsire/back.2bpp.lz
index 543ce394f..543ce394f 100644
--- a/gfx/pics/quagsire/back.6x6.2bpp.lz
+++ b/gfx/pics/quagsire/back.2bpp.lz
diff --git a/gfx/pics/quagsire/front.6x6.2bpp.lz b/gfx/pics/quagsire/front.2bpp.lz
index d1f42f064..d1f42f064 100644
--- a/gfx/pics/quagsire/front.6x6.2bpp.lz
+++ b/gfx/pics/quagsire/front.2bpp.lz
diff --git a/gfx/pics/quilava/back.6x6.2bpp.lz b/gfx/pics/quilava/back.2bpp.lz
index 8514a77c7..8514a77c7 100644
--- a/gfx/pics/quilava/back.6x6.2bpp.lz
+++ b/gfx/pics/quilava/back.2bpp.lz
diff --git a/gfx/pics/quilava/front.6x6.2bpp.lz b/gfx/pics/quilava/front.2bpp.lz
index 33aebb81c..33aebb81c 100644
--- a/gfx/pics/quilava/front.6x6.2bpp.lz
+++ b/gfx/pics/quilava/front.2bpp.lz
diff --git a/gfx/pics/qwilfish/back.6x6.2bpp.lz b/gfx/pics/qwilfish/back.2bpp.lz
index 09f793f47..09f793f47 100644
--- a/gfx/pics/qwilfish/back.6x6.2bpp.lz
+++ b/gfx/pics/qwilfish/back.2bpp.lz
diff --git a/gfx/pics/qwilfish/front.5x5.2bpp.lz b/gfx/pics/qwilfish/front.2bpp.lz
index 02370c7ba..02370c7ba 100644
--- a/gfx/pics/qwilfish/front.5x5.2bpp.lz
+++ b/gfx/pics/qwilfish/front.2bpp.lz
diff --git a/gfx/pics/raichu/back.6x6.2bpp.lz b/gfx/pics/raichu/back.2bpp.lz
index 912c378e8..912c378e8 100644
--- a/gfx/pics/raichu/back.6x6.2bpp.lz
+++ b/gfx/pics/raichu/back.2bpp.lz
diff --git a/gfx/pics/raichu/front.7x7.2bpp.lz b/gfx/pics/raichu/front.2bpp.lz
index 84115fb00..84115fb00 100644
--- a/gfx/pics/raichu/front.7x7.2bpp.lz
+++ b/gfx/pics/raichu/front.2bpp.lz
diff --git a/gfx/pics/raikou/back.6x6.2bpp.lz b/gfx/pics/raikou/back.2bpp.lz
index 23fd5c471..23fd5c471 100644
--- a/gfx/pics/raikou/back.6x6.2bpp.lz
+++ b/gfx/pics/raikou/back.2bpp.lz
diff --git a/gfx/pics/raikou/front.7x7.2bpp.lz b/gfx/pics/raikou/front.2bpp.lz
index dba4517aa..dba4517aa 100644
--- a/gfx/pics/raikou/front.7x7.2bpp.lz
+++ b/gfx/pics/raikou/front.2bpp.lz
diff --git a/gfx/pics/rapidash/back.6x6.2bpp.lz b/gfx/pics/rapidash/back.2bpp.lz
index 3854c29e5..3854c29e5 100644
--- a/gfx/pics/rapidash/back.6x6.2bpp.lz
+++ b/gfx/pics/rapidash/back.2bpp.lz
diff --git a/gfx/pics/rapidash/front.7x7.2bpp.lz b/gfx/pics/rapidash/front.2bpp.lz
index 231e312fb..231e312fb 100644
--- a/gfx/pics/rapidash/front.7x7.2bpp.lz
+++ b/gfx/pics/rapidash/front.2bpp.lz
diff --git a/gfx/pics/raticate/back.6x6.2bpp.lz b/gfx/pics/raticate/back.2bpp.lz
index 4e69587dd..4e69587dd 100644
--- a/gfx/pics/raticate/back.6x6.2bpp.lz
+++ b/gfx/pics/raticate/back.2bpp.lz
diff --git a/gfx/pics/raticate/front.6x6.2bpp.lz b/gfx/pics/raticate/front.2bpp.lz
index 5b426cbdd..5b426cbdd 100644
--- a/gfx/pics/raticate/front.6x6.2bpp.lz
+++ b/gfx/pics/raticate/front.2bpp.lz
diff --git a/gfx/pics/rattata/back.6x6.2bpp.lz b/gfx/pics/rattata/back.2bpp.lz
index a06c5f1f8..a06c5f1f8 100644
--- a/gfx/pics/rattata/back.6x6.2bpp.lz
+++ b/gfx/pics/rattata/back.2bpp.lz
diff --git a/gfx/pics/rattata/front.5x5.2bpp.lz b/gfx/pics/rattata/front.2bpp.lz
index 7bb18d542..7bb18d542 100644
--- a/gfx/pics/rattata/front.5x5.2bpp.lz
+++ b/gfx/pics/rattata/front.2bpp.lz
diff --git a/gfx/pics/remoraid/back.6x6.2bpp.lz b/gfx/pics/remoraid/back.2bpp.lz
index 414d65a14..414d65a14 100644
--- a/gfx/pics/remoraid/back.6x6.2bpp.lz
+++ b/gfx/pics/remoraid/back.2bpp.lz
diff --git a/gfx/pics/remoraid/front.5x5.2bpp.lz b/gfx/pics/remoraid/front.2bpp.lz
index 6d702b4a1..6d702b4a1 100644
--- a/gfx/pics/remoraid/front.5x5.2bpp.lz
+++ b/gfx/pics/remoraid/front.2bpp.lz
diff --git a/gfx/pics/rhydon/back.6x6.2bpp.lz b/gfx/pics/rhydon/back.2bpp.lz
index b626f4ce6..b626f4ce6 100644
--- a/gfx/pics/rhydon/back.6x6.2bpp.lz
+++ b/gfx/pics/rhydon/back.2bpp.lz
diff --git a/gfx/pics/rhydon/front.7x7.2bpp.lz b/gfx/pics/rhydon/front.2bpp.lz
index 0ad1c221b..0ad1c221b 100644
--- a/gfx/pics/rhydon/front.7x7.2bpp.lz
+++ b/gfx/pics/rhydon/front.2bpp.lz
diff --git a/gfx/pics/rhyhorn/back.6x6.2bpp.lz b/gfx/pics/rhyhorn/back.2bpp.lz
index bfcafdcb4..bfcafdcb4 100644
--- a/gfx/pics/rhyhorn/back.6x6.2bpp.lz
+++ b/gfx/pics/rhyhorn/back.2bpp.lz
diff --git a/gfx/pics/rhyhorn/front.7x7.2bpp.lz b/gfx/pics/rhyhorn/front.2bpp.lz
index 62a2e8919..62a2e8919 100644
--- a/gfx/pics/rhyhorn/front.7x7.2bpp.lz
+++ b/gfx/pics/rhyhorn/front.2bpp.lz
diff --git a/gfx/pics/sandshrew/back.6x6.2bpp.lz b/gfx/pics/sandshrew/back.2bpp.lz
index 63ddb82a1..63ddb82a1 100644
--- a/gfx/pics/sandshrew/back.6x6.2bpp.lz
+++ b/gfx/pics/sandshrew/back.2bpp.lz
diff --git a/gfx/pics/sandshrew/front.5x5.2bpp.lz b/gfx/pics/sandshrew/front.2bpp.lz
index 3d1da3087..3d1da3087 100644
--- a/gfx/pics/sandshrew/front.5x5.2bpp.lz
+++ b/gfx/pics/sandshrew/front.2bpp.lz
diff --git a/gfx/pics/sandslash/back.6x6.2bpp.lz b/gfx/pics/sandslash/back.2bpp.lz
index 52bb7ce7d..52bb7ce7d 100644
--- a/gfx/pics/sandslash/back.6x6.2bpp.lz
+++ b/gfx/pics/sandslash/back.2bpp.lz
diff --git a/gfx/pics/sandslash/front.6x6.2bpp.lz b/gfx/pics/sandslash/front.2bpp.lz
index cdffe9baf..cdffe9baf 100644
--- a/gfx/pics/sandslash/front.6x6.2bpp.lz
+++ b/gfx/pics/sandslash/front.2bpp.lz
diff --git a/gfx/pics/scizor/back.6x6.2bpp.lz b/gfx/pics/scizor/back.2bpp.lz
index 5a02e7000..5a02e7000 100644
--- a/gfx/pics/scizor/back.6x6.2bpp.lz
+++ b/gfx/pics/scizor/back.2bpp.lz
diff --git a/gfx/pics/scizor/front.7x7.2bpp.lz b/gfx/pics/scizor/front.2bpp.lz
index e7d506f48..e7d506f48 100644
--- a/gfx/pics/scizor/front.7x7.2bpp.lz
+++ b/gfx/pics/scizor/front.2bpp.lz
diff --git a/gfx/pics/scyther/back.6x6.2bpp.lz b/gfx/pics/scyther/back.2bpp.lz
index 421fc4ed0..421fc4ed0 100644
--- a/gfx/pics/scyther/back.6x6.2bpp.lz
+++ b/gfx/pics/scyther/back.2bpp.lz
diff --git a/gfx/pics/scyther/front.7x7.2bpp.lz b/gfx/pics/scyther/front.2bpp.lz
index 02773fc11..02773fc11 100644
--- a/gfx/pics/scyther/front.7x7.2bpp.lz
+++ b/gfx/pics/scyther/front.2bpp.lz
diff --git a/gfx/pics/seadra/back.6x6.2bpp.lz b/gfx/pics/seadra/back.2bpp.lz
index ba9025832..ba9025832 100644
--- a/gfx/pics/seadra/back.6x6.2bpp.lz
+++ b/gfx/pics/seadra/back.2bpp.lz
diff --git a/gfx/pics/seadra/front.6x6.2bpp.lz b/gfx/pics/seadra/front.2bpp.lz
index 6d63f3645..6d63f3645 100644
--- a/gfx/pics/seadra/front.6x6.2bpp.lz
+++ b/gfx/pics/seadra/front.2bpp.lz
diff --git a/gfx/pics/seaking/back.6x6.2bpp.lz b/gfx/pics/seaking/back.2bpp.lz
index 328a1fb55..328a1fb55 100644
--- a/gfx/pics/seaking/back.6x6.2bpp.lz
+++ b/gfx/pics/seaking/back.2bpp.lz
diff --git a/gfx/pics/seaking/front.7x7.2bpp.lz b/gfx/pics/seaking/front.2bpp.lz
index e204f1025..e204f1025 100644
--- a/gfx/pics/seaking/front.7x7.2bpp.lz
+++ b/gfx/pics/seaking/front.2bpp.lz
diff --git a/gfx/pics/seel/back.6x6.2bpp.lz b/gfx/pics/seel/back.2bpp.lz
index 0d5b89dae..0d5b89dae 100644
--- a/gfx/pics/seel/back.6x6.2bpp.lz
+++ b/gfx/pics/seel/back.2bpp.lz
diff --git a/gfx/pics/seel/front.6x6.2bpp.lz b/gfx/pics/seel/front.2bpp.lz
index c8f1343d6..c8f1343d6 100644
--- a/gfx/pics/seel/front.6x6.2bpp.lz
+++ b/gfx/pics/seel/front.2bpp.lz
diff --git a/gfx/pics/sentret/back.6x6.2bpp.lz b/gfx/pics/sentret/back.2bpp.lz
index 511ba5465..511ba5465 100644
--- a/gfx/pics/sentret/back.6x6.2bpp.lz
+++ b/gfx/pics/sentret/back.2bpp.lz
diff --git a/gfx/pics/sentret/front.6x6.2bpp.lz b/gfx/pics/sentret/front.2bpp.lz
index 229aa430c..229aa430c 100644
--- a/gfx/pics/sentret/front.6x6.2bpp.lz
+++ b/gfx/pics/sentret/front.2bpp.lz
diff --git a/gfx/pics/shellder/back.6x6.2bpp.lz b/gfx/pics/shellder/back.2bpp.lz
index f0d93b8a8..f0d93b8a8 100644
--- a/gfx/pics/shellder/back.6x6.2bpp.lz
+++ b/gfx/pics/shellder/back.2bpp.lz
diff --git a/gfx/pics/shellder/front.5x5.2bpp.lz b/gfx/pics/shellder/front.2bpp.lz
index 5a444cfa6..5a444cfa6 100644
--- a/gfx/pics/shellder/front.5x5.2bpp.lz
+++ b/gfx/pics/shellder/front.2bpp.lz
diff --git a/gfx/pics/shuckle/back.6x6.2bpp.lz b/gfx/pics/shuckle/back.2bpp.lz
index 1cc4efcea..1cc4efcea 100644
--- a/gfx/pics/shuckle/back.6x6.2bpp.lz
+++ b/gfx/pics/shuckle/back.2bpp.lz
diff --git a/gfx/pics/shuckle/front.5x5.2bpp.lz b/gfx/pics/shuckle/front.2bpp.lz
index 95e78302a..95e78302a 100644
--- a/gfx/pics/shuckle/front.5x5.2bpp.lz
+++ b/gfx/pics/shuckle/front.2bpp.lz
diff --git a/gfx/pics/skarmory/back.6x6.2bpp.lz b/gfx/pics/skarmory/back.2bpp.lz
index fca13d16a..fca13d16a 100644
--- a/gfx/pics/skarmory/back.6x6.2bpp.lz
+++ b/gfx/pics/skarmory/back.2bpp.lz
diff --git a/gfx/pics/skarmory/front.7x7.2bpp.lz b/gfx/pics/skarmory/front.2bpp.lz
index e53f5a9ef..e53f5a9ef 100644
--- a/gfx/pics/skarmory/front.7x7.2bpp.lz
+++ b/gfx/pics/skarmory/front.2bpp.lz
diff --git a/gfx/pics/skiploom/back.6x6.2bpp.lz b/gfx/pics/skiploom/back.2bpp.lz
index 8b197406c..8b197406c 100644
--- a/gfx/pics/skiploom/back.6x6.2bpp.lz
+++ b/gfx/pics/skiploom/back.2bpp.lz
diff --git a/gfx/pics/skiploom/front.6x6.2bpp.lz b/gfx/pics/skiploom/front.2bpp.lz
index f48561c76..f48561c76 100644
--- a/gfx/pics/skiploom/front.6x6.2bpp.lz
+++ b/gfx/pics/skiploom/front.2bpp.lz
diff --git a/gfx/pics/slowbro/back.6x6.2bpp.lz b/gfx/pics/slowbro/back.2bpp.lz
index af1d60999..af1d60999 100644
--- a/gfx/pics/slowbro/back.6x6.2bpp.lz
+++ b/gfx/pics/slowbro/back.2bpp.lz
diff --git a/gfx/pics/slowbro/front.7x7.2bpp.lz b/gfx/pics/slowbro/front.2bpp.lz
index 0a6d1ac2c..0a6d1ac2c 100644
--- a/gfx/pics/slowbro/front.7x7.2bpp.lz
+++ b/gfx/pics/slowbro/front.2bpp.lz
diff --git a/gfx/pics/slowking/back.6x6.2bpp.lz b/gfx/pics/slowking/back.2bpp.lz
index e6342e434..e6342e434 100644
--- a/gfx/pics/slowking/back.6x6.2bpp.lz
+++ b/gfx/pics/slowking/back.2bpp.lz
diff --git a/gfx/pics/slowking/front.7x7.2bpp.lz b/gfx/pics/slowking/front.2bpp.lz
index 2f9bd1654..2f9bd1654 100644
--- a/gfx/pics/slowking/front.7x7.2bpp.lz
+++ b/gfx/pics/slowking/front.2bpp.lz
diff --git a/gfx/pics/slowpoke/back.6x6.2bpp.lz b/gfx/pics/slowpoke/back.2bpp.lz
index cdaa2178d..cdaa2178d 100644
--- a/gfx/pics/slowpoke/back.6x6.2bpp.lz
+++ b/gfx/pics/slowpoke/back.2bpp.lz
diff --git a/gfx/pics/slowpoke/front.5x5.2bpp.lz b/gfx/pics/slowpoke/front.2bpp.lz
index 23d8e22f2..23d8e22f2 100644
--- a/gfx/pics/slowpoke/front.5x5.2bpp.lz
+++ b/gfx/pics/slowpoke/front.2bpp.lz
diff --git a/gfx/pics/slugma/back.6x6.2bpp.lz b/gfx/pics/slugma/back.2bpp.lz
index 949fbc218..949fbc218 100644
--- a/gfx/pics/slugma/back.6x6.2bpp.lz
+++ b/gfx/pics/slugma/back.2bpp.lz
diff --git a/gfx/pics/slugma/front.5x5.2bpp.lz b/gfx/pics/slugma/front.2bpp.lz
index 4c9a0078e..4c9a0078e 100644
--- a/gfx/pics/slugma/front.5x5.2bpp.lz
+++ b/gfx/pics/slugma/front.2bpp.lz
diff --git a/gfx/pics/smeargle/back.6x6.2bpp.lz b/gfx/pics/smeargle/back.2bpp.lz
index eb96bfd07..eb96bfd07 100644
--- a/gfx/pics/smeargle/back.6x6.2bpp.lz
+++ b/gfx/pics/smeargle/back.2bpp.lz
diff --git a/gfx/pics/smeargle/front.7x7.2bpp.lz b/gfx/pics/smeargle/front.2bpp.lz
index 81be921d5..81be921d5 100644
--- a/gfx/pics/smeargle/front.7x7.2bpp.lz
+++ b/gfx/pics/smeargle/front.2bpp.lz
diff --git a/gfx/pics/smoochum/back.6x6.2bpp.lz b/gfx/pics/smoochum/back.2bpp.lz
index 52c256c16..52c256c16 100644
--- a/gfx/pics/smoochum/back.6x6.2bpp.lz
+++ b/gfx/pics/smoochum/back.2bpp.lz
diff --git a/gfx/pics/smoochum/front.5x5.2bpp.lz b/gfx/pics/smoochum/front.2bpp.lz
index cd4b75761..cd4b75761 100644
--- a/gfx/pics/smoochum/front.5x5.2bpp.lz
+++ b/gfx/pics/smoochum/front.2bpp.lz
diff --git a/gfx/pics/sneasel/back.6x6.2bpp.lz b/gfx/pics/sneasel/back.2bpp.lz
index be5ad2304..be5ad2304 100644
--- a/gfx/pics/sneasel/back.6x6.2bpp.lz
+++ b/gfx/pics/sneasel/back.2bpp.lz
diff --git a/gfx/pics/sneasel/front.6x6.2bpp.lz b/gfx/pics/sneasel/front.2bpp.lz
index 4add5f2e0..4add5f2e0 100644
--- a/gfx/pics/sneasel/front.6x6.2bpp.lz
+++ b/gfx/pics/sneasel/front.2bpp.lz
diff --git a/gfx/pics/snorlax/back.6x6.2bpp.lz b/gfx/pics/snorlax/back.2bpp.lz
index dfbfcbb50..dfbfcbb50 100644
--- a/gfx/pics/snorlax/back.6x6.2bpp.lz
+++ b/gfx/pics/snorlax/back.2bpp.lz
diff --git a/gfx/pics/snorlax/front.7x7.2bpp.lz b/gfx/pics/snorlax/front.2bpp.lz
index 7c610f46c..7c610f46c 100644
--- a/gfx/pics/snorlax/front.7x7.2bpp.lz
+++ b/gfx/pics/snorlax/front.2bpp.lz
diff --git a/gfx/pics/snubbull/back.6x6.2bpp.lz b/gfx/pics/snubbull/back.2bpp.lz
index 5b020db5e..5b020db5e 100644
--- a/gfx/pics/snubbull/back.6x6.2bpp.lz
+++ b/gfx/pics/snubbull/back.2bpp.lz
diff --git a/gfx/pics/snubbull/front.6x6.2bpp.lz b/gfx/pics/snubbull/front.2bpp.lz
index 69a534e2c..69a534e2c 100644
--- a/gfx/pics/snubbull/front.6x6.2bpp.lz
+++ b/gfx/pics/snubbull/front.2bpp.lz
diff --git a/gfx/pics/spearow/back.6x6.2bpp.lz b/gfx/pics/spearow/back.2bpp.lz
index 9411f32bd..9411f32bd 100644
--- a/gfx/pics/spearow/back.6x6.2bpp.lz
+++ b/gfx/pics/spearow/back.2bpp.lz
diff --git a/gfx/pics/spearow/front.5x5.2bpp.lz b/gfx/pics/spearow/front.2bpp.lz
index 8def69a01..8def69a01 100644
--- a/gfx/pics/spearow/front.5x5.2bpp.lz
+++ b/gfx/pics/spearow/front.2bpp.lz
diff --git a/gfx/pics/spinarak/back.6x6.2bpp.lz b/gfx/pics/spinarak/back.2bpp.lz
index 3fa2e3b12..3fa2e3b12 100644
--- a/gfx/pics/spinarak/back.6x6.2bpp.lz
+++ b/gfx/pics/spinarak/back.2bpp.lz
diff --git a/gfx/pics/spinarak/front.5x5.2bpp.lz b/gfx/pics/spinarak/front.2bpp.lz
index edbe6e1ce..edbe6e1ce 100644
--- a/gfx/pics/spinarak/front.5x5.2bpp.lz
+++ b/gfx/pics/spinarak/front.2bpp.lz
diff --git a/gfx/pics/squirtle/back.6x6.2bpp.lz b/gfx/pics/squirtle/back.2bpp.lz
index a8fa8d3fd..a8fa8d3fd 100644
--- a/gfx/pics/squirtle/back.6x6.2bpp.lz
+++ b/gfx/pics/squirtle/back.2bpp.lz
diff --git a/gfx/pics/squirtle/front.5x5.2bpp.lz b/gfx/pics/squirtle/front.2bpp.lz
index 175cc5e0d..175cc5e0d 100644
--- a/gfx/pics/squirtle/front.5x5.2bpp.lz
+++ b/gfx/pics/squirtle/front.2bpp.lz
diff --git a/gfx/pics/stantler/back.6x6.2bpp.lz b/gfx/pics/stantler/back.2bpp.lz
index a0ab53039..a0ab53039 100644
--- a/gfx/pics/stantler/back.6x6.2bpp.lz
+++ b/gfx/pics/stantler/back.2bpp.lz
diff --git a/gfx/pics/stantler/front.7x7.2bpp.lz b/gfx/pics/stantler/front.2bpp.lz
index 87a56e667..87a56e667 100644
--- a/gfx/pics/stantler/front.7x7.2bpp.lz
+++ b/gfx/pics/stantler/front.2bpp.lz
diff --git a/gfx/pics/starmie/back.6x6.2bpp.lz b/gfx/pics/starmie/back.2bpp.lz
index 8085f0f44..8085f0f44 100644
--- a/gfx/pics/starmie/back.6x6.2bpp.lz
+++ b/gfx/pics/starmie/back.2bpp.lz
diff --git a/gfx/pics/starmie/front.6x6.2bpp.lz b/gfx/pics/starmie/front.2bpp.lz
index b9019f6c6..b9019f6c6 100644
--- a/gfx/pics/starmie/front.6x6.2bpp.lz
+++ b/gfx/pics/starmie/front.2bpp.lz
diff --git a/gfx/pics/staryu/back.6x6.2bpp.lz b/gfx/pics/staryu/back.2bpp.lz
index 65366eb7c..65366eb7c 100644
--- a/gfx/pics/staryu/back.6x6.2bpp.lz
+++ b/gfx/pics/staryu/back.2bpp.lz
diff --git a/gfx/pics/staryu/front.6x6.2bpp.lz b/gfx/pics/staryu/front.2bpp.lz
index 8d0bdacb9..8d0bdacb9 100644
--- a/gfx/pics/staryu/front.6x6.2bpp.lz
+++ b/gfx/pics/staryu/front.2bpp.lz
diff --git a/gfx/pics/steelix/back.6x6.2bpp.lz b/gfx/pics/steelix/back.2bpp.lz
index e4cb2d6dc..e4cb2d6dc 100644
--- a/gfx/pics/steelix/back.6x6.2bpp.lz
+++ b/gfx/pics/steelix/back.2bpp.lz
diff --git a/gfx/pics/steelix/front.7x7.2bpp.lz b/gfx/pics/steelix/front.2bpp.lz
index 2da642f04..2da642f04 100644
--- a/gfx/pics/steelix/front.7x7.2bpp.lz
+++ b/gfx/pics/steelix/front.2bpp.lz
diff --git a/gfx/pics/sudowoodo/back.6x6.2bpp.lz b/gfx/pics/sudowoodo/back.2bpp.lz
index c10731ea9..c10731ea9 100644
--- a/gfx/pics/sudowoodo/back.6x6.2bpp.lz
+++ b/gfx/pics/sudowoodo/back.2bpp.lz
diff --git a/gfx/pics/sudowoodo/front.6x6.2bpp.lz b/gfx/pics/sudowoodo/front.2bpp.lz
index 160f800cf..160f800cf 100644
--- a/gfx/pics/sudowoodo/front.6x6.2bpp.lz
+++ b/gfx/pics/sudowoodo/front.2bpp.lz
diff --git a/gfx/pics/suicune/back.6x6.2bpp.lz b/gfx/pics/suicune/back.2bpp.lz
index a8106fbb4..a8106fbb4 100644
--- a/gfx/pics/suicune/back.6x6.2bpp.lz
+++ b/gfx/pics/suicune/back.2bpp.lz
diff --git a/gfx/pics/suicune/front.7x7.2bpp.lz b/gfx/pics/suicune/front.2bpp.lz
index cbc9dfdbf..cbc9dfdbf 100644
--- a/gfx/pics/suicune/front.7x7.2bpp.lz
+++ b/gfx/pics/suicune/front.2bpp.lz
diff --git a/gfx/pics/sunflora/back.6x6.2bpp.lz b/gfx/pics/sunflora/back.2bpp.lz
index 3fb3432ba..3fb3432ba 100644
--- a/gfx/pics/sunflora/back.6x6.2bpp.lz
+++ b/gfx/pics/sunflora/back.2bpp.lz
diff --git a/gfx/pics/sunflora/front.6x6.2bpp.lz b/gfx/pics/sunflora/front.2bpp.lz
index 1026c3719..1026c3719 100644
--- a/gfx/pics/sunflora/front.6x6.2bpp.lz
+++ b/gfx/pics/sunflora/front.2bpp.lz
diff --git a/gfx/pics/sunkern/back.6x6.2bpp.lz b/gfx/pics/sunkern/back.2bpp.lz
index a9ba0f738..a9ba0f738 100644
--- a/gfx/pics/sunkern/back.6x6.2bpp.lz
+++ b/gfx/pics/sunkern/back.2bpp.lz
diff --git a/gfx/pics/sunkern/front.5x5.2bpp.lz b/gfx/pics/sunkern/front.2bpp.lz
index 77a21af73..77a21af73 100644
--- a/gfx/pics/sunkern/front.5x5.2bpp.lz
+++ b/gfx/pics/sunkern/front.2bpp.lz
diff --git a/gfx/pics/swinub/back.6x6.2bpp.lz b/gfx/pics/swinub/back.2bpp.lz
index 51b90aae2..51b90aae2 100644
--- a/gfx/pics/swinub/back.6x6.2bpp.lz
+++ b/gfx/pics/swinub/back.2bpp.lz
diff --git a/gfx/pics/swinub/front.5x5.2bpp.lz b/gfx/pics/swinub/front.2bpp.lz
index 00171e0f3..00171e0f3 100644
--- a/gfx/pics/swinub/front.5x5.2bpp.lz
+++ b/gfx/pics/swinub/front.2bpp.lz
diff --git a/gfx/pics/tangela/back.6x6.2bpp.lz b/gfx/pics/tangela/back.2bpp.lz
index 9ad73a0b6..9ad73a0b6 100644
--- a/gfx/pics/tangela/back.6x6.2bpp.lz
+++ b/gfx/pics/tangela/back.2bpp.lz
diff --git a/gfx/pics/tangela/front.6x6.2bpp.lz b/gfx/pics/tangela/front.2bpp.lz
index 345732b84..345732b84 100644
--- a/gfx/pics/tangela/front.6x6.2bpp.lz
+++ b/gfx/pics/tangela/front.2bpp.lz
diff --git a/gfx/pics/tauros/back.6x6.2bpp.lz b/gfx/pics/tauros/back.2bpp.lz
index 219aee479..219aee479 100644
--- a/gfx/pics/tauros/back.6x6.2bpp.lz
+++ b/gfx/pics/tauros/back.2bpp.lz
diff --git a/gfx/pics/tauros/front.7x7.2bpp.lz b/gfx/pics/tauros/front.2bpp.lz
index d395b145b..d395b145b 100644
--- a/gfx/pics/tauros/front.7x7.2bpp.lz
+++ b/gfx/pics/tauros/front.2bpp.lz
diff --git a/gfx/pics/teddiursa/back.6x6.2bpp.lz b/gfx/pics/teddiursa/back.2bpp.lz
index a6d267ef8..a6d267ef8 100644
--- a/gfx/pics/teddiursa/back.6x6.2bpp.lz
+++ b/gfx/pics/teddiursa/back.2bpp.lz
diff --git a/gfx/pics/teddiursa/front.5x5.2bpp.lz b/gfx/pics/teddiursa/front.2bpp.lz
index 40c22315e..40c22315e 100644
--- a/gfx/pics/teddiursa/front.5x5.2bpp.lz
+++ b/gfx/pics/teddiursa/front.2bpp.lz
diff --git a/gfx/pics/tentacool/back.6x6.2bpp.lz b/gfx/pics/tentacool/back.2bpp.lz
index c0b615905..c0b615905 100644
--- a/gfx/pics/tentacool/back.6x6.2bpp.lz
+++ b/gfx/pics/tentacool/back.2bpp.lz
diff --git a/gfx/pics/tentacool/front.5x5.2bpp.lz b/gfx/pics/tentacool/front.2bpp.lz
index 57916e4e9..57916e4e9 100644
--- a/gfx/pics/tentacool/front.5x5.2bpp.lz
+++ b/gfx/pics/tentacool/front.2bpp.lz
diff --git a/gfx/pics/tentacruel/back.6x6.2bpp.lz b/gfx/pics/tentacruel/back.2bpp.lz
index 89d7a492d..89d7a492d 100644
--- a/gfx/pics/tentacruel/back.6x6.2bpp.lz
+++ b/gfx/pics/tentacruel/back.2bpp.lz
diff --git a/gfx/pics/tentacruel/front.6x6.2bpp.lz b/gfx/pics/tentacruel/front.2bpp.lz
index ec6f4c2c8..ec6f4c2c8 100644
--- a/gfx/pics/tentacruel/front.6x6.2bpp.lz
+++ b/gfx/pics/tentacruel/front.2bpp.lz
diff --git a/gfx/pics/togepi/back.6x6.2bpp.lz b/gfx/pics/togepi/back.2bpp.lz
index ed6fab2ec..ed6fab2ec 100644
--- a/gfx/pics/togepi/back.6x6.2bpp.lz
+++ b/gfx/pics/togepi/back.2bpp.lz
diff --git a/gfx/pics/togepi/front.5x5.2bpp.lz b/gfx/pics/togepi/front.2bpp.lz
index 8ceaf38bf..8ceaf38bf 100644
--- a/gfx/pics/togepi/front.5x5.2bpp.lz
+++ b/gfx/pics/togepi/front.2bpp.lz
diff --git a/gfx/pics/togetic/back.6x6.2bpp.lz b/gfx/pics/togetic/back.2bpp.lz
index 134d5718a..134d5718a 100644
--- a/gfx/pics/togetic/back.6x6.2bpp.lz
+++ b/gfx/pics/togetic/back.2bpp.lz
diff --git a/gfx/pics/togetic/front.7x7.2bpp.lz b/gfx/pics/togetic/front.2bpp.lz
index 13e98ae1d..13e98ae1d 100644
--- a/gfx/pics/togetic/front.7x7.2bpp.lz
+++ b/gfx/pics/togetic/front.2bpp.lz
diff --git a/gfx/pics/totodile/back.6x6.2bpp.lz b/gfx/pics/totodile/back.2bpp.lz
index 6d73c934f..6d73c934f 100644
--- a/gfx/pics/totodile/back.6x6.2bpp.lz
+++ b/gfx/pics/totodile/back.2bpp.lz
diff --git a/gfx/pics/totodile/front.5x5.2bpp.lz b/gfx/pics/totodile/front.2bpp.lz
index 8e1ebd2f5..8e1ebd2f5 100644
--- a/gfx/pics/totodile/front.5x5.2bpp.lz
+++ b/gfx/pics/totodile/front.2bpp.lz
diff --git a/gfx/pics/typhlosion/back.6x6.2bpp.lz b/gfx/pics/typhlosion/back.2bpp.lz
index 592306fa6..592306fa6 100644
--- a/gfx/pics/typhlosion/back.6x6.2bpp.lz
+++ b/gfx/pics/typhlosion/back.2bpp.lz
diff --git a/gfx/pics/typhlosion/front.7x7.2bpp.lz b/gfx/pics/typhlosion/front.2bpp.lz
index 9dba415ad..9dba415ad 100644
--- a/gfx/pics/typhlosion/front.7x7.2bpp.lz
+++ b/gfx/pics/typhlosion/front.2bpp.lz
diff --git a/gfx/pics/tyranitar/back.6x6.2bpp.lz b/gfx/pics/tyranitar/back.2bpp.lz
index 572e56d69..572e56d69 100644
--- a/gfx/pics/tyranitar/back.6x6.2bpp.lz
+++ b/gfx/pics/tyranitar/back.2bpp.lz
diff --git a/gfx/pics/tyranitar/front.7x7.2bpp.lz b/gfx/pics/tyranitar/front.2bpp.lz
index 07d48a5fe..07d48a5fe 100644
--- a/gfx/pics/tyranitar/front.7x7.2bpp.lz
+++ b/gfx/pics/tyranitar/front.2bpp.lz
diff --git a/gfx/pics/tyrogue/back.6x6.2bpp.lz b/gfx/pics/tyrogue/back.2bpp.lz
index 9c9a0babc..9c9a0babc 100644
--- a/gfx/pics/tyrogue/back.6x6.2bpp.lz
+++ b/gfx/pics/tyrogue/back.2bpp.lz
diff --git a/gfx/pics/tyrogue/front.5x5.2bpp.lz b/gfx/pics/tyrogue/front.2bpp.lz
index 8245825fb..8245825fb 100644
--- a/gfx/pics/tyrogue/front.5x5.2bpp.lz
+++ b/gfx/pics/tyrogue/front.2bpp.lz
diff --git a/gfx/pics/umbreon/back.6x6.2bpp.lz b/gfx/pics/umbreon/back.2bpp.lz
index cf39af2c6..cf39af2c6 100644
--- a/gfx/pics/umbreon/back.6x6.2bpp.lz
+++ b/gfx/pics/umbreon/back.2bpp.lz
diff --git a/gfx/pics/umbreon/front.6x6.2bpp.lz b/gfx/pics/umbreon/front.2bpp.lz
index 64a338138..64a338138 100644
--- a/gfx/pics/umbreon/front.6x6.2bpp.lz
+++ b/gfx/pics/umbreon/front.2bpp.lz
diff --git a/gfx/pics/unown_a/back.6x6.2bpp.lz b/gfx/pics/unown_a/back.2bpp.lz
index 08833e3e2..08833e3e2 100644
--- a/gfx/pics/unown_a/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_a/back.2bpp.lz
diff --git a/gfx/pics/unown_a/front.5x5.2bpp.lz b/gfx/pics/unown_a/front.2bpp.lz
index 6f0639575..6f0639575 100644
--- a/gfx/pics/unown_a/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_a/front.2bpp.lz
diff --git a/gfx/pics/unown_b/back.6x6.2bpp.lz b/gfx/pics/unown_b/back.2bpp.lz
index 46375f630..46375f630 100644
--- a/gfx/pics/unown_b/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_b/back.2bpp.lz
diff --git a/gfx/pics/unown_b/front.5x5.2bpp.lz b/gfx/pics/unown_b/front.2bpp.lz
index 661c64a9e..661c64a9e 100644
--- a/gfx/pics/unown_b/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_b/front.2bpp.lz
diff --git a/gfx/pics/unown_c/back.6x6.2bpp.lz b/gfx/pics/unown_c/back.2bpp.lz
index 796ba6d6a..796ba6d6a 100644
--- a/gfx/pics/unown_c/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_c/back.2bpp.lz
diff --git a/gfx/pics/unown_c/front.5x5.2bpp.lz b/gfx/pics/unown_c/front.2bpp.lz
index 18fb3b48b..18fb3b48b 100644
--- a/gfx/pics/unown_c/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_c/front.2bpp.lz
diff --git a/gfx/pics/unown_d/back.6x6.2bpp.lz b/gfx/pics/unown_d/back.2bpp.lz
index 8a967332f..8a967332f 100644
--- a/gfx/pics/unown_d/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_d/back.2bpp.lz
diff --git a/gfx/pics/unown_d/front.5x5.2bpp.lz b/gfx/pics/unown_d/front.2bpp.lz
index d8004662d..d8004662d 100644
--- a/gfx/pics/unown_d/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_d/front.2bpp.lz
diff --git a/gfx/pics/unown_e/back.6x6.2bpp.lz b/gfx/pics/unown_e/back.2bpp.lz
index dfc768a1e..dfc768a1e 100644
--- a/gfx/pics/unown_e/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_e/back.2bpp.lz
diff --git a/gfx/pics/unown_e/front.5x5.2bpp.lz b/gfx/pics/unown_e/front.2bpp.lz
index 5358f5ff9..5358f5ff9 100644
--- a/gfx/pics/unown_e/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_e/front.2bpp.lz
diff --git a/gfx/pics/unown_f/back.6x6.2bpp.lz b/gfx/pics/unown_f/back.2bpp.lz
index 47e54ab66..47e54ab66 100644
--- a/gfx/pics/unown_f/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_f/back.2bpp.lz
diff --git a/gfx/pics/unown_f/front.5x5.2bpp.lz b/gfx/pics/unown_f/front.2bpp.lz
index 4e0339419..4e0339419 100644
--- a/gfx/pics/unown_f/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_f/front.2bpp.lz
diff --git a/gfx/pics/unown_g/back.6x6.2bpp.lz b/gfx/pics/unown_g/back.2bpp.lz
index 1f380f3ba..1f380f3ba 100644
--- a/gfx/pics/unown_g/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_g/back.2bpp.lz
diff --git a/gfx/pics/unown_g/front.5x5.2bpp.lz b/gfx/pics/unown_g/front.2bpp.lz
index 0e6e343f9..0e6e343f9 100644
--- a/gfx/pics/unown_g/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_g/front.2bpp.lz
diff --git a/gfx/pics/unown_h/back.6x6.2bpp.lz b/gfx/pics/unown_h/back.2bpp.lz
index 926bf5757..926bf5757 100644
--- a/gfx/pics/unown_h/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_h/back.2bpp.lz
diff --git a/gfx/pics/unown_h/front.5x5.2bpp.lz b/gfx/pics/unown_h/front.2bpp.lz
index be2d0293c..be2d0293c 100644
--- a/gfx/pics/unown_h/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_h/front.2bpp.lz
diff --git a/gfx/pics/unown_i/back.6x6.2bpp.lz b/gfx/pics/unown_i/back.2bpp.lz
index 7dcea181f..7dcea181f 100644
--- a/gfx/pics/unown_i/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_i/back.2bpp.lz
diff --git a/gfx/pics/unown_i/front.5x5.2bpp.lz b/gfx/pics/unown_i/front.2bpp.lz
index dfd89c266..dfd89c266 100644
--- a/gfx/pics/unown_i/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_i/front.2bpp.lz
diff --git a/gfx/pics/unown_j/back.6x6.2bpp.lz b/gfx/pics/unown_j/back.2bpp.lz
index c0eabf3ba..c0eabf3ba 100644
--- a/gfx/pics/unown_j/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_j/back.2bpp.lz
diff --git a/gfx/pics/unown_j/front.5x5.2bpp.lz b/gfx/pics/unown_j/front.2bpp.lz
index ec8e536d3..ec8e536d3 100644
--- a/gfx/pics/unown_j/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_j/front.2bpp.lz
diff --git a/gfx/pics/unown_k/back.6x6.2bpp.lz b/gfx/pics/unown_k/back.2bpp.lz
index 0f4e8fda7..0f4e8fda7 100644
--- a/gfx/pics/unown_k/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_k/back.2bpp.lz
diff --git a/gfx/pics/unown_k/front.5x5.2bpp.lz b/gfx/pics/unown_k/front.2bpp.lz
index b617e898c..b617e898c 100644
--- a/gfx/pics/unown_k/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_k/front.2bpp.lz
diff --git a/gfx/pics/unown_l/back.6x6.2bpp.lz b/gfx/pics/unown_l/back.2bpp.lz
index 4f48955df..4f48955df 100644
--- a/gfx/pics/unown_l/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_l/back.2bpp.lz
diff --git a/gfx/pics/unown_l/front.5x5.2bpp.lz b/gfx/pics/unown_l/front.2bpp.lz
index d0eee7516..d0eee7516 100644
--- a/gfx/pics/unown_l/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_l/front.2bpp.lz
diff --git a/gfx/pics/unown_m/back.6x6.2bpp.lz b/gfx/pics/unown_m/back.2bpp.lz
index 3ab40cb03..3ab40cb03 100644
--- a/gfx/pics/unown_m/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_m/back.2bpp.lz
diff --git a/gfx/pics/unown_m/front.5x5.2bpp.lz b/gfx/pics/unown_m/front.2bpp.lz
index 04e1592ce..04e1592ce 100644
--- a/gfx/pics/unown_m/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_m/front.2bpp.lz
diff --git a/gfx/pics/unown_n/back.6x6.2bpp.lz b/gfx/pics/unown_n/back.2bpp.lz
index c39417aa8..c39417aa8 100644
--- a/gfx/pics/unown_n/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_n/back.2bpp.lz
diff --git a/gfx/pics/unown_n/front.5x5.2bpp.lz b/gfx/pics/unown_n/front.2bpp.lz
index ec17bff9f..ec17bff9f 100644
--- a/gfx/pics/unown_n/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_n/front.2bpp.lz
diff --git a/gfx/pics/unown_o/back.6x6.2bpp.lz b/gfx/pics/unown_o/back.2bpp.lz
index 4d4b4fd4f..4d4b4fd4f 100644
--- a/gfx/pics/unown_o/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_o/back.2bpp.lz
diff --git a/gfx/pics/unown_o/front.5x5.2bpp.lz b/gfx/pics/unown_o/front.2bpp.lz
index 66b6b8141..66b6b8141 100644
--- a/gfx/pics/unown_o/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_o/front.2bpp.lz
diff --git a/gfx/pics/unown_p/back.6x6.2bpp.lz b/gfx/pics/unown_p/back.2bpp.lz
index 19fd45591..19fd45591 100644
--- a/gfx/pics/unown_p/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_p/back.2bpp.lz
diff --git a/gfx/pics/unown_p/front.5x5.2bpp.lz b/gfx/pics/unown_p/front.2bpp.lz
index 53d4bfbcd..53d4bfbcd 100644
--- a/gfx/pics/unown_p/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_p/front.2bpp.lz
diff --git a/gfx/pics/unown_q/back.6x6.2bpp.lz b/gfx/pics/unown_q/back.2bpp.lz
index 5199cdc6c..5199cdc6c 100644
--- a/gfx/pics/unown_q/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_q/back.2bpp.lz
diff --git a/gfx/pics/unown_q/front.5x5.2bpp.lz b/gfx/pics/unown_q/front.2bpp.lz
index 65536e23f..65536e23f 100644
--- a/gfx/pics/unown_q/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_q/front.2bpp.lz
diff --git a/gfx/pics/unown_r/back.6x6.2bpp.lz b/gfx/pics/unown_r/back.2bpp.lz
index a8a243e0b..a8a243e0b 100644
--- a/gfx/pics/unown_r/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_r/back.2bpp.lz
diff --git a/gfx/pics/unown_r/front.5x5.2bpp.lz b/gfx/pics/unown_r/front.2bpp.lz
index 9e76761d1..9e76761d1 100644
--- a/gfx/pics/unown_r/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_r/front.2bpp.lz
diff --git a/gfx/pics/unown_s/back.6x6.2bpp.lz b/gfx/pics/unown_s/back.2bpp.lz
index 8441f2519..8441f2519 100644
--- a/gfx/pics/unown_s/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_s/back.2bpp.lz
diff --git a/gfx/pics/unown_s/front.5x5.2bpp.lz b/gfx/pics/unown_s/front.2bpp.lz
index d16dea5e9..d16dea5e9 100644
--- a/gfx/pics/unown_s/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_s/front.2bpp.lz
diff --git a/gfx/pics/unown_t/back.6x6.2bpp.lz b/gfx/pics/unown_t/back.2bpp.lz
index 8d415b53d..8d415b53d 100644
--- a/gfx/pics/unown_t/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_t/back.2bpp.lz
diff --git a/gfx/pics/unown_t/front.5x5.2bpp.lz b/gfx/pics/unown_t/front.2bpp.lz
index 83100fbdb..83100fbdb 100644
--- a/gfx/pics/unown_t/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_t/front.2bpp.lz
diff --git a/gfx/pics/unown_u/back.6x6.2bpp.lz b/gfx/pics/unown_u/back.2bpp.lz
index ad395b7ec..ad395b7ec 100644
--- a/gfx/pics/unown_u/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_u/back.2bpp.lz
diff --git a/gfx/pics/unown_u/front.5x5.2bpp.lz b/gfx/pics/unown_u/front.2bpp.lz
index 622825cbe..622825cbe 100644
--- a/gfx/pics/unown_u/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_u/front.2bpp.lz
diff --git a/gfx/pics/unown_v/back.6x6.2bpp.lz b/gfx/pics/unown_v/back.2bpp.lz
index 21c3191f2..21c3191f2 100644
--- a/gfx/pics/unown_v/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_v/back.2bpp.lz
diff --git a/gfx/pics/unown_v/front.5x5.2bpp.lz b/gfx/pics/unown_v/front.2bpp.lz
index aee5ce362..aee5ce362 100644
--- a/gfx/pics/unown_v/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_v/front.2bpp.lz
diff --git a/gfx/pics/unown_w/back.6x6.2bpp.lz b/gfx/pics/unown_w/back.2bpp.lz
index 882648c4d..882648c4d 100644
--- a/gfx/pics/unown_w/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_w/back.2bpp.lz
diff --git a/gfx/pics/unown_w/front.5x5.2bpp.lz b/gfx/pics/unown_w/front.2bpp.lz
index 78a7fefac..78a7fefac 100644
--- a/gfx/pics/unown_w/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_w/front.2bpp.lz
diff --git a/gfx/pics/unown_x/back.6x6.2bpp.lz b/gfx/pics/unown_x/back.2bpp.lz
index 591af9668..591af9668 100644
--- a/gfx/pics/unown_x/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_x/back.2bpp.lz
diff --git a/gfx/pics/unown_x/front.5x5.2bpp.lz b/gfx/pics/unown_x/front.2bpp.lz
index 11adc7c6f..11adc7c6f 100644
--- a/gfx/pics/unown_x/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_x/front.2bpp.lz
diff --git a/gfx/pics/unown_y/back.6x6.2bpp.lz b/gfx/pics/unown_y/back.2bpp.lz
index ab7563e0d..ab7563e0d 100644
--- a/gfx/pics/unown_y/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_y/back.2bpp.lz
diff --git a/gfx/pics/unown_y/front.5x5.2bpp.lz b/gfx/pics/unown_y/front.2bpp.lz
index 1604f7e7b..1604f7e7b 100644
--- a/gfx/pics/unown_y/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_y/front.2bpp.lz
diff --git a/gfx/pics/unown_z/back.6x6.2bpp.lz b/gfx/pics/unown_z/back.2bpp.lz
index 31bcb7baa..31bcb7baa 100644
--- a/gfx/pics/unown_z/back.6x6.2bpp.lz
+++ b/gfx/pics/unown_z/back.2bpp.lz
diff --git a/gfx/pics/unown_z/front.5x5.2bpp.lz b/gfx/pics/unown_z/front.2bpp.lz
index 0d9b8b4f8..0d9b8b4f8 100644
--- a/gfx/pics/unown_z/front.5x5.2bpp.lz
+++ b/gfx/pics/unown_z/front.2bpp.lz
diff --git a/gfx/pics/ursaring/back.6x6.2bpp.lz b/gfx/pics/ursaring/back.2bpp.lz
index 263eac805..263eac805 100644
--- a/gfx/pics/ursaring/back.6x6.2bpp.lz
+++ b/gfx/pics/ursaring/back.2bpp.lz
diff --git a/gfx/pics/ursaring/front.7x7.2bpp.lz b/gfx/pics/ursaring/front.2bpp.lz
index f98dd0cb0..f98dd0cb0 100644
--- a/gfx/pics/ursaring/front.7x7.2bpp.lz
+++ b/gfx/pics/ursaring/front.2bpp.lz
diff --git a/gfx/pics/vaporeon/back.6x6.2bpp.lz b/gfx/pics/vaporeon/back.2bpp.lz
index 9ea248261..9ea248261 100644
--- a/gfx/pics/vaporeon/back.6x6.2bpp.lz
+++ b/gfx/pics/vaporeon/back.2bpp.lz
diff --git a/gfx/pics/vaporeon/front.6x6.2bpp.lz b/gfx/pics/vaporeon/front.2bpp.lz
index 67793c7ec..67793c7ec 100644
--- a/gfx/pics/vaporeon/front.6x6.2bpp.lz
+++ b/gfx/pics/vaporeon/front.2bpp.lz
diff --git a/gfx/pics/venomoth/back.6x6.2bpp.lz b/gfx/pics/venomoth/back.2bpp.lz
index 721527c2a..721527c2a 100644
--- a/gfx/pics/venomoth/back.6x6.2bpp.lz
+++ b/gfx/pics/venomoth/back.2bpp.lz
diff --git a/gfx/pics/venomoth/front.7x7.2bpp.lz b/gfx/pics/venomoth/front.2bpp.lz
index 5f32ad682..5f32ad682 100644
--- a/gfx/pics/venomoth/front.7x7.2bpp.lz
+++ b/gfx/pics/venomoth/front.2bpp.lz
diff --git a/gfx/pics/venonat/back.6x6.2bpp.lz b/gfx/pics/venonat/back.2bpp.lz
index b28c7523d..b28c7523d 100644
--- a/gfx/pics/venonat/back.6x6.2bpp.lz
+++ b/gfx/pics/venonat/back.2bpp.lz
diff --git a/gfx/pics/venonat/front.5x5.2bpp.lz b/gfx/pics/venonat/front.2bpp.lz
index f6b057e8f..f6b057e8f 100644
--- a/gfx/pics/venonat/front.5x5.2bpp.lz
+++ b/gfx/pics/venonat/front.2bpp.lz
diff --git a/gfx/pics/venusaur/back.6x6.2bpp.lz b/gfx/pics/venusaur/back.2bpp.lz
index 27ca82e8a..27ca82e8a 100644
--- a/gfx/pics/venusaur/back.6x6.2bpp.lz
+++ b/gfx/pics/venusaur/back.2bpp.lz
diff --git a/gfx/pics/venusaur/front.7x7.2bpp.lz b/gfx/pics/venusaur/front.2bpp.lz
index d436da0bd..d436da0bd 100644
--- a/gfx/pics/venusaur/front.7x7.2bpp.lz
+++ b/gfx/pics/venusaur/front.2bpp.lz
diff --git a/gfx/pics/victreebel/back.6x6.2bpp.lz b/gfx/pics/victreebel/back.2bpp.lz
index d4b014f67..d4b014f67 100644
--- a/gfx/pics/victreebel/back.6x6.2bpp.lz
+++ b/gfx/pics/victreebel/back.2bpp.lz
diff --git a/gfx/pics/victreebel/front.7x7.2bpp.lz b/gfx/pics/victreebel/front.2bpp.lz
index c53114990..c53114990 100644
--- a/gfx/pics/victreebel/front.7x7.2bpp.lz
+++ b/gfx/pics/victreebel/front.2bpp.lz
diff --git a/gfx/pics/vileplume/back.6x6.2bpp.lz b/gfx/pics/vileplume/back.2bpp.lz
index 823f0e112..823f0e112 100644
--- a/gfx/pics/vileplume/back.6x6.2bpp.lz
+++ b/gfx/pics/vileplume/back.2bpp.lz
diff --git a/gfx/pics/vileplume/front.7x7.2bpp.lz b/gfx/pics/vileplume/front.2bpp.lz
index 05ca10ba5..05ca10ba5 100644
--- a/gfx/pics/vileplume/front.7x7.2bpp.lz
+++ b/gfx/pics/vileplume/front.2bpp.lz
diff --git a/gfx/pics/voltorb/back.6x6.2bpp.lz b/gfx/pics/voltorb/back.2bpp.lz
index fe102da9a..fe102da9a 100644
--- a/gfx/pics/voltorb/back.6x6.2bpp.lz
+++ b/gfx/pics/voltorb/back.2bpp.lz
diff --git a/gfx/pics/voltorb/front.5x5.2bpp.lz b/gfx/pics/voltorb/front.2bpp.lz
index 94f35f9aa..94f35f9aa 100644
--- a/gfx/pics/voltorb/front.5x5.2bpp.lz
+++ b/gfx/pics/voltorb/front.2bpp.lz
diff --git a/gfx/pics/vulpix/back.6x6.2bpp.lz b/gfx/pics/vulpix/back.2bpp.lz
index ce2535141..ce2535141 100644
--- a/gfx/pics/vulpix/back.6x6.2bpp.lz
+++ b/gfx/pics/vulpix/back.2bpp.lz
diff --git a/gfx/pics/vulpix/front.6x6.2bpp.lz b/gfx/pics/vulpix/front.2bpp.lz
index 9248ce808..9248ce808 100644
--- a/gfx/pics/vulpix/front.6x6.2bpp.lz
+++ b/gfx/pics/vulpix/front.2bpp.lz
diff --git a/gfx/pics/wartortle/back.6x6.2bpp.lz b/gfx/pics/wartortle/back.2bpp.lz
index 5734c20cb..5734c20cb 100644
--- a/gfx/pics/wartortle/back.6x6.2bpp.lz
+++ b/gfx/pics/wartortle/back.2bpp.lz
diff --git a/gfx/pics/wartortle/front.6x6.2bpp.lz b/gfx/pics/wartortle/front.2bpp.lz
index 29642807d..29642807d 100644
--- a/gfx/pics/wartortle/front.6x6.2bpp.lz
+++ b/gfx/pics/wartortle/front.2bpp.lz
diff --git a/gfx/pics/weedle/back.6x6.2bpp.lz b/gfx/pics/weedle/back.2bpp.lz
index 64decb914..64decb914 100644
--- a/gfx/pics/weedle/back.6x6.2bpp.lz
+++ b/gfx/pics/weedle/back.2bpp.lz
diff --git a/gfx/pics/weedle/front.5x5.2bpp.lz b/gfx/pics/weedle/front.2bpp.lz
index 091df588a..091df588a 100644
--- a/gfx/pics/weedle/front.5x5.2bpp.lz
+++ b/gfx/pics/weedle/front.2bpp.lz
diff --git a/gfx/pics/weepinbell/back.6x6.2bpp.lz b/gfx/pics/weepinbell/back.2bpp.lz
index 26e44257c..26e44257c 100644
--- a/gfx/pics/weepinbell/back.6x6.2bpp.lz
+++ b/gfx/pics/weepinbell/back.2bpp.lz
diff --git a/gfx/pics/weepinbell/front.6x6.2bpp.lz b/gfx/pics/weepinbell/front.2bpp.lz
index a7e7d60b5..a7e7d60b5 100644
--- a/gfx/pics/weepinbell/front.6x6.2bpp.lz
+++ b/gfx/pics/weepinbell/front.2bpp.lz
diff --git a/gfx/pics/weezing/back.6x6.2bpp.lz b/gfx/pics/weezing/back.2bpp.lz
index a85124f3a..a85124f3a 100644
--- a/gfx/pics/weezing/back.6x6.2bpp.lz
+++ b/gfx/pics/weezing/back.2bpp.lz
diff --git a/gfx/pics/weezing/front.7x7.2bpp.lz b/gfx/pics/weezing/front.2bpp.lz
index 3c6f24a41..3c6f24a41 100644
--- a/gfx/pics/weezing/front.7x7.2bpp.lz
+++ b/gfx/pics/weezing/front.2bpp.lz
diff --git a/gfx/pics/wigglytuff/back.6x6.2bpp.lz b/gfx/pics/wigglytuff/back.2bpp.lz
index 3b3732986..3b3732986 100644
--- a/gfx/pics/wigglytuff/back.6x6.2bpp.lz
+++ b/gfx/pics/wigglytuff/back.2bpp.lz
diff --git a/gfx/pics/wigglytuff/front.6x6.2bpp.lz b/gfx/pics/wigglytuff/front.2bpp.lz
index c633d2a0a..c633d2a0a 100644
--- a/gfx/pics/wigglytuff/front.6x6.2bpp.lz
+++ b/gfx/pics/wigglytuff/front.2bpp.lz
diff --git a/gfx/pics/wobbuffet/back.6x6.2bpp.lz b/gfx/pics/wobbuffet/back.2bpp.lz
index 87dba2049..87dba2049 100644
--- a/gfx/pics/wobbuffet/back.6x6.2bpp.lz
+++ b/gfx/pics/wobbuffet/back.2bpp.lz
diff --git a/gfx/pics/wobbuffet/front.6x6.2bpp.lz b/gfx/pics/wobbuffet/front.2bpp.lz
index ce7aa46c8..ce7aa46c8 100644
--- a/gfx/pics/wobbuffet/front.6x6.2bpp.lz
+++ b/gfx/pics/wobbuffet/front.2bpp.lz
diff --git a/gfx/pics/wooper/back.6x6.2bpp.lz b/gfx/pics/wooper/back.2bpp.lz
index 973037f02..973037f02 100644
--- a/gfx/pics/wooper/back.6x6.2bpp.lz
+++ b/gfx/pics/wooper/back.2bpp.lz
diff --git a/gfx/pics/wooper/front.5x5.2bpp.lz b/gfx/pics/wooper/front.2bpp.lz
index 3d5d53c1b..3d5d53c1b 100644
--- a/gfx/pics/wooper/front.5x5.2bpp.lz
+++ b/gfx/pics/wooper/front.2bpp.lz
diff --git a/gfx/pics/xatu/back.6x6.2bpp.lz b/gfx/pics/xatu/back.2bpp.lz
index 8b6889ffb..8b6889ffb 100644
--- a/gfx/pics/xatu/back.6x6.2bpp.lz
+++ b/gfx/pics/xatu/back.2bpp.lz
diff --git a/gfx/pics/xatu/front.6x6.2bpp.lz b/gfx/pics/xatu/front.2bpp.lz
index 4b5918b3a..4b5918b3a 100644
--- a/gfx/pics/xatu/front.6x6.2bpp.lz
+++ b/gfx/pics/xatu/front.2bpp.lz
diff --git a/gfx/pics/yanma/back.6x6.2bpp.lz b/gfx/pics/yanma/back.2bpp.lz
index 47105f12f..47105f12f 100644
--- a/gfx/pics/yanma/back.6x6.2bpp.lz
+++ b/gfx/pics/yanma/back.2bpp.lz
diff --git a/gfx/pics/yanma/front.6x6.2bpp.lz b/gfx/pics/yanma/front.2bpp.lz
index 1987afdc9..1987afdc9 100644
--- a/gfx/pics/yanma/front.6x6.2bpp.lz
+++ b/gfx/pics/yanma/front.2bpp.lz
diff --git a/gfx/pics/zapdos/back.6x6.2bpp.lz b/gfx/pics/zapdos/back.2bpp.lz
index 2f2167941..2f2167941 100644
--- a/gfx/pics/zapdos/back.6x6.2bpp.lz
+++ b/gfx/pics/zapdos/back.2bpp.lz
diff --git a/gfx/pics/zapdos/front.7x7.2bpp.lz b/gfx/pics/zapdos/front.2bpp.lz
index 0f048171c..0f048171c 100644
--- a/gfx/pics/zapdos/front.7x7.2bpp.lz
+++ b/gfx/pics/zapdos/front.2bpp.lz
diff --git a/gfx/pics/zubat/back.6x6.2bpp.lz b/gfx/pics/zubat/back.2bpp.lz
index d50e00e90..d50e00e90 100644
--- a/gfx/pics/zubat/back.6x6.2bpp.lz
+++ b/gfx/pics/zubat/back.2bpp.lz
diff --git a/gfx/pics/zubat/front.5x5.2bpp.lz b/gfx/pics/zubat/front.2bpp.lz
index b22e1d971..b22e1d971 100644
--- a/gfx/pics/zubat/front.5x5.2bpp.lz
+++ b/gfx/pics/zubat/front.2bpp.lz
diff --git a/gfx/trainers/beauty.7x7.2bpp.lz b/gfx/trainers/beauty.2bpp.lz
index 8c5d30ee6..8c5d30ee6 100644
--- a/gfx/trainers/beauty.7x7.2bpp.lz
+++ b/gfx/trainers/beauty.2bpp.lz
diff --git a/gfx/trainers/biker.7x7.2bpp.lz b/gfx/trainers/biker.2bpp.lz
index 07ad8621b..07ad8621b 100644
--- a/gfx/trainers/biker.7x7.2bpp.lz
+++ b/gfx/trainers/biker.2bpp.lz
diff --git a/gfx/trainers/bird_keeper.7x7.2bpp.lz b/gfx/trainers/bird_keeper.2bpp.lz
index 48b505847..48b505847 100644
--- a/gfx/trainers/bird_keeper.7x7.2bpp.lz
+++ b/gfx/trainers/bird_keeper.2bpp.lz
diff --git a/gfx/trainers/blackbelt_t.7x7.2bpp.lz b/gfx/trainers/blackbelt_t.2bpp.lz
index 086b8fc02..086b8fc02 100644
--- a/gfx/trainers/blackbelt_t.7x7.2bpp.lz
+++ b/gfx/trainers/blackbelt_t.2bpp.lz
diff --git a/gfx/trainers/blaine.7x7.2bpp.lz b/gfx/trainers/blaine.2bpp.lz
index d967bb3ba..d967bb3ba 100644
--- a/gfx/trainers/blaine.7x7.2bpp.lz
+++ b/gfx/trainers/blaine.2bpp.lz
diff --git a/gfx/trainers/blue.7x7.2bpp.lz b/gfx/trainers/blue.2bpp.lz
index 9d4cb50c6..9d4cb50c6 100644
--- a/gfx/trainers/blue.7x7.2bpp.lz
+++ b/gfx/trainers/blue.2bpp.lz
diff --git a/gfx/trainers/boarder.7x7.2bpp.lz b/gfx/trainers/boarder.2bpp.lz
index a6dc315d8..a6dc315d8 100644
--- a/gfx/trainers/boarder.7x7.2bpp.lz
+++ b/gfx/trainers/boarder.2bpp.lz
diff --git a/gfx/trainers/brock.7x7.2bpp.lz b/gfx/trainers/brock.2bpp.lz
index d7a4e29bf..d7a4e29bf 100644
--- a/gfx/trainers/brock.7x7.2bpp.lz
+++ b/gfx/trainers/brock.2bpp.lz
diff --git a/gfx/trainers/bruno.7x7.2bpp.lz b/gfx/trainers/bruno.2bpp.lz
index 69406d11d..69406d11d 100644
--- a/gfx/trainers/bruno.7x7.2bpp.lz
+++ b/gfx/trainers/bruno.2bpp.lz
diff --git a/gfx/trainers/bug_catcher.7x7.2bpp.lz b/gfx/trainers/bug_catcher.2bpp.lz
index cea17dbac..cea17dbac 100644
--- a/gfx/trainers/bug_catcher.7x7.2bpp.lz
+++ b/gfx/trainers/bug_catcher.2bpp.lz
diff --git a/gfx/trainers/bugsy.7x7.2bpp.lz b/gfx/trainers/bugsy.2bpp.lz
index 7910628aa..7910628aa 100644
--- a/gfx/trainers/bugsy.7x7.2bpp.lz
+++ b/gfx/trainers/bugsy.2bpp.lz
diff --git a/gfx/trainers/burglar.7x7.2bpp.lz b/gfx/trainers/burglar.2bpp.lz
index 45da954d9..45da954d9 100644
--- a/gfx/trainers/burglar.7x7.2bpp.lz
+++ b/gfx/trainers/burglar.2bpp.lz
diff --git a/gfx/trainers/cal.7x7.2bpp.lz b/gfx/trainers/cal.2bpp.lz
index f7d3570ae..f7d3570ae 100644
--- a/gfx/trainers/cal.7x7.2bpp.lz
+++ b/gfx/trainers/cal.2bpp.lz
diff --git a/gfx/trainers/camper.7x7.2bpp.lz b/gfx/trainers/camper.2bpp.lz
index a8963bae7..a8963bae7 100644
--- a/gfx/trainers/camper.7x7.2bpp.lz
+++ b/gfx/trainers/camper.2bpp.lz
diff --git a/gfx/trainers/champion.7x7.2bpp.lz b/gfx/trainers/champion.2bpp.lz
index c5840a676..c5840a676 100644
--- a/gfx/trainers/champion.7x7.2bpp.lz
+++ b/gfx/trainers/champion.2bpp.lz
diff --git a/gfx/trainers/chuck.7x7.2bpp.lz b/gfx/trainers/chuck.2bpp.lz
index 0a92c7074..0a92c7074 100644
--- a/gfx/trainers/chuck.7x7.2bpp.lz
+++ b/gfx/trainers/chuck.2bpp.lz
diff --git a/gfx/trainers/clair.7x7.2bpp.lz b/gfx/trainers/clair.2bpp.lz
index bbc463594..bbc463594 100644
--- a/gfx/trainers/clair.7x7.2bpp.lz
+++ b/gfx/trainers/clair.2bpp.lz
diff --git a/gfx/trainers/cooltrainer_f.7x7.2bpp.lz b/gfx/trainers/cooltrainer_f.2bpp.lz
index cb41d74ee..cb41d74ee 100644
--- a/gfx/trainers/cooltrainer_f.7x7.2bpp.lz
+++ b/gfx/trainers/cooltrainer_f.2bpp.lz
diff --git a/gfx/trainers/cooltrainer_m.7x7.2bpp.lz b/gfx/trainers/cooltrainer_m.2bpp.lz
index 93dad0319..93dad0319 100644
--- a/gfx/trainers/cooltrainer_m.7x7.2bpp.lz
+++ b/gfx/trainers/cooltrainer_m.2bpp.lz
diff --git a/gfx/trainers/erika.7x7.2bpp.lz b/gfx/trainers/erika.2bpp.lz
index 963363d26..963363d26 100644
--- a/gfx/trainers/erika.7x7.2bpp.lz
+++ b/gfx/trainers/erika.2bpp.lz
diff --git a/gfx/trainers/executive_f.7x7.2bpp.lz b/gfx/trainers/executive_f.2bpp.lz
index b823ddaab..b823ddaab 100644
--- a/gfx/trainers/executive_f.7x7.2bpp.lz
+++ b/gfx/trainers/executive_f.2bpp.lz
diff --git a/gfx/trainers/executive_m.7x7.2bpp.lz b/gfx/trainers/executive_m.2bpp.lz
index e10b588cc..e10b588cc 100644
--- a/gfx/trainers/executive_m.7x7.2bpp.lz
+++ b/gfx/trainers/executive_m.2bpp.lz
diff --git a/gfx/trainers/falkner.7x7.2bpp.lz b/gfx/trainers/falkner.2bpp.lz
index 323587e3a..323587e3a 100644
--- a/gfx/trainers/falkner.7x7.2bpp.lz
+++ b/gfx/trainers/falkner.2bpp.lz
diff --git a/gfx/trainers/firebreather.7x7.2bpp.lz b/gfx/trainers/firebreather.2bpp.lz
index a0f853a9d..a0f853a9d 100644
--- a/gfx/trainers/firebreather.7x7.2bpp.lz
+++ b/gfx/trainers/firebreather.2bpp.lz
diff --git a/gfx/trainers/fisher.7x7.2bpp.lz b/gfx/trainers/fisher.2bpp.lz
index b210aeda1..b210aeda1 100644
--- a/gfx/trainers/fisher.7x7.2bpp.lz
+++ b/gfx/trainers/fisher.2bpp.lz
diff --git a/gfx/trainers/gentleman.7x7.2bpp.lz b/gfx/trainers/gentleman.2bpp.lz
index 153720e71..153720e71 100644
--- a/gfx/trainers/gentleman.7x7.2bpp.lz
+++ b/gfx/trainers/gentleman.2bpp.lz
diff --git a/gfx/trainers/grunt_f.7x7.2bpp.lz b/gfx/trainers/grunt_f.2bpp.lz
index beee0721b..beee0721b 100644
--- a/gfx/trainers/grunt_f.7x7.2bpp.lz
+++ b/gfx/trainers/grunt_f.2bpp.lz
diff --git a/gfx/trainers/grunt_m.7x7.2bpp.lz b/gfx/trainers/grunt_m.2bpp.lz
index 5ac5597b0..5ac5597b0 100644
--- a/gfx/trainers/grunt_m.7x7.2bpp.lz
+++ b/gfx/trainers/grunt_m.2bpp.lz
diff --git a/gfx/trainers/guitarist.7x7.2bpp.lz b/gfx/trainers/guitarist.2bpp.lz
index d67e6ea98..d67e6ea98 100644
--- a/gfx/trainers/guitarist.7x7.2bpp.lz
+++ b/gfx/trainers/guitarist.2bpp.lz
diff --git a/gfx/trainers/hiker.7x7.2bpp.lz b/gfx/trainers/hiker.2bpp.lz
index c7cecda28..c7cecda28 100644
--- a/gfx/trainers/hiker.7x7.2bpp.lz
+++ b/gfx/trainers/hiker.2bpp.lz
diff --git a/gfx/trainers/janine.7x7.2bpp.lz b/gfx/trainers/janine.2bpp.lz
index d6249eba3..d6249eba3 100644
--- a/gfx/trainers/janine.7x7.2bpp.lz
+++ b/gfx/trainers/janine.2bpp.lz
diff --git a/gfx/trainers/jasmine.7x7.2bpp.lz b/gfx/trainers/jasmine.2bpp.lz
index 7c08ded94..7c08ded94 100644
--- a/gfx/trainers/jasmine.7x7.2bpp.lz
+++ b/gfx/trainers/jasmine.2bpp.lz
diff --git a/gfx/trainers/juggler.7x7.2bpp.lz b/gfx/trainers/juggler.2bpp.lz
index d64ed1f0b..d64ed1f0b 100644
--- a/gfx/trainers/juggler.7x7.2bpp.lz
+++ b/gfx/trainers/juggler.2bpp.lz
diff --git a/gfx/trainers/karen.7x7.2bpp.lz b/gfx/trainers/karen.2bpp.lz
index a0bd871f7..a0bd871f7 100644
--- a/gfx/trainers/karen.7x7.2bpp.lz
+++ b/gfx/trainers/karen.2bpp.lz
diff --git a/gfx/trainers/kimono_girl.7x7.2bpp.lz b/gfx/trainers/kimono_girl.2bpp.lz
index 465ccb111..465ccb111 100644
--- a/gfx/trainers/kimono_girl.7x7.2bpp.lz
+++ b/gfx/trainers/kimono_girl.2bpp.lz
diff --git a/gfx/trainers/koga.7x7.2bpp.lz b/gfx/trainers/koga.2bpp.lz
index bc4501f08..bc4501f08 100644
--- a/gfx/trainers/koga.7x7.2bpp.lz
+++ b/gfx/trainers/koga.2bpp.lz
diff --git a/gfx/trainers/lass.7x7.2bpp.lz b/gfx/trainers/lass.2bpp.lz
index 0c7cffa79..0c7cffa79 100644
--- a/gfx/trainers/lass.7x7.2bpp.lz
+++ b/gfx/trainers/lass.2bpp.lz
diff --git a/gfx/trainers/lt_surge.7x7.2bpp.lz b/gfx/trainers/lt_surge.2bpp.lz
index 9a3df5d3f..9a3df5d3f 100644
--- a/gfx/trainers/lt_surge.7x7.2bpp.lz
+++ b/gfx/trainers/lt_surge.2bpp.lz
diff --git a/gfx/trainers/medium.7x7.2bpp.lz b/gfx/trainers/medium.2bpp.lz
index 4aaa71326..4aaa71326 100644
--- a/gfx/trainers/medium.7x7.2bpp.lz
+++ b/gfx/trainers/medium.2bpp.lz
diff --git a/gfx/trainers/misty.7x7.2bpp.lz b/gfx/trainers/misty.2bpp.lz
index 1a96cdddd..1a96cdddd 100644
--- a/gfx/trainers/misty.7x7.2bpp.lz
+++ b/gfx/trainers/misty.2bpp.lz
diff --git a/gfx/trainers/morty.7x7.2bpp.lz b/gfx/trainers/morty.2bpp.lz
index 67999aeb8..67999aeb8 100644
--- a/gfx/trainers/morty.7x7.2bpp.lz
+++ b/gfx/trainers/morty.2bpp.lz
diff --git a/gfx/trainers/mysticalman.7x7.2bpp.lz b/gfx/trainers/mysticalman.2bpp.lz
index 38296bc91..38296bc91 100644
--- a/gfx/trainers/mysticalman.7x7.2bpp.lz
+++ b/gfx/trainers/mysticalman.2bpp.lz
diff --git a/gfx/trainers/oak.7x7.2bpp.lz b/gfx/trainers/oak.2bpp.lz
index 276f7c533..276f7c533 100644
--- a/gfx/trainers/oak.7x7.2bpp.lz
+++ b/gfx/trainers/oak.2bpp.lz
diff --git a/gfx/trainers/officer.7x7.2bpp.lz b/gfx/trainers/officer.2bpp.lz
index e3e22f870..e3e22f870 100644
--- a/gfx/trainers/officer.7x7.2bpp.lz
+++ b/gfx/trainers/officer.2bpp.lz
diff --git a/gfx/trainers/picnicker.7x7.2bpp.lz b/gfx/trainers/picnicker.2bpp.lz
index 81ee09ab7..81ee09ab7 100644
--- a/gfx/trainers/picnicker.7x7.2bpp.lz
+++ b/gfx/trainers/picnicker.2bpp.lz
diff --git a/gfx/trainers/pokefan_f.7x7.2bpp.lz b/gfx/trainers/pokefan_f.2bpp.lz
index 2ab555a85..2ab555a85 100644
--- a/gfx/trainers/pokefan_f.7x7.2bpp.lz
+++ b/gfx/trainers/pokefan_f.2bpp.lz
diff --git a/gfx/trainers/pokefan_m.7x7.2bpp.lz b/gfx/trainers/pokefan_m.2bpp.lz
index 25b4a9ff7..25b4a9ff7 100644
--- a/gfx/trainers/pokefan_m.7x7.2bpp.lz
+++ b/gfx/trainers/pokefan_m.2bpp.lz
diff --git a/gfx/trainers/pokemaniac.7x7.2bpp.lz b/gfx/trainers/pokemaniac.2bpp.lz
index 78fb417f4..78fb417f4 100644
--- a/gfx/trainers/pokemaniac.7x7.2bpp.lz
+++ b/gfx/trainers/pokemaniac.2bpp.lz
diff --git a/gfx/trainers/pryce.7x7.2bpp.lz b/gfx/trainers/pryce.2bpp.lz
index ca69273e0..ca69273e0 100644
--- a/gfx/trainers/pryce.7x7.2bpp.lz
+++ b/gfx/trainers/pryce.2bpp.lz
diff --git a/gfx/trainers/psychic_t.7x7.2bpp.lz b/gfx/trainers/psychic_t.2bpp.lz
index c1123a84e..c1123a84e 100644
--- a/gfx/trainers/psychic_t.7x7.2bpp.lz
+++ b/gfx/trainers/psychic_t.2bpp.lz
diff --git a/gfx/trainers/red.7x7.2bpp.lz b/gfx/trainers/red.2bpp.lz
index 15a8dcf88..15a8dcf88 100644
--- a/gfx/trainers/red.7x7.2bpp.lz
+++ b/gfx/trainers/red.2bpp.lz
diff --git a/gfx/trainers/rival1.7x7.2bpp.lz b/gfx/trainers/rival1.2bpp.lz
index 9a5b99abc..9a5b99abc 100644
--- a/gfx/trainers/rival1.7x7.2bpp.lz
+++ b/gfx/trainers/rival1.2bpp.lz
diff --git a/gfx/trainers/rival2.7x7.2bpp.lz b/gfx/trainers/rival2.2bpp.lz
index 683ec66bb..683ec66bb 100644
--- a/gfx/trainers/rival2.7x7.2bpp.lz
+++ b/gfx/trainers/rival2.2bpp.lz
diff --git a/gfx/trainers/sabrina.7x7.2bpp.lz b/gfx/trainers/sabrina.2bpp.lz
index bee6dd0e9..bee6dd0e9 100644
--- a/gfx/trainers/sabrina.7x7.2bpp.lz
+++ b/gfx/trainers/sabrina.2bpp.lz
diff --git a/gfx/trainers/sage.7x7.2bpp.lz b/gfx/trainers/sage.2bpp.lz
index aff9d4589..aff9d4589 100644
--- a/gfx/trainers/sage.7x7.2bpp.lz
+++ b/gfx/trainers/sage.2bpp.lz
diff --git a/gfx/trainers/sailor.7x7.2bpp.lz b/gfx/trainers/sailor.2bpp.lz
index 425667a73..425667a73 100644
--- a/gfx/trainers/sailor.7x7.2bpp.lz
+++ b/gfx/trainers/sailor.2bpp.lz
diff --git a/gfx/trainers/schoolboy.7x7.2bpp.lz b/gfx/trainers/schoolboy.2bpp.lz
index 7d9bd00a3..7d9bd00a3 100644
--- a/gfx/trainers/schoolboy.7x7.2bpp.lz
+++ b/gfx/trainers/schoolboy.2bpp.lz
diff --git a/gfx/trainers/scientist.7x7.2bpp.lz b/gfx/trainers/scientist.2bpp.lz
index 033f421b5..033f421b5 100644
--- a/gfx/trainers/scientist.7x7.2bpp.lz
+++ b/gfx/trainers/scientist.2bpp.lz
diff --git a/gfx/trainers/skier.7x7.2bpp.lz b/gfx/trainers/skier.2bpp.lz
index 42be70abe..42be70abe 100644
--- a/gfx/trainers/skier.7x7.2bpp.lz
+++ b/gfx/trainers/skier.2bpp.lz
diff --git a/gfx/trainers/super_nerd.7x7.2bpp.lz b/gfx/trainers/super_nerd.2bpp.lz
index dbdb4ca46..dbdb4ca46 100644
--- a/gfx/trainers/super_nerd.7x7.2bpp.lz
+++ b/gfx/trainers/super_nerd.2bpp.lz
diff --git a/gfx/trainers/swimmer_f.7x7.2bpp.lz b/gfx/trainers/swimmer_f.2bpp.lz
index 3f27a6d42..3f27a6d42 100644
--- a/gfx/trainers/swimmer_f.7x7.2bpp.lz
+++ b/gfx/trainers/swimmer_f.2bpp.lz
diff --git a/gfx/trainers/swimmer_m.7x7.2bpp.lz b/gfx/trainers/swimmer_m.2bpp.lz
index b162cadca..b162cadca 100644
--- a/gfx/trainers/swimmer_m.7x7.2bpp.lz
+++ b/gfx/trainers/swimmer_m.2bpp.lz
diff --git a/gfx/trainers/teacher.7x7.2bpp.lz b/gfx/trainers/teacher.2bpp.lz
index 92151f891..92151f891 100644
--- a/gfx/trainers/teacher.7x7.2bpp.lz
+++ b/gfx/trainers/teacher.2bpp.lz
diff --git a/gfx/trainers/twins.7x7.2bpp.lz b/gfx/trainers/twins.2bpp.lz
index 1bdf29c7d..1bdf29c7d 100644
--- a/gfx/trainers/twins.7x7.2bpp.lz
+++ b/gfx/trainers/twins.2bpp.lz
diff --git a/gfx/trainers/whitney.7x7.2bpp.lz b/gfx/trainers/whitney.2bpp.lz
index 9564767a8..9564767a8 100644
--- a/gfx/trainers/whitney.7x7.2bpp.lz
+++ b/gfx/trainers/whitney.2bpp.lz
diff --git a/gfx/trainers/will.7x7.2bpp.lz b/gfx/trainers/will.2bpp.lz
index 3de211cd4..3de211cd4 100644
--- a/gfx/trainers/will.7x7.2bpp.lz
+++ b/gfx/trainers/will.2bpp.lz
diff --git a/gfx/trainers/youngster.7x7.2bpp.lz b/gfx/trainers/youngster.2bpp.lz
index ec742f9f3..ec742f9f3 100644
--- a/gfx/trainers/youngster.7x7.2bpp.lz
+++ b/gfx/trainers/youngster.2bpp.lz
diff --git a/main.asm b/main.asm
index 61e994922..564308fc7 100644
--- a/main.asm
+++ b/main.asm
@@ -27708,8 +27708,8 @@ CardStatusGFX: INCBIN "gfx/misc/card_status.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"
+BadgeGFX:   INCBIN "gfx/misc/badges.2bpp"
+BadgeGFX2:  INCBIN "gfx/misc/badges.2bpp"
 
 CardRightCornerGFX: INCBIN "gfx/misc/card_right_corner.2bpp"
 
@@ -40955,7 +40955,7 @@ PackFGFXPointers: ; 48e93
 ; 48e9b
 
 PackFGFX: ; 48e9b
-INCBIN "gfx/misc/pack_f.w40.2bpp"
+INCBIN "gfx/misc/pack_f.2bpp"
 ; 4925b
 
 Function4925b: ; 4925b
@@ -78005,7 +78005,7 @@ Functioncbce5: ; cbce5
 ; cbd2e
 
 TheEndGFX:: ; cbd2e
-INCBIN "gfx/credits/theend.w64.2bpp"
+INCBIN "gfx/credits/theend.2bpp"
 ; cbe2e
 
 
@@ -78180,7 +78180,7 @@ INCLUDE "gfx/pics/kanto_frames.asm"
 
 SECTION "bank36", ROMX, BANK[$36]
 
-FontInversed: INCBIN "gfx/misc/font_inversed.w128.1bpp"
+FontInversed: INCBIN "gfx/misc/font_inversed.1bpp"
 
 
 SECTION "Pic Animations 3", ROMX, BANK[$36]
@@ -87242,7 +87242,7 @@ FontExtra:
 INCBIN "gfx/misc/font_extra.2bpp"
 
 Font:
-INCBIN "gfx/misc/font.w128.1bpp"
+INCBIN "gfx/misc/font.1bpp"
 
 FontBattleExtra:
 INCBIN "gfx/misc/font_battle_extra.2bpp"
@@ -87317,7 +87317,7 @@ INCBIN "gfx/unknown/0f9424.2bpp"
 ; f9434
 
 Footprints: ; f9434
-INCBIN "gfx/misc/footprints.w128.1bpp"
+INCBIN "gfx/misc/footprints.1bpp"
 ; fb434
 
 Unknown_fb434:
diff --git a/predef/cgb.asm b/predef/cgb.asm
index e4cecad83..47d33c5b8 100644
--- a/predef/cgb.asm
+++ b/predef/cgb.asm
@@ -6,7 +6,7 @@ CheckCGB: ; 8d55
 	ret
 ; 8d59
 
-Function8d59: ; 8d59
+Predef_LoadSGBLayoutCGB: ; 8d59
 	ld a, b
 	cp $ff
 	jr nz, .asm_8d61
diff --git a/wram.asm b/wram.asm
index 1ad43b98e..3cae0ebd1 100644
--- a/wram.asm
+++ b/wram.asm
@@ -362,10 +362,10 @@ wPartyMon3MenuIconAnim:: ds 16 ; c334
 wPartyMon4MenuIconAnim:: ds 16 ; c344
 wPartyMon5MenuIconAnim:: ds 16 ; c354
 wPartyMon6MenuIconAnim:: ds 16 ; c364
-wc374:: ds 64
-wc3a4:: ds 8
-wc3ac:: ds 8
-wc3b4:: ds 1
+wc374:: ds 48 ; c374
+wc3a4:: ds 8 ; c3b4
+wc3ac:: ds 8 ; c3bc
+wc3b4:: ds 1 ; c3
 wc3b5:: ds 1
 
 CurIcon:: ; c3b6