From fbce384c92ca2785adfd0c02d4712dfbb40772f5 Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Tue, 16 Sep 2008 12:01:10 +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:=E3=82=BF=E3=82=A4=E3=83=88=E3=83=AB?= =?UTF-8?q?=E5=90=8D=E3=81=AE=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E5=BC=B7?= =?UTF-8?q?=E5=8C=96=E3=80=82=E3=83=90=E3=83=8A=E3=83=BC=E3=81=AE=E3=83=81?= =?UTF-8?q?=E3=82=A7=E3=83=83=E3=82=AF=E3=81=A7=E4=B8=AD=E9=9F=93=E3=81=AE?= =?UTF-8?q?=E9=A0=98=E5=9F=9F=E3=81=AE=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=82=92=E7=9C=81=E3=81=8F=E3=80=82=E7=89=B9=E6=AE=8A=E3=81=AA?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=82=92=E6=8F=90=E5=87=BA=E6=9B=B8=E3=81=AB?= =?UTF-8?q?=E8=A8=98=E8=BF=B0=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E5=A4=89=E6=9B=B4=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/TwlIPL/trunk@2529 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../tools/MasterEditorTWL/MasterEditorTWL.ncb | Bin 11242496 -> 11242496 bytes .../tools/MasterEditorTWL/MasterEditorTWL.suo | Bin 57856 -> 60416 bytes .../MasterEditorTWL/Debug/BuildLog.htm | Bin 17484 -> 12774 bytes .../MasterEditorTWL/MasterEditorTWL/Form1.h | 14 ++++---- .../MasterEditorTWL/Form_deliv.cpp | 7 ++++ .../MasterEditorTWL/Form_srl.cpp | 33 +++++++++++------- .../MasterEditorTWL/Release/BuildLog.htm | Bin 16526 -> 17682 bytes .../MasterEditorTWL/MasterEditorTWL/common.h | 2 +- .../MasterEditorTWL/deliverable.h | 1 + .../MasterEditorTWL/MasterEditorTWL/srl.cpp | 23 ++++++++++++ 10 files changed, 61 insertions(+), 19 deletions(-) diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb index 3f235438728d15ef72a3cd00947182dff2e278da..75dff03e55af0b07e6812cf56a5d97dadb7f0ccb 100644 GIT binary patch delta 35411 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

Jj-vFy|LgUoYI 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 B=V$-` delta 3116 zcmb7`dvHxh9LLX|d+yCcaz$JcCM23hM4}QRLZXRRM5vI6M}!+%8YHPl)JWBhpiCP> z?$4yv!KhBF^%$DHRYr#(%rMd!Qw&w5tv*I)sx@J1N^ZZud-sn+?;q_>KH1-X&hDN) zyL-;wx@(rYR?FePbR$pGG{1o2rLGbpbAuj*Qm`hxUt;fHY)9Pg*HcA)OlfnZZl)tMWlykRH~M=HVyTFj!3n$FJ87U$ix$ zQW!lKuJO?AVuy4jdOBtBZTNP5fcY8EpnMZ>GW%O7-_m5qph#V$QkNme!`opVfQO(% zULSHVOr(%V>`K)GBPrFeQTwR%dT*Po9o?bp7j&x4>(D>8%Gz;12}-`S%x;a?oo$Wa z@oDb6LDa`^(8){Tly)`6-DEdz&vrW9i4Iv*fT7>1JhUAJx;kN*NH^a@)=X@$<@owQ zH+_K)`U7_SY`nYJ%?0eTKr-O86u`-x;%uEdnxe@$zN&fJHk*sLUm~vb14*DiV3&e? z0C)imR4xs9CKwFT!4QxEh5~Lg4Eb=71+u{i@FL(*=Yo-76c`Q0fU!bzX?Y07fqcN7 zFcT0@1TTR}pb$(3Q$P_Y22()^m@Snm;v`R(HkJ zY|8rg5{VyV`GSqY{dF*{D=DM>N4f`CN10W=303TL&>2f&?rB;Q9Y+mG!Se3BC<`q; zGN_-Xb=BTBiY%d;=JjUlzLnt>33N;J)+p#RStiRWs`aqnhK@#a|6r@6i$C8E;RUlI=EY*i@PZ^D$D;VkgAfPv1teY@{Mj|L z9544TZqr3Dt*Um3F!`vuHk6jWyV)HVLov1etQlyR{PYH{-E5(?CDZ=jlsFeuVM?y# z%G|o!A#(Rew}rc5jCCM-&o=i?H4TL}Z7_7^Q@R~m41peQ*4BG4?X+t11Zp)>!$RU;YCwo|c(A29#owZA^YvR7D6qp=j6Eq!$tGH zNg|csSWVj-?w>+FPd-7+=?mrf>vs%s9P$(4w4|b*c9hHv^x8TXY!%eWQy=KsAE`}w(xsLB%;sQr&e+6Arj1Z>~=n63wCLxYdE?QseBsl)(V&39fnPklh; z`M*$QLU(%dRb`+)4tYkpR;zX9<*Y+&L%v=){k9x+uss$7e5g=l|$8u#xvC zcd+p9t2fjQdFEV*dFIwB$20dPV!npil-{!g3|ACN{9g7%&iCMv^N%s!gqg|>M0}qG zQkHTYXCux6vcP?U1OO)eyslT2}Tdrg@jWD?!<;Ez-vyg|F?_Ho=8sd}6omDOYZayVljN)b02H{qG7am$RVqTMx z%CR4dxC`=e%JFE@5p!Cr9LM#_ouF< diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index ae100607faedfbe5033c1efaf88ea7e4c278724b..a25d7e2e19ce0df9303b0850c287b9aecb01af43 100644 GIT binary patch delta 228 zcmX@p!T2nB!y%^4N0`c(`5hUI7|a+ff!LVAgu!q!ucGU}Frv$DekfSV z$nS)zWizj0H|u0MF1E=lq>fBhP}14lr|!mqq3WSNP^&YlR-kRBn`ao>F=0qN6qMa$ kV!+7nf~sM&t?64#L349Urp?PNXE07qvXra}rdG&F!FV?iE4>OpykY-~UhqJW@M@zvBRtt3#$6c7``?2H-{ z6Yei)V%!*$CbLiz-LP_@2`0ML#DxnCD>o*v@VhgibZWPznd!afe&2cA@0|Ime|)6m zH&u0;txa{+&Djn1Io@wNuPCnzi?Te`$nQ>!QJAR0!% zGQjIbBnNrTh4hJwP4x* z26C3}pq@0a31q)i$V2kO*xf9$>#8il8?yESjf(%wKbL;JZu*eO2R{gIs}}ht&3e%= z;&bDy-DA*epqOfz%~`d?q_mDH{-_Iet8J&$G}AGlhKkfhy1HG2pDL|v=W8Vtg=SK< z1yngt_i;ZNw85e{+I2kojX&`ozhRBG`8`%|d4nzf&7b)>|Kb>@c$n9Dh9htrA-F_u z7Gnz=?({ z;g>{)GCG}wHp5U+7ZdH@&GMb}zw+6yr*LES<*!U6s_M|R?KDLlC@hBY$e<|~=^kV` zuunmvEUf#3rJ;?B$H@S88W;npIh7}Bxg@fu;VfUoJLXf$vplGbURT;VVS@x(nwl^T`w#C0vtXT+5i9m diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h index d1c145f1..bde567a2 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -3735,18 +3735,18 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colErrorCause; private: System::Void stripItemEnglish_Click(System::Object^ sender, System::EventArgs^ e) { - this->changeEnglish(); this->stripItemEnglish->Checked = true; this->stripItemJapanese->Checked = false; + this->changeEnglish(); this->updateGrid(); } private: System::Void stripItemJapanese_Click(System::Object^ sender, System::EventArgs^ e) { - this->changeJapanese(); this->stripItemEnglish->Checked = false; this->stripItemJapanese->Checked = true; + this->changeJapanese(); this->updateGrid(); } @@ -3899,10 +3899,12 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ colErrorCause; // 注意書き { this->sucMsg( - "マスターROMデータは作成されませんが、書類に記載されるCRCは現在の入力を反映して再計算されます。" - + "\nまた、提出確認書に記載されるROMデータファイル名は、提出手順書にしたがい、 \"" + srlfile + "\"となります。", - "Re-calculation of CRC code descibed in a submission sheet is based on current input forms, and, " - + "\na ROM data file name discribed in the sheet is \"" + srlfile + "\"." + "マスターROMデータは作成されませんが、書類には現在の入力が反映されます。" + + "\n・書類に記載されるCRCは現在の入力を反映して再計算されるため、読み込んだファイルとは異なる場合があります。" + + "\n・提出確認書に記載されるROMデータファイル名は、提出手順書にしたがい、 \"" + srlfile + "\"となります。", + "A submission sheet description is based on current input information." + + "\n・CRC code described in the sheet is different from one of input ROM data. " + + "\n・a ROM data file name discribed in the sheet is \"" + srlfile + "\"." ); } diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp index 9a4469b2..153e8dfc 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp @@ -161,6 +161,13 @@ void Form1::setDeliverableProperties(void) this->hDeliv->hCaption += ("(" + this->tboxCaptionEx->Text + ")"); } + // 特殊なアプリ種別 + this->hDeliv->hAppTypeOther = this->tboxAppTypeOther->Text; + if( this->hDeliv->hAppTypeOther != nullptr ) + { + this->hDeliv->hAppTypeOther->Replace("\r\n",""); + } + // 一部のROM情報を登録 if( this->combBackup->SelectedIndex != (this->combBackup->Items->Count - 1) ) { diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp index 2b5a71f3..686179bd 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp @@ -143,17 +143,6 @@ void Form1::setSrlForms(void) this->tboxAppType->Text = gcnew System::String( "UNKNOWN" ); } - System::String ^appother = gcnew System::String(""); - if( *(this->hSrl->hIsLaunch) == false ) - { - appother += "Not-Launch.\r\n"; - } - if( *(this->hSrl->hIsDataOnly) == true ) - { - appother += "DataOnly.\r\n"; - } - this->tboxAppTypeOther->Text = appother; - // アクセスコントロール その他 System::String ^acc = gcnew System::String(""); if( *(this->hSrl->hIsCommonClientKey) == true ) @@ -228,7 +217,27 @@ void Form1::setSrlForms(void) // SRLの特殊な設定をフォームにセットする(言語切り替えで表示を変えたいので独立させる) void Form1::setSrlFormsCaptionEx() { - // 特殊な設定は備考欄に書き加えておく + if( System::String::IsNullOrEmpty( this->tboxFile->Text ) ) + { + return; + } + System::String ^appother = gcnew System::String(""); + if( *(this->hSrl->hIsLaunch) == false ) + { + if( this->stripItemJapanese->Checked == true ) + appother += "ランチャー非表示.\r\n"; + else + appother += "Not Display On the Launcher.\r\n"; + } + if( *(this->hSrl->hIsDataOnly) == true ) + { + if( this->stripItemJapanese->Checked == true ) + appother += "データ専用.\r\n"; + else + appother += "Data Only.\r\n"; + } + this->tboxAppTypeOther->Text = appother; + this->tboxCaptionEx->Clear(); if( (this->hSrl->hHasDSDLPlaySign != nullptr) && (*(this->hSrl->hHasDSDLPlaySign) == true) ) { diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm b/build/tools/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm index a3ec2d5302b46b2609fa8c8cf6477d6586355f41..b052794ca202247c3266a393b15196b51510741d 100644 GIT binary patch delta 740 zcmeBcWSrE+xWSH%*Mh;3!HB^EjEyJHmp9+cCsf0<`5#9btDqZ0K0^^hE<-#+DMJZE zCPU8TeqL>UglGv+t^iG}7^nlR4oP3 zDGaF$IY8UXKq@z<@I7Eeb@b*yfl82&6NW!zIM9Rx1rjHpk`>#$PU;B@P|6vhWAl9Z z-<()2U8re|j4BHA3aTi~+dxsIK!XGjsu(07QFX(D94NYZmL?Z7ntM0u zfIaPk@B%pU^7K5IfGUxN0|n$aKQb@^1(7R4^=3t*ujoR`CO?_#5djZ%0fQbe`U-%M qmw}4`Aq#dh4mq$NamYbK1&3^o3nW$GkcI|74q13g+01WV&j|nu=$^L# delta 243 zcmbQ##n{)#xWSH%*NDM@!I;5>!IZ&_!F;l#qWR_x!Zl2r|8bcrgY-w z4JKTSlMUGTfKrASdSy6Jg*V@nj%Ec486i||c2xY$x!F&biy2Kk)u0k&pD{uy*g;B0 l9!zM$H>Kq_PctzBsWw5V-h9>cE4t8i^Pfzc7g!f@0ss{eG-Ch& diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/common.h b/build/tools/MasterEditorTWL/MasterEditorTWL/common.h index fec3da49..11755e6f 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/common.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/common.h @@ -3,7 +3,7 @@ #define METWL_WHETHER_PLATFORM_CHECK // プラットフォームがTWL対応以外かどうかをチェックする #define METWL_WHETHER_SIGN_DECRYPT // 署名を外してダイジェストをベリファイする #define METWL_WHETHER_MRC // MRC機能を含めるか -//#define METWL_LIGHT_CHECK // 提出条件を緩くするか +#define METWL_LIGHT_CHECK // 提出条件を緩くするか // 定数 #define METWL_ERRLIST_NORANGE 0 // エラーのアドレス範囲を指定しないことを表す特別な値 diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h index d2f7a94a..a0169ca8 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h @@ -94,6 +94,7 @@ namespace MasterEditorTWL property System::String ^hPEGI_PRT; property System::String ^hPEGI_BBFC; property System::String ^hOFLC; + property System::String ^hAppTypeOther; // 特記事項 // constructor and destructor public: diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp index 5ea01408..7a394bf2 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp @@ -788,6 +788,7 @@ ECSrlResult RCSrl::searchSDKVersion( FILE *fp ) System::UInt16 relstep = (System::UInt16)(0xffff & sdkcode); System::String ^str = nullptr; str += (major.ToString() + "." + minor.ToString() + " "); + //System::Diagnostics::Debug::WriteLine( "relstep = " + relstep.ToString() ); // RELSTEPの解釈 // PR1=10100 PR2=10200 ... @@ -946,6 +947,24 @@ ECSrlResult RCSrl::mrcNTR( FILE *fp ) "Game Title", "Please use 00h for an unused part.", false, true ) ); } + result = true; + for( i=1; i < TITLE_NAME_MAX; i++ ) + { + char prev = this->pRomHeader->s.title_name[i-1]; + char curr = this->pRomHeader->s.title_name[i]; + if( (prev == 0x00) && (0x21 <= curr) && (curr <= 0x5f) ) // 途中に00hがあるとダメ + { + result = false; + break; + } + } + if( !result ) + { + this->hErrorList->Add( gcnew RCMrcError( + "ソフトタイトル", 0x0, 0xb, "スペース部分には20hを登録してください。", + "Game Title", "Please use 20h for an space part.", false, true ) ); + } + result = true; for( i=0; i < GAME_CODE_MAX; i++ ) { @@ -1642,6 +1661,10 @@ void RCSrl::mrcBanner(FILE *fp) u32 end = (size < 0x1240)?(size):(0x1240); // NTR互換領域までのときはTWL拡張領域をサーチしない for( i=0x240; i < end; i+=2 ) { + if( (0x840 <= i) && (i < 0xA40) ) // 中韓のフォント箇所はチェックしない + { + continue; + } u16 index = banner[i+1]; u16 indexbak = index; index = (index << 8) + banner[i];