diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index f059ae0..154a6f9 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 b5bc10e..927c6a8 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 a7bfdb0..defb2f4 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 2a494aa..175a58d 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -3514,7 +3514,7 @@ private: System::Windows::Forms::CheckBox^ cboxIsUnnecessaryRating; System::String ^filename = this->saveFileDlg( "html format (*.html)|*.html", ".html" ); - if( !filename || !this->saveMiddlewareListXmlEmbeddedXsl(filename) ) + if( !filename || !this->saveMiddlewareListHtml(filename) ) { this->errMsg( "ミドルウェアリストの作成に失敗しました。","Making a middleware list failed." ); } diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp index 81a4b25..4d198d1 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp @@ -1465,7 +1465,7 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp ) { if( this->pRomHeader->s.access_control.sd_card_access != 0 ) { - this->hWarnList->Add( gcnew RCMrcError( + this->hErrorList->Add( gcnew RCMrcError( "アクセスコントロール情報", 0x1b4, 0x1b7, "SDカードへのアクセスは許可されていません。", "Access Control Info.", @@ -1476,7 +1476,7 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp ) { if( this->pRomHeader->s.access_control.nand_access != 0 ) { - this->hWarnList->Add( gcnew RCMrcError( + this->hErrorList->Add( gcnew RCMrcError( "アクセスコントロール情報", 0x1b4, 0x1b7, "ゲームカード用ソフトは、NANDフラッシュメモリへのアクセスを許可されていません。", "Access Control Info.", @@ -1484,11 +1484,19 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp ) false, true ) ); } } - u32 okbits = 0x00000008 | 0x00000010 | 0x00000400; + u32 okbits; + if( !this->IsMediaNand ) + { + okbits = 0x00000008 | 0x00000010; + } + else + { + okbits = 0x00000008 | 0x00000010 | 0x00000400; // NANDアプリのときはJpegSignフラグは許される + } u32 *p = (u32*)&(this->pRomHeader->s); if( p[ 0x1b4 / 4 ] & ~okbits ) { - this->hWarnList->Add( gcnew RCMrcError( + this->hErrorList->Add( gcnew RCMrcError( "アクセスコントロール情報", 0x1b4, 0x1b7, "許可されていないアクセスが設定されています。この設定は許可されていません。", "Access Control Info.",