From af36a1c4bbfb31ed920a4cb277ef126db98d2d58 Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Mon, 29 Jun 2009 12:46:19 +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=82=B2=E3=83=BC=E3=83=A0=E3=82=AB?= =?UTF-8?q?=E3=83=BC=E3=83=89=E9=A0=98=E5=9F=9F=E3=81=B8=E3=81=AER/W?= =?UTF-8?q?=E3=82=A2=E3=82=AF=E3=82=BB=E3=82=B9=E3=82=92=E7=A6=81=E6=AD=A2?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=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@334 7061adef-622a-194b-ae81-725974e89856 --- .../MasterEditorTWL/MasterEditorTWL.ncb | Bin 13937664 -> 13937664 bytes .../MasterEditorTWL/MasterEditorTWL.suo | Bin 84480 -> 84480 bytes .../MasterEditorTWL/srl_mrc.cpp | 63 ++++++++++++------ .../MasterEditorTWL/resource/mrc_msg_e.xml | Bin 54376 -> 56268 bytes .../MasterEditorTWL/resource/mrc_msg_j.xml | 24 ++++++- 5 files changed, 66 insertions(+), 21 deletions(-) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 6c4c5295db3ac1ce81f69d14276cb1494c8860b2..cdab9be6b0d020a0a1765c034a89587afe5bbe8f 100644 GIT binary patch delta 3810 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 Z2L7Ewfs7B18oxgc##kR|);zeM_7)dWHs=5U delta 1358 zcmZ`%Ye-aE6y9s*oSAXb<9M7~IvsRUdYfAKBg1S0t7~QUA}FGVT6VoXjOIqSNT;HQ zAVIETsWKy_vSQ?H}IDxL~oq^L=Zt$38o7 zTn!voTQ)0d^{H!ko^My$op@WBivGmKSTwr8bQM`tjWIR?lU_|mzg{}1e$Y#8;3PUh z(A=Ngn1^O#53Xx<;KqEH`V&cC5S~0oZMlYJsacp?uJIZ3opy*1&N3i}`Sm`iQ4tM!%XsTpvP4ameq+_J)=?k))8j5SD(#owp1q zVP>Jf89nNKTyjm9Vf2k`uUzu;_77a=C<8vl6zR?Z98^^3O$|TEWS0KAQumcVy7E zJsACF!}vcvnAdR#R^h($v#~JjMy=BsjN0H|HIFLv(|>qrzL;*W6<@C{gMW+lQWQIk zBhMi$Oc^qZDrd1v&P%$3u(0_<@)pRv63JDNzJ#!N0UIPYmhd7gvr%BIlHYiJAhGZY zX`=0YnUhJlnXs@<$qD>|u(*>h$%&cYS$WMrHmLm|IZ8_WsJEN2L2-}dM7_llH&7fH7(naS-|RnAv-QBRGi9IImysOw zx!_$SBN5UdGA#+-+cZNzQ()*~B<471$1#dKGA{)@mRQ0YFYJXj15OO59{KTdPd2)O zE4@%XObtEe@$^iHEi4;5jBt27SYnpCG!dLJg~yXgNchjnk+)M|l>R?X_rcq^?|ULR A?EnA( 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 1f3f2dbb87dad863c77b02e00da8490d7932af81..18bd8ad8c2c3efd0c39156f5c37ab2d94ce552c1 100644 GIT binary patch delta 202 zcmaE{g89sL<_%Z6xq}&87=jp584?*%CNnP9o@}7SGWis%(_{s6mdOcIlqN^92~1u! z;Q=#H-Q>=x>R`HXy87e?Q~BU(ou+A^s4JYVIeFhip~MY zw#iqz1=tZbcEW4|s$gN9+%;7Vs8wKc(R7&BxXD1{A(BPYjerVNfMzCvbZt(U!r=e_ DA+Jvz delta 48 zcmV-00MGx-w*%;?1F+PKlOU54lNgaElW>`AlTL>mvk;gB0h3UX7_%;s90rrR0}8V` Go032X3=^XO 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繧ｸ繝｣繝ｳ繝励ｒ險ｱ蜿ｯ縺吶ｋ蠢隕√′縺ゅｊ縺ｾ縺吶３SF繝輔ぃ繧､繝ｫ縺ｮPermitLandingTmpJump繝励Ο繝代ユ繧｣繧定ｨｭ螳壹＠縺ｦ縺上□縺輔＞縲 + 繝繧ｦ繝ｳ繝ｭ繝ｼ繝峨し繝ｼ繝薙せ逕ｨ縺ｮROM縺ｧ縺ｯ縲》mp繧ｸ繝｣繝ｳ繝励ｒ險ｱ蜿ｯ縺吶ｋ蠢隕√′縺ゅｊ縺ｾ縺吶３SF繝輔ぃ繧､繝ｫ縺ｮPermitLandingTmpJump繝励Ο繝代ユ繧｣繧定ｨｭ螳壹＠縺ｦ縺上□縺輔＞縲 1d1dFalseTrue @@ -105,7 +105,7 @@ 繝繧ｦ繝ｳ繝ｭ繝ｼ繝峨し繝ｼ繝薙せ蟇ｾ蠢 - 繝繝ｼ繧ｿ驟堺ｿ｡逕ｨ(Nintendo Zone逕ｨ)縺ｮROM繧ｵ繧､繧ｺ縺ｯ2.5MByte莉･荳九〒縺ｪ縺代ｌ縺ｰ縺ｪ繧翫∪縺帙ｓ縲 + 繝繧ｦ繝ｳ繝ｭ繝ｼ繝峨し繝ｼ繝薙せ逕ｨ縺ｮROM繧ｵ繧､繧ｺ縺ｯ2.5MByte莉･荳九〒縺ｪ縺代ｌ縺ｰ縺ｪ繧翫∪縺帙ｓ縲 00FalseTrue @@ -377,6 +377,16 @@ SD繧ｫ繝ｼ繝峨∈縺ｮ繧｢繧ｯ繧ｻ繧ｹ縺ｯ險ｱ蜿ｯ縺輔ｌ縺ｦ縺縺ｾ縺帙ｓ縲 1b41b7FalseTrue + + SD繧ｫ繝ｼ繝峨い繧ｯ繧ｻ繧ｹ + SD繧ｫ繝ｼ繝峨∈縺ｮ繝ｪ繝ｼ繝峨い繧ｯ繧ｻ繧ｹ縺ｯ險ｱ蜿ｯ縺輔ｌ縺ｦ縺縺ｾ縺帙ｓ縲 + 1b41b7FalseTrue + + + SD繧ｫ繝ｼ繝峨い繧ｯ繧ｻ繧ｹ + SD繧ｫ繝ｼ繝峨∈縺ｮ繝ｩ繧､繝医い繧ｯ繧ｻ繧ｹ縺ｯ險ｱ蜿ｯ縺輔ｌ縺ｦ縺縺ｾ縺帙ｓ縲 + 1b41b7FalseTrue + 繧｢繧ｯ繧ｻ繧ｹ繧ｳ繝ｳ繝医Ο繝ｼ繝ｫ諠蝣ｱ SD繧ｫ繝ｼ繝峨∈繧｢繧ｯ繧ｻ繧ｹ蜿ｯ閭ｽ縺ｫ縺ｪ縺｣縺ｦ縺縺ｾ縺吶 @@ -402,6 +412,16 @@ 繧ｲ繝ｼ繝繧ｫ繝ｼ繝丑TR莠呈鋤鬆伜沺縺ｸ繧｢繧ｯ繧ｻ繧ｹ蜿ｯ閭ｽ縺ｫ縺ｪ縺｣縺ｦ縺縺ｾ縺吶 1b41b7FalseTrue + + 繧｢繧ｯ繧ｻ繧ｹ繧ｳ繝ｳ繝医Ο繝ｼ繝ｫ諠蝣ｱ + 繧ｲ繝ｼ繝繧ｫ繝ｼ繝峨∈縺ｮ繝ｪ繝ｼ繝峨い繧ｯ繧ｻ繧ｹ縺ｯ險ｱ蜿ｯ縺輔ｌ縺ｦ縺縺ｾ縺帙ｓ縲 + 1b41b7FalseTrue + + + 繧｢繧ｯ繧ｻ繧ｹ繧ｳ繝ｳ繝医Ο繝ｼ繝ｫ諠蝣ｱ + 繧ｲ繝ｼ繝繧ｫ繝ｼ繝峨∈縺ｮ繝ｩ繧､繝医い繧ｯ繧ｻ繧ｹ縺ｯ險ｱ蜿ｯ縺輔ｌ縺ｦ縺縺ｾ縺帙ｓ縲 + 1b41b7FalseTrue + 蜀咏悄繝繝ｼ繧ｿ繝吶ｼ繧ｹ繧｢繧ｯ繧ｻ繧ｹ 蜀咏悄繝繝ｼ繧ｿ繝吶ｼ繧ｹ縺ｸ縺ｮ繝ｪ繝ｼ繝峨い繧ｯ繧ｻ繧ｹ縺ｯ險ｱ蜿ｯ縺輔ｌ縺ｦ縺縺ｾ縺帙ｓ縲