Ultra 2.0 Prerelease 3

Updated FPSLocker patches Fixed the problem of Erista rebooting in Hekate Edits loader.kip Updated Ultra Tuner - 12|R6: Now Tuner stores its settings differently, so no more red crosses should appear when changing presets Also updated all presets, and added a switch for weakened versions of them - similar to the old "Green" and "Blue" ones
2025-01-12 18:31:55 +00:00 · 2023-12-18 01:49:41 +03:00 · 2023-12-18 01:49:41 +03:00 · a6956b1e92
commit a6956b1e92
parent 8fcfd7b731
13 changed files with 968 additions and 42 deletions
--- a/SaltySD/plugins/FPSLocker/patches/0100001019F6E000/95B2E97C5D16385A.yaml
+++ b/SaltySD/plugins/FPSLocker/patches/0100001019F6E000/95B2E97C5D16385A.yaml
@ -0,0 +1,153 @@
+# Horizon Chase 2 1.5.4
+# BID: 95B2E97C5D16385A
+
+unsafeCheck: true
+
+15FPS:
+  # r.VSync
+  -
+    type: write
+    address: [MAIN, 0x6F8D398, 0]
+    value_type: int32
+    value: [0, 0]
+  # t.MaxFPS
+  -
+    type: write
+    address: [MAIN, 0x77888A8, 0]
+    value_type: float
+    value: [15, 15]
+20FPS:
+  # r.VSync
+  -
+    type: write
+    address: [MAIN, 0x6F8D398, 0]
+    value_type: int32
+    value: [0, 0]
+  # t.MaxFPS
+  -
+    type: write
+    address: [MAIN, 0x77888A8, 0]
+    value_type: float
+    value: [20, 20]
+25FPS:
+  # r.VSync
+  -
+    type: write
+    address: [MAIN, 0x6F8D398, 0]
+    value_type: int32
+    value: [0, 0]
+  # t.MaxFPS
+  -
+    type: write
+    address: [MAIN, 0x77888A8, 0]
+    value_type: float
+    value: [25, 25]
+  -
+    type: block
+    what: timing
+30FPS:
+  # r.VSync (default value is 1)
+  -
+    type: write
+    address: [MAIN, 0x6F8D398, 0]
+    value_type: int32
+    value: [0, 0]
+  # t.MaxFPS (default value is 30)
+  -
+    type: write
+    address: [MAIN, 0x77888A8, 0]
+    value_type: float
+    value: [0, 0]
+35FPS:
+  # r.VSync
+  -
+    type: write
+    address: [MAIN, 0x6F8D398, 0]
+    value_type: int32
+    value: [0, 0]
+  # t.MaxFPS
+  -
+    type: write
+    address: [MAIN, 0x77888A8, 0]
+    value_type: float
+    value: [35, 35]
+  -
+    type: block
+    what: timing
+40FPS:
+  # r.VSync
+  -
+    type: write
+    address: [MAIN, 0x6F8D398, 0]
+    value_type: int32
+    value: [0, 0]
+  # t.MaxFPS
+  -
+    type: write
+    address: [MAIN, 0x77888A8, 0]
+    value_type: float
+    value: [40, 40]
+  -
+    type: block
+    what: timing
+45FPS:
+  # r.VSync
+  -
+    type: write
+    address: [MAIN, 0x6F8D398, 0]
+    value_type: int32
+    value: [0, 0]
+  # t.MaxFPS
+  -
+    type: write
+    address: [MAIN, 0x77888A8, 0]
+    value_type: float
+    value: [45, 45]
+  -
+    type: block
+    what: timing
+50FPS:
+  # r.VSync
+  -
+    type: write
+    address: [MAIN, 0x6F8D398, 0]
+    value_type: int32
+    value: [0, 0]
+  # t.MaxFPS
+  -
+    type: write
+    address: [MAIN, 0x77888A8, 0]
+    value_type: float
+    value: [50, 50]
+  -
+    type: block
+    what: timing
+55FPS:
+  # r.VSync
+  -
+    type: write
+    address: [MAIN, 0x6F8D398, 0]
+    value_type: int32
+    value: [0, 0]
+  # t.MaxFPS
+  -
+    type: write
+    address: [MAIN, 0x77888A8, 0]
+    value_type: float
+    value: [55, 55]
+  -
+    type: block
+    what: timing
+60FPS:
+  # r.VSync
+  -
+    type: write
+    address: [MAIN, 0x6F8D398, 0]
+    value_type: int32
+    value: [0, 0]
+  # t.MaxFPS
+  -
+    type: write
+    address: [MAIN, 0x77888A8, 0]
+    value_type: float
+    value: [0, 0]
--- a/SaltySD/plugins/FPSLocker/patches/01003FB00C5A8000/DCDFA5A4AD9A175D.yaml
+++ b/SaltySD/plugins/FPSLocker/patches/01003FB00C5A8000/DCDFA5A4AD9A175D.yaml
@ -1,10 +1,96 @@
 # Super Kirby Clash 1.0.1
 # BID: DCDFA5A4AD9A175D
-# Thanks to Kirby567Fan for finding offsets
-# Game is using fake double buffer
+# Thanks to Kirby567Fan for finding offset of interval

 unsafeCheck: true

+MASTER_WRITE:
+  # Block game from updating interval
+  -
+    type: bytes
+    main_offset: 0x7264
+    value_type: uint32
+    value: 0xD503201F
+  -
+    type: bytes
+    main_offset: 0x721C
+    value_type: uint32
+    value: 0xD503201F
+  # Remove double buffer
+  -
+    type: bytes
+    main_offset: 0xC5B08
+    value_type: uint32
+    value: 
+      - 0x52800068
+  -
+    type: bytes
+    main_offset: 0xC5BB0
+    value_type: uint32
+    value: 
+      - 0x52800062
+  -
+    type: bytes
+    main_offset: 0xC5720
+    value_type: uint32
+    value: 
+      - 0xD10143FF
+      - 0xA90257F6
+      - 0xA9034FF4
+      - 0xA9047BFD
+      - 0x910103FD
+  -
+    type: bytes
+    main_offset: 0xC5744
+    value_type: uint32
+    value: 
+      - 0xA9017FFF
+  -
+    type: bytes
+    main_offset: 0xC5758
+    value_type: uint32
+    value: 
+      - 0x52800062
+  -
+    type: bytes
+    main_offset: 0xC5780
+    value_type: uint32
+    value: 
+      - 0xA9447BFD
+      - 0xA9434FF4
+      - 0xA94257F6
+      - 0x910143FF
+  -
+    type: bytes
+    main_offset: 0xC57A0
+    value_type: uint32
+    value: 
+      - 0xD10143FF
+      - 0xA901D7FF
+      - 0xA9034FF4
+      - 0xA9047BFD
+      - 0x910103FD
+  -
+    type: bytes
+    main_offset: 0xC57CC
+    value_type: uint32
+    value: 
+      - 0x52800062
+  -
+    type: bytes
+    main_offset: 0xC57E4
+    value_type: uint32
+    value: 
+      - 0xF90003E8
+  -
+    type: bytes
+    main_offset: 0xC580C
+    value_type: uint32
+    value: 
+      - 0xA9447BFD
+      - 0xF94013F5
+      - 0xA9434FF4
+      - 0x910143FF
 15FPS:
  # Interval
  -
--- a/SaltySD/plugins/FPSLocker/patches/01004D300C5AE000/D9BA7DB72FFAFECD.yaml
+++ b/SaltySD/plugins/FPSLocker/patches/01004D300C5AE000/D9BA7DB72FFAFECD.yaml
@ -1,11 +1,78 @@
 # Kirby and the Forgotten Land 1.0.0
 # BID: D9BA7DB72FFAFECD
-# Thanks to Hazerou for finding offsets
-# Game speed is tied to framerate, no proper support for anything between 30 and 60. 
-# Game crashes at 2nd or 3rd frame if you try to force triple buffer.
+# Thanks to Hazerou for finding interval offsets
+# Game speed is tied to framerate, no proper support for anything between 30 and 60 FPS

-unsafeCheck: true
+unsafeCheck: false

+MASTER_WRITE:
+  # Remove double buffer
+  -
+    type: bytes
+    main_offset: 0x745E94
+    value_type: uint32
+    value: 0x52800069
+  # Fix helper functions to not corrupt stack
+  -
+    type: bytes
+    main_offset: 0x745F70
+    value_type: uint32
+    value: 0x52800062
+  -
+    type: bytes
+    main_offset: 0x75908C
+    value_type: uint32
+    value: 0x52800062 
+  -
+    type: bytes
+    main_offset: 0x675198
+    value_type: uint32
+    value:
+      - 0xD10143FF
+      - 0xA90257F6
+      - 0xA9034FF4
+      - 0xA9047BFD
+      - 0x910103FD
+  -
+    type: bytes
+    main_offset: 0x6751EC
+    value_type: uint32
+    value: 0x52800062 
+  -
+    type: bytes
+    main_offset: 0x675210
+    value_type: uint32
+    value:
+      - 0xA9447BFD
+      - 0xA9434FF4
+      - 0xA94257F6
+      - 0x910143FF
+  -
+    type: bytes
+    main_offset: 0x74A510
+    value_type: uint32
+    value: 0x52800062
+  -
+    type: bytes
+    main_offset: 0x7590F8
+    value_type: uint32
+    value: 0x52800062
+  -
+    type: bytes
+    main_offset: 0x7BDCD4
+    value_type: uint32
+    value: 0x52800062
+  # Block transparency in some 2D elements to avoid issue with flickering at triple buffer
+  -
+    type: bytes
+    main_offset: 0x6A58C8
+    value_type: uint32
+    value:
+      - 0xD2802049
+      - 0xB948414A
+      - 0x91208114
+      - 0xD37DF14C
+      - 0xF9000289
 15FPS:
  # Interval
  -
@ -13,6 +80,12 @@ unsafeCheck: true
    address: [MAIN, 0xA72628, 0x50]
    value_type: int32
    value: 4
+  # Dynamic Resolution GPU Frametiming Max / Min (Max = 1.95 * (30/FPS), Min = 1.7 * (30/FPS))
+  -
+    type: write
+    address: [MAIN, 0xA726B0, 0x140, 0x1B0, 0x20, 0x34]
+    value_type: float
+    value: [3.9, 3.4]
  -
    type: block
    what: timing
@ -23,6 +96,12 @@ unsafeCheck: true
    address: [MAIN, 0xA72628, 0x50]
    value_type: int32
    value: 3
+  # Dynamic Resolution GPU Frametiming
+  -
+    type: write
+    address: [MAIN, 0xA726B0, 0x140, 0x1B0, 0x20, 0x34]
+    value_type: float
+    value: [2.925, 2.55]
  -
    type: block
    what: timing
@ -33,6 +112,12 @@ unsafeCheck: true
    address: [MAIN, 0xA72628, 0x50]
    value_type: int32
    value: 2
+  # Dynamic Resolution GPU Frametiming
+  -
+    type: write
+    address: [MAIN, 0xA726B0, 0x140, 0x1B0, 0x20, 0x34]
+    value_type: float
+    value: [2.34, 2.04]
 30FPS:
  # Interval (default value)
  -
@ -40,6 +125,12 @@ unsafeCheck: true
    address: [MAIN, 0xA72628, 0x50]
    value_type: int32
    value: 2
+  # Dynamic Resolution GPU Frametiming (default values)
+  -
+    type: write
+    address: [MAIN, 0xA726B0, 0x140, 0x1B0, 0x20, 0x34]
+    value_type: float
+    value: [1.95, 1.7]
 35FPS:
  # Interval
  -
@ -47,6 +138,12 @@ unsafeCheck: true
    address: [MAIN, 0xA72628, 0x50]
    value_type: int32
    value: 1
+  # Dynamic Resolution GPU Frametiming
+  -
+    type: write
+    address: [MAIN, 0xA726B0, 0x140, 0x1B0, 0x20, 0x34]
+    value_type: float
+    value: [1.67, 1.45]
 40FPS:
  # Interval
  -
@ -54,6 +151,12 @@ unsafeCheck: true
    address: [MAIN, 0xA72628, 0x50]
    value_type: int32
    value: 1
+  # Dynamic Resolution GPU Frametiming
+  -
+    type: write
+    address: [MAIN, 0xA726B0, 0x140, 0x1B0, 0x20, 0x34]
+    value_type: float
+    value: [1.4625, 1.275]
 45FPS:
  # Interval
  -
@ -61,6 +164,12 @@ unsafeCheck: true
    address: [MAIN, 0xA72628, 0x50]
    value_type: int32
    value: 1
+  # Dynamic Resolution GPU Frametiming
+  -
+    type: write
+    address: [MAIN, 0xA726B0, 0x140, 0x1B0, 0x20, 0x34]
+    value_type: float
+    value: [1.3, 1.13]
 50FPS:
  # Interval
  -
@ -68,6 +177,12 @@ unsafeCheck: true
    address: [MAIN, 0xA72628, 0x50]
    value_type: int32
    value: 1
+  # Dynamic Resolution GPU Frametiming
+  -
+    type: write
+    address: [MAIN, 0xA726B0, 0x140, 0x1B0, 0x20, 0x34]
+    value_type: float
+    value: [1.17, 1.02]
 55FPS:
  # Interval
  -
@ -75,6 +190,12 @@ unsafeCheck: true
    address: [MAIN, 0xA72628, 0x50]
    value_type: int32
    value: 1
+  # Dynamic Resolution GPU Frametiming
+  -
+    type: write
+    address: [MAIN, 0xA726B0, 0x140, 0x1B0, 0x20, 0x34]
+    value_type: float
+    value: [1.06, 0.92]
 60FPS:
  # Interval
  -
@ -82,3 +203,9 @@ unsafeCheck: true
    address: [MAIN, 0xA72628, 0x50]
    value_type: int32
    value: 1
+  # Dynamic Resolution GPU Frametiming
+  -
+    type: write
+    address: [MAIN, 0xA726B0, 0x140, 0x1B0, 0x20, 0x34]
+    value_type: float
+    value: [0.975, 0.85]
--- a/SaltySD/plugins/FPSLocker/patches/0100A8E016236000/82AF4E16BBC0BEC8.yaml
+++ b/SaltySD/plugins/FPSLocker/patches/0100A8E016236000/82AF4E16BBC0BEC8.yaml
@ -1,11 +1,134 @@
 # Kirby's Dream Buffet 1.0.0
 # BID: 82AF4E16BBC0BEC8
 # Thanks to Hazerou for finding offsets
-# Game is using fake double buffer.
-# Game crashes at 2nd or 3rd frame if you try to force triple buffer.
+# Game was patched to use triple buffer, and to avoid flickering with some 2D transparent elements, I have disabled transparency in them.
+# Issue with flickering exists because game is hardcoded to only register 2 textures into texturepool and 2 samplers into samplerpool for framebuffers.

 unsafeCheck: true

+MASTER_WRITE:
+  # Remove double buffer
+  -
+    type: bytes
+    main_offset: 0x861208
+    value_type: uint32
+    value: 0x52800069
+  # Fix helper functions to properly copy third buffer address to stack
+  -
+    type: bytes
+    main_offset: 0x8612DC
+    value_type: uint32
+    value: 0x52800062
+  -
+    type: bytes
+    main_offset: 0x8654D8
+    value_type: uint32
+    value:
+      - 0xD10183FF
+      - 0xA9027BFD
+      - 0x910083FD
+      - 0xF9001BF7
+      - 0xA90457F6
+      - 0xA9054FF4
+      - 0xA9017FFF
+  -
+    type: bytes
+    main_offset: 0x86550C
+    value_type: uint32
+    value: 0x52800062
+  -
+    type: bytes
+    main_offset: 0x8655B8
+    value_type: uint32
+    value:
+      - 0xA9002BE8
+      - 0x97FFE69B
+      - 0xA9454FF4
+      - 0xF9401BF7
+      - 0xA94457F6
+      - 0xA9427BFD
+      - 0x910183FF
+  -
+    type: bytes
+    main_offset: 0x793298
+    value_type: uint32
+    value:
+      - 0xD10143FF
+      - 0xA9027BFD
+      - 0x910083FD
+      - 0xA90357F6
+      - 0xA9044FF4
+  -
+    type: bytes
+    main_offset: 0x7932E0
+    value_type: uint32
+    value: 0xA9017FFF
+  -
+    type: bytes
+    main_offset: 0x7932EC
+    value_type: uint32
+    value: 0x52800062
+  -
+    type: bytes
+    main_offset: 0x793310
+    value_type: uint32
+    value:
+      - 0xA9444FF4
+      - 0xA94357F6
+      - 0xA9427BFD
+      - 0x910143FF
+  -
+    type: bytes
+    main_offset: 0x876B00
+    value_type: uint32
+    value:
+      - 0x910043E1
+      - 0x910043F7
+  -
+    type: bytes
+    main_offset: 0x876B14
+    value_type: uint32
+    value: 
+      - 0x52800062
+      - 0xA9017FFF
+  -
+    type: bytes
+    main_offset: 0x8CFC44
+    value_type: uint32
+    value:
+      - 0x910003E1
+      - 0x52800062
+  -
+    type: bytes
+    main_offset: 0x8CFC5C
+    value_type: uint32
+    value: 0x910003FA
+  -
+    type: bytes
+    main_offset: 0x876B14
+    value_type: uint32
+    value: 0x52800062
+  -
+    type: bytes
+    main_offset: 0x8612DC
+    value_type: uint32
+    value: 0x52800062
+  -
+    type: bytes
+    main_offset: 0x876A64
+    value_type: uint32
+    value: 0x52800062
+  # Disable transparency for some 2D elements to avoid issues with flickering at triple buffer
+  -
+    type: bytes
+    main_offset: 0x7BFB00
+    value_type: uint32
+    value:
+      - 0xD2802049
+      - 0xB948494A
+      - 0xD37DF14C
+      - 0x9120A114
+      - 0xF9000289
 15FPS:
  # Interval
  -
--- a/SaltySD/plugins/FPSLocker/patches/0100E2701A888000/8322528255D2CC63.yaml
+++ b/SaltySD/plugins/FPSLocker/patches/0100E2701A888000/8322528255D2CC63.yaml
@ -0,0 +1,182 @@
+# Trine 5: A Clockwork Conspiracy 1.0.5
+# BID: 8322528255D2CC63
+# To update dynamic resolution offsets look at fb::renderer::ResolutionScaler::update
+
+unsafeCheck: true
+
+MASTER_WRITE:
+  # Change double buffer to triple buffer
+  -
+    type: bytes
+    main_offset: 0x138A024
+    value_type: uint32
+    value: 0x52800068
+  # Allow changing dynamic resolution timings
+  # Max - changed address to MAIN + 0x7D05200
+  -
+    type: bytes
+    main_offset: 0x25992CC
+    value_type: uint32
+    value: 
+      - 0x9002BB68
+      - 0xD001C236
+      - 0xFD410102
+  # Min - changed address to MAIN + 0x7D05208
+  -
+    type: bytes
+    main_offset: 0x2599344
+    value_type: uint32
+    value: 
+    - 0x9002BB6A
+    - 0xFD410545
+  -
+    type: bytes
+    main_offset: 0x2599380
+    value_type: uint32
+    value: 0x9002BB6A
+  -
+    type: bytes
+    main_offset: 0x2599390
+    value_type: uint32
+    value: 0xFD410546
+  # Default values
+  -
+    type: bytes
+    main_offset: 0x7D05200
+    value_type: double
+    value: 34.0
+  -
+    type: bytes
+    main_offset: 0x7D05208
+    value_type: double
+    value: 32.0
+15FPS:
+  # Max Dynamic Resolution Timing
+  -
+    type: write
+    address: [MAIN, 0x7D05200]
+    value_type: double
+    value: 68.0
+  # Min Dynamic Resolution Timing
+  -
+    type: write
+    address: [MAIN, 0x7D05208]
+    value_type: double
+    value: 64.0
+20FPS:
+  # Max Dynamic Resolution Timing
+  -
+    type: write
+    address: [MAIN, 0x7D05200]
+    value_type: double
+    value: 51.0
+  # Min Dynamic Resolution Timing
+  -
+    type: write
+    address: [MAIN, 0x7D05208]
+    value_type: double
+    value: 48.0
+25FPS:
+  # Max Dynamic Resolution Timing
+  -
+    type: write
+    address: [MAIN, 0x7D05200]
+    value_type: double
+    value: 40.8
+  # Min Dynamic Resolution Timing
+  -
+    type: write
+    address: [MAIN, 0x7D05208]
+    value_type: double
+    value: 38.4
+30FPS:
+  # Max Dynamic Resolution Timing
+  -
+    type: write
+    address: [MAIN, 0x7D05200]
+    value_type: double
+    value: 34.0
+  # Min Dynamic Resolution Timing
+  -
+    type: write
+    address: [MAIN, 0x7D05208]
+    value_type: double
+    value: 32.0
+35FPS:
+  # Max Dynamic Resolution Timing
+  -
+    type: write
+    address: [MAIN, 0x7D05200]
+    value_type: double
+    value: 29.14
+  # Min Dynamic Resolution Timing
+  -
+    type: write
+    address: [MAIN, 0x7D05208]
+    value_type: double
+    value: 27.42
+40FPS:
+  # Max Dynamic Resolution Timing
+  -
+    type: write
+    address: [MAIN, 0x7D05200]
+    value_type: double
+    value: 25.5
+  # Min Dynamic Resolution Timing
+  -
+    type: write
+    address: [MAIN, 0x7D05208]
+    value_type: double
+    value: 24.0
+45FPS:
+  # Max Dynamic Resolution Timing
+  -
+    type: write
+    address: [MAIN, 0x7D05200]
+    value_type: double
+    value: 22.66
+  # Min Dynamic Resolution Timing
+  -
+    type: write
+    address: [MAIN, 0x7D05208]
+    value_type: double
+    value: 21.33
+50FPS:
+  # Max Dynamic Resolution Timing
+  -
+    type: write
+    address: [MAIN, 0x7D05200]
+    value_type: double
+    value: 20.4
+  # Min Dynamic Resolution Timing
+  -
+    type: write
+    address: [MAIN, 0x7D05208]
+    value_type: double
+    value: 19.2
+55FPS:
+  # Max Dynamic Resolution Timing
+  -
+    type: write
+    address: [MAIN, 0x7D05200]
+    value_type: double
+    value: 18.54
+  # Min Dynamic Resolution Timing
+  -
+    type: write
+    address: [MAIN, 0x7D05208]
+    value_type: double
+    value: 17.45
+60FPS:
+  # Max Dynamic Resolution Timing
+  -
+    type: write
+    address: [MAIN, 0x7D05200]
+    value_type: double
+    value: 17.0
+  # Min Dynamic Resolution Timing
+  -
+    type: write
+    address: [MAIN, 0x7D05208]
+    value_type: double
+    value: 16.0
--- a/SaltySD/plugins/FPSLocker/patches/0100E67012924000/B151A224A429F9A7.yaml
+++ b/SaltySD/plugins/FPSLocker/patches/0100E67012924000/B151A224A429F9A7.yaml
@ -0,0 +1,224 @@
+# The Witcher 3: Wild Hunt 4.04a-4.04b
+# BID: B151A224A429F9A7
+
+unsafeCheck: true
+
+15FPS:
+  # DRGameTargetFrameTimeInMs
+  -
+    type: write
+    address: [MAIN, 0x41312B4]
+    value_type: float
+    value: 63
+  # DRCinematicTargetFrameTimeInMs
+  -
+    type: write
+    address: [MAIN, 0x41312E4]
+    value_type: float
+    value: 63
+  # LimitFPS
+  -
+    type: write
+    address: [MAIN, 0x411DCFC]
+    value_type: int32
+    value: 15
+  -
+    type: block
+    what: timing
+20FPS:
+  # DRGameTargetFrameTimeInMs
+  -
+    type: write
+    address: [MAIN, 0x41312B4]
+    value_type: float
+    value: 47.25
+  # DRCinematicTargetFrameTimeInMs
+  -
+    type: write
+    address: [MAIN, 0x41312E4]
+    value_type: float
+    value: 47.25
+  # LimitFPS
+  -
+    type: write
+    address: [MAIN, 0x411DCFC]
+    value_type: int32
+    value: 20
+  -
+    type: block
+    what: timing
+25FPS:
+  # DRGameTargetFrameTimeInMs
+  -
+    type: write
+    address: [MAIN, 0x41312B4]
+    value_type: float
+    value: 37.8
+  # DRCinematicTargetFrameTimeInMs
+  -
+    type: write
+    address: [MAIN, 0x41312E4]
+    value_type: float
+    value: 37.8
+  # LimitFPS
+  -
+    type: write
+    address: [MAIN, 0x411DCFC]
+    value_type: int32
+    value: 25
+  -
+    type: block
+    what: timing
+30FPS:
+  # DRGameTargetFrameTimeInMs (original value)
+  -
+    type: write
+    address: [MAIN, 0x41312B4]
+    value_type: float
+    value: 31.5
+  # DRCinematicTargetFrameTimeInMs
+  -
+    type: write
+    address: [MAIN, 0x41312E4]
+    value_type: float
+    value: 31.5
+  # LimitFPS (original value)
+  -
+    type: write
+    address: [MAIN, 0x411DCFC]
+    value_type: int32
+    value: 60
+
+# For 35-60 FPS check if cutscene is played. If it is, set 30 FPS lock. If not, disable it.
+35FPS:
+  # DRGameTargetFrameTimeInMs
+  -
+    type: write
+    address: [MAIN, 0x41312B4]
+    value_type: float
+    value: 27
+  # DRCinematicTargetFrameTimeInMs
+  -
+    type: write
+    address: [MAIN, 0x41312E4]
+    value_type: float
+    value: 27
+  # LimitFPS
+  -
+    type: write
+    address: [MAIN, 0x411DCFC]
+    value_type: int32
+    value: 35
+  -
+    type: block
+    what: timing
+40FPS:
+  # DRGameTargetFrameTimeInMs
+  -
+    type: write
+    address: [MAIN, 0x41312B4]
+    value_type: float
+    value: 23.625
+  # DRCinematicTargetFrameTimeInMs
+  -
+    type: write
+    address: [MAIN, 0x41312E4]
+    value_type: float
+    value: 23.625
+  # LimitFPS
+  -
+    type: write
+    address: [MAIN, 0x411DCFC]
+    value_type: int32
+    value: 40
+  -
+    type: block
+    what: timing
+45FPS:
+  # DRGameTargetFrameTimeInMs
+  -
+    type: write
+    address: [MAIN, 0x41312B4]
+    value_type: float
+    value: 21
+  # DRCinematicTargetFrameTimeInMs
+  -
+    type: write
+    address: [MAIN, 0x41312E4]
+    value_type: float
+    value: 21
+  # LimitFPS
+  -
+    type: write
+    address: [MAIN, 0x411DCFC]
+    value_type: int32
+    value: 45
+  -
+    type: block
+    what: timing
+50FPS:
+  # DRGameTargetFrameTimeInMs
+  -
+    type: write
+    address: [MAIN, 0x41312B4]
+    value_type: float
+    value: 18.9
+  # DRCinematicTargetFrameTimeInMs
+  -
+    type: write
+    address: [MAIN, 0x41312E4]
+    value_type: float
+    value: 18.9
+  # LimitFPS
+  -
+    type: write
+    address: [MAIN, 0x411DCFC]
+    value_type: int32
+    value: 50
+  -
+    type: block
+    what: timing
+55FPS:
+  # DRGameTargetFrameTimeInMs
+  -
+    type: write
+    address: [MAIN, 0x41312B4]
+    value_type: float
+    value: 17.1818181818
+  # DRCinematicTargetFrameTimeInMs
+  -
+    type: write
+    address: [MAIN, 0x41312E4]
+    value_type: float
+    value: 17.1818181818
+  # LimitFPS
+  -
+    type: write
+    address: [MAIN, 0x411DCFC]
+    value_type: int32
+    value: 55
+  -
+    type: block
+    what: timing
+60FPS:
+  # DRGameTargetFrameTimeInMs
+  -
+    type: write
+    address: [MAIN, 0x41312B4]
+    value_type: float
+    value: 15.75
+  # DRCinematicTargetFrameTimeInMs
+  -
+    type: write
+    address: [MAIN, 0x41312E4]
+    value_type: float
+    value: 15.75
+  # LimitFPS
+  -
+    type: write
+    address: [MAIN, 0x411DCFC]
+    value_type: int32
+    value: 60
+  -
+    type: block
+    what: timing
--- a/atmosphere/kips/.bak/Initial.ini
+++ b/atmosphere/kips/.bak/Initial.ini
@ -2,12 +2,12 @@
 cpuBoost = A83C1B
 cpuUV = 00
 cpuMVE = B004
-cpuMVM = 8804
+cpuMVM = 9C04
 gpuUV = 00
 gpuOFF = 0000
 gpuVminE = 2A03
 gpuVminM = 4E02
-DRAM = 00
+DRAM = 01
 ramVDD2 = 804F12
 ramVDDQ = C02709
 ramMHzE = 006B1C
@ -21,16 +21,16 @@ t4 = 03
 t5 = 02
 t6 = 03
 t7 = 00
-76UV3 = 6202
-153UV3 = 6202
-230UV3 = 6202
-307UV3 = 6202
-384UV3 = 6202
-460UV3 = 6202
-537UV3 = 6202
-614UV3 = 6202
-691UV3 = 6202
-768UV3 = 6202
+76UV3 = 2602
+153UV3 = 2602
+230UV3 = 2602
+307UV3 = 2602
+384UV3 = 2602
+460UV3 = 2602
+537UV3 = 2602
+614UV3 = 2602
+691UV3 = 3A02
+768UV3 = 4E02
 844UV3 = 6C02
 921UV3 = 8002
 998UV3 = A302
@ -51,4 +51,4 @@ t7 = 00
 844E = 38D11200D01F000054FCFFFF28030000B1ABFFFFE2000000
 921E = DC741300D01F000054FCFFFF28030000B1ABFFFFE2000000
 998E = 7F181400D01F000054FCFFFF28030000B1ABFFFFE2000000
-Presets = Gray
+Presets = Default
--- 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/config/Tuner.ini
+++ b/config/Tuner.ini
@ -0,0 +1,50 @@
+[Reduced Presets]
+footer = Off
+mode = toggle
+grouping = default
+
+[Ultra Cooling Fan]
+footer = Off
+mode = toggle
+grouping = default
+
+[Background Services]
+footer = Off
+mode = toggle
+grouping = default
+
+[*Selected Preset]
+footer = Default
+mode = option
+grouping = default
+
+[*Loader Kip]
+footer = Meha
+mode = option
+grouping = default
+
+[Old Ram Table]
+footer = Off
+mode = toggle
+grouping = default
+
+[*Status Monitor]
+footer = Ultra
+mode = option
+grouping = default
+
+[*Preset?SM]
+footer = Normal-
+mode = option
+grouping = default
+
+[*Framerate]
+footer = 60 Fps
+mode = option
+grouping = default
+
+[*Bitrate]
+footer = 20 Sec.
+mode = option
+grouping = default
+
--- a/config/aio-switch-updater/custom_packs.json
+++ b/config/aio-switch-updater/custom_packs.json
@ -1,7 +1,7 @@
 {
  "ams": {
-    "[PACK] Ultra 1.5.3": "https://github.com/Ultra-NX/Ultra/releases/latest/download/Ultra.zip",
-    "[PACK] Ultra 2.0 Pre1": "https://github.com/Ultra-NX/Ultra-Resources/raw/main/Ultra.zip"
+    "[PACK] Ultra 2.0 Prerelease": "https://github.com/Ultra-NX/Ultra-Resources/raw/main/Ultra.zip",
+    "[PACK] Ultra 1.5.3": "https://github.com/Ultra-NX/Ultra/releases/latest/download/Ultra.zip"
  },
  "misc": {
    "Brick Code": "https://github.com/Ultra-NX/Ultra-Resources/raw/main/brick.zip",
--- a/config/ultra/config.ini
+++ b/config/ultra/config.ini
@ -1,19 +0,0 @@
-[Tuner]
-OC_Preset = Gray
-SM_Preset = Normal-
-SM_Back = #1113
-SM_Color = #CCCC
-SM_Volts = false
-Cooling_System = Off
-Background_Services = Off
-
-[Setup]
-Loader_Kip = B3711
-RAM_Table = New
-Status_Monitor = Ultra
-
-[Sys-clk]
-allow_unsafe_freq = 1
-uncapped_clocks = 1
-auto_cpu_boost = 1
-override_boost_mode = 0