diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-07-17 20:15:15 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-07-17 20:15:15 -0500 |
| commit | e2ab2e50a0723b11802e33074e0dd5d9f7d81496 (patch) | |
| tree | 843680a4e5f4e7de6d90f7e7a1e493508f9c1a36 /include/script_menu.h | |
| parent | d4bd4c393e59bb66a8d4f69f23dce694982723e1 (diff) | |
| parent | 67ced1d77ec0d36cc2b6ebcbfc58ba28b357ddbb (diff) | |
fix merge conflicts
Diffstat (limited to 'include/script_menu.h')
| -rw-r--r-- | include/script_menu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/script_menu.h b/include/script_menu.h index 458aad13d..cc5c442ec 100644 --- a/include/script_menu.h +++ b/include/script_menu.h @@ -7,7 +7,7 @@ struct MultichoiceListStruct u8 count; }; -extern const struct TextStruct gUnknown_083CE048[]; +extern const u8 *const 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); |