diff --git a/build/nandfirm/menu-launcher/ARM9/main.c b/build/nandfirm/menu-launcher/ARM9/main.c index 658aa307..5fbe5214 100644 --- a/build/nandfirm/menu-launcher/ARM9/main.c +++ b/build/nandfirm/menu-launcher/ARM9/main.c @@ -39,7 +39,7 @@ static const u8 rsa_key[128] = static u8 acHeap[RSA_HEAP_SIZE] __attribute__ ((aligned (32))); static SVCSignHeapContext acPool; -#define MENU_TITLE_ID_HI 0x00030007ULL +#define MENU_TITLE_ID_HI 0x00030017ULL #define MENU_TITLE_ID_LO 0x4c4e4352ULL #define MENU_TITLE_ID (MENU_TITLE_ID_HI << 32 | MENU_TITLE_ID_LO) diff --git a/build/systemMenu_RED/DS_DownloadPlay/ARM9/Makefile b/build/systemMenu_RED/DS_DownloadPlay/ARM9/Makefile index 587a1cb4..327c961f 100644 --- a/build/systemMenu_RED/DS_DownloadPlay/ARM9/Makefile +++ b/build/systemMenu_RED/DS_DownloadPlay/ARM9/Makefile @@ -40,7 +40,7 @@ LDEPENDS_NEF = include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs -MAKEROM = $(SYSMENU_TOOLSDIR)/bin/makerom.TWL.sys.exe +MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.sys.exe #---------------------------------------------------------------------------- diff --git a/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile b/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile index b7b212ec..b68b8974 100644 --- a/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile +++ b/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile @@ -63,7 +63,7 @@ MAKETAD_FLAGS += -s include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs -MAKEROM = $(SYSMENU_TOOLSDIR)/bin/makerom.TWL.sys.exe +MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe LDIRT_CLEAN = $(TARGET_TAD) INSTALL_TARGETS = $(TARGET_TAD) diff --git a/build/systemMenu_RED/HWInfoWriter/ARM9/main.rsf b/build/systemMenu_RED/HWInfoWriter/ARM9/main.rsf index ec53ad02..3246c48b 100644 --- a/build/systemMenu_RED/HWInfoWriter/ARM9/main.rsf +++ b/build/systemMenu_RED/HWInfoWriter/ARM9/main.rsf @@ -154,6 +154,16 @@ AppendProperty # Media NAND + # + # Data only title : [TRUE/FALSE] + # don't have to edit + DataOnly FALSE + + # + # Secure title : [TRUE/FALSE] + # don't have to edit + Secure TRUE + # # GameCode for TitleID : Your GameCode in 4 ascii words # diff --git a/build/systemMenu_RED/Launcher/ARM9/main.rsf b/build/systemMenu_RED/Launcher/ARM9/main.rsf index 562ad6af..26667e91 100644 --- a/build/systemMenu_RED/Launcher/ARM9/main.rsf +++ b/build/systemMenu_RED/Launcher/ARM9/main.rsf @@ -155,6 +155,16 @@ AppendProperty # Media NAND + # + # Data only title : [TRUE/FALSE] + # don't have to edit + DataOnly FALSE + + # + # Secure title : [TRUE/FALSE] + # don't have to edit + Secure TRUE + # # GameCode for TitleID : Your GameCode in 4 ascii words # diff --git a/build/systemMenu_RED/MachineSettings/ARM9/Makefile b/build/systemMenu_RED/MachineSettings/ARM9/Makefile index 7780196f..0d7139f9 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/Makefile +++ b/build/systemMenu_RED/MachineSettings/ARM9/Makefile @@ -53,7 +53,7 @@ MAKETAD_FLAGS += -s include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs -MAKEROM = $(SYSMENU_TOOLSDIR)/bin/makerom.TWL.sys.exe +MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe LDIRT_CLEAN = $(TARGET_TAD) INSTALL_TARGETS = $(TARGET_TAD) diff --git a/build/systemMenu_RED/MachineSettings/ARM9/main.rsf b/build/systemMenu_RED/MachineSettings/ARM9/main.rsf index 13746b0a..0ac0499d 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/main.rsf +++ b/build/systemMenu_RED/MachineSettings/ARM9/main.rsf @@ -154,6 +154,16 @@ AppendProperty # Media NAND + # + # Data only title : [TRUE/FALSE] + # don't have to edit + DataOnly FALSE + + # + # Secure title : [TRUE/FALSE] + # don't have to edit + Secure TRUE + # # GameCode for TitleID : Your GameCode in 4 ascii words # diff --git a/build/systemMenu_RED/NandInitializer/ARM9.TWL/Makefile b/build/systemMenu_RED/NandInitializer/ARM9.TWL/Makefile index bd8054bf..58f42f7f 100644 --- a/build/systemMenu_RED/NandInitializer/ARM9.TWL/Makefile +++ b/build/systemMenu_RED/NandInitializer/ARM9.TWL/Makefile @@ -93,7 +93,8 @@ LLIBRARIES += libes$(TWL_LIBSUFFIX).a \ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs include $(TWLSDK_ROOT)/build/buildtools/commondefs.gx.demolib -MAKEROM = $(SYSMENU_TOOLSDIR)/bin/makerom.TWL.sys.exe +MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe + LDIRT_CLEAN = $(TARGET_TAD) INSTALL_TARGETS = $(TARGET_TAD) diff --git a/build/systemMenu_RED/NandInitializer/ARM9.TWL/main.rsf b/build/systemMenu_RED/NandInitializer/ARM9.TWL/main.rsf index 05cd7f2c..8e163f5d 100644 --- a/build/systemMenu_RED/NandInitializer/ARM9.TWL/main.rsf +++ b/build/systemMenu_RED/NandInitializer/ARM9.TWL/main.rsf @@ -149,6 +149,16 @@ AppendProperty # don't have to edit Launch TRUE + # + # Data only title : [TRUE/FALSE] + # don't have to edit + DataOnly FALSE + + # + # Secure title : [TRUE/FALSE] + # don't have to edit + Secure TRUE + # # Boot allowed Media: [GameCard/NAND] # diff --git a/build/systemMenu_RED/PictoChat/ARM9/Makefile b/build/systemMenu_RED/PictoChat/ARM9/Makefile index bb2d20bb..330887e1 100644 --- a/build/systemMenu_RED/PictoChat/ARM9/Makefile +++ b/build/systemMenu_RED/PictoChat/ARM9/Makefile @@ -43,7 +43,7 @@ MAKETAD_FLAGS += -s include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs -MAKEROM = $(SYSMENU_TOOLSDIR)/bin/makerom.TWL.sys.exe +MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.sys.exe LDIRT_CLEAN = $(TARGET_TAD) INSTALL_TARGETS = $(TARGET_TAD) diff --git a/build/tools/attach_dummyromheader/attach_dummyromheader.c b/build/tools/attach_dummyromheader/attach_dummyromheader.c index acb2f603..36b6b98c 100644 --- a/build/tools/attach_dummyromheader/attach_dummyromheader.c +++ b/build/tools/attach_dummyromheader/attach_dummyromheader.c @@ -40,6 +40,7 @@ static ROM_Header rom_header; #define CHANNEL_SYSTEM_BIT 0x1 #define CHANNEL_SHOW_BIT 0x2 #define CHANNEL_CARD_BIT 0x4 +#define CHANNEL_DATA_ONLY_BIT 0x8 int main(int argc, char *argv[]) @@ -168,7 +169,11 @@ int main(int argc, char *argv[]) [16-31]: PublisherCode( 2:Broadon, 3:Nintendo) */ - rom_header.s.titleID_Hi = ( 3 /* Nintendo */ << 16) | 4 | (isLaunch? 2:0) | (isSystem? 1:0); + rom_header.s.titleID_Hi = ( 3 /* Nintendo */ << 16) | + CHANNEL_CARD_BIT | + CHANNEL_DATA_ONLY_BIT | + (isLaunch? 2:0) | + (isSystem? 1:0); printf("titleID = 0x%08X%08x\n", (unsigned int)rom_header.s.titleID_Hi, (unsigned int)*((u32 *)&(rom_header.s.titleID_Lo[0]))); diff --git a/docs/X4ボード対応/X4_TSボード搭載ランチャー準備.mmap b/docs/X4ボード対応/X4_TSボード搭載ランチャー準備.mmap new file mode 100644 index 00000000..66d4ee86 Binary files /dev/null and b/docs/X4ボード対応/X4_TSボード搭載ランチャー準備.mmap differ diff --git a/docs/X4ボード対応/機材別REDランチャー機能.xls b/docs/X4ボード対応/機材別REDランチャー機能.xls new file mode 100644 index 00000000..f47e4ada Binary files /dev/null and b/docs/X4ボード対応/機材別REDランチャー機能.xls differ diff --git a/docs/format_ROM_Header.xls b/docs/format_ROM_Header.xls index cc8910bc..fea8e38b 100644 Binary files a/docs/format_ROM_Header.xls and b/docs/format_ROM_Header.xls differ diff --git a/tools/bin/makerom.TWL.launcher.exe b/tools/bin/makerom.TWL.launcher.exe index 508dc538..ecc670bc 100644 Binary files a/tools/bin/makerom.TWL.launcher.exe and b/tools/bin/makerom.TWL.launcher.exe differ diff --git a/tools/bin/makerom.TWL.secure.exe b/tools/bin/makerom.TWL.secure.exe deleted file mode 100644 index df4bf9ff..00000000 Binary files a/tools/bin/makerom.TWL.secure.exe and /dev/null differ diff --git a/tools/bin/makerom.TWL.sys.exe b/tools/bin/makerom.TWL.sys.exe deleted file mode 100644 index 17c0dc54..00000000 Binary files a/tools/bin/makerom.TWL.sys.exe and /dev/null differ