mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-05-29 08:43:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Various small matches (#2879)

Browse Source 
* 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
This commit is contained in:
LagoLunatic
2025-11-28 00:34:18 -05:00
committed by GitHub
parent a089a1d21c
commit 4fb3af91b8
34 changed files with 250 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp
+4 -4
View File
@@ -150,7 +150,7 @@ J3DMaterial* J3DMaterialFactory::createNormalMaterial(J3DMaterial* i_material, i
BOOL ind_flag = (i_flags & 0x1000000) ? TRUE : FALSE;
if (i_material == NULL) {
i_material = new J3DMaterial();
JUT_ASSERT_MSG(269, i_material, "Error : allocate memory.");
J3D_ASSERT_ALLOCMEM(269, i_material);
}
i_material->mColorBlock = J3DMaterial::createColorBlock(color_flag);
i_material->mTexGenBlock = J3DMaterial::createTexGenBlock(texgen_flag);
@@ -252,14 +252,14 @@ J3DMaterial* J3DMaterialFactory::createPatchedMaterial(J3DMaterial* i_material,
u32 i_flags) const {
if (i_material == NULL) {
i_material = new J3DPatchedMaterial();
JUT_ASSERT_MSG(430, i_material, "Error : allocate memory.");
J3D_ASSERT_ALLOCMEM(430, i_material);
}
bool bVar1 = i_flags & 0x3000000 ? true : false;
i_material->mColorBlock = J3DMaterial::createColorBlock(0x40000000);
i_material->mTexGenBlock = new J3DTexGenBlockPatched();
JUT_ASSERT_MSG(440, i_material->mTexGenBlock, "Error : allocate memory.");
J3D_ASSERT_ALLOCMEM(440, i_material->mTexGenBlock);
i_material->mTevBlock = new J3DTevBlockPatched();
JUT_ASSERT_MSG(442, i_material->mTevBlock, "Error : allocate memory.");
J3D_ASSERT_ALLOCMEM(442, i_material->mTevBlock);
i_material->mIndBlock = J3DMaterial::createIndBlock(bVar1);
i_material->mPEBlock = J3DMaterial::createPEBlock(0x10000000, getMaterialMode(i_idx));
i_material->mIndex = i_idx;