diff options
| author | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2016-12-03 03:59:21 +0100 |
|---|---|---|
| committer | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2016-12-04 11:48:28 +0100 |
| commit | 32fa3b735ac79bae1386a921103cd0af2ae9244a (patch) | |
| tree | 2db7cb5b86fdffddccd371fffad7d1e4a5118d05 | |
| parent | 2157ab3f9db20d6956da797042f752d85c5f5291 (diff) | |
Fix warnings in menu.c and option_menu.c
| -rw-r--r-- | include/menu.h | 2 | ||||
| -rw-r--r-- | src/menu.c | 10 |
2 files changed, 6 insertions, 6 deletions
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/src/menu.c b/src/menu.c index 62237794b..ae0dca058 100644 --- a/src/menu.c +++ b/src/menu.c @@ -20,8 +20,8 @@ struct Menu u8 columnXCoords[8]; }; -static void MultistepInitMenuWindowInternal(struct WindowConfig *, u16); -static void InitMenuWindowInternal(struct WindowConfig *, u16); +static void MultistepInitMenuWindowInternal(const struct WindowConfig *, u16); +static void InitMenuWindowInternal(const struct WindowConfig *, u16); static bool8 sub_80723D4(void); static u8 sub_8072484(u8, u8, u8, u8, u8, u8, u32); static u8 sub_80724F4(u8, u8, u8, u8 * const [][2], u8); @@ -46,12 +46,12 @@ void InitMenuWindow(const struct WindowConfig *winConfig) InitMenuWindowInternal(winConfig, 1); } -void MultistepInitMenuWindowBegin(struct WindowConfig *winConfig) +void MultistepInitMenuWindowBegin(const struct WindowConfig *winConfig) { MultistepInitMenuWindowInternal(winConfig, 1); } -static void MultistepInitMenuWindowInternal(struct WindowConfig *winConfig, u16 tileOffset) +static void MultistepInitMenuWindowInternal(const struct WindowConfig *winConfig, u16 tileOffset) { gMenuMultistepInitState = 0; gMenuTextTileOffset = tileOffset; @@ -88,7 +88,7 @@ bool32 MultistepInitMenuWindowContinue(void) } } -static void InitMenuWindowInternal(struct WindowConfig *winConfig, u16 tileOffset) +static void InitMenuWindowInternal(const struct WindowConfig *winConfig, u16 tileOffset) { gMenuWindowPtr = &gMenuWindow; InitWindowFromConfig(&gMenuWindow, winConfig); |