diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 5b6133e..131d253 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 59da9b7..3b3f6a1 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 cde1589..96e7855 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 f1154eb..20923c8 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -745,14 +745,14 @@ private: System::Windows::Forms::RadioButton^ rPurposeCardKiosk; private: System::Windows::Forms::GroupBox^ gboxPurpose; private: System::Windows::Forms::RadioButton^ rPurposeDSiWare; -private: System::Windows::Forms::RadioButton^ rPurposeCardDSCentre; -private: System::Windows::Forms::RadioButton^ rPurposeZone; + + private: System::Windows::Forms::TabPage^ tabErrorInfo; private: System::Windows::Forms::TextBox^ tboxGuideErrorInfo; private: System::Windows::Forms::GroupBox^ gboxErrorTiming; @@ -780,11 +780,11 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colLibPublisher; private: System::Windows::Forms::DataGridViewTextBoxColumn^ colLibName; private: System::Windows::Forms::RadioButton^ rPurposeCardTouchTryDS; -private: System::Windows::Forms::RadioButton^ rPurposeNandShop; -private: System::Windows::Forms::RadioButton^ rPurposeNandDSCentre; -private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; + + + @@ -1229,15 +1229,10 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; this->tabSubmitInfo = (gcnew System::Windows::Forms::TabPage()); this->gboxPurpose = (gcnew System::Windows::Forms::GroupBox()); this->gboxPurposeNand = (gcnew System::Windows::Forms::GroupBox()); - this->rPurposeNandShop = (gcnew System::Windows::Forms::RadioButton()); - this->rPurposeNandDSCentre = (gcnew System::Windows::Forms::RadioButton()); - this->rPurposeNandTouchTryDS = (gcnew System::Windows::Forms::RadioButton()); - this->rPurposeZone = (gcnew System::Windows::Forms::RadioButton()); this->rPurposeDSiWare = (gcnew System::Windows::Forms::RadioButton()); this->tboxPurposeOther = (gcnew System::Windows::Forms::TextBox()); this->rPurposeOther = (gcnew System::Windows::Forms::RadioButton()); this->gboxPurposeCard = (gcnew System::Windows::Forms::GroupBox()); - this->rPurposeCardDSCentre = (gcnew System::Windows::Forms::RadioButton()); this->rPurposeCardProduction = (gcnew System::Windows::Forms::RadioButton()); this->rPurposeCardTouchTryDS = (gcnew System::Windows::Forms::RadioButton()); this->rPurposeCardDistribution = (gcnew System::Windows::Forms::RadioButton()); @@ -3893,62 +3888,11 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; this->gboxPurposeNand->AccessibleName = nullptr; resources->ApplyResources(this->gboxPurposeNand, L"gboxPurposeNand"); this->gboxPurposeNand->BackgroundImage = nullptr; - this->gboxPurposeNand->Controls->Add(this->rPurposeNandShop); - this->gboxPurposeNand->Controls->Add(this->rPurposeNandDSCentre); - this->gboxPurposeNand->Controls->Add(this->rPurposeNandTouchTryDS); - this->gboxPurposeNand->Controls->Add(this->rPurposeZone); this->gboxPurposeNand->Controls->Add(this->rPurposeDSiWare); this->gboxPurposeNand->Font = nullptr; this->gboxPurposeNand->Name = L"gboxPurposeNand"; this->gboxPurposeNand->TabStop = false; // - // rPurposeNandShop - // - this->rPurposeNandShop->AccessibleDescription = nullptr; - this->rPurposeNandShop->AccessibleName = nullptr; - resources->ApplyResources(this->rPurposeNandShop, L"rPurposeNandShop"); - this->rPurposeNandShop->BackgroundImage = nullptr; - this->rPurposeNandShop->Font = nullptr; - this->rPurposeNandShop->Name = L"rPurposeNandShop"; - this->rPurposeNandShop->UseVisualStyleBackColor = true; - this->rPurposeNandShop->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeNandShop_CheckedChanged); - // - // rPurposeNandDSCentre - // - this->rPurposeNandDSCentre->AccessibleDescription = nullptr; - this->rPurposeNandDSCentre->AccessibleName = nullptr; - resources->ApplyResources(this->rPurposeNandDSCentre, L"rPurposeNandDSCentre"); - this->rPurposeNandDSCentre->BackgroundImage = nullptr; - this->rPurposeNandDSCentre->Font = nullptr; - this->rPurposeNandDSCentre->Name = L"rPurposeNandDSCentre"; - this->rPurposeNandDSCentre->TabStop = true; - this->rPurposeNandDSCentre->UseVisualStyleBackColor = true; - this->rPurposeNandDSCentre->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeNandDSCentre_CheckedChanged); - // - // rPurposeNandTouchTryDS - // - this->rPurposeNandTouchTryDS->AccessibleDescription = nullptr; - this->rPurposeNandTouchTryDS->AccessibleName = nullptr; - resources->ApplyResources(this->rPurposeNandTouchTryDS, L"rPurposeNandTouchTryDS"); - this->rPurposeNandTouchTryDS->BackgroundImage = nullptr; - this->rPurposeNandTouchTryDS->Font = nullptr; - this->rPurposeNandTouchTryDS->Name = L"rPurposeNandTouchTryDS"; - this->rPurposeNandTouchTryDS->TabStop = true; - this->rPurposeNandTouchTryDS->UseVisualStyleBackColor = true; - this->rPurposeNandTouchTryDS->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeNandTouchTryDS_CheckedChanged); - // - // rPurposeZone - // - this->rPurposeZone->AccessibleDescription = nullptr; - this->rPurposeZone->AccessibleName = nullptr; - resources->ApplyResources(this->rPurposeZone, L"rPurposeZone"); - this->rPurposeZone->BackgroundImage = nullptr; - this->rPurposeZone->Font = nullptr; - this->rPurposeZone->Name = L"rPurposeZone"; - this->rPurposeZone->TabStop = true; - this->rPurposeZone->UseVisualStyleBackColor = true; - this->rPurposeZone->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeZone_CheckedChanged); - // // rPurposeDSiWare // this->rPurposeDSiWare->AccessibleDescription = nullptr; @@ -3987,7 +3931,6 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; this->gboxPurposeCard->AccessibleName = nullptr; resources->ApplyResources(this->gboxPurposeCard, L"gboxPurposeCard"); this->gboxPurposeCard->BackgroundImage = nullptr; - this->gboxPurposeCard->Controls->Add(this->rPurposeCardDSCentre); this->gboxPurposeCard->Controls->Add(this->rPurposeCardProduction); this->gboxPurposeCard->Controls->Add(this->rPurposeCardTouchTryDS); this->gboxPurposeCard->Controls->Add(this->rPurposeCardDistribution); @@ -3996,18 +3939,6 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; this->gboxPurposeCard->Name = L"gboxPurposeCard"; this->gboxPurposeCard->TabStop = false; // - // rPurposeCardDSCentre - // - this->rPurposeCardDSCentre->AccessibleDescription = nullptr; - this->rPurposeCardDSCentre->AccessibleName = nullptr; - resources->ApplyResources(this->rPurposeCardDSCentre, L"rPurposeCardDSCentre"); - this->rPurposeCardDSCentre->BackgroundImage = nullptr; - this->rPurposeCardDSCentre->Font = nullptr; - this->rPurposeCardDSCentre->Name = L"rPurposeCardDSCentre"; - this->rPurposeCardDSCentre->TabStop = true; - this->rPurposeCardDSCentre->UseVisualStyleBackColor = true; - this->rPurposeCardDSCentre->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeCardDSCentre_CheckedChanged); - // // rPurposeCardProduction // this->rPurposeCardProduction->AccessibleDescription = nullptr; @@ -4734,27 +4665,17 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; // イベントが発生しないようにイベントを無効にする this->rPurposeCardProduction->CheckedChanged -= gcnew System::EventHandler(this, &Form1::rPurposeCardProduction_CheckedChanged); this->rPurposeCardTouchTryDS->CheckedChanged -= gcnew System::EventHandler(this, &Form1::rPurposeCardTouchTryDS_CheckedChanged); - this->rPurposeCardDSCentre->CheckedChanged -= gcnew System::EventHandler(this, &Form1::rPurposeCardDSCentre_CheckedChanged); this->rPurposeCardDistribution->CheckedChanged -= gcnew System::EventHandler(this, &Form1::rPurposeCardDistribution_CheckedChanged); this->rPurposeCardKiosk->CheckedChanged -= gcnew System::EventHandler(this, &Form1::rPurposeCardKiosk_CheckedChanged); this->rPurposeDSiWare->CheckedChanged -= gcnew System::EventHandler(this, &Form1::rPurposeDSiWare_CheckedChanged); - this->rPurposeNandTouchTryDS->CheckedChanged -= gcnew System::EventHandler(this, &Form1::rPurposeNandTouchTryDS_CheckedChanged); - this->rPurposeNandDSCentre->CheckedChanged -= gcnew System::EventHandler(this, &Form1::rPurposeNandDSCentre_CheckedChanged); - this->rPurposeNandShop->CheckedChanged -= gcnew System::EventHandler(this, &Form1::rPurposeNandShop_CheckedChanged); - this->rPurposeZone->CheckedChanged -= gcnew System::EventHandler(this, &Form1::rPurposeZone_CheckedChanged); this->rPurposeOther->CheckedChanged -= gcnew System::EventHandler(this, &Form1::rPurposeOther_CheckedChanged); // いったんすべてチェックを外す this->rPurposeCardProduction->Checked = false; this->rPurposeCardTouchTryDS->Checked = false; - this->rPurposeCardDSCentre->Checked = false; this->rPurposeCardDistribution->Checked = false; this->rPurposeCardKiosk->Checked = false; this->rPurposeDSiWare->Checked = false; - this->rPurposeNandTouchTryDS->Checked = false; - this->rPurposeNandDSCentre->Checked = false; - this->rPurposeNandShop->Checked = false; - this->rPurposeZone->Checked = false; this->rPurposeOther->Checked = false; // 選択されたもののみチェックする @@ -4774,14 +4695,9 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; // イベントを有効にする this->rPurposeCardProduction->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeCardProduction_CheckedChanged); this->rPurposeCardTouchTryDS->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeCardTouchTryDS_CheckedChanged); - this->rPurposeCardDSCentre->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeCardDSCentre_CheckedChanged); this->rPurposeCardDistribution->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeCardDistribution_CheckedChanged); this->rPurposeCardKiosk->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeCardKiosk_CheckedChanged); this->rPurposeDSiWare->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeDSiWare_CheckedChanged); - this->rPurposeNandTouchTryDS->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeNandTouchTryDS_CheckedChanged); - this->rPurposeNandDSCentre->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeNandDSCentre_CheckedChanged); - this->rPurposeNandShop->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeNandShop_CheckedChanged); - this->rPurposeZone->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeZone_CheckedChanged); this->rPurposeOther->CheckedChanged += gcnew System::EventHandler(this, &Form1::rPurposeOther_CheckedChanged); } //changePurposeForms() @@ -4800,7 +4716,6 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; { this->rPurposeCardProduction, this->rPurposeCardTouchTryDS, - this->rPurposeCardDSCentre, this->rPurposeCardDistribution, this->rPurposeCardKiosk, }; @@ -4808,10 +4723,6 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; cli::array ^rbutsNand = gcnew cli::array { this->rPurposeDSiWare, - this->rPurposeNandTouchTryDS, - this->rPurposeNandDSCentre, - this->rPurposeNandShop, - this->rPurposeZone, }; if( this->hSrl->IsMediaNand ) // SRLが読み込まれていないときにはfalseであることが保証されている @@ -4847,22 +4758,12 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; // SRLのリージョンによって選択可能な項目をマスクする - // 日本リージョンでは"DS CENTRE"をなくす - if( this->hSrl->IsRegionJapan || this->hSrl->IsRegionAmerica ) - { - this->rPurposeCardDSCentre->Enabled = false; - this->rPurposeNandDSCentre->Enabled = false; - if( this->rPurposeCardDSCentre->Checked || this->rPurposeNandDSCentre->Checked ) - { - this->changePurposeForms(this->rPurposeOther); // わざわざこれを選ぶには特別な理由があるだろうから"その他"にチェックをつけかえる - } - } - // 北米/欧州リージョンでは"Touch!Try!DS"をなくす - if( this->hSrl->IsRegionAmerica || this->hSrl->IsRegionEurope || this->hSrl->IsRegionAustralia ) + // 北米/欧州/中国韓国リージョンでは"Touch!Try!DS"をなくす + if( this->hSrl->IsRegionAmerica || this->hSrl->IsRegionEurope || this->hSrl->IsRegionAustralia || + this->hSrl->IsRegionChina || this->hSrl->IsRegionKorea ) { this->rPurposeCardTouchTryDS->Enabled = false; - this->rPurposeNandTouchTryDS->Enabled = false; - if( this->rPurposeCardTouchTryDS->Checked || this->rPurposeNandTouchTryDS->Checked ) + if( this->rPurposeCardTouchTryDS->Checked ) { this->changePurposeForms(this->rPurposeOther); } @@ -4870,45 +4771,17 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; // リージョンがコンボボックスで変更されている場合があるのでそちらを優先する - // 日本/北米リージョンでは"DS CENTRE"をなくす - if( (this->combRegion->SelectedIndex == 0) || - (this->combRegion->SelectedIndex == 1) || - (this->combRegion->SelectedIndex == 5) || - (this->combRegion->SelectedIndex == 6) ) - { - this->rPurposeCardDSCentre->Enabled = false; - this->rPurposeNandDSCentre->Enabled = false; - if( this->rPurposeCardDSCentre->Checked || this->rPurposeNandDSCentre->Checked ) - { - this->changePurposeForms(this->rPurposeOther); - } - } - else - { - // 別のリージョンに変更されたときに enable にしなければならない - if( !System::String::IsNullOrEmpty(this->tboxFile->Text) && this->hSrl->IsMediaNand ) - { - this->rPurposeCardDSCentre->Enabled = false; - this->rPurposeNandDSCentre->Enabled = true; - } - else - { - this->rPurposeCardDSCentre->Enabled = true; - this->rPurposeNandDSCentre->Enabled = false; - } - } - - // 北米/欧州/豪州リージョンでは"Touch!Try!DS"をなくす + // 北米/欧州/豪州/中韓リージョンでは"Touch!Try!DS"をなくす if( (this->combRegion->SelectedIndex == 1) || (this->combRegion->SelectedIndex == 2) || (this->combRegion->SelectedIndex == 3) || (this->combRegion->SelectedIndex == 4) || (this->combRegion->SelectedIndex == 5) || - (this->combRegion->SelectedIndex == 6) ) + (this->combRegion->SelectedIndex == 6) || + (this->combRegion->DropDownStyle == System::Windows::Forms::ComboBoxStyle::DropDown)) // 中韓のときはドロップダウンではない { this->rPurposeCardTouchTryDS->Enabled = false; - this->rPurposeNandTouchTryDS->Enabled = false; - if( this->rPurposeCardTouchTryDS->Checked || this->rPurposeNandTouchTryDS->Checked ) + if( this->rPurposeCardTouchTryDS->Checked ) { this->changePurposeForms(this->rPurposeOther); } @@ -4918,12 +4791,10 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; if( !System::String::IsNullOrEmpty(this->tboxFile->Text) && this->hSrl->IsMediaNand ) { this->rPurposeCardTouchTryDS->Enabled = false; - this->rPurposeNandTouchTryDS->Enabled = true; } else { this->rPurposeCardTouchTryDS->Enabled = true; - this->rPurposeNandTouchTryDS->Enabled = false; } } } //maskPurposeForms() @@ -5999,14 +5870,9 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; { this->rPurposeCardProduction, this->rPurposeCardTouchTryDS, - this->rPurposeCardDSCentre, this->rPurposeCardDistribution, this->rPurposeCardKiosk, this->rPurposeDSiWare, - this->rPurposeNandTouchTryDS, - this->rPurposeNandDSCentre, - this->rPurposeNandShop, - this->rPurposeZone, this->rPurposeOther }; this->tboxPurposeInError->Text = ""; @@ -6030,11 +5896,6 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; { this->changePurposeForms(this->rPurposeCardTouchTryDS); } - private: - System::Void rPurposeCardDSCentre_CheckedChanged(System::Object^ sender, System::EventArgs^ e) - { - this->changePurposeForms(this->rPurposeCardDSCentre); - } private: System::Void rPurposeCardDistribution_CheckedChanged(System::Object^ sender, System::EventArgs^ e) { @@ -6050,26 +5911,6 @@ private: System::Windows::Forms::RadioButton^ rPurposeNandTouchTryDS; { this->changePurposeForms(this->rPurposeDSiWare); } - private: - System::Void rPurposeNandTouchTryDS_CheckedChanged(System::Object^ sender, System::EventArgs^ e) - { - this->changePurposeForms(this->rPurposeNandTouchTryDS); - } - private: - System::Void rPurposeNandDSCentre_CheckedChanged(System::Object^ sender, System::EventArgs^ e) - { - this->changePurposeForms(this->rPurposeNandDSCentre); - } - private: - System::Void rPurposeNandShop_CheckedChanged(System::Object^ sender, System::EventArgs^ e) - { - this->changePurposeForms(this->rPurposeNandShop); - } - private: - System::Void rPurposeZone_CheckedChanged(System::Object^ sender, System::EventArgs^ e) - { - this->changePurposeForms(this->rPurposeZone); - } private: System::Void rPurposeOther_CheckedChanged(System::Object^ sender, System::EventArgs^ e) { diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx index cc69842..e5169e7 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx @@ -1208,7 +1208,7 @@ 4, 21 - 772, 468 + 772, 436 ROM蝓ｺ譛ｬ諠蝣ｱ @@ -1223,7 +1223,7 @@ 4, 21 - 772, 468 + 772, 436 TWL諡｡蠑ｵ諠蝣ｱ @@ -1256,7 +1256,7 @@ 4, 21 - 772, 468 + 772, 436 DSi繧ｦ繧ｧ繧｢諠蝣ｱ @@ -1379,7 +1379,7 @@ 4, 21 - 772, 468 + 772, 436 繝ｪ繝ｼ繧ｸ繝ｧ繝ｳ縺ｨ繝ｬ繝ｼ繝繧｣繝ｳ繧ｰ(邱ｨ髮蜿ｯ) @@ -1442,7 +1442,7 @@ 4, 21 - 772, 468 + 772, 436 謠仙ｺ諠蝣ｱ(隕∝･蜉) @@ -1453,35 +1453,14 @@ DSiWare (NAND繧｢繝励Μ) - - 152, 16 - - - DSi繧ｷ繝ｧ繝繝鈴堺ｿ｡逕ｨ菴馴ｨ鍋沿 - - - 123, 16 - - - DS CENTRE菴馴ｨ鍋沿 - - - 128, 16 - - - Touch!Try!DS菴馴ｨ鍋沿 - - - 97, 16 - - 120, 16 + 71, 16 - DSi繧ｦ繧ｧ繧｢荳闊ｬ雋ｩ螢ｲ + 荳闊ｬ雋ｩ螢ｲ - 349, 19 + 209, 19 58, 16 @@ -1492,17 +1471,11 @@ TWL繧ｫ繝ｼ繝峨い繝励Μ - - 123, 16 - - - DS CENTRE菴馴ｨ鍋沿 - - 137, 16 + 71, 16 - 繧ｲ繝ｼ繝繧ｫ繝ｼ繝我ｸ闊ｬ雋ｩ螢ｲ + 荳闊ｬ雋ｩ螢ｲ 128, 16 @@ -1547,7 +1520,7 @@ 4, 21 - 772, 468 + 772, 436 莨夂､ｾ諠蝣ｱ(隕∝･蜉) @@ -1562,7 +1535,7 @@ 4, 21 - 772, 468 + 772, 436 繧ｨ繝ｩ繝ｼ諠蝣ｱ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX index 8855996..0efb577 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX @@ -146,9 +146,6 @@ 339, 203 - - 0 - 27, 45 @@ -198,7 +195,7 @@ gboxTWLExInfo - 349, 21 + 209, 21 System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -227,9 +224,6 @@ labProductCode2Foreign - - gboxPurposeNand - 3 @@ -263,8 +257,8 @@ 33 - - gboxPurposeNand + + gboxPurposeCard Display Connection Icon On DSi Menu @@ -338,9 +332,6 @@ TWL - - - rPurposeNandTouchTryDS - Language @@ -409,7 +400,7 @@ gboxNandSize - 88, 172 + 228, 109 18, 214 @@ -448,7 +439,7 @@ Permit Tmp Jump Landing - 411, 218 + 411, 177 aged 6 or older @@ -477,6 +468,9 @@ 155, 203 + + tabTWLInfo + 7 @@ -552,8 +546,8 @@ 20 - - 3 + + gboxTWLExInfo gboxTitleID @@ -615,11 +609,14 @@ 1 + + 339, 100 + 0 - 408, 406 + 408, 401 True @@ -627,6 +624,9 @@ 497, 15 + + tabTWLInfo + 96, 21 @@ -654,8 +654,8 @@ 56, 20 - - 8 + + tabSubmitInfo 558, 54 @@ -693,9 +693,6 @@ labGameCode - - Demo for "Touch!Try!DS" - NAND Flash Memory @@ -723,8 +720,8 @@ 37, 15 - - 5 + + labSrlSize 0 @@ -759,6 +756,9 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gboxSrl + 223, 68 @@ -831,9 +831,6 @@ rPurposeCardProduction - - 8 - 71, 21 @@ -1125,8 +1122,8 @@ labSumSize2 - - gboxPerson1 + + 2 NoControl @@ -1137,8 +1134,8 @@ 21, 55 - - labSrlSize + + tabMain NoControl @@ -1161,9 +1158,6 @@ stripItemJapanese - - 157, 19 - 59, 15 @@ -1176,8 +1170,8 @@ gboxSrl - - 339, 100 + + 8 12 @@ -1314,9 +1308,6 @@ Orignal Size in ROM - - Demo for "Nintendo DSi Shop" - 5 @@ -1353,9 +1344,6 @@ 27 - - gboxSubmitWay - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1392,6 +1380,9 @@ 117, 18 + + tabTWLInfo + TWL Normal Region ROM Offset @@ -1446,8 +1437,8 @@ 55, 21 - - tboxSubBannerSizeFS + + 158, 21 202, 212 @@ -1465,7 +1456,7 @@ gboxTitleID - 3 + 2 11 @@ -1551,9 +1542,6 @@ gboxTWLExInfo - - gboxPurposeNand - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1566,11 +1554,11 @@ 2 - - 261, 21 + + ver.0.0 - - tabTWLInfo + + 2 7 @@ -1600,7 +1588,7 @@ True - 289, 195 + 289, 190 (Arbitrary) @@ -1665,9 +1653,6 @@ gboxExFlags - - rPurposeNandDSCentre - 73, 15 @@ -1750,7 +1735,7 @@ aged 3 or older - 772, 465 + 772, 433 gboxParental @@ -1779,9 +1764,6 @@ M (aged 17 or older) - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Begin @@ -1824,9 +1806,6 @@ 171, 80 - - 532, 188 - 23, 163 @@ -1863,9 +1842,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - NoControl - 119, 15 @@ -1884,6 +1860,9 @@ 0 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1902,18 +1881,12 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tboxMakerCode - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 8 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1977,15 +1950,15 @@ 13 - - True - Other ROM Spec. Name + + You must complete all items on this tab to create a submission checklist. + All ages @@ -2058,6 +2031,9 @@ tabSubmitInfo + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -2073,11 +2049,8 @@ 17 - - End - - - gboxSrl + + aged 16 or older 261, 21 @@ -2124,9 +2097,6 @@ 268, 21 - - rPurposeNandShop - 19 @@ -2155,10 +2125,10 @@ 29, 15 - 4 + 0 - - 64Kbit EEPROM + + True rSubmitPost @@ -2208,9 +2178,6 @@ labFurigana2 - - ver.0.0 - 155, 232 @@ -2220,9 +2187,6 @@ NoControl - - 142, 18 - 5 @@ -2241,11 +2205,11 @@ gboxErrorTiming - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 142, 18 - 772, 465 + 772, 433 False @@ -2295,8 +2259,8 @@ 181, 21 - - gboxTWLExInfo + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 gboxNandSize @@ -2334,9 +2298,6 @@ 2 - - NoControl - tabRomInfo @@ -2406,8 +2367,8 @@ 37 - - 8 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 gboxForeign @@ -2428,7 +2389,7 @@ 13 - 74, 19 + 67, 19 tabErrorInfo @@ -2457,12 +2418,6 @@ gboxPerson2 - - 7 - - - gboxPerson2 - 12 @@ -2491,7 +2446,7 @@ tabSubmitInfo - 209, 146 + 209, 53 - @@ -2515,7 +2470,7 @@ 4 - 6, 95 + 6, 70 5 @@ -2580,9 +2535,6 @@ 100 - - 95, 83 - 123, 21 @@ -2608,7 +2560,7 @@ True - 24, 298 + 24, 279 tboxPublicSizeFS @@ -2757,17 +2709,17 @@ gboxPerson2 + + 40, 15 + 300 - - NoControl - aged 18 or older - 285, 164 + 285, 131 System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -2775,9 +2727,6 @@ True - - 2 - 203, 101 @@ -2847,9 +2796,6 @@ 7 - - Demo for "DS CENTRE" - 9 @@ -2857,14 +2803,11 @@ 149, 52 - 772, 465 + 772, 433 Region and Rating Infomation - - 192, 19 - 115, 15 @@ -2898,9 +2841,6 @@ True - - True - False @@ -3048,6 +2988,9 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 49, 15 + labMultiForeign2 @@ -3066,8 +3009,8 @@ 84, 15 - - Nintendo Zone + + tabErrorInfo gboxProd @@ -3141,9 +3084,6 @@ ROM Info. - - tabMain - 45, 21 @@ -3183,15 +3123,9 @@ 10 - - gboxOtherSpec - True - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 11 @@ -3219,9 +3153,6 @@ gboxPerson2 - - True - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -3231,9 +3162,6 @@ 322, 151 - - 6, 70 - gboxPurposeCard @@ -3270,9 +3198,6 @@ True - - gboxPurposeNand - 2 @@ -3318,8 +3243,8 @@ 125, 19 - - tabErrorInfo + + 95, 83 192, 21 @@ -3432,9 +3357,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - aged 16 or older - tboxPrivateSizeFS @@ -3540,21 +3462,18 @@ 94, 15 + + 3 + 96, 21 - - gboxPurposeCard - E10+ (aged 10 or older) 37, 15 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - PEGI(General) @@ -3592,7 +3511,7 @@ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 233, 139 + 233, 134 3 @@ -3600,6 +3519,9 @@ False + + 6, 18 + File 3 @@ -3636,9 +3558,6 @@ True - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 261, 21 @@ -3717,9 +3636,6 @@ 0 - - 6 - 1 @@ -3831,6 +3747,9 @@ 100 + + aged 4 or older + labSDAccessRight @@ -3859,7 +3778,7 @@ 18, 228 - 4 + 3 100, 19 @@ -3877,10 +3796,10 @@ tabCompanyInfo - 780, 493 + 780, 461 - 737, 152 + 737, 131 gboxPerson2 @@ -3910,7 +3829,7 @@ True - 737, 152 + 737, 131 204, 23 @@ -3984,8 +3903,8 @@ gboxShared2Size - - NoControl + + tboxDepart1 4 @@ -3999,8 +3918,8 @@ gboxNandSize - - Launch Control On DSi Menu + + End 337, 221 @@ -4008,9 +3927,6 @@ gboxSrl - - True - 183, 97 @@ -4050,11 +3966,14 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 261, 21 + 2 - - tabTWLInfo + + gboxParental Mail @@ -4080,9 +3999,6 @@ 8 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - gboxProd @@ -4233,9 +4149,6 @@ tabSubmitInfo - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Right @@ -4255,13 +4168,13 @@ 85, 154 - 792, 566 + 792, 541 System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 447, 201 + 447, 160 System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -4272,9 +4185,6 @@ rPurposeCardKiosk - - 157, 19 - 0 @@ -4305,9 +4215,6 @@ tabErrorInfo - - 86, 15 - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -4347,8 +4254,8 @@ tabRomEditInfo - - 2 + + 532, 188 49, 15 @@ -4362,8 +4269,8 @@ gboxShared2Size - - 1 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 89, 21 @@ -4383,9 +4290,6 @@ 11 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 525, 167 @@ -4566,9 +4470,6 @@ 17, 88 - - rPurposeZone - 155, 261 @@ -4593,9 +4494,6 @@ All ages - - 35 - 6, 21 @@ -4627,7 +4525,7 @@ 9 - 772, 465 + 772, 433 ) @@ -4698,8 +4596,8 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - gboxPerson1 + + 9 None @@ -4722,8 +4620,8 @@ 512Kbit EEPROM - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 64Kbit EEPROM gboxPerson1 @@ -4770,9 +4668,6 @@ 0 - - Demo for "DS CENTRE" - 4, 24 @@ -4833,9 +4728,6 @@ 78, 25 - - 106, 19 - 2 @@ -4849,13 +4741,13 @@ tboxPurposeInError - 6, 120 + 6, 95 Remarks - Enter any other related information - - tabSubmitInfo + + 5 42 @@ -4947,8 +4839,8 @@ gboxNandSize - - You must complete all items on this tab to create a submission checklist. + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 6 @@ -5010,6 +4902,9 @@ 77, 15 + + 10 + 2 @@ -5049,26 +4944,23 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gboxOtherSpec - - 6, 95 + + labProductCode 9 - - 9 + + gboxPerson1 14, 15 - - Right - - - tabTWLInfo + + 86, 15 labIsGameCardOn2 @@ -5085,8 +4977,8 @@ 155, 87 - - 30 + + 36 gboxPurposeNand @@ -5121,8 +5013,8 @@ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 49, 15 + + labTel1 labFax2 @@ -5148,9 +5040,6 @@ 1 - - gboxParental - 4 @@ -5190,9 +5079,6 @@ tabSubmitInfo - - tboxDepart1 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -5322,8 +5208,8 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 40, 15 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -5334,8 +5220,8 @@ tboxSDAccessRight - - 10 + + gboxPerson2 gboxParental @@ -5355,9 +5241,6 @@ 32 - - 158, 21 - 4, 24 @@ -5491,7 +5374,7 @@ 188, 19 - 2 + 1 16 @@ -5526,11 +5409,14 @@ 201, 189 + + gboxPerson1 + 19 - - rPurposeCardDSCentre + + tboxAccessOther tboxSumSizeMB @@ -5701,7 +5587,7 @@ TWL - - 1 + 0 E(Pre-Check) @@ -5718,8 +5604,8 @@ 13 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Right 0 @@ -5739,11 +5625,8 @@ 24, 11 - - labProductCode - - 22, 280 + 22, 261 True @@ -5772,9 +5655,6 @@ 74, 15 - - tboxAccessOther - gboxParental @@ -5947,7 +5827,7 @@ 1 - 16, 173 + 234, 90 0 @@ -5955,9 +5835,6 @@ 3 - - 6, 70 - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -6006,8 +5883,8 @@ 87, 15 - - 6, 121 + + 0 labNandSize @@ -6027,11 +5904,8 @@ 7 - - True - - - 5 + + tboxSubBannerSizeFS gboxPerson1 @@ -6096,9 +5970,6 @@ gboxLaunch - - NoControl - 5 @@ -6153,9 +6024,6 @@ labBracketR - - 6 - gboxForeign @@ -6294,8 +6162,8 @@ tboxProductName - - 6, 18 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -6331,10 +6199,10 @@ True - 772, 465 + 772, 433 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabNandSizeInfo (Furigana) @@ -6442,7 +6310,7 @@ 158, 15 - 209, 146 + 209, 124 tabRomEditInfo @@ -6456,8 +6324,8 @@ tabRomEditInfo - - tabNandSizeInfo + + tboxMakerCode System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -6510,18 +6378,12 @@ gboxTitleID - - gboxPurposeCard - CODEC Mode TitleID Low - - 0 - Media @@ -6547,7 +6409,7 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 273, 398 + 273, 393 stripItemSaveTemp @@ -6634,7 +6496,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 772, 465 + 772, 433 combPEGI_PRT @@ -6786,8 +6648,8 @@ 96, 21 - - 0 + + 35 gboxLaunch @@ -6801,8 +6663,8 @@ tabMain - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 6 2 @@ -6865,7 +6727,7 @@ 11 - 124, 19 + 67, 19 True @@ -6972,9 +6834,6 @@ 78, 106 - - 0 - 24, 11 @@ -6990,9 +6849,6 @@ MiddleRight - - 36 - 554, 238 @@ -7038,9 +6894,6 @@ 89, 21 - - True - 4 @@ -7084,7 +6937,7 @@ stripItemMasterRom - DSiWare + Product System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -7092,9 +6945,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 160, 19 - Name @@ -7105,7 +6955,7 @@ 100 - 281, 412 + 281, 407 228, 164 @@ -7122,6 +6972,9 @@ True + + 30 + 550, 71 @@ -7159,7 +7012,7 @@ NoControl - 772, 465 + 772, 433 stripItemErrorListRead @@ -7188,8 +7041,8 @@ Set Back to Initial Settings - - labTel1 + + gboxSubmitWay System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -7212,6 +7065,9 @@ labTitleIDHi + + 5 + tboxSumSize @@ -7227,8 +7083,8 @@ 100, 21 - - aged 4 or older + + Launch Control On DSi Menu 200 @@ -7254,9 +7110,6 @@ 12 - - 6, 45 - True @@ -7359,11 +7212,11 @@ Foreign Ver. - - 2 + + 0 - Retail Game Card + Product Right @@ -7410,9 +7263,6 @@ True - - 3 - gboxExFlags diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp index 9f2cd0a..f1854bb 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp @@ -97,14 +97,9 @@ void Form1::setDeliverableProperties(void) { this->rPurposeCardProduction, this->rPurposeCardTouchTryDS, - this->rPurposeCardDSCentre, this->rPurposeCardDistribution, this->rPurposeCardKiosk, this->rPurposeDSiWare, - this->rPurposeNandTouchTryDS, - this->rPurposeNandDSCentre, - this->rPurposeNandShop, - this->rPurposeZone, this->rPurposeOther, }; for each( System::Windows::Forms::RadioButton ^r in rbuts ) @@ -342,14 +337,9 @@ System::Boolean Form1::checkDeliverableForms(void) { this->rPurposeCardProduction, this->rPurposeCardTouchTryDS, - this->rPurposeCardDSCentre, this->rPurposeCardDistribution, this->rPurposeCardKiosk, this->rPurposeDSiWare, - this->rPurposeNandTouchTryDS, - this->rPurposeNandDSCentre, - this->rPurposeNandShop, - this->rPurposeZone, this->rPurposeOther, }; this->checkRadioButton( rbuts, "LabelUsage" ); diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp index 620a3ce..5b33f94 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp @@ -484,14 +484,9 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname ) resources->ApplyResources(this->colWarnCause, L"colWarnCause"); resources->ApplyResources(this->rPurposeCardProduction, L"rPurposeCardProduction"); resources->ApplyResources(this->rPurposeCardTouchTryDS, L"rPurposeCardTouchTryDS"); - resources->ApplyResources(this->rPurposeCardDSCentre, L"rPurposeCardDSCentre"); resources->ApplyResources(this->rPurposeCardDistribution, L"rPurposeCardDistribution"); resources->ApplyResources(this->rPurposeCardKiosk, L"rPurposeCardKiosk"); resources->ApplyResources(this->rPurposeDSiWare, L"rPurposeDSiWare"); - resources->ApplyResources(this->rPurposeNandTouchTryDS, L"rPurposeNandTouchTryDS"); - resources->ApplyResources(this->rPurposeNandDSCentre, L"rPurposeNandDSCentre"); - resources->ApplyResources(this->rPurposeNandShop, L"rPurposeNandShop"); - resources->ApplyResources(this->rPurposeZone, L"rPurposeZone"); resources->ApplyResources(this->rPurposeOther, L"rPurposeOther"); resources->ApplyResources(this->gboxPurposeCard, L"gboxPurposeCard"); resources->ApplyResources(this->gboxPurposeNand, L"gboxPurposeNand"); diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp index 24f1222..0464a92 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp @@ -75,28 +75,18 @@ System::Void Form1::saveTmp( System::String ^filename ) { this->rPurposeCardProduction, this->rPurposeCardTouchTryDS, - this->rPurposeCardDSCentre, this->rPurposeCardDistribution, this->rPurposeCardKiosk, this->rPurposeDSiWare, - this->rPurposeNandTouchTryDS, - this->rPurposeNandDSCentre, - this->rPurposeNandShop, - this->rPurposeZone, this->rPurposeOther }; cli::array ^strs = gcnew cli::array { "CardProduction", "CardTouchTryDS", - "CardDSCentre", "CardDistribution", "CardKiosk", "DSiWare", - "NandTouchTryDS", - "NandDSCentre", - "NandShop", - "Zone", "Other" }; int i; @@ -228,28 +218,18 @@ void Form1::loadTmp( System::String ^filename ) { this->rPurposeCardProduction, this->rPurposeCardTouchTryDS, - this->rPurposeCardDSCentre, this->rPurposeCardDistribution, this->rPurposeCardKiosk, this->rPurposeDSiWare, - this->rPurposeNandTouchTryDS, - this->rPurposeNandDSCentre, - this->rPurposeNandShop, - this->rPurposeZone, this->rPurposeOther }; strs = gcnew cli::array { "CardProduction", "CardTouchTryDS", - "CardDSCentre", "CardDistribution", "CardKiosk", "DSiWare", - "NandTouchTryDS", - "NandDSCentre", - "NandShop", - "Zone", "Other" }; this->parseTmp( root, "/MasterEditorTWL/Form/Purpose", rbuts, strs ); diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_util.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_util.cpp index c66911f..1b74b36 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_util.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_util.cpp @@ -129,7 +129,6 @@ bool Form1::isDisplayOneGridErrorForPurpose( RCMrcError ^err ) if( ((err->Purpose & RCMrcError::PurposeType::Production) != (RCMrcError::PurposeType)0) && (this->rPurposeCardProduction->Checked || this->rPurposeDSiWare->Checked || - this->rPurposeNandShop || // ショップ配信体験版は通常版と同じ this->rPurposeOther->Checked) ) { is_display = true; @@ -145,13 +144,7 @@ bool Form1::isDisplayOneGridErrorForPurpose( RCMrcError ^err ) is_display = true; } if( ((err->Purpose & RCMrcError::PurposeType::DSStation) != (RCMrcError::PurposeType)0) && - (this->rPurposeCardTouchTryDS->Checked || this->rPurposeCardDSCentre->Checked || - this->rPurposeNandTouchTryDS->Checked || this->rPurposeNandDSCentre->Checked) ) - { - is_display = true; - } - if( ((err->Purpose & RCMrcError::PurposeType::Zone) != (RCMrcError::PurposeType)0) && - this->rPurposeZone->Checked ) + this->rPurposeCardTouchTryDS->Checked) { is_display = true; }