mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-11 14:38:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Several JSystem file matches

Browse Source
This commit is contained in:
Noah McQueen
2023-09-10 23:17:07 -06:00
parent b82520becb
commit da415ac542
14 changed files with 487 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JUtility/JUTGraphFifo.h
+6 -4
View File
@@ -5,9 +5,8 @@
class JUTGraphFifo {
public:
/* 802DEB58 */ JUTGraphFifo(u32);
/* 802DEC34 */ virtual ~JUTGraphFifo();
JUTGraphFifo(u32);
virtual ~JUTGraphFifo();
void getGpStatus() {
GXGetGPStatus((GXBool*)&mGpStatus[0], (GXBool*)&mGpStatus[1], (GXBool*)&mGpStatus[2],
@@ -21,6 +20,7 @@ public:
void save() { GXSaveCPUFifo(this->mFifo); }
static bool sInitiated;
static JUTGraphFifo* sCurrentFifo;
static bool mGpStatus[5];
@@ -31,6 +31,8 @@ private:
/* 0x10 */ u8 field_0x10[0xC];
};
inline void JUTCreateFifo(u32 bufSize) { new JUTGraphFifo(bufSize); }
inline void JUTCreateFifo(u32 bufSize) {
new JUTGraphFifo(bufSize);
}
#endif /* JUTGRAPHFIFO_H */
include/JSystem/JUtility/JUTPalette.h
+4 -6
View File
@@ -18,13 +18,11 @@ public:
this->storeTLUT(p1, p2, p3, p4, p5);
}
JUTPalette(GXTlut tlutNo, ResTLUT* p_tlutRes) {
storeTLUT(tlutNo, p_tlutRes);
}
JUTPalette(GXTlut tlutNo, ResTLUT* p_tlutRes) { storeTLUT(tlutNo, p_tlutRes); }
/* 802DE890 */ void storeTLUT(_GXTlut, ResTLUT*);
/* 802DE91C */ void storeTLUT(_GXTlut, _GXTlutFmt, JUTTransparency, u16, void*);
/* 802DE95C */ bool load();
void storeTLUT(_GXTlut, ResTLUT*);
void storeTLUT(_GXTlut, _GXTlutFmt, JUTTransparency, u16, void*);
bool load();
u8 getTlutName() const { return mTlutName; }
u8 getFormat() const { return mFormat; }
include/JSystem/JUtility/JUTResource.h
+5 -7
View File
@@ -8,9 +8,9 @@ class JSUInputStream;
class JUTResReference {
private:
/* 0x001 */ u8 mType;
/* 0x002 */ u8 mNameLength;
/* 0x003 */ char mName[0x100];
/* 0x0 */ u8 mType;
/* 0x1 */ u8 mNameLength;
/* 0x2 */ char mName[0x100];
public:
enum ResType {
@@ -21,10 +21,8 @@ public:
RESTYPE_Unk4 = 4,
};
JUTResReference() { mType = 0; }
/* 802DE078 */ void* getResource(JSUInputStream*, u32, JKRArchive*);
/* 802DE120 */ void* getResource(void const*, u32, JKRArchive*);
/* 802DE1BC */ void* getResource(u32, JKRArchive*);
void* getResource(JSUInputStream*, u32, JKRArchive*);
void* getResource(u32, JKRArchive*);
};
// only rough size known due to getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive
#endif /* JUTRESOURCE_H */
include/JSystem/JUtility/JUTTexture.h
+7 -14
View File
@@ -68,29 +68,22 @@ public:
void setCaptureFlag(bool flag) { mFlags &= 2 | flag; }
u8 getCaptureFlag() const { return mFlags & 1; }
u8 getEmbPaletteDelFlag() const { return mFlags & 2; }
void setEmbPaletteDelFlag(bool flag) { mFlags = (mFlags & 1) | (flag << 1);}
void setEmbPaletteDelFlag(bool flag) { mFlags = (mFlags & 1) | (flag << 1); }
u8 getTlutName() const { return mTlutName; }
bool operator==(const JUTTexture& other) {
return mTexInfo == other.mTexInfo
&& field_0x2c == other.field_0x2c
&& mWrapS == other.mWrapS
&& mWrapT == other.mWrapT
&& mMinFilter == other.mMinFilter
&& mMagFilter == other.mMagFilter
&& mMinLOD == other.mMinLOD
&& mMinLOD == other.mMinLOD
&& mLODBias == other.mLODBias;
}
bool operator!=(const JUTTexture& other) {
return !operator==(other);
return mTexInfo == other.mTexInfo && mAttachedPalette == other.mAttachedPalette &&
mWrapS == other.mWrapS && mWrapT == other.mWrapT && mMinFilter == other.mMinFilter &&
mMagFilter == other.mMagFilter && mMinLOD == other.mMinLOD &&
mMinLOD == other.mMinLOD && mLODBias == other.mLODBias;
}
bool operator!=(const JUTTexture& other) { return !operator==(other); }
private:
/* 0x00 */ GXTexObj mTexObj;
/* 0x20 */ const ResTIMG* mTexInfo;
/* 0x24 */ void* mTexData;
/* 0x28 */ JUTPalette* mEmbPalette;
/* 0x2C */ JUTPalette* field_0x2c;
/* 0x2C */ JUTPalette* mAttachedPalette;
/* 0x30 */ u8 mWrapS;
/* 0x31 */ u8 mWrapT;
/* 0x32 */ u8 mMinFilter;