diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 2c035ad..7d5cb29 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index 115b6a6..d65462d 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 47c8af6..ddc4dbb 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp index 79ca92b..8e41ecd 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp @@ -86,7 +86,7 @@ void Form1::setSrlForms(void) } else { - this->tboxIsCodec->Text = gcnew System::String( "NTR" ); + this->tboxIsCodec->Text = gcnew System::String( "DS" ); } this->cboxIsSD->Checked = this->hSrl->IsSD; this->cboxIsNAND->Checked = this->hSrl->IsNAND; diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp index 70ddb0c..6bcb5b3 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp @@ -316,7 +316,7 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( if( hSrl->IsCodecTWL ) node->FirstChild->Value = gcnew System::String("TWL"); else - node->FirstChild->Value = gcnew System::String("NTR"); + node->FirstChild->Value = gcnew System::String("DS"); } if( node->FirstChild->Value->Equals( "TagIsEULA" ) ) { diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_element.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_element.h index 0689e2b..b1400bb 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_element.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_element.h @@ -142,9 +142,8 @@ namespace MasterEditorTWL property System::UInt32 PrivateSaveSize; property System::Boolean IsMediaNand; // NANDアプリかどうか property System::Boolean IsUseSubBanner; // サブバナーを使用するかどうか - public: - static const System::UInt32 TmdSize = 16 * 1024; private: + static const System::UInt32 cTmdSize = 16 * 1024; static const System::UInt32 cSubBannerSize = 16 * 1024; static const System::UInt32 NandClusterSize = 16 * 1024; static const System::UInt32 ShopBlockSize = 128 * 1024; @@ -168,17 +167,6 @@ namespace MasterEditorTWL { System::UInt32 get(){ return (MasterEditorTWL::roundUp( this->PrivateSaveSize, NandClusterSize )); } } - property System::UInt32 TmdSizeRoundUp - { - System::UInt32 get() - { - if( !this->IsMediaNand ) - { - return 0; - } - return (MasterEditorTWL::roundUp( this->TmdSize, NandClusterSize )); - } - } property System::UInt32 SubBannerSize // サブバナーのサイズは使用するかしないかで異なるので計算した値を property で提供 { System::UInt32 get() @@ -201,6 +189,28 @@ namespace MasterEditorTWL return (MasterEditorTWL::roundUp( this->SubBannerSize, NandClusterSize )); } } + property System::UInt32 TmdSize + { + System::UInt32 get() + { + if( !this->IsMediaNand ) + { + return 0; + } + return this->cTmdSize; + } + } + property System::UInt32 TmdSizeRoundUp + { + System::UInt32 get() + { + if( !this->IsMediaNand ) + { + return 0; + } + return (MasterEditorTWL::roundUp( this->TmdSize, NandClusterSize )); + } + } property System::UInt32 NandUsedSize // 全体のNAND消費サイズは変数で持たず property で提供 { System::UInt32 get()