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 c368c02e..e0c2ec13 100644 --- a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/include/kami_global.h +++ b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/include/kami_global.h @@ -60,6 +60,7 @@ extern const char *g_strSDKSvnRevision; extern s32 gLockId; extern const u16* sRegionStringArray[OS_TWL_REGION_MAX]; extern OSTWLRegion gRegion; +extern BOOL gIsDeleteNMenuAndNandFiler; /*---------------------------------------------------------------------------* 関数宣言 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 b27791e4..7f5cc8fc 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 @@ -42,6 +42,12 @@ #define TITLE_ID_HND_NUM 3 #define TITLE_ID_HNE_NUM 3 +/*---------------------------------------------------------------------------* + グローバル変数定義 + *---------------------------------------------------------------------------*/ + +BOOL gIsDeleteNMenuAndNandFiler = FALSE; + /*---------------------------------------------------------------------------* 内部変数定義 *---------------------------------------------------------------------------*/ @@ -261,6 +267,15 @@ BOOL ProcessDeleteOtherResionSysmenu(void) } } + // TwlNMenuとNandFilerを消去する + if (gIsDeleteNMenuAndNandFiler == TRUE) + { + // TwlNMenu + ret &= DeleteTitle( 0x0003001534544e41 ); + // NandFiler + ret &= DeleteTitle( 0x00030015344e4641 ); + } + return ret; } diff --git a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_note.c b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_note.c index b1463439..f8330368 100644 --- a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_note.c +++ b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_note.c @@ -115,6 +115,12 @@ void ProcessNote(void) } else if (kamiPadIsTrigger(PAD_BUTTON_A)) { + // Aボタンを押したときにSELECTボタンも押していた場合 + // NMenuとNandFilerのインポートをスキップして、削除する + if (kamiPadIsPress(PAD_BUTTON_SELECT)) + { + gIsDeleteNMenuAndNandFiler = TRUE; + } while (!FadeOutTick()) { OS_WaitVBlankIntr();