From 4b0dd3e40622b9f84f4a3c4709674bc2361b9adf Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 21 Apr 2021 14:56:57 -0400 Subject: Move dex gfx back to pokedex subfolder --- graphics/interface/pokedex_abc.png | Bin 525 -> 0 bytes graphics/interface/pokedex_blit_wide_ellipse.png | Bin 151 -> 0 bytes graphics/interface/pokedex_cat_icon_cancel.png | Bin 470 -> 0 bytes graphics/interface/pokedex_cat_icon_cave.png | Bin 623 -> 0 bytes graphics/interface/pokedex_cat_icon_forest.png | Bin 759 -> 0 bytes graphics/interface/pokedex_cat_icon_grassland.png | Bin 672 -> 0 bytes graphics/interface/pokedex_cat_icon_lightest.png | Bin 566 -> 0 bytes graphics/interface/pokedex_cat_icon_mountain.png | Bin 652 -> 0 bytes graphics/interface/pokedex_cat_icon_numerical.png | Bin 578 -> 0 bytes graphics/interface/pokedex_cat_icon_qmark.png | Bin 444 -> 0 bytes graphics/interface/pokedex_cat_icon_rare.png | Bin 579 -> 0 bytes .../interface/pokedex_cat_icon_rough_terrain.png | Bin 704 -> 0 bytes graphics/interface/pokedex_cat_icon_sea.png | Bin 457 -> 0 bytes graphics/interface/pokedex_cat_icon_smallest.png | Bin 584 -> 0 bytes graphics/interface/pokedex_cat_icon_type.png | Bin 678 -> 0 bytes graphics/interface/pokedex_cat_icon_urban.png | Bin 619 -> 0 bytes .../interface/pokedex_cat_icon_waters_edge.png | Bin 777 -> 0 bytes graphics/interface/pokedex_caught_marker.png | Bin 105 -> 0 bytes graphics/interface/pokedex_kanto_dex_bgpals.pal | 259 --------------------- graphics/interface/pokedex_kanto_dex_bgtiles.png | Bin 361 -> 0 bytes graphics/interface/pokedex_map_five_island.png | Bin 216 -> 0 bytes graphics/interface/pokedex_map_four_island.png | Bin 175 -> 0 bytes graphics/interface/pokedex_map_kanto.png | Bin 500 -> 0 bytes graphics/interface/pokedex_map_one_island.png | Bin 190 -> 0 bytes graphics/interface/pokedex_map_seven_island.png | Bin 207 -> 0 bytes graphics/interface/pokedex_map_six_island.png | Bin 213 -> 0 bytes graphics/interface/pokedex_map_three_island.png | Bin 193 -> 0 bytes graphics/interface/pokedex_map_two_island.png | Bin 174 -> 0 bytes graphics/interface/pokedex_mini_page.png | Bin 269 -> 0 bytes graphics/interface/pokedex_national_dex_bgpals.pal | 259 --------------------- .../interface/pokedex_national_dex_bgtiles.png | Bin 330 -> 0 bytes graphics/interface/pokedex_page_icon_tilemap.bin | Bin 128 -> 0 bytes .../interface/pokedex_silhouette_sprite_pal.pal | 19 -- graphics/pokedex/area_markers/marker.pal | 19 ++ graphics/pokedex/area_markers/marker_0.png | Bin 0 -> 157 bytes graphics/pokedex/area_markers/marker_1.png | Bin 0 -> 165 bytes graphics/pokedex/area_markers/marker_2.png | Bin 0 -> 165 bytes graphics/pokedex/area_markers/marker_3.png | Bin 0 -> 175 bytes graphics/pokedex/area_markers/marker_4.png | Bin 0 -> 177 bytes graphics/pokedex/area_markers/marker_5.png | Bin 0 -> 180 bytes graphics/pokedex/area_markers/marker_6.png | Bin 0 -> 186 bytes graphics/pokedex/blit_wide_ellipse.png | Bin 0 -> 151 bytes graphics/pokedex/cat_icon_abc.png | Bin 0 -> 525 bytes graphics/pokedex/cat_icon_cancel.png | Bin 0 -> 470 bytes graphics/pokedex/cat_icon_cave.png | Bin 0 -> 623 bytes graphics/pokedex/cat_icon_forest.png | Bin 0 -> 759 bytes graphics/pokedex/cat_icon_grassland.png | Bin 0 -> 672 bytes graphics/pokedex/cat_icon_lightest.png | Bin 0 -> 566 bytes graphics/pokedex/cat_icon_mountain.png | Bin 0 -> 652 bytes graphics/pokedex/cat_icon_numerical.png | Bin 0 -> 578 bytes graphics/pokedex/cat_icon_qmark.png | Bin 0 -> 444 bytes graphics/pokedex/cat_icon_rare.png | Bin 0 -> 579 bytes graphics/pokedex/cat_icon_rough_terrain.png | Bin 0 -> 704 bytes graphics/pokedex/cat_icon_sea.png | Bin 0 -> 457 bytes graphics/pokedex/cat_icon_smallest.png | Bin 0 -> 584 bytes graphics/pokedex/cat_icon_type.png | Bin 0 -> 678 bytes graphics/pokedex/cat_icon_urban.png | Bin 0 -> 619 bytes graphics/pokedex/cat_icon_waters_edge.png | Bin 0 -> 777 bytes graphics/pokedex/caught_marker.png | Bin 0 -> 105 bytes graphics/pokedex/kanto_dex_bgpals.pal | 259 +++++++++++++++++++++ graphics/pokedex/kanto_dex_bgtiles.png | Bin 0 -> 361 bytes graphics/pokedex/map_five_island.png | Bin 0 -> 216 bytes graphics/pokedex/map_four_island.png | Bin 0 -> 175 bytes graphics/pokedex/map_kanto.png | Bin 0 -> 500 bytes graphics/pokedex/map_one_island.png | Bin 0 -> 190 bytes graphics/pokedex/map_seven_island.png | Bin 0 -> 207 bytes graphics/pokedex/map_six_island.png | Bin 0 -> 213 bytes graphics/pokedex/map_three_island.png | Bin 0 -> 193 bytes graphics/pokedex/map_two_island.png | Bin 0 -> 174 bytes graphics/pokedex/mini_page.png | Bin 0 -> 269 bytes graphics/pokedex/national_dex_bgpals.pal | 259 +++++++++++++++++++++ graphics/pokedex/national_dex_bgtiles.png | Bin 0 -> 330 bytes graphics/pokedex/page_icon_tilemap.bin | Bin 0 -> 128 bytes graphics/pokedex/silhouette_sprite_pal.pal | 19 ++ graphics/pokedex_area_markers/marker.pal | 19 -- graphics/pokedex_area_markers/marker_0.png | Bin 157 -> 0 bytes graphics/pokedex_area_markers/marker_1.png | Bin 165 -> 0 bytes graphics/pokedex_area_markers/marker_2.png | Bin 165 -> 0 bytes graphics/pokedex_area_markers/marker_3.png | Bin 175 -> 0 bytes graphics/pokedex_area_markers/marker_4.png | Bin 177 -> 0 bytes graphics/pokedex_area_markers/marker_5.png | Bin 180 -> 0 bytes graphics/pokedex_area_markers/marker_6.png | Bin 186 -> 0 bytes graphics_file_rules.mk | 2 +- src/graphics.c | 4 +- src/pokedex_area_markers.c | 4 +- src/pokedex_screen.c | 94 ++++---- 86 files changed, 608 insertions(+), 608 deletions(-) delete mode 100644 graphics/interface/pokedex_abc.png delete mode 100644 graphics/interface/pokedex_blit_wide_ellipse.png delete mode 100644 graphics/interface/pokedex_cat_icon_cancel.png delete mode 100644 graphics/interface/pokedex_cat_icon_cave.png delete mode 100644 graphics/interface/pokedex_cat_icon_forest.png delete mode 100644 graphics/interface/pokedex_cat_icon_grassland.png delete mode 100644 graphics/interface/pokedex_cat_icon_lightest.png delete mode 100644 graphics/interface/pokedex_cat_icon_mountain.png delete mode 100644 graphics/interface/pokedex_cat_icon_numerical.png delete mode 100644 graphics/interface/pokedex_cat_icon_qmark.png delete mode 100644 graphics/interface/pokedex_cat_icon_rare.png delete mode 100644 graphics/interface/pokedex_cat_icon_rough_terrain.png delete mode 100644 graphics/interface/pokedex_cat_icon_sea.png delete mode 100644 graphics/interface/pokedex_cat_icon_smallest.png delete mode 100644 graphics/interface/pokedex_cat_icon_type.png delete mode 100644 graphics/interface/pokedex_cat_icon_urban.png delete mode 100644 graphics/interface/pokedex_cat_icon_waters_edge.png delete mode 100644 graphics/interface/pokedex_caught_marker.png delete mode 100644 graphics/interface/pokedex_kanto_dex_bgpals.pal delete mode 100644 graphics/interface/pokedex_kanto_dex_bgtiles.png delete mode 100644 graphics/interface/pokedex_map_five_island.png delete mode 100644 graphics/interface/pokedex_map_four_island.png delete mode 100644 graphics/interface/pokedex_map_kanto.png delete mode 100644 graphics/interface/pokedex_map_one_island.png delete mode 100644 graphics/interface/pokedex_map_seven_island.png delete mode 100644 graphics/interface/pokedex_map_six_island.png delete mode 100644 graphics/interface/pokedex_map_three_island.png delete mode 100644 graphics/interface/pokedex_map_two_island.png delete mode 100644 graphics/interface/pokedex_mini_page.png delete mode 100644 graphics/interface/pokedex_national_dex_bgpals.pal delete mode 100644 graphics/interface/pokedex_national_dex_bgtiles.png delete mode 100644 graphics/interface/pokedex_page_icon_tilemap.bin delete mode 100644 graphics/interface/pokedex_silhouette_sprite_pal.pal create mode 100644 graphics/pokedex/area_markers/marker.pal create mode 100644 graphics/pokedex/area_markers/marker_0.png create mode 100644 graphics/pokedex/area_markers/marker_1.png create mode 100644 graphics/pokedex/area_markers/marker_2.png create mode 100644 graphics/pokedex/area_markers/marker_3.png create mode 100644 graphics/pokedex/area_markers/marker_4.png create mode 100644 graphics/pokedex/area_markers/marker_5.png create mode 100644 graphics/pokedex/area_markers/marker_6.png create mode 100644 graphics/pokedex/blit_wide_ellipse.png create mode 100644 graphics/pokedex/cat_icon_abc.png create mode 100644 graphics/pokedex/cat_icon_cancel.png create mode 100644 graphics/pokedex/cat_icon_cave.png create mode 100644 graphics/pokedex/cat_icon_forest.png create mode 100644 graphics/pokedex/cat_icon_grassland.png create mode 100644 graphics/pokedex/cat_icon_lightest.png create mode 100644 graphics/pokedex/cat_icon_mountain.png create mode 100644 graphics/pokedex/cat_icon_numerical.png create mode 100644 graphics/pokedex/cat_icon_qmark.png create mode 100644 graphics/pokedex/cat_icon_rare.png create mode 100644 graphics/pokedex/cat_icon_rough_terrain.png create mode 100644 graphics/pokedex/cat_icon_sea.png create mode 100644 graphics/pokedex/cat_icon_smallest.png create mode 100644 graphics/pokedex/cat_icon_type.png create mode 100644 graphics/pokedex/cat_icon_urban.png create mode 100644 graphics/pokedex/cat_icon_waters_edge.png create mode 100644 graphics/pokedex/caught_marker.png create mode 100644 graphics/pokedex/kanto_dex_bgpals.pal create mode 100644 graphics/pokedex/kanto_dex_bgtiles.png create mode 100644 graphics/pokedex/map_five_island.png create mode 100644 graphics/pokedex/map_four_island.png create mode 100644 graphics/pokedex/map_kanto.png create mode 100644 graphics/pokedex/map_one_island.png create mode 100644 graphics/pokedex/map_seven_island.png create mode 100644 graphics/pokedex/map_six_island.png create mode 100644 graphics/pokedex/map_three_island.png create mode 100644 graphics/pokedex/map_two_island.png create mode 100644 graphics/pokedex/mini_page.png create mode 100644 graphics/pokedex/national_dex_bgpals.pal create mode 100644 graphics/pokedex/national_dex_bgtiles.png create mode 100644 graphics/pokedex/page_icon_tilemap.bin create mode 100644 graphics/pokedex/silhouette_sprite_pal.pal delete mode 100644 graphics/pokedex_area_markers/marker.pal delete mode 100644 graphics/pokedex_area_markers/marker_0.png delete mode 100644 graphics/pokedex_area_markers/marker_1.png delete mode 100644 graphics/pokedex_area_markers/marker_2.png delete mode 100644 graphics/pokedex_area_markers/marker_3.png delete mode 100644 graphics/pokedex_area_markers/marker_4.png delete mode 100644 graphics/pokedex_area_markers/marker_5.png delete mode 100644 graphics/pokedex_area_markers/marker_6.png diff --git a/graphics/interface/pokedex_abc.png b/graphics/interface/pokedex_abc.png deleted file mode 100644 index 0ec33315e..000000000 Binary files a/graphics/interface/pokedex_abc.png and /dev/null differ diff --git a/graphics/interface/pokedex_blit_wide_ellipse.png b/graphics/interface/pokedex_blit_wide_ellipse.png deleted file mode 100644 index 763ed976c..000000000 Binary files a/graphics/interface/pokedex_blit_wide_ellipse.png and /dev/null differ diff --git a/graphics/interface/pokedex_cat_icon_cancel.png b/graphics/interface/pokedex_cat_icon_cancel.png deleted file mode 100644 index f8aafff9b..000000000 Binary files a/graphics/interface/pokedex_cat_icon_cancel.png and /dev/null differ diff --git a/graphics/interface/pokedex_cat_icon_cave.png b/graphics/interface/pokedex_cat_icon_cave.png deleted file mode 100644 index 56e529b32..000000000 Binary files a/graphics/interface/pokedex_cat_icon_cave.png and /dev/null differ diff --git a/graphics/interface/pokedex_cat_icon_forest.png b/graphics/interface/pokedex_cat_icon_forest.png deleted file mode 100644 index 68f3d3463..000000000 Binary files a/graphics/interface/pokedex_cat_icon_forest.png and /dev/null differ diff --git a/graphics/interface/pokedex_cat_icon_grassland.png b/graphics/interface/pokedex_cat_icon_grassland.png deleted file mode 100644 index 2b0f7cd1d..000000000 Binary files a/graphics/interface/pokedex_cat_icon_grassland.png and /dev/null differ diff --git a/graphics/interface/pokedex_cat_icon_lightest.png b/graphics/interface/pokedex_cat_icon_lightest.png deleted file mode 100644 index 804fd02f1..000000000 Binary files a/graphics/interface/pokedex_cat_icon_lightest.png and /dev/null differ diff --git a/graphics/interface/pokedex_cat_icon_mountain.png b/graphics/interface/pokedex_cat_icon_mountain.png deleted file mode 100644 index ece6eb196..000000000 Binary files a/graphics/interface/pokedex_cat_icon_mountain.png and /dev/null differ diff --git a/graphics/interface/pokedex_cat_icon_numerical.png b/graphics/interface/pokedex_cat_icon_numerical.png deleted file mode 100644 index 77da41052..000000000 Binary files a/graphics/interface/pokedex_cat_icon_numerical.png and /dev/null differ diff --git a/graphics/interface/pokedex_cat_icon_qmark.png b/graphics/interface/pokedex_cat_icon_qmark.png deleted file mode 100644 index c5db049f8..000000000 Binary files a/graphics/interface/pokedex_cat_icon_qmark.png and /dev/null differ diff --git a/graphics/interface/pokedex_cat_icon_rare.png b/graphics/interface/pokedex_cat_icon_rare.png deleted file mode 100644 index 20a676b40..000000000 Binary files a/graphics/interface/pokedex_cat_icon_rare.png and /dev/null differ diff --git a/graphics/interface/pokedex_cat_icon_rough_terrain.png b/graphics/interface/pokedex_cat_icon_rough_terrain.png deleted file mode 100644 index 61a1e3ac1..000000000 Binary files a/graphics/interface/pokedex_cat_icon_rough_terrain.png and /dev/null differ diff --git a/graphics/interface/pokedex_cat_icon_sea.png b/graphics/interface/pokedex_cat_icon_sea.png deleted file mode 100644 index 2589fc28f..000000000 Binary files a/graphics/interface/pokedex_cat_icon_sea.png and /dev/null differ diff --git a/graphics/interface/pokedex_cat_icon_smallest.png b/graphics/interface/pokedex_cat_icon_smallest.png deleted file mode 100644 index 2c8a25b4e..000000000 Binary files a/graphics/interface/pokedex_cat_icon_smallest.png and /dev/null differ diff --git a/graphics/interface/pokedex_cat_icon_type.png b/graphics/interface/pokedex_cat_icon_type.png deleted file mode 100644 index 92c03ac1b..000000000 Binary files a/graphics/interface/pokedex_cat_icon_type.png and /dev/null differ diff --git a/graphics/interface/pokedex_cat_icon_urban.png b/graphics/interface/pokedex_cat_icon_urban.png deleted file mode 100644 index 0c422aa07..000000000 Binary files a/graphics/interface/pokedex_cat_icon_urban.png and /dev/null differ diff --git a/graphics/interface/pokedex_cat_icon_waters_edge.png b/graphics/interface/pokedex_cat_icon_waters_edge.png deleted file mode 100644 index d7bd2116d..000000000 Binary files a/graphics/interface/pokedex_cat_icon_waters_edge.png and /dev/null differ diff --git a/graphics/interface/pokedex_caught_marker.png b/graphics/interface/pokedex_caught_marker.png deleted file mode 100644 index 74f43ec80..000000000 Binary files a/graphics/interface/pokedex_caught_marker.png and /dev/null differ diff --git a/graphics/interface/pokedex_kanto_dex_bgpals.pal b/graphics/interface/pokedex_kanto_dex_bgpals.pal deleted file mode 100644 index b719d111f..000000000 --- a/graphics/interface/pokedex_kanto_dex_bgpals.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -156 156 189 -0 0 0 -197 180 139 -230 222 197 -246 246 238 -255 255 255 -123 98 57 -164 148 98 -213 197 164 -255 246 238 -238 238 230 -213 213 213 -156 156 156 -255 255 0 -205 65 57 -255 139 57 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -156 156 189 -0 0 0 -197 180 139 -230 222 197 -246 246 238 -255 255 255 -123 98 57 -164 148 98 -213 197 164 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -255 255 0 -205 65 57 -255 139 57 -156 156 189 -0 0 0 -197 180 139 -230 222 197 -246 246 238 -255 255 255 -123 98 57 -164 148 98 -213 197 164 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -255 255 0 -205 65 57 -255 139 57 -156 156 189 -0 0 0 -197 180 139 -230 222 197 -246 246 238 -255 255 255 -123 98 57 -164 148 98 -213 197 164 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -255 255 0 -205 65 57 -255 139 57 -156 156 189 -0 0 0 -197 180 139 -230 222 197 -246 246 238 -255 255 255 -123 98 57 -164 148 98 -213 197 164 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -255 255 0 -205 65 57 -255 139 57 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -156 156 189 -0 0 0 -197 180 139 -230 222 197 -246 246 238 -255 255 255 -123 98 57 -164 148 98 -213 197 164 -255 246 238 -238 238 230 -213 213 213 -156 156 156 -255 255 0 -205 65 57 -255 139 57 -255 255 255 -255 255 255 -98 98 98 -213 213 205 -230 8 8 -255 189 115 -32 156 8 -148 246 148 -49 82 205 -164 197 246 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -197 180 139 diff --git a/graphics/interface/pokedex_kanto_dex_bgtiles.png b/graphics/interface/pokedex_kanto_dex_bgtiles.png deleted file mode 100644 index 5cef4b098..000000000 Binary files a/graphics/interface/pokedex_kanto_dex_bgtiles.png and /dev/null differ diff --git a/graphics/interface/pokedex_map_five_island.png b/graphics/interface/pokedex_map_five_island.png deleted file mode 100644 index c37c1c25a..000000000 Binary files a/graphics/interface/pokedex_map_five_island.png and /dev/null differ diff --git a/graphics/interface/pokedex_map_four_island.png b/graphics/interface/pokedex_map_four_island.png deleted file mode 100644 index 83ef69608..000000000 Binary files a/graphics/interface/pokedex_map_four_island.png and /dev/null differ diff --git a/graphics/interface/pokedex_map_kanto.png b/graphics/interface/pokedex_map_kanto.png deleted file mode 100644 index 3c32b2d4c..000000000 Binary files a/graphics/interface/pokedex_map_kanto.png and /dev/null differ diff --git a/graphics/interface/pokedex_map_one_island.png b/graphics/interface/pokedex_map_one_island.png deleted file mode 100644 index 2e2d30fbb..000000000 Binary files a/graphics/interface/pokedex_map_one_island.png and /dev/null differ diff --git a/graphics/interface/pokedex_map_seven_island.png b/graphics/interface/pokedex_map_seven_island.png deleted file mode 100644 index 3631d8906..000000000 Binary files a/graphics/interface/pokedex_map_seven_island.png and /dev/null differ diff --git a/graphics/interface/pokedex_map_six_island.png b/graphics/interface/pokedex_map_six_island.png deleted file mode 100644 index 53e598139..000000000 Binary files a/graphics/interface/pokedex_map_six_island.png and /dev/null differ diff --git a/graphics/interface/pokedex_map_three_island.png b/graphics/interface/pokedex_map_three_island.png deleted file mode 100644 index 2e34eb497..000000000 Binary files a/graphics/interface/pokedex_map_three_island.png and /dev/null differ diff --git a/graphics/interface/pokedex_map_two_island.png b/graphics/interface/pokedex_map_two_island.png deleted file mode 100644 index 5006ba035..000000000 Binary files a/graphics/interface/pokedex_map_two_island.png and /dev/null differ diff --git a/graphics/interface/pokedex_mini_page.png b/graphics/interface/pokedex_mini_page.png deleted file mode 100644 index b6e6e2788..000000000 Binary files a/graphics/interface/pokedex_mini_page.png and /dev/null differ diff --git a/graphics/interface/pokedex_national_dex_bgpals.pal b/graphics/interface/pokedex_national_dex_bgpals.pal deleted file mode 100644 index 0d68b4233..000000000 --- a/graphics/interface/pokedex_national_dex_bgpals.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -156 156 189 -0 0 0 -197 180 139 -230 222 197 -238 246 246 -255 255 255 -123 98 57 -164 148 98 -213 197 164 -255 246 238 -238 238 230 -213 213 213 -156 156 156 -255 255 0 -205 65 57 -255 139 57 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -156 156 189 -0 0 0 -197 180 139 -230 222 197 -238 246 246 -255 255 255 -123 98 57 -164 148 98 -213 197 164 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -255 255 0 -205 65 57 -255 139 57 -156 156 189 -0 0 0 -197 180 139 -230 222 197 -238 246 246 -255 255 255 -123 98 57 -164 148 98 -213 197 164 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -255 255 0 -205 65 57 -255 139 57 -156 156 189 -0 0 0 -197 180 139 -230 222 197 -238 246 246 -255 255 255 -123 98 57 -164 148 98 -213 197 164 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -255 255 0 -205 65 57 -255 139 57 -156 156 189 -0 0 0 -197 180 139 -230 222 197 -238 246 246 -255 255 255 -123 98 57 -164 148 98 -213 197 164 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -255 255 0 -205 65 57 -255 139 57 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -156 156 189 -0 0 0 -197 180 139 -230 222 197 -238 246 246 -255 255 255 -123 98 57 -164 148 98 -213 197 164 -255 246 238 -238 238 230 -213 213 213 -156 156 156 -255 255 0 -205 65 57 -255 139 57 -255 255 255 -255 255 255 -98 98 98 -213 213 205 -230 8 8 -255 189 115 -32 156 8 -148 246 148 -49 82 205 -164 197 246 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -172 197 24 diff --git a/graphics/interface/pokedex_national_dex_bgtiles.png b/graphics/interface/pokedex_national_dex_bgtiles.png deleted file mode 100644 index 226e08d54..000000000 Binary files a/graphics/interface/pokedex_national_dex_bgtiles.png and /dev/null differ diff --git a/graphics/interface/pokedex_page_icon_tilemap.bin b/graphics/interface/pokedex_page_icon_tilemap.bin deleted file mode 100644 index bd64c4ad4..000000000 Binary files a/graphics/interface/pokedex_page_icon_tilemap.bin and /dev/null differ diff --git a/graphics/interface/pokedex_silhouette_sprite_pal.pal b/graphics/interface/pokedex_silhouette_sprite_pal.pal deleted file mode 100644 index 43ab6f7f7..000000000 --- a/graphics/interface/pokedex_silhouette_sprite_pal.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 82 -82 82 82 -82 82 82 -82 82 82 -82 82 82 -82 82 82 -82 82 82 -82 82 82 -82 82 82 -82 82 82 -82 82 82 -82 82 82 -82 82 82 -82 82 82 -82 82 82 diff --git a/graphics/pokedex/area_markers/marker.pal b/graphics/pokedex/area_markers/marker.pal new file mode 100644 index 000000000..5a7190a3a --- /dev/null +++ b/graphics/pokedex/area_markers/marker.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 197 115 +255 139 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokedex/area_markers/marker_0.png b/graphics/pokedex/area_markers/marker_0.png new file mode 100644 index 000000000..10ef6d24b Binary files /dev/null and b/graphics/pokedex/area_markers/marker_0.png differ diff --git a/graphics/pokedex/area_markers/marker_1.png b/graphics/pokedex/area_markers/marker_1.png new file mode 100644 index 000000000..21db66b29 Binary files /dev/null and b/graphics/pokedex/area_markers/marker_1.png differ diff --git a/graphics/pokedex/area_markers/marker_2.png b/graphics/pokedex/area_markers/marker_2.png new file mode 100644 index 000000000..e25be6f5c Binary files /dev/null and b/graphics/pokedex/area_markers/marker_2.png differ diff --git a/graphics/pokedex/area_markers/marker_3.png b/graphics/pokedex/area_markers/marker_3.png new file mode 100644 index 000000000..1e8fe22d2 Binary files /dev/null and b/graphics/pokedex/area_markers/marker_3.png differ diff --git a/graphics/pokedex/area_markers/marker_4.png b/graphics/pokedex/area_markers/marker_4.png new file mode 100644 index 000000000..193697384 Binary files /dev/null and b/graphics/pokedex/area_markers/marker_4.png differ diff --git a/graphics/pokedex/area_markers/marker_5.png b/graphics/pokedex/area_markers/marker_5.png new file mode 100644 index 000000000..0919682f4 Binary files /dev/null and b/graphics/pokedex/area_markers/marker_5.png differ diff --git a/graphics/pokedex/area_markers/marker_6.png b/graphics/pokedex/area_markers/marker_6.png new file mode 100644 index 000000000..439d858e1 Binary files /dev/null and b/graphics/pokedex/area_markers/marker_6.png differ diff --git a/graphics/pokedex/blit_wide_ellipse.png b/graphics/pokedex/blit_wide_ellipse.png new file mode 100644 index 000000000..763ed976c Binary files /dev/null and b/graphics/pokedex/blit_wide_ellipse.png differ diff --git a/graphics/pokedex/cat_icon_abc.png b/graphics/pokedex/cat_icon_abc.png new file mode 100644 index 000000000..0ec33315e Binary files /dev/null and b/graphics/pokedex/cat_icon_abc.png differ diff --git a/graphics/pokedex/cat_icon_cancel.png b/graphics/pokedex/cat_icon_cancel.png new file mode 100644 index 000000000..f8aafff9b Binary files /dev/null and b/graphics/pokedex/cat_icon_cancel.png differ diff --git a/graphics/pokedex/cat_icon_cave.png b/graphics/pokedex/cat_icon_cave.png new file mode 100644 index 000000000..56e529b32 Binary files /dev/null and b/graphics/pokedex/cat_icon_cave.png differ diff --git a/graphics/pokedex/cat_icon_forest.png b/graphics/pokedex/cat_icon_forest.png new file mode 100644 index 000000000..68f3d3463 Binary files /dev/null and b/graphics/pokedex/cat_icon_forest.png differ diff --git a/graphics/pokedex/cat_icon_grassland.png b/graphics/pokedex/cat_icon_grassland.png new file mode 100644 index 000000000..2b0f7cd1d Binary files /dev/null and b/graphics/pokedex/cat_icon_grassland.png differ diff --git a/graphics/pokedex/cat_icon_lightest.png b/graphics/pokedex/cat_icon_lightest.png new file mode 100644 index 000000000..804fd02f1 Binary files /dev/null and b/graphics/pokedex/cat_icon_lightest.png differ diff --git a/graphics/pokedex/cat_icon_mountain.png b/graphics/pokedex/cat_icon_mountain.png new file mode 100644 index 000000000..ece6eb196 Binary files /dev/null and b/graphics/pokedex/cat_icon_mountain.png differ diff --git a/graphics/pokedex/cat_icon_numerical.png b/graphics/pokedex/cat_icon_numerical.png new file mode 100644 index 000000000..77da41052 Binary files /dev/null and b/graphics/pokedex/cat_icon_numerical.png differ diff --git a/graphics/pokedex/cat_icon_qmark.png b/graphics/pokedex/cat_icon_qmark.png new file mode 100644 index 000000000..c5db049f8 Binary files /dev/null and b/graphics/pokedex/cat_icon_qmark.png differ diff --git a/graphics/pokedex/cat_icon_rare.png b/graphics/pokedex/cat_icon_rare.png new file mode 100644 index 000000000..20a676b40 Binary files /dev/null and b/graphics/pokedex/cat_icon_rare.png differ diff --git a/graphics/pokedex/cat_icon_rough_terrain.png b/graphics/pokedex/cat_icon_rough_terrain.png new file mode 100644 index 000000000..61a1e3ac1 Binary files /dev/null and b/graphics/pokedex/cat_icon_rough_terrain.png differ diff --git a/graphics/pokedex/cat_icon_sea.png b/graphics/pokedex/cat_icon_sea.png new file mode 100644 index 000000000..2589fc28f Binary files /dev/null and b/graphics/pokedex/cat_icon_sea.png differ diff --git a/graphics/pokedex/cat_icon_smallest.png b/graphics/pokedex/cat_icon_smallest.png new file mode 100644 index 000000000..2c8a25b4e Binary files /dev/null and b/graphics/pokedex/cat_icon_smallest.png differ diff --git a/graphics/pokedex/cat_icon_type.png b/graphics/pokedex/cat_icon_type.png new file mode 100644 index 000000000..92c03ac1b Binary files /dev/null and b/graphics/pokedex/cat_icon_type.png differ diff --git a/graphics/pokedex/cat_icon_urban.png b/graphics/pokedex/cat_icon_urban.png new file mode 100644 index 000000000..0c422aa07 Binary files /dev/null and b/graphics/pokedex/cat_icon_urban.png differ diff --git a/graphics/pokedex/cat_icon_waters_edge.png b/graphics/pokedex/cat_icon_waters_edge.png new file mode 100644 index 000000000..d7bd2116d Binary files /dev/null and b/graphics/pokedex/cat_icon_waters_edge.png differ diff --git a/graphics/pokedex/caught_marker.png b/graphics/pokedex/caught_marker.png new file mode 100644 index 000000000..74f43ec80 Binary files /dev/null and b/graphics/pokedex/caught_marker.png differ diff --git a/graphics/pokedex/kanto_dex_bgpals.pal b/graphics/pokedex/kanto_dex_bgpals.pal new file mode 100644 index 000000000..b719d111f --- /dev/null +++ b/graphics/pokedex/kanto_dex_bgpals.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +156 156 189 +0 0 0 +197 180 139 +230 222 197 +246 246 238 +255 255 255 +123 98 57 +164 148 98 +213 197 164 +255 246 238 +238 238 230 +213 213 213 +156 156 156 +255 255 0 +205 65 57 +255 139 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +156 156 189 +0 0 0 +197 180 139 +230 222 197 +246 246 238 +255 255 255 +123 98 57 +164 148 98 +213 197 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +205 65 57 +255 139 57 +156 156 189 +0 0 0 +197 180 139 +230 222 197 +246 246 238 +255 255 255 +123 98 57 +164 148 98 +213 197 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +205 65 57 +255 139 57 +156 156 189 +0 0 0 +197 180 139 +230 222 197 +246 246 238 +255 255 255 +123 98 57 +164 148 98 +213 197 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +205 65 57 +255 139 57 +156 156 189 +0 0 0 +197 180 139 +230 222 197 +246 246 238 +255 255 255 +123 98 57 +164 148 98 +213 197 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +205 65 57 +255 139 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +156 156 189 +0 0 0 +197 180 139 +230 222 197 +246 246 238 +255 255 255 +123 98 57 +164 148 98 +213 197 164 +255 246 238 +238 238 230 +213 213 213 +156 156 156 +255 255 0 +205 65 57 +255 139 57 +255 255 255 +255 255 255 +98 98 98 +213 213 205 +230 8 8 +255 189 115 +32 156 8 +148 246 148 +49 82 205 +164 197 246 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 180 139 diff --git a/graphics/pokedex/kanto_dex_bgtiles.png b/graphics/pokedex/kanto_dex_bgtiles.png new file mode 100644 index 000000000..5cef4b098 Binary files /dev/null and b/graphics/pokedex/kanto_dex_bgtiles.png differ diff --git a/graphics/pokedex/map_five_island.png b/graphics/pokedex/map_five_island.png new file mode 100644 index 000000000..c37c1c25a Binary files /dev/null and b/graphics/pokedex/map_five_island.png differ diff --git a/graphics/pokedex/map_four_island.png b/graphics/pokedex/map_four_island.png new file mode 100644 index 000000000..83ef69608 Binary files /dev/null and b/graphics/pokedex/map_four_island.png differ diff --git a/graphics/pokedex/map_kanto.png b/graphics/pokedex/map_kanto.png new file mode 100644 index 000000000..3c32b2d4c Binary files /dev/null and b/graphics/pokedex/map_kanto.png differ diff --git a/graphics/pokedex/map_one_island.png b/graphics/pokedex/map_one_island.png new file mode 100644 index 000000000..2e2d30fbb Binary files /dev/null and b/graphics/pokedex/map_one_island.png differ diff --git a/graphics/pokedex/map_seven_island.png b/graphics/pokedex/map_seven_island.png new file mode 100644 index 000000000..3631d8906 Binary files /dev/null and b/graphics/pokedex/map_seven_island.png differ diff --git a/graphics/pokedex/map_six_island.png b/graphics/pokedex/map_six_island.png new file mode 100644 index 000000000..53e598139 Binary files /dev/null and b/graphics/pokedex/map_six_island.png differ diff --git a/graphics/pokedex/map_three_island.png b/graphics/pokedex/map_three_island.png new file mode 100644 index 000000000..2e34eb497 Binary files /dev/null and b/graphics/pokedex/map_three_island.png differ diff --git a/graphics/pokedex/map_two_island.png b/graphics/pokedex/map_two_island.png new file mode 100644 index 000000000..5006ba035 Binary files /dev/null and b/graphics/pokedex/map_two_island.png differ diff --git a/graphics/pokedex/mini_page.png b/graphics/pokedex/mini_page.png new file mode 100644 index 000000000..b6e6e2788 Binary files /dev/null and b/graphics/pokedex/mini_page.png differ diff --git a/graphics/pokedex/national_dex_bgpals.pal b/graphics/pokedex/national_dex_bgpals.pal new file mode 100644 index 000000000..0d68b4233 --- /dev/null +++ b/graphics/pokedex/national_dex_bgpals.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +156 156 189 +0 0 0 +197 180 139 +230 222 197 +238 246 246 +255 255 255 +123 98 57 +164 148 98 +213 197 164 +255 246 238 +238 238 230 +213 213 213 +156 156 156 +255 255 0 +205 65 57 +255 139 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +156 156 189 +0 0 0 +197 180 139 +230 222 197 +238 246 246 +255 255 255 +123 98 57 +164 148 98 +213 197 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +205 65 57 +255 139 57 +156 156 189 +0 0 0 +197 180 139 +230 222 197 +238 246 246 +255 255 255 +123 98 57 +164 148 98 +213 197 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +205 65 57 +255 139 57 +156 156 189 +0 0 0 +197 180 139 +230 222 197 +238 246 246 +255 255 255 +123 98 57 +164 148 98 +213 197 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +205 65 57 +255 139 57 +156 156 189 +0 0 0 +197 180 139 +230 222 197 +238 246 246 +255 255 255 +123 98 57 +164 148 98 +213 197 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +205 65 57 +255 139 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +156 156 189 +0 0 0 +197 180 139 +230 222 197 +238 246 246 +255 255 255 +123 98 57 +164 148 98 +213 197 164 +255 246 238 +238 238 230 +213 213 213 +156 156 156 +255 255 0 +205 65 57 +255 139 57 +255 255 255 +255 255 255 +98 98 98 +213 213 205 +230 8 8 +255 189 115 +32 156 8 +148 246 148 +49 82 205 +164 197 246 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +172 197 24 diff --git a/graphics/pokedex/national_dex_bgtiles.png b/graphics/pokedex/national_dex_bgtiles.png new file mode 100644 index 000000000..226e08d54 Binary files /dev/null and b/graphics/pokedex/national_dex_bgtiles.png differ diff --git a/graphics/pokedex/page_icon_tilemap.bin b/graphics/pokedex/page_icon_tilemap.bin new file mode 100644 index 000000000..bd64c4ad4 Binary files /dev/null and b/graphics/pokedex/page_icon_tilemap.bin differ diff --git a/graphics/pokedex/silhouette_sprite_pal.pal b/graphics/pokedex/silhouette_sprite_pal.pal new file mode 100644 index 000000000..43ab6f7f7 --- /dev/null +++ b/graphics/pokedex/silhouette_sprite_pal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 82 +82 82 82 +82 82 82 +82 82 82 +82 82 82 +82 82 82 +82 82 82 +82 82 82 +82 82 82 +82 82 82 +82 82 82 +82 82 82 +82 82 82 +82 82 82 +82 82 82 diff --git a/graphics/pokedex_area_markers/marker.pal b/graphics/pokedex_area_markers/marker.pal deleted file mode 100644 index 5a7190a3a..000000000 --- a/graphics/pokedex_area_markers/marker.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 197 115 -255 139 57 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/pokedex_area_markers/marker_0.png b/graphics/pokedex_area_markers/marker_0.png deleted file mode 100644 index 10ef6d24b..000000000 Binary files a/graphics/pokedex_area_markers/marker_0.png and /dev/null differ diff --git a/graphics/pokedex_area_markers/marker_1.png b/graphics/pokedex_area_markers/marker_1.png deleted file mode 100644 index 21db66b29..000000000 Binary files a/graphics/pokedex_area_markers/marker_1.png and /dev/null differ diff --git a/graphics/pokedex_area_markers/marker_2.png b/graphics/pokedex_area_markers/marker_2.png deleted file mode 100644 index e25be6f5c..000000000 Binary files a/graphics/pokedex_area_markers/marker_2.png and /dev/null differ diff --git a/graphics/pokedex_area_markers/marker_3.png b/graphics/pokedex_area_markers/marker_3.png deleted file mode 100644 index 1e8fe22d2..000000000 Binary files a/graphics/pokedex_area_markers/marker_3.png and /dev/null differ diff --git a/graphics/pokedex_area_markers/marker_4.png b/graphics/pokedex_area_markers/marker_4.png deleted file mode 100644 index 193697384..000000000 Binary files a/graphics/pokedex_area_markers/marker_4.png and /dev/null differ diff --git a/graphics/pokedex_area_markers/marker_5.png b/graphics/pokedex_area_markers/marker_5.png deleted file mode 100644 index 0919682f4..000000000 Binary files a/graphics/pokedex_area_markers/marker_5.png and /dev/null differ diff --git a/graphics/pokedex_area_markers/marker_6.png b/graphics/pokedex_area_markers/marker_6.png deleted file mode 100644 index 439d858e1..000000000 Binary files a/graphics/pokedex_area_markers/marker_6.png and /dev/null differ 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}, -- cgit v1.2.3