Merge remote-tracking branch 'origin/master' into modern_ld

1 files changed, 20 insertions, 10 deletions

diff --git a/include/pokedex_screen.h b/include/pokedex_screen.h
index 128fc1ad3..a93e0ffcd 100644
--- 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