additional cleanup

hmxmilohax · Jan 7, 2024 · 722fbfe · 722fbfe
1 parent 5869e70
commit 722fbfe
Show file tree

Hide file tree

Showing 10 changed files with 80 additions and 76 deletions.
diff --git a/_ark/(..)/(..)/system/run/band/band_objects.dta b/_ark/(..)/(..)/system/run/band/band_objects.dta
@@ -2736,16 +2736,10 @@
                         {&&
                            {!
                               [disabled]}
-                           #ifdef HX_WII
-                           {{get_track_panel my_track_panel_dir}
-                              tracks_extended}
-                           #else
                            {'||'
                               {exists milo}
                               {{get_track_panel my_track_panel_dir}
-                                 tracks_extended}
-                           }
-                           #endif}
+                                 tracks_extended}}}
                         {if_else
                            {>
                               [total_slots]
@@ -4571,12 +4565,10 @@
       {set
          [scenetrigger]
          ''})
-   #ifndef HX_WII
    (cam_cat_priorities
       (CAM_CAT_PRIORITIES))
    (generic_cam_cats
       (GENERIC_CAM_CATS))
-   #endif
    (editor
       (debug_char_interests
          script

diff --git a/_ark/config/band_keep.dta b/_ark/config/band_keep.dta
@@ -3,8 +3,8 @@
 #include ../dx/macros/dx_reader_macros.dta
 #include ../dx/track/dx_track_color_macros.dta
 #include ../dx/macros/dx_conf_macros.dta
-#include ../dx/macros/dx_endgame_macros.dta
-#include ../dx/macros/dx_game_macros.dta
+#include ../dx/ui/endgame/dx_endgame_macros.dta
+#include ../dx/game/dx_game_macros.dta
 #include ../dx/track/dx_countdown.dta
 #include ../dx/track/dx_mtv_macros.dta
 #include ../dx/ui/dx_ui_macros.dta
@@ -23,17 +23,17 @@
       ("songs_download_rb3")
       #endif)
    #ifdef HX_WII
-   (max_song_count 4000)
+   (max_song_count 1000)
    #else
    (max_song_count
       {if_else {file_exists "GD:/dev_hdd0/game/BLUS30463/USRDIR/dx_high_memory.dta"}
          {if_else {> {size {read_file "GD:/dev_hdd0/game/BLUS30463/USRDIR/dx_high_memory.dta"}} 1}
             {elem {find {read_file "GD:/dev_hdd0/game/BLUS30463/USRDIR/dx_high_memory.dta"} dx_song_count} 1}
-            8000
+            8000 ; dx - vanilla is 3000
          }
-         8000
+         8000 ; dx - vanilla is 3000
       }
-   ) ; dx - vanilla is 3000
+   )
    #endif
    #ifndef _SHIP
    (max_song_count_debug 180)
@@ -67,7 +67,7 @@
    #include net.dta)
 (objects
    #include objects.dta)
-(locale "../ui/locale/eng/locale_keep.dta" "../ui/locale/eng/locale_updates_keep.dta")
+(locale ../ui/locale/eng/locale_keep.dta ../ui/locale/eng/locale_updates_keep.dta)
 (venues VENUES)
 (subway_venues SUBWAY_VENUES)
 (van_venues VAN_VENUES)

diff --git a/_ark/dx/macros/dx_game_macros.dta → _ark/dx/game/dx_game_macros.dta b/_ark/dx/macros/dx_game_macros.dta → _ark/dx/game/dx_game_macros.dta
diff --git a/_ark/dx/funcs/dx_overshell_funcs.dta → _ark/dx/overshell/dx_overshell_funcs.dta b/_ark/dx/funcs/dx_overshell_funcs.dta → _ark/dx/overshell/dx_overshell_funcs.dta
diff --git a/_ark/dx/ui/dx_funcs.dta b/_ark/dx/ui/dx_funcs.dta
@@ -1,12 +1,13 @@
 #include ../funcs/dx_bot_funcs.dta
-#include ../funcs/dx_camera_funcs.dta
+#include ../world/dx_camera_funcs.dta
 #include ../game/dx_game_funcs.dta
 #include ../game/dx_game_reset_funcs.dta
 #include ../funcs/dx_log_funcs.dta
-#include ../funcs/dx_overshell_funcs.dta
+#include ../overshell/dx_overshell_funcs.dta
 #include ../funcs/dx_presence_funcs.dta
 #include ../funcs/dx_read_write_funcs.dta
 #include ../funcs/dx_special_char_funcs.dta
 #include ../track/dx_mtv_funcs.dta
 #include ../track/dx_countdown_funcs.dta
-#include ../track/dx_track_funcs.dta
+#include ../track/dx_track_funcs.dta
+#include song_select/dx_song_select_funcs.dta
diff --git a/_ark/dx/macros/dx_endgame_macros.dta → _ark/dx/ui/endgame/dx_endgame_macros.dta b/_ark/dx/macros/dx_endgame_macros.dta → _ark/dx/ui/endgame/dx_endgame_macros.dta
diff --git a/_ark/dx/ui/song_select/dx_song_select_funcs.dta b/_ark/dx/ui/song_select/dx_song_select_funcs.dta
@@ -0,0 +1,61 @@
+{func
+   dx_song_select_enter
+   {dx_presence_manager}
+   ;{dx_sv_menu_logo_set sv4_panel}
+   {set $dx_trainer_real_guitar FALSE}
+   {set $dx_trainer_real_bass FALSE}
+   {set $dx_trainer_real_keys FALSE}
+   {set $dx_trainer_real_drum FALSE}
+   {set $dx_skip_game_setup FALSE}
+   {unless $dx_song_select_noise {synth stop_all_sfx TRUE}} ; dx - removes the annoying noises in song select
+   {dx_send_leader_song_speed}
+   {if $dx_confirm_song_count
+      {set $high_song_count 4000}
+      {unless $rb3e_checked_song_count
+         {set $rb3e_checked_song_count TRUE}
+         {if {> {{song_select_panel find song.lst} num_data} $high_song_count}
+            {dx_modal_messenger_symbol 'High song counts, especially with multiple players, have been known to cause instability issues after prolonged play-time. It is recommended to:\nStick to music video venues\nTurn off song transition cutscenes\nAvoid very long, 10 min+ songs\nOr lower your song count\nYou have been warned.\n\nTo disable this warning go to Deluxe Settings > Tweaks > Other Settings > Pop-Up Options'}
+         }
+      }
+   }
+   {unless $gocentral_sanity_checked
+      {if {&& {! {session_mgr is_local}} {< {{song_select_panel find song.lst} num_data} 130}}
+         {set $gocentral_sanity_checked TRUE}
+         {dx_modal_messenger_symbol 'If you show up to custom online lobbies in 2023 without dlc I hope you find jesus'}
+      }
+   }
+}
+{func
+   dx_song_select_endurance
+   {if {|| $dx_customizer $dx_auto_endurance}
+      {script_task kTaskSeconds
+         (delay {if_else $dx_auto_endurance 1.5 0})
+         (script
+            {gamemode set_mode qp_coop}
+            {music_library select_highlighted_node {input_mgr get_user}}
+         )
+      }
+   }
+}
+#define DX_SONG_LIST_LEFT_ACTION
+(
+   ({&&
+      {== $action kAction_Left}
+      {!
+         {song.lst is_scrolling}}}
+   {unless
+      [waiting_for_sort]
+      {song.lst set_scroll_user $user}
+      {song.lst scroll -10}}) ; dx scroll the list up by 10 slots when pressing left dpad
+)
+#define DX_SONG_LIST_RIGHT_ACTION
+(
+   ({&&
+      {== $action kAction_Right}
+      {!
+         {song.lst is_scrolling}}}
+   {unless
+      [waiting_for_sort]
+      {song.lst set_scroll_user $user}
+      {song.lst scroll 10}}) ; dx scroll the list down by 10 slots when pressing right dpad
+)
diff --git a/_ark/dx/funcs/dx_camera_funcs.dta → _ark/dx/world/dx_camera_funcs.dta b/_ark/dx/funcs/dx_camera_funcs.dta → _ark/dx/world/dx_camera_funcs.dta
diff --git a/_ark/ui/song_select/song_select.dta b/_ark/ui/song_select/song_select.dta
@@ -26,15 +26,6 @@
    (song_data_mounted
       {$this refresh_top})
    (enter
-      {dx_presence_manager}
-      ;{dx_sv_menu_logo_set sv4_panel}
-      {set $dx_trainer_real_guitar FALSE}
-      {set $dx_trainer_real_bass FALSE}
-      {set $dx_trainer_real_keys FALSE}
-      {set $dx_trainer_real_drum FALSE}
-      {set $dx_skip_game_setup FALSE}
-      {unless $dx_song_select_noise {synth stop_all_sfx TRUE}} ; dx - removes the annoying noises in song select
-      {dx_send_leader_song_speed}
       {net_sync set_ui_state kNetUI_MusicLibrary}
       {set
          [should_go_to_art_maker]
@@ -83,24 +74,10 @@
       {$this
          refresh_sort
          [waiting_for_sort]}
-      {if $dx_confirm_song_count
-         {set $high_song_count 4000}
-         {unless $rb3e_checked_song_count
-            {set $rb3e_checked_song_count TRUE}
-            {if {> {{song_select_panel find song.lst} num_data} $high_song_count}
-               {dx_modal_messenger_symbol 'High song counts, especially with multiple players, have been known to cause instability issues after prolonged play-time. It is recommended to:\nStick to music video venues\nTurn off song transition cutscenes\nAvoid very long, 10 min+ songs\nOr lower your song count\nYou have been warned.\n\nTo disable this warning go to Deluxe Settings > Tweaks > Other Settings > Pop-Up Options'}
-            }
-         }
-      }
-      {unless $gocentral_sanity_checked
-         {if {&& {! {session_mgr is_local}} {< {{song_select_panel find song.lst} num_data} 130}}
-            {set $gocentral_sanity_checked TRUE}
-            {dx_modal_messenger_symbol 'If you show up to custom online lobbies in 2023 without dlc I hope you find jesus'}
-         }
-      }
-   )
+      {dx_song_select_enter})
    (TRANSITION_COMPLETE_MSG
       {dx_restore_online_transitions}
+      {dx_song_select_endurance}
       {if
          [resume_setlist_edit]
          {ui push_screen edit_setlist_screen}
@@ -113,16 +90,7 @@
          {ui goto_screen patch_select_practice_space_screen}
          {set
             [should_go_to_art_maker]
-            FALSE}}
-      {if {|| $dx_customizer $dx_auto_endurance}
-         {script_task kTaskSeconds
-            (delay {if_else $dx_auto_endurance 1.5 0})
-            (script
-               {gamemode set_mode qp_coop}
-               {music_library select_highlighted_node {input_mgr get_user}}
-            )
-         }
-      })
+            FALSE}})
    (exit
       {set
          [details_mode]
@@ -395,11 +363,7 @@
                         $setlist}
                      DX_AUTOSAVE
                      {$component set text_token share_setlist}})
-               kDataUnhandled
-            }
-         }
-      }
-   )
+               kDataUnhandled}}})
    (refresh_leaderboard
       ($user)
       {do
@@ -708,14 +672,8 @@
                [waiting_for_sort]
                {song.lst set_scroll_user $user}
                {music_library skip_to_next_shortcut}})
-         ({&&
-               {== $action kAction_Right}
-               {!
-                  {song.lst is_scrolling}}}
-            {unless
-               [waiting_for_sort]
-               {song.lst set_scroll_user $user}
-               {song.lst scroll 10}}) ; dx scroll the list down by 10 slots when pressing right dpad
+         DX_SONG_LIST_LEFT_ACTION
+         DX_SONG_LIST_RIGHT_ACTION
          ({&&
                {== $action kAction_PageUp}
                {!
@@ -724,14 +682,6 @@
                [waiting_for_sort]
                {song.lst set_scroll_user $user}
                {music_library skip_to_prev_shortcut}})
-         ({&&
-               {== $action kAction_Left}
-               {!
-                  {song.lst is_scrolling}}}
-            {unless
-               [waiting_for_sort]
-               {song.lst set_scroll_user $user}
-               {song.lst scroll -10}}) ; dx scroll the list up by 10 slots when pressing left dpad
          ({'||'
                {== $action kAction_Up}
                {== $action kAction_Down}}

diff --git a/_ark/ui/track/mtv_overlay.dta b/_ark/ui/track/mtv_overlay.dta
@@ -22,7 +22,7 @@
                      {fade.anim animate}})))
          (enter
             {$this dx_set_mtv_pos} ;set the custom position of the mtv_overlay on enter
-            {set $dx_mtvup TRUE}
+            {set $dx_mtvup TRUE} ;some code crashes when ran and mtv is not available
             {if
                {exists game}
                {game