En_Time_Tag (#810)

* En_Time_Tag

* BSS

* PR

* PR

include/z64.h

@@ -794,12 +794,18 @@ typedef struct {
     /* 0x24 */ u32 flags;
 } PreRenderParams; // size = 0x28
 
+typedef struct {
+    /* 0x00 */ u8 unk00;
+    /* 0x01 */ u8 unk01;
+} MsgCtx11F00;
+
 typedef struct {
     /* 0x00000 */ View view;
     /* 0x00168 */ Font font;
     /* 0x11EF4 */ char unk_11EF4[0x4];
     /* 0x11EF8 */ UNK_PTR unk11EF8;
-    /* 0x11EFC */ UNK_TYPE1 unk11EFC[0x8];
+    /* 0x11EFC */ UNK_TYPE1 unk11EFC[0x4];
+    /* 0x11F00 */ MsgCtx11F00* unk11F00;
     /* 0x11F04 */ u16 currentTextId;
     /* 0x11F06 */ UNK_TYPE1 pad11F06[0x4];
     /* 0x11F0A */ u8 unk11F0A;

include/z64player.h

@@ -188,7 +188,6 @@ typedef struct {
 
 typedef void (*PlayerFuncD58)(struct GlobalContext*, struct Player*);
 
-
 typedef struct Player {
     /* 0x000 */ Actor actor;
     /* 0x144 */ s8 currentShield;

spec

@@ -3387,8 +3387,7 @@ beginseg
     name "ovl_En_Time_Tag"
     compress
     include "build/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.o"
-    include "build/data/ovl_En_Time_Tag/ovl_En_Time_Tag.data.o"
+    include "build/src/overlays/actors/ovl_En_Time_Tag/ovl_En_Time_Tag_reloc.o"
-    include "build/data/ovl_En_Time_Tag/ovl_En_Time_Tag.reloc.o"
 endseg
 
 beginseg

src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c

@@ -5,6 +5,7 @@
  */
 
 #include "z_en_time_tag.h"
+#include "overlays/actors/ovl_En_Elf/z_en_elf.h"
 
 #define FLAGS (ACTOR_FLAG_10)
 
@@ -29,7 +30,6 @@ void func_80ACA724(EnTimeTag* this, GlobalContext* globalCtx);
 void func_80ACA7C4(EnTimeTag* this, GlobalContext* globalCtx);
 void func_80ACA840(EnTimeTag* this, GlobalContext* globalCtx);
 
-#if 0
 const ActorInit En_Time_Tag_InitVars = {
     ACTOR_EN_TIME_TAG,
     ACTORCAT_ITEMACTION,
@@ -42,40 +42,268 @@ const ActorInit En_Time_Tag_InitVars = {
     (ActorFunc)NULL,
 };
 
-#endif
+void EnTimeTag_Init(Actor* thisx, GlobalContext* globalCtx) {
+    EnTimeTag* this = THIS;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/EnTimeTag_Init.s")
+    this->actionFunc = func_80ACA840;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/EnTimeTag_Destroy.s")
+    switch (ENTIMETAG_GET_E000(&this->actor)) {
+        case 4:
+            if ((gSaveContext.save.weekEventReg[8] & 0x40) || (CURRENT_DAY != 3)) {
+                Actor_MarkForDeath(&this->actor);
+                return;
+            }
+            this->actor.home.rot.x = 0;
+            this->actor.home.rot.y = 0;
+            break;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80AC9FD4.s")
+        case 2:
+            this->actionFunc = func_80ACA0A8;
+            this->actor.flags |= ACTOR_FLAG_2000000;
+            break;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80AC9FE4.s")
+        case 1:
+            this->actionFunc = func_80ACA268;
+            this->actor.flags |= ACTOR_FLAG_2000000;
+            if (CHECK_QUEST_ITEM(QUEST_SONG_SOARING)) {
+                this->actor.textId = 0xC02;
+                return;
+            }
+            this->actor.textId = 0;
+            break;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA0A8.s")
+        case 3:
+            this->actionFunc = func_80ACA5F8;
+            this->actor.textId = 0;
+            this->actor.home.rot.x = 0;
+            break;
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA12C.s")
+void EnTimeTag_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA184.s")
+void func_80AC9FD4(EnTimeTag* this, GlobalContext* globalCtx) {
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA208.s")
+void func_80AC9FE4(EnTimeTag* this, GlobalContext* globalCtx) {
+    if (ActorCutscene_GetCanPlayNext(this->actor.cutscene)) {
+        ActorCutscene_StartAndSetUnkLinkFields(this->actor.cutscene, &this->actor);
+        this->actionFunc = func_80AC9FD4;
+        gSaveContext.unk_3DD0[3] = 0;
+        if (CHECK_QUEST_ITEM(QUEST_REMAINS_ODOWLA) && CHECK_QUEST_ITEM(QUEST_REMAINS_GOHT) &&
+            CHECK_QUEST_ITEM(QUEST_REMAINS_GYORG) && CHECK_QUEST_ITEM(QUEST_REMAINS_TWINMOLD)) {
+            gSaveContext.save.weekEventReg[25] |= 2;
+        }
+    } else {
+        ActorCutscene_SetIntentToPlay(this->actor.cutscene);
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA268.s")
+void func_80ACA0A8(EnTimeTag* this, GlobalContext* globalCtx) {
+    EnTimeTag* this2 = this;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA348.s")
+    if ((globalCtx->msgCtx.ocarinaMode == 3) && (globalCtx->msgCtx.unk1202E == 4)) {
+        if (this->actor.cutscene != -1) {
+            this->actionFunc = func_80AC9FE4;
+            ActorCutscene_SetIntentToPlay(this2->actor.cutscene);
+            gSaveContext.unk_3DD0[3] = 0;
+        }
+        globalCtx->msgCtx.ocarinaMode = 4;
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA3C0.s")
+void func_80ACA12C(EnTimeTag* this, GlobalContext* globalCtx) {
+    if (ActorCutscene_GetCurrentIndex() != this->actor.cutscene) {
+        this->actionFunc = func_80ACA268;
+        this->actor.textId = 0xC02;
+        Item_Give(globalCtx, ITEM_SONG_SOARING);
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA418.s")
+void func_80ACA184(EnTimeTag* this, GlobalContext* globalCtx) {
+    if (ActorCutscene_GetCurrentIndex() == 0x7C) {
+        ActorCutscene_Stop(0x7C);
+        ActorCutscene_SetIntentToPlay(this->actor.cutscene);
+    } else if (ActorCutscene_GetCanPlayNext(this->actor.cutscene)) {
+        ActorCutscene_Start(this->actor.cutscene, &this->actor);
+        this->actionFunc = func_80ACA12C;
+    } else {
+        ActorCutscene_SetIntentToPlay(this->actor.cutscene);
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA5F8.s")
+void func_80ACA208(EnTimeTag* this, GlobalContext* globalCtx) {
+    if ((Message_GetState(&globalCtx->msgCtx) == 5) && Message_ShouldAdvance(globalCtx)) {
+        func_801477B4(globalCtx);
+        this->actionFunc = func_80ACA268;
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA714.s")
+void func_80ACA268(EnTimeTag* this, GlobalContext* globalCtx) {
+    if (Actor_ProcessTalkRequest(&this->actor, &globalCtx->state)) {
+        if (this->actor.textId == 0) {
+            this->actionFunc = func_80ACA184;
+        } else {
+            this->actionFunc = func_80ACA208;
+        }
+    } else if ((this->actor.xzDistToPlayer < 100.0f) && Player_IsFacingActor(&this->actor, 0x3000, globalCtx) &&
+               (Flags_GetSwitch(globalCtx, ENTIMETAG_GET_SWITCHFLAG(&this->actor)) ||
+                CHECK_QUEST_ITEM(QUEST_SONG_SOARING))) {
+        this->actor.flags |= ACTOR_FLAG_1;
+        func_800B8614(&this->actor, globalCtx, 110.0f);
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA724.s")
+void func_80ACA348(EnTimeTag* this, GlobalContext* globalCtx) {
+    if (this->actor.home.rot.x > 0) {
+        this->actor.home.rot.x--;
+        return;
+    }
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA7C4.s")
+    if (this->actor.home.rot.z != 0) {
+        func_80151938(globalCtx, 0x1230);
+    } else {
+        func_80151938(globalCtx, 0x122D);
+    }
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA840.s")
+    this->actionFunc = func_80ACA418;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/EnTimeTag_Update.s")
+void func_80ACA3C0(EnTimeTag* this, GlobalContext* globalCtx) {
+    if ((globalCtx->msgCtx.unk11F00->unk01 == 0) && (globalCtx->msgCtx.msgMode == 0x1B)) {
+        this->actor.home.rot.x = 5;
+        this->actionFunc = func_80ACA348;
+        globalCtx->msgCtx.unk11F10 = 0;
+        globalCtx->msgCtx.msgMode = 0;
+    }
+}
+
+void func_80ACA418(EnTimeTag* this, GlobalContext* globalCtx) {
+    switch (Message_GetState(&globalCtx->msgCtx)) {
+        case 5:
+            if (Message_ShouldAdvance(globalCtx)) {
+                switch (globalCtx->msgCtx.currentTextId) {
+                    case 0x101C:
+                    case 0x101D:
+                    case 0x101E:
+                    case 0x122D:
+                        func_80151938(globalCtx, globalCtx->msgCtx.currentTextId + 1);
+                        break;
+
+                    case 0x101F:
+                    case 0x122A:
+                    case 0x1230:
+                        func_801477B4(globalCtx);
+                        this->actionFunc = func_80ACA5F8;
+                        if (ActorCutscene_GetCurrentIndex() == this->actor.cutscene) {
+                            ActorCutscene_Stop(this->actor.cutscene);
+                        }
+                        break;
+
+                    case 0x122B:
+                        func_80152434(globalCtx, 0x3F);
+                        this->actionFunc = func_80ACA3C0;
+                        this->actor.home.rot.z = 0;
+                        break;
+
+                    case 0x122E:
+                        func_80152434(globalCtx, 0x40);
+                        this->actionFunc = func_80ACA3C0;
+                        this->actor.home.rot.z = 1;
+                        break;
+                }
+            }
+            break;
+
+        case 2:
+            this->actionFunc = func_80ACA5F8;
+            break;
+    }
+
+    if (this->actor.home.rot.x != 0) {
+        if (this->actor.cutscene == -1) {
+            this->actor.home.rot.x = 0;
+        } else if (ActorCutscene_GetCurrentIndex() == 0x7C) {
+            ActorCutscene_Stop(0x7C);
+            ActorCutscene_SetIntentToPlay(this->actor.cutscene);
+        } else if (ActorCutscene_GetCanPlayNext(this->actor.cutscene)) {
+            ActorCutscene_Start(this->actor.cutscene, &this->actor);
+            this->actor.home.rot.x = 0;
+        } else {
+            ActorCutscene_SetIntentToPlay(this->actor.cutscene);
+        }
+    }
+}
+
+void func_80ACA5F8(EnTimeTag* this, GlobalContext* globalCtx) {
+    if (Actor_ProcessTalkRequest(&this->actor, &globalCtx->state)) {
+        if (gSaveContext.save.playerForm == PLAYER_FORM_ZORA) {
+            if (ENTIMETAG_GET_SWITCHFLAG(&this->actor) == 1) {
+                Message_StartTextbox(globalCtx, 0x101C, &this->actor);
+            } else {
+                Message_StartTextbox(globalCtx, 0x122B, &this->actor);
+            }
+            this->actor.home.rot.x = 1;
+        } else {
+            Message_StartTextbox(globalCtx, 0x122A, &this->actor);
+            if (0) {}
+            ((EnElf*)GET_PLAYER(globalCtx)->tatlActor)->unk_264 |= 4;
+            Actor_ChangeFocus(&this->actor, globalCtx, GET_PLAYER(globalCtx)->tatlActor);
+            this->actor.home.rot.x = 0;
+        }
+        this->actionFunc = func_80ACA418;
+    } else if ((this->actor.xzDistToPlayer < 100.0f) && Player_IsFacingActor(&this->actor, 0x3000, globalCtx)) {
+        func_800B8614(&this->actor, globalCtx, 110.0f);
+    }
+}
+
+void func_80ACA714(EnTimeTag* this, GlobalContext* globalCtx) {
+}
+
+void func_80ACA724(EnTimeTag* this, GlobalContext* globalCtx) {
+    if (Message_GetState(&globalCtx->msgCtx) == 5) {
+        globalCtx->nextEntranceIndex = globalCtx->setupExitList[ENTIMETAG_GET_1F(&this->actor)];
+        globalCtx->sceneLoadFlag = 0x14;
+        if (!ENTIMETAG_GET_E000(&this->actor)) {
+            Actor_PlaySfxAtPos(&this->actor, NA_SE_OC_DOOR_OPEN);
+        }
+        this->actionFunc = func_80ACA714;
+    }
+}
+
+void func_80ACA7C4(EnTimeTag* this, GlobalContext* globalCtx) {
+    if (!(gSaveContext.save.weekEventReg[63] & 1) && !(gSaveContext.save.weekEventReg[63] & 2)) {
+        func_800B7298(globalCtx, &this->actor, 7);
+        Message_StartTextbox(globalCtx, ENTIMETAG_GET_1FE0(&this->actor) + 0x1883, NULL);
+        this->actionFunc = func_80ACA724;
+    }
+}
+
+void func_80ACA840(EnTimeTag* this, GlobalContext* globalCtx) {
+    s16 temp_ft4;
+    s16 temp_hi;
+
+    if ((globalCtx->sceneNum != SCENE_YADOYA) || (INV_CONTENT(ITEM_ROOM_KEY) != ITEM_ROOM_KEY)) {
+        temp_ft4 = gSaveContext.save.time * (24.0f / 0x10000); // TIME_TO_HOURS_F
+        temp_hi = (s32)TIME_TO_MINUTES_F(gSaveContext.save.time) % 60;
+        if (gSaveContext.save.weekEventReg[63] & 1) {
+            if (gSaveContext.save.weekEventReg[63] & 2) {
+                this->actionFunc = func_80ACA7C4;
+            } else if ((temp_ft4 == this->actor.home.rot.x) && (temp_hi == this->actor.home.rot.y)) {
+                gSaveContext.save.weekEventReg[63] |= 2;
+            }
+        } else if ((temp_ft4 == this->actor.home.rot.x) && (temp_hi == this->actor.home.rot.y) &&
+                   !Play_InCsMode(globalCtx)) {
+            func_800B7298(globalCtx, &this->actor, 7);
+            Message_StartTextbox(globalCtx, ENTIMETAG_GET_1FE0(&this->actor) + 0x1883, NULL);
+            this->actionFunc = func_80ACA724;
+        }
+    }
+}
+
+void EnTimeTag_Update(Actor* thisx, GlobalContext* globalCtx) {
+    EnTimeTag* this = THIS;
+
+    this->actionFunc(this, globalCtx);
+}

src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h

@@ -7,6 +7,11 @@ struct EnTimeTag;
 
 typedef void (*EnTimeTagActionFunc)(struct EnTimeTag*, GlobalContext*);
 
+#define ENTIMETAG_GET_1F(thisx) ((thisx)->params & 0x1F)
+#define ENTIMETAG_GET_SWITCHFLAG(thisx) ((thisx)->params & 0x7F)
+#define ENTIMETAG_GET_1FE0(thisx) (((thisx)->params & 0x1FE0) >> 0x5)
+#define ENTIMETAG_GET_E000(thisx) (((thisx)->params & 0xE000) >> 0xD)
+
 typedef struct EnTimeTag {
     /* 0x0000 */ Actor actor;
     /* 0x0144 */ EnTimeTagActionFunc actionFunc;