diff options
| author | jdflyer <jdflyer10@gmail.com> | 2024-03-15 01:35:29 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-15 00:35:29 -0700 |
| commit | df77eae2b31e75ae139191a08243a2fb49e21551 (patch) | |
| tree | 591c41de73470f9252df222a8086a160c529808b /libs/JSystem/J3DGraphLoader | |
| parent | 75dcb319802e1b8e2ac317952c5d1bb3364894e8 (diff) | |
Fix make game (#2097)
Diffstat (limited to 'libs/JSystem/J3DGraphLoader')
| -rw-r--r-- | libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp | 3 | ||||
| -rw-r--r-- | libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp index 3260c48006..42cfc489f7 100644 --- a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp @@ -310,8 +310,7 @@ J3DMaterialFactory::J3DMaterialFactory(J3DMaterialBlock const& i_block) { field_0x34 = JSUConvertOffsetToPtr<J3DTexMtxInfo>(&i_block, i_block.field_0x44); mpTexNo = JSUConvertOffsetToPtr<u16>(&i_block, i_block.mpTexNo); mpTevOrderInfo = JSUConvertOffsetToPtr<J3DTevOrderInfo>(&i_block, i_block.mpTevOrderInfo); - // mpTevColor = JSUConvertOffsetToPtr<GXColorS10>(&i_block, i_block.mpTevColor); - mpTevColor = func_802F41E8(&i_block, i_block.mpTevColor); + mpTevColor = JSUConvertOffsetToPtr<GXColorS10>(&i_block, i_block.mpTevColor); mpTevKColor = JSUConvertOffsetToPtr<GXColor>(&i_block, i_block.mpTevKColor); mpTevStageNum = JSUConvertOffsetToPtr<u8>(&i_block, i_block.mpTevStageNum); mpTevStageInfo = JSUConvertOffsetToPtr<J3DTevStageInfo>(&i_block, i_block.mpTevStageInfo); diff --git a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp index 12a70d343d..527ea32ce0 100644 --- a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp @@ -100,8 +100,7 @@ J3DMaterialFactory_v21::J3DMaterialFactory_v21(J3DMaterialBlock_v21 const& i_blo field_0x28 = JSUConvertOffsetToPtr<J3DTexMtxInfo>(&i_block, i_block.field_0x38);
mpTexNo = JSUConvertOffsetToPtr<u16>(&i_block, i_block.mpTexNo);
mpTevOrderInfo = JSUConvertOffsetToPtr<J3DTevOrderInfo>(&i_block, i_block.mpTevOrderInfo);
- // mpTevColor = JSUConvertOffsetToPtr<GXColorS10>(&i_block, i_block.mpTevColor);
- mpTevColor = func_802F41E8(&i_block, i_block.mpTevColor);
+ mpTevColor = JSUConvertOffsetToPtr<GXColorS10>(&i_block, i_block.mpTevColor);
mpTevKColor = JSUConvertOffsetToPtr<GXColor>(&i_block, i_block.mpTevKColor);
mpTevStageNum = JSUConvertOffsetToPtr<u8>(&i_block, i_block.mpTevStageNum);
mpTevStageInfo = JSUConvertOffsetToPtr<J3DTevStageInfo>(&i_block, i_block.mpTevStageInfo);
|