From e54ef879881642f3009405179525acdb130c5493 Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Fri, 13 Mar 2009 07:24:03 +0000 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=8A=9BROM=E3=83=81=E3=82=A7?= =?UTF-8?q?=E3=83=83=E3=82=AB:=E3=83=AA=E3=83=BC=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E3=81=8C=E3=82=B3=E3=83=BC=E3=83=89=E3=81=A0=E3=81=91?= =?UTF-8?q?=E3=81=A0=E3=81=A8=E3=81=BF=E3=81=A5=E3=82=89=E3=81=84=E3=81=AE?= =?UTF-8?q?=E3=81=A7=E6=96=87=E5=AD=97=E5=88=97=E3=82=82=E3=81=82=E3=82=8F?= =?UTF-8?q?=E3=81=9B=E3=81=A6=E8=A1=A8=E8=A8=98=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@245 7061adef-622a-194b-ae81-725974e89856 --- .../MasterEditorTWLChecker.ncb | Bin 7023616 -> 7023616 bytes .../MasterEditorTWLChecker.suo | Bin 30720 -> 31232 bytes .../MasterEditorTWLChecker/Debug/BuildLog.htm | Bin 11494 -> 10986 bytes .../MasterEditorTWLChecker/check.cpp | 33 ++++++++++++++++++ .../MasterEditorTWLChecker/check.h | 1 + .../MasterEditorTWLChecker/check_rom.cpp | 2 +- 6 files changed, 35 insertions(+), 1 deletion(-) diff --git a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker.ncb b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker.ncb index a43244c14cc95b2f142bc6782bf4a0f122dc8680..039e83860c4a316732beba758863e7adf95afa8c 100644 GIT binary patch delta 5719 zcmZ{od2|%jp2u%>^`3N6+3I#zI^ER}APHGWf&l_#VF`-?0)#*akbM`37!?prKYDA9xtW=uzJr7<_#lP+*uKa+Ejn0Cg}2@rfRMqN4ByQ6%%N?uz>Un6C5b@4dgf zFTdNjy7S}L#ZIs@)qZsj34V4e2MUjhJtbkgi~-Zo$(ut%y@#y{hK~1pqf7}-@3Enw zpNEDlcWw>+{*!;8FjMF)upjOz$uVgO*OA*LMD~7WR(h)}eY>n&n8-Gtr0T(sjUx@c zs>#&bX-_+t7WRo%a6M{^?XtxRzyL&G1SVhx7GMQ7U_LGZJH92Pa5&frvGNQ1??U(6?$*MZ+1t}9z$Hv+TYnFw(<*^x}t)~4x(jSU?(I3 zie_q}*>)rgG3=!;&&JD2Ke(9U9YvWV_y}Y2*t%G@nfMNJK>G(D*ZVn1W4t z$cC>>!CJLWPuJ^8At%t5)|FgxIux3S*$@Upg($h9XH>~l|0p{>ahiNUO)o=$BPW)k5Ex?U#|LJb=_wPBmF z6D6p?{#Ef()?}mOfA5UX*=SzvA*2s4m=bhGZT7=3otisp-LoSWj(TG8D3~5M(lkfZ z^4VdrjR|c%3;IBV&ZsTEJ9zGBp?H>Nr(-Q@(1j#cX{U5fs2(qBQiM% zSBCp>N_T&i)Laa?fErxrU>SDrnD`jM&Hmd?<6?%ly%OB^q4aO;bWE5#xOp{0JoARp zIMz;Scfd%G8@i6?!~-`-;Ky@3d2a_KdQITh5~ySd6wvubKL57oh$xu2L#5ZnzKQg8 z{<_gyD)z@x$?x>~ooc_+cdRdw{)K(EV0jzQn}cc{+U_~3cUWr`-+#7GVEE+a~+uCIO5a~jz#2*?%Q)orfw@E)$np{6m7pwZhr8%)@(6^ z7hm|@=l}DDF)iS zSFQZ2q{NDWP2Syce0Q=^X9zsyT@}S@PG`!zeX7!J2z=m66il_#1X9fkrz?~f6e`CI zeNHu+N5A4tr>vktITkqPooi&fPNd1as!G|5PI*;ps`f;UH z=sV}@=lui9axoyqXPHa_8C_xwr5B%8-Y^85@rfc!JgW=_X47zsu!JrAABD2SPn5yF z61s_R8dSE5eINUb%vee#n{egL;I$^2CzR4!L3oaBUP8-4lE>sS>KqQQE~Ao&?5y*m zFE?wKSvx<6hIWOn0N5}uzG24idN@%L9s`DJ&LV;p8O`kbCK}I5mQW)LTT1Q8yUa3< z9FgoY$3czISf~ja12sdPP_)4EmQvTR9nE4@OX)bFm-WCZI)p>)k4tG;!f*X}`tYw^ z3T|#Ki@J=?5TaTAGP){QF=0Y^D4MM6zE&4uhKr#m`kM;dYJMU&Z)CSA?YSj4sC zSW~O6HfS8;c3s1C4Ts9GJ9LfEH4;i;*G^SUqjZgiIuVc2G#i0f-4F+LAuj7mb#+1& z*j>7^i_2*u`Y%?{i$XO2TLo4S(Mc<53uNC)TE<2#qmj(E3NshYa#scIFRh|KbuP}}!*12prmJ>Fr@$VjYq+is=vdezbdA(if~LZ*by?GBU1OkW9WZD= z18LAWU1exG;#60st}bW>?24}Oy1Jp`U{BE11I#~uMh=8V} zbR7*HkN6l}lXOjn-UWM#u48pgh33GXrfa&c8PEx^GohNkhj~9;O{YPm8k);mZu%lw zd5yLn{D~TxFR)YBeG~fXsDvC*b-|3KAz^iNE{uPxqea*v+R03Cp(JF3?GT$#PiII` zSU(H4Lo{?~Xm%vu_7C4)fsJjX`C2=DeNA*iaJT0+(V~RektiGd)Sk8Ax7dn@V87xg z1D>*{i56H&@dMzn9%7f9XpMa~79u-XFDq%L&fpQy+DzvnAp+B+HOP+M^3_I0!fCZ@ zLLT_Ya)@RA%VMCN#+rof?9443hN-6bb7sNKg-%*w5Ew7tLg@&hli!;A76(>4qt?j0g9~K-MT2{> zAVlyOwy$PRhFoz-S`F!R%>5{pm zcuFKeV$~_0_k>8EHr5jstSr^DcB+9*XMbvT%TW%js|kgYKsG6fe2WRIJ(M47_E<#` zcW-v|&(1h@tifXxK4qCz9?CA=B zoY4#?Go5BZksU;?dq!3 z%sh3~D7LUQyMtx?GSkk~Jw;aj>02{>qS+b&&zR1>pG&u}`43XL>-qgz{Q3RaHI@D6 z7GGl5F3?yW`%Kc+#{Q(4E4C(YP1!njYwFgtt?64c`~wU8110`}h5ms>{(;5*fl~j# z68}J%e_*M9U|Ih_`C$LnnaBK975!B!jI6q#$jv^OR%B;K9-9@$Dj%Db&5k@VYkJqq zGm7}jGiH?^_IEGs?_PF!cyITV^sobK%iV16edQ9n)=_Tk8rN3N$F(h=A60&Tc9y!h zeO>dKMs-zEN@IQdg2pwWcydznn)YN8mh{hALgr+$c*A||^{aDp|G&b_w>g_8B&7`J zzkkhr&5dj7>r~XLuB&fsUb}`rym|Sfp1_J#YetKBN9XtYE3hIP5mFKwzBKS{-4zGt zh<`x5@WYD7B=KW}PJLN%YLs{op{K)FR4+8#PUYjmnl}pJ24W*a=Pktip@s19DK$4l z$DQx)e5YOH&*P1X^cKqLe6rfmWSNRlE(&%a)ORv(X6e%6%6Wy0@2*@lbJm;%^D7I< z^tG$os@K(*t|g`Gnpe+UQ%4rnx7|}+ThCt@)9`eo<}W;VN5eZ#UiMMtYpMLT!G@0w z;>)lOMpUg_(DiwGBmX?Tse6ft7aacX!RlY)`P#ir;W3&I@<$Ff%^c*yEA>MncOI>o znJpfMwd#kO`c$^|yXInP^Uk2#Je8g)j5*Rf$Hi?`l{aJjYJ*>G^s7z%YV!xZXOt{f zT)mv~IgiU7B2&BMiGAI2to(}@OTyuH3f})>@h&i9uS6bCVJY46Uk${{?sUtF+^*gF z^-nRJHw*c26TI`0JfH11x5k<`;iYe)2Mht+ zZionszyxr!BNku{H5z&MZzvYZ`+WFs&h+y!#L1TYay0=Zx^m;$DP zJdh6xKp~h0rh^$^CMW{4z-%xF%msIYVlWTP2Ma(6SO^w%;A=4`1xr8~SPGVbaBPIrRMU<-H@Yz2=2Kj;FFgMR@}fNh`~YzI$*9Bjs8*!DPv`5!E; zE9Igih#duovAN#@|B3K%@Lym6oB$6X`-5N4FLJ7??N4#if)p2Xn$3&8h#Bz2|tD?ZK})vR>$^;X(&Su&r#8}t_6k`}D`Y!ufV z#FUqYKYiKKqm1GWx|V!(6c^Ezp2@YOse4Yp2oBM5rfphdqt?hFc!UC>M5qvIga#3W z&?15nqYyeo2ttoAAOyr{L?|K*A^RJ{v_^4w6Zeq4Y7!3^<2@RHLBz%&fK7;0Yv6Ys@R^`$oGaPm7?o5Z0V;$c*GL7yi$5{p65X5%(h+D+**VF*l5$DibAEF;I zfT%$a=ka*~aZ$r2eIag9jK6}0R}sA`T!6TUxQycsX#4@1$TabX_UzHdPzV~5pHPjH$ zR^Bs=SX$6>GTJ6XS(@LI9*XA#v@`%O(>@S?kL5oS3;3v&&<@ApEO=mkx&W9w^gu84 zp0Q5-l@;>ZabeR3Y7%Wu!1 z@2m7?WW(9q*ABpv3A_Y+YKJD>%1nTQYI`5uFho&#_d ze%02tOi z^|*hg8a88~1`Io=%O9*Bwn12*!B@i?tnUErkBS(ps*#JOH@_Fd6z$MX|M|UWu{fay z`eyj)d*f&)R0k-jfm%R!boz5~W_=lS!g~)?KCb>t!@+O^XfdxUSOe84&XH`c;TxHR z)o=#$lC@fB4Ny=6Um*qZ+)g-(nabVMBfXs{a&5;_`~;4Hr)FLKfe&;?HdT#Sb47XR#6+;dM*mp!Dxn;3%_O=i7h#Lx6VOUhw6#@A!~hSy?P z{TqWioR&Kpi&ex!4&))5-v(T#!q0HITxB`#l@>S$)q!yZ?vypK0X~^6fPn9fcn~JQ zL`*jkl3(Ed~OiY_QQ_^XuFdX-om|}>@>@vj;v~|WQ zsWMO6#OgAo?Fx5+w1a0m?#0$}G2rzcMi%|Q)*hKT|4&Zxz^62(NIJsfbFfI7hfk(k zCe`Rz!#A<@e49;5mS3gVq>RYQk(Fh)H25tELIDu{P7d0nbaf7T{8tVAyG<(7R;nfZ z)Ox*@G}kUw1Xrr{Fijq+S-)K>=4g1CNBwa>cVCGs=2-EQ*rU8}gQZZFP5KcZ zW%I`^7)kzzana(3af1u={Nd>pLM?UJrL5rfdVdn@^|XI5u8fXzNT1Mw zOL5CT&QsF3KU@CBc&8MqVx}R>zj+QA=ajq(*H&pAQ)b7PY8p#Vnh;}I>B;clmC_Dn zgpLW_mS?XUmC2EaD5gw~e%aYJXi_%XRwW=35lPIpYSOx%MyDYgk%L&soQB+{vut=s z4B@--Iu%`cb9mR4+*!;PId$J~<34X5+vm-n>!hXK^Wunek;}QblnB#^Fr5fLCPFe1 ztVBp5!VDtJB*H8r{DcUpM3_y4G$N!E;awukaS3x1UFM7?*Oj?CI)!9L(*9E!G1NSi z5lj!A$cU$%M>9fMT}Q_D#iYA{bT4srFTG36yC;lcn^z}%T}ktI6(+Hyrovmr#FI%p z3y9~Z#FIrl*~F7WJPU~@mw57sC!cs05zk`cDIlID#Iuxm3W=x4F?R~T{y!p`?XLE6rTe?$ z=WEywQv5?k=&y<&D~P#*m@A3d<}%xFjL?G@zyLkh6tvcApQg&fiXKx{lNiGd(D)|N z!WGb*Ch?@|A>N>hD7Qzt_XI jD93>M3kl$s#QvamJmhJox=P@;`Rrazc90%~{v`?X2)0;p&zqs^d8Jed&HsT(6fNk?^roDu^QOf5Zf_R-@G5hvrX){tOFN|=*oVQ1 z=MJeGabK*<_=6mwJgyc^GoAQnljx1Y)?pfOx@p>en;ex{ERAPw&1E#(lS-C0ng3dz z!?;?bvT=1YqwR%*q}o#H#lDOLEOThpAYCZ^g*~LG<2QV5Ahp^;y(Wu(q0>TsEOdZz z#Svi?FgYn=O5-brF&-i>T)6fP}J$d_* z`LOLW8&kA&#J7=HXixFdJ|s!AFp__x6==3#%Dt9}?Whak#ck?u7$PO8aHX+PD~rG8 zZ?^o6A=|9z)**&XH-okj&$Lb)32SVb?|4#~c@T96;5E1kZ@_mj1S4c#zw$64^$r|| zcVQI7rhX6c`|tsL2q)kqoPkqt8pdE8uEAM22j}4ed<>t!MYsf?!e=lE6CnDS5}TVN za~VE|FW^h~3a(HzA$!@kNQtTu#8Jvj%q64u^&}L;1D*A5rb(khif>e=rr~+IM0vop6t&Mj=~z&pB_Er(&4-g0#A(|v?TwwgFxpvq8(5JSSKq6Tl_R?t9^D@6 zqyV|mw~`2kxmJw2(r6eULiz9dSCt EKMrTQ4*&oF delta 1393 zcmZvce{54#6vy9ry{~J#4c1z)l(pMRi({+Mkyc1I=woXq%x0sbIx^40;vg~V>^1s_(Tur23<-ZgH1QAq@DJmUf3O-CNZ_ElbIn4bWb4ThCZa@y@Dk-v zaqwWOXT!w6_gQg3o2`B(_$H2s6n^P$!H^KBw+nekq(N{wOq-v_e7C@_&2ik>6U2B$ zaw6r#^A+Jz{CY*LWwCb7vQ-5)rqazaV>=^S6$Rkm7O4s4%6nnQFAFyci~bn-)c^Q7 zPsmM6KU398Mc%fLsUUFFdAS<+5El2sl*KPI%Y+7{&{C$p<`Ds^Dj=-w>5X-5h9Kas_vdnTFHWdnm>&S>^q^5+Fr? z5Ma549d?kXAC0OQ_eJq>?@81*SK(BPLrm@Y^9o*U{PzDB;?cT<)PplXYxL|u4nwP! z!!10z=2K{-SPVbj{R-CjeC*Haw^8>A`D(}svfsZNvf^)Rf{#U> z+V%(F^eQ8poWpouNZw3Vfrlff^l|Z>i~Mxc=Ha~5+FqRnfHjArWW&r>u CI$|3D diff --git a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check.cpp b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check.cpp index 3bca60c..ead5032 100644 --- a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check.cpp +++ b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check.cpp @@ -28,6 +28,39 @@ void DebugPrint( System::String ^fmt, ... cli::array ^args ) // ------------------------------------------------------------------ // ROMヘッダ中の値の解釈 // ------------------------------------------------------------------ +System::String^ getRegionString(System::UInt32 region) +{ + if( region == METWL_MASK_REGION_ALL ) + { + return (gcnew System::String("ALL")); + } + + System::String ^str = ""; + if( region & METWL_MASK_REGION_JAPAN ) + { + str += "Japan "; + } + if( region & METWL_MASK_REGION_AMERICA ) + { + str += "America "; + } + if( region & METWL_MASK_REGION_EUROPE ) + { + str += "Europe "; + } + if( region & METWL_MASK_REGION_AUSTRALIA ) + { + str += "Australia "; + } + if( region & METWL_MASK_REGION_KOREA ) + { + str += "Korea "; + } + str = str->TrimEnd( ' ' ); + str = str->Replace( ' ', ',' ); + return str; +} + System::String^ getOgnString(int ogn) { System::String ^str = nullptr; diff --git a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check.h b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check.h index b047fbf..783ef83 100644 --- a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check.h +++ b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check.h @@ -24,6 +24,7 @@ System::Void checkRom( System::String ^orgSrl, System::String ^targetSrl ); System::Void checkSheet( SheetItem ^sItem ); // ROMヘッダの値を解釈 +System::String^ getRegionString(System::UInt32 region); System::String^ getOgnString(int ogn); System::String^ getRatingString( u8 rating ); diff --git a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check_rom.cpp b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check_rom.cpp index bb9bf16..205e5fc 100644 --- a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check_rom.cpp +++ b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check_rom.cpp @@ -52,7 +52,7 @@ System::Void checkRom( System::String ^orgSrl, System::String ^targetSrl ) Console::WriteLine( "--" ); // リージョンの表示 - Console::WriteLine( "{0,-15} {1,-20:X04}", "Region", rh.s.card_region_bitmap ); + Console::WriteLine( "{0,-15} {1,-10:X04} {2}", "Region", rh.s.card_region_bitmap, getRegionString(rh.s.card_region_bitmap) ); Console::WriteLine( "--" ); // レーティングの表示