diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 8d73be1..49e3de6 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 52cb841..ef93c42 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 5317259..2492887 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 22e7586..5ecc5d0 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -4214,7 +4214,7 @@ private: System::Windows::Forms::RadioButton^ rSubmitInternet; { System::Reflection::Assembly ^ass = System::Reflection::Assembly::GetEntryAssembly(); System::Version ^ver = ass->GetName()->Version; - return ( ver->Major.ToString() + "." + ver->Minor.ToString() ); + return ( ver->Major.ToString() + "." + ver->Minor.ToString() + "a" ); } // SRLに登録されないROM仕様のフォーム入力を diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp index 7aedb41..a9ccdac 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp @@ -687,6 +687,23 @@ void RCSrl::mrcAccessControl(FILE *fp) { this->hWarnList->Add( this->makeMrcError("SDJpegSignAccessUser") ); } + // 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 ) + { + if( lic->Publisher->StartsWith("NINTENDO") && lic->Name->StartsWith("TCL") ) + { + 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 58c6b9f..32f0253 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml @@ -272,6 +272,11 @@ Write access to the Photo Database is not permitted. 1b41b7FalseTrue + + 繧「繧ッ繧サ繧ケ繧ウ繝ウ繝医Ο繝シ繝ォ諠蝣ア + 蜀咏悄繝繝シ繧ソ繝吶シ繧ケ縺ク繧「繧ッ繧サ繧ケ縺吶k蝣エ蜷医↓縺ッTCL繝ゥ繧、繝悶Λ繝ェ繧剃スソ逕ィ縺励※縺上□縺輔>縲 + 1b41b7FalseTrue + Access Control Information JPEG signatures (JpegSign) are not enabled, even though write access to the Photo Database has been specified. diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml index 6df0f96..6c0c670 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml @@ -272,6 +272,11 @@ 蜀咏悄繝繝シ繧ソ繝吶シ繧ケ縺ク縺ョ繝ゥ繧、繝医い繧ッ繧サ繧ケ縺ッ險ア蜿ッ縺輔l縺ヲ縺縺セ縺帙s縲 1b41b7FalseTrue + + 繧「繧ッ繧サ繧ケ繧ウ繝ウ繝医Ο繝シ繝ォ諠蝣ア + 蜀咏悄繝繝シ繧ソ繝吶シ繧ケ縺ク繧「繧ッ繧サ繧ケ縺吶k蝣エ蜷医↓縺ッTCL繝ゥ繧、繝悶Λ繝ェ繧剃スソ逕ィ縺励※縺上□縺輔>縲 + 1b41b7FalseTrue + 繧「繧ッ繧サ繧ケ繧ウ繝ウ繝医Ο繝シ繝ォ諠蝣ア 蜀咏悄繝繝シ繧ソ繝吶シ繧ケ縺ク縺ョ繝ゥ繧、繝医い繧ッ繧サ繧ケ縺梧欠螳壹&繧後※縺繧九↓繧ゅ°縺九o繧峨★JPEG鄂イ蜷(JpegSign)縺梧怏蜉ケ縺ォ縺ェ縺」縺ヲ縺縺セ縺帙s縲