From 32fa3b735ac79bae1386a921103cd0af2ae9244a Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sat, 3 Dec 2016 03:59:21 +0100 Subject: Fix warnings in menu.c and option_menu.c --- include/menu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') 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); -- cgit v1.2.3 From 20958a3e042bd08e54d54ac09f673a6262f51ce0 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sat, 3 Dec 2016 04:37:28 +0100 Subject: Fix warnings in trainer_see.c --- include/asm.inc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/asm.inc.h b/include/asm.inc.h index 567c8708e..0e39d2c1e 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -20,7 +20,7 @@ void current_map_music_set__default_for_battle(u16); // asm/rom_8040EB4.o void StoreWordInTwoHalfwords(u16 *, u32); -void LoadWordFromTwoHalfwords(u16 *, u32); +void LoadWordFromTwoHalfwords(u16 *, u32 *); // asm/daycare.o u8 daycare_count_pokemon(u8 *); -- cgit v1.2.3 From 1a93ee20959627c97208f4733ed0cbd7d22cb41b Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sun, 4 Dec 2016 11:52:19 +0100 Subject: Add functions used by matsuda menu to asm.inc.h --- include/asm.inc.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'include') diff --git a/include/asm.inc.h b/include/asm.inc.h index 0e39d2c1e..c288f180f 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -266,6 +266,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 @@ -312,9 +317,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 void ShowContestWinner(void); @@ -335,6 +342,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); -- cgit v1.2.3 From 97f58f823c6cfc031e48fd30d84bcbfeb667c881 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sun, 4 Dec 2016 11:52:52 +0100 Subject: Make InitWindowFromConfig use const config --- include/text.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') 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); -- cgit v1.2.3