diff --git a/README.md b/README.md index 799d2a5..04dfe6e 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Custom Nintendo Switch bootloader, firmware patcher, and more. | bootloader | Main folder. | | \|__ bootlogo.bmp | It is used when custom is on and no logopath found. Can be skipped. | | \|__ hekate_ipl.ini | Main bootloader configuration and boot entries. | -| \|__ patches.ini | Add external patches. If not found `patches_template.ini` will be loaded. Can be skipped. | +| \|__ patches.ini | Add external patches. Can be skipped. A template can be found [here](./res/patches_template.ini) | | \|__ update.bin | If newer, it is loaded at boot. For modchips. Can be skipped. | | bootloader/ini/ | For individual inis. 'More configs...' menu. Autoboot is supported. | | bootloader/res/ | Nyx user resources. Icons and more. | diff --git a/bootloader/hos/pkg2.c b/bootloader/hos/pkg2.c index 02350c8..38f91b0 100644 --- a/bootloader/hos/pkg2.c +++ b/bootloader/hos/pkg2.c @@ -574,10 +574,6 @@ static void parse_external_kip_patches() char path[64]; strcpy(path, "bootloader/patches.ini"); - // If patches.ini not found, try to load from template. - if (f_stat(path, NULL)) - strcpy(path, "bootloader/patches_template.ini"); - LIST_INIT(ini_kip_sections); if (ini_patch_parse(&ini_kip_sections, path)) { @@ -1066,7 +1062,7 @@ const char* pkg2_patch_kips(link_t *info, char* patchNames) } currPatchset++; } - if (!strncmp(_kip_ids[currKipIdx].name, "FS", 2) && emummc_patch_selected) + if (emummc_patch_selected && !strncmp(_kip_ids[currKipIdx].name, "FS", 2)) { emummc_patch_selected = false; emu_cfg.fs_ver = currKipIdx; @@ -1091,7 +1087,7 @@ const char* pkg2_patch_kips(link_t *info, char* patchNames) return NULL; } -static const uint8_t mkey_keyseed_8xx[][0x10] = +static const u8 mkey_keyseed_8xx[][0x10] = { {0x4D, 0xD9, 0x98, 0x42, 0x45, 0x0D, 0xB1, 0x3C, 0x52, 0x0C, 0x9A, 0x44, 0xBB, 0xAD, 0xAF, 0x80} // Master key 8 encrypted with 9. }; diff --git a/nyx/nyx_gui/hos/pkg2.c b/nyx/nyx_gui/hos/pkg2.c index b8ba50e..a3629b0 100644 --- a/nyx/nyx_gui/hos/pkg2.c +++ b/nyx/nyx_gui/hos/pkg2.c @@ -81,7 +81,7 @@ DPRINTF(" kip1 %d:%s @ %08X (%08X)\n", i, kip1->name, (u32)kip1, ki->size); } } -static const uint8_t mkey_keyseed_8xx[][0x10] = +static const u8 mkey_keyseed_8xx[][0x10] = { {0x4D, 0xD9, 0x98, 0x42, 0x45, 0x0D, 0xB1, 0x3C, 0x52, 0x0C, 0x9A, 0x44, 0xBB, 0xAD, 0xAF, 0x80} // Master key 8 encrypted with 9. }; diff --git a/res/patches_template.ini b/res/patches_template.ini index 97ed3a2..0ebe8bd 100644 --- a/res/patches_template.ini +++ b/res/patches_template.ini @@ -1,10 +1,15 @@ -# UTF-8 +# ASCII non-extended # A KIP section is [kip1_name:sha256_hex_8bytes] # A patchset is .patch_name=kip_section_dec:offset_hex_0x:length_hex_0x:src_data_hex,dst_data_hex +# # _dec: 1 char decimal | _hex_0x: max u32 prefixed with 0x | _hex: hex array. # Kip1 section decimals: TEXT: 0, RODATA: 1, DATA: 2. # -# Care when editing this, otherwise it will fail to be parsed. +# Careful when editing this, otherwise it will fail to be parsed. +# +# Note: the below patches is an obsolete method that was used +# to install homebrew for a qlaunch icon or 3.5GB RAM access. +# This is useless nowadays, because title override or custom qlaunch are a more proper solution. #FS Patches for 1.0.0 [FS:de9fdda4085dd5fe]