From 77f9369fd68f4dfff44a90520062a821b38f5cb1 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Fri, 28 Aug 2026 12:57:22 -0400 Subject: [PATCH] J3DMatBlock OK --- configure.py | 2 +- include/JSystem/J3DGraphBase/J3DMatBlock.h | 4 ++-- src/JSystem/J3DGraphBase/J3DMatBlock.cpp | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/configure.py b/configure.py index fe6cb93fa..688ae5ab1 100755 --- a/configure.py +++ b/configure.py @@ -1062,7 +1062,7 @@ config.libs = [ Object(Matching, "JSystem/J3DGraphBase/J3DShapeMtx.cpp"), Object(Matching, "JSystem/J3DGraphBase/J3DShape.cpp"), Object(Matching, "JSystem/J3DGraphBase/J3DMaterial.cpp"), - Object(Equivalent, "JSystem/J3DGraphBase/J3DMatBlock.cpp"), # regalloc + Object(Matching, "JSystem/J3DGraphBase/J3DMatBlock.cpp"), Object(Matching, "JSystem/J3DGraphBase/J3DTevs.cpp"), Object(Matching, "JSystem/J3DGraphBase/J3DDrawBuffer.cpp"), ], diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h index f3e588286..c89634370 100644 --- a/include/JSystem/J3DGraphBase/J3DMatBlock.h +++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h @@ -882,8 +882,8 @@ struct J3DIndTexOrder : public J3DIndTexOrderInfo { J3DIndTexOrder() { *(J3DIndTexOrderInfo*)this = j3dDefaultIndTexOrderNull; } explicit J3DIndTexOrder(const J3DIndTexOrderInfo& info) { *(J3DIndTexOrderInfo*)this = info; } - u8 getCoord() const { return mCoord; } - u8 getMap() const { return mMap; } + u8 getCoord() { return mCoord; } + u8 getMap() { return mMap; } void setCoord(u8 coord) { mCoord = coord; } void setMap(u8 map) { mMap = map; } }; diff --git a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp index 5aca93a27..3d01020a2 100644 --- a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp +++ b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp @@ -1400,7 +1400,6 @@ void J3DTevBlock::indexToPtr_private(u32 offs) { /* 802E6298-802E6494 .text load__15J3DIndBlockFullFv */ void J3DIndBlockFull::load() { - /* Nonmatching - regalloc */ u8 indTexStageNum = mIndTexStageNum; for (u32 i = 0; i < indTexStageNum; i++) { mIndTexMtx[i].load(i); @@ -1433,7 +1432,6 @@ void J3DIndBlockFull::load() { /* 802E6494-802E657C .text diff__15J3DIndBlockFullFUl */ void J3DIndBlockFull::diff(u32 flag) { - /* Nonmatching - regalloc */ if ((flag & 0x08000000) == 0) { return; }