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

マスタエディタ:リマスターバージョンのチェック範囲を変更。提出バージョンの上限を15にする。

Browse Source 
git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2616 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
nishikawa_takeshi 2008-10-16 02:45:24 +00:00
parent e1d224dda1
commit 6dfe02c9c6
7 changed files with 44 additions and 41 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.

2
build/tools/MasterEditorTWL/MasterEditorTWL/AssemblyInfo.cpp
View File

@ -31,7 +31,7 @@ using namespace System::Security::Permissions;
// すべての値を指定するか、下のように '*' を使ってリビジョンおよびビルド番号を // すべての値を指定するか、下のように '*' を使ってリビジョンおよびビルド番号を
// 既定値にすることができます: // 既定値にすることができます:
[assembly:AssemblyVersionAttribute("1.0.*")]; [assembly:AssemblyVersionAttribute("1.0.1")];
[assembly:ComVisible(false)]; [assembly:ComVisible(false)];

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

Binary file not shown.

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

@ -755,10 +755,10 @@ private: System::Windows::Forms::CheckBox^ cboxIsPhotoEx;
/// </summary> /// </summary>
void InitializeComponent(void) void InitializeComponent(void)
{ {
System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle1 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle5 = (gcnew System::Windows::Forms::DataGridViewCellStyle());
System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle2 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle6 = (gcnew System::Windows::Forms::DataGridViewCellStyle());
System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle3 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle7 = (gcnew System::Windows::Forms::DataGridViewCellStyle());
System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle4 = (gcnew System::Windows::Forms::DataGridViewCellStyle()); System::Windows::Forms::DataGridViewCellStyle^ dataGridViewCellStyle8 = (gcnew System::Windows::Forms::DataGridViewCellStyle());
this->tboxFile = (gcnew System::Windows::Forms::TextBox()); this->tboxFile = (gcnew System::Windows::Forms::TextBox());
this->gboxSrl = (gcnew System::Windows::Forms::GroupBox()); this->gboxSrl = (gcnew System::Windows::Forms::GroupBox());
this->tboxRemasterVer = (gcnew System::Windows::Forms::TextBox()); this->tboxRemasterVer = (gcnew System::Windows::Forms::TextBox());
@ -2082,7 +2082,7 @@ private: System::Windows::Forms::CheckBox^ cboxIsPhotoEx;
// numSubmitVersion // numSubmitVersion
// //
this->numSubmitVersion->Location = System::Drawing::Point(106, 172); this->numSubmitVersion->Location = System::Drawing::Point(106, 172);
this->numSubmitVersion->Maximum = System::Decimal(gcnew cli::array< System::Int32 >(4) {9, 0, 0, 0}); this->numSubmitVersion->Maximum = System::Decimal(gcnew cli::array< System::Int32 >(4) {15, 0, 0, 0});
this->numSubmitVersion->Name = L"numSubmitVersion"; this->numSubmitVersion->Name = L"numSubmitVersion";
this->numSubmitVersion->Size = System::Drawing::Size(38, 19); this->numSubmitVersion->Size = System::Drawing::Size(38, 19);
this->numSubmitVersion->TabIndex = 9; this->numSubmitVersion->TabIndex = 9;
@ -2922,15 +2922,15 @@ private: System::Windows::Forms::CheckBox^ cboxIsPhotoEx;
this->gridLibrary->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridLibrary->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize;
this->gridLibrary->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(2) {this->colLibPublisher, this->gridLibrary->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(2) {this->colLibPublisher,
this->colLibName}); this->colLibName});
dataGridViewCellStyle1->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; dataGridViewCellStyle5->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft;
dataGridViewCellStyle1->BackColor = System::Drawing::SystemColors::Window; dataGridViewCellStyle5->BackColor = System::Drawing::SystemColors::Window;
dataGridViewCellStyle1->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, dataGridViewCellStyle5->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point,
static_cast<System::Byte>(128))); static_cast<System::Byte>(128)));
dataGridViewCellStyle1->ForeColor = System::Drawing::SystemColors::ControlText; dataGridViewCellStyle5->ForeColor = System::Drawing::SystemColors::ControlText;
dataGridViewCellStyle1->SelectionBackColor = System::Drawing::SystemColors::Highlight; dataGridViewCellStyle5->SelectionBackColor = System::Drawing::SystemColors::Highlight;
dataGridViewCellStyle1->SelectionForeColor = System::Drawing::SystemColors::HighlightText; dataGridViewCellStyle5->SelectionForeColor = System::Drawing::SystemColors::HighlightText;
dataGridViewCellStyle1->WrapMode = System::Windows::Forms::DataGridViewTriState::True; dataGridViewCellStyle5->WrapMode = System::Windows::Forms::DataGridViewTriState::True;
this->gridLibrary->DefaultCellStyle = dataGridViewCellStyle1; this->gridLibrary->DefaultCellStyle = dataGridViewCellStyle5;
this->gridLibrary->Location = System::Drawing::Point(337, 189); this->gridLibrary->Location = System::Drawing::Point(337, 189);
this->gridLibrary->Name = L"gridLibrary"; this->gridLibrary->Name = L"gridLibrary";
this->gridLibrary->ReadOnly = true; this->gridLibrary->ReadOnly = true;
@ -3348,15 +3348,15 @@ private: System::Windows::Forms::CheckBox^ cboxIsPhotoEx;
this->gridWarn->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridWarn->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize;
this->gridWarn->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(4) {this->colWarnName, this->gridWarn->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(4) {this->colWarnName,
this->colWarnBegin, this->colWarnEnd, this->colWarnCause}); this->colWarnBegin, this->colWarnEnd, this->colWarnCause});
dataGridViewCellStyle2->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; dataGridViewCellStyle6->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft;
dataGridViewCellStyle2->BackColor = System::Drawing::SystemColors::Window; dataGridViewCellStyle6->BackColor = System::Drawing::SystemColors::Window;
dataGridViewCellStyle2->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, dataGridViewCellStyle6->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point,
static_cast<System::Byte>(128))); static_cast<System::Byte>(128)));
dataGridViewCellStyle2->ForeColor = System::Drawing::SystemColors::ControlText; dataGridViewCellStyle6->ForeColor = System::Drawing::SystemColors::ControlText;
dataGridViewCellStyle2->SelectionBackColor = System::Drawing::SystemColors::Highlight; dataGridViewCellStyle6->SelectionBackColor = System::Drawing::SystemColors::Highlight;
dataGridViewCellStyle2->SelectionForeColor = System::Drawing::SystemColors::HighlightText; dataGridViewCellStyle6->SelectionForeColor = System::Drawing::SystemColors::HighlightText;
dataGridViewCellStyle2->WrapMode = System::Windows::Forms::DataGridViewTriState::True; dataGridViewCellStyle6->WrapMode = System::Windows::Forms::DataGridViewTriState::True;
this->gridWarn->DefaultCellStyle = dataGridViewCellStyle2; this->gridWarn->DefaultCellStyle = dataGridViewCellStyle6;
this->gridWarn->GridColor = System::Drawing::SystemColors::Control; this->gridWarn->GridColor = System::Drawing::SystemColors::Control;
this->gridWarn->Location = System::Drawing::Point(24, 228); this->gridWarn->Location = System::Drawing::Point(24, 228);
this->gridWarn->Name = L"gridWarn"; this->gridWarn->Name = L"gridWarn";
@ -3396,22 +3396,22 @@ private: System::Windows::Forms::CheckBox^ cboxIsPhotoEx;
// //
// gridError // gridError
// //
dataGridViewCellStyle3->BackColor = System::Drawing::Color::White; dataGridViewCellStyle7->BackColor = System::Drawing::Color::White;
this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7;
this->gridError->AutoSizeRowsMode = System::Windows::Forms::DataGridViewAutoSizeRowsMode::AllCellsExceptHeaders; this->gridError->AutoSizeRowsMode = System::Windows::Forms::DataGridViewAutoSizeRowsMode::AllCellsExceptHeaders;
this->gridError->BackgroundColor = System::Drawing::SystemColors::Control; this->gridError->BackgroundColor = System::Drawing::SystemColors::Control;
this->gridError->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridError->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize;
this->gridError->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(4) {this->colErrorName, this->gridError->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(4) {this->colErrorName,
this->colErrorBegin, this->colErrorEnd, this->colErrorCause}); this->colErrorBegin, this->colErrorEnd, this->colErrorCause});
dataGridViewCellStyle4->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; dataGridViewCellStyle8->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft;
dataGridViewCellStyle4->BackColor = System::Drawing::SystemColors::Window; dataGridViewCellStyle8->BackColor = System::Drawing::SystemColors::Window;
dataGridViewCellStyle4->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, dataGridViewCellStyle8->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point,
static_cast<System::Byte>(128))); static_cast<System::Byte>(128)));
dataGridViewCellStyle4->ForeColor = System::Drawing::SystemColors::ControlText; dataGridViewCellStyle8->ForeColor = System::Drawing::SystemColors::ControlText;
dataGridViewCellStyle4->SelectionBackColor = System::Drawing::SystemColors::Highlight; dataGridViewCellStyle8->SelectionBackColor = System::Drawing::SystemColors::Highlight;
dataGridViewCellStyle4->SelectionForeColor = System::Drawing::SystemColors::HighlightText; dataGridViewCellStyle8->SelectionForeColor = System::Drawing::SystemColors::HighlightText;
dataGridViewCellStyle4->WrapMode = System::Windows::Forms::DataGridViewTriState::True; dataGridViewCellStyle8->WrapMode = System::Windows::Forms::DataGridViewTriState::True;
this->gridError->DefaultCellStyle = dataGridViewCellStyle4; this->gridError->DefaultCellStyle = dataGridViewCellStyle8;
this->gridError->GridColor = System::Drawing::SystemColors::Control; this->gridError->GridColor = System::Drawing::SystemColors::Control;
this->gridError->Location = System::Drawing::Point(24, 99); this->gridError->Location = System::Drawing::Point(24, 99);
this->gridError->Name = L"gridError"; this->gridError->Name = L"gridError";
@ -3876,11 +3876,13 @@ private: System::Windows::Forms::CheckBox^ cboxIsPhotoEx;
if( this->cboxRemasterVerE->Checked == true ) if( this->cboxRemasterVerE->Checked == true )
{ {
filename = "T" + this->hSrl->hGameCode + "E" + this->numSubmitVersion->Value.ToString() + ".SRL"; filename = "T" + this->hSrl->hGameCode + "E"
+ System::Decimal::ToByte(this->numSubmitVersion->Value).ToString("X") + ".SRL";
} }
else else
{ {
filename = "T" + this->hSrl->hGameCode + this->hSrl->hRomVersion->ToString() + this->numSubmitVersion->Value.ToString() + ".SRL"; filename = "T" + this->hSrl->hGameCode + this->hSrl->hRomVersion->ToString("X")
+ System::Decimal::ToByte(this->numSubmitVersion->Value).ToString("X") + ".SRL";
} }
} }
@ -3983,11 +3985,13 @@ private: System::Windows::Forms::CheckBox^ cboxIsPhotoEx;
if( this->cboxRemasterVerE->Checked == true ) if( this->cboxRemasterVerE->Checked == true )
{ {
srlfile = "T" + this->hSrl->hGameCode + "E" + this->numSubmitVersion->Value.ToString() + ".SRL"; srlfile = "T" + this->hSrl->hGameCode + "E"
+ System::Decimal::ToByte(this->numSubmitVersion->Value).ToString("X") + ".SRL";
} }
else else
{ {
srlfile = "T" + this->hSrl->hGameCode + this->hSrl->hRomVersion->ToString() + this->numSubmitVersion->Value.ToString() + ".SRL"; srlfile = "T" + this->hSrl->hGameCode + this->hSrl->hRomVersion->ToString("X")
+ System::Decimal::ToByte(this->numSubmitVersion->Value).ToString("X") + ".SRL";
} }
} }

3
build/tools/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp
View File

@ -49,14 +49,13 @@ void Form1::setSrlForms(void)
this->tboxPlatform->Text = this->hSrl->hPlatform; this->tboxPlatform->Text = this->hSrl->hPlatform;
this->tboxRomSize->Text = this->hSrl->hRomSize; this->tboxRomSize->Text = this->hSrl->hRomSize;
this->tboxRomLatency->Text = this->hSrl->hLatency; this->tboxRomLatency->Text = this->hSrl->hLatency;
this->tboxRemasterVer->Text = this->hSrl->hRomVersion->ToString("X2");
if( *(this->hSrl->hRomVersion) == 0xE0 ) if( *(this->hSrl->hRomVersion) == 0xE0 )
{ {
this->tboxRemasterVer->Text = gcnew System::String("E");
this->cboxRemasterVerE->Checked = true; this->cboxRemasterVerE->Checked = true;
} }
else else
{ {
this->tboxRemasterVer->Text = this->hSrl->hRomVersion->ToString();
this->cboxRemasterVerE->Checked = false; this->cboxRemasterVerE->Checked = false;
} }

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

@ -1045,11 +1045,11 @@ ECSrlResult RCSrl::mrcNTR( FILE *fp )
} }
u8 romver = this->pRomHeader->s.rom_version; u8 romver = this->pRomHeader->s.rom_version;
if( ((romver < 0x00) || (0x09 < romver)) && (romver != 0xE0) ) if( ((romver < 0x00) || (0x0f < romver)) && (romver != 0xE0) )
{ {
this->hErrorList->Add( gcnew RCMrcError( this->hErrorList->Add( gcnew RCMrcError(
"リマスターバージョン", 0x1e, 0x1e, "不正な値です。正式版では01h-09hのいずれかの値、事前版ではE0hです。", "リマスターバージョン", 0x1e, 0x1e, "不正な値です。正式版では01h-0Fhのいずれかの値、事前版ではE0hを設定してください。",
"Release Ver.", "Invalid data. Please set either one of 01h-09h(Regular ver.), or E0h(Preliminary ver.)", false, true ) ); "Release Ver.", "Invalid data. Please set either one of 01h-0Fh(Regular ver.), or E0h(Preliminary ver.)", false, true ) );
} }
if( this->pRomHeader->s.banner_offset == 0 ) if( this->pRomHeader->s.banner_offset == 0 )
{ {