diff --git a/build/systemMenu_tools/NandFirmWriter/ARM7.TWL/Makefile b/build/systemMenu_tools/NandFirmWriter/ARM7.TWL/Makefile index 50d0fc35..14631f45 100644 --- a/build/systemMenu_tools/NandFirmWriter/ARM7.TWL/Makefile +++ b/build/systemMenu_tools/NandFirmWriter/ARM7.TWL/Makefile @@ -66,18 +66,7 @@ LINCLUDES += $(ROOT)/build/libraries/spi/ARM7/include \ $(ROOT)/build/libraries/fatfs/ARM7.TWL/include/twl/fatfs/ARM7 \ ../common/include - -#LLIBRARIES += libwl_sp.TWL.LTD.a libsdio_hcd_twl$(TWL_LIBSUFFIX).a libsdio_busdriver$(TWL_LIBSUFFIX).a libsdio_lib$(TWL_LIBSUFFIX).a libARM7athdrv$(TWL_LIBSUFFIX).a LLIBRARIES += libwl_sp.TWL.LTD.a -#LLIBRARIES += libwl_sp$(TWL_LIBSUFFIX).a \ -# libcdc_sp$(TWL_LIBSUFFIX).a \ -# libtpex_sp$(TWL_LIBSUFFIX).a \ -# libmicex_sp$(TWL_LIBSUFFIX).a \ -# libsdio_hcd_twl$(TWL_LIBSUFFIX).a \ -# libsdio_busdriver$(TWL_LIBSUFFIX).a \ -# libsdio_lib$(TWL_LIBSUFFIX).a \ -# librompatch_sp$(TWL_LIBSUFFIX).a \ -# libARM7athdrv$(TWL_LIBSUFFIX).a LDEPENDS_NEF = $(TWL_LIBS) $(LLIBRARIES) diff --git a/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/include/kami_write_nandfirm.h b/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/include/kami_write_nandfirm.h index d3bf85c0..44f6c1f1 100644 --- a/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/include/kami_write_nandfirm.h +++ b/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/include/kami_write_nandfirm.h @@ -64,7 +64,7 @@ BOOL NandfirmProcess(void); static inline void MakeFullPathForSD(char* file_name, char* full_path) { - STD_CopyString( full_path, "sdmc:/" ); + STD_CopyString( full_path, "rom:/data/" ); STD_ConcatenateString( full_path, file_name ); } diff --git a/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/main.rsf b/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/main.rsf index 956b54fd..3482be27 100644 --- a/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/main.rsf +++ b/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/main.rsf @@ -193,7 +193,7 @@ RomSpec { Offset 0x00000000 Segment ALL - HostRoot $(MAKEROM_ROMROOT) - Root / - File $(MAKEROM_ROMFILES) + HostRoot ../data + Root /data + File menu_launcher-FINALROM-2869-10333-NWD.prod.nand } diff --git a/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/src/kami_write_nandfirm.c b/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/src/kami_write_nandfirm.c index 91b55675..14caa0c1 100644 --- a/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/src/kami_write_nandfirm.c +++ b/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/src/kami_write_nandfirm.c @@ -139,18 +139,16 @@ BOOL GetNandFirmBinPath(void) // ファイル数初期化 sFileNum = 0; - // SDカードのルートディレクトリを検索 - if ( !FS_OpenDirectory(&dir, "sdmc:/", FS_FILEMODE_R | FS_FILEMODE_W) ) + // ロムアーカイブのルートディレクトリを検索 + if ( !FS_OpenDirectory(&dir, "rom:/data/", FS_FILEMODE_R | FS_FILEMODE_W) ) { ret = FALSE; - OS_TPrintf("Error FS_OpenDirectory(sdmc:/)\n"); + OS_TPrintf("Error FS_OpenDirectory(rom:/data)\n"); } else { FSDirectoryEntryInfo info[1]; - OS_Printf("[%s]:\n", "sdmc:/"); - - //kamiFontPrintfConsole(CONSOLE_ORANGE, "------ nand file list -----\n"); + OS_Printf("[%s]:\n", "rom:/data/"); // .nand を探してファイル名を保存しておく while (FS_ReadDirectory(&dir, info)) diff --git a/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/src/main.c b/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/src/main.c index 095ec054..199d1099 100644 --- a/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/src/main.c +++ b/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/src/main.c @@ -203,8 +203,7 @@ static void DrawScene(void) PutMainScreen( 5, 5, 0xf8, " - - "); PutMainScreen( 5, 6, 0xf8, " ------------------- "); - PutMainScreen( 3, 9, 0xff, "Please Insert SD Card and"); - PutMainScreen( 3,11, 0xff, "Push A Button."); + PutMainScreen( 5,11, 0xff, "Please Push A Button."); if( gProc ) { diff --git a/build/systemMenu_tools/NandFirmWriter/data/menu_launcher-FINALROM-2869-10333-NWD.prod.nand b/build/systemMenu_tools/NandFirmWriter/data/menu_launcher-FINALROM-2869-10333-NWD.prod.nand new file mode 100644 index 00000000..47dc3a7c Binary files /dev/null and b/build/systemMenu_tools/NandFirmWriter/data/menu_launcher-FINALROM-2869-10333-NWD.prod.nand differ