Merge branch 'main' of https://github.com/TwilitRealm/dusk into randomizer

include/m_Do/m_Do_audio.h

@@ -4,8 +4,12 @@
 #include "Z2AudioLib/Z2AudioMgr.h"
 #include "Z2AudioLib/Z2EnvSeMgr.h"
 #include "Z2AudioLib/Z2LinkMgr.h"
+#if defined(DUSK_BUILDING_GAME)
 #include "dusk/audio.h"
 #include "dusk/settings.h"
+#else
+#define DUSK_AUDIO_SKIP(...)
+#endif
 
 class mDoAud_zelAudio_c : public Z2AudioMgr {
 public:
@@ -134,15 +138,7 @@ inline void mDoAud_seStart(u32 i_sfxID, const Vec* i_sePos, u32 param_2, s8 i_re
 }
 
 #if TARGET_PC
-inline void mDoAud_seStartMenu(u32 i_sfxID) {
-    if (!mDoAud_zelAudio_c::isInitFlag()) {
-        return;
-    }
-    if (!dusk::getSettings().audio.menuSounds.getValue()) {
-        return;
-    }
-    mDoAud_seStart(i_sfxID, nullptr, 0, 0);
-}
+void mDoAud_seStartMenu(u32 i_sfxID);
 #endif
 
 inline void mDoAud_seStartLevel(u32 i_sfxID, const Vec* i_sePos, u32 param_2, s8 i_reverb) {

include/m_Do/m_Do_controller_pad.h

@@ -3,7 +3,10 @@
 
 #include "JSystem/JUtility/JUTGamePad.h"
 #include "SSystem/SComponent/c_API_controller_pad.h"
+
+#if defined(DUSK_BUILDING_GAME)
 #include "dusk/settings.h"
+#endif
 
 // Controller Ports 1 - 4
 enum { PAD_1, PAD_2, PAD_3, PAD_4 };
@@ -54,29 +57,21 @@ public:
     static f32 getStickValue(u32 pad) { return getCpadInfo(pad).mMainStickValue; }
     static s16 getStickAngle(u32 pad) { return getCpadInfo(pad).mMainStickAngle; }
 
+#if TARGET_PC
+    static s16 getStickAngle3D(u32 pad);
+#else
     static s16 getStickAngle3D(u32 pad) {
-        #if TARGET_PC
-        if (dusk::getSettings().game.enableMirrorMode) {
-            return -getCpadInfo(pad).mMainStickAngle;
-        } else {
-            return getCpadInfo(pad).mMainStickAngle;
-        }
-        #else
         return getCpadInfo(pad).mMainStickAngle;
-        #endif
     }
+#endif
 
+#if TARGET_PC
+    static f32 getSubStickX3D(u32 pad);
+#else
     static f32 getSubStickX3D(u32 pad) {
-        #if TARGET_PC
-        if (dusk::getSettings().game.enableMirrorMode) {
-            return -getCpadInfo(pad).mCStickPosX;
-        } else {
-            return getCpadInfo(pad).mCStickPosX;
-        }
-        #else
         return getCpadInfo(pad).mCStickPosX;
-        #endif
     }
+#endif
 
     static f32 getSubStickX(u32 pad) { return getCpadInfo(pad).mCStickPosX; }
     static f32 getSubStickY(u32 pad) { return getCpadInfo(pad).mCStickPosY; }

include/m_Do/m_Do_lib.h

@@ -8,7 +8,7 @@
 #include "JSystem/JGeometry.h"
 #endif
 
-#include "dusk/gx_helper.h"
+#include "helpers/gx_helper.h"
 
 typedef struct Vec Vec;
 struct ResTIMG;

include/m_Do/m_Do_mtx.h

@@ -6,7 +6,7 @@
 #include <mtx.h>
 
 #include "JSystem/JMath/JMath.h"
-#include "dusk/endian.h"
+#include "helpers/endian.h"
 
 extern u8 g_printCurrentHeapDebug;
 DUSK_GAME_EXTERN u8 g_printOtherHeapDebug;

include/m_Do/m_Do_printf.h

@@ -2,7 +2,7 @@
 #define M_DO_M_DO_PRINTF_H
 
 #include <os.h>
-#include "dusk/endian.h"
+#include "helpers/endian.h"
 
 void my_PutString(const char*);
 void mDoPrintf_vprintf_Interrupt(char const*, va_list);