diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp index 8a0cfa3..23e577c 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp @@ -189,6 +189,7 @@ extern "C" void nnMain(void) bool nextStep = false; bool operateBmsDone = false; bool forcePreinstall = false; + bool unregister = false; s_PadReader.ReadLatest(&padStatus); @@ -204,6 +205,7 @@ extern "C" void nnMain(void) { operateBmsDone = true; forcePreinstall = true; + unregister = true; } // LまたはRボタンで上下画面フリップ @@ -258,7 +260,7 @@ extern "C" void nnMain(void) } else { - ControlState(manager, operationMessage, nextStep, operateBmsDone, forcePreinstall); + ControlState(manager, operationMessage, nextStep, operateBmsDone, forcePreinstall, unregister); nn::util::FloatColor titleColor; diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp index e58b916..6df956c 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp @@ -865,7 +865,7 @@ nn::Result ExecSyncMcuRtc(common::HardwareStateManager& manager) } // namespace void ControlState(common::HardwareStateManager& manager, common::OperationMessage& operationMessage, bool& nextStep, - bool operateBmsDone, bool forcePreinstall) + bool operateBmsDone, bool forcePreinstall, bool unregister) { using namespace common; nn::Result result; @@ -1134,11 +1134,11 @@ void ControlState(common::HardwareStateManager& manager, common::OperationMessag case WAIT_START_DELETE_ACCOUNT: { - operationMessage.Add("Push A or START Button"); - operationMessage.Add("Delete Account Mode"); + operationMessage.Add("Delete Account Mode.", nn::util::Color8(255, 153, 0, 255)); + operationMessage.Add("Press Y Button to Continue"); PlayCursorSound(WAIT_START_DELETE_ACCOUNT); - if (nextStep) + if (unregister) { COMMON_LOGGER("Delete Account\n"); s_RestoreState = DELETE_ACCOUNT; @@ -1690,7 +1690,7 @@ void ControlState(common::HardwareStateManager& manager, common::OperationMessag case PREINSTALL_WAIT_START_UPDATE: { operationMessage.Add("Operate BMS to Transfer PreInstalled Application", nn::util::Color8(0, 255, 255, 255)); - operationMessage.Add("and NNAS management Tool.", nn::util::Color8(0, 255, 255, 255)); + operationMessage.Add("and NNAS management Tool.", nn::util::Color8(0, 255, 255, 255)); operationMessage.Add("Press Y Button to Continue."); PlayCursorSound(PREINSTALL_WAIT_START_UPDATE); diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.h index 5499d67..58d82f6 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.h +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.h @@ -44,8 +44,9 @@ const u32 RETRY_MAX = 3; // nextStep 次の状態に遷移してもよいかどうか // operateBmsDone BMS操作を完了したかどうか // forcePreinstall ユーザSDが初期化済みだが、プリインストールアプリを書き込むかどうか +// unregister アカウント削除を開始しても良いか void ControlState(common::HardwareStateManager& manager, common::OperationMessage& operationMessage, bool& nextStep, - bool operateBmsDone, bool forcePreinstall); + bool operateBmsDone, bool forcePreinstall, bool unregister); // リストア処理中かどうか bool InProgress();