diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb index b82c2472..1eb84c0f 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 b853652e..acbc8921 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 7bb5bc6b..ab45d19d 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/Form_deliv.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp index eb9976fb..9a4469b2 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp @@ -177,6 +177,85 @@ void Form1::setDeliverableProperties(void) { this->hDeliv->hBackupMemory = this->tboxBackupOther->Text; } + + // SRL情報を文字列で登録 + if( this->combCERO->SelectedIndex < 0 ) + { + if( this->stripItemJapanese->Checked == true ) + this->hDeliv->hCERO = gcnew System::String("未定義"); + else + this->hDeliv->hCERO = gcnew System::String("Undefined"); + } + else + { + this->hDeliv->hCERO = dynamic_cast(this->combCERO->SelectedItem); + } + if( this->combESRB->SelectedIndex < 0 ) + { + if( this->stripItemJapanese->Checked == true ) + this->hDeliv->hESRB = gcnew System::String("未定義"); + else + this->hDeliv->hESRB = gcnew System::String("Undefined"); + } + else + { + this->hDeliv->hESRB = dynamic_cast(this->combESRB->SelectedItem); + } + if( this->combUSK->SelectedIndex < 0 ) + { + if( this->stripItemJapanese->Checked == true ) + this->hDeliv->hUSK = gcnew System::String("未定義"); + else + this->hDeliv->hUSK = gcnew System::String("Undefined"); + } + else + { + this->hDeliv->hUSK = dynamic_cast(this->combUSK->SelectedItem); + } + if( this->combPEGI->SelectedIndex < 0 ) + { + if( this->stripItemJapanese->Checked == true ) + this->hDeliv->hPEGI = gcnew System::String("未定義"); + else + this->hDeliv->hPEGI = gcnew System::String("Undefined"); + } + else + { + this->hDeliv->hPEGI = dynamic_cast(this->combPEGI->SelectedItem); + } + if( this->combPEGI_PRT->SelectedIndex < 0 ) + { + if( this->stripItemJapanese->Checked == true ) + this->hDeliv->hPEGI_PRT = gcnew System::String("未定義"); + else + this->hDeliv->hPEGI_PRT = gcnew System::String("Undefined"); + } + else + { + this->hDeliv->hPEGI_PRT = dynamic_cast(this->combPEGI_PRT->SelectedItem); + } + if( this->combPEGI_BBFC->SelectedIndex < 0 ) + { + if( this->stripItemJapanese->Checked == true ) + this->hDeliv->hPEGI_BBFC = gcnew System::String("未定義"); + else + this->hDeliv->hPEGI_BBFC = gcnew System::String("Undefined"); + } + else + { + this->hDeliv->hPEGI_BBFC = dynamic_cast(this->combPEGI_BBFC->SelectedItem); + } + if( this->combOFLC->SelectedIndex < 0 ) + { + if( this->stripItemJapanese->Checked == true ) + this->hDeliv->hOFLC = gcnew System::String("未定義"); + else + this->hDeliv->hOFLC = gcnew System::String("Undefined"); + } + else + { + this->hDeliv->hOFLC = dynamic_cast(this->combOFLC->SelectedItem); + } } // ---------------------------------------------- diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp index 5483eb1b..25306753 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp @@ -491,194 +491,34 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( } // ペアレンタルコントロール - //if( node->FirstChild->Value->Equals( "TagRatingCERO" ) ) - //{ - // node->FirstChild->Value = hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_CERO ]->ToString(); - //} - //if( node->FirstChild->Value->Equals( "TagRatingCEROStr" ) ) - //{ - // node->FirstChild->Value = MasterEditorTWL::transRatingToString( - // OS_TWL_PCTL_OGN_CERO, - // *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_CERO ]), - // *(hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_CERO ]), - // english ); - //} - //if( node->FirstChild->Value->Equals( "TagEnableCERO" ) ) - //{ - // if( *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_CERO ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - //if( node->FirstChild->Value->Equals( "TagAlwaysCERO" ) ) - //{ - // if( *(hSrl->hArrayParentalAlways[ OS_TWL_PCTL_OGN_CERO ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - - //if( node->FirstChild->Value->Equals( "TagRatingESRB" ) ) - //{ - // node->FirstChild->Value = hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_ESRB ]->ToString(); - //} - //if( node->FirstChild->Value->Equals( "TagRatingESRBStr" ) ) - //{ - // node->FirstChild->Value = MasterEditorTWL::transRatingToString( - // OS_TWL_PCTL_OGN_ESRB, - // *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_ESRB ]), - // *(hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_ESRB ]), - // english ); - //} - //if( node->FirstChild->Value->Equals( "TagEnableESRB" ) ) - //{ - // if( *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_ESRB ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - //if( node->FirstChild->Value->Equals( "TagAlwaysESRB" ) ) - //{ - // if( *(hSrl->hArrayParentalAlways[ OS_TWL_PCTL_OGN_ESRB ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - - //if( node->FirstChild->Value->Equals( "TagRatingUSK" ) ) - //{ - // node->FirstChild->Value = hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_USK ]->ToString(); - //} - //if( node->FirstChild->Value->Equals( "TagRatingUSKStr" ) ) - //{ - // node->FirstChild->Value = MasterEditorTWL::transRatingToString( - // OS_TWL_PCTL_OGN_USK, - // *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_USK ]), - // *(hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_USK ]), - // english ); - //} - //if( node->FirstChild->Value->Equals( "TagEnableUSK" ) ) - //{ - // if( *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_USK ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - //if( node->FirstChild->Value->Equals( "TagAlwaysUSK" ) ) - //{ - // if( *(hSrl->hArrayParentalAlways[ OS_TWL_PCTL_OGN_USK ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - - //if( node->FirstChild->Value->Equals( "TagRatingPEGI" ) ) - //{ - // node->FirstChild->Value = hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_PEGI_GEN ]->ToString(); - //} - //if( node->FirstChild->Value->Equals( "TagRatingPEGIStr" ) ) - //{ - // node->FirstChild->Value = MasterEditorTWL::transRatingToString( - // OS_TWL_PCTL_OGN_PEGI_GEN, - // *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_PEGI_GEN ]), - // *(hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_PEGI_GEN ]), - // english ); - //} - //if( node->FirstChild->Value->Equals( "TagEnablePEGI" ) ) - //{ - // if( *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_PEGI_GEN ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - //if( node->FirstChild->Value->Equals( "TagAlwaysPEGI" ) ) - //{ - // if( *(hSrl->hArrayParentalAlways[ OS_TWL_PCTL_OGN_PEGI_GEN ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - - //if( node->FirstChild->Value->Equals( "TagRatingPEGI_PRT" ) ) - //{ - // node->FirstChild->Value = hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_PEGI_PRT ]->ToString(); - //} - //if( node->FirstChild->Value->Equals( "TagRatingPEGI_PRTStr" ) ) - //{ - // node->FirstChild->Value = MasterEditorTWL::transRatingToString( - // OS_TWL_PCTL_OGN_PEGI_PRT, - // *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_PEGI_PRT ]), - // *(hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_PEGI_PRT ]), - // english ); - //} - //if( node->FirstChild->Value->Equals( "TagEnablePEGI_PRT" ) ) - //{ - // if( *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_PEGI_PRT ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - //if( node->FirstChild->Value->Equals( "TagAlwaysPEGI_PRT" ) ) - //{ - // if( *(hSrl->hArrayParentalAlways[ OS_TWL_PCTL_OGN_PEGI_PRT ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - - //if( node->FirstChild->Value->Equals( "TagRatingPEGI_BBFC" ) ) - //{ - // node->FirstChild->Value = hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_PEGI_BBFC ]->ToString(); - //} - //if( node->FirstChild->Value->Equals( "TagRatingPEGI_BBFCStr" ) ) - //{ - // node->FirstChild->Value = MasterEditorTWL::transRatingToString( - // OS_TWL_PCTL_OGN_PEGI_BBFC, - // *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_PEGI_BBFC ]), - // *(hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_PEGI_BBFC ]), - // english ); - //} - //if( node->FirstChild->Value->Equals( "TagEnablePEGI_BBFC" ) ) - //{ - // if( *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_PEGI_BBFC ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - //if( node->FirstChild->Value->Equals( "TagAlwaysPEGI_BBFC" ) ) - //{ - // if( *(hSrl->hArrayParentalAlways[ OS_TWL_PCTL_OGN_PEGI_BBFC ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - - //if( node->FirstChild->Value->Equals( "TagRatingOFLC" ) ) - //{ - // node->FirstChild->Value = hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_OFLC ]->ToString(); - //} - //if( node->FirstChild->Value->Equals( "TagRatingOFLCStr" ) ) - //{ - // node->FirstChild->Value = MasterEditorTWL::transRatingToString( - // OS_TWL_PCTL_OGN_OFLC, - // *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_OFLC ]), - // *(hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_OFLC ]), - // english ); - //} - //if( node->FirstChild->Value->Equals( "TagEnableOFLC" ) ) - //{ - // if( *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_OFLC ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - //if( node->FirstChild->Value->Equals( "TagAlwaysOFLC" ) ) - //{ - // if( *(hSrl->hArrayParentalAlways[ OS_TWL_PCTL_OGN_OFLC ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} + if( node->FirstChild->Value->Equals( "TagRatingCERO" ) ) + { + node->FirstChild->Value = this->hCERO; + } + if( node->FirstChild->Value->Equals( "TagRatingESRB" ) ) + { + node->FirstChild->Value = this->hESRB; + } + if( node->FirstChild->Value->Equals( "TagRatingUSK" ) ) + { + node->FirstChild->Value = this->hUSK; + } + if( node->FirstChild->Value->Equals( "TagRatingPEGI" ) ) + { + node->FirstChild->Value = this->hPEGI; + } + if( node->FirstChild->Value->Equals( "TagRatingPEGI_PRT" ) ) + { + node->FirstChild->Value = this->hPEGI_PRT; + } + if( node->FirstChild->Value->Equals( "TagRatingPEGI_BBFC" ) ) + { + node->FirstChild->Value = this->hPEGI_BBFC; + } + if( node->FirstChild->Value->Equals( "TagRatingOFLC" ) ) + { + node->FirstChild->Value = this->hOFLC; + } // ROM内登録データを1バイトずつ表に書き込む if( node->FirstChild->Value->Equals( "TagRomVersionHex" ) ) diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h index 980c2b23..d2f7a94a 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h @@ -86,6 +86,15 @@ namespace MasterEditorTWL // ROMヘッダ不記載のROMバイナリ(SRL)固有情報 property System::String ^hBackupMemory; // バックアップメモリの種別 + // SRL情報の一部を文字列で持っておく + property System::String ^hCERO; + property System::String ^hESRB; + property System::String ^hUSK; + property System::String ^hPEGI; + property System::String ^hPEGI_PRT; + property System::String ^hPEGI_BBFC; + property System::String ^hOFLC; + // constructor and destructor public: diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp index 7961e912..b7d3f5e8 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp @@ -518,7 +518,7 @@ void RCSrl::setParentalControlHeader(void) } else // レーティング年齢を設定 { - rating = OS_TWL_PCTL_OGNINFO_ALWAYS_MASK | ages[ index ]; + rating = OS_TWL_PCTL_OGNINFO_ENABLE_MASK | ages[ index ]; } } this->pRomHeader->s.parental_control_rating_info[i] = rating; diff --git a/build/tools/MasterEditorTWL/resource/sheet_templete.xml b/build/tools/MasterEditorTWL/resource/sheet_templete.xml index 50075c0a..3acb6a0d 100644 --- a/build/tools/MasterEditorTWL/resource/sheet_templete.xml +++ b/build/tools/MasterEditorTWL/resource/sheet_templete.xml @@ -33,39 +33,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + - + - - + - - - - - - - - - - - - - - - - - - -