rvtr/ctr_Repair
1
Fork 0
mirror of https://github.com/rvtr/ctr_Repair.git synced 2025-10-31 13:51:08 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

アカウント削除前のメッセージをオレンジ色に変更。アカウント削除開始をYボタンに変更

Browse Source 
git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@769 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
N2614 2013-11-27 07:32:42 +00:00
parent 2f4936723d
commit ee4e3e02b8
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp
View File

@ -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;

10
trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
View File

@ -865,7 +865,7 @@ nn::Result ExecSyncMcuRtc(common::HardwareStateManager& manager)
} // namespace <unnamed>
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);

3
trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.h
View File

@ -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();