diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 583b973..d6a25f8 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 8b67538..6505bcd 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 5f958d3..a32fdb1 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/Form_srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp index 762bc7f..2b6883e 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp @@ -83,7 +83,8 @@ void Form1::setSrlForms(void) this->tboxIsCodec->Text = gcnew System::String( "DS" ); } this->cboxIsSD->Checked = this->hSrl->IsSD; - if( this->hSrl->IsSD && !this->hSrl->IsOldSDK52Release ) + this->tboxSDAccessRight->Text = ""; // 2回連続してROMを読み込むときのために初期化しておく + if( this->hSrl->IsSD && !this->hSrl->IsOldSDK52Release ) // SDアクセスしない場合には空白 { System::String ^sdright = ""; if( this->hSrl->IsSDRead && this->hSrl->IsSDWrite ) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp index 506a6a4..f50d12a 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp @@ -447,7 +447,7 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( } if( node->FirstChild->Value->Equals( "TagSDAccessRight" ) ) { - if( hSrl->IsSD && !hSrl->IsOldSDK52Release ) + if( hSrl->IsSD && !hSrl->IsOldSDK52Release ) // SDアクセスしない場合には空白 { if( hSrl->IsSDRead && hSrl->IsSDWrite ) node->FirstChild->Value = gcnew System::String("Read/Write"); diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp index a60c747..c2cd086 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp @@ -787,7 +787,7 @@ void RCSrl::mrcAccessControl(FILE *fp) this->hErrorList->Add( this->makeMrcError("IllegalAccessUser", "Common Client Key for the debugger system menu") ); } - u32 okbits = 0x80007FFF; + u32 okbits = 0x8001FFFF; u32 *p = (u32*)&(this->pRomHeader->s); if( p[ 0x1b4 / 4 ] & ~okbits ) { diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/errorlist.xsl b/build/tools/MasterEditor/MasterEditorTWL/resource/errorlist.xsl index bafb957..416839f 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/errorlist.xsl +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/errorlist.xsl @@ -60,6 +60,18 @@ font-weight: normal; font-size: 12px; } + td.errname { + width: 200px; + } + td.errtype { + width: 100px; + } + td.errrange { + width: 100px; + } + td.errmsg { + width: 600px; + } diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/middleware.xsl b/build/tools/MasterEditor/MasterEditorTWL/resource/middleware.xsl index a7edd3b..58466a4 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/middleware.xsl +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/middleware.xsl @@ -43,6 +43,15 @@ font-weight: normal; font-size: 12px; } + td.publisher { + width: 200px; + } + td.name { + width: 400px; + } + td.note { + width: 400px; + } diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/middleware_e.xsl b/build/tools/MasterEditor/MasterEditorTWL/resource/middleware_e.xsl index 95dd2e4..64221a3 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/middleware_e.xsl +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/middleware_e.xsl @@ -43,6 +43,15 @@ font-weight: normal; font-size: 12px; } + td.publisher { + width: 200px; + } + td.name { + width: 400px; + } + td.note { + width: 400px; + }