From 132357d9fb50d7962518e10b22db358c85d87ba5 Mon Sep 17 00:00:00 2001 From: MegaMech Date: Fri, 6 Mar 2026 20:10:07 -0700 Subject: Big Interpolation Overhaul (#674) * Fix FI * FI statue * Intepr fixes * Improve * More interp * Fix compile * More interp * Fix text --- src/engine/objects/Boos.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/engine/objects/Boos.cpp') diff --git a/src/engine/objects/Boos.cpp b/src/engine/objects/Boos.cpp index f05d62be1..f41197f46 100644 --- a/src/engine/objects/Boos.cpp +++ b/src/engine/objects/Boos.cpp @@ -104,30 +104,30 @@ void OBoos::Draw(s32 cameraId) { temp_s2 = MIN(temp_s2, 0x15F91U); } - // @port: Tag the transform. - FrameInterpolation_RecordOpenChild("Boo", (uintptr_t)&gObjectList[objectIndex]); + FrameInterpolation_RecordOpenChild("boo", (objectIndex << 4) | cameraId); if (is_obj_flag_status_active(objectIndex, VISIBLE) != 0) { func_800523B8(objectIndex, cameraId, temp_s2); } - // @port Pop the transform id. FrameInterpolation_RecordCloseChild(); } } } -void OBoos::func_800523B8(s32 objectIndex, s32 arg1, u32 arg2) { +void OBoos::func_800523B8(s32 objectIndex, s32 cameraId, u32 arg2) { UNUSED s32 pad[2]; Object* object; - Camera* camera = &camera1[arg1]; + Camera* camera = &camera1[cameraId]; object = &gObjectList[objectIndex]; object->orientation[1] = func_800418AC(object->pos[0], object->pos[2], camera->pos); func_800484BC(object->pos, object->orientation, object->sizeScaling, object->primAlpha, (u8*) object->activeTLUT, (u8*) object->activeTexture, object->vertex, 0x00000030, 0x00000028, 0x00000030, 0x00000028); if ((is_obj_flag_status_active(objectIndex, 0x00000020) != 0) && (arg2 < 0x15F91U)) { + FrameInterpolation_RecordOpenChild("boo_hoo", (objectIndex << 4) | cameraId); func_8004A630(&D_8018C830, object->pos, 0.4f); + FrameInterpolation_RecordCloseChild(); } } -- cgit v1.2.3