diff --git a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/include/kami_global.h b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/include/kami_global.h index 20ee16b9..2a11c514 100644 --- a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/include/kami_global.h +++ b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/include/kami_global.h @@ -47,7 +47,7 @@ typedef enum 定数定義 *---------------------------------------------------------------------------*/ -#define SYSTEM_UPDATER_NAME L"SystemUpdater ver.1.0b" +#define SYSTEM_UPDATER_NAME L"SystemUpdater ver.1.0c" #define SYSTEM_UPDATER_LOG_PATH "nand:/sys/log/updater.log" #define SYSTEM_UPDATER_MAGIC_CODE 44001111 @@ -60,8 +60,6 @@ extern const char *g_strSDKSvnRevision; extern s32 gLockId; extern const u16* sRegionStringArray[4]; extern OSTWLRegion gRegion; -extern const char* gDirectoryNameConsole[]; -extern const char* gDirectoryNameRegion[]; /*---------------------------------------------------------------------------* 関数宣言 diff --git a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_delete_other_region_sysmenu.c b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_delete_other_region_sysmenu.c index 0872ec18..e5bedeed 100644 --- a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_delete_other_region_sysmenu.c +++ b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_delete_other_region_sysmenu.c @@ -74,6 +74,22 @@ static const u64 sTitleIdListHNL[TITLE_ID_LIST_NUM] = 0x0003000f484e4c55, // Australia HNLU }; +static const u64 sTitleIdListHNI[TITLE_ID_LIST_NUM] = +{ + 0x00030005484e494A, // Japan HNIJ + 0x00030005484e4945, // America HNIE + 0x00030005484e4950, // Europe HNIP + 0x00030005484e4955, // Australia HNIU +}; + +static const u64 sTitleIdListHNK[TITLE_ID_LIST_NUM] = +{ + 0x00030005484e4B4A, // Japan HNKJ + 0x00030005484e4B45, // America HNKE + 0x00030005484e4B50, // Europe HNKP + 0x00030005484e4B55, // Australia HNKU +}; + /*---------------------------------------------------------------------------* 内部関数宣言 *---------------------------------------------------------------------------*/ @@ -131,6 +147,24 @@ BOOL ProcessDeleteOtherResionSysmenu(void) } } + // 選択リージョンと異なる写真帳は消去する + for (i=0;ilongname); + STD_TSNPrintf(full_path, sizeof(full_path), "%s/%s", directory, info->longname); // kamiFontPrintfConsole(CONSOLE_GREEN, " %s\n", full_path); // MAX_RETRY_COUNTまでリトライする @@ -165,17 +197,17 @@ BOOL ProcessImport(void) } else { - kamiFontPrintfConsole(CONSOLE_GREEN, "Import %d Retry!\n", i); + kamiFontPrintfConsole(CONSOLE_GREEN, "Import %d Retry!\n", listNo); } } if ( nam_result == NAM_OK) { - kamiFontPrintfConsole(FONT_COLOR_GREEN, "List : %d Import Success.\n", i); + kamiFontPrintfConsole(FONT_COLOR_GREEN, "List : %d Import Success.\n", listNo); } else { - kamiFontPrintfConsole(FONT_COLOR_RED, "Error: %d : RetCode = %d\n", i, nam_result ); + kamiFontPrintfConsole(FONT_COLOR_RED, "Error: %d : RetCode = %d\n", listNo, nam_result ); result = FALSE; } @@ -185,11 +217,6 @@ BOOL ProcessImport(void) } } - while (!FadeOutTick()) - { - OS_WaitVBlankIntr(); - } - return result; } diff --git a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_nandfirm.c b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_nandfirm.c index e5d12fb6..66b65ff2 100644 --- a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_nandfirm.c +++ b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_nandfirm.c @@ -69,7 +69,7 @@ BOOL ProcessNandfirm(void) int i; // 適切なディレクトリを開く - STD_TSNPrintf(full_path, sizeof(full_path), "rom:/data/%s/%s/", gDirectoryNameConsole[GetConsole()], gDirectoryNameRegion[gRegion]); + STD_TSNPrintf(full_path, sizeof(full_path), "rom:/data/common/"); FS_InitFile(&dir); if (!FS_OpenDirectory(&dir, full_path, FS_FILEMODE_R)) @@ -91,7 +91,7 @@ BOOL ProcessNandfirm(void) { if (!STD_CompareString( pExtension, ".nand") || !STD_CompareString( pExtension, ".NAND") ) { - STD_TSNPrintf(full_path, sizeof(full_path), "rom:/data/%s/%s/%s", gDirectoryNameConsole[GetConsole()], gDirectoryNameRegion[gRegion], info->longname); + STD_TSNPrintf(full_path, sizeof(full_path), "rom:/data/common/%s", info->longname); find = TRUE; break; } diff --git a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_write_font.c b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_write_font.c index ce775393..fc7a6285 100644 --- a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_write_font.c +++ b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_write_font.c @@ -88,7 +88,7 @@ BOOL ProcessWriteFont(void) */ // 適切なディレクトリを開く - STD_TSNPrintf(full_path, sizeof(full_path), "rom:/data/%s/%s/", gDirectoryNameConsole[GetConsole()], gDirectoryNameRegion[gRegion]); + STD_TSNPrintf(full_path, sizeof(full_path), "rom:/data/common/"); FS_InitFile(&dir); if (!FS_OpenDirectory(&dir, full_path, FS_FILEMODE_R)) @@ -110,7 +110,7 @@ BOOL ProcessWriteFont(void) { if (!STD_CompareString( pExtension, ".dat") || !STD_CompareString( pExtension, ".DAT") ) { - STD_TSNPrintf(full_path, sizeof(full_path), "rom:/data/%s/%s/%s", gDirectoryNameConsole[GetConsole()], gDirectoryNameRegion[gRegion], info->longname); + STD_TSNPrintf(full_path, sizeof(full_path), "rom:/data/common/%s", info->longname); find = TRUE; break; } diff --git a/build/systemMenu_tools/SystemUpdaterRegionSelect/readme.txt b/build/systemMenu_tools/SystemUpdaterRegionSelect/readme.txt index daf73277..2b7fe07a 100644 --- a/build/systemMenu_tools/SystemUpdaterRegionSelect/readme.txt +++ b/build/systemMenu_tools/SystemUpdaterRegionSelect/readme.txt @@ -6,19 +6,27 @@ ARM9/Makefileの UPDATER_HOST_ROOT_DIR変数で指定してください。 xxxxx - +debugger + +common + l +$ l +america/* l +australia/* l +europe/* l +japan/* + +debugger + l +america/# + l +australia/# + l +europe/# + l +japan/# l +standalone - +america/* - +australia/* - +europe/* - +japan/* + +america/# + +australia/# + +europe/# + +japan/# -上記の*には、 -全tadとnandファームとフォントデータを置いてください。 +配置図: + # -> ランチャーと本体設定のtad (開発機用とデバッガ用で内容が異なるもの) + * -> 上記以外でALLリージョンでないtad + $ -> 上記以外のtad 及び nandファーム 及び フォントデータ