d_resorce debug (#3105)

4 files changed, 17 insertions, 11 deletions

diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h
index 91cd452131..25f48c5fd6 100644
--- a/include/d/d_com_inf_game.h
+++ b/include/d/d_com_inf_game.h
@@ -4285,7 +4285,8 @@ inline int dComIfG_setObjectRes(const char* i_arcName, u8 i_mountDirection, JKRH
     return g_dComIfG_gameInfo.mResControl.setObjectRes(i_arcName, i_mountDirection, i_heap);
 }
 
-inline int dComIfG_setObjectRes(const char* i_arcName, void* i_archiveRes, u32 i_bufferSize) {
+inline int dComIfG_setObjectRes(const char* i_arcName, void* i_archiveRes, u32 i_bufferSize, JKRHeap* i_heap) {
+    UNUSED(i_heap);
     return g_dComIfG_gameInfo.mResControl.setObjectRes(i_arcName, i_archiveRes, i_bufferSize, NULL);
 }
 
diff --git a/include/d/d_particle.h b/include/d/d_particle.h
index 893ac49ca0..fc52a637ea 100644
--- a/include/d/d_particle.h
+++ b/include/d/d_particle.h
@@ -425,6 +425,7 @@ public:
     JKRSolidHeap* getHeap() { return mHeap; }
     JKRExpHeap* getResHeap() { return m_resHeap; }
     JKRSolidHeap* getSceneHeap() { return mSceneHeap; }
+    void* getSceneRes() { return m_sceneRes; }
 
     void levelAllForceOnEventMove() { field_0x210.allForceOnEventMove(); }
 
diff --git a/include/d/d_resorce.h b/include/d/d_resorce.h
index 8666f369cd..000146822b 100644
--- a/include/d/d_resorce.h
+++ b/include/d/d_resorce.h
@@ -25,6 +25,8 @@ public:
     static J3DModelData* loaderBasicBmd(u32 i_tag, void* i_data);
     static void dump_long(dRes_info_c* i_resInfo, int i_infoNum);
     static void dump(dRes_info_c* i_resInfo, int i_infoNum);
+    static void dumpTag(dRes_info_c*, int, int, int);
+    static void dump(char*, dRes_info_c*, int);
 
     void* getRes(s32 i_index) {
         JUT_ASSERT(25, i_index >= 0 && i_index < getResNum());
@@ -37,10 +39,12 @@ public:
     char* getArchiveName() { return mArchiveName; }
     mDoDvdThd_mountArchive_c* getDMCommand() { return mDMCommand; }
     JKRArchive* getArchive() { return mArchive; }
-    void incCount() { mCount++; }
-    u16 decCount() {
-        return --mCount;
-    }
+    u32 incCount() { return ++mCount; }
+    u32 decCount() { return --mCount; }
+
+#if DEBUG
+    int getSize() { return mSize; }
+#endif
 
 #ifdef __MWERKS__
     static const int NAME_MAX = 9;
@@ -55,7 +59,7 @@ private:
     /* 0x1C */ JKRSolidHeap* mDataHeap;
     /* 0x20 */ void** mRes;
 #if DEBUG
-    /* 0x24 */ void* unk_0x24;
+    /* 0x24 */ int mSize;
 #endif
 };  // Size: 0x24
 
@@ -66,9 +70,13 @@ public:
     dRes_control_c() {}
     ~dRes_control_c();
 
+    int getSize(const char*, dRes_info_c*, int);
+    int getStageAllSize();
+    int getObjectAllSize();
     int setObjectRes(char const* i_arcName, void* i_archiveRes, u32 i_bufferSize, JKRHeap* i_heap);
     int setStageRes(char const* i_arcName, JKRHeap* i_heap);
     void dump();
+    void dumpTag();
     void dump(char*);
     int getObjectResName2Index(char const* i_arcName, char const* i_resName);
 
@@ -129,10 +137,6 @@ public:
     dRes_info_c* getStageResInfo(const char* i_arcName) {
         return getResInfo(i_arcName, mStageInfo, ARRAY_SIZEU(mStageInfo));
     }
-    
-    void dumpTag() {
-        // TODO
-    }
 
     /* 0x0000 */ dRes_info_c mObjectInfo[128];
     /* 0x1200 */ dRes_info_c mStageInfo[64];
diff --git a/include/d/dolzel_base.pch b/include/d/dolzel_base.pch
index 87dcd80f6b..6da4ed7986 100644
--- a/include/d/dolzel_base.pch
+++ b/include/d/dolzel_base.pch
@@ -18,10 +18,10 @@
 #include "JSystem/JKernel/JKRDisposer.h" // IWYU pragma: export
 #include "JSystem/JGadget/linklist.h" // IWYU pragma: export
 #include "JSystem/J3DGraphBase/J3DPacket.h" // IWYU pragma: export
-#include "JSystem/J3DGraphAnimator/J3DShapeTable.h" // IWYU pragma: export
 #include "JSystem/J3DGraphAnimator/J3DAnimation.h" // IWYU pragma: export
 #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" // IWYU pragma: export
 #include "JSystem/J3DGraphAnimator/J3DMaterialAttach.h" // IWYU pragma: export
+#include "JSystem/J3DGraphAnimator/J3DShapeTable.h" // IWYU pragma: export
 #include "JSystem/J3DGraphAnimator/J3DJoint.h" // IWYU pragma: export
 #include "JSystem/JUtility/JUTGamePad.h" // IWYU pragma: export
 #include "JSystem/J3DGraphBase/J3DSys.h" // IWYU pragma: export