diff options
Diffstat (limited to 'src/engine/objects/Thwomp.cpp')
| -rw-r--r-- | src/engine/objects/Thwomp.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/engine/objects/Thwomp.cpp b/src/engine/objects/Thwomp.cpp index 1bde243a9..fdd36a21b 100644 --- a/src/engine/objects/Thwomp.cpp +++ b/src/engine/objects/Thwomp.cpp @@ -168,8 +168,7 @@ void OThwomp::Tick60fps() { // func_80081210 if (_idx == 0) { for (var_s4 = 0; var_s4 < gObjectParticle2_SIZE; var_s4++) { - // @port: Tag the transform. - FrameInterpolation_RecordOpenChild("Thwomp_part", (uintptr_t) var_s4); + FrameInterpolation_RecordOpenChild("Thwomp_smoke", (uintptr_t) (var_s4 << 5)); objectIndex = gObjectParticle2[var_s4]; if (objectIndex == DELETED_OBJECT_ID) { @@ -715,7 +714,7 @@ void OThwomp::Draw(s32 cameraId) { plusone = gObjectList[objectIndex].unk_0DF + 1; if (gGamestate != CREDITS_SEQUENCE) { - OThwomp::DrawModel(objectIndex); + OThwomp::DrawModel(cameraId, objectIndex); } gSPDisplayList(gDisplayListHead++, (Gfx*) D_0D0079C8); @@ -758,9 +757,9 @@ void OThwomp::Draw(s32 cameraId) { } } -void OThwomp::DrawModel(s32 objectIndex) { +void OThwomp::DrawModel(s32 cameraId, s32 objectIndex) { if ((gObjectList[objectIndex].state >= 2) && (func_80072354(objectIndex, 0x00000040) != 0)) { - FrameInterpolation_RecordOpenChild("Thwomp_Main", TAG_THWOMP(this)); + FrameInterpolation_RecordOpenChild("Thwomp_Main", TAG_THWOMP((_idx << 5) | cameraId)); func_8004A7AC(objectIndex, 1.75f); rsp_set_matrix_transformation(gObjectList[objectIndex].pos, gObjectList[objectIndex].orientation, gObjectList[objectIndex].sizeScaling); |