release 1.1.0-beta5

.github/workflows/build.yml

@@ -7,63 +7,53 @@ jobs:
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python 3.11
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.11'
       - name: Build Files
         run: |
           sed -i '1d' _ark/dx/song_updates/songs_updates.dta
           dependencies/python/configure_yarg_build.py
           dependencies/linux/ninja
-
       - name: Upload result
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: RB3DX-YARG-Updates
           path: out/yarg
 
   build_xbox:
     runs-on: ubuntu-latest
-
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python 3.11
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.11'
-      - name: Set env
-        run: |
-          echo "GITHUB_SHA_SHORT=$(echo $GITHUB_SHA | cut -c 1-7)" >> $GITHUB_ENV
-          echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
       - name: Build ARK
         run: |
           dependencies/python/configure_build.py xbox
           dependencies/linux/ninja
-
-      - name: Remove Excess files
+      - name: Remove .gitkeep
         run: |
-          find . -name "*.txt" -type f -delete
-          find . -name "*.zbm" -type f -delete
-      
+          find . -name ".gitkeep" -type f -delete
       - name: Upload result
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: RB3DX-Xbox
           path: out/xbox
 
   build_ps3:
     runs-on: windows-2019
-
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: GuillaumeFalourd/[email protected]
         with:
           command_line: echo InstallDirectory = BLUS30463
           output_file_name: ps3_package.conf
       - name: Set up Python 3.11
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.11'
       - name: Build ARK
@@ -77,7 +67,61 @@ jobs:
           $packageversion="1.05"
           dependencies/windows/make_package_npdrm_retail.exe --k-licensee 0x00000000000000000000000000000000 --drm-type Local --package-version $packageversion --content-type GameData --content-id ($content + $sha_short) ps3_package.conf out/ps3
       - name: Upload result
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: RB3DX-PS3
-          path: '*.pkg'
+          path: '*.pkg'
+
+  build_wii:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+      - name: Set env
+        run: |
+          mkdir ./build
+          mkdir platform/wii/files
+          mkdir platform/wii/files/gen
+          cp dependencies/wii_patcher/main_wii.hdr platform/wii/files/gen/main_wii.hdr
+          mkdir platform/wii/sys
+          truncate -s 13068128 platform/wii/sys/main.dol
+          truncate -s 22353239 platform/wii/files/gen/main_wii_0.ark
+          truncate -s 5721833 platform/wii/files/gen/main_wii_1.ark
+          truncate -s 24584681 platform/wii/files/gen/main_wii_2.ark
+          truncate -s 266057007 platform/wii/files/gen/main_wii_3.ark
+          truncate -s 688887924 platform/wii/files/gen/main_wii_4.ark
+          truncate -s 107950925 platform/wii/files/gen/main_wii_5.ark
+          truncate -s 468328063 platform/wii/files/gen/main_wii_6.ark
+          truncate -s 22352016 platform/wii/files/gen/main_wii_7.ark
+          truncate -s 1983799220 platform/wii/files/gen/main_wii_8.ark
+          truncate -s 300667016 platform/wii/files/gen/main_wii_9.ark
+      - name: Build ARK
+        run: |
+          dependencies/python/configure_build.py wii
+          dependencies/linux/ninja
+      - uses: edgarrc/action-7z@v1
+        with:
+          args: 7z a -t7z -mx=9 build.7z ./build/
+      - name: Configure Tools
+        run: |
+          curl -L https://dlhb.gamebrew.org/wiihomebrews/wiimmfiisopatcherwii.7z -o wiimmfi-patcher-latest.7z
+          7z x wiimmfi-patcher-latest.7z
+          7z x wiimmfi-patcher-v7.4.zip
+          mv wiimmfi-patcher-v7.4 rb3dx_wii_patcher
+          mkdir rb3dx_wii_patcher/wii_patch_files
+          mkdir rb3dx_wii_patcher/wii_patch_files/gen
+          cp out/wii/files/gen/main_wii.hdr rb3dx_wii_patcher/wii_patch_files/gen/main_wii.hdr
+          cp out/wii/files/gen/main_wii_10.ark rb3dx_wii_patcher/wii_patch_files/gen/main_wii_10.ark
+          cp dependencies/wii_patcher/patch-images.sh rb3dx_wii_patcher/patch-images.sh
+          cp dependencies/wii_patcher/setup.sh rb3dx_wii_patcher/bin/setup.sh
+      - name: Remove .gitkeep
+        run: |
+          find . -name ".gitkeep" -type f -delete
+      - name: Upload result
+        uses: actions/upload-artifact@v4
+        with:
+          name: RB3DX-Wii-Patcher
+          path: rb3dx_wii_patcher

.gitignore

@@ -13,4 +13,7 @@ obj
 out
 
 #generated files by additional game scripts
-scripts/dx_config.ini
+scripts/dx_config.ini
+
+#reference script unused by dx
+_ark/dx/reference

_ark/config/macros.dta

@@ -689,7 +689,7 @@
 #define dxState_AnimatedGemWarn (69003)
 #define dxState_AppearanceMenu (69004)
 #define dxState_AudioSFX (69005)
-#define dxState_AxisPositionSetup (69006)
+#define dxState_PositionRemapper (69006)
 #define dxState_AxisXYZ (69007)
 #define dxState_BotSettings (69008)
 #define dxState_CameraMenu (69009)
@@ -775,7 +775,9 @@
 #define dxState_GraphicsWarn (69089)
 #define dxState_60FPSWarn (69090)
 #define dxState_HighLODWarn (69091)
-#define dxState_ScreenElements_Practice (69052)
+#define dxState_ScreenElements_Practice (69092)
+#define dxState_ButtonRemapper (69093)
+#define dxState_MenuColor (69094)
 #define kOverrideFlow_None
 (0)
 #define kOverrideFlow_SongSettings

_ark/config/mem.dta

@@ -9,13 +9,23 @@
    #ifdef HX_PS3
    (main
       (size
-         {if_else {file_exists DX_HI_MEM_PATH}
-            {if_else {> {size {read_file DX_HI_MEM_PATH}} 0}
-               {elem {find {read_file DX_HI_MEM_PATH} dx_high_memory} 1}
+         #ifdef REGION_EUROPE
+         {if_else {file_exists "GD:/dev_hdd0/game/BLES00986/USRDIR/dx_high_memory.dta"}
+            {if_else {> {size {read_file "GD:/dev_hdd0/game/BLES00986/USRDIR/dx_high_memory.dta"}} 0}
+               {elem {find {read_file "GD:/dev_hdd0/game/BLES00986/USRDIR/dx_high_memory.dta"} dx_high_memory} 1}
                131000000
             }
             131000000
          }
+         #else
+         {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"}} 0}
+               {elem {find {read_file "GD:/dev_hdd0/game/BLUS30463/USRDIR/dx_high_memory.dta"} dx_high_memory} 1}
+               131000000
+            }
+            131000000
+         }
+         #endif
       )
    )
    (char

_ark/dx/countdown/dx_countdown_funcs.dta

@@ -92,13 +92,16 @@
    ;      {time
             #ifdef RB3DX
             {if {== $dx_current_checked_instrument vocals}
-               {PLAYER_FEEDBACK_VOX start_solo}
-               {{PLAYER_FEEDBACK_VOX find solo_start.trig} trigger}
+               {if {== {PLAYER_FEEDBACK_VOX get in_solo} FALSE}
+                  {{PLAYER_FEEDBACK_VOX find solo_start.trig} trigger}
+               }
                {set $solo_box_up_vocals TRUE}
             }
             #endif
             {if {!= $dx_current_checked_instrument vocals}
-               {PLAYER_FEEDBACK_00 start_solo}
+               {if {== {PLAYER_FEEDBACK_00 get in_solo} FALSE}
+                  {{PLAYER_FEEDBACK_00 find solo_start.trig} trigger}
+               }
                {switch $dx_current_checked_slot
                   (0
                      {set $solo_box_up_0 TRUE}
@@ -171,11 +174,15 @@
    ;   {sprintf "Executed dx_clean_solo_box - time: %.4fms"
    ;      {time
             #ifdef RB3DX
-            {PLAYER_FEEDBACK_VOX set_showing TRUE}
-            {{PLAYER_FEEDBACK_VOX find points.lbl} #ifdef RB3DX set_token_fmt dx_points #else set_localized dx_points #endif}
+            {if {== $dx_current_checked_instrument vocals}
+               {PLAYER_FEEDBACK_VOX set_showing TRUE}
+               {{PLAYER_FEEDBACK_VOX find points.lbl} #ifdef RB3DX set_token_fmt dx_points #else set_localized dx_points #endif}
+            }
             #endif
-            {PLAYER_FEEDBACK_00 set_showing TRUE}
-            {{PLAYER_FEEDBACK_00 find points.lbl} #ifdef RB3DX set_token_fmt dx_points #else set_localized dx_points #endif}
+            {if {!= $dx_current_checked_instrument vocals}
+               {PLAYER_FEEDBACK_00 set_showing TRUE}
+               {{PLAYER_FEEDBACK_00 find points.lbl} #ifdef RB3DX set_token_fmt dx_points #else set_localized dx_points #endif}
+            }
    ;      }
    ;   }
    ;}
@@ -188,23 +195,27 @@
    ;      {time
             #ifdef RB3DX
             {if {== $dx_current_checked_instrument vocals}
-               {PLAYER_FEEDBACK_VOX set_showing TRUE}
-               {PLAYER_FEEDBACK_VOX end_solo}
-               {{PLAYER_FEEDBACK_VOX find solo_end.trig} trigger}
-               {{PLAYER_FEEDBACK_VOX find SOLO_PERCENT_LABEL} #ifdef RB3DX set_token_fmt solo_countdown {localize_separated_int 2} #else set_text "2" #endif}
-               {{PLAYER_FEEDBACK_VOX find solo_rating.lbl} #ifdef RB3DX set_token_fmt get_ready #else set_localized {localize get_ready} #endif}
-               {{PLAYER_FEEDBACK_VOX find SCORE_LABEL} #ifdef RB3DX set_token_fmt os_blnk #else set_text " " #endif}
-               {{PLAYER_FEEDBACK_VOX find points.lbl} #ifdef RB3DX set_token_fmt os_blnk #else set_localized {localize os_blnk} #endif}
+               {if {== {PLAYER_FEEDBACK_VOX get in_solo} FALSE}
+                  {PLAYER_FEEDBACK_VOX set_showing TRUE}
+                  {PLAYER_FEEDBACK_VOX end_solo}
+                  {{PLAYER_FEEDBACK_VOX find solo_end.trig} trigger}
+                  {{PLAYER_FEEDBACK_VOX find SOLO_PERCENT_LABEL} #ifdef RB3DX set_token_fmt solo_countdown {localize_separated_int 2} #else set_text "2" #endif}
+                  {{PLAYER_FEEDBACK_VOX find solo_rating.lbl} #ifdef RB3DX set_token_fmt get_ready #else set_localized {localize get_ready} #endif}
+                  {{PLAYER_FEEDBACK_VOX find SCORE_LABEL} #ifdef RB3DX set_token_fmt os_blnk #else set_text " " #endif}
+                  {{PLAYER_FEEDBACK_VOX find points.lbl} #ifdef RB3DX set_token_fmt os_blnk #else set_localized {localize os_blnk} #endif}
+               }
             }
             #endif
             {if {!= $dx_current_checked_instrument vocals}
-               {PLAYER_FEEDBACK_00 set_showing TRUE}
-               {PLAYER_FEEDBACK_00 end_solo}
-               {{PLAYER_FEEDBACK_00 find solo_end.trig} trigger}
-               {{PLAYER_FEEDBACK_00 find SOLO_PERCENT_LABEL} #ifdef RB3DX set_token_fmt solo_countdown {localize_separated_int 2} #else set_text "2" #endif}
-               {{PLAYER_FEEDBACK_00 find solo_rating.lbl} #ifdef RB3DX set_token_fmt get_ready #else set_localized {localize get_ready} #endif}
-               {{PLAYER_FEEDBACK_00 find SCORE_LABEL} #ifdef RB3DX set_token_fmt os_blnk #else set_text " " #endif}
-               {{PLAYER_FEEDBACK_00 find points.lbl} #ifdef RB3DX set_token_fmt os_blnk #else set_localized {localize os_blnk} #endif}
+               {if {== {PLAYER_FEEDBACK_00 get in_solo} FALSE}
+                  {PLAYER_FEEDBACK_00 set_showing TRUE}
+                  {PLAYER_FEEDBACK_00 end_solo}
+                  {{PLAYER_FEEDBACK_00 find solo_end.trig} trigger}
+                  {{PLAYER_FEEDBACK_00 find SOLO_PERCENT_LABEL} #ifdef RB3DX set_token_fmt solo_countdown {localize_separated_int 2} #else set_text "2" #endif}
+                  {{PLAYER_FEEDBACK_00 find solo_rating.lbl} #ifdef RB3DX set_token_fmt get_ready #else set_localized {localize get_ready} #endif}
+                  {{PLAYER_FEEDBACK_00 find SCORE_LABEL} #ifdef RB3DX set_token_fmt os_blnk #else set_text " " #endif}
+                  {{PLAYER_FEEDBACK_00 find points.lbl} #ifdef RB3DX set_token_fmt os_blnk #else set_localized {localize os_blnk} #endif}
+               }
             }
    ;      }
    ;   }
@@ -216,27 +227,29 @@
    ;{dx_log_writer countdown
    ;   {sprintf "Executed dx_final_percent_report - time: %.4fms"
    ;      {time
-            {PLAYER_FEEDBACK_00 set_showing FALSE}
-            {PLAYER_FEEDBACK_00 end_solo}
-            {{PLAYER_FEEDBACK_00 find solo_end.trig} trigger}
-            {{PLAYER_FEEDBACK_00 find SOLO_PERCENT_LABEL} #ifdef RB3DX set_token_fmt os_blnk #else set_text " " #endif}
-            {{PLAYER_FEEDBACK_00 find solo_rating.lbl} #ifdef RB3DX set_token_fmt os_blnk #else set_localized {localize os_blnk} #endif}
-            {{PLAYER_FEEDBACK_00 find SCORE_LABEL} #ifdef RB3DX set_token_fmt os_blnk #else set_text " " #endif}
-            {{PLAYER_FEEDBACK_00 find points.lbl} #ifdef RB3DX set_token_fmt os_blnk #else set_localized {localize os_blnk} #endif}
-            {switch $dx_current_checked_slot
-               (0
-                  {set $solo_box_up_0 FALSE}
-               )
-               (1
-                  {set $solo_box_up_1 FALSE}
-               )
-               (2
-                  {set $solo_box_up_2 FALSE}
-               )
-               (3
-                  {set $solo_box_up_3 FALSE}
-               )
-               kDataUnhandled
+            {if {!= $dx_current_checked_instrument vocals}
+               {PLAYER_FEEDBACK_00 set_showing FALSE}
+               {PLAYER_FEEDBACK_00 end_solo}
+               {{PLAYER_FEEDBACK_00 find solo_end.trig} trigger}
+               {{PLAYER_FEEDBACK_00 find SOLO_PERCENT_LABEL} #ifdef RB3DX set_token_fmt os_blnk #else set_text " " #endif}
+               {{PLAYER_FEEDBACK_00 find solo_rating.lbl} #ifdef RB3DX set_token_fmt os_blnk #else set_localized {localize os_blnk} #endif}
+               {{PLAYER_FEEDBACK_00 find SCORE_LABEL} #ifdef RB3DX set_token_fmt os_blnk #else set_text " " #endif}
+               {{PLAYER_FEEDBACK_00 find points.lbl} #ifdef RB3DX set_token_fmt os_blnk #else set_localized {localize os_blnk} #endif}
+               {switch $dx_current_checked_slot
+                  (0
+                     {set $solo_box_up_0 FALSE}
+                  )
+                  (1
+                     {set $solo_box_up_1 FALSE}
+                  )
+                  (2
+                     {set $solo_box_up_2 FALSE}
+                  )
+                  (3
+                     {set $solo_box_up_3 FALSE}
+                  )
+                  kDataUnhandled
+               }
             }
    ;      }
    ;   }
@@ -343,24 +356,28 @@
    ;      {time
             #ifdef RB3DX
             {if {== $dx_current_checked_instrument vocals}
-               {{PLAYER_FEEDBACK_VOX find SOLO_PERCENT_LABEL} #ifdef RB3DX set_token_fmt solo_countdown {localize_separated_int SOLO_PERCENT_VOX_INT} #else set_text {sprintf "%d" SOLO_PERCENT_VOX_INT} #endif}
+               {if {== {PLAYER_FEEDBACK_VOX get in_solo} FALSE}
+                  {{PLAYER_FEEDBACK_VOX find SOLO_PERCENT_LABEL} #ifdef RB3DX set_token_fmt solo_countdown {localize_separated_int SOLO_PERCENT_VOX_INT} #else set_text {sprintf "%d" SOLO_PERCENT_VOX_INT} #endif}
+               }
             }
             #endif
             {if {!= $dx_current_checked_instrument vocals}
-               {switch $dx_current_checked_instrument
-                  ((guitar real_guitar)
-                     {{PLAYER_FEEDBACK_00 find SOLO_PERCENT_LABEL} #ifdef RB3DX set_token_fmt solo_countdown {localize_separated_int SOLO_PERCENT_GUITAR_INT} #else set_text {sprintf "%d" SOLO_PERCENT_GUITAR_INT} #endif}
-                  )
-                  ((bass real_bass)
-                     {{PLAYER_FEEDBACK_00 find SOLO_PERCENT_LABEL} #ifdef RB3DX set_token_fmt solo_countdown {localize_separated_int SOLO_PERCENT_BASS_INT} #else set_text {sprintf "%d" SOLO_PERCENT_BASS_INT} #endif}
-                  )
-                  ((keys real_keys)
-                     {{PLAYER_FEEDBACK_00 find SOLO_PERCENT_LABEL} #ifdef RB3DX set_token_fmt solo_countdown {localize_separated_int SOLO_PERCENT_KEYS_INT} #else set_text {sprintf "%d" SOLO_PERCENT_KEYS_INT} #endif}
-                  )
-                  ((drum real_drum)
-                     {{PLAYER_FEEDBACK_00 find SOLO_PERCENT_LABEL} #ifdef RB3DX set_token_fmt solo_countdown {localize_separated_int SOLO_PERCENT_DRUM_INT} #else set_text {sprintf "%d" SOLO_PERCENT_DRUM_INT} #endif}
-                  )
-                  kDataUnhandled
+               {if {== {PLAYER_FEEDBACK_00 get in_solo} FALSE}
+                  {switch $dx_current_checked_instrument
+                     ((guitar real_guitar)
+                        {{PLAYER_FEEDBACK_00 find SOLO_PERCENT_LABEL} #ifdef RB3DX set_token_fmt solo_countdown {localize_separated_int SOLO_PERCENT_GUITAR_INT} #else set_text {sprintf "%d" SOLO_PERCENT_GUITAR_INT} #endif}
+                     )
+                     ((bass real_bass)
+                        {{PLAYER_FEEDBACK_00 find SOLO_PERCENT_LABEL} #ifdef RB3DX set_token_fmt solo_countdown {localize_separated_int SOLO_PERCENT_BASS_INT} #else set_text {sprintf "%d" SOLO_PERCENT_BASS_INT} #endif}
+                     )
+                     ((keys real_keys)
+                        {{PLAYER_FEEDBACK_00 find SOLO_PERCENT_LABEL} #ifdef RB3DX set_token_fmt solo_countdown {localize_separated_int SOLO_PERCENT_KEYS_INT} #else set_text {sprintf "%d" SOLO_PERCENT_KEYS_INT} #endif}
+                     )
+                     ((drum real_drum)
+                        {{PLAYER_FEEDBACK_00 find SOLO_PERCENT_LABEL} #ifdef RB3DX set_token_fmt solo_countdown {localize_separated_int SOLO_PERCENT_DRUM_INT} #else set_text {sprintf "%d" SOLO_PERCENT_DRUM_INT} #endif}
+                     )
+                     kDataUnhandled
+                  }
                }
             }
    ;      }