From 200928b611e54827f5db23bd62c056d6d6df5f29 Mon Sep 17 00:00:00 2001 From: Thar0 <17233964+Thar0@users.noreply.github.com> Date: Mon, 22 May 2023 00:16:01 +0100 Subject: [PATCH] Decompiled --- spec | 3 +- src/overlays/actors/ovl_En_Kitan/z_en_kitan.c | 318 ++++++++++++++++-- src/overlays/actors/ovl_En_Kitan/z_en_kitan.h | 9 +- tools/disasm/functions.txt | 6 +- 4 files changed, 303 insertions(+), 33 deletions(-) diff --git a/spec b/spec index 57fca6cda..5261533d5 100644 --- a/spec +++ b/spec @@ -4790,8 +4790,7 @@ beginseg name "ovl_En_Kitan" compress include "build/src/overlays/actors/ovl_En_Kitan/z_en_kitan.o" - include "build/data/ovl_En_Kitan/ovl_En_Kitan.data.o" - include "build/data/ovl_En_Kitan/ovl_En_Kitan.reloc.o" + include "build/src/overlays/actors/ovl_En_Kitan/ovl_En_Kitan_reloc.o" endseg beginseg diff --git a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c index c9d40c1e7..a8d74132a 100644 --- a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c +++ b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c @@ -1,7 +1,7 @@ /* * File: z_en_kitan.c * Overlay: ovl_En_Kitan - * Description: + * Description: Keaton */ #include "z_en_kitan.h" @@ -13,8 +13,11 @@ void EnKitan_Init(Actor* thisx, PlayState* play); void EnKitan_Destroy(Actor* thisx, PlayState* play); void EnKitan_Update(Actor* thisx, PlayState* play); +void EnKitan_Draw(Actor* thisx, PlayState* play); + +void func_80C09708(EnKitan*, PlayState*); +void func_80C09B50(EnKitan*, PlayState*); -#if 0 ActorInit En_Kitan_InitVars = { ACTOR_EN_KITAN, ACTORCAT_NPC, @@ -27,50 +30,311 @@ ActorInit En_Kitan_InitVars = { (ActorFunc)NULL, }; -// static ColliderCylinderInit sCylinderInit = { -static ColliderCylinderInit D_80C09D50 = { - { COLTYPE_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_CYLINDER, }, - { ELEMTYPE_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, +static ColliderCylinderInit sCylinderInit = { + { + COLTYPE_NONE, + AT_NONE, + AC_ON | AC_TYPE_ENEMY, + OC1_ON | OC1_TYPE_ALL, + OC2_TYPE_1, + COLSHAPE_CYLINDER, + }, + { + ELEMTYPE_UNK0, + { 0x00000000, 0x00, 0x00 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_NONE | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, { 20, 40, 0, { 0, 0, 0 } }, }; -#endif +#define ENKITAN_GET_9(thisx) (((thisx)->params & 0xFE00) >> 9) -extern ColliderCylinderInit D_80C09D50; +void EnKitan_Init(Actor* thisx, PlayState* play) { + EnKitan* this = THIS; + s32 pad; -extern UNK_TYPE D_06000CE8; -extern UNK_TYPE D_06002770; + Actor_SetScale(&this->actor, 0.0f); + this->actionFunc = func_80C09B50; + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 12.0f); + SkelAnime_InitFlex(play, &this->skelAnime, &object_kitan_Skel_007FA8, &object_kitan_Anim_002770, this->jointTable, + this->morphTable, OBJECT_KITAN_LIMB_MAX); + Animation_PlayLoop(&this->skelAnime, &object_kitan_Anim_002770); + Collider_InitAndSetCylinder(play, &this->collider, &this->actor, &sCylinderInit); + this->actor.colChkInfo.mass = MASS_IMMOVABLE; + Collider_UpdateCylinder(&this->actor, &this->collider); + this->actor.velocity.y = -9.0f; + this->actor.terminalVelocity = -9.0f; + this->actor.gravity = -1.0f; + if (Player_GetMask(play) != PLAYER_MASK_KEATON || Flags_GetCollectible(play, ENKITAN_GET_9(&this->actor))) { + Actor_Kill(&this->actor); + return; + } + this->timer = 120; + this->actor.flags &= ~1; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Kitan/EnKitan_Init.s") +void EnKitan_Destroy(Actor* thisx, PlayState* play) { + EnKitan* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Kitan/EnKitan_Destroy.s") + Collider_DestroyCylinder(play, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Kitan/func_80C0923C.s") +void func_80C0923C(EnKitan* this, PlayState* play, s32 arg2) { + static Color_RGBA8 sEffPrimColor = { 255, 255, 255, 255 }; + static Color_RGBA8 sEffEnvColor = { 255, 255, 200, 255 }; + s32 i; + Vec3f accel; + Vec3f vel; + Vec3f pos; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Kitan/func_80C09390.s") + pos.x = this->actor.world.pos.x; + pos.y = this->actor.world.pos.y; + pos.z = this->actor.world.pos.z; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Kitan/func_80C09418.s") + for (i = 0; i < arg2; i++) { + vel.x = randPlusMinusPoint5Scaled(10.0f); + vel.y = Rand_ZeroFloat(6.0f); + vel.z = randPlusMinusPoint5Scaled(10.0f); + accel.x = -vel.x * 0.05f; + accel.y = 0.1f; + accel.z = -vel.x * 0.05f; + func_800B0F18(play, &pos, &vel, &accel, &sEffPrimColor, &sEffEnvColor, 400, 20, 20); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Kitan/func_80C094A8.s") +s32 func_80C09390(EnKitan* this, PlayState* play) { + Player* player = GET_PLAYER(play); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Kitan/func_80C09518.s") + if (player->stateFlags1 & PLAYER_STATE1_800000) { + return false; + } + if (Player_IsFacingActor(&this->actor, 0x3000, play) && Actor_IsFacingPlayer(&this->actor, 0x3000) && + this->actor.xzDistToPlayer < 120.0f) { + return true; + } + return false; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Kitan/func_80C095C8.s") +u16 func_80C09418(EnKitan* this) { + s32 i = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Kitan/func_80C09648.s") + //! @bug This loop was likely meant to have a cap of 1000? + while (true) { + s32 rand = Rand_ZeroFloat(30.0f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Kitan/func_80C09708.s") + if (!(this->textBitSet & (1 << rand))) { + this->textBitSet |= (1 << rand); + return 0x04B6 + 2 * rand; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Kitan/func_80C09990.s") + i++; + if (i > 1000) { + continue; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Kitan/func_80C09AA4.s") +void func_80C094A8(EnKitan* this, PlayState* play) { + SkelAnime_Update(&this->skelAnime); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Kitan/func_80C09B50.s") + if (this->timer > 0) { + this->timer--; + this->actor.scale.x *= 0.7f; + Actor_SetScale(&this->actor, this->actor.scale.x); + } else { + Actor_Kill(&this->actor); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Kitan/EnKitan_Update.s") +void func_80C09518(EnKitan* this, PlayState* play) { + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Kitan/func_80C09C74.s") + SkelAnime_Update(&this->skelAnime); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Kitan/func_80C09C90.s") + if (Actor_ProcessTalkRequest(&this->actor, &play->state)) { + this->actionFunc = func_80C09708; + Message_ContinueTextbox(play, 0x04B5); + this->actor.flags &= ~ACTOR_FLAG_10000; + Animation_MorphToLoop(&this->skelAnime, &object_kitan_Anim_000CE8, -5.0f); + } else { + func_800B8500(&this->actor, play, 1000.0f, 1000.0f, PLAYER_IA_MINUS1); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Kitan/func_80C09CD0.s") +void func_80C095C8(EnKitan* this, PlayState* play) { + SkelAnime_Update(&this->skelAnime); + if (Actor_TextboxIsClosing(&this->actor, play)) { + this->actor.flags |= ACTOR_FLAG_10000; + this->actionFunc = func_80C09518; + func_800B8500(&this->actor, play, 1000.0f, 1000.0f, PLAYER_IA_MINUS1); + } +} + +void func_80C09648(EnKitan* this, PlayState* play) { + SkelAnime_Update(&this->skelAnime); + + if (Actor_HasParent(&this->actor, play)) { + this->actor.parent = NULL; + this->actionFunc = func_80C095C8; + gSaveContext.save.saveInfo.weekEventReg[0x4F] |= 0x80; + } else if (gSaveContext.save.saveInfo.weekEventReg[0x4F] & 0x80) { + Actor_OfferGetItem(&this->actor, play, GI_RUPEE_RED, 2000.0f, 1000.0f); + } else { + Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 2000.0f, 1000.0f); + } +} + +void func_80C09708(EnKitan* this, PlayState* play) { + if (SkelAnime_Update(&this->skelAnime)) { + Animation_MorphToLoop(&this->skelAnime, &object_kitan_Anim_002770, -10.0f); + if (play->msgCtx.currentTextId != 0x04B4) { + Message_ContinueTextbox(play, func_80C09418(this)); + } + } + + switch (Message_GetState(&play->msgCtx)) { + case 4: + if (Message_ShouldAdvance(play)) { + if (play->msgCtx.choiceIndex + 1 == play->msgCtx.unk1206C) { + play_sound(NA_SE_SY_QUIZ_CORRECT); + this->timer++; + if (this->timer < 5) { + play->msgCtx.msgLength = 0; + } else { + this->timer = 0; + this->textBitSet = 0; + Message_ContinueTextbox(play, 0x04B4); + } + Animation_MorphToPlayOnce(&this->skelAnime, &object_kitan_Anim_00190C, -5.0f); + } else { + play_sound(NA_SE_SY_QUIZ_INCORRECT); + Animation_MorphToLoop(&this->skelAnime, &object_kitan_Anim_000CE8, -5.0f); + Message_ContinueTextbox(play, 0x04B3); + this->timer = 0; + this->textBitSet = 0; + } + } + break; + case 5: + if (Message_ShouldAdvance(play)) { + switch (play->msgCtx.currentTextId) { + case 0x04B0: + case 0x04B1: + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); + break; + case 0x04B2: + Animation_MorphToLoop(&this->skelAnime, &object_kitan_Anim_002770, -5.0f); + Message_ContinueTextbox(play, func_80C09418(this)); + break; + case 0x04B4: + Message_CloseTextbox(play); + this->actionFunc = func_80C09648; + func_80C09648(this, play); + break; + case 0x04B3: + AudioSeq_QueueSeqCmd(0x110000FF); + /* fallthrough */ + case 0x04B5: + Message_CloseTextbox(play); + this->actionFunc = func_80C094A8; + this->timer = 4; + func_80C0923C(this, play, 30); + SoundSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 30, NA_SE_EN_NPC_FADEAWAY); + Flags_SetCollectible(play, ENKITAN_GET_9(&this->actor)); + break; + default: + if (!(play->msgCtx.currentTextId & 1)) { + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); + } + break; + } + } + break; + } +} + +void func_80C09990(EnKitan* this, PlayState* play) { + SkelAnime_Update(&this->skelAnime); + + if (Actor_ProcessTalkRequest(&this->actor, &play->state)) { + this->actionFunc = func_80C09708; + Message_StartTextbox(play, 0x04B0, &this->actor); + this->timer = 0; + Animation_MorphToLoop(&this->skelAnime, &object_kitan_Anim_000CE8, -5.0f); + Audio_PlayFanfare(NA_BGM_KEATON_QUIZ); + } else if (this->timer <= 0 || Player_GetMask(play) != PLAYER_MASK_KEATON) { + this->actionFunc = func_80C094A8; + this->timer = 4; + func_80C0923C(this, play, 30); + SoundSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 30, NA_SE_EN_NPC_FADEAWAY); + } else if (func_80C09390(this, play)) { + func_800B8614(&this->actor, play, 130.0f); + this->timer--; + } +} + +void func_80C09AA4(EnKitan* this, PlayState* play) { + SkelAnime_Update(&this->skelAnime); + + if (this->timer > 0) { + this->timer--; + this->actor.scale.x = this->actor.scale.x * 0.3f + 0.0105f; + Actor_SetScale(&this->actor, this->actor.scale.x); + } else { + Actor_SetScale(&this->actor, 0.015f); + this->actionFunc = func_80C09990; + this->actor.flags |= ACTOR_FLAG_1; + this->timer = 600; + } +} + +void func_80C09B50(EnKitan* this, PlayState* play) { + if (this->timer > 0) { + this->timer--; + return; + } + func_80C0923C(this, play, 30); + Actor_PlaySfx(&this->actor, NA_SE_EN_NPC_APPEAR); + this->actor.draw = EnKitan_Draw; + this->actionFunc = func_80C09AA4; + this->timer = 20; + this->actor.shape.rot.y = this->actor.yawTowardsPlayer; + this->actor.world.rot.y = this->actor.shape.rot.y; +} + +void EnKitan_Update(Actor* thisx, PlayState* play) { + EnKitan* this = THIS; + + if (this->actor.draw != NULL) { + CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); + } + Actor_MoveWithGravity(&this->actor); + Actor_UpdateBgCheckInfo(play, &this->actor, 40.0f, 25.0f, 40.0f, UPDBGCHECKINFO_FLAG_1 | UPDBGCHECKINFO_FLAG_4); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 2, 0x1000, 0x200); + this->actor.world.rot.y = this->actor.shape.rot.y; + this->actionFunc(this, play); +} + +s32 EnKitan_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) { + return 0; +} + +void EnKitan_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) { + static Vec3f sFocusOffset = { 0.0f, 0.0f, 0.0f }; + EnKitan* this = THIS; + + if (limbIndex == 6) { + Matrix_MultVec3f(&sFocusOffset, &this->actor.focus.pos); + } +} + +void EnKitan_Draw(Actor* thisx, PlayState* play) { + EnKitan* this = THIS; + + func_8012C5B0(play->state.gfxCtx); + SkelAnime_DrawFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, + EnKitan_OverrideLimbDraw, EnKitan_PostLimbDraw, &this->actor); +} diff --git a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.h b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.h index 9d2ae096b..dbdb74ddd 100644 --- a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.h +++ b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.h @@ -2,6 +2,7 @@ #define Z_EN_KITAN_H #include "global.h" +#include "objects/object_kitan/object_kitan.h" struct EnKitan; @@ -9,7 +10,13 @@ typedef void (*EnKitanActionFunc)(struct EnKitan*, PlayState*); typedef struct EnKitan { /* 0x000 */ Actor actor; - /* 0x144 */ char unk_144[0x194]; + /* 0x144 */ SkelAnime skelAnime; + /* 0x188 */ Vec3s jointTable[OBJECT_KITAN_LIMB_MAX]; + /* 0x206 */ Vec3s morphTable[OBJECT_KITAN_LIMB_MAX]; + /* 0x284 */ ColliderCylinder collider; + /* 0x2D0 */ s32 textBitSet; + /* 0x2D4 */ char unk2D4[2]; + /* 0x2D6 */ s16 timer; /* 0x2D8 */ EnKitanActionFunc actionFunc; } EnKitan; // size = 0x2DC diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt index 3d41ffddd..fb722ece0 100644 --- a/tools/disasm/functions.txt +++ b/tools/disasm/functions.txt @@ -16644,9 +16644,9 @@ 0x80C09AA4:("func_80C09AA4",), 0x80C09B50:("func_80C09B50",), 0x80C09BC8:("EnKitan_Update",), - 0x80C09C74:("func_80C09C74",), - 0x80C09C90:("func_80C09C90",), - 0x80C09CD0:("func_80C09CD0",), + 0x80C09C74:("EnKitan_OverrideLimbDraw",), + 0x80C09C90:("EnKitan_PostLimbDraw",), + 0x80C09CD0:("EnKitan_Draw",), 0x80C09ED0:("func_80C09ED0",), 0x80C09FEC:("BgAstrBombwall_Init",), 0x80C0A0EC:("BgAstrBombwall_Destroy",),