make sure calibration mode is off on startup

hmxmilohax · May 17, 2024 · 1a99833 · 1a99833
1 parent 2d6300f
commit 1a99833
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/_ark/ps4/dx/macros/dx_overshell_macros.dta b/_ark/ps4/dx/macros/dx_overshell_macros.dta
@@ -4,7 +4,6 @@
 	{set $songtitle {file_exists "data:/GoldHEN/RB4DX/ps4/ui/game/song_artist_overlay.entity_ps4"}}
 	{set $noshine {file_exists "data:/GoldHEN/RB4DX/ps4/track/shared/fx_noise_b_util.bmp_ps4"}}
 	{set $noflames {file_exists "data:/GoldHEN/RB4DX/ps4/track/smasher/gem_smasher_unlit.entity_ps4"}}
-	{set $calibrationmode {file_exists "data:/GoldHEN/RB4DX/ps4/config/include/beatmatcher.dta_dta_ps4"}}
 )
 #define DELETE_NOFLAMES_FILES
 (

diff --git a/_ark/ps4/dx/overshell/dx_warn_states.dta b/_ark/ps4/dx/overshell/dx_warn_states.dta
@@ -92,9 +92,6 @@
                (noflames
                   DELETE_NOFLAMES_FILES
                )
-               (calibrationmode
-                  {file_delete "data:/GoldHEN/RB4DX/ps4/config/include/beatmatcher.dta_dta_ps4"}
-               )
             }
             {if_else {== $optionaladd calibrationmode}
                {$this show_state kState_RB4DXDelayedEffectWarn}

diff --git a/_ark/ps4/dx/ui/dx_hooks.dta b/_ark/ps4/dx/ui/dx_hooks.dta
@@ -1,9 +1,12 @@
-;apply no overdrive hooks
+;apply hit window hook, make sure its default and not calibration/precision
+{set_elem {find $syscfg beatmatcher watcher slop} 1 100}
+
+;apply no overdrive hook
 {if $nood
    {set_elem {find $syscfg gamemodes defaults allow_overdrive_phrases} 1 FALSE}
 }
 
-;apply practice overdrive hooks
+;apply practice overdrive hook
 {set_elem {find $syscfg gamemodes practice enable_overdrive} 1 TRUE}
 {if $practiceod
    {set_elem {find $syscfg gamemodes practice allow_overdrive_phrases} 1 TRUE}

diff --git a/_ark/ps4/dx/ui/dx_init.dta b/_ark/ps4/dx/ui/dx_init.dta
@@ -1,6 +1,10 @@
 {set $dx_write_nul {array ()}}
 {set $speedmod 100}
 {set $dx_initialized TRUE}
+{set $calibrationmode FALSE}
+{if {file_exists "data:/GoldHEN/RB4DX/ps4/config/include/beatmatcher.dta_dta_ps4"}
+	{file_delete "data:/GoldHEN/RB4DX/ps4/config/include/beatmatcher.dta_dta_ps4"}
+}
 {set $nood {file_exists "nood.dta"}}
 {set $practiceod {file_exists "practiceod.dta"}}
 {set $blackbg {file_exists "blackbg.dta"}}