MHX_OG macro to fix ps2, remove streak tex ps2

hmxmilohax · Mar 12, 2024 · fdd9978 · fdd9978
1 parent 27d062d
commit fdd9978
Show file tree

Hide file tree

Showing 27 changed files with 44 additions and 43 deletions.
diff --git a/_ark/config/midi_parsers.dta b/_ark/config/midi_parsers.dta
@@ -2206,7 +2206,7 @@
       {if
          {== $mp.val $mp.note}
          {$this add_message pick_new_shot}})}
-#ifndef HX_OG
+#ifndef MHX_OG
 {if
    {stagekit_present}
    {new

diff --git a/_ark/config/modifiers.dta b/_ark/config/modifiers.dta
@@ -19,7 +19,7 @@
    (mod_awesome unlocked)
    (mod_blackvenue (activate {set $blackvenue TRUE} {modifier_mgr deactivate_modifier mod_nohud} #ifndef HX_EE {modifier_mgr deactivate_modifier mod_choose_venue} #endif {set $crowdsfx FALSE}) (deactivate {set $blackvenue FALSE} {set $crowdsfx TRUE}) unlocked)
    (mod_songtitle unlocked)
-   #ifndef HX_OG
+   #ifndef MHX_OG
    (mod_songtitlestats unlocked)
    #endif
    (mod_staticfills (activate {modifier_mgr deactivate_modifier mod_freestyledrums}) unlocked)

diff --git a/_ark/dx/config/dx_macros.dta b/_ark/dx/config/dx_macros.dta
@@ -1,4 +1,10 @@
 ;#define STORE_ENABLED (1) ;show music store on main menu
+#ifdef HX_WII
+#define MHX_OG (1) ; macro for "last-gen" platforms (ps2/wii)
+#endif
+#ifdef HX_EE
+#define MHX_OG (1) ; macro for "last-gen" platforms (ps2/wii)
+#endif
 #define GEMCOLOR_SET
 (green red yellow blue orange)
 #define NORMALGEM_SET

diff --git a/_ark/dx/track/dx_track_macros.dta b/_ark/dx/track/dx_track_macros.dta
@@ -1,7 +1,7 @@
 #define DX_TEXTURE_CORRECTOR
 (
    {unless $texrunonce
-      #ifdef HX_OG
+      #ifdef MHX_OG
          {if {== $gem "rb2"} {set $gem "none"} {set $gemcustomtexture FALSE}}
          {if {== $smasher "rb2_ps2"} {set $smasher "none"} {set $smashercustomtexture FALSE}}
          #ifdef HX_WII
@@ -232,7 +232,7 @@
       {{$this find black.tex} iterate_refs $ref {$ref set intensify {== $hwalpha off}}}      
    }
 
-   #ifndef HX_OG
+   #ifndef MHX_OG
    {if $highwaycustomtexture
       {{$this find track_reflect_warning.tex} set_bitmap {sprint "track_new/highways/" $highwaygtr ".png"}}
       {{$this find background.tex} set_bitmap {sprint "track_new/highways/" $highwaybass ".png"}}
@@ -263,7 +263,7 @@
    #endif
 
    {if $gemcustomtexture
-      #ifdef HX_OG
+      #ifdef MHX_OG
       {{$this find prism_gems.tex} set_bitmap {sprint "track_og/gems/prism_gems_" $gem ".png"}}
       {{$this find prism_gems_lod.tex} set_bitmap {sprint "track_og/gems/prism_gems_lod_" $gem ".png"}}
       #else
@@ -279,7 +279,7 @@
    }
 
    {if $smashercustomtexture
-      #ifdef HX_OG
+      #ifdef MHX_OG
       {{$this find smasher_color_ps2.tex} set_bitmap {sprint "track_og/smashers/smasher_color_" $smasher ".png"}}
       {{$this find smasher_ps2.tex} set_bitmap {sprint "track_og/smashers/smasher_" $smasher ".png"}}
       {{$this find square_smasher_bright.tex} set_bitmap {sprint "track_og/smashers/square_smasher_bright_" $smasher ".png"}}
@@ -315,7 +315,7 @@
       {{$this find radial_shockwave_subtract.tex} set_bitmap {sprint "track_new/flames/radial_shockwave_subtract_" $flames ".png"}}
       {{$this find radial_shockwave.tex} iterate_refs $ref {$ref set blend {if_else {|| {== $flames fnfestival} {== $flames fnfestival_beta}} 2 3}}}
       {{$this find shockwave.tex} set_bitmap {sprint "track_new/flames/shockwave_" $flames ".png"}}
-      #ifndef HX_OG
+      #ifndef MHX_OG
       {{$this find flare_orange_kick_smasher.tex} set_bitmap {sprint "track_new/flames/flare_orange_kick_smasher_" $flames ".png"}}
       #endif
       {{$this find flare_light_can_star.tex} set_bitmap {sprint "track_new/flames/flare_light_can_star_" $flames ".png"}}
@@ -327,7 +327,7 @@
    }
    #endif
 
-   #ifndef HX_OG
+   #ifndef MHX_OG
    {if $lanescustomtexture
       {{$this find gem_mash_green_emmisive.tex} set_bitmap {sprint "track/lanes/gem_mash_green_" $lanestex ".png"}}
       {{$this find gem_mash_red_emmisive.tex} set_bitmap {sprint "track/lanes/gem_mash_red_" $lanestex ".png"}}
@@ -383,13 +383,13 @@
    {if $starscustomtexture
       {{$this find star_sheet.tex} set_bitmap {sprint "track/stars/star_power_" $stars ".png"}}
       {{$this find score_meter_wipe.tex} set_bitmap {sprint "track/stars/score_meter_wipe_" $stars ".png"}}
-      #ifdef HX_OG
+      #ifdef MHX_OG
       {{$this find score_meter_wipe.tex} iterate_refs $ref {$ref set color {pack_color 1.0 1.0 1.0}}}
       #endif
    }
    #endif
 
-   #ifndef HX_OG
+   #ifndef MHX_OG
    {if $fontcustomtexture
       {{$this find chalet_numbers_mono.tex} set_bitmap {sprint "track/font/" $font ".png"}}
    }
@@ -418,11 +418,12 @@
    }
    #endif
 
+   #ifndef HX_EE ;TODO: figure out why streak texture causes crashes on ps2
    {if $streakcustomtexture
       {unless {== $streakbass none}
          {{$this find bass_superstreak_pattern.tex} set_bitmap {sprint "track_new/streak/" $streakbass ".png"}}
       }
-      #ifndef HX_OG ; streak is currently unavailable for g/d on ps2
+      #ifndef MHX_OG ; per-instrument streak is currently unavailable on wii
       {if_else {&& {!= $streakbass none} {== $streakgtr none}}
          {do
             {set $streakgtr "rb2"}
@@ -461,6 +462,7 @@
       }
       #endif
    }
+   #endif
 
    {if $railscustomtexture
       {{$this find rails.tex} set_bitmap {sprint "track/rails/rails_" $rails ".png"}}
@@ -499,7 +501,7 @@
    }
 
    {if $spotlightgtrcustomtexture
-      #ifdef HX_OG
+      #ifdef MHX_OG
       {{$this find spotlight_guitar_track.tex} set_bitmap {sprint "track_og/spotlight/" $spotlightgtr ".png"}}
       #else
       {{$this find spotlight_guitar_track.tex} set_bitmap {sprint "track_new/spotlight/" $spotlightgtr ".png"}}
@@ -517,7 +519,7 @@
    }
 
    {if $spotlightbasscustomtexture
-      #ifdef HX_OG
+      #ifdef MHX_OG
       {{$this find spotlight_bass_track.tex} set_bitmap {sprint "track_og/spotlight/" $spotlightbass ".png"}}
       #else
       {{$this find spotlight_bass_track.tex} set_bitmap {sprint "track_new/spotlight/" $spotlightbass ".png"}}
@@ -535,7 +537,7 @@
    }
 
    {if $spotlightdrumcustomtexture
-      #ifdef HX_OG
+      #ifdef MHX_OG
       {{$this find spotlight_drums_track.tex} set_bitmap {sprint "track_og/spotlight/" $spotlightdrum ".png"}}
       #else
       {{$this find spotlight_drums_track.tex} set_bitmap {sprint "track_new/spotlight/" $spotlightdrum ".png"}}

diff --git a/_ark/track/gem_smasher.dta b/_ark/track/gem_smasher.dta
@@ -204,7 +204,7 @@
                      set
                      start_alpha
                      {$part get start_alpha_high}}
-                  #ifndef HX_OG
+                  #ifndef MHX_OG
                   {$launcher set use_mid_color TRUE}
                   {$launcher
                      set

diff --git a/_ark/track_new/streak/gen/fnfestival.png_ps2 b/_ark/track_new/streak/gen/fnfestival.png_ps2
diff --git a/_ark/track_new/streak/gen/fnfestival_beta.png_ps2 b/_ark/track_new/streak/gen/fnfestival_beta.png_ps2
diff --git a/_ark/track_new/streak/gen/lrb.png_ps2 b/_ark/track_new/streak/gen/lrb.png_ps2
diff --git a/_ark/track_new/streak/gen/rb2.png_ps2 b/_ark/track_new/streak/gen/rb2.png_ps2
diff --git a/_ark/track_new/streak/gen/rb3_drums.png_ps2 b/_ark/track_new/streak/gen/rb3_drums.png_ps2
diff --git a/_ark/track_new/streak/gen/rb3_guitar.png_ps2 b/_ark/track_new/streak/gen/rb3_guitar.png_ps2
diff --git a/_ark/track_new/streak/gen/rb3_keys.png_ps2 b/_ark/track_new/streak/gen/rb3_keys.png_ps2
diff --git a/_ark/track_new/streak/gen/rb3_prokeys.png_ps2 b/_ark/track_new/streak/gen/rb3_prokeys.png_ps2
diff --git a/_ark/track_new/streak/gen/rb3_unused.png_ps2 b/_ark/track_new/streak/gen/rb3_unused.png_ps2
diff --git a/_ark/track_new/streak/gen/rb4.png_ps2 b/_ark/track_new/streak/gen/rb4.png_ps2
diff --git a/_ark/track_new/streak/gen/rb4_3p.png_ps2 b/_ark/track_new/streak/gen/rb4_3p.png_ps2
diff --git a/_ark/track_new/streak/gen/rb4_new.png_ps2 b/_ark/track_new/streak/gen/rb4_new.png_ps2
diff --git a/_ark/track_new/streak/gen/rb4_rivals.png_ps2 b/_ark/track_new/streak/gen/rb4_rivals.png_ps2
diff --git a/_ark/track_new/streak/gen/rb4_true.png_ps2 b/_ark/track_new/streak/gen/rb4_true.png_ps2
diff --git a/_ark/track_new/streak/gen/tbrb.png_ps2 b/_ark/track_new/streak/gen/tbrb.png_ps2
diff --git a/_ark/track_new/streak/gen/yarg.png_ps2 b/_ark/track_new/streak/gen/yarg.png_ps2
diff --git a/_ark/tutorial/tutorial_state.dta b/_ark/tutorial/tutorial_state.dta
@@ -388,7 +388,7 @@
                      TRUE}
                   {{gamemode get main_panel}
                      pause}
-                  #ifndef HX_OG
+                  #ifndef MHX_OG
                   {stagekit_pause TRUE}
                   #endif}}
             {set
@@ -441,7 +441,7 @@
                      FALSE}
                   {{gamemode get main_panel}
                      unpause}
-                  #ifndef HX_OG
+                  #ifndef MHX_OG
                   {stagekit_pause FALSE}
                   #endif}
                {do

diff --git a/_ark/ui/game.dta b/_ark/ui/game.dta
@@ -175,7 +175,7 @@
       {set $guitar_milosong FALSE} {set $bass_milosong FALSE} {set $drum_milosong FALSE} {set $track_0_milosong FALSE} {set $track_1_milosong FALSE}
       {set $bass_groove_active FALSE} {set $drum_groove_active FALSE} {set $guitar_groove_active FALSE} {set $track_0_groove_active FALSE} {set $track_1_groove_active FALSE}
       {set $bass_firstnote FALSE} {set $guitar_firstnote FALSE} {set $drum_firstnote FALSE} {set $track_0_firstnote FALSE} {set $track_1_firstnote FALSE}
-      #ifndef HX_OG
+      #ifndef MHX_OG
       {stagekit_reset}
       #endif
       {beatmatch
@@ -264,7 +264,7 @@
                   pause_screen
                   {ui current_screen}}
                {'||'
-                  #ifdef HX_OG
+                  #ifdef MHX_OG
                   {gamemode get is_jukebox}
                   #else
                   {gamemode get allow_any_controller_to_pause_in_game}
@@ -410,7 +410,7 @@
             {$this set_showing TRUE}}}})
    (unload
       #ifndef HX_PC
-      #ifndef HX_OG
+      #ifndef MHX_OG
       {rnd suspend}
       {{{{gamemode get track_panel} find mtv_overlay} find fade.anim} set_frame 0}
       #endif
@@ -465,7 +465,7 @@
          FALSE}
       {net_sync set_ui_state kNetUI_Pause}
       {ui push_screen pause_mics_screen}
-      #ifdef HX_OG
+      #ifdef MHX_OG
       {band_ui trigger_event mic_lost}
       #endif)
    (pause_for_mic_check
@@ -631,7 +631,7 @@ DX_FPS_SETUP
             {profile_mgr update_mic_gain $player_num}}}
       {handle
          ($this my_enter)}
-      #ifdef HX_OG
+      #ifdef MHX_OG
       {if_else
          {gamemode get is_jukebox}
          {input_mgr set_limit kLimitNone}
@@ -652,7 +652,7 @@ DX_FPS_SETUP
       {platform_mgr remove_sink $this wii_controller_overflow}
       #endif
       {synth stop_playback_all_mics}
-      #ifndef HX_OG
+      #ifndef MHX_OG
       {if
          {'||'
             {==
@@ -824,7 +824,7 @@ DX_FPS_SETUP
          $ret})
    #endif
    (TRANSITION_COMPLETE_MSG
-      #ifndef HX_OG
+      #ifndef MHX_OG
       {if
          {'||'
             {==

diff --git a/_ark/ui/overshell.dta b/_ark/ui/overshell.dta
@@ -1,6 +1,6 @@
 #define OS_MAIN_DATA
-({if_else $debug_mode (os_ace os_mod #ifndef HX_OG os_sys #endif os_spd os_trkset #ifndef HX_EE os_cam #endif)
-    (os_mod #ifndef HX_OG os_sys #endif os_spd os_trkset #ifndef HX_EE os_cam #endif)}
+({if_else $debug_mode (os_ace os_mod #ifndef MHX_OG os_sys #endif os_spd os_trkset #ifndef HX_EE os_cam #endif)
+    (os_mod #ifndef MHX_OG os_sys #endif os_spd os_trkset #ifndef HX_EE os_cam #endif)}
 )
 {new
     UIPanel

diff --git a/_ark/ui/overshell_textures.dta b/_ark/ui/overshell_textures.dta
@@ -8,7 +8,7 @@
     #endif
     (focus sel_section.lst)
     (enter
-        {sel_section.lst set_data (#ifndef HX_OG os_hw #endif os_strk os_spotlight os_gems os_smashers #ifndef HX_WII os_flames #endif os_sus #ifndef HX_OG os_lanes os_font #endif #ifndef HX_WII os_score os_solobox os_stars os_crowd_meter os_bre os_rails os_odbar os_multi_ring #endif os_voxtrk)}
+        {sel_section.lst set_data (#ifndef MHX_OG os_hw #endif #ifndef HX_EE os_strk #endif os_spotlight os_gems os_smashers #ifndef HX_WII os_flames #endif os_sus #ifndef MHX_OG os_lanes os_font #endif #ifndef HX_WII os_score os_solobox os_stars os_crowd_meter os_bre os_rails os_odbar os_multi_ring #endif os_voxtrk)}
         {title.lbl set_localized {localize os_tex1}}
         {full_selection.mesh set_showing FALSE}
         {set $os_in_transition FALSE}
@@ -99,7 +99,7 @@
          (os_strk
             {set $os_in_transition TRUE}
             {set $dx_tracked_texture_loader streak}
-            #ifdef HX_OG
+            #ifdef MHX_OG
             {set $dx_tracked_instrument bass}
             {os_change_screen overshell_texload}
             #else
@@ -138,7 +138,7 @@
          {do
          {synth play button_toggle}
          {set $os_in_transition TRUE}
-         #ifdef HX_OG
+         #ifdef MHX_OG
          {os_back_screen overshell_track}
          #else
          {os_back_screen overshell_trkpreset}
@@ -334,7 +334,7 @@
       {full_selection.mesh set_showing FALSE}
       {switch $dx_tracked_texture_loader
          (gems
-            {sel_section.lst set_data #ifdef HX_OG (#include ../track_og/gems/gems.dta) #else (#include ../track/gems/gems.dta) #endif}
+            {sel_section.lst set_data #ifdef MHX_OG (#include ../track_og/gems/gems.dta) #else (#include ../track/gems/gems.dta) #endif}
             {title.lbl set_localized {localize os_gems}}
             #ifdef HX_WII
             {anchor_corner02.tex set_bitmap {sprint "track_og/gems/prism_gems_" $gem ".png"}}
@@ -343,7 +343,7 @@
             #endif
          )
          (smashers
-            {sel_section.lst set_data #ifdef HX_OG (#include ../track_og/smashers/smashers.dta) #else (#include ../track_new/smashers/smashers.dta) #endif}
+            {sel_section.lst set_data #ifdef MHX_OG (#include ../track_og/smashers/smashers.dta) #else (#include ../track_new/smashers/smashers.dta) #endif}
             {title.lbl set_localized {localize os_smashers}}
             #ifdef HX_WII
             {anchor_corner02.tex set_bitmap {sprint "track_og/smashers/smasher_color_" $smasher ".png"}}
@@ -426,7 +426,7 @@
                )
                (bass
                   {anchor_corner02.tex set_bitmap {sprint "track_new/streak/" $streakbass ".png"}}
-                  #ifdef HX_OG
+                  #ifdef MHX_OG
                   {title.lbl set_localized {localize os_strk}}
                   #else
                   {title.lbl set_localized {localize os_spotlightbass}}
@@ -443,7 +443,7 @@
             }
          )
          (spotlight
-            {sel_section.lst set_data #ifdef HX_OG (#include ../track_og/spotlight/spotlight.dta) #else (#include ../track_new/spotlight/spotlight.dta) #endif}
+            {sel_section.lst set_data #ifdef MHX_OG (#include ../track_og/spotlight/spotlight.dta) #else (#include ../track_new/spotlight/spotlight.dta) #endif}
             {switch $dx_tracked_instrument
                (guitar
                   #ifdef HX_WII
@@ -748,7 +748,7 @@
          {synth play button_toggle}
          {if_else {|| {== $dx_tracked_texture_loader voxarrow} {== $dx_tracked_texture_loader voxhw} {== $dx_tracked_texture_loader voxnotes} {== $dx_tracked_texture_loader voxod}}
             {os_back_screen overshell_voxtrk}
-            {if_else {|| {== $dx_tracked_texture_loader highway} {== $dx_tracked_texture_loader spotlight} #ifndef HX_OG {== $dx_tracked_texture_loader streak} #endif}
+            {if_else {|| {== $dx_tracked_texture_loader highway} {== $dx_tracked_texture_loader spotlight} #ifndef MHX_OG {== $dx_tracked_texture_loader streak} #endif}
                {os_back_screen overshell_instrument_sel}
                {os_back_screen overshell_tex}
             }

diff --git a/_ark/ui/overshell_track.dta b/_ark/ui/overshell_track.dta
@@ -38,7 +38,7 @@
          )
          (os_trkpreset
             {set $os_in_transition TRUE}
-            #ifdef HX_OG
+            #ifdef MHX_OG
             {os_change_screen overshell_tex}
             #else
             {os_change_screen overshell_trkpreset}

diff --git a/windows_bats/process_textures_streak.bat b/windows_bats/process_textures_streak.bat
@@ -14,11 +14,4 @@ FOR /F "tokens=*" %%G IN ('dir /b *.png') DO "%~dp0..\dependencies/windows/super
 FOR /F "tokens=*" %%G IN ('dir /b *.png') DO "%~dp0..\dependencies/windows/superfreq.exe" png2tex "%~dp0..\custom_textures\streak/%%G" "%~dp0..\_ark\track_new\streak\gen\%%~nG.png_wii" --platform wii
 del sed* /a /s
 cd "%~dp0..\_ark/track_new/streak/gen"
-FOR /F "tokens=*" %%G IN ('dir /b *.png_xbox') DO python "%~dp0..\dependencies/swap_rb_art_bytes.py" "%~dp0..\_ark/track_new/streak/gen/%%G" "%~dp0..\_ark/track_new/streak/gen/%%~nG.png_ps3"
-cd "%~dp0..\custom_textures\streak"
-FOR /F "tokens=*" %%G IN ('dir /b *.png') DO "%~dp0..\dependencies/windows/superfreq.exe" png2tex "%~dp0..\custom_textures\streak/%%G" "%~dp0..\_tmp\%%~nG.bmp_ps2"
-cd "%~dp0..\_tmp"
-FOR /F "tokens=*" %%G IN ('dir /b *.bmp_ps2') DO "%~dp0..\dependencies/windows/superfreq.exe" tex2png "%~dp0..\_tmp/%%G" "%~dp0..\_tmp\%%~nG.png"
-FOR /F "tokens=*" %%G IN ('dir /b *.png') DO "%~dp0..\dependencies/windows/superfreq.exe" png2tex "%~dp0..\_tmp/%%G" "%~dp0..\_ark\track_new\streak\gen\%%~nG.png_ps2"
-cd "%~dp0..\"
-rmdir "%~dp0..\_tmp" /s /q
+FOR /F "tokens=*" %%G IN ('dir /b *.png_xbox') DO python "%~dp0..\dependencies/swap_rb_art_bytes.py" "%~dp0..\_ark/track_new/streak/gen/%%G" "%~dp0..\_ark/track_new/streak/gen/%%~nG.png_ps3"