Bg_ingate OK (#643)

* close, 2 functions left, both close * documenting what I can * fixing things * fixing * changing weekEventReg * master fix * ran actorfixer
2026-07-07 04:54:55 -04:00 · 2022-03-05 10:22:43 -05:00
parent 26d71ffbf6
commit 10a1ef8f1d
6 changed files with 367 additions and 37 deletions
@@ -1,9 +1,9 @@
 <Root>
    <File Name="object_sichitai_obj" Segment="6">
-        <DList Name="object_sichitai_obj_DL_0006B0" Offset="0x6B0" />
-        <Texture Name="object_sichitai_obj_Tex_000878" OutName="tex_000878" Format="rgba16" Width="16" Height="16" Offset="0x878" />
-        <Texture Name="object_sichitai_obj_Tex_000A78" OutName="tex_000A78" Format="rgba16" Width="32" Height="32" Offset="0xA78" />
-        <Collision Name="object_sichitai_obj_Colheader_0016DC" Offset="0x16DC" />
+        <DList Name="gSichitaiBoat" Offset="0x6B0" />
+        <Texture Name="gSichitaiThwartTex" OutName="tex_000878" Format="rgba16" Width="16" Height="16" Offset="0x878" />
+        <Texture Name="gSichitaiHullTex" OutName="tex_000A78" Format="rgba16" Width="32" Height="32" Offset="0xA78" />
+        <Collision Name="gSichitaiBoatCol" Offset="0x16DC" />
        <DList Name="object_sichitai_obj_DL_001820" Offset="0x1820" />
        <Texture Name="object_sichitai_obj_Tex_001908" OutName="tex_001908" Format="rgba16" Width="32" Height="32" Offset="0x1908" />
        <Texture Name="object_sichitai_obj_Tex_002108" OutName="tex_002108" Format="i4" Width="64" Height="64" Offset="0x2108" />
@@ -1624,8 +1624,7 @@ beginseg
    name "ovl_Bg_Ingate"
    compress
    include "build/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.o"
-    include "build/data/ovl_Bg_Ingate/ovl_Bg_Ingate.data.o"
-    include "build/data/ovl_Bg_Ingate/ovl_Bg_Ingate.reloc.o"
+    include "build/src/overlays/actors/ovl_Bg_Ingate/ovl_Bg_Ingate_reloc.o"
 endseg

 beginseg
@@ -5,6 +5,7 @@
 */

 #include "z_bg_ingate.h"
+#include "objects/object_sichitai_obj/object_sichitai_obj.h"

 #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20)

@@ -15,7 +16,16 @@ void BgIngate_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void BgIngate_Update(Actor* thisx, GlobalContext* globalCtx);
 void BgIngate_Draw(Actor* thisx, GlobalContext* globalCtx);

-#if 0
+Actor* BgIngate_FindActor(BgIngate* this, GlobalContext* globalCtx, u8 actorCat, s16 actorId);
+s32 func_80953BEC(BgIngate* this);
+void func_80953B40(BgIngate* this);
+void func_80953F8C(BgIngate* this, GlobalContext* globalCtx);
+void func_80953F9C(BgIngate* this, GlobalContext* globalCtx);
+void func_809541B8(BgIngate* this, GlobalContext* globalCtx);
+void func_809542A0(BgIngate* this, GlobalContext* globalCtx);
+void func_80954340(BgIngate* this, GlobalContext* globalCtx);
+void func_809543D4(BgIngate* this, GlobalContext* globalCtx);
+
 const ActorInit Bg_Ingate_InitVars = {
    ACTOR_BG_INGATE,
    ACTORCAT_BG,
@@ -28,41 +38,355 @@ const ActorInit Bg_Ingate_InitVars = {
    (ActorFunc)BgIngate_Draw,
 };

-#endif
+/**
+ * @brief Searches for an actor based on the parameters given to the function. Returns Actor* of actor found or NULL
+ *
+ * @param this
+ * @param globalCtx
+ * @param actorCat - Category of Actor
+ * @param actorId - ID of actor to search for
+ * @return Actor*
+ */
+Actor* BgIngate_FindActor(BgIngate* this, GlobalContext* globalCtx, u8 actorCat, s16 actorId) {
+    Actor* foundActor = NULL;
+    Actor* tempActor;

-extern UNK_TYPE D_060006B0;
-extern UNK_TYPE D_060016DC;
+    while (true) {
+        foundActor = SubS_FindActor(globalCtx, foundActor, actorCat, actorId);

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ingate/func_80953A90.s")
+        if ((foundActor == NULL) || (((this != (BgIngate*)foundActor)) && (foundActor->update != NULL))) {
+            break;
+        }

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ingate/func_80953B40.s")
+        tempActor = foundActor->next;
+        if (tempActor == NULL) {
+            foundActor = NULL;
+            break;
+        }
+        foundActor = tempActor;
+    }

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ingate/func_80953BEC.s")
+    return foundActor;
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ingate/func_80953DA8.s")
+void func_80953B40(BgIngate* this) {
+    s32 temp;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ingate/func_80953E38.s")
+    if (!(gSaveContext.eventInf[3] & 0x20)) {
+        this->unk180 = 0xFA0;
+        this->unk168 = 4;
+    } else {
+        this->unk180 = 0x7D0;
+        this->unk168 = 1;
+    }
+    temp = this->unk164->count - 2;
+    this->unk184 = this->unk180 / temp;
+    this->unk188 = 2;
+    this->unk18C = 0;
+    this->unk160 &= ~0x1;
+    this->unk160 &= ~0x2;
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ingate/func_80953EA4.s")
+s32 func_80953BEC(BgIngate* this) {
+    f32 sp74[265];
+    Vec3f sp68;
+    Vec3f sp5C;
+    Vec3f unkVec;
+    s16 yaw;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ingate/func_80953F14.s")
+    func_8013AF00(sp74, 3, this->unk164->count + 3);
+    if (!(this->unk160 & 1)) {
+        unkVec = gZeroVec3f;
+        func_8013B6B0(this->unk164, &this->unk17C, &this->unk18C, this->unk184, this->unk180, &this->unk188, sp74,
+                      &unkVec, this->unk168);
+        this->unk160 |= 1;
+    } else {
+        unkVec = this->unk170;
+    }
+    this->dyna.actor.world.pos.x = unkVec.x;
+    this->dyna.actor.world.pos.z = unkVec.z;
+    this->unk170 = gZeroVec3f;
+    if (func_8013B6B0(this->unk164, &this->unk17C, &this->unk18C, this->unk184, this->unk180, &this->unk188, sp74,
+                      &this->unk170, this->unk168) != 0) {
+        this->unk160 |= 2;
+    } else {
+        sp68 = this->dyna.actor.world.pos;
+        sp5C = this->unk170;
+        yaw = Math_Vec3f_Yaw(&sp68, &sp5C);
+        this->dyna.actor.world.rot.y = yaw;
+        this->dyna.actor.shape.rot.y = yaw;
+    }

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ingate/func_80953F8C.s")
+    return false;
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ingate/func_80953F9C.s")
+s32 func_80953DA8(BgIngate* this, GlobalContext* globalCtx) {
+    Camera* camera = Play_GetCamera(globalCtx, CAM_ID_MAIN);

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ingate/func_809541B8.s")
+    if (gSaveContext.eventInf[3] & 0x20) {
+        func_800B7298(globalCtx, &this->dyna.actor, 7);
+    } else {
+        gSaveContext.eventInf[4] |= 2;
+    }
+    func_800DFAC8(camera, 47);
+    globalCtx->unk_1887C = 0x63;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ingate/func_809542A0.s")
+    return false;
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ingate/func_80954340.s")
+void func_80953E38(GlobalContext* globalCtx) {
+    func_800DFAC8(Play_GetCamera(globalCtx, CAM_ID_MAIN), 1);

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ingate/func_809543D4.s")
+    if (!(gSaveContext.eventInf[3] & 0x20)) {
+        gSaveContext.eventInf[4] &= (u8)~2;
+    }

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ingate/BgIngate_Init.s")
+    globalCtx->unk_1887C = -1;
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ingate/BgIngate_Destroy.s")
+void func_80953EA4(BgIngate* this, GlobalContext* globalCtx) {
+    Player* player = GET_PLAYER(globalCtx);

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ingate/BgIngate_Update.s")
+    func_800B7298(globalCtx, &this->dyna.actor, 0x3A);
+    player->unk_3A0.x = this->dyna.actor.world.pos.x;
+    player->unk_3A0.z = this->dyna.actor.world.pos.z;
+    this->unk160 &= ~0x4;
+    this->unk16A = 0x1E;
+    this->actionFunc = func_80954340;
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ingate/BgIngate_Draw.s")
+void func_80953F14(BgIngate* this, GlobalContext* globalCtx) {
+    Player* player = GET_PLAYER(globalCtx);
+
+    player->actor.shape.rot.y = this->dyna.actor.shape.rot.y;
+    player->actor.world.rot.y = player->actor.shape.rot.y;
+    player->currentYaw = player->actor.shape.rot.y;
+    player->actor.focus.rot.y = player->actor.shape.rot.y;
+    this->unk160 |= 0x10;
+    func_80953DA8(this, globalCtx);
+    if (this->unk164 != 0) {
+        func_80953B40(this);
+    }
+    this->unk16E = -1;
+    this->actionFunc = func_80953F9C;
+}
+
+void func_80953F8C(BgIngate* this, GlobalContext* globalCtx) {
+}
+
+void func_80953F9C(BgIngate* this, GlobalContext* globalCtx) {
+    Player* player = GET_PLAYER(globalCtx);
+    Camera* camera = Play_GetCamera(globalCtx, CAM_ID_MAIN);
+
+    if (!(gSaveContext.eventInf[4] & 1)) {
+
+        if (!(gSaveContext.eventInf[3] & 0x20) && (this->unk160 & 0x10) && (this->unk16C == 0)) {
+            this->dyna.actor.textId = 0x9E3;
+            Message_StartTextbox(globalCtx, this->dyna.actor.textId, NULL);
+            this->unk160 &= ~0x10;
+        }
+
+        if (this->unk160 & 2) {
+
+            if (this->unk164->unk1 != 0xFF) {
+                func_80953E38(globalCtx);
+                func_800B7298(globalCtx, &this->dyna.actor, 7);
+                this->dyna.actor.textId = 0x9E4;
+                Message_StartTextbox(globalCtx, this->dyna.actor.textId, NULL);
+                this->unk16C += 1;
+                gSaveContext.weekEventReg[90] |= 0x40;
+                this->actionFunc = func_809543D4;
+            } else {
+
+                if (!(gSaveContext.eventInf[3] & 0x20)) {
+                    gSaveContext.eventInf[4] &= (u8)~2;
+                } else {
+                    gSaveContext.eventInf[4] |= 1;
+                }
+                this->actionFunc = func_809542A0;
+            }
+        } else if ((ActorCutscene_GetCurrentIndex() == -1) && (this->unk164 != NULL)) {
+            Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_CRUISER - SFX_FLAG);
+            func_80953BEC(this);
+        }
+    }
+    if (ActorCutscene_GetCurrentIndex() != this->unk16E) {
+        if (ActorCutscene_GetCurrentIndex() != -1) {
+            func_800DFAC8(camera, 1);
+            player->stateFlags1 |= 0x20;
+            globalCtx->actorCtx.unk5 &= ~0x4;
+        } else {
+            func_800DFAC8(camera, 47);
+            player->stateFlags1 &= ~0x20;
+        }
+    }
+    this->unk16E = ActorCutscene_GetCurrentIndex();
+}
+
+void func_809541B8(BgIngate* this, GlobalContext* globalCtx) {
+    Player* player = GET_PLAYER(globalCtx);
+
+    if (this->unk160 & 0x4) {
+        if ((player->transformation == PLAYER_FORM_HUMAN) && (player->actor.bgCheckFlags & 1) &&
+            (this->dyna.actor.xzDistToPlayer < 40.0f)) {
+            if (this->dyna.actor.playerHeightRel > 15.0f) {
+                func_800B7298(globalCtx, &this->dyna.actor, 7);
+                this->dyna.actor.textId = 0x9E6;
+                Message_StartTextbox(globalCtx, this->dyna.actor.textId, NULL);
+                this->actionFunc = func_809543D4;
+            }
+        }
+    } else if (!DynaPolyActor_IsInRidingMovingState(&this->dyna)) {
+        this->unk160 |= 4;
+    }
+}
+
+void func_809542A0(BgIngate* this, GlobalContext* globalCtx) {
+    if (gSaveContext.eventInf[5] & 1) {
+        globalCtx->nextEntranceIndex = 0xA820;
+        gSaveContext.eventInf[5] &= (u8)~1;
+    } else {
+        globalCtx->nextEntranceIndex = 0xA810;
+    }
+    gSaveContext.nextCutsceneIndex = 0;
+    globalCtx->sceneLoadFlag = 0x14;
+    globalCtx->unk_1887F = 3;
+    gSaveContext.nextTransition = 3;
+    this->actionFunc = func_80953F8C;
+    gSaveContext.weekEventReg[90] &= (u8)~0x40;
+    func_800FE498();
+}
+
+void func_80954340(BgIngate* this, GlobalContext* globalCtx) {
+    if (!DECR(this->unk16A)) {
+        if (this->unk164 != 0) {
+            func_800B7298(globalCtx, &this->dyna.actor, 6);
+            this->unk164 = &globalCtx->setupPathList[this->unk164->unk1];
+            func_80953F14(this, globalCtx);
+            func_800FE484();
+        }
+    }
+}
+
+void func_809543D4(BgIngate* this, GlobalContext* globalCtx) {
+    u8 talkState = Message_GetState(&globalCtx->msgCtx);
+
+    if (((talkState == 4) || (talkState == 5)) && func_80147624(globalCtx)) {
+        switch (this->dyna.actor.textId) {
+            case 0x9E4:
+                this->dyna.actor.textId = 0x9E5;
+                func_80151938(globalCtx, this->dyna.actor.textId);
+                break;
+            case 0x9E5:
+                if (globalCtx->msgCtx.choiceIndex == 0) {
+                    func_800B7298(globalCtx, &this->dyna.actor, 6);
+                    this->unk160 &= ~0x4;
+                    this->actionFunc = func_809541B8;
+                    func_800FE498();
+                    func_8019F208();
+                } else {
+                    if (this->unk164 != 0) {
+                        this->unk164 = &globalCtx->setupPathList[this->unk164->unk1];
+                    }
+                    func_80953F14(this, globalCtx);
+                    gSaveContext.weekEventReg[90] &= (u8)~0x40;
+                    func_8019F230();
+                }
+                func_801477B4(globalCtx);
+                break;
+            case 0x9E6:
+                if (globalCtx->msgCtx.choiceIndex == 0) {
+                    func_80953EA4(this, globalCtx);
+                    gSaveContext.weekEventReg[90] &= (u8)~0x40;
+                    func_8019F208();
+                } else {
+                    this = this;
+                    func_800B7298(globalCtx, &this->dyna.actor, 6);
+                    this->unk160 &= ~0x4;
+                    this->actionFunc = func_809541B8;
+                    func_800FE498();
+                    func_8019F230();
+                }
+                func_801477B4(globalCtx);
+                break;
+        }
+    }
+}
+
+void BgIngate_Init(Actor* thisx, GlobalContext* globalCtx2) {
+    GlobalContext* globalCtx = globalCtx2;
+    BgIngate* this = THIS;
+    s32 phi_a2;
+    Vec3s* sp38;
+    Vec3f sp2C;
+    Vec3f sp20;
+
+    if (BgIngate_FindActor(this, globalCtx, ACTORCAT_BG, ACTOR_BG_INGATE) == NULL) {
+        DynaPolyActor_Init(&this->dyna, 3);
+        DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &gSichitaiBoatCol);
+        this->unk160 = 0;
+        this->unk160 |= 0x8;
+        this->unk160 |= 0x10;
+        Actor_SetScale(&this->dyna.actor, 1.0f);
+        this->unk164 = func_8013BB34(globalCtx, BGINGATE_GET_FF(&this->dyna.actor), 0);
+        this->dyna.actor.room = -1;
+        if (gSaveContext.weekEventReg[20] & 2) {
+            gSaveContext.weekEventReg[90] &= (u8)~0x40;
+        }
+        if (!(gSaveContext.eventInf[3] & 0x20) && (gSaveContext.weekEventReg[90] & 0x40)) {
+            phi_a2 = 1;
+            this->unk16C = 1;
+            this->actionFunc = func_809541B8;
+        } else {
+            phi_a2 = 0;
+            if (globalCtx->curSpawn == 6) {
+                func_80953F14(this, globalCtx);
+                if (gSaveContext.eventInf[3] & 0x20) {
+                    func_80112AFC(globalCtx);
+                } else {
+                    gSaveContext.eventInf[4] |= 2;
+                }
+            } else {
+                this->actionFunc = func_80953F8C;
+            }
+        }
+        this->unk164 = func_8013BB34(globalCtx, BGINGATE_GET_FF(&this->dyna.actor), phi_a2);
+        if (this->unk164 != 0) {
+            sp38 = Lib_SegmentedToVirtual(this->unk164->points);
+            Math_Vec3s_ToVec3f(&sp2C, &sp38[0]);
+            Math_Vec3s_ToVec3f(&sp20, &sp38[1]);
+            this->dyna.actor.world.rot.y = Math_Vec3f_Yaw(&sp2C, &sp20);
+            this->dyna.actor.shape.rot.y = this->dyna.actor.world.rot.y;
+            this->dyna.actor.world.pos.x = sp2C.x;
+            this->dyna.actor.world.pos.y = -15.0f;
+            this->dyna.actor.world.pos.z = sp2C.z;
+        }
+        this->unk164 = func_8013BB34(globalCtx, BGINGATE_GET_FF(&this->dyna.actor), 0);
+    } else {
+        Actor_MarkForDeath(&this->dyna.actor);
+    }
+}
+
+void BgIngate_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+    BgIngate* this = THIS;
+
+    if (this->unk160 & 8) {
+        DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
+    }
+}
+
+void BgIngate_Update(Actor* thisx, GlobalContext* globalCtx) {
+    BgIngate* this = THIS;
+
+    this->actionFunc(this, globalCtx);
+}
+
+void BgIngate_Draw(Actor* thisx, GlobalContext* globalCtx) {
+    OPEN_DISPS(globalCtx->state.gfxCtx);
+
+    func_8012C28C(globalCtx->state.gfxCtx);
+    gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPDisplayList(POLY_OPA_DISP++, gSichitaiBoat);
+
+    CLOSE_DISPS(globalCtx->state.gfxCtx);
+}
@@ -7,11 +7,23 @@ struct BgIngate;

 typedef void (*BgIngateActionFunc)(struct BgIngate*, GlobalContext*);

+#define BGINGATE_GET_FF(thisx) ((thisx)->params & 0xFF)
+
 typedef struct BgIngate {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x18];
-    /* 0x015C */ BgIngateActionFunc actionFunc;
-    /* 0x0160 */ char unk_160[0x30];
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ BgIngateActionFunc actionFunc;
+    /* 0x160 */ u16 unk160;
+    /* 0x164 */ Path* unk164;
+    /* 0x168 */ s16 unk168;
+    /* 0x16A */ s16 unk16A;
+    /* 0x16C */ s16 unk16C;
+    /* 0x16E */ s16 unk16E;
+    /* 0x170 */ Vec3f unk170;
+    /* 0x17C */ f32 unk17C;
+    /* 0x180 */ s32 unk180;
+    /* 0x184 */ s32 unk184;
+    /* 0x188 */ s32 unk188;
+    /* 0x18C */ s32 unk18C;
 } BgIngate; // size = 0x190

 extern const ActorInit Bg_Ingate_InitVars;
@@ -7655,7 +7655,7 @@
    0x8095376C:("func_8095376C",),
    0x80953848:("func_80953848",),
    0x80953888:("EnHs_Draw",),
-    0x80953A90:("func_80953A90",),
+    0x80953A90:("BgIngate_FindActor",),
    0x80953B40:("func_80953B40",),
    0x80953BEC:("func_80953BEC",),
    0x80953DA8:("func_80953DA8",),
@@ -692,11 +692,6 @@ D_06012700 = 0x06012700;
 D_06012728 = 0x06012728;
 D_06012788 = 0x06012788;

-// ovl_Bg_Ingate
-
-D_060006B0 = 0x060006B0;
-D_060016DC = 0x060016DC;
-
 // ovl_Bg_Keikoku_Saku

 D_06001640 = 0x06001640;