diff options
author | camthesaxman <cameronghall@cox.net> | 2017-06-17 19:46:25 -0500 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2017-06-17 19:46:25 -0500 |
commit | 82ddae9db42f45abf876e68dc9b0b69a00b44070 (patch) | |
tree | 26e39c75e92ca8cf128b9143c0e664b06bff23a9 /include/menu.h | |
parent | c56305607a1bad264b89d07b7539eff3fe010e0d (diff) | |
parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) |
fix merge conflicts
Diffstat (limited to 'include/menu.h')
-rw-r--r-- | include/menu.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/menu.h b/include/menu.h index c18f4cb9e..a6784a553 100644 --- a/include/menu.h +++ b/include/menu.h @@ -21,6 +21,14 @@ struct MenuAction3 void (*func2)(u8); }; +extern const struct MenuAction gMenuYesNoItems[]; + +extern struct Window gMenuWindow; +extern struct Window *gMenuWindowPtr; +extern u16 gMenuTextTileOffset; +extern u16 gMenuTextWindowContentTileOffset; +extern u16 gMenuMessageBoxContentTileOffset; + void CloseMenu(void); void AppendToList(u8 *list, u8 *pindex, u32 value); void InitMenuWindow(const struct WindowConfig *); |