fvb Matching (#2820)

* fvb Matching

* J2DScreen debug work

4 files changed, 8 insertions, 7 deletions

diff --git a/include/JSystem/JStudio/JStudio/fvb-data-parse.h b/include/JSystem/JStudio/JStudio/fvb-data-parse.h
index 776d86c321..fbb0c568df 100644
--- a/include/JSystem/JStudio/JStudio/fvb-data-parse.h
+++ b/include/JSystem/JStudio/JStudio/fvb-data-parse.h
@@ -15,8 +15,7 @@ public:
 
     u32 get_size() const { return get()->size; }
     const void* getNext() const {
-        u32 size = get_size();
-        return (const void*)((u8*)getRaw() + size);
+        return (const void*)((u8*)getRaw() + get_size());
     }
     u16 get_type() const { return get()->type; }
     u16 get_IDSize() const { return get()->id_size; }
@@ -28,8 +27,7 @@ public:
         return ret;
     }
     const void* getContent() const {
-        u32 size = align_roundUp(get_IDSize(), 4);
-        return (const void*)((int)getBlockEnd_() + size);
+        return (const void*)((int)getBlockEnd_() + align_roundUp(get_IDSize(), 4));
     }
 };
 
diff --git a/include/JSystem/JStudio/JStudio/fvb-data.h b/include/JSystem/JStudio/JStudio/fvb-data.h
index cacc41cafd..b88f637dbb 100644
--- a/include/JSystem/JStudio/JStudio/fvb-data.h
+++ b/include/JSystem/JStudio/JStudio/fvb-data.h
@@ -26,9 +26,11 @@ typedef enum TEComposite {
     /* 0x8 */ COMPOSITE_ENUM_SIZE,
 };
 
+typedef TFunctionValue_composite::TData (*CompositeDataFunc)(const void*);
+
 struct CompositeOperation {
     TFunctionValue_composite::CompositeFunc composite;
-    TFunctionValue_composite::TData (*getCompositeData)(const void*);
+    CompositeDataFunc getCompositeData;
 };
 
 struct TBlock {
diff --git a/include/JSystem/JStudio/JStudio/fvb.h b/include/JSystem/JStudio/JStudio/fvb.h
index 5ccf0d0f1c..3536aa018e 100644
--- a/include/JSystem/JStudio/JStudio/fvb.h
+++ b/include/JSystem/JStudio/JStudio/fvb.h
@@ -39,9 +39,9 @@ public:
 
     void prepare(const data::TParse_TBlock& block, TControl* control);
 
-    TFunctionValue* const& referFunctionValue() { return pfv_; }
+    TFunctionValue* const referFunctionValue() { return pfv_; }
 
-private:
+protected:
     /* 0x0C */ JGadget::TLinkListNode mNode;
     /* 0x14 */ TFunctionValue* pfv_;
 };
diff --git a/include/JSystem/JStudio/JStudio/object-id.h b/include/JSystem/JStudio/JStudio/object-id.h
index cd05ef494b..5803a872ec 100644
--- a/include/JSystem/JStudio/JStudio/object-id.h
+++ b/include/JSystem/JStudio/JStudio/object-id.h
@@ -22,6 +22,7 @@ protected:
 
 struct TObject_ID : public TIDData {
     TObject_ID(const void* id, u32 id_size) : TIDData(id, id_size) {}
+    ~TObject_ID() {}
     TIDData const& getIDData() const { return *this; }
     const u8 *getID() const { return TIDData::getID(); }
 };