diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2026-10-12 12:58:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-10-12 12:58:41 -0400 |
| commit | 31c6f72f5787de0d65b25dfe5dfa18e4557ff7bc (patch) | |
| tree | 417033a0519fb3bdf8b0d610fc863f8d5765fa3a /include/JSystem/J3DGraphBase | |
| parent | f288e35ac5572ca34d34d6fe0f618c8e38cc77dc (diff) | |
| parent | be8fa6e8476a02de3fec234f78ef7406108627c7 (diff) | |
Merge pull request #1239 from Jcw87/misc_fixes
Misc fixes
Diffstat (limited to 'include/JSystem/J3DGraphBase')
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DPacket.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/JSystem/J3DGraphBase/J3DPacket.h b/include/JSystem/J3DGraphBase/J3DPacket.h index fc726761..60ca5941 100644 --- a/include/JSystem/J3DGraphBase/J3DPacket.h +++ b/include/JSystem/J3DGraphBase/J3DPacket.h @@ -156,7 +156,7 @@ public: /* 0x10 */ u32 mFlags; /* 0x14 */ char mPad0[0x0C]; // unk /* 0x20 */ J3DDisplayListObj* mpDisplayListObj; -}; // Size: 0x28 +}; // Size: 0x24 class J3DShapePacket : public J3DDrawPacket { public: @@ -222,13 +222,13 @@ public: virtual bool isSame(J3DMatPacket*) const; public: - /* 0x28 */ J3DShapePacket* mpInitShapePacket; - /* 0x2C */ J3DShapePacket* mpShapePacket; - /* 0x30 */ J3DMaterial* mpMaterial; - /* 0x34 */ u32 mDiffFlag; - /* 0x38 */ J3DTexture* mpTexture; - /* 0x3C */ J3DMaterialAnm* mpMaterialAnm; -}; // Size: 0x40 + /* 0x24 */ J3DShapePacket* mpInitShapePacket; + /* 0x28 */ J3DShapePacket* mpShapePacket; + /* 0x2C */ J3DMaterial* mpMaterial; + /* 0x30 */ u32 mDiffFlag; + /* 0x34 */ J3DTexture* mpTexture; + /* 0x38 */ J3DMaterialAnm* mpMaterialAnm; +}; // Size: 0x3C class J3DCallBackPacket : public J3DPacket { public: @@ -239,7 +239,7 @@ public: public: typedef void (*CallBack)(J3DCallBackPacket * pPacket, u32 timing); - CallBack mpCallBack; -}; + /* 0x10 */ CallBack mpCallBack; +}; // Size: 0x14 #endif /* J3DPACKET_H */ |