From abda3dcf228def060ad261f7fb316f3a5c2b2888 Mon Sep 17 00:00:00 2001 From: kamikawa Date: Wed, 4 Mar 2009 10:30:24 +0000 Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=91=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=82=B9=E3=82=A4=E3=83=83=E3=83=81JP=5FREGION=5FONLY=E3=81=A7?= =?UTF-8?q?TRUE=E6=8C=87=E5=AE=9A=E3=81=99=E3=82=8B=E3=81=A8=E3=83=AA?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E9=81=B8=E6=8A=9E=E3=83=A1?= =?UTF-8?q?=E3=83=8B=E3=83=A5=E3=83=BC=E3=81=A7JP=E3=81=97=E3=81=8B?= =?UTF-8?q?=E9=81=B8=E6=8A=9E=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=8F=E3=81=AA?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E6=94=B9=E8=89=AF=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@2760 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../ARM9.TWL/Makefile | 7 ++++++ .../ARM9.TWL/src/process_select_region.c | 25 ++++++++++++++++++- .../SystemUpdaterRegionSelect/readme.txt | 7 ++++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/Makefile b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/Makefile index a7c4709a..51fb67d1 100644 --- a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/Makefile +++ b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/Makefile @@ -23,6 +23,9 @@ # SystemMenuファイルの置かれているフォルダを指定(相対もしくは絶対） UPDATER_HOST_ROOT_DIR = ./v1_2 +# JPリージョンしか選択できなくする場合はTRUEを指定 +JP_REGION_ONLY ?= FALSE + # COMPILE SWITCH for build SystemUpdater（TRUEにすると、ダミーdev.kpを生成しないようになります。） FOR_LOTCHECK ?= FALSE @@ -113,6 +116,10 @@ endif endif endif +ifeq ($(JP_REGION_ONLY),TRUE) +MACRO_FLAGS += -DJP_REGION_ONLY +endif + ifeq ($(FOR_LOTCHECK),TRUE) MACRO_FLAGS += -DFOR_LOTCHECK endif diff --git a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_select_region.c b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_select_region.c index 18421f79..fd197b6e 100644 --- a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_select_region.c +++ b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_select_region.c @@ -82,7 +82,7 @@ void ProcessSelectRegion(void) OS_WaitVBlankIntr(); NNS_G2dCharCanvasClearArea(&gCanvas2, TXT_COLOR_BLACK, 0, 130, 256, 62); OS_WaitVBlankIntr(); - +#ifndef JP_REGION_ONLY NNS_G2dTextCanvasDrawText(&gTextCanvas2, 60, 140, TXT_COLOR_BLACK_BASE, TXT_DRAWTEXT_FLAG_DEFAULT, (const char *) @@ -90,17 +90,32 @@ void ProcessSelectRegion(void) L"\xe000 choice.\n" L"\xe001 cancel.\n" ); +#else // JP_REGION_ONLY + NNS_G2dTextCanvasDrawText(&gTextCanvas2, 60, 140, + TXT_COLOR_BLACK_BASE, TXT_DRAWTEXT_FLAG_DEFAULT, + (const char *) + L"\n" + L"\xe000 choice.\n" + L"\xe001 cancel.\n" + ); + +#endif // JP_REGION_ONLY // 液晶を見てください。 CARD_LockRom((u16)gLockId); (void)CARDi_ReadRomIDCoreEx(DEBUGGER_COMMAND_LOOK_SCREEN); CARD_UnlockRom((u16)gLockId); +#ifndef JP_REGION_ONLY gRegion = OS_GetRegion(); +#endif // JP_REGION_ONLY while(1) { +#ifndef JP_REGION_ONLY s32 i; +#endif // JP_REGION_ONLY + G3X_Reset(); G3_Identity(); G3_PolygonAttr(GX_LIGHTMASK_NONE, GX_POLYGONMODE_DECAL, GX_CULL_NONE, 0, 31, 0); @@ -115,6 +130,8 @@ void ProcessSelectRegion(void) #else if (FadeInMaster()) { + +#ifndef JP_REGION_ONLY if (kamiPadIsRepeatTrigger(PAD_KEY_DOWN)) { if (++gRegion > OS_TWL_REGION_AUSTRALIA) @@ -129,6 +146,7 @@ void ProcessSelectRegion(void) gRegion = OS_TWL_REGION_AUSTRALIA; } } +#endif // JP_REGION_ONLY if (kamiPadIsTrigger(PAD_BUTTON_B)) { @@ -144,6 +162,8 @@ void ProcessSelectRegion(void) } } #endif + +#ifndef JP_REGION_ONLY for (i=0;i