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/script_menu.h | |
| parent | c56305607a1bad264b89d07b7539eff3fe010e0d (diff) | |
| parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) | |
fix merge conflicts
Diffstat (limited to 'include/script_menu.h')
| -rw-r--r-- | include/script_menu.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/script_menu.h b/include/script_menu.h index 7a504556e..458aad13d 100644 --- a/include/script_menu.h +++ b/include/script_menu.h @@ -7,6 +7,8 @@ struct MultichoiceListStruct u8 count; }; +extern const struct TextStruct gUnknown_083CE048[]; + bool8 sub_80B5054(u8 left, u8 top, u8 var3, u8 var4); bool8 sub_80B50B0(u8 left, u8 top, u8 var3, u8 var4, u8 var5); u16 GetStringWidthInTilesForScriptMenu(const u8 *str); |