rvtr/TwlIPL
1
Fork 0
mirror of https://github.com/rvtr/TwlIPL.git synced 2025-10-31 06:01:12 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

マスタエディタ：EULAバージョンをGUIと提出書から削除。SCFGアクセス警告をランチャーには出さないように変更。

Browse Source 
git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2509 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
nishikawa_takeshi 2008-09-12 13:23:55 +00:00
parent e080fadae3
commit 58fa1980e2
8 changed files with 1077 additions and 1126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
build/tools/MasterEditorTWL/MasterEditorTWL.ncb
View File

Binary file not shown.

BIN
build/tools/MasterEditorTWL/MasterEditorTWL.suo
View File

Binary file not shown.

BIN
build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm
View File

Binary file not shown.

42
build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h
View File

@ -199,9 +199,9 @@ namespace MasterEditorTWL {
private: System::Windows::Forms::CheckBox^ cboxIsEULA;
private: System::Windows::Forms::Label^ labEULA;
private: System::Windows::Forms::NumericUpDown^ numEULA;
@ -778,8 +778,6 @@ private: System::Windows::Forms::RadioButton^ rIsNoIcon;
this->labRegion = (gcnew System::Windows::Forms::Label());
this->cboxIsEULA = (gcnew System::Windows::Forms::CheckBox());
this->combRegion = (gcnew System::Windows::Forms::ComboBox());
this->labEULA = (gcnew System::Windows::Forms::Label());
this->numEULA = (gcnew System::Windows::Forms::NumericUpDown());
this->cboxIsInputPerson2 = (gcnew System::Windows::Forms::CheckBox());
this->gboxPerson2 = (gcnew System::Windows::Forms::GroupBox());
this->labArbit4 = (gcnew System::Windows::Forms::Label());
@ -970,7 +968,6 @@ private: System::Windows::Forms::RadioButton^ rIsNoIcon;
this->labAssemblyVersion = (gcnew System::Windows::Forms::Label());
this->gboxSrl->SuspendLayout();
this->gboxCRC->SuspendLayout();
(cli::safe_cast<System::ComponentModel::ISupportInitialize^ >(this->numEULA))->BeginInit();
this->gboxPerson2->SuspendLayout();
this->gboxPerson1->SuspendLayout();
this->gboxUsage->SuspendLayout();
@ -1579,7 +1576,7 @@ private: System::Windows::Forms::RadioButton^ rIsNoIcon;
// cboxIsEULA
//
this->cboxIsEULA->AutoSize = true;
this->cboxIsEULA->Location = System::Drawing::Point(17, 18);
this->cboxIsEULA->Location = System::Drawing::Point(8, 20);
this->cboxIsEULA->Name = L"cboxIsEULA";
this->cboxIsEULA->Size = System::Drawing::Size(77, 16);
this->cboxIsEULA->TabIndex = 0;
@ -1597,24 +1594,6 @@ private: System::Windows::Forms::RadioButton^ rIsNoIcon;
this->combRegion->TabIndex = 36;
this->combRegion->SelectedIndexChanged += gcnew System::EventHandler(this, &Form1::combRegion_SelectedIndexChanged);
//
// labEULA
//
this->labEULA->AutoSize = true;
this->labEULA->Location = System::Drawing::Point(14, 44);
this->labEULA->Name = L"labEULA";
this->labEULA->Size = System::Drawing::Size(103, 12);
this->labEULA->TabIndex = 7;
this->labEULA->Text = L"EULA“¯ˆÓƒo<EFBFBD>[ƒWƒ‡ƒ“";
//
// numEULA
//
this->numEULA->Location = System::Drawing::Point(130, 39);
this->numEULA->Maximum = System::Decimal(gcnew cli::array< System::Int32 >(4) {255, 0, 0, 0});
this->numEULA->Name = L"numEULA";
this->numEULA->Size = System::Drawing::Size(45, 19);
this->numEULA->TabIndex = 1;
this->numEULA->TextAlign = System::Windows::Forms::HorizontalAlignment::Right;
//
// cboxIsInputPerson2
//
this->cboxIsInputPerson2->AutoSize = true;
@ -3186,7 +3165,7 @@ private: System::Windows::Forms::RadioButton^ rIsNoIcon;
this->gboxIcon->Controls->Add(this->rIsNoIcon);
this->gboxIcon->Controls->Add(this->rIsWiFiIcon);
this->gboxIcon->Controls->Add(this->rIsWirelessIcon);
this->gboxIcon->Location = System::Drawing::Point(19, 138);
this->gboxIcon->Location = System::Drawing::Point(19, 114);
this->gboxIcon->Name = L"gboxIcon";
this->gboxIcon->Size = System::Drawing::Size(215, 116);
this->gboxIcon->TabIndex = 32;
@ -3228,11 +3207,9 @@ private: System::Windows::Forms::RadioButton^ rIsNoIcon;
// gboxEULA
//
this->gboxEULA->Controls->Add(this->cboxIsEULA);
this->gboxEULA->Controls->Add(this->numEULA);
this->gboxEULA->Controls->Add(this->labEULA);
this->gboxEULA->Location = System::Drawing::Point(19, 60);
this->gboxEULA->Name = L"gboxEULA";
this->gboxEULA->Size = System::Drawing::Size(215, 72);
this->gboxEULA->Size = System::Drawing::Size(215, 48);
this->gboxEULA->TabIndex = 31;
this->gboxEULA->TabStop = false;
this->gboxEULA->Text = L"EULA";
@ -3555,7 +3532,6 @@ private: System::Windows::Forms::RadioButton^ rIsNoIcon;
this->gboxSrl->PerformLayout();
this->gboxCRC->ResumeLayout(false);
this->gboxCRC->PerformLayout();
(cli::safe_cast<System::ComponentModel::ISupportInitialize^ >(this->numEULA))->EndInit();
this->gboxPerson2->ResumeLayout(false);
this->gboxPerson2->PerformLayout();
this->gboxPerson1->ResumeLayout(false);
@ -3890,7 +3866,6 @@ private: System::Windows::Forms::RadioButton^ rIsNoIcon;
MasterEditorTWL::appendXmlTag( doc, form, "DisplayIcon", "None" );
MasterEditorTWL::appendXmlTag( doc, form, "IsEULA", (this->cboxIsEULA->Checked)?"Y":"N" );
MasterEditorTWL::appendXmlTag( doc, form, "EULAVersion", this->numEULA->Value.ToString() );
MasterEditorTWL::appendXmlTag( doc, form, "Region", this->combRegion->SelectedIndex.ToString() );
MasterEditorTWL::appendXmlTag( doc, form, "RatingCERO", this->combCERO->SelectedIndex.ToString() );
MasterEditorTWL::appendXmlTag( doc, form, "RpCERO", (this->cboxAlwaysCERO->Checked)?"Y":"N" );
@ -4030,7 +4005,6 @@ private: System::Windows::Forms::RadioButton^ rIsNoIcon;
this->parseTmp( root, "/MasterEditorTWL/Form/DisplayIcon", rbuts, strs );
this->parseTmp( root, "/MasterEditorTWL/Form/IsEULA", this->cboxIsEULA );
this->parseTmp( root, "/MasterEditorTWL/Form/EULAVersion", this->numEULA );
this->parseTmp( root, "/MasterEditorTWL/Form/Region", this->combRegion );
this->parseTmp( root, "/MasterEditorTWL/Form/RatingCERO", this->combCERO );
this->parseTmp( root, "/MasterEditorTWL/Form/RpCERO", this->cboxAlwaysCERO );
@ -4181,7 +4155,6 @@ private: System::Windows::Forms::RadioButton^ rIsNoIcon;
void readOnly( void )
{
this->cboxIsEULA->Enabled = false;
this->numEULA->Enabled = false;
this->rIsWirelessIcon->Enabled = false;
this->rIsWiFiIcon->Enabled = false;
this->rIsNoIcon->Enabled = false;
@ -4222,7 +4195,6 @@ private: System::Windows::Forms::RadioButton^ rIsNoIcon;
// TWL拡張領域のいくつかの情報をROMヘッダに反映させる
this->hSrl->hIsEULA = this->cboxIsEULA->Checked;
this->hSrl->hEULAVersion = gcnew System::Byte( System::Decimal::ToByte( this->numEULA->Value ) );
this->hSrl->hIsWiFiIcon = this->rIsWiFiIcon->Checked;
this->hSrl->hIsWirelessIcon = this->rIsWirelessIcon->Checked;
@ -4399,7 +4371,6 @@ private: System::Windows::Forms::RadioButton^ rIsNoIcon;
// 編集可能情報
this->cboxIsEULA->Checked = *(this->hSrl->hIsEULA);
this->numEULA->Value = *(this->hSrl->hEULAVersion);
if( ( *this->hSrl->hIsWiFiIcon && *this->hSrl->hIsWirelessIcon) ||
(!(*this->hSrl->hIsWiFiIcon) && !(*this->hSrl->hIsWirelessIcon)) )
{
@ -5462,7 +5433,6 @@ private: System::Windows::Forms::RadioButton^ rIsNoIcon;
this->labCaptionEx->Text = gcnew System::String( "特記事項" );
// SRL編集可能情報
this->labEULA->Text = gcnew System::String( LANG_EULA_VER_J );
this->cboxIsEULA->Text = gcnew System::String( LANG_EULA_J );
this->gboxIcon->Text = gcnew System::String( LANG_ICON_J );
this->rIsWirelessIcon->Text = gcnew System::String( LANG_WIRELESS_ICON_J );
@ -5689,7 +5659,6 @@ private: System::Windows::Forms::RadioButton^ rIsNoIcon;
this->labCaptionEx->Text = gcnew System::String( "Special Note" );
// SRL編集可能情報
this->labEULA->Text = gcnew System::String( LANG_EULA_VER_E );
this->cboxIsEULA->Text = gcnew System::String( LANG_EULA_E );
this->gboxIcon->Text = gcnew System::String( LANG_ICON_E );
this->rIsWirelessIcon->Text = gcnew System::String( LANG_WIRELESS_ICON_E );
@ -6408,7 +6377,6 @@ private: System::Windows::Forms::RadioButton^ rIsNoIcon;
// 編集可能情報を読み込み時の設定に戻す
this->cboxIsEULA->Checked = *(this->hSrl->hIsEULA);
this->numEULA->Value = *(this->hSrl->hEULAVersion);
if( ( *this->hSrl->hIsWiFiIcon && *this->hSrl->hIsWirelessIcon) ||
(!(*this->hSrl->hIsWiFiIcon) && !(*this->hSrl->hIsWirelessIcon)) )
{

4
build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp
View File

@ -247,10 +247,6 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet(
node->FirstChild->Value = lib;
}
// ROM<4F>î•ñ (TWLŠg’£<E28099>î•ñ)
if( node->FirstChild->Value->Equals( "TagEULAVersion" ) )
{
node->FirstChild->Value = hSrl->hEULAVersion->ToString();
}
if( node->FirstChild->Value->Equals( "TagTitleIDLo" ) )
{
node->FirstChild->Value = hSrl->hTitleIDLo;

22
build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp
View File

@ -202,7 +202,6 @@ ECSrlResult RCSrl::setRomInfo(void)
this->hIsTmpJump = gcnew System::Boolean( (this->pRomHeader->s.permit_landing_tmp_jump != 0)?true:false );
this->hNormalRomOffset = gcnew System::UInt32( (u32)(this->pRomHeader->s.twl_card_normal_area_rom_offset) * 0x80000 );
this->hKeyTableRomOffset = gcnew System::UInt32( (u32)(this->pRomHeader->s.twl_card_keytable_area_rom_offset) * 0x80000 );
this->hEULAVersion = gcnew System::Byte( this->pRomHeader->s.agree_EULA_version );
this->hPublicSize = gcnew System::UInt32( this->pRomHeader->s.public_save_data_size );
this->hPrivateSize = gcnew System::UInt32( this->pRomHeader->s.private_save_data_size );
@ -340,7 +339,6 @@ ECSrlResult RCSrl::setRomHeader(void)
// いくつかのフラグをROMヘッダに反映
this->pRomHeader->s.exFlags.agree_EULA = (*(this->hIsEULA) == true)?1:0;
this->pRomHeader->s.agree_EULA_version = *(this->hEULAVersion);
this->pRomHeader->s.exFlags.WiFiConnectionIcon = (*(this->hIsWiFiIcon) == true)?1:0;
this->pRomHeader->s.exFlags.DSWirelessIcon = (*(this->hIsWirelessIcon) == true)?1:0;
@ -966,7 +964,7 @@ ECSrlResult RCSrl::mrcNTR( FILE *fp )
if( !bRsv )
{
this->hErrorList->Add( gcnew RCMrcError(
"予約領域C", 0x078, 0x07f, "不正な値が含まれています。この領域をすべて0で埋めてください。",
"予約領域C", 0x160, 0x17f, "不正な値が含まれています。この領域をすべて0で埋めてください。",
"Reserved Area C", "Invalid data is included. Please set 0 into this area.", false, true ) );
}
@ -1272,7 +1270,7 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp )
true, true ) ); // 修正可能
}
if( *(this->hIsSCFGAccess) == true )
if( (*this->hIsAppLauncher == false) && (*this->hIsSCFGAccess == true) )
{
this->hWarnList->Add( gcnew RCMrcError(
"SCFG設定", 0x1b8, 0x1bb, "SCFGレジスタへアクセス可能になっています。",
@ -1327,10 +1325,10 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp )
if( *this->hIsOldDevEncrypt && *this->hHasDSDLPlaySign )
{
this->hErrorList->Add( gcnew RCMrcError(
"クローンブート署名", METWL_ERRLIST_NORANGE, METWL_ERRLIST_NORANGE,
"SDKがクローンブートに対応していないため、ROM出しによってデータに矛盾が生じます。任天堂窓口にご相談ください。",
"Clone-Boot Signature",
"Since SDK used by this ROM is not support for making Clone-Boot ROM, Mastering ROM will be error. Please contact nintendo, sorry.",
"旧開発用暗号フラグ", METWL_ERRLIST_NORANGE, METWL_ERRLIST_NORANGE,
"このROMはクローンブート対応アプリですが、製品用本体ではクローンブートができなくなります。",
"Old Development Flag",
"This ROM supports Clone-Boot, and the flag is old type. Therefore, Clone-Boot is ",
false, true ) );
}
@ -1361,14 +1359,6 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp )
"SDK Version", "The data doesn't match one registered in this program.", false, true ) );
}
// EULAバージョン
if( *(this->hEULAVersion) != *(this->hMrcSpecialList->hEULAVer) )
{
this->hWarnList->Add( gcnew RCMrcError(
"EULA バージョン", METWL_ERRLIST_NORANGE, METWL_ERRLIST_NORANGE, "本プログラムに登録されているバージョン情報と一致しません。",
"EULA Version", "The data doesn't match one registered in this program.", false, true ) );
}
// Shared2ファイルサイズ
for( i=0; i < METWL_NUMOF_SHARED2FILES; i++ )
{

1
build/tools/MasterEditorTWL/MasterEditorTWL/srl.h
View File

@ -267,7 +267,6 @@ namespace MasterEditorTWL
// TWL専用情報 一部編集可能
property System::UInt32 ^hNormalRomOffset;
property System::UInt32 ^hKeyTableRomOffset;
property System::Byte ^hEULAVersion; // •Ò<EFBFBD>W‰Â”\
property System::String ^hTitleIDLo;
property System::UInt32 ^hTitleIDHi;
property System::Boolean ^hIsAppLauncher; // TitleIDLoからわかるアプリ種別

2134
build/tools/MasterEditorTWL/resource/sheet_templete.xml
View File

File diff suppressed because it is too large Load Diff