Link all oustanding US-matched TUs for JP (#2671)

1 files changed, 55 insertions, 0 deletions

diff --git a/src/d/d_menu_save.cpp b/src/d/d_menu_save.cpp
index cb9edffbcd..2d6b5a62aa 100644
--- a/src/d/d_menu_save.cpp
+++ b/src/d/d_menu_save.cpp
@@ -204,10 +204,15 @@ void dMenu_save_c::screenSet() {
     static u64 l_tagName10[2] = {'w_no_g', 'w_yes_g'};
     static u64 l_tagName11[2] = {'w_no_gr', 'w_yes_gr'};
     static u64 l_tagName12[3] = {'w_bk_l00', 'w_bk_l01', 'w_bk_l02'};
+#if VERSION == VERSION_GCN_JPN
+    static u64 l_tagName21[2] = {'w_tabi_s', 'w_tabi_x'};
+    static u64 l_tagName20[2] = {'w_er_msg', 'w_er_msR'};
+#else
     static u64 l_tagName21[2] = {'t_for', 't_for1'};
     static u64 l_tagName211[10] = {'tmoyou00', 'tmoyou01', 'tmoyou02', 'tmoyou03', 'tmoyou04',
                                 'tmoyou05', 'tmoyou06', 'tmoyou07', 'tmoyou08', 'tmoyou09'};
     static u64 l_tagName20[2] = {'er_for0', 'er_for1'};
+#endif
     static u64 l_tagName13[3] = {'w_dat_i0', 'w_dat_i1', 'w_dat_i2'};
     static u8 l_msgNum0[2] = {0x08, 0x07};
     static u8 l_msgNum[2] = {0x54, 0x55};
@@ -241,8 +246,13 @@ void dMenu_save_c::screenSet() {
     mpNoYes[1] = new CPaneMgr(mSaveSel.Scr, 'w_yes_n', 0, NULL);
 
     for (int i = 0; i < 2; i++) {
+#if VERSION == VERSION_GCN_JPN
+        mpNoYesTxt[i] = new CPaneMgr(mSaveSel.Scr, l_tagName000[i], 0, NULL);
+        mSaveSel.Scr->search(l_tagName000U[i])->hide();
+#else
         mpNoYesTxt[i] = new CPaneMgr(mSaveSel.Scr, l_tagName000U[i], 0, NULL);
         mSaveSel.Scr->search(l_tagName000[i])->hide();
+#endif
         ((J2DTextBox*)mpNoYesTxt[i]->getPanePtr())->setFont(mSaveSel.font[0]);
 
         char message[32];
@@ -255,8 +265,13 @@ void dMenu_save_c::screenSet() {
 
     mpBBtnIcon = new CPaneMgrAlpha(mSaveSel.Scr, 'w_nbbtn', 2, NULL);
     mpABtnIcon = new CPaneMgrAlpha(mSaveSel.Scr, 'w_nabtn', 2, NULL);
+#if VERSION == VERSION_GCN_JPN
+    mpBackTxt = new CPaneMgrAlpha(mSaveSel.Scr, 'w_modo', 2, NULL);
+    mpConfirmTxt = new CPaneMgrAlpha(mSaveSel.Scr, 'w_kete', 2, NULL);
+#else
     mpBackTxt = new CPaneMgrAlpha(mSaveSel.Scr, 'f_modo', 2, NULL);
     mpConfirmTxt = new CPaneMgrAlpha(mSaveSel.Scr, 'f_kete', 2, NULL);
+#endif
 
     mpBackTxt->setAlpha(0);
     mpConfirmTxt->setAlpha(0);
@@ -265,8 +280,13 @@ void dMenu_save_c::screenSet() {
 
     for (int i = 0; i < 2; i++) {
         J2DTextBox* tbox[2];
+#if VERSION == VERSION_GCN_JPN
+        tbox[i] = (J2DTextBox*)mSaveSel.Scr->search(l_tagName00[i]);
+        mSaveSel.Scr->search(l_tagName00U[i])->hide();
+#else
         tbox[i] = (J2DTextBox*)mSaveSel.Scr->search(l_tagName00U[i]);
         mSaveSel.Scr->search(l_tagName00[i])->hide();
+#endif
         tbox[i]->setFont(mSaveSel.font[0]);
 
         char message[32];
@@ -335,21 +355,32 @@ void dMenu_save_c::screenSet() {
         mpBookWaku[i]->setAlpha(0);
     }
 
+#if VERSION == VERSION_GCN_JPN
+    mSaveSel.Scr->search('t_for')->hide();
+    mSaveSel.Scr->search('t_for1')->hide();
+#else
     mSaveSel.Scr->search('w_tabi_s')->hide();
     mSaveSel.Scr->search('w_tabi_x')->hide();
 
     for (int i = 0; i < 10; i++) {
         mSaveSel.Scr->search(l_tagName211[i])->hide();
     }
+#endif
 
     for (int i = 0; i < 2; i++) {
         mpHeaderTxtPane[i] = new CPaneMgrAlpha(mSaveSel.Scr, l_tagName21[i], 0, NULL);
 
         ((J2DTextBox*)mpHeaderTxtPane[i]->getPanePtr())->setFont(mSaveSel.font[0]);
         ((J2DTextBox*)mpHeaderTxtPane[i]->getPanePtr())->setString(0x100, "");
+#if VERSION == VERSION_GCN_JPN
+        ((J2DTextBox*)mpHeaderTxtPane[i]->getPanePtr())->setFontSize(21.0f, 21.0f);
+        ((J2DTextBox*)mpHeaderTxtPane[i]->getPanePtr())->setLineSpace(22.0f);
+        ((J2DTextBox*)mpHeaderTxtPane[i]->getPanePtr())->setCharSpace(2.0f);
+#else
         ((J2DTextBox*)mpHeaderTxtPane[i]->getPanePtr())->setFontSize(19.0f, 19.0f);
         ((J2DTextBox*)mpHeaderTxtPane[i]->getPanePtr())->setLineSpace(20.0f);
         ((J2DTextBox*)mpHeaderTxtPane[i]->getPanePtr())->setCharSpace(0.0f);
+#endif
         mpHeaderTxt[i] = ((J2DTextBox*)mpHeaderTxtPane[i]->getPanePtr())->getStringPtr();
     }
 
@@ -358,18 +389,33 @@ void dMenu_save_c::screenSet() {
     mHeaderTxtType = 0;
 
     field_0xb4 = mSaveSel.Scr->search('w_er_n');
+#if VERSION == VERSION_GCN_JPN
+    mSaveSel.Scr->search('er_for0')->hide();
+    mSaveSel.Scr->search('er_for1')->hide();
+#else
     mSaveSel.Scr->search('w_er_msg')->hide();
     mSaveSel.Scr->search('w_er_msR')->hide();
+#endif
 
     for (int i = 0; i < 2; i++) {
+#if VERSION == VERSION_GCN_JPN
         mpErrTxtPane[i] = new CPaneMgrAlpha(mSaveSel.Scr, l_tagName20[i], 0, NULL);
+#else
+        mpErrTxtPane[i] = new CPaneMgrAlpha(mSaveSel.Scr, l_tagName20[i], 0, NULL);
+#endif
 
         ((J2DTextBox*)mpErrTxtPane[i]->getPanePtr())->setFont(mSaveSel.font[0]);
         ((J2DTextBox*)mpErrTxtPane[i]->getPanePtr())->setString(0x200, "");
+#if VERSION == VERSION_GCN_JPN
+        ((J2DTextBox*)mpErrTxtPane[i]->getPanePtr())->setFontSize(21.0f, 21.0f);
+        ((J2DTextBox*)mpErrTxtPane[i]->getPanePtr())->setLineSpace(22.0f);
+        ((J2DTextBox*)mpErrTxtPane[i]->getPanePtr())->setCharSpace(2.0f);
+#else
         ((J2DTextBox*)mpErrTxtPane[i]->getPanePtr())->resize(440.0f, 198.0f);
         ((J2DTextBox*)mpErrTxtPane[i]->getPanePtr())->setFontSize(21.0f, 21.0f);
         ((J2DTextBox*)mpErrTxtPane[i]->getPanePtr())->setLineSpace(21.0f);
         ((J2DTextBox*)mpErrTxtPane[i]->getPanePtr())->setCharSpace(1.0f);
+#endif
         mpErrTxt[i] = ((J2DTextBox*)mpErrTxtPane[i]->getPanePtr())->getStringPtr();
         mpErrTxtPane[i]->show();
     }
@@ -2411,12 +2457,21 @@ bool dMenu_save_c::selectDataBaseMoveAnm() {
         mpSelectMoveBase->getPanePtr()->animationTransform();
         return false;
     } else {
+#if VERSION == VERSION_GCN_JPN
+        if (mDataBaseMoveAnmFrame == 33) {
+            field_0x64 = 1;
+        } else {
+            field_0x64 = 0;
+        }
+        field_0x65 = 0;
+#else
         if (mDataBaseMoveAnmFrame == 33) {
             field_0x64 = 1;
             field_0x65 = 0;
         } else {
             field_0x64 = 0;
         }
+#endif
 
         mpSelectMoveBase->getPanePtr()->setAnimation((J2DAnmTransformKey*)NULL);
         return true;