diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm.inc.h | 14 | ||||
| -rw-r--r-- | include/menu.h | 2 | ||||
| -rw-r--r-- | include/text.h | 2 |
3 files changed, 16 insertions, 2 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h index d15a8bc9b..795e68f34 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -262,6 +262,11 @@ void sub_80A68CC(); // asm/contest.o void sub_80AB1B0(void); +void sub_80AE098(u8); +void sub_80AE398(u8, u8); +void sub_80AE82C(u8); +void sub_80AF668(void); +void sub_80B0F28(u8); void sub_80B2D1C(void); // asm/shop.o @@ -308,9 +313,11 @@ void sub_80BFD44(void *, u32, u8); void sub_80C0514(void *, u32, u8); // asm/contest_link_80C2020.o +void sub_80C2358(void); void sub_80C48C8(void); void sub_80C4940(void); void sub_80C4980(u8); +u8 sub_80C4B34(u8 *); // asm/script_pokemon_util_80C4BF0.o u8 sub_80C4D50(void); @@ -332,6 +339,13 @@ void RotatingGatePuzzleCameraUpdate(s16, s16); void sub_80C8080(); u32 CheckForRotatingGatePuzzleCollision(u8, s16, s16); +// asm/contest_link_80C857C.o +void sub_80C8734(u8); +void sub_80C88AC(u8); +void sub_80C8E1C(u8); +void sub_80C8EBC(u8); +void sub_80C8F34(u8); + // asm/bike.o void MovePlayerOnBike(u8, u16, u16); void sub_80E5B38(u16 i, u16 c); diff --git a/include/menu.h b/include/menu.h index 6805591df..28710b7b9 100644 --- a/include/menu.h +++ b/include/menu.h @@ -10,7 +10,7 @@ struct MenuAction }; void InitMenuWindow(const struct WindowConfig *); -void MultistepInitMenuWindowBegin(struct WindowConfig *); +void MultistepInitMenuWindowBegin(const struct WindowConfig *); bool32 MultistepInitMenuWindowContinue(void); void unref_sub_8071DA4(struct WindowConfig *, u16); void MenuLoadTextWindowGraphics_OverrideFrameType(u8); diff --git a/include/text.h b/include/text.h index fb6dfe915..ad5313eed 100644 --- a/include/text.h +++ b/include/text.h @@ -137,7 +137,7 @@ void SetUpWindowConfig(const struct WindowConfig *winConfig); u16 InitWindowTileData(struct Window *win, u16 startOffset); u32 MultistepInitWindowTileData(struct Window *win, u16 startOffset); bool32 MultistepLoadFont(void); -void InitWindowFromConfig(struct Window *win, struct WindowConfig *winConfig); +void InitWindowFromConfig(struct Window *win, const struct WindowConfig *winConfig); void InitWindow(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top); void sub_8002E4C(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u16 top, u32 a6); void sub_8002E90(struct Window *win, const u8 *text); |