diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index aa3b74e..02e41c0 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index 8cba8d5..9884fb9 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 817a4bf..011759f 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp index e05f0a7..8c4a3ce 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp @@ -123,7 +123,7 @@ void Form1::setRegionForms(void) index = -1; // 不正 #if defined(METWL_VER_APPTYPE_SYSTEM) || defined(METWL_VER_APPTYPE_SECURE) || defined(METWL_VER_APPTYPE_LAUNCHER) if( isJapan && isAmerica && isEurope && isAustralia && isKorea && isChina ) - index = 7; + index = 9; #endif this->combRegion->SelectedIndex = index; this->maskRatingForms(); // ペアレンタルコントロール用フォームの表示/非表示切り替え diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp index 2134896..8835dde 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp @@ -586,6 +586,16 @@ void RCSrl::setRatingRomHeader( u32 region ) } this->pRomHeader->s.parental_control_rating_info[ ogn ] = rating; } +//#if defined(METWL_VER_APPTYPE_SYSTEM) || defined(METWL_VER_APPTYPE_SECURE) || defined(METWL_VER_APPTYPE_LAUNCHER) +// int ogn; +// for( ogn=0; ogn < OS_TWL_PCTL_OGN_MAX; ogn++ ) +// { +// if( ognlist->IndexOf(ogn) < 0 ) +// { +// this->pRomHeader->s.parental_control_rating_info[ ogn ] = OS_TWL_PCTL_OGNINFO_ENABLE_MASK | 0; +// } +// } +//#endif } // ------------------------------------------------------------------- diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/utility.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/utility.cpp index 2ba538d..0e0fca4 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/utility.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/utility.cpp @@ -319,7 +319,6 @@ System::Collections::Generic::List^ MasterEditorTWL::getOgnListInRegion( u3 #if defined(METWL_VER_APPTYPE_SYSTEM) || defined(METWL_VER_APPTYPE_SECURE) || defined(METWL_VER_APPTYPE_LAUNCHER) case METWL_MASK_REGION_ALL: - list->Add( OS_TWL_PCTL_OGN_CERO ); list->Add( OS_TWL_PCTL_OGN_ESRB ); list->Add( OS_TWL_PCTL_OGN_USK );