fix GC JPN dol splits / d_a_npc_prayer mostly done (#2488)

* jmessage cleanup pass

* more JMessage cleanup

* d_msg_class cleanup

* fix a bunch of gc jpn dol splits

* d_a_npc_prayer pretty much equivalent

1 files changed, 29 insertions, 0 deletions

diff --git a/src/d/d_bright_check.cpp b/src/d/d_bright_check.cpp
index 4a717958ae..aca8c8690c 100644
--- a/src/d/d_bright_check.cpp
+++ b/src/d/d_bright_check.cpp
@@ -60,23 +60,43 @@ void dBrightCheck_c::screenSet() {
         'font_a1', 'font_at2', 'font_at3', 'font_at4', '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',
+    };
+    #else
     static u64 const txTV[] = {
         'menu_t61', 'menu_t2',  'menu_t91', 'menu_t1',  'menut101',
         'menu_t01', 'menu_t71', 'menu_t3',  'menu_t81', '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',
+    };
+    #else
     static u64 const txTVhide[] = {
         'menu_6n', 'menu_9n', 'menu_10n', 'menu_7n', 'menu_8n',
     };
+    #endif
 
     mBrightCheck.Scr = new J2DScreen();
     JUT_ASSERT(0, mBrightCheck.Scr != 0);
     mBrightCheck.Scr->setPriority("zelda_option_check.blo", 0x1100000, mArchive);
 
     mBrightCheck.Scr->search('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();
+    #else
     J2DTextBox* settings_text = (J2DTextBox*)mBrightCheck.Scr->search('f_t00');
     mBrightCheck.Scr->search('f_t00')->show();
     mBrightCheck.Scr->search('t_t00')->hide();
+    #endif
 
     settings_text->setFont(mDoExt_getRubyFont());
     settings_text->setString(0x40, "");
@@ -84,8 +104,14 @@ void dBrightCheck_c::screenSet() {
 
     J2DTextBox* btna_text[5];
     for (int i = 0; i < 5; i++) {
+        #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
+        btna_text[i] = (J2DTextBox*)mBrightCheck.Scr->search(tv_btnA[i]);
+        mBrightCheck.Scr->search(ftv_btnA[i])->hide();
+        #else
         btna_text[i] = (J2DTextBox*)mBrightCheck.Scr->search(ftv_btnA[i]);
         mBrightCheck.Scr->search(tv_btnA[i])->hide();
+        #endif
+
         btna_text[i]->setFont(mDoExt_getMesgFont());
         btna_text[i]->setString(0x40, "");
         mBrightCheck.mMsgString->getString(0x564, btna_text[i], NULL, NULL, NULL, 0);  // "Complete"
@@ -98,7 +124,10 @@ void dBrightCheck_c::screenSet() {
     for (int i = 0; i < 10; i++) {
         J2DTextBox* check_text = (J2DTextBox*)mBrightCheck.Scr->search(txTV[i]);
         check_text->setFont(mDoExt_getMesgFont());
+
+        #if (VERSION != VERSION_GCN_JPN) && (VERSION != VERSION_WII_JPN)
         check_text->setCharSpace(0.0f);
+        #endif
 
         if (i < 2) {
             check_text->setString(0x100, "");