mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-03 00:16:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

J2D structs + print / fix GX + MSL string headers (#157)

Browse Source 
* J2D structs + print / fix GX + MSL string headers

* remove msl_c/string.h
This commit is contained in:
TakaRikka
2021-10-24 14:35:00 -07:00
committed by GitHub
parent bf5416a23d
commit 6d4520da66
71 changed files with 2069 additions and 2054 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J2DGraph/J2DMaterial.h
+30 -3
View File
@@ -2,15 +2,27 @@
#define J2DMATERIAL_H
#include "JSystem/J2DGraph/J2DAnimation.h"
#include "JSystem/J2DGraph/J2DMatBlock.h"
#include "dolphin/gx/GX.h"
#include "dolphin/types.h"
struct J2DMaterial {
class J2DMaterial {
public:
struct J2DMaterialAnmPointer {
/* 802EA79C */ J2DMaterialAnmPointer();
};
/* 0x00 */ int field_0x0;
/* 0x04 */ int field_0x4;
/* 0x08 */ int field_0x8;
/* 0x0C */ int field_0xc;
/* 0x10 */ u16 field_0x10;
/* 0x12 */ u16 field_0x12[8];
/* 0x22 */ u16 field_0x22[8];
/* 0x32 */ u16 field_0x32[4];
/* 0x3A */ u16 field_0x3a[4];
}; // Size: 0x44
/* 802EA1AC */ J2DMaterial();
/* 802EA2CC */ ~J2DMaterial();
/* 802EA38C */ void setGX();
/* 802EA410 */ void createTevBlock(int, bool);
/* 802EA5C4 */ void createIndBlock(int, bool);
@@ -20,6 +32,21 @@ struct J2DMaterial {
/* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
/* 802EA89C */ void setAnimation(J2DAnmColor*);
/* 802EAC78 */ void animation();
/* 802EA2CC */ virtual ~J2DMaterial();
private:
/* 0x04 */ int field_0x4;
/* 0x08 */ int field_0x8;
/* 0x0C */ u16 mIndex;
/* 0x0E */ bool mVisible;
/* 0x0F */ u8 mMaterialAlphaCalc;
/* 0x10 */ J2DColorBlock mColorBlock;
/* 0x28 */ J2DTexGenBlock mTexGenBlock;
/* 0x70 */ J2DTevBlock* mTevBlock;
/* 0x74 */ J2DIndBlock* mIndBlock;
/* 0x78 */ J2DPEBlock mPEBlock;
/* 0x84 */ J2DMaterialAnmPointer* mAnmPointer;
};
#endif /* J2DMATERIAL_H */