diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/graphics.h | 7 | ||||
| -rw-r--r-- | include/menu.h | 1 | ||||
| -rw-r--r-- | include/pokenav.h | 22 | ||||
| -rw-r--r-- | include/strings.h | 27 |
4 files changed, 45 insertions, 12 deletions
diff --git a/include/graphics.h b/include/graphics.h index 5a73e7b92..1171d3c1c 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4019,6 +4019,13 @@ extern const u32 gPokenavLeftHeaderMainMenu_Gfx[]; extern const u32 gPokenavLeftHeaderCondition_Gfx[]; extern const u32 gPokenavLeftHeaderRibbons_Gfx[]; extern const u32 gPokenavLeftHeaderMatchCall_Gfx[]; +extern const u32 gPokenavLeftHeaderParty_Gfx[]; +extern const u32 gPokenavLeftHeaderSearch_Gfx[]; +extern const u32 gPokenavLeftHeaderCool_Gfx[]; +extern const u32 gPokenavLeftHeaderBeauty_Gfx[]; +extern const u32 gPokenavLeftHeaderCute_Gfx[]; +extern const u32 gPokenavLeftHeaderSmart_Gfx[]; +extern const u32 gPokenavLeftHeaderTough_Gfx[]; extern const u32 gPageInfoTilemap[]; extern const u32 gUnknown_08D98CC8[]; diff --git a/include/menu.h b/include/menu.h index 4d55fc955..08cad40bd 100644 --- a/include/menu.h +++ b/include/menu.h @@ -99,6 +99,7 @@ void sub_8199CBC(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height); u8 sub_81980F0(u8 bg, u8 xPos, u8 yPos, u8 palette, u16 baseTile); void sub_8198314(void); void sub_8198180(const u8 *string, u8 a2, bool8 copyToVram); +void ResetBgPositions(void); void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonPress, u8 speed); void sub_8198C78(void); void PrintTextArray(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *strs); diff --git a/include/pokenav.h b/include/pokenav.h index 4e1648c93..d1bdbb2e9 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -1,6 +1,28 @@ #ifndef GUARD_POKENAV_H #define GUARD_POKENAV_H +typedef u32 (*LoopedTask)(s32 state); + +// Return values of LoopedTask functions. +#define LT_INC_AND_PAUSE 0 +#define LT_INC_AND_CONTINUE 1 +#define LT_PAUSE 2 +#define LT_CONTINUE 3 +#define LT_FINISH 4 +#define LT_SET_STATE(newState) (newState + 5) + +// pokenav.c +extern u32 sub_81C99D4(void); + void CB2_InitPokeNav(void); +u32 CreateLoopedTask(LoopedTask loopedTask, u32 priority); +bool32 FuncIsActiveLoopedTask(LoopedTask func); +void *GetSubstructPtr(u32 index); +void FreePokenavSubstruct(u32 index); +void *AllocSubstruct(u32 index, u32 size); +void Pokenav_AllocAndLoadPalettes(const struct SpritePalette *palettes); +bool32 IsLoopedTaskActive(u32 taskId); + +// pokenav_match_call_ui.c #endif //GUARD_POKENAV_H diff --git a/include/strings.h b/include/strings.h index 74e364232..3c141f243 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1008,18 +1008,21 @@ extern const u8 gText_SomeonesPC[]; extern const u8 gText_PlayersPC[]; extern const u8 gText_WhichPCShouldBeAccessed[]; -extern const u8 gText_Navgear_ClearButtonList[]; -extern const u8 gText_NavgearMap_ZoomedOutButtons[]; -extern const u8 gText_NavgearMap_ZoomedInButtons[]; -extern const u8 gText_NavgearCondition_MonListButtons[]; -extern const u8 gText_NavgearCondition_MonStatusButtons[]; -extern const u8 gText_NavgearCondition_MarkingButtons[]; -extern const u8 gText_NavgearMatchCall_TrainerListButtons[]; -extern const u8 gText_NavgearMatchCall_CallMenuButtons[]; -extern const u8 gText_NavgearMatchCall_CheckTrainerButtons[]; -extern const u8 gText_NavgearRibbons_MonListButtons[]; -extern const u8 gText_NavgearRibbons_RibbonListButtons[]; -extern const u8 gText_NavgearRibbons_RibbonCheckButtons[]; +extern const u8 gText_PokenavMatchCall_Strategy[]; +extern const u8 gText_PokenavMatchCall_TrainerPokemon[]; +extern const u8 gText_PokenavMatchCall_SelfIntroduction[]; +extern const u8 gText_Pokenav_ClearButtonList[]; +extern const u8 gText_PokenavMap_ZoomedOutButtons[]; +extern const u8 gText_PokenavMap_ZoomedInButtons[]; +extern const u8 gText_PokenavCondition_MonListButtons[]; +extern const u8 gText_PokenavCondition_MonStatusButtons[]; +extern const u8 gText_PokenavCondition_MarkingButtons[]; +extern const u8 gText_PokenavMatchCall_TrainerListButtons[]; +extern const u8 gText_PokenavMatchCall_CallMenuButtons[]; +extern const u8 gText_PokenavMatchCall_CheckTrainerButtons[]; +extern const u8 gText_PokenavRibbons_MonListButtons[]; +extern const u8 gText_PokenavRibbons_RibbonListButtons[]; +extern const u8 gText_PokenavRibbons_RibbonCheckButtons[]; extern const u8 gUnknown_085EAD37[]; extern const u8 gUnknown_085EAD41[]; |