diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2021-05-23 03:09:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-23 12:09:59 +0200 |
| commit | e915df66c806bdff65aa243649f7abfe6cc19227 (patch) | |
| tree | 226e708c0546c45f65420446382ba597ad773651 /include/JSystem/J3DGraphBase | |
| parent | 462d71cbef02ef119fc2aa480b98cfeedde46441 (diff) | |
move d_a_alink and some related stuff (#130)
* clean up d_a_player
* move some of daalink
* more daalink / daplayer
* setup some daalink members
* rest of daalink members setup
* remove comment
* few more matches
* remove asm
* more matches
* more matches + move e_wb_class
* fix some d_save classes
Co-authored-by: lepelog <lepelog@users.noreply.github.com>
Diffstat (limited to 'include/JSystem/J3DGraphBase')
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DMatBlock.h | 8 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DPacket.h | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h index 65b37695a1..ff5235ef2d 100644 --- a/include/JSystem/J3DGraphBase/J3DMatBlock.h +++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h @@ -1,6 +1,14 @@ #ifndef J3DMATBLOCK_H #define J3DMATBLOCK_H +#include "dolphin/gx/GXTexture.h" #include "dolphin/types.h" +class J3DGXColorS10 { +public: + /* 8000E460 */ J3DGXColorS10(); + + _GXColorS10 mColor; +}; + #endif /* J3DMATBLOCK_H */ diff --git a/include/JSystem/J3DGraphBase/J3DPacket.h b/include/JSystem/J3DGraphBase/J3DPacket.h index 09e3a7c739..1b2cee8aa5 100644 --- a/include/JSystem/J3DGraphBase/J3DPacket.h +++ b/include/JSystem/J3DGraphBase/J3DPacket.h @@ -51,9 +51,10 @@ public: virtual ~J3DPacket(); public: - J3DPacket* mpNextSibling; - J3DPacket* mpFirstChild; -}; + /* 0x04 */ J3DPacket* mpNextSibling; + /* 0x08 */ J3DPacket* mpFirstChild; + /* 0x0C */ void* mpUserData; +}; // Size = 0x10 class J3DDrawPacket : public J3DPacket { public: @@ -64,7 +65,6 @@ public: virtual void draw(); public: - void* mpUserData; int mFlags; char mPad0[0x0C]; // unk J3DDisplayListObj* mpDisplayListObj; |