From f6e596af92191e24298f8b129b2e84aaaae7237e Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Wed, 21 Jan 2009 07:57:27 +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=BB=A5=E4=B8=8B=E3=81=AE=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=E3=80=82=20=E3=83=BB=E8=AA=AD=E3=81=BF=E8=BE=BC?= =?UTF-8?q?=E3=81=BF=E6=99=82=E3=81=AB=E3=83=AC=E3=83=BC=E3=83=86=E3=82=A3?= =?UTF-8?q?=E3=83=B3=E3=82=B0=E3=81=8C=E3=80=8C=E3=83=AC=E3=83=BC=E3=83=86?= =?UTF-8?q?=E3=82=A3=E3=83=B3=E3=82=B0=E8=A1=A8=E7=A4=BA=E4=B8=8D=E8=A6=81?= =?UTF-8?q?=E3=80=8D=E3=82=82=E3=81=97=E3=81=8F=E3=81=AF=E3=80=8C=E5=AF=A9?= =?UTF-8?q?=E6=9F=BB=E4=B8=AD=E3=80=8D=E3=81=A7=E3=81=82=E3=82=8B=E5=A0=B4?= =?UTF-8?q?=E5=90=88=E3=81=AB=E8=AD=A6=E5=91=8A=E3=82=92=E5=87=BA=E3=81=99?= =?UTF-8?q?=E3=80=82=20=E3=83=BB=E4=B8=80=E6=99=82=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=83=85=E5=A0=B1=E3=81=ABDSiWare=E3=81=AE=E8=B2=A9=E5=A3=B2?= =?UTF-8?q?=E3=82=AB=E3=83=86=E3=82=B4=E3=83=AA=E3=81=AE=E3=82=B3=E3=83=B3?= =?UTF-8?q?=E3=83=9C=E3=83=9C=E3=83=83=E3=82=AF=E3=82=B9=E3=81=AE=E9=81=B8?= =?UTF-8?q?=E6=8A=9E=E3=82=92=E5=90=AB=E3=82=81=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=E3=81=97=E3=81=9F=E3=80=82=20=E3=83=BB=E6=8F=90?= =?UTF-8?q?=E5=87=BA=E7=A2=BA=E8=AA=8D=E6=9B=B8=E3=81=AB=E3=83=9E=E3=82=B9?= =?UTF-8?q?=E3=82=BF=E3=82=A8=E3=83=87=E3=82=A3=E3=82=BF=E3=81=AE=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92=E5=9F=8B=E3=82=81?= =?UTF-8?q?=E8=BE=BC=E3=82=80=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@130 7061adef-622a-194b-ae81-725974e89856 --- .../MasterEditorTWL/MasterEditorTWL.ncb | Bin 11406336 -> 11406336 bytes .../MasterEditorTWL/MasterEditorTWL.suo | Bin 64000 -> 67072 bytes .../MasterEditorTWL/Debug/BuildLog.htm | Bin 20662 -> 13138 bytes .../MasterEditorTWL/MasterEditorTWL/Form1.h | 9 ++++- .../MasterEditorTWL/Form_deliv.cpp | 3 ++ .../MasterEditorTWL/Form_pctl.cpp | 6 ++- .../MasterEditorTWL/Form_srl.cpp | 4 +- .../MasterEditorTWL/Form_tmp.cpp | 17 ++++++++- .../MasterEditorTWL/Form_util.cpp | 6 +-- .../MasterEditorTWL/deliverable.cpp | 5 +++ .../MasterEditorTWL/deliverable.h | 3 ++ .../MasterEditorTWL/MasterEditorTWL/srl.cpp | 35 +++++++++++++++++- .../MasterEditorTWL/MasterEditorTWL/srl.h | 3 +- .../MasterEditorTWL/srl_mrc.cpp | 3 +- .../MasterEditorTWL/utility.cpp | 5 +++ 15 files changed, 88 insertions(+), 11 deletions(-) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 64512dad2be67676b403894842a428e193653318..b26ea1d5959e446f246b001666c00106c77ab6a7 100644 GIT binary patch delta 48038 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 z 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 D?l?3w diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index 9e055960e95af68147f6c99313a870b707cac2d4..d5a28333c38a5b85f23b4179d9c00f7bbf4e74c5 100644 GIT binary patch delta 8925 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 delta 2360 zcmZ`)4^Wgv6#w?S@8I|&9OreJfbF30+lf) zAa_qq%<#{oHDejFj?!pwk~UbTSZbj*i6}9F#vy_dLT~Rr8f0kie)rz~_U-Q5xBK1| zmkGtavYLxBVQ6@G7@B2XM!nJ`WVzff44A#8@B)!>94BVd%|ZcR#7v^FAB`wL#31G( zViEHYY&;I-e8g*r1roOiWjtar;&q8jM!5u$h)6={5o~@6$~O>8rT!|EZz57Tj%M3m zwTJHnEf`!AVBVC-T4fUn$1%09A=g!8Wi2n>K{j!LBX9-_vGf?~2ISNh*;J`M-Gv=(-8*hV{6jhlau7|Va| z%yEb5)6mPjA`yq#HPEZ!pH1K$32ctt!rKu#fPzJBBnz9>&d0&H>B=~%esv(Oz4Jkc$5 zApWSb^Y2O{UJxQEz>v_aK!%> znrc%{q=q=K<*g0wr^Xu7Cn=NAVZC%}HULXk1RFELpl*e`F~irs9EXYt2i~SOaM`H_ zQ7h1am4ONxvaXrH?SfD_yJj~aY1d4dKM1CDWinjK^zvmn!LESi0t-nXmxCXUt6Do) zfx>pps`c$M;tWqV=tv-o2{mNj;-R;)3$mhBL;y?WadipK-iok!ZTkhaVV*G~7(Os~ z9nVN5wFT~k@YLh&X#^+5Z}cH^Y0k!92*eg*u54~r%#k)6i7Pb}mhqsyr-e(Mj^rji z^A|1<04<#Xw4|t%2q%B*a-z;9gL3C(PVLqVvqnZ;+6AGLqM&PzicFx3^E~kWU(wUX zZAw!6k_#aUjDlxvSuC+5%s#?)&EeiP;QTF^g)S-Czz_^gq(`d z$q@g6`wKIXp2F70#)8cP&sr`m+G|h3^HF8gbc6xH+7u*4%-m7YA~#jyict52)1Q3H zYw+doTVSgW`|#QB!?=EGeZEd+G*a7E0Lz|hP_ssmvx~=IBtC+ZnQGd;f3JY=$4te; zW&%BT3t&duN3~xx@@pcbjowH5NJ(ER$!z47OM0#(nL~M!zGXxrS0w4|vErB8il|@; zwnNna=rRG$ntU)>RV0x1bzxeIo6KPD&ew#ZtE|-VD(-rS9mfhM*C7K-o%=ZHOgd;y zeJQ?rqY}bzdP7N@nVL_Ca!6lUQe-W*Y{Pzpv^Vz{br#V9iAzWM4}vuo?GZZ7au zF(BR*fj=dJ`E(5AniIx3KP@~nNT9S;Gv3(O^(uZmzRiqjV!oj;HHwhv(++Rly8+sM z5yW%noL~LWRL(qN-hlGFyL>rz0zi9yI!U4F=lAnict}&U>5dsxRmb4ig+#bwdKvFg zfzQm2sOWp`n7B7!|DWDq>H8AQC%hp3VlR+YXW@`(HFWu_;N45h|Hoyl&K5Y(pa9V# zQn9&Crmz)nj7977J0QzX17BUW7T5946>)9+^Jf2wF~Wj8&K#Kj%@rtaIAuLRP;1_J zCJn7IP}7<~yX$oXe*7Z^p8oFcHm0_7Jgu%j$cEQJbi-q|91Utsk&h0@LE!f^S<72E zB=tOi+PgK+6g%3|iJ@cJFjWTnO&GiGd=g5-EK>;yr%631W3QFD?CNTWSNTR5* M581i2rayuI7nXbli~s-t diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 8b531cb17d08ad1e714bc93cd4315e1c1d123685..1b9bb08e038e325864bd7d6e4a16329444222b8a 100644 GIT binary patch delta 301 zcmdnCknvL51~WEc3kFLDV+Jz@6CgAMvWyr^HhZ$YWt%*O&to$m{}iUp3PMJV*pyAS zm5tqeK}iH8>4!pLk1c*750L0RYSgK1~1s delta 2023 zcmcIlU1(cn7=Dx0Y-@Xxbj@1UznrG4>1uNFu5(?tfzY+e;!igxw*HibG)?O?>(5E5 zEl7i)!bA}A-U|c4D?vCaZYYR|>}D5=KNrHV-c7-6cvH~Hp6_HQJ#9}f$H#Y)@BMkc z=lwbF`Ellp%f3$s1IE^4yvm2(x7Ir8AWQQkd9d-AdBD^YD|=W45vw#JSS`Yoz^cs5mm(F zo<$5ck3S^AmVi9A`&&614@#j|w_ZBXSnuUwt@JD^s9_JNEo_1*MV{Mvua-|Bh= zP==gc9KS)iP*Y2fxn|GTDwhsJdeY*i-JM9E-hk-3b6Ea{}yxn1w_ zmNkD=63NEeba^Y;s-}zebn;2xmZ|cNaVTl=Kl}rK#D8&e%m6XNF6mCQ=91AHxxv@@ zKmL++`jfxLzbjl}xt-|J7>!#K$y(1X&uneH#yUO4m-v(S%KX&_WnSeM+0Uw<91NX) z=F2v<3a`&R11sTK9$%{O7i3dkx2;Y*O zQldC)oj(tXiIdO@TXH86mFWgG&-&;b9Rj}zwAvh+Y#!g5BF>Kd9A4TYq|V6J@glhg zwF%pC*qE@o0L>iEgNTZ;k0SB`delCtk}A&ye6vhg&SLDB>g|h06amRLG>=rlO&F=c zuf7dcNCS2{##8}I-*C5yRy#=%cwNmG`Pk@gb3)bWbN-%hqI<5PJtxnEr>xJ659{s$ DcX-lI diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h index 30fc494..8b1b1af 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -4259,7 +4259,14 @@ private: System::Windows::Forms::TextBox^ tboxGuideDLCategory; // DL販売カテゴリの表示をカードアプリのとき「なし」にする。 void maskDLCategoryForms(void) { - if( !this->hSrl->IsMediaNand ) + // デフォルトだと IsMediaNand は false なのでメディアがNANDなのかROMが読み込まれていないのでfalseなのか判断できないので + // ROMが読み込まれていないときに(TMP情報の読み出しで)呼ばれるとコンボボックスが編集不可になってしまう + // => 読み込まれたときにのみ判定する + + System::Boolean bRead = this->hSrl->IsAppUser || this->hSrl->IsAppSystem || // 一度でも読み込まれているとどれかがtrueになっている + this->hSrl->IsAppSecure || this->hSrl->IsAppLauncher; + + if( !this->hSrl->IsMediaNand && bRead ) // 読み込まれているときのみ { this->combDLCategory->SelectedIndex = this->combDLCategory->Items->Count - 2; this->combDLCategory->Enabled = false; diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp index 9f4aa28..53891c9 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp @@ -28,6 +28,9 @@ using namespace MasterEditorTWL; // ---------------------------------------------- void Form1::setDeliverableProperties(void) { + // プログラムのバージョン + this->hDeliv->hMasterEditorVersion = this->getVersion(); + // 提出情報 this->hDeliv->hProductName = this->tboxProductName->Text; this->hDeliv->hProductCode1 = this->tboxProductCode1->Text; diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp index 6501103..a66029e 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp @@ -245,7 +245,7 @@ void Form1::checkRatingForms( System::Boolean inRegion, System::Windows::Forms:: "ペアレンタルコントロール情報", METWL_ERRLIST_NORANGE, METWL_ERRLIST_NORANGE, msg + ": レーティングを選択してください。", "Parental Control", - msg + ": Rating Pending is setting. When rating age is examined, Please submit again.", true, true ) ); + msg + ": Please set rating.", true, true ) ); } // 審査中のとき警告 @@ -254,7 +254,9 @@ void Form1::checkRatingForms( System::Boolean inRegion, System::Windows::Forms:: this->hWarnList->Add( gcnew RCMrcError( "ペアレンタルコントロール情報", METWL_ERRLIST_NORANGE, METWL_ERRLIST_NORANGE, msg + ": 審査中指定がされています。審査が決まりしだい、再提出してください。", - "Parental Control", msg + ": Save ROM data as Game soft which needs rating examinination.", true, true ) ); + "Parental Control", + msg + ": In your selection, no rating yet. Please submit again when rating is dicided.", + true, true ) ); } } //checkRatingForms() diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp index 653fc63..2e60dde 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp @@ -232,6 +232,7 @@ void Form1::setSrlForms(void) // ROMヘッダには関係ないが // NANDアプリのときにバックアップメモリを自動的に「なし」にしておく this->maskBackupMemoryForms(); + // カードアプリのときにDSi Wareの販売カテゴリを自動的に「なし」にしておく this->maskDLCategoryForms(); } // setSrlForms() @@ -357,7 +358,8 @@ System::Boolean Form1::checkSrlForms(void) "ペアレンタルコントロール情報", METWL_ERRLIST_NORANGE, METWL_ERRLIST_NORANGE, "レーティング表示が不要であると指定されています。この指定は、ソフトがゲームでないツール類のときのみ選択可能です。レーティング表示が不要であるかどうかは弊社窓口にご相談ください。", "Parental Control", - "In your selection, rating is unnecessary. This selection is available for only tool application which is not game. Please contact Nintendo for checking validation of this selection", true, true ) ); + "In your selection, rating is unnecessary. This selection is available for only tool application which is not game. Please contact Nintendo for checking validation of this selection", + true, true ) ); } else { diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp index e52f2fe..1e26275 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp @@ -69,6 +69,9 @@ System::Void Form1::saveTmp( System::String ^filename ) MasterEditorTWL::appendXmlTag( doc, form, "ReleaseDate", this->dateRelease->Value.ToString() ); MasterEditorTWL::appendXmlTag( doc, form, "SubmitDate", this->dateSubmit->Value.ToString() ); + MasterEditorTWL::appendXmlTag( doc, form, "DLCategory", this->combDLCategory->SelectedIndex.ToString() ); + MasterEditorTWL::appendXmlTag( doc, form, "DLCategoryOther", this->tboxDLCategoryOther->Text ); + MasterEditorTWL::appendXmlTag( doc, form, "Company1", this->tboxCompany1->Text ); MasterEditorTWL::appendXmlTag( doc, form, "Depart1", this->tboxDepart1->Text ); MasterEditorTWL::appendXmlTag( doc, form, "Name1", this->tboxPerson1->Text ); @@ -161,7 +164,7 @@ void Form1::loadTmp( System::String ^filename ) this->parseTmp( root, "/MasterEditorTWL/Form/ReleaseDate", this->dateRelease ); this->parseTmp( root, "/MasterEditorTWL/Form/SubmitDate", this->dateSubmit ); this->parseTmp( root, "/MasterEditorTWL/Form/Backup", this->combBackup ); - this->combBackup->Enabled = true; + this->combBackup->Enabled = true; // あとでマスクする this->tboxBackupOther->Enabled = false; this->tboxBackupOther->Clear(); @@ -171,6 +174,18 @@ void Form1::loadTmp( System::String ^filename ) this->tboxBackupOther->Enabled = true; } + // DSi Ware + this->parseTmp( root, "/MasterEditorTWL/Form/DLCategory", this->combDLCategory ); + this->combDLCategory->Enabled = true; // あとでマスクする + + this->tboxDLCategoryOther->Enabled = false; + this->tboxDLCategoryOther->Clear(); + if( this->combDLCategory->SelectedIndex == (this->combDLCategory->Items->Count - 1) ) + { + this->parseTmp( root, "/MasterEditorTWL/Form/DLCategoryOther", this->tboxDLCategoryOther ); + this->tboxDLCategoryOther->Enabled = true; + } + cli::array ^rbuts; cli::array ^strs; diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_util.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_util.cpp index a632488..183ef7d 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_util.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_util.cpp @@ -86,7 +86,7 @@ System::Boolean Form1::checkBoxIndex( System::Windows::Forms::ComboBox ^box, Sys void Form1::setGridError( void ) { this->gridError->Rows->Clear(); - if( this->hSrl->hErrorList != nullptr ) + if( this->hSrl->hErrorList != nullptr ) // ROM読み込み時に発見されたエラー { for each( RCMrcError ^err in this->hSrl->hErrorList ) { @@ -113,7 +113,7 @@ void Form1::setGridWarn( void ) void Form1::overloadGridError( void ) { this->gridError->Rows->Clear(); - if( this->hSrl->hErrorList != nullptr ) + if( this->hSrl->hErrorList != nullptr ) // ROM読み込み時に発見されたエラー { for each( RCMrcError ^err in this->hSrl->hErrorList ) { @@ -124,7 +124,7 @@ void Form1::overloadGridError( void ) } } } - if( this->hErrorList != nullptr ) + if( this->hErrorList != nullptr ) // 現在のフォーム入力から発見されたエラー { for each( RCMrcError ^err in this->hErrorList ) { diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp index fb01348..2c442a5 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp @@ -139,6 +139,11 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( System::Xml::XmlNode ^node = list->Item(i); if( (node->FirstChild != nullptr) && (node->FirstChild->Value != nullptr) ) { + // プログラムのバージョン + if( node->FirstChild->Value->Equals( "TagMasterEditorVersion" ) ) + { + node->FirstChild->Value = this->hMasterEditorVersion; + } // 提出情報 if( node->FirstChild->Value->Equals( "TagProductName" ) ) { diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.h index 720efe9..823906d 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.h @@ -104,6 +104,9 @@ namespace MasterEditorTWL property System::Boolean IsUGC; property System::Boolean IsPhotoEx; + // プログラムのバージョン + property System::String ^hMasterEditorVersion; + // constructor and destructor public: diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp index b21dae6..4678f56 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp @@ -104,9 +104,11 @@ ECSrlResult RCSrl::readFromFile( System::String ^filename ) this->hErrorList = gcnew System::Collections::Generic::List; this->hWarnList = gcnew System::Collections::Generic::List; this->hParentalErrorList = gcnew System::Collections::Generic::List; + this->hParentalWarnList = gcnew System::Collections::Generic::List; this->hErrorList->Clear(); this->hWarnList->Clear(); this->hParentalErrorList->Clear(); + this->hParentalWarnList->Clear(); // ROMヘッダの値をROM固有情報フィールドに反映させる (void)this->setRomInfo(); @@ -368,6 +370,12 @@ bool RCSrl::setRegionInfo( u32 region ) "Region", "Illigal Region. Parental Control Information is ignored in reading.", true, true ) ); return false; } + if( !this->IsAppUser && (region == METWL_MASK_REGION_ALL) ) + { + this->hParentalWarnList->Add( gcnew RCMrcError( + "リージョン", 0x1b0, 0x1b3, "読み込み時のROMでは全リージョンが設定されています。仕向地別に設定する必要がないかご確認ください。", + "Region", "All Region is set in reading ROM. Please check necessity for setting each region individually.", true, true ) ); + } return true; } @@ -407,6 +415,15 @@ void RCSrl::setUnnecessaryRatingInfo( u32 region ) "ペアレンタルコントロール情報", 0x1b0, 0x1b3, "レーティング表示が不要かどうかを判断できません。再設定してください。", "Parental Control Info.", "Can't judge wheather rating display is unnecessary.", true, true ) ); } + else + { + this->hParentalWarnList->Add( gcnew RCMrcError( + "ペアレンタルコントロール情報", METWL_ERRLIST_NORANGE, METWL_ERRLIST_NORANGE, + "読み込み時のROMにはレーティング表示が不要であると設定されています。この指定は、ソフトがゲームでないツール類のときのみ選択可能です。レーティング表示が不要であるかどうかは弊社窓口にご相談ください。", + "Parental Control", + "In the loaded ROM, rating is unnecessary. This selection is available for only tool application which is not game. Please contact Nintendo for checking validation of this selection", + true, true ) ); + } } // ------------------------------------------------------------------- @@ -458,6 +475,11 @@ void RCSrl::setOneRatingOrgInfo( int ogn ) if( age == 0 ) // 年齢が0のときは審査中とみなす { index = ages->Length; // 配列の最後の要素の次が「審査中」 + this->hParentalWarnList->Add( gcnew RCMrcError( + "ペアレンタルコントロール情報", METWL_ERRLIST_NORANGE, METWL_ERRLIST_NORANGE, + name + ": 読み込み時のROMには審査中であると指定されています。審査が決まりしだい、再提出してください。", + "Parental Control", + name + ": In the loaded ROM, no rating yet. Please submit again when rating is dicided.", true, true ) ); } else { @@ -902,9 +924,20 @@ ECSrlResult RCSrl::searchSDKVersion( FILE *fp ) { case 1: str += ("PR " + patch.ToString() + revstr); break; case 2: str += ("RC " + patch.ToString() + revstr); break; - case 3: str += ("RELEASE " + patch.ToString() + revstr); break; + //case 3: str += ("RELEASE " + patch.ToString() + revstr); break; + case 3: + if( patch > 0 ) + { + str += ("RELEASE " + patch.ToString() + revstr); + } + else + { + str += ("RELEASE" + revstr); + } + break; default: break; } + // ARM9 static 内にあるか判定 u32 statbegin = this->pRomHeader->s.main_rom_offset; u32 statend = this->pRomHeader->s.main_rom_offset + this->pRomHeader->s.main_size - 1; System::Boolean isstat = ((statbegin <= offset) && (offset <= statend))?true:false; diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h index f8fa903..c81c563 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h @@ -487,7 +487,8 @@ namespace MasterEditorTWL // MRC機能でチェックされたエラー情報のリスト property System::Collections::Generic::List ^hErrorList; property System::Collections::Generic::List ^hWarnList; - property System::Collections::Generic::List ^hParentalErrorList; // ペアレンタルコントロールのチェックはsetと同時に行なう + property System::Collections::Generic::List ^hParentalErrorList; // 読み込み時に発見されるペアレンタルコントロール情報のエラー + property System::Collections::Generic::List ^hParentalWarnList; // MRC追加項目 property RCMrcExternalCheckItems ^hMrcExternalCheckItems; diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp index 829dc38..cf15400 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp @@ -38,7 +38,8 @@ ECSrlResult RCSrl::mrc( FILE *fp ) { return result; } - this->hErrorList->AddRange( this->hParentalErrorList ); // ペアレンタルコントロールのリストは別につくっているので追加 + this->hErrorList->AddRange( this->hParentalErrorList ); // ペアレンタルコントロールのリストは別につくっているので追加 + this->hWarnList->AddRange( this->hParentalWarnList ); #endif return ECSrlResult::NOERROR; } diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/utility.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/utility.cpp index e5755b7..2bf5418 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/utility.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/utility.cpp @@ -137,6 +137,11 @@ System::String^ MasterEditorTWL::transSizeToStringKB( const System::UInt32 size // 第2引数で小数点の桁数を指定(それ以下の桁は切り上げ) System::String^ MasterEditorTWL::transSizeToStringMB( const System::UInt32 size, const System::UInt32 decimals ) { + if( size == 0 ) + { + return size.ToString(); + } + System::UInt32 MB = 1024*1024; System::UInt32 pow = 1; System::UInt32 i;