JStudio/JMessage work and cleanup

include/JSystem/JStudio/JStudio/functionvalue.h

@@ -11,6 +11,7 @@ typedef f64 (*ExtrapolateParameter)(f64, f64);
 
 class TFunctionValue;
 class TFunctionValueAttributeSet;
+class TFunctionValueAttributeSet;
 
 class TFunctionValueAttribute_refer;
 class TFunctionValueAttribute_range;
@@ -188,8 +189,9 @@ public:
     };
     typedef f64 (*UnkFunc)(f64, const TFunctionValueAttribute_refer*,
                            const TFunctionValue_composite::TData*);
-    typedef f64 (*CompositeFunc)(const JGadget::TVector_pointer<TFunctionValue>&,
+    typedef f64 (*CompositeFunc)(const JGadget::TVector_pointer<TFunctionValue*>&,
                                  const TFunctionValue_composite::TData&, f64);
+    typedef TFunctionValue_composite::TData (*GetCompositeFunc)(const void*);
 
     TFunctionValue_composite();
     virtual ~TFunctionValue_composite() {}

include/JSystem/JStudio/JStudio/fvb-data-parse.h

@@ -28,18 +28,17 @@ public:
         return ret;
     }
     const void* getContent() const {
-        u32 size = align_roundUp(get_IDSize(), 4);
-        return (const void*)((int)getBlockEnd_() + size);
+        return (const void*)((const u8*)getBlockEnd_() + align_roundUp(get_IDSize(), 4));
     }
 };
 
 class TParse_TParagraph : public TParseData_aligned<4> {
 public:
     struct TData {
-        /* 0x04 */ u32 u32Size;
-        /* 0x08 */ u32 u32Type;
-        /* 0x0C */ const void* pContent;
-        /* 0x10 */ const void* next;
+        /* 0x00 */ u32 u32Size;
+        /* 0x04 */ u32 u32Type;
+        /* 0x08 */ const void* pContent;
+        /* 0x0C */ const void* next;
     };
     TParse_TParagraph(const void* content) : TParseData_aligned<4>(content) {}
 

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

@@ -14,7 +14,7 @@ extern const char ga4cSignature[4];
 
 const int PARAGRAPH_DATA = 1;
 
-typedef enum TEComposite {
+enum TEComposite {
     /* 0x0 */ COMPOSITE_NONE,
     /* 0x1 */ COMPOSITE_RAW,
     /* 0x2 */ COMPOSITE_IDX,
@@ -26,7 +26,10 @@ typedef enum TEComposite {
     /* 0x8 */ COMPOSITE_ENUM_SIZE,
 };
 
-typedef const void* (*CompositeOperation)(TFunctionValue_composite::TData);
+struct CompositeOperation {
+    TFunctionValue_composite::CompositeFunc mSetFunc;
+    TFunctionValue_composite::GetCompositeFunc mGetFunc;
+};
 
 struct TBlock {
     /* 0x0 */ u32 size;

include/JSystem/JStudio/JStudio/fvb.h

@@ -72,7 +72,7 @@ public:
 
 private:
     /* 0x4 */ TFactory* pFactory;
-    /* 0x8 */ JGadget::TLinkList<TObject, 12> ocObject_;
+    /* 0x8 */ JGadget::TLinkList<TObject, -12> ocObject_;
 };  // Size: 0x14
 
 class TObject_composite : public TObject {