diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp index d70395a..86016a0 100644 --- a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp +++ b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp @@ -611,7 +611,7 @@ void OnSdEjected() else { InitializeState(); - ClearFileReadReslt(); + ClearFileReadResult(); } } diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp index 012d542..19fc1a8 100644 --- a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp +++ b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp @@ -1167,7 +1167,7 @@ void ImportTwlSoundData() ImportTwlData(common::TWL_SOUND); } -void ClearFileReadReslt() +void ClearFileReadResult() { s_CheckedEqualsIVSFileandIVS = false; s_ReadSerialNumber = false; diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.h b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.h index d4a37ee..0dc1bf0 100644 --- a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.h +++ b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.h @@ -65,7 +65,7 @@ void ImportMcuRtc(); // TWL写真領域を初期化してから本体初期化を行う void InitializeFileSystem(); -void ClearFileReadReslt(); +void ClearFileReadResult(); // プレイ履歴を読み込みます。ptmのセーブデータ移行後に呼び出す必要があります void ImportPlayHistory(); diff --git a/trunk/ConsoleDataMigration/common/DrawSystemState.cpp b/trunk/ConsoleDataMigration/common/DrawSystemState.cpp index 8ca7170..ef2058a 100644 --- a/trunk/ConsoleDataMigration/common/DrawSystemState.cpp +++ b/trunk/ConsoleDataMigration/common/DrawSystemState.cpp @@ -66,10 +66,15 @@ void DrawSystemState { renderSystem.SetClearColor(GetRenderTarget(NN_GX_DISPLAY0, flip), SUCCESS_COLOR); } - if (isBackupFailed) + else if (isBackupFailed) { renderSystem.SetClearColor(GetRenderTarget(NN_GX_DISPLAY0, flip), FAIL_COLOR); } + else + { + renderSystem.SetClearColor(GetRenderTarget(NN_GX_DISPLAY0, flip), NORMAL_COLOR); + } + renderSystem.Clear(); renderSystem.SetColor(1.f, 1.f, 1.f); diff --git a/trunk/ConsoleDataMigration/common/DrawSystemState.h b/trunk/ConsoleDataMigration/common/DrawSystemState.h index 7b7a996..3a99da5 100644 --- a/trunk/ConsoleDataMigration/common/DrawSystemState.h +++ b/trunk/ConsoleDataMigration/common/DrawSystemState.h @@ -38,6 +38,7 @@ #define BLUE_COLOR 0.f, 0.f, 1.f, 1.f #define SUCCESS_COLOR 0.f, 0.6f,0.f, 1.f #define FAIL_COLOR 0.6f, 0.f,0.f, 1.f +#define NORMAL_COLOR 0.f, 0.f, 0.f, 1.f namespace common {