From 960b08e88ca705c5953c86bdf3aabf89b0b312ee Mon Sep 17 00:00:00 2001 From: Huitzi <73550465+marwernerh@users.noreply.github.com> Date: Fri, 3 Jan 2025 17:50:14 -0500 Subject: d_a_obj_waterPillar + d_a_obj_syRock Equivalent (weak ordering) (#2281) * d_a_obj_waterPillar + d_a_obj_syRock Equivalent (weak ordering) * Added fake struct padding * Added fake Chk inlines to dBgS_Acch * Added AT_TYPE_100 to cCcD_ObjAtType * Addressed fakematch * Deleted fake Chk inlines from dBgS_Acch * Removed duplicated, but commented, static check for struct size * Renamed two d_a_obj_waterPillar fields according to comments * Removed explicit inline keywords & swapped use of PSMTX for debug-friendly MTX --- include/SSystem/SComponent/c_cc_d.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/SSystem/SComponent') diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index 00427f85e1..db50a57acd 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -37,6 +37,7 @@ enum cCcD_ObjAtType { /* 0x00000020 */ AT_TYPE_BOMB = (1 << 5), /* 0x00000040 */ AT_TYPE_40 = (1 << 6), /* 0x00000080 */ AT_TYPE_SLINGSHOT = (1 << 7), + /* 0x00000100 */ AT_TYPE_100 = (1 << 8), /* 0x00000200 */ AT_TYPE_LANTERN_SWING = (1 << 9), /* 0x00000400 */ AT_TYPE_CSTATUE_SWING = (1 << 10), /* 0x00000800 */ AT_TYPE_800 = (1 << 11), -- cgit v1.2.3