From 7033479efa84b18dd4f12904c932606d99985988 Mon Sep 17 00:00:00 2001
From: nishikawa_takeshi <nishikawa_takeshi@randommeaninglesscharacters.com>
Date: Tue, 23 Jun 2009 08:36:35 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=9E=E3=82=B9=E3=82=BF=E3=82=A8=E3=83=87?=
 =?UTF-8?q?=E3=82=A3=E3=82=BF:=E3=83=97=E3=83=A9=E3=83=83=E3=83=88?=
 =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=BC=E3=83=A0=E3=81=AE=E3=83=81=E3=82=A7?=
 =?UTF-8?q?=E3=83=83=E3=82=AF=E4=BF=AE=E6=AD=A3=E3=80=82=E3=83=81=E3=82=A7?=
 =?UTF-8?q?=E3=83=83=E3=82=AF=E3=81=99=E3=82=8B=E5=A0=B4=E6=89=80=E3=82=82?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4=E3=80=82PictoChat=E3=81=AA=E3=81=A9=E3=81=AE?=
 =?UTF-8?q?=E3=82=B7=E3=82=B9=E3=83=86=E3=83=A0NTR=E3=82=A2=E3=83=97?=
 =?UTF-8?q?=E3=83=AA=E3=82=92=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=82=81=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlToolsRED@312 7061adef-622a-194b-ae81-725974e89856
---
 .../MasterEditorTWL/Debug/BuildLog.htm        | Bin 23560 -> 23560 bytes
 .../MasterEditorTWL/MasterEditorTWL/srl.cpp   |  13 +++++++++++++
 .../MasterEditorTWL/srl_mrc.cpp               |  10 ----------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm
index 9f64684d08b542c6842efea99ac4b4ea07799e2c..cc8aab0728adf995e9169717f28cd4d7c25a364e 100644
GIT binary patch
delta 420
zcmeC!!Pv2baf2C~umOW1gE0`BF&HqIFqi__Mw1m?j5pV?vG8G)%$AGY{6R#75h!Vd
zLuVb+<`WVVSh1<toGr)B0hBPts&$9jHbHEXn;R_(K^B@|(PcT=&Wdj`pU$<-O4dzG
zSQTZ<NpF7Oqz5tq<Uw@LB1|xF0GoiR2+0I9bQ3l!y5xiG#gLc`(WSsR`JOu{EX^@=
Q{&#-~aulY-Z%<w!01vZHtN;K2

delta 436
zcmeC!!Pv2baf2C~upxsJgE508g8>j4GMEF|W|I|Nj5pV?vG8G)%$AGY{6R#75h&@5
zLuVb+<`WVVSh1<toGr)B0hDmTs&$9jHbHEXn;R_(K^D4V(PcT=&Wdlc92eVU3)Ul(
z?c{hiD_J)&VO5+hC%yTBlOD(<H=;~3Z~&WxsTgjO5ir=$f^V~;OFok@7KzCaT?&ko
X@452<6&PaZ{O|sf5v#;+PhKGaOnp-D

diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp
index 263c209..0f2b09b 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp
@@ -79,6 +79,19 @@ ECSrlResult RCSrl::readFromFile( System::String ^srlfile )
 	}
 #endif //#ifdef METWL_WHETHER_SIGN_DECRYPT
 
+#ifdef METWL_WHETHER_PLATFORM_CHECK
+	// プラットフォームのチェック
+	if( ((tmprh.s.platform_code != PLATFORM_CODE_NTR) && (tmprh.s.enable_signature != 0)) ||	// PictoChat/DS-download-play のみこれに該当
+		(tmprh.s.platform_code != PLATFORM_CODE_TWL_HYBLID) ||
+		(tmprh.s.platform_code != PLATFORM_CODE_TWL_LIMITED) )
+	{
+	}
+	else
+	{
+		return ECSrlResult::ERROR_PLATFORM;
+	}
+#endif
+
 	// 署名チェックを通ってからフィールドのROMヘッダにコピー
 	// (そうしないと不正SRLを読み込んだときにROMヘッダが上書きされてしまう)
 	memcpy( this->pRomHeader, &tmprh, sizeof(ROM_Header) );
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp
index 66de72d..5db09c2 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp
@@ -232,16 +232,6 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp )
 {
 	// ROMヘッダのチェック (NTR互換領域)
 
-#ifdef METWL_WHETHER_PLATFORM_CHECK
-	// プラットフォームのチェック
-	if( (this->pRomHeader->s.platform_code != PLATFORM_CODE_TWL_HYBLID) && 
-		(this->pRomHeader->s.platform_code != PLATFORM_CODE_TWL_LIMITED) &&
-		(this->pRomHeader->s.enable_signature == 0) )
-	{
-		return ECSrlResult::ERROR_PLATFORM;
-	}
-#endif
-
 	// NANDアプリがHYBRIDとなるのはクローンブートのときのみ
 	if( this->IsMediaNand )
 	{