diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb
index d8c4df1..37cbdea 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 8200d91..57ca385 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 7d90343..4a2b7b5 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_mrc.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp
index 7b57453..8aacb29 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp
@@ -284,36 +284,50 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp )
u32 filesizeMb = (filesize / (1024*1024)) * 8; // 単位をMbitに直す
if( romsize < filesizeMb )
{
- this->hErrorList->Add( this->makeMrcError("CapacityCardLess") );
+ this->hErrorList->Add( this->makeMrcError(
+ RCMrcError::PurposeType::Production | RCMrcError::PurposeType::CardKiosk, // Touch!Try!DS用のROMを除く
+ "CapacityCardLess") );
}
else if( filesizeMb < romsize )
{
- this->hWarnList->Add( this->makeMrcError("CapacityCardWaste") );
+ this->hWarnList->Add( this->makeMrcError(
+ RCMrcError::PurposeType::Production | RCMrcError::PurposeType::CardKiosk,
+ "CapacityCardWaste") );
}
if( (romsize < METWL_ROMSIZE_MIN) || (METWL_ROMSIZE_MAX < romsize) )
{
- this->hErrorList->Add( this->makeMrcError("CapacityCardRange") );
+ this->hErrorList->Add( this->makeMrcError(
+ RCMrcError::PurposeType::Production | RCMrcError::PurposeType::CardKiosk,
+ "CapacityCardRange") );
}
- if( (filesizeMb < 1) || (MasterEditorTWL::countBits(filesizeMb) != 1) )
+ if( (filesizeMb < 1) || (MasterEditorTWL::countBits(filesizeMb) != 1) ) // 立っているビットが1つかどうかでべき乗かどうかを調べる
{
- this->hWarnList->Add( this->makeMrcError("FilesizeFraction") );
+ this->hWarnList->Add( this->makeMrcError(
+ RCMrcError::PurposeType::Production | RCMrcError::PurposeType::CardKiosk,
+ "FilesizeFraction") );
}
} //if( *(this->hIsNAND) == false )
else // NANDアプリのときのみのチェック
{
if( (romsize < METWL_ROMSIZE_MIN_NAND) || (METWL_ROMSIZE_MAX_NAND < romsize) )
{
- this->hErrorList->Add( this->makeMrcError("CapacityNandRange") );
+ this->hErrorList->Add( this->makeMrcError(
+ RCMrcError::PurposeType::Production,
+ "CapacityNandRange") );
}
//u32 allsize = filesize + this->pRomHeader->s.public_save_data_size + this->pRomHeader->s.private_save_data_size;
u32 allsize = this->hNandUsedSize->NandUsedSize; // TMDやサブバナーのサイズを含める
if( allsize > METWL_ALLSIZE_MAX_NAND )
{
- this->hErrorList->Add( this->makeMrcError("UsedNandSizeLimit") );
+ this->hErrorList->Add( this->makeMrcError(
+ RCMrcError::PurposeType::Production,
+ "UsedNandSizeLimit") );
}
if( (allsize > METWL_ALLSIZE_MAX_NAND_LIC) && this->IsAppUser ) // ユーザアプリのときのみ
{
- this->hErrorList->Add( this->makeMrcError("UsedNandSizeExceed") );
+ this->hErrorList->Add( this->makeMrcError(
+ RCMrcError::PurposeType::Production,
+ "UsedNandSizeExceed") );
}
}
@@ -328,7 +342,9 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp )
BOOL crcret = getSeg3CRCInFp( fp, &crcseg3 );
if( !crcret || (crcseg3 != METWL_SEG3_CRC) )
{
- this->hErrorList->Add( this->makeMrcError("Seg3CRC") );
+ this->hErrorList->Add( this->makeMrcError(
+ RCMrcError::PurposeType::Production | RCMrcError::PurposeType::CardKiosk,
+ "Seg3CRC") );
}
}
@@ -855,7 +871,9 @@ void RCSrl::mrcPadding(FILE *fp)
u32 offset = ((romsize / 8) * 1024 * 1024) - padsize;
if( (offset + padsize) > filesize )
{
- this->hErrorList->Add( this->makeMrcError("PaddingRead", padstr) );
+ this->hErrorList->Add( this->makeMrcError(
+ RCMrcError::PurposeType::Production | RCMrcError::PurposeType::CardKiosk,
+ "PaddingRead", padstr) );
return;
}
@@ -863,7 +881,9 @@ void RCSrl::mrcPadding(FILE *fp)
fseek( fp, offset, SEEK_SET );
if( padsize != fread( buf, 1, padsize, fp ) )
{
- this->hErrorList->Add( this->makeMrcError("PaddingRead", padstr) );
+ this->hErrorList->Add( this->makeMrcError(
+ RCMrcError::PurposeType::Production | RCMrcError::PurposeType::CardKiosk,
+ "PaddingRead", padstr) );
delete []buf;
return;
}
@@ -879,7 +899,9 @@ void RCSrl::mrcPadding(FILE *fp)
}
if( !bResult )
{
- this->hErrorList->Add( this->makeMrcError("PaddingValue", padstr, romstr) );
+ this->hErrorList->Add( this->makeMrcError(
+ RCMrcError::PurposeType::Production | RCMrcError::PurposeType::CardKiosk,
+ "PaddingValue", padstr, romstr) );
}
delete []buf;
} //RCSrl::mrcPadding
@@ -1254,7 +1276,7 @@ void RCSrl::mrcTrialApp(FILE *fp)
u32 filesize = ftell(fp); // 実ファイルサイズ
if( filesize > (96 * 1024 * 1024) )
{
- this->hErrorList->Add( this->makeMrcError(RCMrcError::PurposeType::DSStation, "DSStationRomSize") );
+ this->hWarnList->Add( this->makeMrcError(RCMrcError::PurposeType::DSStation, "DSStationRomSize") );
}
bool use_nis = false;
for each( RCLicense ^lic in this->hLicenseList )
@@ -1276,7 +1298,7 @@ void RCSrl::mrcTrialApp(FILE *fp)
}
if( filesize > (5 * 1024 * 1024 / 2) )
{
- this->hErrorList->Add( this->makeMrcError(RCMrcError::PurposeType::Zone, "ZoneRomSize") );
+ this->hWarnList->Add( this->makeMrcError(RCMrcError::PurposeType::Zone, "ZoneRomSize") );
}
if( this->pRomHeader->s.platform_code == PLATFORM_CODE_TWL_HYBLID )
{
diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml
index ffa9b71..80e0332 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 533224f..81fcf23 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml
+++ b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml
@@ -38,7 +38,7 @@
Touch!Try!DS蟇セ蠢
- Touch!Try!DS逕ィ繧「繝励Μ縺ョ繝輔ぃ繧、繝ォ繧オ繧、繧コ縺ッ768Mbit(96MByte)莉・荳九〒縺ェ縺代l縺ー縺ェ繧翫∪縺帙s縲
+ Touch!Try!DS逕ィ繧「繝励Μ縺ョROM繝輔ぃ繧、繝ォ繧オ繧、繧コ縺ッ騾壼クク縲768Mbit(96MByte)莉・荳九〒縺ェ縺代l縺ー縺ェ繧翫∪縺帙s縲ゅし繧、繧コ繧ェ繝シ繝舌シ縺励◆ROM繧呈署蜃コ縺吶k蝣エ蜷医∝シ顔、セ遯灘哨縺ォ縺秘」邨。縺上□縺輔>縲
00FalseTrue
@@ -69,7 +69,7 @@
Nintendo Zone蟇セ蠢
- Nintendo Zone逕ィ縺ョ繝輔ぃ繧、繝ォ繧オ繧、繧コ縺ッ2.5MByte莉・荳九〒縺ェ縺代l縺ー縺ェ繧翫∪縺帙s縲
+ Nintendo Zone逕ィ縺ョROM繝輔ぃ繧、繝ォ繧オ繧、繧コ縺ッ騾壼クク縲2.5MByte莉・荳九〒縺ェ縺代l縺ー縺ェ繧翫∪縺帙s縲ゅし繧、繧コ繧ェ繝シ繝舌シ縺励◆ROM繧呈署蜃コ縺吶k蝣エ蜷医∝シ顔、セ遯灘哨縺ク縺ョ遒コ隱阪′蠢隕√〒縺吶
00FalseTrue