diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 6c4c529..cdab9be 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 125b1dd..442f9e1 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/srl_mrc.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp index 58af6d3..a60c747 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp @@ -609,27 +609,27 @@ void RCSrl::mrcAccessControl(FILE *fp) } if( this->pRomHeader->s.access_control.photo_access_read != 0 ) { - this->hWarnList->Add( this->makeMrcError("IllegalAccessSystem", "Photo Database(Read)") ); + this->hWarnList->Add( this->makeMrcError("IllegalAccessSystem", "Photo Database (Read)") ); } if( this->pRomHeader->s.access_control.photo_access_write != 0 ) { - this->hWarnList->Add( this->makeMrcError("IllegalAccessSystem", "Photo Database(Write)") ); + this->hWarnList->Add( this->makeMrcError("IllegalAccessSystem", "Photo Database (Write)") ); } if( this->pRomHeader->s.access_control.sdmc_access_read != 0 ) { - this->hWarnList->Add( this->makeMrcError("IllegalAccessSystem", "SD Card(Read)") ); + this->hWarnList->Add( this->makeMrcError("IllegalAccessSystem", "SD Card (Read)") ); } if( this->pRomHeader->s.access_control.sdmc_access_write != 0 ) { - this->hWarnList->Add( this->makeMrcError("IllegalAccessSystem", "SD Card(Write)") ); + this->hWarnList->Add( this->makeMrcError("IllegalAccessSystem", "SD Card (Write)") ); } if( this->pRomHeader->s.access_control.backup_access_read != 0 ) { - this->hWarnList->Add( this->makeMrcError("IllegalAccessSystem", "Card Backup(Read)") ); + this->hWarnList->Add( this->makeMrcError("IllegalAccessSystem", "Game Card (Read)") ); } if( this->pRomHeader->s.access_control.backup_access_write != 0 ) { - this->hWarnList->Add( this->makeMrcError("IllegalAccessSystem", "Card Backup(Write)") ); + this->hWarnList->Add( this->makeMrcError("IllegalAccessSystem", "Game Card (Write)") ); } // その他のビット @@ -674,6 +674,14 @@ void RCSrl::mrcAccessControl(FILE *fp) { this->hErrorList->Add( this->makeMrcError("IllegalAccessUser", "HW AES Slot A for the SSL client certification") ); } + if( this->pRomHeader->s.access_control.backup_access_read != 0 ) + { + this->hErrorList->Add( this->makeMrcError("GameCardReadAccessUser") ); + } + if( this->pRomHeader->s.access_control.backup_access_write != 0 ) + { + this->hErrorList->Add( this->makeMrcError("GameCardWriteAccessUser") ); + } // SDアクセスは 5.2RELEASE で特定のアプリには許可される if( !this->IsMediaNand ) @@ -683,6 +691,14 @@ void RCSrl::mrcAccessControl(FILE *fp) { this->hErrorList->Add( this->makeMrcError("SDAccessUser") ); } + if( this->pRomHeader->s.access_control.sdmc_access_read != 0 ) + { + this->hErrorList->Add( this->makeMrcError("SDReadAccessUser") ); + } + if( this->pRomHeader->s.access_control.sdmc_access_read != 0 ) + { + this->hErrorList->Add( this->makeMrcError("SDWriteAccessUser") ); + } } else { @@ -694,6 +710,14 @@ void RCSrl::mrcAccessControl(FILE *fp) { this->hErrorList->Add( this->makeMrcError("SDAccessUser") ); } + if( this->pRomHeader->s.access_control.sdmc_access_read != 0 ) + { + this->hErrorList->Add( this->makeMrcError("SDReadAccessUser") ); + } + if( this->pRomHeader->s.access_control.sdmc_access_read != 0 ) + { + this->hErrorList->Add( this->makeMrcError("SDWriteAccessUser") ); + } } else { @@ -738,23 +762,24 @@ void RCSrl::mrcAccessControl(FILE *fp) { this->hErrorList->Add( this->makeMrcError("JpegSignAccessUserNand") ); } - // photoアクセスするのにTCLライブラリを使用していないとき - if( (this->pRomHeader->s.access_control.photo_access_read != 0) || - (this->pRomHeader->s.access_control.photo_access_write != 0) ) + } + + // photoアクセスするのにTCLライブラリを使用していないとき + if( (this->pRomHeader->s.access_control.photo_access_read != 0) || + (this->pRomHeader->s.access_control.photo_access_write != 0) ) + { + System::Boolean useTcl = false; + for each( RCLicense ^lic in this->hLicenseList ) { - System::Boolean useTcl = false; - for each( RCLicense ^lic in this->hLicenseList ) + if( lic->Publisher->StartsWith("NINTENDO") && lic->Name->StartsWith("TCL") ) { - if( lic->Publisher->StartsWith("NINTENDO") && lic->Name->StartsWith("TCL") ) - { - useTcl = true; - } - } - if( !useTcl ) - { - this->hErrorList->Add( this->makeMrcError("PhotoTclAccessUser") ); + useTcl = true; } } + if( !useTcl ) + { + this->hErrorList->Add( this->makeMrcError("PhotoTclAccessUser") ); + } } if( this->pRomHeader->s.access_control.common_client_key_for_debugger_sysmenu != 0 ) diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml index 1f3f2db..18bd8ad 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml and b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml index c0d3f6e..fc4b31e 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml @@ -93,7 +93,7 @@ 繝繧ヲ繝ウ繝ュ繝シ繝峨し繝シ繝薙せ蟇セ蠢 - 繝繝シ繧ソ驟堺ソ。逕ィ(Nintendo Zone逕ィ)縺ョROM縺ァ縺ッ縲》mp繧ク繝」繝ウ繝励r險ア蜿ッ縺吶k蠢隕√′縺ゅj縺セ縺吶3SF繝輔ぃ繧、繝ォ縺ョPermitLandingTmpJump繝励Ο繝代ユ繧」繧定ィュ螳壹@縺ヲ縺上□縺輔>縲 + 繝繧ヲ繝ウ繝ュ繝シ繝峨し繝シ繝薙せ逕ィ縺ョROM縺ァ縺ッ縲》mp繧ク繝」繝ウ繝励r險ア蜿ッ縺吶k蠢隕√′縺ゅj縺セ縺吶3SF繝輔ぃ繧、繝ォ縺ョPermitLandingTmpJump繝励Ο繝代ユ繧」繧定ィュ螳壹@縺ヲ縺上□縺輔>縲 1d1dFalseTrue @@ -105,7 +105,7 @@ 繝繧ヲ繝ウ繝ュ繝シ繝峨し繝シ繝薙せ蟇セ蠢 - 繝繝シ繧ソ驟堺ソ。逕ィ(Nintendo Zone逕ィ)縺ョROM繧オ繧、繧コ縺ッ2.5MByte莉・荳九〒縺ェ縺代l縺ー縺ェ繧翫∪縺帙s縲 + 繝繧ヲ繝ウ繝ュ繝シ繝峨し繝シ繝薙せ逕ィ縺ョROM繧オ繧、繧コ縺ッ2.5MByte莉・荳九〒縺ェ縺代l縺ー縺ェ繧翫∪縺帙s縲 00FalseTrue @@ -377,6 +377,16 @@ SD繧ォ繝シ繝峨∈縺ョ繧「繧ッ繧サ繧ケ縺ッ險ア蜿ッ縺輔l縺ヲ縺縺セ縺帙s縲 1b41b7FalseTrue + + SD繧ォ繝シ繝峨い繧ッ繧サ繧ケ + SD繧ォ繝シ繝峨∈縺ョ繝ェ繝シ繝峨い繧ッ繧サ繧ケ縺ッ險ア蜿ッ縺輔l縺ヲ縺縺セ縺帙s縲 + 1b41b7FalseTrue + + + SD繧ォ繝シ繝峨い繧ッ繧サ繧ケ + SD繧ォ繝シ繝峨∈縺ョ繝ゥ繧、繝医い繧ッ繧サ繧ケ縺ッ險ア蜿ッ縺輔l縺ヲ縺縺セ縺帙s縲 + 1b41b7FalseTrue + 繧「繧ッ繧サ繧ケ繧ウ繝ウ繝医Ο繝シ繝ォ諠蝣ア SD繧ォ繝シ繝峨∈繧「繧ッ繧サ繧ケ蜿ッ閭ス縺ォ縺ェ縺」縺ヲ縺縺セ縺吶 @@ -402,6 +412,16 @@ 繧イ繝シ繝繧ォ繝シ繝丑TR莠呈鋤鬆伜沺縺ク繧「繧ッ繧サ繧ケ蜿ッ閭ス縺ォ縺ェ縺」縺ヲ縺縺セ縺吶 1b41b7FalseTrue + + 繧「繧ッ繧サ繧ケ繧ウ繝ウ繝医Ο繝シ繝ォ諠蝣ア + 繧イ繝シ繝繧ォ繝シ繝峨∈縺ョ繝ェ繝シ繝峨い繧ッ繧サ繧ケ縺ッ險ア蜿ッ縺輔l縺ヲ縺縺セ縺帙s縲 + 1b41b7FalseTrue + + + 繧「繧ッ繧サ繧ケ繧ウ繝ウ繝医Ο繝シ繝ォ諠蝣ア + 繧イ繝シ繝繧ォ繝シ繝峨∈縺ョ繝ゥ繧、繝医い繧ッ繧サ繧ケ縺ッ險ア蜿ッ縺輔l縺ヲ縺縺セ縺帙s縲 + 1b41b7FalseTrue + 蜀咏悄繝繝シ繧ソ繝吶シ繧ケ繧「繧ッ繧サ繧ケ 蜀咏悄繝繝シ繧ソ繝吶シ繧ケ縺ク縺ョ繝ェ繝シ繝峨い繧ッ繧サ繧ケ縺ッ險ア蜿ッ縺輔l縺ヲ縺縺セ縺帙s縲