Add Progress.md (#187)

* Match DynamicLink

* finish merge

* Add Progress.md and update readme

5 files changed, 17 insertions, 17 deletions

diff --git a/include/DynamicLink.h b/include/DynamicLink.h
index 053bf375b6..a8905be76d 100644
--- a/include/DynamicLink.h
+++ b/include/DynamicLink.h
@@ -14,7 +14,7 @@ struct DynamicModuleControlBase {
 
     /* 0x0C */ /*vtable*/
     /* 802621CC */ virtual ~DynamicModuleControlBase();
-    /* 800188DC */ virtual const char* getModuleName() const;
+    /* 800188DC */ virtual const char* getModuleName() const {return NULL;};
     /* 80263210 */ virtual int getModuleSize() const;
     /* 80263200 */ virtual const char* getModuleTypeString() const;
     /* 80262470 */ virtual void dump();
@@ -43,6 +43,7 @@ struct DynamicModuleControl : DynamicModuleControlBase {
     /* 80263218 */ virtual const char* getModuleName() const;
     /* 80263000 */ virtual int getModuleSize() const;
     /* 80263070 */ virtual const char* getModuleTypeString() const;
+    //virtual void dump();
     /* 80262C0C */ virtual void dump2();
     /* 802627E8 */ virtual bool do_load();
     /* 80262AFC */ virtual BOOL do_load_async();
diff --git a/include/JSystem/JKernel/JKRArchive.h b/include/JSystem/JKernel/JKRArchive.h
index 31991837d2..edd694ea7e 100644
--- a/include/JSystem/JKernel/JKRArchive.h
+++ b/include/JSystem/JKernel/JKRArchive.h
@@ -218,11 +218,11 @@ inline JKRCompression JKRConvertAttrToCompressionType(u32 attr) {
     return JKRArchive::convertAttrToCompressionType(attr);
 }
 
-inline void* JKRGetTypeResource(u32 tag, const char* name, JKRArchive* arc) {
-    return JKRArchive::getGlbResource(tag, name, arc);
+inline void* JKRGetResource(u32 node, const char* path, JKRArchive* archive) {
+    return JKRArchive::getGlbResource(node,path,archive);
 }
 
-inline void* JKRGetResource(u32 tag, const char* name, JKRArchive* arc) {
+inline void* JKRGetTypeResource(u32 tag, const char* name, JKRArchive* arc) {
     return JKRArchive::getGlbResource(tag, name, arc);
 }
 
diff --git a/include/JSystem/JKernel/JKRDvdRipper.h b/include/JSystem/JKernel/JKRDvdRipper.h
index 8248d167a2..d0c9a7030a 100644
--- a/include/JSystem/JKernel/JKRDvdRipper.h
+++ b/include/JSystem/JKernel/JKRDvdRipper.h
@@ -43,11 +43,10 @@ inline void* JKRDvdToMainRam(s32 entryNum, u8* dst, JKRExpandSwitch expandSwitch
                                        offset, compression, returnSize);
 }
 
-inline void* JKRDvdToMainRam(char const* param_0, u8* dst, JKRExpandSwitch expandSwitch,
-                             u32 dstLength, JKRHeap* heap,
-                             JKRDvdRipper::EAllocDirection allocDirection, u32 offset,
-                             JKRCompression* compression, u32* returnSize) {
-    return JKRDvdRipper::loadToMainRAM(param_0, dst, expandSwitch, dstLength, heap, allocDirection,
+inline void* JKRDvdToMainRam(const char* name, u8* dst, JKRExpandSwitch expandSwitch, u32 dstLength,
+                             JKRHeap* heap, JKRDvdRipper::EAllocDirection allocDirection,
+                             u32 offset, JKRCompression* compression, u32* returnSize) {
+    return JKRDvdRipper::loadToMainRAM(name, dst, expandSwitch, dstLength, heap, allocDirection,
                                        offset, compression, returnSize);
 }
 
diff --git a/include/JSystem/JKernel/JKRFileLoader.h b/include/JSystem/JKernel/JKRFileLoader.h
index 501fdda7d9..42752bc241 100644
--- a/include/JSystem/JKernel/JKRFileLoader.h
+++ b/include/JSystem/JKernel/JKRFileLoader.h
@@ -54,6 +54,10 @@ public:
     static JSUList<JKRFileLoader> sVolumeList;
 };
 
+inline bool JKRDetachResource(void* resource, JKRFileLoader* fileLoader) {
+    return JKRFileLoader::detachResource(resource,fileLoader);
+}
+
 inline void* JKRGetNameResource(const char* name, JKRFileLoader* loader) {
     return JKRFileLoader::getGlbResource(name, loader);
 }
@@ -62,8 +66,4 @@ inline void* JKRGetResource(const char* name) {
     return JKRFileLoader::getGlbResource(name);
 }
 
-inline bool JKRDetachResource(void* resource, JKRFileLoader* loader) {
-    return JKRFileLoader::detachResource(resource, loader);
-}
-
 #endif /* JKRFILELOADER_H */
diff --git a/include/dolphin/os/OSLink.h b/include/dolphin/os/OSLink.h
index 24940ada3a..5244e16c10 100644
--- a/include/dolphin/os/OSLink.h
+++ b/include/dolphin/os/OSLink.h
@@ -10,8 +10,8 @@ struct OSSectionInfo {
 
 struct OSModuleInfo {
     u32 mId;
-    OSModuleInfo* mNext;
-    OSModuleInfo* mPrev;
+    u32 mNext;
+    u32 mPrev;
     u32 mNumSections;
     struct {  // Needed to get an assert correct; very likely bigger
         u32 sectionInfoOffset;
@@ -27,8 +27,8 @@ struct OSModuleInfo {
     u8 mEpilogSection;
     u8 mUnresolvedSection;
     u8 mBssSection;
-    u32 (*prolog)();
-    void (*epilog)();
+    u32 prolog;
+    u32 epilog;
     u32 mUnresolvedFuncOffset;
     u32 mModuleAlignment;
     u32 mBssAlignment;