From 984f8dfcaee0fbb6b692571180e251e7c0348e4f Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Wed, 10 Sep 2008 14:29:09 +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=AB=E3=83=BC=E3=83=89=E3=82=A2?= =?UTF-8?q?=E3=83=97=E3=83=AA=E3=81=AE=E3=81=A8=E3=81=8D=E3=81=AE=E3=81=BF?= =?UTF-8?q?=E3=82=BB=E3=82=B0=E3=83=A1=E3=83=B3=E3=83=883=E3=81=AECRC?= =?UTF-8?q?=E3=82=92=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=80=82=E3=83=95?= =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=AA=E3=83=BC=E3=83=97=E3=83=B3?= =?UTF-8?q?=E3=81=AE=E4=BE=8B=E5=A4=96=E5=87=A6=E7=90=86=E3=82=92=E8=BF=BD?= =?UTF-8?q?=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@2483 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../tools/MasterEditorTWL/MasterEditorTWL.ncb | Bin 11217920 -> 11217920 bytes .../tools/MasterEditorTWL/MasterEditorTWL.suo | Bin 53760 -> 49152 bytes .../MasterEditorTWL/Debug/BuildLog.htm | Bin 16374 -> 16374 bytes .../MasterEditorTWL/MasterEditorTWL/Form1.h | 12 ++++- .../MasterEditorTWL/Release/BuildLog.htm | Bin 16546 -> 16526 bytes .../MasterEditorTWL/deliverable.cpp | 10 +++- .../MasterEditorTWL/MasterEditorTWL/srl.cpp | 49 ++++++++++-------- 7 files changed, 48 insertions(+), 23 deletions(-) diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb index 9b1197a9919df99eb1e7606f395cb42c3b4814e8..058b9ebfce46dd0acd2efbd7ef69a77b9603142f 100644 GIT binary patch delta 12490 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 delta 5544 zcmeI0dwdgBzQAWDlae&kWb!ykAEAVj$22LSN{fh9ilPfxuqe8ypoj_;Tdassd2Hha zPK$=x+S0?L&;n&z+UkO`IX5p^l#T{e3thTQoK5u7fk8}FE z;7#l!$LEY|S*8~%^a2ZTfCk_JEsy{V0Ca#JNCXT(w0;s`qh+i&$c@i+D=y~>L^ z4GHN-^R?TxDK&-m+75jRDd5HS1Sb0FqW|DUjRp%M7R*?%V8Mz78x{~2>{xJMAsGuP zSV+Y}8Wx;b7>I>*EDXYe3k!p>kb#9E5y9=e$Qe>edapZ`j9k;UoOJfO>$t6ca^2Lv zfbPHIZpxrVoo&UL#Ql9+5jmXHo{zfp46_T^4SWpna4@gZnmax3yUV9Remd|Nuse}q zW+XApTLy-C4|pG-K89HXUJI-P)&mW|24Ex52s8nkfX%=bpc&W&eO&_n2Gl~n4pnl(l(%<)?Q3uqW>Z1w!Ci738s5)H5P%;zFyQdmpFXMK=d zF3n`=%nQDaoZR5y0iE0gZuMkGT0K>ITD96U4{CW1>*(Q=p6mf~rNqluJ%SvTbn<1W zSqJWowv_lttMnm9Kin+c$woS)0+xtxNO|Sona-K|O#d)3A}b;>SxgZ#M33kd1L8uF zi0j2o;#P5+7!ltSyTm=>e(|7qSUd)C1|q}kHt)1VBLYDo-nD!Tu@_<=#21#s5Z^*5 z5N9DWt#ho!)>3Pg^^~>Oy41EbXu}XKwpQCVTbr%j)?s_Yw%zu&ZKv%owup_|-m$%J z>$H7f>$2^#?Y4bNMz8Q9?FrjS+ZpnFqIW2Jl{6-LQ<4TCJxW4GWI`gcl0UET4u05+ zd`Lo>$d3YOI2ws=MWfJdXf`TB&!9QzSyY1NqUTU4dLF%i=A#!;1*$|V(JSax6h^C1 zHL68*Xf>)w1g$~qQ3Kk5n$RY+8Eqq@4R8z*MA3)jVS{&Q-~>8}zDD1mQ>YuAM&F_{ zNI_@Ocjz4YE4qX(qyI!dq8{`U`WamzI}F~zg*v<5o@h7N1$&Ym*;DOlcBg%yeS-a7 zdx3qTeUiP(F`$P6W+Nau2*n1(a*bNSoBkYhJ+Z>&a(~dKavyStQKF5sY z`jC_}IC?kh?`OI+V1}_kz^BQ{+$iTsNvq_b#m!O%N8Yk{w@{7S{MVom?@`Vqav3+|K4fm(T`u^Cm9~Syc z%Qu#9$op1ruI9S!H2KBq%@j2-2PekI>z@}-wC@Zo;piRHz3D93cgj0U-s7=Fx;;4t zn$zz&$j7!TY*ixi-e%H8GI&z_n@6BKJG=#&dYw0)<{$QU4XV%f=Fps8??Fv{j<<@; z80r(~x-8!;Q)H}n8cU}==xesi9bR58_PON4URR5_1Twu|K2q)5XBQh1HY99JXiTu6 zUKEA=`nuO&ei$7==MSVY9GvHP-5|$D#`wIwYkALd%GzzcVEx|uk>45n{tL@-%SX4x z=fq(?VBVkn(FP|YLd#A|r{w^|_Yk?(Tx%Z0JrENira&C3NQ=$g?xaIU;;9Y%p`&Sx zNE&OsDCIfJVhgs^SQ;!XmUL_7XYt`i+x|cf)q2xLoHm{|D#lC3k*1NRQKsFdGjQ1= zxL9jo6{B~Or>r${{HS&tr;86H*PM33ot$1LUd|Tj^!+@5{v7Zb#mIIkJ&C5@?fZ_C z_xN=36yFm0ppUQL;}xmc<14k7f2}>GJ*)jrdro^v`#0@n?a$g??G^2>+RDZ8Ntw@; zaev~H67832RlFy+kM+(K?I_mrkl^VQ1u=`CZ-6XOSWjH&r5o;tvf{xLQ7 ztn)M3%v@$Mb8TGwOj&jUyQtJz9-HOcncKN*$D?P!Fjm&irm=(AA*_!Lu*2B1{5goq zUs7W=FR&S0G#Jc{1o#G z^NA*XW&AuExlLRa3>ICK0c^*N__q3q_3(e4?2PsOHFJ*ngf()rVMe1{u9#cI%~lsL zUBl<{a+k#89v|+Ja8IV(;}`4qNS(B^OB$=G-!FwoXpfXfw)F;!>5#p_T`c`_(#;OG zJ{0Jt-MWBVv(q=hKqfc>k%-`%mqh2)NL5_K>B|>rev{Otk@I}KoELCL@_h|FY3Pu) z(*kzbahA9q4=D0D*c3$pAu>+-#zena7Vx?w2c^0MTKBnB%tnq&)jX}0~_g+&PQne;!GoJ?0zsUHq}=KL?f~@v#OC)-RGYdnd0w8wEJnlo2xJO zV~UIX53#g+1LPy6{);@lSn5yKM9Tb2Su(uDKWNZ@-5#I3Y}hLPJK}4c&D?n-MJAW{ zGY4-`D`hYN=9rrHFcM?^XSIrA{}4Ysl9?1{F!U6STbS|8qpFv zY9v+O^t;%|PJf?{Y+n^fCyx!Wy2sX$Y>%pzDqXX0i3Hfh?NU8GMeT>)#4I%|^}#lvJu*3%FRhN#g6feZ8c&FA$^| zf04fB>YJsRWM;STb=v!mBx)$%6%+&_R_9LibLQy1+Q@KbBiICn--K}A;mq*+g)xJp z*NO#9Dh>wEk1|0y2OHJ|_2P!Mu{^Ym8QR7SZDWSE@B}fL>C&3qTF!q>OlI`3j@Lv7 zmVQ4fcNO)Ws+6v*3EJ5(ow;R-dUsHRQFgZFdg zMmTZ@Y#k#UdE5!$Ovn#Vty8TB`=LBhwL!H24nTR5YNKisI19=})n?Te@K7j^p4ZTF zNZ8Z@1P(&puG*nG89WTiQ&gv_P6KB{xl{E(@J*0US3L-PGvr;W2dmBi4~Oz0;Azo> zTP^T_b0F_k?Ncp*bD=y_wO@4rJOawIR1Z}h1m6PXq~K&wCI=dFOA<|H31&aG)y8bd z9jSq>LmIn-&v4g7ns_?6faPElKDIg6!6qh}&9EN*{fTB;z9rYIjaL2ad~mYgWX@o2 zg=de+JQ%D4yTE$zAaEi$9c%!TdoBd`(W@ml_pp(R!S0c?`+V-nXUWd+u!4aG*zzI_ z5Um>>DBj0NCVEL($iT@X29cRVtjYTL@%Hyy$;-9F92N6d4Fj@)o9O&iH+O_9TvfLM zqo}LuHsxs?%Eh4(ICKjRjl`i_acC3{-G)PXICOg?bVubYv~p%~*@{T@=#EUL(LQKyw6cF*7*W3A9xX104xN`fS2f4=b}y@4v)v-2{?Q&4j16?L>!)k z!}sBEAr4Q*;rns;0UVx!!w=%{Lpc0L9G;59599D7IQ%FMPs8EqIQ$q6KaRsQaQF!v zo+*c)JXqnH`V{aqFbkMXT~mt`D`{Gq%@e+~$SD^W@fEJpBI+uAMyVjmnR1EhPUiJ# zT6m>g*TVC2MC!K9>9!K(_i~pk&EcslYmQn($1jNu~L;bisu|k|W z2Y8l>Q;U0FYvG+Cp7PbB`_kg|a&#pJhZE(2P&O6wN_tH4ln^f$mXuOgSBWx=C>79Y zPswt%)5_3gle~PclT$L`Cb z+pn!CWU*3;mFKZC4=XQVWjaemJEA?0* zSXqOWwOCn)mGxL@z{&<$*(mL0g4pE$?cZcj)?wEpjBTqy{jR$iH$b;=&`2#95MXZC{WK#`Qs6? zZWGj8BTqIFS_j`xY?X@##TxA!y=kB!mg+t#zstu`Yfi{3Q(~#$Gn>u|v6Sw*tlT5N zv&q(SacoOY^JeI-tmP+bO(9QDhg*7v#3~)$-ty@qu~dVh6-|nzKKx`yjnqj>-6|(bmVS(@U~b}qrO>fx@76Lmj=eluCCj*?S)wC z%{$ue=BS}>W4{KsHsjW6vuz}_uE}w>k7+?%Oc8q0n=Gb#!|^8(Ljxd0hWw`S`MS&tCbP8*lAKI zoWMN{V+><~%~)os+_8sJZ2E^XsMs`_HIq?I*n@l|=~T-0y>NG=nLV?gz32D6=f2K8 zzg_p+n%k`%JEvNgD2nn3$OKNX2+RXCpr+<7g_8pogAt$4mxnf2`iZh#Cfj_p1)vZV zf#u*SunJJ2mZX0cj)S&nG5ad2Ji02A^IBzfQDiUEpnLQ94&7x{cTEHr2Q}yh;qZZ= zwLx@7mqD(Hg_ILBzbiaP)tk^0M$8^b&0Z^;L)*;xqcOwg0s{+0=LCP}L09Ai_9WjH zSFh^GZsJ{u_cWum#(V`q3IjaYeo8a21h_H&K{T9RFt+CO0)sLYU9tWyK0N)3en#o9 z&O=Z~ClIYL6+{CusUQP{fK2*3<4b)CyczVxEW6=NouZu8@sU|=YOcuVFX;IV2>*Aq zL*Nf^9ozsn!7cD7xDAHEU*Hb73qr6MAIPjUvS|M%$@O@@fnh$M%`b7+!hTJh$sq3L zvoOBni504;*Ywu>UX$3ZqQx61UT5LA^NLh`5`@_ghA!)81{Mb`^?{aui3QssiB-t$ zP1R@NVLjCr_5~Zq$>b_JA1zXI;l0`B8za|!46Ef^6=gG6!Jk>)uIWd2!T%{asi$*g z#;g-42C*ekT;1@+=rdA-tNaWfALY8#L~Ih0Dw3T-_si^cp^(CW5rhMA!iiuqhyZ2~ z2`pd|hyqq1t{@t%4a9&cAQnso(?A@E2MHh%B!Og*0>oHp$IDhR&7aSC6%CBsEhc)u zyp+B#iHi7t&T%}RUU8XG#F6<-<5_F^Slvn-#(=|=qs7e1G_YD~>&9u7Qmd9)EaEo7 z7s+`+YN84Uq&6tEWN06XAXtcgY>k=l!{Ec}lxQh#!BYZ!5t}A85tA-8htwX079%=f zIZ_j2JKzVSJuJ0U_(x?NAE%vwFK+qcQEiT*%*DfE8F*3#ra|kLS}@WhGBX>5id4bE zDeL)#3ueKq1!Bv)fQYIGF+kWiSVvqFO3HE6an*4T-y%oC?kH=iXMMJ3T~?qMqkLV5 z=GpD++T&$iRk<2V_rD9|+O*fRJvqP_DsSqf?7`gk%{!~vw)0&!AdT5D}c9#^> z-Pde^=6bmC0(py1(U9Ft7hVsvRb-^2YcCFKt{J4NjlDJWV@)bgYtC2M zeZJi@lZE2Wlu1BU=m%>NZB4ULv(-pV#Y3Jp8_nojDPFHYllAmvdp18!rw?zWi^oIx zrB(;y-foLlw-diXqCiT)i|~cDj??x_?YPv+(9fmz(KziBseL+5>yg@7sfoYEUa5UG zrkRw<5XD<7>}y)>jSTq~U8D6$+0hHT_FEXmwT*Dg8%9PJK15figp;lPCK(SzdFGC= z34GdtYQ~#8RK}e%Ri@!LkQU7Qmzj7|=N9HKG>$@Jorlfz`M#F1QVQnBF1Cm%@3A1t HzSQ#{FSGRP delta 3145 zcmb`JYiv|S6vyw}y}PufY;n8NQfMiCPzs?hA)R;bANN@ zo;zn=*W)pHJ~lO+)1zP1G;J_62y#H9Azxct8(r1==5S>cz!(LKQRb*Rn*25n&*Py9 zP(D-ul|X@ZE~&tjwAC4Hp97u<&4u2CGN7%_BCk|$V%e}-SB@$ zVW;)}ioDvXxRXWj>#Q^*J()5L3%Mc+%w5o-Ux3Kl5d}Jp3d;~fsN6QeBErxb9%!Z8 zwtPBkWY)PNyNEnl9$&2+qjUDHYfOA-GFF@KO{4H$@iIQ8&ScRN&@tvo$A0;tA`Zwu zoSEqf?cw|9TSRxz*np$F-Tz1PfHe^duY>xXxn$EJb`?sgC_|wEbT9KV{Tyqjt69;O zT^PSKNnh43y$gp5m~X3dh`c)Jt#HvJ5Q*>tgG^ zp^L2?OpCf=q27jF{+H|2&3yp|23{du<64D9iw8@2!X{i2AxS_So77Ov!vJDvML`QE zmt4+oc`Vw+!vk&q`u=GX2vlR$wEa+L`P#(YCbRzo>5q1z)1%uS$j< zFo2y=ED`nd%I}h5?3-e=rz({m%}D7PNJ*gNK}JAP&{k(p;XCH66MEDY*{5ia@E*6) zky%sd^W1L1QZl6I8$ri*3?)aCAsw^N3HKX_WkJl@C^>d7XpUm@IP-Q zh(Ct<7sXz%`u72 zfn7?j#T&gJOp}f!n+267cQaLKRo(GnmVU%@uU>qiEU`ZIux#Dnt+;d9X4j=wb7FRji0zfbn2B{&TN04-U2v zY9F7odm=eJ4mYQfw^;-f4{;A(LNy(@X`=I8d>yY1Y&V%H z^Nq&cb|Gzh!v)#*_{c7A&@Vl^Qp~=aPL5zyARC~bkn;H7lhrL5h5E-Zxb}C=`>xEgDK;%Ax!j~Jo`VH CEoLkL diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 3db3414ce36a6b3bbe4baa94d68c733852cdda7c..b1cfbfbe069d68e6b8e572205fc28546ae3a57db 100644 GIT binary patch delta 296 zcmexX|E+$58Jn;XgDHbCg9(r{1Jb4ph74w#J=vafVw0FGEfu?Yfq)1jP!gmXUDrmY z%@raOSh31VOSyw2%+a+?_GB~Nyh?rs4>rlop*n>i%Pi1!ZN90S&xBPX+Q5@h+K9mt mT?d06LlQ$GL&@YoHqFg140kZf;!(t)G}%y2cJnP`86E)GN;FXb delta 296 zcmexX|E+$58Jn;HgCTo6m$*BHF-{QQCmP6kP{{ j9zzmCB16gKKsL?IFAR4u%HmPPpfuS~PImJxV;LR*ZNf9B diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h index ff01b7d2..00f5787d 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -6250,7 +6250,17 @@ private: System::Windows::Forms::Label^ labProductNameLimitForeign; result = this->hDeliv->writeSpreadsheet( delivfile, this->hSrl, hcrc, srlfile, !(this->stripItemJapanese->Checked) ); if( result != ECDeliverableResult::NOERROR ) { - this->errMsg( "提出確認書の作成に失敗しました。", "Making the submission sheet is failed." ); + switch( result ) + { + case ECDeliverableResult::ERROR_FILE_OPEN: + this->errMsg( "提出確認書のテンプレートが開けなかったため、提出確認書の作成に失敗しました。", + "Since a templete of the submission sheet can't be opened, making the sheet is failed." ); + break; + + default: + this->errMsg( "提出確認書の作成に失敗しました。", "Making the submission sheet is failed." ); + break; + } return; } this->sucMsg( "提出確認書の作成に成功しました。", "The submission sheet is made successfully." ); diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm b/build/tools/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm index 40b6cf06a0698d373c43861893343b983aeff23a..a3ec2d5302b46b2609fa8c8cf6477d6586355f41 100644 GIT binary patch delta 267 zcmZ3~$k^A&xWSH1(1^i+!I;5>!IZ&_!5qjk+Z@RDl@p6_q(CVnP}mSn^+Q2_4ou<6 zkpi)s7fAhL0ZJL6>X;nJX1w`<{5c*>sm%vCL j&<`m7V9;YoVn}2tnH;F6xjDn=0LbxZN;X@Yr1Jm(^-?i* delta 300 zcmeBcWL(t9xWSH1*nq)_!HB^Shz)?)3`iPm_GkObiA`d%wN&ipKL%WklMUGTfC`+k z=v>dVxl3dLD^^)+sc?{l3%a(+{%ppZugRa|!6vzRt4=8+P{I|ft~@;tCajXyQqr3r s85l828!)(`>txVlNMcB2D4G1wKzwo@o6zPkqXQr-FcfZ9H%aFK0R9^`Bme*a diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp index 233c1f20..adf9a74b 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp @@ -29,7 +29,15 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( { // テンプレートを読み込む System::Xml::XmlDocument ^doc = gcnew System::Xml::XmlDocument(); - doc->Load( "../resource/sheet_templete.xml" ); + try + { + doc->Load( "../resource/sheet_templete.xml" ); + } + catch ( System::Exception ^ex ) // 改ざんされていたとき + { + (void)ex; + return ECDeliverableResult::ERROR_FILE_OPEN; + } System::Xml::XmlElement ^root = doc->DocumentElement; // ソフトタイトルetc.は1文字ずつ入れる diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp index 14b93b70..d4d31c17 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp @@ -945,19 +945,6 @@ ECSrlResult RCSrl::mrcNTR( FILE *fp ) "システムコールライブラリ", METWL_ERRLIST_NORANGE, METWL_ERRLIST_NORANGE, "SDKデフォルトです。", "System-Call Library", "This Library is SDK default one.", false, true ) ); } - -#if 0 - // セグメント3のCRC - u16 crcseg3; - BOOL crcret = getSeg3CRCInFp( fp, &crcseg3 ); - if( !crcret || (crcseg3 != METWL_SEG3_CRC) ) - { - this->hErrorList->Add( gcnew RCMrcError( - "セグメント3CRC", METWL_ERRLIST_NORANGE, METWL_ERRLIST_NORANGE, - "セグメント3領域に誤りがあります。", - "System-Call Library", "This Library is SDK default one.", false, true ) ); - } -#endif return ECSrlResult::NOERROR; } // mrcNTR() @@ -1008,8 +995,18 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp ) "実ファイルサイズ", METWL_ERRLIST_NORANGE, METWL_ERRLIST_NORANGE, "中途半端な値です。通常では2のべき乗の値です。", "Actual File Size", "Invalid size. This size is usually power of 2.", false, true ) ); } + // セグメント3のCRC + u16 crcseg3; + BOOL crcret = getSeg3CRCInFp( fp, &crcseg3 ); + if( !crcret || (crcseg3 != METWL_SEG3_CRC) ) + { + this->hErrorList->Add( gcnew RCMrcError( + "セグメント3CRC", METWL_ERRLIST_NORANGE, METWL_ERRLIST_NORANGE, + "セグメント3領域に誤りがあります。", + "System-Call Library", "This Library is SDK default one.", false, true ) ); + } } //if( *(this->hIsNAND) == false ) - else + else // NANDアプリのときのみのチェック { if( (romsize < METWL_ROMSIZE_MIN_NAND) || (METWL_ROMSIZE_MAX_NAND < romsize) ) { @@ -1195,26 +1192,36 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp ) "Title ID", "Lower 4 bytes don't match ones of Game Code.", false, true ) ); } + System::Boolean bReserved = true; for( i=0; i < (0x2f0 - 0x240); i++ ) { if( this->pRomHeader->s.reserved_ltd_F[i] != 0 ) { - this->hErrorList->Add( gcnew RCMrcError( - "予約領域F", 0x240, 0x2ef, "不正な値が含まれています。この領域をすべて0で埋めてください。", - "Reserved Area F", "Invalid data is included. Please set 0 into this area.", false, true ) ); + bReserved = false; } } + if( !bReserved ) + { + this->hErrorList->Add( gcnew RCMrcError( + "予約領域F", 0x240, 0x2ef, "不正な値が含まれています。この領域をすべて0で埋めてください。", + "Reserved Area F", "Invalid data is included. Please set 0 into this area.", false, true ) ); + } + bReserved = true; for( i=0; i < (0xf80 - 0x378); i++ ) { u8 *p = (u8*)this->pRomHeader; if( p[ 0x378 + i ] != 0 ) { - this->hErrorList->Add( gcnew RCMrcError( - "予約領域D", 0x378, 0xf7f, "不正な値が含まれています。この領域をすべて0で埋めてください。", - "Reserved Area D", "Invalid data is included. Please set 0 into this area.", false, true ) ); + bReserved = false; } } + if( !bReserved ) + { + this->hErrorList->Add( gcnew RCMrcError( + "予約領域D", 0x378, 0xf7f, "不正な値が含まれています。この領域をすべて0で埋めてください。", + "Reserved Area D", "Invalid data is included. Please set 0 into this area.", false, true ) ); + } // ROMヘッダ以外の領域のチェック @@ -1224,7 +1231,7 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp ) "クローンブート署名", METWL_ERRLIST_NORANGE, METWL_ERRLIST_NORANGE, "SDKがクローンブートに対応していないため、ROM出しによってデータに矛盾が生じます。任天堂窓口にご相談ください。", "Clone-Boot Signature", - "Since SDK used by this ROM is not support for making Clone-Boot ROM, Mastering ROM will be error. Please contact with nintendo, sorry.", + "Since SDK used by this ROM is not support for making Clone-Boot ROM, Mastering ROM will be error. Please contact nintendo, sorry.", false, true ) ); }