m_Do / d_a_npc work

9 files changed, 37 insertions, 6 deletions

diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h
index f3c349f72a..db9a5184a6 100644
--- a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h
+++ b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h
@@ -114,6 +114,8 @@ private:
 
 class J3DMaterialAnm {
 public:
+    J3DMaterialAnm() { initialize(); }
+
     /* 8032C320 */ void initialize();
     /* 8032C5A4 */ void setMatColorAnm(int, J3DMatColorAnm*);
     /* 8032C5E4 */ void setTexMtxAnm(int, J3DTexMtxAnm*);
diff --git a/include/JSystem/J3DGraphBase/J3DPacket.h b/include/JSystem/J3DGraphBase/J3DPacket.h
index 14ed0fb5f4..6552c461af 100644
--- a/include/JSystem/J3DGraphBase/J3DPacket.h
+++ b/include/JSystem/J3DGraphBase/J3DPacket.h
@@ -64,6 +64,8 @@ public:
         mpFirstChild = NULL;
     }
 
+    void setUserArea(u32 area) { mpUserData = (void*)area; }
+
     virtual bool entry(J3DDrawBuffer*);
     virtual void draw();
     virtual ~J3DPacket() {}
diff --git a/include/JSystem/JAudio2/JASDvdThread.h b/include/JSystem/JAudio2/JASDvdThread.h
index 5496d6ec04..779461a72f 100644
--- a/include/JSystem/JAudio2/JASDvdThread.h
+++ b/include/JSystem/JAudio2/JASDvdThread.h
@@ -2,5 +2,14 @@
 #define JASDVDTHREAD_H
 
 #include "dolphin/types.h"
+#include "JSystem/JAudio2/JASTaskThread.h"
+
+class JASDvd {
+public:
+    /* 8028FEFC */ static JASTaskThread* getThreadPointer();
+    /* 8028FF04 */ void createThread(s32, int, u32);
+
+    static JASTaskThread* sThread;
+};
 
 #endif /* JASDVDTHREAD_H */
diff --git a/include/JSystem/JAudio2/JASTaskThread.h b/include/JSystem/JAudio2/JASTaskThread.h
index b8cecabc6a..82f9a9f2ac 100644
--- a/include/JSystem/JAudio2/JASTaskThread.h
+++ b/include/JSystem/JAudio2/JASTaskThread.h
@@ -2,5 +2,22 @@
 #define JASTASKTHREAD_H
 
 #include "dolphin/types.h"
+#include "JSystem/JKernel/JKRThread.h"
+
+class JASTaskThread : public JKRThread {
+public:
+    /* 8028F6C4 */ JASTaskThread(int, int, u32);
+    /* 8028F9EC */ void allocCallStack(void (*)(void*), void*);
+    /* 8028F850 */ void allocCallStack(void (*)(void*), void const*, u32);
+    /* 8028FC54 */ void sendCmdMsg(void (*)(void*), void*);
+    /* 8028FB5C */ void sendCmdMsg(void (*)(void*), void const*, u32);
+    /* 8028FE88 */ void pause(bool);
+
+    /* 8028F724 */ virtual ~JASTaskThread();
+    /* 8028FD4C */ virtual void run();
+
+    /* 0x7C */ OSThreadQueue* mpThreadQueue;
+    /* 0x84 */ bool field_0x84;
+};
 
 #endif /* JASTASKTHREAD_H */
diff --git a/include/JSystem/JKernel/JKRAssertHeap.h b/include/JSystem/JKernel/JKRAssertHeap.h
index e285ea9f99..58c4345d5c 100644
--- a/include/JSystem/JKernel/JKRAssertHeap.h
+++ b/include/JSystem/JKernel/JKRAssertHeap.h
@@ -25,7 +25,7 @@ public:
     /* vt[16] */ virtual s32 do_getFreeSize(void);        /* override */
     /* vt[17] */ virtual void* do_getMaxFreeBlock(void);  /* override */
     /* vt[18] */ virtual s32 do_getTotalFreeSize(void);   /* override */
-    /* vt[19] */ virtual u8 do_changeGroupID(u8 param_1); /* override */
+    /* vt[19] */ virtual s32 do_changeGroupID(u8 param_1); /* override */
     /* vt[20] */ virtual u8 do_getCurrentGroupId(void);   /* override */
 
 public:
diff --git a/include/JSystem/JKernel/JKRExpHeap.h b/include/JSystem/JKernel/JKRExpHeap.h
index d2e93baa53..257e0bfc4b 100644
--- a/include/JSystem/JKernel/JKRExpHeap.h
+++ b/include/JSystem/JKernel/JKRExpHeap.h
@@ -73,7 +73,7 @@ public:
     /* vt[16] */ virtual s32 do_getFreeSize();                             /* override */
     /* vt[17] */ virtual void* do_getMaxFreeBlock();                       /* override */
     /* vt[18] */ virtual s32 do_getTotalFreeSize();                        /* override */
-    /* vt[19] */ virtual u8 do_changeGroupID(u8 newGroupID);               /* override */
+    /* vt[19] */ virtual s32 do_changeGroupID(u8 newGroupID);               /* override */
     /* vt[20] */ virtual u8 do_getCurrentGroupId();                        /* override */
     /* vt[21] */ virtual void state_register(JKRHeap::TState*, u32) const; /* override */
     /* vt[22] */ virtual bool state_compare(JKRHeap::TState const&,
diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h
index f2194cb7a8..d0f0fc9c0d 100644
--- a/include/JSystem/JKernel/JKRHeap.h
+++ b/include/JSystem/JKernel/JKRHeap.h
@@ -43,7 +43,7 @@ public:
     s32 getFreeSize();
     void* getMaxFreeBlock();
     s32 getTotalFreeSize();
-    u8 changeGroupID(u8 newGroupId);
+    s32 changeGroupID(u8 newGroupId);
     u32 getMaxAllocatableSize(int alignment);
 
     JKRHeap* find(void* ptr) const;
@@ -73,7 +73,7 @@ public:
     /* vt[16] */ virtual s32 do_getFreeSize() = 0;
     /* vt[17] */ virtual void* do_getMaxFreeBlock() = 0;
     /* vt[18] */ virtual s32 do_getTotalFreeSize() = 0;
-    /* vt[19] */ virtual u8 do_changeGroupID(u8 newGroupID);
+    /* vt[19] */ virtual s32 do_changeGroupID(u8 newGroupID);
     /* vt[20] */ virtual u8 do_getCurrentGroupId();
     /* vt[21] */ virtual void state_register(JKRHeap::TState*, unsigned long) const;
     /* vt[22] */ virtual bool state_compare(JKRHeap::TState const&, JKRHeap::TState const&) const;
diff --git a/include/JSystem/JParticle/JPAParticle.h b/include/JSystem/JParticle/JPAParticle.h
index ae0a07b8b2..2c50176b8a 100644
--- a/include/JSystem/JParticle/JPAParticle.h
+++ b/include/JSystem/JParticle/JPAParticle.h
@@ -287,6 +287,7 @@ public:
 
 class JPAParticleCallBack {
 public:
+    JPAParticleCallBack() {}
     virtual ~JPAParticleCallBack();
     virtual void execute(JPABaseEmitter*, JPABaseParticle*);
     virtual void draw(JPABaseEmitter*, JPABaseParticle*);
diff --git a/include/JSystem/JUtility/JUTReport.h b/include/JSystem/JUtility/JUTReport.h
index 9fd63ad99b..f38f31706a 100644
--- a/include/JSystem/JUtility/JUTReport.h
+++ b/include/JSystem/JUtility/JUTReport.h
@@ -1,7 +1,7 @@
 #ifndef JSYSTEM_JUTILITY_JUTREPORT_H
 #define JSYSTEM_JUTILITY_JUTREPORT_H
 
-void JUTReport(int, int, const char*, ...);
-void JUTReport(int, int, int, const char*, ...);
+void JUTReport(int x_pos, int y_pos, const char* str, ...);
+void JUTReport(int x_pos, int y_pos, int, const char* str, ...);
 
 #endif
\ No newline at end of file