diff --git a/build/systemMenu_RED/Launcher/ARM9/main.rsf b/build/systemMenu_RED/Launcher/ARM9/main.rsf index 74ff743c..01df8a6e 100644 --- a/build/systemMenu_RED/Launcher/ARM9/main.rsf +++ b/build/systemMenu_RED/Launcher/ARM9/main.rsf @@ -188,12 +188,12 @@ AppendProperty # # Public save data size: [0K/16K/32K/64K/128K/256K/512K/1M/2M/4M/8M] # - PublicSaveDataSize 0K + PublicSaveDataSize 32K # # Private save data size: [0K/16K/32K/64K/128K/256K/512K/1M/2M/4M/8M] # - PrivateSaveDataSize 0K + PrivateSaveDataSize 16K # # Enable SubBannerFile diff --git a/build/systemMenu_RED/NandInitializer/ARM7.TWL/Makefile b/build/systemMenu_RED/NandInitializer/ARM7.TWL/Makefile index adecdfe6..2e9070f6 100644 --- a/build/systemMenu_RED/NandInitializer/ARM7.TWL/Makefile +++ b/build/systemMenu_RED/NandInitializer/ARM7.TWL/Makefile @@ -18,7 +18,7 @@ #============================================================================ # NandInitializerRedから一部の機能を削除するために定義を追加します。 -MACRO_FLAGS += -DNAND_FORMATTER_MODE +MACRO_FLAGS += -DNAND_INITIALIZER_LIMITED_MODE #============================================================================ override TARGET_PLATFORM = TWL diff --git a/build/systemMenu_RED/NandInitializer/ARM9.TWL/Makefile b/build/systemMenu_RED/NandInitializer/ARM9.TWL/Makefile index 7a5582aa..101b82f0 100644 --- a/build/systemMenu_RED/NandInitializer/ARM9.TWL/Makefile +++ b/build/systemMenu_RED/NandInitializer/ARM9.TWL/Makefile @@ -27,7 +27,7 @@ SUBDIRS = #============================================================================ #============================================================================ # NandInitializerRedから一部の機能を削除するために定義を追加します。 -MACRO_FLAGS += -DNAND_FORMATTER_MODE +MACRO_FLAGS += -DNAND_INITIALIZER_LIMITED_MODE #============================================================================ TARGET_FIRM = SYSTEMMENU @@ -36,10 +36,10 @@ TWL_ARCHGEN = LIMITED #TWL_CODEGEN = THUMB -TITLEID_LO = 0NFA +TITLEID_LO = 0NIA TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad -TARGET_BIN = NandFormatter.srl +TARGET_BIN = NandInitializer.srl LCFILE_SPEC = ../../NandInitializerRed/ARM9.TWL/ARM9-TS.lsf ROM_SPEC = ../../NandInitializerRed/ARM9.TWL/main.rsf diff --git a/build/systemMenu_RED/NandInitializerProduction/ARM9.TWL/Makefile b/build/systemMenu_RED/NandInitializerProduction/ARM9.TWL/Makefile index 55dba4fb..fadc72af 100644 --- a/build/systemMenu_RED/NandInitializerProduction/ARM9.TWL/Makefile +++ b/build/systemMenu_RED/NandInitializerProduction/ARM9.TWL/Makefile @@ -36,7 +36,7 @@ TWL_ARCHGEN = LIMITED #TWL_CODEGEN = THUMB -TITLEID_LO = 0NAA +TITLEID_LO = 0NPA TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad TARGET_BIN = NandInitializerRedAuto.srl diff --git a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/Makefile b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/Makefile index f8c4813a..18a5680e 100644 --- a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/Makefile +++ b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/Makefile @@ -32,7 +32,7 @@ TWL_ARCHGEN = LIMITED #TWL_CODEGEN = THUMB -TITLEID_LO = 0NIA +TITLEID_LO = 0NRA TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad TARGET_BIN = NandInitializerRed.srl diff --git a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/main.c b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/main.c index 44a1f398..d1c9ca55 100644 --- a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/main.c +++ b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/main.c @@ -113,7 +113,7 @@ TwlMain() kamiFontPrintfConsole( CONSOLE_ORANGE, "+---------------------------+\n"); kamiFontPrintfConsole( CONSOLE_ORANGE, "l A Button : Select Menu l\n"); kamiFontPrintfConsole( CONSOLE_ORANGE, "l Up/Down Key : Change Menu l\n"); -#ifndef NAND_FORMATTER_MODE +#ifndef NAND_INITIALIZER_LIMITED_MODE kamiFontPrintfConsole( CONSOLE_ORANGE, "l L&R Button : Auto Init l\n"); #endif kamiFontPrintfConsole( CONSOLE_ORANGE, "+---------------------------+\n"); diff --git a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_format.c b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_format.c index 2a603f46..f5cb56ad 100644 --- a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_format.c +++ b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_format.c @@ -38,7 +38,7 @@ enum { MENU_CLEAN_UP=0, MENU_CHECK_DISK, -#ifndef NAND_FORMATTER_MODE +#ifndef NAND_INITIALIZER_LIMITED_MODE MENU_NORMAL_FORMAT, MENU_FILL_FORMAT, #endif @@ -104,7 +104,7 @@ void* FormatProcess0(void) kamiFontPrintf(3, 8, FONT_COLOR_BLACK, "+-------------------+-----+"); kamiFontPrintf(3, 9, FONT_COLOR_BLACK, "l CHECK DISK l l"); kamiFontPrintf(3, 10, FONT_COLOR_BLACK, "+-------------------+-----+"); -#ifndef NAND_FORMATTER_MODE +#ifndef NAND_INITIALIZER_LIMITED_MODE kamiFontPrintf(3, 11, FONT_COLOR_BLACK, "l FORMAT l l"); kamiFontPrintf(3, 12, FONT_COLOR_BLACK, "+-------------------+-----+"); kamiFontPrintf(3, 13, FONT_COLOR_BLACK, "l FORMAT l l"); @@ -145,7 +145,7 @@ void* FormatProcess0(void) void* FormatProcess1(void) { -#ifndef NAND_FORMATTER_MODE +#ifndef NAND_INITIALIZER_LIMITED_MODE // オート実行用 if (gAutoFlag) { @@ -267,7 +267,7 @@ void* FormatProcess2(void) return FormatProcess1; } -#ifndef NAND_FORMATTER_MODE +#ifndef NAND_INITIALIZER_LIMITED_MODE case MENU_NORMAL_FORMAT: // ノーマルフォーマット sLock = TRUE; ExeFormatAsync(FORMAT_MODE_QUICK, FormatCallback); @@ -326,7 +326,7 @@ void* FormatProcess3(void) { progress = 0; -#ifndef NAND_FORMATTER_MODE +#ifndef NAND_INITIALIZER_LIMITED_MODE // Auto用 if (gAutoFlag) { diff --git a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_hw_info.c b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_hw_info.c index 263f878c..3db55b77 100644 --- a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_hw_info.c +++ b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_hw_info.c @@ -146,7 +146,7 @@ void* HWInfoProcess0(void) void* HWInfoProcess1(void) { -#ifndef NAND_FORMATTER_MODE +#ifndef NAND_INITIALIZER_LIMITED_MODE // オート実行用 if (gAutoFlag) { @@ -231,7 +231,7 @@ void* HWInfoProcess2(void) kamiFontPrintf(26, (s16)(7+sMenuSelectNo*CHAR_OF_MENU_SPACE), FONT_COLOR_RED, "NG"); } -#ifndef NAND_FORMATTER_MODE +#ifndef NAND_INITIALIZER_LIMITED_MODE // Auto用 if (gAutoFlag) { diff --git a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_topmenu.c b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_topmenu.c index 2e446f49..94ec61ff 100644 --- a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_topmenu.c +++ b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/process_topmenu.c @@ -37,7 +37,7 @@ 定数定義 *---------------------------------------------------------------------------*/ -#ifndef NAND_FORMATTER_MODE +#ifndef NAND_INITIALIZER_LIMITED_MODE #define NUM_OF_MENU_SELECT 6 #else #define NUM_OF_MENU_SELECT 2 @@ -83,17 +83,17 @@ void* TopmenuProcess0(void) kamiFontClear(); // バージョン表示 -#ifndef NAND_FORMATTER_MODE - kamiFontPrintf(8, 2, 0, "Nand Initializer"); +#ifndef NAND_INITIALIZER_LIMITED_MODE + kamiFontPrintf(7, 2, 0, "Nand Initializer RED"); #else - kamiFontPrintf(9, 2, 0, "Nand Formatter"); + kamiFontPrintf(8, 2, 0, "Nand Initializer"); #endif kamiFontPrintf(9, 4, 8, "<%s>", __DATE__); // メニュー一覧 kamiFontPrintf(3, 7, FONT_COLOR_BLACK, " FORMAT NAND "); kamiFontPrintf(3, 9, FONT_COLOR_BLACK, " WRITE HARDWARE INFO "); -#ifndef NAND_FORMATTER_MODE +#ifndef NAND_INITIALIZER_LIMITED_MODE kamiFontPrintf(3, 11, FONT_COLOR_BLACK, " WRITE ETICKET SIGN "); kamiFontPrintf(3, 13, FONT_COLOR_BLACK, " INPORT TAD FROM SD "); kamiFontPrintf(3, 15, FONT_COLOR_BLACK, " INPORT NANDFIRM FROM SD"); @@ -114,7 +114,7 @@ void* TopmenuProcess0(void) kamiFontFillChar( 8, BG_COLOR_NONE, BG_COLOR_PURPLE ); kamiFontFillChar( 9, BG_COLOR_PURPLE, BG_COLOR_PURPLE ); kamiFontFillChar(10, BG_COLOR_PURPLE, BG_COLOR_TRANS ); -#ifndef NAND_FORMATTER_MODE +#ifndef NAND_INITIALIZER_LIMITED_MODE kamiFontFillChar(10, BG_COLOR_NONE, BG_COLOR_GRAY ); kamiFontFillChar(11, BG_COLOR_GRAY, BG_COLOR_GRAY ); kamiFontFillChar(12, BG_COLOR_GRAY, BG_COLOR_TRANS ); @@ -170,7 +170,7 @@ void* TopmenuProcess1(void) } -#ifndef NAND_FORMATTER_MODE +#ifndef NAND_INITIALIZER_LIMITED_MODE #ifdef AUTO_FORMAT_MODE // sAutoProcessFlag でオート実行 @@ -209,7 +209,7 @@ void* TopmenuProcess2(void) FADE_OUT_RETURN( FormatProcess0 ); case 1: FADE_OUT_RETURN( HWInfoProcess0 ); -#ifndef NAND_FORMATTER_MODE +#ifndef NAND_INITIALIZER_LIMITED_MODE case 2: FADE_OUT_RETURN( eTicketProcess0 ); case 3: