diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb index a0c6d2d0..bf6dfa83 100644 Binary files a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb differ diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditorTWL/MasterEditorTWL.suo index 949fe27f..46c7f1a2 100644 Binary files a/build/tools/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditorTWL/MasterEditorTWL.suo differ diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index c2391061..6f7809ff 100644 Binary files a/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h index be399253..d5e57477 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -4192,7 +4192,6 @@ private: System::Windows::Forms::TextBox^ tboxMedia; } // TWL拡張情報 - //this->tboxTitleIDLo->Text = this->hSrl->hTitleIDLo->ToString("X8"); this->tboxTitleIDLo->Text = this->hSrl->hTitleIDLo; this->tboxTitleIDHi->Text = this->hSrl->hTitleIDHi->ToString("X8"); this->tboxNormalRomOffset->Text = this->hSrl->hNormalRomOffset->ToString("X8"); diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/common.h b/build/tools/MasterEditorTWL/MasterEditorTWL/common.h index 0c9754d8..9148918e 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/common.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/common.h @@ -1,8 +1,8 @@ #pragma once // ビルドスイッチ -#define METWL_VER_APPTYPE_USER -//#define METWL_VER_APPTYPE_SYSTEM +//#define METWL_VER_APPTYPE_USER +#define METWL_VER_APPTYPE_SYSTEM //#define METWL_VER_APPTYPE_SECURE //#define METWL_VER_APPTYPE_LAUNCHER diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp index 27557a58..fb261018 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp @@ -244,7 +244,6 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( } if( node->FirstChild->Value->Equals( "TagTitleIDLo" ) ) { - //node->FirstChild->Value = "0x" + hSrl->hTitleIDLo->ToString("X8"); node->FirstChild->Value = hSrl->hTitleIDLo; } if( node->FirstChild->Value->Equals( "TagTitleIDHi" ) ) diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp index 0fea1ce8..1ff9df4b 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp @@ -1455,10 +1455,13 @@ void RCSrl::mrcRating( System::Byte ogn ) if( *(this->hArrayParentalEffect[ ogn ]) == false ) { - this->hWarnList->Add( gcnew RCMrcError( - "ペアレンタルコントロール情報", 0x2f0, 0x2ff, ognArray[ ogn ] + warnDisableJ, - "Parental Control", ognArray[ ogn ] + warnDisableE, true, true ) ); - this->clearParentalControl( ogn ); + if( *this->hArrayParentalAlways[ ogn ] || (*this->hArrayParentalRating[ ogn ] != 0 ) ) + { + this->hWarnList->Add( gcnew RCMrcError( + "ペアレンタルコントロール情報", 0x2f0, 0x2ff, ognArray[ ogn ] + warnDisableJ, + "Parental Control", ognArray[ ogn ] + warnDisableE, true, true ) ); + this->clearParentalControl( ogn ); + } } else { diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/srl.h b/build/tools/MasterEditorTWL/MasterEditorTWL/srl.h index 2dd3559d..f68d1732 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/srl.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/srl.h @@ -254,8 +254,6 @@ namespace MasterEditorTWL property System::String ^hMakerCode; property System::String ^hPlatform; property System::String ^hRomSize; - //property System::Byte ^hForKorea; - //property System::Byte ^hForChina; property System::Byte ^hRomVersion; property System::UInt16 ^hHeaderCRC; property System::String ^hLatency; // MROM/1TROM/Illegal @@ -269,7 +267,6 @@ namespace MasterEditorTWL property System::UInt32 ^hNormalRomOffset; property System::UInt32 ^hKeyTableRomOffset; property System::Byte ^hEULAVersion; // 編集可能 - //property System::UInt32 ^hTitleIDLo; property System::String ^hTitleIDLo; property System::UInt32 ^hTitleIDHi; property System::Boolean ^hIsAppLauncher; // TitleIDLoからわかるアプリ種別 @@ -308,12 +305,6 @@ namespace MasterEditorTWL property System::Boolean ^hIsCommonClientKeyForDebugger; // Shared2ファイルサイズ Read Only - //property System::UInt32 ^hShared2Size0; - //property System::UInt32 ^hShared2Size1; - //property System::UInt32 ^hShared2Size2; - //property System::UInt32 ^hShared2Size3; - //property System::UInt32 ^hShared2Size4; - //property System::UInt32 ^hShared2Size5; property cli::array ^hShared2SizeArray; // カードリージョン Read Only