diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp index 57b136f..8092c71 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp @@ -294,6 +294,12 @@ extern "C" void nnMain(void) titleColor.g = 0.55f; titleColor.b = 1.0f; } + else if (GetRestoreMode() == RESTORE_MODE_CHECK_SALVAGE) + { + titleColor.r = 0.33f; + titleColor.g = 0.10f; + titleColor.b = 0.55f; + } // 上画面表示 common::DrawSystemState("CTR Console Restore", s_RenderSystem, titleColor, flip, adapterState, @@ -327,6 +333,10 @@ extern "C" void nnMain(void) { s_RenderSystem.DrawText(0, lineBottom * spaceSize, "DL_PREINATALL Mode"); } + else if (GetRestoreMode() == RESTORE_MODE_CHECK_SALVAGE) + { + s_RenderSystem.DrawText(0, lineBottom * spaceSize, "GET_SDCI + CHECK_SALVAGE 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 edf5ac4..b46f997 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp @@ -804,7 +804,14 @@ bool CheckAndReadAPSetting(common::OperationMessage& operationMessage) if (s_GetIvsOnlyMode) { - s_RestoreMode = RESTORE_MODE_GET_IVS; + if(s_CheckAccountSalvageResult) + { + s_RestoreMode = RESTORE_MODE_CHECK_SALVAGE; + } + else + { + s_RestoreMode = RESTORE_MODE_GET_IVS; + } } if(s_CheckSdOnlyMode) @@ -2123,13 +2130,19 @@ void InitializeState() s_ReadSettingDone = false; s_ReadSettingIsSuccess = false; + s_PlayedFailSound = false; s_ExecuteFgNup = false; s_FgNupRetryCount = 0; + s_NupOnlyMode = false; s_GetIvsOnlyMode = false; s_CheckSdOnlyMode = false; s_SkipNupMode = false; + s_DownloadPreinstallMode = false; + s_ForceDownloadPreinstall = false; + s_CheckAccountSalvageResult = false; + s_ExecutePreparePreinstallTitleDownload = false; s_ExecutePreinstallTitleDownload = false; s_PreinstallTitleDownloadSuccess = false; diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.h index 58d82f6..5f8c982 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.h +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.h @@ -31,7 +31,8 @@ typedef enum RestoreMode RESTORE_MODE_NUP_ONLY, RESTORE_MODE_GET_IVS, RESTORE_MODE_CHECK_SD, - RESTORE_MODE_DOWNLOAD_PREINSTALL + RESTORE_MODE_DOWNLOAD_PREINSTALL, + RESTORE_MODE_CHECK_SALVAGE } RestoreMode;