diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 0fc05a8..91f6808 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index 2032a18..e77e65c 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 69a41bb..1652563 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h index ba8f0de..c66ff4e 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -403,7 +403,7 @@ private: System::Windows::Forms::Label^ labNormalRomOffset; private: System::Windows::Forms::TextBox^ tboxNormalRomOffset; private: System::Windows::Forms::CheckBox^ cboxIsSubBanner; private: System::Windows::Forms::Label^ labKeyTableRomOffset; -private: System::Windows::Forms::CheckBox^ cboxIsWL; + private: System::Windows::Forms::TextBox^ tboxPrivateSize; private: System::Windows::Forms::Label^ labPrivateSize; private: System::Windows::Forms::TextBox^ tboxKeyTableRomOffset; @@ -484,8 +484,8 @@ private: System::Windows::Forms::GroupBox^ gboxExFlags; -private: System::Windows::Forms::GroupBox^ gboxEULA; -private: System::Windows::Forms::GroupBox^ gboxIcon; + + private: System::Windows::Forms::GroupBox^ gboxParental; private: System::Windows::Forms::TextBox^ tboxGuideRomInfo; private: System::Windows::Forms::TextBox^ tboxGuideTWLInfo; @@ -563,12 +563,12 @@ private: System::Windows::Forms::TextBox^ tboxAppType; private: System::Windows::Forms::TextBox^ tboxMedia; private: System::Windows::Forms::Label^ labProductNameLimit; private: System::Windows::Forms::Label^ labProductNameLimitForeign; -private: System::Windows::Forms::RadioButton^ rIsWiFiIcon; -private: System::Windows::Forms::RadioButton^ rIsWirelessIcon; -private: System::Windows::Forms::RadioButton^ rIsNoIcon; + + + @@ -607,6 +607,17 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnName; private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnBegin; private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnEnd; private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnCause; +private: System::Windows::Forms::GroupBox^ gboxLaunch; +private: System::Windows::Forms::Label^ labConnectIcon; +private: System::Windows::Forms::TextBox^ tboxConnectIcon; +private: System::Windows::Forms::Label^ labIsGameCardOn2; + + + + + + + @@ -951,19 +962,19 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnCause; this->labHex3 = (gcnew System::Windows::Forms::Label()); this->tboxIsCodec = (gcnew System::Windows::Forms::TextBox()); this->labIsCodec = (gcnew System::Windows::Forms::Label()); + this->tboxPrivateSize = (gcnew System::Windows::Forms::TextBox()); + this->labPrivateSize = (gcnew System::Windows::Forms::Label()); this->labNormalRomOffset = (gcnew System::Windows::Forms::Label()); this->tboxNormalRomOffset = (gcnew System::Windows::Forms::TextBox()); this->labKeyTableRomOffset = (gcnew System::Windows::Forms::Label()); - this->tboxPrivateSize = (gcnew System::Windows::Forms::TextBox()); - this->labPrivateSize = (gcnew System::Windows::Forms::Label()); - this->tboxKeyTableRomOffset = (gcnew System::Windows::Forms::TextBox()); this->labPublicSize = (gcnew System::Windows::Forms::Label()); this->tboxPublicSize = (gcnew System::Windows::Forms::TextBox()); + this->tboxKeyTableRomOffset = (gcnew System::Windows::Forms::TextBox()); this->cboxIsSubBanner = (gcnew System::Windows::Forms::CheckBox()); - this->cboxIsWL = (gcnew System::Windows::Forms::CheckBox()); this->cboxIsNormalJump = (gcnew System::Windows::Forms::CheckBox()); this->cboxIsTmpJump = (gcnew System::Windows::Forms::CheckBox()); this->gboxAccess = (gcnew System::Windows::Forms::GroupBox()); + this->labIsGameCardOn2 = (gcnew System::Windows::Forms::Label()); this->labAccessOther = (gcnew System::Windows::Forms::Label()); this->tboxAccessOther = (gcnew System::Windows::Forms::TextBox()); this->tboxIsGameCardOn = (gcnew System::Windows::Forms::TextBox()); @@ -1007,6 +1018,9 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnCause; this->colLibName = (gcnew System::Windows::Forms::DataGridViewTextBoxColumn()); this->tboxGuideRomInfo = (gcnew System::Windows::Forms::TextBox()); this->tabTWLInfo = (gcnew System::Windows::Forms::TabPage()); + this->gboxLaunch = (gcnew System::Windows::Forms::GroupBox()); + this->labConnectIcon = (gcnew System::Windows::Forms::Label()); + this->tboxConnectIcon = (gcnew System::Windows::Forms::TextBox()); this->tboxGuideTWLInfo = (gcnew System::Windows::Forms::TextBox()); this->gboxExFlags = (gcnew System::Windows::Forms::GroupBox()); this->tabRomEditInfo = (gcnew System::Windows::Forms::TabPage()); @@ -1016,11 +1030,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnCause; this->butSetBack = (gcnew System::Windows::Forms::Button()); this->tboxGuideRomEditInfo = (gcnew System::Windows::Forms::TextBox()); this->gboxParental = (gcnew System::Windows::Forms::GroupBox()); - this->gboxIcon = (gcnew System::Windows::Forms::GroupBox()); - this->rIsNoIcon = (gcnew System::Windows::Forms::RadioButton()); - this->rIsWiFiIcon = (gcnew System::Windows::Forms::RadioButton()); - this->rIsWirelessIcon = (gcnew System::Windows::Forms::RadioButton()); - this->gboxEULA = (gcnew System::Windows::Forms::GroupBox()); this->tabSubmitInfo = (gcnew System::Windows::Forms::TabPage()); this->labProductNameLimit = (gcnew System::Windows::Forms::Label()); this->tboxGuideSubmitInfo = (gcnew System::Windows::Forms::TextBox()); @@ -1065,12 +1074,11 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnCause; this->tabRomInfo->SuspendLayout(); (cli::safe_cast(this->gridLibrary))->BeginInit(); this->tabTWLInfo->SuspendLayout(); + this->gboxLaunch->SuspendLayout(); this->gboxExFlags->SuspendLayout(); this->tabRomEditInfo->SuspendLayout(); this->gboxOtherSpec->SuspendLayout(); this->gboxParental->SuspendLayout(); - this->gboxIcon->SuspendLayout(); - this->gboxEULA->SuspendLayout(); this->tabSubmitInfo->SuspendLayout(); this->gboxForeign->SuspendLayout(); this->tabCompanyInfo->SuspendLayout(); @@ -1950,14 +1958,14 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnCause; this->gboxTWLExInfo->Controls->Add(this->labHex3); this->gboxTWLExInfo->Controls->Add(this->tboxIsCodec); this->gboxTWLExInfo->Controls->Add(this->labIsCodec); + this->gboxTWLExInfo->Controls->Add(this->tboxPrivateSize); + this->gboxTWLExInfo->Controls->Add(this->labPrivateSize); this->gboxTWLExInfo->Controls->Add(this->labNormalRomOffset); this->gboxTWLExInfo->Controls->Add(this->tboxNormalRomOffset); this->gboxTWLExInfo->Controls->Add(this->labKeyTableRomOffset); - this->gboxTWLExInfo->Controls->Add(this->tboxPrivateSize); - this->gboxTWLExInfo->Controls->Add(this->labPrivateSize); - this->gboxTWLExInfo->Controls->Add(this->tboxKeyTableRomOffset); this->gboxTWLExInfo->Controls->Add(this->labPublicSize); this->gboxTWLExInfo->Controls->Add(this->tboxPublicSize); + this->gboxTWLExInfo->Controls->Add(this->tboxKeyTableRomOffset); resources->ApplyResources(this->gboxTWLExInfo, L"gboxTWLExInfo"); this->gboxTWLExInfo->Name = L"gboxTWLExInfo"; this->gboxTWLExInfo->TabStop = false; @@ -1988,6 +1996,17 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnCause; resources->ApplyResources(this->labIsCodec, L"labIsCodec"); this->labIsCodec->Name = L"labIsCodec"; // + // tboxPrivateSize + // + resources->ApplyResources(this->tboxPrivateSize, L"tboxPrivateSize"); + this->tboxPrivateSize->Name = L"tboxPrivateSize"; + this->tboxPrivateSize->ReadOnly = true; + // + // labPrivateSize + // + resources->ApplyResources(this->labPrivateSize, L"labPrivateSize"); + this->labPrivateSize->Name = L"labPrivateSize"; + // // labNormalRomOffset // resources->ApplyResources(this->labNormalRomOffset, L"labNormalRomOffset"); @@ -2004,23 +2023,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnCause; resources->ApplyResources(this->labKeyTableRomOffset, L"labKeyTableRomOffset"); this->labKeyTableRomOffset->Name = L"labKeyTableRomOffset"; // - // tboxPrivateSize - // - resources->ApplyResources(this->tboxPrivateSize, L"tboxPrivateSize"); - this->tboxPrivateSize->Name = L"tboxPrivateSize"; - this->tboxPrivateSize->ReadOnly = true; - // - // labPrivateSize - // - resources->ApplyResources(this->labPrivateSize, L"labPrivateSize"); - this->labPrivateSize->Name = L"labPrivateSize"; - // - // tboxKeyTableRomOffset - // - resources->ApplyResources(this->tboxKeyTableRomOffset, L"tboxKeyTableRomOffset"); - this->tboxKeyTableRomOffset->Name = L"tboxKeyTableRomOffset"; - this->tboxKeyTableRomOffset->ReadOnly = true; - // // labPublicSize // resources->ApplyResources(this->labPublicSize, L"labPublicSize"); @@ -2032,18 +2034,18 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnCause; this->tboxPublicSize->Name = L"tboxPublicSize"; this->tboxPublicSize->ReadOnly = true; // + // tboxKeyTableRomOffset + // + resources->ApplyResources(this->tboxKeyTableRomOffset, L"tboxKeyTableRomOffset"); + this->tboxKeyTableRomOffset->Name = L"tboxKeyTableRomOffset"; + this->tboxKeyTableRomOffset->ReadOnly = true; + // // cboxIsSubBanner // resources->ApplyResources(this->cboxIsSubBanner, L"cboxIsSubBanner"); this->cboxIsSubBanner->Name = L"cboxIsSubBanner"; this->cboxIsSubBanner->UseVisualStyleBackColor = true; // - // cboxIsWL - // - resources->ApplyResources(this->cboxIsWL, L"cboxIsWL"); - this->cboxIsWL->Name = L"cboxIsWL"; - this->cboxIsWL->UseVisualStyleBackColor = true; - // // cboxIsNormalJump // resources->ApplyResources(this->cboxIsNormalJump, L"cboxIsNormalJump"); @@ -2058,6 +2060,7 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnCause; // // gboxAccess // + this->gboxAccess->Controls->Add(this->labIsGameCardOn2); this->gboxAccess->Controls->Add(this->labAccessOther); this->gboxAccess->Controls->Add(this->tboxAccessOther); this->gboxAccess->Controls->Add(this->tboxIsGameCardOn); @@ -2068,6 +2071,11 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnCause; this->gboxAccess->Name = L"gboxAccess"; this->gboxAccess->TabStop = false; // + // labIsGameCardOn2 + // + resources->ApplyResources(this->labIsGameCardOn2, L"labIsGameCardOn2"); + this->labIsGameCardOn2->Name = L"labIsGameCardOn2"; + // // labAccessOther // resources->ApplyResources(this->labAccessOther, L"labAccessOther"); @@ -2365,6 +2373,7 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnCause; // // tabTWLInfo // + this->tabTWLInfo->Controls->Add(this->gboxLaunch); this->tabTWLInfo->Controls->Add(this->tboxGuideTWLInfo); this->tabTWLInfo->Controls->Add(this->gboxExFlags); this->tabTWLInfo->Controls->Add(this->gboxShared2Size); @@ -2375,6 +2384,26 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnCause; this->tabTWLInfo->Name = L"tabTWLInfo"; this->tabTWLInfo->UseVisualStyleBackColor = true; // + // gboxLaunch + // + this->gboxLaunch->Controls->Add(this->labConnectIcon); + this->gboxLaunch->Controls->Add(this->tboxConnectIcon); + this->gboxLaunch->Controls->Add(this->cboxIsEULA); + resources->ApplyResources(this->gboxLaunch, L"gboxLaunch"); + this->gboxLaunch->Name = L"gboxLaunch"; + this->gboxLaunch->TabStop = false; + // + // labConnectIcon + // + resources->ApplyResources(this->labConnectIcon, L"labConnectIcon"); + this->labConnectIcon->Name = L"labConnectIcon"; + // + // tboxConnectIcon + // + resources->ApplyResources(this->tboxConnectIcon, L"tboxConnectIcon"); + this->tboxConnectIcon->Name = L"tboxConnectIcon"; + this->tboxConnectIcon->ReadOnly = true; + // // tboxGuideTWLInfo // this->tboxGuideTWLInfo->BackColor = System::Drawing::SystemColors::Info; @@ -2386,7 +2415,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnCause; // this->gboxExFlags->Controls->Add(this->cboxIsNormalJump); this->gboxExFlags->Controls->Add(this->cboxIsTmpJump); - this->gboxExFlags->Controls->Add(this->cboxIsWL); this->gboxExFlags->Controls->Add(this->cboxIsSubBanner); resources->ApplyResources(this->gboxExFlags, L"gboxExFlags"); this->gboxExFlags->Name = L"gboxExFlags"; @@ -2398,8 +2426,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnCause; this->tabRomEditInfo->Controls->Add(this->butSetBack); this->tabRomEditInfo->Controls->Add(this->tboxGuideRomEditInfo); this->tabRomEditInfo->Controls->Add(this->gboxParental); - this->tabRomEditInfo->Controls->Add(this->gboxIcon); - this->tabRomEditInfo->Controls->Add(this->gboxEULA); resources->ApplyResources(this->tabRomEditInfo, L"tabRomEditInfo"); this->tabRomEditInfo->Name = L"tabRomEditInfo"; this->tabRomEditInfo->UseVisualStyleBackColor = true; @@ -2461,42 +2487,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnCause; this->gboxParental->Name = L"gboxParental"; this->gboxParental->TabStop = false; // - // gboxIcon - // - this->gboxIcon->Controls->Add(this->rIsNoIcon); - this->gboxIcon->Controls->Add(this->rIsWiFiIcon); - this->gboxIcon->Controls->Add(this->rIsWirelessIcon); - resources->ApplyResources(this->gboxIcon, L"gboxIcon"); - this->gboxIcon->Name = L"gboxIcon"; - this->gboxIcon->TabStop = false; - // - // rIsNoIcon - // - resources->ApplyResources(this->rIsNoIcon, L"rIsNoIcon"); - this->rIsNoIcon->Checked = true; - this->rIsNoIcon->Name = L"rIsNoIcon"; - this->rIsNoIcon->TabStop = true; - this->rIsNoIcon->UseVisualStyleBackColor = true; - // - // rIsWiFiIcon - // - resources->ApplyResources(this->rIsWiFiIcon, L"rIsWiFiIcon"); - this->rIsWiFiIcon->Name = L"rIsWiFiIcon"; - this->rIsWiFiIcon->UseVisualStyleBackColor = true; - // - // rIsWirelessIcon - // - resources->ApplyResources(this->rIsWirelessIcon, L"rIsWirelessIcon"); - this->rIsWirelessIcon->Name = L"rIsWirelessIcon"; - this->rIsWirelessIcon->UseVisualStyleBackColor = true; - // - // gboxEULA - // - this->gboxEULA->Controls->Add(this->cboxIsEULA); - resources->ApplyResources(this->gboxEULA, L"gboxEULA"); - this->gboxEULA->Name = L"gboxEULA"; - this->gboxEULA->TabStop = false; - // // tabSubmitInfo // this->tabSubmitInfo->Controls->Add(this->labProductNameLimit); @@ -2790,6 +2780,8 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnCause; (cli::safe_cast(this->gridLibrary))->EndInit(); this->tabTWLInfo->ResumeLayout(false); this->tabTWLInfo->PerformLayout(); + this->gboxLaunch->ResumeLayout(false); + this->gboxLaunch->PerformLayout(); this->gboxExFlags->ResumeLayout(false); this->gboxExFlags->PerformLayout(); this->tabRomEditInfo->ResumeLayout(false); @@ -2798,10 +2790,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnCause; this->gboxOtherSpec->PerformLayout(); this->gboxParental->ResumeLayout(false); this->gboxParental->PerformLayout(); - this->gboxIcon->ResumeLayout(false); - this->gboxIcon->PerformLayout(); - this->gboxEULA->ResumeLayout(false); - this->gboxEULA->PerformLayout(); this->tabSubmitInfo->ResumeLayout(false); this->tabSubmitInfo->PerformLayout(); this->gboxForeign->ResumeLayout(false); @@ -2916,9 +2904,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnCause; void readOnly( void ) { this->cboxIsEULA->Enabled = false; - this->rIsWirelessIcon->Enabled = false; - this->rIsWiFiIcon->Enabled = false; - this->rIsNoIcon->Enabled = false; this->cboxIsUGC->Enabled = false; this->cboxIsPhotoEx->Enabled = false; @@ -2974,8 +2959,8 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnCause; // SRLのROM情報をフォームに反映させる(ファイルが読み込まれていることが前提) void setSrlForms(void); - // SRLの特殊な設定をフォームにセットする(言語切り替えで表示を変えたいので独立させる) - void setSrlFormsCaptionEx(); + // ROM情報のうちテキストボックスを更新する(言語切り替えで表示を変えたいので独立させる) + void setSrlFormsTextBox(); // フォームの入力をチェックする System::Boolean checkSrlForms(void); @@ -3623,25 +3608,14 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colWarnCause; return; // 編集可能情報を読み込み時の設定に戻す - this->cboxIsEULA->Checked = this->hSrl->IsEULA; - if( ( this->hSrl->IsWiFiIcon && this->hSrl->IsWirelessIcon) || - (!this->hSrl->IsWiFiIcon && !this->hSrl->IsWirelessIcon) ) - { - this->rIsNoIcon->Checked = true; - } - else if( this->hSrl->IsWiFiIcon && !this->hSrl->IsWirelessIcon ) - { - this->rIsWiFiIcon->Checked = true; - } - else - { - this->rIsWirelessIcon->Checked = true; - } this->setRegionForms(); this->setParentalForms(); this->loadOtherForms(); // SRLに登録されていないROM仕様のフォームも戻す } + + + }; // enf of ref class Form1 } // end of namespace MasterEditorTWL diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx index efa1709..b720b51 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx @@ -341,10 +341,10 @@ 繝ｪ繝ｼ繧ｸ繝ｧ繝ｳ - 157, 16 + 213, 16 - EULA縺ｸ縺ｮ蜷梧э繧貞ｿ隕√→縺吶ｋ + EULA(蛻ｩ逕ｨ隕冗ｴ)縺ｸ縺ｮ蜷梧э繧貞ｿ隕√→縺吶ｋ 譌･譛ｬ縺ｮ縺ｿ @@ -589,12 +589,6 @@ 繧ｵ繝悶ヰ繝翫ｼ繝輔ぃ繧､繝ｫ譛牙柑 - - 155, 16 - - - NTR繝帙Ρ繧､繝医Μ繧ｹ繝育ｽｲ蜷肴怏蜉ｹ - 121, 16 @@ -607,6 +601,12 @@ tmp繧ｸ繝｣繝ｳ繝苓ｨｱ蜿ｯ + + 98, 12 + + + (NAND繧｢繝励Μ縺九ｉ縺ｮ) + 36, 12 @@ -614,10 +614,10 @@ 縺昴ｮ莉 - 87, 12 + 99, 12 - 繧ｲ繝ｼ繝繧ｫ繝ｼ繝蛾崕貅 + 繧ｲ繝ｼ繝繧ｫ繝ｼ繝峨い繧ｯ繧ｻ繧ｹ 121, 16 @@ -706,6 +706,12 @@ ROM蝓ｺ譛ｬ諠蝣ｱ(遒ｺ隱咲畑) + + 173, 12 + + + DSi繝｡繝九Η繝ｼ荳翫〒縺ｮ騾壻ｿ｡繧｢繧､繧ｳ繝ｳ陦ｨ遉ｺ + 縺薙ｮ繧ｿ繝悶ｮ諠蝣ｱ縺ｯ邱ｨ髮荳榊庄縺ｧ縺吶ゅョ繝ｼ繧ｿ縺ｫ隱､繧翫′縺ゅｋ蝣ｴ蜷医↓縺ｯROM繝繝ｼ繧ｿ縺ｮ菴懈先凾縺ｮ險ｭ螳壹ｒ隕狗峩縺励※縺上□縺輔＞縲 @@ -739,30 +745,6 @@ 繝ｪ繝ｼ繧ｸ繝ｧ繝ｳ縺ｨ繝ｬ繝ｼ繝繧｣繝ｳ繧ｰ諠蝣ｱ - - 144, 16 - - - 騾壻ｿ｡繧｢繧､繧ｳ繝ｳ繧定｡ｨ遉ｺ縺励↑縺 - - - 134, 16 - - - Wi-Fi騾壻ｿ｡繧｢繧､繧ｳ繝ｳ陦ｨ遉ｺ - - - 167, 16 - - - DS繝ｯ繧､繝､繝ｬ繧ｹ騾壻ｿ｡繧｢繧､繧ｳ繝ｳ陦ｨ遉ｺ - - - 繝｡繝九Η繝ｼ荳翫〒縺ｮ騾壻ｿ｡繧｢繧､繧ｳ繝ｳ陦ｨ遉ｺ - - - EULA(蛻ｩ逕ｨ隕冗ｴ) - ROM逋ｻ骭ｲ諠蝣ｱ(邱ｨ髮蜿ｯ) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX index d3020c5..6b25eaf 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX @@ -1362,8 +1362,11 @@ True + + False + - 8, 20 + 8, 23 155, 16 @@ -1381,10 +1384,10 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - gboxEULA + gboxLaunch - 0 + 2 Japan Only @@ -3370,7 +3373,7 @@ True - 7, 180 + 13, 169 34, 12 @@ -3397,7 +3400,7 @@ True - 6, 155 + 12, 144 34, 12 @@ -3424,7 +3427,7 @@ True - 7, 130 + 13, 119 34, 12 @@ -3451,7 +3454,7 @@ True - 7, 105 + 13, 94 34, 12 @@ -3478,7 +3481,7 @@ True - 7, 80 + 13, 69 34, 12 @@ -3505,7 +3508,7 @@ True - 7, 55 + 13, 44 34, 12 @@ -3529,7 +3532,7 @@ 5 - 46, 177 + 52, 166 90, 19 @@ -3553,7 +3556,7 @@ 6 - 47, 152 + 53, 141 89, 19 @@ -3577,7 +3580,7 @@ 7 - 47, 127 + 53, 116 89, 19 @@ -3601,7 +3604,7 @@ 8 - 47, 102 + 53, 91 89, 19 @@ -3625,7 +3628,7 @@ 9 - 47, 77 + 53, 66 89, 19 @@ -3649,7 +3652,7 @@ 10 - 47, 52 + 53, 41 89, 19 @@ -3679,7 +3682,7 @@ False - 8, 25 + 14, 19 118, 16 @@ -3703,10 +3706,10 @@ 12 - 547, 54 + 545, 147 - 164, 220 + 181, 197 1 @@ -3724,7 +3727,7 @@ tabTWLInfo - 2 + 3 True @@ -3838,7 +3841,7 @@ True - 261, 46 + 257, 98 11, 12 @@ -3865,7 +3868,7 @@ True - 261, 21 + 257, 123 11, 12 @@ -3889,10 +3892,10 @@ 2 - 172, 118 + 179, 69 - 87, 19 + 75, 19 28 @@ -3916,7 +3919,7 @@ True - 55, 121 + 62, 72 75, 12 @@ -3939,89 +3942,11 @@ 4 - - True - - - 7, 21 - - - 160, 12 - - - 9 - - - TWL Normal Area ROM Offset - - - labNormalRomOffset - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxTWLExInfo - - - 5 - - - 172, 18 - - - 87, 19 - - - 8 - - - Right - - - tboxNormalRomOffset - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxTWLExInfo - - - 6 - - - True - - - 7, 46 - - - 159, 12 - - - 11 - - - TWL Secure Area ROM Offset - - - labKeyTableRomOffset - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxTWLExInfo - - - 7 - - 172, 93 + 179, 44 - 87, 19 + 75, 19 13 @@ -4039,13 +3964,16 @@ gboxTWLExInfo - 8 + 5 True + + NoControl + - 31, 96 + 38, 47 123, 12 @@ -4066,37 +3994,94 @@ gboxTWLExInfo + 6 + + + True + + + 7, 123 + + + 160, 12 + + 9 - - 172, 43 + + TWL Normal Area ROM Offset - - 87, 19 + + labNormalRomOffset - - 10 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Right - - - tboxKeyTableRomOffset - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + gboxTWLExInfo - - 10 + + 7 + + + 179, 120 + + + 75, 19 + + + 8 + + + Right + + + tboxNormalRomOffset + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 8 + + + True + + + 7, 98 + + + 159, 12 + + + 11 + + + TWL Secure Area ROM Offset + + + labKeyTableRomOffset + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 9 True + + NoControl + - 31, 71 + 38, 22 118, 12 @@ -4117,13 +4102,13 @@ gboxTWLExInfo - 11 + 10 - 172, 68 + 179, 19 - 87, 19 + 75, 19 12 @@ -4141,19 +4126,43 @@ gboxTWLExInfo + 11 + + + 179, 95 + + + 75, 19 + + + 10 + + + Right + + + tboxKeyTableRomOffset + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + 12 - 231, 54 + 251, 54 - 300, 146 + 280, 146 24 - TWL Extended Info. + TWL Extended Info gboxTWLExInfo @@ -4165,7 +4174,7 @@ tabTWLInfo - 3 + 4 True @@ -4174,7 +4183,7 @@ False - 14, 62 + 14, 18 140, 16 @@ -4195,36 +4204,6 @@ gboxExFlags - 3 - - - True - - - False - - - 14, 84 - - - 188, 16 - - - 25 - - - Enable NTR WhiteList Signature - - - cboxIsWL - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxExFlags - - 2 @@ -4234,7 +4213,7 @@ False - 14, 18 + 14, 62 154, 16 @@ -4287,11 +4266,44 @@ 1 + + True + + + MiddleRight + + + NoControl + + + 5, 73 + + + 127, 12 + + + 6 + + + (For NAND Application) + + + labIsGameCardOn2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 0 + True - 139, 20 + 145, 21 39, 12 @@ -4312,16 +4324,16 @@ gboxAccess - 0 + 1 - 141, 36 + 147, 36 True - 142, 85 + 123, 85 4 @@ -4336,10 +4348,10 @@ gboxAccess - 1 + 2 - 8, 102 + 6, 102 122, 19 @@ -4360,22 +4372,22 @@ gboxAccess - 2 + 3 True - 7, 87 + 6, 87 - 64, 12 + 104, 12 2 - Card Power + Game Card Access labIsGameCardOn @@ -4387,7 +4399,7 @@ gboxAccess - 3 + 4 True @@ -4417,7 +4429,7 @@ gboxAccess - 4 + 5 True @@ -4447,13 +4459,13 @@ gboxAccess - 5 + 6 - 231, 211 + 251, 211 - 300, 133 + 280, 133 0 @@ -4471,22 +4483,22 @@ tabTWLInfo - 4 + 5 True - 21, 98 + 12, 98 - 56, 12 + 91, 12 11 - App. Type + Application Type labAppType @@ -4504,7 +4516,7 @@ True - 39, 73 + 40, 73 35, 12 @@ -4528,7 +4540,7 @@ 1 - 83, 95 + 113, 95 71, 19 @@ -4552,7 +4564,7 @@ 2 - 83, 70 + 113, 70 71, 19 @@ -4579,7 +4591,7 @@ True - 157, 48 + 189, 50 11, 12 @@ -4603,7 +4615,7 @@ 4 - 83, 20 + 113, 21 71, 19 @@ -4630,7 +4642,7 @@ True - 11, 23 + 24, 24 63, 12 @@ -4657,7 +4669,7 @@ True - 11, 48 + 24, 48 66, 12 @@ -4681,7 +4693,7 @@ 7 - 83, 45 + 113, 45 71, 19 @@ -4711,7 +4723,7 @@ True - 170, 34 + 186, 34 4 @@ -4735,13 +4747,13 @@ 12, 122 - 58, 12 + 56, 12 5 - Other Info. + Other Info labAppTypeOther @@ -4759,7 +4771,7 @@ 12, 54 - 198, 174 + 225, 174 23 @@ -4777,7 +4789,7 @@ tabTWLInfo - 5 + 6 True @@ -5046,6 +5058,78 @@ 0 + + True + + + 6, 50 + + + 200, 12 + + + 2 + + + Display Connection Icon On DSi Menu + + + labConnectIcon + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxLaunch + + + 0 + + + 6, 65 + + + 192, 19 + + + 1 + + + tboxConnectIcon + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxLaunch + + + 1 + + + 12, 238 + + + 225, 106 + + + 37 + + + Launch Control On DSi Menu + + + gboxLaunch + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 0 + 24, 11 @@ -5068,13 +5152,13 @@ tabTWLInfo - 0 + 1 - 12, 236 + 545, 54 - 198, 108 + 181, 85 35 @@ -5092,7 +5176,7 @@ tabTWLInfo - 1 + 2 4, 21 @@ -5125,7 +5209,7 @@ True - 8, 18 + 15, 25 229, 16 @@ -5152,7 +5236,7 @@ True - 8, 46 + 15, 56 149, 16 @@ -5176,10 +5260,10 @@ 1 - 19, 225 + 445, 60 - 266, 70 + 266, 90 41 @@ -5200,7 +5284,7 @@ 0 - 51, 309 + 483, 185 185, 23 @@ -5209,7 +5293,7 @@ 38 - Set Back To Reading Settings + Set Back To Initial Settings butSetBack @@ -5251,7 +5335,7 @@ 2 - 313, 60 + 24, 60 398, 272 @@ -5274,135 +5358,6 @@ 3 - - True - - - 8, 25 - - - 104, 16 - - - 4 - - - Display No Icon - - - rIsNoIcon - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxIcon - - - 0 - - - True - - - 8, 77 - - - 209, 16 - - - 6 - - - Display an Icon of Wi-Fi Connection - - - rIsWiFiIcon - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxIcon - - - 1 - - - True - - - 8, 51 - - - 182, 16 - - - 5 - - - Display an Icon of DS Wireless - - - rIsWirelessIcon - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxIcon - - - 2 - - - 19, 114 - - - 266, 105 - - - 32 - - - Icons on the Menu - - - gboxIcon - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRomEditInfo - - - 4 - - - 19, 60 - - - 266, 48 - - - 31 - - - EULA - - - gboxEULA - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRomEditInfo - - - 5 - 4, 21 diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp index 687519f..2c4632c 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp @@ -39,13 +39,6 @@ void Form1::changeJapanese(void) this->changeMaxLength( this->tboxPerson1, 15 ); this->changeLanguage( "ja" ); - - // 特殊な設定用のテキストボックスの表記を変更 - this->setSrlFormsCaptionEx(); - - // 複数行表示の改行を挿入 - this->tboxGuideRomEditInfo->Text = this->tboxGuideRomEditInfo->Text->Replace( "", "\r\n" ); - this->tboxGuideErrorInfo->Text = this->tboxGuideErrorInfo->Text->Replace( "", "\r\n" ); } // 英語版への切り替え @@ -56,11 +49,6 @@ void Form1::changeEnglish(void) this->changeMaxLength( this->tboxPerson1, 30 ); this->changeLanguage( "en" ); - - this->setSrlFormsCaptionEx(); - - this->tboxGuideRomEditInfo->Text = this->tboxGuideRomEditInfo->Text->Replace( "", "\r\n" ); - this->tboxGuideErrorInfo->Text = this->tboxGuideErrorInfo->Text->Replace( "", "\r\n" ); } // 言語リソース切り替え @@ -298,7 +286,6 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname ) resources->ApplyResources(this->labPublicSize, L"labPublicSize"); resources->ApplyResources(this->tboxPublicSize, L"tboxPublicSize"); resources->ApplyResources(this->cboxIsSubBanner, L"cboxIsSubBanner"); - resources->ApplyResources(this->cboxIsWL, L"cboxIsWL"); resources->ApplyResources(this->cboxIsNormalJump, L"cboxIsNormalJump"); resources->ApplyResources(this->cboxIsTmpJump, L"cboxIsTmpJump"); resources->ApplyResources(this->gboxAccess, L"gboxAccess"); @@ -306,6 +293,7 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname ) resources->ApplyResources(this->tboxAccessOther, L"tboxAccessOther"); resources->ApplyResources(this->tboxIsGameCardOn, L"tboxIsGameCardOn"); resources->ApplyResources(this->labIsGameCardOn, L"labIsGameCardOn"); + resources->ApplyResources(this->labIsGameCardOn2, L"labIsGameCardOn2"); resources->ApplyResources(this->cboxIsNAND, L"cboxIsNAND"); resources->ApplyResources(this->cboxIsSD, L"cboxIsSD"); resources->ApplyResources(this->gboxTitleID, L"gboxTitleID"); @@ -345,6 +333,8 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname ) resources->ApplyResources(this->colLibName, L"colLibName"); resources->ApplyResources(this->tboxGuideRomInfo, L"tboxGuideRomInfo"); resources->ApplyResources(this->tabTWLInfo, L"tabTWLInfo"); + resources->ApplyResources(this->gboxLaunch, L"gboxLaunch"); + resources->ApplyResources(this->labConnectIcon, L"labConnectIcon"); resources->ApplyResources(this->tboxGuideTWLInfo, L"tboxGuideTWLInfo"); resources->ApplyResources(this->gboxExFlags, L"gboxExFlags"); resources->ApplyResources(this->tabRomEditInfo, L"tabRomEditInfo"); @@ -354,11 +344,6 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname ) resources->ApplyResources(this->butSetBack, L"butSetBack"); resources->ApplyResources(this->tboxGuideRomEditInfo, L"tboxGuideRomEditInfo"); resources->ApplyResources(this->gboxParental, L"gboxParental"); - resources->ApplyResources(this->gboxIcon, L"gboxIcon"); - resources->ApplyResources(this->rIsNoIcon, L"rIsNoIcon"); - resources->ApplyResources(this->rIsWiFiIcon, L"rIsWiFiIcon"); - resources->ApplyResources(this->rIsWirelessIcon, L"rIsWirelessIcon"); - resources->ApplyResources(this->gboxEULA, L"gboxEULA"); resources->ApplyResources(this->tabSubmitInfo, L"tabSubmitInfo"); resources->ApplyResources(this->labProductNameLimit, L"labProductNameLimit"); resources->ApplyResources(this->tboxGuideSubmitInfo, L"tboxGuideSubmitInfo"); @@ -387,6 +372,16 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname ) resources->ApplyResources(this->colWarnEnd, L"colWarnEnd"); resources->ApplyResources(this->colWarnCause, L"colWarnCause"); resources->ApplyResources(this, L"$this"); + + // テキストボックスの表記を変更 + if( !System::String::IsNullOrEmpty( this->tboxFile->Text ) ) + { + this->setSrlFormsTextBox(); + } + + // 複数行表示の改行を挿入 + this->tboxGuideRomEditInfo->Text = this->tboxGuideRomEditInfo->Text->Replace( "", "\r\n" ); + this->tboxGuideErrorInfo->Text = this->tboxGuideErrorInfo->Text->Replace( "", "\r\n" ); } // end of file \ No newline at end of file diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp index 89519df..d37e2f7 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp @@ -27,11 +27,6 @@ void Form1::setSrlProperties(void) { // ROMヘッダの[0,0x160)の領域はRead Onlyで変更しない - // TWL拡張領域のいくつかの情報をROMヘッダに反映させる - this->hSrl->IsEULA = this->cboxIsEULA->Checked; - this->hSrl->IsWiFiIcon = this->rIsWiFiIcon->Checked; - this->hSrl->IsWirelessIcon = this->rIsWirelessIcon->Checked; - // リージョン this->setRegionSrlPropaties(); @@ -79,7 +74,6 @@ void Form1::setSrlForms(void) this->cboxIsNormalJump->Checked = this->hSrl->IsNormalJump; this->cboxIsTmpJump->Checked = this->hSrl->IsTmpJump; this->cboxIsSubBanner->Checked = this->hSrl->IsSubBanner; - this->cboxIsWL->Checked = this->hSrl->IsWL; if( this->hSrl->IsCodecTWL == true ) { this->tboxIsCodec->Text = gcnew System::String( "TWL" ); @@ -174,8 +168,11 @@ void Form1::setSrlForms(void) } this->tboxAccessOther->Text = acc; + // 起動制限 + this->cboxIsEULA->Checked = this->hSrl->IsEULA; + // 特殊な設定をテキストボックスに反映 - this->setSrlFormsCaptionEx(); + this->setSrlFormsTextBox(); // SDKバージョンとライブラリ this->tboxSDK->Clear(); @@ -204,31 +201,54 @@ void Form1::setSrlForms(void) } // 編集可能情報 - this->cboxIsEULA->Checked = this->hSrl->IsEULA; - if( ( this->hSrl->IsWiFiIcon && this->hSrl->IsWirelessIcon) || - (!this->hSrl->IsWiFiIcon && !this->hSrl->IsWirelessIcon) ) + this->setRegionForms(); + this->setParentalForms(); // ペアレンタルコントロール関連 + + // ROMヘッダには関係ないが + // NANDアプリのときにバックアップメモリを自動的に「なし」にしておく + if( this->hSrl->IsMediaNand ) { - this->rIsNoIcon->Checked = true; - } - else if( this->hSrl->IsWiFiIcon && !this->hSrl->IsWirelessIcon ) - { - this->rIsWiFiIcon->Checked = true; + this->combBackup->SelectedIndex = this->combBackup->Items->Count - 2; + this->combBackup->Enabled = false; } else { - this->rIsWirelessIcon->Checked = true; + this->combBackup->Enabled = true; } - this->setRegionForms(); - this->setParentalForms(); // ペアレンタルコントロール関連 } // setSrlForms() // SRLの特殊な設定をフォームにセットする(言語切り替えで表示を変えたいので独立させる) -void Form1::setSrlFormsCaptionEx() +void Form1::setSrlFormsTextBox() { - if( System::String::IsNullOrEmpty( this->tboxFile->Text ) ) + if( !this->hSrl->IsWiFiIcon && !this->hSrl->IsWirelessIcon ) { - return; + if( this->isJapanese() ) + this->tboxConnectIcon->Text = "アイコンを表示しない"; + else + this->tboxConnectIcon->Text = "No Icon"; } + else if( this->hSrl->IsWiFiIcon && !this->hSrl->IsWirelessIcon ) + { + if( this->isJapanese() ) + this->tboxConnectIcon->Text = "Wi-Fiコネクションアイコン"; + else + this->tboxConnectIcon->Text = "Wi-Fi Connection Icon"; + } + else if( !this->hSrl->IsWiFiIcon && this->hSrl->IsWirelessIcon ) + { + if( this->isJapanese() ) + this->tboxConnectIcon->Text = "ワイヤレス通信アイコン"; + else + this->tboxConnectIcon->Text = "Wireless Icon"; + } + else + { + if( this->isJapanese() ) + this->tboxConnectIcon->Text = "不正な設定"; + else + this->tboxConnectIcon->Text = "Illegal Setting"; + } + System::String ^appother = gcnew System::String(""); if( !this->hSrl->IsLaunch ) { @@ -261,7 +281,7 @@ void Form1::setSrlFormsCaptionEx() else this->tboxCaptionEx->Text += gcnew System::String( "SDFC Register Accessible.\r\n" ); } -} // setSrlFormsCaptionEx() +} // setSrlFormsTextBox() // フォームの入力をチェックする System::Boolean Form1::checkSrlForms(void) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp index 5c7713d..b9fdc11 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp @@ -84,14 +84,6 @@ System::Void Form1::saveTmp( System::String ^filename ) MasterEditorTWL::appendXmlTag( doc, form, "Mail2", this->tboxMail2->Text ); MasterEditorTWL::appendXmlTag( doc, form, "NTSC2", this->tboxNTSC2->Text ); - if( this->rIsWirelessIcon->Checked ) - MasterEditorTWL::appendXmlTag( doc, form, "DisplayIcon", "Wireless" ); - else if( this->rIsWiFiIcon->Checked ) - MasterEditorTWL::appendXmlTag( doc, form, "DisplayIcon", "WiFi" ); - else - MasterEditorTWL::appendXmlTag( doc, form, "DisplayIcon", "None" ); - - MasterEditorTWL::appendXmlTag( doc, form, "IsEULA", (this->cboxIsEULA->Checked)?"Y":"N" ); MasterEditorTWL::appendXmlTag( doc, form, "Region", this->combRegion->SelectedIndex.ToString() ); MasterEditorTWL::appendXmlTag( doc, form, "RatingCERO", this->combCERO->SelectedIndex.ToString() ); MasterEditorTWL::appendXmlTag( doc, form, "RatingESRB", this->combESRB->SelectedIndex.ToString() ); @@ -159,9 +151,10 @@ void Form1::loadTmp( System::String ^filename ) this->parseTmp( root, "/MasterEditorTWL/Form/ProductCode1", this->tboxProductCode1 ); this->parseTmp( root, "/MasterEditorTWL/Form/ProductCode2", this->tboxProductCode2 ); this->parseTmp( root, "/MasterEditorTWL/Form/SubmitVersion", this->numSubmitVersion ); - this->parseTmp( root, "/MasterEditorTWL/Form/Backup", this->combBackup ); this->parseTmp( root, "/MasterEditorTWL/Form/ReleaseDate", this->dateRelease ); this->parseTmp( root, "/MasterEditorTWL/Form/SubmitDate", this->dateSubmit ); + this->parseTmp( root, "/MasterEditorTWL/Form/Backup", this->combBackup ); + this->combBackup->Enabled = true; this->tboxBackupOther->Enabled = false; this->tboxBackupOther->Clear(); @@ -234,11 +227,6 @@ void Form1::loadTmp( System::String ^filename ) this->parseTmp( root, "/MasterEditorTWL/Form/Mail2", this->tboxMail2 ); this->parseTmp( root, "/MasterEditorTWL/Form/NTSC2", this->tboxNTSC2 ); - rbuts = gcnew cli::array{this->rIsWirelessIcon, this->rIsWiFiIcon, this->rIsNoIcon}; - strs = gcnew cli::array{"Wireless","WiFi","None"}; - this->parseTmp( root, "/MasterEditorTWL/Form/DisplayIcon", rbuts, strs ); - - this->parseTmp( root, "/MasterEditorTWL/Form/IsEULA", this->cboxIsEULA ); this->parseTmp( root, "/MasterEditorTWL/Form/Region", this->combRegion ); this->parseTmp( root, "/MasterEditorTWL/Form/RatingCERO", this->combCERO ); this->parseTmp( root, "/MasterEditorTWL/Form/RatingESRB", this->combESRB ); diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp index 5b58059..a96ce2d 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp @@ -1420,14 +1420,24 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp ) } } + if( this->IsWL ) + { + this->hErrorList->Add( gcnew RCMrcError( + "TWL拡張諸フラグ", 0x1bf, 0x1bf, + "本来、立つはずのないフラグが立てられています。ビルド時の設定をご確認ください。", + "TWL Extended Flag", + "Unavailable flag is set. Please check building option.", + false, true ) ); + } + if( this->IsWiFiIcon && this->IsWirelessIcon ) { this->hErrorList->Add( gcnew RCMrcError( "アイコン表示フラグ", 0x1bf, 0x1bf, - "ワイヤレス通信アイコンとWi-Fi通信アイコンは同時に表示できません。設定を無視して読み込みます。", - "Icon Displaying", - "Icon displayed on menu is either Wireless Icon or Wi-Fi Icon. This setting was ignored in reading.", - true, true ) ); // 修正可能 + "ワイヤレス通信アイコンとWi-Fi通信アイコンは同時に表示できません。", + "Icon Displaying Flag", + "Icon displayed on menu is either Wireless Icon or Wi-Fi Connection Icon.", + false, true ) ); } if( !this->IsMediaNand ) // カードアプリのときのみ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h index 5d70e4c..0eaac8d 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h @@ -298,12 +298,12 @@ namespace MasterEditorTWL property System::Boolean IsOldDevEncrypt; // 旧開発用暗号フラグが立っている property System::Boolean IsSCFGAccess; // SCFGレジスタをロックしている - // TWL拡張フラグ 一部編集可能 + // TWL拡張フラグ Read Only property System::Boolean IsCodecTWL; - property System::Boolean IsEULA; // 編集可能 + property System::Boolean IsEULA; property System::Boolean IsSubBanner; - property System::Boolean IsWiFiIcon; // 編集可能 - property System::Boolean IsWirelessIcon; // 編集可能 + property System::Boolean IsWiFiIcon; + property System::Boolean IsWirelessIcon; property System::Boolean IsWL; // TWLアクセスコントロール Read Only