diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb
index d8cf817..43fd2b3 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 2a8bcba..61a8af9 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 37ed741..84f32d1 100644
Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h
index c7cac37..68d5e51 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h
@@ -4582,7 +4582,7 @@ private: System::Windows::Forms::RadioButton^ rPurposeCardTouchTryDS;
{
System::Reflection::Assembly ^ass = System::Reflection::Assembly::GetEntryAssembly();
System::Version ^ver = ass->GetName()->Version;
- return ( ver->Major.ToString() + "." + ver->Minor.ToString() + "TRIAL" );
+ return ( ver->Major.ToString() + "." + ver->Minor.ToString() );
}
// SRLに登録されないROM仕様のフォーム入力を
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx
index 30eeb5e..7221940 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx
@@ -1085,7 +1085,7 @@
縺昴ョ莉悶い繝励Μ諠蝣ア
- 245, 82
+ 245, 103
88, 12
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX
index 5712c0d..895cc91 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX
@@ -5698,7 +5698,7 @@
Submission Date
- 711, 24
+ 731, 24
Form1
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm
index cea9386..1186e61 100644
Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm differ
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp
index 7c35821..dd670ad 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp
@@ -323,9 +323,7 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp )
u32 allsize = this->hNandUsedSize->NandUsedSize; // TMDやサブバナーのサイズを含める
if( allsize > METWL_ALLSIZE_MAX_NAND )
{
- this->hErrorList->Add( this->makeMrcError(
- RCMrcError::PurposeType::Production | RCMrcError::PurposeType::DSiShop,
- "UsedNandSizeLimit") );
+ this->hErrorList->Add( this->makeMrcError("UsedNandSizeLimit") );
}
if( (allsize > METWL_ALLSIZE_MAX_NAND_LIC) && this->IsAppUser ) // ユーザアプリのときのみ
{
@@ -500,6 +498,10 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp )
{
this->hErrorList->Add( this->makeMrcError("DebugBuild") );
}
+ if( lic->Publisher->Equals( "NINTENDO" ) && lic->Name->StartsWith( "DEBUG DWC" ) )
+ {
+ this->hErrorList->Add( this->makeMrcError("DwcDebug") );
+ }
}
// 中韓版チェック
@@ -607,6 +609,39 @@ void RCSrl::mrcAccessControl(FILE *fp)
this->hErrorList->Add( this->makeMrcError("CardAccess") );
}
+ // TCLライブラリを使用しているかどうかを調べる
+ System::Boolean useTcl = false;
+ for each( RCLicense ^lic in this->hLicenseList )
+ {
+ if( lic->Publisher->StartsWith("NINTENDO") && lic->Name->StartsWith("TCL") )
+ {
+ useTcl = true;
+ }
+ }
+
+ // TCL_DeletePicture() を使用してはいけないSDKを調べる(DEA-SUP参照)
+ bool prohibid = false;
+ if( useTcl && (this->pRomHeader->s.access_control.photo_access_write != 0) )
+ {
+ for each( RCSDKVersion ^sdk in this->hSDKList )
+ {
+ if( sdk->IsStatic )
+ {
+ System::Byte major = (System::Byte)(0xff & (sdk->Code >> 24));
+ System::Byte minor = (System::Byte)(0xff & (sdk->Code >> 16));
+ System::UInt16 relstep = (System::UInt16)(0xffff & sdk->Code);
+ if( (major == 5) && (minor == 3) && (30000 <= relstep) && (relstep < 30003) )
+ {
+ this->hWarnList->Add( this->makeMrcError("TclDeletePicture53") );
+ }
+ else if( (major == 5) && (minor == 2) && (30000 <= relstep) && (relstep < 30004) )
+ {
+ this->hWarnList->Add( this->makeMrcError("TclDeletePicture52") );
+ }
+ }
+ }
+ }
+
if( !this->IsAppUser ) // システムアプリ
{
if( this->pRomHeader->s.access_control.common_client_key != 0 )
@@ -836,14 +871,6 @@ void RCSrl::mrcAccessControl(FILE *fp)
if( (this->pRomHeader->s.access_control.photo_access_read != 0) ||
(this->pRomHeader->s.access_control.photo_access_write != 0) )
{
- System::Boolean useTcl = false;
- for each( RCLicense ^lic in this->hLicenseList )
- {
- if( lic->Publisher->StartsWith("NINTENDO") && lic->Name->StartsWith("TCL") )
- {
- useTcl = true;
- }
- }
if( !useTcl )
{
this->hErrorList->Add( this->makeMrcError("PhotoTclAccessUser") );
@@ -964,6 +991,7 @@ void RCSrl::mrcReservedArea(FILE *fp)
}
if( !bReserved )
{
+ // begin と end が mrc_msg.xml には記載されていないので呼び出し方が他とは異なる
this->hErrorList->Add( this->makeMrcError(begin, end, false, true, RCMrcError::PurposeType::Common, "ReservedArea") );
}
} //for each
@@ -1369,12 +1397,12 @@ void RCSrl::mrcTrialApp(FILE *fp)
if( this->pRomHeader->s.platform_code == PLATFORM_CODE_TWL_LIMITED )
{
this->hWarnList->Add( this->makeMrcError(RCMrcError::PurposeType::Zone, "ZoneLimited") );
- this->hWarnList->Add( this->makeMrcError(RCMrcError::PurposeType::DSDownload, "DSDownloadLimited") );
+ this->hErrorList->Add( this->makeMrcError(RCMrcError::PurposeType::DSDownload, "DSDownloadLimited") );
}
if( filesize > (5 * 1024 * 1024 / 2) )
{
- this->hErrorList->Add( this->makeMrcError(RCMrcError::PurposeType::Zone, "ZoneRomSize") );
- this->hErrorList->Add( this->makeMrcError(RCMrcError::PurposeType::DSDownload, "DSDownloadRomSize") );
+ this->hWarnList->Add( this->makeMrcError(RCMrcError::PurposeType::Zone, "ZoneRomSize") );
+ this->hWarnList->Add( this->makeMrcError(RCMrcError::PurposeType::DSDownload, "DSDownloadRomSize") );
}
if( !this->HasDSDLPlaySign )
{