diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 551626d..4ff7685 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 b199fdf..0dbb163 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 69319ac..586e49d 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 e1551cc..e1d178f 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -3431,7 +3431,7 @@ private: System::Windows::Forms::TextBox^ tboxWarningChinaRating; { 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/Release/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm index d0b9be1..32cda6f 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp index 8e38b7c..335b8b3 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp @@ -232,6 +232,12 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp ) { // ROMヘッダのチェック (NTR互換領域) + // 開始アドレスが0x02004000よりも前のときにはエラー + if( (u32)(this->pRomHeader->s.main_ram_address) < 0x02004000 ) + { + this->hErrorList->Add( this->makeMrcError("RomStartAddress") ); + } + // NANDアプリがHYBRIDとなるのはクローンブートのときのみ if( this->IsMediaNand ) { diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml index 2dcd97e..d8ba3c9 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 2a15543..e633078 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml @@ -1,7 +1,18 @@ サソ - + + + + + 繧ケ繧ソ繝シ繝医い繝峨Ξ繧ケ + ROM縺ョ繧ケ繧ソ繝シ繝医い繝峨Ξ繧ケ縺ッ縲0x02004000莉・髯阪〒縺ェ縺代l縺ー縺ェ繧翫∪縺帙s縲 + 282bFalseTrue + + + + + @@ -158,7 +169,7 @@ 1d1dFalseTrue - +