diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 5 | ||||
| -rw-r--r-- | include/list_menu.h | 4 | ||||
| -rw-r--r-- | include/menu_indicators.h | 4 | ||||
| -rw-r--r-- | include/pokedex_screen.h | 1 | ||||
| -rw-r--r-- | include/sound.h | 2 | ||||
| -rw-r--r-- | include/strings.h | 14 |
6 files changed, 23 insertions, 7 deletions
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/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/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); diff --git a/include/pokedex_screen.h b/include/pokedex_screen.h index 8855a47fc..dfcbda05a 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, bool8 indexIsSpecies); #endif //GUARD_POKEDEX_SCREEN_H diff --git a/include/sound.h b/include/sound.h index e5736fad8..8ce8a62ad 100644 --- a/include/sound.h +++ b/include/sound.h @@ -46,5 +46,7 @@ void SE12PanpotControl(s8 pan); bool8 IsSEPlaying(void); bool8 IsBGMPlaying(void); bool8 IsSpecialSEPlaying(void); +void sub_8072474(u16 volume); +void sub_807249C(void); #endif // GUARD_SOUND_H diff --git a/include/strings.h b/include/strings.h index fd690886a..bc1aee889 100644 --- a/include/strings.h +++ b/include/strings.h @@ -965,6 +965,20 @@ 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[]; +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[]; + // trainer card extern const u8 gText_WaitingTrainerFinishReading[]; extern const u8 gText_TrainerCardName[]; |