split up some dx dtas

hmxmilohax · May 16, 2024 · 5bb96f1 · 5bb96f1
1 parent edf7fc7
commit 5bb96f1
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 77 deletions.
diff --git a/_ark/ps4/config/rb_config.dta b/_ark/ps4/config/rb_config.dta
@@ -1,5 +1,4 @@
-;#include ../dx/macros/dx_macros.dta
-;#include ../dx/funcs/dx_funcs.dta
+#include ../dx/macros/dx_macros.dta
 (init
    #include ../dx/ui/dx_init.dta
 )

diff --git a/_ark/ps4/dx/macros/dx_controller_macros.dta b/_ark/ps4/dx/macros/dx_controller_macros.dta
@@ -0,0 +1,44 @@
+#define WRITE_SLOT_DTA
+(
+   {write_file {sprint "data:/GoldHEN/RB4DX/" $slot_changed $slot_to ".dta"} $dx_write_nul}
+)
+
+#define SET_SLOT_VAR
+(
+   {switch $slot_changed
+      (gtr
+         {set $gtrslt $slot_to}
+      )
+      (drum
+         {set $drmslt $slot_to}
+      )
+      (vox
+         {set $voxslt $slot_to}
+      )
+   }
+)
+
+#define CLEAR_SLOT_DTAS
+(
+   {switch $slot_changed
+      (gtr
+         {file_delete "data:/GoldHEN/RB4DX/gtrdrum.dta"}
+         {file_delete "data:/GoldHEN/RB4DX/gtrvox.dta"}
+      )
+      (drum
+         {file_delete "data:/GoldHEN/RB4DX/drumgtr.dta"}
+         {file_delete "data:/GoldHEN/RB4DX/drumvox.dta"}
+      )
+      (vox
+         {file_delete "data:/GoldHEN/RB4DX/voxgtr.dta"}
+         {file_delete "data:/GoldHEN/RB4DX/voxdrum.dta"}
+      )
+   }
+)
+
+#define CLEAR_INVALID_SLOT_DTAS
+(
+   {file_delete "data:/GoldHEN/RB4DX/voxvox.dta"}
+   {file_delete "data:/GoldHEN/RB4DX/drumdrum.dta"}
+   {file_delete "data:/GoldHEN/RB4DX/gtrgtr.dta"}
+)
diff --git a/_ark/ps4/dx/macros/dx_macros.dta b/_ark/ps4/dx/macros/dx_macros.dta
@@ -0,0 +1,2 @@
+#include dx_overshell_macros.dta
+#include dx_controller_macros.dta
diff --git a/_ark/ps4/dx/macros/dx_overshell_macros.dta b/_ark/ps4/dx/macros/dx_overshell_macros.dta
@@ -0,0 +1,28 @@
+#define OPTIONAL_ADDITIONS_CHECK
+(
+	{set $nohud {file_exists "data:/GoldHEN/RB4DX/ps4/ui/game/game.layout_ps4"}}
+	{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
+(
+	{file_delete "data:/GoldHEN/RB4DX/ps4/track/smasher/gem_smasher_unlit.entity_ps4"}
+	{file_delete "data:/GoldHEN/RB4DX/ps4/track/smasher/fx_smasher_streaks.bmp_ps4"}
+	{file_delete "data:/GoldHEN/RB4DX/ps4/track/smasher/gem_smashed_util.bmp_ps4"}
+	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/smasher_beams.bmp_ps4"}
+	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/smasher_flash.bmp_ps4"}
+	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/smasher_shockwave.bmp_ps4"}
+	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/spark01_color.bmp_ps4"}
+	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_orb.bmp_ps4"}
+	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_orb_dense.bmp_ps4"}
+	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_shockwave.bmp_ps4"}
+	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_shockwave_forced_persp.bmp_ps4"}
+	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_smoke_plume.bmp_ps4"}
+	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_spark.bmp_ps4"}
+	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_spark_cluster.bmp_ps4"}
+	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_spark_dense.bmp_ps4"}
+	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_spiral_flare.bmp_ps4"}
+	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/fx/flash_pot/particle_smoke.bmp_ps4"}
+)
diff --git a/_ark/ps4/dx/ui/dx_hooks.dta b/_ark/ps4/dx/ui/dx_hooks.dta
@@ -1,10 +1,15 @@
+;apply no overdrive hooks
 {if $nood
    {set_elem {find $syscfg gamemodes defaults allow_overdrive_phrases} 1 FALSE}
 }
+
+;apply practice overdrive hooks
 {set_elem {find $syscfg gamemodes practice enable_overdrive} 1 TRUE}
 {if $practiceod
    {set_elem {find $syscfg gamemodes practice allow_overdrive_phrases} 1 TRUE}
 }
+
+;apply track muting hook
 {switch $trackmuting
    (vanilla 
       {set_elem {find $syscfg beatmatcher audio mute_volume} 1 -16.0}
@@ -16,6 +21,8 @@
       {set_elem {find $syscfg beatmatcher audio mute_volume} 1 -96.0}
    )
 }
+
+;apply no whammy fx hook
 {if $nowhammyfx
    {set_elem {find $syscfg beatmatcher watcher pitch_bend_range} 1 0}
 }
diff --git a/_ark/ps4/dx/ui/dx_init.dta b/_ark/ps4/dx/ui/dx_init.dta
@@ -60,78 +60,4 @@
 			drum
 		)
 	}
-}
-
-#define OPTIONAL_ADDITIONS_CHECK
-(
-	{set $nohud {file_exists "data:/GoldHEN/RB4DX/ps4/ui/game/game.layout_ps4"}}
-	{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
-(
-	{file_delete "data:/GoldHEN/RB4DX/ps4/track/smasher/gem_smasher_unlit.entity_ps4"}
-	{file_delete "data:/GoldHEN/RB4DX/ps4/track/smasher/fx_smasher_streaks.bmp_ps4"}
-	{file_delete "data:/GoldHEN/RB4DX/ps4/track/smasher/gem_smashed_util.bmp_ps4"}
-	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/smasher_beams.bmp_ps4"}
-	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/smasher_flash.bmp_ps4"}
-	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/smasher_shockwave.bmp_ps4"}
-	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/spark01_color.bmp_ps4"}
-	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_orb.bmp_ps4"}
-	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_orb_dense.bmp_ps4"}
-	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_shockwave.bmp_ps4"}
-	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_shockwave_forced_persp.bmp_ps4"}
-	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_smoke_plume.bmp_ps4"}
-	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_spark.bmp_ps4"}
-	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_spark_cluster.bmp_ps4"}
-	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_spark_dense.bmp_ps4"}
-	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_spiral_flare.bmp_ps4"}
-	{file_delete "data:/GoldHEN/RB4DX/ps4/track/shared/fx/flash_pot/particle_smoke.bmp_ps4"}
-)
-
-#define WRITE_SLOT_DTA
-(
-	{write_file {sprint "data:/GoldHEN/RB4DX/" $slot_changed $slot_to ".dta"} $dx_write_nul}
-)
-
-#define SET_SLOT_VAR
-(
-	{switch $slot_changed
-        (gtr
-	        {set $gtrslt $slot_to}
-        )
-        (drum
-            {set $drmslt $slot_to}
-        )
-        (vox
-	        {set $voxslt $slot_to}
-        )
-    }
-)
-
-#define CLEAR_SLOT_DTAS
-(
-	{switch $slot_changed
-        (gtr
-	        {file_delete "data:/GoldHEN/RB4DX/gtrdrum.dta"}
-	        {file_delete "data:/GoldHEN/RB4DX/gtrvox.dta"}
-        )
-        (drum
-            {file_delete "data:/GoldHEN/RB4DX/drumgtr.dta"}
-            {file_delete "data:/GoldHEN/RB4DX/drumvox.dta"}
-        )
-        (vox
-	        {file_delete "data:/GoldHEN/RB4DX/voxgtr.dta"}
-	        {file_delete "data:/GoldHEN/RB4DX/voxdrum.dta"}
-        )
-    }
-)
-
-#define CLEAR_INVALID_SLOT_DTAS
-(
-	{file_delete "data:/GoldHEN/RB4DX/voxvox.dta"}
-	{file_delete "data:/GoldHEN/RB4DX/drumdrum.dta"}
-	{file_delete "data:/GoldHEN/RB4DX/gtrgtr.dta"}
-)
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#include dx_overshell_macros.dta
		#include dx_controller_macros.dta