From 63dbe038de0553dd56a017e49a18142c27938cfa Mon Sep 17 00:00:00 2001
From: kamikawa <kamikawa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Tue, 23 Jun 2009 11:56:52 +0000
Subject: [PATCH] =?UTF-8?q?Select=E3=83=9C=E3=82=BF=E3=83=B3=E3=82=92?=
 =?UTF-8?q?=E6=8A=BC=E3=81=97=E3=81=AA=E3=81=8C=E3=82=89A=E3=83=9C?=
 =?UTF-8?q?=E3=82=BF=E3=83=B3=E3=82=92=E6=8A=BC=E3=81=97=E3=81=A6=E5=AE=9F?=
 =?UTF-8?q?=E8=A1=8C=E3=81=97=E3=81=9F=E5=A0=B4=E5=90=88=E3=80=81TwlNMenu?=
 =?UTF-8?q?=E3=81=A8NandFiler=E3=82=92=E6=B6=88=E5=8E=BB=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E6=A9=9F=E8=83=BD=E3=82=92=E8=BF=BD=E5=8A=A0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2852 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../ARM9.TWL/include/kami_global.h                |  1 +
 .../src/process_delete_other_region_sysmenu.c     | 15 +++++++++++++++
 .../ARM9.TWL/src/process_note.c                   |  6 ++++++
 3 files changed, 22 insertions(+)

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