diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb index f154f8fc..70b82747 100644 Binary files a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb differ diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditorTWL/MasterEditorTWL.suo index da1c1b01..10f3419b 100644 Binary files a/build/tools/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditorTWL/MasterEditorTWL.suo differ diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 5ea6df14..228beb2b 100644 Binary files a/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h index 9eaaf8d0..406bcc05 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -420,8 +420,10 @@ private: System::Windows::Forms::TextBox^ tboxTitleIDLo; private: System::Windows::Forms::Label^ labTitleIDLo; private: System::Windows::Forms::Label^ labTitleIDHi; private: System::Windows::Forms::TextBox^ tboxTitleIDHi; -private: System::Windows::Forms::TextBox^ tboxAppType; -private: System::Windows::Forms::Label^ labAppType; +private: System::Windows::Forms::TextBox^ tboxAppTypeOther; + +private: System::Windows::Forms::Label^ labAppTypeOther; + private: System::Windows::Forms::Label^ labCaptionEx; private: System::Windows::Forms::TextBox^ tboxCaptionEx; @@ -543,6 +545,13 @@ private: System::Windows::Forms::Label^ labArbit3; private: System::Windows::Forms::Label^ labArbit2; private: System::Windows::Forms::Label^ labArbit1; private: System::Windows::Forms::Button^ butSetBack; +private: System::Windows::Forms::Label^ labAppType; + +private: System::Windows::Forms::Label^ labMedia; +private: System::Windows::Forms::TextBox^ tboxAppType; + +private: System::Windows::Forms::TextBox^ tboxMedia; + @@ -687,7 +696,7 @@ private: System::Windows::Forms::Button^ butSetBack; /// void InitializeComponent(void) { - System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle1 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle4 = (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()); @@ -872,14 +881,18 @@ private: System::Windows::Forms::Button^ butSetBack; this->cboxIsNAND = (gcnew System::Windows::Forms::CheckBox()); this->cboxIsSD = (gcnew System::Windows::Forms::CheckBox()); this->gboxTitleID = (gcnew System::Windows::Forms::GroupBox()); + this->labAppType = (gcnew System::Windows::Forms::Label()); + this->labMedia = (gcnew System::Windows::Forms::Label()); + this->tboxAppType = (gcnew System::Windows::Forms::TextBox()); + this->tboxMedia = (gcnew System::Windows::Forms::TextBox()); this->labHex2 = (gcnew System::Windows::Forms::Label()); this->labHex1 = (gcnew System::Windows::Forms::Label()); this->tboxTitleIDLo = (gcnew System::Windows::Forms::TextBox()); this->labTitleIDLo = (gcnew System::Windows::Forms::Label()); this->labTitleIDHi = (gcnew System::Windows::Forms::Label()); this->tboxTitleIDHi = (gcnew System::Windows::Forms::TextBox()); - this->tboxAppType = (gcnew System::Windows::Forms::TextBox()); - this->labAppType = (gcnew System::Windows::Forms::Label()); + this->tboxAppTypeOther = (gcnew System::Windows::Forms::TextBox()); + this->labAppTypeOther = (gcnew System::Windows::Forms::Label()); this->labCaptionEx = (gcnew System::Windows::Forms::Label()); this->tboxCaptionEx = (gcnew System::Windows::Forms::TextBox()); this->gboxProd = (gcnew System::Windows::Forms::GroupBox()); @@ -2202,6 +2215,7 @@ private: System::Windows::Forms::Button^ butSetBack; // numSubmitVersion // this->numSubmitVersion->Location = System::Drawing::Point(106, 172); + this->numSubmitVersion->Maximum = System::Decimal(gcnew cli::array< System::Int32 >(4) {9, 0, 0, 0}); this->numSubmitVersion->Name = L"numSubmitVersion"; this->numSubmitVersion->Size = System::Drawing::Size(38, 19); this->numSubmitVersion->TabIndex = 9; @@ -2501,7 +2515,7 @@ private: System::Windows::Forms::Button^ butSetBack; this->gboxTWLExInfo->Controls->Add(this->tboxPublicSize); this->gboxTWLExInfo->Location = System::Drawing::Point(231, 54); this->gboxTWLExInfo->Name = L"gboxTWLExInfo"; - this->gboxTWLExInfo->Size = System::Drawing::Size(298, 146); + this->gboxTWLExInfo->Size = System::Drawing::Size(300, 146); this->gboxTWLExInfo->TabIndex = 24; this->gboxTWLExInfo->TabStop = false; this->gboxTWLExInfo->Text = L"TWL拡張情報"; @@ -2677,7 +2691,7 @@ private: System::Windows::Forms::Button^ butSetBack; this->gboxAccess->Controls->Add(this->cboxIsSD); this->gboxAccess->Location = System::Drawing::Point(231, 211); this->gboxAccess->Name = L"gboxAccess"; - this->gboxAccess->Size = System::Drawing::Size(298, 133); + this->gboxAccess->Size = System::Drawing::Size(300, 133); this->gboxAccess->TabIndex = 0; this->gboxAccess->TabStop = false; this->gboxAccess->Text = L"アクセスコントロール情報"; @@ -2685,7 +2699,7 @@ private: System::Windows::Forms::Button^ butSetBack; // labAccessOther // this->labAccessOther->AutoSize = true; - this->labAccessOther->Location = System::Drawing::Point(152, 21); + this->labAccessOther->Location = System::Drawing::Point(139, 20); this->labAccessOther->Name = L"labAccessOther"; this->labAccessOther->Size = System::Drawing::Size(36, 12); this->labAccessOther->TabIndex = 5; @@ -2693,11 +2707,11 @@ private: System::Windows::Forms::Button^ butSetBack; // // tboxAccessOther // - this->tboxAccessOther->Location = System::Drawing::Point(154, 36); + this->tboxAccessOther->Location = System::Drawing::Point(141, 36); this->tboxAccessOther->Multiline = true; this->tboxAccessOther->Name = L"tboxAccessOther"; this->tboxAccessOther->ReadOnly = true; - this->tboxAccessOther->Size = System::Drawing::Size(118, 85); + this->tboxAccessOther->Size = System::Drawing::Size(142, 85); this->tboxAccessOther->TabIndex = 4; // // tboxIsGameCardOn @@ -2707,11 +2721,12 @@ private: System::Windows::Forms::Button^ butSetBack; this->tboxIsGameCardOn->ReadOnly = true; this->tboxIsGameCardOn->Size = System::Drawing::Size(122, 19); this->tboxIsGameCardOn->TabIndex = 3; + this->tboxIsGameCardOn->TextAlign = System::Windows::Forms::HorizontalAlignment::Right; // // labIsGameCardOn // this->labIsGameCardOn->AutoSize = true; - this->labIsGameCardOn->Location = System::Drawing::Point(7, 83); + this->labIsGameCardOn->Location = System::Drawing::Point(7, 87); this->labIsGameCardOn->Name = L"labIsGameCardOn"; this->labIsGameCardOn->Size = System::Drawing::Size(87, 12); this->labIsGameCardOn->TabIndex = 2; @@ -2741,14 +2756,18 @@ private: System::Windows::Forms::Button^ butSetBack; // // gboxTitleID // + this->gboxTitleID->Controls->Add(this->labAppType); + this->gboxTitleID->Controls->Add(this->labMedia); + this->gboxTitleID->Controls->Add(this->tboxAppType); + this->gboxTitleID->Controls->Add(this->tboxMedia); this->gboxTitleID->Controls->Add(this->labHex2); this->gboxTitleID->Controls->Add(this->labHex1); this->gboxTitleID->Controls->Add(this->tboxTitleIDLo); this->gboxTitleID->Controls->Add(this->labTitleIDLo); this->gboxTitleID->Controls->Add(this->labTitleIDHi); this->gboxTitleID->Controls->Add(this->tboxTitleIDHi); - this->gboxTitleID->Controls->Add(this->tboxAppType); - this->gboxTitleID->Controls->Add(this->labAppType); + this->gboxTitleID->Controls->Add(this->tboxAppTypeOther); + this->gboxTitleID->Controls->Add(this->labAppTypeOther); this->gboxTitleID->Location = System::Drawing::Point(12, 54); this->gboxTitleID->Name = L"gboxTitleID"; this->gboxTitleID->Size = System::Drawing::Size(198, 174); @@ -2756,10 +2775,46 @@ private: System::Windows::Forms::Button^ butSetBack; this->gboxTitleID->TabStop = false; this->gboxTitleID->Text = L"TitleID"; // + // labAppType + // + this->labAppType->AutoSize = true; + this->labAppType->Location = System::Drawing::Point(21, 98); + this->labAppType->Name = L"labAppType"; + this->labAppType->Size = System::Drawing::Size(56, 12); + this->labAppType->TabIndex = 11; + this->labAppType->Text = L"App. Type"; + // + // labMedia + // + this->labMedia->AutoSize = true; + this->labMedia->Location = System::Drawing::Point(39, 73); + this->labMedia->Name = L"labMedia"; + this->labMedia->Size = System::Drawing::Size(35, 12); + this->labMedia->TabIndex = 10; + this->labMedia->Text = L"Media"; + // + // tboxAppType + // + this->tboxAppType->Location = System::Drawing::Point(83, 95); + this->tboxAppType->Name = L"tboxAppType"; + this->tboxAppType->ReadOnly = true; + this->tboxAppType->Size = System::Drawing::Size(71, 19); + this->tboxAppType->TabIndex = 9; + this->tboxAppType->TextAlign = System::Windows::Forms::HorizontalAlignment::Right; + // + // tboxMedia + // + this->tboxMedia->Location = System::Drawing::Point(83, 70); + this->tboxMedia->Name = L"tboxMedia"; + this->tboxMedia->ReadOnly = true; + this->tboxMedia->Size = System::Drawing::Size(71, 19); + this->tboxMedia->TabIndex = 8; + this->tboxMedia->TextAlign = System::Windows::Forms::HorizontalAlignment::Right; + // // labHex2 // this->labHex2->AutoSize = true; - this->labHex2->Location = System::Drawing::Point(160, 52); + this->labHex2->Location = System::Drawing::Point(160, 48); this->labHex2->Name = L"labHex2"; this->labHex2->Size = System::Drawing::Size(11, 12); this->labHex2->TabIndex = 7; @@ -2795,7 +2850,7 @@ private: System::Windows::Forms::Button^ butSetBack; // labTitleIDHi // this->labTitleIDHi->AutoSize = true; - this->labTitleIDHi->Location = System::Drawing::Point(11, 51); + this->labTitleIDHi->Location = System::Drawing::Point(11, 48); this->labTitleIDHi->Name = L"labTitleIDHi"; this->labTitleIDHi->Size = System::Drawing::Size(66, 12); this->labTitleIDHi->TabIndex = 2; @@ -2803,30 +2858,30 @@ private: System::Windows::Forms::Button^ butSetBack; // // tboxTitleIDHi // - this->tboxTitleIDHi->Location = System::Drawing::Point(83, 48); + this->tboxTitleIDHi->Location = System::Drawing::Point(83, 45); this->tboxTitleIDHi->Name = L"tboxTitleIDHi"; this->tboxTitleIDHi->ReadOnly = true; this->tboxTitleIDHi->Size = System::Drawing::Size(71, 19); this->tboxTitleIDHi->TabIndex = 3; this->tboxTitleIDHi->TextAlign = System::Windows::Forms::HorizontalAlignment::Right; // - // tboxAppType + // tboxAppTypeOther // - this->tboxAppType->Location = System::Drawing::Point(13, 89); - this->tboxAppType->Multiline = true; - this->tboxAppType->Name = L"tboxAppType"; - this->tboxAppType->ReadOnly = true; - this->tboxAppType->Size = System::Drawing::Size(158, 72); - this->tboxAppType->TabIndex = 4; + this->tboxAppTypeOther->Location = System::Drawing::Point(14, 134); + this->tboxAppTypeOther->Multiline = true; + this->tboxAppTypeOther->Name = L"tboxAppTypeOther"; + this->tboxAppTypeOther->ReadOnly = true; + this->tboxAppTypeOther->Size = System::Drawing::Size(170, 34); + this->tboxAppTypeOther->TabIndex = 4; // - // labAppType + // labAppTypeOther // - this->labAppType->AutoSize = true; - this->labAppType->Location = System::Drawing::Point(12, 74); - this->labAppType->Name = L"labAppType"; - this->labAppType->Size = System::Drawing::Size(91, 12); - this->labAppType->TabIndex = 5; - this->labAppType->Text = L"Application Type"; + this->labAppTypeOther->AutoSize = true; + this->labAppTypeOther->Location = System::Drawing::Point(12, 122); + this->labAppTypeOther->Name = L"labAppTypeOther"; + this->labAppTypeOther->Size = System::Drawing::Size(58, 12); + this->labAppTypeOther->TabIndex = 5; + this->labAppTypeOther->Text = L"Other Info."; // // labCaptionEx // @@ -3084,7 +3139,7 @@ private: System::Windows::Forms::Button^ butSetBack; this->tboxGuideRomEditInfo->ReadOnly = true; this->tboxGuideRomEditInfo->Size = System::Drawing::Size(687, 19); this->tboxGuideRomEditInfo->TabIndex = 37; - this->tboxGuideRomEditInfo->Text = L"このタブの情報は、提出確認書およびマスターROMの作成に必要です。編集してください。"; + this->tboxGuideRomEditInfo->Text = L"このタブの情報は提出確認書およびマスターROMの作成に必要です。編集してください。"; // // gboxParental // @@ -3371,8 +3426,8 @@ private: System::Windows::Forms::Button^ butSetBack; // // gridError // - dataGridViewCellStyle1->BackColor = System::Drawing::Color::White; - this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle4->BackColor = System::Drawing::Color::White; + this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; 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, @@ -3631,7 +3686,7 @@ private: System::Windows::Forms::Button^ butSetBack; private: // SRLのオープン - System::Boolean loadSrl( System::String ^filename ) + System::Void loadSrl( System::String ^filename ) { ECSrlResult result = this->hSrl->readFromFile( filename ); if( result != ECSrlResult::NOERROR ) @@ -3653,7 +3708,7 @@ private: System::Windows::Forms::Button^ butSetBack; "Reading the ROM data file failed. \nPlease read a ROM data file again, with \"Open a ROM data file\"" ); break; } - return false; + return; } this->tboxFile->Text = filename; @@ -3666,7 +3721,7 @@ private: System::Windows::Forms::Button^ butSetBack; { this->errMsg( "ROMデータのCRC計算に失敗しました。ROMデータの読み込みはキャンセルされました。", "Calculating CRC of the ROM data failed. Therefore reading ROM data is canceled." ); - return false; + return; } System::UInt16 ^hcrc = gcnew System::UInt16( crc ); this->tboxWholeCRC->Clear(); @@ -3677,13 +3732,13 @@ private: System::Windows::Forms::Button^ butSetBack; this->rErrorReading->Checked = true; this->setGridError(); this->setGridWarn(); - if( this->hSrl->hErrorList->Count > 0 ) - { - this->errMsg( "ROMデータにエラーがあります。「エラー情報」タブをご確認ください。", - "ROM data include error. Please look the tab \"Setting Error\"." ); - return false; - } - return true; + //if( this->hSrl->hErrorList->Count > 0 ) + //{ + // this->errMsg( "ROMデータにエラーがあります。「エラー情報」タブをご確認ください。", + // "ROM data include error. Please look the tab \"Setting Error\"." ); + // return; + //} + return; } // openSrl private: @@ -4189,70 +4244,69 @@ private: System::Windows::Forms::Button^ butSetBack; this->tboxShared2Size5->Text = MasterEditorTWL::transSizeToString( this->hSrl->hShared2SizeArray[5] ); // アプリ種別 - System::String ^app = gcnew System::String(""); - if( *(this->hSrl->hIsAppUser) == true ) + if( *this->hSrl->hIsMediaNand ) { - app += "Type:User. "; + this->tboxMedia->Text = gcnew System::String( "NAND" ); } - if( *(this->hSrl->hIsAppSystem) == true ) + else { - app += "Type:System. "; + this->tboxMedia->Text = gcnew System::String( "Game Card" ); } + + if( *(this->hSrl->hIsAppLauncher) == true ) { - app += "Type:Launcher. "; + this->tboxAppType->Text = gcnew System::String( "Launcher" ); } if( *(this->hSrl->hIsAppSecure) == true ) { - app += "Type:Secure. "; + this->tboxAppType->Text = gcnew System::String( "Secure" ); } - if( *(this->hSrl->hIsMediaNand) == true ) + if( *(this->hSrl->hIsAppSystem) == true ) { - app += "Media:NAND. "; + this->tboxAppType->Text = gcnew System::String( "System" ); } - else + if( *(this->hSrl->hIsAppUser) == true ) { - app += "Media:Card. "; + this->tboxAppType->Text = gcnew System::String( "User" ); } - if( *(this->hSrl->hIsLaunch) == true ) + + System::String ^appother = gcnew System::String(""); + if( *(this->hSrl->hIsLaunch) == false ) { - app += "Launch. "; - } - else - { - app += "Not-Launch. "; + appother += "Not-Launch.\r\n"; } if( *(this->hSrl->hIsDataOnly) == true ) { - app += "DataOnly. "; + appother += "DataOnly.\r\n"; } - this->tboxAppType->Text = app; + this->tboxAppTypeOther->Text = appother; // アクセスコントロール その他 System::String ^acc = gcnew System::String(""); if( *(this->hSrl->hIsCommonClientKey) == true ) { - acc += "commonClientKey. "; + acc += "commonClientKey.\r\n"; } if( *(this->hSrl->hIsAesSlotBForES) == true ) { - acc += "AES-SlotB(ES). "; + acc += "AES-SlotB(ES).\r\n"; } if( *(this->hSrl->hIsAesSlotCForNAM) == true ) { - acc += "AES-SlotC(NAM). "; + acc += "AES-SlotC(NAM).\r\n"; } if( *(this->hSrl->hIsAesSlotBForJpegEnc) == true ) { - acc += "AES-SlotB(JpegEnc.). "; + acc += "AES-SlotB(JpegEnc.).\r\n"; } if( *(this->hSrl->hIsAesSlotAForSSL) == true ) { - acc += "AES-SlotA(SSL). "; + acc += "AES-SlotA(SSL).\r\n"; } if( *(this->hSrl->hIsCommonClientKeyForDebugger) == true ) { - acc += "commonClientKey(Debug.). "; + acc += "commonClientKey(Debug.).\r\n"; } this->tboxAccessOther->Text = acc; @@ -4808,7 +4862,8 @@ private: System::Windows::Forms::Button^ butSetBack; // ひととおりエラー登録をした後で // SRLバイナリに影響を与えるエラーが存在するかチェック - return this->isValidAffectRom(); + //return this->isValidAffectRom(); + return this->isValidAffectRomModified(); } // ペアレンタルコントロール関連のフォーム入力が正しいか書き込み前チェック @@ -4949,8 +5004,7 @@ private: System::Windows::Forms::Button^ butSetBack; } // 会社情報 - this->hDeliv->hCompany1 = this->tboxCompany1->Text; - this->hDeliv->hDepart1 = this->tboxDepart1->Text; + this->hDeliv->hCompany1 = this->tboxCompany1->Text + " " + this->tboxDepart1->Text; this->hDeliv->hPerson1 = this->tboxPerson1->Text; if( this->stripItemJapanese->Checked == true ) { @@ -4964,11 +5018,9 @@ private: System::Windows::Forms::Button^ butSetBack; this->hDeliv->hFax1 = this->tboxFax1->Text; this->hDeliv->hMail1 = this->tboxMail1->Text; this->hDeliv->hNTSC1 = this->tboxNTSC1->Text; - this->hDeliv->hIsPerson2 = gcnew System::Boolean( this->cboxIsInputPerson2->Checked ); if( this->cboxIsInputPerson2->Checked == true ) { - this->hDeliv->hCompany2 = this->tboxCompany2->Text; - this->hDeliv->hDepart2 = this->tboxDepart2->Text; + this->hDeliv->hCompany2 = this->tboxCompany2->Text + " " + this->tboxDepart2->Text; this->hDeliv->hPerson2 = this->tboxPerson2->Text; if( this->stripItemJapanese->Checked == true ) { @@ -4986,7 +5038,6 @@ private: System::Windows::Forms::Button^ butSetBack; else { this->hDeliv->hCompany2 = nullptr; - this->hDeliv->hDepart2 = nullptr; this->hDeliv->hPerson2 = nullptr; this->hDeliv->hFurigana2 = nullptr; this->hDeliv->hTel2 = nullptr; @@ -5015,7 +5066,14 @@ private: System::Windows::Forms::Button^ butSetBack; // 一部のROM情報を登録 if( this->combBackup->SelectedIndex != (this->combBackup->Items->Count - 1) ) { - this->hDeliv->hBackupMemory = this->combBackup->SelectedItem->ToString(); + if( this->combBackup->SelectedIndex > 0 ) + { + this->hDeliv->hBackupMemory = this->combBackup->SelectedItem->ToString(); + } + else + { + this->hDeliv->hBackupMemory = gcnew System::String(""); + } } else { @@ -5047,7 +5105,7 @@ private: System::Windows::Forms::Button^ butSetBack; } // 会社情報 - this->checkTextForm( this->tboxPerson1->Text, LANG_PERSON_1_J, LANG_PERSON_1_E, false ); + this->checkTextForm( this->tboxPerson1->Text, LANG_PERSON_J, LANG_PERSON_E, false ); this->checkTextForm( this->tboxCompany1->Text, LANG_COMPANY_J, LANG_COMPANY_E, false ); this->checkTextForm( this->tboxDepart1->Text, LANG_DEPART_J, LANG_DEPART_E, false ); if( this->stripItemJapanese->Checked == true ) @@ -5055,16 +5113,16 @@ private: System::Windows::Forms::Button^ butSetBack; this->checkTextForm( this->tboxFurigana1->Text, LANG_FURIGANA_J, LANG_FURIGANA_J, false ); } this->checkTextForm( this->tboxTel1->Text, LANG_TEL_J, LANG_TEL_E, false ); - this->checkTextForm( this->tboxFax1->Text, LANG_FAX_J, LANG_FAX_E, false ); + //this->checkTextForm( this->tboxFax1->Text, LANG_FAX_J, LANG_FAX_E, false ); this->checkTextForm( this->tboxMail1->Text, LANG_MAIL_J, LANG_MAIL_E, false ); - if( this->stripItemJapanese->Checked == true ) - { - this->checkTextForm( this->tboxNTSC1->Text, LANG_NTSC_1_J + " " + LANG_NTSC_2_J, LANG_NTSC_1_J + " " + LANG_NTSC_2_J, false ); - } + //if( this->stripItemJapanese->Checked == true ) + //{ + // this->checkTextForm( this->tboxNTSC1->Text, LANG_NTSC_1_J + " " + LANG_NTSC_2_J, LANG_NTSC_1_J + " " + LANG_NTSC_2_J, false ); + //} if( this->cboxIsInputPerson2->Checked == true ) { - this->checkTextForm( this->tboxPerson2->Text, LANG_PERSON_2_J, LANG_PERSON_2_E, false ); + this->checkTextForm( this->tboxPerson2->Text, LANG_PERSON_J, LANG_PERSON_E, false ); this->checkTextForm( this->tboxCompany2->Text, LANG_COMPANY_J, LANG_COMPANY_E, false ); this->checkTextForm( this->tboxDepart2->Text, LANG_DEPART_J, LANG_DEPART_E, false ); if( this->stripItemJapanese->Checked == true ) @@ -5072,12 +5130,12 @@ private: System::Windows::Forms::Button^ butSetBack; this->checkTextForm( this->tboxFurigana2->Text, LANG_FURIGANA_J, LANG_FURIGANA_J, false ); } this->checkTextForm( this->tboxTel2->Text, LANG_TEL_J, LANG_TEL_E, false ); - this->checkTextForm( this->tboxFax2->Text, LANG_FAX_J, LANG_FAX_E, false ); + //this->checkTextForm( this->tboxFax2->Text, LANG_FAX_J, LANG_FAX_E, false ); this->checkTextForm( this->tboxMail2->Text, LANG_MAIL_J, LANG_MAIL_E, false ); - if( this->stripItemJapanese->Checked == true ) - { - this->checkTextForm( this->tboxNTSC2->Text, LANG_NTSC_1_J + " " + LANG_NTSC_2_J, LANG_NTSC_1_J + " " + LANG_NTSC_2_J, false ); - } + //if( this->stripItemJapanese->Checked == true ) + //{ + // this->checkTextForm( this->tboxNTSC2->Text, LANG_NTSC_1_J + " " + LANG_NTSC_2_J, LANG_NTSC_1_J + " " + LANG_NTSC_2_J, false ); + //} } // 一部のROM情報(SRLバイナリに反映されない情報)をここでチェックする @@ -5135,6 +5193,18 @@ private: System::Windows::Forms::Button^ butSetBack; return (count == 0); } + // SRLのバイナリに影響する項目の中で修正可能なエラーだけをチェック + System::Boolean isValidAffectRomModified(void) + { + System::Int32 count = 0; + for each( RCMrcError ^err in this->hErrorList ) + { + if( err->AffectRom ) // 修正不可エラーは存在しない + count++; + } + return (count == 0); + } + // ---------------------------------------------- // ダイアログ // ---------------------------------------------- @@ -5996,8 +6066,8 @@ private: System::Windows::Forms::Button^ butSetBack; } if( this->checkDeliverableForms() == false ) { - this->errMsg( "入力情報に不正な設定があるため提出確認書を作成できません。", - "Making a submission sheet can't be done, since input data is illegal." ); + this->errMsg( "入力情報に不足があるため提出確認書を作成できません。", + "Making a submission sheet can't be done, since your input is not enough." ); return; } diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.resX b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.resX index 1f0e93fa..302e29f7 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.resX +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.resX @@ -126,6 +126,24 @@ True + + True + + + True + + + True + + + True + + + True + + + True + True diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/common.h b/build/tools/MasterEditorTWL/MasterEditorTWL/common.h index 9148918e..0c9754d8 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/common.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/common.h @@ -1,8 +1,8 @@ #pragma once // ビルドスイッチ -//#define METWL_VER_APPTYPE_USER -#define METWL_VER_APPTYPE_SYSTEM +#define METWL_VER_APPTYPE_USER +//#define METWL_VER_APPTYPE_SYSTEM //#define METWL_VER_APPTYPE_SECURE //#define METWL_VER_APPTYPE_LAUNCHER diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp index 9b9ae31a..caf665e2 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp @@ -44,41 +44,39 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( // アプリ種別 System::String ^apptype = gcnew System::String(""); - if( *(hSrl->hIsAppUser) == true ) + if( *hSrl->hIsAppLauncher ) { - apptype += "Type:User. "; + apptype = gcnew System::String( "Launcher" ); } - if( *(hSrl->hIsAppSystem) == true ) + else if( *hSrl->hIsAppSecure ) { - apptype += "Type:System. "; + apptype = gcnew System::String( "Secure" ); } - if( *(hSrl->hIsAppLauncher) == true ) + else if( *hSrl->hIsAppSystem ) { - apptype += "Type:Launcher. "; + apptype = gcnew System::String( "System" ); } - if( *(hSrl->hIsAppSecure) == true ) + else if( *hSrl->hIsAppUser ) { - apptype += "Type:Secure. "; + apptype = gcnew System::String( "User" ); } - if( *(hSrl->hIsMediaNand) == true ) + System::String ^media = gcnew System::String(""); + if( *hSrl->hIsMediaNand ) { - apptype += "Media:NAND. "; + media = gcnew System::String( "NAND" ); } else { - apptype += "Media:Card. "; + media = gcnew System::String( "Game Card" ); } - if( *(hSrl->hIsLaunch) == true ) + System::String ^appother = gcnew System::String(""); + if( *(hSrl->hIsLaunch) == false ) { - apptype += "Launch. "; - } - else - { - apptype += "Not-Launch. "; + appother += "ランチャー非表示."; } if( *(hSrl->hIsDataOnly) == true ) { - apptype += "DataOnly. "; + apptype += "データ専用."; } // アクセスコントロール その他 @@ -256,6 +254,14 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( { node->FirstChild->Value = apptype; } + if( node->FirstChild->Value->Equals( "TagMedia" ) ) + { + node->FirstChild->Value = media; + } + if( node->FirstChild->Value->Equals( "TagAppTypeOther" ) ) + { + node->FirstChild->Value = appother; + } if( node->FirstChild->Value->Equals( "TagIsNormalJump" ) ) { if( *(hSrl->hIsNormalJump) == true ) @@ -280,11 +286,11 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( } if( node->FirstChild->Value->Equals( "TagPublicSize" ) ) { - node->FirstChild->Value = hSrl->hPublicSize->ToString() + "Byte"; + node->FirstChild->Value = MasterEditorTWL::transSizeToString( hSrl->hPublicSize ); } if( node->FirstChild->Value->Equals( "TagPrivateSize" ) ) { - node->FirstChild->Value = hSrl->hPrivateSize->ToString() + "Byte"; + node->FirstChild->Value = MasterEditorTWL::transSizeToString( hSrl->hPrivateSize ); } if( node->FirstChild->Value->Equals( "TagIsRegionJapan" ) ) { @@ -314,20 +320,6 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( else node->FirstChild->Value = nullptr; } - //if( node->FirstChild->Value->Equals( "TagIsRegionChina" ) ) - //{ - // if( *(hSrl->hIsRegionChina) == true ) - // node->FirstChild->Value = gcnew System::String("○"); - // else - // node->FirstChild->Value = nullptr; - //} - //if( node->FirstChild->Value->Equals( "TagIsRegionKorea" ) ) - //{ - // if( *(hSrl->hIsRegionKorea) == true ) - // node->FirstChild->Value = gcnew System::String("○"); - // else - // node->FirstChild->Value = nullptr; - //} if( node->FirstChild->Value->Equals( "TagIsCodec" ) ) { if( *(hSrl->hIsCodecTWL) == true ) @@ -406,27 +398,27 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( } if( node->FirstChild->Value->Equals( "TagShared2Size0" ) ) { - node->FirstChild->Value = hSrl->hShared2SizeArray[0]->ToString() + "KB"; + node->FirstChild->Value = MasterEditorTWL::transSizeToString( hSrl->hShared2SizeArray[0] ); } if( node->FirstChild->Value->Equals( "TagShared2Size1" ) ) { - node->FirstChild->Value = hSrl->hShared2SizeArray[1]->ToString() + "KB"; + node->FirstChild->Value = MasterEditorTWL::transSizeToString( hSrl->hShared2SizeArray[1] ); } if( node->FirstChild->Value->Equals( "TagShared2Size2" ) ) { - node->FirstChild->Value = hSrl->hShared2SizeArray[2]->ToString() + "KB"; + node->FirstChild->Value = MasterEditorTWL::transSizeToString( hSrl->hShared2SizeArray[2] ); } if( node->FirstChild->Value->Equals( "TagShared2Size3" ) ) { - node->FirstChild->Value = hSrl->hShared2SizeArray[3]->ToString() + "KB"; + node->FirstChild->Value = MasterEditorTWL::transSizeToString( hSrl->hShared2SizeArray[3] ); } if( node->FirstChild->Value->Equals( "TagShared2Size4" ) ) { - node->FirstChild->Value = hSrl->hShared2SizeArray[4]->ToString() + "KB"; + node->FirstChild->Value = MasterEditorTWL::transSizeToString( hSrl->hShared2SizeArray[4] ); } if( node->FirstChild->Value->Equals( "TagShared2Size5" ) ) { - node->FirstChild->Value = hSrl->hShared2SizeArray[5]->ToString() + "KB"; + node->FirstChild->Value = MasterEditorTWL::transSizeToString( hSrl->hShared2SizeArray[5] ); } // 会社情報 @@ -434,10 +426,6 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( { node->FirstChild->Value = this->hCompany1; } - if( node->FirstChild->Value->Equals( "TagDepart1" ) ) - { - node->FirstChild->Value = this->hDepart1; - } if( node->FirstChild->Value->Equals( "TagPerson1" ) ) { node->FirstChild->Value = this->hPerson1; @@ -466,10 +454,6 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( { node->FirstChild->Value = this->hCompany2; } - if( node->FirstChild->Value->Equals( "TagDepart2" ) ) - { - node->FirstChild->Value = this->hDepart2; - } if( node->FirstChild->Value->Equals( "TagPerson2" ) ) { node->FirstChild->Value = this->hPerson2; @@ -717,45 +701,13 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( node->FirstChild->Value = title_name[byte].ToString("X2"); } } - for( byte=0; byte < GAME_CODE_MAX; byte++ ) + if( node->FirstChild->Value->Equals( "TagGameCode" ) ) { - if( node->FirstChild->Value->Equals( "TagGameCode" + byte.ToString() ) ) - { - System::String ^bstr = hSrl->hGameCode[byte].ToString(); - if( bstr == nullptr ) - node->FirstChild->Value = gcnew System::String( "null" ); - else if( bstr->Equals( "\0" ) ) - node->FirstChild->Value = gcnew System::String( "\\0" ); - else if( bstr->Equals( " " ) ) - node->FirstChild->Value = gcnew System::String( "\\s" ); - else - node->FirstChild->Value = gcnew System::String( bstr ); - //node->FirstChild->Value = gcnew System::String( hSrl->hGameCode[byte].ToString() ); - } - else if( node->FirstChild->Value->Equals( "TagGameCodeHex" + byte.ToString() ) ) - { - node->FirstChild->Value = game_code[byte].ToString("X2"); - } + node->FirstChild->Value = hSrl->hGameCode; } - for( byte=0; byte < MAKER_CODE_MAX; byte++ ) + if( node->FirstChild->Value->Equals( "TagMakerCode" ) ) { - if( node->FirstChild->Value->Equals( "TagMakerCode" + byte.ToString() ) ) - { - System::String ^bstr = hSrl->hMakerCode[byte].ToString(); - if( bstr == nullptr ) - node->FirstChild->Value = gcnew System::String( "null" ); - else if( bstr->Equals( "\0" ) ) - node->FirstChild->Value = gcnew System::String( "\\0" ); - else if( bstr->Equals( " " ) ) - node->FirstChild->Value = gcnew System::String( "\\s" ); - else - node->FirstChild->Value = gcnew System::String( bstr ); - //node->FirstChild->Value = gcnew System::String( hSrl->hMakerCode[byte].ToString() ); - } - else if( node->FirstChild->Value->Equals( "TagMakerCodeHex" + byte.ToString() ) ) - { - node->FirstChild->Value = maker_code[byte].ToString("X2"); - } + node->FirstChild->Value = hSrl->hMakerCode; } } // if( (node->FirstChild != nullptr) && (node->FirstChild->Value != nullptr) ) diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h index 18eead19..45d8c0d4 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h @@ -64,7 +64,6 @@ namespace MasterEditorTWL // 担当者(1人目) property System::String ^hCompany1; // 会社名 - property System::String ^hDepart1; // 部署名 property System::String ^hPerson1; // 名前 property System::String ^hFurigana1; // ふりがな property System::String ^hTel1; // 電話番号 @@ -72,9 +71,7 @@ namespace MasterEditorTWL property System::String ^hMail1; // メアド property System::String ^hNTSC1; // NTSC User ID // 担当者(2人目) - property System::Boolean ^hIsPerson2; // 2人目情報を入力したか property System::String ^hCompany2; - property System::String ^hDepart2; property System::String ^hPerson2; property System::String ^hFurigana2; property System::String ^hTel2; diff --git a/build/tools/MasterEditorTWL/resource/sheet_templete.xml b/build/tools/MasterEditorTWL/resource/sheet_templete.xml index e776ef52..564f530b 100644 --- a/build/tools/MasterEditorTWL/resource/sheet_templete.xml +++ b/build/tools/MasterEditorTWL/resource/sheet_templete.xml @@ -9,9 +9,9 @@ 繝九Φ繝繝ｳ繝峨ｼDS縲繝槭せ繧ｿ繝ｼROM謠仙ｺ遒ｺ隱肴嶌縲ｼ2005-00蜿ｷｼ Osamu Kurokawa nishikawa_takeshi - 2008-08-01T05:28:28Z + 2008-09-08T11:08:56Z 2004-08-25T05:17:34Z - 2008-07-31T00:35:15Z + 2008-09-08T09:49:23Z Nintendo Co.,Ltd. 11.9999 @@ -33,7 +33,7 @@ - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + + - - + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + - - - - - - - - - - - - + - - - - - + + + + + + + + - + + + + + + - - - - - - - - + + - - - - - - - + + + + + - - - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - + + - - - - - - - - - + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + - @@ -2481,8 +2437,8 @@ 繝繧､繧ｷ繝･繝繧ｫ繧ｯ繝九Φ繧ｷ繝ｧ繝阪Φ繧ｬ繝繝九メ繝上Φ繧ｫ繧､繝ｯ繧ｶ繝倥Φ繧ｳ繧ｦ繝九Φ繝繝ｳ繝峨ｼTWL繝槭せ繧ｿ繝ｼROM謠仙ｺ遒ｺ隱肴嶌ｼ2008蟷ｴ8譛26譌･迚 髢区橿螟画峩ｼ + xmlns="urn:schemas-microsoft-com:office:excel">繝繧､繧ｷ繝･繝繧ｫ繧ｯ繝九Φ繧ｷ繝ｧ繝阪Φ繧ｬ繝繧ｫ繝上Φ繝九Φ繝繝ｳ繝峨ｼTWL繝槭せ繧ｿ繝ｼROM謠仙ｺ遒ｺ隱肴嶌ｼ2008蟷ｴ9譛8譌･迚茨ｼ 繧ｭ繧ｷ繝｣繝｡繧､雋ｴ遉ｾ蜷 - TagCompany1雋ｴ遉ｾ蜷搾ｼ城Κ鄂ｲ蜷 + TagCompany1 - 繝悶す繝ｧ繝｡繧､驛ｨ鄂ｲ蜷 - TagDepart1 - 縺ｵ繧翫′縺ｪ TagFurigana1 - 繧､繝ｳ蜊ｰ - TEL - TagTel1TEL + TagTel1 - 繧ｴ繧ｷ繝｡繧､縺疲ｰ丞錐 - TagPerson1TagPerson1 - FAX - TagFax1TagFax1 - E-Mail - TagMail1TagMail1 - - - NTSC 繝ｦ繝ｼ繧ｶ繝ｼID - TagNTSC1NTSC 繝ｦ繝ｼ繧ｶ繝ｼID + TagNTSC1 @@ -2880,50 +2828,42 @@ - 繧ｭ繧ｷ繝｣繝｡繧､繝悶す繝ｧ繝｡繧､雋ｴ遉ｾ蜷搾ｼ城Κ鄂ｲ蜷 - TagCompany2TagCompany2 - 繝悶す繝ｧ繝｡繧､驛ｨ鄂ｲ蜷 - TagDepart2 - 縺ｵ繧翫′縺ｪ TagFurigana2 - 繧､繝ｳ蜊ｰ - TEL - TagTel2TEL + TagTel2 - 繧ｴ繧ｷ繝｡繧､縺疲ｰ丞錐 - TagPerson2TagPerson2 - FAX - TagFax2TagFax2 - E-Mail - TagMail2TagMail2 - - - NTSC 繝ｦ繝ｼ繧ｶ繝ｼID - TagNTSC2NTSC 繝ｦ繝ｼ繧ｶ繝ｼID + TagNTSC2 @@ -3029,35 +2969,35 @@ - 繝繧､繧ｷ繝･繝繝謠仙ｺ譌･ - TagSubmitYearTagSubmitYear 繝阪Φ蟷ｴ - TagSubmitMonthTagSubmitMonth 繝繧ｭ譛 - TagSubmitDayTagSubmitDay - 繝九メ譌･ - 繝帙え繝帙え譁ｹ豕 - TagSubmitWayTagSubmitWay - 繝上ヤ繝舌う繝ｨ繝繧､繝逋ｺ螢ｲ莠亥ｮ壽律 - TagReleaseYearTagReleaseYear 繝阪Φ譛 TagReleaseDay - 繝九メ譌･ - 繝ｨ繧ｦ繝逕ｨ騾 - TagUsageTagUsage 繧ｸ繝ｧ繧ｦ繝帙え笳繝槭せ繧ｿ繝ｼ繝繝ｼ繧ｿ諠蝣ｱ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 繝｡繧､繝槭せ繧ｿ繝ｼ繝輔ぃ繧､繝ｫ蜷 + TagSrlFilename + CRC + TagCRC + 繧､繝九す繝｣繝ｫ繧ｳ繝ｼ繝 + TagGameCode + + + + 繝｡繝ｼ繧ｫ繝ｼ繧ｳ繝ｼ繝 + TagMakerCode + 繝｡繧､繧ｲ繝ｼ繝蜷 + TagTitleName0 + TagTitleName1 + TagTitleName2 + TagTitleName3 + TagTitleName4 + TagTitleName5 + TagTitleName6 + TagTitleName7 + TagTitleName8 + TagTitleName9 + TagTitleName10 + TagTitleName11 + + + + 繝ｪ繝槭せ繧ｿ繝ｼ繝舌ｼ繧ｸ繝ｧ繝ｳ + TagRomVersion + 繝繧､繧ｷ繝･繝謠仙ｺ繝舌ｼ繧ｸ繝ｧ繝ｳ + TagSubmitVersion + 繝励Λ繝繝医ヵ繧ｩ繝ｼ繝 + TagPlatform + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 繧ｻ繝繝繧､ROM繧ｿ繧､繝苓ｨｭ螳 + TagLatency + 繝ｨ繧ｦ繝ｪ繝ｧ繧ｦROM螳ｹ驥 + TagRomSize + 繝舌ャ繧ｯ繧｢繝繝励Γ繝｢繝ｪ + TagBackupMemory + + + + Title ID High + TagTitleIDHi + TitleID Low + TagTitleIDLo + 繝｡繝繧｣繧｢ + TagMedia + 繝｡繧､繝槭せ繧ｿ繝ｼ繝輔ぃ繧､繝ｫ蜷 - TagSrlFilename - CRC - TagCRC - 繧､繝九す繝｣繝ｫ繧ｳ繝ｼ繝 - TagGameCode0 - TagGameCode1 - TagGameCode2 - TagGameCode3 - - - - 繝｡繝ｼ繧ｫ繝ｼ繧ｳ繝ｼ繝 - TagMakerCode0 - TagMakerCode1 - 繝ｪ繝槭せ繧ｿ繝ｼ繝舌ｼ繧ｸ繝ｧ繝ｳ - TagRomVersion - 繝繧､繧ｷ繝･繝謠仙ｺ繝舌ｼ繧ｸ繝ｧ繝ｳ - TagSubmitVersion - - - 繧ｻ繝繝繧､ROM繧ｿ繧､繝苓ｨｭ螳 - TagLatency - 繝ｨ繧ｦ繝ｪ繝ｧ繧ｦROM螳ｹ驥 - TagRomSize - 繝舌ャ繧ｯ繧｢繝繝励Γ繝｢繝ｪ - TagBackupMemory - - - 繝励Λ繝繝医ヵ繧ｩ繝ｼ繝 - TagPlatform - 繝峨え繧､EULA蜷梧э繝舌ｼ繧ｸ繝ｧ繝ｳ - TagEULAVersion - TitleID Low - TagTitleIDLo - - - Title ID High - TagTitleIDHi - TagAppType - - - 繝｡繧､繧ｲ繝ｼ繝蜷 - TagTitleName0 - TagTitleName1 - TagTitleName2 - TagTitleName3 - TagTitleName4 - TagTitleName5 - TagTitleName6 - TagTitleName7 - TagTitleName8 - TagTitleName9 - TagTitleName10 - TagTitleName11 - + xmlns="urn:schemas-microsoft-com:office:excel">繧ｷ繝･繝吶ヤ繧｢繝励Μ遞ｮ蛻･ + TagAppType + 繧ｿ繧ｸ繝ｧ繧ｦ繝帙え縺昴ｮ莉悶い繝励Μ諠蝣ｱ + TagAppTypeOther + - 繧ｭ繝ｧ繧ｫ繝弱ｼ繝槭Ν繧ｸ繝｣繝ｳ繝苓ｨｱ蜿ｯ - TagIsNormalJump - 繧ｭ繝ｧ繧ｫtmp繧ｸ繝｣繝ｳ繝苓ｨｱ蜿ｯ - TagIsTmpJump - - - 繝ｪ繝ｧ繧ｦ繧､繧ｭTWL繝弱ｼ繝槭Ν鬆伜沺ROM繧ｪ繝輔そ繝繝 - TagNormalRomOffsetTagNormalRomOffset - 繧ｻ繝ｳ繝ｨ繧ｦ繝ｪ繝ｧ繧ｦ繧､繧ｭTWL蟆ら畑鬆伜沺ROM繧ｪ繝輔そ繝繝 - TagKeyTableRomOffsetTagKeyTableRomOffset - Public繧ｻ繝ｼ繝悶ョ繝ｼ繧ｿ繧ｵ繧､繧ｺ - TagPublicSizeTagPublicSize - Private繧ｻ繝ｼ繝悶ョ繝ｼ繧ｿ繧ｵ繧､繧ｺ - TagPrivateSizePrivate繧ｻ繝ｼ繝悶ョ繝ｼ繧ｿ繧ｵ繧､繧ｺ + TagPrivateSize - 繧ｫ繝ｼ繝峨Μ繝ｼ繧ｸ繝ｧ繝ｳ - Japan - TagIsRegionJapan - America - TagIsRegionAmerica - Europe - TagIsRegionEurope - Australia - TagIsRegionAustralia - - - - 繧ｫ繧ｯ繝√Ι繧ｦ繧ｷ繝ｧ笳TWL諡｡蠑ｵ隲ｸ繝輔Λ繧ｰ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Codec NTR/TWL繝｢繝ｼ繝 - TagIsCodec - 繝峨え繧､EULA蜷梧э - TagIsEULA - 繝ｦ繧ｦ繧ｳ繧ｦ繧ｵ繝悶ヰ繝翫ｼ繝輔ぃ繧､繝ｫ譛牙柑 - TagIsSubBanner - - - 繝繧ｦ繧ｷ繝ｳ繝偵Ι繧ｦ繧ｸWiFi騾壻ｿ｡繧｢繧､繧ｳ繝ｳ陦ｨ遉ｺ - TagIsWiFiIconTagIsWiFiIcon - 繝繧ｦ繧ｷ繝ｳ繝偵Ι繧ｦ繧ｸDSｾ懶ｽｲｾ費ｾ夲ｽｽ騾壻ｿ｡ｽｱｽｲｽｺｾ晁｡ｨ遉ｺｾ - TagIsWirelessIconDSｾ懶ｽｲｾ費ｾ夲ｽｽ騾壻ｿ｡ｽｱｽｲｽｺｾ晁｡ｨ遉ｺ + TagIsWirelessIcon - 繝ｨ繧ｦ繧ｷ繝ｧ繝｡繧､繝ｦ繧ｦ繧ｳ繧ｦNTRｾ趣ｾ懶ｽｲｾｾ假ｽｽｾｾｽｪｽｯｽｸ逕ｨ鄂ｲ蜷肴怏蜉ｹ - TagIsWLTagIsWL + + Codec NTR/TWL繝｢繝ｼ繝 + TagIsCodec + 繝ｦ繧ｦ繧ｳ繧ｦ繧ｵ繝悶ヰ繝翫ｼ繝輔ぃ繧､繝ｫ譛牙柑 + TagIsSubBanner + 繝峨え繧､EULA蜷梧э + TagIsEULA + + + + 繧ｭ繝ｧ繧ｫ繝弱ｼ繝槭Ν繧ｸ繝｣繝ｳ繝苓ｨｱ蜿ｯ + TagIsNormalJump + 繧ｭ繝ｧ繧ｫtmp繧ｸ繝｣繝ｳ繝苓ｨｱ蜿ｯ + TagIsTmpJump + 繝峨え繧､EULA蜷梧э繝舌ｼ繧ｸ繝ｧ繝ｳ + TagEULAVersion + + + + 繧ｫ繝ｼ繝峨Μ繝ｼ繧ｸ繝ｧ繝ｳ + Japan + TagIsRegionJapan + America + TagIsRegionAmerica + Europe + TagIsRegionEurope + Australia + TagIsRegionAustralia + + 繧ｸ繝ｧ繧ｦ繝帙え笳繧｢繧ｯ繧ｻ繧ｹ繧ｳ繝ｳ繝医Ο繝ｼ繝ｫ諠蝣ｱ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - SD繧ｫ繝ｼ繝 - TagIsSDTagIsSD - NAND繝輔Λ繝繧ｷ繝･ - TagIsNANDNAND繝輔Λ繝繧ｷ繝･ + TagIsNAND - 繧ｷ繝ｨ繧ｦShared繝輔ぃ繧､繝ｫ菴ｿ逕ｨ - TagIsShared2TagIsShared2 - 繝繝ｳ繧ｲ繝ｳ繧ｲ繝ｼ繝繧ｫ繝ｼ繝蛾崕貅 - TagIsGameCardOnTagIsGameCardOn - 繧ｿ縺昴ｮ莉 - TagAccessOtherTagAccessOther 笳Share2繝輔ぃ繧､繝ｫ繧ｵ繧､繧ｺ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - File0 - TagShared2Size0TagShared2Size0 - File1 - TagShared2Size1File1 + TagShared2Size1 - File2 - TagShared2Size2File2 + TagShared2Size2 - File3 - TagShared2Size3File3 + TagShared2Size3 - File4 - TagShared2Size4File4 + TagShared2Size4 - File5 - TagShared2Size5File5 + TagShared2Size5 笳繝壹い繝ｬ繝ｳ繧ｿ繝ｫ繧ｳ繝ｳ繝医Ο繝ｼ繝ｫ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - 繝繝ｳ繧ｿ繧､蝗｣菴 - 繝ｦ繧ｦ繧ｳ繧ｦ譛牙柑 - RP - RP + 繧｢繧ｿ繧､繝ｬ繝ｼ繝繧｣繝ｳ繧ｰ蛟､ - 繝繝ｳ繧ｿ繧､蝗｣菴 - 繝ｦ繧ｦ繧ｳ繧ｦ譛牙柑 - RP - RP + 繧｢繧ｿ繧､繝ｬ繝ｼ繝繧｣繝ｳ繧ｰ蛟､ - CERO - TagEnableCEROTagEnableCERO - TagAlwaysCEROTagAlwaysCERO - TagRatingCEROTagRatingCERO - TagRatingCEROStrTagRatingCEROStr - ESRB - TagEnableESRBESRB + TagEnableESRB - TagAlwaysESRBTagAlwaysESRB - TagRatingESRBTagRatingESRB - TagRatingESRBStrTagRatingESRBStr - USK - TagEnableUSKTagEnableUSK - TagAlwaysUSKTagAlwaysUSK - TagRatingUSKTagRatingUSK - TagRatingUSKStrTagRatingUSKStr - PEGI(Gen.) - TagEnablePEGIPEGI(Gen.) + TagEnablePEGI - TagAlwaysPEGITagAlwaysPEGI - TagRatingPEGITagRatingPEGI - TagRatingPEGIStrTagRatingPEGIStr - PEGI(Prt.) - TagEnablePEGIPRTTagEnablePEGIPRT - TagAlwaysPEGIPRTTagAlwaysPEGIPRT - TagRatingPEGIPRTTagRatingPEGIPRT - TagRatingPEGIPRTStrTagRatingPEGIPRTStr - PEGI+BBFC - TagEnablePEGIBBFCPEGI+BBFC + TagEnablePEGIBBFC - TagAlwaysPEGIBBFCTagAlwaysPEGIBBFC - TagRatingPEGIBBFCTagRatingPEGIBBFC - TagRatingPEGIBBFCStrTagRatingPEGIBBFCStr - OFLC - TagEnableOFLCTagEnableOFLC - TagAlwaysOFLCTagAlwaysOFLC - TagRatingOFLCTagRatingOFLC - TagRatingOFLCStrTagRatingOFLCStr - - - - - + + + + + 笳菴ｿ逕ｨSDK/繝ｩ繧､繝悶Λ繝ｪ - SDK - TagSDKTagSDK - + + + 繝ｩ繧､繝悶Λ繝ｪ + TagLibrary + + + + 繝薙さ繧ｦ笳蛯呵 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - 繝ｩ繧､繝悶Λ繝ｪ - TagLibrary - - - - - TagCaption + 繝九Φ繝繝ｳ繝峨え繧ｦ繧ｱ繝繧ｱ繧､繝ｳ莉ｻ螟ｩ蝣ょ女莉伜魂 - 繝薙さ繧ｦ笳蛯呵 - - - - TagCaption - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4364,2103 +4243,2103 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6472,22 +6351,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -6543,37 +6422,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6675,37 +6554,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6725,110 +6604,110 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6848,34 +6727,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6902,12 +6781,12 @@ - - - - - - + + + + + + @@ -6936,79 +6815,79 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + @@ -7107,16 +6986,16 @@ - - - - + + + + - + @@ -7144,79 +7023,79 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + @@ -7315,40 +7194,40 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -7422,9 +7301,9 @@ - - - + + + @@ -7523,45 +7402,45 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7630,9 +7509,9 @@ - - - + + + @@ -7731,10 +7610,10 @@ - - - - + + + + @@ -7761,23 +7640,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -7838,7 +7717,7 @@ - + @@ -7939,44 +7818,44 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7985,7 +7864,7 @@ - + @@ -8046,7 +7925,7 @@ - + @@ -8147,10 +8026,10 @@ - - - - + + + + @@ -8177,23 +8056,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -8254,7 +8133,7 @@ - + @@ -8355,44 +8234,44 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8401,7 +8280,7 @@ - + @@ -8462,7 +8341,7 @@ - + @@ -8563,10 +8442,10 @@ - - - - + + + + @@ -8593,23 +8472,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -8671,52 +8550,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + @@ -8924,7 +8803,7 @@ - + @@ -9132,7 +9011,7 @@ - + @@ -9340,7 +9219,7 @@ - + @@ -9548,7 +9427,7 @@ - + @@ -9756,7 +9635,7 @@ - + @@ -9964,7 +9843,7 @@ - + @@ -10172,7 +10051,7 @@ - + @@ -10380,7 +10259,7 @@ - + @@ -10594,7 +10473,7 @@ - + @@ -10808,7 +10687,7 @@ - + @@ -11022,7 +10901,7 @@ - + @@ -11229,14 +11108,14 @@ - - - - - + + + + + - + @@ -11450,7 +11329,7 @@ - + @@ -11657,14 +11536,14 @@ - - - - - + + + + + - + @@ -11871,21 +11750,21 @@ - - - - - - + + + + + + - - - - + + + +
@@ -11908,9 +11787,9 @@ 3 - 2 - 19 - R3C20:R3C100 + 10 + 79 + R11C80:R11C100 False