Move dex gfx back to pokedex subfolder

45 files changed, 52 insertions, 52 deletions

diff --git a/graphics/pokedex_area_markers/marker.pal b/graphics/pokedex/area_markers/marker.pal
index 5a7190a3a..5a7190a3a 100644
--- a/graphics/pokedex_area_markers/marker.pal
+++ b/graphics/pokedex/area_markers/marker.pal
diff --git a/graphics/pokedex_area_markers/marker_0.png b/graphics/pokedex/area_markers/marker_0.png
index 10ef6d24b..10ef6d24b 100644
--- a/graphics/pokedex_area_markers/marker_0.png
+++ b/graphics/pokedex/area_markers/marker_0.png
diff --git a/graphics/pokedex_area_markers/marker_1.png b/graphics/pokedex/area_markers/marker_1.png
index 21db66b29..21db66b29 100644
--- a/graphics/pokedex_area_markers/marker_1.png
+++ b/graphics/pokedex/area_markers/marker_1.png
diff --git a/graphics/pokedex_area_markers/marker_2.png b/graphics/pokedex/area_markers/marker_2.png
index e25be6f5c..e25be6f5c 100644
--- a/graphics/pokedex_area_markers/marker_2.png
+++ b/graphics/pokedex/area_markers/marker_2.png
diff --git a/graphics/pokedex_area_markers/marker_3.png b/graphics/pokedex/area_markers/marker_3.png
index 1e8fe22d2..1e8fe22d2 100644
--- a/graphics/pokedex_area_markers/marker_3.png
+++ b/graphics/pokedex/area_markers/marker_3.png
diff --git a/graphics/pokedex_area_markers/marker_4.png b/graphics/pokedex/area_markers/marker_4.png
index 193697384..193697384 100644
--- a/graphics/pokedex_area_markers/marker_4.png
+++ b/graphics/pokedex/area_markers/marker_4.png
diff --git a/graphics/pokedex_area_markers/marker_5.png b/graphics/pokedex/area_markers/marker_5.png
index 0919682f4..0919682f4 100644
--- a/graphics/pokedex_area_markers/marker_5.png
+++ b/graphics/pokedex/area_markers/marker_5.png
diff --git a/graphics/pokedex_area_markers/marker_6.png b/graphics/pokedex/area_markers/marker_6.png
index 439d858e1..439d858e1 100644
--- a/graphics/pokedex_area_markers/marker_6.png
+++ b/graphics/pokedex/area_markers/marker_6.png
diff --git a/graphics/interface/pokedex_blit_wide_ellipse.png b/graphics/pokedex/blit_wide_ellipse.png
index 763ed976c..763ed976c 100644
--- a/graphics/interface/pokedex_blit_wide_ellipse.png
+++ b/graphics/pokedex/blit_wide_ellipse.png
diff --git a/graphics/interface/pokedex_abc.png b/graphics/pokedex/cat_icon_abc.png
index 0ec33315e..0ec33315e 100644
--- a/graphics/interface/pokedex_abc.png
+++ b/graphics/pokedex/cat_icon_abc.png
diff --git a/graphics/interface/pokedex_cat_icon_cancel.png b/graphics/pokedex/cat_icon_cancel.png
index f8aafff9b..f8aafff9b 100644
--- a/graphics/interface/pokedex_cat_icon_cancel.png
+++ b/graphics/pokedex/cat_icon_cancel.png
diff --git a/graphics/interface/pokedex_cat_icon_cave.png b/graphics/pokedex/cat_icon_cave.png
index 56e529b32..56e529b32 100644
--- a/graphics/interface/pokedex_cat_icon_cave.png
+++ b/graphics/pokedex/cat_icon_cave.png
diff --git a/graphics/interface/pokedex_cat_icon_forest.png b/graphics/pokedex/cat_icon_forest.png
index 68f3d3463..68f3d3463 100644
--- a/graphics/interface/pokedex_cat_icon_forest.png
+++ b/graphics/pokedex/cat_icon_forest.png
diff --git a/graphics/interface/pokedex_cat_icon_grassland.png b/graphics/pokedex/cat_icon_grassland.png
index 2b0f7cd1d..2b0f7cd1d 100644
--- a/graphics/interface/pokedex_cat_icon_grassland.png
+++ b/graphics/pokedex/cat_icon_grassland.png
diff --git a/graphics/interface/pokedex_cat_icon_lightest.png b/graphics/pokedex/cat_icon_lightest.png
index 804fd02f1..804fd02f1 100644
--- a/graphics/interface/pokedex_cat_icon_lightest.png
+++ b/graphics/pokedex/cat_icon_lightest.png
diff --git a/graphics/interface/pokedex_cat_icon_mountain.png b/graphics/pokedex/cat_icon_mountain.png
index ece6eb196..ece6eb196 100644
--- a/graphics/interface/pokedex_cat_icon_mountain.png
+++ b/graphics/pokedex/cat_icon_mountain.png
diff --git a/graphics/interface/pokedex_cat_icon_numerical.png b/graphics/pokedex/cat_icon_numerical.png
index 77da41052..77da41052 100644
--- a/graphics/interface/pokedex_cat_icon_numerical.png
+++ b/graphics/pokedex/cat_icon_numerical.png
diff --git a/graphics/interface/pokedex_cat_icon_qmark.png b/graphics/pokedex/cat_icon_qmark.png
index c5db049f8..c5db049f8 100644
--- a/graphics/interface/pokedex_cat_icon_qmark.png
+++ b/graphics/pokedex/cat_icon_qmark.png
diff --git a/graphics/interface/pokedex_cat_icon_rare.png b/graphics/pokedex/cat_icon_rare.png
index 20a676b40..20a676b40 100644
--- a/graphics/interface/pokedex_cat_icon_rare.png
+++ b/graphics/pokedex/cat_icon_rare.png
diff --git a/graphics/interface/pokedex_cat_icon_rough_terrain.png b/graphics/pokedex/cat_icon_rough_terrain.png
index 61a1e3ac1..61a1e3ac1 100644
--- a/graphics/interface/pokedex_cat_icon_rough_terrain.png
+++ b/graphics/pokedex/cat_icon_rough_terrain.png
diff --git a/graphics/interface/pokedex_cat_icon_sea.png b/graphics/pokedex/cat_icon_sea.png
index 2589fc28f..2589fc28f 100644
--- a/graphics/interface/pokedex_cat_icon_sea.png
+++ b/graphics/pokedex/cat_icon_sea.png
diff --git a/graphics/interface/pokedex_cat_icon_smallest.png b/graphics/pokedex/cat_icon_smallest.png
index 2c8a25b4e..2c8a25b4e 100644
--- a/graphics/interface/pokedex_cat_icon_smallest.png
+++ b/graphics/pokedex/cat_icon_smallest.png
diff --git a/graphics/interface/pokedex_cat_icon_type.png b/graphics/pokedex/cat_icon_type.png
index 92c03ac1b..92c03ac1b 100644
--- a/graphics/interface/pokedex_cat_icon_type.png
+++ b/graphics/pokedex/cat_icon_type.png
diff --git a/graphics/interface/pokedex_cat_icon_urban.png b/graphics/pokedex/cat_icon_urban.png
index 0c422aa07..0c422aa07 100644
--- a/graphics/interface/pokedex_cat_icon_urban.png
+++ b/graphics/pokedex/cat_icon_urban.png
diff --git a/graphics/interface/pokedex_cat_icon_waters_edge.png b/graphics/pokedex/cat_icon_waters_edge.png
index d7bd2116d..d7bd2116d 100644
--- a/graphics/interface/pokedex_cat_icon_waters_edge.png
+++ b/graphics/pokedex/cat_icon_waters_edge.png
diff --git a/graphics/interface/pokedex_caught_marker.png b/graphics/pokedex/caught_marker.png
index 74f43ec80..74f43ec80 100644
--- a/graphics/interface/pokedex_caught_marker.png
+++ b/graphics/pokedex/caught_marker.png
diff --git a/graphics/interface/pokedex_kanto_dex_bgpals.pal b/graphics/pokedex/kanto_dex_bgpals.pal
index b719d111f..b719d111f 100644
--- a/graphics/interface/pokedex_kanto_dex_bgpals.pal
+++ b/graphics/pokedex/kanto_dex_bgpals.pal
diff --git a/graphics/interface/pokedex_kanto_dex_bgtiles.png b/graphics/pokedex/kanto_dex_bgtiles.png
index 5cef4b098..5cef4b098 100644
--- a/graphics/interface/pokedex_kanto_dex_bgtiles.png
+++ b/graphics/pokedex/kanto_dex_bgtiles.png
diff --git a/graphics/interface/pokedex_map_five_island.png b/graphics/pokedex/map_five_island.png
index c37c1c25a..c37c1c25a 100644
--- a/graphics/interface/pokedex_map_five_island.png
+++ b/graphics/pokedex/map_five_island.png
diff --git a/graphics/interface/pokedex_map_four_island.png b/graphics/pokedex/map_four_island.png
index 83ef69608..83ef69608 100644
--- a/graphics/interface/pokedex_map_four_island.png
+++ b/graphics/pokedex/map_four_island.png
diff --git a/graphics/interface/pokedex_map_kanto.png b/graphics/pokedex/map_kanto.png
index 3c32b2d4c..3c32b2d4c 100644
--- a/graphics/interface/pokedex_map_kanto.png
+++ b/graphics/pokedex/map_kanto.png
diff --git a/graphics/interface/pokedex_map_one_island.png b/graphics/pokedex/map_one_island.png
index 2e2d30fbb..2e2d30fbb 100644
--- a/graphics/interface/pokedex_map_one_island.png
+++ b/graphics/pokedex/map_one_island.png
diff --git a/graphics/interface/pokedex_map_seven_island.png b/graphics/pokedex/map_seven_island.png
index 3631d8906..3631d8906 100644
--- a/graphics/interface/pokedex_map_seven_island.png
+++ b/graphics/pokedex/map_seven_island.png
diff --git a/graphics/interface/pokedex_map_six_island.png b/graphics/pokedex/map_six_island.png
index 53e598139..53e598139 100644
--- a/graphics/interface/pokedex_map_six_island.png
+++ b/graphics/pokedex/map_six_island.png
diff --git a/graphics/interface/pokedex_map_three_island.png b/graphics/pokedex/map_three_island.png
index 2e34eb497..2e34eb497 100644
--- a/graphics/interface/pokedex_map_three_island.png
+++ b/graphics/pokedex/map_three_island.png
diff --git a/graphics/interface/pokedex_map_two_island.png b/graphics/pokedex/map_two_island.png
index 5006ba035..5006ba035 100644
--- a/graphics/interface/pokedex_map_two_island.png
+++ b/graphics/pokedex/map_two_island.png
diff --git a/graphics/interface/pokedex_mini_page.png b/graphics/pokedex/mini_page.png
index b6e6e2788..b6e6e2788 100644
--- a/graphics/interface/pokedex_mini_page.png
+++ b/graphics/pokedex/mini_page.png
diff --git a/graphics/interface/pokedex_national_dex_bgpals.pal b/graphics/pokedex/national_dex_bgpals.pal
index 0d68b4233..0d68b4233 100644
--- a/graphics/interface/pokedex_national_dex_bgpals.pal
+++ b/graphics/pokedex/national_dex_bgpals.pal
diff --git a/graphics/interface/pokedex_national_dex_bgtiles.png b/graphics/pokedex/national_dex_bgtiles.png
index 226e08d54..226e08d54 100644
--- a/graphics/interface/pokedex_national_dex_bgtiles.png
+++ b/graphics/pokedex/national_dex_bgtiles.png
diff --git a/graphics/interface/pokedex_page_icon_tilemap.bin b/graphics/pokedex/page_icon_tilemap.bin
index bd64c4ad4..bd64c4ad4 100644
--- a/graphics/interface/pokedex_page_icon_tilemap.bin
+++ b/graphics/pokedex/page_icon_tilemap.bin
diff --git a/graphics/interface/pokedex_silhouette_sprite_pal.pal b/graphics/pokedex/silhouette_sprite_pal.pal
index 43ab6f7f7..43ab6f7f7 100644
--- a/graphics/interface/pokedex_silhouette_sprite_pal.pal
+++ b/graphics/pokedex/silhouette_sprite_pal.pal
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 0d5c6fa7b..64e173aa4 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -492,7 +492,7 @@ $(TITLESCREENGFXDIR)/leafgreen/box_art_mon.4bpp: %.4bpp: %.png
 $(CREDITSGFXDIR)/unk_8EAE548.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 77
 
-POKEDEXAREAMARKERSDATADIR := graphics/pokedex_area_markers
+POKEDEXAREAMARKERSDATADIR := graphics/pokedex/area_markers
 
 POKEDEXAREAMARKERFILES := \
 	$(POKEDEXAREAMARKERSDATADIR)/marker_0.4bpp \
diff --git a/src/graphics.c b/src/graphics.c
index c5af3c0be..c14251d17 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1245,8 +1245,8 @@ const u32 gEasyChatRedRectangularCursor_Tiles[] = INCBIN_U32("graphics/interface
 const u16 gPokeSummary_StatusAilmentIconPals[] = INCBIN_U16("graphics/interface/link_rfu_frame.gbapal");
 const u32 gPokeSummary_StatusAilmentIconTiles[] = INCBIN_U32("graphics/interface/link_rfu_status.4bpp.lz");
 
-const u16 gDexScreen_TopMenuIconPals_AtoZ[] = INCBIN_U16("graphics/interface/pokedex_abc.gbapal");
-const u32 gDexScreen_TopMenuIconTiles_AtoZ[] = INCBIN_U32("graphics/interface/pokedex_abc.4bpp.lz");
+const u16 gDexScreen_TopMenuIconPals_AtoZ[] = INCBIN_U16("graphics/pokedex/cat_icon_abc.gbapal");
+const u32 gDexScreen_TopMenuIconTiles_AtoZ[] = INCBIN_U32("graphics/pokedex/cat_icon_abc.4bpp.lz");
 
 const u16 gPSSMenu_Pal[] = INCBIN_U16("graphics/interface/box_tiles_pal1.gbapal");
 const u16 gUnknown_8E9C3F8[] = INCBIN_U16("graphics/interface/box_tiles_pal2.gbapal");
diff --git a/src/pokedex_area_markers.c b/src/pokedex_area_markers.c
index d51efcec9..5226133ac 100644
--- a/src/pokedex_area_markers.c
+++ b/src/pokedex_area_markers.c
@@ -5,8 +5,8 @@
 #include "wild_pokemon_area.h"
 #include "pokedex_area_markers.h"
 
-static const u16 sMarkerPal[] = INCBIN_U16("graphics/pokedex_area_markers/marker.gbapal");
-static const u32 sMarkerTiles[] = INCBIN_U32("graphics/pokedex_area_markers/marker.4bpp.lz");
+static const u16 sMarkerPal[] = INCBIN_U16("graphics/pokedex/area_markers/marker.gbapal");
+static const u32 sMarkerTiles[] = INCBIN_U32("graphics/pokedex/area_markers/marker.4bpp.lz");
 
 static const struct Subsprite sSubsprite0 = {
     .size = ST_OAM_SIZE_0,
diff --git a/src/pokedex_screen.c b/src/pokedex_screen.c
index 5ea31f3d9..dc8968a5f 100644
--- a/src/pokedex_screen.c
+++ b/src/pokedex_screen.c
@@ -136,10 +136,10 @@ static void Task_DexScreen_RegisterMonToPokedex(u8 taskId);
 
 #include "data/pokemon_graphics/footprint_table.h"
 
-const u32 sCategoryMonInfoBgTiles[] = INCBIN_U32("graphics/interface/pokedex_mini_page.4bpp.lz");
-const u32 sKantoDexTiles[] = INCBIN_U32("graphics/interface/pokedex_kanto_dex_bgtiles.4bpp.lz");
-const u32 sNatDexTiles[] = INCBIN_U32("graphics/interface/pokedex_national_dex_bgtiles.4bpp.lz");
-const u16 sKantoDexPalette[0x100] = INCBIN_U16("graphics/interface/pokedex_kanto_dex_bgpals.gbapal");
+const u32 sCategoryMonInfoBgTiles[] = INCBIN_U32("graphics/pokedex/mini_page.4bpp.lz");
+const u32 sKantoDexTiles[] = INCBIN_U32("graphics/pokedex/kanto_dex_bgtiles.4bpp.lz");
+const u32 sNatDexTiles[] = INCBIN_U32("graphics/pokedex/national_dex_bgtiles.4bpp.lz");
+const u16 sKantoDexPalette[0x100] = INCBIN_U16("graphics/pokedex/kanto_dex_bgpals.gbapal");
 
 const u16 sDexScreen_CategoryCursorPals[] = {
     RGB(24, 22, 17), RGB(26, 24, 20),
@@ -150,47 +150,47 @@ const u16 sDexScreen_CategoryCursorPals[] = {
     RGB(26, 20, 15), RGB(27, 23, 19)
 };
 
-const u16 sNationalDexPalette[0x100] = INCBIN_U16("graphics/interface/pokedex_national_dex_bgpals.gbapal");
-const u32 sTopMenuIconTiles_Cave[] = INCBIN_U32("graphics/interface/pokedex_cat_icon_cave.4bpp.lz");
-const u32 sTopMenuIconTiles_Urban[] = INCBIN_U32("graphics/interface/pokedex_cat_icon_urban.4bpp.lz");
-const u32 sTopMenuSelectionIconTiles_Cancel[] = INCBIN_U32("graphics/interface/pokedex_cat_icon_cancel.4bpp.lz");
-const u32 sTopMenuIconTiles_Forest[] = INCBIN_U32("graphics/interface/pokedex_cat_icon_forest.4bpp.lz");
-const u32 sTopMenuIconTiles_Grassland[] = INCBIN_U32("graphics/interface/pokedex_cat_icon_grassland.4bpp.lz");
-const u32 sTopMenuIconTiles_QuestionMark[] = INCBIN_U32("graphics/interface/pokedex_cat_icon_qmark.4bpp.lz");
-const u32 sTopMenuIconTiles_Mountain[] = INCBIN_U32("graphics/interface/pokedex_cat_icon_mountain.4bpp.lz");
-const u32 sTopMenuIconTiles_Rare[] = INCBIN_U32("graphics/interface/pokedex_cat_icon_rare.4bpp.lz");
-const u32 sTopMenuIconTiles_Sea[] = INCBIN_U32("graphics/interface/pokedex_cat_icon_sea.4bpp.lz");
-const u32 sTopMenuIconTiles_Numerical[] = INCBIN_U32("graphics/interface/pokedex_cat_icon_numerical.4bpp.lz");
-const u32 sTopMenuIconTiles_RoughTerrain[] = INCBIN_U32("graphics/interface/pokedex_cat_icon_rough_terrain.4bpp.lz");
-const u32 sTopMenuIconTiles_WatersEdge[] = INCBIN_U32("graphics/interface/pokedex_cat_icon_waters_edge.4bpp.lz");
-const u32 sTopMenuIconTiles_Type[] = INCBIN_U32("graphics/interface/pokedex_cat_icon_type.4bpp.lz");
-const u32 sTopMenuIconTiles_Lightest[] = INCBIN_U32("graphics/interface/pokedex_cat_icon_lightest.4bpp.lz");
-const u32 sTopMenuIconTiles_Smallest[] = INCBIN_U32("graphics/interface/pokedex_cat_icon_smallest.4bpp.lz");
-const u16 sTopMenuIconPals_Cave[] = INCBIN_U16("graphics/interface/pokedex_cat_icon_cave.gbapal");
-const u16 sTopMenuIconPals_Urban[] = INCBIN_U16("graphics/interface/pokedex_cat_icon_urban.gbapal");
-const u16 sTopMenuSelectionIconPals_Cancel[] = INCBIN_U16("graphics/interface/pokedex_cat_icon_cancel.gbapal");
-const u16 sTopMenuIconPals_Forest[] = INCBIN_U16("graphics/interface/pokedex_cat_icon_forest.gbapal");
-const u16 sTopMenuIconPals_Grassland[] = INCBIN_U16("graphics/interface/pokedex_cat_icon_grassland.gbapal");
-const u16 sTopMenuIconPals_QuestionMark[] = INCBIN_U16("graphics/interface/pokedex_cat_icon_qmark.gbapal");
-const u16 sTopMenuIconPals_Mountain[] = INCBIN_U16("graphics/interface/pokedex_cat_icon_mountain.gbapal");
-const u16 sTopMenuIconPals_Rare[] = INCBIN_U16("graphics/interface/pokedex_cat_icon_rare.gbapal");
-const u16 sTopMenuIconPals_Sea[] = INCBIN_U16("graphics/interface/pokedex_cat_icon_sea.gbapal");
-const u16 sTopMenuIconPals_Numerical[] = INCBIN_U16("graphics/interface/pokedex_cat_icon_numerical.gbapal");
-const u16 sTopMenuIconPals_RoughTerrain[] = INCBIN_U16("graphics/interface/pokedex_cat_icon_rough_terrain.gbapal");
-const u16 sTopMenuIconPals_WatersEdge[] = INCBIN_U16("graphics/interface/pokedex_cat_icon_waters_edge.gbapal");
-const u16 sTopMenuIconPals_Type[] = INCBIN_U16("graphics/interface/pokedex_cat_icon_type.gbapal");
-const u16 sTopMenuIconPals_Lightest[] = INCBIN_U16("graphics/interface/pokedex_cat_icon_lightest.gbapal");
-const u16 sTopMenuIconPals_Smallest[] = INCBIN_U16("graphics/interface/pokedex_cat_icon_smallest.gbapal");
-const u8 sDexScreen_CaughtIcon[] = INCBIN_U8("graphics/interface/pokedex_caught_marker.4bpp");
-const u32 sTilemap_AreaMap_Kanto[] = INCBIN_U32("graphics/interface/pokedex_map_kanto.4bpp.lz");
-const u32 sTilemap_AreaMap_OneIsland[] = INCBIN_U32("graphics/interface/pokedex_map_one_island.4bpp.lz");
-const u32 sTilemap_AreaMap_TwoIsland[] = INCBIN_U32("graphics/interface/pokedex_map_two_island.4bpp.lz");
-const u32 sTilemap_AreaMap_ThreeIsland[] = INCBIN_U32("graphics/interface/pokedex_map_three_island.4bpp.lz");
-const u32 sTilemap_AreaMap_FourIsland[] = INCBIN_U32("graphics/interface/pokedex_map_four_island.4bpp.lz");
-const u32 sTilemap_AreaMap_FiveIsland[] = INCBIN_U32("graphics/interface/pokedex_map_five_island.4bpp.lz");
-const u32 sTilemap_AreaMap_SixIsland[] = INCBIN_U32("graphics/interface/pokedex_map_six_island.4bpp.lz");
-const u32 sTilemap_AreaMap_SevenIsland[] = INCBIN_U32("graphics/interface/pokedex_map_seven_island.4bpp.lz");
-const u16 sBlitTiles_WideEllipse[] = INCBIN_U16("graphics/interface/pokedex_blit_wide_ellipse.4bpp");
+const u16 sNationalDexPalette[0x100] = INCBIN_U16("graphics/pokedex/national_dex_bgpals.gbapal");
+const u32 sTopMenuIconTiles_Cave[] = INCBIN_U32("graphics/pokedex/cat_icon_cave.4bpp.lz");
+const u32 sTopMenuIconTiles_Urban[] = INCBIN_U32("graphics/pokedex/cat_icon_urban.4bpp.lz");
+const u32 sTopMenuSelectionIconTiles_Cancel[] = INCBIN_U32("graphics/pokedex/cat_icon_cancel.4bpp.lz");
+const u32 sTopMenuIconTiles_Forest[] = INCBIN_U32("graphics/pokedex/cat_icon_forest.4bpp.lz");
+const u32 sTopMenuIconTiles_Grassland[] = INCBIN_U32("graphics/pokedex/cat_icon_grassland.4bpp.lz");
+const u32 sTopMenuIconTiles_QuestionMark[] = INCBIN_U32("graphics/pokedex/cat_icon_qmark.4bpp.lz");
+const u32 sTopMenuIconTiles_Mountain[] = INCBIN_U32("graphics/pokedex/cat_icon_mountain.4bpp.lz");
+const u32 sTopMenuIconTiles_Rare[] = INCBIN_U32("graphics/pokedex/cat_icon_rare.4bpp.lz");
+const u32 sTopMenuIconTiles_Sea[] = INCBIN_U32("graphics/pokedex/cat_icon_sea.4bpp.lz");
+const u32 sTopMenuIconTiles_Numerical[] = INCBIN_U32("graphics/pokedex/cat_icon_numerical.4bpp.lz");
+const u32 sTopMenuIconTiles_RoughTerrain[] = INCBIN_U32("graphics/pokedex/cat_icon_rough_terrain.4bpp.lz");
+const u32 sTopMenuIconTiles_WatersEdge[] = INCBIN_U32("graphics/pokedex/cat_icon_waters_edge.4bpp.lz");
+const u32 sTopMenuIconTiles_Type[] = INCBIN_U32("graphics/pokedex/cat_icon_type.4bpp.lz");
+const u32 sTopMenuIconTiles_Lightest[] = INCBIN_U32("graphics/pokedex/cat_icon_lightest.4bpp.lz");
+const u32 sTopMenuIconTiles_Smallest[] = INCBIN_U32("graphics/pokedex/cat_icon_smallest.4bpp.lz");
+const u16 sTopMenuIconPals_Cave[] = INCBIN_U16("graphics/pokedex/cat_icon_cave.gbapal");
+const u16 sTopMenuIconPals_Urban[] = INCBIN_U16("graphics/pokedex/cat_icon_urban.gbapal");
+const u16 sTopMenuSelectionIconPals_Cancel[] = INCBIN_U16("graphics/pokedex/cat_icon_cancel.gbapal");
+const u16 sTopMenuIconPals_Forest[] = INCBIN_U16("graphics/pokedex/cat_icon_forest.gbapal");
+const u16 sTopMenuIconPals_Grassland[] = INCBIN_U16("graphics/pokedex/cat_icon_grassland.gbapal");
+const u16 sTopMenuIconPals_QuestionMark[] = INCBIN_U16("graphics/pokedex/cat_icon_qmark.gbapal");
+const u16 sTopMenuIconPals_Mountain[] = INCBIN_U16("graphics/pokedex/cat_icon_mountain.gbapal");
+const u16 sTopMenuIconPals_Rare[] = INCBIN_U16("graphics/pokedex/cat_icon_rare.gbapal");
+const u16 sTopMenuIconPals_Sea[] = INCBIN_U16("graphics/pokedex/cat_icon_sea.gbapal");
+const u16 sTopMenuIconPals_Numerical[] = INCBIN_U16("graphics/pokedex/cat_icon_numerical.gbapal");
+const u16 sTopMenuIconPals_RoughTerrain[] = INCBIN_U16("graphics/pokedex/cat_icon_rough_terrain.gbapal");
+const u16 sTopMenuIconPals_WatersEdge[] = INCBIN_U16("graphics/pokedex/cat_icon_waters_edge.gbapal");
+const u16 sTopMenuIconPals_Type[] = INCBIN_U16("graphics/pokedex/cat_icon_type.gbapal");
+const u16 sTopMenuIconPals_Lightest[] = INCBIN_U16("graphics/pokedex/cat_icon_lightest.gbapal");
+const u16 sTopMenuIconPals_Smallest[] = INCBIN_U16("graphics/pokedex/cat_icon_smallest.gbapal");
+const u8 sDexScreen_CaughtIcon[] = INCBIN_U8("graphics/pokedex/caught_marker.4bpp");
+const u32 sTilemap_AreaMap_Kanto[] = INCBIN_U32("graphics/pokedex/map_kanto.4bpp.lz");
+const u32 sTilemap_AreaMap_OneIsland[] = INCBIN_U32("graphics/pokedex/map_one_island.4bpp.lz");
+const u32 sTilemap_AreaMap_TwoIsland[] = INCBIN_U32("graphics/pokedex/map_two_island.4bpp.lz");
+const u32 sTilemap_AreaMap_ThreeIsland[] = INCBIN_U32("graphics/pokedex/map_three_island.4bpp.lz");
+const u32 sTilemap_AreaMap_FourIsland[] = INCBIN_U32("graphics/pokedex/map_four_island.4bpp.lz");
+const u32 sTilemap_AreaMap_FiveIsland[] = INCBIN_U32("graphics/pokedex/map_five_island.4bpp.lz");
+const u32 sTilemap_AreaMap_SixIsland[] = INCBIN_U32("graphics/pokedex/map_six_island.4bpp.lz");
+const u32 sTilemap_AreaMap_SevenIsland[] = INCBIN_U32("graphics/pokedex/map_seven_island.4bpp.lz");
+const u16 sBlitTiles_WideEllipse[] = INCBIN_U16("graphics/pokedex/blit_wide_ellipse.4bpp");
 
 #include "data/pokemon/pokedex_orders.h"
 
@@ -764,7 +764,7 @@ struct {
     {&sWindowTemplate_AreaMap_SevenIsland, sTilemap_AreaMap_SevenIsland},
 };
 
-static const u16 sCategoryPageIconWindowBg[] = INCBIN_U16("graphics/interface/pokedex_page_icon_tilemap.bin");
+static const u16 sCategoryPageIconWindowBg[] = INCBIN_U16("graphics/pokedex/page_icon_tilemap.bin");
 
 // Circular window x/y; Rectangular window x/y
 static const u8 sPageIconCoords_1Mon[1][4] = {
@@ -808,7 +808,7 @@ static const u8 * const sDexCategoryNamePtrs[] = {
     gText_DexCategory_RarePkmn,
 };
 
-const u16 sPalette_Silhouette[] = INCBIN_U16("graphics/interface/pokedex_silhouette_sprite_pal.gbapal");
+const u16 sPalette_Silhouette[] = INCBIN_U16("graphics/pokedex/silhouette_sprite_pal.gbapal");
 
 static const u8 sDexScreenPageTurnColumns[][30] = {
     {30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30},