mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-09 06:53:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_carry work, setup static shape data (#1890)

Browse Source
This commit is contained in:
Pheenoh
2023-08-20 22:10:09 -06:00
committed by GitHub
parent cf0b47a5ba
commit 2d5c38e022
219 changed files with 6502 additions and 13711 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/m_Do/m_Do_ext.cpp
+8 -8
View File
@@ -3561,7 +3561,7 @@ asm void mDoExt_removeSubFont() {
/* 80014C54-80014D5C 00F594 0108+00 3/3 14/14 445/445 .text
* mDoExt_J3DModel__create__FP12J3DModelDataUlUl */
J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 modelFlag, u32 differedDlistFlag) {
J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 i_modelFlag, u32 i_differedDlistFlag) {
if (i_modelData != NULL) {
J3DModel* model = new J3DModel();
@@ -3569,18 +3569,18 @@ J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 modelFlag, u32
// Update the modelFlag if the model data passed in has a shared dlist object
if (i_modelData->getMaterialNodePointer(0)->getSharedDisplayListObj() != NULL) {
if (i_modelData->isLocked()) {
modelFlag = J3DMdlFlag_Unk20000;
} else if (modelFlag == J3DMdlFlag_Unk20000) {
modelFlag |= J3DMdlFlag_Unk40000;
i_modelFlag = J3DMdlFlag_Unk20000;
} else if (i_modelFlag == J3DMdlFlag_Unk20000) {
i_modelFlag |= J3DMdlFlag_Unk40000;
} else {
modelFlag = J3DMdlFlag_Unk80000;
i_modelFlag = J3DMdlFlag_Unk80000;
}
}
// Set up the model
if (!model->entryModelData(i_modelData, modelFlag, 1)) {
if (modelFlag == J3DMdlFlag_Unk80000 &&
model->newDifferedDisplayList(differedDlistFlag))
if (!model->entryModelData(i_modelData, i_modelFlag, 1)) {
if (i_modelFlag == J3DMdlFlag_Unk80000 &&
model->newDifferedDisplayList(i_differedDlistFlag))
{
return NULL;
}