From dd38faf491d6fb31d8fcf49cb8d4b36dbb6cccaf Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Mon, 19 Jan 2009 03:09:19 +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:NAND=E4=BD=BF=E7=94=A8=E3=82=B5=E3=82=A4?= =?UTF-8?q?=E3=82=BA=E3=81=AEGUI=E4=BD=9C=E6=88=90=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@115 7061adef-622a-194b-ae81-725974e89856 --- .../MasterEditorTWL/MasterEditorTWL.ncb | Bin 11398144 -> 11406336 bytes .../MasterEditorTWL/MasterEditorTWL.suo | Bin 65024 -> 66560 bytes .../MasterEditorTWL/Debug/BuildLog.htm | Bin 12036 -> 15956 bytes .../MasterEditorTWL/MasterEditorTWL/Form1.h | 441 +- .../MasterEditorTWL/Form1.ja.resx | 225 +- .../MasterEditorTWL/Form1.resX | 3707 +++++++++++++---- .../MasterEditorTWL/Form_constructor.cpp | 5 +- .../MasterEditorTWL/Form_lang.cpp | 14 + .../MasterEditorTWL/Form_srl.cpp | 20 +- .../MasterEditorTWL/MasterEditorTWL/srl.h | 29 +- 10 files changed, 3584 insertions(+), 857 deletions(-) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 393c9f32e0ef24ad0b8c15155a7a73b1bf04fe32..32ce246b248b93ddc505eae5e63ab2d532ac86f7 100644 GIT binary patch delta 49681 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 diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index ca155ba68f3b73748f4b5d189bb3ac1fad97d5c6..c2758fbd59fa8e054c798af83b6de432a2d957c8 100644 GIT binary patch delta 5403 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 delta 2879 zcmZ{m3s98T7018x?YE0OTwz^Nbd?oWiPi@gHK?l)p(2SXkD|%cC5SNWnPxJb3GStNN;GIPqv>?Cp^4hWN@H7Qs`!W+waE5=mP>0V^v?YD zocq7`+}C#>+qA`M>an%_+Dxl83}X_Q2y(zIFcmE1HZzk7xYL|NQ+Tv(6qWESTb8F1 zWmRA)=#56Bi(#Jzs{lV|^H?JC0h`C038fCK1tJDve+1Tp4S>(uJV~?Rpe&Zc)*9!< z zS>kihejXR7?fX2h1U&vJh?)wrK@OM(a=~;^4rT&bVL$9FAoHIC76HB%$hSWMrRyCRHJwes_lifB-?E9j%JGi51x|+Fjq^T-)k0dVVz2V?fyH+H7 zUc(p;fY-r6&<3O-NxV7e<#z+_U3GryJzSkgk)JIwx${~H|KV=JzPE@ndDpY)lA-hJ z$Q_F!4TUu55j_-sdTIt|TMiX$>=qhdJU!fDIi|zZ!j5-|H(o!cja!$ZyQo8iw_eYZKc+V*)5aZzXLKxIeIK1zE&q6_N6 zkqnBozd|czq;kHoagDjKGSmq`&c4iOp4PJA=V@)e*5r{W(Aom6NqfccrM*(Ep*xw_;GpB}z8gvPa(TE?}2b;7ehjSZz*>*2Ip#1~B zbpKDSiEl$?StSb=vXKm)7YAv$*3#hXgJGmW!*{ktv0~L#sVe`|V`lin{oKBMet4@( zbsurj+-lU9CWPfc#wJg$0c$71I0Z47uSG#sB>UleQla4|9fT( z!{kr?=1(yOdh=9P^QFpzW(^mlw7zI5EFH9u?@kl4#wll{=G zwd-0N4SPdtx3o42_OC$Fx3Yu!JGlcvI*9_&q#_=GSSM+)qGf=X12al%qI>Wov6)&k z;ZK4eyTc#Qd=t;uOhh$;X53xI4bfAp_nZh6*0 zhg9i}5kznDs&Dpj-Mz+`XsS)Oe@Wr)0(k-*Bhi+Rxa{g<>O{An`0$Ox^4~yxaOe9r SMbAZvqTG4UjVte6p;`B diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 4d0d9c9417a606189c4159b2086e99a888812077..fe0e76217f82115fc4af48735afa448ea2c7a077 100644 GIT binary patch delta 1381 zcmcIkOH30{6um84Q(>S;OWSE}r_)9Wk@iwd`51^`LnKBZaREj{1K8pRZGn=oAa-L+ zFeVCjk1=tn(Ks;?qiN#8=)xUtO=Jfqx^Sb$g?Fa(H%#2Q=*!GI=iYnHd#7`2VsrUf z%+eTxE;tS`KyUsfuNeqK ziCKXyFlV+BbC>HfT#>CtY2M>1(e!X(^)naWPIC06LE;HKaTcTHAtN5$rHU;6Eq zl|Et6WZ*p?^3e180otswot8jm`AJyd!ATw;=5>jG5=3B;caw0A4`Gox)BHTj60>kw zL#KIPJ(PlwwT5pcdF|Y#&~u!-9|M^l$Zgc+@|k5|p1*iJD(@+}p&_-=DIME$WZP)l+0tpIEwit7H^Hha zTJ<^-TAnqJ#Y@p;U58a=U5DwiuFaV9xQ`mm&}CiYei0ppTwT^R?uh8Lmip2!cQ96Z z0|o!!2V6t{qHU^eILz@1Yf3-kM@C+v1UvYKpEj67*y?MFLX^J?-JI$YK!L#bT=7V% z^DMy`T)`)Ia`^gQ4sYUlG@}}lVyy(9@F70JuiXA;>MXMeXE3fY3t}XmboavT;W6GD z!^CcVl)p>=)}a5d{4XUt_yeD^vJ}SYT5E$?cJ>0_;Wm4F&)zPM*rt?J>-xUG{V_Tc delta 266 zcmcao(-ODAj7`{x!G*zy!JNUA!HmHW2u&CaChrzC-CV=AgN?PAp@<=8av-nx<_r8r zj9ArnYD-Vn6Li|VPg?|}z!lxF&AUar1+Yqls}+KDxS{I+T5r5rOxK19o8;zBZEMEK t^9=ZejTsEkb#C5k@RAX$#C9WdCO)ul81xvD847@Ka-F5z=2MnkEC8NmG-Ch& diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h index 2035958..f296a80 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -616,6 +616,61 @@ private: System::Windows::Forms::Label^ labConnectIcon; private: System::Windows::Forms::TextBox^ tboxConnectIcon; private: System::Windows::Forms::Label^ labIsGameCardOn2; private: System::Windows::Forms::CheckBox^ cboxIsUnnecessaryRating; +private: System::Windows::Forms::TabPage^ tabNandSizeInfo; + +private: System::Windows::Forms::Label^ labSumSize2; + + + +private: System::Windows::Forms::Label^ labSrlSize; +private: System::Windows::Forms::Label^ labSubBannerSize; +private: System::Windows::Forms::Label^ labTmdSize; +private: System::Windows::Forms::Label^ labNandSize; + + +private: System::Windows::Forms::Label^ labNandSizeFS; +private: System::Windows::Forms::Label^ labSumSize; +private: System::Windows::Forms::Label^ labShopBlock; +private: System::Windows::Forms::Label^ labShopBlock2; +private: System::Windows::Forms::GroupBox^ gboxNandSize; +private: System::Windows::Forms::TextBox^ tboxShopBlock; + +private: System::Windows::Forms::TextBox^ tboxSumSize; + +private: System::Windows::Forms::TextBox^ tboxTmdSizeFS; + +private: System::Windows::Forms::TextBox^ tboxSubBannerSizeFS; + +private: System::Windows::Forms::TextBox^ tboxPrivateSizeFS; + +private: System::Windows::Forms::TextBox^ tboxPublicSizeFS; + +private: System::Windows::Forms::TextBox^ tboxSrlSizeFS; + +private: System::Windows::Forms::TextBox^ tboxTmdSize; + +private: System::Windows::Forms::TextBox^ tboxSubBannerSize; + + + +private: System::Windows::Forms::Label^ labShopBlockUnit; +private: System::Windows::Forms::Label^ labArrow5; + +private: System::Windows::Forms::Label^ labArrow4; + +private: System::Windows::Forms::Label^ labArrow3; + + + +private: System::Windows::Forms::Label^ labArrow2; + +private: System::Windows::Forms::Label^ labArrow1; +private: System::Windows::Forms::TextBox^ tboxGuideNandSizeInfo; + + +private: System::Windows::Forms::TextBox^ tboxSrlSize; + + @@ -750,10 +805,10 @@ private: System::Windows::Forms::CheckBox^ cboxIsUnnecessaryRating; void InitializeComponent(void) { System::ComponentModel::ComponentResourceManager^ resources = (gcnew System::ComponentModel::ComponentResourceManager(Form1::typeid)); - System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle1 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); - System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle2 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); - System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle3 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); - System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle4 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle13 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle14 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle15 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); + System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle16 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); this->tboxFile = (gcnew System::Windows::Forms::TextBox()); this->gboxSrl = (gcnew System::Windows::Forms::GroupBox()); this->tboxRemasterVer = (gcnew System::Windows::Forms::TextBox()); @@ -894,17 +949,17 @@ private: System::Windows::Forms::CheckBox^ cboxIsUnnecessaryRating; this->gboxTWLExInfo = (gcnew System::Windows::Forms::GroupBox()); this->labByte1 = (gcnew System::Windows::Forms::Label()); this->labHex4 = (gcnew System::Windows::Forms::Label()); + this->labHex3 = (gcnew System::Windows::Forms::Label()); this->tboxIsCodec = (gcnew System::Windows::Forms::TextBox()); this->labIsCodec = (gcnew System::Windows::Forms::Label()); - this->tboxPrivateSize = (gcnew System::Windows::Forms::TextBox()); - this->labPrivateSize = (gcnew System::Windows::Forms::Label()); this->labKeyTableRomOffset = (gcnew System::Windows::Forms::Label()); - this->labPublicSize = (gcnew System::Windows::Forms::Label()); - this->tboxPublicSize = (gcnew System::Windows::Forms::TextBox()); this->tboxKeyTableRomOffset = (gcnew System::Windows::Forms::TextBox()); - this->labHex3 = (gcnew System::Windows::Forms::Label()); this->labNormalRomOffset = (gcnew System::Windows::Forms::Label()); this->tboxNormalRomOffset = (gcnew System::Windows::Forms::TextBox()); + this->tboxPrivateSize = (gcnew System::Windows::Forms::TextBox()); + this->labPrivateSize = (gcnew System::Windows::Forms::Label()); + this->labPublicSize = (gcnew System::Windows::Forms::Label()); + this->tboxPublicSize = (gcnew System::Windows::Forms::TextBox()); this->cboxIsSubBanner = (gcnew System::Windows::Forms::CheckBox()); this->cboxIsNormalJump = (gcnew System::Windows::Forms::CheckBox()); this->cboxIsTmpJump = (gcnew System::Windows::Forms::CheckBox()); @@ -918,9 +973,7 @@ private: System::Windows::Forms::CheckBox^ cboxIsUnnecessaryRating; this->cboxIsSD = (gcnew System::Windows::Forms::CheckBox()); this->gboxTitleID = (gcnew System::Windows::Forms::GroupBox()); this->labAppType = (gcnew System::Windows::Forms::Label()); - this->labMedia = (gcnew System::Windows::Forms::Label()); this->tboxAppType = (gcnew System::Windows::Forms::TextBox()); - this->tboxMedia = (gcnew System::Windows::Forms::TextBox()); this->labHex2 = (gcnew System::Windows::Forms::Label()); this->tboxTitleIDLo = (gcnew System::Windows::Forms::TextBox()); this->labTitleIDLo = (gcnew System::Windows::Forms::Label()); @@ -928,6 +981,8 @@ private: System::Windows::Forms::CheckBox^ cboxIsUnnecessaryRating; this->tboxTitleIDHi = (gcnew System::Windows::Forms::TextBox()); this->tboxAppTypeOther = (gcnew System::Windows::Forms::TextBox()); this->labAppTypeOther = (gcnew System::Windows::Forms::Label()); + this->labMedia = (gcnew System::Windows::Forms::Label()); + this->tboxMedia = (gcnew System::Windows::Forms::TextBox()); this->labCaptionEx = (gcnew System::Windows::Forms::Label()); this->tboxCaptionEx = (gcnew System::Windows::Forms::TextBox()); this->gboxProd = (gcnew System::Windows::Forms::GroupBox()); @@ -958,6 +1013,34 @@ private: System::Windows::Forms::CheckBox^ cboxIsUnnecessaryRating; this->tboxConnectIcon = (gcnew System::Windows::Forms::TextBox()); this->tboxGuideTWLInfo = (gcnew System::Windows::Forms::TextBox()); this->gboxExFlags = (gcnew System::Windows::Forms::GroupBox()); + this->tabNandSizeInfo = (gcnew System::Windows::Forms::TabPage()); + this->tboxGuideNandSizeInfo = (gcnew System::Windows::Forms::TextBox()); + this->gboxNandSize = (gcnew System::Windows::Forms::GroupBox()); + this->tboxSrlSize = (gcnew System::Windows::Forms::TextBox()); + this->labShopBlockUnit = (gcnew System::Windows::Forms::Label()); + this->labArrow5 = (gcnew System::Windows::Forms::Label()); + this->labArrow4 = (gcnew System::Windows::Forms::Label()); + this->labArrow3 = (gcnew System::Windows::Forms::Label()); + this->labArrow2 = (gcnew System::Windows::Forms::Label()); + this->labArrow1 = (gcnew System::Windows::Forms::Label()); + this->tboxShopBlock = (gcnew System::Windows::Forms::TextBox()); + this->tboxSumSize = (gcnew System::Windows::Forms::TextBox()); + this->tboxTmdSizeFS = (gcnew System::Windows::Forms::TextBox()); + this->tboxSubBannerSizeFS = (gcnew System::Windows::Forms::TextBox()); + this->tboxPrivateSizeFS = (gcnew System::Windows::Forms::TextBox()); + this->tboxPublicSizeFS = (gcnew System::Windows::Forms::TextBox()); + this->tboxSrlSizeFS = (gcnew System::Windows::Forms::TextBox()); + this->tboxTmdSize = (gcnew System::Windows::Forms::TextBox()); + this->tboxSubBannerSize = (gcnew System::Windows::Forms::TextBox()); + this->labNandSize = (gcnew System::Windows::Forms::Label()); + this->labShopBlock2 = (gcnew System::Windows::Forms::Label()); + this->labNandSizeFS = (gcnew System::Windows::Forms::Label()); + this->labShopBlock = (gcnew System::Windows::Forms::Label()); + this->labSrlSize = (gcnew System::Windows::Forms::Label()); + this->labSumSize2 = (gcnew System::Windows::Forms::Label()); + this->labSumSize = (gcnew System::Windows::Forms::Label()); + this->labSubBannerSize = (gcnew System::Windows::Forms::Label()); + this->labTmdSize = (gcnew System::Windows::Forms::Label()); this->tabRomEditInfo = (gcnew System::Windows::Forms::TabPage()); this->gboxOtherSpec = (gcnew System::Windows::Forms::GroupBox()); this->cboxIsUGC = (gcnew System::Windows::Forms::CheckBox()); @@ -1012,6 +1095,8 @@ private: System::Windows::Forms::CheckBox^ cboxIsUnnecessaryRating; this->tabTWLInfo->SuspendLayout(); this->gboxLaunch->SuspendLayout(); this->gboxExFlags->SuspendLayout(); + this->tabNandSizeInfo->SuspendLayout(); + this->gboxNandSize->SuspendLayout(); this->tabRomEditInfo->SuspendLayout(); this->gboxOtherSpec->SuspendLayout(); this->gboxParental->SuspendLayout(); @@ -1888,14 +1973,13 @@ private: System::Windows::Forms::CheckBox^ cboxIsUnnecessaryRating; // this->gboxTWLExInfo->Controls->Add(this->labByte1); this->gboxTWLExInfo->Controls->Add(this->labHex4); + this->gboxTWLExInfo->Controls->Add(this->labHex3); this->gboxTWLExInfo->Controls->Add(this->tboxIsCodec); this->gboxTWLExInfo->Controls->Add(this->labIsCodec); - this->gboxTWLExInfo->Controls->Add(this->tboxPrivateSize); - this->gboxTWLExInfo->Controls->Add(this->labPrivateSize); this->gboxTWLExInfo->Controls->Add(this->labKeyTableRomOffset); - this->gboxTWLExInfo->Controls->Add(this->labPublicSize); - this->gboxTWLExInfo->Controls->Add(this->tboxPublicSize); this->gboxTWLExInfo->Controls->Add(this->tboxKeyTableRomOffset); + this->gboxTWLExInfo->Controls->Add(this->labNormalRomOffset); + this->gboxTWLExInfo->Controls->Add(this->tboxNormalRomOffset); resources->ApplyResources(this->gboxTWLExInfo, L"gboxTWLExInfo"); this->gboxTWLExInfo->Name = L"gboxTWLExInfo"; this->gboxTWLExInfo->TabStop = false; @@ -1910,6 +1994,11 @@ private: System::Windows::Forms::CheckBox^ cboxIsUnnecessaryRating; resources->ApplyResources(this->labHex4, L"labHex4"); this->labHex4->Name = L"labHex4"; // + // labHex3 + // + resources->ApplyResources(this->labHex3, L"labHex3"); + this->labHex3->Name = L"labHex3"; + // // tboxIsCodec // resources->ApplyResources(this->tboxIsCodec, L"tboxIsCodec"); @@ -1921,6 +2010,28 @@ private: System::Windows::Forms::CheckBox^ cboxIsUnnecessaryRating; resources->ApplyResources(this->labIsCodec, L"labIsCodec"); this->labIsCodec->Name = L"labIsCodec"; // + // labKeyTableRomOffset + // + resources->ApplyResources(this->labKeyTableRomOffset, L"labKeyTableRomOffset"); + this->labKeyTableRomOffset->Name = L"labKeyTableRomOffset"; + // + // tboxKeyTableRomOffset + // + resources->ApplyResources(this->tboxKeyTableRomOffset, L"tboxKeyTableRomOffset"); + this->tboxKeyTableRomOffset->Name = L"tboxKeyTableRomOffset"; + this->tboxKeyTableRomOffset->ReadOnly = true; + // + // labNormalRomOffset + // + resources->ApplyResources(this->labNormalRomOffset, L"labNormalRomOffset"); + this->labNormalRomOffset->Name = L"labNormalRomOffset"; + // + // tboxNormalRomOffset + // + resources->ApplyResources(this->tboxNormalRomOffset, L"tboxNormalRomOffset"); + this->tboxNormalRomOffset->Name = L"tboxNormalRomOffset"; + this->tboxNormalRomOffset->ReadOnly = true; + // // tboxPrivateSize // resources->ApplyResources(this->tboxPrivateSize, L"tboxPrivateSize"); @@ -1932,11 +2043,6 @@ private: System::Windows::Forms::CheckBox^ cboxIsUnnecessaryRating; resources->ApplyResources(this->labPrivateSize, L"labPrivateSize"); this->labPrivateSize->Name = L"labPrivateSize"; // - // labKeyTableRomOffset - // - resources->ApplyResources(this->labKeyTableRomOffset, L"labKeyTableRomOffset"); - this->labKeyTableRomOffset->Name = L"labKeyTableRomOffset"; - // // labPublicSize // resources->ApplyResources(this->labPublicSize, L"labPublicSize"); @@ -1948,28 +2054,6 @@ private: System::Windows::Forms::CheckBox^ cboxIsUnnecessaryRating; this->tboxPublicSize->Name = L"tboxPublicSize"; this->tboxPublicSize->ReadOnly = true; // - // tboxKeyTableRomOffset - // - resources->ApplyResources(this->tboxKeyTableRomOffset, L"tboxKeyTableRomOffset"); - this->tboxKeyTableRomOffset->Name = L"tboxKeyTableRomOffset"; - this->tboxKeyTableRomOffset->ReadOnly = true; - // - // labHex3 - // - resources->ApplyResources(this->labHex3, L"labHex3"); - this->labHex3->Name = L"labHex3"; - // - // labNormalRomOffset - // - resources->ApplyResources(this->labNormalRomOffset, L"labNormalRomOffset"); - this->labNormalRomOffset->Name = L"labNormalRomOffset"; - // - // tboxNormalRomOffset - // - resources->ApplyResources(this->tboxNormalRomOffset, L"tboxNormalRomOffset"); - this->tboxNormalRomOffset->Name = L"tboxNormalRomOffset"; - this->tboxNormalRomOffset->ReadOnly = true; - // // cboxIsSubBanner // resources->ApplyResources(this->cboxIsSubBanner, L"cboxIsSubBanner"); @@ -2043,9 +2127,7 @@ private: System::Windows::Forms::CheckBox^ cboxIsUnnecessaryRating; // gboxTitleID // this->gboxTitleID->Controls->Add(this->labAppType); - this->gboxTitleID->Controls->Add(this->labMedia); this->gboxTitleID->Controls->Add(this->tboxAppType); - this->gboxTitleID->Controls->Add(this->tboxMedia); this->gboxTitleID->Controls->Add(this->labHex2); this->gboxTitleID->Controls->Add(this->tboxTitleIDLo); this->gboxTitleID->Controls->Add(this->labTitleIDLo); @@ -2062,23 +2144,12 @@ private: System::Windows::Forms::CheckBox^ cboxIsUnnecessaryRating; resources->ApplyResources(this->labAppType, L"labAppType"); this->labAppType->Name = L"labAppType"; // - // labMedia - // - resources->ApplyResources(this->labMedia, L"labMedia"); - this->labMedia->Name = L"labMedia"; - // // tboxAppType // resources->ApplyResources(this->tboxAppType, L"tboxAppType"); this->tboxAppType->Name = L"tboxAppType"; this->tboxAppType->ReadOnly = true; // - // tboxMedia - // - resources->ApplyResources(this->tboxMedia, L"tboxMedia"); - this->tboxMedia->Name = L"tboxMedia"; - this->tboxMedia->ReadOnly = true; - // // labHex2 // resources->ApplyResources(this->labHex2, L"labHex2"); @@ -2117,6 +2188,17 @@ private: System::Windows::Forms::CheckBox^ cboxIsUnnecessaryRating; resources->ApplyResources(this->labAppTypeOther, L"labAppTypeOther"); this->labAppTypeOther->Name = L"labAppTypeOther"; // + // labMedia + // + resources->ApplyResources(this->labMedia, L"labMedia"); + this->labMedia->Name = L"labMedia"; + // + // tboxMedia + // + resources->ApplyResources(this->tboxMedia, L"tboxMedia"); + this->tboxMedia->Name = L"tboxMedia"; + this->tboxMedia->ReadOnly = true; + // // labCaptionEx // resources->ApplyResources(this->labCaptionEx, L"labCaptionEx"); @@ -2235,6 +2317,7 @@ private: System::Windows::Forms::CheckBox^ cboxIsUnnecessaryRating; // this->tabMain->Controls->Add(this->tabRomInfo); this->tabMain->Controls->Add(this->tabTWLInfo); + this->tabMain->Controls->Add(this->tabNandSizeInfo); this->tabMain->Controls->Add(this->tabRomEditInfo); this->tabMain->Controls->Add(this->tabSubmitInfo); this->tabMain->Controls->Add(this->tabCompanyInfo); @@ -2266,15 +2349,15 @@ private: System::Windows::Forms::CheckBox^ cboxIsUnnecessaryRating; this->gridLibrary->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridLibrary->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(2) {this->colLibPublisher, this->colLibName}); - dataGridViewCellStyle1->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; - dataGridViewCellStyle1->BackColor = System::Drawing::SystemColors::Window; - dataGridViewCellStyle1->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + dataGridViewCellStyle13->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle13->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle13->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(128))); - dataGridViewCellStyle1->ForeColor = System::Drawing::SystemColors::ControlText; - dataGridViewCellStyle1->SelectionBackColor = System::Drawing::SystemColors::Highlight; - dataGridViewCellStyle1->SelectionForeColor = System::Drawing::SystemColors::HighlightText; - dataGridViewCellStyle1->WrapMode = System::Windows::Forms::DataGridViewTriState::True; - this->gridLibrary->DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle13->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle13->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle13->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle13->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridLibrary->DefaultCellStyle = dataGridViewCellStyle13; resources->ApplyResources(this->gridLibrary, L"gridLibrary"); this->gridLibrary->Name = L"gridLibrary"; this->gridLibrary->ReadOnly = true; @@ -2303,16 +2386,12 @@ private: System::Windows::Forms::CheckBox^ cboxIsUnnecessaryRating; // // tabTWLInfo // - this->tabTWLInfo->Controls->Add(this->cboxIsNormalJump); this->tabTWLInfo->Controls->Add(this->gboxLaunch); - this->tabTWLInfo->Controls->Add(this->labHex3); this->tabTWLInfo->Controls->Add(this->tboxGuideTWLInfo); this->tabTWLInfo->Controls->Add(this->gboxExFlags); this->tabTWLInfo->Controls->Add(this->gboxShared2Size); this->tabTWLInfo->Controls->Add(this->gboxTWLExInfo); - this->tabTWLInfo->Controls->Add(this->tboxNormalRomOffset); this->tabTWLInfo->Controls->Add(this->gboxAccess); - this->tabTWLInfo->Controls->Add(this->labNormalRomOffset); this->tabTWLInfo->Controls->Add(this->gboxTitleID); resources->ApplyResources(this->tabTWLInfo, L"tabTWLInfo"); this->tabTWLInfo->Name = L"tabTWLInfo"; @@ -2347,12 +2426,200 @@ private: System::Windows::Forms::CheckBox^ cboxIsUnnecessaryRating; // // gboxExFlags // + this->gboxExFlags->Controls->Add(this->cboxIsNormalJump); this->gboxExFlags->Controls->Add(this->cboxIsTmpJump); this->gboxExFlags->Controls->Add(this->cboxIsSubBanner); resources->ApplyResources(this->gboxExFlags, L"gboxExFlags"); this->gboxExFlags->Name = L"gboxExFlags"; this->gboxExFlags->TabStop = false; // + // tabNandSizeInfo + // + this->tabNandSizeInfo->Controls->Add(this->tboxGuideNandSizeInfo); + this->tabNandSizeInfo->Controls->Add(this->labMedia); + this->tabNandSizeInfo->Controls->Add(this->tboxMedia); + this->tabNandSizeInfo->Controls->Add(this->gboxNandSize); + resources->ApplyResources(this->tabNandSizeInfo, L"tabNandSizeInfo"); + this->tabNandSizeInfo->Name = L"tabNandSizeInfo"; + this->tabNandSizeInfo->UseVisualStyleBackColor = true; + // + // tboxGuideNandSizeInfo + // + this->tboxGuideNandSizeInfo->BackColor = System::Drawing::SystemColors::Info; + resources->ApplyResources(this->tboxGuideNandSizeInfo, L"tboxGuideNandSizeInfo"); + this->tboxGuideNandSizeInfo->Name = L"tboxGuideNandSizeInfo"; + this->tboxGuideNandSizeInfo->ReadOnly = true; + // + // gboxNandSize + // + this->gboxNandSize->Controls->Add(this->tboxSrlSize); + this->gboxNandSize->Controls->Add(this->labShopBlockUnit); + this->gboxNandSize->Controls->Add(this->labArrow5); + this->gboxNandSize->Controls->Add(this->labArrow4); + this->gboxNandSize->Controls->Add(this->labArrow3); + this->gboxNandSize->Controls->Add(this->labArrow2); + this->gboxNandSize->Controls->Add(this->labArrow1); + this->gboxNandSize->Controls->Add(this->tboxShopBlock); + this->gboxNandSize->Controls->Add(this->tboxSumSize); + this->gboxNandSize->Controls->Add(this->tboxTmdSizeFS); + this->gboxNandSize->Controls->Add(this->tboxSubBannerSizeFS); + this->gboxNandSize->Controls->Add(this->tboxPrivateSizeFS); + this->gboxNandSize->Controls->Add(this->tboxPublicSizeFS); + this->gboxNandSize->Controls->Add(this->tboxSrlSizeFS); + this->gboxNandSize->Controls->Add(this->tboxTmdSize); + this->gboxNandSize->Controls->Add(this->tboxSubBannerSize); + this->gboxNandSize->Controls->Add(this->labNandSize); + this->gboxNandSize->Controls->Add(this->labShopBlock2); + this->gboxNandSize->Controls->Add(this->labNandSizeFS); + this->gboxNandSize->Controls->Add(this->tboxPrivateSize); + this->gboxNandSize->Controls->Add(this->labShopBlock); + this->gboxNandSize->Controls->Add(this->labSrlSize); + this->gboxNandSize->Controls->Add(this->labPrivateSize); + this->gboxNandSize->Controls->Add(this->labSumSize2); + this->gboxNandSize->Controls->Add(this->tboxPublicSize); + this->gboxNandSize->Controls->Add(this->labPublicSize); + this->gboxNandSize->Controls->Add(this->labSumSize); + this->gboxNandSize->Controls->Add(this->labSubBannerSize); + this->gboxNandSize->Controls->Add(this->labTmdSize); + resources->ApplyResources(this->gboxNandSize, L"gboxNandSize"); + this->gboxNandSize->Name = L"gboxNandSize"; + this->gboxNandSize->TabStop = false; + // + // tboxSrlSize + // + resources->ApplyResources(this->tboxSrlSize, L"tboxSrlSize"); + this->tboxSrlSize->Name = L"tboxSrlSize"; + this->tboxSrlSize->ReadOnly = true; + // + // labShopBlockUnit + // + resources->ApplyResources(this->labShopBlockUnit, L"labShopBlockUnit"); + this->labShopBlockUnit->Name = L"labShopBlockUnit"; + // + // labArrow5 + // + resources->ApplyResources(this->labArrow5, L"labArrow5"); + this->labArrow5->Name = L"labArrow5"; + // + // labArrow4 + // + resources->ApplyResources(this->labArrow4, L"labArrow4"); + this->labArrow4->Name = L"labArrow4"; + // + // labArrow3 + // + resources->ApplyResources(this->labArrow3, L"labArrow3"); + this->labArrow3->Name = L"labArrow3"; + // + // labArrow2 + // + resources->ApplyResources(this->labArrow2, L"labArrow2"); + this->labArrow2->Name = L"labArrow2"; + // + // labArrow1 + // + resources->ApplyResources(this->labArrow1, L"labArrow1"); + this->labArrow1->Name = L"labArrow1"; + // + // tboxShopBlock + // + resources->ApplyResources(this->tboxShopBlock, L"tboxShopBlock"); + this->tboxShopBlock->Name = L"tboxShopBlock"; + this->tboxShopBlock->ReadOnly = true; + // + // tboxSumSize + // + resources->ApplyResources(this->tboxSumSize, L"tboxSumSize"); + this->tboxSumSize->Name = L"tboxSumSize"; + this->tboxSumSize->ReadOnly = true; + // + // tboxTmdSizeFS + // + resources->ApplyResources(this->tboxTmdSizeFS, L"tboxTmdSizeFS"); + this->tboxTmdSizeFS->Name = L"tboxTmdSizeFS"; + this->tboxTmdSizeFS->ReadOnly = true; + // + // tboxSubBannerSizeFS + // + resources->ApplyResources(this->tboxSubBannerSizeFS, L"tboxSubBannerSizeFS"); + this->tboxSubBannerSizeFS->Name = L"tboxSubBannerSizeFS"; + this->tboxSubBannerSizeFS->ReadOnly = true; + // + // tboxPrivateSizeFS + // + resources->ApplyResources(this->tboxPrivateSizeFS, L"tboxPrivateSizeFS"); + this->tboxPrivateSizeFS->Name = L"tboxPrivateSizeFS"; + this->tboxPrivateSizeFS->ReadOnly = true; + // + // tboxPublicSizeFS + // + resources->ApplyResources(this->tboxPublicSizeFS, L"tboxPublicSizeFS"); + this->tboxPublicSizeFS->Name = L"tboxPublicSizeFS"; + this->tboxPublicSizeFS->ReadOnly = true; + // + // tboxSrlSizeFS + // + resources->ApplyResources(this->tboxSrlSizeFS, L"tboxSrlSizeFS"); + this->tboxSrlSizeFS->Name = L"tboxSrlSizeFS"; + this->tboxSrlSizeFS->ReadOnly = true; + // + // tboxTmdSize + // + resources->ApplyResources(this->tboxTmdSize, L"tboxTmdSize"); + this->tboxTmdSize->Name = L"tboxTmdSize"; + this->tboxTmdSize->ReadOnly = true; + // + // tboxSubBannerSize + // + resources->ApplyResources(this->tboxSubBannerSize, L"tboxSubBannerSize"); + this->tboxSubBannerSize->Name = L"tboxSubBannerSize"; + this->tboxSubBannerSize->ReadOnly = true; + // + // labNandSize + // + resources->ApplyResources(this->labNandSize, L"labNandSize"); + this->labNandSize->Name = L"labNandSize"; + // + // labShopBlock2 + // + resources->ApplyResources(this->labShopBlock2, L"labShopBlock2"); + this->labShopBlock2->Name = L"labShopBlock2"; + // + // labNandSizeFS + // + resources->ApplyResources(this->labNandSizeFS, L"labNandSizeFS"); + this->labNandSizeFS->Name = L"labNandSizeFS"; + // + // labShopBlock + // + resources->ApplyResources(this->labShopBlock, L"labShopBlock"); + this->labShopBlock->Name = L"labShopBlock"; + // + // labSrlSize + // + resources->ApplyResources(this->labSrlSize, L"labSrlSize"); + this->labSrlSize->Name = L"labSrlSize"; + // + // labSumSize2 + // + resources->ApplyResources(this->labSumSize2, L"labSumSize2"); + this->labSumSize2->Name = L"labSumSize2"; + // + // labSumSize + // + resources->ApplyResources(this->labSumSize, L"labSumSize"); + this->labSumSize->Name = L"labSumSize"; + // + // labSubBannerSize + // + resources->ApplyResources(this->labSubBannerSize, L"labSubBannerSize"); + this->labSubBannerSize->Name = L"labSubBannerSize"; + // + // labTmdSize + // + resources->ApplyResources(this->labTmdSize, L"labTmdSize"); + this->labTmdSize->Name = L"labTmdSize"; + // // tabRomEditInfo // this->tabRomEditInfo->Controls->Add(this->gboxOtherSpec); @@ -2577,15 +2844,15 @@ private: System::Windows::Forms::CheckBox^ cboxIsUnnecessaryRating; this->gridWarn->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridWarn->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(4) {this->colWarnName, this->colWarnBegin, this->colWarnEnd, this->colWarnCause}); - dataGridViewCellStyle2->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; - dataGridViewCellStyle2->BackColor = System::Drawing::SystemColors::Window; - dataGridViewCellStyle2->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + dataGridViewCellStyle14->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle14->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle14->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(128))); - dataGridViewCellStyle2->ForeColor = System::Drawing::SystemColors::ControlText; - dataGridViewCellStyle2->SelectionBackColor = System::Drawing::SystemColors::Highlight; - dataGridViewCellStyle2->SelectionForeColor = System::Drawing::SystemColors::HighlightText; - dataGridViewCellStyle2->WrapMode = System::Windows::Forms::DataGridViewTriState::True; - this->gridWarn->DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle14->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle14->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle14->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle14->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridWarn->DefaultCellStyle = dataGridViewCellStyle14; this->gridWarn->GridColor = System::Drawing::SystemColors::Control; resources->ApplyResources(this->gridWarn, L"gridWarn"); this->gridWarn->Name = L"gridWarn"; @@ -2620,22 +2887,22 @@ private: System::Windows::Forms::CheckBox^ cboxIsUnnecessaryRating; // // gridError // - dataGridViewCellStyle3->BackColor = System::Drawing::Color::White; - this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle15->BackColor = System::Drawing::Color::White; + this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle15; this->gridError->AutoSizeRowsMode = System::Windows::Forms::DataGridViewAutoSizeRowsMode::AllCellsExceptHeaders; this->gridError->BackgroundColor = System::Drawing::SystemColors::Control; this->gridError->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridError->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(4) {this->colErrorName, this->colErrorBegin, this->colErrorEnd, this->colErrorCause}); - dataGridViewCellStyle4->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; - dataGridViewCellStyle4->BackColor = System::Drawing::SystemColors::Window; - dataGridViewCellStyle4->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + dataGridViewCellStyle16->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle16->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle16->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(128))); - dataGridViewCellStyle4->ForeColor = System::Drawing::SystemColors::ControlText; - dataGridViewCellStyle4->SelectionBackColor = System::Drawing::SystemColors::Highlight; - dataGridViewCellStyle4->SelectionForeColor = System::Drawing::SystemColors::HighlightText; - dataGridViewCellStyle4->WrapMode = System::Windows::Forms::DataGridViewTriState::True; - this->gridError->DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle16->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle16->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle16->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle16->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridError->DefaultCellStyle = dataGridViewCellStyle16; this->gridError->GridColor = System::Drawing::SystemColors::Control; resources->ApplyResources(this->gridError, L"gridError"); this->gridError->Name = L"gridError"; @@ -2728,6 +2995,10 @@ private: System::Windows::Forms::CheckBox^ cboxIsUnnecessaryRating; this->gboxLaunch->PerformLayout(); this->gboxExFlags->ResumeLayout(false); this->gboxExFlags->PerformLayout(); + this->tabNandSizeInfo->ResumeLayout(false); + this->tabNandSizeInfo->PerformLayout(); + this->gboxNandSize->ResumeLayout(false); + this->gboxNandSize->PerformLayout(); this->tabRomEditInfo->ResumeLayout(false); this->tabRomEditInfo->PerformLayout(); this->gboxOtherSpec->ResumeLayout(false); diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx index 7965f35..a183fb4 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ROM繝繝ｼ繧ｿ諠蝣ｱ + 73, 12 @@ -160,9 +163,6 @@ 繝ｪ繝槭せ繧ｿ繝ｼ繝舌ｼ繧ｸ繝ｧ繝ｳ - - ROM繝繝ｼ繧ｿ諠蝣ｱ - 79, 12 @@ -364,6 +364,9 @@ 諡蠖楢2繧貞･蜉帙☆繧(莉ｻ諢) + + 諡蠖楢2 + 37, 12 @@ -400,8 +403,8 @@ 雋ｴ遉ｾ蜷 - - 諡蠖楢2 + + 諡蠖楢1 37, 12 @@ -439,8 +442,8 @@ 雋ｴ遉ｾ蜷 - - 諡蠖楢1 + + 逶ｮ逧 54, 16 @@ -466,8 +469,8 @@ 荳闊ｬ雋ｩ螢ｲ逕ｨ - - 逶ｮ逧 + + 謠仙ｺ譁ｹ豕 56, 16 @@ -481,9 +484,6 @@ 驛ｵ騾 - - 謠仙ｺ譁ｹ豕 - 65, 12 @@ -544,15 +544,15 @@ 陬ｽ蜩√さ繝ｼ繝 + + Shared2繝輔ぃ繧､繝ｫ繧ｵ繧､繧ｺ + 123, 16 Shared2繝輔ぃ繧､繝ｫ菴ｿ逕ｨ - - Shared2繝輔ぃ繧､繝ｫ繧ｵ繧､繧ｺ - 70, 12 @@ -565,21 +565,33 @@ SDK繝舌ｼ繧ｸ繝ｧ繝ｳ + + TWL諡｡蠑ｵ諠蝣ｱ + 142, 12 TWL蟆ら畑鬆伜沺ROM繧ｪ繝輔そ繝繝 - - TWL諡｡蠑ｵ諠蝣ｱ - 155, 12 TWL繝弱ｼ繝槭Ν鬆伜沺ROM繧ｪ繝輔そ繝繝 + + 121, 12 + + + Privat繧ｻ繝ｼ繝悶ョ繝ｼ繧ｿ繧ｵ繧､繧ｺ + + + 122, 12 + + + Public繧ｻ繝ｼ繝悶ョ繝ｼ繧ｿ繧ｵ繧､繧ｺ + 131, 16 @@ -598,6 +610,9 @@ tmp繧ｸ繝｣繝ｳ繝苓ｨｱ蜿ｯ + + 繧｢繧ｯ繧ｻ繧ｹ繧ｳ繝ｳ繝医Ο繝ｼ繝ｫ諠蝣ｱ + 98, 12 @@ -625,8 +640,14 @@ SD繧ｫ繝ｼ繝 - - 繧｢繧ｯ繧ｻ繧ｹ繧ｳ繝ｳ繝医Ο繝ｼ繝ｫ諠蝣ｱ + + 260, 62 + + + 74, 12 + + + 繧｢繝励Μ縺ｮ繝｡繝繧｣繧｢ 53, 12 @@ -637,6 +658,12 @@ ROM謠仙ｺ諠蝣ｱ + + 51, 20 + + + 繝輔ぃ繧､繝ｫ + 211, 22 @@ -658,11 +685,11 @@ 荳譎ゆｿ晏ｭ倥＠縺滓署蜃ｺ諠蝣ｱ繧帝幕縺 - - 51, 20 + + 53, 20 - - 繝輔ぃ繧､繝ｫ + + 繝槭せ繧ｿ繝ｼ 280, 22 @@ -691,17 +718,17 @@ 繝溘ラ繝ｫ繧ｦ繧ｧ繧｢繝ｪ繧ｹ繝医ｮ縺ｿ繧剃ｽ懈舌☆繧(HTML蠖｢蠑) - - 53, 20 - - - 繝槭せ繧ｿ繝ｼ + + ROM蝓ｺ譛ｬ諠蝣ｱ 縺薙ｮ繧ｿ繝悶ｮ諠蝣ｱ縺ｯ邱ｨ髮荳榊庄縺ｧ縺吶ゅョ繝ｼ繧ｿ縺ｫ隱､繧翫′縺ゅｋ蝣ｴ蜷医↓縺ｯROM繝繝ｼ繧ｿ縺ｮ菴懈先凾縺ｮ險ｭ螳壹ｒ隕狗峩縺励※縺上□縺輔＞縲 - - ROM蝓ｺ譛ｬ諠蝣ｱ(遒ｺ隱咲畑) + + TWL諡｡蠑ｵ諠蝣ｱ + + + DSi繝｡繝九Η繝ｼ荳翫〒縺ｮ襍ｷ蜍募宛髯 173, 12 @@ -709,17 +736,107 @@ DSi繝｡繝九Η繝ｼ荳翫〒縺ｮ騾壻ｿ｡繧｢繧､繧ｳ繝ｳ陦ｨ遉ｺ - - DSi繝｡繝九Η繝ｼ荳翫〒縺ｮ襍ｷ蜍募宛髯 - 縺薙ｮ繧ｿ繝悶ｮ諠蝣ｱ縺ｯ邱ｨ髮荳榊庄縺ｧ縺吶ゅョ繝ｼ繧ｿ縺ｫ隱､繧翫′縺ゅｋ蝣ｴ蜷医↓縺ｯROM繝繝ｼ繧ｿ縺ｮ菴懈先凾縺ｮ險ｭ螳壹ｒ隕狗峩縺励※縺上□縺輔＞縲 TWL諡｡蠑ｵ隲ｸ繝輔Λ繧ｰ - - TWL諡｡蠑ｵ諠蝣ｱ(遒ｺ隱咲畑) + + NAND菴ｿ逕ｨ繧ｵ繧､繧ｺ + + + 縺薙ｮ繧ｿ繝悶ｮ諠蝣ｱ縺ｯNAND繧｢繝励Μ縺ｫ繧医▲縺ｦ菴ｿ逕ｨ縺輔ｌ繧亀WL譛ｬ菴灘縺ｮNAND鬆伜沺縺ｮ繧ｵ繧､繧ｺ繧堤｢ｺ隱阪☆繧句ｴ蜷医↓蠢隕√〒縺吶<newline>繧｢繝励Μ縺後ご繝ｼ繝繧ｫ繝ｼ繝牙髄縺代ｮ蝣ｴ蜷医↓縺ｯNAND菴ｿ逕ｨ繧ｵ繧､繧ｺ縺ｮ遒ｺ隱阪ｯ蠢隕√≠繧翫∪縺帙ｓ縲 + + + NAND繧｢繝励Μ縺ｫ繧医▲縺ｦ菴ｿ逕ｨ縺輔ｌ繧起AND鬆伜沺縺ｮ繧ｵ繧､繧ｺ + + + 38, 12 + + + 繝悶Ο繝繧ｯ + + + 154, 23 + + + 90, 12 + + + ROM蜀逋ｻ骭ｲ諠蝣ｱ + + + 154, 224 + + + 99, 12 + + + (1繝悶Ο繝繧ｯ = 128KB) + + + 296, 23 + + + 90, 12 + + + 菴ｿ逕ｨNAND繧ｵ繧､繧ｺ + + + 139, 210 + + + 127, 12 + + + 繝繧ｦ繝ｳ繝ｭ繝ｼ繝画凾縺ｮ繝悶Ο繝繧ｯ謨ｰ + + + 18, 44 + + + 115, 12 + + + ROM縺ｮ螳溘ヵ繧｡繧､繝ｫ繧ｵ繧､繧ｺ + + + 160, 12 + + + (菴ｿ逕ｨ縺輔ｌ繧起AND鬆伜沺縺ｮ繧ｵ繧､繧ｺ) + + + 92, 12 + + + 荳願ｨ倥し繧､繧ｺ縺ｮ蜷郁ｨ + + + 18, 119 + + + 117, 12 + + + 繧ｵ繝悶ヰ繝翫ｼ繝輔ぃ繧､繝ｫ繧ｵ繧､繧ｺ + + + 18, 144 + + + 99, 12 + + + 縺昴ｮ莉悶ヵ繧｡繧､繝ｫ繧ｵ繧､繧ｺ + + + 繝ｪ繝ｼ繧ｸ繝ｧ繝ｳ縺ｨ繝ｬ繝ｼ繝繧｣繝ｳ繧ｰ(邱ｨ髮蜿ｯ) + + + 縺昴ｮ莉乏OM莉墓ｧ 210, 16 @@ -733,26 +850,23 @@ 蜀咏悄莠､謠帛ｯｾ蠢 - - 縺昴ｮ莉乏OM莉墓ｧ - 隱ｭ縺ｿ霎ｼ縺ｿ譎ゅｮ險ｭ螳壹↓謌ｻ縺 縺薙ｮ繧ｿ繝悶ｮ蜷鬆逶ｮ縺ｸ縺ｮ蜈･蜉帙ｯ謠仙ｺ遒ｺ隱肴嶌縺翫ｈ縺ｳ繝槭せ繧ｿ繝ｼROM縺ｮ菴懈舌ｮ縺溘ａ縺ｫ蠢隕√〒縺吶<newline>縺薙ｌ繧峨ｮ諠蝣ｱ縺ｯ繝槭せ繧ｿ繝ｼROM縺ｮ菴懈先凾縺ｫROM蜀逋ｻ骭ｲ繝繝ｼ繧ｿ縺ｨ縺励※逋ｻ骭ｲ縺輔ｌ縺ｾ縺(縲後◎縺ｮ莉乏OM莉墓ｧ倥阪ｒ髯､縺)縲 + + 繝ｪ繝ｼ繧ｸ繝ｧ繝ｳ縺ｨ繝ｬ繝ｼ繝繧｣繝ｳ繧ｰ諠蝣ｱ + 235, 16 繝ｬ繝ｼ繝繧｣繝ｳ繧ｰ陦ｨ遉ｺ荳崎ｦ (繝繝ｼ繝ｫ鬘槭ｮ縺ｿ驕ｸ謚槫庄) - - 繝ｪ繝ｼ繧ｸ繝ｧ繝ｳ縺ｨ繝ｬ繝ｼ繝繧｣繝ｳ繧ｰ諠蝣ｱ - - - ROM逋ｻ骭ｲ諠蝣ｱ(邱ｨ髮蜿ｯ) + + 謠仙ｺ諠蝣ｱ(邱ｨ髮蜿ｯ) (30譁蟄嶺ｻ･蜀) @@ -760,6 +874,9 @@ 縺薙ｮ繧ｿ繝悶ｮ諠蝣ｱ縺ｯ謠仙ｺ遒ｺ隱肴嶌縺ｮ菴懈舌↓蠢隕√〒縺吶ょ･蜉帙＠縺ｦ縺上□縺輔＞縲 + + 豬ｷ螟也沿 + (30譁蟄嶺ｻ･蜀) @@ -769,21 +886,21 @@ (隍謨ｰ縺ゅｋ蝣ｴ蜷医ｮ縺ｿ) - - 豬ｷ螟也沿 - - - 謠仙ｺ諠蝣ｱ(邱ｨ髮蜿ｯ) + + 莨夂､ｾ諠蝣ｱ(邱ｨ髮蜿ｯ) 縺薙ｮ繧ｿ繝悶ｮ諠蝣ｱ縺ｯ謠仙ｺ遒ｺ隱肴嶌縺ｮ菴懈舌↓蠢隕√〒縺吶ょ･蜉帙＠縺ｦ縺上□縺輔＞縲 - - 莨夂､ｾ諠蝣ｱ(邱ｨ髮蜿ｯ) + + 繧ｨ繝ｩ繝ｼ諠蝣ｱ 縺薙ｮ繧ｿ繝悶↓縺ｯ隱ｭ縺ｿ霎ｼ繧薙□ROM繝繝ｼ繧ｿ縺ｮ蝠城｡後→譛ｬ繝励Ο繧ｰ繝ｩ繝縺ｧ縺ｮ蜈･蜉帙Α繧ｹ縺悟玲嫌縺輔ｌ縺ｾ縺吶<newline>襍､譁蟄励ｮ鬆逶ｮ縺ｯ縲∵悽繝励Ο繧ｰ繝ｩ繝縺ｧ菫ｮ豁｣荳榊庄縺ｧ縺吶３OM繝繝ｼ繧ｿ菴懈先凾縺ｮ險ｭ螳壹ｒ縺皮｢ｺ隱阪￥縺縺輔＞縲<newline>髱呈枚蟄励ｮ鬆逶ｮ縺ｯ縲∵悽繝励Ο繧ｰ繝ｩ繝縺ｧ菫ｮ豁｣縺ｧ縺阪∪縺吶′縲∽ｿｮ豁｣縺後槭せ繧ｿ繝ｼROM縺ｫ蜿肴丐縺輔ｌ縺ｾ縺吶<newline>鮟呈枚蟄励ｮ鬆逶ｮ縺ｯ縲∵署蜃ｺ遒ｺ隱肴嶌縺ｫ縺ｮ縺ｿ蜿肴丐縺輔ｌ縲√槭せ繧ｿ繝ｼROM縺ｫ縺ｯ蜿肴丐縺輔ｌ縺ｾ縺帙ｓ縲 + + 縺縺､縺ｮ諠蝣ｱ繧定｡ｨ遉ｺ縺吶ｋ縺 + 114, 16 @@ -796,9 +913,6 @@ ROM繝繝ｼ繧ｿ隱ｭ縺ｿ霎ｼ縺ｿ譎 - - 縺縺､縺ｮ諠蝣ｱ繧定｡ｨ遉ｺ縺吶ｋ縺 - 339, 12 @@ -835,9 +949,6 @@ 隕∝屏 - - 繧ｨ繝ｩ繝ｼ諠蝣ｱ(遒ｺ隱咲畑) - 92, 12 diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX index f3c7c9b..d40d37e 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX @@ -140,6 +140,210 @@ 3 + + tboxRemasterVer + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 0 + + + tboxRomSize + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 1 + + + tboxPlatform + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 2 + + + labPlatform + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 3 + + + tboxRomLatency + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 4 + + + labRomSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 5 + + + labRomType + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 6 + + + tboxMakerCode + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 7 + + + cboxRemasterVerE + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 8 + + + labMakerCode + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 9 + + + labGameCode + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 10 + + + tboxGameCode + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 11 + + + labTitleName + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 12 + + + labRemasterVer + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 13 + + + tboxTitleName + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSrl + + + 14 + + + 26, 52 + + + 285, 227 + + + 3 + + + ROM Info. + + + gboxSrl + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomInfo + + + 2 + 109, 190 @@ -519,30 +723,6 @@ 14 - - 26, 52 - - - 285, 227 - - - 3 - - - ROM Info. - - - gboxSrl - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRomInfo - - - 2 - True @@ -648,6 +828,78 @@ 2 + + labRomCRC + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxCRC + + + 0 + + + labHeaderCRC + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxCRC + + + 1 + + + tboxHeaderCRC + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxCRC + + + 2 + + + tboxWholeCRC + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxCRC + + + 3 + + + 26, 285 + + + 285, 49 + + + 5 + + + CRC + + + gboxCRC + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomInfo + + + 6 + True @@ -744,30 +996,6 @@ 3 - - 26, 285 - - - 285, 49 - - - 5 - - - CRC - - - gboxCRC - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRomInfo - - - 6 - True @@ -1452,6 +1680,261 @@ 1 + + labArbit4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 0 + + + labArbit3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 1 + + + labNTSC2Sur + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 2 + + + tboxNTSC2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 3 + + + labFax2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 4 + + + labNTSC2Pre + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 5 + + + tboxFax2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 6 + + + tboxMail2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 7 + + + tboxTel2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 8 + + + tboxFurigana2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 9 + + + tboxPerson2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 10 + + + tboxDepart2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 11 + + + labDepart2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 12 + + + tboxCompany2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 13 + + + labMail2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 14 + + + labTel2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 15 + + + labFurigana2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 16 + + + labPerson2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 17 + + + labCompany2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson2 + + + 18 + + + False + + + 377, 88 + + + 347, 234 + + + 14 + + + Contact2 + + + gboxPerson2 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabCompanyInfo + + + 3 + True @@ -1941,32 +2424,257 @@ 18 - - False + + labArbit2 - - 377, 88 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 347, 234 + + gboxPerson1 - + + 0 + + + labArbit1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 1 + + + labNTSC1Sur + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 2 + + + labFax1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 3 + + + labNTSC1Pre + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 4 + + + tboxNTSC1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 5 + + + tboxFax1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 6 + + + tboxMail1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 7 + + + tboxTel1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 8 + + + tboxFurigana1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 9 + + + tboxPerson1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 10 + + + tboxDepart1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 11 + + + labDepart1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 12 + + + tboxCompany1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 13 + + + labMail1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + 14 - - Contact2 + + labTel1 - - gboxPerson2 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + gboxPerson1 + + + 15 + + + labFurigana1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 16 + + + labPerson1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 17 + + + labCompany1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxPerson1 + + + 18 + + + 17, 88 + + + 344, 234 + + + 8 + + + Contact1 + + + gboxPerson1 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tabCompanyInfo - - 3 + + 2 True @@ -2457,30 +3165,6 @@ 18 - - 17, 88 - - - 344, 234 - - - 8 - - - Contact1 - - - gboxPerson1 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabCompanyInfo - - - 2 - 175, 81 @@ -2652,6 +3336,90 @@ 14 + + tboxUsageOther + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxUsage + + + 0 + + + rUsageOther + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxUsage + + + 1 + + + rUsageDst + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxUsage + + + 2 + + + rUsageSample + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxUsage + + + 3 + + + rUsageSale + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxUsage + + + 4 + + + 16, 258 + + + 346, 79 + + + 6 + + + Purpose + + + gboxUsage + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabSubmitInfo + + + 8 + False @@ -2787,29 +3555,53 @@ 4 - - 16, 258 + + rSubmitHand - - 346, 79 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 6 + + gboxSubmitWay - - Purpose + + 0 - - gboxUsage + + rSubmitPost - + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxSubmitWay + + + 1 + + + 16, 207 + + + 155, 45 + + + 5 + + + How To Submit + + + gboxSubmitWay + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tabSubmitInfo - - 8 + + 11 True @@ -2865,30 +3657,6 @@ 1 - - 16, 207 - - - 155, 45 - - - 5 - - - How To Submit - - - gboxSubmitWay - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabSubmitInfo - - - 11 - True @@ -3369,6 +4137,186 @@ 4 + + labShared2Size5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 0 + + + labShared2Size4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 1 + + + labShared2Size3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 2 + + + labShared2Size2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 3 + + + labShared2Size1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 4 + + + labShared2Size0 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 5 + + + tboxShared2Size5 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 6 + + + tboxShared2Size4 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 7 + + + tboxShared2Size3 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 8 + + + tboxShared2Size2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 9 + + + tboxShared2Size1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 10 + + + tboxShared2Size0 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 11 + + + cboxIsShared2 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxShared2Size + + + 12 + + + 545, 147 + + + 181, 197 + + + 1 + + + Size of Shared2 Files + + + gboxShared2Size + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 3 + True @@ -3705,30 +4653,6 @@ 12 - - 545, 147 - - - 181, 197 - - - 1 - - - Size of Shared2 Files - - - gboxShared2Size - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabTWLInfo - - - 5 - True @@ -3810,6 +4734,138 @@ 8 + + labByte1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 0 + + + labHex4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 1 + + + labHex3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 2 + + + tboxIsCodec + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 3 + + + labIsCodec + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 4 + + + labKeyTableRomOffset + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 5 + + + tboxKeyTableRomOffset + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 6 + + + labNormalRomOffset + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 7 + + + tboxNormalRomOffset + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 8 + + + 251, 54 + + + 280, 103 + + + 24 + + + TWL Extended Info + + + gboxTWLExInfo + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 4 + True @@ -3841,7 +4897,7 @@ True - 257, 98 + 257, 50 11, 12 @@ -3864,8 +4920,35 @@ 1 + + True + + + 257, 79 + + + 11, 12 + + + 8 + + + h + + + labHex3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTWLExInfo + + + 2 + - 179, 69 + 179, 19 75, 19 @@ -3886,13 +4969,13 @@ gboxTWLExInfo - 2 + 3 True - 62, 72 + 66, 22 75, 12 @@ -3913,67 +4996,13 @@ gboxTWLExInfo - 3 - - - 179, 44 - - - 75, 19 - - - 13 - - - Right - - - tboxPrivateSize - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxTWLExInfo - - 4 - - True - - - NoControl - - - 38, 47 - - - 123, 12 - - - 15 - - - Private Save Data Size - - - labPrivateSize - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxTWLExInfo - - - 5 - True - 14, 98 + 14, 51 159, 12 @@ -3994,64 +5023,10 @@ gboxTWLExInfo - 6 - - - True - - - NoControl - - - 38, 22 - - - 118, 12 - - - 14 - - - Public Save Data Size - - - labPublicSize - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxTWLExInfo - - - 7 - - - 179, 19 - - - 75, 19 - - - 12 - - - Right - - - tboxPublicSize - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxTWLExInfo - - - 8 + 5 - 179, 95 + 179, 47 75, 19 @@ -4072,64 +5047,13 @@ gboxTWLExInfo - 9 - - - 251, 54 - - - 280, 128 - - - 24 - - - TWL Extended Info - - - gboxTWLExInfo - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabTWLInfo - - 6 - - True - - - 508, 191 - - - 11, 12 - - - 8 - - - h - - - labHex3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabTWLInfo - - - 2 - True - 264, 191 + 14, 79 160, 12 @@ -4147,13 +5071,13 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tabTWLInfo + gboxTWLExInfo - 9 + 7 - 430, 188 + 179, 76 75, 19 @@ -4171,10 +5095,118 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tabTWLInfo + gboxTWLExInfo - 7 + 8 + + + 153, 91 + + + 96, 19 + + + 13 + + + Right + + + tboxPrivateSize + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 19 + + + True + + + NoControl + + + 18, 94 + + + 123, 12 + + + 15 + + + Private Save Data Size + + + labPrivateSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 22 + + + True + + + NoControl + + + 18, 69 + + + 118, 12 + + + 14 + + + Public Save Data Size + + + labPublicSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 25 + + + 153, 66 + + + 96, 19 + + + 12 + + + Right + + + tboxPublicSize + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 24 True @@ -4204,7 +5236,7 @@ gboxExFlags - 1 + 2 True @@ -4213,7 +5245,7 @@ False - 559, 122 + 14, 62 154, 16 @@ -4231,7 +5263,7 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tabTWLInfo + gboxExFlags 0 @@ -4264,8 +5296,116 @@ gboxExFlags + 1 + + + labIsGameCardOn2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + 0 + + labAccessOther + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 1 + + + tboxAccessOther + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 2 + + + tboxIsGameCardOn + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 3 + + + labIsGameCardOn + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 4 + + + cboxIsNAND + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 5 + + + cboxIsSD + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxAccess + + + 6 + + + 251, 171 + + + 280, 157 + + + 0 + + + Access Control + + + gboxAccess + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 5 + True @@ -4276,7 +5416,7 @@ NoControl - 5, 73 + 5, 90 127, 12 @@ -4333,7 +5473,7 @@ True - 123, 85 + 123, 103 4 @@ -4351,7 +5491,7 @@ 2 - 6, 102 + 7, 117 122, 19 @@ -4378,7 +5518,7 @@ True - 6, 87 + 6, 102 104, 12 @@ -4461,35 +5601,143 @@ 6 - - 251, 211 + + labAppType - - 280, 133 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + gboxTitleID + + 0 - - Access Control + + tboxAppType - - gboxAccess + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + gboxTitleID + + + 1 + + + labHex2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 2 + + + tboxTitleIDLo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 3 + + + labTitleIDLo + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 4 + + + labTitleIDHi + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 5 + + + tboxTitleIDHi + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 6 + + + tboxAppTypeOther + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 7 + + + labAppTypeOther + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxTitleID + + + 8 + + + 12, 54 + + + 225, 161 + + + 23 + + + TitleID + + + gboxTitleID + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tabTWLInfo - - 8 + + 6 True - 12, 98 + 15, 79 91, 12 @@ -4512,35 +5760,8 @@ 0 - - True - - - 40, 73 - - - 35, 12 - - - 10 - - - Media - - - labMedia - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxTitleID - - - 1 - - 113, 95 + 112, 76 71, 19 @@ -4561,31 +5782,7 @@ gboxTitleID - 2 - - - 113, 70 - - - 71, 19 - - - 8 - - - Right - - - tboxMedia - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gboxTitleID - - - 3 + 1 True @@ -4612,10 +5809,10 @@ gboxTitleID - 4 + 2 - 113, 21 + 112, 19 71, 19 @@ -4636,13 +5833,13 @@ gboxTitleID - 5 + 3 True - 24, 24 + 24, 22 63, 12 @@ -4663,13 +5860,13 @@ gboxTitleID - 6 + 4 True - 24, 48 + 24, 50 66, 12 @@ -4690,10 +5887,10 @@ gboxTitleID - 7 + 5 - 113, 45 + 112, 47 71, 19 @@ -4714,10 +5911,10 @@ gboxTitleID - 8 + 6 - 14, 134 + 14, 117 True @@ -4738,13 +5935,13 @@ gboxTitleID - 9 + 7 True - 12, 122 + 12, 102 56, 12 @@ -4765,31 +5962,58 @@ gboxTitleID + 8 + + + True + + + 224, 62 + + + 110, 12 + + 10 - - 12, 54 + + Media of Application - - 225, 174 + + labMedia - - 23 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TitleID + + tabNandSizeInfo - - gboxTitleID + + 1 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 340, 59 - - tabTWLInfo + + 96, 19 - - 10 + + 8 + + + Right + + + tboxMedia + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabNandSizeInfo + + + 2 True @@ -4872,6 +6096,36 @@ 0, 0 + + 0, 0 + + + 777, 24 + + + 33 + + + menuStrip1 + + + menuStripAbove + + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + 36, 20 + + + File + 274, 22 @@ -4893,11 +6147,11 @@ Load a temporary info. saved previously - - 36, 20 + + 52, 20 - - File + + Master 288, 22 @@ -4926,11 +6180,11 @@ Make a middleware list only(HTML format) - - 52, 20 + + 65, 20 - - Master + + Language 119, 22 @@ -4944,35 +6198,1139 @@ Japanese - - 65, 20 + + gridLibrary - - Language + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 0 + + tabRomInfo - - 777, 24 + + 0 - - 33 + + tboxGuideRomInfo - - menuStrip1 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - menuStripAbove + + tabRomInfo - - System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - + + 4, 21 + + + 3, 3, 3, 3 + + + 745, 352 + + + 0 + + + ROM Info. + + + tabRomInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 0 + + + gboxLaunch + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 0 + + + tboxGuideTWLInfo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 1 + + + gboxExFlags + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + + 2 + + + 4, 21 + + + 3, 3, 3, 3 + + + 745, 352 + + + 1 + + + TWL Info. + + + tabTWLInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 1 + + + 24, 11 + + + True + + + 687, 34 + + + 42 + + + These item is necessary for checking NAND size used by NAND Application.<newline>When the Media of application is GameCard, following items is not necessary. + + + tboxGuideNandSizeInfo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabNandSizeInfo + + + 0 + + + 153, 41 + + + 96, 19 + + + 30 + + + Right + + + tboxSrlSize + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 0 + + + True + + + 392, 213 + + + 40, 12 + + + 29 + + + Blocks + + + labShopBlockUnit + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 1 + + + True + + + NoControl + + + 263, 144 + + + 17, 12 + + + 28 + + + 竊 + + + labArrow5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 2 + + + True + + + NoControl + + + 263, 119 + + + 17, 12 + + + 27 + + + 竊 + + + labArrow4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 3 + + + True + + + NoControl + + + 263, 94 + + + 17, 12 + + + 26 + + + 竊 + + + labArrow3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 4 + + + True + + + NoControl + + + 263, 69 + + + 17, 12 + + + 25 + + + 竊 + + + labArrow2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 5 + + + True + + + 263, 44 + + + 17, 12 + + + 10 + + + 竊 + + + labArrow1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 6 + + + 292, 210 + + + 94, 19 + + + 24 + + + Right + + + tboxShopBlock + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 7 + + + 292, 177 + + + 94, 19 + + + 23 + + + Right + + + tboxSumSize + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 8 + + + 292, 141 + + + 94, 19 + + + 22 + + + Right + + + tboxTmdSizeFS + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 9 + + + 292, 116 + + + 94, 19 + + + 21 + + + Right + + + tboxSubBannerSizeFS + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 10 + + + 292, 91 + + + 94, 19 + + + 20 + + + Right + + + tboxPrivateSizeFS + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 11 + + + 292, 66 + + + 94, 19 + + + 19 + + + Right + + + tboxPublicSizeFS + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 12 + + + 292, 41 + + + 94, 19 + + + 18 + + + Right + + + tboxSrlSizeFS + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 13 + + + 153, 141 + + + 96, 19 + + + 17 + + + Right + + + tboxTmdSize + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 14 + + + 153, 116 + + + 96, 19 + + + 16 + + + Right + + + tboxSubBannerSize + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 15 + + + True + + + 167, 22 + + + 66, 12 + + + 1 + + + Orignal Size + + + labNandSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 16 + + + True + + + 158, 224 + + + 95, 12 + + + 8 + + + (1Block = 128KB) + + + labShopBlock2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 17 + + + True + + + NoControl + + + 307, 22 + + + 62, 12 + + + 0 + + + NAND Size + + + labNandSizeFS + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 18 + + + True + + + 151, 210 + + + 111, 12 + + + 7 + + + Blocks for Download + + + labShopBlock + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 20 + + + True + + + 39, 44 + + + 78, 12 + + + 4 + + + ROM File Size + + + labSrlSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 21 + + + True + + + 121, 189 + + + 165, 12 + + + 5 + + + (NAND Size Used by the ROM) + + + labSumSize2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 23 + + + True + + + 151, 175 + + + 106, 12 + + + 6 + + + Sum of Above Files + + + labSumSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 26 + + + True + + + 39, 119 + + + 89, 12 + + + 3 + + + Sub Banner Size + + + labSubBannerSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 27 + + + True + + + 39, 144 + + + 81, 12 + + + 2 + + + Other File Size + + + labTmdSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxNandSize + + + 28 + + + 122, 93 + + + 484, 245 + + + 9 + + + NAND Size Used by the NAND Application + + + gboxNandSize + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabNandSizeInfo + + + 3 + + + 4, 21 + + + 745, 352 + + + 6 + + + Used Nand Size + + + tabNandSizeInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 2 + + + gboxOtherSpec + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomEditInfo + + + 0 + + + butSetBack + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomEditInfo + + + 1 + + + tboxGuideRomEditInfo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomEditInfo + + + 2 + + + gboxParental + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomEditInfo + + + 3 + + + 4, 21 + + + 745, 352 + + + 2 + + + Region and Ratings (Editable) + + + tabRomEditInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 3 + + + labProductNameLimit + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabSubmitInfo + + + 0 + + + tboxGuideSubmitInfo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabSubmitInfo + + + 1 + + + gboxForeign + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabSubmitInfo + + + 2 + + + 4, 21 + + + 745, 352 + + + 3 + + + Submission Info.(Editable) + + + tabSubmitInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 4 + + + tboxGuideCompanyInfo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabCompanyInfo + + + 0 + + + 4, 21 + + + 745, 352 + + + 4 + + + Company Info.(Editable) + + + tabCompanyInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 5 + + + tboxGuideErrorInfo + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 0 + + + gboxErrorTiming + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 1 + + + labWarn + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 2 + + + labError + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 3 + + + gridWarn + + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 4 + + + gridError + + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 5 + + + 4, 21 + + + 745, 352 + + + 5 + + + Error Info. + + + tabErrorInfo + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 6 + + + 12, 93 + + + 753, 377 + + + 34 + + + tabMain + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - 4 + + 2 True @@ -5031,31 +7389,52 @@ 1 - - 4, 21 + + labConnectIcon - - 3, 3, 3, 3 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 745, 352 + + gboxLaunch - + 0 - - ROM Info.(Read Only) + + tboxConnectIcon - - tabRomInfo + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gboxLaunch - - tabMain + + 1 - + + 12, 226 + + + 225, 102 + + + 37 + + + Launch Control On DSi Menu + + + gboxLaunch + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTWLInfo + + 0 @@ -5106,30 +7485,6 @@ 1 - - 12, 238 - - - 225, 106 - - - 37 - - - Launch Control On DSi Menu - - - gboxLaunch - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabTWLInfo - - - 1 - 24, 11 @@ -5152,13 +7507,13 @@ tabTWLInfo - 3 + 1 545, 54 - 181, 64 + 181, 84 35 @@ -5176,34 +7531,55 @@ tabTWLInfo - 4 + 2 - - 4, 21 + + cboxIsUGC - - 3, 3, 3, 3 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 745, 352 + + gboxOtherSpec - + + 0 + + + cboxIsPhotoEx + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxOtherSpec + + 1 - - TWL Info.(Read Only) + + 445, 60 - - tabTWLInfo + + 266, 90 - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 41 - - tabMain + + Other ROM Spec. - - 1 + + gboxOtherSpec + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRomEditInfo + + + 0 True @@ -5259,30 +7635,6 @@ 1 - - 445, 60 - - - 266, 90 - - - 41 - - - Other ROM Spec. - - - gboxOtherSpec - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRomEditInfo - - - 0 - 483, 185 @@ -5334,21 +7686,6 @@ 2 - - True - - - 116, 56 - - - 263, 16 - - - 38 - - - Unnecessary Rating (Available Only Tool App) - cboxIsUnnecessaryRating @@ -5385,29 +7722,32 @@ 3 - - 4, 21 + + True - - 745, 352 + + 116, 56 - - 2 + + 263, 16 - - ROM Settings(Editable) + + 38 - - tabRomEditInfo + + Unnecessary Rating (Available Only Tool App) - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + cboxIsUnnecessaryRating - - tabMain + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 2 + + gboxParental + + + 0 237, 75 @@ -5460,6 +7800,54 @@ 1 + + labProductNameLimitForeign + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxForeign + + + 0 + + + labMultiForeign2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxForeign + + + 1 + + + 378, 91 + + + 355, 144 + + + 35 + + + Foreign Ver. + + + gboxForeign + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabSubmitInfo + + + 2 + 225, 62 @@ -5514,54 +7902,6 @@ 1 - - 378, 91 - - - 355, 144 - - - 35 - - - Foreign Ver. - - - gboxForeign - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabSubmitInfo - - - 2 - - - 4, 21 - - - 745, 352 - - - 3 - - - Submission Info.(Editable) - - - tabSubmitInfo - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 3 - 24, 11 @@ -5586,30 +7926,6 @@ 0 - - 4, 21 - - - 745, 352 - - - 4 - - - Company Info.(Editable) - - - tabCompanyInfo - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 4 - 24, 11 @@ -5637,6 +7953,54 @@ 0 + + rErrorCurrent + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxErrorTiming + + + 0 + + + rErrorReading + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gboxErrorTiming + + + 1 + + + 551, 11 + + + 172, 71 + + + 41 + + + Error of Timing + + + gboxErrorTiming + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabErrorInfo + + + 1 + True @@ -5691,30 +8055,6 @@ 1 - - 551, 11 - - - 172, 71 - - - 41 - - - Error of Timing - - - gboxErrorTiming - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabErrorInfo - - - 1 - True @@ -5877,51 +8217,6 @@ 5 - - 4, 21 - - - 745, 352 - - - 5 - - - Error(Read Only) - - - tabErrorInfo - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabMain - - - 5 - - - 12, 93 - - - 753, 377 - - - 34 - - - tabMain - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - True diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp index f121071..d0e4180 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp @@ -80,8 +80,9 @@ void Form1::construct(void) } // 複数行表示の改行を挿入 - this->tboxGuideRomEditInfo->Text = this->tboxGuideRomEditInfo->Text->Replace( "", "\r\n" ); - this->tboxGuideErrorInfo->Text = this->tboxGuideErrorInfo->Text->Replace( "", "\r\n" ); + this->tboxGuideNandSizeInfo->Text = this->tboxGuideNandSizeInfo->Text->Replace( "", "\r\n" ); + this->tboxGuideRomEditInfo->Text = this->tboxGuideRomEditInfo->Text->Replace( "", "\r\n" ); + this->tboxGuideErrorInfo->Text = this->tboxGuideErrorInfo->Text->Replace( "", "\r\n" ); // 言語バージョンにあわせてメニューにチェックを入れる if( System::Threading::Thread::CurrentThread->CurrentUICulture->Name->StartsWith( "ja" ) ) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp index 1d2c912..56c6f11 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp @@ -346,6 +346,19 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname ) resources->ApplyResources(this->labConnectIcon, L"labConnectIcon"); resources->ApplyResources(this->tboxGuideTWLInfo, L"tboxGuideTWLInfo"); resources->ApplyResources(this->gboxExFlags, L"gboxExFlags"); + resources->ApplyResources(this->tabNandSizeInfo, L"tabNandSizeInfo"); + resources->ApplyResources(this->tboxGuideNandSizeInfo, L"tboxGuideNandSizeInfo"); + resources->ApplyResources(this->labShopBlockUnit, L"labShopBlockUnit"); + resources->ApplyResources(this->gboxNandSize, L"gboxNandSize"); + resources->ApplyResources(this->labNandSize, L"labNandSize"); + resources->ApplyResources(this->labShopBlock2, L"labShopBlock2"); + resources->ApplyResources(this->labNandSizeFS, L"labNandSizeFS"); + resources->ApplyResources(this->labShopBlock, L"labShopBlock"); + resources->ApplyResources(this->labSrlSize, L"labSrlSize"); + resources->ApplyResources(this->labSumSize2, L"labSumSize2"); + resources->ApplyResources(this->labSumSize, L"labSumSize"); + resources->ApplyResources(this->labSubBannerSize, L"labSubBannerSize"); + resources->ApplyResources(this->labTmdSize, L"labTmdSize"); resources->ApplyResources(this->tabRomEditInfo, L"tabRomEditInfo"); resources->ApplyResources(this->gboxOtherSpec, L"gboxOtherSpec"); resources->ApplyResources(this->cboxIsUGC, L"cboxIsUGC"); @@ -403,6 +416,7 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname ) } // 複数行表示の改行を挿入 + this->tboxGuideNandSizeInfo->Text = this->tboxGuideNandSizeInfo->Text->Replace( "", "\r\n" ); this->tboxGuideRomEditInfo->Text = this->tboxGuideRomEditInfo->Text->Replace( "", "\r\n" ); this->tboxGuideErrorInfo->Text = this->tboxGuideErrorInfo->Text->Replace( "", "\r\n" ); diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp index 5479b96..9a97510 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp @@ -77,8 +77,6 @@ void Form1::setSrlForms(void) this->tboxTitleIDHi->Text = this->hSrl->TitleIDHi.ToString("X8"); this->tboxNormalRomOffset->Text = this->hSrl->NormalRomOffset.ToString("X8"); this->tboxKeyTableRomOffset->Text = this->hSrl->KeyTableRomOffset.ToString("X8"); - this->tboxPublicSize->Text = MasterEditorTWL::transSizeToString( this->hSrl->PublicSize ); - this->tboxPrivateSize->Text = MasterEditorTWL::transSizeToString( this->hSrl->PrivateSize ); this->cboxIsNormalJump->Checked = this->hSrl->IsNormalJump; this->cboxIsTmpJump->Checked = this->hSrl->IsTmpJump; this->cboxIsSubBanner->Checked = this->hSrl->IsSubBanner; @@ -112,6 +110,24 @@ void Form1::setSrlForms(void) this->tboxShared2Size4->Text = MasterEditorTWL::transSizeToString( this->hSrl->hShared2SizeArray[4] ); this->tboxShared2Size5->Text = MasterEditorTWL::transSizeToString( this->hSrl->hShared2SizeArray[5] ); + // NAND消費サイズ + //this->tboxPublicSize->Text = MasterEditorTWL::transSizeToString( this->hSrl->PublicSize ); + //this->tboxPrivateSize->Text = MasterEditorTWL::transSizeToString( this->hSrl->PrivateSize ); + this->tboxSrlSize->Text = MasterEditorTWL::transSizeToString( this->hSrl->hNandUsedSize->SrlSize ); + this->tboxPublicSize->Text = MasterEditorTWL::transSizeToString( this->hSrl->hNandUsedSize->PublicSaveSize ); + this->tboxPrivateSize->Text = MasterEditorTWL::transSizeToString( this->hSrl->hNandUsedSize->PrivateSaveSize ); + this->tboxSubBannerSize->Text = MasterEditorTWL::transSizeToString( this->hSrl->hNandUsedSize->SubBannerSize ); + this->tboxTmdSize->Text = MasterEditorTWL::transSizeToString( this->hSrl->hNandUsedSize->TmdSize ); + // NANDのクラスタサイズに切り上げた値 + this->tboxSrlSizeFS->Text = MasterEditorTWL::transSizeToString( this->hSrl->hNandUsedSize->SrlSizeRoundUp ); + this->tboxPublicSizeFS->Text = MasterEditorTWL::transSizeToString( this->hSrl->hNandUsedSize->PublicSaveSizeRoundUp ); + this->tboxPrivateSizeFS->Text = MasterEditorTWL::transSizeToString( this->hSrl->hNandUsedSize->PrivateSaveSizeRoundUp ); + this->tboxSubBannerSizeFS->Text = MasterEditorTWL::transSizeToString( this->hSrl->hNandUsedSize->SubBannerSizeRoundUp ); + this->tboxTmdSizeFS->Text = MasterEditorTWL::transSizeToString( this->hSrl->hNandUsedSize->TmdSizeRoundUp ); + // 総和 + this->tboxSumSize->Text = MasterEditorTWL::transSizeToString( this->hSrl->hNandUsedSize->NandUsedSize ); + this->tboxShopBlock->Text = this->hSrl->hNandUsedSize->NandUsedSizeBlock.ToString(); + // アプリ種別 if( this->hSrl->IsMediaNand ) { diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h index 8e12c63..be42cf4 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h @@ -293,6 +293,9 @@ namespace MasterEditorTWL // ------------------------------------------------------------------- ref class RCNandUsedSize { + // 値へのアクセス方法 + // - 生のデータサイズ : publicメンバ変数 + // - 切り上げたサイズ : property (ReadOnlyなメンバ変数のように見える) public: property System::UInt32 SrlSize; property System::UInt32 PublicSaveSize; @@ -301,12 +304,12 @@ namespace MasterEditorTWL property System::Boolean IsUseSubBanner; // サブバナーを使用するかどうか public: static const System::UInt32 TmdSize = 16 * 1024; - static const System::UInt32 SubBannerSize = 16 * 1024; private: - static const System::UInt32 NandClusterSize = 16 * 1024; - static const System::UInt32 ShopBlockSize = 128 * 1024; + static const System::UInt32 cSubBannerSize = 16 * 1024; + static const System::UInt32 NandClusterSize = 16 * 1024; + static const System::UInt32 ShopBlockSize = 128 * 1024; public: - property System::UInt32 SrlSizeRoundUp + property System::UInt32 SrlSizeRoundUp // 切り上げた値はメンバ変数としては持たず計算した値を property で提供 { System::UInt32 get() { @@ -336,6 +339,17 @@ namespace MasterEditorTWL return (MasterEditorTWL::roundUp( this->TmdSize, NandClusterSize )); } } + property System::UInt32 SubBannerSize // サブバナーのサイズは使用するかしないかで異なるので計算した値を property で提供 + { + System::UInt32 get() + { + if( !this->IsUseSubBanner ) + { + return 0; + } + return this->cSubBannerSize; + } + } property System::UInt32 SubBannerSizeRoundUp { System::UInt32 get() @@ -372,7 +386,12 @@ namespace MasterEditorTWL { System::UInt32 get() { - return (MasterEditorTWL::roundUp( this->NandUsedSize, ShopBlockSize )); + System::UInt32 div = this->NandUsedSize / this->ShopBlockSize; + if( this->NandUsedSize % this->ShopBlockSize ) + { + div++; + } + return div; } } }; //RCNandUsedSize