diff options
| author | TakaRikka <takarikka@outlook.com> | 2023-02-26 17:50:56 -0800 |
|---|---|---|
| committer | TakaRikka <takarikka@outlook.com> | 2023-02-26 17:50:56 -0800 |
| commit | 090dcee01206bf7ba6b2231747f0b083521019f1 (patch) | |
| tree | be77feb3762d6f3ff504fde5e10553d03b551fc1 /include/JSystem | |
| parent | c54f0816ea70a88494b0dca045a6ab64f65a62d0 (diff) | |
clean JKernel
Diffstat (limited to 'include/JSystem')
| -rw-r--r-- | include/JSystem/JKernel/JKRCompArchive.h | 8 | ||||
| -rw-r--r-- | include/JSystem/JSupport/JSupport.h | 10 | ||||
| -rw-r--r-- | include/JSystem/JUtility/JUTConsole.h | 1 |
3 files changed, 15 insertions, 4 deletions
diff --git a/include/JSystem/JKernel/JKRCompArchive.h b/include/JSystem/JKernel/JKRCompArchive.h index 3becd55f1f..f5fcb31999 100644 --- a/include/JSystem/JKernel/JKRCompArchive.h +++ b/include/JSystem/JKernel/JKRCompArchive.h @@ -9,12 +9,12 @@ public: JKRCompArchive(long, JKRArchive::EMountDirection); virtual ~JKRCompArchive(); - void open(long); + bool open(long); /* vt[09] */ void removeResourceAll(void); /* override */ /* vt[10] */ bool removeResource(void*); /* override */ - /* vt[15] */ u32 getExpandedResSize(const void*); /* override */ + /* vt[15] */ u32 getExpandedResSize(const void*) const; /* override */ /* vt[16] */ void* fetchResource(SDIFileEntry*, u32*); /* override */ /* vt[17] */ void* fetchResource(void*, u32, SDIFileEntry*, u32*); /* override */ @@ -23,9 +23,9 @@ private: /* 0x00 */ // vtable /* 0x04 */ // JKRArchive /* 0x5C */ int field_0x5c; - /* 0x60 */ int field_0x60; + /* 0x60 */ EMountDirection mMountDirection; /* 0x64 */ int field_0x64; - /* 0x68 */ int field_0x68; + /* 0x68 */ JKRAramBlock* field_0x68; /* 0x6C */ int field_0x6c; /* 0x70 */ JKRDvdFile* field_0x70; /* 0x74 */ u32 mSizeOfMemPart; diff --git a/include/JSystem/JSupport/JSupport.h b/include/JSystem/JSupport/JSupport.h index e98dee1f98..cec1508163 100644 --- a/include/JSystem/JSupport/JSupport.h +++ b/include/JSystem/JSupport/JSupport.h @@ -1,6 +1,8 @@ #ifndef JSUPPORT_H #define JSUPPORT_H +#include "dolphin/types.h" + template <typename T> T* JSUConvertOffsetToPtr(const void* ptr, const void* offset) { if (offset == NULL) { @@ -10,4 +12,12 @@ T* JSUConvertOffsetToPtr(const void* ptr, const void* offset) { } } +inline u8 JSULoByte(u16 in) { + return in & 0xff; +} + +inline u8 JSUHiByte(u16 in) { + return in >> 8; +} + #endif diff --git a/include/JSystem/JUtility/JUTConsole.h b/include/JSystem/JUtility/JUTConsole.h index c1c2a5adfa..6714e1922d 100644 --- a/include/JSystem/JUtility/JUTConsole.h +++ b/include/JSystem/JUtility/JUTConsole.h @@ -147,5 +147,6 @@ extern "C" void JUTSetWarningConsole(JUTConsole*); extern "C" JUTConsole* JUTGetWarningConsole(); extern "C" void JUTReportConsole_f_va(const char*, va_list); extern "C" void JUTReportConsole_f(const char*, ...); +extern "C" void JUTWarningConsole(const char* message); #endif /* JUTCONSOLE_H */ |