diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 9f64684..cc8aab0 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/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 ) {