diff --git a/README.md b/README.md index 7e7a4ec..1ce1407 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ ### Ultra - это функциональная кастомная прошивка для Nintendo Switch, с упором в разгон и улучшенный пользовательский опыт. -### [UltraNX 3.0|R4](https://github.com/Ultra-NX/UltraNX/releases/tag/3.0-R4) Поддерживает все HOS до 22.5.0 включительно +### [UltraNX 3.0|R4+](https://github.com/Ultra-NX/UltraNX/releases/tag/3.0-R4) Поддерживает все HOS до 22.5.0 включительно diff --git a/README_ENG.md b/README_ENG.md index 0943da1..7f840ae 100644 --- a/README_ENG.md +++ b/README_ENG.md @@ -6,7 +6,7 @@ # ### Ultra is a functional custom firmware for Nintendo Switch, with a focus on overclocking and an improved user experience. -### [UltraNX 3.0|R4](https://github.com/Ultra-NX/UltraNX/releases/tag/3.0-R4) Supports all HOS up to and including 22.5.0 +### [UltraNX 3.0|R4+](https://github.com/Ultra-NX/UltraNX/releases/tag/3.0-R4) Supports all HOS up to and including 22.5.0 diff --git a/SaltySD/plugins/FPSLocker/patches/01001E9023920000/4F4FD1AED39EB96A.yaml b/SaltySD/plugins/FPSLocker/patches/01001E9023920000/4F4FD1AED39EB96A.yaml new file mode 100644 index 0000000..9302c97 --- /dev/null +++ b/SaltySD/plugins/FPSLocker/patches/01001E9023920000/4F4FD1AED39EB96A.yaml @@ -0,0 +1,43 @@ +# 하늘의 궤적 the 1st 1.0.7 +# BID: 4F4FD1AED39EB96A + +DECLARATIONS: + # Lock Max Handheld Resolution to 720p instead of 900p + - + type: code + name: adjustDrResToNativeInHH + instructions: [ + [cmp, w10, 1280], + [b.le, :goto1], + [adrp, x21, 0x725000], + [ldr, w21, [x21, 0x820]], ## REF: nn::oe::GetOperationMode in nnMain + [cbnz, w21, :goto1], + [mov, w10, 1280], + [mov, w8, 720], + :goto1, [stp, w10, w8, [x0, 0x10]], + [ret] + ] +MASTER_WRITE: + ## REF: 40 18 20 1E 00 08 21 1E, patch STP W10, W8 after it + - + type: asm_a64 + main_offset: 0x2C5D9C + instructions: [ + [bl, _adjustDrResToNativeInHH()] + ] +ALL_FPS: + # Min Delta + ## REF: C1 03 80 52 28 4D 28 9B, first ADRP + ADD below it + - + type: evaluate_write + address: [MAIN, 0x725850, 0x2C] + value_type: uint32 + value: FPS_TARGET + # Dynamic Resolution + ## REF: First function in .init_array section, ADRP + ADD + 0x220 (default float: 2) + ## Adding there 0.95 by myself because game seems to have issues with reaching 60 FPS without it + - + type: write + address: [MAIN, 0x7253D0] + value_type: float + value: 0.95 \ No newline at end of file diff --git a/SaltySD/plugins/FPSLocker/patches/010032B015D66000/742C48981DBC4F2C.yaml b/SaltySD/plugins/FPSLocker/patches/010032B015D66000/742C48981DBC4F2C.yaml new file mode 100644 index 0000000..210dc07 --- /dev/null +++ b/SaltySD/plugins/FPSLocker/patches/010032B015D66000/742C48981DBC4F2C.yaml @@ -0,0 +1,25 @@ +# The DioField Chronicle 1.2.0 +# BID: 742C48981DBC4F2C + +ALL_FPS: + # r.VSync + - + type: write + address: [MAIN, 0x6582428, 0] + value_type: int32 + value: [0, 0] + # t.MaxFPS + - + type: evaluate_write + address: [MAIN, 0x6D7DDC8, 0] + value_type: float + value: [FPS_LOCK_TARGET, FPS_LOCK_TARGET] + # r.DynamicRes.FrameTimeBudget + - + type: evaluate_write + address: [MAIN, 0x6D500A8, 0] + value_type: float + value: ["TruncDec(FRAMETIME_TARGET, 2)", "TruncDec(FRAMETIME_TARGET, 2)"] + - + type: block + what: timing \ No newline at end of file diff --git a/atmosphere/kips/hoc.kip b/atmosphere/kips/hoc.kip index 04d5f88..002e011 100644 Binary files a/atmosphere/kips/hoc.kip and b/atmosphere/kips/hoc.kip differ diff --git a/atmosphere/package3 b/atmosphere/package3 index fb46d8b..b2d5ef8 100644 Binary files a/atmosphere/package3 and b/atmosphere/package3 differ diff --git a/atmosphere/stratosphere.romfs b/atmosphere/stratosphere.romfs index 443adfe..efa9b73 100644 Binary files a/atmosphere/stratosphere.romfs and b/atmosphere/stratosphere.romfs differ diff --git a/bootloader/sys/l4t/sc7exit_b01.bin b/bootloader/sys/l4t/sc7exit_b01.bin index 1f67aa0..d9253a6 100644 Binary files a/bootloader/sys/l4t/sc7exit_b01.bin and b/bootloader/sys/l4t/sc7exit_b01.bin differ diff --git a/config/ultrahand/overlays.ini b/config/ultrahand/overlays.ini index 22f1031..1c49b27 100644 --- a/config/ultrahand/overlays.ini +++ b/config/ultrahand/overlays.ini @@ -4,9 +4,9 @@ key_combo=L+R+DLEFT [Status-Monitor-Overlay.ovl] priority=1 -mode_args=(-mini, -micro) -mode_labels=(Mini, Micro) -mode_combos=(L+R+DDOWN, ) +mode_args=(-full, -mini, -micro, -fps_graph, -fps_counter, -game_resolutions) +mode_combos=(, L+R+DDOWN, , , ) +mode_labels=(Full, Mini, Micro, FPS Graph, FPS Counter, Game Resolutions) [FPSLocker.ovl] priority=2 diff --git a/switch/.packages/boot_package.ini b/switch/.packages/boot_package.ini index e541c33..ec58b91 100644 --- a/switch/.packages/boot_package.ini +++ b/switch/.packages/boot_package.ini @@ -13,7 +13,6 @@ del '/atmosphere/config_templates/' del '/atmosphere/flags/' del '/atmosphere/hbl_html/' del '/atmosphere/hosts/domains.txt' -del '/atmosphere/hosts/default.txt' del '/atmosphere/kips/.bak/*.kip' del '/atmosphere/splash.png' diff --git a/warmboot_mariko/wb_14.bin b/warmboot_mariko/wb_14.bin new file mode 100644 index 0000000..d40bb4f Binary files /dev/null and b/warmboot_mariko/wb_14.bin differ diff --git a/warmboot_mariko/wb_18.bin b/warmboot_mariko/wb_18.bin new file mode 100644 index 0000000..2af57ed Binary files /dev/null and b/warmboot_mariko/wb_18.bin differ