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 /src/script_menu.c | |
| parent | d4bd4c393e59bb66a8d4f69f23dce694982723e1 (diff) | |
| parent | 67ced1d77ec0d36cc2b6ebcbfc58ba28b357ddbb (diff) | |
fix merge conflicts
Diffstat (limited to 'src/script_menu.c')
| -rw-r--r-- | src/script_menu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script_menu.c b/src/script_menu.c index e1ad3f467..f4ac55fb9 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -547,7 +547,7 @@ const struct MultichoiceListStruct gMultichoiceLists[] = {(struct MenuAction *)MultichoiceList_72, 5} }; -const struct TextStruct gUnknown_083CE048[] = +const u8 *const gUnknown_083CE048[] = { OtherText_Cool2, OtherText_Beauty3, |