diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-07-17 20:10:21 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-07-17 20:10:21 -0400 |
| commit | 8027698fd30d410f2262906a25c0f00170abd58f (patch) | |
| tree | 4b36f90f33d3d93a329956c5c88cba0d48157fb0 /src/option_menu.c | |
| parent | 61d54c967acbbfdc0aaeb3f96d5f7d4aa94c6dcf (diff) | |
| parent | d01a28c82fd25b8a92cbb1d508279e34690e3d26 (diff) | |
resolve tv.c conflict
Diffstat (limited to 'src/option_menu.c')
| -rw-r--r-- | src/option_menu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/option_menu.c b/src/option_menu.c index 2463b11c6..7f8d76528 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -32,8 +32,9 @@ enum { MENUITEM_CANCEL, }; -extern u8 gUnknown_0839F63C[]; -extern u8 gUnknown_0839F5FC[]; //palette +const u16 gUnknown_0839F5FC[] = INCBIN_U16("graphics/misc/option_menu_text.gbapal"); +// note: this is only used in the Japanese release +const u8 gUnknown_0839F63C[] = INCBIN_U8("graphics/misc/option_menu_equals_sign.4bpp"); static void Task_OptionMenuFadeIn(u8 taskId); static void Task_OptionMenuProcessInput(u8 taskId); |