diff options
Diffstat (limited to 'src/d/d_bright_check.cpp')
| -rw-r--r-- | src/d/d_bright_check.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/d/d_bright_check.cpp b/src/d/d_bright_check.cpp index 75537717e1..e7695b7451 100644 --- a/src/d/d_bright_check.cpp +++ b/src/d/d_bright_check.cpp @@ -28,32 +28,32 @@ dBrightCheck_c::~dBrightCheck_c() { void dBrightCheck_c::screenSet() { static u64 const tv_btnA[] = { - 'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4', 'cont_at', + MULTI_CHAR('cont_at1'), MULTI_CHAR('cont_at2'), MULTI_CHAR('cont_at3'), MULTI_CHAR('cont_at4'), MULTI_CHAR('cont_at'), }; static u64 const ftv_btnA[] = { - 'font_a1', 'font_at2', 'font_at3', 'font_at4', 'font_at', + MULTI_CHAR('font_a1'), MULTI_CHAR('font_at2'), MULTI_CHAR('font_at3'), MULTI_CHAR('font_at4'), MULTI_CHAR('font_at'), }; #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) static u64 const txTV[] = { - 'menu_t6s', 'menu_t6', 'menu_t9s', 'menu_t9', 'menut10s', - 'menu_t10', 'menu_t7s', 'menu_t7', 'menu_t8s', 'menu_t8', + MULTI_CHAR('menu_t6s'), MULTI_CHAR('menu_t6'), MULTI_CHAR('menu_t9s'), MULTI_CHAR('menu_t9'), MULTI_CHAR('menut10s'), + MULTI_CHAR('menu_t10'), MULTI_CHAR('menu_t7s'), MULTI_CHAR('menu_t7'), MULTI_CHAR('menu_t8s'), MULTI_CHAR('menu_t8'), }; #else static u64 const txTV[] = { - 'menu_t61', 'menu_t2', 'menu_t91', 'menu_t1', 'menut101', - 'menu_t01', 'menu_t71', 'menu_t3', 'menu_t81', 'menu_t4', + MULTI_CHAR('menu_t61'), MULTI_CHAR('menu_t2'), MULTI_CHAR('menu_t91'), MULTI_CHAR('menu_t1'), MULTI_CHAR('menut101'), + MULTI_CHAR('menu_t01'), MULTI_CHAR('menu_t71'), MULTI_CHAR('menu_t3'), MULTI_CHAR('menu_t81'), MULTI_CHAR('menu_t4'), }; #endif #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) static u64 const txTVhide[] = { - 'fmenu_6n', 'fmenu_9n', 'fmenu_10', 'fmenu_7n', 'fmenu_8n', + MULTI_CHAR('fmenu_6n'), MULTI_CHAR('fmenu_9n'), MULTI_CHAR('fmenu_10'), MULTI_CHAR('fmenu_7n'), MULTI_CHAR('fmenu_8n'), }; #else static u64 const txTVhide[] = { - 'menu_6n', 'menu_9n', 'menu_10n', 'menu_7n', 'menu_8n', + MULTI_CHAR('menu_6n'), MULTI_CHAR('menu_9n'), MULTI_CHAR('menu_10n'), MULTI_CHAR('menu_7n'), MULTI_CHAR('menu_8n'), }; #endif @@ -61,16 +61,16 @@ void dBrightCheck_c::screenSet() { JUT_ASSERT(0, mBrightCheck.Scr != NULL); mBrightCheck.Scr->setPriority("zelda_option_check.blo", 0x1100000, mArchive); - mBrightCheck.Scr->search('g_abtn_n')->hide(); + mBrightCheck.Scr->search(MULTI_CHAR('g_abtn_n'))->hide(); #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) - J2DTextBox* settings_text = (J2DTextBox*)mBrightCheck.Scr->search('t_t00'); - mBrightCheck.Scr->search('t_t00')->show(); - mBrightCheck.Scr->search('f_t00')->hide(); + J2DTextBox* settings_text = (J2DTextBox*)mBrightCheck.Scr->search(MULTI_CHAR('t_t00')); + mBrightCheck.Scr->search(MULTI_CHAR('t_t00'))->show(); + mBrightCheck.Scr->search(MULTI_CHAR('f_t00'))->hide(); #else - J2DTextBox* settings_text = (J2DTextBox*)mBrightCheck.Scr->search('f_t00'); - mBrightCheck.Scr->search('f_t00')->show(); - mBrightCheck.Scr->search('t_t00')->hide(); + J2DTextBox* settings_text = (J2DTextBox*)mBrightCheck.Scr->search(MULTI_CHAR('f_t00')); + mBrightCheck.Scr->search(MULTI_CHAR('f_t00'))->show(); + mBrightCheck.Scr->search(MULTI_CHAR('t_t00'))->hide(); #endif settings_text->setFont(mDoExt_getRubyFont()); |