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