J3DPacket fix

configure.py

@@ -851,7 +851,7 @@ config.libs = [
             Object(Matching,    "JSystem/J3DGraphBase/J3DSys.cpp"),
             Object(Matching,    "JSystem/J3DGraphBase/J3DVertex.cpp"),
             Object(NonMatching, "JSystem/J3DGraphBase/J3DTransform.cpp"),
-            Object(NonMatching, "JSystem/J3DGraphBase/J3DPacket.cpp"),
+            Object(Matching,    "JSystem/J3DGraphBase/J3DPacket.cpp"),
             Object(NonMatching, "JSystem/J3DGraphBase/J3DShapeMtx.cpp"),
             Object(Matching,    "JSystem/J3DGraphBase/J3DShape.cpp"),
             Object(NonMatching, "JSystem/J3DGraphBase/J3DMaterial.cpp"),

include/JSystem/J3DGraphBase/J3DPacket.h

@@ -154,16 +154,6 @@ public:
     /* 0x20 */ J3DDisplayListObj* mpDisplayListObj;
 };  // Size: 0x28
 
-class J3DCallBackPacket : public J3DPacket {
-public:
-    ~J3DCallBackPacket();
-    virtual void draw();
-
-public:
-    typedef void (*CallBack)(J3DCallBackPacket * pPacket, u32 timing);
-    CallBack mpCallBack;
-};
-
 class J3DShapePacket : public J3DDrawPacket {
 public:
     J3DShapePacket();
@@ -202,7 +192,6 @@ public:
     void addShapePacket(J3DShapePacket*);
     void beginDiff();
     void endDiff();
-    bool isSame(J3DMatPacket*) const;
 
     J3DMaterial* getMaterial() const { return mpMaterial; }
     J3DShapePacket* getShapePacket() const { return mpShapePacket; }
@@ -217,6 +206,7 @@ public:
     virtual ~J3DMatPacket();
     virtual int entry(J3DDrawBuffer*);
     virtual void draw();
+    virtual bool isSame(J3DMatPacket*) const;
 
 public:
     /* 0x28 */ J3DShapePacket* mpInitShapePacket;
@@ -227,4 +217,14 @@ public:
     /* 0x3C */ J3DMaterialAnm* mpMaterialAnm;
 };  // Size: 0x40
 
+class J3DCallBackPacket : public J3DPacket {
+public:
+    virtual ~J3DCallBackPacket() {}
+    virtual void draw();
+
+public:
+    typedef void (*CallBack)(J3DCallBackPacket * pPacket, u32 timing);
+    CallBack mpCallBack;
+};
+
 #endif /* J3DPACKET_H */

src/JSystem/J3DGraphBase/J3DPacket.cpp

@@ -379,8 +379,3 @@ bool J3DMatPacket::isSame(J3DMatPacket* pOther) const {
 /* 802DB978-802DB97C       .text draw__9J3DPacketFv */
 void J3DPacket::draw() {
 }
-
-/* 802DB97C-802DB9D8       .text __dt__17J3DCallBackPacketFv */
-J3DCallBackPacket::~J3DCallBackPacket() {
-    /* Nonmatching */
-}