diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb index f484314b..af5d28d0 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 50257e0b..88ee26fe 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 b3384b97..89be26f5 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 b2026085..e71499b7 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -712,7 +712,7 @@ private: System::Windows::Forms::CheckBox^ cboxIsPhotoEx; // 複数行表示したいが初期値で設定できないのでここで設定 this->tboxGuideRomEditInfo->Text = "このタブの各項目への入力は提出確認書およびマスターROMの作成のために必要です。"; - this->tboxGuideRomEditInfo->Text += "\r\nこれらの情報はマスターROMの作成時にROM内登録データとして登録されます(「その他ROM情報」を除く。)"; + this->tboxGuideRomEditInfo->Text += "\r\nこれらの情報はマスターROMの作成時にROM内登録データとして登録されます(「その他ROM情報」を除く)。"; this->tboxGuideErrorInfo->Text = "このタブには読み込んだROMデータの問題と本プログラムでの入力ミスが列挙されます。"; this->tboxGuideErrorInfo->Text += "\r\n赤文字の項目は、本プログラムで修正不可です。ROMデータ作成時の設定をご確認ください。"; diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp index 750143f0..a65f890e 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp @@ -67,7 +67,7 @@ void Form1::changeJapanese(void) this->tboxGuideTWLInfo->Text = gcnew System::String( "このタブの情報は編集不可です。データに誤りがある場合にはROMデータの作成時の設定を見直してください。" ); this->tboxGuideRomEditInfo->Text = gcnew System::String( "" ); this->tboxGuideRomEditInfo->Text += "このタブの各項目への入力は提出確認書およびマスターROMの作成のために必要です。"; - this->tboxGuideRomEditInfo->Text += "\r\nこれらの情報はマスターROMの作成時にROM内登録データとして登録されます(「その他ROM情報」を除く。)"; + this->tboxGuideRomEditInfo->Text += "\r\nこれらの情報はマスターROMの作成時にROM内登録データとして登録されます(「その他ROM情報」を除く)。"; this->tboxGuideSubmitInfo->Text = gcnew System::String( "このタブの情報は提出確認書の作成に必要です。入力してください。" ); this->tboxGuideCompanyInfo->Text = gcnew System::String( "このタブの情報は提出確認書の作成に必要です。入力してください。" ); this->tboxGuideErrorInfo->Text = gcnew System::String( "" ); diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp index 82410074..8bbfec47 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp @@ -159,7 +159,11 @@ void Form1::setSrlForms(void) } if( *(this->hSrl->hIsAesSlotBForJpegEnc) == true ) { - acc += "AES-SlotB(JpegEnc.).\r\n"; + acc += "AES-SlotB(Jpeg Launcher).\r\n"; + } + if( *(this->hSrl->hIsAesSlotBForJpegEncUser) == true ) + { + acc += "AES-SlotB(Jpeg User).\r\n"; } if( *(this->hSrl->hIsAesSlotAForSSL) == true ) { @@ -167,7 +171,7 @@ void Form1::setSrlForms(void) } if( *(this->hSrl->hIsCommonClientKeyForDebugger) == true ) { - acc += "commonClientKey(Debug.).\r\n"; + acc += "commonClientKey(Debug).\r\n"; } this->tboxAccessOther->Text = acc; diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp index 15b4634e..a83cc63e 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp @@ -104,7 +104,11 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( } if( *(hSrl->hIsAesSlotBForJpegEnc) == true ) { - access += "AES-SlotB(JpegEnc.). "; + access += "AES-SlotB(Jpeg Launcher). "; + } + if( *(hSrl->hIsAesSlotBForJpegEncUser) == true ) + { + access += "AES-SlotB(Jpeg User). "; } if( *(hSrl->hIsAesSlotAForSSL) == true ) { @@ -121,7 +125,7 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( { for each( RCLicense ^lic in hSrl->hLicenseList ) { - lib += lic->Publisher + " " + lic->Name + ". "; + lib += "[" + lic->Publisher + " " + lic->Name + "]. "; } } diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp index 164b10a7..9a688c61 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp @@ -262,6 +262,7 @@ ECSrlResult RCSrl::setRomInfo(void) this->hIsGameCardOn = gcnew System::Boolean( (this->pRomHeader->s.access_control.game_card_on != 0)?true:false ); this->hIsShared2 = gcnew System::Boolean( (this->pRomHeader->s.access_control.shared2_file != 0)?true:false ); this->hIsAesSlotBForJpegEnc = gcnew System::Boolean( (this->pRomHeader->s.access_control.hw_aes_slot_B_SignJPEGForLauncher != 0)?true:false ); + this->hIsAesSlotBForJpegEncUser = gcnew System::Boolean( (this->pRomHeader->s.access_control.hw_aes_slot_B_SignJPEGForUser != 0)?true:false ); this->hIsGameCardNitro = gcnew System::Boolean( (this->pRomHeader->s.access_control.game_card_nitro_mode != 0)?true:false ); this->hIsAesSlotAForSSL = gcnew System::Boolean( (this->pRomHeader->s.access_control.hw_aes_slot_A_SSLClientCert != 0)?true:false ); this->hIsCommonClientKeyForDebugger diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/srl.h b/build/tools/MasterEditorTWL/MasterEditorTWL/srl.h index 07b4df2e..cac8be9c 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/srl.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/srl.h @@ -314,6 +314,7 @@ namespace MasterEditorTWL property System::Boolean ^hIsGameCardOn; property System::Boolean ^hIsShared2; property System::Boolean ^hIsAesSlotBForJpegEnc; + property System::Boolean ^hIsAesSlotBForJpegEncUser; property System::Boolean ^hIsGameCardNitro; property System::Boolean ^hIsAesSlotAForSSL; property System::Boolean ^hIsCommonClientKeyForDebugger;