Merge remote-tracking branch 'decomp/main' into compile

include/JSystem/JStudio/JStudio/jstudio-math.h

@@ -1,7 +1,7 @@
 #ifndef JSTUDIO_MATH_H
 #define JSTUDIO_MATH_H
 
-#include "dolphin/mtx.h"
+#include <dolphin/mtx.h>
 #include <cmath>
 
 #define m_PI_D 3.141592653589793

include/JSystem/JStudio/JStudio/jstudio-object.h

@@ -120,6 +120,12 @@ public:
     virtual void do_data(void const*, u32, void const*, u32);
 
     TAdaptor* getAdaptor() const { return mpAdaptor; }
+
+    void setAdaptor(TAdaptor* pAdaptor) {
+        mpAdaptor = pAdaptor;
+        prepareAdaptor();
+    }
+
     TControl* getControl() { return (TControl*)stb::TObject::getControl(); }
     const TControl* getControl() const { return (const TControl*)stb::TObject::getControl(); }
 

include/JSystem/JStudio/JStudio/object-id.h

@@ -1,7 +1,7 @@
 #ifndef OBJECT_ID_H
 #define OBJECT_ID_H
 
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 
 namespace JStudio {
 namespace object {

include/JSystem/JStudio/JStudio/stb-data.h

@@ -1,7 +1,7 @@
 #ifndef STB_DATA_H
 #define STB_DATA_H
 
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 
 namespace JStudio {
 namespace stb {

include/JSystem/JStudio/JStudio/stb.h

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