Dm_Tag (#922)

* Dm_Tag

* PR

* Fix

* PR

* PR

spec

@@ -5029,8 +5029,7 @@ beginseg
     name "ovl_Dm_Tag"
     compress
     include "build/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.o"
-    include "build/data/ovl_Dm_Tag/ovl_Dm_Tag.data.o"
-    include "build/data/ovl_Dm_Tag/ovl_Dm_Tag.reloc.o"
+    include "build/src/overlays/actors/ovl_Dm_Tag/ovl_Dm_Tag_reloc.o"
 endseg
 
 beginseg

src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c

@@ -18,7 +18,6 @@ void func_80C229AC(DmTag* this, PlayState* play);
 void func_80C229EC(DmTag* this, PlayState* play);
 void func_80C229FC(DmTag* this, PlayState* play);
 
-#if 0
 const ActorInit Dm_Tag_InitVars = {
     ACTOR_DM_TAG,
     ACTORCAT_ITEMACTION,
@@ -31,30 +30,236 @@ const ActorInit Dm_Tag_InitVars = {
     (ActorFunc)NULL,
 };
 
-#endif
+s32 D_80C22BF0[] = {
+    0x0E28F00C,
+    0x15090000,
+    0x10000000,
+};
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Tag/func_80C22350.s")
+s32 D_80C22BFC[] = {
+    0x0900000E, 0x28F10C09, 0x00000E28, 0xF20C0900, 0x000E28F3, 0x0C090000, 0x0E28F40C,
+    0x0900000E, 0x28F50C09, 0x00000E28, 0xF60C1511, 0x55040900, 0x00100000,
+};
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Tag/func_80C22400.s")
+s32 D_80C22C30[] = {
+    0x0E28EF0C,
+    0x10000000,
+};
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Tag/func_80C2247C.s")
+Actor* func_80C22350(DmTag* this, PlayState* play, u8 actorCat, s16 actorId) {
+    Actor* foundActor = NULL;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Tag/func_80C224D8.s")
+    while (true) {
+        foundActor = SubS_FindActor(play, foundActor, actorCat, actorId);
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Tag/func_80C227E8.s")
+        if ((foundActor == NULL) || (((this != (DmTag*)foundActor)) && (foundActor->update != NULL))) {
+            break;
+        }
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Tag/func_80C22880.s")
+        if (foundActor->next == NULL) {
+            foundActor = NULL;
+            break;
+        }
+        foundActor = foundActor->next;
+    }
+    return foundActor;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Tag/func_80C2291C.s")
+s32 func_80C22400(DmTag* this, s16 arg1) {
+    s32 ret = false;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Tag/func_80C229AC.s")
+    if (ActorCutscene_GetCurrentIndex() == 0x7C) {
+        ActorCutscene_Stop(0x7C);
+        ActorCutscene_SetIntentToPlay(arg1);
+    } else if (ActorCutscene_GetCanPlayNext(arg1)) {
+        ActorCutscene_StartAndSetUnkLinkFields(arg1, &this->actor);
+        ret = true;
+    } else {
+        ActorCutscene_SetIntentToPlay(arg1);
+    }
+    return ret;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Tag/func_80C229EC.s")
+s16 func_80C2247C(DmTag* this, s32 arg1) {
+    s32 i;
+    s16 cs = this->actor.cutscene;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Tag/func_80C229FC.s")
+    for (i = 0; i < arg1; i++) {
+        cs = ActorCutscene_GetAdditionalCutscene(cs);
+    }
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Tag/DmTag_Init.s")
+    return cs;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Tag/DmTag_Destroy.s")
+s32 func_80C224D8(DmTag* this, PlayState* play) {
+    s32 pad;
+    Actor* sp30;
+    Actor* sp2C;
+    s16 sp2A = this->actor.cutscene;
+    s32 ret = false;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Tag/DmTag_Update.s")
+    sp30 = func_80C22350(this, play, ACTORCAT_NPC, ACTOR_EN_AN);
+    sp2C = func_80C22350(this, play, ACTORCAT_NPC, ACTOR_EN_AH);
+
+    switch (this->unk_1A4) {
+        case 0:
+            if (func_80C22400(this, sp2A)) {
+                if ((sp2C != NULL) && (sp2C->update != NULL)) {
+                    Camera_SetTargetActor(Play_GetCamera(play, ActorCutscene_GetCurrentSubCamId(sp2A)), sp2C);
+                }
+                this->unk_1A4++;
+                ret = true;
+            }
+            break;
+
+        case 1:
+            if ((sp30 != NULL) && (sp30->update != NULL)) {
+                Camera_SetTargetActor(Play_GetCamera(play, ActorCutscene_GetCurrentSubCamId(func_80C2247C(this, 0))),
+                                      sp30);
+            }
+            this->unk_1A4++;
+            ret = true;
+            break;
+
+        case 2:
+            ActorCutscene_Stop(func_80C2247C(this, 0));
+            if (func_80C22400(this, func_80C2247C(this, 1))) {
+                this->unk_1A4++;
+                ret = true;
+            }
+            break;
+
+        case 3:
+            ActorCutscene_Stop(func_80C2247C(this, 1));
+            if (func_80C22400(this, func_80C2247C(this, 2))) {
+                this->unk_1A4++;
+                ret = true;
+            }
+            break;
+
+        case 4:
+            ActorCutscene_Stop(func_80C2247C(this, 2));
+            if (func_80C22400(this, func_80C2247C(this, 3))) {
+                this->unk_1A4++;
+                ret = true;
+            }
+            break;
+
+        case 5:
+            ActorCutscene_Stop(func_80C2247C(this, 3));
+            if (func_80C22400(this, func_80C2247C(this, 4))) {
+                this->unk_1A4++;
+                ret = true;
+            }
+            break;
+
+        case 6:
+            func_800B7298(play, &this->actor, 7);
+            play->nextEntrance = ENTRANCE(STOCK_POT_INN, 5);
+            gSaveContext.nextCutsceneIndex = 0;
+            play->transitionTrigger = TRANS_TRIGGER_START;
+            play->transitionType = TRANS_TYPE_02;
+            gSaveContext.nextTransitionType = TRANS_TYPE_06;
+            this->unk_1A4++;
+            break;
+    }
+    return ret;
+}
+
+s32 func_80C227E8(DmTag* this, PlayState* play) {
+    if (this->unk_1A4 == 0) {
+        func_800B7298(play, &this->actor, 7);
+        play->nextEntrance = ENTRANCE(STOCK_POT_INN, 4);
+        gSaveContext.nextCutsceneIndex = 0;
+        play->transitionTrigger = TRANS_TRIGGER_START;
+        play->transitionType = TRANS_TYPE_02;
+        gSaveContext.nextTransitionType = TRANS_TYPE_06;
+        this->unk_1A4++;
+    }
+    return false;
+}
+
+s32* func_80C22880(DmTag* this, PlayState* play) {
+    s32 time;
+
+    switch (this->unk_18E) {
+        case 1:
+            time = gSaveContext.save.time - 0x3FFC;
+            if ((time >= 0xA54B) && (time < 0xB54A) && (gSaveContext.save.day == 2)) {
+                this->msgEventCallback = func_80C227E8;
+                return D_80C22BF0;
+            }
+            return D_80C22C30;
+        case 2:
+            this->msgEventCallback = func_80C224D8;
+            return D_80C22BFC;
+    }
+    return NULL;
+}
+
+s32 func_80C2291C(DmTag* this, PlayState* play) {
+    s32 ret = false;
+
+    if (this->unk_18C & 7) {
+        if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
+            this->unk_18C |= 8;
+            SubS_UpdateFlags(&this->unk_18C, 0, 7);
+            this->msgEventScript = func_80C22880(this, play);
+            this->actionFunc = func_80C229FC;
+            ret = true;
+        }
+    }
+    return ret;
+}
+
+void func_80C229AC(DmTag* this, PlayState* play) {
+    SubS_UpdateFlags(&this->unk_18C, 3, 7);
+    this->actor.flags |= ACTOR_FLAG_1;
+}
+
+void func_80C229EC(DmTag* this, PlayState* play) {
+}
+
+void func_80C229FC(DmTag* this, PlayState* play) {
+    if (func_8010BF58(&this->actor, play, this->msgEventScript, this->msgEventCallback, &this->msgEventArg4)) {
+        this->actionFunc = func_80C229AC;
+    }
+}
+
+void DmTag_Init(Actor* thisx, PlayState* play) {
+    DmTag* this = (DmTag*)thisx;
+    Player* player = GET_PLAYER(play);
+
+    if (gSaveContext.save.weekEventReg[85] & 4) {
+        Actor_MarkForDeath(&this->actor);
+        return;
+    }
+
+    if ((play->sceneId == SCENE_YADOYA) && (play->curSpawn == 4)) {
+        player->stateFlags1 |= PLAYER_STATE1_20;
+        this->unk_18E = 2;
+        this->unk_18C = 0;
+        SubS_UpdateFlags(&this->unk_18C, 4, 7);
+        this->actor.flags &= ~ACTOR_FLAG_1;
+        this->actionFunc = func_80C229EC;
+    } else if (this->actor.room == 2) {
+        Actor_MarkForDeath(&this->actor);
+    } else {
+        this->actor.targetMode = 1;
+        this->unk_18E = 1;
+        this->unk_18C = 0;
+        this->actionFunc = func_80C229AC;
+    }
+}
+
+void DmTag_Destroy(Actor* thisx, PlayState* play) {
+}
+
+void DmTag_Update(Actor* thisx, PlayState* play) {
+    DmTag* this = THIS;
+
+    func_80C2291C(this, play);
+    this->actionFunc(this, play);
+    func_8013C964(&this->actor, play, 40.0f, fabsf(this->actor.playerHeightRel) + 1.0f, 0, this->unk_18C & 7);
+    Actor_SetFocus(&this->actor, 0.0f);
+}

src/overlays/actors/ovl_Dm_Tag/z_dm_tag.h

@@ -6,12 +6,19 @@
 struct DmTag;
 
 typedef void (*DmTagActionFunc)(struct DmTag*, PlayState*);
+typedef s32 (*DmTagMsgEventFunc)(struct DmTag*, PlayState*);
 
 typedef struct DmTag {
     /* 0x000 */ Actor actor;
-    /* 0x144 */ char unk_144[0x44];
+    /* 0x144 */ UNK_TYPE1 pad144[0x44];
     /* 0x188 */ DmTagActionFunc actionFunc;
-    /* 0x18C */ char unk_18C[0x20];
+    /* 0x18C */ u16 unk_18C;
+    /* 0x18E */ u8 unk_18E;
+    /* 0x190 */ s32* msgEventScript;
+    /* 0x194 */ s32 msgEventArg4;
+    /* 0x198 */ UNK_TYPE1 pad198[0xC];
+    /* 0x1A4 */ s16 unk_1A4;
+    /* 0x1A8 */ DmTagMsgEventFunc msgEventCallback;
 } DmTag; // size = 0x1AC
 
 extern const ActorInit Dm_Tag_InitVars;