Ultra 2.3|R1

README.md

@@ -25,6 +25,7 @@
 * [Форки](https://github.com/Ultra-NX/Ultra-Resources/tree/main/patches) (свои модификации) программ и компонентов, нужные для удобства, безопасности и расширения возможностей:
    * Форк Атмосферы с прописанной версией Ультры в информации о системе, и отключенными репортами, обычно засоряющими сд карту, тратящими ее ресурс и ломающими файловю систему.
    * Форки SaltyNX и FPSLocker, с поддержкой изменения частоты обновления экрана и с поддержкой OLED.
+   * Форк Mission Control, с вырезанной "пасхалкой", делающей джойконы жовто-блакитными.
    * Форк Status Monitor с отображением текущих вольтажей и уникальными модулями Микро Оверлея, пресеты которых можно менять через Ultra Tuner.
 
 
@@ -53,7 +54,6 @@
    * [sys-clk](https://github.com/halop/OC_Toolkit_SC_EOS) - Модуль отвечающий за разгон процессора, памяти и видеочипа - для лучшей производительности. Периодически меняю версии от разных авторов. Оригинальные авторы: Meha/hanai3Bi, lineon, p-sam.
    * [nx-ovlloader](https://github.com/ppkantorski/nx-ovlloader) - С помощью этого модуля осуществляется переключение установленных модулей.
    * [sys-patch](https://github.com/impeeza/sys-patch) - Патчит систему на работу неподписанного софта вместо сигпатчей.
-   * [nim-prodinfo-blank-fix](https://github.com/fruityloops1/nim-prodinfo-blank-fix) - Исправляет проблему краша атмосферы, при занулении серийного номера.
    * [Ultrahand Overlay](https://github.com/ppkantorski/Ultrahand-Overlay) - Специальное оверлей-меню для взаимодействия с системой: разгон, управление режимами через ReverseNX, включение читов, прочее. Так же позволяет использовать самописные пакеты, например - Ultra Tuner.
      - **`Ultra OC (sys-clk)`**, мод [sys-clk](https://github.com/halop/OC_Toolkit_SC_EOS) - Оверлей для управления модулем sys-clk. Немного изменен мной, но без копания в исходниках (Так как они закрыты).
      - [Status Monitor](https://github.com/Ultra-NX/Status-Monitor-Overlay), форк [Status Monitor](https://github.com/hanai3Bi/Status-Monitor-Overlay) - Оверлей позволяющий следить за параметрами консоли в реальном времени. Может выступать в качестве счетчика FPS. Сменить пресет Micro-оверлея можно в Updater.
@@ -83,18 +83,9 @@
       * [FPSLocker Patches](https://github.com/masagrator/FPSLocker-Warehouse) - Патчи для FPSLocker, что бы не качать отдельно патч для каждой игры через оверлей.
       * [DVR Patches](https://github.com/exelix11/dvr-patches) - Патчи SysDVR, работают и без системного модуля, активируя фоновую запись в играх, где это изначально запрещено.
       * [TriPlayer](https://github.com/DefenderOfHyrule/TriPlayer) - Хоумбрю-музыкальный плеер, который работает через системный модуль, и может сворачиваться, работая в фоне.
-      * [Mission Control](https://github.com/ndeadly/MissionControl) - Модуль, позволяющий подключать практически любые геймпады к консоли.
       * [sys-ftpd](https://github.com/tomvita/sys-ftpd-light) - FTP сервер, работающий на фоне.
 
 
-1. **Содержимое [Homebrews Pack](https://github.com/Ultra-NX/Ultra/releases/latest)**
-*
-   * [HB App Store](https://github.com/fortheusers/hb-appstore) - Бесплатный магазин для скачивания Homebrew приложений.
-   * [Tinfoil](https://tinfoil.io) - Установщик и каталог игр.
-   * [ThemezerNX](https://github.com/suchmememanyskill/themezer-nx) + [NXThemes Installer](https://github.com/exelix11/SwitchThemeInjector) + [Theme Patches](https://github.com/exelix11/theme-patches) - Поиск и установка тем на свитч.
-   * [Mission Control](https://github.com/ndeadly/MissionControl) - Модуль, позволяющий подключать практически любые геймпады к консоли.
-
-
 
 
 ## Лицензии

README_ENG.md

@@ -21,6 +21,7 @@
 * [Forks](https://github.com/Ultra-NX/Ultra-Resources/tree/main/patches) (own modifications) of programs and components needed for convenience, security and empowerment:
    * Atmosphere fork with Ultra version in system information, and disabled reports, which usually clogs up the SD card, wastes its resource and breaks the file system.
    * SaltyNX and FPSLocker forks, with support for changing screen refresh rate and with OLED support.
+   * Mission Control fork, with the “easter egg” cut out, making the joycons yellow-blue.
    * Status Monitor fork with display of current voltages and unique Micro Overlay modules, whose presets can be changed via Ultra Tuner.
 
 
@@ -49,7 +50,6 @@
    * [sys-clk](https://github.com/halop/OC_Toolkit_SC_EOS) - Module responsible for overclocking CPU, memory and GPU - for better performance. I change versions from different authors from time to time. Original authors: Meha/hanai3Bi, lineon, p-sam.
    * [nx-ovlloader](https://github.com/ppkantorski/nx-ovlloader) - This module is used to switch the installed modules.
    * [sys-patch](https://github.com/impeeza/sys-patch) - Patches the system to run unsigned software instead of sigpatches.
-   * [nim-prodinfo-blank-fix](https://github.com/fruityloops1/nim-prodinfo-blank-fix) - Fixes an atmosphere crash problem, when nulling the serial number.
    * [Ultrahand Overlay](https://github.com/ppkantorski/Ultrahand-Overlay) - Special overlay-menu for interacting with the system: overclocking, controlling modes via ReverseNX, enabling cheats, etc. Also allows to use your own packages, for example, Ultra Tuner.
      - **`Ultra OC (sys-clk)`**, a mod of [sys-clk](https://github.com/halop/OC_Toolkit_SC_EOS) - Overlay for controlling sys-clk module. Slightly modified by me, but without digging into sources (Since they're closed).
      - [Status Monitor](https://github.com/Ultra-NX/Status-Monitor-Overlay), a fork of [Status Monitor](https://github.com/masagrator/Status-Monitor-Overlay) - Overlay that allows you to monitor console parameters in real time. It can act as an FPS counter. You change preset of Micro-overlay appearance in Updater.
@@ -81,18 +81,9 @@
       * [FPSLocker Patches](https://github.com/masagrator/FPSLocker-Warehouse) - Patches for FPSLocker, so you don't have to download a separate patch for each game through the overlay.
       * [DVR Patches](https://github.com/exelix11/dvr-patches) - SysDVR patches, work without the system module, activating background recording in games where it is initially prohibited.
       * [TriPlayer](https://github.com/DefenderOfHyrule/TriPlayer) - A homebrew music player that runs through the system module, and can minimize while running in the background.
-      * [Mission Control](https://github.com/ndeadly/MissionControl) - A module that allows you to connect almost any gamepads to the console.
       * [sys-ftpd](https://github.com/tomvita/sys-ftpd-light) - FTP server running in background.
 
 
-1. **Contents of the [Homebrews Pack](https://github.com/Ultra-NX/Ultra/releases/latest)**
-*
-   * [HB App Store](https://github.com/fortheusers/hb-appstore) - A free store for downloading Homebrew apps.
-   * [Tinfoil](https://tinfoil.io) - Installer and game store.
-   * [ThemezerNX](https://github.com/suchmememanyskill/themezer-nx) + [NXThemes Installer](https://github.com/exelix11/SwitchThemeInjector) + [Theme Patches](https://github.com/exelix11/theme-patches) - Searching and installing themes on Switch.
-   * [Mission Control](https://github.com/ndeadly/MissionControl) - A module that allows you to connect almost any gamepads to the console.
-
-
 
 ## License
 

SaltySD/plugins/FPSLocker/patches/01001BE01908C000/E1F81DC590FDE0B5.yaml

@@ -0,0 +1,27 @@
+# HOT WHEELS UNLEASHED 2 1.0.10
+# BID: E1F81DC590FDE0B5
+
+unsafeCheck: true
+
+ALL_FPS:
+ # r.VSync
+  -
+    type: write
+    address: [MAIN, 0xAD74458, 0]
+    value_type: int32
+    value: [0, 0]
+  # r.DynamicRes.FrameTimeBudget (1000/FPS) cutted to 2 decimals
+  -
+    type: evaluate_write
+    address: [MAIN, 0xB58E090, 0]
+    value_type: float
+    value: ["TruncDec(FRAMETIME_TARGET, 2)", "TruncDec(FRAMETIME_TARGET, 2)"]
+  # t.MaxFPS
+  -
+    type: evaluate_write
+    address: [MAIN, 0xB632E08, 0]
+    value_type: float
+    value: [FPS_LOCK_TARGET, FPS_LOCK_TARGET]
+  -
+    type: block
+    what: timing

SaltySD/plugins/FPSLocker/patches/010045301B86C000/791D79EBD7A0115E.yaml

@@ -0,0 +1,27 @@
+# Romancing SaGa 2: Revenge of the Seven 1.0.1
+# BID: 791D79EBD7A0115E
+
+unsafeCheck: true
+
+ALL_FPS:
+ # r.VSync
+  -
+    type: write
+    address: [MAIN, 0x6D1DA90, 0]
+    value_type: int32
+    value: [0, 0]
+  # r.DynamicRes.FrameTimeBudget (1000/FPS) cutted to 2 decimals
+  -
+    type: evaluate_write
+    address: [MAIN, 0x7BF9C70, 0]
+    value_type: float
+    value: ["TruncDec(FRAMETIME_TARGET, 2)", "TruncDec(FRAMETIME_TARGET, 2)"]
+  # t.MaxFPS
+  -
+    type: evaluate_write
+    address: [MAIN, 0x7C524C0, 0]
+    value_type: float
+    value: [FPS_LOCK_TARGET, FPS_LOCK_TARGET]
+  -
+    type: block
+    what: timing

SaltySD/plugins/FPSLocker/patches/01005EA01C0FC000/3AEBA262CC1D26D3.yaml

@@ -0,0 +1,28 @@
+# SONIC X SHADOW GENERATIONS Launcher / SHADOW GENERATIONS 1.0.1
+# BID: 3AEBA262CC1D26D3
+
+# FPS Lock is used to determine dynamic resolution timing too, but it doesn't work properly when setting higher FPS.
+# DR Timing Fix is applied for anything above 30 FPS as it seems to fix the most notorious issue - stucking at 360p.
+# Turn off Window Sync for better performance
+
+unsafeCheck: true
+
+ALL_FPS:
+  # Internal FPS Lock
+  # REF: C8 AA 8A 52 A8 30 A8 72 first ADRP above it
+  -
+    type: evaluate_write
+    address: [MAIN, 0x3E4D7B8, 0x14]
+    value_type: float
+    value: FPS_TARGET
+  # DR Timing fix, applied only for handheld
+  # Ref: 00 01 3F D6 B4 02 00 F9 E0 03 13 AA 01 3E 80 52 first ADRP above it
+  -
+    type: evaluate_compare
+    compare_address: [MAIN, 0x3E4D7E0, 0x18, 0x260, 0x24]
+    compare_value_type: float
+    compare_type: "=="
+    compare_value: -2.8
+    address: [MAIN, 0x3E4D7E0, 0x18, 0x260, 0x24]
+    value_type: float
+    value: ["-1.4 * VSYNC_TARGET", "-0.6 * VSYNC_TARGET", "0.025 * VSYNC_TARGET", "0.04 * VSYNC_TARGET", "0.05 * VSYNC_TARGET", "0.15 * VSYNC_TARGET"]

SaltySD/plugins/FPSLocker/patches/01005EA01C0FC001/D91C67509C6AED8D.yaml

@@ -0,0 +1,27 @@
+# SONIC GENERATIONS 1.0.1
+# BID: D91C67509C6AED8D
+
+unsafeCheck: true
+
+MASTER_WRITE:
+  # NOP internal FPS Lock
+  # REF: 00 00 23 1E E1 02 27 1E 00 08 21 1E
+  -
+    type: bytes
+    main_offset: 0x7E4AA4
+    value_type: uint32
+    value: 0xD503201F
+  # Set window present interval to 2 to get default 30 FPS lock
+  # REF: 34 14 9F 1A
+  -
+    type: bytes
+    main_offset: 0x22FCB88
+    value_type: uint32
+    value: 0x52800054
+ALL_FPS:
+  # DUMMY
+  -
+    type: write
+    address: [MAIN, 0x5226F00]
+    value_type: uint8
+    value: 0

SaltySD/plugins/FPSLocker/patches/0100BAC01E57E000/E5816E16CC5D72A5.yaml

@@ -0,0 +1,14 @@
+# Ys X: Nordics US/EU 1.0.2
+# BID: E5816E16CC5D72A5
+# Credits to StevensND for finding assembly instruction from which I have derived pointer address
+
+unsafeCheck: true
+
+ALL_FPS:
+  # Used to set min delta timing for various parts of game + DR target
+  # REF: C9 03 80 52 C1 03 80 52 first ADRP above it
+  -
+    type: evaluate_write
+    address: [MAIN, 0xC4F758, 0x34]
+    value_type: uint32
+    value: FPS_TARGET

atmosphere/contents/010000000000bd00/mitm.lst

@@ -0,0 +1,2 @@
+btdrv
+btm

atmosphere/contents/010000000000bd00/toolbox.json

@@ -0,0 +1,5 @@
+{
+	"name"  : "MissionControl",
+	"tid"   : "010000000000bd00",
+	"requires_reboot": true
+}

atmosphere/contents/690000000000000D/toolbox.json

@@ -0,0 +1,5 @@
+{
+	"name"  : "sys-con",
+	"tid"   : "690000000000000D",
+	"requires_reboot": false
+}

config/MissionControl/missioncontrol.ini

@@ -0,0 +1,28 @@
+[general]
+; Enable vibration support for unofficial controllers [default true]
+;enable_rumble=true
+; Enable motion controls support for unoffical controllers [default true]
+;enable_motion=true
+
+[bluetooth]
+; Override host name of Bluetooth adapter
+;host_name=Nintendo Switch!
+; Override host mac address of Bluetooth adapter
+;host_address=04:20:69:04:20:69
+
+[misc]
+; Set the threshold for which ZL/ZR are considered pressed for controllers with analog triggers. Valid range [0-100] percent [default 50]
+;analog_trigger_activation_threshold=50
+; Set Dualshock 3 player LED behaviour. Valid modes [0-2] where 0=Switch pattern, 1=PS3 pattern, 2=Hybrid (Switch pattern reversed to line up with numeric labels on the controller) [default 0]
+;dualshock3_led_mode=0
+; Set polling rate for Sony Dualshock 4 controllers. Valid range [0-16] where 0=max, 16=min [default 8 (125Hz)]
+; Refer to https://github.com/ndeadly/MissionControl/blob/4a0326308d1ff39353b045f5efb1a99c4a504c28/mc_mitm/source/controllers/dualshock4_controller.hpp#L21
+;dualshock4_polling_rate=8
+; Set LED lightbar brightness for Sony Dualshock 4 controllers. Valid range [0-9] where 0=off, 1=min, 2-9=12.5-100% [default 5(50%)]
+;dualshock4_lightbar_brightness=4
+; Set LED lightbar brightness for Sony Dualsense controllers. Valid range [0-9] where 0=off, 1=min, 2-9=12.5-100% [default 5(50%)]
+;dualsense_lightbar_brightness=4
+; Enable the white player indicator LEDs below the Dualsense touchpad [default true]
+;dualsense_enable_player_leds=false
+; Set Dualsense vibration intensity, 12.5% per increment. Valid range [1-8] where 1=12.5%, 8=100% [default 4(50%)]
+;dualsense_vibration_intensity=4

config/aio-switch-updater/custom_packs.json

@@ -1,9 +1,8 @@
 {
   "ams": {
-    "[PACK] Ultra-NX": "https://github.com/Ultra-NX/Ultra/releases/latest/download/Ultra.zip"
+    "[PACK] UltraNX": "https://github.com/Ultra-NX/Ultra/releases/latest/download/Ultra.zip"
   },
   "misc": {
-    "Homebrews Pack": "https://github.com/Ultra-NX/Ultra/releases/latest/download/Homebrews.Pack.zip",
     "Refresh AIO": "https://github.com/Ultra-NX/Ultra/releases/latest/download/AIO.zip"
   }
 }

config/sys-patch/config.ini

@@ -9,8 +9,8 @@ noacidsigchk2=1
 noncasigchk_old=1
 noncasigchk_new=1
 noncasigchk_new2=1
-nocntchk_old=1
-nocntchk_new=1
+nocntchk=1
+nocntchk_FW19=1
 [ldr]
 noacidsigchk=1
 [es]
@@ -20,5 +20,7 @@ es3=1
 es4=1
 es5=1
 es6=1
+es7_FW18=1
+es7_FW18-19=1
 [nifm]
 ctest=1

switch/.packages/package.ini

@@ -1,89 +1,5 @@
 [Reboot]
 reboot
 
-[*Options]
-
-[$]
-;mode=table
-;background=false
-;gap=10
-
-[$]
-;mode=table
-;background=false
-;section_text_color=FFFFFF
-;info_text_color=FFFFFF
-;spacing=1
-;gap=5
-
-'Launch'=''
-
-[$]
-;mode=table
-;background=false
-;section_text_color=AAAAAA
-;info_text_color=00FF00
-;header=false
-;spacing=5
-;gap=10
-'============================'= ''
-
-
-[Atmosphere - OC]
-set-ini-val /bootloader/hekate_ipl.ini config autoboot 1
-set-ini-val /bootloader/hekate_ipl.ini config autoboot_list 0
-reboot
-
-[Safe Mode - No OC]
-set-ini-val /bootloader/hekate_ipl.ini config autoboot 2
-set-ini-val /bootloader/hekate_ipl.ini config autoboot_list 0
-reboot
-
-[$]
-;mode=table
-;background=false
-;gap=20
-
-[$]
-;mode=table
-;background=false
-;section_text_color=FFFFFF
-;info_text_color=FFFFFF
-;spacing=1
-;gap=5
-
-'More Configs'=''
-
-[$]
-;mode=table
-;background=false
-;section_text_color=AAAAAA
-;info_text_color=00FF00
-;header=false
-;spacing=5
-;gap=10
-'============================'= ''
-
-
-[Semi Stock - OC]
-set-ini-val /bootloader/hekate_ipl.ini config autoboot 1
-set-ini-val /bootloader/hekate_ipl.ini config autoboot_list 1
-reboot
-
-[Semi Safe - No OC]
-set-ini-val /bootloader/hekate_ipl.ini config autoboot 2
-set-ini-val /bootloader/hekate_ipl.ini config autoboot_list 1
-reboot
-
-[$]
-;mode=table
-;background=false
-;section_text_color=AAAAAA
-;info_text_color=00FF00
-;header=false
-;spacing=5
-;gap=10
-'============================'= ''
-
 [Shutdown]
 shutdown