Fakematch J3DZModeInfo to fix ninja diff error

2 files changed, 10 insertions, 1 deletions

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 */
diff --git a/include/d/actor/d_a_agb.h b/include/d/actor/d_a_agb.h
index 4f428811..7ed6df21 100644
--- a/include/d/actor/d_a_agb.h
+++ b/include/d/actor/d_a_agb.h
@@ -8,6 +8,7 @@
 #include "global.h"
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_hostIO.h"
+#include "f_op/f_op_msg.h"
 
 class daAgb_HIO_c : public mDoHIO_entry_c {
 public:
@@ -25,7 +26,6 @@ public:
     /* 0x30 */ f32 field_0x30;
 };
 
-class msg_class;
 class dMsgCtrl_c {
 public:
     int init(u16);