From 31721a24f62ec753b7a5cdd35514ef19382fb967 Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Thu, 11 Sep 2008 11:45:38 +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=83=90=E3=83=8A=E3=83=BC=E3=81=AE?= =?UTF-8?q?=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=81=A8TWL=E3=82=AB?= =?UTF-8?q?=E3=83=BC=E3=83=89ROM=E3=82=AA=E3=83=95=E3=82=BB=E3=83=83?= =?UTF-8?q?=E3=83=88=E3=81=AE=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=82=92?= =?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/TwlIPL/trunk@2499 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../tools/MasterEditorTWL/MasterEditorTWL.ncb | Bin 11217920 -> 11217920 bytes .../tools/MasterEditorTWL/MasterEditorTWL.suo | Bin 48128 -> 48128 bytes .../MasterEditorTWL/Debug/BuildLog.htm | Bin 16374 -> 11630 bytes .../MasterEditorTWL/MasterEditorTWL/srl.cpp | 47 +++++++++++++++++- 4 files changed, 45 insertions(+), 2 deletions(-) diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb index 6e33956b9d3e171ac0601ddb165d67ddc18c63ae..b02e2a0b321caa2cbd48a8da08b95e1138c3299d 100644 GIT binary patch delta 15362 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 diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditorTWL/MasterEditorTWL.suo index 2c2b4b7d5c2509d82fc282138e49c700a0d36537..f9ad1eef967f7b8c481f56f8a829cbe8fb1202ac 100644 GIT binary patch delta 2750 zcma);du$X{6vk(^)9tdfyUTWYT0>jJ@+i=XMWuyq1%a33+xy+$oVj!7 z&b@cG_O_$;wqyHr%h`0G(i0c3XIZNq))$6hNFZTLmtSCJL9?M6Xb#j2*=G`7NN}1h z2#=T<$ueVrU$QKx)Obh7Cn2FvG_`Mf&zNSM+)3^%jU7_L{^2s*oh3E?5~t}#a$m&D!kS6q>fuVVT3sOPVN)K>>ta8bz1)o7 z;xvrU>^l#1cBFiXyu0Y-S6Y6J@+kBzBw0DV#+`;a1APabg}#T*LFb_h&<{`(^doc; zx&&Q@eu936*!UHcSJhu*DeH0u+D$ntk{oY4?FGXMEg9y{wr`F&Z+bGlYx6R_?6fg{ zja$;Jfc;0|3Cn5p0J%SUAe`etoDTW($->A;XG9;3pNXS$WqwJK3`@jhU*ldgLv2m$hG7$XQIe%W zjWC=ECzW-FKc(z!6g#KvqOyCDcNw1TT~WrN*ay#u!vVFX5iSdc)&mwp8z3H_PC^et zr?k$8wG3huB0(E4iePx5QOd|m@zV+AQ_A?@Cc!hWLRnAvC*TnUMx8>|7HeXIvXNj* zB8kRUWxc_+Dcgne-SK9~LhHPM6F)pedEs3sla-~x2jDrXU6pZE?@^W-#nP2!DC4O1 zhR4^)RK{xzfzL3EkTFytJD0#L#0X{dBjJgQl=X)%CO}M8Mn4Unc)GGU_%M7&ly50x zXBNWaYuK$UWEcZbsU$({ZiNxQ2R;bFEMH!dCegecbW%SMP#J?%)0)I=H z13lviq(j$3%tAO7@<0+iw?=OiI|}auJEn~Dzy;5^sH_M4Rd_b}yE3*{X&FX4lvOBM zPlMLOWAiht%`iJBcpdls*P`QD+=cAp)!C*jn_MZ|iaqku!U^(Wb*ET6Re9YaQ;wI% zOZKij32w6N;4_CJtCsWT1HJf1+99$X%62Q`Xzzu`eHaInWy3#&Nk}#XCA-CexJ-a3 zSH>wa8J8J z`2;-5xcjYYZ4YzJr;wA~56_sWjN8T}WfjU&!KNtNr;LpshUdgSqKqACgztdz8)Y2T z{qPJ|0y@n}$Y_TO<1v(cF&na@tZ%Se1RCrbo1^#!7z1&Mu+Fi|ff(HR+VV!h%c=6` z|JNkqt4!+a=g9VOvrK;RV0d<-1cNU7k}it1RC zZBs=*bLXspDgG7BJ8Mjrg!?U!lIjU^dST4T>3!MZh|!J=3>^!O#+^K^cgDqC1~Dq3 zw!7tfjd}BxWujaFF(gkyGtKuOzr)+@f7x=Z_`}dI>#+p9# zsz5`t4wU2lk&emdUJZvZdH>cD9$U-4!pxHysq; c$AjcXnT0=)1se}bx^JXZC;9BM&6|_|0pc*SxBvhE delta 1001 zcmZuvZETBC6n@XUw{NTZ^>$qqwati%un)37>z2LSgjCQPOGp|ui?P_4wIeoc#1f0i z=tE*NHYCV`SZ|0#d`0{t5q{tYCj7Hx!hX!x>b@HZYj1LL?|II1&Uwzgw{=u(9TjiX zN^;=!-EYIGtU)>_N@MYO91i_emv(3n1R=~V!mW{;hOt-r?Rq?t@({5Guykf&%=U!v zQE^8duBd&f&cb<9L7r6X$gv|=k`b}{$N3|6zf49RHvb<^?SRW+!=NJRL>`^braL}Z zOv)|Y0QUsmGR_Qh3}#3k8_UdHNaKfKUJvQ&WI;H^el4CRx;2_6Pg{TY36IZ{n?L`= zx|Ik93)x`)X|re~)>P(`G*xV5`5Q9V82buqjHLA|=*Da*jeYe!lVqC1fqDO`l{aw2 zN%+3nr)BGQao3K${uL+-L7A2o7k%UFvWsa5uTII zB$I^Nj}Q)=ccQJL9R8y-l2Cf9D+!rCkFH8+5UQZ`7g7o<+Wd&{{vsRi(Q>tv@FmBA zExvMOw5KO2@}hnbFH*4(m3!_*!zQSzfj!^0Tc!p7ULYbnkD=6+jiE)EXxyKlHiu8$07HT&pE6`ir80$Ejl9+(|oh9O*&*F{pD}Hd;f@>#g6Pe5#O{R^7PM%M( z)(Vxv4q>a1Eo|ct>x2>>#!$MO6et73cqKF_&xjF2#!;XcBxr=Je6l;6`Q}yf zA*_?-xY#CJupXKGPLgNxKXrx8UsU}-hNGz79IOL2!Wh|z&DV7cnSd%$1SdNR$Zjq( z&|{P|0lE#zeLw^C7?Kzg8A>JxvT1I9VYmb2CKM%`HyT?qO;#{FF`36)Vsnu75*7fA CMlz=W delta 1184 zcmcIkUr1A76h9j#V=-|#n@X+QH)9KG9d#-e1my}svM|!h#B6_5u(_s{!E`+Z{eh(O z8dTsz5K(a-DyWC>C8(f?daLLuNU(<>3VP`G-5YZodyVnkefON-@0{Ov&iU^0v7h+| z9o1f@7W|^rNv+g|)g`muPBT}%(_=}^KQxR1fYIjTXMqeyTNt&WjJku1xa|X+xZFC0K zBpsqj?6MTc{vd)+)0pLr!+we~G)@!n$St)jQIF4K2b&>9TS&>5`mJ)K(Iwmza4HMb zxEH)Em@UX z1!R&=;xwbcjzD{+ph5E$-i{a98Tx9C*PXEP zed5>rhaa;+-}o7JPxv~^t5CqhICjA#H`RCDLzG+(gzlk1J$#ApUC#5pRomHeader->s.title_name[TITLE_NAME_MAX - i - 1]; // 末尾から探索 + if( ((0x21 <= c ) && (c <= 0x5f)) || (c == 0x00) ) // 00hと20h以外の使用可能な文字が出てくるまでにスペースが存在したらダメ + { + break; + } + else if( c == 0x20 ) + { + result = false; + } + } + if( !result ) + { + this->hErrorList->Add( gcnew RCMrcError( + "ソフトタイトル", 0x0, 0xb, "末尾の未使用部分には00hを登録してください。", + "Game Title", "Please use 00h for an unused part.", false, true ) ); + } + result = true; for( i=0; i < GAME_CODE_MAX; i++ ) { @@ -1034,6 +1054,18 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp ) "セグメント3領域に誤りがあります。", "System-Call Library", "This Library is SDK default one.", false, true ) ); } + + u16 NA = this->pRomHeader->s.twl_card_normal_area_rom_offset & 0x7fffUL; + u16 KA = this->pRomHeader->s.twl_card_keytable_area_rom_offset; + if( (NA == 0) || (KA == 0) || (NA > KA) ) + { + this->hErrorList->Add( gcnew RCMrcError( + "TWL ROMオフセット", 0x90, 0x93, + "TWLノーマル領域ROMオフセット(NA)およびTWL専用領域ROMオフセット(KA)はともに1以上で、かつNAはKAを超えてはいけません。", + "TWL ROM Offset", + "Both TWL Normal Area ROM Offset(NA) and TWL Limited Area ROM Offset(KA) are bigger than 0. And NA must be smaller than KA, or equals to KA.", + false, true ) ); + } } //if( *(this->hIsNAND) == false ) else // NANDアプリのときのみのチェック { @@ -1694,6 +1726,18 @@ void RCSrl::mrcBanner(FILE *fp) u8 map[ 0x10000 ]; u32 i; + // 本体設定だけはガイドライン無視 + if( memcmp( this->pRomHeader->s.game_code, "HNB", 3 ) == 0 ) + { + //this->hWarnList->Add( gcnew RCMrcError( + // "バナーファイル", METWL_ERRLIST_NORANGE, METWL_ERRLIST_NORANGE, + // "本体設定アプリに限ってはバナーの文字コードチェックをスキップします。", + // "Banner File", + // "Only a machine setting app., a charactor code check of the banner file is skip.", + // false, true ) ); + return; + } + // 使用可能な文字のマップをつくる // 文字コードをインデックスとして使用可能なら 1 が入る // そうでないなら 0 が入る @@ -1716,7 +1760,6 @@ void RCSrl::mrcBanner(FILE *fp) // バナーを読み込む u32 size = this->pRomHeader->s.banner_size; u8 *banner = new u8[size]; - System::Diagnostics::Debug::WriteLine( "size: " + size.ToString("X") ); fseek( fp, this->pRomHeader->s.banner_offset, SEEK_SET ); if( size != fread( banner, 1, size, fp ) ) { @@ -1739,7 +1782,7 @@ void RCSrl::mrcBanner(FILE *fp) index = (index << 8) + banner[i]; if( map[ index ] == 0 ) { - System::Diagnostics::Debug::WriteLine( i.ToString("X") + ":" + index.ToString("X") + ":" + indexbak.ToString("X") ); + //System::Diagnostics::Debug::WriteLine( i.ToString("X") + ":" + index.ToString("X") + ":" + indexbak.ToString("X") ); bResult = false; break; }