diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-07-16 20:09:46 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-07-16 20:09:46 -0400 |
| commit | 93f767e26de82d1d4133e719a758578ede98b306 (patch) | |
| tree | 0932ef3730d627bb9d9fc6c919cdcd5a6a358d7f /src/script_menu.c | |
| parent | dd7e19107879f74d8f962a6a47d619470eaefbcd (diff) | |
| parent | e50b9e28bc0d98c69b22f6d13298e705eb4eb865 (diff) | |
resolve conflict
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, |