From 083e879782a0db81410088c1c361ba37fbeb2344 Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Tue, 7 Jul 2009 08:38:29 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=9E=E3=82=B9=E3=82=BF=E3=82=A8=E3=83=87?= =?UTF-8?q?=E3=82=A3=E3=82=BF:=E4=B8=AD=E5=9B=BD=E3=82=A2=E3=83=97?= =?UTF-8?q?=E3=83=AA=E7=94=A8=E3=81=AB=E3=80=8C=E3=83=AC=E3=83=BC=E3=83=86?= =?UTF-8?q?=E3=82=A3=E3=83=B3=E3=82=B0=E8=A1=A8=E7=A4=BA=E4=B8=8D=E8=A6=81?= =?UTF-8?q?=E3=80=8D=E3=83=95=E3=83=A9=E3=82=B0=E3=81=AE=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6=E3=81=AE=E3=83=A1=E3=83=83?= =?UTF-8?q?=E3=82=BB=E3=83=BC=E3=82=B8=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F=E3=80=82?= =?UTF-8?q?=E9=9B=91=E5=A4=9A=E3=81=AA=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E3=80=82=E6=8F=90=E5=87=BA=E7=A2=BA=E8=AA=8D=E6=9B=B8?= =?UTF-8?q?=E3=81=AE=E6=9B=B8=E9=A1=9E=E7=95=AA=E5=8F=B7=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlToolsRED@359 7061adef-622a-194b-ae81-725974e89856 --- .../MasterEditorTWL/MasterEditorTWL.ncb | Bin 13937664 -> 13937664 bytes .../MasterEditorTWL/MasterEditorTWL.suo | Bin 83968 -> 83968 bytes .../MasterEditorTWL/Debug/BuildLog.htm | Bin 23956 -> 23956 bytes .../MasterEditorTWL/Form1.en.resx | 98 +- .../MasterEditorTWL/MasterEditorTWL/Form1.h | 88 +- .../MasterEditorTWL/Form1.ja.resx | 151 +- .../MasterEditorTWL/Form1.resX | 3146 +++- .../MasterEditorTWL/Form_lang.cpp | 12 +- .../MasterEditorTWL/Form_pctl.cpp | 3 + .../MasterEditorTWL/srl_mrc.cpp | 42 +- .../MasterEditorTWLSetup.vdproj | 110 +- .../MasterEditorTWL/resource/mrc_msg_e.xml | Bin 56268 -> 58228 bytes .../MasterEditorTWL/resource/mrc_msg_j.xml | 20 + .../resource/sheet_template_en.xml | 9914 ++++++------- .../resource/sheet_template_jp.xml | 11798 ++++++++-------- 15 files changed, 13702 insertions(+), 11680 deletions(-) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index d6a25f8e6acef3b25bf3c4f9b06d9cde638656f3..d80db0b1126e86da10bcbbfa471d589daaa2b715 100644 GIT binary patch delta 42278 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�^}idIEg!ThBQ{&r>iM~|oR0BH{`f>H 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 delta 18061 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 diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index 6505bcd0d8fc188a73202af8cec478b36ad7f4b7..da9c340e47ce83cd25cc625c5665094a5a006715 100644 GIT binary patch delta 6474 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 W>27M8w;)NCSC?m~;-I&)l>I*-lXy!2 delta 4582 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 Enter Contact 2 (optional) + + Contact 2 + 55, 12 @@ -316,8 +319,14 @@ (Optional) - - Contact 2 + + 39, 12 + + + E-mail + + + Contact 1 55, 12 @@ -337,21 +346,18 @@ E-mail - - Contact 1 - Usage + + Submission Method + 67, 16 By Hand - - Submission Method - 9, 143 @@ -391,15 +397,15 @@ 9, 74 + + Shared 2 File Size + 130, 16 Use of Shared 2 File - - Shared 2 File Size - 161, 12 @@ -454,6 +460,9 @@ Permit Tmp Jump Landing + + Access Control Information + 128, 12 @@ -466,9 +475,6 @@ Other - - Access Control Information - 16, 79 @@ -541,11 +547,17 @@ Create middleware list only (HTML format) + + Basic ROM Info + Information on this tab cannot be edited. If data errors exist, review the ROM's build settings. - - Basic ROM Info + + TWL Extended Info + + + Launch Control on DSi Menu 198, 12 @@ -553,18 +565,18 @@ Display Connection Icon on DSi Menu - - Launch Control on DSi Menu - Information on this tab cannot be edited. If data errors exist, review the ROM's build settings. - - TWL Extended Info + + DSiWare Info Information on this tab is required to confirm the amount of space a given Nintendo DSiWare title (NAND application) uses in the system memory. <newline>If the media of the application is a Game Card, there is no need to check the amount of system memory used. + + Amount of System NAND Memory Used by DSiWare Application + 154, 23 @@ -628,11 +640,11 @@ Other - - Amount of System NAND Memory Used by DSiWare Application + + Market and Rating *** - - DSiWare Info + + Other ROM Specifications 227, 16 @@ -640,15 +652,15 @@ UGC (User Generated Content) Support - - Other ROM Specifications - Restore Initial Settings You must complete all items on this tab to create a submission checklist and Master ROM. <newline>This information is used as ROM registration data when the Master ROM is created (excluding "Other ROM Specifications"). + + Market and Rating Information + All @@ -667,11 +679,8 @@ Rating Not Required (Tools Only) - - Market and Rating Information - - - Market and Rating *** + + Submission Info *** (100 characters or less) @@ -679,6 +688,9 @@ You must complete all items on this tab to create a submission checklist. + + Foreign Version + (100 characters or less) @@ -688,30 +700,27 @@ (When for >1 market) - - Foreign Version - - - Submission Info *** + + Company Info *** You must complete all items on this tab to create a submission checklist. Enter all information. - - Company Info *** + + Error Info This tab lists problems in the ROM data file and editing mistakes made when using this program. <newline>Items in red cannot be corrected using this program. You must modify the ROM build settings. <newline>Items in blue indicate problems with the ROM data that can be can corrected using this program. <newline>Items in black indicate errors or omissions in the Submission Info and Company Info tabs. + + Display Information From + 121, 16 Apply current input - - Display Information From - 466, 12 @@ -736,7 +745,4 @@ Start - - Error Info - \ No newline at end of file diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h index 27a6eed..b4fd8e5 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -711,6 +711,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ stripItemErrorListCurrent; private: System::Windows::Forms::ToolStripSeparator^ toolStripSeparator1; private: System::Windows::Forms::ToolStripMenuItem^ stripItemRomInfoAndErrorListRead; private: System::Windows::Forms::ToolStripMenuItem^ stripItemRomInfoAndErrorListCurrent; +private: System::Windows::Forms::TextBox^ tboxWarningChinaRating; @@ -872,11 +873,11 @@ private: System::Windows::Forms::ToolStripMenuItem^ stripItemRomInfoAndErrorLis 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()); @@ -1122,6 +1123,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ stripItemRomInfoAndErrorLis this->labSubBannerSize = (gcnew System::Windows::Forms::Label()); this->labTmdSize = (gcnew System::Windows::Forms::Label()); this->tabRomEditInfo = (gcnew System::Windows::Forms::TabPage()); + this->tboxWarningChinaRating = (gcnew System::Windows::Forms::TextBox()); this->gboxOtherSpec = (gcnew System::Windows::Forms::GroupBox()); this->cboxIsUGC = (gcnew System::Windows::Forms::CheckBox()); this->cboxIsPhotoEx = (gcnew System::Windows::Forms::CheckBox()); @@ -2498,15 +2500,15 @@ private: System::Windows::Forms::ToolStripMenuItem^ stripItemRomInfoAndErrorLis 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; resources->ApplyResources(this->gridSDK, L"gridSDK"); this->gridSDK->Name = L"gridSDK"; this->gridSDK->ReadOnly = true; @@ -2528,15 +2530,15 @@ private: System::Windows::Forms::ToolStripMenuItem^ stripItemRomInfoAndErrorLis 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; resources->ApplyResources(this->gridLibrary, L"gridLibrary"); this->gridLibrary->Name = L"gridLibrary"; this->gridLibrary->ReadOnly = true; @@ -2801,6 +2803,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ stripItemRomInfoAndErrorLis // // tabRomEditInfo // + this->tabRomEditInfo->Controls->Add(this->tboxWarningChinaRating); this->tabRomEditInfo->Controls->Add(this->gboxOtherSpec); this->tabRomEditInfo->Controls->Add(this->butSetBack); this->tabRomEditInfo->Controls->Add(this->tboxGuideRomEditInfo); @@ -2809,6 +2812,12 @@ private: System::Windows::Forms::ToolStripMenuItem^ stripItemRomInfoAndErrorLis this->tabRomEditInfo->Name = L"tabRomEditInfo"; this->tabRomEditInfo->UseVisualStyleBackColor = true; // + // tboxWarningChinaRating + // + this->tboxWarningChinaRating->BackColor = System::Drawing::SystemColors::InactiveCaptionText; + resources->ApplyResources(this->tboxWarningChinaRating, L"tboxWarningChinaRating"); + this->tboxWarningChinaRating->Name = L"tboxWarningChinaRating"; + // // gboxOtherSpec // this->gboxOtherSpec->Controls->Add(this->cboxIsUGC); @@ -3038,15 +3047,15 @@ private: System::Windows::Forms::ToolStripMenuItem^ stripItemRomInfoAndErrorLis 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->GridColor = System::Drawing::SystemColors::Control; resources->ApplyResources(this->gridWarn, L"gridWarn"); this->gridWarn->Name = L"gridWarn"; @@ -3081,22 +3090,22 @@ private: System::Windows::Forms::ToolStripMenuItem^ stripItemRomInfoAndErrorLis // // gridError // - dataGridViewCellStyle4->BackColor = System::Drawing::Color::White; - this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle9->BackColor = System::Drawing::Color::White; + this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9; this->gridError->AutoSizeRowsMode = System::Windows::Forms::DataGridViewAutoSizeRowsMode::AllCellsExceptHeaders; this->gridError->BackgroundColor = System::Drawing::SystemColors::Control; 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->GridColor = System::Drawing::SystemColors::Control; resources->ApplyResources(this->gridError, L"gridError"); this->gridError->Name = L"gridError"; @@ -4534,6 +4543,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ stripItemRomInfoAndErrorLis } + }; // 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 2bc0391..49aa720 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx @@ -117,9 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ROMデータ情報 - 73, 12 @@ -172,6 +169,9 @@ リマスターバージョン + + ROMデータ情報 + 20, 20 @@ -382,9 +382,6 @@ 担当者2を入力する(任意) - - 担当者2 - 37, 12 @@ -403,6 +400,12 @@ 部署名 + + 39, 12 + + + E-mail + 51, 12 @@ -421,8 +424,8 @@ 貴社名 - - 担当者1 + + 担当者2 37, 12 @@ -442,6 +445,12 @@ 部署名 + + 39, 12 + + + E-mail + 51, 12 @@ -460,8 +469,8 @@ 貴社名 - - 目的 + + 担当者1 54, 16 @@ -487,8 +496,8 @@ 一般販売用 - - 提出方法 + + 目的 56, 16 @@ -502,6 +511,9 @@ 郵送 + + 提出方法 + 31, 143 @@ -583,15 +595,15 @@ 製品コード - - Shared2ファイルサイズ - 123, 16 Shared2ファイル使用 + + Shared2ファイルサイズ + 70, 12 @@ -604,9 +616,6 @@ SDKバージョン - - TWL拡張情報 - 72, 12 @@ -622,6 +631,9 @@ TWL専用領域ROMオフセット + + TWL拡張情報 + 266, 147 @@ -661,9 +673,6 @@ tmpジャンプ許可 - - アクセスコントロール情報 - 96, 12 @@ -691,6 +700,9 @@ SDカード + + アクセスコントロール情報 + 294, 328 @@ -742,12 +754,6 @@ ROM提出情報 - - 51, 20 - - - ファイル - 211, 22 @@ -769,11 +775,11 @@ 一時保存した提出情報を開く - - 77, 20 + + 51, 20 - - マスター作成 + + ファイル 284, 22 @@ -802,11 +808,11 @@ ミドルウェアリストのみを作成する (HTML形式) - - 71, 20 + + 77, 20 - - エクスポート + + マスター作成 501, 22 @@ -844,23 +850,17 @@ ROM情報とエラー情報を合わせてHTMLファイルに出力する (現在の入力を反映した情報) - - 467, 22 + + 71, 20 - - ROM情報とエラー情報を合わせてHTMLファイルに出力する (ROMデータ読み込み時) - - - ROM基本情報 + + エクスポート このタブの情報は編集不可です。データに誤りがある場合にはROMデータ作成時の設定を見直してください。 - - TWL拡張情報 - - - DSiメニュー上での起動制限 + + ROM基本情報 173, 12 @@ -868,21 +868,21 @@ DSiメニュー上での通信アイコン表示 + + DSiメニュー上での起動制限 + このタブの情報は編集不可です。データに誤りがある場合にはROMデータ作成時の設定を見直してください。 TWL拡張諸フラグ - - DSiウェア情報 + + TWL拡張情報 このタブの情報はDSiウェア(NANDアプリ)による本体NANDメモリ領域の使用量を確認する場合に必要です。<newline>アプリがゲームカード向けの場合にはNANDメモリ使用量の確認は必要ありません。 - - DSiウェアによる本体NANDメモリの使用量 - 154, 23 @@ -943,11 +943,14 @@ その他ファイルサイズ - - リージョンとレーティング(編集可) + + DSiウェアによる本体NANDメモリの使用量 - - その他ROM仕様 + + DSiウェア情報 + + + 中国にはレーティング審査団体が存在しませんが、将来的に団体が設立された場合においてもレーティング表示が不要なタイトルであるときに限り、「レーティング表示不要 (ツール類のみ選択可)」を選択してください。 210, 16 @@ -961,15 +964,15 @@ 写真交換対応 + + その他ROM仕様 + 読み込み時の設定に戻す このタブの各項目への入力は提出確認書およびマスターROMの作成のために必要です。<newline>これらの情報はマスターROMの作成時にROM内登録データとして登録されます(「その他ROM仕様」を除く)。 - - リージョンとレーティング情報 - 全体利用可 @@ -991,8 +994,11 @@ レーティング表示不要 (ツール類のみ選択可) - - 提出情報(要入力) + + リージョンとレーティング情報 + + + リージョンとレーティング(編集可) (100文字以内) @@ -1000,9 +1006,6 @@ このタブの情報は提出確認書の作成に必要です。入力してください。 - - 海外版 - (100文字以内) @@ -1012,21 +1015,21 @@ (複数ある場合のみ) - - 会社情報(要入力) + + 海外版 + + + 提出情報(要入力) このタブの情報は提出確認書の作成に必要です。入力してください。 - - エラー情報 + + 会社情報(要入力) このタブには読み込んだROMデータの問題点と本プログラムでの入力ミスが列挙されます。<newline>赤文字の項目は、本プログラムで修正不可です。ROMデータ作成時の設定をご確認ください。<newline>青文字の項目は、ROMデータの問題点のうち、本プログラムで修正できるものです。<newline>黒文字の項目は、提出情報と会社情報の入力ミスおよび入力漏れです。 - - いつの情報を表示するか - 114, 16 @@ -1039,6 +1042,9 @@ ROMデータ読み込み時 + + いつの情報を表示するか + 339, 12 @@ -1075,6 +1081,9 @@ 要因 + + エラー情報 + 92, 12 diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX index 0b27333..2d366a8 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX @@ -140,6 +140,210 @@ 3 + + tboxRemasterVer + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 0 + + + tboxRomSize + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 1 + + + tboxPlatform + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 2 + + + labPlatform + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 3 + + + tboxRomLatency + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 4 + + + labRomSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 5 + + + labRomType + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 6 + + + tboxMakerCode + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 7 + + + cboxRemasterVerE + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 8 + + + labMakerCode + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 9 + + + labGameCode + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 10 + + + tboxGameCode + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 11 + + + labTitleName + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 12 + + + labRemasterVer + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 13 + + + tboxTitleName + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 14 + + + 26, 52 + + + 285, 227 + + + 3 + + + ROM Info. + + + gboxSrl + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomInfo + + + 3 + 109, 190 @@ -519,30 +723,6 @@ 14 - - 26, 52 - - - 285, 227 - - - 3 - - - ROM Info. - - - gboxSrl - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRomInfo - - - 3 - True @@ -651,6 +831,78 @@ 2 + + labRomCRC + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxCRC + + + 0 + + + labHeaderCRC + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxCRC + + + 1 + + + tboxHeaderCRC + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxCRC + + + 2 + + + tboxWholeCRC + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxCRC + + + 3 + + + 26, 285 + + + 285, 49 + + + 5 + + + CRC + + + gboxCRC + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomInfo + + + 7 + True @@ -747,30 +999,6 @@ 3 - - 26, 285 - - - 285, 49 - - - 5 - - - CRC - - - gboxCRC - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRomInfo - - - 7 - True @@ -1437,6 +1665,261 @@ 1 + + labArbit4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 0 + + + labArbit3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 1 + + + labNTSC2Sur + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 2 + + + tboxNTSC2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 3 + + + labFax2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 4 + + + labNTSC2Pre + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 5 + + + tboxFax2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 6 + + + tboxMail2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 7 + + + tboxTel2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 8 + + + tboxFurigana2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 9 + + + tboxPerson2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 10 + + + tboxDepart2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 11 + + + labDepart2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 12 + + + tboxCompany2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 13 + + + labMail2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 14 + + + labTel2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 15 + + + labFurigana2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 16 + + + labPerson2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 17 + + + labCompany2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 18 + + + False + + + 377, 88 + + + 347, 234 + + + 14 + + + Contact2 + + + gboxPerson2 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabCompanyInfo + + + 3 + True @@ -1720,7 +2203,7 @@ 66, 50 - 100 + 200 268, 19 @@ -1771,7 +2254,7 @@ 66, 25 - 100 + 200 268, 19 @@ -1926,32 +2409,257 @@ 18 - - False + + labArbit2 - - 377, 88 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 347, 234 + + gboxPerson1 - + + 0 + + + labArbit1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 1 + + + labNTSC1Sur + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 2 + + + labFax1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 3 + + + labNTSC1Pre + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 4 + + + tboxNTSC1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 5 + + + tboxFax1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 6 + + + tboxMail1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 7 + + + tboxTel1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 8 + + + tboxFurigana1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 9 + + + tboxPerson1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 10 + + + tboxDepart1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 11 + + + labDepart1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 12 + + + tboxCompany1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 13 + + + labMail1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + 14 - - Contact2 + + labTel1 - - gboxPerson2 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + gboxPerson1 + + + 15 + + + labFurigana1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 16 + + + labPerson1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 17 + + + labCompany1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 18 + + + 17, 88 + + + 344, 234 + + + 8 + + + Contact1 + + + gboxPerson1 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tabCompanyInfo - - 3 + + 2 True @@ -2236,7 +2944,7 @@ 66, 50 - 100 + 200 261, 19 @@ -2287,7 +2995,7 @@ 66, 25 - 100 + 200 261, 19 @@ -2442,30 +3150,6 @@ 18 - - 17, 88 - - - 344, 234 - - - 8 - - - Contact1 - - - gboxPerson1 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabCompanyInfo - - - 2 - 175, 81 @@ -2637,6 +3321,90 @@ 14 + + tboxUsageOther + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxUsage + + + 0 + + + rUsageOther + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxUsage + + + 1 + + + rUsageDst + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxUsage + + + 2 + + + rUsageSample + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxUsage + + + 3 + + + rUsageSale + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxUsage + + + 4 + + + 16, 258 + + + 346, 79 + + + 6 + + + Purpose + + + gboxUsage + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabSubmitInfo + + + 8 + False @@ -2772,29 +3540,65 @@ 4 - - 16, 258 + + rSubmitInternet - - 346, 79 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 6 + + gboxSubmitWay - - Purpose + + 0 - - gboxUsage + + rSubmitHand - + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSubmitWay + + + 1 + + + rSubmitPost + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSubmitWay + + + 2 + + + 16, 207 + + + 346, 45 + + + 5 + + + How To Submit + + + gboxSubmitWay + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tabSubmitInfo - - 8 + + 11 True @@ -2877,30 +3681,6 @@ 2 - - 16, 207 - - - 346, 45 - - - 5 - - - How To Submit - - - gboxSubmitWay - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabSubmitInfo - - - 11 - True @@ -3381,6 +4161,186 @@ 4 + + labShared2Size5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 0 + + + labShared2Size4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 1 + + + labShared2Size3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 2 + + + labShared2Size2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 3 + + + labShared2Size1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 4 + + + labShared2Size0 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 5 + + + tboxShared2Size5 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 6 + + + tboxShared2Size4 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 7 + + + tboxShared2Size3 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 8 + + + tboxShared2Size2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 9 + + + tboxShared2Size1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 10 + + + tboxShared2Size0 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 11 + + + cboxIsShared2 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 12 + + + 545, 147 + + + 190, 197 + + + 1 + + + Size of Shared2 Files + + + gboxShared2Size + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 6 + True @@ -3717,30 +4677,6 @@ 12 - - 545, 147 - - - 190, 197 - - - 1 - - - Size of Shared2 Files - - - gboxShared2Size - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabTWLInfo - - - 6 - True @@ -3795,6 +4731,102 @@ 8 + + labByte1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 0 + + + labHex4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 1 + + + tboxIsCodec + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 2 + + + labIsCodec + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 3 + + + labKeyTableRomOffset + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 4 + + + tboxKeyTableRomOffset + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 5 + + + 251, 54 + + + 280, 84 + + + 24 + + + TWL Extended Info + + + gboxTWLExInfo + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 8 + True @@ -3951,30 +4983,6 @@ 5 - - 251, 54 - - - 280, 84 - - - 24 - - - TWL Extended Info - - - gboxTWLExInfo - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabTWLInfo - - - 8 - True @@ -4251,6 +5259,126 @@ 1 + + labSDAccessRight + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 0 + + + tboxSDAccessRight + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 1 + + + tboxPhotoAccess + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 2 + + + labPhotoAccess + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 3 + + + labAccessOther + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 4 + + + tboxAccessOther + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 5 + + + cboxIsNAND + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 6 + + + cboxIsSD + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 7 + + + 251, 171 + + + 280, 154 + + + 0 + + + Access Control + + + gboxAccess + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 9 + True @@ -4461,30 +5589,6 @@ 7 - - 251, 171 - - - 280, 154 - - - 0 - - - Access Control - - - gboxAccess - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabTWLInfo - - - 9 - True @@ -4572,6 +5676,138 @@ 7 + + labAppType + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 0 + + + tboxAppType + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 1 + + + labHex2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 2 + + + tboxTitleIDLo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 3 + + + labTitleIDLo + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 4 + + + labTitleIDHi + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 5 + + + tboxTitleIDHi + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 6 + + + tboxAppTypeOther + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 7 + + + labAppTypeOther + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 8 + + + 12, 54 + + + 225, 161 + + + 23 + + + TitleID + + + gboxTitleID + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 10 + True @@ -4803,30 +6039,6 @@ 8 - - 12, 54 - - - 225, 161 - - - 23 - - - TitleID - - - gboxTitleID - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabTWLInfo - - - 10 - True @@ -4959,6 +6171,36 @@ 0, 0 + + 0, 0 + + + 777, 24 + + + 33 + + + menuStrip1 + + + menuStripAbove + + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + 36, 20 + + + File + 274, 22 @@ -4980,11 +6222,11 @@ Load a temporary info. saved previously - - 36, 20 + + 52, 20 - - File + + Master 288, 22 @@ -5013,11 +6255,11 @@ Make a middleware list only(HTML format) - - 52, 20 + + 50, 20 - - Master + + Export 465, 22 @@ -5055,11 +6297,11 @@ Export both ROM info and error info to HTML file (apply current input) - - 50, 20 + + 65, 20 - - Export + + Language 119, 22 @@ -5073,35 +6315,605 @@ Japanese - - 65, 20 + + gridSDK - - Language + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 0 + + tabRomInfo - - 777, 24 + + 0 - + + gridLibrary + + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomInfo + + + 1 + + + tboxGuideRomInfo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomInfo + + + 2 + + + 4, 21 + + + 3, 3, 3, 3 + + + 745, 367 + + + 0 + + + ROM Info. + + + tabRomInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 0 + + + gboxLaunch + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 0 + + + tboxGuideTWLInfo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 1 + + + gboxExFlags + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 5 + + + 4, 21 + + + 3, 3, 3, 3 + + + 745, 367 + + + 1 + + + TWL Info. + + + tabTWLInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 1 + + + tboxGuideNandSizeInfo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabNandSizeInfo + + + 0 + + + gboxNandSize + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabNandSizeInfo + + + 3 + + + 4, 21 + + + 745, 367 + + + 6 + + + DSi Ware Info. + + + tabNandSizeInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 2 + + + 445, 233 + + + True + + + 266, 86 + + + 42 + + + In China, any rating organizations have not been established yet. In case such organization is established, select a "Rating Not Required (Tool Only)" if rating doesn't have to be displayed. + + + False + + + tboxWarningChinaRating + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomEditInfo + + + 0 + + + cboxIsUGC + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxOtherSpec + + + 0 + + + cboxIsPhotoEx + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxOtherSpec + + + 1 + + + 445, 60 + + + 266, 90 + + + 41 + + + Other ROM Spec. + + + gboxOtherSpec + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomEditInfo + + + 1 + + + 483, 185 + + + 185, 23 + + + 38 + + + Set Back to Initial Settings + + + butSetBack + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomEditInfo + + + 2 + + + 24, 11 + + + True + + + 687, 34 + + + 37 + + + These item is necessary not only to make a submission sheet but also to make a master ROM data. Please edit certainly.<newline>In making a master ROM data, these info will be registered in the ROM data(except "Other Rom Spec"). + + + tboxGuideRomEditInfo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomEditInfo + + + 3 + + + labGRB + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxParental + + + 0 + + + combGRB + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxParental + + + 1 + + + cboxIsUnnecessaryRating + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxParental + + + 2 + + + 24, 60 + + + 398, 299 + + 33 - - menuStrip1 + + Region and Rating Infomation - - menuStripAbove + + gboxParental - - System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + tabRomEditInfo + + + 4 + + + 4, 21 + + + 745, 367 + + + 2 + + + Region and Ratings (Editable) + + + tabRomEditInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 3 + + + labProductNameLimit + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabSubmitInfo + + + 0 + + + tboxGuideSubmitInfo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabSubmitInfo + + + 1 + + + gboxForeign + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabSubmitInfo + + + 2 + + + 4, 21 + + + 745, 367 + + + 3 + + + Submission Info.(Editable) + + + tabSubmitInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 4 + + + tboxGuideCompanyInfo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabCompanyInfo + + + 0 + + + 4, 21 + + + 745, 367 + + + 4 + + + Company Info.(Editable) + + + tabCompanyInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 5 + + + tboxGuideErrorInfo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 0 + + + gboxErrorTiming + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 1 + + + labWarn + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 2 + + + labError + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 3 + + + gridWarn + + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 4 + + + gridError + + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 5 + + + 4, 21 + + + 745, 367 + + + 5 + + + Error Info. + + + tabErrorInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 6 + + + 12, 93 + + + 753, 392 + + + 34 + + + tabMain + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - 4 + + 2 True @@ -5187,31 +6999,52 @@ 2 - - 4, 21 + + labConnectIcon - - 3, 3, 3, 3 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 745, 367 + + gboxLaunch - + 0 - - ROM Info. + + tboxConnectIcon - - tabRomInfo + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gboxLaunch - - tabMain + + 1 - + + 12, 226 + + + 225, 99 + + + 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 @@ -5262,30 +7095,6 @@ 1 - - 12, 226 - - - 225, 99 - - - 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 @@ -5334,33 +7143,6 @@ 5 - - 4, 21 - - - 3, 3, 3, 3 - - - 745, 367 - - - 1 - - - TWL Info. - - - tabTWLInfo - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 1 - 24, 11 @@ -5388,6 +7170,318 @@ 0 + + labBracketR + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 0 + + + labBracketL + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 1 + + + tboxSumSizeMB + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 2 + + + tboxSrlSize + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 3 + + + labArrow5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 4 + + + labArrow4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 5 + + + labArrow3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 6 + + + labArrow2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 7 + + + labArrow1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 8 + + + tboxSumSize + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 9 + + + tboxTmdSizeFS + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 10 + + + tboxSubBannerSizeFS + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 11 + + + tboxPrivateSizeFS + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 12 + + + tboxPublicSizeFS + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 13 + + + tboxSrlSizeFS + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 14 + + + tboxTmdSize + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 15 + + + tboxSubBannerSize + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 16 + + + labNandSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 17 + + + labNandSizeFS + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 18 + + + labSrlSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 20 + + + labSumSize2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 22 + + + labSumSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 25 + + + labSubBannerSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 26 + + + labTmdSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 27 + + + 104, 114 + + + 522, 214 + + + 9 + + + NAND Area Size Used by the DSi Ware + + + gboxNandSize + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabNandSizeInfo + + + 3 + True @@ -6030,54 +8124,6 @@ 27 - - 104, 114 - - - 522, 214 - - - 9 - - - NAND Area Size Used by the DSi Ware - - - gboxNandSize - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabNandSizeInfo - - - 3 - - - 4, 21 - - - 745, 367 - - - 6 - - - DSi Ware Info. - - - tabNandSizeInfo - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 2 - True @@ -6132,81 +8178,6 @@ 1 - - 445, 60 - - - 266, 90 - - - 41 - - - Other ROM Spec. - - - gboxOtherSpec - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRomEditInfo - - - 0 - - - 483, 185 - - - 185, 23 - - - 38 - - - Set Back to Initial Settings - - - butSetBack - - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRomEditInfo - - - 1 - - - 24, 11 - - - True - - - 687, 34 - - - 37 - - - These item is necessary not only to make a submission sheet but also to make a master ROM data. Please edit certainly.<newline>In making a master ROM data, these info will be registered in the ROM data(except "Other Rom Spec"). - - - tboxGuideRomEditInfo - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRomEditInfo - - - 2 - True @@ -6300,54 +8271,6 @@ 2 - - 24, 60 - - - 398, 299 - - - 33 - - - Region and Rating Infomation - - - gboxParental - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRomEditInfo - - - 3 - - - 4, 21 - - - 745, 367 - - - 2 - - - Region and Ratings (Editable) - - - tabRomEditInfo - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 3 - 229, 36 @@ -6399,6 +8322,54 @@ 1 + + labProductNameLimitForeign + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxForeign + + + 0 + + + labMultiForeign2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxForeign + + + 1 + + + 378, 91 + + + 355, 144 + + + 35 + + + Foreign Ver. + + + gboxForeign + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabSubmitInfo + + + 2 + 217, 62 @@ -6453,54 +8424,6 @@ 1 - - 378, 91 - - - 355, 144 - - - 35 - - - Foreign Ver. - - - gboxForeign - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabSubmitInfo - - - 2 - - - 4, 21 - - - 745, 367 - - - 3 - - - Submission Info.(Editable) - - - tabSubmitInfo - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 4 - 24, 11 @@ -6525,30 +8448,6 @@ 0 - - 4, 21 - - - 745, 367 - - - 4 - - - Company Info.(Editable) - - - tabCompanyInfo - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 5 - 24, 11 @@ -6576,6 +8475,54 @@ 0 + + rErrorCurrent + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxErrorTiming + + + 0 + + + rErrorReading + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxErrorTiming + + + 1 + + + 551, 11 + + + 172, 71 + + + 41 + + + Timing of Error + + + gboxErrorTiming + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 1 + True @@ -6630,30 +8577,6 @@ 1 - - 551, 11 - - - 172, 71 - - - 41 - - - Timing of Error - - - gboxErrorTiming - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabErrorInfo - - - 1 - True @@ -6816,51 +8739,6 @@ 5 - - 4, 21 - - - 745, 367 - - - 5 - - - Error Info. - - - tabErrorInfo - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 6 - - - 12, 93 - - - 753, 392 - - - 34 - - - tabMain - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - True diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp index d90e28b..e06cfdc 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp @@ -55,11 +55,11 @@ void Form1::changeFormInput( System::String ^langname ) this->labArbit2->Visible = true; this->labArbit4->Visible = true; - // {łInternetoF߂Ȃ + // {łInternetoF߂Ȃ̂ŕ\ if( this->rSubmitInternet->Checked ) { - this->rSubmitInternet->Checked = false; // \ƂɑIĂ鍀ڂȂ󋵂h - this->rSubmitPost->Checked = true; + this->rSubmitInternet->Checked = false; // InternetIĂƂɕ\ƂǂIĂȂ󋵂ɂȂ̂ + this->rSubmitPost->Checked = true; // Kǂꂩ1‚IĂ悤ɂĂ } this->rSubmitInternet->Enabled = false; this->rSubmitInternet->Visible = false; @@ -481,6 +481,12 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname ) this->setSrlFormsTextBox(); } + // pʃbZ[W + // ftHgVisible=falseȂ̂Ń\[Xǂݍ݂Ȃƕ\ĂĂVisible=falseɏĂ܂ + bool visible = this->tboxWarningChinaRating->Visible; + resources->ApplyResources(this->tboxWarningChinaRating, L"tboxWarningChinaRating"); + this->tboxWarningChinaRating->Visible = visible; + // obNAbṽeLXg{bNX this->combBackup_SelectedIndexChanged( nullptr, nullptr ); this->cboxReleaseForeign_CheckedChanged( nullptr, nullptr ); diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp index 51e6f6b..6867228 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp @@ -231,9 +231,12 @@ void Form1::maskRatingForms(void) this->enableRating( this->combGRB, this->labGRB, nullptr ); // ؃[W͐ݒs‚Ȃ̂œʏ + this->tboxWarningChinaRating->Visible = false; if( (this->combRegion->DropDownStyle == System::Windows::Forms::ComboBoxStyle::DropDown) // R{{bNX؃[WpɂȂĂƂ && this->hSrl->IsRegionChina ) // SRLǂݍ܂Ă邱Ƃ͕ۏ؂ { + this->tboxWarningChinaRating->Visible = true; // p̓ʃbZ[W\ + // Ƀ[eBOĉȂ this->disableRating( this->combCERO, this->labCERO, nullptr ); this->disableRating( this->combESRB, this->labESRB, nullptr ); diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp index c2cd086..8e38b7c 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp @@ -968,6 +968,10 @@ void RCSrl::mrcSDKVersion(FILE *fp) System::Boolean isOldExNTR = false; System::Boolean isPR = false; System::Boolean isRC = false; + System::Boolean isPRExTWL = false; + System::Boolean isRCExTWL = false; + System::Boolean isPRExNTR = false; + System::Boolean isRCExNTR = false; for each( RCSDKVersion ^sdk in this->hSDKList ) { if( sdk->IsStatic ) @@ -986,10 +990,14 @@ void RCSrl::mrcSDKVersion(FILE *fp) u32 major = sdk->Code >> 24; if( major >= 5 ) // TWLSDK { + isPRExTWL = MasterEditorTWL::IsSDKVersionPR( sdk->Code ); + isRCExTWL = MasterEditorTWL::IsSDKVersionRC( sdk->Code ); isOldExTWL = MasterEditorTWL::IsOldSDKVersion( sdk->Code, this->hMrcExternalCheckItems->SDKVerNotStaticTWL, false ); } else // NTRSDK { + isPRExNTR = MasterEditorTWL::IsSDKVersionPR( sdk->Code ); + isRCExNTR = MasterEditorTWL::IsSDKVersionRC( sdk->Code ); isOldExNTR = MasterEditorTWL::IsOldSDKVersion( sdk->Code, this->hMrcExternalCheckItems->SDKVerNotStaticNTR, false ); } } @@ -999,14 +1007,6 @@ void RCSrl::mrcSDKVersion(FILE *fp) { this->hWarnList->Add( this->makeMrcError("SDKVersionOld") ); } - if( isOldExTWL ) - { - this->hWarnList->Add( this->makeMrcError("SDKVersionExModuleTwlOld") ); - } - if( isOldExNTR ) - { - this->hWarnList->Add( this->makeMrcError("SDKVersionExModuleNtrOld") ); - } if( isPR ) { this->hWarnList->Add( this->makeMrcError("SDKVersionPR") ); @@ -1015,7 +1015,31 @@ void RCSrl::mrcSDKVersion(FILE *fp) { this->hWarnList->Add( this->makeMrcError("SDKVersionRC") ); } -} + if( isOldExTWL ) + { + this->hWarnList->Add( this->makeMrcError("SDKVersionExModuleTwlOld") ); + } + if( isPRExTWL ) + { + this->hWarnList->Add( this->makeMrcError("SDKVersionExModuleTwlPR") ); + } + if( isRCExTWL ) + { + this->hWarnList->Add( this->makeMrcError("SDKVersionExModuleTwlRC") ); + } + if( isOldExNTR ) + { + this->hWarnList->Add( this->makeMrcError("SDKVersionExModuleNtrOld") ); + } + if( isPRExNTR ) + { + this->hWarnList->Add( this->makeMrcError("SDKVersionExModuleNtrPR") ); + } + if( isRCExNTR ) + { + this->hWarnList->Add( this->makeMrcError("SDKVersionExModuleNtrRC") ); + } +} //RCSrl::mrcSDKVersion // ------------------------------------------------------------------- // oi[̃`FbN diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj index 5afbe8a..be84da5 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj @@ -21,8 +21,8 @@ } "Entry" { - "MsmKey" = "8:_17DEC7700AB24CF788F16DC2E3CA658B" - "OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4" + "MsmKey" = "8:_0E470F1B3CF44F35ABF4FB16E91A115D" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -39,6 +39,12 @@ } "Entry" { + "MsmKey" = "8:_49104D7177B54D00B4FB0261387DAD61" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_491C89DAB2F34A939F356C47975E7BD0" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -51,14 +57,14 @@ } "Entry" { - "MsmKey" = "8:_66AB9DF4508D46A78B5DD77090E047F2" - "OwnerKey" = "8:_17DEC7700AB24CF788F16DC2E3CA658B" + "MsmKey" = "8:_6EC739CA561443E48045379A268C1657" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6EC739CA561443E48045379A268C1657" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_70AB37BBE8CA43569FBD2939340E73E5" + "OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -93,6 +99,18 @@ } "Entry" { + "MsmKey" = "8:_D76DFCAA5D1E46308791E7C21B146970" + "OwnerKey" = "8:_70AB37BBE8CA43569FBD2939340E73E5" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DAC0F3BBAB014046906FA4ACE74604B7" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_FE56DE664C36410FB05BBF909ADE9DBE" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -103,18 +121,6 @@ "OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4" "MsmSig" = "8:_UNDEFINED" } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_BFEA9BAA0DBF4332913A71EDE89FC3CD" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_7DAFD42678FC4D69A3A6BC6E6726AB10" - "MsmSig" = "8:_UNDEFINED" - } } "Configurations" { @@ -240,6 +246,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0E470F1B3CF44F35ABF4FB16E91A115D" + { + "SourcePath" = "8:..\\resource\\rominfolist.xsl" + "TargetName" = "8:rominfolist.xsl" + "Tag" = "8:" + "Folder" = "8:_99EFE6B595C5432FB4712560C9D29AE5" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_351447BE85794AA58330AD369D8A545D" { "SourcePath" = "8:..\\resource\\gui_msg_j.xml" @@ -280,6 +306,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_49104D7177B54D00B4FB0261387DAD61" + { + "SourcePath" = "8:..\\resource\\middleware_name_list.xml" + "TargetName" = "8:middleware_name_list.xml" + "Tag" = "8:" + "Folder" = "8:_99EFE6B595C5432FB4712560C9D29AE5" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_491C89DAB2F34A939F356C47975E7BD0" { "SourcePath" = "8:..\\resource\\middleware.xsl" @@ -432,6 +478,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DAC0F3BBAB014046906FA4ACE74604B7" + { + "SourcePath" = "8:..\\resource\\errorlist.xsl" + "TargetName" = "8:errorlist.xsl" + "Tag" = "8:" + "Folder" = "8:_99EFE6B595C5432FB4712560C9D29AE5" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FE56DE664C36410FB05BBF909ADE9DBE" { "SourcePath" = "8:..\\resource\\sheet_template_en.xml" @@ -1082,11 +1148,11 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_17DEC7700AB24CF788F16DC2E3CA658B" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_70AB37BBE8CA43569FBD2939340E73E5" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86.msm" + "SourcePath" = "8:policy_9_0_Microsoft_VC90_DebugCRT_x86.msm" "Properties" { } @@ -1096,11 +1162,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_66AB9DF4508D46A78B5DD77090E047F2" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_D76DFCAA5D1E46308791E7C21B146970" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:microsoft_vc90_crt_x86.msm" + "SourcePath" = "8:microsoft_vc90_debugcrt_x86.msm" "Properties" { } diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml index 18bd8ad8c2c3efd0c39156f5c37ab2d94ce552c1..3f093c0a4546e393cd4ea743cb23324079850cda 100644 GIT binary patch delta 251 zcmX@Jo%zc#<_$SIllipRm;)GsCL11BoouI-2WBVg3Qul2D#EJ3kjYRynbF2_a)WQr zWC0zG$w|kQCO7B_fOJj1P90#``HS&*07uYNN&o-= delta 31 pcmV+)0O0@h#skc^1F&o?vp_I50+X1&5R;yW7?aL82(x-N`mE*E4qE^K diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml index fc4b31e..2a15543 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml @@ -115,11 +115,31 @@ 設定ファイルに登録されているバージョンよりも古いモジュールがあります。 00FalseTrue + + SDKバージョン(TWL非常駐モジュール) + PR版が使用されています。 + 00FalseTrue + + + SDKバージョン(TWL非常駐モジュール) + RC版が使用されています。 + 00FalseTrue + SDKバージョン(NTR非常駐モジュール) 設定ファイルに登録されているバージョンよりも古いモジュールがあります。 00FalseTrue + + SDKバージョン(NTR非常駐モジュール) + PR版が使用されています。 + 00FalseTrue + + + SDKバージョン(NTR非常駐モジュール) + RC版が使用されています。 + 00FalseTrue + diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/sheet_template_en.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/sheet_template_en.xml index b93f9c7..d55f1eb 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/sheet_template_en.xml +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/sheet_template_en.xml @@ -33,7 +33,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - -