体験版ライブラリの名称変更に伴うROMチェックの変更/追加．

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlToolsRED@484 7061adef-622a-194b-ae81-725974e89856

build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp

@@ -1352,17 +1352,26 @@ void RCSrl::mrcTrialApp(FILE *fp)
 	// 表示するときに振り分けをする
 
 	// Touch!Try!DS
+	bool use_tis = false;
 	bool use_nis = false;
 	for each( RCLicense ^lic in this->hLicenseList )
 	{
+		if( lic->Publisher->Equals( "NINTENDO" ) && lic->Name->StartsWith( "TIS_FOR_TWLSDK" ) )
+		{
+			use_tis = true;
+		}
 		if( lic->Publisher->Equals( "NINTENDO" ) && lic->Name->StartsWith( "NIS_FOR_TWLSDK" ) )
 		{
 			use_nis = true;
 		}
 	}
-	if( !use_nis )
+	if( !use_tis )
 	{
-		this->hErrorList->Add( this->makeMrcError(RCMrcError::PurposeType::TouchTryDS, "TouchTryDSLib") );
+		this->hErrorList->Add( this->makeMrcError(RCMrcError::PurposeType::TouchTryDS, "TouchTryDSLibTis") );
+	}
+	if( use_nis )
+	{
+		this->hErrorList->Add( this->makeMrcError(RCMrcError::PurposeType::TouchTryDS, "TouchTryDSLibNis") );
 	}
 	if( this->IsMediaNand )
 	{

build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj

@@ -57,7 +57,7 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_6ACA4D814AA04AF2A2F63060CDA5FA7D"
+        "MsmKey" = "8:_4E53291669A94A01BEB1B14679DF85E0"
         "OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -87,6 +87,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_899760908357496CB0912065D65DDBDA"
+        "OwnerKey" = "8:_4E53291669A94A01BEB1B14679DF85E0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_9081D70FB535474FA8789DC9AFE4637C"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -111,12 +117,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_E67AE567BCA041ABA7D402B9029EA503"
-        "OwnerKey" = "8:_6ACA4D814AA04AF2A2F63060CDA5FA7D"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_FE56DE664C36410FB05BBF909ADE9DBE"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -408,7 +408,7 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.8.3658.26637, Culture=en, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.8.3664.28542, Culture=en, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
                 }
@@ -494,7 +494,7 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.8.3658.26637, Culture=ja, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.8.3664.28542, Culture=ja, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
                 }
@@ -657,7 +657,7 @@
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:MasterEditorTWL"
         "ProductCode" = "8:{B12B5AFF-26D1-47B5-85B6-1E2A7B5106F5}"
-        "PackageCode" = "8:{E2B78A12-4165-4BC1-99EC-3E8BF69CB7A6}"
+        "PackageCode" = "8:{1047076B-0F2A-4B45-8FB6-12E43381C4B5}"
         "UpgradeCode" = "8:{CE22C209-7AE1-4F58-8F6B-6D044BA2A118}"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:FALSE"
@@ -1186,7 +1186,7 @@
         }
         "MergeModule"
         {
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_6ACA4D814AA04AF2A2F63060CDA5FA7D"
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_4E53291669A94A01BEB1B14679DF85E0"
             {
             "UseDynamicProperties" = "11:TRUE"
             "IsDependency" = "11:TRUE"
@@ -1200,7 +1200,7 @@
             "Feature" = "8:"
             "IsolateTo" = "8:"
             }
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_E67AE567BCA041ABA7D402B9029EA503"
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_899760908357496CB0912065D65DDBDA"
             {
             "UseDynamicProperties" = "11:TRUE"
             "IsDependency" = "11:TRUE"

build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml

@@ -61,11 +61,17 @@
 	</ChinaAllRatingFree>
 
 	<!-- For Touch Try DS -->
-	<TouchTryDSLib>
+	<TouchTryDSLibTis>
 		<name>Touch!Try!DS体験版対応</name>
-		<sentence>Touch!Try!DS体験版ではNISライブラリを使用する必要があります。</sentence>
+		<sentence>Touch!Try!DS体験版ではTISライブラリを使用する必要があります。</sentence>
 		<begin>0</begin><end>0</end><modify>False</modify><affect>True</affect>
-	</TouchTryDSLib>
+	</TouchTryDSLibTis>
+
+	<TouchTryDSLibNis>
+		<name>Touch!Try!DS体験版対応</name>
+		<sentence>Touch!Try!DS体験版ではNISライブラリを使用してはいけません。TISライブラリを使用してください。</sentence>
+		<begin>0</begin><end>0</end><modify>False</modify><affect>True</affect>
+	</TouchTryDSLibNis>
 
 	<TouchTryDSMedia>
 		<name>Touch!Try!DS体験版対応</name>