現状の trunk をマージ

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/branches/20090403_1_4test@2793 b08762b0-b915-fc4b-9d8c-17b2551a87ff

build/buildtools/commondefs

@@ -20,8 +20,14 @@ TWL_IPL_COMMONDEFS_ = TRUE
 
 #FIRM_USE_PRODUCT_KEYS = TRUE
 #SYSM_BUILD_FOR_DEBUGGER = TRUE
+
+# 開発機で全ホワイトリストチェックを無視する場合TRUE (デフォルトはTRUE)
 SYSM_DEV_WHITELIST_CHECK_SKIP ?= TRUE
+
+# バナーハッシュチェックを無視する場合TRUE (デフォルトは FALSE)
 #SYSM_IGNORE_DHT_PHASE_3 = TRUE
+
+# 新ホワイトリストでなくてもFatalにならないようにしたい場合TRUE (デフォルトはTRUE)
 SYSM_IGNORE_DHT_EX_NOT_FOUND ?= TRUE
 
 ifeq	($(TARGET_FIRM),SYSTEMMENU)

build/libraries_sysmenu/sysmenu/ARM9/Makefile

@@ -62,7 +62,7 @@ include	$(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 
 ifeq ($(SYSM_DEV_WHITELIST_CHECK_SKIP),TRUE)
 MACRO_FLAGS 	+=	-DDEV_WHITELIST_CHECK_SKIP
-else
+endif
 
 ifeq ($(SYSM_IGNORE_DHT_PHASE_3),TRUE)
 MACRO_FLAGS		+=	-DSYSM_IGNORE_DHT_PHASE_3
@@ -72,8 +72,6 @@ ifeq ($(SYSM_IGNORE_DHT_EX_NOT_FOUND),TRUE)
 MACRO_FLAGS		+=	-DSYSM_IGNORE_DHT_EX_NOT_FOUND
 endif
 
-endif
-
 INSTALL_TARGETS	=	$(TARGETS)
 INSTALL_DIR		=	$(SYSMENU_INSTALL_LIBDIR)
 

build/libraries_sysmenu/sysmenu/ARM9/src/title.c

@@ -344,7 +344,7 @@ static BOOL PrepareDHTDatabase(void)
 #endif
     }
     // 個別対応データベース
-    s_dht.dhtah = (void*)((u32)s_dht.buffer + DHT_GetDatabaseExLength(s_dht.dhtex));
+    s_dht.dhtah = (void*)((u32)s_dht.buffer + DHT_GetDatabaseLength(s_dht.dht) + DHT_GetDatabaseExLength(s_dht.dhtex));
     if ( sizeof(DHTHeader) != FS_ReadFile(&file, &s_dht.dhtah->header, sizeof(DHTHeader)) )
     {
         s_dht.dhtah = NULL;
@@ -1465,7 +1465,7 @@ static BOOL SYSMi_AuthenticateNTRDownloadTitle( TitleProperty *pBootTitle)
             UTL_SetFatalError(FATAL_ERROR_DL_SIGN_DECRYPTION_FAILED);
             return FALSE;
         }
-        
+
         // それぞれheader,ARM9FLX,ARM7FLXについてハッシュを計算して、それら3つを並べたものに対してまたハッシュをとる
         if(s_calc_hash)
         {
@@ -1479,7 +1479,7 @@ static BOOL SYSMi_AuthenticateNTRDownloadTitle( TitleProperty *pBootTitle)
             UTL_SetFatalError(FATAL_ERROR_DL_HASH_CALC_FAILED);
             return FALSE;
         }
-        
+
         // 計算した最終ハッシュと、署名から得たハッシュとを比較
         if(!SVC_CompareSHA1((const void *)buf, (const void *)final_hash))
         {
@@ -1492,7 +1492,7 @@ static BOOL SYSMi_AuthenticateNTRDownloadTitle( TitleProperty *pBootTitle)
         }
     }
     OS_TPrintf("Authenticate : total %d ms.\n", OS_TicksToMilliSeconds(OS_GetTick() - start) );
-    
+
     return TRUE;
 }
 
@@ -1719,18 +1719,28 @@ static BOOL SYSMi_AuthenticateNTRCardTitle( TitleProperty *pBootTitle)
 
     // DHTチェックphase3 (バナーチェック)
     OS_TPrintf("DHT Phase3...");
-    if ( !s_dht.hash3 || !DHT_CheckHashPhase3(s_dht.hash3, (NTRBannerFile*)&s_card_bannerBuf) )
+    if ( !s_dht.hash3 )
+    {
+        if(!s_b_dev){
+            // デバグ用。ERRORLOG_Init()がすでに呼ばれている事前提
+            ERRORLOG_Printf( "DHT_PAHSE3_FAILED (sub info): no database no hash\n" );
+#ifndef SYSM_IGNORE_DHT_EX_NOT_FOUND
+            SYSM_Free(p2work);
+            UTL_SetFatalError(FATAL_ERROR_DHT_PHASE3_FAILED);
+            return FALSE;
+#endif
+        }
+    }
+    else if ( !DHT_CheckHashPhase3(s_dht.hash3, (NTRBannerFile*)&s_card_bannerBuf) )
     {
         OS_TPrintf(" DHT Phase3 : Failed.\n");
         if(!s_b_dev){
             // デバグ用。ERRORLOG_Init()がすでに呼ばれている事前提
             ERRORLOG_Printf( "DHT_PAHSE3_FAILED (sub info): hash3Addr-%08x\n", s_dht.hash3 );
-#ifndef SYSM_IGNORE_DHT_EX_NOT_FOUND
 #ifndef SYSM_IGNORE_DHT_PHASE_3
             SYSM_Free(p2work);
             UTL_SetFatalError(FATAL_ERROR_DHT_PHASE3_FAILED);
             return FALSE;
-#endif
 #endif
         }
     }

build/systemMenu_RED/sharedFont/Makefile

@@ -40,16 +40,16 @@ FONT_REGION_CODE =  4
 FONTS			=	NULL \
 					NULL \
 					NULL \
-					$(FONT_DIR)/TBF1_cn_l.NFTR \
-					$(FONT_DIR)/TBF1_cn_m.NFTR \
-					$(FONT_DIR)/TBF1_cn_s.NFTR \
+					$(FONT_DIR)/TBF1-cn_l.NFTR \
+					$(FONT_DIR)/TBF1-cn_m.NFTR \
+					$(FONT_DIR)/TBF1-cn_s.NFTR \
 					NULL \
 					NULL \
 					NULL
 endif # REGION=CN
 
 ifeq ($(FONT_REGION),KR)
-FONT_TIMESTAMP	=	09033000
+FONT_TIMESTAMP	=	09033100
 FONT_REGION_CODE =  5
 FONTS			=	NULL \
 					NULL \
@@ -57,9 +57,9 @@ FONTS			=	NULL \
 					NULL \
 					NULL \
 					NULL \
-					$(FONT_DIR)/TBF1_kr_l.NFTR \
-					$(FONT_DIR)/TBF1_kr_m.NFTR \
-					$(FONT_DIR)/TBF1_kr_s.NFTR
+					$(FONT_DIR)/TBF1-kr_l.NFTR \
+					$(FONT_DIR)/TBF1-kr_m.NFTR \
+					$(FONT_DIR)/TBF1-kr_s.NFTR
 endif # REGION=KR
 
 FONT_RSC		=	$(FONTS)

build/systemMenu_RED/sysmenuVersion/Makefile

@@ -25,7 +25,7 @@
 
 override TARGET_PLATFORM := TWL
 
-SUBMAKES				=	 Makefile.A Makefile.J Makefile.E Makefile.P Makefile.U
+SUBMAKES				=	 Makefile.A Makefile.J Makefile.E Makefile.P Makefile.U Makefile.C Makefile.K
 
 
 include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

build/systemMenu_RED/sysmenuVersion/Makefile.C

@@ -0,0 +1,40 @@
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     Makefile -
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date:: 
+# $Rev: 
+# $Author: 
+#----------------------------------------------------------------------------
+
+override TARGET_PLATFORM  := TWL
+
+TARGET_FIRM     = SYSTEMMENU
+TWL_NANDAPP     = TRUE
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+include ./commondefs.sysmenuVersion
+include ./commondefs.sysmenuVersion.local
+
+#---------------------------------------------------------
+# リージョン固有パラメータ
+
+include ./defs.sysmenuVersion.C
+
+
+do-build :  $(TARGET_BIN)
+
+#----------------------------------------------------------------------------
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+include ./modulerules.sysmenuVersion
+
+#===== End of Makefile =====

build/systemMenu_RED/sysmenuVersion/Makefile.K

@@ -0,0 +1,40 @@
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     Makefile -
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date:: 
+# $Rev: 
+# $Author: 
+#----------------------------------------------------------------------------
+
+override TARGET_PLATFORM  := TWL
+
+TARGET_FIRM     = SYSTEMMENU
+TWL_NANDAPP     = TRUE
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+include ./commondefs.sysmenuVersion
+include ./commondefs.sysmenuVersion.local
+
+#---------------------------------------------------------
+# リージョン固有パラメータ
+
+include ./defs.sysmenuVersion.K
+
+
+do-build :  $(TARGET_BIN)
+
+#----------------------------------------------------------------------------
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+include ./modulerules.sysmenuVersion
+
+#===== End of Makefile =====

build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion

@@ -29,7 +29,10 @@ NUP_HOSTNAME		=	nus.t.shop.nintendowifi.net:443
 EULA_URL			=	https://cfh.t.app.nintendowifi.net/eula/
 
 # バージョン文字列
-STR_VERSION			=	$(SYSMENU_VERSION_MAJOR).$(SYSMENU_VERSION_MINOR)$(SYSMENU_VERSION_STRING_REGION)
+ifndef FIRM_USE_PRODUCT_KEYS
+DEV_STRING			=	_dev
+endif
+STR_VERSION			=	$(SYSMENU_VERSION_MAJOR).$(SYSMENU_VERSION_MINOR)$(SYSMENU_VERSION_STRING_REGION)$(DEV_STRING)
 
 #---------------------------------------------------------
 # 外部使用変数

build/systemMenu_RED/sysmenuVersion/defs.sysmenuVersion.A

@@ -21,10 +21,10 @@
 
 SYSMENU_VERSION_REGION		=	A
 SYSMENU_VERSION_STRING_REGION	=	ALL
-SYSMENU_VERSION_TIMESTAMP	=	08112700
+SYSMENU_VERSION_TIMESTAMP	=	09040300
 SYSMENU_VERSION_MAJOR		=	1
-SYSMENU_VERSION_MINOR		=	2
-SYSMENU_VERSION_TAD_VERSION	=	2
+SYSMENU_VERSION_MINOR		=	4
+SYSMENU_VERSION_TAD_VERSION	=	4
 
 do-build :  $(TARGET_BIN)
 

build/systemMenu_RED/sysmenuVersion/defs.sysmenuVersion.C

@@ -0,0 +1,30 @@
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     commondefs.systemmenuVersion.A -
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date:: 
+# $Rev: 
+# $Author: 
+#----------------------------------------------------------------------------
+
+#---------------------------------------------------------
+# リージョン固有パラメータ
+
+SYSMENU_VERSION_REGION		=	C
+SYSMENU_VERSION_STRING_REGION	=	C
+SYSMENU_VERSION_TIMESTAMP	=	09040300
+SYSMENU_VERSION_MAJOR		=	1
+SYSMENU_VERSION_MINOR		=	4
+SYSMENU_VERSION_TAD_VERSION	=	4
+
+do-build :  $(TARGET_BIN)
+

build/systemMenu_RED/sysmenuVersion/defs.sysmenuVersion.E

@@ -21,10 +21,10 @@
 
 SYSMENU_VERSION_REGION		=	E
 SYSMENU_VERSION_STRING_REGION	=	U
-SYSMENU_VERSION_TIMESTAMP	=	08112700
+SYSMENU_VERSION_TIMESTAMP	=	09040300
 SYSMENU_VERSION_MAJOR		=	1
-SYSMENU_VERSION_MINOR		=	2
-SYSMENU_VERSION_TAD_VERSION	=	2
+SYSMENU_VERSION_MINOR		=	4
+SYSMENU_VERSION_TAD_VERSION	=	4
 
 do-build :  $(TARGET_BIN)
 

build/systemMenu_RED/sysmenuVersion/defs.sysmenuVersion.J

@@ -21,10 +21,10 @@
 
 SYSMENU_VERSION_REGION		=	J
 SYSMENU_VERSION_STRING_REGION	=	J
-SYSMENU_VERSION_TIMESTAMP	=	08112700
+SYSMENU_VERSION_TIMESTAMP	=	09040300
 SYSMENU_VERSION_MAJOR		=	1
-SYSMENU_VERSION_MINOR		=	2
-SYSMENU_VERSION_TAD_VERSION	=	2
+SYSMENU_VERSION_MINOR		=	4
+SYSMENU_VERSION_TAD_VERSION	=	4
 
 do-build :  $(TARGET_BIN)
 

build/systemMenu_RED/sysmenuVersion/defs.sysmenuVersion.K

@@ -0,0 +1,30 @@
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     commondefs.systemmenuVersion.A -
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date:: 
+# $Rev: 
+# $Author: 
+#----------------------------------------------------------------------------
+
+#---------------------------------------------------------
+# リージョン固有パラメータ
+
+SYSMENU_VERSION_REGION		=	K
+SYSMENU_VERSION_STRING_REGION	=	K
+SYSMENU_VERSION_TIMESTAMP	=	09040300
+SYSMENU_VERSION_MAJOR		=	1
+SYSMENU_VERSION_MINOR		=	4
+SYSMENU_VERSION_TAD_VERSION	=	4
+
+do-build :  $(TARGET_BIN)
+

build/systemMenu_RED/sysmenuVersion/defs.sysmenuVersion.P

@@ -21,10 +21,10 @@
 
 SYSMENU_VERSION_REGION		=	P
 SYSMENU_VERSION_STRING_REGION	=	E
-SYSMENU_VERSION_TIMESTAMP	=	08112700
+SYSMENU_VERSION_TIMESTAMP	=	09040300
 SYSMENU_VERSION_MAJOR		=	1
-SYSMENU_VERSION_MINOR		=	2
-SYSMENU_VERSION_TAD_VERSION	=	2
+SYSMENU_VERSION_MINOR		=	4
+SYSMENU_VERSION_TAD_VERSION	=	4
 
 do-build :  $(TARGET_BIN)
 

build/systemMenu_RED/sysmenuVersion/defs.sysmenuVersion.U

@@ -21,10 +21,10 @@
 
 SYSMENU_VERSION_REGION		=	U
 SYSMENU_VERSION_STRING_REGION	=	A
-SYSMENU_VERSION_TIMESTAMP	=	08112700
+SYSMENU_VERSION_TIMESTAMP	=	09040300
 SYSMENU_VERSION_MAJOR		=	1
-SYSMENU_VERSION_MINOR		=	2
-SYSMENU_VERSION_TAD_VERSION	=	2
+SYSMENU_VERSION_MINOR		=	4
+SYSMENU_VERSION_TAD_VERSION	=	4
 
 do-build :  $(TARGET_BIN)
 

build/systemMenu_RED/sysmenuVersion/verList.txt

@@ -11,3 +11,21 @@ HNAJ	1			1.1				08091200
 HNAE	1			1.1				08091200
 HNAP	1			1.1				08091200
 HNAU	1			1.1				08091200
+
+HNAJ	2			1.2				08112700
+HNAE	2			1.2				08112700
+HNAP	2			1.2				08112700
+HNAU	2			1.2				08112700
+
+HNAJ	3			1.3				08112800
+HNAE	3			1.3				08112800
+HNAP	3			1.3				08112800
+HNAU	3			1.3				08112800
+
+HNAJ	4			1.4				09040300
+HNAE	4			1.4				09040300
+HNAP	4			1.4				09040300
+HNAU	4			1.4				09040300
+HNAC	4			1.4				09040300
+HNAK	4			1.4				09040300
+

build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_write_data.c

@@ -114,11 +114,16 @@ void* WriteDataProcessAfter0(void)
 	// オート実行用
 	if (gAutoFlag)
 	{
+#ifdef MARIOCLUB_VERSION
 		sMenuSelectNo = MENU_WRAP;
+#else  // MARIOCLUB_VERSION
+		sMenuSelectNo = MENU_FONT;
+#endif // MARIOCLUB_VERSION
 		FADE_IN_RETURN( WriteDataProcess2 );
 	}
 #endif
 
+// NEVER REACHED
 	FADE_IN_RETURN( WriteDataProcess1 );
 }
 
@@ -180,15 +185,6 @@ void WriteDataProcessDrawMenu(void)
 
 void* WriteDataProcess1(void)
 {
-#ifndef NAND_INITIALIZER_LIMITED_MODE
-	// オート実行用
-	if (gAutoFlag)
-	{
-		sMenuSelectNo = MENU_FONT;
-		return WriteDataProcess2;
-	}
-#endif
-
 	// 選択メニューの変更
     if ( kamiPadIsRepeatTrigger(PAD_KEY_UP) )
 	{
@@ -228,16 +224,18 @@ void* WriteDataProcess1(void)
 
 void* WriteDataProcess2(void)
 {
-	BOOL result;
+	BOOL result = TRUE;
 	s16 y_pos = (s16)(7 + sMenuSelectNo * CHAR_OF_MENU_SPACE);
 
 	switch( sMenuSelectNo )
 	{
 	case MENU_CERT:
+#ifdef   MARIOCLUB_VERSION
 		result = WriteCertData();
 		
 		// sysmenu.logの生成をこのタイミングで行っておく
 		ERRORLOG_Init(OS_AllocFromMain, OS_FreeToMain);
+#endif //MARIOCLUB_VERSION
 		break;
 	case MENU_WRAP:
 		// ダミーのDSメニューラッピング用ファイル作成（UIGランチャーが作っているもの）
@@ -274,6 +272,7 @@ void* WriteDataProcess2(void)
 		switch(sMenuSelectNo)
 		{
 		case MENU_CERT:
+#ifdef   MARIOCLUB_VERSION
 			if (total_result) 
 			{
 				gAutoProcessResult[AUTO_PROCESS_MENU_VARIOUS_DATA_1] = AUTO_PROCESS_RESULT_SUCCESS; 
@@ -284,13 +283,14 @@ void* WriteDataProcess2(void)
 				gAutoProcessResult[AUTO_PROCESS_MENU_VARIOUS_DATA_1] = AUTO_PROCESS_RESULT_FAILURE; 
 				FADE_OUT_RETURN( AutoProcess2); 
 			}
+#else  //MARIOCLUB_VERSION
+				FADE_OUT_RETURN( AutoProcess1 ); 			
+#endif //MARIOCLUB_VERSION
 			
 			/* NOTREACHED */
 		case MENU_WRAP:
-#ifdef   MARIOCLUB_VERSION
 			sMenuSelectNo++;
 			return WriteDataProcess2;
-#endif //MARIOCLUB_VERSION
 		case MENU_FONT:
 #ifdef   WRITE_DEVKP_ENABLE
 			sMenuSelectNo = MENU_DEVKP;

build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/include/kami_global.h

@@ -58,7 +58,7 @@ typedef enum
 extern const char *g_strIPLSvnRevision;
 extern const char *g_strSDKSvnRevision;
 extern s32 gLockId;
-extern const u16* sRegionStringArray[4];
+extern const u16* sRegionStringArray[OS_TWL_REGION_MAX];
 extern OSTWLRegion gRegion;
 
 /*---------------------------------------------------------------------------*

build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_delete_other_region_sysmenu.c

@@ -37,7 +37,7 @@
     ’è<EFBFBD>”’è‹`
  *---------------------------------------------------------------------------*/
 #define TITLE_ID_MUST_ERASE_NUM   3
-#define TITLE_ID_LIST_NUM         4
+#define TITLE_ID_LIST_NUM         OS_TWL_REGION_MAX
 
 /*---------------------------------------------------------------------------*
     “à•”•Ï<EFBFBD>”’è‹`
@@ -56,6 +56,9 @@ static const u64 sTitleIdListHNA[TITLE_ID_LIST_NUM] =
 	0x00030017484e4145,	// America   HNAE
 	0x00030017484e4150,	// Europe    HNAP
 	0x00030017484e4155,	// Australia HNAU
+	0x00030017484e4143,	// China     HNAC
+	0x00030017484e414B,	// Korea     HNAK
+
 };
 
 static const u64 sTitleIdListHNB[TITLE_ID_LIST_NUM] =
@@ -64,6 +67,8 @@ static const u64 sTitleIdListHNB[TITLE_ID_LIST_NUM] =
 	0x00030015484e4245,	// America   HNBE
 	0x00030015484e4250,	// Europe    HNBP
 	0x00030015484e4255,	// Australia HNBU
+	0x00030015484e4243,	// China     HNBC
+	0x00030015484e424B,	// Korea     HNBK
 };
 
 static const u64 sTitleIdListHNL[TITLE_ID_LIST_NUM] =
@@ -72,6 +77,8 @@ static const u64 sTitleIdListHNL[TITLE_ID_LIST_NUM] =
 	0x0003000f484e4c45,	// America   HNLE
 	0x0003000f484e4c50,	// Europe    HNLP
 	0x0003000f484e4c55,	// Australia HNLU
+	0x0003000f484e4c43,	// China     HNLC
+	0x0003000f484e4c4B,	// Korea     HNLK
 };
 
 static const u64 sTitleIdListHNI[TITLE_ID_LIST_NUM] =
@@ -80,6 +87,8 @@ static const u64 sTitleIdListHNI[TITLE_ID_LIST_NUM] =
 	0x00030005484e4945,	// America   HNIE
 	0x00030005484e4950,	// Europe    HNIP
 	0x00030005484e4955,	// Australia HNIU
+	0x00030005484e4943,	// China     HNIC
+	0x00030005484e494B,	// Korea     HNIK
 };
 
 static const u64 sTitleIdListHNK[TITLE_ID_LIST_NUM] =
@@ -88,6 +97,8 @@ static const u64 sTitleIdListHNK[TITLE_ID_LIST_NUM] =
 	0x00030005484e4B45,	// America   HNKE
 	0x00030005484e4B50,	// Europe    HNKP
 	0x00030005484e4B55,	// Australia HNKU
+	0x00030005484e4B43,	// China     HNKC
+	0x00030005484e4B4B,	// Korea     HNKK
 };
 
 
@@ -97,6 +108,8 @@ static const u64 sTitleIdListHNF[TITLE_ID_LIST_NUM] =
 	0x00030015484E4645,	// America   HNFE
 	0x00030015484E4650,	// Europe    HNFP
 	0x00030015484E4655,	// Australia HNFU
+	0x00030015484E4643,	// China     HNFC
+	0x00030015484E464B,	// Korea     HNFK
 };
 
 static const u64 sTitleIdListHNJ[TITLE_ID_LIST_NUM] =
@@ -105,6 +118,8 @@ static const u64 sTitleIdListHNJ[TITLE_ID_LIST_NUM] =
 	0x00030005484E4A45,	// America   HNJE
 	0x00030005484E4A50,	// Europe    HNJP
 	0x00030005484E4A55,	// Australia HNJU
+	0x00030005484E4A43,	// China     HNJC
+	0x00030005484E4A4B,	// Korea     HNJK
 };
 
 

build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_import.c

@@ -48,7 +48,9 @@ static const char* sDirectoryNameRegion[] =
 	"japan",
 	"america",
 	"europe",
-	"australia"
+	"australia",
+	"china",
+	"korea"
 };
 
 static const char* sDirectoryNameConsole[] =

build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_select_region.c

@@ -37,29 +37,35 @@ OSTWLRegion gRegion = OS_TWL_REGION_JAPAN;
     “à•”’è<EFBFBD>”’è‹`
  *---------------------------------------------------------------------------*/
 
-static const u16 POS_Y_JAPAN     =  52;
-static const u16 POS_Y_AMERICA   =  66;
-static const u16 POS_Y_EUROPE    =  80;
-static const u16 POS_Y_AUSTRALIA =  94;
+static const u16 POS_Y_JAPAN     =  44;
+static const u16 POS_Y_AMERICA   =  56;
+static const u16 POS_Y_EUROPE    =  68;
+static const u16 POS_Y_AUSTRALIA =  80;
+static const u16 POS_Y_CHINA     =  92;
+static const u16 POS_Y_KOREA     = 104;
 
 /*---------------------------------------------------------------------------*
     “à•”•Ï<EFBFBD>”’è‹`
  *---------------------------------------------------------------------------*/
 
-static const u16 sPosArray[4] =
+static const u16 sPosArray[OS_TWL_REGION_MAX] =
 {
 	POS_Y_JAPAN,
 	POS_Y_AMERICA,
 	POS_Y_EUROPE,
-	POS_Y_AUSTRALIA
+	POS_Y_AUSTRALIA,
+	POS_Y_CHINA,
+	POS_Y_KOREA
 };
 
-const u16* sRegionStringArray[4] =
+const u16* sRegionStringArray[OS_TWL_REGION_MAX] =
 {
 	L"region Japan",
 	L"region America",
 	L"region Europe",
-	L"region Australia"
+	L"region Australia",
+	L"region China",
+	L"region Korea"
 };
 
 /*---------------------------------------------------------------------------*
@@ -134,7 +140,7 @@ void ProcessSelectRegion(void)
 #ifndef JP_REGION_ONLY
 			if (kamiPadIsRepeatTrigger(PAD_KEY_DOWN))
 			{
-				if (++gRegion > OS_TWL_REGION_AUSTRALIA)
+				if (++gRegion >= OS_TWL_REGION_MAX)
 				{
 					gRegion = OS_TWL_REGION_JAPAN;
 				}
@@ -143,7 +149,7 @@ void ProcessSelectRegion(void)
 			{
 				if (--gRegion < OS_TWL_REGION_JAPAN)
 				{
-					gRegion = OS_TWL_REGION_AUSTRALIA;
+					gRegion = (OSTWLRegion)(OS_TWL_REGION_MAX-1);
 				}
 			}
 #endif // JP_REGION_ONLY
@@ -164,7 +170,7 @@ void ProcessSelectRegion(void)
 #endif
 
 #ifndef JP_REGION_ONLY
-		for (i=0;i<OS_TWL_REGION_AUSTRALIA+1;i++)
+		for (i=0;i<OS_TWL_REGION_MAX;i++)
 		{
 			if (gRegion != i)
 			{

build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_write_font.c

@@ -110,9 +110,30 @@ BOOL ProcessWriteFont(void)
 			{
 				if (!STD_CompareString( pExtension, ".dat") || !STD_CompareString( pExtension, ".DAT")  )
 				{
-					STD_TSNPrintf(full_path, sizeof(full_path), "rom:/data/common/%s", info->longname);
-					find = TRUE;
-					break;
+					// “ú•Ä‰¢<E280B0>‹
+					if (gRegion < OS_TWL_REGION_CHINA && 
+						!STD_SearchString( info->longname, "_CN_" ) && 
+						!STD_SearchString( info->longname, "_KR_" )) 
+					{
+						STD_TSNPrintf(full_path, sizeof(full_path), "rom:/data/common/%s", info->longname);
+						find = TRUE;
+						break;
+					}
+					// ’†
+					else if (gRegion == OS_TWL_REGION_CHINA && STD_SearchString( info->longname, "_CN_" )) 
+					{
+						STD_TSNPrintf(full_path, sizeof(full_path), "rom:/data/common/%s", info->longname);
+						find = TRUE;
+						break;
+					}
+					// ŠØ
+					else if (gRegion == OS_TWL_REGION_KOREA && STD_SearchString( info->longname, "_KR_" )) 
+					{
+						STD_TSNPrintf(full_path, sizeof(full_path), "rom:/data/common/%s", info->longname);
+						find = TRUE;
+						break;
+					}
+
 				}
 			}
         }

build/systemMenu_tools/SystemUpdaterRegionSelect/readme.txt

@@ -18,19 +18,26 @@ xxxxx
   l    +$
   l    +america/*
   l    +australia/*
+  l    +china/*
   l    +europe/*
   l    +japan/*
+  l    +korea/*
+  l
   +debugger
   l    +america/#
   l    +australia/#
+  l    +china/#
   l    +europe/#
   l    +japan/#
+  l    +korea/#
   l
   +standalone
        +america/#
        +australia/#
+       +china/#
        +europe/#
        +japan/#
+       +korea/#
 
 
 配置図:
@@ -63,3 +70,11 @@ xxxxx
  l JP_REGION_ONLY        l  書き込みリージョンの選択肢をJPに限定する場合はTRUEを選択します      l
  l                       l  この際、japanでないリージョン以下のデータは不要です
  +-----------------------+----------------------------------------------------------------------+
+
+/*-----------------------------------------------------*/
+/*                フォントデータついて                 */
+/*-----------------------------------------------------*/
+
+中国フォントのファイル名は     ***_CN_***.dat  としてください。
+韓国フォントのファイル名は     ***_KR_***.dat  としてください。
+日米欧豪フォントのファイル名には、 "_CN_" 及び "_KR_" を含めないでください。