From aac3ba32865f04d15330191ad3dcea7d40f05289 Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Mon, 15 Dec 2008 06:48:31 +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:=E4=BA=88=E7=B4=84=E9=A0=98=E5=9F=9F?= =?UTF-8?q?=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@79 7061adef-622a-194b-ae81-725974e89856 --- .../MasterEditorTWL/MasterEditorTWL.ncb | Bin 11348992 -> 11348992 bytes .../MasterEditorTWL/MasterEditorTWL.suo | Bin 65536 -> 65536 bytes .../MasterEditorTWL/Debug/BuildLog.htm | Bin 20262 -> 20238 bytes .../MasterEditorTWL/MasterEditorTWL/srl.cpp | 10 +++++----- .../MasterEditorTWL/resource/ini.xml | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index ce43ffe4e352c4a7312da6b1fb4d538b2cbe36d3..f059ae045de01ea19e1789000dc1a4e984a9a4d3 100644 GIT binary patch delta 3828 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 delta 4408 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 delta 754 zcmZo@U}(Bo`0PSYoyG+iCr9Gl{qk;y097d`>qgHVAWN} zv{^!Y0xK4Ipw`L%gq$`@$a;Y+1zCu0=?dk2{FqXkD~$_57Mh{z*!|$lcgekRoy@fU7pRomHeader->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