diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp index c38bf64..3d83e93 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp @@ -261,6 +261,12 @@ extern "C" void nnMain(void) titleColor.g = 0.2f; titleColor.b = 0.2f; } + else if(GetRestoreMode() == RESTORE_MODE_CHECK_SD) + { + titleColor.r = 0.2f; + titleColor.g = 0.2f; + titleColor.b = 1.2f; + } // 上画面表示 common::DrawSystemState("CTR Console Restore", @@ -302,6 +308,10 @@ extern "C" void nnMain(void) { s_RenderSystem.DrawText(0, lineBottom * spaceSize, "GET-IVS Mode"); } + else if (GetRestoreMode() == RESTORE_MODE_CHECK_SD) + { + s_RenderSystem.DrawText(0, lineBottom * spaceSize, "CHECK-SD Mode"); + } s_RenderSystem.SetColor(titleColor.r, titleColor.g, titleColor.b); s_RenderSystem.FillRectangle(0, lineBottom * spaceSize, screenWidth, spaceSize); diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp index b54c01d..03b65b5 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp @@ -48,6 +48,8 @@ bool s_ReadSettingIsSuccess = false; bool s_NupOnlyMode = false; // IVS取得専用モードかどうか bool s_GetIvsOnlyMode = false; +// SDカード確認専用モード +bool s_CheckSdOnlyMode = false; // APSettingの書式が無い警告サウンドを鳴らしたかどうか bool s_ExistAPSettingAnnotation = false; @@ -216,7 +218,14 @@ void CheckApSetting(common::HardwareStateManager& manager, ::std::vector& operationMessage) if (!s_ReadSettingDone) { s_ReadSettingDone = true; - s_ReadSettingIsSuccess = ReadSetting(&s_NupOnlyMode, &s_GetIvsOnlyMode); + s_ReadSettingIsSuccess = ReadSetting(&s_NupOnlyMode, &s_GetIvsOnlyMode, &s_CheckSdOnlyMode); } - if(s_NupOnlyMode && s_GetIvsOnlyMode) + if (s_NupOnlyMode && s_GetIvsOnlyMode + || s_GetIvsOnlyMode && s_CheckSdOnlyMode + || s_CheckSdOnlyMode && s_NupOnlyMode) { - operationMessage.push_back("Both NUP_ONLY and GET_IVS settings are described!!"); + operationMessage.push_back("Only one special mode setting is valid!!"); s_ReadSettingIsSuccess = false; } else @@ -690,6 +701,11 @@ bool CheckAndReadAPSetting(::std::vector& operationMessage) { s_RestoreMode = RESTORE_MODE_GET_IVS; } + + if(s_CheckSdOnlyMode) + { + s_RestoreMode = RESTORE_MODE_CHECK_SD; + } } if (!s_ReadSettingIsSuccess) @@ -1432,6 +1448,7 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector