Port JStudio work to new branch (#160)

* build fix

* stb

* functionvalue

* fvb

* jstudio cleanup

* d

4 files changed, 6 insertions, 79 deletions

diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp
index cb7d394ae0..b07f1de0df 100644
--- a/src/d/a/d_a_alink.cpp
+++ b/src/d/a/d_a_alink.cpp
@@ -5,6 +5,7 @@
 
 #include "d/a/d_a_alink.h"
 #include "JSystem/J3DGraphLoader/J3DAnmLoader.h"
+#include "JSystem/JStudio/JStudio/stb.h"
 #include "Z2AudioLib/Z2AudioMgr.h"
 #include "d/a/d_a_horse_static.h"
 #include "d/com/d_com_inf_game.h"
@@ -599,20 +600,6 @@ struct dCamera_c {
     /* 80181500 */ void GetForceLockOnActor();
 };
 
-namespace JStudio {
-namespace stb {
-struct data {
-    struct TParse_TParagraph_data {
-        struct TData {};
-
-        /* 80289A80 */ void getData(JStudio::stb::data::TParse_TParagraph_data::TData*) const;
-    };
-};
-
-};  // namespace stb
-
-};  // namespace JStudio
-
 struct JASKernel {
     /* 80290B08 */ void getAramHeap();
 };
diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp
index 15794476f6..4d8d7c3ad4 100644
--- a/src/d/d_demo.cpp
+++ b/src/d/d_demo.cpp
@@ -4,6 +4,9 @@
 //
 
 #include "d/d_demo.h"
+#include "JSystem/JGadget/binary.h"
+#include "JSystem/JStudio/JStudio/fvb.h"
+#include "JSystem/JStudio/JStudio/stb.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
@@ -293,13 +296,6 @@ struct TControl {
 
 };  // namespace ctb
 
-namespace fvb {
-struct TControl {
-    /* 802847D0 */ void destroyObject_all();
-};
-
-};  // namespace fvb
-
 struct TCreateObject {
     /* 80285488 */ ~TCreateObject();
 };
@@ -332,25 +328,6 @@ struct TAdaptor_message {
     /* 802875E0 */ ~TAdaptor_message();
 };
 
-namespace stb {
-struct data {
-    struct TParse_TBlock_object {};
-
-    struct TParse_TParagraph_data {
-        struct TData {};
-
-        /* 80289A80 */ void getData(JStudio::stb::data::TParse_TParagraph_data::TData*) const;
-    };
-};
-
-struct TControl {
-    /* 80289300 */ void destroyObject_all();
-    /* 80289404 */ void reset();
-    /* 802894B4 */ void forward(u32);
-};
-
-};  // namespace stb
-
 struct TObject_message {
     /* 80287640 */ TObject_message(JStudio::stb::data::TParse_TBlock_object const&,
                                    JStudio::TAdaptor_message*);
@@ -377,15 +354,6 @@ struct JMessage {
     };
 };
 
-namespace JGadget {
-struct binary {
-    struct TParse_header_block {
-        /* 802DC910 */ void parse_next(void const**, u32);
-    };
-};
-
-};  // namespace JGadget
-
 //
 // Forward References:
 //
diff --git a/src/d/msg/d_msg_object.cpp b/src/d/msg/d_msg_object.cpp
index 3b5360e5bb..b5f7e8dc75 100644
--- a/src/d/msg/d_msg_object.cpp
+++ b/src/d/msg/d_msg_object.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/msg/d_msg_object.h"
+#include "JSystem/JGadget/binary.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
@@ -388,21 +389,6 @@ struct JMessage {
     };
 };
 
-namespace JGadget {
-struct binary {
-    struct TParse_header_block {
-        /* 802DC910 */ void parse_next(void const**, u32);
-    };
-};
-
-struct TNodeLinkList {
-    struct iterator {};
-
-    /* 802DCA58 */ void erase(JGadget::TNodeLinkList::iterator);
-};
-
-};  // namespace JGadget
-
 //
 // Forward References:
 //
diff --git a/src/d/msg/d_msg_string_base.cpp b/src/d/msg/d_msg_string_base.cpp
index c9e639a9f5..76fc19a2fd 100644
--- a/src/d/msg/d_msg_string_base.cpp
+++ b/src/d/msg/d_msg_string_base.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/msg/d_msg_string_base.h"
+#include "JSystem/JGadget/binary.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
@@ -79,21 +80,6 @@ struct JKRArchive {
     /* 802D5B38 */ void getGlbResource(u32, char const*, JKRArchive*);
 };
 
-namespace JGadget {
-struct binary {
-    struct TParse_header_block {
-        /* 802DC910 */ void parse_next(void const**, u32);
-    };
-};
-
-struct TNodeLinkList {
-    struct iterator {};
-
-    /* 802DCA58 */ void erase(JGadget::TNodeLinkList::iterator);
-};
-
-};  // namespace JGadget
-
 //
 // Forward References:
 //