61 files changed, 6 insertions, 5 deletions

diff --git a/gfx/misc/dude.2bpp.lz.d13fb490 b/gfx/battle/dude.2bpp.lz.d13fb490
index b8e96a09f..b8e96a09f 100644
--- a/gfx/misc/dude.2bpp.lz.d13fb490
+++ b/gfx/battle/dude.2bpp.lz.d13fb490
diff --git a/gfx/misc/dude.png b/gfx/battle/dude.png
index 9a74a90d6..9a74a90d6 100644
--- a/gfx/misc/dude.png
+++ b/gfx/battle/dude.png
diff --git a/gfx/font.asm b/gfx/font.asm
index 578085ddf..b61fc1e23 100755
--- a/gfx/font.asm
+++ b/gfx/font.asm
@@ -1,11 +1,11 @@
 FontExtra:
-INCBIN "gfx/misc/font_extra.2bpp"
+INCBIN "gfx/font/font_extra.2bpp"
 
 Font:
-INCBIN "gfx/misc/font.1bpp"
+INCBIN "gfx/font/font.1bpp"
 
 FontBattleExtra:
-INCBIN "gfx/misc/font_battle_extra.2bpp"
+INCBIN "gfx/font/font_battle_extra.2bpp"
 
 Frames: ; f8800
 INCBIN "gfx/frames/1.1bpp"
@@ -47,7 +47,7 @@ INCBIN "gfx/battle/expbar.2bpp"
 ; f8ba0
 
 TownMapGFX: ; f8ba0
-INCBIN "gfx/misc/town_map.2bpp.lz"
+INCBIN "gfx/pokegear/town_map.2bpp.lz"
 ; f8ea4
 
 WeekdayKanjiGFX: ; unused kanji
@@ -79,7 +79,7 @@ INCBIN "gfx/unknown/0f9424.2bpp"
 ; f9434
 
 Footprints: ; f9434
-INCBIN "gfx/misc/footprints.1bpp"
+INCBIN "gfx/pokedex/footprints.1bpp"
 ; fb434
 
 ; This and the following two functions are unreferenced.
diff --git a/gfx/misc/font.png b/gfx/font/font.png
index 7119c0691..7119c0691 100644
--- a/gfx/misc/font.png
+++ b/gfx/font/font.png
diff --git a/gfx/misc/font_battle_extra.png b/gfx/font/font_battle_extra.png
index 15e25a40c..15e25a40c 100644
--- a/gfx/misc/font_battle_extra.png
+++ b/gfx/font/font_battle_extra.png
diff --git a/gfx/misc/font_extra.png b/gfx/font/font_extra.png
index 7ca840c3a..7ca840c3a 100644
--- a/gfx/misc/font_extra.png
+++ b/gfx/font/font_extra.png
diff --git a/gfx/misc/font_inversed.png b/gfx/font/font_inversed.png
index 519339f39..519339f39 100644
--- a/gfx/misc/font_inversed.png
+++ b/gfx/font/font_inversed.png
diff --git a/gfx/misc/unown_font.png b/gfx/font/unown_font.png
index 5ac70b807..5ac70b807 100644
--- a/gfx/misc/unown_font.png
+++ b/gfx/font/unown_font.png
diff --git a/gfx/misc/boulderdust.png b/gfx/ow_fx/boulder_dust.png
index 9acb11c1b..9acb11c1b 100644
--- a/gfx/misc/boulderdust.png
+++ b/gfx/ow_fx/boulder_dust.png
diff --git a/gfx/overworld/chris_fish.png b/gfx/ow_fx/chris_fish.png
index ea0730151..ea0730151 100644
--- a/gfx/overworld/chris_fish.png
+++ b/gfx/ow_fx/chris_fish.png
diff --git a/gfx/misc/cut_grass.png b/gfx/ow_fx/cut_grass.png
index b10e0cf8c..b10e0cf8c 100644
--- a/gfx/misc/cut_grass.png
+++ b/gfx/ow_fx/cut_grass.png
diff --git a/gfx/misc/cut_tree.png b/gfx/ow_fx/cut_tree.png
index c1f1bc97d..c1f1bc97d 100644
--- a/gfx/misc/cut_tree.png
+++ b/gfx/ow_fx/cut_tree.png
diff --git a/gfx/misc/fishing2.png b/gfx/ow_fx/fishing_rod.png
index 32d277269..32d277269 100644
--- a/gfx/misc/fishing2.png
+++ b/gfx/ow_fx/fishing_rod.png
diff --git a/gfx/misc/fishing4.png b/gfx/ow_fx/grass_rustle.png
index 0b2d73e2c..0b2d73e2c 100644
--- a/gfx/misc/fishing4.png
+++ b/gfx/ow_fx/grass_rustle.png
diff --git a/gfx/overworld/headbutt_tree.png b/gfx/ow_fx/headbutt_tree.png
index 4cbb595f7..4cbb595f7 100644
--- a/gfx/overworld/headbutt_tree.png
+++ b/gfx/ow_fx/headbutt_tree.png
diff --git a/gfx/overworld/kris_fish.png b/gfx/ow_fx/kris_fish.png
index a47b89042..a47b89042 100644
--- a/gfx/overworld/kris_fish.png
+++ b/gfx/ow_fx/kris_fish.png
diff --git a/gfx/misc/shadow.png b/gfx/ow_fx/shadow.png
index ba3dab5be..ba3dab5be 100644
--- a/gfx/misc/shadow.png
+++ b/gfx/ow_fx/shadow.png
diff --git a/gfx/overworld/trainer_battle_pokeball_tiles.png b/gfx/ow_fx/trainer_battle_pokeball_tiles.png
index a4655d26e..a4655d26e 100644
--- a/gfx/overworld/trainer_battle_pokeball_tiles.png
+++ b/gfx/ow_fx/trainer_battle_pokeball_tiles.png
diff --git a/gfx/misc/pack.png b/gfx/pack/pack.png
index b85fc0990..b85fc0990 100644
--- a/gfx/misc/pack.png
+++ b/gfx/pack/pack.png
diff --git a/gfx/misc/pack_f.png b/gfx/pack/pack_f.png
index fbe120bd1..fbe120bd1 100644
--- a/gfx/misc/pack_f.png
+++ b/gfx/pack/pack_f.png
diff --git a/gfx/misc/pack_menu.png b/gfx/pack/pack_menu.png
index 52e2bcdd5..52e2bcdd5 100644
--- a/gfx/misc/pack_menu.png
+++ b/gfx/pack/pack_menu.png
diff --git a/gfx/pc.2bpp.lz.2201c1aa b/gfx/pc/pc.2bpp.lz.2201c1aa
index 996cfadc9..996cfadc9 100644
--- a/gfx/pc.2bpp.lz.2201c1aa
+++ b/gfx/pc/pc.2bpp.lz.2201c1aa
diff --git a/gfx/pc.png b/gfx/pc/pc.png
index ce8fed73b..ce8fed73b 100644
--- a/gfx/pc.png
+++ b/gfx/pc/pc.png
diff --git a/gfx/pc_mail.png b/gfx/pc/pc_mail.png
index fd4b2892f..fd4b2892f 100644
--- a/gfx/pc_mail.png
+++ b/gfx/pc/pc_mail.png
diff --git a/gfx/misc/chris.png b/gfx/player/chris.png
index 19869944e..19869944e 100644
--- a/gfx/misc/chris.png
+++ b/gfx/player/chris.png
diff --git a/gfx/misc/player.2bpp.lz.0312ddce b/gfx/player/chris_back.2bpp.lz.0312ddce
index aec84bbab..aec84bbab 100644
--- a/gfx/misc/player.2bpp.lz.0312ddce
+++ b/gfx/player/chris_back.2bpp.lz.0312ddce
diff --git a/gfx/misc/player.png b/gfx/player/chris_back.png
index 7bf3c50db..7bf3c50db 100644
--- a/gfx/misc/player.png
+++ b/gfx/player/chris_back.png
diff --git a/gfx/misc/kris.png b/gfx/player/kris.png
index 7a855e676..7a855e676 100644
--- a/gfx/misc/kris.png
+++ b/gfx/player/kris.png
diff --git a/gfx/misc/kris_back.png b/gfx/player/kris_back.png
index eb0c1e941..eb0c1e941 100644
--- a/gfx/misc/kris_back.png
+++ b/gfx/player/kris_back.png
diff --git a/gfx/misc/footprints.png b/gfx/pokedex/footprints.png
index b1e350436..b1e350436 100644
--- a/gfx/misc/footprints.png
+++ b/gfx/pokedex/footprints.png
diff --git a/gfx/pokegear/dexmap_nest_icon.2bpp b/gfx/pokegear/dexmap_nest_icon.2bpp
new file mode 100644
index 000000000..48a4938e6
--- /dev/null
+++ b/gfx/pokegear/dexmap_nest_icon.2bpp
@@ -0,0 +1 @@
+BBffÿÿ½ÿ™ÿÿÿZZ$$
\ No newline at end of file
diff --git a/gfx/misc/fast_ship.png b/gfx/pokegear/fast_ship.png
index e92f00f55..e92f00f55 100644
--- a/gfx/misc/fast_ship.png
+++ b/gfx/pokegear/fast_ship.png
diff --git a/gfx/pokegear/flymap_label_border.1bpp b/gfx/pokegear/flymap_label_border.1bpp
new file mode 100644
index 000000000..671aab1d7
--- /dev/null
+++ b/gfx/pokegear/flymap_label_border.1bpp
diff --git a/gfx/misc/johto.bin b/gfx/pokegear/johto.bin
index faa5efe70..faa5efe70 100644
--- a/gfx/misc/johto.bin
+++ b/gfx/pokegear/johto.bin
diff --git a/gfx/misc/kanto.bin b/gfx/pokegear/kanto.bin
index 8a08cd826..8a08cd826 100644
--- a/gfx/misc/kanto.bin
+++ b/gfx/pokegear/kanto.bin
diff --git a/gfx/misc/pokegear.2bpp.lz.42315ab4 b/gfx/pokegear/pokegear.2bpp.lz.42315ab4
index df312a51b..df312a51b 100644
--- a/gfx/misc/pokegear.2bpp.lz.42315ab4
+++ b/gfx/pokegear/pokegear.2bpp.lz.42315ab4
diff --git a/gfx/misc/pokegear.png b/gfx/pokegear/pokegear.png
index 78774a260..78774a260 100644
--- a/gfx/misc/pokegear.png
+++ b/gfx/pokegear/pokegear.png
diff --git a/gfx/misc/pokegear_sprites.2bpp.lz.7a3cc91f b/gfx/pokegear/pokegear_sprites.2bpp.lz.7a3cc91f
index b5af62d28..b5af62d28 100644
--- a/gfx/misc/pokegear_sprites.2bpp.lz.7a3cc91f
+++ b/gfx/pokegear/pokegear_sprites.2bpp.lz.7a3cc91f
diff --git a/gfx/misc/pokegear_sprites.png b/gfx/pokegear/pokegear_sprites.png
index 746d4b486..746d4b486 100644
--- a/gfx/misc/pokegear_sprites.png
+++ b/gfx/pokegear/pokegear_sprites.png
diff --git a/gfx/misc/town_map.2bpp.lz.c0587c86 b/gfx/pokegear/town_map.2bpp.lz.c0587c86
index c807a372f..c807a372f 100644
--- a/gfx/misc/town_map.2bpp.lz.c0587c86
+++ b/gfx/pokegear/town_map.2bpp.lz.c0587c86
diff --git a/gfx/misc/town_map.png b/gfx/pokegear/town_map.png
index 6e7af59d0..6e7af59d0 100644
--- a/gfx/misc/town_map.png
+++ b/gfx/pokegear/town_map.png
diff --git a/gfx/shrink1.2bpp.lz.d4443930 b/gfx/shrink/shrink1.2bpp.lz.d4443930
index 284bee8c2..284bee8c2 100644
--- a/gfx/shrink1.2bpp.lz.d4443930
+++ b/gfx/shrink/shrink1.2bpp.lz.d4443930
diff --git a/gfx/shrink1.png b/gfx/shrink/shrink1.png
index 6cf5b8077..6cf5b8077 100644
--- a/gfx/shrink1.png
+++ b/gfx/shrink/shrink1.png
diff --git a/gfx/shrink2.2bpp.lz.3f58480a b/gfx/shrink/shrink2.2bpp.lz.3f58480a
index df14d5ed4..df14d5ed4 100644
--- a/gfx/shrink2.2bpp.lz.3f58480a
+++ b/gfx/shrink/shrink2.2bpp.lz.3f58480a
diff --git a/gfx/shrink2.png b/gfx/shrink/shrink2.png
index 276b4e7c7..276b4e7c7 100644
--- a/gfx/shrink2.png
+++ b/gfx/shrink/shrink2.png
diff --git a/gfx/slots.tilemap b/gfx/slots/slots.tilemap
index 5e920ed54..5e920ed54 100644
--- a/gfx/slots.tilemap
+++ b/gfx/slots/slots.tilemap
diff --git a/gfx/slots_1.2bpp.lz.b22ddc13 b/gfx/slots/slots_1.2bpp.lz.b22ddc13
index 90d3ce139..90d3ce139 100644
--- a/gfx/slots_1.2bpp.lz.b22ddc13
+++ b/gfx/slots/slots_1.2bpp.lz.b22ddc13
diff --git a/gfx/slots_1.png b/gfx/slots/slots_1.png
index a10340844..a10340844 100644
--- a/gfx/slots_1.png
+++ b/gfx/slots/slots_1.png
diff --git a/gfx/slots_2.2bpp.lz.b28f76e3 b/gfx/slots/slots_2.2bpp.lz.b28f76e3
index 638c68055..638c68055 100644
--- a/gfx/slots_2.2bpp.lz.b28f76e3
+++ b/gfx/slots/slots_2.2bpp.lz.b28f76e3
diff --git a/gfx/slots_2.png b/gfx/slots/slots_2.png
index aa1292ccb..aa1292ccb 100644
--- a/gfx/slots_2.png
+++ b/gfx/slots/slots_2.png
diff --git a/gfx/slots_3.2bpp.lz.70c2984c b/gfx/slots/slots_3.2bpp.lz.70c2984c
index 858b6e464..858b6e464 100644
--- a/gfx/slots_3.2bpp.lz.70c2984c
+++ b/gfx/slots/slots_3.2bpp.lz.70c2984c
diff --git a/gfx/slots_3.png b/gfx/slots/slots_3.png
index 456e9b6bf..456e9b6bf 100755..100644
--- a/gfx/slots_3.png
+++ b/gfx/slots/slots_3.png
diff --git a/gfx/misc/copyright.png b/gfx/splash/copyright.png
index 023bb93dd..023bb93dd 100644
--- a/gfx/misc/copyright.png
+++ b/gfx/splash/copyright.png
diff --git a/gfx/tilesets/water.png b/gfx/tilesets/water/water.png
index 0aa2640c9..0aa2640c9 100644
--- a/gfx/tilesets/water.png
+++ b/gfx/tilesets/water/water.png
diff --git a/gfx/misc/badges.png b/gfx/trainer_card/badges.png
index 4e5820da8..4e5820da8 100644
--- a/gfx/misc/badges.png
+++ b/gfx/trainer_card/badges.png
diff --git a/gfx/misc/card_right_corner.png b/gfx/trainer_card/card_right_corner.png
index fa9aea024..fa9aea024 100644
--- a/gfx/misc/card_right_corner.png
+++ b/gfx/trainer_card/card_right_corner.png
diff --git a/gfx/misc/card_status.png b/gfx/trainer_card/card_status.png
index b33bb2029..b33bb2029 100644
--- a/gfx/misc/card_status.png
+++ b/gfx/trainer_card/card_status.png
diff --git a/gfx/misc/chris_card.png b/gfx/trainer_card/chris_card.png
index 977981d41..977981d41 100644
--- a/gfx/misc/chris_card.png
+++ b/gfx/trainer_card/chris_card.png
diff --git a/gfx/misc/kris_card.png b/gfx/trainer_card/kris_card.png
index 2ffa11159..2ffa11159 100644
--- a/gfx/misc/kris_card.png
+++ b/gfx/trainer_card/kris_card.png
diff --git a/gfx/misc/leaders.png b/gfx/trainer_card/leaders.png
index 6e7eb0f8d..6e7eb0f8d 100644
--- a/gfx/misc/leaders.png
+++ b/gfx/trainer_card/leaders.png
diff --git a/gfx/misc/trainer_card.png b/gfx/trainer_card/trainer_card.png
index 88ce35bca..88ce35bca 100644
--- a/gfx/misc/trainer_card.png
+++ b/gfx/trainer_card/trainer_card.png