some small FileHolder changes and a ltitle MemoryUtil decompilation

include/JMap/JMapInfo.h

@@ -1,6 +1,6 @@
-#pragma once
+#ifndef JMAPINFO_H
+#define JMAPINFO_H
 
-#include "bcsv.h"
 #include <revolution.h>
 
 struct JMapData
@@ -56,4 +56,6 @@ public:
 
     const JMapData* mData; // _0
     const char* mName; // _4
-};
+};
+
+#endif // JMAPINFO_H

include/MR/MemoryUtil.h

@@ -18,6 +18,7 @@ namespace MR
 
     void becomeCurrentHeap(JKRHeap *);
     JKRHeap* getCurrentHeap();
+    bool isEqualCurrentHeap(JKRHeap *);
 
     void zeroMemory(void *, u32);
     s32 calcCheckSum(const void *, u32);

include/System/File/FileHolder.h

@@ -25,6 +25,9 @@ public:
 class FileHolder
 {
 public:
+    FileHolder();
+
+    void add(const char *, JKRHeap *, void *);
     bool isExist(const char *) const;
     void* getContext(const char *) const;
 

include/bcsv.h

@@ -1,24 +0,0 @@
-#ifndef BCSV_H
-#define BCSV_H
-
-#include <revolution.h>
-
-struct BCSVEntry
-{
-    u32 mNameHash;
-    u32 mMask;
-    u16 mDataOffs;
-    u8 mShift;
-    u8 mField;
-};
-
-struct BCSVHeader
-{
-    u32 mEntryCount;
-    u32 mFieldCount;
-    u32 mDataOffs;
-    u32 mEntrySize;
-    BCSVEntry** mEntries;
-};
-
-#endif // BCSV_H

source/MR/MemoryUtil.cpp

@@ -15,4 +15,9 @@ namespace MR
         MR::becomeCurrentHeap(mPreviousHeap);
         OSUnlockMutex(&MutexHolder<1>::sMutex);
     }
+
+    JKRHeap* getCurrentHeap()
+    {
+        return JKRHeap::sCurrentHeap;
+    }
 };