d_demo work

include/JSystem/JMessage/control.h

@@ -32,7 +32,7 @@ struct TControl {
         return mResource != NULL && mResource->getGroupID() == groupID;
     }
 
-    const char* getMessageData_cached_messageEntry_(u16 messageIndex, const void* messageEntry) const {}
+    const char* getMessageData_cached_messageEntry_(u16 messageIndex, const void* messageEntry) const { /* TODO */ return NULL; }
 
     bool isReady_update_() const { return mMessageEntry != NULL && mMessageDataStart != 0 && mBaseProcSeq != NULL; }
     bool isReady_render_() const { return mMessageEntry != NULL && mMessageDataCurrent != NULL && mBaseProcRender != NULL; }

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

@@ -37,10 +37,16 @@ public:
 
     TControl();
     virtual ~TControl();
-    void setFactory(JStudio::TFactory*);
     void transformOnSet_setOrigin(const Vec&, f32);
     void transformOnGet_setOrigin(const Vec&, f32);
 
+    void setFactory(JStudio::TFactory* factory) {
+        stb::TFactory* stb_factory = factory;
+        fvb::TFactory* fvb_factory = factory == NULL ? NULL : &factory->fvb_Factory;
+        stb::TControl::setFactory(stb_factory);
+        fvb_Control.setFactory(fvb_factory);
+    }
+
     void stb_destroyObject_all() { stb::TControl::destroyObject_all(); }
     void fvb_destroyObject_all() { fvb_Control.destroyObject_all(); }
 
@@ -55,13 +61,13 @@ public:
     void transformOnGet_enable(bool param_0) { mTransformOnGet = param_0; }
 
     void transform_enable(bool param_0) {
-        transformOnSet_enable(param_0);
         transformOnGet_enable(param_0);
+        transformOnSet_enable(param_0);
     }
 
     void transform_setOrigin(const Vec& xyz, f32 rotY) {
-        transformOnSet_setOrigin(xyz, rotY);
         transformOnGet_setOrigin(xyz, rotY);
+        transformOnSet_setOrigin(xyz, rotY);
     }
 
     f32 transformOnSet_getRotationY() const { return mTransformOnSet_RotationY; }

include/JSystem/JStudio/JStudio_JAudio/control.h

@@ -69,17 +69,15 @@ struct TAdaptor_sound : public JStudio::TAdaptor_sound {
 };  // Size: 0x104
 
 struct TCreateObject : public JStudio::TCreateObject {
-    TCreateObject(JAIBasic* jai, const JStage::TSystem* system)
+    TCreateObject(JAIBasic* jai)
     {
         mSound  = jai;
-        mSystem = system;
     }
     virtual ~TCreateObject();                                                                                // _08
     virtual bool create(JStudio::TObject** newObject, const JStudio::stb::data::TParse_TBlock_object& data); // _0C
 
     /* 0x00 */ /* JStudio::TCreateObject */
     /* 0x0C */ JAIBasic* mSound;
-    /* 0x10 */ const JStage::TSystem* mSystem;
 };
 } // namespace JStudio_JAudio
 

include/JSystem/JStudio/JStudio_JParticle/control.h

@@ -8,17 +8,15 @@
 namespace JStudio_JParticle {
 struct TCreateObject : public JStudio::TCreateObject {
     TCreateObject(JPAEmitterManager* p_emitMgr, const JStage::TSystem* p_system) {
-        pJPAEmitterManager_ = p_emitMgr;
-        pJSGSystem_ = p_system;
-        mPermit_onExit_notEnd = false;
+        mEmitterMgr = p_emitMgr;
+        mSystem = p_system;
     }
 
     virtual ~TCreateObject();
     virtual bool create(JStudio::TObject**, JStudio::stb::data::TParse_TBlock_object const&);
 
-    /* 0x0C */ JPAEmitterManager* pJPAEmitterManager_;
-    /* 0x10 */ const JStage::TSystem* pJSGSystem_;
-    /* 0x14 */ bool mPermit_onExit_notEnd;
+    /* 0x0C */ JPAEmitterManager* mEmitterMgr;
+    /* 0x10 */ const JStage::TSystem* mSystem;
 };
 
 struct TAdaptor_particle : public JStudio::TAdaptor_particle {

include/d/d_demo.h

@@ -15,22 +15,21 @@
 #include "JSystem/J3DGraphAnimator/J3DModelData.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTNameTab.h"
+#include "JSystem/JStudio/JStudio/jstudio-control.h"
+#include "JSystem/JStudio/JStudio_JAudio/control.h"
+#include "JSystem/JStudio/JStudio_JMessage/control.h"
+#include "JSystem/JStudio/JStudio_JParticle/control.h"
+#include "JSystem/JStudio/JStudio_JStage/control.h"
 #include "m_Do/m_Do_mtx.h"
 
-class dDemo_system_c;
-namespace JStudio {
-    class TControl {
-    public:
-        TControl();
-        /* 0x00 */ u32 field_0x00[10];
-    };
-}
-class dMesg_tControl {
+class fopAc_ac_c;
+
+class dMesg_tControl : public JMessage::TControl {
 public:
     dMesg_tControl();
-    /* 0x00 */ u32 field_0x00[29];
-};
-class fopAc_ac_c;
+
+    /* 0x3C */ u8 field_0x3C[0x74 - 0x3C];
+};  // Size: 0x74
 
 class dDemo_actor_c : public JStage::TActor {
 public:
@@ -243,9 +242,9 @@ public:
     dDemo_manager_c();
     ~dDemo_manager_c();
 
-    void create(u8 const*, cXyz*, f32);
+    bool create(const u8*, cXyz*, f32);
     void remove();
-    void update();
+    bool update();
 
     int getFrame() { return mFrame; }
     u32 getFrameNoMsg() { return mFrameNoMsg; }
@@ -253,12 +252,12 @@ public:
 
     /* 0x00 */ dDemo_system_c* mSystem;
     /* 0x04 */ JStudio::TControl* mControl;
-    /* 0x08 */ void* mStage;
-    /* 0x0C */ void* mAudio;
-    /* 0x10 */ void* mParticle;
-    /* 0x14 */ void* mFactory;
+    /* 0x08 */ JStudio_JStage::TCreateObject* mStage;
+    /* 0x0C */ JStudio_JAudio::TCreateObject* mAudio;
+    /* 0x10 */ JStudio_JParticle::TCreateObject* mParticle;
+    /* 0x14 */ JStudio::TFactory* mFactory;
     /* 0x18 */ dMesg_tControl* mMesgControl;
-    /* 0x1C */ void* mMessage;
+    /* 0x1C */ JStudio_JMessage::TCreateObject* mMessage;
     /* 0x20 */ dDemo_object_c mDemoObj;
     /* 0xD0 */ char* mCurFile;
     /* 0xD4 */ int mFrame;

include/d/d_particle.h

@@ -475,7 +475,9 @@ public:
     static void offStatus(u8 status) { mStatus &= ~status; }
     static u8 mStatus;
 
+    static JPAEmitterManager* getEmitterManager() { return mEmitterMng; }
     static JPAEmitterManager* mEmitterMng;
+
     static dPa_stripesEcallBack mStripes;
     static dPa_kageroEcallBack mKagero;
     static dPa_smokeEcallBack mSmokeEcallback;