588 files changed, 823 insertions, 1755 deletions
diff --git a/gfx/fx/000.2bpp.lz b/gfx/fx/000.2bpp.lz
deleted file mode 100644
index 5d9ffbe5d..000000000
--- a/gfx/fx/000.2bpp.lz
+++ /dev/null
diff --git a/gfx/overworld/000.2bpp b/gfx/overworld/000.2bpp
index 784e453f5..e05a2c3f1 100644
--- a/gfx/overworld/000.2bpp
+++ b/gfx/overworld/000.2bpp
diff --git a/gfx/overworld/001.2bpp b/gfx/overworld/001.2bpp
index 0f1205cad..af04601ad 100644
--- a/gfx/overworld/001.2bpp
+++ b/gfx/overworld/001.2bpp
@@ -1 +1,2 @@
-0?;<_O�������<����??/<t_\??�����<.��:����pp
-\ No newline at end of file
+3?<?PB��������<��
+�B?2>9OO3>�L|������|H��p��0?;<_O�������<����??;7\t?<�����:.��<���p��8???�����>�����?<?3S����|D88��h����_���>"?(?!�����������!?9?<OO?>�&>������|�x@���?/?'�����������5;?.>?���������X谰 ? ?p?)?)�� ��8�|�����0? ?<?3S����uM88� ��������?���
+\ No newline at end of file
diff --git a/gfx/overworld/002.2bpp b/gfx/overworld/002.2bpp
index f3d7b7941..ec1facf43 100644
--- a/gfx/overworld/002.2bpp
+++ b/gfx/overworld/002.2bpp
@@ -1 +1 @@
-8???�����>�����	��p�����H�p����
-\ No newline at end of file
+?7S@oR��������������J?3
+��p����(�0����pp????_Oo_����������������;7</?+��<����������pp???9��������������|�
+��p����(�0����pp
+\ No newline at end of file
diff --git a/gfx/overworld/003.2bpp b/gfx/overworld/003.2bpp
index be40bc2e8..1db1ee7e2 100644
--- a/gfx/overworld/003.2bpp
+++ b/gfx/overworld/003.2bpp
diff --git a/gfx/overworld/004.2bpp b/gfx/overworld/004.2bpp
index 09ef456f8..c4f817c13 100644
--- a/gfx/overworld/004.2bpp
+++ b/gfx/overworld/004.2bpp
diff --git a/gfx/overworld/005.2bpp b/gfx/overworld/005.2bpp
index 7e305790b..e550d7ad6 100644
--- a/gfx/overworld/005.2bpp
+++ b/gfx/overworld/005.2bpp
diff --git a/gfx/overworld/006.2bpp b/gfx/overworld/006.2bpp
index a1def7941..f5499ff9e 100644
--- a/gfx/overworld/006.2bpp
+++ b/gfx/overworld/006.2bpp
diff --git a/gfx/overworld/007.2bpp b/gfx/overworld/007.2bpp
index 9323c3258..2f14207b0 100644
--- a/gfx/overworld/007.2bpp
+++ b/gfx/overworld/007.2bpp
diff --git a/gfx/overworld/008.2bpp b/gfx/overworld/008.2bpp
index 01f7a206b..94df75fc7 100644
--- a/gfx/overworld/008.2bpp
+++ b/gfx/overworld/008.2bpp
@@ -1 +1,7 @@
-8???�����>�����?<?3S����|D88��h����_���>"
-\ No newline at end of file
+(7P@oR���`0����
+��J?0/9M~^??9???����~z��������/0PP@���`0����
+�
+�?0_xW~Os?39?>>���~����8���||>!? ? ?(��� p�����d�? �x���������(7P@oR���`0����
+��J?0Oy_~??���~����8�0���/0P@oP���`0����
+��
+?0_x_~Os?3���~����8�0���	#<}B@@P���@� ������(@>1=#�(��p� �p��p���
+\ No newline at end of file
diff --git a/gfx/overworld/009.2bpp b/gfx/overworld/009.2bpp
index 96c7df96d..65cbdb1a2 100644
--- a/gfx/overworld/009.2bpp
+++ b/gfx/overworld/009.2bpp
diff --git a/gfx/overworld/010.2bpp b/gfx/overworld/010.2bpp
index fded90509..1f21db12d 100644
--- a/gfx/overworld/010.2bpp
+++ b/gfx/overworld/010.2bpp
diff --git a/gfx/overworld/011.2bpp b/gfx/overworld/011.2bpp
index 33659cd4d..36f409c46 100644
--- a/gfx/overworld/011.2bpp
+++ b/gfx/overworld/011.2bpp
diff --git a/gfx/overworld/012.2bpp b/gfx/overworld/012.2bpp
index c6d6c2904..fc40c0f15 100644
--- a/gfx/overworld/012.2bpp
+++ b/gfx/overworld/012.2bpp
diff --git a/gfx/overworld/013.2bpp b/gfx/overworld/013.2bpp
index 26eb73398..df6b3a16c 100644
--- a/gfx/overworld/013.2bpp
+++ b/gfx/overworld/013.2bpp
diff --git a/gfx/overworld/014.2bpp b/gfx/overworld/014.2bpp
index f490ff66a..58ce75371 100644
--- a/gfx/overworld/014.2bpp
+++ b/gfx/overworld/014.2bpp
diff --git a/gfx/overworld/015.2bpp b/gfx/overworld/015.2bpp
index ddc51a0a0..5de055557 100644
--- a/gfx/overworld/015.2bpp
+++ b/gfx/overworld/015.2bpp
diff --git a/gfx/overworld/016.2bpp b/gfx/overworld/016.2bpp
index 293d5d5fe..bdce93ada 100644
--- a/gfx/overworld/016.2bpp
+++ b/gfx/overworld/016.2bpp
@@ -1 +1 @@
- ? ?@@@��0�������H(?t_8?��.����x���pp
-\ No newline at end of file
+"?"?*?O_y��0���$�4�r���/??'>'	�����|���p��`` ? ? ?@D��0������"�$??/?/	$�X�������p��`` ?DI.?��0�������
+�������`�`��@���
+\ No newline at end of file
diff --git a/gfx/overworld/017.2bpp b/gfx/overworld/017.2bpp
index 18a951199..f51ec2470 100644
--- a/gfx/overworld/017.2bpp
+++ b/gfx/overworld/017.2bpp
diff --git a/gfx/overworld/018.2bpp b/gfx/overworld/018.2bpp
index 133a3c829..354fcfdca 100644
--- a/gfx/overworld/018.2bpp
+++ b/gfx/overworld/018.2bpp
diff --git a/gfx/overworld/019.2bpp b/gfx/overworld/019.2bpp
index 839ee7a09..298a38351 100644
--- a/gfx/overworld/019.2bpp
+++ b/gfx/overworld/019.2bpp
diff --git a/gfx/overworld/020.2bpp b/gfx/overworld/020.2bpp
index 4746b3a35..2c1da80cc 100644
--- a/gfx/overworld/020.2bpp
+++ b/gfx/overworld/020.2bpp
diff --git a/gfx/overworld/021.2bpp b/gfx/overworld/021.2bpp
index 604618a7b..82240e622 100644
--- a/gfx/overworld/021.2bpp
+++ b/gfx/overworld/021.2bpp
diff --git a/gfx/overworld/022.2bpp b/gfx/overworld/022.2bpp
index e61dbbebd..2fd8ce8b6 100644
--- a/gfx/overworld/022.2bpp
+++ b/gfx/overworld/022.2bpp
diff --git a/gfx/overworld/023.2bpp b/gfx/overworld/023.2bpp
index f88863912..745b1afca 100644
--- a/gfx/overworld/023.2bpp
+++ b/gfx/overworld/023.2bpp
diff --git a/gfx/overworld/024.2bpp b/gfx/overworld/024.2bpp
index a22c45590..32bef007e 100644
--- a/gfx/overworld/024.2bpp
+++ b/gfx/overworld/024.2bpp
diff --git a/gfx/overworld/025.2bpp b/gfx/overworld/025.2bpp
index 58587d87f..4ed34a450 100644
--- a/gfx/overworld/025.2bpp
+++ b/gfx/overworld/025.2bpp
diff --git a/gfx/overworld/026.2bpp b/gfx/overworld/026.2bpp
index b5f6f7e32..7be42b2df 100644
--- a/gfx/overworld/026.2bpp
+++ b/gfx/overworld/026.2bpp
diff --git a/gfx/overworld/027.2bpp b/gfx/overworld/027.2bpp
index aff0a5d15..9381d7555 100644
--- a/gfx/overworld/027.2bpp
+++ b/gfx/overworld/027.2bpp
diff --git a/gfx/overworld/028.2bpp b/gfx/overworld/028.2bpp
index 26560df33..f5450a0f1 100644
--- a/gfx/overworld/028.2bpp
+++ b/gfx/overworld/028.2bpp
diff --git a/gfx/overworld/029.2bpp b/gfx/overworld/029.2bpp
index 1c5f4aee9..12fc0c187 100644
--- a/gfx/overworld/029.2bpp
+++ b/gfx/overworld/029.2bpp
diff --git a/gfx/overworld/030.2bpp b/gfx/overworld/030.2bpp
index d50305efc..cdb942ab9 100644
--- a/gfx/overworld/030.2bpp
+++ b/gfx/overworld/030.2bpp
diff --git a/gfx/overworld/031.2bpp b/gfx/overworld/031.2bpp
index 3d34387dc..16691d982 100644
--- a/gfx/overworld/031.2bpp
+++ b/gfx/overworld/031.2bpp
diff --git a/gfx/overworld/032.2bpp b/gfx/overworld/032.2bpp
index 450b7e383..db7652bbd 100644
--- a/gfx/overworld/032.2bpp
+++ b/gfx/overworld/032.2bpp
diff --git a/gfx/overworld/033.2bpp b/gfx/overworld/033.2bpp
index 8e79427f9..d2aff635f 100644
--- a/gfx/overworld/033.2bpp
+++ b/gfx/overworld/033.2bpp
diff --git a/gfx/overworld/034.2bpp b/gfx/overworld/034.2bpp
index 99cee4d2c..ae075c338 100644
--- a/gfx/overworld/034.2bpp
+++ b/gfx/overworld/034.2bpp
diff --git a/gfx/overworld/035.2bpp b/gfx/overworld/035.2bpp
index fe34fe0f2..17c6687a5 100644
--- a/gfx/overworld/035.2bpp
+++ b/gfx/overworld/035.2bpp
diff --git a/gfx/overworld/036.2bpp b/gfx/overworld/036.2bpp
index 2afaa45b8..6edb8a305 100644
--- a/gfx/overworld/036.2bpp
+++ b/gfx/overworld/036.2bpp
diff --git a/gfx/overworld/037.2bpp b/gfx/overworld/037.2bpp
index 8743c431e..597f0e4ba 100644
--- a/gfx/overworld/037.2bpp
+++ b/gfx/overworld/037.2bpp
diff --git a/gfx/overworld/038.2bpp b/gfx/overworld/038.2bpp
index 4a58abe34..f0f329b63 100644
--- a/gfx/overworld/038.2bpp
+++ b/gfx/overworld/038.2bpp
diff --git a/gfx/overworld/039.2bpp b/gfx/overworld/039.2bpp
index 82bf5c74a..4e8485fc2 100644
--- a/gfx/overworld/039.2bpp
+++ b/gfx/overworld/039.2bpp
diff --git a/gfx/overworld/040.2bpp b/gfx/overworld/040.2bpp
index 79fb75b13..0901ed9b0 100644
--- a/gfx/overworld/040.2bpp
+++ b/gfx/overworld/040.2bpp
diff --git a/gfx/overworld/041.2bpp b/gfx/overworld/041.2bpp
index df9fcb777..00886ad62 100644
--- a/gfx/overworld/041.2bpp
+++ b/gfx/overworld/041.2bpp
diff --git a/gfx/overworld/042.2bpp b/gfx/overworld/042.2bpp
index aa7ff419f..c3a136249 100644
--- a/gfx/overworld/042.2bpp
+++ b/gfx/overworld/042.2bpp
diff --git a/gfx/overworld/043.2bpp b/gfx/overworld/043.2bpp
index 823a3514c..2542203c2 100644
--- a/gfx/overworld/043.2bpp
+++ b/gfx/overworld/043.2bpp
diff --git a/gfx/overworld/044.2bpp b/gfx/overworld/044.2bpp
index 7f6b1dd28..2e167caf4 100644
--- a/gfx/overworld/044.2bpp
+++ b/gfx/overworld/044.2bpp
diff --git a/gfx/overworld/045.2bpp b/gfx/overworld/045.2bpp
index 35c7b72d3..1f6239516 100644
--- a/gfx/overworld/045.2bpp
+++ b/gfx/overworld/045.2bpp
@@ -1,2 +1 @@
-(7P@oR���`0����
-��J?0/9M~^??9???����~z��������
-\ No newline at end of file
+;>?8���������|��H�H	?/?(?<p���������<�8��;?=?��p��������x���?/_X~���������~����>?=3�����������������x�p�����������;>?8���������|��H�H	?/?(?<p���������<�8��;?=?��p��������x���?/_X~���������x���>?=3����������������	
+�x�p�������|�|��
+\ No newline at end of file
diff --git a/gfx/overworld/046.2bpp b/gfx/overworld/046.2bpp
index 9428e2539..8a5d7ec67 100644
--- a/gfx/overworld/046.2bpp
+++ b/gfx/overworld/046.2bpp
diff --git a/gfx/overworld/047.2bpp b/gfx/overworld/047.2bpp
index f40514b09..7b563b1c7 100644
--- a/gfx/overworld/047.2bpp
+++ b/gfx/overworld/047.2bpp
diff --git a/gfx/overworld/048.2bpp b/gfx/overworld/048.2bpp
index 02acc4b99..882f016cf 100644
--- a/gfx/overworld/048.2bpp
+++ b/gfx/overworld/048.2bpp
diff --git a/gfx/overworld/049.2bpp b/gfx/overworld/049.2bpp
index 11a01dbd9..b1e79ffb0 100644
--- a/gfx/overworld/049.2bpp
+++ b/gfx/overworld/049.2bpp
diff --git a/gfx/overworld/050.2bpp b/gfx/overworld/050.2bpp
index da4abbb6a..9b45a1c2b 100644
--- a/gfx/overworld/050.2bpp
+++ b/gfx/overworld/050.2bpp
diff --git a/gfx/overworld/051.2bpp b/gfx/overworld/051.2bpp
index 501fd460b..1e4f970a2 100644
--- a/gfx/overworld/051.2bpp
+++ b/gfx/overworld/051.2bpp
diff --git a/gfx/overworld/052.2bpp b/gfx/overworld/052.2bpp
index 193e87805..2bc8793ab 100644
--- a/gfx/overworld/052.2bpp
+++ b/gfx/overworld/052.2bpp
diff --git a/gfx/overworld/053.2bpp b/gfx/overworld/053.2bpp
index 532fbffe0..97a5e6ab6 100644
--- a/gfx/overworld/053.2bpp
+++ b/gfx/overworld/053.2bpp
diff --git a/gfx/overworld/054.2bpp b/gfx/overworld/054.2bpp
index c45062dfe..fec70f27c 100644
--- a/gfx/overworld/054.2bpp
+++ b/gfx/overworld/054.2bpp
diff --git a/gfx/overworld/055.2bpp b/gfx/overworld/055.2bpp
index f529237f8..df716add1 100644
--- a/gfx/overworld/055.2bpp
+++ b/gfx/overworld/055.2bpp
diff --git a/gfx/overworld/056.2bpp b/gfx/overworld/056.2bpp
index 87c8a8ee5..6d69aee66 100644
--- a/gfx/overworld/056.2bpp
+++ b/gfx/overworld/056.2bpp
diff --git a/gfx/overworld/057.2bpp b/gfx/overworld/057.2bpp
index beb2698ce..0c62b196b 100644
--- a/gfx/overworld/057.2bpp
+++ b/gfx/overworld/057.2bpp
diff --git a/gfx/overworld/058.2bpp b/gfx/overworld/058.2bpp
index f26adaf4e..702f325a1 100644
--- a/gfx/overworld/058.2bpp
+++ b/gfx/overworld/058.2bpp
diff --git a/gfx/overworld/059.2bpp b/gfx/overworld/059.2bpp
index 8aae28ca0..a4e8d6899 100644
--- a/gfx/overworld/059.2bpp
+++ b/gfx/overworld/059.2bpp
diff --git a/gfx/overworld/060.2bpp b/gfx/overworld/060.2bpp
index c5ec1b300..32daceb69 100644
--- a/gfx/overworld/060.2bpp
+++ b/gfx/overworld/060.2bpp
diff --git a/gfx/overworld/061.2bpp b/gfx/overworld/061.2bpp
index abc12d802..69b2e4e70 100644
--- a/gfx/overworld/061.2bpp
+++ b/gfx/overworld/061.2bpp
diff --git a/gfx/overworld/062.2bpp b/gfx/overworld/062.2bpp
index 0ba80d2c7..b1f5b464b 100644
--- a/gfx/overworld/062.2bpp
+++ b/gfx/overworld/062.2bpp
diff --git a/gfx/overworld/063.2bpp b/gfx/overworld/063.2bpp
index 4130cf317..e7fd2bc18 100644
--- a/gfx/overworld/063.2bpp
+++ b/gfx/overworld/063.2bpp
diff --git a/gfx/overworld/064.2bpp b/gfx/overworld/064.2bpp
index 0061d74cc..28c141dfa 100644
--- a/gfx/overworld/064.2bpp
+++ b/gfx/overworld/064.2bpp
diff --git a/gfx/overworld/065.2bpp b/gfx/overworld/065.2bpp
index 20fdf4498..826e6460e 100644
--- a/gfx/overworld/065.2bpp
+++ b/gfx/overworld/065.2bpp
diff --git a/gfx/overworld/066.2bpp b/gfx/overworld/066.2bpp
index 28bf0a9b1..da551977f 100644
--- a/gfx/overworld/066.2bpp
+++ b/gfx/overworld/066.2bpp
diff --git a/gfx/overworld/067.2bpp b/gfx/overworld/067.2bpp
index 89cd7c2e1..b35296544 100644
--- a/gfx/overworld/067.2bpp
+++ b/gfx/overworld/067.2bpp
diff --git a/gfx/overworld/068.2bpp b/gfx/overworld/068.2bpp
index ca65cca7e..3cac02f74 100644
--- a/gfx/overworld/068.2bpp
+++ b/gfx/overworld/068.2bpp
diff --git a/gfx/overworld/069.2bpp b/gfx/overworld/069.2bpp
index 6f68c2ac5..8b5d0dc34 100644
--- a/gfx/overworld/069.2bpp
+++ b/gfx/overworld/069.2bpp
diff --git a/gfx/overworld/070.2bpp b/gfx/overworld/070.2bpp
index 378685da1..f13f3a80c 100644
--- a/gfx/overworld/070.2bpp
+++ b/gfx/overworld/070.2bpp
diff --git a/gfx/overworld/071.2bpp b/gfx/overworld/071.2bpp
index 6f80b8220..de6d4772a 100644
--- a/gfx/overworld/071.2bpp
+++ b/gfx/overworld/071.2bpp
diff --git a/gfx/overworld/072.2bpp b/gfx/overworld/072.2bpp
index 635017d59..bbd9e6f30 100644
--- a/gfx/overworld/072.2bpp
+++ b/gfx/overworld/072.2bpp
diff --git a/gfx/overworld/073.2bpp b/gfx/overworld/073.2bpp
index a278a1331..e650a0fa6 100644
--- a/gfx/overworld/073.2bpp
+++ b/gfx/overworld/073.2bpp
diff --git a/gfx/overworld/074.2bpp b/gfx/overworld/074.2bpp
index d427e39f8..2407b11df 100644
--- a/gfx/overworld/074.2bpp
+++ b/gfx/overworld/074.2bpp
diff --git a/gfx/overworld/075.2bpp b/gfx/overworld/075.2bpp
index 57f7cac7a..542d6ef24 100644
--- a/gfx/overworld/075.2bpp
+++ b/gfx/overworld/075.2bpp
diff --git a/gfx/overworld/076.2bpp b/gfx/overworld/076.2bpp
index 403982268..32e75d48b 100644
--- a/gfx/overworld/076.2bpp
+++ b/gfx/overworld/076.2bpp
diff --git a/gfx/overworld/077.2bpp b/gfx/overworld/077.2bpp
index ba7ee1183..d74e9980d 100644
--- a/gfx/overworld/077.2bpp
+++ b/gfx/overworld/077.2bpp
diff --git a/gfx/overworld/078.2bpp b/gfx/overworld/078.2bpp
index 5403871e6..bd2dcea81 100644
--- a/gfx/overworld/078.2bpp
+++ b/gfx/overworld/078.2bpp
diff --git a/gfx/overworld/079.2bpp b/gfx/overworld/079.2bpp
index 6351a37f4..91659bdc6 100644
--- a/gfx/overworld/079.2bpp
+++ b/gfx/overworld/079.2bpp
diff --git a/gfx/overworld/080.2bpp b/gfx/overworld/080.2bpp
index d2c9ef987..c03f2a4d6 100644
--- a/gfx/overworld/080.2bpp
+++ b/gfx/overworld/080.2bpp
diff --git a/gfx/overworld/081.2bpp b/gfx/overworld/081.2bpp
index 5d6770b79..d9efd679e 100644
--- a/gfx/overworld/081.2bpp
+++ b/gfx/overworld/081.2bpp
diff --git a/gfx/overworld/082.2bpp b/gfx/overworld/082.2bpp
index 5c1fa07e6..f6395da92 100644
--- a/gfx/overworld/082.2bpp
+++ b/gfx/overworld/082.2bpp
diff --git a/gfx/overworld/083.2bpp b/gfx/overworld/083.2bpp
index 1dc8f712c..feb6d7d19 100644
--- a/gfx/overworld/083.2bpp
+++ b/gfx/overworld/083.2bpp
diff --git a/gfx/overworld/084.2bpp b/gfx/overworld/084.2bpp
index 5cd6505ef..40ee737a7 100644
--- a/gfx/overworld/084.2bpp
+++ b/gfx/overworld/084.2bpp
diff --git a/gfx/overworld/085.2bpp b/gfx/overworld/085.2bpp
index d8a0d82b1..3d7694f43 100644
--- a/gfx/overworld/085.2bpp
+++ b/gfx/overworld/085.2bpp
diff --git a/gfx/overworld/086.2bpp b/gfx/overworld/086.2bpp
index 4834123a5..bbe5b9fa8 100644
--- a/gfx/overworld/086.2bpp
+++ b/gfx/overworld/086.2bpp
diff --git a/gfx/overworld/087.2bpp b/gfx/overworld/087.2bpp
index ba50520c0..7d28ef270 100644
--- a/gfx/overworld/087.2bpp
+++ b/gfx/overworld/087.2bpp
@@ -1 +1 @@
-? ?6oYV��0�h�����d���j?0>9OJ?3>#�|����R��|���pp
-\ No newline at end of file
+ ?"?'=Ox����0���D����G��ny	�Ov����������``
+\ No newline at end of file
diff --git a/gfx/overworld/088.2bpp b/gfx/overworld/088.2bpp
index 73b362bbd..da35730d0 100644
--- a/gfx/overworld/088.2bpp
+++ b/gfx/overworld/088.2bpp
@@ -1,2 +1 @@
- ? ?p_xW��0�������?0?8WP?0�����
-����pp
-\ No newline at end of file
+7\޵����t���p����|z����q~�����Go??���>��������px
+\ No newline at end of file
diff --git a/gfx/overworld/089.2bpp b/gfx/overworld/089.2bpp
index b85400f71..f3386f2a5 100644
--- a/gfx/overworld/089.2bpp
+++ b/gfx/overworld/089.2bpp
@@ -1,3 +1 @@
-? ? ?09/?0��`���������<�8? 
-
-	����� �P�P�`���
-\ No newline at end of file
+? @��ժ�Ѯ�����R��^C��+��ҭ��������u??���+�W���~�����
+\ No newline at end of file
diff --git a/gfx/overworld/090.2bpp b/gfx/overworld/090.2bpp
index 8cbf7fc59..ec7867d54 100644
--- a/gfx/overworld/090.2bpp
+++ b/gfx/overworld/090.2bpp
diff --git a/gfx/overworld/091.2bpp b/gfx/overworld/091.2bpp
index 39c752a43..182a360fe 100644
--- a/gfx/overworld/091.2bpp
+++ b/gfx/overworld/091.2bpp
diff --git a/gfx/overworld/092.2bpp b/gfx/overworld/092.2bpp
index e6383d539..3c38a9b3a 100644
--- a/gfx/overworld/092.2bpp
+++ b/gfx/overworld/092.2bpp
diff --git a/gfx/overworld/093.2bpp b/gfx/overworld/093.2bpp
index eef0e4773..594985e43 100644
--- a/gfx/overworld/093.2bpp
+++ b/gfx/overworld/093.2bpp
diff --git a/gfx/overworld/094.2bpp b/gfx/overworld/094.2bpp
index 06b21e9ff..73964d04e 100644
--- a/gfx/overworld/094.2bpp
+++ b/gfx/overworld/094.2bpp
diff --git a/gfx/overworld/095.2bpp b/gfx/overworld/095.2bpp
index 77fa9b1f4..a4d55c72d 100644
--- a/gfx/overworld/095.2bpp
+++ b/gfx/overworld/095.2bpp
diff --git a/gfx/overworld/096.2bpp b/gfx/overworld/096.2bpp
index a13b47d22..11e6a4fd5 100644
--- a/gfx/overworld/096.2bpp
+++ b/gfx/overworld/096.2bpp
@@ -1,2 +1,2 @@
-2/$?J}I3>��0���$����
-�J?<OyO3?�L������8���pp
-\ No newline at end of file
+%?/:����0��8xȤ��\��G��xOO3>�O������|H��p��(7/8�������8�������c\t?<a����:.��<���p��	'>-;���8��8�Ȅ�����
+?3S����|D88�������_���>"		q����<����.��"Oy?<OO?>�'������|�x@���	t�����
+�����C1?1��������X谰,3O|[w?%?)?)��� p��p�����0>#?3S����uM88��������?���
+\ No newline at end of file
diff --git a/gfx/overworld/097.2bpp b/gfx/overworld/097.2bpp
index f85e78fc4..7da1f4b4a 100644
--- a/gfx/overworld/097.2bpp
+++ b/gfx/overworld/097.2bpp
@@ -1 +1,2 @@
- ?0/$;p_p_��0����"���0?<?{O|_3?�<���>���8���pp
-\ No newline at end of file
+/0P@oV����������
+��jp?3{LK?<8/����2���<�����??___����������������??/<[X0?���<����������? ? ? ?,����x��x�<�<�|�? �x���x��������
+\ No newline at end of file
diff --git a/gfx/overworld/098.2bpp b/gfx/overworld/098.2bpp
index 59ba04421..45ee3056d 100644
--- a/gfx/overworld/098.2bpp
+++ b/gfx/overworld/098.2bpp
@@ -1 +1 @@
-"?'=OyOt?4��0��l��B�����d���� � ��� ��
-\ No newline at end of file
+
+>}}56=w^���| �������,�n�����y_y_�R^�O�W�����WuJz08
+\ No newline at end of file
diff --git a/gfx/overworld/099.2bpp b/gfx/overworld/099.2bpp
index 10e73a29f..e95759482 100644
--- a/gfx/overworld/099.2bpp
+++ b/gfx/overworld/099.2bpp
diff --git a/gfx/overworld/100.2bpp b/gfx/overworld/100.2bpp
index 36c74157d..3aa0fd5c0 100644
--- a/gfx/overworld/100.2bpp
+++ b/gfx/overworld/100.2bpp
diff --git a/gfx/overworld/101.2bpp b/gfx/overworld/101.2bpp
index 55f935356..579b552f1 100644
--- a/gfx/overworld/101.2bpp
+++ b/gfx/overworld/101.2bpp
diff --git a/gfx/overworld/102.2bpp b/gfx/overworld/102.2bpp
deleted file mode 100644
index 8ccb58e02..000000000
--- a/gfx/overworld/102.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-"=%?w|����0���D����>�__r?8>%	�N���|������``
-\ No newline at end of file
diff --git a/gfx/overworld/103.2bpp b/gfx/overworld/103.2bpp
deleted file mode 100644
index 4ab688407..000000000
--- a/gfx/overworld/103.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-(7"=x����0����D��!�@8??$	�����$�����``
-\ No newline at end of file
diff --git a/gfx/overworld/104.2bpp b/gfx/overworld/104.2bpp
deleted file mode 100644
index 3fb32c909..000000000
--- a/gfx/overworld/104.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-*=(?<7��0��D������?�>���p� ���@���
-\ No newline at end of file
diff --git a/gfx/overworld/105.2bpp b/gfx/overworld/105.2bpp
deleted file mode 100644
index 64735e744..000000000
--- a/gfx/overworld/105.2bpp
+++ /dev/null
diff --git a/gfx/overworld/106.2bpp b/gfx/overworld/106.2bpp
deleted file mode 100644
index c656bbf24..000000000
--- a/gfx/overworld/106.2bpp
+++ /dev/null
diff --git a/gfx/overworld/107.2bpp b/gfx/overworld/107.2bpp
deleted file mode 100644
index 7645c764a..000000000
--- a/gfx/overworld/107.2bpp
+++ /dev/null
diff --git a/gfx/overworld/108.2bpp b/gfx/overworld/108.2bpp
deleted file mode 100644
index 639d4a230..000000000
--- a/gfx/overworld/108.2bpp
+++ /dev/null
diff --git a/gfx/overworld/109.2bpp b/gfx/overworld/109.2bpp
deleted file mode 100644
index f6a6142a8..000000000
--- a/gfx/overworld/109.2bpp
+++ /dev/null
diff --git a/gfx/overworld/110.2bpp b/gfx/overworld/110.2bpp
deleted file mode 100644
index 53edd5b12..000000000
--- a/gfx/overworld/110.2bpp
+++ /dev/null
diff --git a/gfx/overworld/111.2bpp b/gfx/overworld/111.2bpp
deleted file mode 100644
index 624ad335a..000000000
--- a/gfx/overworld/111.2bpp
+++ /dev/null
diff --git a/gfx/overworld/112.2bpp b/gfx/overworld/112.2bpp
deleted file mode 100644
index a11dd4052..000000000
--- a/gfx/overworld/112.2bpp
+++ /dev/null
diff --git a/gfx/overworld/113.2bpp b/gfx/overworld/113.2bpp
deleted file mode 100644
index 289e5a1ec..000000000
--- a/gfx/overworld/113.2bpp
+++ /dev/null
diff --git a/gfx/overworld/114.2bpp b/gfx/overworld/114.2bpp
deleted file mode 100644
index 4def129da..000000000
--- a/gfx/overworld/114.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-4?<?>?oWoR��0���<������J_p>9OO7?�|�������8���pp
-\ No newline at end of file
diff --git a/gfx/overworld/115.2bpp b/gfx/overworld/115.2bpp
deleted file mode 100644
index 40300dc89..000000000
--- a/gfx/overworld/115.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-0?<???g_`_��0���<������P9?__3?
-���������8���pp
-\ No newline at end of file
diff --git a/gfx/overworld/116.2bpp b/gfx/overworld/116.2bpp
deleted file mode 100644
index 23f4fb9f9..000000000
--- a/gfx/overworld/116.2bpp
+++ /dev/null
@@ -1 +0,0 @@
- ?<???��0���<������>�<����� � �� ���
-\ No newline at end of file
diff --git a/gfx/overworld/117.2bpp b/gfx/overworld/117.2bpp
deleted file mode 100644
index 53d2aae69..000000000
--- a/gfx/overworld/117.2bpp
+++ /dev/null
diff --git a/gfx/overworld/118.2bpp b/gfx/overworld/118.2bpp
deleted file mode 100644
index 9f8159175..000000000
--- a/gfx/overworld/118.2bpp
+++ /dev/null
diff --git a/gfx/overworld/119.2bpp b/gfx/overworld/119.2bpp
deleted file mode 100644
index db803a6c5..000000000
--- a/gfx/overworld/119.2bpp
+++ /dev/null
diff --git a/gfx/overworld/120.2bpp b/gfx/overworld/120.2bpp
deleted file mode 100644
index 9e082a7f7..000000000
--- a/gfx/overworld/120.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-?8?0;4nSP���������,v��
-?6?<OH3<�l�<����<8���pp
-\ No newline at end of file
diff --git a/gfx/overworld/121.2bpp b/gfx/overworld/121.2bpp
deleted file mode 100644
index 4dbfc69bf..000000000
--- a/gfx/overworld/121.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-??????__����������������????MH3<��������<8���pp
-\ No newline at end of file
diff --git a/gfx/overworld/122.2bpp b/gfx/overworld/122.2bpp
deleted file mode 100644
index 877229fcc..000000000
--- a/gfx/overworld/122.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-�������x|���������p����0��� ��
-\ No newline at end of file
diff --git a/gfx/overworld/123.2bpp b/gfx/overworld/123.2bpp
deleted file mode 100644
index edbdb4f55..000000000
--- a/gfx/overworld/123.2bpp
+++ /dev/null
diff --git a/gfx/overworld/124.2bpp b/gfx/overworld/124.2bpp
deleted file mode 100644
index 5feee155a..000000000
--- a/gfx/overworld/124.2bpp
+++ /dev/null
diff --git a/gfx/overworld/125.2bpp b/gfx/overworld/125.2bpp
deleted file mode 100644
index cbf15f6a8..000000000
--- a/gfx/overworld/125.2bpp
+++ /dev/null
diff --git a/gfx/overworld/126.2bpp b/gfx/overworld/126.2bpp
deleted file mode 100644
index 706490e97..000000000
--- a/gfx/overworld/126.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-pp����P?'?$OxOr��1�
-����$��NOrOx_w:%�N���\������
-\ No newline at end of file
diff --git a/gfx/overworld/127.2bpp b/gfx/overworld/127.2bpp
deleted file mode 100644
index 392a426a7..000000000
--- a/gfx/overworld/127.2bpp
+++ /dev/null
@@ -1,4 +0,0 @@
-pp����P ?(7B}@��1�
-���B��@PP8/�
-�
-��������
-\ No newline at end of file
diff --git a/gfx/overworld/128.2bpp b/gfx/overworld/128.2bpp
deleted file mode 100644
index 38c6842f8..000000000
--- a/gfx/overworld/128.2bpp
+++ /dev/null
diff --git a/gfx/overworld/129.2bpp b/gfx/overworld/129.2bpp
deleted file mode 100644
index edac8153f..000000000
--- a/gfx/overworld/129.2bpp
+++ /dev/null
diff --git a/gfx/overworld/130.2bpp b/gfx/overworld/130.2bpp
deleted file mode 100644
index a6059c338..000000000
--- a/gfx/overworld/130.2bpp
+++ /dev/null
diff --git a/gfx/overworld/131.2bpp b/gfx/overworld/131.2bpp
deleted file mode 100644
index 6881800c8..000000000
--- a/gfx/overworld/131.2bpp
+++ /dev/null
diff --git a/gfx/overworld/132.2bpp b/gfx/overworld/132.2bpp
deleted file mode 100644
index bc6c4aca1..000000000
--- a/gfx/overworld/132.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-7=Ox/8?0mRV��p������J�j>1?/9/|��X�����8��pp
-\ No newline at end of file
diff --git a/gfx/overworld/133.2bpp b/gfx/overworld/133.2bpp
deleted file mode 100644
index 65638b786..000000000
--- a/gfx/overworld/133.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-0?@ ?0?hWP��p�������
-?0?'?!������8���pp
-\ No newline at end of file
diff --git a/gfx/overworld/134.2bpp b/gfx/overworld/134.2bpp
deleted file mode 100644
index e9bb39ac9..000000000
--- a/gfx/overworld/134.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-��0����|�~�(���	��p���p�� ��
-\ No newline at end of file
diff --git a/gfx/overworld/135.2bpp b/gfx/overworld/135.2bpp
deleted file mode 100644
index 03af92b24..000000000
--- a/gfx/overworld/135.2bpp
+++ /dev/null
diff --git a/gfx/overworld/136.2bpp b/gfx/overworld/136.2bpp
deleted file mode 100644
index fe3468246..000000000
--- a/gfx/overworld/136.2bpp
+++ /dev/null
diff --git a/gfx/overworld/137.2bpp b/gfx/overworld/137.2bpp
deleted file mode 100644
index 171950bef..000000000
--- a/gfx/overworld/137.2bpp
+++ /dev/null
diff --git a/gfx/overworld/138.2bpp b/gfx/overworld/138.2bpp
deleted file mode 100644
index 84b0168e7..000000000
--- a/gfx/overworld/138.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-$?*?N{_q/2�����d������LOr_x?7'?_O{9?�N��������ޜ�``
-\ No newline at end of file
diff --git a/gfx/overworld/139.2bpp b/gfx/overworld/139.2bpp
deleted file mode 100644
index 74cd02bc1..000000000
--- a/gfx/overworld/139.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-&=$?DT"?��p�(�d�$�"�*�D�BY7?#?@@9?B�����������``
-\ No newline at end of file
diff --git a/gfx/overworld/140.2bpp b/gfx/overworld/140.2bpp
deleted file mode 100644
index 6941d631f..000000000
--- a/gfx/overworld/140.2bpp
+++ /dev/null
@@ -1,3 +0,0 @@
- ?XU~\g>+>+00��$�T����
-�>#
-�T����������
-\ No newline at end of file
diff --git a/gfx/overworld/141.2bpp b/gfx/overworld/141.2bpp
deleted file mode 100644
index d039b08dd..000000000
--- a/gfx/overworld/141.2bpp
+++ /dev/null
diff --git a/gfx/overworld/142.2bpp b/gfx/overworld/142.2bpp
deleted file mode 100644
index b8600cd6d..000000000
--- a/gfx/overworld/142.2bpp
+++ /dev/null
diff --git a/gfx/overworld/143.2bpp b/gfx/overworld/143.2bpp
deleted file mode 100644
index 99aa62035..000000000
--- a/gfx/overworld/143.2bpp
+++ /dev/null
diff --git a/gfx/overworld/144.2bpp b/gfx/overworld/144.2bpp
deleted file mode 100644
index c80cc32f5..000000000
--- a/gfx/overworld/144.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-
-?:;4}RoV�������\��,�J�j?0>9OxO<?�|����<�����pp
-\ No newline at end of file
diff --git a/gfx/overworld/145.2bpp b/gfx/overworld/145.2bpp
deleted file mode 100644
index 63af83549..000000000
--- a/gfx/overworld/145.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-
-????_o_����������������?6?8wOp_<?�l����<�����pp
-\ No newline at end of file
diff --git a/gfx/overworld/146.2bpp b/gfx/overworld/146.2bpp
deleted file mode 100644
index e921712bf..000000000
--- a/gfx/overworld/146.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-�������������������0��`�`�� ���
-\ No newline at end of file
diff --git a/gfx/overworld/147.2bpp b/gfx/overworld/147.2bpp
deleted file mode 100644
index 500e90e6b..000000000
--- a/gfx/overworld/147.2bpp
+++ /dev/null
diff --git a/gfx/overworld/148.2bpp b/gfx/overworld/148.2bpp
deleted file mode 100644
index 75c489cd2..000000000
--- a/gfx/overworld/148.2bpp
+++ /dev/null
diff --git a/gfx/overworld/149.2bpp b/gfx/overworld/149.2bpp
deleted file mode 100644
index 301784139..000000000
--- a/gfx/overworld/149.2bpp
+++ /dev/null
diff --git a/gfx/overworld/150.2bpp b/gfx/overworld/150.2bpp
deleted file mode 100644
index f9fe9754d..000000000
--- a/gfx/overworld/150.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-?"='?(HJ���0��D�����R?*?$C?%	�T�$�������А�``
-\ No newline at end of file
diff --git a/gfx/overworld/151.2bpp b/gfx/overworld/151.2bpp
deleted file mode 100644
index 5de9072e7..000000000
--- a/gfx/overworld/151.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-? ? ? @@���0������? ?!C?'	����������А�``
-\ No newline at end of file
diff --git a/gfx/overworld/152.2bpp b/gfx/overworld/152.2bpp
deleted file mode 100644
index b66c66d06..000000000
--- a/gfx/overworld/152.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-���0��������
-������,��@���
-\ No newline at end of file
diff --git a/gfx/overworld/153.2bpp b/gfx/overworld/153.2bpp
deleted file mode 100644
index 6ce4355c0..000000000
--- a/gfx/overworld/153.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-,? ?1?G~/8PoV��0������|�
-�j?0~IG����>>�~����	������||
-\ No newline at end of file
diff --git a/gfx/overworld/154.2bpp b/gfx/overworld/154.2bpp
deleted file mode 100644
index e4f9c7fad..000000000
--- a/gfx/overworld/154.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-,? ?0?@ ?p_`_��0�������0?zOoU����>>�^����	������||
-\ No newline at end of file
diff --git a/gfx/overworld/155.2bpp b/gfx/overworld/155.2bpp
deleted file mode 100644
index 6f0b50e5f..000000000
--- a/gfx/overworld/155.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-,? ?6?Oy?0��0������|���p�������@��
-\ No newline at end of file
diff --git a/gfx/overworld/156.2bpp b/gfx/overworld/156.2bpp
deleted file mode 100644
index f415cd370..000000000
--- a/gfx/overworld/156.2bpp
+++ /dev/null
diff --git a/gfx/overworld/157.2bpp b/gfx/overworld/157.2bpp
deleted file mode 100644
index 0453cdd2b..000000000
--- a/gfx/overworld/157.2bpp
+++ /dev/null
diff --git a/gfx/overworld/158.2bpp b/gfx/overworld/158.2bpp
deleted file mode 100644
index 14de03db2..000000000
--- a/gfx/overworld/158.2bpp
+++ /dev/null
diff --git a/gfx/overworld/159.2bpp b/gfx/overworld/159.2bpp
deleted file mode 100644
index 41c9e73fc..000000000
--- a/gfx/overworld/159.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-"=%?7</:��0���D����<�\Or/8<'		�N���<�(�p���``
-\ No newline at end of file
diff --git a/gfx/overworld/160.2bpp b/gfx/overworld/160.2bpp
deleted file mode 100644
index 29a0bc1c7..000000000
--- a/gfx/overworld/160.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-(7"=0? ?��0����D���@(?<'		����<�(�p���``
-\ No newline at end of file
diff --git a/gfx/overworld/161.2bpp b/gfx/overworld/161.2bpp
deleted file mode 100644
index 16f6aca17..000000000
--- a/gfx/overworld/161.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-*=(?<7��0��D������>
-�>����0��@@���
-\ No newline at end of file
diff --git a/gfx/overworld/162.2bpp b/gfx/overworld/162.2bpp
deleted file mode 100644
index 2103cac97..000000000
--- a/gfx/overworld/162.2bpp
+++ /dev/null
diff --git a/gfx/overworld/163.2bpp b/gfx/overworld/163.2bpp
deleted file mode 100644
index 282a68f3f..000000000
--- a/gfx/overworld/163.2bpp
+++ /dev/null
diff --git a/gfx/overworld/164.2bpp b/gfx/overworld/164.2bpp
deleted file mode 100644
index e000a5800..000000000
--- a/gfx/overworld/164.2bpp
+++ /dev/null
diff --git a/gfx/overworld/165.2bpp b/gfx/overworld/165.2bpp
deleted file mode 100644
index 3ccbefea1..000000000
--- a/gfx/overworld/165.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-?;QDoR�������������"�J?0>9O~M�����|���~�����pp
-\ No newline at end of file
diff --git a/gfx/overworld/166.2bpp b/gfx/overworld/166.2bpp
deleted file mode 100644
index 3ef096a51..000000000
--- a/gfx/overworld/166.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-??????_����������������?7??�����������������pp
-\ No newline at end of file
diff --git a/gfx/overworld/167.2bpp b/gfx/overworld/167.2bpp
deleted file mode 100644
index bc5b19f0c..000000000
--- a/gfx/overworld/167.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-???7�������������x�H��p���<�>������
-\ No newline at end of file
diff --git a/gfx/overworld/168.2bpp b/gfx/overworld/168.2bpp
deleted file mode 100644
index 7225ffcfd..000000000
--- a/gfx/overworld/168.2bpp
+++ /dev/null
diff --git a/gfx/overworld/169.2bpp b/gfx/overworld/169.2bpp
deleted file mode 100644
index ff1a3b1cc..000000000
--- a/gfx/overworld/169.2bpp
+++ /dev/null
diff --git a/gfx/overworld/170.2bpp b/gfx/overworld/170.2bpp
deleted file mode 100644
index 9e76b1d21..000000000
--- a/gfx/overworld/170.2bpp
+++ /dev/null
diff --git a/gfx/overworld/171.2bpp b/gfx/overworld/171.2bpp
deleted file mode 100644
index de8cfbd09..000000000
--- a/gfx/overworld/171.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-?&/9/8kToR���0������*�J_p>9OxO<?�|����<�����pp
-\ No newline at end of file
diff --git a/gfx/overworld/172.2bpp b/gfx/overworld/172.2bpp
deleted file mode 100644
index ab5499a5b..000000000
--- a/gfx/overworld/172.2bpp
+++ /dev/null
@@ -1,3 +0,0 @@
-? 7(-2oPoP���0����L�
-�
-_p?8Op_<?�����<�����pp
-\ No newline at end of file
diff --git a/gfx/overworld/173.2bpp b/gfx/overworld/173.2bpp
deleted file mode 100644
index 0792a3c1e..000000000
--- a/gfx/overworld/173.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-	���0���$~�~����h���� � �� ���
-\ No newline at end of file
diff --git a/gfx/overworld/174.2bpp b/gfx/overworld/174.2bpp
deleted file mode 100644
index 1daae9027..000000000
--- a/gfx/overworld/174.2bpp
+++ /dev/null
diff --git a/gfx/overworld/175.2bpp b/gfx/overworld/175.2bpp
deleted file mode 100644
index 1d3d59981..000000000
--- a/gfx/overworld/175.2bpp
+++ /dev/null
diff --git a/gfx/overworld/176.2bpp b/gfx/overworld/176.2bpp
deleted file mode 100644
index a018a7787..000000000
--- a/gfx/overworld/176.2bpp
+++ /dev/null
diff --git a/gfx/overworld/177.2bpp b/gfx/overworld/177.2bpp
deleted file mode 100644
index 559f554a1..000000000
--- a/gfx/overworld/177.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-;/?=?8?:������<�������\4/�H���,���(����
-\ No newline at end of file
diff --git a/gfx/overworld/178.2bpp b/gfx/overworld/178.2bpp
deleted file mode 100644
index 7b0176bb9..000000000
--- a/gfx/overworld/178.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-?=??????����������������4/�����,���(����
-\ No newline at end of file
diff --git a/gfx/overworld/179.2bpp b/gfx/overworld/179.2bpp
deleted file mode 100644
index 0a3cdbc04..000000000
--- a/gfx/overworld/179.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-9?<?>3����������������
-	����0�p�h��x����
-\ No newline at end of file
diff --git a/gfx/overworld/180.2bpp b/gfx/overworld/180.2bpp
deleted file mode 100644
index 517714117..000000000
--- a/gfx/overworld/180.2bpp
+++ /dev/null
diff --git a/gfx/overworld/181.2bpp b/gfx/overworld/181.2bpp
deleted file mode 100644
index 55dc3bbe0..000000000
--- a/gfx/overworld/181.2bpp
+++ /dev/null
diff --git a/gfx/overworld/182.2bpp b/gfx/overworld/182.2bpp
deleted file mode 100644
index ac3801346..000000000
--- a/gfx/overworld/182.2bpp
+++ /dev/null
diff --git a/gfx/overworld/183.2bpp b/gfx/overworld/183.2bpp
deleted file mode 100644
index 61f3ed185..000000000
--- a/gfx/overworld/183.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-
-?9?0;4}RoV����������,�J�j?8
-	�p����x�p���``
-\ No newline at end of file
diff --git a/gfx/overworld/184.2bpp b/gfx/overworld/184.2bpp
deleted file mode 100644
index 2b79ce22e..000000000
--- a/gfx/overworld/184.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-
-??????_o_����������������?;	���0���������``
-\ No newline at end of file
diff --git a/gfx/overworld/185.2bpp b/gfx/overworld/185.2bpp
deleted file mode 100644
index da7a5fd13..000000000
--- a/gfx/overworld/185.2bpp
+++ /dev/null
diff --git a/gfx/overworld/186.2bpp b/gfx/overworld/186.2bpp
deleted file mode 100644
index dfc748d74..000000000
--- a/gfx/overworld/186.2bpp
+++ /dev/null
diff --git a/gfx/overworld/187.2bpp b/gfx/overworld/187.2bpp
deleted file mode 100644
index ae52722a2..000000000
--- a/gfx/overworld/187.2bpp
+++ /dev/null
diff --git a/gfx/overworld/188.2bpp b/gfx/overworld/188.2bpp
deleted file mode 100644
index c40a5a46d..000000000
--- a/gfx/overworld/188.2bpp
+++ /dev/null
diff --git a/gfx/overworld/189.2bpp b/gfx/overworld/189.2bpp
deleted file mode 100644
index 57c15cb44..000000000
--- a/gfx/overworld/189.2bpp
+++ /dev/null
@@ -1 +0,0 @@
- ?0/BO}/2��0����B���N	4/	�Nr���,��8p��``
-\ No newline at end of file
diff --git a/gfx/overworld/190.2bpp b/gfx/overworld/190.2bpp
deleted file mode 100644
index 7fed32efd..000000000
--- a/gfx/overworld/190.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
- ? ?PoD{@��0����
-�"�� ? ?	��(�,�X����``
-\ No newline at end of file
diff --git a/gfx/overworld/191.2bpp b/gfx/overworld/191.2bpp
deleted file mode 100644
index b192290eb..000000000
--- a/gfx/overworld/191.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-*=(?<7��0��D�����
-B�����H��p��@���
-\ No newline at end of file
diff --git a/gfx/overworld/192.2bpp b/gfx/overworld/192.2bpp
deleted file mode 100644
index a707aa589..000000000
--- a/gfx/overworld/192.2bpp
+++ /dev/null
diff --git a/gfx/overworld/193.2bpp b/gfx/overworld/193.2bpp
deleted file mode 100644
index 6534d27c4..000000000
--- a/gfx/overworld/193.2bpp
+++ /dev/null
diff --git a/gfx/overworld/194.2bpp b/gfx/overworld/194.2bpp
deleted file mode 100644
index 9a015220c..000000000
--- a/gfx/overworld/194.2bpp
+++ /dev/null
diff --git a/gfx/overworld/195.2bpp b/gfx/overworld/195.2bpp
deleted file mode 100644
index ab4521a82..000000000
--- a/gfx/overworld/195.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-?9Q@oR�����������
-��J?2>9OI??�L|�����������pp
-\ No newline at end of file
diff --git a/gfx/overworld/196.2bpp b/gfx/overworld/196.2bpp
deleted file mode 100644
index 8500d5dca..000000000
--- a/gfx/overworld/196.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-??_Oo_����������������;7</KX??��<����������pp
-\ No newline at end of file
diff --git a/gfx/overworld/197.2bpp b/gfx/overworld/197.2bpp
deleted file mode 100644
index 8e12fb873..000000000
--- a/gfx/overworld/197.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-???9��������������|�
-��0���P�p�`����
-\ No newline at end of file
diff --git a/gfx/overworld/198.2bpp b/gfx/overworld/198.2bpp
deleted file mode 100644
index 99e507cc3..000000000
--- a/gfx/overworld/198.2bpp
+++ /dev/null
diff --git a/gfx/overworld/199.2bpp b/gfx/overworld/199.2bpp
deleted file mode 100644
index a224c56e8..000000000
--- a/gfx/overworld/199.2bpp
+++ /dev/null
diff --git a/gfx/overworld/200.2bpp b/gfx/overworld/200.2bpp
deleted file mode 100644
index d9a24e925..000000000
--- a/gfx/overworld/200.2bpp
+++ /dev/null
diff --git a/gfx/overworld/201.2bpp b/gfx/overworld/201.2bpp
deleted file mode 100644
index 6f59d0864..000000000
--- a/gfx/overworld/201.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-&;'=/8��`����d����H?'?$�Hx����$X����``
-\ No newline at end of file
diff --git a/gfx/overworld/202.2bpp b/gfx/overworld/202.2bpp
deleted file mode 100644
index 8ffcfa047..000000000
--- a/gfx/overworld/202.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-
-$?$?$?"?��`�ph�$�$�$�D�?/?,������4X����``
-\ No newline at end of file
diff --git a/gfx/overworld/203.2bpp b/gfx/overworld/203.2bpp
deleted file mode 100644
index e25e08a08..000000000
--- a/gfx/overworld/203.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-<'Roq9/=/?+��x�<�������? ���h@����`�����
-\ No newline at end of file
diff --git a/gfx/overworld/204.2bpp b/gfx/overworld/204.2bpp
deleted file mode 100644
index cf5c60d8c..000000000
--- a/gfx/overworld/204.2bpp
+++ /dev/null
diff --git a/gfx/overworld/205.2bpp b/gfx/overworld/205.2bpp
deleted file mode 100644
index 5b3498e51..000000000
--- a/gfx/overworld/205.2bpp
+++ /dev/null
diff --git a/gfx/overworld/206.2bpp b/gfx/overworld/206.2bpp
deleted file mode 100644
index d2208547c..000000000
--- a/gfx/overworld/206.2bpp
+++ /dev/null
diff --git a/gfx/overworld/207.2bpp b/gfx/overworld/207.2bpp
deleted file mode 100644
index ea0b05a3f..000000000
--- a/gfx/overworld/207.2bpp
+++ /dev/null
diff --git a/gfx/overworld/208.2bpp b/gfx/overworld/208.2bpp
deleted file mode 100644
index fa3ea9f18..000000000
--- a/gfx/overworld/208.2bpp
+++ /dev/null
diff --git a/gfx/overworld/209.2bpp b/gfx/overworld/209.2bpp
deleted file mode 100644
index 3aa7aec02..000000000
--- a/gfx/overworld/209.2bpp
+++ /dev/null
diff --git a/gfx/overworld/210.2bpp b/gfx/overworld/210.2bpp
deleted file mode 100644
index a6b38c66c..000000000
--- a/gfx/overworld/210.2bpp
+++ /dev/null
diff --git a/gfx/overworld/211.2bpp b/gfx/overworld/211.2bpp
deleted file mode 100644
index 08975362a..000000000
--- a/gfx/overworld/211.2bpp
+++ /dev/null
diff --git a/gfx/overworld/212.2bpp b/gfx/overworld/212.2bpp
deleted file mode 100644
index c08fe616c..000000000
--- a/gfx/overworld/212.2bpp
+++ /dev/null
diff --git a/gfx/overworld/213.2bpp b/gfx/overworld/213.2bpp
deleted file mode 100644
index 5f05f3c53..000000000
--- a/gfx/overworld/213.2bpp
+++ /dev/null
diff --git a/gfx/overworld/214.2bpp b/gfx/overworld/214.2bpp
deleted file mode 100644
index 1ccd28515..000000000
--- a/gfx/overworld/214.2bpp
+++ /dev/null
diff --git a/gfx/overworld/215.2bpp b/gfx/overworld/215.2bpp
deleted file mode 100644
index eaf3cd733..000000000
--- a/gfx/overworld/215.2bpp
+++ /dev/null
diff --git a/gfx/overworld/216.2bpp b/gfx/overworld/216.2bpp
deleted file mode 100644
index 540c55149..000000000
--- a/gfx/overworld/216.2bpp
+++ /dev/null
diff --git a/gfx/overworld/217.2bpp b/gfx/overworld/217.2bpp
deleted file mode 100644
index c163c1b82..000000000
--- a/gfx/overworld/217.2bpp
+++ /dev/null
diff --git a/gfx/overworld/218.2bpp b/gfx/overworld/218.2bpp
deleted file mode 100644
index 639641c21..000000000
--- a/gfx/overworld/218.2bpp
+++ /dev/null
diff --git a/gfx/overworld/219.2bpp b/gfx/overworld/219.2bpp
deleted file mode 100644
index ca286ffd8..000000000
--- a/gfx/overworld/219.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-????_~ToR�����������~�*�J?2?'=&�Lx���d�����xx
-\ No newline at end of file
diff --git a/gfx/overworld/220.2bpp b/gfx/overworld/220.2bpp
deleted file mode 100644
index 6a701b642..000000000
--- a/gfx/overworld/220.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-????__o_����������������;7?/8/���8����x���pp
-\ No newline at end of file
diff --git a/gfx/overworld/221.2bpp b/gfx/overworld/221.2bpp
deleted file mode 100644
index 4ef660895..000000000
--- a/gfx/overworld/221.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-??7?+7�������������.�.��8���0�0������
-\ No newline at end of file
diff --git a/gfx/overworld/222.2bpp b/gfx/overworld/222.2bpp
deleted file mode 100644
index 78e040064..000000000
--- a/gfx/overworld/222.2bpp
+++ /dev/null
diff --git a/gfx/overworld/223.2bpp b/gfx/overworld/223.2bpp
deleted file mode 100644
index 9ba5dfa58..000000000
--- a/gfx/overworld/223.2bpp
+++ /dev/null
diff --git a/gfx/overworld/224.2bpp b/gfx/overworld/224.2bpp
deleted file mode 100644
index dff320828..000000000
--- a/gfx/overworld/224.2bpp
+++ /dev/null
diff --git a/gfx/overworld/225.2bpp b/gfx/overworld/225.2bpp
deleted file mode 100644
index 5d701a4b0..000000000
--- a/gfx/overworld/225.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-??7=?(?"���p���������D	?'�Hp�������0���``
-\ No newline at end of file
diff --git a/gfx/overworld/226.2bpp b/gfx/overworld/226.2bpp
deleted file mode 100644
index f399230a9..000000000
--- a/gfx/overworld/226.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-
-;?;?;?<?�@������������<�?7?'������������``
-\ No newline at end of file
diff --git a/gfx/overworld/227.2bpp b/gfx/overworld/227.2bpp
deleted file mode 100644
index b6019dc51..000000000
--- a/gfx/overworld/227.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-7?=7?1������������������0��`��p������
-\ No newline at end of file
diff --git a/gfx/overworld/228.2bpp b/gfx/overworld/228.2bpp
deleted file mode 100644
index dea793fdb..000000000
--- a/gfx/overworld/228.2bpp
+++ /dev/null
diff --git a/gfx/overworld/229.2bpp b/gfx/overworld/229.2bpp
deleted file mode 100644
index a80e8b477..000000000
--- a/gfx/overworld/229.2bpp
+++ /dev/null
diff --git a/gfx/overworld/230.2bpp b/gfx/overworld/230.2bpp
deleted file mode 100644
index 8f59fcb6b..000000000
--- a/gfx/overworld/230.2bpp
+++ /dev/null
diff --git a/gfx/overworld/231.2bpp b/gfx/overworld/231.2bpp
deleted file mode 100644
index 20cb7cb28..000000000
--- a/gfx/overworld/231.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-3?5?x������8��������O����woyO0?�O����������
-\ No newline at end of file
diff --git a/gfx/overworld/232.2bpp b/gfx/overworld/232.2bpp
deleted file mode 100644
index 42e1f6d96..000000000
--- a/gfx/overworld/232.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-??��������������������6?9/��l���x������
-\ No newline at end of file
diff --git a/gfx/overworld/233.2bpp b/gfx/overworld/233.2bpp
deleted file mode 100644
index f1c3dafd2..000000000
--- a/gfx/overworld/233.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-1>.?���������������
-
-�~����<������
-\ No newline at end of file
diff --git a/gfx/overworld/234.2bpp b/gfx/overworld/234.2bpp
deleted file mode 100644
index 0adea6fdb..000000000
--- a/gfx/overworld/234.2bpp
+++ /dev/null
diff --git a/gfx/overworld/235.2bpp b/gfx/overworld/235.2bpp
deleted file mode 100644
index a52f0e67a..000000000
--- a/gfx/overworld/235.2bpp
+++ /dev/null
diff --git a/gfx/overworld/236.2bpp b/gfx/overworld/236.2bpp
deleted file mode 100644
index db40d4a34..000000000
--- a/gfx/overworld/236.2bpp
+++ /dev/null
diff --git a/gfx/overworld/237.2bpp b/gfx/overworld/237.2bpp
deleted file mode 100644
index 849619b39..000000000
--- a/gfx/overworld/237.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-(7.?w}������0���t����_Or?8>'�N���|����0���
-\ No newline at end of file
diff --git a/gfx/overworld/238.2bpp b/gfx/overworld/238.2bpp
deleted file mode 100644
index 1edcafc05..000000000
--- a/gfx/overworld/238.2bpp
+++ /dev/null
@@ -1 +0,0 @@
- ?(7r}������0����N���@"??'�D�8������0���
-\ No newline at end of file
diff --git a/gfx/overworld/239.2bpp b/gfx/overworld/239.2bpp
deleted file mode 100644
index d607a540e..000000000
--- a/gfx/overworld/239.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-'?.;/9��0��D����"�
-2������0� �����
-\ No newline at end of file
diff --git a/gfx/overworld/240.2bpp b/gfx/overworld/240.2bpp
deleted file mode 100644
index 7ca9be649..000000000
--- a/gfx/overworld/240.2bpp
+++ /dev/null
diff --git a/gfx/overworld/241.2bpp b/gfx/overworld/241.2bpp
deleted file mode 100644
index 563725478..000000000
--- a/gfx/overworld/241.2bpp
+++ /dev/null
@@ -1 +0,0 @@
- ?(7r}������0����N���@"??'�D�8���������
-\ No newline at end of file
diff --git a/gfx/overworld/242.2bpp b/gfx/overworld/242.2bpp
deleted file mode 100644
index 3b958ed24..000000000
--- a/gfx/overworld/242.2bpp
+++ /dev/null
diff --git a/gfx/overworld/243.2bpp b/gfx/overworld/243.2bpp
deleted file mode 100644
index 5daa2515b..000000000
--- a/gfx/overworld/243.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-??=?:=oPR����������\��
-�J?2>9O{O??�L|�������8���pp
-\ No newline at end of file
diff --git a/gfx/overworld/244.2bpp b/gfx/overworld/244.2bpp
deleted file mode 100644
index dd4f929af..000000000
--- a/gfx/overworld/244.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-????_wO����������������=3?<w__8?���<���������pp
-\ No newline at end of file
diff --git a/gfx/overworld/245.2bpp b/gfx/overworld/245.2bpp
deleted file mode 100644
index c0672c2e3..000000000
--- a/gfx/overworld/245.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-??7?+7������������������p���0�0�� ���
-\ No newline at end of file
diff --git a/gfx/overworld/246.2bpp b/gfx/overworld/246.2bpp
deleted file mode 100644
index c5df3da28..000000000
--- a/gfx/overworld/246.2bpp
+++ /dev/null
diff --git a/gfx/overworld/247.2bpp b/gfx/overworld/247.2bpp
deleted file mode 100644
index 3caf73502..000000000
--- a/gfx/overworld/247.2bpp
+++ /dev/null
diff --git a/gfx/overworld/248.2bpp b/gfx/overworld/248.2bpp
deleted file mode 100644
index cea1f6ae1..000000000
--- a/gfx/overworld/248.2bpp
+++ /dev/null
diff --git a/gfx/overworld/249.2bpp b/gfx/overworld/249.2bpp
deleted file mode 100644
index 452cfaf1c..000000000
--- a/gfx/overworld/249.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-$?)?[~ToR��0��$����~�*�J?2>9O~I9?�L|���~���x���pp
-\ No newline at end of file
diff --git a/gfx/overworld/250.2bpp b/gfx/overworld/250.2bpp
deleted file mode 100644
index 26e8e6936..000000000
--- a/gfx/overworld/250.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
- ? ?Pp_d_��0����
-��&�:7?<w_~Y9?\��<��~���x���pp
-\ No newline at end of file
diff --git a/gfx/overworld/251.2bpp b/gfx/overworld/251.2bpp
deleted file mode 100644
index 37bf474c5..000000000
--- a/gfx/overworld/251.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-(?4?*7��0��$������.�.��8���0�0������
-\ No newline at end of file
diff --git a/gfx/overworld/252.2bpp b/gfx/overworld/252.2bpp
deleted file mode 100644
index 4e74d55a4..000000000
--- a/gfx/overworld/252.2bpp
+++ /dev/null
diff --git a/gfx/overworld/253.2bpp b/gfx/overworld/253.2bpp
deleted file mode 100644
index c2692a653..000000000
--- a/gfx/overworld/253.2bpp
+++ /dev/null
diff --git a/gfx/overworld/254.2bpp b/gfx/overworld/254.2bpp
deleted file mode 100644
index 09136438a..000000000
--- a/gfx/overworld/254.2bpp
+++ /dev/null
diff --git a/gfx/overworld/255.2bpp b/gfx/overworld/255.2bpp
deleted file mode 100644
index 9017fd98b..000000000
--- a/gfx/overworld/255.2bpp
+++ /dev/null
diff --git a/gfx/overworld/256.2bpp b/gfx/overworld/256.2bpp
deleted file mode 100644
index 3fdaf8dcf..000000000
--- a/gfx/overworld/256.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-?0pPF?0�������
-�b�~M����p'8!?">~���������D|xx
-\ No newline at end of file
diff --git a/gfx/overworld/257.2bpp b/gfx/overworld/257.2bpp
deleted file mode 100644
index b866a38a7..000000000
--- a/gfx/overworld/257.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-??_O?0�������������H����p ?!?">��������D|xx
-\ No newline at end of file
diff --git a/gfx/overworld/258.2bpp b/gfx/overworld/258.2bpp
deleted file mode 100644
index 7a064dea4..000000000
--- a/gfx/overworld/258.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-�����<�|�<��
-����(�(�(�0����
-\ No newline at end of file
diff --git a/gfx/overworld/259.2bpp b/gfx/overworld/259.2bpp
deleted file mode 100644
index 399d9dfd8..000000000
--- a/gfx/overworld/259.2bpp
+++ /dev/null
diff --git a/gfx/overworld/260.2bpp b/gfx/overworld/260.2bpp
deleted file mode 100644
index 6404cd833..000000000
--- a/gfx/overworld/260.2bpp
+++ /dev/null
diff --git a/gfx/overworld/261.2bpp b/gfx/overworld/261.2bpp
deleted file mode 100644
index 725c58b1b..000000000
--- a/gfx/overworld/261.2bpp
+++ /dev/null
diff --git a/gfx/overworld/262.2bpp b/gfx/overworld/262.2bpp
deleted file mode 100644
index c9c6bae20..000000000
--- a/gfx/overworld/262.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-;>?8���������|��H�H	?/?(?<p���������<�8��
-\ No newline at end of file
diff --git a/gfx/overworld/263.2bpp b/gfx/overworld/263.2bpp
deleted file mode 100644
index 10b7652b2..000000000
--- a/gfx/overworld/263.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-;?=?��p��������x���?/_X~���������~����
-\ No newline at end of file
diff --git a/gfx/overworld/264.2bpp b/gfx/overworld/264.2bpp
deleted file mode 100644
index f81ae6802..000000000
--- a/gfx/overworld/264.2bpp
+++ /dev/null
@@ -1 +0,0 @@
->?=3�����������������x�p�����������
-\ No newline at end of file
diff --git a/gfx/overworld/265.2bpp b/gfx/overworld/265.2bpp
deleted file mode 100644
index 0bfac2b8f..000000000
--- a/gfx/overworld/265.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-;>?8���������|��H�H	?/?(?<p���������<�8��
-\ No newline at end of file
diff --git a/gfx/overworld/266.2bpp b/gfx/overworld/266.2bpp
deleted file mode 100644
index 3566c26a9..000000000
--- a/gfx/overworld/266.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-;?=?��p��������x���?/_X~���������x���
-\ No newline at end of file
diff --git a/gfx/overworld/267.2bpp b/gfx/overworld/267.2bpp
deleted file mode 100644
index 1d1815f27..000000000
--- a/gfx/overworld/267.2bpp
+++ /dev/null
@@ -1 +0,0 @@
->?=3����������������	
-�x�p�������|�|��
-\ No newline at end of file
diff --git a/gfx/overworld/268.2bpp b/gfx/overworld/268.2bpp
deleted file mode 100644
index 1919f8a58..000000000
--- a/gfx/overworld/268.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-
-/0VIoV��p��(���j���j>1-:C|S|?>8???|��\�>�>�|����
-\ No newline at end of file
diff --git a/gfx/overworld/269.2bpp b/gfx/overworld/269.2bpp
deleted file mode 100644
index 3239223f1..000000000
--- a/gfx/overworld/269.2bpp
+++ /dev/null
@@ -1,3 +0,0 @@
-/0PP@���0(����
-�
-�?0_xWNs>38???����r�|�8����
-\ No newline at end of file
diff --git a/gfx/overworld/270.2bpp b/gfx/overworld/270.2bpp
deleted file mode 100644
index afa1d75b7..000000000
--- a/gfx/overworld/270.2bpp
+++ /dev/null
@@ -1 +0,0 @@
->!?,?3?,���0x���<�|���\'8;$:%�h����������
-\ No newline at end of file
diff --git a/gfx/overworld/271.2bpp b/gfx/overworld/271.2bpp
deleted file mode 100644
index f51a147a4..000000000
--- a/gfx/overworld/271.2bpp
+++ /dev/null
diff --git a/gfx/overworld/272.2bpp b/gfx/overworld/272.2bpp
deleted file mode 100644
index 980034d1a..000000000
--- a/gfx/overworld/272.2bpp
+++ /dev/null
diff --git a/gfx/overworld/273.2bpp b/gfx/overworld/273.2bpp
deleted file mode 100644
index e61b61fda..000000000
--- a/gfx/overworld/273.2bpp
+++ /dev/null
diff --git a/gfx/overworld/274.2bpp b/gfx/overworld/274.2bpp
deleted file mode 100644
index fb71710ae..000000000
--- a/gfx/overworld/274.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-=&wXoPR���0�X���d��
-�J?0?9O~O4;����~��,��8�8��
-\ No newline at end of file
diff --git a/gfx/overworld/275.2bpp b/gfx/overworld/275.2bpp
deleted file mode 100644
index 423307cf2..000000000
--- a/gfx/overworld/275.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-/2dboq���0����L�&�F��?0_xO^s?2����z��Lx����
-\ No newline at end of file
diff --git a/gfx/overworld/276.2bpp b/gfx/overworld/276.2bpp
deleted file mode 100644
index b03684ec0..000000000
--- a/gfx/overworld/276.2bpp
+++ /dev/null
diff --git a/gfx/overworld/277.2bpp b/gfx/overworld/277.2bpp
deleted file mode 100644
index cb936b2af..000000000
--- a/gfx/overworld/277.2bpp
+++ /dev/null
diff --git a/gfx/overworld/278.2bpp b/gfx/overworld/278.2bpp
deleted file mode 100644
index 7ce7d86a5..000000000
--- a/gfx/overworld/278.2bpp
+++ /dev/null
diff --git a/gfx/overworld/279.2bpp b/gfx/overworld/279.2bpp
deleted file mode 100644
index 5d928cb13..000000000
--- a/gfx/overworld/279.2bpp
+++ /dev/null
diff --git a/gfx/overworld/280.2bpp b/gfx/overworld/280.2bpp
deleted file mode 100644
index 78cecc43d..000000000
--- a/gfx/overworld/280.2bpp
+++ /dev/null
diff --git a/gfx/overworld/281.2bpp b/gfx/overworld/281.2bpp
deleted file mode 100644
index 308fe5c0f..000000000
--- a/gfx/overworld/281.2bpp
+++ /dev/null
diff --git a/gfx/overworld/282.2bpp b/gfx/overworld/282.2bpp
deleted file mode 100644
index 35111ce19..000000000
--- a/gfx/overworld/282.2bpp
+++ /dev/null
diff --git a/gfx/overworld/283.2bpp b/gfx/overworld/283.2bpp
deleted file mode 100644
index 45843cac2..000000000
--- a/gfx/overworld/283.2bpp
+++ /dev/null
diff --git a/gfx/overworld/284.2bpp b/gfx/overworld/284.2bpp
deleted file mode 100644
index ea8896e62..000000000
--- a/gfx/overworld/284.2bpp
+++ /dev/null
diff --git a/gfx/overworld/285.2bpp b/gfx/overworld/285.2bpp
deleted file mode 100644
index d52cfc08c..000000000
--- a/gfx/overworld/285.2bpp
+++ /dev/null
diff --git a/gfx/overworld/286.2bpp b/gfx/overworld/286.2bpp
deleted file mode 100644
index fcf94a0e2..000000000
--- a/gfx/overworld/286.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-C?>��������`������|?8RoR?0?'<$��J�J�x���<$
-\ No newline at end of file
diff --git a/gfx/overworld/287.2bpp b/gfx/overworld/287.2bpp
deleted file mode 100644
index 16a2499fd..000000000
--- a/gfx/overworld/287.2bpp
+++ /dev/null
diff --git a/gfx/overworld/288.2bpp b/gfx/overworld/288.2bpp
deleted file mode 100644
index 2e0e66425..000000000
--- a/gfx/overworld/288.2bpp
+++ /dev/null
diff --git a/gfx/overworld/289.2bpp b/gfx/overworld/289.2bpp
deleted file mode 100644
index afce6220d..000000000
--- a/gfx/overworld/289.2bpp
+++ /dev/null
diff --git a/gfx/overworld/290.2bpp b/gfx/overworld/290.2bpp
deleted file mode 100644
index e1412dec4..000000000
--- a/gfx/overworld/290.2bpp
+++ /dev/null
diff --git a/gfx/overworld/291.2bpp b/gfx/overworld/291.2bpp
deleted file mode 100644
index 8b4a71d40..000000000
--- a/gfx/overworld/291.2bpp
+++ /dev/null
diff --git a/gfx/overworld/292.2bpp b/gfx/overworld/292.2bpp
deleted file mode 100644
index cd74cba2a..000000000
--- a/gfx/overworld/292.2bpp
+++ /dev/null
diff --git a/gfx/overworld/293.2bpp b/gfx/overworld/293.2bpp
deleted file mode 100644
index 61e28f3ff..000000000
--- a/gfx/overworld/293.2bpp
+++ /dev/null
diff --git a/gfx/overworld/294.2bpp b/gfx/overworld/294.2bpp
deleted file mode 100644
index 3669253bf..000000000
--- a/gfx/overworld/294.2bpp
+++ /dev/null
diff --git a/gfx/overworld/295.2bpp b/gfx/overworld/295.2bpp
deleted file mode 100644
index 8cebe23c9..000000000
--- a/gfx/overworld/295.2bpp
+++ /dev/null
diff --git a/gfx/overworld/296.2bpp b/gfx/overworld/296.2bpp
deleted file mode 100644
index 3402c244b..000000000
--- a/gfx/overworld/296.2bpp
+++ /dev/null
diff --git a/gfx/overworld/297.2bpp b/gfx/overworld/297.2bpp
deleted file mode 100644
index bc509ca0d..000000000
--- a/gfx/overworld/297.2bpp
+++ /dev/null
diff --git a/gfx/overworld/298.2bpp b/gfx/overworld/298.2bpp
deleted file mode 100644
index 629e9dddd..000000000
--- a/gfx/overworld/298.2bpp
+++ /dev/null
diff --git a/gfx/overworld/299.2bpp b/gfx/overworld/299.2bpp
deleted file mode 100644
index 1f057ba7b..000000000
--- a/gfx/overworld/299.2bpp
+++ /dev/null
diff --git a/gfx/overworld/300.2bpp b/gfx/overworld/300.2bpp
deleted file mode 100644
index c5fbd6e63..000000000
--- a/gfx/overworld/300.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-?????7PF�������������
-�b?2>9OO??�L|�����������pp
-\ No newline at end of file
diff --git a/gfx/overworld/301.2bpp b/gfx/overworld/301.2bpp
deleted file mode 100644
index 0e64d9830..000000000
--- a/gfx/overworld/301.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-????_O����������������?0;<__??��<����������pp
-\ No newline at end of file
diff --git a/gfx/overworld/302.2bpp b/gfx/overworld/302.2bpp
deleted file mode 100644
index eff88b69a..000000000
--- a/gfx/overworld/302.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-????������������������`���0�0������
-\ No newline at end of file
diff --git a/gfx/overworld/303.2bpp b/gfx/overworld/303.2bpp
deleted file mode 100644
index 226246cf0..000000000
--- a/gfx/overworld/303.2bpp
+++ /dev/null
diff --git a/gfx/overworld/304.2bpp b/gfx/overworld/304.2bpp
deleted file mode 100644
index 29de8c710..000000000
--- a/gfx/overworld/304.2bpp
+++ /dev/null
diff --git a/gfx/overworld/305.2bpp b/gfx/overworld/305.2bpp
deleted file mode 100644
index fd783cfbd..000000000
--- a/gfx/overworld/305.2bpp
+++ /dev/null
diff --git a/gfx/overworld/306.2bpp b/gfx/overworld/306.2bpp
deleted file mode 100644
index 5d6b7008e..000000000
--- a/gfx/overworld/306.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-????/?/8_r��������������N_r>9?'?'	�N|����������``
-\ No newline at end of file
diff --git a/gfx/overworld/307.2bpp b/gfx/overworld/307.2bpp
deleted file mode 100644
index 2940aed6b..000000000
--- a/gfx/overworld/307.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-????/? ?@��������������@ ?0??/	����������``
-\ No newline at end of file
diff --git a/gfx/overworld/308.2bpp b/gfx/overworld/308.2bpp
deleted file mode 100644
index b46c5e466..000000000
--- a/gfx/overworld/308.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-????�����������������������8�0������
-\ No newline at end of file
diff --git a/gfx/overworld/309.2bpp b/gfx/overworld/309.2bpp
deleted file mode 100644
index a8454ba43..000000000
--- a/gfx/overworld/309.2bpp
+++ /dev/null
diff --git a/gfx/overworld/310.2bpp b/gfx/overworld/310.2bpp
deleted file mode 100644
index 1a74c6312..000000000
--- a/gfx/overworld/310.2bpp
+++ /dev/null
diff --git a/gfx/overworld/311.2bpp b/gfx/overworld/311.2bpp
deleted file mode 100644
index b9b067212..000000000
--- a/gfx/overworld/311.2bpp
+++ /dev/null
diff --git a/gfx/overworld/312.2bpp b/gfx/overworld/312.2bpp
deleted file mode 100644
index 61a79f9b0..000000000
--- a/gfx/overworld/312.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-/??2?2�������������L�LNyGO{?4r������,��0����
-\ No newline at end of file
diff --git a/gfx/overworld/313.2bpp b/gfx/overworld/313.2bpp
deleted file mode 100644
index def1fda6d..000000000
--- a/gfx/overworld/313.2bpp
+++ /dev/null
diff --git a/gfx/overworld/314.2bpp b/gfx/overworld/314.2bpp
deleted file mode 100644
index 5e0d88ffc..000000000
--- a/gfx/overworld/314.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-?0?8?8?0���������x�x
-������|�8�`����
-\ No newline at end of file
diff --git a/gfx/overworld/315.2bpp b/gfx/overworld/315.2bpp
deleted file mode 100644
index 95657b08e..000000000
--- a/gfx/overworld/315.2bpp
+++ /dev/null
@@ -1 +0,0 @@
->1.9g��������|�t�����OOr?8�N������(��0��
-\ No newline at end of file
diff --git a/gfx/overworld/316.2bpp b/gfx/overworld/316.2bpp
deleted file mode 100644
index b5bbfa51a..000000000
--- a/gfx/overworld/316.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-?0/8g��������������@1?������ � ��0��
-\ No newline at end of file
diff --git a/gfx/overworld/317.2bpp b/gfx/overworld/317.2bpp
deleted file mode 100644
index 3630b77f4..000000000
--- a/gfx/overworld/317.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-������0�����
-������ � ��0��
-\ No newline at end of file
diff --git a/gfx/overworld/318.2bpp b/gfx/overworld/318.2bpp
deleted file mode 100644
index fc23d9d08..000000000
--- a/gfx/overworld/318.2bpp
+++ /dev/null
diff --git a/gfx/overworld/319.2bpp b/gfx/overworld/319.2bpp
deleted file mode 100644
index c56be7eb4..000000000
--- a/gfx/overworld/319.2bpp
+++ /dev/null
diff --git a/gfx/overworld/320.2bpp b/gfx/overworld/320.2bpp
deleted file mode 100644
index 4599b2e00..000000000
--- a/gfx/overworld/320.2bpp
+++ /dev/null
diff --git a/gfx/overworld/321.2bpp b/gfx/overworld/321.2bpp
deleted file mode 100644
index 9854c7440..000000000
--- a/gfx/overworld/321.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-????_~PoV�����������
-�j?0??|KxO8?�x���>�����pp
-\ No newline at end of file
diff --git a/gfx/overworld/322.2bpp b/gfx/overworld/322.2bpp
deleted file mode 100644
index 78c8c9e5f..000000000
--- a/gfx/overworld/322.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-????__g_����������������;7?<w_r_1?���<��N���H���pp
-\ No newline at end of file
diff --git a/gfx/overworld/323.2bpp b/gfx/overworld/323.2bpp
deleted file mode 100644
index 4bc16bb6d..000000000
--- a/gfx/overworld/323.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-??7?+7�������������.�.��8���0�0������
-\ No newline at end of file
diff --git a/gfx/overworld/324.2bpp b/gfx/overworld/324.2bpp
deleted file mode 100644
index 961002239..000000000
--- a/gfx/overworld/324.2bpp
+++ /dev/null
diff --git a/gfx/overworld/325.2bpp b/gfx/overworld/325.2bpp
deleted file mode 100644
index f90cefc93..000000000
--- a/gfx/overworld/325.2bpp
+++ /dev/null
diff --git a/gfx/overworld/326.2bpp b/gfx/overworld/326.2bpp
deleted file mode 100644
index 15d301d66..000000000
--- a/gfx/overworld/326.2bpp
+++ /dev/null
diff --git a/gfx/overworld/327.2bpp b/gfx/overworld/327.2bpp
deleted file mode 100644
index aff689002..000000000
--- a/gfx/overworld/327.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-?0voP~A�����8���n�
-~�/0X���`8???���������xx
-\ No newline at end of file
diff --git a/gfx/overworld/328.2bpp b/gfx/overworld/328.2bpp
deleted file mode 100644
index c7c550244..000000000
--- a/gfx/overworld/328.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-??_O����������������?3X��`0???�����7�����xx
-\ No newline at end of file
diff --git a/gfx/overworld/329.2bpp b/gfx/overworld/329.2bpp
deleted file mode 100644
index a055a96f0..000000000
--- a/gfx/overworld/329.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-��x��|�~�~���(7!?!?�|�����0������
-\ No newline at end of file
diff --git a/gfx/overworld/330.2bpp b/gfx/overworld/330.2bpp
deleted file mode 100644
index 93be2a5ee..000000000
--- a/gfx/overworld/330.2bpp
+++ /dev/null
diff --git a/gfx/overworld/331.2bpp b/gfx/overworld/331.2bpp
deleted file mode 100644
index be21644e8..000000000
--- a/gfx/overworld/331.2bpp
+++ /dev/null
diff --git a/gfx/overworld/332.2bpp b/gfx/overworld/332.2bpp
deleted file mode 100644
index e0b487463..000000000
--- a/gfx/overworld/332.2bpp
+++ /dev/null
diff --git a/gfx/overworld/333.2bpp b/gfx/overworld/333.2bpp
deleted file mode 100644
index b0890cb82..000000000
--- a/gfx/overworld/333.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-p��pOoR���0�������J?0>9wO~I6?�|���~�l����pp
-\ No newline at end of file
diff --git a/gfx/overworld/334.2bpp b/gfx/overworld/334.2bpp
deleted file mode 100644
index 26e6a0029..000000000
--- a/gfx/overworld/334.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-p��pOoW���0��������?3?8WwX0?����������pp
-\ No newline at end of file
diff --git a/gfx/overworld/335.2bpp b/gfx/overworld/335.2bpp
deleted file mode 100644
index 130cc3217..000000000
--- a/gfx/overworld/335.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-?0pO?0����������,��p�����0� ����
-\ No newline at end of file
diff --git a/gfx/overworld/336.2bpp b/gfx/overworld/336.2bpp
deleted file mode 100644
index 758076642..000000000
--- a/gfx/overworld/336.2bpp
+++ /dev/null
diff --git a/gfx/overworld/337.2bpp b/gfx/overworld/337.2bpp
deleted file mode 100644
index 801f94e0a..000000000
--- a/gfx/overworld/337.2bpp
+++ /dev/null
diff --git a/gfx/overworld/338.2bpp b/gfx/overworld/338.2bpp
deleted file mode 100644
index 5434e6d57..000000000
--- a/gfx/overworld/338.2bpp
+++ /dev/null
diff --git a/gfx/overworld/339.2bpp b/gfx/overworld/339.2bpp
deleted file mode 100644
index 4fbce5e20..000000000
--- a/gfx/overworld/339.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-?0VIoY�����x���j����?6>9{OI?0�l|���������pp
-\ No newline at end of file
diff --git a/gfx/overworld/340.2bpp b/gfx/overworld/340.2bpp
deleted file mode 100644
index 94524227c..000000000
--- a/gfx/overworld/340.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-??___����������������?7?8{_P?0������
-�����pp
-\ No newline at end of file
diff --git a/gfx/overworld/341.2bpp b/gfx/overworld/341.2bpp
deleted file mode 100644
index 8d86cd86e..000000000
--- a/gfx/overworld/341.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-������������������`���0�0������
-\ No newline at end of file
diff --git a/gfx/overworld/342.2bpp b/gfx/overworld/342.2bpp
deleted file mode 100644
index 58f0f33cd..000000000
--- a/gfx/overworld/342.2bpp
+++ /dev/null
diff --git a/gfx/overworld/343.2bpp b/gfx/overworld/343.2bpp
deleted file mode 100644
index 10d83bc57..000000000
--- a/gfx/overworld/343.2bpp
+++ /dev/null
diff --git a/gfx/overworld/344.2bpp b/gfx/overworld/344.2bpp
deleted file mode 100644
index 80bb0b180..000000000
--- a/gfx/overworld/344.2bpp
+++ /dev/null
diff --git a/gfx/overworld/345.2bpp b/gfx/overworld/345.2bpp
deleted file mode 100644
index cc18fab5b..000000000
--- a/gfx/overworld/345.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-'?'?}x?2�����8��������L>9g_-63/-6�H|����l���l�x��
-\ No newline at end of file
diff --git a/gfx/overworld/346.2bpp b/gfx/overworld/346.2bpp
deleted file mode 100644
index 2aa4166b5..000000000
--- a/gfx/overworld/346.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-/?/??7���0������������?8g_-73/-7��������������
-\ No newline at end of file
diff --git a/gfx/overworld/347.2bpp b/gfx/overworld/347.2bpp
deleted file mode 100644
index d74a4e227..000000000
--- a/gfx/overworld/347.2bpp
+++ /dev/null
@@ -1,3 +0,0 @@
-���<����>�>�����
-
-���8�<��|D��x��
-\ No newline at end of file
diff --git a/gfx/overworld/348.2bpp b/gfx/overworld/348.2bpp
deleted file mode 100644
index 69a2c281f..000000000
--- a/gfx/overworld/348.2bpp
+++ /dev/null
diff --git a/gfx/overworld/349.2bpp b/gfx/overworld/349.2bpp
deleted file mode 100644
index 3a6677e81..000000000
--- a/gfx/overworld/349.2bpp
+++ /dev/null
diff --git a/gfx/overworld/350.2bpp b/gfx/overworld/350.2bpp
deleted file mode 100644
index 5ec7794aa..000000000
--- a/gfx/overworld/350.2bpp
+++ /dev/null
diff --git a/gfx/overworld/351.2bpp b/gfx/overworld/351.2bpp
deleted file mode 100644
index 2ddda8073..000000000
--- a/gfx/overworld/351.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-
-/0P@oV���p����
-��j?0?9N{O8?����r���������
-\ No newline at end of file
diff --git a/gfx/overworld/352.2bpp b/gfx/overworld/352.2bpp
deleted file mode 100644
index 9fd02b5ac..000000000
--- a/gfx/overworld/352.2bpp
+++ /dev/null
@@ -1,3 +0,0 @@
-/0PP@���0����
-�
-�78?<{_x_0?��<����������
-\ No newline at end of file
diff --git a/gfx/overworld/353.2bpp b/gfx/overworld/353.2bpp
deleted file mode 100644
index f880e38f5..000000000
--- a/gfx/overworld/353.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-
-? ? ? ?,���p�����d�? �x���x���������
-\ No newline at end of file
diff --git a/gfx/overworld/354.2bpp b/gfx/overworld/354.2bpp
deleted file mode 100644
index 9d010a091..000000000
--- a/gfx/overworld/354.2bpp
+++ /dev/null
diff --git a/gfx/overworld/355.2bpp b/gfx/overworld/355.2bpp
deleted file mode 100644
index dc2a3beb7..000000000
--- a/gfx/overworld/355.2bpp
+++ /dev/null
diff --git a/gfx/overworld/356.2bpp b/gfx/overworld/356.2bpp
deleted file mode 100644
index 32e965a2a..000000000
--- a/gfx/overworld/356.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-/0? @@@X��`��0������8@>1=#�(������������
-\ No newline at end of file
diff --git a/gfx/overworld/357.2bpp b/gfx/overworld/357.2bpp
deleted file mode 100644
index 075e94c2d..000000000
--- a/gfx/overworld/357.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-'8/0=2kVP��0�����L�j�
->1=:OH0?|��\����x���pp
-\ No newline at end of file
diff --git a/gfx/overworld/358.2bpp b/gfx/overworld/358.2bpp
deleted file mode 100644
index 215f783d4..000000000
--- a/gfx/overworld/358.2bpp
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#< ?0?hWP��p���<����
-?0?8oWP3<�����
-�<8���pp
-\ No newline at end of file
diff --git a/gfx/overworld/359.2bpp b/gfx/overworld/359.2bpp
deleted file mode 100644
index ff2881a73..000000000
--- a/gfx/overworld/359.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-? ? (;,/0��`��0�p�����07(�0�����x�8����
-\ No newline at end of file
diff --git a/gfx/overworld/360.2bpp b/gfx/overworld/360.2bpp
deleted file mode 100644
index 9017fd98b..000000000
--- a/gfx/overworld/360.2bpp
+++ /dev/null
diff --git a/gfx/overworld/361.2bpp b/gfx/overworld/361.2bpp
deleted file mode 100644
index 9017fd98b..000000000
--- a/gfx/overworld/361.2bpp
+++ /dev/null
diff --git a/gfx/overworld/362.2bpp b/gfx/overworld/362.2bpp
deleted file mode 100644
index 9017fd98b..000000000
--- a/gfx/overworld/362.2bpp
+++ /dev/null
diff --git a/gfx/overworld/363.2bpp b/gfx/overworld/363.2bpp
deleted file mode 100644
index 06150aa58..000000000
--- a/gfx/overworld/363.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-??vYB�����������n��B?2>9}NO>?�L|��r��|�����pp
-\ No newline at end of file
diff --git a/gfx/overworld/364.2bpp b/gfx/overworld/364.2bpp
deleted file mode 100644
index bad77cca3..000000000
--- a/gfx/overworld/364.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-??p_pO�������������87?8__??������������pp
-\ No newline at end of file
diff --git a/gfx/overworld/365.2bpp b/gfx/overworld/365.2bpp
deleted file mode 100644
index 1ad6ac8a0..000000000
--- a/gfx/overworld/365.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-??�������������	h���`���0�0����
-\ No newline at end of file
diff --git a/gfx/overworld/366.2bpp b/gfx/overworld/366.2bpp
deleted file mode 100644
index bf001ffb2..000000000
--- a/gfx/overworld/366.2bpp
+++ /dev/null
diff --git a/gfx/overworld/367.2bpp b/gfx/overworld/367.2bpp
deleted file mode 100644
index 32553d865..000000000
--- a/gfx/overworld/367.2bpp
+++ /dev/null
diff --git a/gfx/overworld/368.2bpp b/gfx/overworld/368.2bpp
deleted file mode 100644
index dfc85f561..000000000
--- a/gfx/overworld/368.2bpp
+++ /dev/null
diff --git a/gfx/overworld/369.2bpp b/gfx/overworld/369.2bpp
deleted file mode 100644
index 341aed00e..000000000
--- a/gfx/overworld/369.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-?0??VB�����������j�B?0>9O{N?>>"<<�|����r�|��|D<<
-\ No newline at end of file
diff --git a/gfx/overworld/370.2bpp b/gfx/overworld/370.2bpp
deleted file mode 100644
index 2b73bfa82..000000000
--- a/gfx/overworld/370.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-?0??_O��������������?3<?{_y^<??!>>��<����z<�����||
-\ No newline at end of file
diff --git a/gfx/overworld/371.2bpp b/gfx/overworld/371.2bpp
deleted file mode 100644
index aaab465a3..000000000
--- a/gfx/overworld/371.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-? ? ??����������������x���8�8��� ��
-\ No newline at end of file
diff --git a/gfx/overworld/372.2bpp b/gfx/overworld/372.2bpp
deleted file mode 100644
index 1a7d2a594..000000000
--- a/gfx/overworld/372.2bpp
+++ /dev/null
diff --git a/gfx/overworld/373.2bpp b/gfx/overworld/373.2bpp
deleted file mode 100644
index a2807737b..000000000
--- a/gfx/overworld/373.2bpp
+++ /dev/null
diff --git a/gfx/overworld/374.2bpp b/gfx/overworld/374.2bpp
deleted file mode 100644
index 79b713fde..000000000
--- a/gfx/overworld/374.2bpp
+++ /dev/null
diff --git a/gfx/overworld/375.2bpp b/gfx/overworld/375.2bpp
deleted file mode 100644
index 7a02bb629..000000000
--- a/gfx/overworld/375.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-p?2?2���������8�L�L>9??|���p���0� �����
-\ No newline at end of file
diff --git a/gfx/overworld/376.2bpp b/gfx/overworld/376.2bpp
deleted file mode 100644
index d9abd33eb..000000000
--- a/gfx/overworld/376.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-p????��������������????����p���0� �����
-\ No newline at end of file
diff --git a/gfx/overworld/377.2bpp b/gfx/overworld/377.2bpp
deleted file mode 100644
index be6883c82..000000000
--- a/gfx/overworld/377.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-????����������������
-�������@�` �����
-\ No newline at end of file
diff --git a/gfx/overworld/378.2bpp b/gfx/overworld/378.2bpp
deleted file mode 100644
index 0c0fa9ed4..000000000
--- a/gfx/overworld/378.2bpp
+++ /dev/null
diff --git a/gfx/overworld/379.2bpp b/gfx/overworld/379.2bpp
deleted file mode 100644
index a140bde6c..000000000
--- a/gfx/overworld/379.2bpp
+++ /dev/null
diff --git a/gfx/overworld/380.2bpp b/gfx/overworld/380.2bpp
deleted file mode 100644
index 3596c40e8..000000000
--- a/gfx/overworld/380.2bpp
+++ /dev/null
diff --git a/gfx/overworld/381.2bpp b/gfx/overworld/381.2bpp
deleted file mode 100644
index 1131313e3..000000000
--- a/gfx/overworld/381.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-?7PB�����x�����
-�B?2??}NK8?�Lx����r�����pp
-\ No newline at end of file
diff --git a/gfx/overworld/382.2bpp b/gfx/overworld/382.2bpp
deleted file mode 100644
index 95cdefad2..000000000
--- a/gfx/overworld/382.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-????_O�������������?3?<s_p_<?���<���<�����pp
-\ No newline at end of file
diff --git a/gfx/overworld/383.2bpp b/gfx/overworld/383.2bpp
deleted file mode 100644
index f59da99e5..000000000
--- a/gfx/overworld/383.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-??���������������p���0�0�� ���
-\ No newline at end of file
diff --git a/gfx/overworld/384.2bpp b/gfx/overworld/384.2bpp
deleted file mode 100644
index 7db176b91..000000000
--- a/gfx/overworld/384.2bpp
+++ /dev/null
diff --git a/gfx/overworld/385.2bpp b/gfx/overworld/385.2bpp
deleted file mode 100644
index d9856b769..000000000
--- a/gfx/overworld/385.2bpp
+++ /dev/null
diff --git a/gfx/overworld/386.2bpp b/gfx/overworld/386.2bpp
deleted file mode 100644
index 9ca0473a9..000000000
--- a/gfx/overworld/386.2bpp
+++ /dev/null
diff --git a/gfx/overworld/387.2bpp b/gfx/overworld/387.2bpp
deleted file mode 100644
index c511258fa..000000000
--- a/gfx/overworld/387.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-3?<?PB���������<��
-�B?2;7~IyN??�Lx���~��r����pp
-\ No newline at end of file
diff --git a/gfx/overworld/388.2bpp b/gfx/overworld/388.2bpp
deleted file mode 100644
index fa6f9a68d..000000000
--- a/gfx/overworld/388.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-0?;<_O�������<����??/8q^x_??������z�����pp
-\ No newline at end of file
diff --git a/gfx/overworld/389.2bpp b/gfx/overworld/389.2bpp
deleted file mode 100644
index 9ad22ca78..000000000
--- a/gfx/overworld/389.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-8???�����>�������p�� ����`���
-\ No newline at end of file
diff --git a/gfx/overworld/390.2bpp b/gfx/overworld/390.2bpp
deleted file mode 100644
index b306f06b6..000000000
--- a/gfx/overworld/390.2bpp
+++ /dev/null
diff --git a/gfx/overworld/391.2bpp b/gfx/overworld/391.2bpp
deleted file mode 100644
index 429ce3343..000000000
--- a/gfx/overworld/391.2bpp
+++ /dev/null
diff --git a/gfx/overworld/392.2bpp b/gfx/overworld/392.2bpp
deleted file mode 100644
index d8ef83d1d..000000000
--- a/gfx/overworld/392.2bpp
+++ /dev/null
diff --git a/gfx/overworld/393.2bpp b/gfx/overworld/393.2bpp
deleted file mode 100644
index 3cac02f74..000000000
--- a/gfx/overworld/393.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-88GP|c<+<#@O88���|�x�x����?  ? ?���������pp
-\ No newline at end of file
diff --git a/gfx/overworld/394.2bpp b/gfx/overworld/394.2bpp
deleted file mode 100644
index 6a5bea727..000000000
--- a/gfx/overworld/394.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-7???wXF��x�x��������b>1=:LL?:|��\�2�2�\����pp
-\ No newline at end of file
diff --git a/gfx/overworld/395.2bpp b/gfx/overworld/395.2bpp
deleted file mode 100644
index 1af157d8e..000000000
--- a/gfx/overworld/395.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-0???p_pO�������������87?8__??������������pp
-\ No newline at end of file
diff --git a/gfx/overworld/396.2bpp b/gfx/overworld/396.2bpp
deleted file mode 100644
index 9782c4f41..000000000
--- a/gfx/overworld/396.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-????�������������			h���`���0�0����
-\ No newline at end of file
diff --git a/gfx/overworld/397.2bpp b/gfx/overworld/397.2bpp
deleted file mode 100644
index 9017fd98b..000000000
--- a/gfx/overworld/397.2bpp
+++ /dev/null
diff --git a/gfx/overworld/398.2bpp b/gfx/overworld/398.2bpp
deleted file mode 100644
index 9017fd98b..000000000
--- a/gfx/overworld/398.2bpp
+++ /dev/null
diff --git a/gfx/overworld/399.2bpp b/gfx/overworld/399.2bpp
deleted file mode 100644
index 9017fd98b..000000000
--- a/gfx/overworld/399.2bpp
+++ /dev/null
diff --git a/gfx/overworld/400.2bpp b/gfx/overworld/400.2bpp
deleted file mode 100644
index 3ca44cefd..000000000
--- a/gfx/overworld/400.2bpp
+++ /dev/null
diff --git a/gfx/overworld/401.2bpp b/gfx/overworld/401.2bpp
deleted file mode 100644
index 656ffc47f..000000000
--- a/gfx/overworld/401.2bpp
+++ /dev/null
diff --git a/gfx/overworld/402.2bpp b/gfx/overworld/402.2bpp
deleted file mode 100644
index 1c63f3ac0..000000000
--- a/gfx/overworld/402.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-?8?0PVY���������
-�j��?67?xOH??�lx���������pp
-\ No newline at end of file
diff --git a/gfx/overworld/403.2bpp b/gfx/overworld/403.2bpp
deleted file mode 100644
index c96cc3488..000000000
--- a/gfx/overworld/403.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-??_OoW����������������79=>s_xO?8으|��������pp
-\ No newline at end of file
diff --git a/gfx/overworld/404.2bpp b/gfx/overworld/404.2bpp
deleted file mode 100644
index f4363b80f..000000000
--- a/gfx/overworld/404.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-???1����������������
-�x�p���p�P�� ���
-\ No newline at end of file
diff --git a/gfx/overworld/405.2bpp b/gfx/overworld/405.2bpp
deleted file mode 100644
index f20d50254..000000000
--- a/gfx/overworld/405.2bpp
+++ /dev/null
diff --git a/gfx/overworld/406.2bpp b/gfx/overworld/406.2bpp
deleted file mode 100644
index 6a349aceb..000000000
--- a/gfx/overworld/406.2bpp
+++ /dev/null
diff --git a/gfx/overworld/407.2bpp b/gfx/overworld/407.2bpp
deleted file mode 100644
index 77b1ad49e..000000000
--- a/gfx/overworld/407.2bpp
+++ /dev/null
diff --git a/gfx/overworld/408.2bpp b/gfx/overworld/408.2bpp
deleted file mode 100644
index 95a08abcd..000000000
--- a/gfx/overworld/408.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-8??0TB��������*�B/0~i����s}�~���Yξx���pp
-\ No newline at end of file
diff --git a/gfx/overworld/409.2bpp b/gfx/overworld/409.2bpp
deleted file mode 100644
index 171284c89..000000000
--- a/gfx/overworld/409.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-1?>?}_}O�������|�����?7_x��p������
-�����pp
-\ No newline at end of file
diff --git a/gfx/overworld/410.2bpp b/gfx/overworld/410.2bpp
deleted file mode 100644
index 447e4cd61..000000000
--- a/gfx/overworld/410.2bpp
+++ /dev/null
@@ -1 +0,0 @@
- ? ??!��������������`���0�0������
-\ No newline at end of file
diff --git a/gfx/overworld/411.2bpp b/gfx/overworld/411.2bpp
deleted file mode 100644
index 0f38f6939..000000000
--- a/gfx/overworld/411.2bpp
+++ /dev/null
diff --git a/gfx/overworld/412.2bpp b/gfx/overworld/412.2bpp
deleted file mode 100644
index 8581c3450..000000000
--- a/gfx/overworld/412.2bpp
+++ /dev/null
diff --git a/gfx/overworld/413.2bpp b/gfx/overworld/413.2bpp
deleted file mode 100644
index 399c90dd2..000000000
--- a/gfx/overworld/413.2bpp
+++ /dev/null
diff --git a/gfx/overworld/414.2bpp b/gfx/overworld/414.2bpp
deleted file mode 100644
index a2132162b..000000000
--- a/gfx/overworld/414.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-???:?0ToR���������\��*�J?0?'<'�x���<��x������
-\ No newline at end of file
diff --git a/gfx/overworld/415.2bpp b/gfx/overworld/415.2bpp
deleted file mode 100644
index aa7e0c1b5..000000000
--- a/gfx/overworld/415.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-??????_o_����������������?0?/</����<���������
-\ No newline at end of file
diff --git a/gfx/overworld/416.2bpp b/gfx/overworld/416.2bpp
deleted file mode 100644
index a1f0d9166..000000000
--- a/gfx/overworld/416.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-	
-�����������~�<�$?9gc??��0������c���
-\ No newline at end of file
diff --git a/gfx/overworld/417.2bpp b/gfx/overworld/417.2bpp
deleted file mode 100644
index 1c90135b3..000000000
--- a/gfx/overworld/417.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-??t`��ߤ������������T�`<3OxO?<��0��xȰ����``
-\ No newline at end of file
diff --git a/gfx/overworld/418.2bpp b/gfx/overworld/418.2bpp
deleted file mode 100644
index efcee16ed..000000000
--- a/gfx/overworld/418.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-??��߿����������������`?0_x_7???��0��x������``
-\ No newline at end of file
diff --git a/gfx/overworld/419.2bpp b/gfx/overworld/419.2bpp
deleted file mode 100644
index d2378e52b..000000000
--- a/gfx/overworld/419.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-???7?4�������������x�H+</3s����~99��`��������|���
-\ No newline at end of file
diff --git a/gfx/overworld/420.2bpp b/gfx/overworld/420.2bpp
deleted file mode 100644
index 2468d3409..000000000
--- a/gfx/overworld/420.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-$?/;PV_��0��$����
-�j��?6??~I{L??�lx���~��2����pp
-\ No newline at end of file
diff --git a/gfx/overworld/421.2bpp b/gfx/overworld/421.2bpp
deleted file mode 100644
index 0a96f6ff9..000000000
--- a/gfx/overworld/421.2bpp
+++ /dev/null
@@ -1 +0,0 @@
- ?p_xOnW��0������v�?1?<SH?8���<��������pp
-\ No newline at end of file
diff --git a/gfx/overworld/422.2bpp b/gfx/overworld/422.2bpp
deleted file mode 100644
index cba61b105..000000000
--- a/gfx/overworld/422.2bpp
+++ /dev/null
@@ -1,3 +0,0 @@
-$?/;��0��������
-
-�x�p���P�P�� ���
-\ No newline at end of file
diff --git a/gfx/overworld/423.2bpp b/gfx/overworld/423.2bpp
deleted file mode 100644
index 26a9a7c58..000000000
--- a/gfx/overworld/423.2bpp
+++ /dev/null
diff --git a/gfx/overworld/424.2bpp b/gfx/overworld/424.2bpp
deleted file mode 100644
index c2a5264b7..000000000
--- a/gfx/overworld/424.2bpp
+++ /dev/null
diff --git a/gfx/overworld/425.2bpp b/gfx/overworld/425.2bpp
deleted file mode 100644
index 2f23f7404..000000000
--- a/gfx/overworld/425.2bpp
+++ /dev/null
diff --git a/gfx/overworld/426.2bpp b/gfx/overworld/426.2bpp
deleted file mode 100644
index f9c58d94f..000000000
--- a/gfx/overworld/426.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-~{N0/'> ?���~�r�(��|��x/;W|��wx/<7+���>�����<��88
-\ No newline at end of file
diff --git a/gfx/overworld/427.2bpp b/gfx/overworld/427.2bpp
deleted file mode 100644
index 5b648d412..000000000
--- a/gfx/overworld/427.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-~{N0/ ?!>���~�r�x��|8�+?P��r,?#?��
-���N��4���88
-\ No newline at end of file
diff --git a/gfx/overworld/428.2bpp b/gfx/overworld/428.2bpp
deleted file mode 100644
index b05094ed2..000000000
--- a/gfx/overworld/428.2bpp
+++ /dev/null
diff --git a/gfx/overworld/429.2bpp b/gfx/overworld/429.2bpp
deleted file mode 100644
index fc8333f86..000000000
--- a/gfx/overworld/429.2bpp
+++ /dev/null
diff --git a/gfx/overworld/430.2bpp b/gfx/overworld/430.2bpp
deleted file mode 100644
index 2d22ab4c3..000000000
--- a/gfx/overworld/430.2bpp
+++ /dev/null
diff --git a/gfx/overworld/431.2bpp b/gfx/overworld/431.2bpp
deleted file mode 100644
index d1ff5a221..000000000
--- a/gfx/overworld/431.2bpp
+++ /dev/null
diff --git a/gfx/overworld/432.2bpp b/gfx/overworld/432.2bpp
deleted file mode 100644
index 6f0c9a098..000000000
--- a/gfx/overworld/432.2bpp
+++ /dev/null
diff --git a/gfx/overworld/433.2bpp b/gfx/overworld/433.2bpp
deleted file mode 100644
index 0a9f3be49..000000000
--- a/gfx/overworld/433.2bpp
+++ /dev/null
diff --git a/gfx/overworld/434.2bpp b/gfx/overworld/434.2bpp
deleted file mode 100644
index 350176233..000000000
--- a/gfx/overworld/434.2bpp
+++ /dev/null
diff --git a/gfx/overworld/435.2bpp b/gfx/overworld/435.2bpp
deleted file mode 100644
index c8ee260c7..000000000
--- a/gfx/overworld/435.2bpp
+++ /dev/null
diff --git a/gfx/overworld/436.2bpp b/gfx/overworld/436.2bpp
deleted file mode 100644
index 70a02cd60..000000000
--- a/gfx/overworld/436.2bpp
+++ /dev/null
diff --git a/gfx/overworld/437.2bpp b/gfx/overworld/437.2bpp
deleted file mode 100644
index 147f1f580..000000000
--- a/gfx/overworld/437.2bpp
+++ /dev/null
diff --git a/gfx/overworld/438.2bpp b/gfx/overworld/438.2bpp
deleted file mode 100644
index 829156208..000000000
--- a/gfx/overworld/438.2bpp
+++ /dev/null
diff --git a/gfx/overworld/439.2bpp b/gfx/overworld/439.2bpp
deleted file mode 100644
index 15b7f9e09..000000000
--- a/gfx/overworld/439.2bpp
+++ /dev/null
diff --git a/gfx/overworld/440.2bpp b/gfx/overworld/440.2bpp
deleted file mode 100644
index 22bcec66e..000000000
--- a/gfx/overworld/440.2bpp
+++ /dev/null
diff --git a/gfx/overworld/441.2bpp b/gfx/overworld/441.2bpp
deleted file mode 100644
index 9f3f8524c..000000000
--- a/gfx/overworld/441.2bpp
+++ /dev/null
diff --git a/gfx/overworld/442.2bpp b/gfx/overworld/442.2bpp
deleted file mode 100644
index 618adb4f9..000000000
--- a/gfx/overworld/442.2bpp
+++ /dev/null
diff --git a/gfx/overworld/443.2bpp b/gfx/overworld/443.2bpp
deleted file mode 100644
index b56470420..000000000
--- a/gfx/overworld/443.2bpp
+++ /dev/null
diff --git a/gfx/overworld/444.2bpp b/gfx/overworld/444.2bpp
deleted file mode 100644
index 80e5f2f4d..000000000
--- a/gfx/overworld/444.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-ss\o,7>7`����:�4��8�|��_�����S|׸_x'<7+=����>���<��88
-\ No newline at end of file
diff --git a/gfx/overworld/445.2bpp b/gfx/overworld/445.2bpp
deleted file mode 100644
index fae1f89fd..000000000
--- a/gfx/overworld/445.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-ssl_4/ ?`ٿ��6�,�����������B��,?6?#?a�A�B�#�6�l���88
-\ No newline at end of file
diff --git a/gfx/overworld/446.2bpp b/gfx/overworld/446.2bpp
deleted file mode 100644
index 93bdaef33..000000000
--- a/gfx/overworld/446.2bpp
+++ /dev/null
diff --git a/gfx/overworld/447.2bpp b/gfx/overworld/447.2bpp
deleted file mode 100644
index 25c4e6442..000000000
--- a/gfx/overworld/447.2bpp
+++ /dev/null
diff --git a/gfx/overworld/448.2bpp b/gfx/overworld/448.2bpp
deleted file mode 100644
index a735f6a1a..000000000
--- a/gfx/overworld/448.2bpp
+++ /dev/null
diff --git a/gfx/overworld/449.2bpp b/gfx/overworld/449.2bpp
deleted file mode 100644
index 44fa0d6f9..000000000
--- a/gfx/overworld/449.2bpp
+++ /dev/null
diff --git a/gfx/overworld/450.2bpp b/gfx/overworld/450.2bpp
deleted file mode 100644
index 722462835..000000000
--- a/gfx/overworld/450.2bpp
+++ /dev/null
diff --git a/gfx/overworld/451.2bpp b/gfx/overworld/451.2bpp
deleted file mode 100644
index 5e6313d87..000000000
--- a/gfx/overworld/451.2bpp
+++ /dev/null
diff --git a/gfx/overworld/452.2bpp b/gfx/overworld/452.2bpp
deleted file mode 100644
index a2837fc6d..000000000
--- a/gfx/overworld/452.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-������#��q���������_Q�!���SWD`??���>�����Gǀ�
-\ No newline at end of file
diff --git a/gfx/overworld/453.2bpp b/gfx/overworld/453.2bpp
deleted file mode 100644
index c03f2a4d6..000000000
--- a/gfx/overworld/453.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-78??4???xS���0�8��X���<���tk?/?1?"\�����w��5ͷ��22
-\ No newline at end of file
diff --git a/gfx/overworld/454.2bpp b/gfx/overworld/454.2bpp
deleted file mode 100644
index 8d4e89cca..000000000
--- a/gfx/overworld/454.2bpp
+++ /dev/null
diff --git a/gfx/overworld/455.2bpp b/gfx/overworld/455.2bpp
deleted file mode 100644
index 1f83a0a4f..000000000
--- a/gfx/overworld/455.2bpp
+++ /dev/null
diff --git a/gfx/overworld/456.2bpp b/gfx/overworld/456.2bpp
deleted file mode 100644
index b5366a0a0..000000000
--- a/gfx/overworld/456.2bpp
+++ /dev/null
diff --git a/gfx/overworld/457.2bpp b/gfx/overworld/457.2bpp
deleted file mode 100644
index 7fc316acc..000000000
--- a/gfx/overworld/457.2bpp
+++ /dev/null
diff --git a/gfx/overworld/458.2bpp b/gfx/overworld/458.2bpp
deleted file mode 100644
index 15f94531d..000000000
--- a/gfx/overworld/458.2bpp
+++ /dev/null
diff --git a/gfx/overworld/459.2bpp b/gfx/overworld/459.2bpp
deleted file mode 100644
index 98db78bb9..000000000
--- a/gfx/overworld/459.2bpp
+++ /dev/null
diff --git a/gfx/overworld/460.2bpp b/gfx/overworld/460.2bpp
deleted file mode 100644
index 09d14773e..000000000
--- a/gfx/overworld/460.2bpp
+++ /dev/null
diff --git a/gfx/overworld/461.2bpp b/gfx/overworld/461.2bpp
deleted file mode 100644
index 6daf34067..000000000
--- a/gfx/overworld/461.2bpp
+++ /dev/null
diff --git a/gfx/overworld/462.2bpp b/gfx/overworld/462.2bpp
deleted file mode 100644
index c693499de..000000000
--- a/gfx/overworld/462.2bpp
+++ /dev/null
diff --git a/gfx/overworld/463.2bpp b/gfx/overworld/463.2bpp
deleted file mode 100644
index 9017fd98b..000000000
--- a/gfx/overworld/463.2bpp
+++ /dev/null
diff --git a/gfx/overworld/464.2bpp b/gfx/overworld/464.2bpp
deleted file mode 100644
index 9017fd98b..000000000
--- a/gfx/overworld/464.2bpp
+++ /dev/null
diff --git a/gfx/overworld/465.2bpp b/gfx/overworld/465.2bpp
deleted file mode 100644
index 9017fd98b..000000000
--- a/gfx/overworld/465.2bpp
+++ /dev/null
diff --git a/gfx/overworld/466.2bpp b/gfx/overworld/466.2bpp
deleted file mode 100644
index 9017fd98b..000000000
--- a/gfx/overworld/466.2bpp
+++ /dev/null
diff --git a/gfx/overworld/467.2bpp b/gfx/overworld/467.2bpp
deleted file mode 100644
index 9017fd98b..000000000
--- a/gfx/overworld/467.2bpp
+++ /dev/null
diff --git a/gfx/overworld/468.2bpp b/gfx/overworld/468.2bpp
deleted file mode 100644
index 1225028a5..000000000
--- a/gfx/overworld/468.2bpp
+++ /dev/null
diff --git a/gfx/overworld/469.2bpp b/gfx/overworld/469.2bpp
deleted file mode 100644
index 9017fd98b..000000000
--- a/gfx/overworld/469.2bpp
+++ /dev/null
diff --git a/gfx/overworld/470.2bpp b/gfx/overworld/470.2bpp
deleted file mode 100644
index 9017fd98b..000000000
--- a/gfx/overworld/470.2bpp
+++ /dev/null
diff --git a/gfx/overworld/471.2bpp b/gfx/overworld/471.2bpp
deleted file mode 100644
index 9017fd98b..000000000
--- a/gfx/overworld/471.2bpp
+++ /dev/null
diff --git a/gfx/overworld/472.2bpp b/gfx/overworld/472.2bpp
deleted file mode 100644
index 9017fd98b..000000000
--- a/gfx/overworld/472.2bpp
+++ /dev/null
diff --git a/gfx/overworld/473.2bpp b/gfx/overworld/473.2bpp
deleted file mode 100644
index 9017fd98b..000000000
--- a/gfx/overworld/473.2bpp
+++ /dev/null
diff --git a/gfx/overworld/474.2bpp b/gfx/overworld/474.2bpp
deleted file mode 100644
index dc2a72abb..000000000
--- a/gfx/overworld/474.2bpp
+++ /dev/null
diff --git a/gfx/overworld/475.2bpp b/gfx/overworld/475.2bpp
deleted file mode 100644
index 9017fd98b..000000000
--- a/gfx/overworld/475.2bpp
+++ /dev/null
diff --git a/gfx/overworld/476.2bpp b/gfx/overworld/476.2bpp
deleted file mode 100644
index 9017fd98b..000000000
--- a/gfx/overworld/476.2bpp
+++ /dev/null
diff --git a/gfx/overworld/477.2bpp b/gfx/overworld/477.2bpp
deleted file mode 100644
index 9017fd98b..000000000
--- a/gfx/overworld/477.2bpp
+++ /dev/null
diff --git a/gfx/overworld/478.2bpp b/gfx/overworld/478.2bpp
deleted file mode 100644
index 9017fd98b..000000000
--- a/gfx/overworld/478.2bpp
+++ /dev/null
diff --git a/gfx/overworld/479.2bpp b/gfx/overworld/479.2bpp
deleted file mode 100644
index 9017fd98b..000000000
--- a/gfx/overworld/479.2bpp
+++ /dev/null
diff --git a/gfx/overworld/480.2bpp b/gfx/overworld/480.2bpp
deleted file mode 100644
index bbe5b9fa8..000000000
--- a/gfx/overworld/480.2bpp
+++ /dev/null
diff --git a/gfx/overworld/481.2bpp b/gfx/overworld/481.2bpp
deleted file mode 100644
index 7d28ef270..000000000
--- a/gfx/overworld/481.2bpp
+++ /dev/null
@@ -1 +0,0 @@
- ?"?'=Ox����0���D����G��ny	�Ov����������``
-\ No newline at end of file
diff --git a/gfx/overworld/482.2bpp b/gfx/overworld/482.2bpp
deleted file mode 100644
index da35730d0..000000000
--- a/gfx/overworld/482.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-7\޵����t���p����|z����q~�����Go??���>��������px
-\ No newline at end of file
diff --git a/gfx/overworld/483.2bpp b/gfx/overworld/483.2bpp
deleted file mode 100644
index f3386f2a5..000000000
--- a/gfx/overworld/483.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-? @��ժ�Ѯ�����R��^C��+��ҭ��������u??���+�W���~�����
-\ No newline at end of file
diff --git a/gfx/overworld/484.2bpp b/gfx/overworld/484.2bpp
deleted file mode 100644
index ec7867d54..000000000
--- a/gfx/overworld/484.2bpp
+++ /dev/null
diff --git a/gfx/overworld/485.2bpp b/gfx/overworld/485.2bpp
deleted file mode 100644
index 182a360fe..000000000
--- a/gfx/overworld/485.2bpp
+++ /dev/null
diff --git a/gfx/overworld/486.2bpp b/gfx/overworld/486.2bpp
deleted file mode 100644
index 3c38a9b3a..000000000
--- a/gfx/overworld/486.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-;2nO]i6)]`�й���lLv�ږl���3M���Gx0?>������������
-\ No newline at end of file
diff --git a/gfx/overworld/487.2bpp b/gfx/overworld/487.2bpp
deleted file mode 100644
index 594985e43..000000000
--- a/gfx/overworld/487.2bpp
+++ /dev/null
diff --git a/gfx/overworld/488.2bpp b/gfx/overworld/488.2bpp
deleted file mode 100644
index 73964d04e..000000000
--- a/gfx/overworld/488.2bpp
+++ /dev/null
diff --git a/gfx/overworld/489.2bpp b/gfx/overworld/489.2bpp
deleted file mode 100644
index 60c06e9b0..000000000
--- a/gfx/overworld/489.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-%?/:����0��8xȤ��\��G��x?%?%	�O�������x���``
-\ No newline at end of file
diff --git a/gfx/overworld/490.2bpp b/gfx/overworld/490.2bpp
deleted file mode 100644
index f493bf1ea..000000000
--- a/gfx/overworld/490.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-(7/8�������8�������c4/?,	a����8,��4����``
-\ No newline at end of file
diff --git a/gfx/overworld/491.2bpp b/gfx/overworld/491.2bpp
deleted file mode 100644
index 3261016ce..000000000
--- a/gfx/overworld/491.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-	'>-;���8��8�Ȅ�����		��������H�p����
-\ No newline at end of file
diff --git a/gfx/overworld/492.2bpp b/gfx/overworld/492.2bpp
deleted file mode 100644
index 480641420..000000000
--- a/gfx/overworld/492.2bpp
+++ /dev/null
diff --git a/gfx/overworld/493.2bpp b/gfx/overworld/493.2bpp
deleted file mode 100644
index 9e57fb2f2..000000000
--- a/gfx/overworld/493.2bpp
+++ /dev/null
diff --git a/gfx/overworld/494.2bpp b/gfx/overworld/494.2bpp
deleted file mode 100644
index 91b20f69d..000000000
--- a/gfx/overworld/494.2bpp
+++ /dev/null
diff --git a/gfx/overworld/495.2bpp b/gfx/overworld/495.2bpp
deleted file mode 100644
index da7137a56..000000000
--- a/gfx/overworld/495.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-%?/:����0��8xȤ��\��G��xOO3>�O������|H��p��
-\ No newline at end of file
diff --git a/gfx/overworld/496.2bpp b/gfx/overworld/496.2bpp
deleted file mode 100644
index 756c541ed..000000000
--- a/gfx/overworld/496.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-(7/8�������8�������c\t?<a����:.��<���p��
-\ No newline at end of file
diff --git a/gfx/overworld/497.2bpp b/gfx/overworld/497.2bpp
deleted file mode 100644
index b6e8e92ee..000000000
--- a/gfx/overworld/497.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-	'>-;���8��8�Ȅ�����
-?3S����|D88�������_���>"
-\ No newline at end of file
diff --git a/gfx/overworld/498.2bpp b/gfx/overworld/498.2bpp
deleted file mode 100644
index c8c1635a3..000000000
--- a/gfx/overworld/498.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-		q����<����.��"Oy?<OO?>�'������|�x@���
-\ No newline at end of file
diff --git a/gfx/overworld/499.2bpp b/gfx/overworld/499.2bpp
deleted file mode 100644
index 4c79216f3..000000000
--- a/gfx/overworld/499.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-	t�����
-�����C1?1��������X谰
-\ No newline at end of file
diff --git a/gfx/overworld/500.2bpp b/gfx/overworld/500.2bpp
deleted file mode 100644
index 7ec0a63d3..000000000
--- a/gfx/overworld/500.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-,3O|[w?%?)?)��� p��p�����0>#?3S����uM88��������?���
-\ No newline at end of file
diff --git a/gfx/overworld/501.2bpp b/gfx/overworld/501.2bpp
deleted file mode 100644
index beb2698ce..000000000
--- a/gfx/overworld/501.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-/0P@oV����������
-��jp?3{LK?<8/����2���<�����
-\ No newline at end of file
diff --git a/gfx/overworld/502.2bpp b/gfx/overworld/502.2bpp
deleted file mode 100644
index f26adaf4e..000000000
--- a/gfx/overworld/502.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-??___����������������??/<[X0?���<����������
-\ No newline at end of file
diff --git a/gfx/overworld/503.2bpp b/gfx/overworld/503.2bpp
deleted file mode 100644
index 8aae28ca0..000000000
--- a/gfx/overworld/503.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-? ? ? ?,����x��x�<�<�|�? �x���x��������
-\ No newline at end of file
diff --git a/gfx/overworld/504.2bpp b/gfx/overworld/504.2bpp
deleted file mode 100644
index 45ee3056d..000000000
--- a/gfx/overworld/504.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-
->}}56=w^���| �������,�n�����y_y_�R^�O�W�����WuJz08
-\ No newline at end of file
diff --git a/gfx/overworld/505.2bpp b/gfx/overworld/505.2bpp
deleted file mode 100644
index e95759482..000000000
--- a/gfx/overworld/505.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-?8O~5?C7=���X�h��~�����7<?-?'?;??~F~R<<�<��������~b~J<<
-\ No newline at end of file
diff --git a/gfx/overworld/506.2bpp b/gfx/overworld/506.2bpp
deleted file mode 100644
index 3aa0fd5c0..000000000
--- a/gfx/overworld/506.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-?/{O]S���������������?(?=w}s#?:>~V||��������^~~j>>
-\ No newline at end of file
diff --git a/gfx/overworld/507.2bpp b/gfx/overworld/507.2bpp
deleted file mode 100644
index ca286ffd8..000000000
--- a/gfx/overworld/507.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-????_~ToR�����������~�*�J?2?'=&�Lx���d�����xx
-\ No newline at end of file
diff --git a/gfx/overworld/508.2bpp b/gfx/overworld/508.2bpp
deleted file mode 100644
index 6a701b642..000000000
--- a/gfx/overworld/508.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-????__o_����������������;7?/8/���8����x���pp
-\ No newline at end of file
diff --git a/gfx/overworld/509.2bpp b/gfx/overworld/509.2bpp
deleted file mode 100644
index 4ef660895..000000000
--- a/gfx/overworld/509.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-??7?+7�������������.�.��8���0�0������
-\ No newline at end of file
diff --git a/gfx/overworld/510.2bpp b/gfx/overworld/510.2bpp
deleted file mode 100644
index 9017fd98b..000000000
--- a/gfx/overworld/510.2bpp
+++ /dev/null
diff --git a/gfx/overworld/511.2bpp b/gfx/overworld/511.2bpp
deleted file mode 100644
index 9017fd98b..000000000
--- a/gfx/overworld/511.2bpp
+++ /dev/null
diff --git a/gfx/overworld/sprites_1.asm b/gfx/overworld/sprites_1.asm
index 03e2ee2de..640ac6ccc 100644
--- a/gfx/overworld/sprites_1.asm
+++ b/gfx/overworld/sprites_1.asm
@@ -1,388 +1,44 @@
-ChrisSpriteGFX: ; c0000
-INCBIN "gfx/overworld/000.2bpp"
-INCBIN "gfx/overworld/001.2bpp"
-INCBIN "gfx/overworld/002.2bpp"
-INCBIN "gfx/overworld/003.2bpp"
-INCBIN "gfx/overworld/004.2bpp"
-INCBIN "gfx/overworld/005.2bpp"
-; c0180
-
-ChrisBikeSpriteGFX: ; c0180
-INCBIN "gfx/overworld/006.2bpp"
-INCBIN "gfx/overworld/007.2bpp"
-INCBIN "gfx/overworld/008.2bpp"
-INCBIN "gfx/overworld/009.2bpp"
-INCBIN "gfx/overworld/010.2bpp"
-INCBIN "gfx/overworld/011.2bpp"
-; c0300
-
-GameboyKidSpriteGFX: ; c0300
-INCBIN "gfx/overworld/012.2bpp"
-INCBIN "gfx/overworld/013.2bpp"
-INCBIN "gfx/overworld/014.2bpp"
-; c03c0
-
-SilverSpriteGFX: ; c03c0
-INCBIN "gfx/overworld/015.2bpp"
-INCBIN "gfx/overworld/016.2bpp"
-INCBIN "gfx/overworld/017.2bpp"
-INCBIN "gfx/overworld/018.2bpp"
-INCBIN "gfx/overworld/019.2bpp"
-INCBIN "gfx/overworld/020.2bpp"
-; c0540
-
-OakSpriteGFX: ; c0540
-INCBIN "gfx/overworld/021.2bpp"
-INCBIN "gfx/overworld/022.2bpp"
-INCBIN "gfx/overworld/023.2bpp"
-INCBIN "gfx/overworld/024.2bpp"
-INCBIN "gfx/overworld/025.2bpp"
-INCBIN "gfx/overworld/026.2bpp"
-; c06c0
-
-RedSpriteGFX: ; c06c0
-INCBIN "gfx/overworld/027.2bpp"
-INCBIN "gfx/overworld/028.2bpp"
-INCBIN "gfx/overworld/029.2bpp"
-INCBIN "gfx/overworld/030.2bpp"
-INCBIN "gfx/overworld/031.2bpp"
-INCBIN "gfx/overworld/032.2bpp"
-; c0840
-
-BlueSpriteGFX: ; c0840
-INCBIN "gfx/overworld/033.2bpp"
-INCBIN "gfx/overworld/034.2bpp"
-INCBIN "gfx/overworld/035.2bpp"
-INCBIN "gfx/overworld/036.2bpp"
-INCBIN "gfx/overworld/037.2bpp"
-INCBIN "gfx/overworld/038.2bpp"
-; c09c0
-
-BillSpriteGFX: ; c09c0
-INCBIN "gfx/overworld/039.2bpp"
-INCBIN "gfx/overworld/040.2bpp"
-INCBIN "gfx/overworld/041.2bpp"
-INCBIN "gfx/overworld/042.2bpp"
-INCBIN "gfx/overworld/043.2bpp"
-INCBIN "gfx/overworld/044.2bpp"
-; c0b40
-
-ElderSpriteGFX: ; c0b40
-INCBIN "gfx/overworld/045.2bpp"
-INCBIN "gfx/overworld/046.2bpp"
-INCBIN "gfx/overworld/047.2bpp"
-INCBIN "gfx/overworld/048.2bpp"
-INCBIN "gfx/overworld/049.2bpp"
-INCBIN "gfx/overworld/050.2bpp"
-; c0cc0
-
-JanineSpriteGFX: ; c0cc0
-INCBIN "gfx/overworld/051.2bpp"
-INCBIN "gfx/overworld/052.2bpp"
-INCBIN "gfx/overworld/053.2bpp"
-INCBIN "gfx/overworld/054.2bpp"
-INCBIN "gfx/overworld/055.2bpp"
-INCBIN "gfx/overworld/056.2bpp"
-; c0e40
-
-KurtSpriteGFX: ; c0e40
-INCBIN "gfx/overworld/057.2bpp"
-INCBIN "gfx/overworld/058.2bpp"
-INCBIN "gfx/overworld/059.2bpp"
-INCBIN "gfx/overworld/060.2bpp"
-INCBIN "gfx/overworld/061.2bpp"
-INCBIN "gfx/overworld/062.2bpp"
-; c0fc0
-
-MomSpriteGFX: ; c0fc0
-INCBIN "gfx/overworld/063.2bpp"
-INCBIN "gfx/overworld/064.2bpp"
-INCBIN "gfx/overworld/065.2bpp"
-INCBIN "gfx/overworld/066.2bpp"
-INCBIN "gfx/overworld/067.2bpp"
-INCBIN "gfx/overworld/068.2bpp"
-; c1140
-
-BlaineSpriteGFX: ; c1140
-INCBIN "gfx/overworld/069.2bpp"
-INCBIN "gfx/overworld/070.2bpp"
-INCBIN "gfx/overworld/071.2bpp"
-INCBIN "gfx/overworld/072.2bpp"
-INCBIN "gfx/overworld/073.2bpp"
-INCBIN "gfx/overworld/074.2bpp"
-; c12c0
-
-RedsMomSpriteGFX: ; c12c0
-INCBIN "gfx/overworld/075.2bpp"
-INCBIN "gfx/overworld/076.2bpp"
-INCBIN "gfx/overworld/077.2bpp"
-INCBIN "gfx/overworld/078.2bpp"
-INCBIN "gfx/overworld/079.2bpp"
-INCBIN "gfx/overworld/080.2bpp"
-; c1440
-
-DaisySpriteGFX: ; c1440
-INCBIN "gfx/overworld/081.2bpp"
-INCBIN "gfx/overworld/082.2bpp"
-INCBIN "gfx/overworld/083.2bpp"
-INCBIN "gfx/overworld/084.2bpp"
-INCBIN "gfx/overworld/085.2bpp"
-INCBIN "gfx/overworld/086.2bpp"
-; c15c0
-
-ElmSpriteGFX: ; c15c0
-INCBIN "gfx/overworld/087.2bpp"
-INCBIN "gfx/overworld/088.2bpp"
-INCBIN "gfx/overworld/089.2bpp"
-INCBIN "gfx/overworld/090.2bpp"
-INCBIN "gfx/overworld/091.2bpp"
-INCBIN "gfx/overworld/092.2bpp"
-; c1740
-
-WillSpriteGFX: ; c1740
-INCBIN "gfx/overworld/093.2bpp"
-INCBIN "gfx/overworld/094.2bpp"
-INCBIN "gfx/overworld/095.2bpp"
-; c1800
-
-FalknerSpriteGFX: ; c1800
-INCBIN "gfx/overworld/096.2bpp"
-INCBIN "gfx/overworld/097.2bpp"
-INCBIN "gfx/overworld/098.2bpp"
-INCBIN "gfx/overworld/099.2bpp"
-INCBIN "gfx/overworld/100.2bpp"
-INCBIN "gfx/overworld/101.2bpp"
-; c1980
-
-WhitneySpriteGFX: ; c1980
-INCBIN "gfx/overworld/102.2bpp"
-INCBIN "gfx/overworld/103.2bpp"
-INCBIN "gfx/overworld/104.2bpp"
-INCBIN "gfx/overworld/105.2bpp"
-INCBIN "gfx/overworld/106.2bpp"
-INCBIN "gfx/overworld/107.2bpp"
-; c1b00
-
-BugsySpriteGFX: ; c1b00
-INCBIN "gfx/overworld/108.2bpp"
-INCBIN "gfx/overworld/109.2bpp"
-INCBIN "gfx/overworld/110.2bpp"
-INCBIN "gfx/overworld/111.2bpp"
-INCBIN "gfx/overworld/112.2bpp"
-INCBIN "gfx/overworld/113.2bpp"
-; c1c80
-
-MortySpriteGFX: ; c1c80
-INCBIN "gfx/overworld/114.2bpp"
-INCBIN "gfx/overworld/115.2bpp"
-INCBIN "gfx/overworld/116.2bpp"
-INCBIN "gfx/overworld/117.2bpp"
-INCBIN "gfx/overworld/118.2bpp"
-INCBIN "gfx/overworld/119.2bpp"
-; c1e00
-
-ChuckSpriteGFX: ; c1e00
-INCBIN "gfx/overworld/120.2bpp"
-INCBIN "gfx/overworld/121.2bpp"
-INCBIN "gfx/overworld/122.2bpp"
-INCBIN "gfx/overworld/123.2bpp"
-INCBIN "gfx/overworld/124.2bpp"
-INCBIN "gfx/overworld/125.2bpp"
-; c1f80
-
-JasmineSpriteGFX: ; c1f80
-INCBIN "gfx/overworld/126.2bpp"
-INCBIN "gfx/overworld/127.2bpp"
-INCBIN "gfx/overworld/128.2bpp"
-INCBIN "gfx/overworld/129.2bpp"
-INCBIN "gfx/overworld/130.2bpp"
-INCBIN "gfx/overworld/131.2bpp"
-; c2100
-
-PryceSpriteGFX: ; c2100
-INCBIN "gfx/overworld/132.2bpp"
-INCBIN "gfx/overworld/133.2bpp"
-INCBIN "gfx/overworld/134.2bpp"
-INCBIN "gfx/overworld/135.2bpp"
-INCBIN "gfx/overworld/136.2bpp"
-INCBIN "gfx/overworld/137.2bpp"
-; c2280
-
-ClairSpriteGFX: ; c2280
-INCBIN "gfx/overworld/138.2bpp"
-INCBIN "gfx/overworld/139.2bpp"
-INCBIN "gfx/overworld/140.2bpp"
-INCBIN "gfx/overworld/141.2bpp"
-INCBIN "gfx/overworld/142.2bpp"
-INCBIN "gfx/overworld/143.2bpp"
-; c2400
-
-BrockSpriteGFX: ; c2400
-INCBIN "gfx/overworld/144.2bpp"
-INCBIN "gfx/overworld/145.2bpp"
-INCBIN "gfx/overworld/146.2bpp"
-INCBIN "gfx/overworld/147.2bpp"
-INCBIN "gfx/overworld/148.2bpp"
-INCBIN "gfx/overworld/149.2bpp"
-; c2580
-
-KarenSpriteGFX: ; c2580
-INCBIN "gfx/overworld/150.2bpp"
-INCBIN "gfx/overworld/151.2bpp"
-INCBIN "gfx/overworld/152.2bpp"
-; c2640
-
-BrunoSpriteGFX: ; c2640
-INCBIN "gfx/overworld/153.2bpp"
-INCBIN "gfx/overworld/154.2bpp"
-INCBIN "gfx/overworld/155.2bpp"
-INCBIN "gfx/overworld/156.2bpp"
-INCBIN "gfx/overworld/157.2bpp"
-INCBIN "gfx/overworld/158.2bpp"
-; c27c0
-
-MistySpriteGFX: ; c27c0
-INCBIN "gfx/overworld/159.2bpp"
-INCBIN "gfx/overworld/160.2bpp"
-INCBIN "gfx/overworld/161.2bpp"
-INCBIN "gfx/overworld/162.2bpp"
-INCBIN "gfx/overworld/163.2bpp"
-INCBIN "gfx/overworld/164.2bpp"
-; c2940
-
-LanceSpriteGFX: ; c2940
-INCBIN "gfx/overworld/165.2bpp"
-INCBIN "gfx/overworld/166.2bpp"
-INCBIN "gfx/overworld/167.2bpp"
-INCBIN "gfx/overworld/168.2bpp"
-INCBIN "gfx/overworld/169.2bpp"
-INCBIN "gfx/overworld/170.2bpp"
-; c2ac0
-
-SurgeSpriteGFX: ; c2ac0
-INCBIN "gfx/overworld/171.2bpp"
-INCBIN "gfx/overworld/172.2bpp"
-INCBIN "gfx/overworld/173.2bpp"
-INCBIN "gfx/overworld/174.2bpp"
-INCBIN "gfx/overworld/175.2bpp"
-INCBIN "gfx/overworld/176.2bpp"
-; c2c40
-
-ErikaSpriteGFX: ; c2c40
-INCBIN "gfx/overworld/177.2bpp"
-INCBIN "gfx/overworld/178.2bpp"
-INCBIN "gfx/overworld/179.2bpp"
-INCBIN "gfx/overworld/180.2bpp"
-INCBIN "gfx/overworld/181.2bpp"
-INCBIN "gfx/overworld/182.2bpp"
-; c2dc0
-
-KogaSpriteGFX: ; c2dc0
-INCBIN "gfx/overworld/183.2bpp"
-INCBIN "gfx/overworld/184.2bpp"
-INCBIN "gfx/overworld/185.2bpp"
-INCBIN "gfx/overworld/186.2bpp"
-INCBIN "gfx/overworld/187.2bpp"
-INCBIN "gfx/overworld/188.2bpp"
-; c2f40
-
-SabrinaSpriteGFX: ; c2f40
-INCBIN "gfx/overworld/189.2bpp"
-INCBIN "gfx/overworld/190.2bpp"
-INCBIN "gfx/overworld/191.2bpp"
-INCBIN "gfx/overworld/192.2bpp"
-INCBIN "gfx/overworld/193.2bpp"
-INCBIN "gfx/overworld/194.2bpp"
-; c30c0
-
-CooltrainerMSpriteGFX: ; c30c0
-INCBIN "gfx/overworld/195.2bpp"
-INCBIN "gfx/overworld/196.2bpp"
-INCBIN "gfx/overworld/197.2bpp"
-INCBIN "gfx/overworld/198.2bpp"
-INCBIN "gfx/overworld/199.2bpp"
-INCBIN "gfx/overworld/200.2bpp"
-; c3240
-
-CooltrainerFSpriteGFX: ; c3240
-INCBIN "gfx/overworld/201.2bpp"
-INCBIN "gfx/overworld/202.2bpp"
-INCBIN "gfx/overworld/203.2bpp"
-INCBIN "gfx/overworld/204.2bpp"
-INCBIN "gfx/overworld/205.2bpp"
-INCBIN "gfx/overworld/206.2bpp"
-; c33c0
-
-BugCatcherSpriteGFX: ; c33c0
-INCBIN "gfx/overworld/207.2bpp"
-INCBIN "gfx/overworld/208.2bpp"
-INCBIN "gfx/overworld/209.2bpp"
-INCBIN "gfx/overworld/210.2bpp"
-INCBIN "gfx/overworld/211.2bpp"
-INCBIN "gfx/overworld/212.2bpp"
-; c3540
-
-TwinSpriteGFX: ; c3540
-INCBIN "gfx/overworld/213.2bpp"
-INCBIN "gfx/overworld/214.2bpp"
-INCBIN "gfx/overworld/215.2bpp"
-INCBIN "gfx/overworld/216.2bpp"
-INCBIN "gfx/overworld/217.2bpp"
-INCBIN "gfx/overworld/218.2bpp"
-; c36c0
-
-YoungsterSpriteGFX: ; c36c0
-INCBIN "gfx/overworld/219.2bpp"
-INCBIN "gfx/overworld/220.2bpp"
-INCBIN "gfx/overworld/221.2bpp"
-INCBIN "gfx/overworld/222.2bpp"
-INCBIN "gfx/overworld/223.2bpp"
-INCBIN "gfx/overworld/224.2bpp"
-; c3840
-
-LassSpriteGFX: ; c3840
-INCBIN "gfx/overworld/225.2bpp"
-INCBIN "gfx/overworld/226.2bpp"
-INCBIN "gfx/overworld/227.2bpp"
-INCBIN "gfx/overworld/228.2bpp"
-INCBIN "gfx/overworld/229.2bpp"
-INCBIN "gfx/overworld/230.2bpp"
-; c39c0
-
-TeacherSpriteGFX: ; c39c0
-INCBIN "gfx/overworld/231.2bpp"
-INCBIN "gfx/overworld/232.2bpp"
-INCBIN "gfx/overworld/233.2bpp"
-INCBIN "gfx/overworld/234.2bpp"
-INCBIN "gfx/overworld/235.2bpp"
-INCBIN "gfx/overworld/236.2bpp"
-; c3b40
-
-BuenaSpriteGFX: ; c3b40
-INCBIN "gfx/overworld/237.2bpp"
-INCBIN "gfx/overworld/238.2bpp"
-INCBIN "gfx/overworld/239.2bpp"
-INCBIN "gfx/overworld/240.2bpp"
-INCBIN "gfx/overworld/241.2bpp"
-INCBIN "gfx/overworld/242.2bpp"
-; c3cc0
-
-SuperNerdSpriteGFX: ; c3cc0
-INCBIN "gfx/overworld/243.2bpp"
-INCBIN "gfx/overworld/244.2bpp"
-INCBIN "gfx/overworld/245.2bpp"
-INCBIN "gfx/overworld/246.2bpp"
-INCBIN "gfx/overworld/247.2bpp"
-INCBIN "gfx/overworld/248.2bpp"
-; c3e40
-
-RockerSpriteGFX: ; c3e40
-INCBIN "gfx/overworld/249.2bpp"
-INCBIN "gfx/overworld/250.2bpp"
-INCBIN "gfx/overworld/251.2bpp"
-INCBIN "gfx/overworld/252.2bpp"
-INCBIN "gfx/overworld/253.2bpp"
-INCBIN "gfx/overworld/254.2bpp"
-INCBIN "gfx/overworld/255.2bpp"
-; c4000
-
+ChrisSpriteGFX:        INCBIN "gfx/overworld/000.2bpp" ; c0000
+ChrisBikeSpriteGFX:    INCBIN "gfx/overworld/001.2bpp" ; c0180
+GameboyKidSpriteGFX:   INCBIN "gfx/overworld/002.2bpp" ; c0300
+SilverSpriteGFX:       INCBIN "gfx/overworld/003.2bpp" ; c03c0
+OakSpriteGFX:          INCBIN "gfx/overworld/004.2bpp" ; c0540
+RedSpriteGFX:          INCBIN "gfx/overworld/005.2bpp" ; c06c0
+BlueSpriteGFX:         INCBIN "gfx/overworld/006.2bpp" ; c0840
+BillSpriteGFX:         INCBIN "gfx/overworld/007.2bpp" ; c09c0
+ElderSpriteGFX:        INCBIN "gfx/overworld/008.2bpp" ; c0b40
+JanineSpriteGFX:       INCBIN "gfx/overworld/009.2bpp" ; c0cc0
+KurtSpriteGFX:         INCBIN "gfx/overworld/010.2bpp" ; c0e40
+MomSpriteGFX:          INCBIN "gfx/overworld/011.2bpp" ; c0fc0
+BlaineSpriteGFX:       INCBIN "gfx/overworld/012.2bpp" ; c1140
+RedsMomSpriteGFX:      INCBIN "gfx/overworld/013.2bpp" ; c12c0
+DaisySpriteGFX:        INCBIN "gfx/overworld/014.2bpp" ; c1440
+ElmSpriteGFX:          INCBIN "gfx/overworld/015.2bpp" ; c15c0
+WillSpriteGFX:         INCBIN "gfx/overworld/016.2bpp" ; c1740
+FalknerSpriteGFX:      INCBIN "gfx/overworld/017.2bpp" ; c1800
+WhitneySpriteGFX:      INCBIN "gfx/overworld/018.2bpp" ; c1980
+BugsySpriteGFX:        INCBIN "gfx/overworld/019.2bpp" ; c1b00
+MortySpriteGFX:        INCBIN "gfx/overworld/020.2bpp" ; c1c80
+ChuckSpriteGFX:        INCBIN "gfx/overworld/021.2bpp" ; c1e00
+JasmineSpriteGFX:      INCBIN "gfx/overworld/022.2bpp" ; c1f80
+PryceSpriteGFX:        INCBIN "gfx/overworld/023.2bpp" ; c2100
+ClairSpriteGFX:        INCBIN "gfx/overworld/024.2bpp" ; c2280
+BrockSpriteGFX:        INCBIN "gfx/overworld/025.2bpp" ; c2400
+KarenSpriteGFX:        INCBIN "gfx/overworld/026.2bpp" ; c2580
+BrunoSpriteGFX:        INCBIN "gfx/overworld/027.2bpp" ; c2640
+MistySpriteGFX:        INCBIN "gfx/overworld/028.2bpp" ; c27c0
+LanceSpriteGFX:        INCBIN "gfx/overworld/029.2bpp" ; c2940
+SurgeSpriteGFX:        INCBIN "gfx/overworld/030.2bpp" ; c2ac0
+ErikaSpriteGFX:        INCBIN "gfx/overworld/031.2bpp" ; c2c40
+KogaSpriteGFX:         INCBIN "gfx/overworld/032.2bpp" ; c2dc0
+SabrinaSpriteGFX:      INCBIN "gfx/overworld/033.2bpp" ; c2f40
+CooltrainerMSpriteGFX: INCBIN "gfx/overworld/034.2bpp" ; c30c0
+CooltrainerFSpriteGFX: INCBIN "gfx/overworld/035.2bpp" ; c3240
+BugCatcherSpriteGFX:   INCBIN "gfx/overworld/036.2bpp" ; c33c0
+TwinSpriteGFX:         INCBIN "gfx/overworld/037.2bpp" ; c3540
+YoungsterSpriteGFX:    INCBIN "gfx/overworld/038.2bpp" ; c36c0
+LassSpriteGFX:         INCBIN "gfx/overworld/039.2bpp" ; c3840
+TeacherSpriteGFX:      INCBIN "gfx/overworld/040.2bpp" ; c39c0
+BuenaSpriteGFX:        INCBIN "gfx/overworld/041.2bpp" ; c3b40
+SuperNerdSpriteGFX:    INCBIN "gfx/overworld/042.2bpp" ; c3cc0
+RockerSpriteGFX:       INCBIN "gfx/overworld/043.2bpp" ; c3e40
diff --git a/gfx/overworld/sprites_2.asm b/gfx/overworld/sprites_2.asm
index cc80d3df3..20060d0c1 100644
--- a/gfx/overworld/sprites_2.asm
+++ b/gfx/overworld/sprites_2.asm
@@ -1,430 +1,58 @@
-PokefanMSpriteGFX: ; c4000
-INCBIN "gfx/overworld/256.2bpp"
-INCBIN "gfx/overworld/257.2bpp"
-INCBIN "gfx/overworld/258.2bpp"
-INCBIN "gfx/overworld/259.2bpp"
-INCBIN "gfx/overworld/260.2bpp"
-INCBIN "gfx/overworld/261.2bpp"
-; c4180
-
-PokefanFSpriteGFX: ; c4180
-INCBIN "gfx/overworld/262.2bpp"
-INCBIN "gfx/overworld/263.2bpp"
-INCBIN "gfx/overworld/264.2bpp"
-INCBIN "gfx/overworld/265.2bpp"
-INCBIN "gfx/overworld/266.2bpp"
-INCBIN "gfx/overworld/267.2bpp"
-; c4300
-
-GrampsSpriteGFX: ; c4300
-INCBIN "gfx/overworld/268.2bpp"
-INCBIN "gfx/overworld/269.2bpp"
-INCBIN "gfx/overworld/270.2bpp"
-INCBIN "gfx/overworld/271.2bpp"
-INCBIN "gfx/overworld/272.2bpp"
-INCBIN "gfx/overworld/273.2bpp"
-; c4480
-
-GrannySpriteGFX: ; c4480
-INCBIN "gfx/overworld/274.2bpp"
-INCBIN "gfx/overworld/275.2bpp"
-INCBIN "gfx/overworld/276.2bpp"
-INCBIN "gfx/overworld/277.2bpp"
-INCBIN "gfx/overworld/278.2bpp"
-INCBIN "gfx/overworld/279.2bpp"
-; c4600
-
-SwimmerGuySpriteGFX: ; c4600
-INCBIN "gfx/overworld/280.2bpp"
-INCBIN "gfx/overworld/281.2bpp"
-INCBIN "gfx/overworld/282.2bpp"
-INCBIN "gfx/overworld/283.2bpp"
-INCBIN "gfx/overworld/284.2bpp"
-INCBIN "gfx/overworld/285.2bpp"
-; c4780
-
-SwimmerGirlSpriteGFX: ; c4780
-INCBIN "gfx/overworld/286.2bpp"
-INCBIN "gfx/overworld/287.2bpp"
-INCBIN "gfx/overworld/288.2bpp"
-INCBIN "gfx/overworld/289.2bpp"
-INCBIN "gfx/overworld/290.2bpp"
-INCBIN "gfx/overworld/291.2bpp"
-; c4900
-
-BigSnorlaxSpriteGFX: ; c4900
-INCBIN "gfx/overworld/292.2bpp"
-INCBIN "gfx/overworld/293.2bpp"
-; c4980
-
-SurfingPikachuSpriteGFX: ; c4980
-INCBIN "gfx/overworld/294.2bpp"
-INCBIN "gfx/overworld/295.2bpp"
-INCBIN "gfx/overworld/296.2bpp"
-INCBIN "gfx/overworld/297.2bpp"
-INCBIN "gfx/overworld/298.2bpp"
-INCBIN "gfx/overworld/299.2bpp"
-; c4b00
-
-RocketSpriteGFX: ; c4b00
-INCBIN "gfx/overworld/300.2bpp"
-INCBIN "gfx/overworld/301.2bpp"
-INCBIN "gfx/overworld/302.2bpp"
-INCBIN "gfx/overworld/303.2bpp"
-INCBIN "gfx/overworld/304.2bpp"
-INCBIN "gfx/overworld/305.2bpp"
-; c4c80
-
-RocketGirlSpriteGFX: ; c4c80
-INCBIN "gfx/overworld/306.2bpp"
-INCBIN "gfx/overworld/307.2bpp"
-INCBIN "gfx/overworld/308.2bpp"
-INCBIN "gfx/overworld/309.2bpp"
-INCBIN "gfx/overworld/310.2bpp"
-INCBIN "gfx/overworld/311.2bpp"
-; c4e00
-
-NurseSpriteGFX: ; c4e00
-INCBIN "gfx/overworld/312.2bpp"
-INCBIN "gfx/overworld/313.2bpp"
-INCBIN "gfx/overworld/314.2bpp"
-; c4ec0
-
-LinkReceptionistSpriteGFX: ; c4ec0
-INCBIN "gfx/overworld/315.2bpp"
-INCBIN "gfx/overworld/316.2bpp"
-INCBIN "gfx/overworld/317.2bpp"
-INCBIN "gfx/overworld/318.2bpp"
-INCBIN "gfx/overworld/319.2bpp"
-INCBIN "gfx/overworld/320.2bpp"
-; c5040
-
-ClerkSpriteGFX: ; c5040
-INCBIN "gfx/overworld/321.2bpp"
-INCBIN "gfx/overworld/322.2bpp"
-INCBIN "gfx/overworld/323.2bpp"
-INCBIN "gfx/overworld/324.2bpp"
-INCBIN "gfx/overworld/325.2bpp"
-INCBIN "gfx/overworld/326.2bpp"
-; c51c0
-
-FisherSpriteGFX: ; c51c0
-INCBIN "gfx/overworld/327.2bpp"
-INCBIN "gfx/overworld/328.2bpp"
-INCBIN "gfx/overworld/329.2bpp"
-INCBIN "gfx/overworld/330.2bpp"
-INCBIN "gfx/overworld/331.2bpp"
-INCBIN "gfx/overworld/332.2bpp"
-; c5340
-
-FishingGuruSpriteGFX: ; c5340
-INCBIN "gfx/overworld/333.2bpp"
-INCBIN "gfx/overworld/334.2bpp"
-INCBIN "gfx/overworld/335.2bpp"
-INCBIN "gfx/overworld/336.2bpp"
-INCBIN "gfx/overworld/337.2bpp"
-INCBIN "gfx/overworld/338.2bpp"
-; c54c0
-
-ScientistSpriteGFX: ; c54c0
-INCBIN "gfx/overworld/339.2bpp"
-INCBIN "gfx/overworld/340.2bpp"
-INCBIN "gfx/overworld/341.2bpp"
-INCBIN "gfx/overworld/342.2bpp"
-INCBIN "gfx/overworld/343.2bpp"
-INCBIN "gfx/overworld/344.2bpp"
-; c5640
-
-KimonoGirlSpriteGFX: ; c5640
-INCBIN "gfx/overworld/345.2bpp"
-INCBIN "gfx/overworld/346.2bpp"
-INCBIN "gfx/overworld/347.2bpp"
-INCBIN "gfx/overworld/348.2bpp"
-INCBIN "gfx/overworld/349.2bpp"
-INCBIN "gfx/overworld/350.2bpp"
-; c57c0
-
-SageSpriteGFX: ; c57c0
-INCBIN "gfx/overworld/351.2bpp"
-INCBIN "gfx/overworld/352.2bpp"
-INCBIN "gfx/overworld/353.2bpp"
-INCBIN "gfx/overworld/354.2bpp"
-INCBIN "gfx/overworld/355.2bpp"
-INCBIN "gfx/overworld/356.2bpp"
-; c5940
-
-UnusedGuySpriteGFX: ; c5940
-INCBIN "gfx/overworld/357.2bpp"
-INCBIN "gfx/overworld/358.2bpp"
-INCBIN "gfx/overworld/359.2bpp"
-INCBIN "gfx/overworld/360.2bpp"
-INCBIN "gfx/overworld/361.2bpp"
-INCBIN "gfx/overworld/362.2bpp"
-; c5ac0
-
-GentlemanSpriteGFX: ; c5ac0
-INCBIN "gfx/overworld/363.2bpp"
-INCBIN "gfx/overworld/364.2bpp"
-INCBIN "gfx/overworld/365.2bpp"
-INCBIN "gfx/overworld/366.2bpp"
-INCBIN "gfx/overworld/367.2bpp"
-INCBIN "gfx/overworld/368.2bpp"
-; c5c40
-
-BlackBeltSpriteGFX: ; c5c40
-INCBIN "gfx/overworld/369.2bpp"
-INCBIN "gfx/overworld/370.2bpp"
-INCBIN "gfx/overworld/371.2bpp"
-INCBIN "gfx/overworld/372.2bpp"
-INCBIN "gfx/overworld/373.2bpp"
-INCBIN "gfx/overworld/374.2bpp"
-; c5dc0
-
-ReceptionistSpriteGFX: ; c5dc0
-INCBIN "gfx/overworld/375.2bpp"
-INCBIN "gfx/overworld/376.2bpp"
-INCBIN "gfx/overworld/377.2bpp"
-INCBIN "gfx/overworld/378.2bpp"
-INCBIN "gfx/overworld/379.2bpp"
-INCBIN "gfx/overworld/380.2bpp"
-; c5f40
-
-OfficerSpriteGFX: ; c5f40
-INCBIN "gfx/overworld/381.2bpp"
-INCBIN "gfx/overworld/382.2bpp"
-INCBIN "gfx/overworld/383.2bpp"
-INCBIN "gfx/overworld/384.2bpp"
-INCBIN "gfx/overworld/385.2bpp"
-INCBIN "gfx/overworld/386.2bpp"
-; c60c0
-
-CalSpriteGFX: ; c60c0
-INCBIN "gfx/overworld/387.2bpp"
-INCBIN "gfx/overworld/388.2bpp"
-INCBIN "gfx/overworld/389.2bpp"
-INCBIN "gfx/overworld/390.2bpp"
-INCBIN "gfx/overworld/391.2bpp"
-INCBIN "gfx/overworld/392.2bpp"
-; c6240
-
-SlowpokeSpriteGFX: ; c6240
-INCBIN "gfx/overworld/393.2bpp"
-; c6280
-
-CaptainSpriteGFX: ; c6280
-INCBIN "gfx/overworld/394.2bpp"
-INCBIN "gfx/overworld/395.2bpp"
-INCBIN "gfx/overworld/396.2bpp"
-INCBIN "gfx/overworld/397.2bpp"
-INCBIN "gfx/overworld/398.2bpp"
-INCBIN "gfx/overworld/399.2bpp"
-; c6400
-
-BigLaprasSpriteGFX: ; c6400
-INCBIN "gfx/overworld/400.2bpp"
-INCBIN "gfx/overworld/401.2bpp"
-; c6480
-
-GymGuySpriteGFX: ; c6480
-INCBIN "gfx/overworld/402.2bpp"
-INCBIN "gfx/overworld/403.2bpp"
-INCBIN "gfx/overworld/404.2bpp"
-INCBIN "gfx/overworld/405.2bpp"
-INCBIN "gfx/overworld/406.2bpp"
-INCBIN "gfx/overworld/407.2bpp"
-; c6600
-
-SailorSpriteGFX: ; c6600
-INCBIN "gfx/overworld/408.2bpp"
-INCBIN "gfx/overworld/409.2bpp"
-INCBIN "gfx/overworld/410.2bpp"
-INCBIN "gfx/overworld/411.2bpp"
-INCBIN "gfx/overworld/412.2bpp"
-INCBIN "gfx/overworld/413.2bpp"
-; c6780
-
-BikerSpriteGFX: ; c6780
-INCBIN "gfx/overworld/414.2bpp"
-INCBIN "gfx/overworld/415.2bpp"
-INCBIN "gfx/overworld/416.2bpp"
-INCBIN "gfx/overworld/417.2bpp"
-INCBIN "gfx/overworld/418.2bpp"
-INCBIN "gfx/overworld/419.2bpp"
-; c6900
-
-PharmacistSpriteGFX: ; c6900
-INCBIN "gfx/overworld/420.2bpp"
-INCBIN "gfx/overworld/421.2bpp"
-INCBIN "gfx/overworld/422.2bpp"
-INCBIN "gfx/overworld/423.2bpp"
-INCBIN "gfx/overworld/424.2bpp"
-INCBIN "gfx/overworld/425.2bpp"
-; c6a80
-
-MonsterSpriteGFX: ; c6a80
-INCBIN "gfx/overworld/426.2bpp"
-INCBIN "gfx/overworld/427.2bpp"
-INCBIN "gfx/overworld/428.2bpp"
-INCBIN "gfx/overworld/429.2bpp"
-INCBIN "gfx/overworld/430.2bpp"
-INCBIN "gfx/overworld/431.2bpp"
-; c6c00
-
-FairySpriteGFX: ; c6c00
-INCBIN "gfx/overworld/432.2bpp"
-INCBIN "gfx/overworld/433.2bpp"
-INCBIN "gfx/overworld/434.2bpp"
-INCBIN "gfx/overworld/435.2bpp"
-INCBIN "gfx/overworld/436.2bpp"
-INCBIN "gfx/overworld/437.2bpp"
-; c6d80
-
-BirdSpriteGFX: ; c6d80
-INCBIN "gfx/overworld/438.2bpp"
-INCBIN "gfx/overworld/439.2bpp"
-INCBIN "gfx/overworld/440.2bpp"
-INCBIN "gfx/overworld/441.2bpp"
-INCBIN "gfx/overworld/442.2bpp"
-INCBIN "gfx/overworld/443.2bpp"
-; c6f00
-
-DragonSpriteGFX: ; c6f00
-INCBIN "gfx/overworld/444.2bpp"
-INCBIN "gfx/overworld/445.2bpp"
-INCBIN "gfx/overworld/446.2bpp"
-INCBIN "gfx/overworld/447.2bpp"
-INCBIN "gfx/overworld/448.2bpp"
-INCBIN "gfx/overworld/449.2bpp"
-; c7080
-
-BigOnixSpriteGFX: ; c7080
-INCBIN "gfx/overworld/450.2bpp"
-INCBIN "gfx/overworld/451.2bpp"
-INCBIN "gfx/overworld/452.2bpp"
-; c7140
-
-N64SpriteGFX: ; c7140
-INCBIN "gfx/overworld/453.2bpp"
-; c7180
-
-SudowoodoSpriteGFX: ; c7180
-INCBIN "gfx/overworld/454.2bpp"
-INCBIN "gfx/overworld/455.2bpp"
-; c7200
-
-SurfSpriteGFX: ; c7200
-INCBIN "gfx/overworld/456.2bpp"
-INCBIN "gfx/overworld/457.2bpp"
-INCBIN "gfx/overworld/458.2bpp"
-INCBIN "gfx/overworld/459.2bpp"
-INCBIN "gfx/overworld/460.2bpp"
-INCBIN "gfx/overworld/461.2bpp"
-; c7380
-
-PokeBallSpriteGFX: ; c7380
-INCBIN "gfx/overworld/462.2bpp"
-INCBIN "gfx/overworld/463.2bpp"
-INCBIN "gfx/overworld/464.2bpp"
-INCBIN "gfx/overworld/465.2bpp"
-INCBIN "gfx/overworld/466.2bpp"
-INCBIN "gfx/overworld/467.2bpp"
-; c7500
-
-PokedexSpriteGFX: ; c7500
-INCBIN "gfx/overworld/468.2bpp"
-INCBIN "gfx/overworld/469.2bpp"
-INCBIN "gfx/overworld/470.2bpp"
-INCBIN "gfx/overworld/471.2bpp"
-INCBIN "gfx/overworld/472.2bpp"
-INCBIN "gfx/overworld/473.2bpp"
-; c7680
-
-PaperSpriteGFX: ; c7680
-INCBIN "gfx/overworld/474.2bpp"
-INCBIN "gfx/overworld/475.2bpp"
-INCBIN "gfx/overworld/476.2bpp"
-INCBIN "gfx/overworld/477.2bpp"
-INCBIN "gfx/overworld/478.2bpp"
-INCBIN "gfx/overworld/479.2bpp"
-; c7800
-
-VirtualBoySpriteGFX: ; c7800
-INCBIN "gfx/overworld/480.2bpp"
-; c7840
-
-OldLinkReceptionistSpriteGFX: ; c7840
-INCBIN "gfx/overworld/481.2bpp"
-; c7880
-
-RockSpriteGFX: ; c7880
-INCBIN "gfx/overworld/482.2bpp"
-; c78c0
-
-BoulderSpriteGFX: ; c78c0
-INCBIN "gfx/overworld/483.2bpp"
-; c7900
-
-SnesSpriteGFX: ; c7900
-INCBIN "gfx/overworld/484.2bpp"
-; c7940
-
-FamicomSpriteGFX: ; c7940
-INCBIN "gfx/overworld/485.2bpp"
-; c7980
-
-FruitTreeSpriteGFX: ; c7980
-INCBIN "gfx/overworld/486.2bpp"
-; c79c0
-
-GoldTrophySpriteGFX: ; c79c0
-INCBIN "gfx/overworld/487.2bpp"
-; c7a00
-
-SilverTrophySpriteGFX: ; c7a00
-INCBIN "gfx/overworld/488.2bpp"
-; c7a40
-
-KrisSpriteGFX: ; c7a40
-INCBIN "gfx/overworld/489.2bpp"
-INCBIN "gfx/overworld/490.2bpp"
-INCBIN "gfx/overworld/491.2bpp"
-INCBIN "gfx/overworld/492.2bpp"
-INCBIN "gfx/overworld/493.2bpp"
-INCBIN "gfx/overworld/494.2bpp"
-; c7bc0
-
-KrisBikeSpriteGFX: ; c7bc0
-INCBIN "gfx/overworld/495.2bpp"
-INCBIN "gfx/overworld/496.2bpp"
-INCBIN "gfx/overworld/497.2bpp"
-INCBIN "gfx/overworld/498.2bpp"
-INCBIN "gfx/overworld/499.2bpp"
-INCBIN "gfx/overworld/500.2bpp"
-; c7d40
-
-KurtOutsideSpriteGFX: ; c7d40
-INCBIN "gfx/overworld/501.2bpp"
-INCBIN "gfx/overworld/502.2bpp"
-INCBIN "gfx/overworld/503.2bpp"
-; c7e00
-
-SuicuneSpriteGFX: ; c7e00
-INCBIN "gfx/overworld/504.2bpp"
-; c7e40
-
-EnteiSpriteGFX: ; c7e40
-INCBIN "gfx/overworld/505.2bpp"
-; c7e80
-
-RaikouSpriteGFX: ; c7e80
-INCBIN "gfx/overworld/506.2bpp"
-; c7ec0
-
-StandingYoungsterSpriteGFX: ; c7ec0
-INCBIN "gfx/overworld/507.2bpp"
-INCBIN "gfx/overworld/508.2bpp"
-INCBIN "gfx/overworld/509.2bpp"
-INCBIN "gfx/overworld/510.2bpp"
-INCBIN "gfx/overworld/511.2bpp"
-; c8000
-
+PokefanMSpriteGFX:            INCBIN "gfx/overworld/044.2bpp" ; c4000
+PokefanFSpriteGFX:            INCBIN "gfx/overworld/045.2bpp" ; c4180
+GrampsSpriteGFX:              INCBIN "gfx/overworld/046.2bpp" ; c4300
+GrannySpriteGFX:              INCBIN "gfx/overworld/047.2bpp" ; c4480
+SwimmerGuySpriteGFX:          INCBIN "gfx/overworld/048.2bpp" ; c4600
+SwimmerGirlSpriteGFX:         INCBIN "gfx/overworld/049.2bpp" ; c4780
+BigSnorlaxSpriteGFX:          INCBIN "gfx/overworld/050.2bpp" ; c4900
+SurfingPikachuSpriteGFX:      INCBIN "gfx/overworld/051.2bpp" ; c4980
+RocketSpriteGFX:              INCBIN "gfx/overworld/052.2bpp" ; c4b00
+RocketGirlSpriteGFX:          INCBIN "gfx/overworld/053.2bpp" ; c4c80
+NurseSpriteGFX:               INCBIN "gfx/overworld/054.2bpp" ; c4e00
+LinkReceptionistSpriteGFX:    INCBIN "gfx/overworld/055.2bpp" ; c4ec0
+ClerkSpriteGFX:               INCBIN "gfx/overworld/056.2bpp" ; c5040
+FisherSpriteGFX:              INCBIN "gfx/overworld/057.2bpp" ; c51c0
+FishingGuruSpriteGFX:         INCBIN "gfx/overworld/058.2bpp" ; c5340
+ScientistSpriteGFX:           INCBIN "gfx/overworld/059.2bpp" ; c54c0
+KimonoGirlSpriteGFX:          INCBIN "gfx/overworld/060.2bpp" ; c5640
+SageSpriteGFX:                INCBIN "gfx/overworld/061.2bpp" ; c57c0
+UnusedGuySpriteGFX:           INCBIN "gfx/overworld/062.2bpp" ; c5940
+GentlemanSpriteGFX:           INCBIN "gfx/overworld/063.2bpp" ; c5ac0
+BlackBeltSpriteGFX:           INCBIN "gfx/overworld/064.2bpp" ; c5c40
+ReceptionistSpriteGFX:        INCBIN "gfx/overworld/065.2bpp" ; c5dc0
+OfficerSpriteGFX:             INCBIN "gfx/overworld/066.2bpp" ; c5f40
+CalSpriteGFX:                 INCBIN "gfx/overworld/067.2bpp" ; c60c0
+SlowpokeSpriteGFX:            INCBIN "gfx/overworld/068.2bpp" ; c6240
+CaptainSpriteGFX:             INCBIN "gfx/overworld/069.2bpp" ; c6280
+BigLaprasSpriteGFX:           INCBIN "gfx/overworld/070.2bpp" ; c6400
+GymGuySpriteGFX:              INCBIN "gfx/overworld/071.2bpp" ; c6480
+SailorSpriteGFX:              INCBIN "gfx/overworld/072.2bpp" ; c6600
+BikerSpriteGFX:               INCBIN "gfx/overworld/073.2bpp" ; c6780
+PharmacistSpriteGFX:          INCBIN "gfx/overworld/074.2bpp" ; c6900
+MonsterSpriteGFX:             INCBIN "gfx/overworld/075.2bpp" ; c6a80
+FairySpriteGFX:               INCBIN "gfx/overworld/076.2bpp" ; c6c00
+BirdSpriteGFX:                INCBIN "gfx/overworld/077.2bpp" ; c6d80
+DragonSpriteGFX:              INCBIN "gfx/overworld/078.2bpp" ; c6f00
+BigOnixSpriteGFX:             INCBIN "gfx/overworld/079.2bpp" ; c7080
+N64SpriteGFX:                 INCBIN "gfx/overworld/080.2bpp" ; c7140
+SudowoodoSpriteGFX:           INCBIN "gfx/overworld/081.2bpp" ; c7180
+SurfSpriteGFX:                INCBIN "gfx/overworld/082.2bpp" ; c7200
+PokeBallSpriteGFX:            INCBIN "gfx/overworld/083.2bpp" ; c7380
+PokedexSpriteGFX:             INCBIN "gfx/overworld/084.2bpp" ; c7500
+PaperSpriteGFX:               INCBIN "gfx/overworld/085.2bpp" ; c7680
+VirtualBoySpriteGFX:          INCBIN "gfx/overworld/086.2bpp" ; c7800
+OldLinkReceptionistSpriteGFX: INCBIN "gfx/overworld/087.2bpp" ; c7840
+RockSpriteGFX:                INCBIN "gfx/overworld/088.2bpp" ; c7880
+BoulderSpriteGFX:             INCBIN "gfx/overworld/089.2bpp" ; c78c0
+SnesSpriteGFX:                INCBIN "gfx/overworld/090.2bpp" ; c7900
+FamicomSpriteGFX:             INCBIN "gfx/overworld/091.2bpp" ; c7940
+FruitTreeSpriteGFX:           INCBIN "gfx/overworld/092.2bpp" ; c7980
+GoldTrophySpriteGFX:          INCBIN "gfx/overworld/093.2bpp" ; c79c0
+SilverTrophySpriteGFX:        INCBIN "gfx/overworld/094.2bpp" ; c7a00
+KrisSpriteGFX:                INCBIN "gfx/overworld/095.2bpp" ; c7a40
+KrisBikeSpriteGFX:            INCBIN "gfx/overworld/096.2bpp" ; c7bc0
+KurtOutsideSpriteGFX:         INCBIN "gfx/overworld/097.2bpp" ; c7d40
+SuicuneSpriteGFX:             INCBIN "gfx/overworld/098.2bpp" ; c7e00
+EnteiSpriteGFX:               INCBIN "gfx/overworld/099.2bpp" ; c7e40
+RaikouSpriteGFX:              INCBIN "gfx/overworld/100.2bpp" ; c7e80
+StandingYoungsterSpriteGFX:   INCBIN "gfx/overworld/101.2bpp" ; c7ec0
diff --git a/gfx/pics/pic_pointers.asm b/gfx/pics/pic_pointers.asm
index 34a5f8f82..ac9864139 100644
--- a/gfx/pics/pic_pointers.asm
+++ b/gfx/pics/pic_pointers.asm
@@ -1,512 +1,511 @@
 
-	dbw BANK(BulbasaurFrontpic)   - $36, BulbasaurFrontpic
-	dbw BANK(BulbasaurBackpic)    - $36, BulbasaurBackpic
-	dbw BANK(IvysaurFrontpic)     - $36, IvysaurFrontpic
-	dbw BANK(IvysaurBackpic)      - $36, IvysaurBackpic
-	dbw BANK(VenusaurFrontpic)    - $36, VenusaurFrontpic
-	dbw BANK(VenusaurBackpic)     - $36, VenusaurBackpic
-	dbw BANK(CharmanderFrontpic)  - $36, CharmanderFrontpic
-	dbw BANK(CharmanderBackpic)   - $36, CharmanderBackpic
-	dbw BANK(CharmeleonFrontpic)  - $36, CharmeleonFrontpic
-	dbw BANK(CharmeleonBackpic)   - $36, CharmeleonBackpic
-	dbw BANK(CharizardFrontpic)   - $36, CharizardFrontpic
-	dbw BANK(CharizardBackpic)    - $36, CharizardBackpic
-	dbw BANK(SquirtleFrontpic)    - $36, SquirtleFrontpic
-	dbw BANK(SquirtleBackpic)     - $36, SquirtleBackpic
-	dbw BANK(WartortleFrontpic)   - $36, WartortleFrontpic
-	dbw BANK(WartortleBackpic)    - $36, WartortleBackpic
-	dbw BANK(BlastoiseFrontpic)   - $36, BlastoiseFrontpic
-	dbw BANK(BlastoiseBackpic)    - $36, BlastoiseBackpic
-	dbw BANK(CaterpieFrontpic)    - $36, CaterpieFrontpic
-	dbw BANK(CaterpieBackpic)     - $36, CaterpieBackpic
-	dbw BANK(MetapodFrontpic)     - $36, MetapodFrontpic
-	dbw BANK(MetapodBackpic)      - $36, MetapodBackpic
-	dbw BANK(ButterfreeFrontpic)  - $36, ButterfreeFrontpic
-	dbw BANK(ButterfreeBackpic)   - $36, ButterfreeBackpic
-	dbw BANK(WeedleFrontpic)      - $36, WeedleFrontpic
-	dbw BANK(WeedleBackpic)       - $36, WeedleBackpic
-	dbw BANK(KakunaFrontpic)      - $36, KakunaFrontpic
-	dbw BANK(KakunaBackpic)       - $36, KakunaBackpic
-	dbw BANK(BeedrillFrontpic)    - $36, BeedrillFrontpic
-	dbw BANK(BeedrillBackpic)     - $36, BeedrillBackpic
-	dbw BANK(PidgeyFrontpic)      - $36, PidgeyFrontpic
-	dbw BANK(PidgeyBackpic)       - $36, PidgeyBackpic
-	dbw BANK(PidgeottoFrontpic)   - $36, PidgeottoFrontpic
-	dbw BANK(PidgeottoBackpic)    - $36, PidgeottoBackpic
-	dbw BANK(PidgeotFrontpic)     - $36, PidgeotFrontpic
-	dbw BANK(PidgeotBackpic)      - $36, PidgeotBackpic
-	dbw BANK(RattataFrontpic)     - $36, RattataFrontpic
-	dbw BANK(RattataBackpic)      - $36, RattataBackpic
-	dbw BANK(RaticateFrontpic)    - $36, RaticateFrontpic
-	dbw BANK(RaticateBackpic)     - $36, RaticateBackpic
-	dbw BANK(SpearowFrontpic)     - $36, SpearowFrontpic
-	dbw BANK(SpearowBackpic)      - $36, SpearowBackpic
-	dbw BANK(FearowFrontpic)      - $36, FearowFrontpic
-	dbw BANK(FearowBackpic)       - $36, FearowBackpic
-	dbw BANK(EkansFrontpic)       - $36, EkansFrontpic
-	dbw BANK(EkansBackpic)        - $36, EkansBackpic
-	dbw BANK(ArbokFrontpic)       - $36, ArbokFrontpic
-	dbw BANK(ArbokBackpic)        - $36, ArbokBackpic
-	dbw BANK(PikachuFrontpic)     - $36, PikachuFrontpic
-	dbw BANK(PikachuBackpic)      - $36, PikachuBackpic
-	dbw BANK(RaichuFrontpic)      - $36, RaichuFrontpic
-	dbw BANK(RaichuBackpic)       - $36, RaichuBackpic
-	dbw BANK(SandshrewFrontpic)   - $36, SandshrewFrontpic
-	dbw BANK(SandshrewBackpic)    - $36, SandshrewBackpic
-	dbw BANK(SandslashFrontpic)   - $36, SandslashFrontpic
-	dbw BANK(SandslashBackpic)    - $36, SandslashBackpic
-	dbw BANK(NidoranFFrontpic)    - $36, NidoranFFrontpic
-	dbw BANK(NidoranFBackpic)     - $36, NidoranFBackpic
-	dbw BANK(NidorinaFrontpic)    - $36, NidorinaFrontpic
-	dbw BANK(NidorinaBackpic)     - $36, NidorinaBackpic
-	dbw BANK(NidoqueenFrontpic)   - $36, NidoqueenFrontpic
-	dbw BANK(NidoqueenBackpic)    - $36, NidoqueenBackpic
-	dbw BANK(NidoranMFrontpic)    - $36, NidoranMFrontpic
-	dbw BANK(NidoranMBackpic)     - $36, NidoranMBackpic
-	dbw BANK(NidorinoFrontpic)    - $36, NidorinoFrontpic
-	dbw BANK(NidorinoBackpic)     - $36, NidorinoBackpic
-	dbw BANK(NidokingFrontpic)    - $36, NidokingFrontpic
-	dbw BANK(NidokingBackpic)     - $36, NidokingBackpic
-	dbw BANK(ClefairyFrontpic)    - $36, ClefairyFrontpic
-	dbw BANK(ClefairyBackpic)     - $36, ClefairyBackpic
-	dbw BANK(ClefableFrontpic)    - $36, ClefableFrontpic
-	dbw BANK(ClefableBackpic)     - $36, ClefableBackpic
-	dbw BANK(VulpixFrontpic)      - $36, VulpixFrontpic
-	dbw BANK(VulpixBackpic)       - $36, VulpixBackpic
-	dbw BANK(NinetalesFrontpic)   - $36, NinetalesFrontpic
-	dbw BANK(NinetalesBackpic)    - $36, NinetalesBackpic
-	dbw BANK(JigglypuffFrontpic)  - $36, JigglypuffFrontpic
-	dbw BANK(JigglypuffBackpic)   - $36, JigglypuffBackpic
-	dbw BANK(WigglytuffFrontpic)  - $36, WigglytuffFrontpic
-	dbw BANK(WigglytuffBackpic)   - $36, WigglytuffBackpic
-	dbw BANK(ZubatFrontpic)       - $36, ZubatFrontpic
-	dbw BANK(ZubatBackpic)        - $36, ZubatBackpic
-	dbw BANK(GolbatFrontpic)      - $36, GolbatFrontpic
-	dbw BANK(GolbatBackpic)       - $36, GolbatBackpic
-	dbw BANK(OddishFrontpic)      - $36, OddishFrontpic
-	dbw BANK(OddishBackpic)       - $36, OddishBackpic
-	dbw BANK(GloomFrontpic)       - $36, GloomFrontpic
-	dbw BANK(GloomBackpic)        - $36, GloomBackpic
-	dbw BANK(VileplumeFrontpic)   - $36, VileplumeFrontpic
-	dbw BANK(VileplumeBackpic)    - $36, VileplumeBackpic
-	dbw BANK(ParasFrontpic)       - $36, ParasFrontpic
-	dbw BANK(ParasBackpic)        - $36, ParasBackpic
-	dbw BANK(ParasectFrontpic)    - $36, ParasectFrontpic
-	dbw BANK(ParasectBackpic)     - $36, ParasectBackpic
-	dbw BANK(VenonatFrontpic)     - $36, VenonatFrontpic
-	dbw BANK(VenonatBackpic)      - $36, VenonatBackpic
-	dbw BANK(VenomothFrontpic)    - $36, VenomothFrontpic
-	dbw BANK(VenomothBackpic)     - $36, VenomothBackpic
-	dbw BANK(DiglettFrontpic)     - $36, DiglettFrontpic
-	dbw BANK(DiglettBackpic)      - $36, DiglettBackpic
-	dbw BANK(DugtrioFrontpic)     - $36, DugtrioFrontpic
-	dbw BANK(DugtrioBackpic)      - $36, DugtrioBackpic
-	dbw BANK(MeowthFrontpic)      - $36, MeowthFrontpic
-	dbw BANK(MeowthBackpic)       - $36, MeowthBackpic
-	dbw BANK(PersianFrontpic)     - $36, PersianFrontpic
-	dbw BANK(PersianBackpic)      - $36, PersianBackpic
-	dbw BANK(PsyduckFrontpic)     - $36, PsyduckFrontpic
-	dbw BANK(PsyduckBackpic)      - $36, PsyduckBackpic
-	dbw BANK(GolduckFrontpic)     - $36, GolduckFrontpic
-	dbw BANK(GolduckBackpic)      - $36, GolduckBackpic
-	dbw BANK(MankeyFrontpic)      - $36, MankeyFrontpic
-	dbw BANK(MankeyBackpic)       - $36, MankeyBackpic
-	dbw BANK(PrimeapeFrontpic)    - $36, PrimeapeFrontpic
-	dbw BANK(PrimeapeBackpic)     - $36, PrimeapeBackpic
-	dbw BANK(GrowlitheFrontpic)   - $36, GrowlitheFrontpic
-	dbw BANK(GrowlitheBackpic)    - $36, GrowlitheBackpic
-	dbw BANK(ArcanineFrontpic)    - $36, ArcanineFrontpic
-	dbw BANK(ArcanineBackpic)     - $36, ArcanineBackpic
-	dbw BANK(PoliwagFrontpic)     - $36, PoliwagFrontpic
-	dbw BANK(PoliwagBackpic)      - $36, PoliwagBackpic
-	dbw BANK(PoliwhirlFrontpic)   - $36, PoliwhirlFrontpic
-	dbw BANK(PoliwhirlBackpic)    - $36, PoliwhirlBackpic
-	dbw BANK(PoliwrathFrontpic)   - $36, PoliwrathFrontpic
-	dbw BANK(PoliwrathBackpic)    - $36, PoliwrathBackpic
-	dbw BANK(AbraFrontpic)        - $36, AbraFrontpic
-	dbw BANK(AbraBackpic)         - $36, AbraBackpic
-	dbw BANK(KadabraFrontpic)     - $36, KadabraFrontpic
-	dbw BANK(KadabraBackpic)      - $36, KadabraBackpic
-	dbw BANK(AlakazamFrontpic)    - $36, AlakazamFrontpic
-	dbw BANK(AlakazamBackpic)     - $36, AlakazamBackpic
-	dbw BANK(MachopFrontpic)      - $36, MachopFrontpic
-	dbw BANK(MachopBackpic)       - $36, MachopBackpic
-	dbw BANK(MachokeFrontpic)     - $36, MachokeFrontpic
-	dbw BANK(MachokeBackpic)      - $36, MachokeBackpic
-	dbw BANK(MachampFrontpic)     - $36, MachampFrontpic
-	dbw BANK(MachampBackpic)      - $36, MachampBackpic
-	dbw BANK(BellsproutFrontpic)  - $36, BellsproutFrontpic
-	dbw BANK(BellsproutBackpic)   - $36, BellsproutBackpic
-	dbw BANK(WeepinbellFrontpic)  - $36, WeepinbellFrontpic
-	dbw BANK(WeepinbellBackpic)   - $36, WeepinbellBackpic
-	dbw BANK(VictreebelFrontpic)  - $36, VictreebelFrontpic
-	dbw BANK(VictreebelBackpic)   - $36, VictreebelBackpic
-	dbw BANK(TentacoolFrontpic)   - $36, TentacoolFrontpic
-	dbw BANK(TentacoolBackpic)    - $36, TentacoolBackpic
-	dbw BANK(TentacruelFrontpic)  - $36, TentacruelFrontpic
-	dbw BANK(TentacruelBackpic)   - $36, TentacruelBackpic
-	dbw BANK(GeodudeFrontpic)     - $36, GeodudeFrontpic
-	dbw BANK(GeodudeBackpic)      - $36, GeodudeBackpic
-	dbw BANK(GravelerFrontpic)    - $36, GravelerFrontpic
-	dbw BANK(GravelerBackpic)     - $36, GravelerBackpic
-	dbw BANK(GolemFrontpic)       - $36, GolemFrontpic
-	dbw BANK(GolemBackpic)        - $36, GolemBackpic
-	dbw BANK(PonytaFrontpic)      - $36, PonytaFrontpic
-	dbw BANK(PonytaBackpic)       - $36, PonytaBackpic
-	dbw BANK(RapidashFrontpic)    - $36, RapidashFrontpic
-	dbw BANK(RapidashBackpic)     - $36, RapidashBackpic
-	dbw BANK(SlowpokeFrontpic)    - $36, SlowpokeFrontpic
-	dbw BANK(SlowpokeBackpic)     - $36, SlowpokeBackpic
-	dbw BANK(SlowbroFrontpic)     - $36, SlowbroFrontpic
-	dbw BANK(SlowbroBackpic)      - $36, SlowbroBackpic
-	dbw BANK(MagnemiteFrontpic)   - $36, MagnemiteFrontpic
-	dbw BANK(MagnemiteBackpic)    - $36, MagnemiteBackpic
-	dbw BANK(MagnetonFrontpic)    - $36, MagnetonFrontpic
-	dbw BANK(MagnetonBackpic)     - $36, MagnetonBackpic
-	dbw BANK(FarfetchDFrontpic)   - $36, FarfetchDFrontpic
-	dbw BANK(FarfetchDBackpic)    - $36, FarfetchDBackpic
-	dbw BANK(DoduoFrontpic)       - $36, DoduoFrontpic
-	dbw BANK(DoduoBackpic)        - $36, DoduoBackpic
-	dbw BANK(DodrioFrontpic)      - $36, DodrioFrontpic
-	dbw BANK(DodrioBackpic)       - $36, DodrioBackpic
-	dbw BANK(SeelFrontpic)        - $36, SeelFrontpic
-	dbw BANK(SeelBackpic)         - $36, SeelBackpic
-	dbw BANK(DewgongFrontpic)     - $36, DewgongFrontpic
-	dbw BANK(DewgongBackpic)      - $36, DewgongBackpic
-	dbw BANK(GrimerFrontpic)      - $36, GrimerFrontpic
-	dbw BANK(GrimerBackpic)       - $36, GrimerBackpic
-	dbw BANK(MukFrontpic)         - $36, MukFrontpic
-	dbw BANK(MukBackpic)          - $36, MukBackpic
-	dbw BANK(ShellderFrontpic)    - $36, ShellderFrontpic
-	dbw BANK(ShellderBackpic)     - $36, ShellderBackpic
-	dbw BANK(CloysterFrontpic)    - $36, CloysterFrontpic
-	dbw BANK(CloysterBackpic)     - $36, CloysterBackpic
-	dbw BANK(GastlyFrontpic)      - $36, GastlyFrontpic
-	dbw BANK(GastlyBackpic)       - $36, GastlyBackpic
-	dbw BANK(HaunterFrontpic)     - $36, HaunterFrontpic
-	dbw BANK(HaunterBackpic)      - $36, HaunterBackpic
-	dbw BANK(GengarFrontpic)      - $36, GengarFrontpic
-	dbw BANK(GengarBackpic)       - $36, GengarBackpic
-	dbw BANK(OnixFrontpic)        - $36, OnixFrontpic
-	dbw BANK(OnixBackpic)         - $36, OnixBackpic
-	dbw BANK(DrowzeeFrontpic)     - $36, DrowzeeFrontpic
-	dbw BANK(DrowzeeBackpic)      - $36, DrowzeeBackpic
-	dbw BANK(HypnoFrontpic)       - $36, HypnoFrontpic
-	dbw BANK(HypnoBackpic)        - $36, HypnoBackpic
-	dbw BANK(KrabbyFrontpic)      - $36, KrabbyFrontpic
-	dbw BANK(KrabbyBackpic)       - $36, KrabbyBackpic
-	dbw BANK(KinglerFrontpic)     - $36, KinglerFrontpic
-	dbw BANK(KinglerBackpic)      - $36, KinglerBackpic
-	dbw BANK(VoltorbFrontpic)     - $36, VoltorbFrontpic
-	dbw BANK(VoltorbBackpic)      - $36, VoltorbBackpic
-	dbw BANK(ElectrodeFrontpic)   - $36, ElectrodeFrontpic
-	dbw BANK(ElectrodeBackpic)    - $36, ElectrodeBackpic
-	dbw BANK(ExeggcuteFrontpic)   - $36, ExeggcuteFrontpic
-	dbw BANK(ExeggcuteBackpic)    - $36, ExeggcuteBackpic
-	dbw BANK(ExeggutorFrontpic)   - $36, ExeggutorFrontpic
-	dbw BANK(ExeggutorBackpic)    - $36, ExeggutorBackpic
-	dbw BANK(CuboneFrontpic)      - $36, CuboneFrontpic
-	dbw BANK(CuboneBackpic)       - $36, CuboneBackpic
-	dbw BANK(MarowakFrontpic)     - $36, MarowakFrontpic
-	dbw BANK(MarowakBackpic)      - $36, MarowakBackpic
-	dbw BANK(HitmonleeFrontpic)   - $36, HitmonleeFrontpic
-	dbw BANK(HitmonleeBackpic)    - $36, HitmonleeBackpic
-	dbw BANK(HitmonchanFrontpic)  - $36, HitmonchanFrontpic
-	dbw BANK(HitmonchanBackpic)   - $36, HitmonchanBackpic
-	dbw BANK(LickitungFrontpic)   - $36, LickitungFrontpic
-	dbw BANK(LickitungBackpic)    - $36, LickitungBackpic
-	dbw BANK(KoffingFrontpic)     - $36, KoffingFrontpic
-	dbw BANK(KoffingBackpic)      - $36, KoffingBackpic
-	dbw BANK(WeezingFrontpic)     - $36, WeezingFrontpic
-	dbw BANK(WeezingBackpic)      - $36, WeezingBackpic
-	dbw BANK(RhyhornFrontpic)     - $36, RhyhornFrontpic
-	dbw BANK(RhyhornBackpic)      - $36, RhyhornBackpic
-	dbw BANK(RhydonFrontpic)      - $36, RhydonFrontpic
-	dbw BANK(RhydonBackpic)       - $36, RhydonBackpic
-	dbw BANK(ChanseyFrontpic)     - $36, ChanseyFrontpic
-	dbw BANK(ChanseyBackpic)      - $36, ChanseyBackpic
-	dbw BANK(TangelaFrontpic)     - $36, TangelaFrontpic
-	dbw BANK(TangelaBackpic)      - $36, TangelaBackpic
-	dbw BANK(KangaskhanFrontpic)  - $36, KangaskhanFrontpic
-	dbw BANK(KangaskhanBackpic)   - $36, KangaskhanBackpic
-	dbw BANK(HorseaFrontpic)      - $36, HorseaFrontpic
-	dbw BANK(HorseaBackpic)       - $36, HorseaBackpic
-	dbw BANK(SeadraFrontpic)      - $36, SeadraFrontpic
-	dbw BANK(SeadraBackpic)       - $36, SeadraBackpic
-	dbw BANK(GoldeenFrontpic)     - $36, GoldeenFrontpic
-	dbw BANK(GoldeenBackpic)      - $36, GoldeenBackpic
-	dbw BANK(SeakingFrontpic)     - $36, SeakingFrontpic
-	dbw BANK(SeakingBackpic)      - $36, SeakingBackpic
-	dbw BANK(StaryuFrontpic)      - $36, StaryuFrontpic
-	dbw BANK(StaryuBackpic)       - $36, StaryuBackpic
-	dbw BANK(StarmieFrontpic)     - $36, StarmieFrontpic
-	dbw BANK(StarmieBackpic)      - $36, StarmieBackpic
-	dbw BANK(MrMimeFrontpic)      - $36, MrMimeFrontpic
-	dbw BANK(MrMimeBackpic)       - $36, MrMimeBackpic
-	dbw BANK(ScytherFrontpic)     - $36, ScytherFrontpic
-	dbw BANK(ScytherBackpic)      - $36, ScytherBackpic
-	dbw BANK(JynxFrontpic)        - $36, JynxFrontpic
-	dbw BANK(JynxBackpic)         - $36, JynxBackpic
-	dbw BANK(ElectabuzzFrontpic)  - $36, ElectabuzzFrontpic
-	dbw BANK(ElectabuzzBackpic)   - $36, ElectabuzzBackpic
-	dbw BANK(MagmarFrontpic)      - $36, MagmarFrontpic
-	dbw BANK(MagmarBackpic)       - $36, MagmarBackpic
-	dbw BANK(PinsirFrontpic)      - $36, PinsirFrontpic
-	dbw BANK(PinsirBackpic)       - $36, PinsirBackpic
-	dbw BANK(TaurosFrontpic)      - $36, TaurosFrontpic
-	dbw BANK(TaurosBackpic)       - $36, TaurosBackpic
-	dbw BANK(MagikarpFrontpic)    - $36, MagikarpFrontpic
-	dbw BANK(MagikarpBackpic)     - $36, MagikarpBackpic
-	dbw BANK(GyaradosFrontpic)    - $36, GyaradosFrontpic
-	dbw BANK(GyaradosBackpic)     - $36, GyaradosBackpic
-	dbw BANK(LaprasFrontpic)      - $36, LaprasFrontpic
-	dbw BANK(LaprasBackpic)       - $36, LaprasBackpic
-	dbw BANK(DittoFrontpic)       - $36, DittoFrontpic
-	dbw BANK(DittoBackpic)        - $36, DittoBackpic
-	dbw BANK(EeveeFrontpic)       - $36, EeveeFrontpic
-	dbw BANK(EeveeBackpic)        - $36, EeveeBackpic
-	dbw BANK(VaporeonFrontpic)    - $36, VaporeonFrontpic
-	dbw BANK(VaporeonBackpic)     - $36, VaporeonBackpic
-	dbw BANK(JolteonFrontpic)     - $36, JolteonFrontpic
-	dbw BANK(JolteonBackpic)      - $36, JolteonBackpic
-	dbw BANK(FlareonFrontpic)     - $36, FlareonFrontpic
-	dbw BANK(FlareonBackpic)      - $36, FlareonBackpic
-	dbw BANK(PorygonFrontpic)     - $36, PorygonFrontpic
-	dbw BANK(PorygonBackpic)      - $36, PorygonBackpic
-	dbw BANK(OmanyteFrontpic)     - $36, OmanyteFrontpic
-	dbw BANK(OmanyteBackpic)      - $36, OmanyteBackpic
-	dbw BANK(OmastarFrontpic)     - $36, OmastarFrontpic
-	dbw BANK(OmastarBackpic)      - $36, OmastarBackpic
-	dbw BANK(KabutoFrontpic)      - $36, KabutoFrontpic
-	dbw BANK(KabutoBackpic)       - $36, KabutoBackpic
-	dbw BANK(KabutopsFrontpic)    - $36, KabutopsFrontpic
-	dbw BANK(KabutopsBackpic)     - $36, KabutopsBackpic
-	dbw BANK(AerodactylFrontpic)  - $36, AerodactylFrontpic
-	dbw BANK(AerodactylBackpic)   - $36, AerodactylBackpic
-	dbw BANK(SnorlaxFrontpic)     - $36, SnorlaxFrontpic
-	dbw BANK(SnorlaxBackpic)      - $36, SnorlaxBackpic
-	dbw BANK(ArticunoFrontpic)    - $36, ArticunoFrontpic
-	dbw BANK(ArticunoBackpic)     - $36, ArticunoBackpic
-	dbw BANK(ZapdosFrontpic)      - $36, ZapdosFrontpic
-	dbw BANK(ZapdosBackpic)       - $36, ZapdosBackpic
-	dbw BANK(MoltresFrontpic)     - $36, MoltresFrontpic
-	dbw BANK(MoltresBackpic)      - $36, MoltresBackpic
-	dbw BANK(DratiniFrontpic)     - $36, DratiniFrontpic
-	dbw BANK(DratiniBackpic)      - $36, DratiniBackpic
-	dbw BANK(DragonairFrontpic)   - $36, DragonairFrontpic
-	dbw BANK(DragonairBackpic)    - $36, DragonairBackpic
-	dbw BANK(DragoniteFrontpic)   - $36, DragoniteFrontpic
-	dbw BANK(DragoniteBackpic)    - $36, DragoniteBackpic
-	dbw BANK(MewtwoFrontpic)      - $36, MewtwoFrontpic
-	dbw BANK(MewtwoBackpic)       - $36, MewtwoBackpic
-	dbw BANK(MewFrontpic)         - $36, MewFrontpic
-	dbw BANK(MewBackpic)          - $36, MewBackpic
-	dbw BANK(ChikoritaFrontpic)   - $36, ChikoritaFrontpic
-	dbw BANK(ChikoritaBackpic)    - $36, ChikoritaBackpic
-	dbw BANK(BayleefFrontpic)     - $36, BayleefFrontpic
-	dbw BANK(BayleefBackpic)      - $36, BayleefBackpic
-	dbw BANK(MeganiumFrontpic)    - $36, MeganiumFrontpic
-	dbw BANK(MeganiumBackpic)     - $36, MeganiumBackpic
-	dbw BANK(CyndaquilFrontpic)   - $36, CyndaquilFrontpic
-	dbw BANK(CyndaquilBackpic)    - $36, CyndaquilBackpic
-	dbw BANK(QuilavaFrontpic)     - $36, QuilavaFrontpic
-	dbw BANK(QuilavaBackpic)      - $36, QuilavaBackpic
-	dbw BANK(TyphlosionFrontpic)  - $36, TyphlosionFrontpic
-	dbw BANK(TyphlosionBackpic)   - $36, TyphlosionBackpic
-	dbw BANK(TotodileFrontpic)    - $36, TotodileFrontpic
-	dbw BANK(TotodileBackpic)     - $36, TotodileBackpic
-	dbw BANK(CroconawFrontpic)    - $36, CroconawFrontpic
-	dbw BANK(CroconawBackpic)     - $36, CroconawBackpic
-	dbw BANK(FeraligatrFrontpic)  - $36, FeraligatrFrontpic
-	dbw BANK(FeraligatrBackpic)   - $36, FeraligatrBackpic
-	dbw BANK(SentretFrontpic)     - $36, SentretFrontpic
-	dbw BANK(SentretBackpic)      - $36, SentretBackpic
-	dbw BANK(FurretFrontpic)      - $36, FurretFrontpic
-	dbw BANK(FurretBackpic)       - $36, FurretBackpic
-	dbw BANK(HoothootFrontpic)    - $36, HoothootFrontpic
-	dbw BANK(HoothootBackpic)     - $36, HoothootBackpic
-	dbw BANK(NoctowlFrontpic)     - $36, NoctowlFrontpic
-	dbw BANK(NoctowlBackpic)      - $36, NoctowlBackpic
-	dbw BANK(LedybaFrontpic)      - $36, LedybaFrontpic
-	dbw BANK(LedybaBackpic)       - $36, LedybaBackpic
-	dbw BANK(LedianFrontpic)      - $36, LedianFrontpic
-	dbw BANK(LedianBackpic)       - $36, LedianBackpic
-	dbw BANK(SpinarakFrontpic)    - $36, SpinarakFrontpic
-	dbw BANK(SpinarakBackpic)     - $36, SpinarakBackpic
-	dbw BANK(AriadosFrontpic)     - $36, AriadosFrontpic
-	dbw BANK(AriadosBackpic)      - $36, AriadosBackpic
-	dbw BANK(CrobatFrontpic)      - $36, CrobatFrontpic
-	dbw BANK(CrobatBackpic)       - $36, CrobatBackpic
-	dbw BANK(ChinchouFrontpic)    - $36, ChinchouFrontpic
-	dbw BANK(ChinchouBackpic)     - $36, ChinchouBackpic
-	dbw BANK(LanturnFrontpic)     - $36, LanturnFrontpic
-	dbw BANK(LanturnBackpic)      - $36, LanturnBackpic
-	dbw BANK(PichuFrontpic)       - $36, PichuFrontpic
-	dbw BANK(PichuBackpic)        - $36, PichuBackpic
-	dbw BANK(CleffaFrontpic)      - $36, CleffaFrontpic
-	dbw BANK(CleffaBackpic)       - $36, CleffaBackpic
-	dbw BANK(IgglybuffFrontpic)   - $36, IgglybuffFrontpic
-	dbw BANK(IgglybuffBackpic)    - $36, IgglybuffBackpic
-	dbw BANK(TogepiFrontpic)      - $36, TogepiFrontpic
-	dbw BANK(TogepiBackpic)       - $36, TogepiBackpic
-	dbw BANK(TogeticFrontpic)     - $36, TogeticFrontpic
-	dbw BANK(TogeticBackpic)      - $36, TogeticBackpic
-	dbw BANK(NatuFrontpic)        - $36, NatuFrontpic
-	dbw BANK(NatuBackpic)         - $36, NatuBackpic
-	dbw BANK(XatuFrontpic)        - $36, XatuFrontpic
-	dbw BANK(XatuBackpic)         - $36, XatuBackpic
-	dbw BANK(MareepFrontpic)      - $36, MareepFrontpic
-	dbw BANK(MareepBackpic)       - $36, MareepBackpic
-	dbw BANK(FlaaffyFrontpic)     - $36, FlaaffyFrontpic
-	dbw BANK(FlaaffyBackpic)      - $36, FlaaffyBackpic
-	dbw BANK(AmpharosFrontpic)    - $36, AmpharosFrontpic
-	dbw BANK(AmpharosBackpic)     - $36, AmpharosBackpic
-	dbw BANK(BellossomFrontpic)   - $36, BellossomFrontpic
-	dbw BANK(BellossomBackpic)    - $36, BellossomBackpic
-	dbw BANK(MarillFrontpic)      - $36, MarillFrontpic
-	dbw BANK(MarillBackpic)       - $36, MarillBackpic
-	dbw BANK(AzumarillFrontpic)   - $36, AzumarillFrontpic
-	dbw BANK(AzumarillBackpic)    - $36, AzumarillBackpic
-	dbw BANK(SudowoodoFrontpic)   - $36, SudowoodoFrontpic
-	dbw BANK(SudowoodoBackpic)    - $36, SudowoodoBackpic
-	dbw BANK(PolitoedFrontpic)    - $36, PolitoedFrontpic
-	dbw BANK(PolitoedBackpic)     - $36, PolitoedBackpic
-	dbw BANK(HoppipFrontpic)      - $36, HoppipFrontpic
-	dbw BANK(HoppipBackpic)       - $36, HoppipBackpic
-	dbw BANK(SkiploomFrontpic)    - $36, SkiploomFrontpic
-	dbw BANK(SkiploomBackpic)     - $36, SkiploomBackpic
-	dbw BANK(JumpluffFrontpic)    - $36, JumpluffFrontpic
-	dbw BANK(JumpluffBackpic)     - $36, JumpluffBackpic
-	dbw BANK(AipomFrontpic)       - $36, AipomFrontpic
-	dbw BANK(AipomBackpic)        - $36, AipomBackpic
-	dbw BANK(SunkernFrontpic)     - $36, SunkernFrontpic
-	dbw BANK(SunkernBackpic)      - $36, SunkernBackpic
-	dbw BANK(SunfloraFrontpic)    - $36, SunfloraFrontpic
-	dbw BANK(SunfloraBackpic)     - $36, SunfloraBackpic
-	dbw BANK(YanmaFrontpic)       - $36, YanmaFrontpic
-	dbw BANK(YanmaBackpic)        - $36, YanmaBackpic
-	dbw BANK(WooperFrontpic)      - $36, WooperFrontpic
-	dbw BANK(WooperBackpic)       - $36, WooperBackpic
-	dbw BANK(QuagsireFrontpic)    - $36, QuagsireFrontpic
-	dbw BANK(QuagsireBackpic)     - $36, QuagsireBackpic
-	dbw BANK(EspeonFrontpic)      - $36, EspeonFrontpic
-	dbw BANK(EspeonBackpic)       - $36, EspeonBackpic
-	dbw BANK(UmbreonFrontpic)     - $36, UmbreonFrontpic
-	dbw BANK(UmbreonBackpic)      - $36, UmbreonBackpic
-	dbw BANK(MurkrowFrontpic)     - $36, MurkrowFrontpic
-	dbw BANK(MurkrowBackpic)      - $36, MurkrowBackpic
-	dbw BANK(SlowkingFrontpic)    - $36, SlowkingFrontpic
-	dbw BANK(SlowkingBackpic)     - $36, SlowkingBackpic
-	dbw BANK(MisdreavusFrontpic)  - $36, MisdreavusFrontpic
-	dbw BANK(MisdreavusBackpic)   - $36, MisdreavusBackpic
+	add_pic BulbasaurFrontpic
+	add_pic BulbasaurBackpic
+	add_pic IvysaurFrontpic
+	add_pic IvysaurBackpic
+	add_pic VenusaurFrontpic
+	add_pic VenusaurBackpic
+	add_pic CharmanderFrontpic
+	add_pic CharmanderBackpic
+	add_pic CharmeleonFrontpic
+	add_pic CharmeleonBackpic
+	add_pic CharizardFrontpic
+	add_pic CharizardBackpic
+	add_pic SquirtleFrontpic
+	add_pic SquirtleBackpic
+	add_pic WartortleFrontpic
+	add_pic WartortleBackpic
+	add_pic BlastoiseFrontpic
+	add_pic BlastoiseBackpic
+	add_pic CaterpieFrontpic
+	add_pic CaterpieBackpic
+	add_pic MetapodFrontpic
+	add_pic MetapodBackpic
+	add_pic ButterfreeFrontpic
+	add_pic ButterfreeBackpic
+	add_pic WeedleFrontpic
+	add_pic WeedleBackpic
+	add_pic KakunaFrontpic
+	add_pic KakunaBackpic
+	add_pic BeedrillFrontpic
+	add_pic BeedrillBackpic
+	add_pic PidgeyFrontpic
+	add_pic PidgeyBackpic
+	add_pic PidgeottoFrontpic
+	add_pic PidgeottoBackpic
+	add_pic PidgeotFrontpic
+	add_pic PidgeotBackpic
+	add_pic RattataFrontpic
+	add_pic RattataBackpic
+	add_pic RaticateFrontpic
+	add_pic RaticateBackpic
+	add_pic SpearowFrontpic
+	add_pic SpearowBackpic
+	add_pic FearowFrontpic
+	add_pic FearowBackpic
+	add_pic EkansFrontpic
+	add_pic EkansBackpic
+	add_pic ArbokFrontpic
+	add_pic ArbokBackpic
+	add_pic PikachuFrontpic
+	add_pic PikachuBackpic
+	add_pic RaichuFrontpic
+	add_pic RaichuBackpic
+	add_pic SandshrewFrontpic
+	add_pic SandshrewBackpic
+	add_pic SandslashFrontpic
+	add_pic SandslashBackpic
+	add_pic NidoranFFrontpic
+	add_pic NidoranFBackpic
+	add_pic NidorinaFrontpic
+	add_pic NidorinaBackpic
+	add_pic NidoqueenFrontpic
+	add_pic NidoqueenBackpic
+	add_pic NidoranMFrontpic
+	add_pic NidoranMBackpic
+	add_pic NidorinoFrontpic
+	add_pic NidorinoBackpic
+	add_pic NidokingFrontpic
+	add_pic NidokingBackpic
+	add_pic ClefairyFrontpic
+	add_pic ClefairyBackpic
+	add_pic ClefableFrontpic
+	add_pic ClefableBackpic
+	add_pic VulpixFrontpic
+	add_pic VulpixBackpic
+	add_pic NinetalesFrontpic
+	add_pic NinetalesBackpic
+	add_pic JigglypuffFrontpic
+	add_pic JigglypuffBackpic
+	add_pic WigglytuffFrontpic
+	add_pic WigglytuffBackpic
+	add_pic ZubatFrontpic
+	add_pic ZubatBackpic
+	add_pic GolbatFrontpic
+	add_pic GolbatBackpic
+	add_pic OddishFrontpic
+	add_pic OddishBackpic
+	add_pic GloomFrontpic
+	add_pic GloomBackpic
+	add_pic VileplumeFrontpic
+	add_pic VileplumeBackpic
+	add_pic ParasFrontpic
+	add_pic ParasBackpic
+	add_pic ParasectFrontpic
+	add_pic ParasectBackpic
+	add_pic VenonatFrontpic
+	add_pic VenonatBackpic
+	add_pic VenomothFrontpic
+	add_pic VenomothBackpic
+	add_pic DiglettFrontpic
+	add_pic DiglettBackpic
+	add_pic DugtrioFrontpic
+	add_pic DugtrioBackpic
+	add_pic MeowthFrontpic
+	add_pic MeowthBackpic
+	add_pic PersianFrontpic
+	add_pic PersianBackpic
+	add_pic PsyduckFrontpic
+	add_pic PsyduckBackpic
+	add_pic GolduckFrontpic
+	add_pic GolduckBackpic
+	add_pic MankeyFrontpic
+	add_pic MankeyBackpic
+	add_pic PrimeapeFrontpic
+	add_pic PrimeapeBackpic
+	add_pic GrowlitheFrontpic
+	add_pic GrowlitheBackpic
+	add_pic ArcanineFrontpic
+	add_pic ArcanineBackpic
+	add_pic PoliwagFrontpic
+	add_pic PoliwagBackpic
+	add_pic PoliwhirlFrontpic
+	add_pic PoliwhirlBackpic
+	add_pic PoliwrathFrontpic
+	add_pic PoliwrathBackpic
+	add_pic AbraFrontpic
+	add_pic AbraBackpic
+	add_pic KadabraFrontpic
+	add_pic KadabraBackpic
+	add_pic AlakazamFrontpic
+	add_pic AlakazamBackpic
+	add_pic MachopFrontpic
+	add_pic MachopBackpic
+	add_pic MachokeFrontpic
+	add_pic MachokeBackpic
+	add_pic MachampFrontpic
+	add_pic MachampBackpic
+	add_pic BellsproutFrontpic
+	add_pic BellsproutBackpic
+	add_pic WeepinbellFrontpic
+	add_pic WeepinbellBackpic
+	add_pic VictreebelFrontpic
+	add_pic VictreebelBackpic
+	add_pic TentacoolFrontpic
+	add_pic TentacoolBackpic
+	add_pic TentacruelFrontpic
+	add_pic TentacruelBackpic
+	add_pic GeodudeFrontpic
+	add_pic GeodudeBackpic
+	add_pic GravelerFrontpic
+	add_pic GravelerBackpic
+	add_pic GolemFrontpic
+	add_pic GolemBackpic
+	add_pic PonytaFrontpic
+	add_pic PonytaBackpic
+	add_pic RapidashFrontpic
+	add_pic RapidashBackpic
+	add_pic SlowpokeFrontpic
+	add_pic SlowpokeBackpic
+	add_pic SlowbroFrontpic
+	add_pic SlowbroBackpic
+	add_pic MagnemiteFrontpic
+	add_pic MagnemiteBackpic
+	add_pic MagnetonFrontpic
+	add_pic MagnetonBackpic
+	add_pic FarfetchDFrontpic
+	add_pic FarfetchDBackpic
+	add_pic DoduoFrontpic
+	add_pic DoduoBackpic
+	add_pic DodrioFrontpic
+	add_pic DodrioBackpic
+	add_pic SeelFrontpic
+	add_pic SeelBackpic
+	add_pic DewgongFrontpic
+	add_pic DewgongBackpic
+	add_pic GrimerFrontpic
+	add_pic GrimerBackpic
+	add_pic MukFrontpic
+	add_pic MukBackpic
+	add_pic ShellderFrontpic
+	add_pic ShellderBackpic
+	add_pic CloysterFrontpic
+	add_pic CloysterBackpic
+	add_pic GastlyFrontpic
+	add_pic GastlyBackpic
+	add_pic HaunterFrontpic
+	add_pic HaunterBackpic
+	add_pic GengarFrontpic
+	add_pic GengarBackpic
+	add_pic OnixFrontpic
+	add_pic OnixBackpic
+	add_pic DrowzeeFrontpic
+	add_pic DrowzeeBackpic
+	add_pic HypnoFrontpic
+	add_pic HypnoBackpic
+	add_pic KrabbyFrontpic
+	add_pic KrabbyBackpic
+	add_pic KinglerFrontpic
+	add_pic KinglerBackpic
+	add_pic VoltorbFrontpic
+	add_pic VoltorbBackpic
+	add_pic ElectrodeFrontpic
+	add_pic ElectrodeBackpic
+	add_pic ExeggcuteFrontpic
+	add_pic ExeggcuteBackpic
+	add_pic ExeggutorFrontpic
+	add_pic ExeggutorBackpic
+	add_pic CuboneFrontpic
+	add_pic CuboneBackpic
+	add_pic MarowakFrontpic
+	add_pic MarowakBackpic
+	add_pic HitmonleeFrontpic
+	add_pic HitmonleeBackpic
+	add_pic HitmonchanFrontpic
+	add_pic HitmonchanBackpic
+	add_pic LickitungFrontpic
+	add_pic LickitungBackpic
+	add_pic KoffingFrontpic
+	add_pic KoffingBackpic
+	add_pic WeezingFrontpic
+	add_pic WeezingBackpic
+	add_pic RhyhornFrontpic
+	add_pic RhyhornBackpic
+	add_pic RhydonFrontpic
+	add_pic RhydonBackpic
+	add_pic ChanseyFrontpic
+	add_pic ChanseyBackpic
+	add_pic TangelaFrontpic
+	add_pic TangelaBackpic
+	add_pic KangaskhanFrontpic
+	add_pic KangaskhanBackpic
+	add_pic HorseaFrontpic
+	add_pic HorseaBackpic
+	add_pic SeadraFrontpic
+	add_pic SeadraBackpic
+	add_pic GoldeenFrontpic
+	add_pic GoldeenBackpic
+	add_pic SeakingFrontpic
+	add_pic SeakingBackpic
+	add_pic StaryuFrontpic
+	add_pic StaryuBackpic
+	add_pic StarmieFrontpic
+	add_pic StarmieBackpic
+	add_pic MrMimeFrontpic
+	add_pic MrMimeBackpic
+	add_pic ScytherFrontpic
+	add_pic ScytherBackpic
+	add_pic JynxFrontpic
+	add_pic JynxBackpic
+	add_pic ElectabuzzFrontpic
+	add_pic ElectabuzzBackpic
+	add_pic MagmarFrontpic
+	add_pic MagmarBackpic
+	add_pic PinsirFrontpic
+	add_pic PinsirBackpic
+	add_pic TaurosFrontpic
+	add_pic TaurosBackpic
+	add_pic MagikarpFrontpic
+	add_pic MagikarpBackpic
+	add_pic GyaradosFrontpic
+	add_pic GyaradosBackpic
+	add_pic LaprasFrontpic
+	add_pic LaprasBackpic
+	add_pic DittoFrontpic
+	add_pic DittoBackpic
+	add_pic EeveeFrontpic
+	add_pic EeveeBackpic
+	add_pic VaporeonFrontpic
+	add_pic VaporeonBackpic
+	add_pic JolteonFrontpic
+	add_pic JolteonBackpic
+	add_pic FlareonFrontpic
+	add_pic FlareonBackpic
+	add_pic PorygonFrontpic
+	add_pic PorygonBackpic
+	add_pic OmanyteFrontpic
+	add_pic OmanyteBackpic
+	add_pic OmastarFrontpic
+	add_pic OmastarBackpic
+	add_pic KabutoFrontpic
+	add_pic KabutoBackpic
+	add_pic KabutopsFrontpic
+	add_pic KabutopsBackpic
+	add_pic AerodactylFrontpic
+	add_pic AerodactylBackpic
+	add_pic SnorlaxFrontpic
+	add_pic SnorlaxBackpic
+	add_pic ArticunoFrontpic
+	add_pic ArticunoBackpic
+	add_pic ZapdosFrontpic
+	add_pic ZapdosBackpic
+	add_pic MoltresFrontpic
+	add_pic MoltresBackpic
+	add_pic DratiniFrontpic
+	add_pic DratiniBackpic
+	add_pic DragonairFrontpic
+	add_pic DragonairBackpic
+	add_pic DragoniteFrontpic
+	add_pic DragoniteBackpic
+	add_pic MewtwoFrontpic
+	add_pic MewtwoBackpic
+	add_pic MewFrontpic
+	add_pic MewBackpic
+	add_pic ChikoritaFrontpic
+	add_pic ChikoritaBackpic
+	add_pic BayleefFrontpic
+	add_pic BayleefBackpic
+	add_pic MeganiumFrontpic
+	add_pic MeganiumBackpic
+	add_pic CyndaquilFrontpic
+	add_pic CyndaquilBackpic
+	add_pic QuilavaFrontpic
+	add_pic QuilavaBackpic
+	add_pic TyphlosionFrontpic
+	add_pic TyphlosionBackpic
+	add_pic TotodileFrontpic
+	add_pic TotodileBackpic
+	add_pic CroconawFrontpic
+	add_pic CroconawBackpic
+	add_pic FeraligatrFrontpic
+	add_pic FeraligatrBackpic
+	add_pic SentretFrontpic
+	add_pic SentretBackpic
+	add_pic FurretFrontpic
+	add_pic FurretBackpic
+	add_pic HoothootFrontpic
+	add_pic HoothootBackpic
+	add_pic NoctowlFrontpic
+	add_pic NoctowlBackpic
+	add_pic LedybaFrontpic
+	add_pic LedybaBackpic
+	add_pic LedianFrontpic
+	add_pic LedianBackpic
+	add_pic SpinarakFrontpic
+	add_pic SpinarakBackpic
+	add_pic AriadosFrontpic
+	add_pic AriadosBackpic
+	add_pic CrobatFrontpic
+	add_pic CrobatBackpic
+	add_pic ChinchouFrontpic
+	add_pic ChinchouBackpic
+	add_pic LanturnFrontpic
+	add_pic LanturnBackpic
+	add_pic PichuFrontpic
+	add_pic PichuBackpic
+	add_pic CleffaFrontpic
+	add_pic CleffaBackpic
+	add_pic IgglybuffFrontpic
+	add_pic IgglybuffBackpic
+	add_pic TogepiFrontpic
+	add_pic TogepiBackpic
+	add_pic TogeticFrontpic
+	add_pic TogeticBackpic
+	add_pic NatuFrontpic
+	add_pic NatuBackpic
+	add_pic XatuFrontpic
+	add_pic XatuBackpic
+	add_pic MareepFrontpic
+	add_pic MareepBackpic
+	add_pic FlaaffyFrontpic
+	add_pic FlaaffyBackpic
+	add_pic AmpharosFrontpic
+	add_pic AmpharosBackpic
+	add_pic BellossomFrontpic
+	add_pic BellossomBackpic
+	add_pic MarillFrontpic
+	add_pic MarillBackpic
+	add_pic AzumarillFrontpic
+	add_pic AzumarillBackpic
+	add_pic SudowoodoFrontpic
+	add_pic SudowoodoBackpic
+	add_pic PolitoedFrontpic
+	add_pic PolitoedBackpic
+	add_pic HoppipFrontpic
+	add_pic HoppipBackpic
+	add_pic SkiploomFrontpic
+	add_pic SkiploomBackpic
+	add_pic JumpluffFrontpic
+	add_pic JumpluffBackpic
+	add_pic AipomFrontpic
+	add_pic AipomBackpic
+	add_pic SunkernFrontpic
+	add_pic SunkernBackpic
+	add_pic SunfloraFrontpic
+	add_pic SunfloraBackpic
+	add_pic YanmaFrontpic
+	add_pic YanmaBackpic
+	add_pic WooperFrontpic
+	add_pic WooperBackpic
+	add_pic QuagsireFrontpic
+	add_pic QuagsireBackpic
+	add_pic EspeonFrontpic
+	add_pic EspeonBackpic
+	add_pic UmbreonFrontpic
+	add_pic UmbreonBackpic
+	add_pic MurkrowFrontpic
+	add_pic MurkrowBackpic
+	add_pic SlowkingFrontpic
+	add_pic SlowkingBackpic
+	add_pic MisdreavusFrontpic
+	add_pic MisdreavusBackpic
 	
 	; Unown pics have their own table. See UnownPicPointers
+	dbw -1, -1
+	dbw -1, -1
 	
-	dbw $ff, $ffff
-	dbw $ff, $ffff
-	
-	dbw BANK(WobbuffetFrontpic)   - $36, WobbuffetFrontpic
-	dbw BANK(WobbuffetBackpic)    - $36, WobbuffetBackpic
-	dbw BANK(GirafarigFrontpic)   - $36, GirafarigFrontpic
-	dbw BANK(GirafarigBackpic)    - $36, GirafarigBackpic
-	dbw BANK(PinecoFrontpic)      - $36, PinecoFrontpic
-	dbw BANK(PinecoBackpic)       - $36, PinecoBackpic
-	dbw BANK(ForretressFrontpic)  - $36, ForretressFrontpic
-	dbw BANK(ForretressBackpic)   - $36, ForretressBackpic
-	dbw BANK(DunsparceFrontpic)   - $36, DunsparceFrontpic
-	dbw BANK(DunsparceBackpic)    - $36, DunsparceBackpic
-	dbw BANK(GligarFrontpic)      - $36, GligarFrontpic
-	dbw BANK(GligarBackpic)       - $36, GligarBackpic
-	dbw BANK(SteelixFrontpic)     - $36, SteelixFrontpic
-	dbw BANK(SteelixBackpic)      - $36, SteelixBackpic
-	dbw BANK(SnubbullFrontpic)    - $36, SnubbullFrontpic
-	dbw BANK(SnubbullBackpic)     - $36, SnubbullBackpic
-	dbw BANK(GranbullFrontpic)    - $36, GranbullFrontpic
-	dbw BANK(GranbullBackpic)     - $36, GranbullBackpic
-	dbw BANK(QwilfishFrontpic)    - $36, QwilfishFrontpic
-	dbw BANK(QwilfishBackpic)     - $36, QwilfishBackpic
-	dbw BANK(ScizorFrontpic)      - $36, ScizorFrontpic
-	dbw BANK(ScizorBackpic)       - $36, ScizorBackpic
-	dbw BANK(ShuckleFrontpic)     - $36, ShuckleFrontpic
-	dbw BANK(ShuckleBackpic)      - $36, ShuckleBackpic
-	dbw BANK(HeracrossFrontpic)   - $36, HeracrossFrontpic
-	dbw BANK(HeracrossBackpic)    - $36, HeracrossBackpic
-	dbw BANK(SneaselFrontpic)     - $36, SneaselFrontpic
-	dbw BANK(SneaselBackpic)      - $36, SneaselBackpic
-	dbw BANK(TeddiursaFrontpic)   - $36, TeddiursaFrontpic
-	dbw BANK(TeddiursaBackpic)    - $36, TeddiursaBackpic
-	dbw BANK(UrsaringFrontpic)    - $36, UrsaringFrontpic
-	dbw BANK(UrsaringBackpic)     - $36, UrsaringBackpic
-	dbw BANK(SlugmaFrontpic)      - $36, SlugmaFrontpic
-	dbw BANK(SlugmaBackpic)       - $36, SlugmaBackpic
-	dbw BANK(MagcargoFrontpic)    - $36, MagcargoFrontpic
-	dbw BANK(MagcargoBackpic)     - $36, MagcargoBackpic
-	dbw BANK(SwinubFrontpic)      - $36, SwinubFrontpic
-	dbw BANK(SwinubBackpic)       - $36, SwinubBackpic
-	dbw BANK(PiloswineFrontpic)   - $36, PiloswineFrontpic
-	dbw BANK(PiloswineBackpic)    - $36, PiloswineBackpic
-	dbw BANK(CorsolaFrontpic)     - $36, CorsolaFrontpic
-	dbw BANK(CorsolaBackpic)      - $36, CorsolaBackpic
-	dbw BANK(RemoraidFrontpic)    - $36, RemoraidFrontpic
-	dbw BANK(RemoraidBackpic)     - $36, RemoraidBackpic
-	dbw BANK(OctilleryFrontpic)   - $36, OctilleryFrontpic
-	dbw BANK(OctilleryBackpic)    - $36, OctilleryBackpic
-	dbw BANK(DelibirdFrontpic)    - $36, DelibirdFrontpic
-	dbw BANK(DelibirdBackpic)     - $36, DelibirdBackpic
-	dbw BANK(MantineFrontpic)     - $36, MantineFrontpic
-	dbw BANK(MantineBackpic)      - $36, MantineBackpic
-	dbw BANK(SkarmoryFrontpic)    - $36, SkarmoryFrontpic
-	dbw BANK(SkarmoryBackpic)     - $36, SkarmoryBackpic
-	dbw BANK(HoundourFrontpic)    - $36, HoundourFrontpic
-	dbw BANK(HoundourBackpic)     - $36, HoundourBackpic
-	dbw BANK(HoundoomFrontpic)    - $36, HoundoomFrontpic
-	dbw BANK(HoundoomBackpic)     - $36, HoundoomBackpic
-	dbw BANK(KingdraFrontpic)     - $36, KingdraFrontpic
-	dbw BANK(KingdraBackpic)      - $36, KingdraBackpic
-	dbw BANK(PhanpyFrontpic)      - $36, PhanpyFrontpic
-	dbw BANK(PhanpyBackpic)       - $36, PhanpyBackpic
-	dbw BANK(DonphanFrontpic)     - $36, DonphanFrontpic
-	dbw BANK(DonphanBackpic)      - $36, DonphanBackpic
-	dbw BANK(Porygon2Frontpic)    - $36, Porygon2Frontpic
-	dbw BANK(Porygon2Backpic)     - $36, Porygon2Backpic
-	dbw BANK(StantlerFrontpic)    - $36, StantlerFrontpic
-	dbw BANK(StantlerBackpic)     - $36, StantlerBackpic
-	dbw BANK(SmeargleFrontpic)    - $36, SmeargleFrontpic
-	dbw BANK(SmeargleBackpic)     - $36, SmeargleBackpic
-	dbw BANK(TyrogueFrontpic)     - $36, TyrogueFrontpic
-	dbw BANK(TyrogueBackpic)      - $36, TyrogueBackpic
-	dbw BANK(HitmontopFrontpic)   - $36, HitmontopFrontpic
-	dbw BANK(HitmontopBackpic)    - $36, HitmontopBackpic
-	dbw BANK(SmoochumFrontpic)    - $36, SmoochumFrontpic
-	dbw BANK(SmoochumBackpic)     - $36, SmoochumBackpic
-	dbw BANK(ElekidFrontpic)      - $36, ElekidFrontpic
-	dbw BANK(ElekidBackpic)       - $36, ElekidBackpic
-	dbw BANK(MagbyFrontpic)       - $36, MagbyFrontpic
-	dbw BANK(MagbyBackpic)        - $36, MagbyBackpic
-	dbw BANK(MiltankFrontpic)     - $36, MiltankFrontpic
-	dbw BANK(MiltankBackpic)      - $36, MiltankBackpic
-	dbw BANK(BlisseyFrontpic)     - $36, BlisseyFrontpic
-	dbw BANK(BlisseyBackpic)      - $36, BlisseyBackpic
-	dbw BANK(RaikouFrontpic)      - $36, RaikouFrontpic
-	dbw BANK(RaikouBackpic)       - $36, RaikouBackpic
-	dbw BANK(EnteiFrontpic)       - $36, EnteiFrontpic
-	dbw BANK(EnteiBackpic)        - $36, EnteiBackpic
-	dbw BANK(SuicuneFrontpic)     - $36, SuicuneFrontpic
-	dbw BANK(SuicuneBackpic)      - $36, SuicuneBackpic
-	dbw BANK(LarvitarFrontpic)    - $36, LarvitarFrontpic
-	dbw BANK(LarvitarBackpic)     - $36, LarvitarBackpic
-	dbw BANK(PupitarFrontpic)     - $36, PupitarFrontpic
-	dbw BANK(PupitarBackpic)      - $36, PupitarBackpic
-	dbw BANK(TyranitarFrontpic)   - $36, TyranitarFrontpic
-	dbw BANK(TyranitarBackpic)    - $36, TyranitarBackpic
-	dbw BANK(LugiaFrontpic)       - $36, LugiaFrontpic
-	dbw BANK(LugiaBackpic)        - $36, LugiaBackpic
-	dbw BANK(HoOhFrontpic)        - $36, HoOhFrontpic
-	dbw BANK(HoOhBackpic)         - $36, HoOhBackpic
-	dbw BANK(CelebiFrontpic)      - $36, CelebiFrontpic
-	dbw BANK(CelebiBackpic)       - $36, CelebiBackpic
-	dbw                             $ff, $ffff ; unused
-	dbw                             $ff, $ffff ; unused
-	dbw BANK(EggPic)              - $36, EggPic
-	dbw                             $ff, $ffff ; unused
+	add_pic WobbuffetFrontpic
+	add_pic WobbuffetBackpic
+	add_pic GirafarigFrontpic
+	add_pic GirafarigBackpic
+	add_pic PinecoFrontpic
+	add_pic PinecoBackpic
+	add_pic ForretressFrontpic
+	add_pic ForretressBackpic
+	add_pic DunsparceFrontpic
+	add_pic DunsparceBackpic
+	add_pic GligarFrontpic
+	add_pic GligarBackpic
+	add_pic SteelixFrontpic
+	add_pic SteelixBackpic
+	add_pic SnubbullFrontpic
+	add_pic SnubbullBackpic
+	add_pic GranbullFrontpic
+	add_pic GranbullBackpic
+	add_pic QwilfishFrontpic
+	add_pic QwilfishBackpic
+	add_pic ScizorFrontpic
+	add_pic ScizorBackpic
+	add_pic ShuckleFrontpic
+	add_pic ShuckleBackpic
+	add_pic HeracrossFrontpic
+	add_pic HeracrossBackpic
+	add_pic SneaselFrontpic
+	add_pic SneaselBackpic
+	add_pic TeddiursaFrontpic
+	add_pic TeddiursaBackpic
+	add_pic UrsaringFrontpic
+	add_pic UrsaringBackpic
+	add_pic SlugmaFrontpic
+	add_pic SlugmaBackpic
+	add_pic MagcargoFrontpic
+	add_pic MagcargoBackpic
+	add_pic SwinubFrontpic
+	add_pic SwinubBackpic
+	add_pic PiloswineFrontpic
+	add_pic PiloswineBackpic
+	add_pic CorsolaFrontpic
+	add_pic CorsolaBackpic
+	add_pic RemoraidFrontpic
+	add_pic RemoraidBackpic
+	add_pic OctilleryFrontpic
+	add_pic OctilleryBackpic
+	add_pic DelibirdFrontpic
+	add_pic DelibirdBackpic
+	add_pic MantineFrontpic
+	add_pic MantineBackpic
+	add_pic SkarmoryFrontpic
+	add_pic SkarmoryBackpic
+	add_pic HoundourFrontpic
+	add_pic HoundourBackpic
+	add_pic HoundoomFrontpic
+	add_pic HoundoomBackpic
+	add_pic KingdraFrontpic
+	add_pic KingdraBackpic
+	add_pic PhanpyFrontpic
+	add_pic PhanpyBackpic
+	add_pic DonphanFrontpic
+	add_pic DonphanBackpic
+	add_pic Porygon2Frontpic
+	add_pic Porygon2Backpic
+	add_pic StantlerFrontpic
+	add_pic StantlerBackpic
+	add_pic SmeargleFrontpic
+	add_pic SmeargleBackpic
+	add_pic TyrogueFrontpic
+	add_pic TyrogueBackpic
+	add_pic HitmontopFrontpic
+	add_pic HitmontopBackpic
+	add_pic SmoochumFrontpic
+	add_pic SmoochumBackpic
+	add_pic ElekidFrontpic
+	add_pic ElekidBackpic
+	add_pic MagbyFrontpic
+	add_pic MagbyBackpic
+	add_pic MiltankFrontpic
+	add_pic MiltankBackpic
+	add_pic BlisseyFrontpic
+	add_pic BlisseyBackpic
+	add_pic RaikouFrontpic
+	add_pic RaikouBackpic
+	add_pic EnteiFrontpic
+	add_pic EnteiBackpic
+	add_pic SuicuneFrontpic
+	add_pic SuicuneBackpic
+	add_pic LarvitarFrontpic
+	add_pic LarvitarBackpic
+	add_pic PupitarFrontpic
+	add_pic PupitarBackpic
+	add_pic TyranitarFrontpic
+	add_pic TyranitarBackpic
+	add_pic LugiaFrontpic
+	add_pic LugiaBackpic
+	add_pic HoOhFrontpic
+	add_pic HoOhBackpic
+	add_pic CelebiFrontpic
+	add_pic CelebiBackpic
+	dbw -1, -1 ; unused
+	dbw -1, -1 ; unused
+	add_pic EggPic
+	dbw -1, -1 ; unused
 
diff --git a/gfx/pics/trainer_pic_pointers.asm b/gfx/pics/trainer_pic_pointers.asm
index 36f4337bf..4c1db41d5 100644
--- a/gfx/pics/trainer_pic_pointers.asm
+++ b/gfx/pics/trainer_pic_pointers.asm
@@ -1,68 +1,68 @@
 
-	dbw BANK(FalknerPic)          - $36, FalknerPic
-	dbw BANK(WhitneyPic)          - $36, WhitneyPic
-	dbw BANK(BugsyPic)            - $36, BugsyPic
-	dbw BANK(MortyPic)            - $36, MortyPic
-	dbw BANK(PrycePic)            - $36, PrycePic
-	dbw BANK(JasminePic)          - $36, JasminePic
-	dbw BANK(ChuckPic)            - $36, ChuckPic
-	dbw BANK(ClairPic)            - $36, ClairPic
-	dbw BANK(Rival1Pic)           - $36, Rival1Pic
-	dbw BANK(PokemonProfPic)      - $36, PokemonProfPic
-	dbw BANK(WillPic)             - $36, WillPic
-	dbw BANK(CalPic)              - $36, CalPic
-	dbw BANK(BrunoPic)            - $36, BrunoPic
-	dbw BANK(KarenPic)            - $36, KarenPic
-	dbw BANK(KogaPic)             - $36, KogaPic
-	dbw BANK(ChampionPic)         - $36, ChampionPic
-	dbw BANK(BrockPic)            - $36, BrockPic
-	dbw BANK(MistyPic)            - $36, MistyPic
-	dbw BANK(LtSurgePic)          - $36, LtSurgePic
-	dbw BANK(ScientistPic)        - $36, ScientistPic
-	dbw BANK(ErikaPic)            - $36, ErikaPic
-	dbw BANK(YoungsterPic)        - $36, YoungsterPic
-	dbw BANK(SchoolboyPic)        - $36, SchoolboyPic
-	dbw BANK(BirdKeeperPic)       - $36, BirdKeeperPic
-	dbw BANK(LassPic)             - $36, LassPic
-	dbw BANK(JaninePic)           - $36, JaninePic
-	dbw BANK(CooltrainermPic)     - $36, CooltrainermPic
-	dbw BANK(CooltrainerfPic)     - $36, CooltrainerfPic
-	dbw BANK(BeautyPic)           - $36, BeautyPic
-	dbw BANK(PokemaniacPic)       - $36, PokemaniacPic
-	dbw BANK(GruntmPic)           - $36, GruntmPic
-	dbw BANK(GentlemanPic)        - $36, GentlemanPic
-	dbw BANK(SkierPic)            - $36, SkierPic
-	dbw BANK(TeacherPic)          - $36, TeacherPic
-	dbw BANK(SabrinaPic)          - $36, SabrinaPic
-	dbw BANK(BugCatcherPic)       - $36, BugCatcherPic
-	dbw BANK(FisherPic)           - $36, FisherPic
-	dbw BANK(SwimmermPic)         - $36, SwimmermPic
-	dbw BANK(SwimmerfPic)         - $36, SwimmerfPic
-	dbw BANK(SailorPic)           - $36, SailorPic
-	dbw BANK(SuperNerdPic)        - $36, SuperNerdPic
-	dbw BANK(Rival2Pic)           - $36, Rival2Pic
-	dbw BANK(GuitaristPic)        - $36, GuitaristPic
-	dbw BANK(HikerPic)            - $36, HikerPic
-	dbw BANK(BikerPic)            - $36, BikerPic
-	dbw BANK(BlainePic)           - $36, BlainePic
-	dbw BANK(BurglarPic)          - $36, BurglarPic
-	dbw BANK(FirebreatherPic)     - $36, FirebreatherPic
-	dbw BANK(JugglerPic)          - $36, JugglerPic
-	dbw BANK(BlackbeltTPic)       - $36, BlackbeltTPic
-	dbw BANK(ExecutivemPic)       - $36, ExecutivemPic
-	dbw BANK(PsychicTPic)         - $36, PsychicTPic
-	dbw BANK(PicnickerPic)        - $36, PicnickerPic
-	dbw BANK(CamperPic)           - $36, CamperPic
-	dbw BANK(ExecutivefPic)       - $36, ExecutivefPic
-	dbw BANK(SagePic)             - $36, SagePic
-	dbw BANK(MediumPic)           - $36, MediumPic
-	dbw BANK(BoarderPic)          - $36, BoarderPic
-	dbw BANK(PokefanmPic)         - $36, PokefanmPic
-	dbw BANK(KimonoGirlPic)       - $36, KimonoGirlPic
-	dbw BANK(TwinsPic)            - $36, TwinsPic
-	dbw BANK(PokefanfPic)         - $36, PokefanfPic
-	dbw BANK(RedPic)              - $36, RedPic
-	dbw BANK(BluePic)             - $36, BluePic
-	dbw BANK(OfficerPic)          - $36, OfficerPic
-	dbw BANK(GruntfPic)           - $36, GruntfPic
-	dbw BANK(MysticalmanPic)      - $36, MysticalmanPic
+	add_pic FalknerPic
+	add_pic WhitneyPic
+	add_pic BugsyPic
+	add_pic MortyPic
+	add_pic PrycePic
+	add_pic JasminePic
+	add_pic ChuckPic
+	add_pic ClairPic
+	add_pic Rival1Pic
+	add_pic PokemonProfPic
+	add_pic WillPic
+	add_pic CalPic
+	add_pic BrunoPic
+	add_pic KarenPic
+	add_pic KogaPic
+	add_pic ChampionPic
+	add_pic BrockPic
+	add_pic MistyPic
+	add_pic LtSurgePic
+	add_pic ScientistPic
+	add_pic ErikaPic
+	add_pic YoungsterPic
+	add_pic SchoolboyPic
+	add_pic BirdKeeperPic
+	add_pic LassPic
+	add_pic JaninePic
+	add_pic CooltrainermPic
+	add_pic CooltrainerfPic
+	add_pic BeautyPic
+	add_pic PokemaniacPic
+	add_pic GruntmPic
+	add_pic GentlemanPic
+	add_pic SkierPic
+	add_pic TeacherPic
+	add_pic SabrinaPic
+	add_pic BugCatcherPic
+	add_pic FisherPic
+	add_pic SwimmermPic
+	add_pic SwimmerfPic
+	add_pic SailorPic
+	add_pic SuperNerdPic
+	add_pic Rival2Pic
+	add_pic GuitaristPic
+	add_pic HikerPic
+	add_pic BikerPic
+	add_pic BlainePic
+	add_pic BurglarPic
+	add_pic FirebreatherPic
+	add_pic JugglerPic
+	add_pic BlackbeltTPic
+	add_pic ExecutivemPic
+	add_pic PsychicTPic
+	add_pic PicnickerPic
+	add_pic CamperPic
+	add_pic ExecutivefPic
+	add_pic SagePic
+	add_pic MediumPic
+	add_pic BoarderPic
+	add_pic PokefanmPic
+	add_pic KimonoGirlPic
+	add_pic TwinsPic
+	add_pic PokefanfPic
+	add_pic RedPic
+	add_pic BluePic
+	add_pic OfficerPic
+	add_pic GruntfPic
+	add_pic MysticalmanPic
diff --git a/gfx/pics/unown_pic_pointers.asm b/gfx/pics/unown_pic_pointers.asm
index 08994df70..a74b818ef 100644
--- a/gfx/pics/unown_pic_pointers.asm
+++ b/gfx/pics/unown_pic_pointers.asm
@@ -1,53 +1,53 @@
 
-	dbw BANK(UnownAFrontpic) - $36, UnownAFrontpic
-	dbw BANK(UnownABackpic)  - $36, UnownABackpic
-	dbw BANK(UnownBFrontpic) - $36, UnownBFrontpic
-	dbw BANK(UnownBBackpic)  - $36, UnownBBackpic
-	dbw BANK(UnownCFrontpic) - $36, UnownCFrontpic
-	dbw BANK(UnownCBackpic)  - $36, UnownCBackpic
-	dbw BANK(UnownDFrontpic) - $36, UnownDFrontpic
-	dbw BANK(UnownDBackpic)  - $36, UnownDBackpic
-	dbw BANK(UnownEFrontpic) - $36, UnownEFrontpic
-	dbw BANK(UnownEBackpic)  - $36, UnownEBackpic
-	dbw BANK(UnownFFrontpic) - $36, UnownFFrontpic
-	dbw BANK(UnownFBackpic)  - $36, UnownFBackpic
-	dbw BANK(UnownGFrontpic) - $36, UnownGFrontpic
-	dbw BANK(UnownGBackpic)  - $36, UnownGBackpic
-	dbw BANK(UnownHFrontpic) - $36, UnownHFrontpic
-	dbw BANK(UnownHBackpic)  - $36, UnownHBackpic
-	dbw BANK(UnownIFrontpic) - $36, UnownIFrontpic
-	dbw BANK(UnownIBackpic)  - $36, UnownIBackpic
-	dbw BANK(UnownJFrontpic) - $36, UnownJFrontpic
-	dbw BANK(UnownJBackpic)  - $36, UnownJBackpic
-	dbw BANK(UnownKFrontpic) - $36, UnownKFrontpic
-	dbw BANK(UnownKBackpic)  - $36, UnownKBackpic
-	dbw BANK(UnownLFrontpic) - $36, UnownLFrontpic
-	dbw BANK(UnownLBackpic)  - $36, UnownLBackpic
-	dbw BANK(UnownMFrontpic) - $36, UnownMFrontpic
-	dbw BANK(UnownMBackpic)  - $36, UnownMBackpic
-	dbw BANK(UnownNFrontpic) - $36, UnownNFrontpic
-	dbw BANK(UnownNBackpic)  - $36, UnownNBackpic
-	dbw BANK(UnownOFrontpic) - $36, UnownOFrontpic
-	dbw BANK(UnownOBackpic)  - $36, UnownOBackpic
-	dbw BANK(UnownPFrontpic) - $36, UnownPFrontpic
-	dbw BANK(UnownPBackpic)  - $36, UnownPBackpic
-	dbw BANK(UnownQFrontpic) - $36, UnownQFrontpic
-	dbw BANK(UnownQBackpic)  - $36, UnownQBackpic
-	dbw BANK(UnownRFrontpic) - $36, UnownRFrontpic
-	dbw BANK(UnownRBackpic)  - $36, UnownRBackpic
-	dbw BANK(UnownSFrontpic) - $36, UnownSFrontpic
-	dbw BANK(UnownSBackpic)  - $36, UnownSBackpic
-	dbw BANK(UnownTFrontpic) - $36, UnownTFrontpic
-	dbw BANK(UnownTBackpic)  - $36, UnownTBackpic
-	dbw BANK(UnownUFrontpic) - $36, UnownUFrontpic
-	dbw BANK(UnownUBackpic)  - $36, UnownUBackpic
-	dbw BANK(UnownVFrontpic) - $36, UnownVFrontpic
-	dbw BANK(UnownVBackpic)  - $36, UnownVBackpic
-	dbw BANK(UnownWFrontpic) - $36, UnownWFrontpic
-	dbw BANK(UnownWBackpic)  - $36, UnownWBackpic
-	dbw BANK(UnownXFrontpic) - $36, UnownXFrontpic
-	dbw BANK(UnownXBackpic)  - $36, UnownXBackpic
-	dbw BANK(UnownYFrontpic) - $36, UnownYFrontpic
-	dbw BANK(UnownYBackpic)  - $36, UnownYBackpic
-	dbw BANK(UnownZFrontpic) - $36, UnownZFrontpic
-	dbw BANK(UnownZBackpic)  - $36, UnownZBackpic
+	add_pic UnownAFrontpic
+	add_pic UnownABackpic
+	add_pic UnownBFrontpic
+	add_pic UnownBBackpic
+	add_pic UnownCFrontpic
+	add_pic UnownCBackpic
+	add_pic UnownDFrontpic
+	add_pic UnownDBackpic
+	add_pic UnownEFrontpic
+	add_pic UnownEBackpic
+	add_pic UnownFFrontpic
+	add_pic UnownFBackpic
+	add_pic UnownGFrontpic
+	add_pic UnownGBackpic
+	add_pic UnownHFrontpic
+	add_pic UnownHBackpic
+	add_pic UnownIFrontpic
+	add_pic UnownIBackpic
+	add_pic UnownJFrontpic
+	add_pic UnownJBackpic
+	add_pic UnownKFrontpic
+	add_pic UnownKBackpic
+	add_pic UnownLFrontpic
+	add_pic UnownLBackpic
+	add_pic UnownMFrontpic
+	add_pic UnownMBackpic
+	add_pic UnownNFrontpic
+	add_pic UnownNBackpic
+	add_pic UnownOFrontpic
+	add_pic UnownOBackpic
+	add_pic UnownPFrontpic
+	add_pic UnownPBackpic
+	add_pic UnownQFrontpic
+	add_pic UnownQBackpic
+	add_pic UnownRFrontpic
+	add_pic UnownRBackpic
+	add_pic UnownSFrontpic
+	add_pic UnownSBackpic
+	add_pic UnownTFrontpic
+	add_pic UnownTBackpic
+	add_pic UnownUFrontpic
+	add_pic UnownUBackpic
+	add_pic UnownVFrontpic
+	add_pic UnownVBackpic
+	add_pic UnownWFrontpic
+	add_pic UnownWBackpic
+	add_pic UnownXFrontpic
+	add_pic UnownXBackpic
+	add_pic UnownYFrontpic
+	add_pic UnownYBackpic
+	add_pic UnownZFrontpic
+	add_pic UnownZBackpic
diff --git a/gfx/trainers/028.pal b/gfx/trainers/beauty.pal
index 7183a0502..7183a0502 100644
--- a/gfx/trainers/028.pal
+++ b/gfx/trainers/beauty.pal
diff --git a/gfx/trainers/044.pal b/gfx/trainers/biker.pal
index bfffe557d..bfffe557d 100644
--- a/gfx/trainers/044.pal
+++ b/gfx/trainers/biker.pal
diff --git a/gfx/trainers/023.pal b/gfx/trainers/bird_keeper.pal
index ca0407a3b..ca0407a3b 100644
--- a/gfx/trainers/023.pal
+++ b/gfx/trainers/bird_keeper.pal
diff --git a/gfx/trainers/049.pal b/gfx/trainers/blackbelt_t.pal
index 59ea02844..59ea02844 100644
--- a/gfx/trainers/049.pal
+++ b/gfx/trainers/blackbelt_t.pal
diff --git a/gfx/trainers/045.pal b/gfx/trainers/blaine.pal
index 90f3a381f..90f3a381f 100644
--- a/gfx/trainers/045.pal
+++ b/gfx/trainers/blaine.pal
diff --git a/gfx/trainers/063.pal b/gfx/trainers/blue.pal
index ce6b3f1d7..ce6b3f1d7 100644
--- a/gfx/trainers/063.pal
+++ b/gfx/trainers/blue.pal
diff --git a/gfx/trainers/057.pal b/gfx/trainers/boarder.pal
index 4fb9af5e1..4fb9af5e1 100644
--- a/gfx/trainers/057.pal
+++ b/gfx/trainers/boarder.pal
diff --git a/gfx/trainers/016.pal b/gfx/trainers/brock.pal
index f5a1b0c06..f5a1b0c06 100644
--- a/gfx/trainers/016.pal
+++ b/gfx/trainers/brock.pal
diff --git a/gfx/trainers/012.pal b/gfx/trainers/bruno.pal
index 41408a91d..41408a91d 100644
--- a/gfx/trainers/012.pal
+++ b/gfx/trainers/bruno.pal
diff --git a/gfx/trainers/035.pal b/gfx/trainers/bug_catcher.pal
index 8e4df4219..8e4df4219 100644
--- a/gfx/trainers/035.pal
+++ b/gfx/trainers/bug_catcher.pal
diff --git a/gfx/trainers/002.pal b/gfx/trainers/bugsy.pal
index 1743f663b..1743f663b 100644
--- a/gfx/trainers/002.pal
+++ b/gfx/trainers/bugsy.pal
diff --git a/gfx/trainers/046.pal b/gfx/trainers/burglar.pal
index cfcdd144f..cfcdd144f 100644
--- a/gfx/trainers/046.pal
+++ b/gfx/trainers/burglar.pal
diff --git a/gfx/trainers/011.pal b/gfx/trainers/cal.pal
index 92101c5e3..92101c5e3 100644
--- a/gfx/trainers/011.pal
+++ b/gfx/trainers/cal.pal
diff --git a/gfx/trainers/053.pal b/gfx/trainers/camper.pal
index 13a083c68..13a083c68 100644
--- a/gfx/trainers/053.pal
+++ b/gfx/trainers/camper.pal
diff --git a/gfx/trainers/015.pal b/gfx/trainers/champion.pal
index 3dee1efef..3dee1efef 100644
--- a/gfx/trainers/015.pal
+++ b/gfx/trainers/champion.pal
diff --git a/gfx/trainers/006.pal b/gfx/trainers/chuck.pal
index 9616829dc..9616829dc 100644
--- a/gfx/trainers/006.pal
+++ b/gfx/trainers/chuck.pal
diff --git a/gfx/trainers/007.pal b/gfx/trainers/clair.pal
index 616598fee..616598fee 100644
--- a/gfx/trainers/007.pal
+++ b/gfx/trainers/clair.pal
diff --git a/gfx/trainers/026.pal b/gfx/trainers/cooltrainer_f.pal
index bdeefabf8..bdeefabf8 100644
--- a/gfx/trainers/026.pal
+++ b/gfx/trainers/cooltrainer_f.pal
diff --git a/gfx/trainers/027.pal b/gfx/trainers/cooltrainer_m.pal
index bdeefabf8..bdeefabf8 100644
--- a/gfx/trainers/027.pal
+++ b/gfx/trainers/cooltrainer_m.pal
diff --git a/gfx/trainers/020.pal b/gfx/trainers/erika.pal
index e8de9b43d..e8de9b43d 100644
--- a/gfx/trainers/020.pal
+++ b/gfx/trainers/erika.pal
diff --git a/gfx/trainers/054.pal b/gfx/trainers/executive_f.pal
index 36ec86f8e..36ec86f8e 100644
--- a/gfx/trainers/054.pal
+++ b/gfx/trainers/executive_f.pal
diff --git a/gfx/trainers/050.pal b/gfx/trainers/executive_m.pal
index 66e0a46c9..66e0a46c9 100644
--- a/gfx/trainers/050.pal
+++ b/gfx/trainers/executive_m.pal
diff --git a/gfx/trainers/000.pal b/gfx/trainers/falkner.pal
index ddc5262ba..ddc5262ba 100644
--- a/gfx/trainers/000.pal
+++ b/gfx/trainers/falkner.pal
diff --git a/gfx/trainers/047.pal b/gfx/trainers/firebreather.pal
index b051224dd..b051224dd 100644
--- a/gfx/trainers/047.pal
+++ b/gfx/trainers/firebreather.pal
diff --git a/gfx/trainers/036.pal b/gfx/trainers/fisher.pal
index 9d0657111..9d0657111 100644
--- a/gfx/trainers/036.pal
+++ b/gfx/trainers/fisher.pal
diff --git a/gfx/trainers/031.pal b/gfx/trainers/gentleman.pal
index c6faa0d33..c6faa0d33 100644
--- a/gfx/trainers/031.pal
+++ b/gfx/trainers/gentleman.pal
diff --git a/gfx/trainers/065.pal b/gfx/trainers/grunt_f.pal
index 746132411..746132411 100644
--- a/gfx/trainers/065.pal
+++ b/gfx/trainers/grunt_f.pal
diff --git a/gfx/trainers/030.pal b/gfx/trainers/grunt_m.pal
index f7dc95d8f..f7dc95d8f 100644
--- a/gfx/trainers/030.pal
+++ b/gfx/trainers/grunt_m.pal
diff --git a/gfx/trainers/042.pal b/gfx/trainers/guitarist.pal
index d5c88a3bd..d5c88a3bd 100644
--- a/gfx/trainers/042.pal
+++ b/gfx/trainers/guitarist.pal
diff --git a/gfx/trainers/043.pal b/gfx/trainers/hiker.pal
index 8d0cb5c4c..8d0cb5c4c 100644
--- a/gfx/trainers/043.pal
+++ b/gfx/trainers/hiker.pal
diff --git a/gfx/trainers/025.pal b/gfx/trainers/janine.pal
index e958004cb..e958004cb 100644
--- a/gfx/trainers/025.pal
+++ b/gfx/trainers/janine.pal
diff --git a/gfx/trainers/005.pal b/gfx/trainers/jasmine.pal
index 352d95673..352d95673 100644
--- a/gfx/trainers/005.pal
+++ b/gfx/trainers/jasmine.pal
diff --git a/gfx/trainers/048.pal b/gfx/trainers/juggler.pal
index ffee98b09..ffee98b09 100644
--- a/gfx/trainers/048.pal
+++ b/gfx/trainers/juggler.pal
diff --git a/gfx/trainers/013.pal b/gfx/trainers/karen.pal
index 0eeb5fa2d..0eeb5fa2d 100644
--- a/gfx/trainers/013.pal
+++ b/gfx/trainers/karen.pal
diff --git a/gfx/trainers/059.pal b/gfx/trainers/kimono_girl.pal
index 334b11d21..334b11d21 100644
--- a/gfx/trainers/059.pal
+++ b/gfx/trainers/kimono_girl.pal
diff --git a/gfx/trainers/014.pal b/gfx/trainers/koga.pal
index 096b1e131..096b1e131 100644
--- a/gfx/trainers/014.pal
+++ b/gfx/trainers/koga.pal
diff --git a/gfx/trainers/024.pal b/gfx/trainers/lass.pal
index 1ca3149dc..1ca3149dc 100644
--- a/gfx/trainers/024.pal
+++ b/gfx/trainers/lass.pal
diff --git a/gfx/trainers/018.pal b/gfx/trainers/lt_surge.pal
index 6243fae58..6243fae58 100644
--- a/gfx/trainers/018.pal
+++ b/gfx/trainers/lt_surge.pal
diff --git a/gfx/trainers/056.pal b/gfx/trainers/medium.pal
index e06b66f39..e06b66f39 100644
--- a/gfx/trainers/056.pal
+++ b/gfx/trainers/medium.pal
diff --git a/gfx/trainers/017.pal b/gfx/trainers/misty.pal
index aab4b0849..aab4b0849 100644
--- a/gfx/trainers/017.pal
+++ b/gfx/trainers/misty.pal
diff --git a/gfx/trainers/003.pal b/gfx/trainers/morty.pal
index 736d93ba7..736d93ba7 100644
--- a/gfx/trainers/003.pal
+++ b/gfx/trainers/morty.pal
diff --git a/gfx/trainers/066.pal b/gfx/trainers/mysticalman.pal
index 7e95414ae..7e95414ae 100644
--- a/gfx/trainers/066.pal
+++ b/gfx/trainers/mysticalman.pal
diff --git a/gfx/trainers/009.pal b/gfx/trainers/oak.pal
index a4be7ff97..a4be7ff97 100644
--- a/gfx/trainers/009.pal
+++ b/gfx/trainers/oak.pal
diff --git a/gfx/trainers/064.pal b/gfx/trainers/officer.pal
index a14a47917..a14a47917 100644
--- a/gfx/trainers/064.pal
+++ b/gfx/trainers/officer.pal
diff --git a/gfx/trainers/palette_pointers.asm b/gfx/trainers/palette_pointers.asm
index 0c8627204..145c35534 100644
--- a/gfx/trainers/palette_pointers.asm
+++ b/gfx/trainers/palette_pointers.asm
@@ -3,80 +3,81 @@ TrainerPalettes: ; b0ce
 
 PlayerPalette: ; b0ce
 ; The player's palette
-	RGB 25, 18, 12
-	RGB 22, 09, 05
+;	RGB 25, 18, 12
+;	RGB 22, 09, 05
+	INCLUDE "gfx/trainers/cal.pal"
 
 KrisPalette: ; b0d0
-; Apparently Kris uses Falkner's palette
+; Kris uses Falkner's palette
 ;	RGB 27, 17, 14
 ;	RGB 07, 05, 31
 
-FalknerPalette:      INCLUDE "gfx/trainers/000.pal"
-WhitneyPalette:      INCLUDE "gfx/trainers/001.pal"
-BugsyPalette:        INCLUDE "gfx/trainers/002.pal"
-MortyPalette:        INCLUDE "gfx/trainers/003.pal"
-PrycePalette:        INCLUDE "gfx/trainers/004.pal"
-JasminePalette:      INCLUDE "gfx/trainers/005.pal"
-ChuckPalette:        INCLUDE "gfx/trainers/006.pal"
-ClairPalette:        INCLUDE "gfx/trainers/007.pal"
-Rival1Palette:       INCLUDE "gfx/trainers/008.pal"
-PokemonProfPalette:  INCLUDE "gfx/trainers/009.pal"
-WillPalette:         INCLUDE "gfx/trainers/010.pal"
-CalPalette:          INCLUDE "gfx/trainers/011.pal"
-BrunoPalette:        INCLUDE "gfx/trainers/012.pal"
-KarenPalette:        INCLUDE "gfx/trainers/013.pal"
-KogaPalette:         INCLUDE "gfx/trainers/014.pal"
-ChampionPalette:     INCLUDE "gfx/trainers/015.pal"
-BrockPalette:        INCLUDE "gfx/trainers/016.pal"
-MistyPalette:        INCLUDE "gfx/trainers/017.pal"
-LtSurgePalette:      INCLUDE "gfx/trainers/018.pal"
-ScientistPalette:    INCLUDE "gfx/trainers/019.pal"
-ErikaPalette:        INCLUDE "gfx/trainers/020.pal"
-YoungsterPalette:    INCLUDE "gfx/trainers/021.pal"
-SchoolboyPalette:    INCLUDE "gfx/trainers/022.pal"
-BirdKeeperPalette:   INCLUDE "gfx/trainers/023.pal"
-LassPalette:         INCLUDE "gfx/trainers/024.pal"
-JaninePalette:       INCLUDE "gfx/trainers/025.pal"
-CooltrainermPalette: INCLUDE "gfx/trainers/026.pal"
-CooltrainerfPalette: INCLUDE "gfx/trainers/027.pal"
-BeautyPalette:       INCLUDE "gfx/trainers/028.pal"
-PokemaniacPalette:   INCLUDE "gfx/trainers/029.pal"
-GruntmPalette:       INCLUDE "gfx/trainers/030.pal"
-GentlemanPalette:    INCLUDE "gfx/trainers/031.pal"
-SkierPalette:        INCLUDE "gfx/trainers/032.pal"
-TeacherPalette:      INCLUDE "gfx/trainers/033.pal"
-SabrinaPalette:      INCLUDE "gfx/trainers/034.pal"
-BugCatcherPalette:   INCLUDE "gfx/trainers/035.pal"
-FisherPalette:       INCLUDE "gfx/trainers/036.pal"
-SwimmermPalette:     INCLUDE "gfx/trainers/037.pal"
-SwimmerfPalette:     INCLUDE "gfx/trainers/038.pal"
-SailorPalette:       INCLUDE "gfx/trainers/039.pal"
-SuperNerdPalette:    INCLUDE "gfx/trainers/040.pal"
-Rival2Palette:       INCLUDE "gfx/trainers/041.pal"
-GuitaristPalette:    INCLUDE "gfx/trainers/042.pal"
-HikerPalette:        INCLUDE "gfx/trainers/043.pal"
-BikerPalette:        INCLUDE "gfx/trainers/044.pal"
-BlainePalette:       INCLUDE "gfx/trainers/045.pal"
-BurglarPalette:      INCLUDE "gfx/trainers/046.pal"
-FirebreatherPalette: INCLUDE "gfx/trainers/047.pal"
-JugglerPalette:      INCLUDE "gfx/trainers/048.pal"
-BlackbeltTPalette:   INCLUDE "gfx/trainers/049.pal"
-ExecutivemPalette:   INCLUDE "gfx/trainers/050.pal"
-PsychicTPalette:     INCLUDE "gfx/trainers/051.pal"
-PicnickerPalette:    INCLUDE "gfx/trainers/052.pal"
-CamperPalette:       INCLUDE "gfx/trainers/053.pal"
-ExecutivefPalette:   INCLUDE "gfx/trainers/054.pal"
-SagePalette:         INCLUDE "gfx/trainers/055.pal"
-MediumPalette:       INCLUDE "gfx/trainers/056.pal"
-BoarderPalette:      INCLUDE "gfx/trainers/057.pal"
-PokefanmPalette:     INCLUDE "gfx/trainers/058.pal"
-KimonoGirlPalette:   INCLUDE "gfx/trainers/059.pal"
-TwinsPalette:        INCLUDE "gfx/trainers/060.pal"
-PokefanfPalette:     INCLUDE "gfx/trainers/061.pal"
-RedPalette:          INCLUDE "gfx/trainers/062.pal"
-BluePalette:         INCLUDE "gfx/trainers/063.pal"
-OfficerPalette:      INCLUDE "gfx/trainers/064.pal"
-GruntfPalette:       INCLUDE "gfx/trainers/065.pal"
-MysticalmanPalette:  INCLUDE "gfx/trainers/066.pal"
+FalknerPalette:      INCLUDE "gfx/trainers/falkner.pal"
+WhitneyPalette:      INCLUDE "gfx/trainers/whitney.pal"
+BugsyPalette:        INCLUDE "gfx/trainers/bugsy.pal"
+MortyPalette:        INCLUDE "gfx/trainers/morty.pal"
+PrycePalette:        INCLUDE "gfx/trainers/pryce.pal"
+JasminePalette:      INCLUDE "gfx/trainers/jasmine.pal"
+ChuckPalette:        INCLUDE "gfx/trainers/chuck.pal"
+ClairPalette:        INCLUDE "gfx/trainers/clair.pal"
+Rival1Palette:       INCLUDE "gfx/trainers/rival1.pal"
+PokemonProfPalette:  INCLUDE "gfx/trainers/oak.pal"
+WillPalette:         INCLUDE "gfx/trainers/will.pal"
+CalPalette:          INCLUDE "gfx/trainers/cal.pal"
+BrunoPalette:        INCLUDE "gfx/trainers/bruno.pal"
+KarenPalette:        INCLUDE "gfx/trainers/karen.pal"
+KogaPalette:         INCLUDE "gfx/trainers/koga.pal"
+ChampionPalette:     INCLUDE "gfx/trainers/champion.pal"
+BrockPalette:        INCLUDE "gfx/trainers/brock.pal"
+MistyPalette:        INCLUDE "gfx/trainers/misty.pal"
+LtSurgePalette:      INCLUDE "gfx/trainers/lt_surge.pal"
+ScientistPalette:    INCLUDE "gfx/trainers/scientist.pal"
+ErikaPalette:        INCLUDE "gfx/trainers/erika.pal"
+YoungsterPalette:    INCLUDE "gfx/trainers/youngster.pal"
+SchoolboyPalette:    INCLUDE "gfx/trainers/schoolboy.pal"
+BirdKeeperPalette:   INCLUDE "gfx/trainers/bird_keeper.pal"
+LassPalette:         INCLUDE "gfx/trainers/lass.pal"
+JaninePalette:       INCLUDE "gfx/trainers/janine.pal"
+CooltrainermPalette: INCLUDE "gfx/trainers/cooltrainer_m.pal"
+CooltrainerfPalette: INCLUDE "gfx/trainers/cooltrainer_f.pal"
+BeautyPalette:       INCLUDE "gfx/trainers/beauty.pal"
+PokemaniacPalette:   INCLUDE "gfx/trainers/pokemaniac.pal"
+GruntmPalette:       INCLUDE "gfx/trainers/grunt_m.pal"
+GentlemanPalette:    INCLUDE "gfx/trainers/gentleman.pal"
+SkierPalette:        INCLUDE "gfx/trainers/skier.pal"
+TeacherPalette:      INCLUDE "gfx/trainers/teacher.pal"
+SabrinaPalette:      INCLUDE "gfx/trainers/sabrina.pal"
+BugCatcherPalette:   INCLUDE "gfx/trainers/bug_catcher.pal"
+FisherPalette:       INCLUDE "gfx/trainers/fisher.pal"
+SwimmermPalette:     INCLUDE "gfx/trainers/swimmer_m.pal"
+SwimmerfPalette:     INCLUDE "gfx/trainers/swimmer_f.pal"
+SailorPalette:       INCLUDE "gfx/trainers/sailor.pal"
+SuperNerdPalette:    INCLUDE "gfx/trainers/super_nerd.pal"
+Rival2Palette:       INCLUDE "gfx/trainers/rival2.pal"
+GuitaristPalette:    INCLUDE "gfx/trainers/guitarist.pal"
+HikerPalette:        INCLUDE "gfx/trainers/hiker.pal"
+BikerPalette:        INCLUDE "gfx/trainers/biker.pal"
+BlainePalette:       INCLUDE "gfx/trainers/blaine.pal"
+BurglarPalette:      INCLUDE "gfx/trainers/burglar.pal"
+FirebreatherPalette: INCLUDE "gfx/trainers/firebreather.pal"
+JugglerPalette:      INCLUDE "gfx/trainers/juggler.pal"
+BlackbeltTPalette:   INCLUDE "gfx/trainers/blackbelt_t.pal"
+ExecutivemPalette:   INCLUDE "gfx/trainers/executive_m.pal"
+PsychicTPalette:     INCLUDE "gfx/trainers/psychic_t.pal"
+PicnickerPalette:    INCLUDE "gfx/trainers/picnicker.pal"
+CamperPalette:       INCLUDE "gfx/trainers/camper.pal"
+ExecutivefPalette:   INCLUDE "gfx/trainers/executive_f.pal"
+SagePalette:         INCLUDE "gfx/trainers/sage.pal"
+MediumPalette:       INCLUDE "gfx/trainers/medium.pal"
+BoarderPalette:      INCLUDE "gfx/trainers/boarder.pal"
+PokefanmPalette:     INCLUDE "gfx/trainers/pokefan_m.pal"
+KimonoGirlPalette:   INCLUDE "gfx/trainers/kimono_girl.pal"
+TwinsPalette:        INCLUDE "gfx/trainers/twins.pal"
+PokefanfPalette:     INCLUDE "gfx/trainers/pokefan_f.pal"
+RedPalette:          INCLUDE "gfx/trainers/red.pal"
+BluePalette:         INCLUDE "gfx/trainers/blue.pal"
+OfficerPalette:      INCLUDE "gfx/trainers/officer.pal"
+GruntfPalette:       INCLUDE "gfx/trainers/grunt_f.pal"
+MysticalmanPalette:  INCLUDE "gfx/trainers/mysticalman.pal"
 ; b1de
 
diff --git a/gfx/trainers/052.pal b/gfx/trainers/picnicker.pal
index d0eec39f9..d0eec39f9 100644
--- a/gfx/trainers/052.pal
+++ b/gfx/trainers/picnicker.pal
diff --git a/gfx/trainers/061.pal b/gfx/trainers/pokefan_f.pal
index 57d1b94cf..57d1b94cf 100644
--- a/gfx/trainers/061.pal
+++ b/gfx/trainers/pokefan_f.pal
diff --git a/gfx/trainers/058.pal b/gfx/trainers/pokefan_m.pal
index 601ed4ae9..601ed4ae9 100644
--- a/gfx/trainers/058.pal
+++ b/gfx/trainers/pokefan_m.pal
diff --git a/gfx/trainers/029.pal b/gfx/trainers/pokemaniac.pal
index f8e224ab8..f8e224ab8 100644
--- a/gfx/trainers/029.pal
+++ b/gfx/trainers/pokemaniac.pal
diff --git a/gfx/trainers/004.pal b/gfx/trainers/pryce.pal
index ca319f05a..ca319f05a 100644
--- a/gfx/trainers/004.pal
+++ b/gfx/trainers/pryce.pal
diff --git a/gfx/trainers/051.pal b/gfx/trainers/psychic_t.pal
index e19c4d817..e19c4d817 100644
--- a/gfx/trainers/051.pal
+++ b/gfx/trainers/psychic_t.pal
diff --git a/gfx/trainers/062.pal b/gfx/trainers/red.pal
index 3ebf35fb7..3ebf35fb7 100644
--- a/gfx/trainers/062.pal
+++ b/gfx/trainers/red.pal
diff --git a/gfx/trainers/008.pal b/gfx/trainers/rival1.pal
index 190dc92e0..190dc92e0 100644
--- a/gfx/trainers/008.pal
+++ b/gfx/trainers/rival1.pal
diff --git a/gfx/trainers/041.pal b/gfx/trainers/rival2.pal
index 190dc92e0..190dc92e0 100644
--- a/gfx/trainers/041.pal
+++ b/gfx/trainers/rival2.pal
diff --git a/gfx/trainers/034.pal b/gfx/trainers/sabrina.pal
index 950be6902..950be6902 100644
--- a/gfx/trainers/034.pal
+++ b/gfx/trainers/sabrina.pal
diff --git a/gfx/trainers/055.pal b/gfx/trainers/sage.pal
index d61b39ec3..d61b39ec3 100644
--- a/gfx/trainers/055.pal
+++ b/gfx/trainers/sage.pal
diff --git a/gfx/trainers/039.pal b/gfx/trainers/sailor.pal
index 33b3c02b1..33b3c02b1 100644
--- a/gfx/trainers/039.pal
+++ b/gfx/trainers/sailor.pal
diff --git a/gfx/trainers/022.pal b/gfx/trainers/schoolboy.pal
index 5ba665e79..5ba665e79 100644
--- a/gfx/trainers/022.pal
+++ b/gfx/trainers/schoolboy.pal
diff --git a/gfx/trainers/019.pal b/gfx/trainers/scientist.pal
index 0661e50e8..0661e50e8 100644
--- a/gfx/trainers/019.pal
+++ b/gfx/trainers/scientist.pal
diff --git a/gfx/trainers/032.pal b/gfx/trainers/skier.pal
index 9201ca909..9201ca909 100644
--- a/gfx/trainers/032.pal
+++ b/gfx/trainers/skier.pal
diff --git a/gfx/trainers/040.pal b/gfx/trainers/super_nerd.pal
index 862d4e21e..862d4e21e 100644
--- a/gfx/trainers/040.pal
+++ b/gfx/trainers/super_nerd.pal
diff --git a/gfx/trainers/038.pal b/gfx/trainers/swimmer_f.pal
index 6bddcbcc3..6bddcbcc3 100644
--- a/gfx/trainers/038.pal
+++ b/gfx/trainers/swimmer_f.pal
diff --git a/gfx/trainers/037.pal b/gfx/trainers/swimmer_m.pal
index 164d2166b..164d2166b 100644
--- a/gfx/trainers/037.pal
+++ b/gfx/trainers/swimmer_m.pal
diff --git a/gfx/trainers/033.pal b/gfx/trainers/teacher.pal
index a614be34c..a614be34c 100644
--- a/gfx/trainers/033.pal
+++ b/gfx/trainers/teacher.pal
diff --git a/gfx/trainers/060.pal b/gfx/trainers/twins.pal
index 47792418b..47792418b 100644
--- a/gfx/trainers/060.pal
+++ b/gfx/trainers/twins.pal
diff --git a/gfx/trainers/001.pal b/gfx/trainers/whitney.pal
index a51af5fda..a51af5fda 100644
--- a/gfx/trainers/001.pal
+++ b/gfx/trainers/whitney.pal
diff --git a/gfx/trainers/010.pal b/gfx/trainers/will.pal
index d27fd8069..d27fd8069 100644
--- a/gfx/trainers/010.pal
+++ b/gfx/trainers/will.pal
diff --git a/gfx/trainers/021.pal b/gfx/trainers/youngster.pal
index a330d692f..a330d692f 100644
--- a/gfx/trainers/021.pal
+++ b/gfx/trainers/youngster.pal
diff --git a/macros.asm b/macros.asm
index 739df1bd4..897636c8f 100644
--- a/macros.asm
+++ b/macros.asm
@@ -8,6 +8,7 @@ INCLUDE "macros/move_effect.asm"
 INCLUDE "macros/move_anim.asm"
 INCLUDE "macros/movement.asm"
 INCLUDE "macros/map.asm"
+INCLUDE "macros/pic.asm"
 INCLUDE "macros/predef.asm"
 INCLUDE "macros/rst.asm"
 INCLUDE "macros/mobile.asm"
diff --git a/macros/pic.asm b/macros/pic.asm
new file mode 100644
index 000000000..a01ce7a31
--- /dev/null
+++ b/macros/pic.asm
@@ -0,0 +1,4 @@
+add_pic: MACRO
+	db BANK(\1) - $36
+	dw \1
+ENDM