From 7871a505b39e5452f0a39f96ce2deea810099906 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 6 Dec 2019 16:57:33 -0500 Subject: pokedex_screen through sub_810250C --- include/sound.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/sound.h b/include/sound.h index e5736fad8..73ca1c654 100644 --- a/include/sound.h +++ b/include/sound.h @@ -46,5 +46,6 @@ void SE12PanpotControl(s8 pan); bool8 IsSEPlaying(void); bool8 IsBGMPlaying(void); bool8 IsSpecialSEPlaying(void); +void sub_8072474(u16 volume); #endif // GUARD_SOUND_H -- cgit v1.2.3 From efb171875caf57aa48edf14254c1dd8d61c17a5a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 9 Dec 2019 16:26:22 -0500 Subject: Nonmatching sub_810287C; annotate rodata --- include/sound.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/sound.h b/include/sound.h index 73ca1c654..8ce8a62ad 100644 --- a/include/sound.h +++ b/include/sound.h @@ -47,5 +47,6 @@ bool8 IsSEPlaying(void); bool8 IsBGMPlaying(void); bool8 IsSpecialSEPlaying(void); void sub_8072474(u16 volume); +void sub_807249C(void); #endif // GUARD_SOUND_H -- cgit v1.2.3 From d4314287ae19ef10b036c3fa0dcf9787b7a500d6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 10 Dec 2019 12:33:19 -0500 Subject: through sub_8102F80 --- include/strings.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'include') diff --git a/include/strings.h b/include/strings.h index aa12fc3ac..ac4720678 100644 --- a/include/strings.h +++ b/include/strings.h @@ -965,4 +965,12 @@ extern const u8 gText_Var1AndYouWantedVar2[]; extern const u8 gText_HereYouGoThankYou[]; extern const u8 gText_NoMoreRoomForThis[]; +// pokedex_screen +extern const u8 gUnknown_8415D9C[]; +extern const u8 gUnknown_8415DB8[]; +extern const u8 gUnknown_8415DC4[]; +extern const u8 gUnknown_8415DCA[]; +extern const u8 gUnknown_8415DD1[]; +extern const u8 gUnknown_8415DD7[]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 30f74d1c371dbf324a28613554ee9027c4918dd6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 10 Dec 2019 13:27:37 -0500 Subject: through sub_810345C --- include/strings.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/strings.h b/include/strings.h index ac4720678..140e9fc41 100644 --- a/include/strings.h +++ b/include/strings.h @@ -972,5 +972,7 @@ extern const u8 gUnknown_8415DC4[]; extern const u8 gUnknown_8415DCA[]; extern const u8 gUnknown_8415DD1[]; extern const u8 gUnknown_8415DD7[]; +extern const u8 gUnknown_8415F3D[]; +extern const u8 gUnknown_8415F4A[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From f55abfddc54e936ccae318d0b4e6efe8f8998d42 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 11 Dec 2019 11:02:42 -0500 Subject: through sub_8103A40 --- include/list_menu.h | 4 ++-- include/pokedex_screen.h | 1 + include/strings.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/list_menu.h b/include/list_menu.h index 94a49d2c2..237805f38 100644 --- a/include/list_menu.h +++ b/include/list_menu.h @@ -73,8 +73,8 @@ struct ListMenuWindowRect extern struct ListMenuTemplate gMultiuseListMenuTemplate; s32 DoMysteryGiftListMenu(const struct WindowTemplate *windowTemplate, const struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum); -u8 ListMenuInit(struct ListMenuTemplate *listMenuTemplate, u16 cursorPos, u16 itemsAbove); -u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenuWindowRect *rect, u16 cursorPos, u16 itemsAbove); +u8 ListMenuInit(const struct ListMenuTemplate *listMenuTemplate, u16 cursorPos, u16 itemsAbove); +u8 ListMenuInitInRect(const struct ListMenuTemplate *listMenuTemplate, const struct ListMenuWindowRect *rect, u16 cursorPos, u16 itemsAbove); s32 ListMenu_ProcessInput(u8 listTaskId); void DestroyListMenuTask(u8 listTaskId, u16 *cursorPos, u16 *itemsAbove); void RedrawListMenu(u8 listTaskId); diff --git a/include/pokedex_screen.h b/include/pokedex_screen.h index 8855a47fc..9cc362d59 100644 --- a/include/pokedex_screen.h +++ b/include/pokedex_screen.h @@ -2,5 +2,6 @@ #define GUARD_POKEDEX_SCREEN_H void CB2_OpenPokedexFromStartMenu(void); +s8 sub_8104AB0(u16 nationalDexNo, u8 caseID, u8 unk); #endif //GUARD_POKEDEX_SCREEN_H diff --git a/include/strings.h b/include/strings.h index 140e9fc41..8ad1dc533 100644 --- a/include/strings.h +++ b/include/strings.h @@ -974,5 +974,6 @@ extern const u8 gUnknown_8415DD1[]; extern const u8 gUnknown_8415DD7[]; extern const u8 gUnknown_8415F3D[]; extern const u8 gUnknown_8415F4A[]; +extern const u8 gUnknown_8415F66[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 0d586d304dbae11eeb0809ef7a06e2d23db5010c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 11 Dec 2019 17:06:27 -0500 Subject: sub_8103AC8 --- include/menu_indicators.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/menu_indicators.h b/include/menu_indicators.h index fbcee2590..507c25485 100644 --- a/include/menu_indicators.h +++ b/include/menu_indicators.h @@ -32,8 +32,8 @@ struct CursorStruct u8 AddScrollIndicatorArrowPairParameterized(u32 arrowType, s32 commonPos, s32 firstPos, s32 secondPos, s32 fullyDownThreshold, s32 tileTag, s32 palTag, u16 *scrollOffset); u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate * template, u16 * a1); void RemoveScrollIndicatorArrowPair(u8); -u8 ListMenuAddCursorObjectInternal(struct CursorStruct *cursor, u32 cursorKind); -u8 ListMenuAddRedOutlineCursorObject(struct CursorStruct *cursor); +u8 ListMenuAddCursorObjectInternal(const struct CursorStruct *cursor, u32 cursorKind); +u8 ListMenuAddRedOutlineCursorObject(const struct CursorStruct *cursor); void ListMenuUpdateRedOutlineCursorObject(u8 taskId, u16 x, u16 y); void ListMenuRemoveRedOutlineCursorObject(u8 taskId); void ListMenuRemoveCursorObject(u8 taskId, u32 cursorKind); -- cgit v1.2.3 From 5df43761c0cdec23a59ee5852cf8d3936cf14972 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 12 Dec 2019 19:00:42 -0500 Subject: through sub_8104A34 --- include/strings.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/strings.h b/include/strings.h index 498d6802d..0288dc05f 100644 --- a/include/strings.h +++ b/include/strings.h @@ -975,6 +975,7 @@ extern const u8 gUnknown_8415DD7[]; extern const u8 gUnknown_8415F3D[]; extern const u8 gUnknown_8415F4A[]; extern const u8 gUnknown_8415F66[]; +extern const u8 gUnknown_8415FFF[]; // trainer card extern const u8 gText_WaitingTrainerFinishReading[]; -- cgit v1.2.3 From 2b2e3dc3e7fb3d855ae203a71e50c3353089c421 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 13 Dec 2019 09:37:46 -0500 Subject: through sub_8104C2C --- include/global.h | 5 ++--- include/pokedex_screen.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/global.h b/include/global.h index 219c09c62..9df153270 100644 --- a/include/global.h +++ b/include/global.h @@ -765,9 +765,8 @@ struct SaveBlock1 /*0x3120*/ struct MEventBuffers mysteryEventBuffers; /*0x348C*/ u8 filler_348C[400]; /*0x361C*/ struct RamScript ramScript; - /*0x3A08*/ u8 filler3A08[12]; - /*0x3A14*/ u8 seen2[DEX_FLAGS_NO]; - /*0x3A48*/ u8 filler_3a48[4]; + /*0x3A08*/ u8 filler3A08[16]; + /*0x3A18*/ u8 seen2[DEX_FLAGS_NO]; /*0x3A4C*/ u8 rivalName[PLAYER_NAME_LENGTH]; /*0x3A54*/ struct FameCheckerSaveData fameChecker[NUM_FAMECHECKER_PERSONS]; /*0x3A94*/ u8 filler3A94[0x204]; diff --git a/include/pokedex_screen.h b/include/pokedex_screen.h index 9cc362d59..6dc640719 100644 --- a/include/pokedex_screen.h +++ b/include/pokedex_screen.h @@ -2,6 +2,6 @@ #define GUARD_POKEDEX_SCREEN_H void CB2_OpenPokedexFromStartMenu(void); -s8 sub_8104AB0(u16 nationalDexNo, u8 caseID, u8 unk); +s8 sub_8104AB0(u16 nationalDexNo, u8 caseID, bool8 indexIsSpecies); #endif //GUARD_POKEDEX_SCREEN_H -- cgit v1.2.3 From e38355d2550f9a3c3d1dd48af40976acf9f9b01a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 13 Dec 2019 10:50:31 -0500 Subject: through sub_8104EC0 --- include/strings.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/strings.h b/include/strings.h index 0288dc05f..c3ab3552a 100644 --- a/include/strings.h +++ b/include/strings.h @@ -976,6 +976,7 @@ extern const u8 gUnknown_8415F3D[]; extern const u8 gUnknown_8415F4A[]; extern const u8 gUnknown_8415F66[]; extern const u8 gUnknown_8415FFF[]; +extern const u8 gUnknown_8416002[]; // trainer card extern const u8 gText_WaitingTrainerFinishReading[]; -- cgit v1.2.3 From be8b7a6f136911a2c48cc4d5578cd33bf095f6d2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 13 Dec 2019 14:55:19 -0500 Subject: through sub_81051D0 --- include/strings.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/strings.h b/include/strings.h index c3ab3552a..bc1aee889 100644 --- a/include/strings.h +++ b/include/strings.h @@ -975,6 +975,7 @@ extern const u8 gUnknown_8415DD7[]; extern const u8 gUnknown_8415F3D[]; extern const u8 gUnknown_8415F4A[]; extern const u8 gUnknown_8415F66[]; +extern const u8 gUnknown_8415F6C[]; extern const u8 gUnknown_8415FFF[]; extern const u8 gUnknown_8416002[]; -- cgit v1.2.3 From 3301c8ff1d852ab95a6607783500beaa96c807bd Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 14 Dec 2019 21:57:25 -0500 Subject: address review comments --- include/pokedex_screen.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/pokedex_screen.h b/include/pokedex_screen.h index 6dc640719..dfcbda05a 100644 --- a/include/pokedex_screen.h +++ b/include/pokedex_screen.h @@ -2,6 +2,6 @@ #define GUARD_POKEDEX_SCREEN_H void CB2_OpenPokedexFromStartMenu(void); -s8 sub_8104AB0(u16 nationalDexNo, u8 caseID, bool8 indexIsSpecies); +s8 sub_8104AB0(u16 nationalDexNo, u8 caseId, bool8 indexIsSpecies); #endif //GUARD_POKEDEX_SCREEN_H -- cgit v1.2.3