Merge branch 'danpei_movebg' of https://github.com/Synray/mm into zret

spec

@@ -3421,8 +3421,7 @@ beginseg
     name "ovl_Bg_Danpei_Movebg"
     compress
     include "build/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.o"
-    include "build/data/ovl_Bg_Danpei_Movebg/ovl_Bg_Danpei_Movebg.data.o"
-    include "build/data/ovl_Bg_Danpei_Movebg/ovl_Bg_Danpei_Movebg.reloc.o"
+    include "build/src/overlays/actors/ovl_Bg_Danpei_Movebg/ovl_Bg_Danpei_Movebg_reloc.o"
 endseg
 
 beginseg

src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c

@@ -5,6 +5,7 @@
  */
 
 #include "z_bg_danpei_movebg.h"
+#include "objects/object_d_lift/object_d_lift.h"
 
 #define FLAGS (ACTOR_FLAG_10)
 
@@ -14,7 +15,15 @@ void BgDanpeiMovebg_Init(Actor* thisx, PlayState* play);
 void BgDanpeiMovebg_Destroy(Actor* thisx, PlayState* play);
 void BgDanpeiMovebg_Update(Actor* thisx, PlayState* play);
 
-#if 0
+void func_80AF6EA8(BgDanpeiMovebg* this, PlayState* play);
+void func_80AF70FC(BgDanpeiMovebg* this, PlayState* play);
+void func_80AF74CC(Actor* thisx, PlayState* play);
+u16 func_80AF705C(BgDanpeiMovebg* this, u16 flags);
+void func_80AF71FC(BgDanpeiMovebg* this, PlayState* play);
+void func_80AF72F8(BgDanpeiMovebg* this, PlayState* play);
+void func_80AF7354(BgDanpeiMovebg* this, PlayState* play);
+void func_80AF746C(BgDanpeiMovebg* this, PlayState* play);
+
 ActorInit Bg_Danpei_Movebg_InitVars = {
     /**/ ACTOR_BG_DANPEI_MOVEBG,
     /**/ ACTORCAT_BG,
@@ -27,38 +36,181 @@ ActorInit Bg_Danpei_Movebg_InitVars = {
     /**/ NULL,
 };
 
-// static InitChainEntry sInitChain[] = {
-static InitChainEntry D_80AF753C[] = {
+static u16 D_80AF7530[] = { OBJECT_D_LIFT, OBJECT_DANPEI_OBJECT };
+
+static Gfx* D_80AF7534[] = { gDampeGraveBrownElevatorDL };
+
+static CollisionHeader* D_80AF7538[] = { &gDampeGraveBrownElevatorCol };
+
+static InitChainEntry sInitChain[] = {
     ICHAIN_F32(uncullZoneScale, 1500, ICHAIN_CONTINUE),
     ICHAIN_F32(uncullZoneDownward, 1100, ICHAIN_CONTINUE),
     ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE),
     ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
 };
 
-#endif
+s32 func_80AF6DE0(PlayState* this, ActorPathing* actorPathing) {
+    Actor* actor;
+    s32 res;
 
-extern InitChainEntry D_80AF753C[];
+    actor = actorPathing->actor;
+    res = 0;
+    if (actorPathing->distSqToCurPoint < actor->speed * actor->speed) {
+        res = 1;
+    } else {
+        actor->world.rot.x = actorPathing->rotToCurPoint.x;
+        actor->world.rot.y = actorPathing->rotToCurPoint.y;
+    }
+    return res;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Danpei_Movebg/func_80AF6DE0.s")
+void BgDanpeiMovebg_Init(Actor* thisx, PlayState* play) {
+    BgDanpeiMovebg* this = THIS;
+    DynaPolyActor_Init(&this->dyna, 1);
+    this->bankIdx = SubS_GetObjectIndex(D_80AF7530[BGDANPEIMOVEBG_GET_TYPE(thisx)], play);
+    if (this->bankIdx < 0) {
+        Actor_Kill(&this->dyna.actor);
+    }
+    this->actionFunc = func_80AF6EA8;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Danpei_Movebg/BgDanpeiMovebg_Init.s")
+void func_80AF6EA8(BgDanpeiMovebg* this, PlayState* play) {
+    Actor* thisx = (Actor*)this;
+    if (SubS_IsObjectLoaded(this->bankIdx, play)) {
+        gSegments[6] = VIRTUAL_TO_PHYSICAL(play->objectCtx.status[this->bankIdx].segment);
+        this->dyna.actor.objBankIndex = this->bankIdx;
+        this->dyna.actor.draw = func_80AF74CC;
+        Actor_ProcessInitChain(thisx, sInitChain);
+        DynaPolyActor_LoadMesh(play, &this->dyna, D_80AF7538[BGDANPEIMOVEBG_GET_TYPE(thisx)]);
+        this->dList = D_80AF7534[BGDANPEIMOVEBG_GET_TYPE(thisx)];
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Danpei_Movebg/func_80AF6EA8.s")
+        /* If D_LIFT */
+        if (BGDANPEIMOVEBG_GET_TYPE(thisx) == 0) {
+            this->dyna.actor.gravity = 0.0f;
+            this->dyna.actor.speed = 1.0f;
+            SubS_ActorPathing_Init(play, &thisx->world.pos, thisx, &this->actorPath, play->setupPathList,
+                                   BGDANPEIMOVEBG_GET_PATH_INDEX(thisx), 0, 0, 0, 0);
+            this->actionFunc = func_80AF70FC;
+        }
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Danpei_Movebg/BgDanpeiMovebg_Destroy.s")
+void BgDanpeiMovebg_Destroy(Actor* thisx, PlayState* play) {
+    BgDanpeiMovebg* this = THIS;
+    DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId);
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Danpei_Movebg/BgDanpeiMovebg_Update.s")
+void BgDanpeiMovebg_Update(Actor* thisx, PlayState* play) {
+    BgDanpeiMovebg* this = THIS;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Danpei_Movebg/func_80AF705C.s")
+    this->actionFunc(this, play);
+    this->prevFlags = this->flags;
+    this->flags &= ~1;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Danpei_Movebg/func_80AF70FC.s")
+u16 func_80AF705C(BgDanpeiMovebg* this, u16 flags) {
+    u16 newFlags = flags & ~0x1C;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Danpei_Movebg/func_80AF71FC.s")
+    if (DynaPolyActor_IsActorOnTop(&this->dyna) && (this->flags & 1)) {
+        newFlags |= 4;
+    }
+    if (DynaPolyActor_IsPlayerOnTop(&this->dyna)) {
+        if (gSaveContext.save.playerForm == PLAYER_FORM_DEKU) {
+            newFlags |= 8;
+        } else {
+            newFlags |= 0x10;
+        }
+    }
+    return newFlags;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Danpei_Movebg/func_80AF72F8.s")
+void func_80AF70FC(BgDanpeiMovebg* this, PlayState* play) {
+    this->flags = func_80AF705C(this, this->flags);
+    if (this->flags & 0xC) {
+        if (this->flags & 4) {
+            this->flags |= 2;
+        }
+        this->actionFunc = func_80AF71FC;
+    } else if (this->flags & 0x10) {
+        if (!(this->prevFlags & 0x10)) {
+            Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_SINK_WOOD_FLOOR);
+        }
+        Math_SmoothStepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y - 8.0f, 1.0f, 2.0f, 0.01f);
+    } else {
+        if (this->prevFlags & 0x10) {
+            Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_REBOUND_WOOD_FLOOR);
+        }
+        Math_SmoothStepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y, 1.0f, 2.0f, 0.01f);
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Danpei_Movebg/func_80AF7354.s")
+void func_80AF71FC(BgDanpeiMovebg* this, PlayState* play) {
+    SubS_ActorPathing_Update(play, &this->actorPath, SubS_ActorPathing_ComputePointInfo, func_80AF6DE0,
+                             SubS_ActorPathing_MoveWithoutGravityReverse, SubS_ActorPathing_SetNextPoint);
+    Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_PLATE_LIFT_LEVEL - SFX_FLAG);
+    if (this->actorPath.flags & ACTOR_PATHING_REACHED_END_TEMPORARY) {
+        if (this->flags & 2) {
+            this->flags &= ~0x2;
+        }
+        this->actionFunc = func_80AF72F8;
+    } else {
+        this->flags = func_80AF705C(this, this->flags);
+        if ((this->flags & 0x10) || (this->flags & 0xC) == 0xC) {
+            this->actionFunc = func_80AF746C;
+        } else if ((this->flags & 0x1C) == 0) {
+            this->actorPath.flags |= ACTOR_PATHING_MOVE_BACKWARDS;
+            this->dyna.actor.speed = 2.0f;
+            this->actionFunc = func_80AF7354;
+        }
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Danpei_Movebg/func_80AF746C.s")
+void func_80AF72F8(BgDanpeiMovebg* this, PlayState* play) {
+    this->flags = func_80AF705C(this, this->flags);
+    if (!(this->flags & 0x1C)) {
+        this->actorPath.flags |= ACTOR_PATHING_MOVE_BACKWARDS;
+        this->dyna.actor.speed = 2.0f;
+        this->actionFunc = func_80AF7354;
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Danpei_Movebg/func_80AF74CC.s")
+void func_80AF7354(BgDanpeiMovebg* this, PlayState* play) {
+    Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_PLATE_LIFT_LEVEL - SFX_FLAG);
+    this->flags = func_80AF705C(this, this->flags);
+    SubS_ActorPathing_Update(play, &this->actorPath, SubS_ActorPathing_ComputePointInfo, func_80AF6DE0,
+                             SubS_ActorPathing_MoveWithoutGravityReverse, SubS_ActorPathing_SetNextPoint);
+    if ((this->flags & 0x10) || (this->flags & 0xC) == 0xC) {
+        this->actionFunc = func_80AF746C;
+    } else if ((this->flags & 0xC) && (this->flags & 0xC) != 0xC) {
+        this->actorPath.flags &= ~ACTOR_PATHING_MOVE_BACKWARDS;
+        this->dyna.actor.speed = 1.0f;
+        if (this->flags & 4) {
+            this->flags |= 2;
+        }
+        this->actionFunc = func_80AF71FC;
+    }
+    if (this->actorPath.flags & ACTOR_PATHING_REACHED_END_TEMPORARY) {
+        this->actorPath.flags &= ~ACTOR_PATHING_MOVE_BACKWARDS;
+        this->flags &= ~2;
+        this->dyna.actor.speed = 1.0f;
+        this->actionFunc = func_80AF70FC;
+    }
+}
+
+void func_80AF746C(BgDanpeiMovebg* this, PlayState* arg1) {
+    this->flags = func_80AF705C(this, this->flags);
+    if (!(this->flags & 0x18)) {
+        if (this->actorPath.flags & ACTOR_PATHING_MOVE_BACKWARDS) {
+            this->actionFunc = func_80AF7354;
+        } else {
+            this->actionFunc = func_80AF71FC;
+        }
+    }
+}
+
+void func_80AF74CC(Actor* thisx, PlayState* play) {
+    BgDanpeiMovebg* this = THIS;
+    if (this->dList != NULL) {
+        Gfx_DrawDListOpa(play, this->dList);
+    }
+}

src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.h

@@ -7,12 +7,17 @@ struct BgDanpeiMovebg;
 
 typedef void (*BgDanpeiMovebgActionFunc)(struct BgDanpeiMovebg*, PlayState*);
 
+#define BGDANPEIMOVEBG_GET_PATH_INDEX(thisx) ((thisx)->params & 0x7F)
+#define BGDANPEIMOVEBG_GET_TYPE(thisx)      (((thisx)->params >> 0xE) & 3)
+
 typedef struct BgDanpeiMovebg {
     /* 0x000 */ DynaPolyActor dyna;
     /* 0x15C */ BgDanpeiMovebgActionFunc actionFunc;
-    /* 0x160 */ char unk_160[0x6C];
-    /* 0x1CC */ u16 unk_1CC;
-    /* 0x1CE */ char unk_1CE[0xA];
+    /* 0x160 */ ActorPathing actorPath;
+    /* 0x1CC */ u16 flags;
+    /* 0x1CE */ u16 prevFlags;
+    /* 0x1D0 */ Gfx* dList;
+    /* 0x1D4 */ s8 bankIdx;
 } BgDanpeiMovebg; // size = 0x1D8
 
 #endif // Z_BG_DANPEI_MOVEBG_H

src/overlays/actors/ovl_En_Tk/z_en_tk.c

@@ -1297,8 +1297,8 @@ void EnTk_Update(Actor* thisx, PlayState* play) {
 
         if (platform != NULL) {
             if (platform->dyna.actor.id == ACTOR_BG_DANPEI_MOVEBG) {
-                platform->unk_1CC |= 1;
-                if (platform->unk_1CC & 2) {
+                platform->flags |= 1;
+                if (platform->flags & 2) {
                     this->unk_2CA |= 1;
                 }
             }