From 773cec3b7f6db05e3d66d16228de840561c1c920 Mon Sep 17 00:00:00 2001
From: Luna <37005649+lunalawl@users.noreply.github.com>
Date: Tue, 6 Aug 2024 21:42:24 -0700
Subject: [PATCH] rb1/lrb: disable vsync in certain areas

---
 lrb/_ark/dx/dx_init.dta                        | 9 ++++++---
 lrb/_ark/dx/dx_macros.dta                      | 4 +++-
 lrb/_ark/fusion/ui/calibration/calibration.dta | 2 ++
 lrb/_ark/fusion/ui/main/main_startmenu.dta     | 5 ++++-
 lrb/_ark/ui/game.dta                           | 1 -
 lrb/platform/ps3/USRDIR/config.dta             | 2 +-
 rb1/_ark/dx/dx_init.dta                        | 8 +++++---
 rb1/_ark/dx/dx_macros.dta                      | 4 +++-
 rb1/_ark/ui/game.dta                           | 2 --
 rb1/_ark/ui/leaderboards.dta                   | 4 ++++
 rb1/_ark/ui/main.dta                           | 4 ++++
 rb1/_ark/ui/options.dta                        | 2 ++
 rb1/_ark/ui/tour_band.dta                      | 2 ++
 rb1/_ark/ui/tour_solo.dta                      | 2 ++
 14 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/lrb/_ark/dx/dx_init.dta b/lrb/_ark/dx/dx_init.dta
index a691809..94a4eb2 100644
--- a/lrb/_ark/dx/dx_init.dta
+++ b/lrb/_ark/dx/dx_init.dta
@@ -3,8 +3,11 @@
 {set $dx_guitar_slot kControllerGuitar}
 {set $dx_drum_slot kControllerDrum}
 
-{rnd set_sync 1}
-
 {set $emulatefps 24}
+
+{set $dx_vsync TRUE}
+
 #ifndef _SHIP {tour toggle_all_unlock} #endif
-#ifdef _SHIP INIT_DTA_READER #endif
\ No newline at end of file
+#ifdef _SHIP INIT_DTA_READER #endif
+
+{rnd set_sync $set_sync}
\ No newline at end of file
diff --git a/lrb/_ark/dx/dx_macros.dta b/lrb/_ark/dx/dx_macros.dta
index 2436fd3..1ee8c81 100644
--- a/lrb/_ark/dx/dx_macros.dta
+++ b/lrb/_ark/dx/dx_macros.dta
@@ -7,11 +7,13 @@
             {elem {find $entry venue_fps} 1}
          }
       }
+      #ifdef HX_PS3
       {if {== {elem $entry 0} {basename vsync}}
-         {rnd set_sync
+         {set $dx_vsync
             {elem {find $entry vsync} 1}
          }
       }
+      #endif
       {if {== {elem $entry 0} {basename pad_slot}}
          {set $dx_pad_slot
             {elem {find $entry pad_slot} 1}
diff --git a/lrb/_ark/fusion/ui/calibration/calibration.dta b/lrb/_ark/fusion/ui/calibration/calibration.dta
index e8452fa..9c19460 100644
--- a/lrb/_ark/fusion/ui/calibration/calibration.dta
+++ b/lrb/_ark/fusion/ui/calibration/calibration.dta
@@ -23,9 +23,11 @@
    (parent
       {ui current_screen})
    (enter
+      {rnd set_sync 1}
       {meta music_stop}
       {platform_mgr disable_xmp})
    (exit
+      {rnd set_sync $set_sync}
       {meta music_start}
       {platform_mgr enable_xmp}
       {input_mgr set_user ''})
diff --git a/lrb/_ark/fusion/ui/main/main_startmenu.dta b/lrb/_ark/fusion/ui/main/main_startmenu.dta
index b507120..12a4af2 100644
--- a/lrb/_ark/fusion/ui/main/main_startmenu.dta
+++ b/lrb/_ark/fusion/ui/main/main_startmenu.dta
@@ -241,7 +241,10 @@
             {== $action kAction_Confirm}}
          {synth play button_select}
          {$this move_on}})
-   (enter)
+   (enter
+      {rnd set_sync 1})
+   (exit
+      {rnd set_sync $set_sync})
    (poll
       {if
          {TexMovie.tmov get played}
diff --git a/lrb/_ark/ui/game.dta b/lrb/_ark/ui/game.dta
index d6752df..056d023 100644
--- a/lrb/_ark/ui/game.dta
+++ b/lrb/_ark/ui/game.dta
@@ -419,7 +419,6 @@
    (enter
       ;venue fps setup
       #ifdef _SHIP
-      INIT_DTA_READER
       DX_FPS_SETUP
       #endif
       {if
diff --git a/lrb/platform/ps3/USRDIR/config.dta b/lrb/platform/ps3/USRDIR/config.dta
index 9e16be4..dc0de8e 100644
--- a/lrb/platform/ps3/USRDIR/config.dta
+++ b/lrb/platform/ps3/USRDIR/config.dta
@@ -3,7 +3,7 @@
 
 ; Venue FPS (Default: 24, can go up to 60)
 (venue_fps
-   (venue_fps 60)
+   (venue_fps 24)
 )
 ; Vsync (0: Uncapped FPS, 1: 60FPS)
 (vsync
diff --git a/rb1/_ark/dx/dx_init.dta b/rb1/_ark/dx/dx_init.dta
index 78e12c7..b8f1dc0 100644
--- a/rb1/_ark/dx/dx_init.dta
+++ b/rb1/_ark/dx/dx_init.dta
@@ -3,8 +3,10 @@
 {set $dx_guitar_slot kControllerGuitar}
 {set $dx_drum_slot kControllerDrum}
 
-{rnd set_sync 1}
-
 {set $emulatefps 24}
 
-INIT_DTA_READER
\ No newline at end of file
+{set $dx_vsync TRUE}
+
+INIT_DTA_READER
+
+{rnd set_sync $set_sync}
\ No newline at end of file
diff --git a/rb1/_ark/dx/dx_macros.dta b/rb1/_ark/dx/dx_macros.dta
index 3178976..7a1fda9 100644
--- a/rb1/_ark/dx/dx_macros.dta
+++ b/rb1/_ark/dx/dx_macros.dta
@@ -22,11 +22,13 @@
             {elem {find $entry autoplay} 1}
          }
       }
+      #ifdef HX_PS3
       {if {== {elem $entry 0} {basename vsync}}
-         {rnd set_sync
+         {set $dx_vsync
             {elem {find $entry vsync} 1}
          }
       }
+      #endif
       {if {== {elem $entry 0} {basename pad_slot}}
          {set $dx_pad_slot
             {elem {find $entry pad_slot} 1}
diff --git a/rb1/_ark/ui/game.dta b/rb1/_ark/ui/game.dta
index 0271d97..a5b1a96 100644
--- a/rb1/_ark/ui/game.dta
+++ b/rb1/_ark/ui/game.dta
@@ -57,7 +57,6 @@
          (script
             {handle
                ($this intro_end)})}
-      INIT_DTA_READER
       {world_panel set_showing {! $dx_black_background}}
       kDataUnhandled)
    (intro_skip
@@ -251,7 +250,6 @@
                TRUE}
             {$this pause_for_mic}}})
    (enter
-      INIT_DTA_READER
       DX_FPS_SETUP
       {if $dx_autoplay {do {beatmatch foreach_active_player $player {$player set_auto_play enable}}}}
       {set
diff --git a/rb1/_ark/ui/leaderboards.dta b/rb1/_ark/ui/leaderboards.dta
index 6706736..6e1e49b 100644
--- a/rb1/_ark/ui/leaderboards.dta
+++ b/rb1/_ark/ui/leaderboards.dta
@@ -593,6 +593,8 @@
          {featurette_panel get featurette_num}})
    (movie_done
       {ui goto_screen community_specialfeatures_screen})
+   (enter {rnd set_sync 1})
+   (exit {rnd set_sync $set_sync})
    (BUTTON_DOWN_MSG
       {if
          {'||'
@@ -615,6 +617,8 @@
    (videos win_credits)
    (movie_done
       {ui goto_screen credits_screen})
+   (enter {rnd set_sync 1})
+   (exit {rnd set_sync $set_sync})
    (BUTTON_DOWN_MSG
       {if
          {'||'
diff --git a/rb1/_ark/ui/main.dta b/rb1/_ark/ui/main.dta
index 4aaa2a1..574c4cd 100644
--- a/rb1/_ark/ui/main.dta
+++ b/rb1/_ark/ui/main.dta
@@ -9,9 +9,11 @@
    (movie_done
       {ui goto_screen intro_to_splash_screen})
    (enter
+      {rnd set_sync 1}
       {platform_mgr disable_xmp}
       {ui goto_screen splash_screen}
       kDataUnhandled)
+   (exit {rnd set_sync $set_sync})
    (BUTTON_DOWN_MSG
       {if
          {'||'
@@ -951,6 +953,8 @@
    (videos attract)
    (movie_done
       {ui goto_screen splash_screen})
+   (enter {rnd set_sync 1})
+   (exit {rnd set_sync $set_sync})
    (BUTTON_DOWN_MSG
       {if
          {'||'
diff --git a/rb1/_ark/ui/options.dta b/rb1/_ark/ui/options.dta
index 490f4bf..32dd75b 100644
--- a/rb1/_ark/ui/options.dta
+++ b/rb1/_ark/ui/options.dta
@@ -1437,6 +1437,7 @@
                (back select)}
             {syncoff.grp set_showing FALSE})})
    (enter
+      {rnd set_sync 1}
       {set
          [cycle_time_ms]
          755}
@@ -1454,6 +1455,7 @@
          set_limit_to_player_num
          {calibrate_video_offset_screen get player_num}})
    (exit
+      {rnd set_sync $set_sync}
       {if
          [running]
          {$this stop_audio}}
diff --git a/rb1/_ark/ui/tour_band.dta b/rb1/_ark/ui/tour_band.dta
index edb7302..054f768 100644
--- a/rb1/_ark/ui/tour_band.dta
+++ b/rb1/_ark/ui/tour_band.dta
@@ -2205,6 +2205,8 @@
    (videos win_credits)
    (movie_done
       {ui goto_screen tour_band_text_credits_screen})
+   (enter {rnd set_sync 1})
+   (exit {rnd set_sync $set_sync})
    LIMIT_TO_SESSION_LEADER
    (BUTTON_DOWN_MSG
       {if
diff --git a/rb1/_ark/ui/tour_solo.dta b/rb1/_ark/ui/tour_solo.dta
index 2c64eac..a5f4a2c 100644
--- a/rb1/_ark/ui/tour_solo.dta
+++ b/rb1/_ark/ui/tour_solo.dta
@@ -996,6 +996,8 @@
    LIMIT_TO_LEADER_SESSION
    (movie_done
       {ui goto_screen tour_solo_text_credits_screen})
+   (enter {rnd set_sync 1})
+   (exit {rnd set_sync $set_sync})
    (BUTTON_DOWN_MSG
       {if
          {'||'