From a41ec2974ea2bbfafbfc491864aeafb021f0878f Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Mon, 8 Jan 2024 21:22:18 -0500 Subject: Fakematch J3DZModeInfo to fix ninja diff error --- include/JSystem/J3DGraphBase/J3DStruct.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'include/JSystem/J3DGraphBase') diff --git a/include/JSystem/J3DGraphBase/J3DStruct.h b/include/JSystem/J3DGraphBase/J3DStruct.h index 2066a4ee..da08ebdc 100644 --- a/include/JSystem/J3DGraphBase/J3DStruct.h +++ b/include/JSystem/J3DGraphBase/J3DStruct.h @@ -239,6 +239,15 @@ struct J3DZModeInfo { /* 0x2 */ u8 mUpdateEnable; }; +// TODO: This struct is a fakematch. +// J3DZModeInfo is only 3 bytes in arrays, but 4 bytes when it's a standalone symbol (with 1 byte alignment). +// Until we figure out the correct way to match this, use J3DZModeInfo in arrays and J3DZModeInfo_4bytes otherwise. +// ninja diff notices that the size of a standalone J3DZModeInfo is wrong and reports it as an error without this. +struct J3DZModeInfo_4bytes { + J3DZModeInfo parent; + u8 padding; +}; + STATIC_ASSERT(sizeof(J3DTevStageInfo) == 0x14); #endif /* J3DSTRUCT_H */ -- cgit v1.2.3