mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-11 14:38:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup, demo work, and match daNpcPeople_c::getMsg on retail

Browse Source
This commit is contained in:
LagoLunatic
2025-05-29 15:41:38 -04:00
parent c1f54653fd
commit 431943a893
29 changed files with 301 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/J3DGraphBase/J3DMaterial.cpp
+6 -6
View File
@@ -213,7 +213,7 @@ void J3DMaterial::makeSharedDisplayList() {
/* 802DEAD4-802DEB3C .text load__11J3DMaterialFv */
void J3DMaterial::load() {
j3dSys.setMaterialMode(mMaterialMode);
if (!j3dSys.checkFlag(2)) {
if (!j3dSys.checkFlag(J3DSysFlag_UNK2)) {
j3dSys.mMatPacket->callDL();
loadNBTScale(*mTexGenBlock->getNBTScale());
}
@@ -222,7 +222,7 @@ void J3DMaterial::load() {
/* 802DEB3C-802DEBA0 .text loadSharedDL__11J3DMaterialFv */
void J3DMaterial::loadSharedDL() {
j3dSys.setMaterialMode(mMaterialMode);
if (!j3dSys.checkFlag(2)) {
if (!j3dSys.checkFlag(J3DSysFlag_UNK2)) {
mSharedDLObj->callDL();
loadNBTScale(*mTexGenBlock->getNBTScale());
}
@@ -360,7 +360,7 @@ void J3DPatchedMaterial::makeSharedDisplayList() {}
/* 802DF268-802DF2AC .text load__18J3DPatchedMaterialFv */
void J3DPatchedMaterial::load() {
j3dSys.setMaterialMode(mMaterialMode);
if (j3dSys.checkFlag(0x02)) {
if (j3dSys.checkFlag(J3DSysFlag_UNK2)) {
return;
}
j3dSys.mMatPacket->callDL();
@@ -369,7 +369,7 @@ void J3DPatchedMaterial::load() {
/* 802DF2AC-802DF2EC .text loadSharedDL__18J3DPatchedMaterialFv */
void J3DPatchedMaterial::loadSharedDL() {
j3dSys.setMaterialMode(mMaterialMode);
if (!j3dSys.checkFlag(0x02)) {
if (!j3dSys.checkFlag(J3DSysFlag_UNK2)) {
mSharedDLObj->callDL();
}
}
@@ -402,7 +402,7 @@ void J3DLockedMaterial::makeSharedDisplayList() {}
/* 802DF368-802DF3AC .text load__17J3DLockedMaterialFv */
void J3DLockedMaterial::load() {
j3dSys.setMaterialMode(mMaterialMode);
if (j3dSys.checkFlag(0x02)) {
if (j3dSys.checkFlag(J3DSysFlag_UNK2)) {
return;
}
j3dSys.mMatPacket->callDL();
@@ -411,7 +411,7 @@ void J3DLockedMaterial::load() {
/* 802DF3AC-802DF3EC .text loadSharedDL__17J3DLockedMaterialFv */
void J3DLockedMaterial::loadSharedDL() {
j3dSys.setMaterialMode(mMaterialMode);
if (!j3dSys.checkFlag(0x02)) {
if (!j3dSys.checkFlag(J3DSysFlag_UNK2)) {
mSharedDLObj->callDL();
}
}