Merge decomp/main into dusk

include/JSystem/JAudio2/JAISound.h

@@ -5,6 +5,7 @@
 #include "JSystem/JAudio2/JAIAudible.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "global.h"
+#include <cstdint>
 
 class JAISound;
 

include/JSystem/JKernel/JKRHeap.h

@@ -5,6 +5,7 @@
 #include <dolphin/os.h>
 #include "global.h"
 #include <new>
+#include <cstdint>
 
 class JKRHeap;
 typedef void (*JKRErrorHandler)(void*, u32, int);

include/JSystem/JStudio/JStudio/stb.h

@@ -5,6 +5,7 @@
 #include "JSystem/JStudio/JStudio/object-id.h"
 #include "JSystem/JStudio/JStudio/stb-data-parse.h"
 #include <dolphin/os.h>
+#include <cstdint>
 
 namespace JStudio {
 class TObject;

include/JSystem/JSupport/JSUOutputStream.h

@@ -35,6 +35,8 @@ public:
     JSU_OUTPUTSTREAM_OPERATOR(signed long long)
     JSU_OUTPUTSTREAM_OPERATOR(unsigned long long)
 
+#undef JSU_OUTPUTSTREAM_OPERATOR
+
     JSUOutputStream& operator<<(const char* param_0) {
         write(param_0);
         return *this;

include/JSystem/JUtility/JUTXfb.h

@@ -75,7 +75,7 @@ private:
     static JUTXfb* sManager;
 
 private:
-    /* 0x00 */ void* mBuffer[3];
+    /* 0x00 */ u8* mBuffer[3];
     /* 0x0C */ bool mXfbAllocated[3];
     /* 0x10 */ s32 mBufferNum;
     /* 0x14 */ s16 mDrawingXfbIndex;