Ultra 2.4|R2

2025-06-28 06:22:19 +00:00 · 2025-06-03 05:12:58 +03:00 · 2025-06-03 05:12:58 +03:00 · eda99e7881
commit eda99e7881
parent d28855fd34
39 changed files with 431 additions and 7 deletions
--- a/README.md
+++ b/README.md
@ -8,7 +8,7 @@

 ### Ultra - это функциональная кастомная прошивка для Nintendo Switch, с упором в разгон и улучшенный пользовательский опыт.

-### [Ultra 2.4](https://github.com/Ultra-NX/UltraNX/releases) Поддерживает HOS 20.0.1 и все ревизии консолей
+### [Ultra 2.4|R2](https://github.com/Ultra-NX/UltraNX/releases) Поддерживает HOS 20.1.0 и все ревизии консолей



--- 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.

-### [Ultra 2.4](https://github.com/Ultra-NX/UltraNX/releases) Supports HOS 20.0.1 and all console revisions
+### [Ultra 2.4|R2](https://github.com/Ultra-NX/UltraNX/releases) Supports HOS 20.1.0 and all console revisions



--- a/SaltySD/plugins/FPSLocker/patches/01000BD00CE64000/E417100FFEEFD1DE.yaml
+++ b/SaltySD/plugins/FPSLocker/patches/01000BD00CE64000/E417100FFEEFD1DE.yaml
@ -12,7 +12,7 @@ ALL_FPS:
    value: [FPS_TARGET, FPS_TARGET]
  # t.MaxFPS
  -
-    type: write
+    type: evaluate_write
    address: [MAIN, 0x71B2BD0, 0]
    value_type: float
    value: [FPS_LOCK_TARGET, FPS_LOCK_TARGET]
--- a/SaltySD/plugins/FPSLocker/patches/01003E601E324000/4F41309B39EEBE5E.yaml
+++ b/SaltySD/plugins/FPSLocker/patches/01003E601E324000/4F41309B39EEBE5E.yaml
@ -0,0 +1,27 @@
+# DRAGON QUEST III HD-2D Remake 1.1.0
+# BID: 4F41309B39EEBE5E
+
+unsafeCheck: true
+
+ALL_FPS:
+  # r.VSync
+  -
+    type: write
+    address: [MAIN, 0x5AB93E8, 0]
+    value_type: int32
+    value: [0, 0]
+  # r.DynamicRes.FrameTimeBudget
+  -
+    type: evaluate_write
+    address: [MAIN, 0x62A5E28, 0]
+    value_type: float
+    value: [FRAMETIME_TARGET, FRAMETIME_TARGET]
+  # t.MaxFPS
+  -
+    type: evaluate_write
+    address: [MAIN, 0x62D3B68, 0]
+    value_type: float
+    value: [FPS_LOCK_TARGET, FPS_LOCK_TARGET]
+  -
+    type: block
+    what: timing
--- a/SaltySD/plugins/FPSLocker/patches/0100544020572000/29F67D61B0AD1500.yaml
+++ b/SaltySD/plugins/FPSLocker/patches/0100544020572000/29F67D61B0AD1500.yaml
@ -0,0 +1,36 @@
+# Atelier Yumia: The Alchemist of Memories & the Envisioned Land 1.2.0
+# BID: 29F67D61B0AD1500
+
+unsafeCheck: false
+
+MASTER_WRITE:
+  # Redirect DR to MAIN + 0x2F4CFF0
+  # REF: A9 24 89 52 49 A2 A7 72, second REF
+  -
+    type: bytes
+    main_offset: 0x10B2424
+    value_type: uint32
+    value:
+      - 0xD000F4C9 # adrp x9, 0x2F4C000
+      - 0xBD4FF121 # ldr s1, [x9, 0xFF0]
+      - 0xD503201F # nop
+  ## Default value
+  -
+    type: bytes
+    main_offset: 0x2F4CFF0
+    value_type: float
+    value: 0.035714
+ALL_FPS:
+  # Disable FPS Lock
+  # REF: 88 46 40 F9 03 11 40 F9, first ADRP+LDR above it
+  -
+    type: write
+    address: [MAIN, 0x2F13D80, 0xE0, 0x284]
+    value_type: uint8
+    value: 0
+  # DR Target
+  -
+    type: evaluate_write
+    address: [MAIN, 0x2F4CFF0]
+    value_type: float
+    value: "1.01 / FPS_TARGET"
--- a/SaltySD/plugins/FPSLocker/patches/010054E01D878000/F57C74294E14BDCC.yaml
+++ b/SaltySD/plugins/FPSLocker/patches/010054E01D878000/F57C74294E14BDCC.yaml
@ -0,0 +1,12 @@
+# EA SPORTS FC 25 1.7a.a54b
+# BID: F57C74294E14BDCC
+
+unsafeCheck: true
+
+ALL_FPS:
+  # Internal FPS Lock
+  -
+    type: evaluate_write
+    address: [MAIN, 0xCE78A68, 8]
+    value_type: double
+    value: FPS_TARGET
--- a/SaltySD/plugins/FPSLocker/patches/01006C7021024000/BD9B46CAE607D7E8.yaml
+++ b/SaltySD/plugins/FPSLocker/patches/01006C7021024000/BD9B46CAE607D7E8.yaml
@ -0,0 +1,27 @@
+# MotoGP 25 1.0.2
+# BID: BD9B46CAE607D7E8
+
+unsafeCheck: true
+
+ALL_FPS:
+  # r.DynamicRes.FrameTimeBudget
+  -
+    type: evaluate_write
+    address: [MAIN, 0xA043518, 0]
+    value_type: float
+    value: ["TruncDec(FRAMETIME_TARGET, 2)", "TruncDec(FRAMETIME_TARGET, 2)"]
+  # t.MaxFPS
+  -
+    type: evaluate_write
+    address: [MAIN, 0xA07EDD0, 0]
+    value_type: float
+    value: [FPS_LOCK_TARGET, FPS_LOCK_TARGET]
+  # r.VSync
+  -
+    type: write
+    address: [MAIN, 0x905FC00, 0]
+    value_type: uint32
+    value: [0, 0]
+  -
+    type: block
+    what: timing
--- a/SaltySD/plugins/FPSLocker/patches/010071F0228CA000/DE26B43C3D21B3A3.yaml
+++ b/SaltySD/plugins/FPSLocker/patches/010071F0228CA000/DE26B43C3D21B3A3.yaml
@ -0,0 +1,27 @@
+# Labirynth Of The Demon King 1.81
+# BID: DE26B43C3D21B3A3
+
+unsafeCheck: false
+
+ALL_FPS:
+  # Disable FixedFrameRate
+  -
+    type: write
+    address: [MAIN, 0x59ED248, 0x7A4]
+    value_type: uint32
+    value: 7
+  # t.MaxFPS
+  -
+    type: evaluate_write
+    address: [MAIN, 0x59EDB68, 0]
+    value_type: float
+    value: [FPS_LOCK_TARGET, FPS_LOCK_TARGET]
+  # r.VSync
+  -
+    type: write
+    address: [MAIN, 0x57EEDA8, 0]
+    value_type: uint32
+    value: [0, 0]
+  -
+    type: block
+    what: timing
--- a/SaltySD/plugins/FPSLocker/patches/0100755017EE0000/66BC954F5323014C.yaml
+++ b/SaltySD/plugins/FPSLocker/patches/0100755017EE0000/66BC954F5323014C.yaml
@ -0,0 +1,27 @@
+# FANTASY LIFE i: The Girl Who Steals Time 1.2.1
+# BID: 66BC954F5323014C
+
+unsafeCheck: false
+
+ALL_FPS:
+  # Disable FixedFrameRate
+  -
+    type: write
+    address: [MAIN, 0xACC63E0, 0xAA4]
+    value_type: uint32
+    value: 7
+  # t.MaxFPS
+  -
+    type: evaluate_write
+    address: [MAIN, 0xACC7938, 0]
+    value_type: float
+    value: [FPS_LOCK_TARGET, FPS_LOCK_TARGET]
+  # r.VSync
+  -
+    type: write
+    address: [MAIN, 0x9CA7728, 0]
+    value_type: uint32
+    value: [0, 0]
+  -
+    type: block
+    what: timing
--- a/SaltySD/plugins/FPSLocker/patches/0100755017EE0000/A697413E1DA7851A.yaml
+++ b/SaltySD/plugins/FPSLocker/patches/0100755017EE0000/A697413E1DA7851A.yaml
@ -0,0 +1,27 @@
+# FANTASY LIFE i: The Girl Who Steals Time 1.1.0
+# BID: A697413E1DA7851A
+
+unsafeCheck: false
+
+ALL_FPS:
+  # Disable FixedFrameRate
+  -
+    type: write
+    address: [MAIN, 0xAB873E0, 0xAA4]
+    value_type: uint32
+    value: 7
+  # t.MaxFPS
+  -
+    type: evaluate_write
+    address: [MAIN, 0xAB88938, 0]
+    value_type: float
+    value: [FPS_LOCK_TARGET, FPS_LOCK_TARGET]
+  # r.VSync
+  -
+    type: write
+    address: [MAIN, 0x9B68728, 0]
+    value_type: uint32
+    value: [0, 0]
+  -
+    type: block
+    what: timing
--- a/SaltySD/plugins/FPSLocker/patches/010078D000F88000/7640CE319C043D56.yaml
+++ b/SaltySD/plugins/FPSLocker/patches/010078D000F88000/7640CE319C043D56.yaml
@ -0,0 +1,47 @@
+# DRAGON BALL XENOVERSE 2 FOR NINTENDO SWITCH 1.24.00
+# BID: 7640CE319C043D56
+# Double buffer is hardcoded in class, getting triple buffer is hard.
+# Some graphical effects like aura have wrong speed outside of 15, 20, 30 and 60 FPS
+
+unsafeCheck: false
+
+ALL_FPS:
+  # Search those in Edizon by searching for 1/60 in title menu, then 1/30 when FPS lock is applied.
+  # FPS Lock
+  -
+    type: write
+    address: [MAIN, 0x4AC8AD8, 0x698]
+    value_type: float
+    value: 0.0
+  # Unknown
+  -
+    type: write
+    address: [MAIN, 0x4AC8AD8, 0x6A4]
+    value_type: float
+    value: 0.0
+  # Game Battle Speed Factor
+  -
+    type: evaluate_write
+    address: [MAIN, 0x4AC8AD8, 0x6B0]
+    value_type: uint32
+    value: VSYNC_TARGET
+  # Cutscenes Speed Factor
+  -
+    type: evaluate_write
+    address: [MAIN, 0x4AC8AD8, 0x6B4]
+    value_type: uint32
+    value: VSYNC_TARGET
+  # Target Speed
+  # REF: E9 03 00 32 09 01 00 39 C0 03 5F D6, first result, LDR instruction
+  -
+    type: evaluate_write
+    address: [MAIN, 0x23F51C0]
+    value_type: float
+    value: "(1 / FPS_TARGET) * VSYNC_TARGET"
+  # Dynamic Resolution FPS Target
+  # REF: 16 4E A8 52 F7 03 60 B2, first ADRP + LDR above it
+  -
+    type: evaluate_write
+    address: [MAIN, 0x23D53C8, 0x1844]
+    value_type: float
+    value: "FPS_TARGET"  
--- a/SaltySD/plugins/FPSLocker/patches/010082F015576000/8BFBF5B8A7098443.yaml
+++ b/SaltySD/plugins/FPSLocker/patches/010082F015576000/8BFBF5B8A7098443.yaml
@ -0,0 +1,53 @@
+# 零 ～濡鴉ノ巫女～ 1.0.5
+# BID: 8BFBF5B8A7098443
+
+unsafeCheck: true
+
+MASTER_WRITE:
+  # Redirect min delta to MAIN + 0x1BC4FF0
+  # REF: 00 D9 21 7E 28 19 20 1E
+  -
+    type: bytes
+    main_offset: 0x39ABF8
+    value_type: uint32
+    value:
+     - 0xD000C15B # ADRP X27, 0x1BC4000
+     - 0xBD4FF368 # LDR S8, [X27, 0xFF0]
+  # Redirect FPS Lock to MAIN + 0x1BC4FF4
+  # REF: 69 AA 40 B9 0A 40 99 52
+  -
+    type: bytes
+    main_offset: 0x39B2D8
+    value_type: uint32
+    value:
+     - 0xB000C149 # ADRP X9, 0x7101BC4000
+     - 0xB94FF529 # LDR W9, [X9, 0xFF4]
+     - 0xD503201F # NOP
+     - 0xD503201F # NOP
+  # Default values
+  -
+    type: bytes
+    main_offset: 0x1BC4FF0
+    value_type: float
+    value: 0.0333333333
+  -
+    type: bytes
+    main_offset: 0x1BC4FF4
+    value_type: uint32
+    value: 33333333
+ALL_FPS:
+  # Min delta
+  -
+    type: evaluate_write
+    address: [MAIN, 0x1BC4FF0]
+    value_type: float
+    value: "1 / FPS_TARGET"
+  # FPS Lock
+  -
+    type: evaluate_write
+    address: [MAIN, 0x1BC4FF4]
+    value_type: uint32
+    value: "1000000000 / FPS_TARGET"
+  -
+    type: block
+    what: timing
--- a/SaltySD/plugins/FPSLocker/patches/010091B01A438000/A735894277FF90F3.yaml
+++ b/SaltySD/plugins/FPSLocker/patches/010091B01A438000/A735894277FF90F3.yaml
@ -0,0 +1,53 @@
+# 零 ～月蝕的假面～ 1.0.3
+# BID: A735894277FF90F3
+
+unsafeCheck: true
+
+MASTER_WRITE:
+  # Redirect min delta to MAIN + 0x1FE0FF0
+  # REF: 00 D9 21 7E 28 19 20 1E
+  -
+    type: bytes
+    main_offset: 0x16D9B4
+    value_type: uint32
+    value:
+     - 0xF000F39B # ADRP X27, 0x1FE0000
+     - 0xBD4FF368 # LDR S8, [X27, 0xFF0]
+  # Redirect FPS Lock to MAIN + 0x1FE0FF4
+  # REF: 69 B2 40 B9 0A 40 99 52
+  -
+    type: bytes
+    main_offset: 0x16DDD0
+    value_type: uint32
+    value:
+     - 0xF000F389 # ADRP X9, 0x1FE0000
+     - 0xB94FF529 # LDR W9, [X9, 0xFF4]
+     - 0xD503201F # NOP
+     - 0xD503201F # NOP
+  # Default values
+  -
+    type: bytes
+    main_offset: 0x1FE0FF0
+    value_type: float
+    value: 0.0333333333
+  -
+    type: bytes
+    main_offset: 0x1FE0FF4
+    value_type: uint32
+    value: 33333333
+ALL_FPS:
+  # Min delta
+  -
+    type: evaluate_write
+    address: [MAIN, 0x1FE0FF0]
+    value_type: float
+    value: "1 / FPS_TARGET"
+  # FPS Lock
+  -
+    type: evaluate_write
+    address: [MAIN, 0x1FE0FF4]
+    value_type: uint32
+    value: "1000000000 / FPS_TARGET"
+  -
+    type: block
+    what: timing
--- a/SaltySD/plugins/FPSLocker/patches/0100DAE019110000/0248DC99035AD28A.yaml
+++ b/SaltySD/plugins/FPSLocker/patches/0100DAE019110000/0248DC99035AD28A.yaml
@ -0,0 +1,53 @@
+# PROJECT ZERO: Mask of the Lunar Eclipse West 1.0.3
+# BID: 0248DC99035AD28A
+
+unsafeCheck: true
+
+MASTER_WRITE:
+  # Redirect min delta to MAIN + 0x1FE0FF0
+  # REF: 00 D9 21 7E 28 19 20 1E
+  -
+    type: bytes
+    main_offset: 0x16D9B4
+    value_type: uint32
+    value:
+     - 0xF000F39B # ADRP X27, 0x1FE0000
+     - 0xBD4FF368 # LDR S8, [X27, 0xFF0]
+  # Redirect FPS Lock to MAIN + 0x1FE0FF4
+  # REF: 69 B2 40 B9 0A 40 99 52
+  -
+    type: bytes
+    main_offset: 0x16DDD0
+    value_type: uint32
+    value:
+     - 0xF000F389 # ADRP X9, 0x1FE0000
+     - 0xB94FF529 # LDR W9, [X9, 0xFF4]
+     - 0xD503201F # NOP
+     - 0xD503201F # NOP
+  # Default values
+  -
+    type: bytes
+    main_offset: 0x1FE0FF0
+    value_type: float
+    value: 0.0333333333
+  -
+    type: bytes
+    main_offset: 0x1FE0FF4
+    value_type: uint32
+    value: 33333333
+ALL_FPS:
+  # Min delta
+  -
+    type: evaluate_write
+    address: [MAIN, 0x1FE0FF0]
+    value_type: float
+    value: "1 / FPS_TARGET"
+  # FPS Lock
+  -
+    type: evaluate_write
+    address: [MAIN, 0x1FE0FF4]
+    value_type: uint32
+    value: "1000000000 / FPS_TARGET"
+  -
+    type: block
+    what: timing
--- a/SaltySD/saltysd_core.elf
+++ b/SaltySD/saltysd_core.elf
--- a/SaltySD/saltysd_core32.elf
+++ b/SaltySD/saltysd_core32.elf
--- a/atmosphere/contents/0000000000534C56/exefs.nsp
+++ b/atmosphere/contents/0000000000534C56/exefs.nsp
--- a/atmosphere/contents/010000000000bd00/exefs.nsp
+++ b/atmosphere/contents/010000000000bd00/exefs.nsp
--- a/atmosphere/contents/690000000000000D/exefs.nsp
+++ b/atmosphere/contents/690000000000000D/exefs.nsp
--- a/atmosphere/exefs_patches/bluetooth_patches/532B667232B3992A0A3D007AA85E4944C4138D15.ips
+++ b/atmosphere/exefs_patches/bluetooth_patches/532B667232B3992A0A3D007AA85E4944C4138D15.ips
--- a/atmosphere/exefs_patches/btm_patches/F4D4976A1E1E6F498F6824151C11C6AA9EF81375.ips
+++ b/atmosphere/exefs_patches/btm_patches/F4D4976A1E1E6F498F6824151C11C6AA9EF81375.ips
--- a/atmosphere/exefs_patches/hid_patches/2ABBA006E9E162C1EF0A28E6477725F2836FFEC9.ips
+++ b/atmosphere/exefs_patches/hid_patches/2ABBA006E9E162C1EF0A28E6477725F2836FFEC9.ips
--- a/atmosphere/kips/loader.kip
+++ b/atmosphere/kips/loader.kip
--- a/atmosphere/package3
+++ b/atmosphere/package3
--- a/atmosphere/reboot_payload.bin
+++ b/atmosphere/reboot_payload.bin
--- a/atmosphere/stratosphere.romfs
+++ b/atmosphere/stratosphere.romfs
--- a/bootloader/sys/emummc.kipm
+++ b/bootloader/sys/emummc.kipm
--- a/bootloader/update.bin
+++ b/bootloader/update.bin
--- a/config/MissionControl/missioncontrol.ini.template
+++ b/config/MissionControl/missioncontrol.ini.template
--- a/config/sphaira/config.ini
+++ b/config/sphaira/config.ini
@ -1,4 +1,11 @@
 [config]
 theme=romfs:/themes/oled_black_theme.ini
-[paths]
-last_launch_path=
+mtp_enabled=1
+replace_hbmenu=1
+install_emummc=1
+install_prompt=0
+[homebrew]
+layout=1
+hide_sphaira=1
+[filebrowser]
+show_hidden=1
--- a/hbmenu.nro
+++ b/hbmenu.nro
--- a/payload.bin
+++ b/payload.bin
--- a/switch/.overlays/FPSLocker.ovl
+++ b/switch/.overlays/FPSLocker.ovl
--- a/switch/.overlays/Status-Monitor-Overlay.ovl
+++ b/switch/.overlays/Status-Monitor-Overlay.ovl
--- a/switch/.overlays/ovlmenu.ovl
+++ b/switch/.overlays/ovlmenu.ovl
--- a/switch/.packages/boot_package.ini
+++ b/switch/.packages/boot_package.ini
@ -1,6 +1,29 @@
 [boot]
 clear hex_sum_cache

+
+set-ini-val /switch/DBI/dbi.config Filtering InheritFilter false
+set-ini-val /switch/DBI/dbi.locations Location_0 Name notUltraNX RU
+set-ini-val /switch/DBI/dbi.locations Location_0 Type ApacheHTTP
+set-ini-val /switch/DBI/dbi.locations Location_0 URL https://dbi.ultranx.ru/
+set-ini-val /switch/DBI/dbi.locations Location_1 Name notUltraNX EN
+set-ini-val /switch/DBI/dbi.locations Location_1 Type ApacheHTTP
+set-ini-val /switch/DBI/dbi.locations Location_1 URL https://dbi.ultranx.ru/en/
+remove-ini-section /switch/DBI/dbi.locations Location_2
+remove-ini-section /switch/DBI/dbi.locations Location_3
+
+
+set-ini-val /config/sphaira/config.ini config theme romfs:/themes/oled_black_theme.ini
+set-ini-val /config/sphaira/config.ini config mtp_enabled 1
+set-ini-val /config/sphaira/config.ini config replace_hbmenu 1
+set-ini-val /config/sphaira/config.ini config install_emummc 1
+set-ini-val /config/sphaira/config.ini config install_prompt 0
+set-ini-val /config/sphaira/config.ini homebrew hide_sphaira 1
+set-ini-val /config/sphaira/config.ini homebrew layout 1
+set-ini-val /config/sphaira/config.ini filebrowser show_hidden 1
+
+
+
 del '/atmosphere/config_templates/'
 del '/atmosphere/contents/00FF0000636C6BFF/toolbox.json'
 del '/atmosphere/flags/'
--- a/switch/DBI/DBI.nro
+++ b/switch/DBI/DBI.nro
--- a/switch/DBI/dbi.config
+++ b/switch/DBI/dbi.config
@ -1,7 +1,7 @@
 ; General settings
 [General]
 ; Direct exit to homescreen
-ExitToHomeScreen=true
+ExitToHomeScreen=false
 ; Folder where saves backups are stored
 SavesFolder=sdmc:/DBIsaves/
 ; Log "Install", "Check integrity" and "Cleanup" processes
--- a/switch/DBI/dbi.locations
+++ b/switch/DBI/dbi.locations
@ -1,4 +1,9 @@
 [Location_0]
-Name=notUltraNX
+Name=notUltraNX RU
 Type=ApacheHTTP
 URL=https://dbi.ultranx.ru/
+
+[Location_1]
+Name=notUltraNX EN
+Type=ApacheHTTP
+URL=https://dbi.ultranx.ru/en/