From 4b0dd3e40622b9f84f4a3c4709674bc2361b9adf Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 21 Apr 2021 14:56:57 -0400 Subject: [PATCH] Move dex gfx back to pokedex subfolder --- .../area_markers}/marker.pal | 0 .../area_markers}/marker_0.png | Bin .../area_markers}/marker_1.png | Bin .../area_markers}/marker_2.png | Bin .../area_markers}/marker_3.png | Bin .../area_markers}/marker_4.png | Bin .../area_markers}/marker_5.png | Bin .../area_markers}/marker_6.png | Bin .../blit_wide_ellipse.png} | Bin .../cat_icon_abc.png} | Bin .../cat_icon_cancel.png} | Bin .../cat_icon_cave.png} | Bin .../cat_icon_forest.png} | Bin .../cat_icon_grassland.png} | Bin .../cat_icon_lightest.png} | Bin .../cat_icon_mountain.png} | Bin .../cat_icon_numerical.png} | Bin .../cat_icon_qmark.png} | Bin .../cat_icon_rare.png} | Bin .../cat_icon_rough_terrain.png} | Bin .../cat_icon_sea.png} | Bin .../cat_icon_smallest.png} | Bin .../cat_icon_type.png} | Bin .../cat_icon_urban.png} | Bin .../cat_icon_waters_edge.png} | Bin .../caught_marker.png} | Bin .../kanto_dex_bgpals.pal} | 0 .../kanto_dex_bgtiles.png} | Bin .../map_five_island.png} | Bin .../map_four_island.png} | Bin .../map_kanto.png} | Bin .../map_one_island.png} | Bin .../map_seven_island.png} | Bin .../map_six_island.png} | Bin .../map_three_island.png} | Bin .../map_two_island.png} | Bin .../mini_page.png} | Bin .../national_dex_bgpals.pal} | 0 .../national_dex_bgtiles.png} | Bin .../page_icon_tilemap.bin} | Bin .../silhouette_sprite_pal.pal} | 0 graphics_file_rules.mk | 2 +- src/graphics.c | 4 +- src/pokedex_area_markers.c | 4 +- src/pokedex_screen.c | 94 +++++++++--------- 45 files changed, 52 insertions(+), 52 deletions(-) rename graphics/{pokedex_area_markers => pokedex/area_markers}/marker.pal (100%) rename graphics/{pokedex_area_markers => pokedex/area_markers}/marker_0.png (100%) rename graphics/{pokedex_area_markers => pokedex/area_markers}/marker_1.png (100%) rename graphics/{pokedex_area_markers => pokedex/area_markers}/marker_2.png (100%) rename graphics/{pokedex_area_markers => pokedex/area_markers}/marker_3.png (100%) rename graphics/{pokedex_area_markers => pokedex/area_markers}/marker_4.png (100%) rename graphics/{pokedex_area_markers => pokedex/area_markers}/marker_5.png (100%) rename graphics/{pokedex_area_markers => pokedex/area_markers}/marker_6.png (100%) rename graphics/{interface/pokedex_blit_wide_ellipse.png => pokedex/blit_wide_ellipse.png} (100%) rename graphics/{interface/pokedex_abc.png => pokedex/cat_icon_abc.png} (100%) rename graphics/{interface/pokedex_cat_icon_cancel.png => pokedex/cat_icon_cancel.png} (100%) rename graphics/{interface/pokedex_cat_icon_cave.png => pokedex/cat_icon_cave.png} (100%) rename graphics/{interface/pokedex_cat_icon_forest.png => pokedex/cat_icon_forest.png} (100%) rename graphics/{interface/pokedex_cat_icon_grassland.png => pokedex/cat_icon_grassland.png} (100%) rename graphics/{interface/pokedex_cat_icon_lightest.png => pokedex/cat_icon_lightest.png} (100%) rename graphics/{interface/pokedex_cat_icon_mountain.png => pokedex/cat_icon_mountain.png} (100%) rename graphics/{interface/pokedex_cat_icon_numerical.png => pokedex/cat_icon_numerical.png} (100%) rename graphics/{interface/pokedex_cat_icon_qmark.png => pokedex/cat_icon_qmark.png} (100%) rename graphics/{interface/pokedex_cat_icon_rare.png => pokedex/cat_icon_rare.png} (100%) rename graphics/{interface/pokedex_cat_icon_rough_terrain.png => pokedex/cat_icon_rough_terrain.png} (100%) rename graphics/{interface/pokedex_cat_icon_sea.png => pokedex/cat_icon_sea.png} (100%) rename graphics/{interface/pokedex_cat_icon_smallest.png => pokedex/cat_icon_smallest.png} (100%) rename graphics/{interface/pokedex_cat_icon_type.png => pokedex/cat_icon_type.png} (100%) rename graphics/{interface/pokedex_cat_icon_urban.png => pokedex/cat_icon_urban.png} (100%) rename graphics/{interface/pokedex_cat_icon_waters_edge.png => pokedex/cat_icon_waters_edge.png} (100%) rename graphics/{interface/pokedex_caught_marker.png => pokedex/caught_marker.png} (100%) rename graphics/{interface/pokedex_kanto_dex_bgpals.pal => pokedex/kanto_dex_bgpals.pal} (100%) rename graphics/{interface/pokedex_kanto_dex_bgtiles.png => pokedex/kanto_dex_bgtiles.png} (100%) rename graphics/{interface/pokedex_map_five_island.png => pokedex/map_five_island.png} (100%) rename graphics/{interface/pokedex_map_four_island.png => pokedex/map_four_island.png} (100%) rename graphics/{interface/pokedex_map_kanto.png => pokedex/map_kanto.png} (100%) rename graphics/{interface/pokedex_map_one_island.png => pokedex/map_one_island.png} (100%) rename graphics/{interface/pokedex_map_seven_island.png => pokedex/map_seven_island.png} (100%) rename graphics/{interface/pokedex_map_six_island.png => pokedex/map_six_island.png} (100%) rename graphics/{interface/pokedex_map_three_island.png => pokedex/map_three_island.png} (100%) rename graphics/{interface/pokedex_map_two_island.png => pokedex/map_two_island.png} (100%) rename graphics/{interface/pokedex_mini_page.png => pokedex/mini_page.png} (100%) rename graphics/{interface/pokedex_national_dex_bgpals.pal => pokedex/national_dex_bgpals.pal} (100%) rename graphics/{interface/pokedex_national_dex_bgtiles.png => pokedex/national_dex_bgtiles.png} (100%) rename graphics/{interface/pokedex_page_icon_tilemap.bin => pokedex/page_icon_tilemap.bin} (100%) rename graphics/{interface/pokedex_silhouette_sprite_pal.pal => pokedex/silhouette_sprite_pal.pal} (100%) diff --git a/graphics/pokedex_area_markers/marker.pal b/graphics/pokedex/area_markers/marker.pal similarity index 100% rename from graphics/pokedex_area_markers/marker.pal rename to graphics/pokedex/area_markers/marker.pal diff --git a/graphics/pokedex_area_markers/marker_0.png b/graphics/pokedex/area_markers/marker_0.png similarity index 100% rename from graphics/pokedex_area_markers/marker_0.png rename to 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 similarity index 100% rename from graphics/pokedex_area_markers/marker_1.png rename to 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 similarity index 100% rename from graphics/pokedex_area_markers/marker_2.png rename to 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 similarity index 100% rename from graphics/pokedex_area_markers/marker_3.png rename to 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 similarity index 100% rename from graphics/pokedex_area_markers/marker_4.png rename to 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 similarity index 100% rename from graphics/pokedex_area_markers/marker_5.png rename to 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 similarity index 100% rename from graphics/pokedex_area_markers/marker_6.png rename to graphics/pokedex/area_markers/marker_6.png diff --git a/graphics/interface/pokedex_blit_wide_ellipse.png b/graphics/pokedex/blit_wide_ellipse.png similarity index 100% rename from graphics/interface/pokedex_blit_wide_ellipse.png rename to graphics/pokedex/blit_wide_ellipse.png diff --git a/graphics/interface/pokedex_abc.png b/graphics/pokedex/cat_icon_abc.png similarity index 100% rename from graphics/interface/pokedex_abc.png rename to graphics/pokedex/cat_icon_abc.png diff --git a/graphics/interface/pokedex_cat_icon_cancel.png b/graphics/pokedex/cat_icon_cancel.png similarity index 100% rename from graphics/interface/pokedex_cat_icon_cancel.png rename to graphics/pokedex/cat_icon_cancel.png diff --git a/graphics/interface/pokedex_cat_icon_cave.png b/graphics/pokedex/cat_icon_cave.png similarity index 100% rename from graphics/interface/pokedex_cat_icon_cave.png rename to graphics/pokedex/cat_icon_cave.png diff --git a/graphics/interface/pokedex_cat_icon_forest.png b/graphics/pokedex/cat_icon_forest.png similarity index 100% rename from graphics/interface/pokedex_cat_icon_forest.png rename to graphics/pokedex/cat_icon_forest.png diff --git a/graphics/interface/pokedex_cat_icon_grassland.png b/graphics/pokedex/cat_icon_grassland.png similarity index 100% rename from graphics/interface/pokedex_cat_icon_grassland.png rename to graphics/pokedex/cat_icon_grassland.png diff --git a/graphics/interface/pokedex_cat_icon_lightest.png b/graphics/pokedex/cat_icon_lightest.png similarity index 100% rename from graphics/interface/pokedex_cat_icon_lightest.png rename to graphics/pokedex/cat_icon_lightest.png diff --git a/graphics/interface/pokedex_cat_icon_mountain.png b/graphics/pokedex/cat_icon_mountain.png similarity index 100% rename from graphics/interface/pokedex_cat_icon_mountain.png rename to graphics/pokedex/cat_icon_mountain.png diff --git a/graphics/interface/pokedex_cat_icon_numerical.png b/graphics/pokedex/cat_icon_numerical.png similarity index 100% rename from graphics/interface/pokedex_cat_icon_numerical.png rename to graphics/pokedex/cat_icon_numerical.png diff --git a/graphics/interface/pokedex_cat_icon_qmark.png b/graphics/pokedex/cat_icon_qmark.png similarity index 100% rename from graphics/interface/pokedex_cat_icon_qmark.png rename to graphics/pokedex/cat_icon_qmark.png diff --git a/graphics/interface/pokedex_cat_icon_rare.png b/graphics/pokedex/cat_icon_rare.png similarity index 100% rename from graphics/interface/pokedex_cat_icon_rare.png rename to 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 similarity index 100% rename from graphics/interface/pokedex_cat_icon_rough_terrain.png rename to graphics/pokedex/cat_icon_rough_terrain.png diff --git a/graphics/interface/pokedex_cat_icon_sea.png b/graphics/pokedex/cat_icon_sea.png similarity index 100% rename from graphics/interface/pokedex_cat_icon_sea.png rename to graphics/pokedex/cat_icon_sea.png diff --git a/graphics/interface/pokedex_cat_icon_smallest.png b/graphics/pokedex/cat_icon_smallest.png similarity index 100% rename from graphics/interface/pokedex_cat_icon_smallest.png rename to graphics/pokedex/cat_icon_smallest.png diff --git a/graphics/interface/pokedex_cat_icon_type.png b/graphics/pokedex/cat_icon_type.png similarity index 100% rename from graphics/interface/pokedex_cat_icon_type.png rename to graphics/pokedex/cat_icon_type.png diff --git a/graphics/interface/pokedex_cat_icon_urban.png b/graphics/pokedex/cat_icon_urban.png similarity index 100% rename from graphics/interface/pokedex_cat_icon_urban.png rename to 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 similarity index 100% rename from graphics/interface/pokedex_cat_icon_waters_edge.png rename to graphics/pokedex/cat_icon_waters_edge.png diff --git a/graphics/interface/pokedex_caught_marker.png b/graphics/pokedex/caught_marker.png similarity index 100% rename from graphics/interface/pokedex_caught_marker.png rename to graphics/pokedex/caught_marker.png diff --git a/graphics/interface/pokedex_kanto_dex_bgpals.pal b/graphics/pokedex/kanto_dex_bgpals.pal similarity index 100% rename from graphics/interface/pokedex_kanto_dex_bgpals.pal rename to graphics/pokedex/kanto_dex_bgpals.pal diff --git a/graphics/interface/pokedex_kanto_dex_bgtiles.png b/graphics/pokedex/kanto_dex_bgtiles.png similarity index 100% rename from graphics/interface/pokedex_kanto_dex_bgtiles.png rename to graphics/pokedex/kanto_dex_bgtiles.png diff --git a/graphics/interface/pokedex_map_five_island.png b/graphics/pokedex/map_five_island.png similarity index 100% rename from graphics/interface/pokedex_map_five_island.png rename to graphics/pokedex/map_five_island.png diff --git a/graphics/interface/pokedex_map_four_island.png b/graphics/pokedex/map_four_island.png similarity index 100% rename from graphics/interface/pokedex_map_four_island.png rename to graphics/pokedex/map_four_island.png diff --git a/graphics/interface/pokedex_map_kanto.png b/graphics/pokedex/map_kanto.png similarity index 100% rename from graphics/interface/pokedex_map_kanto.png rename to graphics/pokedex/map_kanto.png diff --git a/graphics/interface/pokedex_map_one_island.png b/graphics/pokedex/map_one_island.png similarity index 100% rename from graphics/interface/pokedex_map_one_island.png rename to graphics/pokedex/map_one_island.png diff --git a/graphics/interface/pokedex_map_seven_island.png b/graphics/pokedex/map_seven_island.png similarity index 100% rename from graphics/interface/pokedex_map_seven_island.png rename to graphics/pokedex/map_seven_island.png diff --git a/graphics/interface/pokedex_map_six_island.png b/graphics/pokedex/map_six_island.png similarity index 100% rename from graphics/interface/pokedex_map_six_island.png rename to graphics/pokedex/map_six_island.png diff --git a/graphics/interface/pokedex_map_three_island.png b/graphics/pokedex/map_three_island.png similarity index 100% rename from graphics/interface/pokedex_map_three_island.png rename to graphics/pokedex/map_three_island.png diff --git a/graphics/interface/pokedex_map_two_island.png b/graphics/pokedex/map_two_island.png similarity index 100% rename from graphics/interface/pokedex_map_two_island.png rename to graphics/pokedex/map_two_island.png diff --git a/graphics/interface/pokedex_mini_page.png b/graphics/pokedex/mini_page.png similarity index 100% rename from graphics/interface/pokedex_mini_page.png rename to graphics/pokedex/mini_page.png diff --git a/graphics/interface/pokedex_national_dex_bgpals.pal b/graphics/pokedex/national_dex_bgpals.pal similarity index 100% rename from graphics/interface/pokedex_national_dex_bgpals.pal rename to graphics/pokedex/national_dex_bgpals.pal diff --git a/graphics/interface/pokedex_national_dex_bgtiles.png b/graphics/pokedex/national_dex_bgtiles.png similarity index 100% rename from graphics/interface/pokedex_national_dex_bgtiles.png rename to graphics/pokedex/national_dex_bgtiles.png diff --git a/graphics/interface/pokedex_page_icon_tilemap.bin b/graphics/pokedex/page_icon_tilemap.bin similarity index 100% rename from graphics/interface/pokedex_page_icon_tilemap.bin rename to graphics/pokedex/page_icon_tilemap.bin diff --git a/graphics/interface/pokedex_silhouette_sprite_pal.pal b/graphics/pokedex/silhouette_sprite_pal.pal similarity index 100% rename from graphics/interface/pokedex_silhouette_sprite_pal.pal rename to 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},