diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 7d5cb29..9e60935 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 d65462d..354324c 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 ddc4dbb..fb3758e 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 27ca5e0..cf1745e 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -635,10 +635,10 @@ private: System::Windows::Forms::Label^ labNandSize; private: System::Windows::Forms::Label^ labNandSizeFS; private: System::Windows::Forms::Label^ labSumSize; -private: System::Windows::Forms::Label^ labShopBlock; -private: System::Windows::Forms::Label^ labShopBlock2; + + private: System::Windows::Forms::GroupBox^ gboxNandSize; -private: System::Windows::Forms::TextBox^ tboxShopBlock; + private: System::Windows::Forms::TextBox^ tboxSumSize; @@ -658,7 +658,7 @@ private: System::Windows::Forms::TextBox^ tboxSubBannerSize; -private: System::Windows::Forms::Label^ labShopBlockUnit; + private: System::Windows::Forms::Label^ labArrow5; private: System::Windows::Forms::Label^ labArrow4; @@ -828,11 +828,11 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; void InitializeComponent(void) { System::ComponentModel::ComponentResourceManager^ resources = (gcnew System::ComponentModel::ComponentResourceManager(Form1::typeid)); - System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle1 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); - System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle2 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); - System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle3 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); - System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle4 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); - System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle5 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle6 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle7 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle8 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle9 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle10 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); this->tboxFile = (gcnew System::Windows::Forms::TextBox()); this->gboxSrl = (gcnew System::Windows::Forms::GroupBox()); this->tboxRemasterVer = (gcnew System::Windows::Forms::TextBox()); @@ -1045,13 +1045,11 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; this->labBracketL = (gcnew System::Windows::Forms::Label()); this->tboxSumSizeMB = (gcnew System::Windows::Forms::TextBox()); this->tboxSrlSize = (gcnew System::Windows::Forms::TextBox()); - this->labShopBlockUnit = (gcnew System::Windows::Forms::Label()); this->labArrow5 = (gcnew System::Windows::Forms::Label()); this->labArrow4 = (gcnew System::Windows::Forms::Label()); this->labArrow3 = (gcnew System::Windows::Forms::Label()); this->labArrow2 = (gcnew System::Windows::Forms::Label()); this->labArrow1 = (gcnew System::Windows::Forms::Label()); - this->tboxShopBlock = (gcnew System::Windows::Forms::TextBox()); this->tboxSumSize = (gcnew System::Windows::Forms::TextBox()); this->tboxTmdSizeFS = (gcnew System::Windows::Forms::TextBox()); this->tboxSubBannerSizeFS = (gcnew System::Windows::Forms::TextBox()); @@ -1061,9 +1059,7 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; this->tboxTmdSize = (gcnew System::Windows::Forms::TextBox()); this->tboxSubBannerSize = (gcnew System::Windows::Forms::TextBox()); this->labNandSize = (gcnew System::Windows::Forms::Label()); - this->labShopBlock2 = (gcnew System::Windows::Forms::Label()); this->labNandSizeFS = (gcnew System::Windows::Forms::Label()); - this->labShopBlock = (gcnew System::Windows::Forms::Label()); this->labSrlSize = (gcnew System::Windows::Forms::Label()); this->labSumSize2 = (gcnew System::Windows::Forms::Label()); this->labSumSize = (gcnew System::Windows::Forms::Label()); @@ -3063,15 +3059,15 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; this->gridSDK->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridSDK->ColumnHeadersVisible = false; this->gridSDK->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(1) {this->dataSDKVer}); - dataGridViewCellStyle1->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; - dataGridViewCellStyle1->BackColor = System::Drawing::SystemColors::Window; - dataGridViewCellStyle1->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + dataGridViewCellStyle6->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle6->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle6->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(128))); - dataGridViewCellStyle1->ForeColor = System::Drawing::SystemColors::ControlText; - dataGridViewCellStyle1->SelectionBackColor = System::Drawing::SystemColors::Highlight; - dataGridViewCellStyle1->SelectionForeColor = System::Drawing::SystemColors::HighlightText; - dataGridViewCellStyle1->WrapMode = System::Windows::Forms::DataGridViewTriState::True; - this->gridSDK->DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle6->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle6->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle6->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle6->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridSDK->DefaultCellStyle = dataGridViewCellStyle6; this->gridSDK->Font = nullptr; this->gridSDK->Name = L"gridSDK"; this->gridSDK->ReadOnly = true; @@ -3097,15 +3093,15 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; this->gridLibrary->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridLibrary->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(2) {this->colLibPublisher, this->colLibName}); - dataGridViewCellStyle2->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; - dataGridViewCellStyle2->BackColor = System::Drawing::SystemColors::Window; - dataGridViewCellStyle2->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + dataGridViewCellStyle7->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle7->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle7->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(128))); - dataGridViewCellStyle2->ForeColor = System::Drawing::SystemColors::ControlText; - dataGridViewCellStyle2->SelectionBackColor = System::Drawing::SystemColors::Highlight; - dataGridViewCellStyle2->SelectionForeColor = System::Drawing::SystemColors::HighlightText; - dataGridViewCellStyle2->WrapMode = System::Windows::Forms::DataGridViewTriState::True; - this->gridLibrary->DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle7->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle7->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle7->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle7->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridLibrary->DefaultCellStyle = dataGridViewCellStyle7; this->gridLibrary->Font = nullptr; this->gridLibrary->Name = L"gridLibrary"; this->gridLibrary->ReadOnly = true; @@ -3246,13 +3242,11 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; this->gboxNandSize->Controls->Add(this->labBracketL); this->gboxNandSize->Controls->Add(this->tboxSumSizeMB); this->gboxNandSize->Controls->Add(this->tboxSrlSize); - this->gboxNandSize->Controls->Add(this->labShopBlockUnit); this->gboxNandSize->Controls->Add(this->labArrow5); this->gboxNandSize->Controls->Add(this->labArrow4); this->gboxNandSize->Controls->Add(this->labArrow3); this->gboxNandSize->Controls->Add(this->labArrow2); this->gboxNandSize->Controls->Add(this->labArrow1); - this->gboxNandSize->Controls->Add(this->tboxShopBlock); this->gboxNandSize->Controls->Add(this->tboxSumSize); this->gboxNandSize->Controls->Add(this->tboxTmdSizeFS); this->gboxNandSize->Controls->Add(this->tboxSubBannerSizeFS); @@ -3262,10 +3256,8 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; this->gboxNandSize->Controls->Add(this->tboxTmdSize); this->gboxNandSize->Controls->Add(this->tboxSubBannerSize); this->gboxNandSize->Controls->Add(this->labNandSize); - this->gboxNandSize->Controls->Add(this->labShopBlock2); this->gboxNandSize->Controls->Add(this->labNandSizeFS); this->gboxNandSize->Controls->Add(this->tboxPrivateSize); - this->gboxNandSize->Controls->Add(this->labShopBlock); this->gboxNandSize->Controls->Add(this->labSrlSize); this->gboxNandSize->Controls->Add(this->labPrivateSize); this->gboxNandSize->Controls->Add(this->labSumSize2); @@ -3312,14 +3304,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; this->tboxSrlSize->Name = L"tboxSrlSize"; this->tboxSrlSize->ReadOnly = true; // - // labShopBlockUnit - // - this->labShopBlockUnit->AccessibleDescription = nullptr; - this->labShopBlockUnit->AccessibleName = nullptr; - resources->ApplyResources(this->labShopBlockUnit, L"labShopBlockUnit"); - this->labShopBlockUnit->Font = nullptr; - this->labShopBlockUnit->Name = L"labShopBlockUnit"; - // // labArrow5 // this->labArrow5->AccessibleDescription = nullptr; @@ -3360,16 +3344,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; this->labArrow1->Font = nullptr; this->labArrow1->Name = L"labArrow1"; // - // tboxShopBlock - // - this->tboxShopBlock->AccessibleDescription = nullptr; - this->tboxShopBlock->AccessibleName = nullptr; - resources->ApplyResources(this->tboxShopBlock, L"tboxShopBlock"); - this->tboxShopBlock->BackgroundImage = nullptr; - this->tboxShopBlock->Font = nullptr; - this->tboxShopBlock->Name = L"tboxShopBlock"; - this->tboxShopBlock->ReadOnly = true; - // // tboxSumSize // this->tboxSumSize->AccessibleDescription = nullptr; @@ -3458,14 +3432,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; this->labNandSize->Font = nullptr; this->labNandSize->Name = L"labNandSize"; // - // labShopBlock2 - // - this->labShopBlock2->AccessibleDescription = nullptr; - this->labShopBlock2->AccessibleName = nullptr; - resources->ApplyResources(this->labShopBlock2, L"labShopBlock2"); - this->labShopBlock2->Font = nullptr; - this->labShopBlock2->Name = L"labShopBlock2"; - // // labNandSizeFS // this->labNandSizeFS->AccessibleDescription = nullptr; @@ -3474,14 +3440,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; this->labNandSizeFS->Font = nullptr; this->labNandSizeFS->Name = L"labNandSizeFS"; // - // labShopBlock - // - this->labShopBlock->AccessibleDescription = nullptr; - this->labShopBlock->AccessibleName = nullptr; - resources->ApplyResources(this->labShopBlock, L"labShopBlock"); - this->labShopBlock->Font = nullptr; - this->labShopBlock->Name = L"labShopBlock"; - // // labSrlSize // this->labSrlSize->AccessibleDescription = nullptr; @@ -3837,15 +3795,15 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; this->gridWarn->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridWarn->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(4) {this->colWarnName, this->colWarnBegin, this->colWarnEnd, this->colWarnCause}); - dataGridViewCellStyle3->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; - dataGridViewCellStyle3->BackColor = System::Drawing::SystemColors::Window; - dataGridViewCellStyle3->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + dataGridViewCellStyle8->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle8->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle8->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(128))); - dataGridViewCellStyle3->ForeColor = System::Drawing::SystemColors::ControlText; - dataGridViewCellStyle3->SelectionBackColor = System::Drawing::SystemColors::Highlight; - dataGridViewCellStyle3->SelectionForeColor = System::Drawing::SystemColors::HighlightText; - dataGridViewCellStyle3->WrapMode = System::Windows::Forms::DataGridViewTriState::True; - this->gridWarn->DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle8->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle8->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle8->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle8->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridWarn->DefaultCellStyle = dataGridViewCellStyle8; this->gridWarn->Font = nullptr; this->gridWarn->GridColor = System::Drawing::SystemColors::Control; this->gridWarn->Name = L"gridWarn"; @@ -3882,8 +3840,8 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; // this->gridError->AccessibleDescription = nullptr; this->gridError->AccessibleName = nullptr; - dataGridViewCellStyle4->BackColor = System::Drawing::Color::White; - this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle9->BackColor = System::Drawing::Color::White; + this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9; resources->ApplyResources(this->gridError, L"gridError"); this->gridError->AutoSizeRowsMode = System::Windows::Forms::DataGridViewAutoSizeRowsMode::AllCellsExceptHeaders; this->gridError->BackgroundColor = System::Drawing::SystemColors::Control; @@ -3891,15 +3849,15 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; this->gridError->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridError->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(4) {this->colErrorName, this->colErrorBegin, this->colErrorEnd, this->colErrorCause}); - dataGridViewCellStyle5->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; - dataGridViewCellStyle5->BackColor = System::Drawing::SystemColors::Window; - dataGridViewCellStyle5->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + dataGridViewCellStyle10->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle10->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle10->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(128))); - dataGridViewCellStyle5->ForeColor = System::Drawing::SystemColors::ControlText; - dataGridViewCellStyle5->SelectionBackColor = System::Drawing::SystemColors::Highlight; - dataGridViewCellStyle5->SelectionForeColor = System::Drawing::SystemColors::HighlightText; - dataGridViewCellStyle5->WrapMode = System::Windows::Forms::DataGridViewTriState::True; - this->gridError->DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle10->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle10->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle10->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle10->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridError->DefaultCellStyle = dataGridViewCellStyle10; this->gridError->Font = nullptr; this->gridError->GridColor = System::Drawing::SystemColors::Control; this->gridError->Name = L"gridError"; diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx index bdd8683..c194c1f 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ROMデータ情報 + 73, 12 @@ -160,9 +163,6 @@ リマスターバージョン - - ROMデータ情報 - 79, 12 @@ -364,6 +364,9 @@ 担当者2を入力する(任意) + + 担当者2 + 37, 12 @@ -400,8 +403,8 @@ 貴社名 - - 担当者2 + + 担当者1 37, 12 @@ -439,8 +442,8 @@ 貴社名 - - 担当者1 + + 目的 54, 16 @@ -466,8 +469,8 @@ 一般販売用 - - 目的 + + 提出方法 56, 16 @@ -481,9 +484,6 @@ 郵送 - - 提出方法 - 65, 12 @@ -544,15 +544,15 @@ 製品コード + + Shared2ファイルサイズ + 123, 16 Shared2ファイル使用 - - Shared2ファイルサイズ - 70, 12 @@ -565,6 +565,9 @@ SDKバージョン + + TWL拡張情報 + 72, 12 @@ -577,9 +580,6 @@ TWL専用領域ROMオフセット - - TWL拡張情報 - 155, 12 @@ -587,10 +587,10 @@ TWLノーマル領域ROMオフセット - 121, 12 + 127, 12 - Privatセーブデータサイズ + Privateセーブデータサイズ 122, 12 @@ -616,6 +616,9 @@ tmpジャンプ許可 + + アクセスコントロール情報 + 98, 12 @@ -643,9 +646,6 @@ SDカード - - アクセスコントロール情報 - 24, 79 @@ -662,7 +662,7 @@ その他アプリ情報 - 236, 62 + 230, 68 74, 12 @@ -679,6 +679,12 @@ ROM提出情報 + + 51, 20 + + + ファイル + 211, 22 @@ -700,11 +706,11 @@ 一時保存した提出情報を開く - - 51, 20 + + 53, 20 - - ファイル + + マスター 280, 22 @@ -733,17 +739,17 @@ ミドルウェアリストのみを作成する(HTML形式) - - 53, 20 - - - マスター + + ROM基本情報 このタブの情報は編集不可です。データに誤りがある場合にはROMデータの作成時の設定を見直してください。 - - ROM基本情報 + + TWL拡張情報 + + + DSiメニュー上での起動制限 173, 12 @@ -751,26 +757,20 @@ DSiメニュー上での通信アイコン表示 - - DSiメニュー上での起動制限 - このタブの情報は編集不可です。データに誤りがある場合にはROMデータの作成時の設定を見直してください。 TWL拡張諸フラグ - - TWL拡張情報 + + DSiウェア情報 このタブの情報はDSiウェア(NANDアプリ)によって使用されるTWL本体内のNAND領域のサイズを確認する場合に必要です。<newline>アプリがゲームカード向けの場合にはNAND使用サイズの確認は必要ありません。 - - 38, 12 - - - ブロック + + DSiウェアによって使用されるNAND領域のサイズ 154, 23 @@ -781,15 +781,6 @@ ROM内登録情報 - - 154, 224 - - - 99, 12 - - - (1ブロック = 128KB) - 296, 23 @@ -799,15 +790,6 @@ 使用NANDサイズ - - 165, 210 - - - 74, 12 - - - 使用ブロック数 - 18, 44 @@ -847,11 +829,11 @@ その他ファイルサイズ - - DSiウェアによって使用されるNAND領域のサイズ + + リージョンとレーティング(要入力) - - DSiウェア情報 + + その他ROM仕様 210, 16 @@ -865,26 +847,23 @@ 写真交換対応 - - その他ROM仕様 - 読み込み時の設定に戻す このタブの各項目への入力は提出確認書およびマスターROMの作成のために必要です。<newline>これらの情報はマスターROMの作成時にROM内登録データとして登録されます(「その他ROM仕様」を除く)。 + + リージョンとレーティング情報 + 235, 16 レーティング表示不要 (ツール類のみ選択可) - - リージョンとレーティング情報 - - - リージョンとレーティング(要入力) + + 提出情報(要入力) (30文字以内) @@ -892,6 +871,9 @@ このタブの情報は提出確認書の作成に必要です。入力してください。 + + 海外版 + (30文字以内) @@ -901,21 +883,21 @@ (複数ある場合のみ) - - 海外版 - - - 提出情報(要入力) + + 会社情報(要入力) このタブの情報は提出確認書の作成に必要です。入力してください。 - - 会社情報(要入力) + + エラー情報 このタブには読み込んだROMデータの問題と本プログラムでの入力ミスが列挙されます。<newline>赤文字の項目は、本プログラムで修正不可です。ROMデータ作成時の設定をご確認ください。<newline>青文字の項目は、本プログラムで修正できますが、修正がマスターROMに反映されます。<newline>黒文字の項目は、提出確認書にのみ反映され、マスターROMには反映されません。 + + いつの情報を表示するか + 114, 16 @@ -928,9 +910,6 @@ ROMデータ読み込み時 - - いつの情報を表示するか - 339, 12 @@ -967,9 +946,6 @@ 要因 - - エラー情報 - 92, 12 diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX index 6268230..907e453 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX @@ -117,9 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - gboxTWLExInfo - gboxSrl @@ -167,9 +164,6 @@ 2 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 10 @@ -191,6 +185,9 @@ gboxTWLExInfo + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 10 @@ -212,9 +209,6 @@ 3 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Europe and Australia @@ -227,12 +221,6 @@ 24, 99 - - tboxNormalRomOffset - - - 155, 224 - labShared2Size0 @@ -317,9 +305,6 @@ 66, 125 - - stripMaster - gboxNandSize @@ -414,15 +399,15 @@ Enable Temp App Jump - - True - 374, 145 aged 6 or older + + tabMain + 15, 74 @@ -460,7 +445,7 @@ 41 - 26 + 22 17 @@ -534,9 +519,6 @@ TWL Extended Flags - - 1 - 109, 106 @@ -583,7 +565,7 @@ 42, 19 - 316, 59 + 310, 65 0 @@ -612,9 +594,6 @@ 15 - - 52, 20 - tabSubmitInfo @@ -636,9 +615,6 @@ 8 - - 292, 210 - 12 @@ -678,9 +654,6 @@ 40 - - System.Windows.Forms.ToolStripMenuItem, 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 @@ -732,8 +705,11 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 225, 62 + + gboxSrl + + + 5 66, 75 @@ -747,9 +723,6 @@ 96, 19 - - 12 - labProductCode1Foreign @@ -786,6 +759,12 @@ labSubmitVer + + 1 + + + 67, 16 + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -816,8 +795,8 @@ 15 - - gboxParental + + 94, 19 gboxNandSize @@ -922,7 +901,7 @@ gboxForeign - 5 + 4 Error of Timing @@ -948,9 +927,6 @@ NoControl - - gboxNandSize - 4 @@ -988,7 +964,7 @@ gboxParental - 104, 84 + 104, 104 89, 19 @@ -1095,23 +1071,20 @@ 198, 18 - - gboxNandSize - NoControl True - - 66, 100 + + 153, 41 True - - 2 + + 3 23 @@ -1134,9 +1107,6 @@ 7 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 12 @@ -1150,7 +1120,7 @@ labIsCodec - 7 + 6 2 @@ -1171,7 +1141,7 @@ menuStrip1 - 12 + 10 58, 12 @@ -1203,8 +1173,8 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 27, 12 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 labBracketL @@ -1251,8 +1221,8 @@ 3 - - 3 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 37, 12 @@ -1260,18 +1230,12 @@ 6, 18 - - 11 - 2 Orignal Size - - tboxShopBlock - 5 @@ -1290,9 +1254,6 @@ 0 - - gboxNandSize - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1329,17 +1290,14 @@ 3 - - Right - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 46, 19 - - 8 + + stripMaster 82, 18 @@ -1389,9 +1347,6 @@ True - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 125, 19 @@ -1425,9 +1380,6 @@ A (All ages) - - 94, 19 - 2 @@ -1539,8 +1491,8 @@ (Arbitrary) - - tboxFax1 + + 89, 19 3 @@ -1590,9 +1542,6 @@ 66, 12 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tboxTel1 @@ -1623,9 +1572,6 @@ True - - B (aged 12 or older) - 6 @@ -1653,8 +1599,8 @@ True - - 67, 16 + + tboxFax1 18, 19 @@ -1731,12 +1677,15 @@ 36 - - 1 + + tboxIsGameCardOn 165, 68 + + 23, 152 + labCompany2 @@ -1800,9 +1749,6 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - gboxNandSize - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1890,6 +1836,9 @@ 1 + + 5 + TWL Extended Info @@ -1902,9 +1851,6 @@ Right - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 6 @@ -1936,7 +1882,7 @@ 10 - 24 + 20 gboxParental @@ -1960,17 +1906,14 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 19 + 17 - - gboxSrl + + aged 16 or older 261, 19 - - labShopBlock - labCompany1 @@ -2037,8 +1980,8 @@ h - - 53, 91 + + This tab is for checking ROM data. When ROM data is illegal, please check settings of building ROM data. 25, 12 @@ -2127,11 +2070,8 @@ gboxTitleID - - 36, 20 - - - 153, 41 + + 52, 20 9 @@ -2166,6 +2106,9 @@ gboxSrl + + 12, 78 + NoControl @@ -2175,11 +2118,11 @@ gboxNandSize - - 4 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - aged 18 or older + + 66, 175 116, 56 @@ -2194,7 +2137,7 @@ Use Shared2 Files - 25 + 21 gboxParental @@ -2271,6 +2214,9 @@ 37 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 16 @@ -2364,9 +2310,6 @@ 4 - - labShopBlock2 - 5 @@ -2394,9 +2337,6 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 95, 12 - Make a set of submission data @@ -2410,7 +2350,7 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 16 + 14 15, 56 @@ -2445,8 +2385,8 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 66, 200 + + True colErrorName @@ -2485,7 +2425,7 @@ 1 - 9 + 8 12, 93 @@ -2511,8 +2451,8 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + 0 377, 88 @@ -2604,9 +2544,6 @@ 300 - - 0 - aged 18 or older @@ -2646,9 +2583,6 @@ tboxTitleIDHi - - 13, 169 - False @@ -2818,7 +2752,7 @@ 14, 40 - 11 + 9 System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -2829,6 +2763,9 @@ 5 + + Right + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -2952,6 +2889,9 @@ 17, 12 + + 8 + CRC @@ -2973,24 +2913,15 @@ 8 - - True - tboxGuideRomInfo All ages - - 24 - 38, 19 - - tboxIsGameCardOn - 4 @@ -3039,8 +2970,8 @@ gboxPerson2 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0, 0 System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -3078,6 +3009,9 @@ True + + 2 + tabRomInfo @@ -3099,8 +3033,8 @@ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 40, 12 + + tboxSubBannerSizeFS labSDK @@ -3157,7 +3091,7 @@ ESRB - 27 + 23 35 @@ -3234,9 +3168,6 @@ CODEC Mode - - aged 16 or older - stripItemSepMaster1 @@ -3297,6 +3228,9 @@ 101, 252 + + tboxSumSizeMB + tabSubmitInfo @@ -3321,8 +3255,8 @@ 12 - - Right + + aged 18 or older 12 @@ -3378,8 +3312,8 @@ 94, 19 - - 70, 12 + + 225, 102 3 @@ -3480,8 +3414,8 @@ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Right + + gboxNandSize 0 @@ -3492,9 +3426,6 @@ 0 - - 7 - tabTWLInfo @@ -3552,9 +3483,6 @@ 36 - - True - 40 @@ -3627,9 +3555,6 @@ 18, 214 - - 167, 210 - 120, 16 @@ -3661,7 +3586,7 @@ 109, 134 - 31 + 27 gboxNandSize @@ -3684,8 +3609,8 @@ Rating Pending - - 39, 144 + + tabSubmitInfo Rating @@ -3783,6 +3708,9 @@ True + + 4 + True @@ -3831,9 +3759,6 @@ True - - 29 - rUsageDst @@ -3849,6 +3774,9 @@ gboxProd + + Unnecessary Rating (Available Only Tool App) + labNormalRomOffset @@ -3861,8 +3789,8 @@ 45, 12 - - tabMain + + labProductCode1 35, 12 @@ -3975,8 +3903,8 @@ 13 - - True + + 39, 144 777, 482 @@ -3994,7 +3922,7 @@ gboxSrl - 18 + 16 System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -4020,8 +3948,8 @@ 445, 60 - - tboxSumSize + + 96, 19 tabErrorInfo @@ -4032,8 +3960,8 @@ Release Ver. - - 4 + + 1 Input Contact2 @@ -4056,8 +3984,8 @@ 6 - - 18, 94 + + 27, 12 tabRomEditInfo @@ -4077,6 +4005,9 @@ gboxShared2Size + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 89, 19 @@ -4117,7 +4048,7 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 13 + 11 288, 22 @@ -4281,14 +4212,14 @@ All ages - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 6, 21 122, 19 - 22 + 19 225, 161 @@ -4386,8 +4317,8 @@ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 0 + + None 8Mbit FLASH @@ -4395,8 +4326,8 @@ 4Mbit FLASH - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 2Mbit FLASH 256Kbit FRAM @@ -4480,7 +4411,7 @@ (NAND Size Used by the ROM) - 17 + 15 tabRomEditInfo @@ -4492,7 +4423,7 @@ 14, 19 - 194, 62 + 194, 68 101, 96 @@ -4533,9 +4464,6 @@ 5 - - True - 37, 12 @@ -4629,17 +4557,14 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - PEGI Portugal - 292, 91 0 - - 66, 175 + + True tboxCaptionEx @@ -4687,7 +4612,7 @@ $this - 30 + 26 13, 44 @@ -4770,12 +4695,12 @@ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 20 - cboxReleaseForeign + + 225, 62 + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -4803,8 +4728,8 @@ Other - - 4 + + Submission Ver. stripItemOpenRom @@ -4863,17 +4788,11 @@ 52, 166 - - tboxSubBannerSizeFS - 6 - - 179, 47 - - 28 + 24 Right @@ -4887,9 +4806,6 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 89, 19 - Right @@ -4920,9 +4836,6 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Submission Ver. - ROM Size @@ -4965,20 +4878,17 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - gboxNandSize - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 gboxAccess - - 109, 162 + + 12 - 14 + 12 gboxParental @@ -5001,6 +4911,9 @@ combOFLC + + 36, 20 + 50 @@ -5079,6 +4992,9 @@ rUsageSale + + 18, 94 + 0 @@ -5094,8 +5010,8 @@ 4 - - 5 + + 1 3 @@ -5127,21 +5043,18 @@ tboxFurigana2 - - 94, 19 + + 8 - - 12, 78 + + 66, 100 - 15 + 13 271, 6 - - labShopBlockUnit - → @@ -5160,8 +5073,8 @@ 19 - - tboxSumSizeMB + + gboxTWLExInfo NoControl @@ -5175,17 +5088,14 @@ ROM Type - - 96, 19 - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 1 - - tabSubmitInfo + + 109, 162 tboxConnectIcon @@ -5457,6 +5367,9 @@ labCapSubmitVer + + 53, 91 + 15 @@ -5503,7 +5416,7 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 21 + 18 Sum of Above Files @@ -5640,17 +5553,14 @@ 0 - - labProductCode1 + + tboxNormalRomOffset gboxNandSize - - 10 - - - 6, 21 + + True TEL @@ -5715,8 +5625,8 @@ True - - True + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 labLib @@ -5814,8 +5724,8 @@ Launch Date - - 225, 102 + + B (aged 12 or older) 9 @@ -5892,15 +5802,9 @@ System.Windows.Forms.ToolStripMenuItem, 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 - 2 - - 8 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -5940,6 +5844,9 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 66, 200 + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -6022,7 +5929,7 @@ stripItemSepFile1 - 6 + 5 System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -6030,9 +5937,6 @@ 4 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - False @@ -6063,8 +5967,8 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + 13, 169 NTSC @@ -6111,8 +6015,8 @@ 6, 12 - - 12 + + True File @@ -6138,9 +6042,6 @@ 9 - - 392, 213 - gboxNandSize @@ -6195,21 +6096,12 @@ 12 - - 23 - colWarnEnd - - Blocks - 25 - - 8 - Open a ROM data file @@ -6240,9 +6132,15 @@ 1 + + 4 + 39 + + gboxParental + 251, 171 @@ -6312,8 +6210,8 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 5 + + 25 True @@ -6325,7 +6223,7 @@ 2 - 8 + 7 labProductNameLimit @@ -6423,17 +6321,17 @@ Other - - None + + True 6, 45 - - (1Block = 128KB) + + 179, 47 - - 2Mbit FLASH + + PEGI Portugal tabSubmitInfo @@ -6453,9 +6351,6 @@ 38, 12 - - This tab is for checking ROM data. When ROM data is illegal, please check settings of building ROM data. - 26 @@ -6495,8 +6390,8 @@ 109, 190 - - e-mail + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 gboxPerson1 @@ -6504,14 +6399,11 @@ MiddleRight - - True - labSumSize2 - 522, 245 + 522, 214 167, 22 @@ -6531,8 +6423,8 @@ 4, 21 - - Unnecessary Rating (Available Only Tool App) + + 11 gboxPerson2 @@ -6570,8 +6462,8 @@ 66, 200 - - 29 + + True True @@ -6669,6 +6561,9 @@ 2 + + e-mail + Game Title @@ -6702,6 +6597,9 @@ 3 + + tboxSumSize + gboxUsage @@ -6828,8 +6726,8 @@ 6, 50 - - Used Blocks + + 12 True @@ -6843,8 +6741,8 @@ Right - - 23, 152 + + Right System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -6888,9 +6786,6 @@ 4Kbit EEPROM - - True - tabRomInfo diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp index 386ab66..7081f3e 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp @@ -358,12 +358,9 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname ) //resources->ApplyResources(this->tboxGuideDLCategory, L"tboxGuideDLCategory"); //resources->ApplyResources(this->gboxDLCategory, L"gboxDLCategory"); resources->ApplyResources(this->tboxGuideNandSizeInfo, L"tboxGuideNandSizeInfo"); - resources->ApplyResources(this->labShopBlockUnit, L"labShopBlockUnit"); resources->ApplyResources(this->gboxNandSize, L"gboxNandSize"); resources->ApplyResources(this->labNandSize, L"labNandSize"); - resources->ApplyResources(this->labShopBlock2, L"labShopBlock2"); resources->ApplyResources(this->labNandSizeFS, L"labNandSizeFS"); - resources->ApplyResources(this->labShopBlock, L"labShopBlock"); resources->ApplyResources(this->labSrlSize, L"labSrlSize"); resources->ApplyResources(this->labSumSize2, L"labSumSize2"); resources->ApplyResources(this->labSumSize, L"labSumSize"); diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp index 8e41ecd..1ce22b9 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp @@ -128,7 +128,6 @@ void Form1::setSrlForms(void) this->tboxSumSize->Text = MasterEditorTWL::transSizeToStringKB( this->hSrl->hNandUsedSize->NandUsedSize ); //this->tboxSumSizeMB->Text = MasterEditorTWL::transSizeToStringMB( this->hSrl->hNandUsedSize->NandUsedSize, 2 ); this->tboxSumSizeMB->Text = MasterEditorTWL::transSizeToStringMB( this->hSrl->hNandUsedSize->NandUsedSize ); - this->tboxShopBlock->Text = this->hSrl->hNandUsedSize->NandUsedSizeBlock.ToString(); // Av if( this->hSrl->IsMediaNand ) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp index 6bcb5b3..0c5c7de 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp @@ -530,10 +530,6 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( //node->FirstChild->Value = MasterEditorTWL::transSizeToStringMB( hSrl->hNandUsedSize->NandUsedSize, 2 ); node->FirstChild->Value = MasterEditorTWL::transSizeToStringMB( hSrl->hNandUsedSize->NandUsedSize ); } - if( node->FirstChild->Value->Equals( "TagHWBlocks" ) ) - { - node->FirstChild->Value = hSrl->hNandUsedSize->NandUsedSizeBlock.ToString(); - } // SRLɓo^ȂROMdl if( node->FirstChild->Value->Equals( "TagIsUGC" ) ) diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/sheet_templete.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/sheet_templete.xml index c34e69a..5a11fec 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/sheet_templete.xml +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/sheet_templete.xml @@ -69,13 +69,14 @@ - -