Update to spice2x-25-04-25 (pre-apply)

> broken commit
2025-05-07 00:25:31 +09:00
parent 04dee88276
commit c94de456b5
543 changed files with 78491 additions and 91698 deletions
@@ -65,6 +65,7 @@ namespace games::gitadora {
            DrumHelp,
            DrumButtonExtra1,
            DrumButtonExtra2,
+            // note: this is the order they appear in the test menu
            DrumHiHat,
            DrumHiHatClosed,
            DrumHiHatHalfOpen,
@@ -95,14 +96,107 @@ namespace games::gitadora {

    // all lights in correct order
    namespace Lights {
-        enum {
+        typedef enum {
+            // vibration motors (DX only)
            GuitarP1Motor,
            GuitarP2Motor,
-        };
+
+            // P1
+            P1MenuStart,
+            // DX only
+            P1MenuUpDown,
+            P1MenuLeftRight,
+            P1MenuHelp,
+
+            // P2
+            P2MenuStart,
+            // DX only
+            P2MenuUpDown,
+            P2MenuLeftRight,
+            P2MenuHelp,
+
+            // drums
+            DrumLeftCymbal,
+            DrumHiHat,
+            DrumSnare,
+            DrumHighTom,
+            DrumLowTom,
+            DrumFloorTom,
+            DrumRightCymbal,
+
+            // drum woofer
+            DrumWooferR,
+            DrumWooferG,
+            DrumWooferB,
+
+            // drum stage, DX only
+            DrumStageR,
+            DrumStageG,
+            DrumStageB,
+
+            // main spotlights, DX only
+            SpotFrontLeft,
+            SpotFrontRight,
+            SpotCenterLeft,
+            SpotCenterRight,
+
+            // drum rear spotlights, DX only
+            DrumSpotRearLeft,
+            DrumSpotRearRight,
+
+            // guitar center lower RGB, DX only
+            GuitarLowerLeftR,
+            GuitarLowerLeftG,
+            GuitarLowerLeftB,
+            GuitarLowerRightR,
+            GuitarLowerRightG,
+            GuitarLowerRightB,
+
+            // guitar left speaker, DX only
+            GuitarLeftSpeakerUpperR,
+            GuitarLeftSpeakerUpperG,
+            GuitarLeftSpeakerUpperB,
+            GuitarLeftSpeakerMidUpLeftR,
+            GuitarLeftSpeakerMidUpLeftG,
+            GuitarLeftSpeakerMidUpLeftB,
+            GuitarLeftSpeakerMidUpRightR,
+            GuitarLeftSpeakerMidUpRightG,
+            GuitarLeftSpeakerMidUpRightB,
+            GuitarLeftSpeakerMidLowLeftR,
+            GuitarLeftSpeakerMidLowLeftG,
+            GuitarLeftSpeakerMidLowLeftB,
+            GuitarLeftSpeakerMidLowRightR,
+            GuitarLeftSpeakerMidLowRightG,
+            GuitarLeftSpeakerMidLowRightB,
+            GuitarLeftSpeakerLowerR,
+            GuitarLeftSpeakerLowerG,
+            GuitarLeftSpeakerLowerB,
+
+            // guitar right speaker, DX only
+            GuitarRightSpeakerUpperR,
+            GuitarRightSpeakerUpperG,
+            GuitarRightSpeakerUpperB,
+            GuitarRightSpeakerMidUpLeftR,
+            GuitarRightSpeakerMidUpLeftG,
+            GuitarRightSpeakerMidUpLeftB,
+            GuitarRightSpeakerMidUpRightR,
+            GuitarRightSpeakerMidUpRightG,
+            GuitarRightSpeakerMidUpRightB,
+            GuitarRightSpeakerMidLowLeftR,
+            GuitarRightSpeakerMidLowLeftG,
+            GuitarRightSpeakerMidLowLeftB,
+            GuitarRightSpeakerMidLowRightR,
+            GuitarRightSpeakerMidLowRightG,
+            GuitarRightSpeakerMidLowRightB,
+            GuitarRightSpeakerLowerR,
+            GuitarRightSpeakerLowerG,
+            GuitarRightSpeakerLowerB
+        } gitadora_lights_t;
    }

    // getters
    std::vector<Button> &get_buttons();
+    std::string get_buttons_help();
    std::vector<Analog> &get_analogs();
    std::vector<Light> &get_lights();
 }