From d6a4302a6eafd7614e3f865fbd045ec6e867a684 Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Wed, 28 Oct 2009 09:46:09 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E9=A8=93=E7=89=88=E7=94=A8=E3=82=A8?= =?UTF-8?q?=E3=83=A9=E3=83=BC=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=E3=81=9F=E3=81=A0=E3=80=81=E4=B8=80?= =?UTF-8?q?=E8=88=AC=E8=B2=A9=E5=A3=B2=E5=B0=82=E7=94=A8=E3=81=AE=E3=82=A8?= =?UTF-8?q?=E3=83=A9=E3=83=BC=E3=81=AE=E6=B4=97=E3=81=84=E5=87=BA=E3=81=97?= =?UTF-8?q?=E3=81=AF=E3=81=BE=E3=81=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/TwlToolsRED@424 7061adef-622a-194b-ae81-725974e89856 --- .../MasterEditorTWL/MasterEditorTWL.ncb | Bin 13937664 -> 13937664 bytes .../MasterEditorTWL/MasterEditorTWL.suo | Bin 86016 -> 89088 bytes .../MasterEditorTWL/Debug/BuildLog.htm | Bin 12554 -> 12554 bytes .../MasterEditorTWL/MasterEditorTWL/srl.cpp | 28 ++++++--- .../MasterEditorTWL/MasterEditorTWL/srl.h | 4 +- .../MasterEditorTWL/srl_mrc.cpp | 56 +++++++++++++++++- .../MasterEditorTWL/resource/mrc_msg_e.xml | Bin 60852 -> 61018 bytes .../MasterEditorTWL/resource/mrc_msg_j.xml | 28 ++++----- 8 files changed, 91 insertions(+), 25 deletions(-) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index dc771d8131d10e333f1fe4a2340c21c13266d190..d8c4df12548489486e69280068af19453721b74e 100644 GIT binary patch delta 14081 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 delta 40227 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 B5{Cc) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index 5151cb96ade201318e29c09af53ba2d39885a177..8200d919fb5f7c7a21009f1b550bebe09f2acdf4 100644 GIT binary patch delta 2684 zcmbVOe^gX;7Jv86n*m0C%)o$(h|d5aoM0GG5D|uCm9jL7$`nWhN(m7aI?9?1de%Cd zM`7;91N%j!VrXUa9h&M`hq8{wp0?cOXm!{`*M3T39c#;DGkd?|m$U5FAJv`tocH;D z-u>S1efNIfcgESRcfO)OGA!$JBuQF^XXVA_CB&8zN(p&{1U65X31K6*&8}c~4}y-Q z0k%asEh|31-_J^e8Uc3Tz4l6czgLfY9Tt4~*fi9ITnB(9!3As}WQX1WqR^*uPq8~_$rEwDeWL}I#MjPzIrpToRFp?M= zh;%t}86HzIo^6Z@gN4|nwt&XIQ-fs1R#sE)PRIczvihsju4I*!B_5Qq04eM3A&6a~shYeR|8nx9? zP>jWnoG{6dSKm}um(Mc?EVoyQpp)E%n`PL}wk-7PWFuhn;+?qWtyEmKN@4cWH~3}^~u_enXn6w)EKli$p!mM7D6zEQa0k6W{q0Lgl&2$xq_&9!v<0YV*N9ibje zDwb#&^I;=y-1fJQso-GFmNp1XVwToXLr5V#H91NKjOZGp0tMrJ^Gy0^Qhq@A@Shm| zhzjux&g%e8n^cVK8tkF+yYElLw39I`_s^lA4aiW2eQlR8txd(E-9Bx=02j4-1B9Yu zw?f_dUMtT76Z5pk0da_QKXDEwKOogeTck}=np7n<&_|N^Tf--Pjr9d4J%3+J zw2MA>cRPYGsc$6~*eBtV-W5Hx*E8&K_~zpUuD&Ggn_O_C?a^@NIFx08RN4cI7=MZ_)&Z6@(J>L*oEnn_pgH-nHMw3G>2 zs?gGfHeHgi^`=7R{CF6^gXP0j`5APJzS11wq7onDG07GPjq`lsJPn7?GKoj)&^Nrj zh4)|@orrwaEJ7il+Z|$P7~)Tek3%W;xKU&UC#(DgZKsFJnlEwG?r1S2c~@5 zXbc>8V}nY2^^`k1$)Ss|m+&~@3Br?vrwKiTZbB}BAAI9S;eHw)AoLOr5}qUU5e^X! z6MQdKE(7=XCv+k2(umKLuzh+uBqLl&4lz+Wyizk*#+CQ=(KE^AV;b@T2UA4@?)}lQ zE<)=z!MEP+5fBevml<58-D`zW z_|*yhcQIZM=Pw2H=K+9LkO_}zQ>}2vn+{s%5!zMudA delta 2891 zcmZ{m3s6+o8OQH;xy$at3cH&Xi6A0ioGRh5ASfDLABk2RA853rNRUUQsSm&<1tPLO zhNwwY_A}lX(}-)LjoMD-n$S8nH6dP18`tN2+b9S|>@3HPHWu*BLTn&g^f$ z|NWoup2xlCoZY~$ErAxxuewxAzM?48_<}mal?*ipECdt5Tw{D#77Z$%+F21=+(BWm z0!E$osjB^%6vbF*^%L)IpTI@-BreQK;b?odmYG&fJl{6iIAz~t;dU*P{n7JydfdcT zXEzO7i#E0aY3idR+3xGT*ZK%;y@=~y@VBlRmMEx5c3mAq%r)*g{Vjayo*PaPs2C&_ z2mB8VqH$c4*htOBSBX|tyG0*vZcQFXTAdMcarXj`F)!t~%9j^7d0vXcNF3E2!Arg6 z{Gx9upYjHHvNz6JzB;YCd~Gc^_!5jjR)(rI$drzcbwu!9pHKf!8l~z_%p_ZItAl+$ zAAjx}$#cDt{K4L_e68Kh`wm&vvX!kvvOOII6}1E3g4Ohyanm0iu938;$4$F5m_a01p@pV!#j(3mybR zK_=jp>wYxW3y}q~!6P6CbVil+cYfY~P@oDf=Pz&lnJ$MGJ0}Wuks@Rl9h=8i- z%@5OBu3rDgM@He5;JGSUW~@WZHnq=;n-Ql1Df58jOPOypG%{&&X?QmDgzL_D8ckk~ zuDWina}T?#uwKr_8hP6t^3qR)uvRw~ySaO-o3{rOv7UNm9rbWeLcHoy^tV+i;?Ry8 z`p5Ycq5mzNoW^mEC%tnt^+=;pRzEV&=JG4}8&ixp3a0wG>&^Zd4aFf9&u5FTW8_2mX4@_9-4N{6a@EN`>7%LjR3J<(`!S!IoXykhaeTIY zt=9YPh)u@Kci&gJX|j_OGaN?h=?@+BnDNag&srKI(a+;RUYQOS0V$1!?*b_ofHeQG!o6J^ z8$}AUKpL2BUQ3gk@g<9`2~l!nJ#CN*l&z+R4W&E>?L>UR^yGJCJ2XDZZqt*z{m_zk z!1N&XcQR-d*PkCsSkVPv;TVnOUFVyyRnFVJ zrhUdtmDl_y)BB6*$#eJ&ItKA`(~F1hf|hPBnqD0ACDXeyz`F`9<=>{41byA57=4%O zBGsoYM*Z~;?Qz)`I@kqdKggQ@8F&fo0WSmD8?S)^v97Jz-B$Q1JEdML}22W2m>`R#`dAfZfz?Gd>D$Ftn5;#Qv@oJ@W^&7z@>-zqg1c9LykX z_beJ2<&SBZ=#P=6lzf|$M`)h559U#j^w07saKGATW>bWEzluY1sE72^1r&3?S~QwN zte&ss?pj+LrO^CHy>1kx@$%wj`mzEFxV}3Q{Ml%`RzPk#IEhq!e+KQ)cPykrea)Qj zZGQ`K@o&TLO>s#|t#(7jPVWCf@1G#%xMjk3yO9a&ix<-y`tme7+5ZF8)-j!O!t|+Q lXlL6_A615N^N{mWarn~?E diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index ddc1c8190dee20ece1a484ca5577726d316a8b71..7d90343c2df270737a97e06ef9b3fc5584e2aff3 100644 GIT binary patch delta 225 zcmeB5>Pp&R#wKXQV8LL-V8&p;U;?Bq7z`#$3z%-MW825Z9?y`=P{feD*_zjr5mVjf z>3oGCVM|o)o23ON3Skl6uLM@@h^iWBnepZ_6&og?4m7FFN7caAI-%;=tf=u4WG%X| Otd=bk+{KYP8(9GT;3zo& delta 229 zcmeB5>Pp&R#wKjWV98(vgysxpK+*z;O(r|47;mm(JHWQtiPwV>tBQka(wn#Og@Gg; zv1$(xh!eslxp}`*AxM`Kx~|QRD)~%UB@U{2f^;}z=#bWUiCsce%a&<#l+Feg02b>h A1ONa4 diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp index de55dc8..2d3e5cb 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp @@ -1031,16 +1031,8 @@ void RCSrl::calcNandUsedSize(FILE *fp) // ------------------------------------------------------------------- // MRCメッセージを取得 // ------------------------------------------------------------------- -RCMrcError^ RCSrl::makeMrcError( System::String ^tag, ... cli::array ^args ) -{ - // パラメータも取得(パラメータは英語版にも日本語版にも登録されておりどちらでもよいが日本語版のものにしておく) - System::UInt32 beg = System::UInt32::Parse( this->hMrcMsg->getMessage( tag+"/begin", "J" ), System::Globalization::NumberStyles::HexNumber ); - System::UInt32 end = System::UInt32::Parse( this->hMrcMsg->getMessage( tag+"/end", "J" ), System::Globalization::NumberStyles::HexNumber ); - System::Boolean isEnableModify = System::Boolean::Parse( this->hMrcMsg->getMessage( tag+"/modify", "J" ) ); - System::Boolean isAffectRom = System::Boolean::Parse( this->hMrcMsg->getMessage( tag+"/affect", "J" ) ); - return (this->makeMrcError( beg, end, isEnableModify, isAffectRom, RCMrcError::PurposeType::Common, tag, args )); // 共通エラー -} +// 開始と終了アドレスがROMによって異なる/存在しないエラー RCMrcError^ RCSrl::makeMrcError( System::UInt32 beg, System::UInt32 end, System::Boolean isEnableModify, System::Boolean isAffectRom, RCMrcError::PurposeType purpose, System::String ^tag, ... cli::array ^args ) @@ -1056,3 +1048,21 @@ RCMrcError^ RCSrl::makeMrcError( System::UInt32 beg, System::UInt32 end, System: return (gcnew RCMrcError( nameJ, beg, end, msgJ, nameE, msgE, isEnableModify, isAffectRom, purpose )); } + +// 開始と終了アドレスに設定ファイルに書かれているものを採用するエラー (用途が限定されるとき用) +RCMrcError^ RCSrl::makeMrcError( RCMrcError::PurposeType purpose, System::String ^tag, ... cli::array ^args ) +{ + // パラメータも取得(パラメータは英語版にも日本語版にも登録されておりどちらでもよいが日本語版のものにしておく) + System::UInt32 beg = System::UInt32::Parse( this->hMrcMsg->getMessage( tag+"/begin", "J" ), System::Globalization::NumberStyles::HexNumber ); + System::UInt32 end = System::UInt32::Parse( this->hMrcMsg->getMessage( tag+"/end", "J" ), System::Globalization::NumberStyles::HexNumber ); + System::Boolean isEnableModify = System::Boolean::Parse( this->hMrcMsg->getMessage( tag+"/modify", "J" ) ); + System::Boolean isAffectRom = System::Boolean::Parse( this->hMrcMsg->getMessage( tag+"/affect", "J" ) ); + + return (this->makeMrcError( beg, end, isEnableModify, isAffectRom, purpose, tag, args )); +} + +// 用途にかかわらず共通のエラー +RCMrcError^ RCSrl::makeMrcError( System::String ^tag, ... cli::array ^args ) +{ + return (this->makeMrcError( RCMrcError::PurposeType::Common, tag, args )); // 共通エラー +} diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h index 60f2690..6909dad 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h @@ -187,12 +187,14 @@ namespace MasterEditorTWL void mrcShared2( FILE *fp ); void mrcSDKVersion( FILE *fp ); void mrcChinaKorea(void); + void mrcTrialApp( FILE *fp ); // 体験版アプリ用の追加チェック // MRCメッセージを追加 - RCMrcError^ makeMrcError( System::String ^tag, ... cli::array ^args ); RCMrcError^ makeMrcError( System::UInt32 beg, System::UInt32 end, System::Boolean isEnableModify, System::Boolean isAffectRom, RCMrcError::PurposeType purpose, System::String ^tag, ... cli::array ^args ); + RCMrcError^ makeMrcError( RCMrcError::PurposeType purpose, System::String ^tag, ... cli::array ^args ); + RCMrcError^ makeMrcError( System::String ^tag, ... cli::array ^args ); }; // end of ref class RCSrl diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp index f33d12a..7b57453 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp @@ -484,6 +484,9 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp ) // 追加チェック this->mrcSDKVersion(fp); + // 体験版用追加チェック + this->mrcTrialApp(fp); + return ECSrlResult::NOERROR; } // mrcTWL() @@ -1232,4 +1235,55 @@ void RCSrl::mrcChinaKorea(void) this->hErrorList->Add( this->makeMrcError("KoreaFlagAsserted") ); } } -} \ No newline at end of file +} + +// ------------------------------------------------------------------- +// 体験版用の追加チェック +// ------------------------------------------------------------------- +void RCSrl::mrcTrialApp(FILE *fp) +{ + // ROM読み出し時には用途はわからないのですべてのチェックをしておき + // 表示するときに振り分けをする + + // Touch!Try!DS + if( this->IsTmpJump ) + { + this->hErrorList->Add( this->makeMrcError(RCMrcError::PurposeType::DSStation, "DSStationTmpJump") ); + } + fseek( fp, 0, SEEK_END ); + u32 filesize = ftell(fp); // 実ファイルサイズ + if( filesize > (96 * 1024 * 1024) ) + { + this->hErrorList->Add( this->makeMrcError(RCMrcError::PurposeType::DSStation, "DSStationRomSize") ); + } + bool use_nis = false; + for each( RCLicense ^lic in this->hLicenseList ) + { + if( lic->Publisher->Equals( "NINTENDO" ) && lic->Name->Equals( "NIS_FOR_TWLSDK" ) ) + { + use_nis = true; + } + } + if( !use_nis ) + { + this->hErrorList->Add( this->makeMrcError(RCMrcError::PurposeType::DSStation, "DSStationLib") ); + } + + // Nintendo Zone + if( !this->IsTmpJump ) + { + this->hErrorList->Add( this->makeMrcError(RCMrcError::PurposeType::Zone, "ZoneTmpJump") ); + } + if( filesize > (5 * 1024 * 1024 / 2) ) + { + this->hErrorList->Add( this->makeMrcError(RCMrcError::PurposeType::Zone, "ZoneRomSize") ); + } + if( this->pRomHeader->s.platform_code == PLATFORM_CODE_TWL_HYBLID ) + { + this->hErrorList->Add( this->makeMrcError(RCMrcError::PurposeType::Zone, "ZoneHybrid") ); + } + if( this->pRomHeader->s.platform_code == PLATFORM_CODE_TWL_LIMITED ) + { + this->hWarnList->Add( this->makeMrcError(RCMrcError::PurposeType::Zone, "ZoneLimited") ); + } +} //mrcTrialApp() \ No newline at end of file diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml index 57af68af7b980763ddac94981fd9dd15c4c8d7a6..ffa9b719bfc56d4529423d83d93b861467dfe589 100644 GIT binary patch delta 513 zcmdmToB7rq<_-4Ts?H3q41NqD3_(CzfkA`8g&`P72Q!o~Bm!|JLq0P7IYmN2W4>Y~9DJO|-4n zll>=hO}6HDFobxQXumNiOggi3@@yWV$(aIGlY0eZCNoQTf#}Wkf{PfT0v3}Sg)_kH zrzT>X)kU}v5+G}xorNa97kv~A3hfYv3}6_8g0mbL-bKK$&IICgAU_2d@*s~X0Qvbq zPbz?A(tzwDhFl=807&OEBr)UwRpo-!=4OkODHCF;Tu%%A|oB@Br`oXL>SkjGHG`2lx0BUFjq zCpX9#Zq64FW1Jk%&o=qGm=G_D`IF}f`cA$mCV_72W)`8PxV2bM{wtgT(#DNs*yIPP z(wnD?aN*G==md0NGSK^_48=f}0z=8zE*SPD?I3`iFNRX~DB2PguR co6INnbh2~OuF0}e9Fv13JV^A9l%&H|0DTK=0RR91 diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml index ed42e84..533224f 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml @@ -31,45 +31,45 @@ - DS Station蟇セ蠢 - DS Station逕ィROM縺ァ縺ッtmp繧ク繝」繝ウ繝励ッ險ア蜿ッ縺輔l縺ヲ縺縺セ縺帙s縲 + Touch!Try!DS蟇セ蠢 + Touch!Try!DS逕ィ繧「繝励Μ縺ァ縺ッtmp繧ク繝」繝ウ繝励ッ險ア蜿ッ縺輔l縺ヲ縺縺セ縺帙s縲 1d1dFalseTrue - DS Station蟇セ蠢 - DS Station逕ィROM縺ョ繝輔ぃ繧、繝ォ繧オ繧、繧コ縺ッ768Mbit莉・荳九〒縺ェ縺代l縺ー縺ェ繧翫∪縺帙s縲 + Touch!Try!DS蟇セ蠢 + Touch!Try!DS逕ィ繧「繝励Μ縺ョ繝輔ぃ繧、繝ォ繧オ繧、繧コ縺ッ768Mbit(96MByte)莉・荳九〒縺ェ縺代l縺ー縺ェ繧翫∪縺帙s縲 00FalseTrue - DS Station蟇セ蠢 - 蠎鈴ュ隧ヲ驕雁床逕ィ繝ゥ繧、繝悶Λ繝ェ縺御スソ逕ィ縺輔l縺ヲ縺縺セ縺帙s縲 + Touch!Try!DS蟇セ蠢 + Touch!Try!DS繝ゥ繧、繝悶Λ繝ェ(NIS_FOR_TWLSDK)縺御スソ逕ィ縺輔l縺ヲ縺縺セ縺帙s縲 00FalseTrue - 繝繧ヲ繝ウ繝ュ繝シ繝峨し繝シ繝薙せ蟇セ蠢 - 繝繧ヲ繝ウ繝ュ繝シ繝峨し繝シ繝薙せ逕ィ縺ョROM縺ァ縺ッ縲》mp繧ク繝」繝ウ繝励r險ア蜿ッ縺吶k蠢隕√′縺ゅj縺セ縺吶3SF繝輔ぃ繧、繝ォ縺ョPermitLandingTmpJump繝励Ο繝代ユ繧」繧定ィュ螳壹@縺ヲ縺上□縺輔>縲 + Nintendo Zone蟇セ蠢 + Nintendo Zone逕ィ縺ョROM縺ァ縺ッ縲》mp繧ク繝」繝ウ繝励r險ア蜿ッ縺吶k蠢隕√′縺ゅj縺セ縺吶3SF繝輔ぃ繧、繝ォ縺ョPermitLandingTmpJump繝励Ο繝代ユ繧」繧定ィュ螳壹@縺ヲ縺上□縺輔>縲 1d1dFalseTrue - 繝繧ヲ繝ウ繝ュ繝シ繝峨し繝シ繝薙せ蟇セ蠢 - 繝繧ヲ繝ウ繝ュ繝シ繝峨し繝シ繝薙せ逕ィ繧「繝励Μ繧辿YBRID迚医→縺励※菴懈舌☆繧九%縺ィ縺ッ險ア蜿ッ縺輔l縺ヲ縺縺セ縺帙s縲 + Nintendo Zone蟇セ蠢 + Nintendo Zone逕ィ繧「繝励Μ繧辿YBRID迚医→縺励※菴懈舌☆繧九%縺ィ縺ッ險ア蜿ッ縺輔l縺ヲ縺縺セ縺帙s縲 1212FalseTrue - 繝繧ヲ繝ウ繝ュ繝シ繝峨し繝シ繝薙せ蟇セ蠢 - 縺薙ョ繧ス繝輔ヨ縺ッLIMITED迚医〒縺吶ョ縺ァ縲¨intendoZone縺ョ縺ソ縺ァ驟堺ソ。蜿ッ閭ス縺ァ縺吶ゅ∩繧薙↑縺ョ繝九Φ繝繝ウ繝峨シ繝√Ε繝ウ繝阪Ν繧ДS繝繧ヲ繝ウ繝ュ繝シ繝峨励Ξ繧、縺ョ縺励¥縺ソ繧剃スソ逕ィ縺励※驟堺ソ。縺吶k縺薙→縺ッ縺ァ縺阪∪縺帙s縲 + Nintendo Zone蟇セ蠢 + 縺薙ョ繧ス繝輔ヨ縺ッNintendo Zone縺ョ縺ソ縺ァ驟堺ソ。蜿ッ閭ス縺ァ縺吶ゅ∩繧薙↑縺ョ繝九Φ繝繝ウ繝峨シ繝√Ε繝ウ繝阪Ν繧ДS繝繧ヲ繝ウ繝ュ繝シ繝峨励Ξ繧、縺ョ縺励¥縺ソ繧剃スソ逕ィ縺励※驟堺ソ。縺吶k縺薙→縺ッ縺ァ縺阪∪縺帙s縺ョ縺ァ縺疲ウィ諢上¥縺縺輔>縲(譛ャ隴ヲ蜻翫ッROM縺ョ蝠城。後r謖鞫倥@縺ヲ縺繧九o縺代〒縺ッ縺ゅj縺セ縺帙s縺ョ縺ァ縲∵悽隴ヲ蜻翫r辟。隕悶@縺ヲ縺縺溘□縺縺ヲ邨先ァ九〒縺吶) 1212FalseTrue - 繝繧ヲ繝ウ繝ュ繝シ繝峨し繝シ繝薙せ蟇セ蠢 - 繝繧ヲ繝ウ繝ュ繝シ繝峨し繝シ繝薙せ逕ィ縺ョROM繧オ繧、繧コ縺ッ2.5MByte莉・荳九〒縺ェ縺代l縺ー縺ェ繧翫∪縺帙s縲 + Nintendo Zone蟇セ蠢 + Nintendo Zone逕ィ縺ョ繝輔ぃ繧、繝ォ繧オ繧、繧コ縺ッ2.5MByte莉・荳九〒縺ェ縺代l縺ー縺ェ繧翫∪縺帙s縲 00FalseTrue