diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c index c7f37972..03cfb55a 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c @@ -422,7 +422,7 @@ static OSTitleId SYSMi_getTitleIdOfMachineSettings( void ) // 取得したタイトルに本体情報のIDがあるかチェック for( l = 0; l < getNum; l++ ) { char *code = ((char *)&pTitleIDList[l]) + 1; - if( 0 == STD_CompareNString( code, "SMH", 3 ) ) + if( 0 == STD_CompareNString( code, "BNH", 3 ) ) { ret = (OSTitleId)pTitleIDList[l]; break; diff --git a/build/nandfirm/menu-launcher/ARM9/main.c b/build/nandfirm/menu-launcher/ARM9/main.c index 1a90ea88..1b18b2fd 100644 --- a/build/nandfirm/menu-launcher/ARM9/main.c +++ b/build/nandfirm/menu-launcher/ARM9/main.c @@ -40,7 +40,7 @@ static u8 acHeap[RSA_HEAP_SIZE] __attribute__ ((aligned (32))); static SVCSignHeapContext acPool; #define MENU_TITLE_ID_HI 0x00030017ULL -#define MENU_TITLE_ID_LO 0x484c4e41ULL +#define MENU_TITLE_ID_LO 0x484e4141ULL #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 327c961f..8f151f07 100644 --- a/build/systemMenu_RED/DS_DownloadPlay/ARM9/Makefile +++ b/build/systemMenu_RED/DS_DownloadPlay/ARM9/Makefile @@ -26,6 +26,8 @@ TWL_ARCHGEN = LIMITED TARGET_BIN = dlplay.srl +TITLEID_LO = HNDA + LCFILE_SPEC = ARM9-TS.lsf ROM_SPEC = main.rsf diff --git a/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile b/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile index bc21cbb2..29fc1ca1 100644 --- a/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile +++ b/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile @@ -30,7 +30,7 @@ TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED -TITLEID_LO = HHWA +TITLEID_LO = 0HWA TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad TARGET_BIN = main.srl diff --git a/build/systemMenu_RED/HWInfoWriter/ARM9/src/hwi.c b/build/systemMenu_RED/HWInfoWriter/ARM9/src/hwi.c index 6d748b99..30741f27 100644 --- a/build/systemMenu_RED/HWInfoWriter/ARM9/src/hwi.c +++ b/build/systemMenu_RED/HWInfoWriter/ARM9/src/hwi.c @@ -73,12 +73,12 @@ static char *strLanguage[] = { }; static const char *strLauncherGameCode[] = { - "HLNA", - "HLNA", - "HLNA", - "HLNA", - "HLNC", - "HLNK", + "HNAJ", + "HNAE", + "HNAP", + "HNAU", + "HNAC", + "HNAK", }; //====================================================== diff --git a/build/systemMenu_RED/Launcher/ARM9/Makefile b/build/systemMenu_RED/Launcher/ARM9/Makefile index f119f609..738e0adb 100644 --- a/build/systemMenu_RED/Launcher/ARM9/Makefile +++ b/build/systemMenu_RED/Launcher/ARM9/Makefile @@ -35,7 +35,14 @@ TARGET_PLATFORM = TWL TWL_CODEGEN = ARM TWL_ARCHGEN = LIMITED -TITLEID_LO = HLNA +#※REDランチャーはデバッガ対応の都合上、TITLEID_LO=HNAA, CARD_REGION=ALLとしています。 +# UIGランチャーでは、リージョンに合わせてTITLEID_LO, CARD_REGIONを設定してください。 +################################################################## +TITLEID_LO = HNAA +CARD_REGION = ALL +################################################################## + + TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad TARGET_BIN = main.srl @@ -70,7 +77,7 @@ ADDRESS_DTCM = 0x0e000000 DEFAULT_COMP_ARM7 = hyena -MAKEROM_FLAGS += -F -DTITLEID_LO='$(TITLEID_LO)' +MAKEROM_FLAGS += -F -DTITLEID_LO='$(TITLEID_LO)' -DCARD_REGION='$(CARD_REGION)' ifdef FIRM_BUILD MAKEROM_FLAGS += -s \ -DSYS_PRIV_KEY=$(TWL_KEYSDIR)/rsa/private9_0.der \ diff --git a/build/systemMenu_RED/Launcher/ARM9/main.rsf b/build/systemMenu_RED/Launcher/ARM9/main.rsf index 01df8a6e..19e67ebc 100644 --- a/build/systemMenu_RED/Launcher/ARM9/main.rsf +++ b/build/systemMenu_RED/Launcher/ARM9/main.rsf @@ -121,7 +121,7 @@ Property # # CardRegion: card region [Japan/America/Europe/Australia/China/Korea] # - CardRegion ALL + CardRegion $(CARD_REGION) # # Codec mode: @@ -142,7 +142,7 @@ Property # # SDCardAccess: sd card access control [TRUE/FALSE] # - SDCardAccess TRUE + #SDCardAccess TRUE ### #### END diff --git a/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c b/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c index 9057b991..d3ff2fd1 100644 --- a/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c +++ b/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c @@ -112,10 +112,10 @@ void InstallFirmCallback(void* arg) BOOL GetFirmwareFilepath(char *path) { - u8 title[4] = { 'H','W','F','A' }; + u8 title[4] = { 'H','N','C','A' }; #if( USE_LCFG_STRING == 0 ) - char *title0 = "HWFA"; + char *title0 = "HNCA"; #endif u32 titleID_hi; u32 titleID_lo; diff --git a/build/systemMenu_RED/MachineSettings/ARM9/Makefile b/build/systemMenu_RED/MachineSettings/ARM9/Makefile index b23102a4..e9dfdd2b 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/Makefile +++ b/build/systemMenu_RED/MachineSettings/ARM9/Makefile @@ -26,7 +26,13 @@ TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED -TITLEID_LO = HMSA +#※RED本体設定はデバッガ対応の都合上、TITLEID_LO=HNAA, CARD_REGION=ALLとしています。 +# UIG本体設定では、リージョンに合わせてTITLEID_LO, CARD_REGIONを設定してください。 +################################################################## +TITLEID_LO = HNBA +CARD_REGION = ALL +################################################################## + TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad TARGET_BIN = main.srl @@ -46,7 +52,7 @@ SRCS = main.c MachineSetting.c \ LINCLUDES = $(MISC_DIR)/include -MAKEROM_FLAGS += -DTITLEID_LO='$(TITLEID_LO)' +MAKEROM_FLAGS += -DTITLEID_LO='$(TITLEID_LO)' -DCARD_REGION='$(CARD_REGION)' MAKETAD_FLAGS += -s diff --git a/build/systemMenu_RED/MachineSettings/ARM9/main.rsf b/build/systemMenu_RED/MachineSettings/ARM9/main.rsf index d1364bb7..aace337a 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/main.rsf +++ b/build/systemMenu_RED/MachineSettings/ARM9/main.rsf @@ -123,7 +123,7 @@ Property # # CardRegion: card region [Japan/America/Europe/Australia/China/Korea] # - CardRegion ALL + CardRegion $(CARD_REGION) # # CommonClientKey: launcher deliver common client Key [TRUE/FALSE] diff --git a/build/systemMenu_RED/PictoChat/ARM9/Makefile b/build/systemMenu_RED/PictoChat/ARM9/Makefile index 5931f22a..cbe97f1e 100644 --- a/build/systemMenu_RED/PictoChat/ARM9/Makefile +++ b/build/systemMenu_RED/PictoChat/ARM9/Makefile @@ -24,7 +24,7 @@ TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED -TITLEID_LO = HPCA +TITLEID_LO = HNEA TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad TARGET_BIN = main.srl diff --git a/build/systemMenu_RED/wlanfirm/Makefile b/build/systemMenu_RED/wlanfirm/Makefile index 6b82180e..9f04817d 100644 --- a/build/systemMenu_RED/wlanfirm/Makefile +++ b/build/systemMenu_RED/wlanfirm/Makefile @@ -28,7 +28,7 @@ MY_FIRM_ROOT = $(TWLWIRELESS_ROOT)/binfile MY_FIRM_ROOT_CYG = $(call eupath,$(MY_FIRM_ROOT)) -MY_TITLE = HWFA +MY_TITLE = HNCA MY_FIRM = $(MY_FIRM_ROOT_CYG)/nwm_firm.bin #----------------------------------------------------------------------------