diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2023-10-29 12:56:44 -0700 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2023-10-29 12:56:44 -0700 |
| commit | a58edb2a24fe5db0066497095ca73e5ebca620ff (patch) | |
| tree | 6c8b2ef8f877ec03b18b5d9aa092975f43b93cf3 /include/JSystem/JKernel | |
| parent | 5ecfe0da7173d4c096203f1bb40f0daddbce5b80 (diff) | |
JKRAramArchive work
Diffstat (limited to 'include/JSystem/JKernel')
| -rw-r--r-- | include/JSystem/JKernel/JKRArchive.h | 6 | ||||
| -rw-r--r-- | include/JSystem/JKernel/JKRDvdArchive.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/JSystem/JKernel/JKRArchive.h b/include/JSystem/JKernel/JKRArchive.h index 46ebcd0c..dcad5d76 100644 --- a/include/JSystem/JKernel/JKRArchive.h +++ b/include/JSystem/JKernel/JKRArchive.h @@ -193,12 +193,12 @@ public: static JKRCompression convertAttrToCompressionType(u32 attr) { #define JKRARCHIVE_ATTR_COMPRESSION 0x04 -#define JKRARCHIVE_ATTR_YAY0 0x80 +#define JKRARCHIVE_ATTR_YAZ0 0x80 JKRCompression compression; - if (FLAG_ON(attr, JKRARCHIVE_ATTR_COMPRESSION)) { + if (!(attr & JKRARCHIVE_ATTR_COMPRESSION)) { compression = COMPRESSION_NONE; - } else if (!FLAG_ON(attr, JKRARCHIVE_ATTR_YAY0)) { + } else if (attr & JKRARCHIVE_ATTR_YAZ0) { compression = COMPRESSION_YAZ0; } else { compression = COMPRESSION_YAY0; diff --git a/include/JSystem/JKernel/JKRDvdArchive.h b/include/JSystem/JKernel/JKRDvdArchive.h index fe72cd8f..83333ad9 100644 --- a/include/JSystem/JKernel/JKRDvdArchive.h +++ b/include/JSystem/JKernel/JKRDvdArchive.h @@ -23,7 +23,7 @@ public: private: /* 0x00 */ // vtable /* 0x04 */ // JKRArchive - /* 0x64 */ s32 field_0x64; + /* 0x64 */ s32 mDataOffset; /* 0x68 */ JKRDvdFile* mDvdFile; }; |