diff --git a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_hw_info.c b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_hw_info.c index 34df8db4..75c16063 100644 --- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_hw_info.c +++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_hw_info.c @@ -124,7 +124,7 @@ void* HWInfoProcess0(void) kamiFontPrintf(3, 18, FONT_COLOR_BLACK, "+--------------------+----+"); // 現在のリージョンに"now"と表示 - kamiFontPrintf(26, (s16)(MENU_TOP_LINE+LCFG_THW_GetRegion()*CHAR_OF_MENU_SPACE), FONT_COLOR_BLACK, "now"); + kamiFontPrintf(26, (s16)(MENU_TOP_LINE+OS_GetRegion()*CHAR_OF_MENU_SPACE), FONT_COLOR_BLACK, "now"); // 背景全クリア for (i=0;i<24;i++) diff --git a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_wireless_setting.c b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_wireless_setting.c index 863ea002..855dc8c5 100644 --- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_wireless_setting.c +++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_wireless_setting.c @@ -175,7 +175,7 @@ void* WirelessSettingProcess2(void) switch( sMenuSelectNo ) { case MENU_WIRELESS_ENABLE: - result = WriteHWInfoFile( LCFG_THW_GetRegion(), FALSE ); + result = WriteHWInfoFile( OS_GetRegion(), FALSE ); if ( result == TRUE ) { kamiFontPrintf(26, (s16)(MENU_TOP_LINE+MENU_WIRELESS_ENABLE*CHAR_OF_MENU_SPACE), FONT_COLOR_GREEN, "OK "); @@ -189,7 +189,7 @@ void* WirelessSettingProcess2(void) break; case MENU_WIRELESS_FORCE_OFF: - result = WriteHWInfoFile( LCFG_THW_GetRegion(), TRUE ); + result = WriteHWInfoFile( OS_GetRegion(), TRUE ); if ( result == TRUE ) { kamiFontPrintf(26, (s16)(MENU_TOP_LINE+MENU_WIRELESS_ENABLE*CHAR_OF_MENU_SPACE), FONT_COLOR_GREEN, " "); diff --git a/build/systemMenu_tools/SystemUpdater/ARM9.TWL/main.rsf b/build/systemMenu_tools/SystemUpdater/ARM9.TWL/main.rsf index abb5c445..6fe56c1d 100644 --- a/build/systemMenu_tools/SystemUpdater/ARM9.TWL/main.rsf +++ b/build/systemMenu_tools/SystemUpdater/ARM9.TWL/main.rsf @@ -220,7 +220,7 @@ RomSpec { Offset 0x00000000 Segment ALL - HostRoot ../data + HostRoot ../$(UPDATER_HOST_ROOT_DIR) Root /data File HNAA.tad HNBA.tad HNCA.tad HNHA.tad HNLA.tad \ menu_launcher.nand TWLFontTable.dat cert.sys diff --git a/build/systemMenu_tools/SystemUpdater/Makefile b/build/systemMenu_tools/SystemUpdater/Makefile index d931d7c0..f8a20aa5 100644 --- a/build/systemMenu_tools/SystemUpdater/Makefile +++ b/build/systemMenu_tools/SystemUpdater/Makefile @@ -29,8 +29,10 @@ DS_HASH_TABLE = $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/DSHashTable SHARED_FONT_DIR = $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/sharedFont NANDFIRM_DIR = $(TWL_IPL_RED_ROOT)/build/nandfirm/menu-launcher -# 既存データを使用する場合はTRUEを指定 +# systemMenuデータの作成をスキップする場合はTRUEを指定 SKIP_CREATE_DATA = FALSE +# 実際に書き込みたいファイルの置かれているdataフォルダを指定 +export UPDATER_HOST_ROOT_DIR = data ifeq ($(SKIP_CREATE_DATA),FALSE) SUBDIRS = $(LAUNCHER_DIR) \