Merge branch 'develop'

.gitignore

@@ -12,7 +12,9 @@ _tmpbuild
 _ps2_files
 _build/ps2/gen/*
 _ark_ps2/songs
+_ark_wii/songs
 !_ark_ps2/songs/afterlife
+_build/wii
 
 main_xbox_9.ark
 main_xbox_8.ark

README.md

@@ -1,6 +1,6 @@
 <div align="center">
 
-<img src="dependencies/images/header.gif" width="100%" alt="Header GIF">
+<img src="dependencies/images/header.png" width="100%" alt="Header GIF">
 
 # Downloads and install instructions have been moved to our [website](https://rb2deluxe.neocities.org/)!
 

_ark/(..)/(..)/system/run/band/band_objects.dta

@@ -434,7 +434,24 @@
                   object
                   (class Environ)
                   (help
-                     "environment override for this target during this shot")))))
+                     "environment override for this target during this shot"))
+               #ifdef HX_WII
+               (lod_override
+                  bool
+                  (help
+                     "Force target to least-detailed LOD"))
+               (outfit_hides
+                  bitfield
+                  (list
+                     {if_else
+                        {$this
+                           has
+                           (outfit_list)}
+                        {$this outfit_list}
+                        ()})
+                  (help
+                     "Hide specified character outfits"))
+               #endif)))
       (triggers
          (array
             (struct
@@ -473,6 +490,12 @@
          int
          (help
             "30fps maximum duration for this shot, 0 is infinite"))
+      #ifdef HX_WII
+      (fps_override
+         bool
+         (help
+            "Force world to render at 20Hz when 3 or more gem tracks are in play (Wii only)"))
+      #endif
       (store
          script
          (script
@@ -511,6 +534,22 @@
                "kValidDramatic"
                "kValidRocker"
                "kValidSpazz"))
+         #ifdef HX_WII
+         (outfit_list
+            ("kOutfitHideHair"
+               "kOutfitHideHeads"
+               "kOutfitHideFaceHair"
+               "kOutfitHideGlasses"
+               "kOutfitHideTorso"
+               "kOutfitHideHands"
+               "kOutfitHideLegs"
+               "kOutfitHideFeet"
+               "kOutfitHideWrist"
+               "kOutfitHideBass"
+               "kOutfitHideGuitar"
+               "kOutfitHideMic"
+               "kOutfitHideDrum"))
+         #endif
          (worst FALSE)
          (editor
             (bass_focus
@@ -742,6 +781,7 @@
             {$char reset_hair})
          (update_overlay
             #ifndef _SHIP
+            #ifndef WII_OUTPUTONLY
             {rnd
                reflect
                camera
@@ -791,11 +831,14 @@
                         " postprocess: "
                         [postprocess]}}
                   "\n"}}
+            #endif
             #endif)
          (start_shot
             #ifndef _SHIP
+            #ifndef WII_OUTPUTONLY
             {$this update_overlay}
             #endif
+            #endif
             {if
                [play_anim]
                {[play_anim]
@@ -1278,6 +1321,7 @@
                   [abs_regulate])})
          (start_shot
             #ifndef _SHIP
+            #ifndef WII_OUTPUTONLY
             {rnd
                reflect
                camera
@@ -1287,6 +1331,7 @@
                   " category:"
                   [category]
                   "\n"}}
+            #endif
             #endif)
          (stop_shot
             {foreach_int
@@ -4445,4 +4490,91 @@
       (challenge_list
          object
          (class BandList)))
-   (types))
+   (types))
+#ifdef HX_WII
+(ScoreboardDir
+   (description
+      "In-game scoreboard")
+   (superclasses RndDir)
+   (types)
+   (editor
+      (reset
+         script
+         (script
+            {$this reset}))
+      (test_score
+         float
+         (post_sync
+            {$this
+               set_score
+               [test_score]})
+         (help
+            "Current score."))
+      (test_stars
+         float
+         (post_sync
+            {$this
+               set_num_stars
+               [test_stars]}))
+      (test_opponent_score
+         float
+         (post_sync
+            {$this
+               set_opponent_score
+               [test_opponent_score]})
+         (help
+            "BotB opponent's total score."))
+      (sound
+         bool
+         "Play a sound when the stars change")
+      (config
+         symbol
+         (list
+            (normal botb botb_star))
+         (post_sync
+            {$this
+               set_config
+               [config]}))
+      (stars
+         (array
+            object
+            (class RndDir)))))
+(BandPowerMeterDir
+   (description
+      "Overdrive power meter")
+   (superclasses RndDir)
+   (types)
+   (editor
+      (initialize
+         script
+         (script
+            {$this reset}
+            {$this set_showing TRUE}))
+      (test_energy
+         float
+         (post_sync
+            {$this
+               set_energy
+               [test_energy]
+               [state]
+               guitar}))
+      (energy_added
+         script
+         (script
+            {$this energy_added}))
+      (energy_ready
+         script
+         (script
+            {$this energy_ready guitar}))
+      (stop
+         script
+         (script
+            {$this stop_deploy}))
+      (disable_overdrive
+         script
+         (script
+            {$this set_no_overdrive}))
+      (vocal_meter
+         bool
+         (read_only TRUE))))
+#endif

_ark/config/band.dta

@@ -742,9 +742,7 @@
    #endif)
 (tips
    (#include tips.dta
-   #ifndef HX_WII
-      #include tips_updates.dta
-      #endif))
+      #include tips_updates.dta))
 (loading_screens
    (#include loading_screens.dta))
 (videos

_ark/config/beatmatch_controller.dta

@@ -52,4 +52,41 @@
    (slots kPad_X 0 kPad_R2 1 kPad_R1 2 kPad_L1 3 kPad_L2 4)
    (force_mercury kPad_Select))
 (midi_drums
-   (slots kPad_L2 0 kPad_R2 0 kPad_L1 1 kPad_R1 2 kPad_R2 3 kPad_X 4))
+   (slots kPad_L2 0 kPad_R2 0 kPad_L1 1 kPad_R1 2 kPad_R2 3 kPad_X 4))
+#ifdef HX_WII
+(wii_guitar
+   (slots 6 0 5 1 4 2 7 3 2 4)
+   (shift_button 0)
+   (controller_style hx_wii)
+   (force_mercury kPad_Select))
+(wii_drums
+   (dpad_for_navigation FALSE)
+   (slots 2 0 5 1 4 2 7 3 6 4)
+   (velocity_pressures
+      (1 kPad_Circle)
+      (2 kPad_Tri)
+      (3 kPad_Square)
+      (4 kPad_X))
+   (force_mercury kPad_Select))
+(wii_rodrums
+   (dpad_for_navigation FALSE)
+   (slots 2 0 5 1 4 2 7 3 3 3 6 4)
+   (velocity_pressures
+      (1 kPad_Circle)
+      (2 kPad_Tri)
+      (3 kPad_Square)
+      (4 kPad_X))
+   (force_mercury kPad_Select))
+(gamecube
+   (dpad_for_navigation FALSE)
+   (slots 6 0 5 1 4 2 7 3 2 4)
+   (force_mercury kPad_Select))
+(wii_remote
+   (dpad_for_navigation FALSE)
+   (slots 6 0 5 1 4 2 7 3 2 4)
+   (force_mercury kPad_Select))
+(wii_classic
+   (dpad_for_navigation FALSE)
+   (slots 6 0 5 1 4 2 7 3 2 4)
+   (force_mercury kPad_Select))
+#endif

_ark/config/beatmatcher.dta

@@ -15,7 +15,7 @@
          ($world halfbeat)})
    (beat
    DX_COUNTDOWN_TRACKER
-   {unless {> {gamecfg get practice_speed} 0} {if {is_leader_local} {session send_msg_to_all {` (beatmatch set_music_speed {, $speedmod}) kNetReliable}}}}
+   {unless {> {gamecfg get practice_speed} 0} {if {is_leader_local} {session send_msg_to_all {` (beatmatch set_music_speed {, $speedmod}) kNetReliable} kNetReliable}}}
    {unless {> {gamecfg get practice_speed} 0} {beatmatch set_music_speed $speedmod}}
       {if_else
          $world
@@ -165,6 +165,62 @@
             (0 2 3)
             (0 2 3)))
       #else
+      #ifdef HX_WII
+      (drums2
+         ((0)
+            (1)
+            (2 3)
+            (2 3)
+            (2 3)))
+      (drums2easy
+         ((0)
+            (1 2 3)
+            (1 2 3)
+            (1 2 3)
+            (1 2 3)))
+      (drums2easynokick
+         ((0)
+            (1 2 3)
+            (0 1 2 3)
+            (0 1 2 3)
+            (0 1 2 3)))
+      (drums2easysnareonly
+         ((0)
+            (0 1 2 3)
+            (0 2 3)
+            (0 2 3)
+            (0 2 3)))
+      (drums2d
+         ((0)
+            (2 3)
+            (1)
+            (2 3)
+            (2 3)))
+      (drums3
+         ((0)
+            (1)
+            (2 3)
+            (2 3)
+            (2 3)))
+      (drums3d
+         ((0)
+            (2 3)
+            (1)
+            (2 3)
+            (2 3)))
+      (drums3easy
+         ((0)
+            (1 2 3)
+            (1 2 3)
+            (1 2 3)
+            (1 2 3)))
+      (drums3easynokick
+         ((0)
+            (1 2 3)
+            (0 1 2 3)
+            (0 1 2 3)
+            (0 1 2 3)))
+      #else
       (drums2
          ((0)
             (1 2)
@@ -220,6 +276,7 @@
             (0 1 4 5)
             (0 1 4 5)))
       #endif
+      #endif
       (drums4
          ((0)
             (1 2)