From 4fb3af91b8aff0b9042affa4d430aa3375199973 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Fri, 28 Nov 2025 00:34:18 -0500 Subject: Various small matches (#2879) * Misc debug matches * Fix JASBasicWaveBank weak func order * Remove more dol2asm stuff, fix missing includes * Some data fixes * Update comments * d_file_sel_warning is already OK * Fix Z2 splits * Fix movebox namespace * Fix inlining issue in m_Do_ext * Fix Z2 splits for P and J --- include/JSystem/J3DGraphBase/J3DMatBlock.h | 2 +- include/JSystem/J3DGraphBase/J3DShape.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include/JSystem/J3DGraphBase') diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h index 6d019321c5..423ece548a 100644 --- a/include/JSystem/J3DGraphBase/J3DMatBlock.h +++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h @@ -1641,7 +1641,7 @@ struct J3DIndTexMtx : public J3DIndTexMtxInfo { J3DIndTexMtx(J3DIndTexMtxInfo const& info) { *(J3DIndTexMtxInfo*)this = info; } /* 8000E064 */ ~J3DIndTexMtx() {} void load(u32 param_1) const { - J3DGDSetIndTexMtx((GXIndTexMtxID)(param_1 + 1), (Mtx3P)field_0x0, field_0x18); + J3DGDSetIndTexMtx((GXIndTexMtxID)(param_1 + GX_ITM_0), (Mtx3P)field_0x0, field_0x18); } }; // Size: 0x1C diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/include/JSystem/J3DGraphBase/J3DShape.h index 8524af4cf9..9331f74cb5 100644 --- a/include/JSystem/J3DGraphBase/J3DShape.h +++ b/include/JSystem/J3DGraphBase/J3DShape.h @@ -144,7 +144,7 @@ public: void onFlag(u32 flag) { mFlags |= flag; } void offFlag(u32 flag) { mFlags &= ~flag; } - bool checkFlag(u32 flag) const { return (mFlags & flag) != 0; } + bool checkFlag(u32 flag) const { return (mFlags & flag) ? true : false; } void setMaterial(J3DMaterial* pMaterial) { J3D_ASSERT_NULLPTR(509, pMaterial != NULL); -- cgit v1.2.3