diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index ce43ffe..f059ae0 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 60a9667..b5bc10e 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 cb2765d..a7bfdb0 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/srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp index 8f620e8..81a4b25 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp @@ -1206,11 +1206,11 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp ) // 値チェック fseek( fp, 0, SEEK_END ); - u32 filesize = ftell(fp); // 実ファイルサイズ(単位Mbit) - u32 romsize = 1 << (this->pRomHeader->s.rom_size); // ROM容量 + u32 filesize = ftell(fp); // 実ファイルサイズ + u32 romsize = 1 << (this->pRomHeader->s.rom_size); // ROM容量(単位Mbit) if( !this->IsMediaNand ) // カードアプリのときのみのチェック { - u32 filesizeMb = (filesize / (1024*1024)) * 8; + u32 filesizeMb = (filesize / (1024*1024)) * 8; // 単位をMbitに直す if( romsize < filesizeMb ) { this->hErrorList->Add( gcnew RCMrcError( @@ -1269,8 +1269,8 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp ) "デバイス容量", 0x14, 0x14, "NANDアプリに対して指定可能な容量ではありません。", "Device Capacity", "Invalid capacity.", false, true ) ); } - u32 allsizeMB = filesize + this->pRomHeader->s.public_save_data_size + this->pRomHeader->s.private_save_data_size; - if( allsizeMB > METWL_ALLSIZE_MAX_NAND ) + u32 allsize = filesize + this->pRomHeader->s.public_save_data_size + this->pRomHeader->s.private_save_data_size; + if( allsize > METWL_ALLSIZE_MAX_NAND ) { this->hErrorList->Add( gcnew RCMrcError( "実ファイルサイズ", METWL_ERRLIST_NORANGE, METWL_ERRLIST_NORANGE, diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/ini.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/ini.xml index ce60798..351d203 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/ini.xml +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/ini.xml @@ -6,6 +6,7 @@ 16017f 151b 99bf + 1bc1be 2402ef 37839f 3b4f7f