From 816bb8bd85f9eb2c070441169549e8590586af53 Mon Sep 17 00:00:00 2001
From: yosiokat <yosiokat@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Mon, 5 Jan 2009 04:10:18 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=BBver.=E3=82=921.2=E3=81=AB=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4=E3=80=82=20=E3=83=BB=E3=83=AD=E3=83=83=E3=83=88?=
 =?UTF-8?q?=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E5=90=91=E3=81=91SystemUpd?=
 =?UTF-8?q?ater=E3=83=93=E3=83=AB=E3=83=89=E3=82=B9=E3=82=A4=E3=83=83?=
 =?UTF-8?q?=E3=83=81FOR=5FLOTCHECK=E3=82=92=E8=BF=BD=E5=8A=A0=E3=80=82=20?=
 =?UTF-8?q?=E3=83=BBFOR=5FLOTCHECK=E5=AE=9A=E7=BE=A9=E6=99=82=E3=81=ABdev.?=
 =?UTF-8?q?kp=E3=82=92=E5=89=8A=E9=99=A4=E3=81=99=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E5=A4=89=E6=9B=B4=E3=80=82=20=E3=83=BB=E3=82=B7?=
 =?UTF-8?q?=E3=83=A7=E3=83=83=E3=83=97=E3=81=A8Nintendo=E3=82=BE=E3=83=BC?=
 =?UTF-8?q?=E3=83=B3=E3=82=82=E5=AF=BE=E8=B1=A1=E3=83=AA=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=83=A7=E3=83=B3=E4=BB=A5=E5=A4=96=E3=81=AE=E3=82=82=E3=81=AE?=
 =?UTF-8?q?=E3=82=92=E5=89=8A=E9=99=A4=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4=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@2726 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../ARM9.TWL/Makefile                         |  9 ++++-
 .../ARM9.TWL/include/kami_global.h            |  2 +-
 .../src/process_delete_other_region_sysmenu.c | 36 +++++++++++++++++++
 .../ARM9.TWL/src/process_write_dummy.c        | 14 ++++++--
 4 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/Makefile b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/Makefile
index 111bda18..5926556a 100644
--- a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/Makefile
+++ b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/Makefile
@@ -21,7 +21,10 @@
 #============================================================================
 
 # SystemMenuファイルの置かれているフォルダを指定(相対もしくは絶対）
-UPDATER_HOST_ROOT_DIR = ../data_sysmenu
+UPDATER_HOST_ROOT_DIR = s:/v1_2
+
+# COMPILE SWITCH for build SystemUpdater（TRUEにすると、ダミーdev.kpを生成しないようになります。）
+FOR_LOTCHECK			?=	FALSE
 
 # COMPILE SWITCH for build SystemUpdater
 IGNORE_VERSION_CHECK	?=	FALSE
@@ -109,6 +112,10 @@ endif
 endif
 endif
 
+ifeq ($(FOR_LOTCHECK),TRUE)
+MACRO_FLAGS += -DFOR_LOTCHECK
+endif
+
 ifeq ($(IGNORE_VERSION_CHECK),TRUE)
 MACRO_FLAGS += -DIGNORE_VERSION_CHECK
 endif
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 2a11c514..46401b84 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.0c"
+#define SYSTEM_UPDATER_NAME         L"SystemUpdater ver.1.2"
 #define SYSTEM_UPDATER_LOG_PATH     "nand:/sys/log/updater.log"
 #define SYSTEM_UPDATER_MAGIC_CODE   44001111
 
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 e5bedeed..6d8f757c 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
@@ -90,6 +90,24 @@ static const u64 sTitleIdListHNK[TITLE_ID_LIST_NUM] =
 	0x00030005484e4B55,	// Australia HNKU
 };
 
+
+static const u64 sTitleIdListHNF[TITLE_ID_LIST_NUM] =
+{
+	0x00030015484E464A,	// Japan     HNFJ
+	0x00030015484E4645,	// America   HNFE
+	0x00030015484E4650,	// Europe    HNFP
+	0x00030015484E4655,	// Australia HNFU
+};
+
+static const u64 sTitleIdListHNJ[TITLE_ID_LIST_NUM] =
+{
+	0x00030005484E4A4A,	// Japan     HNJJ
+	0x00030005484E4A45,	// America   HNJE
+	0x00030005484E4A50,	// Europe    HNJP
+	0x00030005484E4A55,	// Australia HNJU
+};
+
+
 /*---------------------------------------------------------------------------*
     内部関数宣言
  *---------------------------------------------------------------------------*/
@@ -165,6 +183,24 @@ BOOL ProcessDeleteOtherResionSysmenu(void)
 		}
 	}
 
+	// 選択リージョンと異なるショップは消去する
+	for (i=0;i<TITLE_ID_LIST_NUM;i++)
+	{
+		if (i != gRegion)
+		{
+			ret = DeleteTitle( sTitleIdListHNF[i] );
+		}
+	}
+
+	// 選択リージョンと異なるNintendoゾーンは消去する
+	for (i=0;i<TITLE_ID_LIST_NUM;i++)
+	{
+		if (i != gRegion)
+		{
+			ret = DeleteTitle( sTitleIdListHNJ[i] );
+		}
+	}
+
 	return ret;
 }
 
diff --git a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_write_dummy.c b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_write_dummy.c
index f6683116..a76e5ebe 100644
--- a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_write_dummy.c
+++ b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_write_dummy.c
@@ -36,12 +36,17 @@
 /*---------------------------------------------------------------------------*
     内部定数定義
  *---------------------------------------------------------------------------*/
+#ifdef FOR_LOTCHECK
+#define DUMMY_FILE_NUM   1
+#else
 #define DUMMY_FILE_NUM   2
-
+#endif
 static const char* sDummyFileList[DUMMY_FILE_NUM] =
 { 
 	"nand:/shared2/launcher/wrap.bin",	// ないと本体初期化でこける
+#ifndef FOR_LOTCHECK
 	"nand:/sys/dev.kp"					// ないとアプリ管理画面が表示されない
+#endif
 };
 
 /*---------------------------------------------------------------------------*
@@ -73,8 +78,11 @@ BOOL ProcessWriteDummy(void)
 			kamiFontPrintfConsole(FONT_COLOR_RED, "Write Dummy %d Fail!\n", i);
 			ret = FALSE;
 		}
-	} 
-
+	}
+#ifdef FOR_LOTCHECK
+	FS_DeleteFile("nand:/sys/dev.kp");
+#endif
+	
 	OS_WaitVBlankIntr();
 	kamiFontLoadScreenData();
 	return ret;