diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/settingsAPI.c b/build/libraries_sysmenu/sysmenu/ARM9/src/settingsAPI.c index a6f55c46..953a1795 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/settingsAPI.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/settingsAPI.c @@ -58,14 +58,16 @@ BOOL SYSM_WriteTWLSettingsFile( void ) BOOL retval; // TWL設定データのライト retval = TSD_WriteSettings(); - // ライト成功なら、NVRAMのNTR設定データに値を反映 + if( retval ) { + // ライトに成功したら、TWL設定データを有効にする。 SYSM_SetValidTSD( TRUE ); - SYSMi_ConvertTWL2NTRSettings(); - (void)NSD_WriteSettings(); -#ifndef SDK_FINALROM - (void)SYSMi_VerifyNTRSettings(); // デバッグ用ベリファイ -#endif + + // NTR設定データに反映する値が変化していたら、NTR設定データを書き込み。 + if( !SYSMi_VerifyNTRSettings() ) { + SYSMi_ConvertTWL2NTRSettings(); + (void)NSD_WriteSettings(); + } } return retval; } diff --git a/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile b/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile index 29b23fca..e18c33de 100644 --- a/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile +++ b/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile @@ -27,7 +27,7 @@ TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED TITLEID_LO = HIWR -TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR).tad +TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad TARGET_BIN = main.srl diff --git a/build/systemMenu_RED/HWInfoWriter/ARM9/main.rsf b/build/systemMenu_RED/HWInfoWriter/ARM9/main.rsf index f9f20aeb..919a7701 100644 --- a/build/systemMenu_RED/HWInfoWriter/ARM9/main.rsf +++ b/build/systemMenu_RED/HWInfoWriter/ARM9/main.rsf @@ -132,15 +132,49 @@ Property # CodecMode $(MAKEROM_CODEC_MODE) - TitleID_Lo $(TITLEID_LO) - TitleID_Hi 0x00010001 -# PrivateSaveDataSize 16K -# PublicSaveDataSize 16K - ### #### END } + +AppendProperty +{ + # + # Publisher : "Nintendo" + # don't have to edit + Publisher Nintendo + + # + # Application type : [USER/SYSTEM] + # don't have to edit + AppType User + + # + # launch title on the launcher : [TRUE/FALSE] + # don't have to edit + Launch TRUE + + # + # GameCode for TitleID : Your GameCode in 4 ascii words + # + GameCode $(TITLEID_LO) + + # + # Public save data size: [16K/32K/64K/128K/256K/512K/1M/2M/4M/8M] + # + #PublicSaveDataSize 32K + + # + # Private save data size: [16K/32K/64K/128K/256K/512K/1M/2M/4M/8M] + # + #PrivateSaveDataSize 16K + + # + # Enable SaveBannerFile + #SaveBannerFile TRUE +} + + RomSpec { Offset 0x00000000 diff --git a/build/systemMenu_RED/Launcher/ARM9/Makefile b/build/systemMenu_RED/Launcher/ARM9/Makefile index c9d01755..194c8407 100644 --- a/build/systemMenu_RED/Launcher/ARM9/Makefile +++ b/build/systemMenu_RED/Launcher/ARM9/Makefile @@ -31,7 +31,7 @@ TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED TITLEID_LO = LNCR -TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR).tad +TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad TARGET_BIN = main.srl diff --git a/build/systemMenu_RED/Launcher/ARM9/main.rsf b/build/systemMenu_RED/Launcher/ARM9/main.rsf index 42ce8c68..ff99d124 100644 --- a/build/systemMenu_RED/Launcher/ARM9/main.rsf +++ b/build/systemMenu_RED/Launcher/ARM9/main.rsf @@ -134,18 +134,48 @@ Property # CodecMode $(MAKEROM_CODEC_MODE) - - TitleID_Lo $(TITLEID_LO) - TitleID_Hi 0x00010001 - PrivateSaveDataSize 16K -# PublicSaveDataSize 16K - - - ### #### END } +AppendProperty +{ + # + # Publisher : "Nintendo" + # don't have to edit + Publisher Nintendo + + # + # Application type : [USER/SYSTEM] + # don't have to edit + AppType System + + # + # launch title on the launcher : [TRUE/FALSE] + # don't have to edit + Launch FALSE + + # + # GameCode for TitleID : Your GameCode in 4 ascii words + # + GameCode $(TITLEID_LO) + + # + # Public save data size: [16K/32K/64K/128K/256K/512K/1M/2M/4M/8M] + # + #PublicSaveDataSize 32K + + # + # Private save data size: [16K/32K/64K/128K/256K/512K/1M/2M/4M/8M] + # + PrivateSaveDataSize 16K + + # + # Enable SaveBannerFile + SaveBannerFile FALSE +} + + RomSpec { Offset 0x00000000 diff --git a/build/systemMenu_RED/MachineSettings/ARM9/Makefile b/build/systemMenu_RED/MachineSettings/ARM9/Makefile index 2a20c479..2a0afbd8 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/Makefile +++ b/build/systemMenu_RED/MachineSettings/ARM9/Makefile @@ -27,7 +27,7 @@ TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED TITLEID_LO = MSET -TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR).tad +TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad TARGET_BIN = main.srl diff --git a/build/systemMenu_RED/MachineSettings/ARM9/main.rsf b/build/systemMenu_RED/MachineSettings/ARM9/main.rsf index 14ac5a82..cee9a0fa 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/main.rsf +++ b/build/systemMenu_RED/MachineSettings/ARM9/main.rsf @@ -132,15 +132,49 @@ Property # CodecMode $(MAKEROM_CODEC_MODE) - TitleID_Lo $(TITLEID_LO) - TitleID_Hi 0x00010001 -# PrivateSaveDataSize 16K -# PublicSaveDataSize 16K - ### #### END } + +AppendProperty +{ + # + # Publisher : "Nintendo" + # don't have to edit + Publisher Nintendo + + # + # Application type : [USER/SYSTEM] + # don't have to edit + AppType System + + # + # launch title on the launcher : [TRUE/FALSE] + # don't have to edit + Launch TRUE + + # + # GameCode for TitleID : Your GameCode in 4 ascii words + # + GameCode $(TITLEID_LO) + + # + # Public save data size: [16K/32K/64K/128K/256K/512K/1M/2M/4M/8M] + # + #PublicSaveDataSize 32K + + # + # Private save data size: [16K/32K/64K/128K/256K/512K/1M/2M/4M/8M] + # + #PrivateSaveDataSize 16K + + # + # Enable SaveBannerFile + SaveBannerFile FALSE +} + + RomSpec { Offset 0x00000000 diff --git a/build/systemMenu_RED/PictoChat/ARM9/Makefile b/build/systemMenu_RED/PictoChat/ARM9/Makefile index 82d08fa2..59d7db08 100644 --- a/build/systemMenu_RED/PictoChat/ARM9/Makefile +++ b/build/systemMenu_RED/PictoChat/ARM9/Makefile @@ -25,7 +25,7 @@ TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED TITLEID_LO = PCHT -TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR).tad +TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad TARGET_BIN = main.srl diff --git a/build/systemMenu_RED/PictoChat/ARM9/main.rsf b/build/systemMenu_RED/PictoChat/ARM9/main.rsf index 14ac5a82..cee9a0fa 100644 --- a/build/systemMenu_RED/PictoChat/ARM9/main.rsf +++ b/build/systemMenu_RED/PictoChat/ARM9/main.rsf @@ -132,15 +132,49 @@ Property # CodecMode $(MAKEROM_CODEC_MODE) - TitleID_Lo $(TITLEID_LO) - TitleID_Hi 0x00010001 -# PrivateSaveDataSize 16K -# PublicSaveDataSize 16K - ### #### END } + +AppendProperty +{ + # + # Publisher : "Nintendo" + # don't have to edit + Publisher Nintendo + + # + # Application type : [USER/SYSTEM] + # don't have to edit + AppType System + + # + # launch title on the launcher : [TRUE/FALSE] + # don't have to edit + Launch TRUE + + # + # GameCode for TitleID : Your GameCode in 4 ascii words + # + GameCode $(TITLEID_LO) + + # + # Public save data size: [16K/32K/64K/128K/256K/512K/1M/2M/4M/8M] + # + #PublicSaveDataSize 32K + + # + # Private save data size: [16K/32K/64K/128K/256K/512K/1M/2M/4M/8M] + # + #PrivateSaveDataSize 16K + + # + # Enable SaveBannerFile + SaveBannerFile FALSE +} + + RomSpec { Offset 0x00000000 diff --git a/build/tests/AppliCooperation/CooperationA/ARM9/Makefile b/build/tests/AppliCooperation/CooperationA/ARM9/Makefile index 8d4932f0..80716abc 100644 --- a/build/tests/AppliCooperation/CooperationA/ARM9/Makefile +++ b/build/tests/AppliCooperation/CooperationA/ARM9/Makefile @@ -25,7 +25,7 @@ TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED TITLEID_LO = COPA -TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR).tad +TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad TARGET_BIN = main.srl diff --git a/build/tests/AppliCooperation/CooperationA/ARM9/main.rsf b/build/tests/AppliCooperation/CooperationA/ARM9/main.rsf index f5692e24..4aa97620 100644 --- a/build/tests/AppliCooperation/CooperationA/ARM9/main.rsf +++ b/build/tests/AppliCooperation/CooperationA/ARM9/main.rsf @@ -135,15 +135,49 @@ Property # CodecMode $(MAKEROM_CODEC_MODE) - TitleID_Lo $(TITLEID_LO) - TitleID_Hi 0x00010001 - PrivateSaveDataSize 16K -# PublicSaveDataSize 16K - ### #### END } + +AppendProperty +{ + # + # Publisher : "Nintendo" + # don't have to edit + Publisher Nintendo + + # + # Application type : [USER/SYSTEM] + # don't have to edit + AppType User + + # + # launch title on the launcher : [TRUE/FALSE] + # don't have to edit + Launch TRUE + + # + # GameCode for TitleID : Your GameCode in 4 ascii words + # + GameCode $(TITLEID_LO) + + # + # Public save data size: [16K/32K/64K/128K/256K/512K/1M/2M/4M/8M] + # + #PublicSaveDataSize 32K + + # + # Private save data size: [16K/32K/64K/128K/256K/512K/1M/2M/4M/8M] + # + PrivateSaveDataSize 16K + + # + # Enable SaveBannerFile + SaveBannerFile FALSE +} + + RomSpec { Offset 0x00000000 diff --git a/build/tests/AppliCooperation/CooperationB/ARM9/Makefile b/build/tests/AppliCooperation/CooperationB/ARM9/Makefile index 0f18a4bc..dd168831 100644 --- a/build/tests/AppliCooperation/CooperationB/ARM9/Makefile +++ b/build/tests/AppliCooperation/CooperationB/ARM9/Makefile @@ -25,7 +25,7 @@ TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED TITLEID_LO = COPB -TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR).tad +TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad TARGET_BIN = main.srl diff --git a/build/tests/AppliCooperation/CooperationB/ARM9/main.rsf b/build/tests/AppliCooperation/CooperationB/ARM9/main.rsf index 3d484904..7f916021 100644 --- a/build/tests/AppliCooperation/CooperationB/ARM9/main.rsf +++ b/build/tests/AppliCooperation/CooperationB/ARM9/main.rsf @@ -135,15 +135,49 @@ Property # CodecMode $(MAKEROM_CODEC_MODE) - TitleID_Lo $(TITLEID_LO) - TitleID_Hi 0x00010001 -# PrivateSaveDataSize 16K -# PublicSaveDataSize 16K - ### #### END } + +AppendProperty +{ + # + # Publisher : "Nintendo" + # don't have to edit + Publisher Nintendo + + # + # Application type : [USER/SYSTEM] + # don't have to edit + AppType User + + # + # launch title on the launcher : [TRUE/FALSE] + # don't have to edit + Launch TRUE + + # + # GameCode for TitleID : Your GameCode in 4 ascii words + # + GameCode $(TITLEID_LO) + + # + # Public save data size: [16K/32K/64K/128K/256K/512K/1M/2M/4M/8M] + # + #PublicSaveDataSize 32K + + # + # Private save data size: [16K/32K/64K/128K/256K/512K/1M/2M/4M/8M] + # + #PrivateSaveDataSize 16K + + # + # Enable SaveBannerFile + SaveBannerFile FALSE +} + + RomSpec { Offset 0x00000000 diff --git a/build/tests/AppliCooperation/CooperationC/ARM9/Makefile b/build/tests/AppliCooperation/CooperationC/ARM9/Makefile index 31e64f45..58c91082 100644 --- a/build/tests/AppliCooperation/CooperationC/ARM9/Makefile +++ b/build/tests/AppliCooperation/CooperationC/ARM9/Makefile @@ -25,7 +25,7 @@ TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED TITLEID_LO = COPC -TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR).tad +TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad TARGET_BIN = main.srl diff --git a/build/tests/AppliCooperation/CooperationC/ARM9/main.rsf b/build/tests/AppliCooperation/CooperationC/ARM9/main.rsf index f5692e24..4aa97620 100644 --- a/build/tests/AppliCooperation/CooperationC/ARM9/main.rsf +++ b/build/tests/AppliCooperation/CooperationC/ARM9/main.rsf @@ -135,15 +135,49 @@ Property # CodecMode $(MAKEROM_CODEC_MODE) - TitleID_Lo $(TITLEID_LO) - TitleID_Hi 0x00010001 - PrivateSaveDataSize 16K -# PublicSaveDataSize 16K - ### #### END } + +AppendProperty +{ + # + # Publisher : "Nintendo" + # don't have to edit + Publisher Nintendo + + # + # Application type : [USER/SYSTEM] + # don't have to edit + AppType User + + # + # launch title on the launcher : [TRUE/FALSE] + # don't have to edit + Launch TRUE + + # + # GameCode for TitleID : Your GameCode in 4 ascii words + # + GameCode $(TITLEID_LO) + + # + # Public save data size: [16K/32K/64K/128K/256K/512K/1M/2M/4M/8M] + # + #PublicSaveDataSize 32K + + # + # Private save data size: [16K/32K/64K/128K/256K/512K/1M/2M/4M/8M] + # + PrivateSaveDataSize 16K + + # + # Enable SaveBannerFile + SaveBannerFile FALSE +} + + RomSpec { Offset 0x00000000 diff --git a/build/tests/RelocateChecker/ARM9/Makefile.0 b/build/tests/RelocateChecker/ARM9/Makefile.0 index 529698f9..602552cc 100644 --- a/build/tests/RelocateChecker/ARM9/Makefile.0 +++ b/build/tests/RelocateChecker/ARM9/Makefile.0 @@ -40,7 +40,7 @@ BINDIR = ./bin/$(TWL_BUILDTYPE)/$(TARGET_NAME) TARGET_BIN = $(TARGET_NAME).srl TITLEID_LO = RCK$(TARGET_NUMBER) -TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR).tad +TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad LCFILE_SPEC = ARM9-TS.lsf ROM_SPEC = main.rsf diff --git a/build/tests/RelocateChecker/ARM9/Makefile.1 b/build/tests/RelocateChecker/ARM9/Makefile.1 index 8728e416..49f42eaf 100644 --- a/build/tests/RelocateChecker/ARM9/Makefile.1 +++ b/build/tests/RelocateChecker/ARM9/Makefile.1 @@ -40,7 +40,7 @@ BINDIR = ./bin/$(TWL_BUILDTYPE)/$(TARGET_NAME) TARGET_BIN = $(TARGET_NAME).srl TITLEID_LO = RCK$(TARGET_NUMBER) -TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR).tad +TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad LCFILE_SPEC = ARM9-TS.lsf ROM_SPEC = main.rsf diff --git a/build/tests/RelocateChecker/ARM9/Makefile.2 b/build/tests/RelocateChecker/ARM9/Makefile.2 index 1903deb4..8d0bfe37 100644 --- a/build/tests/RelocateChecker/ARM9/Makefile.2 +++ b/build/tests/RelocateChecker/ARM9/Makefile.2 @@ -40,7 +40,7 @@ BINDIR = ./bin/$(TWL_BUILDTYPE)/$(TARGET_NAME) TARGET_BIN = $(TARGET_NAME).srl TITLEID_LO = RCK$(TARGET_NUMBER) -TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR).tad +TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad LCFILE_SPEC = ARM9-TS.lsf ROM_SPEC = main.rsf diff --git a/build/tests/RelocateChecker/ARM9/Makefile.3 b/build/tests/RelocateChecker/ARM9/Makefile.3 index f6878362..c00d9c26 100644 --- a/build/tests/RelocateChecker/ARM9/Makefile.3 +++ b/build/tests/RelocateChecker/ARM9/Makefile.3 @@ -40,7 +40,7 @@ BINDIR = ./bin/$(TWL_BUILDTYPE)/$(TARGET_NAME) TARGET_BIN = $(TARGET_NAME).srl TITLEID_LO = RCK$(TARGET_NUMBER) -TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR).tad +TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad LCFILE_SPEC = ARM9-TS.lsf ROM_SPEC = main.rsf diff --git a/build/tests/RelocateChecker/ARM9/Makefile.4 b/build/tests/RelocateChecker/ARM9/Makefile.4 index 06279923..856d9e1b 100644 --- a/build/tests/RelocateChecker/ARM9/Makefile.4 +++ b/build/tests/RelocateChecker/ARM9/Makefile.4 @@ -40,7 +40,7 @@ BINDIR = ./bin/$(TWL_BUILDTYPE)/$(TARGET_NAME) TARGET_BIN = $(TARGET_NAME).srl TITLEID_LO = RCK$(TARGET_NUMBER) -TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR).tad +TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad LCFILE_SPEC = ARM9-TS.lsf ROM_SPEC = main.rsf diff --git a/build/tests/RelocateChecker/ARM9/Makefile.5 b/build/tests/RelocateChecker/ARM9/Makefile.5 index 41dc70fc..fde9af4d 100644 --- a/build/tests/RelocateChecker/ARM9/Makefile.5 +++ b/build/tests/RelocateChecker/ARM9/Makefile.5 @@ -40,7 +40,7 @@ BINDIR = ./bin/$(TWL_BUILDTYPE)/$(TARGET_NAME) TARGET_BIN = $(TARGET_NAME).srl TITLEID_LO = RCK$(TARGET_NUMBER) -TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR).tad +TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad LCFILE_SPEC = ARM9-TS.lsf ROM_SPEC = main.rsf diff --git a/build/tests/RelocateChecker/ARM9/main.rsf b/build/tests/RelocateChecker/ARM9/main.rsf index 855205be..3cf75504 100644 --- a/build/tests/RelocateChecker/ARM9/main.rsf +++ b/build/tests/RelocateChecker/ARM9/main.rsf @@ -132,15 +132,49 @@ Property # CodecMode $(MAKEROM_CODEC_MODE) - TitleID_Lo $(TITLEID_LO) - TitleID_Hi 0x00010001 -# PrivateSaveDataSize 16K -# PublicSaveDataSize 16K - ### #### END } + +AppendProperty +{ + # + # Publisher : "Nintendo" + # don't have to edit + Publisher Nintendo + + # + # Application type : [USER/SYSTEM] + # don't have to edit + AppType User + + # + # launch title on the launcher : [TRUE/FALSE] + # don't have to edit + Launch TRUE + + # + # GameCode for TitleID : Your GameCode in 4 ascii words + # + GameCode $(TITLEID_LO) + + # + # Public save data size: [16K/32K/64K/128K/256K/512K/1M/2M/4M/8M] + # + #PublicSaveDataSize 32K + + # + # Private save data size: [16K/32K/64K/128K/256K/512K/1M/2M/4M/8M] + # + #PrivateSaveDataSize 16K + + # + # Enable SaveBannerFile + #SaveBannerFile TRUE +} + + RomSpec { Offset 0x00000000 diff --git a/doc/NAND繝輔Λ繝繧キ繝・繝槭ャ繝&繝輔か繝ォ繝繝繝ェ繝シ.vsd b/doc/NAND繝輔Λ繝繧キ繝・繝槭ャ繝&繝輔か繝ォ繝繝繝ェ繝シ.vsd index 3cc96cf9..bca0a236 100644 Binary files a/doc/NAND繝輔Λ繝繧キ繝・繝槭ャ繝&繝輔か繝ォ繝繝繝ェ繝シ.vsd and b/doc/NAND繝輔Λ繝繧キ繝・繝槭ャ繝&繝輔か繝ォ繝繝繝ェ繝シ.vsd differ diff --git a/doc/SystemMenu_RED繝ェ繝ェ繝シ繧ケ.txt b/doc/SystemMenu_RED繝ェ繝ェ繝シ繧ケ.txt index c6181a08..3497c143 100644 --- a/doc/SystemMenu_RED繝ェ繝ェ繝シ繧ケ.txt +++ b/doc/SystemMenu_RED繝ェ繝ェ繝シ繧ケ.txt @@ -16,6 +16,7 @@ SystemMenu_RED ・署名・暗号処理 × ・鍵管理 × ・メモリマップFIX ○ +  ・起動時の無線ファーム流し込み × ・NTRコンポーネントパッチ × ・本体設定 ・設定データフォーマットFIX ○ diff --git a/doc/rom_header_format.xls b/doc/rom_header_format.xls index 42156e25..cf6d2c09 100644 Binary files a/doc/rom_header_format.xls and b/doc/rom_header_format.xls differ diff --git a/include/sysmenu/settings/common/TWLSettings.h b/include/sysmenu/settings/common/TWLSettings.h index c397a19b..6e22760d 100644 --- a/include/sysmenu/settings/common/TWLSettings.h +++ b/include/sysmenu/settings/common/TWLSettings.h @@ -142,10 +142,11 @@ typedef struct TWLSettingsData{ u32 isAvailableBatteryExtension : 1; // バッテリエクステンションモードの有効化/無効化 u32 rsv : 19; }flags; - u8 rsv2[ 3 ]; // 予約 + u8 rsv2[ 2 ]; // 予約 u8 country; // 国コード u8 language; // 言語(NTRとの違いは、データサイズ8bit) u8 backLightBrightness; // バックライト輝度(NTRとの違いは、データサイズ8bit) + u8 lastTimeBootSoftIndex; // 前回起動したソフトのインデックス番号 u8 freeSoftBoxCount; // インストール可能なNANDアプリ個数 u8 rtcLastSetYear; // RTCの前回設定年 s64 rtcOffset; // RTC設定時のオフセット値(ユーザーがRTC設定を変更する度にその値に応じて増減します。) @@ -199,6 +200,12 @@ static inline int TSD_GetBacklightBrightness( void ) return (int)GetTSD()->backLightBrightness; } +// 前回起動したソフトのインデックスの取得 +static inline u8 TSD_GetLastTimeBootSoftIndex( void ) +{ + return GetTSD()->lastTimeBootSoftIndex; +} + // フリーソフトBOX数の取得 static inline u8 TSD_GetFreeSoftBoxCount( void ) { @@ -396,6 +403,12 @@ static inline void TSD_SetBacklightBrightness( u8 backLightBrightness ) GetTSD()->backLightBrightness = backLightBrightness; } +// 前回起動したソフトのインデックスをセット +static inline void TSD_SetLastTimeBootSoftIndex( u8 index ) +{ + GetTSD()->lastTimeBootSoftIndex = index; +} + // フリーソフトBOX数のセット static inline void TSD_SetFreeSoftBoxCount( u8 count ) {