Document Pokedex Screen

2026-04-24 23:07:39 -05:00 · 2021-04-21 09:21:53 -04:00 · 2021-04-21 09:21:53 -04:00 · 704dc2f913
commit 704dc2f913
parent cf553c7006
95 changed files with 1521 additions and 1709 deletions
--- a/graphics/interface/pokedex_blit_wide_ellipse.png
+++ b/graphics/interface/pokedex_blit_wide_ellipse.png
--- a/graphics/interface/pokedex_cat_icon_cancel.png
+++ b/graphics/interface/pokedex_cat_icon_cancel.png
--- a/graphics/interface/pokedex_cat_icon_cave.png
+++ b/graphics/interface/pokedex_cat_icon_cave.png
--- a/graphics/interface/pokedex_cat_icon_forest.png
+++ b/graphics/interface/pokedex_cat_icon_forest.png
--- a/graphics/interface/pokedex_cat_icon_grassland.png
+++ b/graphics/interface/pokedex_cat_icon_grassland.png
--- a/graphics/interface/pokedex_cat_icon_lightest.png
+++ b/graphics/interface/pokedex_cat_icon_lightest.png
--- a/graphics/interface/pokedex_cat_icon_mountain.png
+++ b/graphics/interface/pokedex_cat_icon_mountain.png
--- a/graphics/interface/pokedex_cat_icon_numerical.png
+++ b/graphics/interface/pokedex_cat_icon_numerical.png
--- a/graphics/interface/pokedex_cat_icon_qmark.png
+++ b/graphics/interface/pokedex_cat_icon_qmark.png
--- a/graphics/interface/pokedex_cat_icon_rare.png
+++ b/graphics/interface/pokedex_cat_icon_rare.png
--- a/graphics/interface/pokedex_cat_icon_rough_terrain.png
+++ b/graphics/interface/pokedex_cat_icon_rough_terrain.png
--- a/graphics/interface/pokedex_cat_icon_sea.png
+++ b/graphics/interface/pokedex_cat_icon_sea.png
--- a/graphics/interface/pokedex_cat_icon_smallest.png
+++ b/graphics/interface/pokedex_cat_icon_smallest.png
--- a/graphics/interface/pokedex_cat_icon_type.png
+++ b/graphics/interface/pokedex_cat_icon_type.png
--- a/graphics/interface/pokedex_cat_icon_urban.png
+++ b/graphics/interface/pokedex_cat_icon_urban.png
--- a/graphics/interface/pokedex_cat_icon_waters_edge.png
+++ b/graphics/interface/pokedex_cat_icon_waters_edge.png
--- a/graphics/interface/pokedex_caught_marker.png
+++ b/graphics/interface/pokedex_caught_marker.png
--- a/graphics/interface/pokedex_kanto_dex_bgpals.pal
+++ b/graphics/interface/pokedex_kanto_dex_bgpals.pal
--- a/graphics/interface/pokedex_kanto_dex_bgtiles.png
+++ b/graphics/interface/pokedex_kanto_dex_bgtiles.png
--- a/graphics/interface/pokedex_map_five_island.png
+++ b/graphics/interface/pokedex_map_five_island.png
--- a/graphics/interface/pokedex_map_four_island.png
+++ b/graphics/interface/pokedex_map_four_island.png
--- a/graphics/interface/pokedex_map_kanto.png
+++ b/graphics/interface/pokedex_map_kanto.png
--- a/graphics/interface/pokedex_map_one_island.png
+++ b/graphics/interface/pokedex_map_one_island.png
--- a/graphics/interface/pokedex_map_seven_island.png
+++ b/graphics/interface/pokedex_map_seven_island.png
--- a/graphics/interface/pokedex_map_six_island.png
+++ b/graphics/interface/pokedex_map_six_island.png
--- a/graphics/interface/pokedex_map_three_island.png
+++ b/graphics/interface/pokedex_map_three_island.png
--- a/graphics/interface/pokedex_map_two_island.png
+++ b/graphics/interface/pokedex_map_two_island.png
--- a/graphics/interface/pokedex_mini_page.png
+++ b/graphics/interface/pokedex_mini_page.png
--- a/graphics/interface/pokedex_national_dex_bgpals.pal
+++ b/graphics/interface/pokedex_national_dex_bgpals.pal
--- a/graphics/interface/pokedex_national_dex_bgtiles.png
+++ b/graphics/interface/pokedex_national_dex_bgtiles.png
--- a/graphics/interface/pokedex_page_icon_tilemap.bin
+++ b/graphics/interface/pokedex_page_icon_tilemap.bin
--- a/graphics/interface/pokedex_silhouette_sprite_pal.pal
+++ b/graphics/interface/pokedex_silhouette_sprite_pal.pal
--- a/graphics/pokedex/unk_8440124.bin
+++ b/graphics/pokedex/unk_8440124.bin
--- a/graphics/pokedex/unk_8440274.png
+++ b/graphics/pokedex/unk_8440274.png
--- a/graphics/pokedex/unk_84403AC.png
+++ b/graphics/pokedex/unk_84403AC.png
--- a/graphics/pokedex/unk_84408E0.bin
+++ b/graphics/pokedex/unk_84408E0.bin
--- a/graphics/pokedex/unk_8440BD8.bin
+++ b/graphics/pokedex/unk_8440BD8.bin
--- a/graphics/pokedex/unk_8440EF0.bin
+++ b/graphics/pokedex/unk_8440EF0.bin
--- a/graphics/pokedex/unk_844112C.bin
+++ b/graphics/pokedex/unk_844112C.bin
--- a/graphics/pokedex/unk_84414BC.bin
+++ b/graphics/pokedex/unk_84414BC.bin
--- a/graphics/pokedex/unk_8441808.bin
+++ b/graphics/pokedex/unk_8441808.bin
--- a/graphics/pokedex/unk_8441A40.bin
+++ b/graphics/pokedex/unk_8441A40.bin
--- a/graphics/pokedex/unk_8441D54.bin
+++ b/graphics/pokedex/unk_8441D54.bin
--- a/graphics/pokedex/unk_8442004.bin
+++ b/graphics/pokedex/unk_8442004.bin
--- a/graphics/pokedex/unk_844223C.bin
+++ b/graphics/pokedex/unk_844223C.bin
--- a/graphics/pokedex/unk_84424E4.bin
+++ b/graphics/pokedex/unk_84424E4.bin
--- a/graphics/pokedex/unk_8442838.bin
+++ b/graphics/pokedex/unk_8442838.bin
--- a/graphics/pokedex/unk_8442BC0.bin
+++ b/graphics/pokedex/unk_8442BC0.bin
--- a/graphics/pokedex/unk_8442EF8.bin
+++ b/graphics/pokedex/unk_8442EF8.bin
--- a/graphics/pokedex/unk_844318C.bin
+++ b/graphics/pokedex/unk_844318C.bin
--- a/graphics/pokedex/unk_8443420.pal
+++ b/graphics/pokedex/unk_8443420.pal
@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-255 238 255
-255 255 255
-213 238 255
-197 230 255
-189 189 255
-213 197 131
-189 172 115
-164 139 98
-131 115 57
-213 222 131
-255 0 255
-98 106 82
-156 164 106
-189 197 131
-255 0 255
-49 49 65
--- a/graphics/pokedex/unk_8443440.pal
+++ b/graphics/pokedex/unk_8443440.pal
@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-255 238 255
-255 255 255
-213 238 255
-197 230 255
-164 213 255
-205 57 0
-131 0 0
-164 32 0
-0 0 0
-222 213 222
-180 172 197
-139 131 156
-148 197 74
-106 148 41
-255 0 255
-49 49 65
--- a/graphics/pokedex/unk_8443460.pal
+++ b/graphics/pokedex/unk_8443460.pal
@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-255 238 255
-255 255 255
-213 238 255
-197 230 255
-189 189 255
-230 230 230
-197 197 197
-213 213 213
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-255 255 255
-180 189 189
--- a/graphics/pokedex/unk_8443480.pal
+++ b/graphics/pokedex/unk_8443480.pal
@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-255 238 255
-255 255 255
-213 238 255
-197 230 255
-189 189 255
-189 230 189
-139 205 189
-106 172 156
-74 148 123
-156 205 131
-230 222 246
-205 197 213
-222 205 131
-180 164 106
-131 180 98
-255 0 255
--- a/graphics/pokedex/unk_84434A0.pal
+++ b/graphics/pokedex/unk_84434A0.pal
@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-255 238 255
-255 255 255
-213 238 255
-197 230 255
-189 189 255
-106 189 90
-82 164 0
-106 180 32
-139 205 65
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-164 213 255
--- a/graphics/pokedex/unk_84434C0.pal
+++ b/graphics/pokedex/unk_84434C0.pal
@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-255 238 255
-255 255 255
-213 238 255
-197 230 255
-189 189 255
-213 230 238
-189 189 255
-197 205 246
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-255 255 255
-180 189 189
--- a/graphics/pokedex/unk_84434E0.pal
+++ b/graphics/pokedex/unk_84434E0.pal
@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-255 238 255
-255 255 255
-213 238 255
-197 230 255
-189 189 255
-189 197 164
-205 213 189
-172 180 148
-156 164 115
-230 255 255
-213 205 222
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-172 222 255
--- a/graphics/pokedex/unk_8443500.pal
+++ b/graphics/pokedex/unk_8443500.pal
@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-255 238 255
-255 255 255
-213 238 255
-197 230 255
-189 189 255
-205 123 255
-230 156 90
-230 156 90
-213 123 74
-205 213 255
-255 0 255
-255 0 255
-255 0 255
-255 255 156
-172 90 222
-49 49 65
--- a/graphics/pokedex/unk_8443520.pal
+++ b/graphics/pokedex/unk_8443520.pal
@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-255 238 255
-255 255 255
-213 238 255
-197 230 255
-189 189 255
-148 164 246
-123 148 238
-106 139 238
-82 123 230
-65 115 230
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-164 213 255
--- a/graphics/pokedex/unk_8443540.pal
+++ b/graphics/pokedex/unk_8443540.pal
@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-255 238 255
-255 255 255
-213 238 255
-197 230 255
-189 189 255
-139 222 156
-172 246 180
-197 255 255
-213 255 255
-230 255 255
-255 255 255
-255 0 255
-255 0 255
-255 0 255
-156 230 164
-255 0 255
--- a/graphics/pokedex/unk_8443560.pal
+++ b/graphics/pokedex/unk_8443560.pal
@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-255 238 255
-255 255 255
-213 238 255
-197 230 255
-189 189 255
-246 246 238
-205 230 106
-180 189 65
-238 246 238
-246 238 180
-230 222 164
-213 205 148
-238 246 205
-238 238 197
-197 213 90
-164 213 255
--- a/graphics/pokedex/unk_8443580.pal
+++ b/graphics/pokedex/unk_8443580.pal
@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-255 238 255
-255 255 255
-213 238 255
-197 230 255
-255 0 255
-172 222 255
-156 222 238
-230 213 131
-180 230 156
-98 205 148
-197 246 172
-148 205 123
-82 180 131
-205 180 98
-164 213 139
-90 197 238
--- a/graphics/pokedex/unk_84435A0.pal
+++ b/graphics/pokedex/unk_84435A0.pal
@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-255 238 255
-255 255 255
-213 238 255
-197 230 255
-189 189 255
-164 205 255
-197 230 246
-255 255 255
-172 222 230
-222 255 255
-222 246 255
-238 255 255
-205 238 246
-255 0 255
-255 0 255
-230 172 82
--- a/graphics/pokedex/unk_84435C0.pal
+++ b/graphics/pokedex/unk_84435C0.pal
@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-255 238 255
-255 255 255
-213 238 255
-197 230 255
-189 189 255
-189 148 255
-222 189 255
-255 255 255
-255 222 172
-238 238 238
-255 238 197
-222 197 246
-230 213 255
-164 131 238
-255 255 172
-230 172 82
--- a/graphics/pokedex/unk_84435E0.pal
+++ b/graphics/pokedex/unk_84435E0.pal
@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-255 238 255
-255 255 255
-213 238 255
-197 230 255
-189 189 255
-246 230 90
-255 246 164
-255 255 238
-148 205 246
-238 230 197
-197 230 255
-255 213 82
-230 213 255
-246 189 82
-255 255 172
-0 0 0
--- a/graphics/pokedex/unk_8443620.bin
+++ b/graphics/pokedex/unk_8443620.bin
--- a/graphics/pokedex/unk_8443910.bin
+++ b/graphics/pokedex/unk_8443910.bin
--- a/graphics/pokedex/unk_8443988.bin
+++ b/graphics/pokedex/unk_8443988.bin
--- a/graphics/pokedex/unk_84439FC.bin
+++ b/graphics/pokedex/unk_84439FC.bin
--- a/graphics/pokedex/unk_8443A78.bin
+++ b/graphics/pokedex/unk_8443A78.bin
--- a/graphics/pokedex/unk_8443AF8.bin
+++ b/graphics/pokedex/unk_8443AF8.bin
--- a/graphics/pokedex/unk_8443BB0.bin
+++ b/graphics/pokedex/unk_8443BB0.bin
--- a/graphics/pokedex/unk_8443C54.bin
+++ b/graphics/pokedex/unk_8443C54.bin
--- a/graphics/pokedex/unk_8443D00.png
+++ b/graphics/pokedex/unk_8443D00.png
--- a/graphics/pokedex_area_markers/marker.pal
+++ b/graphics/pokedex_area_markers/marker.pal
--- a/graphics/pokedex_area_markers/marker_0.png
+++ b/graphics/pokedex_area_markers/marker_0.png
--- a/graphics/pokedex_area_markers/marker_1.png
+++ b/graphics/pokedex_area_markers/marker_1.png
--- a/graphics/pokedex_area_markers/marker_2.png
+++ b/graphics/pokedex_area_markers/marker_2.png
--- a/graphics/pokedex_area_markers/marker_3.png
+++ b/graphics/pokedex_area_markers/marker_3.png
--- a/graphics/pokedex_area_markers/marker_4.png
+++ b/graphics/pokedex_area_markers/marker_4.png
--- a/graphics/pokedex_area_markers/marker_5.png
+++ b/graphics/pokedex_area_markers/marker_5.png
--- a/graphics/pokedex_area_markers/marker_6.png
+++ b/graphics/pokedex_area_markers/marker_6.png
--- 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 \
--- a/include/gba/defines.h
+++ b/include/gba/defines.h
@ -51,8 +51,9 @@
 #define BG_SCREEN_ADDR(n) (void *)(BG_VRAM + (BG_SCREEN_SIZE * (n)))
 #define BG_TILE_ADDR(n)   (void *)(BG_VRAM + (0x80 * (n)))

-#define BG_TILE_H_FLIP(n) (0x400 + (n))
-#define BG_TILE_V_FLIP(n) (0x800 + (n))
+#define BG_TILE_H_FLIP(n)   (0x400 + (n))
+#define BG_TILE_V_FLIP(n)   (0x800 + (n))
+#define BG_TILE_H_V_FLIP(n) (0xC00 + (n))

 // text-mode BG
 #define OBJ_VRAM0      (void *)(VRAM + 0x10000)
--- a/include/graphics.h
+++ b/include/graphics.h
@ -4931,7 +4931,7 @@ extern const u16 gUnknown_8E9C3F8[];
 extern const u16 gUnknown_8E9C418[];

 // pokedex_screen
-extern const u16 gUnknown_8E9C14C[];
-extern const u16 gUnknown_8E9C16C[];
+extern const u16 gDexScreen_TopMenuIconPals_AtoZ[];
+extern const u32 gDexScreen_TopMenuIconTiles_AtoZ[];

 #endif //GUARD_GRAPHICS_H
--- a/include/menu.h
+++ b/include/menu.h
@ -28,8 +28,8 @@ u8 Menu2_GetMonSpriteAnchorCoord(u16 species, u32 personality, u8 a2);
 s8 Menu2_GetMonSpriteAnchorCoordMinusx20(u16 species, u32 personality, u8 a2);

 // list_menu
-void sub_8107CD8(u8 palOffset, u16 speciesId);
-void sub_8107CF8(u8 windowId, u16 speciesId, u32 personality, u16 x, u16 y);
+void ListMenu_LoadMonIconPalette(u8 palOffset, u16 speciesId);
+void ListMenu_DrawMonIconGraphics(u8 windowId, u16 speciesId, u32 personality, u16 x, u16 y);
 void ListMenuLoadStdPalAt(u8 palOffset, u8 palId);
 void BlitMoveInfoIcon(u8 windowId, u8 iconId, u16 x, u16 y);

--- a/include/pokedex.h
+++ b/include/pokedex.h
@ -48,6 +48,6 @@ bool16 HasAllHoennMons(void);
 bool16 HasAllKantoMons(void);
 bool16 HasAllMons(void);

-u8 sub_8106B60(u16 species);
+u8 DexScreen_RegisterMonToPokedex(u16 species);

 #endif // GUARD_POKEDEX_H
--- a/include/pokedex_area_markers.h
+++ b/include/pokedex_area_markers.h
@ -12,8 +12,8 @@ struct PAM_TaskData
 };

 void SetAreaSubsprite(s32 i, s32 whichArea, struct Subsprite * subsprites);
-void sub_81343F4(u8 taskId);
-u8 sub_8134230(u16 species, u16 tilesTag, u8 palIdx, u8 y);
-u8 sub_81344E0(u8 taskId);
+void Dtor_PokedexAreaMarkers(u8 taskId);
+u8 Ctor_PokedexAreaMarkers(u16 species, u16 tilesTag, u8 palIdx, u8 y);
+u8 PokedexAreaMarkers_Any(u8 taskId);

 #endif //GUARD_POKEDEX_AREA_MARKERS_H
--- a/include/pokedex_screen.h
+++ b/include/pokedex_screen.h
@ -1,21 +1,31 @@
 #ifndef GUARD_POKEDEX_SCREEN_H
 #define GUARD_POKEDEX_SCREEN_H

-#define DEX_CATEGORY_GRASSLAND     0
-#define DEX_CATEGORY_FOREST        1
-#define DEX_CATEGORY_WATERS_EDGE   2
-#define DEX_CATEGORY_SEA           3
-#define DEX_CATEGORY_CAVE          4
-#define DEX_CATEGORY_MOUNTAIN      5
-#define DEX_CATEGORY_ROUGH_TERRAIN 6
-#define DEX_CATEGORY_URBAN         7
-#define DEX_CATEGORY_RARE          8
+#define DEX_CATEGORY_GRASSLAND      0
+#define DEX_CATEGORY_FOREST         1
+#define DEX_CATEGORY_WATERS_EDGE    2
+#define DEX_CATEGORY_SEA            3
+#define DEX_CATEGORY_CAVE           4
+#define DEX_CATEGORY_MOUNTAIN       5
+#define DEX_CATEGORY_ROUGH_TERRAIN  6
+#define DEX_CATEGORY_URBAN          7
+#define DEX_CATEGORY_RARE           8
+#define DEX_CATEGORY_COUNT          9
+
+#define DEX_ORDER_NUMERICAL_KANTO    0
+#define DEX_ORDER_ATOZ               1
+#define DEX_ORDER_TYPE               2
+#define DEX_ORDER_LIGHTEST           3
+#define DEX_ORDER_SMALLEST           4
+#define DEX_ORDER_NUMERICAL_NATIONAL 5
+
+#define DEX_MODE(name) (DEX_CATEGORY_COUNT + DEX_ORDER_##name)

 #include "pokedex.h"

 extern const struct PokedexEntry gPokedexEntries[];

 void CB2_OpenPokedexFromStartMenu(void);
-s8 sub_8104AB0(u16 nationalDexNo, u8 caseId, bool8 indexIsSpecies);
+s8 DexScreen_GetSetPokedexFlag(u16 nationalDexNo, u8 caseId, bool8 indexIsSpecies);

 #endif //GUARD_POKEDEX_SCREEN_H
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@ -9179,7 +9179,7 @@ static void atkF2_displaydexinfo(void)
        if (!gPaletteFade.active)
        {
            FreeAllWindowBuffers();
-            gBattleCommunication[TASK_ID] = sub_8106B60(species);
+            gBattleCommunication[TASK_ID] = DexScreen_RegisterMonToPokedex(species);
            ++gBattleCommunication[0];
        }
        break;
--- 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 gUnknown_8E9C14C[] = INCBIN_U16("graphics/interface/pokedex_abc.gbapal");
-const u16 gUnknown_8E9C16C[] = INCBIN_U16("graphics/interface/pokedex_abc.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 gPSSMenu_Pal[] = INCBIN_U16("graphics/interface/box_tiles_pal1.gbapal");
 const u16 gUnknown_8E9C3F8[] = INCBIN_U16("graphics/interface/box_tiles_pal2.gbapal");
--- a/src/list_menu.c
+++ b/src/list_menu.c
@ -748,12 +748,12 @@ void ListMenuSetUnkIndicatorsStructField(u8 taskId, u8 field, s32 value)
    }
 }

-void sub_8107CD8(u8 palOffset, u16 speciesId)
+void ListMenu_LoadMonIconPalette(u8 palOffset, u16 speciesId)
 {
    LoadPalette(GetValidMonIconPalettePtr(speciesId), palOffset, 0x20);
 }

-void sub_8107CF8(u8 windowId, u16 speciesId, u32 personality, u16 x, u16 y)
+void ListMenu_DrawMonIconGraphics(u8 windowId, u16 speciesId, u32 personality, u16 x, u16 y)
 {
    BlitBitmapToWindow(windowId, GetMonIconPtr(speciesId, personality, 1), x, y, 32, 32);
 }
--- a/src/pokedex.c
+++ b/src/pokedex.c
@ -22,7 +22,7 @@ u16 GetPokedexHeightWeight(u16 dexNum, u8 data)

 s8 GetSetPokedexFlag(u16 nationalDexNo, u8 caseID)
 {
-    return sub_8104AB0(nationalDexNo, caseID, 0);
+    return DexScreen_GetSetPokedexFlag(nationalDexNo, caseID, 0);
 }

 u16 GetNationalPokedexCount(u8 caseID)
--- 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,
@ -157,7 +157,7 @@ static void Task_ShowAreaMarkers(u8 taskId)
    gSprites[data->spr_id].invisible = FALSE;
 }

-u8 sub_8134230(u16 species, u16 tilesTag, u8 palIdx, u8 y)
+u8 Ctor_PokedexAreaMarkers(u16 species, u16 tilesTag, u8 palIdx, u8 y)
 {
    struct SpriteTemplate spriteTemplate;
    struct CompressedSpriteSheet spriteSheet;
@ -201,7 +201,7 @@ u8 sub_8134230(u16 species, u16 tilesTag, u8 palIdx, u8 y)
    return taskId;
 }

-void sub_81343F4(u8 taskId)
+void Dtor_PokedexAreaMarkers(u8 taskId)
 {
    struct PAM_TaskData * data = (void *)gTasks[taskId].data;
    FreeSpriteTilesByTag(data->tilesTag);
@ -228,7 +228,7 @@ void SetAreaSubsprite(s32 i, s32 whichArea, struct Subsprite * subsprites)
    subsprites[i].y = sSubspriteLookupTable[whichArea][2];
 }

-u8 sub_81344E0(u8 taskId)
+u8 PokedexAreaMarkers_Any(u8 taskId)
 {
    struct PAM_TaskData * data = (void *)gTasks[taskId].data;
    return data->subsprites.subspriteCount;
--- a/src/pokedex_screen.c
+++ b/src/pokedex_screen.c