ovl_Obj_Ocarinalift Decompiled (#920)

* all functions matching

* data imported

* ovl_Obj_Ocarinalift Decompiled

* pr review

* params prefix

* Jenkins re-run

* pr review

* pr review

spec

@@ -3337,8 +3337,7 @@ beginseg
     name "ovl_Obj_Ocarinalift"
     compress
     include "build/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.o"
-    include "build/data/ovl_Obj_Ocarinalift/ovl_Obj_Ocarinalift.data.o"
+    include "build/src/overlays/actors/ovl_Obj_Ocarinalift/ovl_Obj_Ocarinalift_reloc.o"
-    include "build/data/ovl_Obj_Ocarinalift/ovl_Obj_Ocarinalift.reloc.o"
 endseg
 
 beginseg

src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c

@@ -5,6 +5,7 @@
  */
 
 #include "z_obj_ocarinalift.h"
+#include "objects/object_raillift/object_raillift.h"
 
 #define FLAGS (ACTOR_FLAG_10)
 
@@ -15,7 +16,21 @@ void ObjOcarinalift_Destroy(Actor* thisx, PlayState* play);
 void ObjOcarinalift_Update(Actor* thisx, PlayState* play);
 void ObjOcarinalift_Draw(Actor* thisx, PlayState* play);
 
-#if 0
+void func_80AC9680(ObjOcarinalift* this);
+void func_80AC96A4(ObjOcarinalift* this, PlayState* play);
+void func_80AC96B4(ObjOcarinalift* this);
+void func_80AC96D0(ObjOcarinalift* this, PlayState* play);
+void func_80AC99D4(ObjOcarinalift* this, PlayState* play);
+void func_80AC99C0(ObjOcarinalift* this);
+void func_80AC9A68(ObjOcarinalift* this);
+void func_80AC9A7C(ObjOcarinalift* this, PlayState* play);
+void func_80AC9AB8(ObjOcarinalift* this);
+void func_80AC9AE0(ObjOcarinalift* this, PlayState* play);
+void func_80AC9B48(ObjOcarinalift* this);
+void func_80AC9B5C(ObjOcarinalift* this, PlayState* play);
+void func_80AC9C20(ObjOcarinalift* this);
+void func_80AC9C48(ObjOcarinalift* this, PlayState* play);
+
 const ActorInit Obj_Ocarinalift_InitVars = {
     ACTOR_OBJ_OCARINALIFT,
     ACTORCAT_BG,
@@ -28,56 +43,227 @@ const ActorInit Obj_Ocarinalift_InitVars = {
     (ActorFunc)ObjOcarinalift_Draw,
 };
 
-// static InitChainEntry sInitChain[] = {
+static InitChainEntry sInitChain[] = {
-static InitChainEntry D_80AC9D70[] = {
+    ICHAIN_U8(targetMode, 2, ICHAIN_CONTINUE),         ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE),
-    ICHAIN_U8(targetMode, 2, ICHAIN_CONTINUE),
+    ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_CONTINUE),
-    ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE),
-    ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE),
-    ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_CONTINUE),
     ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
 };
 
-#endif
+void func_80AC94C0(ObjOcarinalift* this, s32 arg1) {
+    Math_Vec3s_ToVec3f(&this->dyna.actor.world.pos, &this->unk170[arg1]);
+}
 
-extern InitChainEntry D_80AC9D70[];
+void ObjOcarinalift_Init(Actor* thisx, PlayState* play) {
+    Path* path;
+    ObjOcarinalift* this = THIS;
 
-extern UNK_TYPE D_06001E40;
+    Actor_ProcessInitChain(thisx, sInitChain);
-extern UNK_TYPE D_060048D0;
+    this->dyna.actor.shape.rot.x = 0;
+    this->dyna.actor.world.rot.x = 0;
+    this->dyna.actor.shape.rot.z = 0;
+    this->dyna.actor.world.rot.z = 0;
+    DynaPolyActor_Init(&this->dyna, 1);
+    DynaPolyActor_LoadMesh(play, &this->dyna, &object_raillift_Colheader_0048D0);
+    this->unk160 = thisx->home.rot.z * 0.1f;
+    if (this->unk160 < 0.01f) {
+        func_80AC9680(this);
+    } else {
+        path = &play->setupPathList[OBJOCARINALIFT_GET_7F(&this->dyna.actor)];
+        this->unk168 = OBJOCARINALIFT_GET_1F(&this->dyna.actor);
+        this->unk164 = path->count - 1;
+        this->unk16C = 1;
+        this->unk170 = Lib_SegmentedToVirtual(path->points);
+        func_80AC94C0(this, this->unk168);
+        if ((OBJOCARINALIFT_GET_C(&this->dyna.actor) != OBJOCARINALIFT_PARAMSC_1) &&
+            (Flags_GetSwitch(play, OBJOCARINALIFT_GET_SWITCH_FLAG(&this->dyna.actor)))) {
+            func_80AC96B4(this);
+        } else {
+            func_80AC9AB8(this);
+        }
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Ocarinalift/func_80AC94C0.s")
+void ObjOcarinalift_Destroy(Actor* thisx, PlayState* play) {
+    ObjOcarinalift* this = THIS;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Ocarinalift/ObjOcarinalift_Init.s")
+    DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId);
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Ocarinalift/ObjOcarinalift_Destroy.s")
+void func_80AC9680(ObjOcarinalift* this) {
+    this->dyna.actor.flags &= ~ACTOR_FLAG_10;
+    this->actionFunc = func_80AC96A4;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Ocarinalift/func_80AC9680.s")
+void func_80AC96A4(ObjOcarinalift* this, PlayState* play) {
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Ocarinalift/func_80AC96A4.s")
+void func_80AC96B4(ObjOcarinalift* this) {
+    this->actionFunc = func_80AC96D0;
+    this->dyna.actor.speedXZ = 0.0f;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Ocarinalift/func_80AC96B4.s")
+void func_80AC96D0(ObjOcarinalift* this, PlayState* play) {
+    Actor* thisx = &this->dyna.actor;
+    Vec3f sp48;
+    f32 magnitude;
+    f32 phi_fv0;
+    f32 phi_fa0;
+    s32 paramsC;
+    s32 sp34;
+    Vec3s* temp_v1_2;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Ocarinalift/func_80AC96D0.s")
+    func_800B9010(thisx, NA_SE_EV_PLATE_LIFT_LEVEL - SFX_FLAG);
+    Math_Vec3s_ToVec3f(&sp48, this->unk170 + this->unk168 + this->unk16C);
+    Math_Vec3f_Diff(&sp48, &thisx->world.pos, &thisx->velocity);
+    magnitude = Math3D_Vec3fMagnitude(&thisx->velocity);
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Ocarinalift/func_80AC99C0.s")
+    if ((magnitude < (this->unk160 * 8.0f)) && (this->unk160 > 2.0f)) {
+        phi_fv0 = ((this->unk160 - 2.0f) * 0.1f) + 2.0f;
+        phi_fa0 = this->unk160 * 0.03f;
+    } else {
+        phi_fv0 = this->unk160;
+        phi_fa0 = this->unk160 * 0.16f;
+    }
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Ocarinalift/func_80AC99D4.s")
+    Math_StepToF(&thisx->speedXZ, phi_fv0, phi_fa0);
+    if ((thisx->speedXZ + 0.05f) < magnitude) {
+        Math_Vec3f_Scale(&thisx->velocity, thisx->speedXZ / magnitude);
+        thisx->world.pos.x += thisx->velocity.x;
+        thisx->world.pos.y += thisx->velocity.y;
+        thisx->world.pos.z += thisx->velocity.z;
+    } else {
+        paramsC = OBJOCARINALIFT_GET_C(thisx);
+        sp34 = true;
+        this->unk168 += this->unk16C;
+        thisx->speedXZ *= 0.4f;
+        if (((this->unk168 >= this->unk164) && (this->unk16C > 0)) || ((this->unk168 <= 0) && (this->unk16C < 0))) {
+            if (paramsC == OBJOCARINALIFT_PARAMSC_0) {
+                this->unk16C = -this->unk16C;
+                this->timer = 10;
+                func_80AC9A68(this);
+            } else {
+                temp_v1_2 = this->unk170 + this->unk164;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Ocarinalift/func_80AC9A68.s")
+                if (this->unk16C > 0) {
+                    this->unk168 = 0;
+                } else {
+                    this->unk168 = this->unk164;
+                }
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Ocarinalift/func_80AC9A7C.s")
+                if (((this->unk170->x != temp_v1_2->x) || (this->unk170->y != temp_v1_2->y)) ||
+                    (this->unk170->z != temp_v1_2->z)) {
+                    func_80AC99C0(this);
+                    func_800C62BC(play, &play->colCtx.dyna, this->dyna.bgId);
+                    sp34 = false;
+                } else if ((paramsC == OBJOCARINALIFT_PARAMSC_1) && (this->unk168 == OBJOCARINALIFT_GET_1F(thisx))) {
+                    func_80AC9AB8(this);
+                }
+            }
+        } else if ((paramsC == OBJOCARINALIFT_PARAMSC_1) && (this->unk168 == OBJOCARINALIFT_GET_1F(thisx))) {
+            func_80AC9AB8(this);
+        }
+        if (sp34) {
+            func_80AC94C0(this, this->unk168);
+        }
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Ocarinalift/func_80AC9AB8.s")
+void func_80AC99C0(ObjOcarinalift* this) {
+    this->actionFunc = func_80AC99D4;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Ocarinalift/func_80AC9AE0.s")
+void func_80AC99D4(ObjOcarinalift* this, PlayState* play) {
+    if (!DynaPolyActor_IsInRidingMovingState(&this->dyna)) {
+        func_80AC94C0(this, this->unk168);
+        func_800C6314(play, &play->colCtx.dyna, this->dyna.bgId);
+        if ((OBJOCARINALIFT_GET_C(&this->dyna.actor) == OBJOCARINALIFT_PARAMSC_1) &&
+            (this->unk168 == OBJOCARINALIFT_GET_1F(&this->dyna.actor))) {
+            func_80AC9AB8(this);
+        } else {
+            func_80AC96B4(this);
+        }
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Ocarinalift/func_80AC9B48.s")
+void func_80AC9A68(ObjOcarinalift* this) {
+    this->actionFunc = func_80AC9A7C;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Ocarinalift/func_80AC9B5C.s")
+void func_80AC9A7C(ObjOcarinalift* this, PlayState* play) {
+    this->timer--;
+    if (this->timer <= 0) {
+        func_80AC96B4(this);
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Ocarinalift/func_80AC9C20.s")
+void func_80AC9AB8(ObjOcarinalift* this) {
+    this->dyna.actor.flags |= (ACTOR_FLAG_1 | ACTOR_FLAG_2000000 | ACTOR_FLAG_8000000);
+    this->actionFunc = func_80AC9AE0;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Ocarinalift/func_80AC9C48.s")
+void func_80AC9AE0(ObjOcarinalift* this, PlayState* play) {
+    if (func_800B8718(&this->dyna.actor, &play->state)) {
+        func_80152434(play, 1);
+        func_80AC9B48(this);
+    } else if (DynaPolyActor_IsInRidingMovingState(&this->dyna)) {
+        func_800B8804(&this->dyna.actor, play, 40.0f);
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Ocarinalift/ObjOcarinalift_Update.s")
+void func_80AC9B48(ObjOcarinalift* this) {
+    this->actionFunc = func_80AC9B5C;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Ocarinalift/ObjOcarinalift_Draw.s")
+void func_80AC9B5C(ObjOcarinalift* this, PlayState* play) {
+    if (func_800B886C(&this->dyna.actor, play)) {
+        if (play->msgCtx.ocarinaMode == 4) {
+            if (play->msgCtx.unk1202E == 0) {
+                if (OBJOCARINALIFT_GET_C(&this->dyna.actor) != OBJOCARINALIFT_PARAMSC_1) {
+                    Flags_SetSwitch(play, OBJOCARINALIFT_GET_SWITCH_FLAG(&this->dyna.actor));
+                }
+                ActorCutscene_SetIntentToPlay(this->dyna.actor.cutscene);
+                func_80AC9C20(this);
+            }
+        } else {
+            if (play->msgCtx.ocarinaMode >= 2) {
+                play->msgCtx.ocarinaMode = 4;
+            }
+            func_80AC9AB8(this);
+        }
+    }
+}
+
+void func_80AC9C20(ObjOcarinalift* this) {
+    this->dyna.actor.flags &= ~(ACTOR_FLAG_1 | ACTOR_FLAG_2000000 | ACTOR_FLAG_8000000);
+    this->actionFunc = func_80AC9C48;
+}
+
+void func_80AC9C48(ObjOcarinalift* this, PlayState* play) {
+    if (ActorCutscene_GetCanPlayNext(this->dyna.actor.cutscene)) {
+        ActorCutscene_StartAndSetUnkLinkFields(this->dyna.actor.cutscene, &this->dyna.actor);
+        this->cutsceneTimer = 50;
+        func_80AC96B4(this);
+    } else {
+        ActorCutscene_SetIntentToPlay(this->dyna.actor.cutscene);
+    }
+}
+
+void ObjOcarinalift_Update(Actor* thisx, PlayState* play) {
+    ObjOcarinalift* this = THIS;
+
+    this->actionFunc(this, play);
+    Actor_SetFocus(&this->dyna.actor, 10.0f);
+    if (this->cutsceneTimer > 0) {
+        this->cutsceneTimer--;
+        if (this->cutsceneTimer == 0) {
+            ActorCutscene_Stop(this->dyna.actor.cutscene);
+        }
+    }
+}
+
+void ObjOcarinalift_Draw(Actor* thisx, PlayState* play) {
+    ObjOcarinalift* this = THIS;
+
+    Gfx_DrawDListOpa(play, object_raillift_DL_001E40);
+    Gfx_DrawDListXlu(play, object_raillift_DL_001DB0);
+}

src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.h

@@ -3,17 +3,32 @@
 
 #include "global.h"
 
+#define OBJOCARINALIFT_GET_C(thisx) (((thisx)->params >> 0xC) & 3)
+#define OBJOCARINALIFT_GET_7F(thisx) ((thisx)->params & 0x7F)
+#define OBJOCARINALIFT_GET_1F(thisx) (((thisx)->params >> 7) & 0x1F)
+#define OBJOCARINALIFT_GET_SWITCH_FLAG(thisx) ((thisx)->home.rot.x & 0x7F)
+
 struct ObjOcarinalift;
 
 typedef void (*ObjOcarinaliftActionFunc)(struct ObjOcarinalift*, PlayState*);
 
 typedef struct ObjOcarinalift {
-    /* 0x000 */ Actor actor;
+    /* 0x000 */ DynaPolyActor dyna;
-    /* 0x144 */ char unk_144[0x18];
     /* 0x15C */ ObjOcarinaliftActionFunc actionFunc;
-    /* 0x160 */ char unk_160[0x18];
+    /* 0x160 */ f32 unk160;
+    /* 0x164 */ s32 unk164;
+    /* 0x168 */ s32 unk168;
+    /* 0x16C */ s32 unk16C;
+    /* 0x170 */ Vec3s* unk170;
+    /* 0x174 */ s16 timer;
+    /* 0x176 */ s16 cutsceneTimer;
 } ObjOcarinalift; // size = 0x178
 
+typedef enum ObjOcarinaliftParams {
+    /* 0x0 */ OBJOCARINALIFT_PARAMSC_0,
+    /* 0x1 */ OBJOCARINALIFT_PARAMSC_1
+} ObjOcarinaliftParams;
+
 extern const ActorInit Obj_Ocarinalift_InitVars;
 
 #endif // Z_OBJ_OCARINALIFT_H

undefined_syms.txt

@@ -1469,12 +1469,6 @@ D_06000030 = 0x06000030;
 D_06002068 = 0x06002068;
 D_06002188 = 0x06002188;
 
-// ovl_Obj_Ocarinalift
-
-D_06001DB0 = 0x06001DB0;
-D_06001E40 = 0x06001E40;
-D_060048D0 = 0x060048D0;
-
 // ovl_Obj_Takaraya_Wall
 
 D_06000B70 = 0x06000B70;