Merge branch 'main' of https://github.com/TakaRikka/dusk

include/Z2AudioLib/Z2WolfHowlMgr.h

@@ -39,6 +39,10 @@ enum Z2WolfHowlCurveID {
     Z2WOLFHOWL_NEWSONG2,
     Z2WOLFHOWL_NEWSONG3,
 
+    #if TARGET_PC
+    Z2WOLFHOWL_TIMESONG,
+    #endif
+
     Z2WOLFHOWL_MAX
 };
 

include/d/actor/d_a_alink.h

@@ -4549,6 +4549,7 @@ public:
     /* 0x03850 */ daAlink_procFunc mpProcFunc;
 
 #if TARGET_PC
+    void handleWolfHowl();
     void handleQuickTransform();
     bool checkGyroAimItemContext();
 #endif

include/dusk/settings.h

@@ -61,6 +61,7 @@ struct UserSettings {
         ConfigVar<bool> noMissClimbing;
         ConfigVar<bool> fastTears;
         ConfigVar<bool> instantSaves;
+        ConfigVar<bool> sunsSong;
 
         // Preferences
         ConfigVar<bool> enableMirrorMode;

include/global.h

@@ -220,10 +220,12 @@ using std::isnan;
 // Some basic macros that are more convenient than putting down #if blocks for one-line changes.
 #if TARGET_PC
 #define IF_DUSK(statement) statement
+#define IF_DUSK_ARG(expr) , expr
 #define IF_NOT_DUSK(statement)
 #define DUSK_IF_ELSE(dusk, orig) dusk
 #else
 #define IF_DUSK(statement)
+#define IF_DUSK_ARG(expr)
 #define IF_NOT_DUSK(statement) statement
 #define DUSK_IF_ELSE(dusk, orig) orig
 #endif