From 6c77c7a714e2e3dc674b24d8aaa96ccf63d51d95 Mon Sep 17 00:00:00 2001 From: Kurausukun Date: Thu, 11 Feb 2021 21:50:39 -0500 Subject: [LEAK-INFORMED] match the rest of pokedex_screen --- include/pokedex.h | 2 +- include/pokedex_area_markers.h | 3 +++ include/pokedex_screen.h | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/pokedex.h b/include/pokedex.h index c132ae794..aad4849de 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -48,6 +48,6 @@ bool16 HasAllHoennMons(void); bool16 HasAllKantoMons(void); bool16 HasAllMons(void); -u32 sub_8106B60(u16 species); +u8 sub_8106B60(u16 species); #endif // GUARD_POKEDEX_H diff --git a/include/pokedex_area_markers.h b/include/pokedex_area_markers.h index da73fd529..47bbdf486 100644 --- a/include/pokedex_area_markers.h +++ b/include/pokedex_area_markers.h @@ -12,5 +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); #endif //GUARD_POKEDEX_AREA_MARKERS_H diff --git a/include/pokedex_screen.h b/include/pokedex_screen.h index 128fc1ad3..507750c81 100644 --- a/include/pokedex_screen.h +++ b/include/pokedex_screen.h @@ -11,6 +11,11 @@ #define DEX_CATEGORY_URBAN 7 #define DEX_CATEGORY_RARE 8 +#define DEX_CATEGORY_SIZE (sizeof(gDexCategories)/sizeof(struct { \ + const struct PokedexCategoryPage * page; \ + u8 count; \ + })) + #include "pokedex.h" extern const struct PokedexEntry gPokedexEntries[]; -- cgit v1.2.3 From 2ff02b3c5ae6791fa19ff367779c03c95923b779 Mon Sep 17 00:00:00 2001 From: Kurausukun Date: Thu, 11 Feb 2021 23:06:33 -0500 Subject: fix whitespace, update dex category macro --- include/pokedex_screen.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'include') diff --git a/include/pokedex_screen.h b/include/pokedex_screen.h index 507750c81..72754ca63 100644 --- a/include/pokedex_screen.h +++ b/include/pokedex_screen.h @@ -11,10 +11,7 @@ #define DEX_CATEGORY_URBAN 7 #define DEX_CATEGORY_RARE 8 -#define DEX_CATEGORY_SIZE (sizeof(gDexCategories)/sizeof(struct { \ - const struct PokedexCategoryPage * page; \ - u8 count; \ - })) +#define DEX_CATEGORY_SIZE NELEMS(gDexCategories) #include "pokedex.h" -- cgit v1.2.3 From ccd75ad32e08465fb38773b2961433916c2ae96c Mon Sep 17 00:00:00 2001 From: Kurausukun Date: Thu, 11 Feb 2021 23:12:55 -0500 Subject: words are hard --- include/pokedex_screen.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include') diff --git a/include/pokedex_screen.h b/include/pokedex_screen.h index 72754ca63..128fc1ad3 100644 --- a/include/pokedex_screen.h +++ b/include/pokedex_screen.h @@ -11,8 +11,6 @@ #define DEX_CATEGORY_URBAN 7 #define DEX_CATEGORY_RARE 8 -#define DEX_CATEGORY_SIZE NELEMS(gDexCategories) - #include "pokedex.h" extern const struct PokedexEntry gPokedexEntries[]; -- cgit v1.2.3