falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

En_Hs (#746) 

* En_Hs

* Add limb switch

* Merge
This commit is contained in:
Maide 2022-03-29 16:29:34 +01:00 committed by GitHub
parent 9582a3e79f
commit b567c4ee68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 313 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spec
View File

@ -1589,8 +1589,7 @@ beginseg
name "ovl_En_Hs"
compress
include "build/src/overlays/actors/ovl_En_Hs/z_en_hs.o"
include "build/data/ovl_En_Hs/ovl_En_Hs.data.o"
include "build/data/ovl_En_Hs/ovl_En_Hs.reloc.o"
include "build/src/overlays/actors/ovl_En_Hs/ovl_En_Hs_reloc.o"
endseg
beginseg

322
src/overlays/actors/ovl_En_Hs/z_en_hs.c
View File

@ -23,7 +23,6 @@ void func_809532D0(EnHs* this, GlobalContext* globalCtx);
void func_80953354(EnHs* this, GlobalContext* globalCtx);
void func_8095345C(EnHs* this, GlobalContext* globalCtx);
#if 0
const ActorInit En_Hs_InitVars = {
ACTOR_EN_HS,
ACTORCAT_NPC,
@ -36,51 +35,322 @@ const ActorInit En_Hs_InitVars = {
(ActorFunc)EnHs_Draw,
};
// static ColliderCylinderInit sCylinderInit = {
static ColliderCylinderInit D_80953910 = {
{ 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,
},
{ 40, 40, 0, { 0, 0, 0 } },
};
#endif
Vec3f D_8095393C = { 300.0f, 1000.0f, 0.0f };
extern ColliderCylinderInit D_80953910;
void func_80952C50(EnHs* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
s32 i;
extern UNK_TYPE D_060005C0;
for (i = 0; i < ARRAY_COUNT(this->unk_2A4); i++) {
Math_Vec3f_Copy(&this->unk_2A4[i], &player->actor.world.pos);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hs/func_80952C50.s")
this->actor.home.rot.x = 0;
this->actor.home.rot.z = 0;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hs/EnHs_Init.s")
void EnHs_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnHs* this = THIS;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hs/EnHs_Destroy.s")
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_hs_Skel_006260, &object_hs_Anim_0005C0, this->jointTable,
this->morphTable, OBJECT_HS_LIMB_MAX);
Animation_PlayLoop(&this->skelAnime, &object_hs_Anim_0005C0);
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
Actor_SetScale(&this->actor, 0.01f);
this->actionFunc = func_8095345C;
if (globalCtx->curSpawn == 1) {
this->actor.flags |= ACTOR_FLAG_10000;
}
this->unk_2A0 = 0;
this->actor.targetMode = 6;
func_80952C50(this, globalCtx);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hs/func_80952DFC.s")
void EnHs_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnHs* this = THIS;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hs/func_80952E50.s")
Collider_DestroyCylinder(globalCtx, &this->collider);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hs/func_80952F00.s")
void func_80952DFC(GlobalContext* globalCtx) {
if (INV_CONTENT(ITEM_MASK_BUNNY) == ITEM_MASK_BUNNY) {
func_80151BB4(globalCtx, 0x2E);
}
func_80151BB4(globalCtx, 0x10);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hs/func_80952FE0.s")
void func_80952E50(Vec3f* dst, Vec3f src, f32 arg2) {
Vec3f sp1C;
f32 temp_f0;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hs/func_80953098.s")
Math_Vec3f_Diff(&src, dst, &sp1C);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hs/func_80953180.s")
temp_f0 = SQ(sp1C.x) + SQ(sp1C.z);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hs/func_809532C0.s")
if (SQ(arg2) > temp_f0) {
return;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hs/func_809532D0.s")
temp_f0 = sqrtf(temp_f0);
sp1C.x *= (temp_f0 - arg2) / temp_f0;
sp1C.z *= (temp_f0 - arg2) / temp_f0;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hs/func_80953354.s")
dst->x += sp1C.x;
dst->z += sp1C.z;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hs/func_809533A0.s")
void func_80952F00(EnHs* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
s32 i;
f32 phi_f20;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hs/func_8095345C.s")
if (this->actor.home.rot.z >= 20) {
phi_f20 = 15.0f;
} else {
phi_f20 = 10.0f;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hs/EnHs_Update.s")
func_80952E50(&this->unk_2A4[0], player->actor.world.pos, phi_f20);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hs/func_8095376C.s")
for (i = 1; i < ARRAY_COUNT(this->unk_2A4); i++) {
func_80952E50(&this->unk_2A4[i], this->unk_2A4[i - 1], phi_f20);
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hs/func_80953848.s")
void func_80952FE0(EnHs* this, GlobalContext* globalCtx) {
if (this->unk_2A2 < 40) {
Math_SmoothStepToS(&this->unk_294.y, 0x1F40, 6, 0x1838, 0x64);
} else if (this->unk_2A2 < 80) {
Math_SmoothStepToS(&this->unk_294.y, -0x1F40, 6, 0x1838, 0x64);
} else {
this->actionFunc = func_80953180;
this->unk_2A0 &= ~4;
func_80151938(globalCtx, 0x33F6);
func_80952DFC(globalCtx);
}
this->unk_2A2++;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hs/EnHs_Draw.s")
void func_80953098(EnHs* this, GlobalContext* globalCtx) {
if (Actor_HasParent(&this->actor, globalCtx)) {
this->actor.parent = NULL;
this->actionFunc = func_8095345C;
this->actor.flags |= ACTOR_FLAG_10000;
this->unk_2A0 |= 0x10;
func_800B8500(&this->actor, globalCtx, 1000.0f, 1000.0f, -1);
} else {
this->unk_2A0 |= 8;
if (INV_CONTENT(ITEM_MASK_BUNNY) == ITEM_MASK_BUNNY) {
Actor_PickUp(&this->actor, globalCtx, GI_RUPEE_RED, 10000.0f, 50.0f);
} else {
Actor_PickUp(&this->actor, globalCtx, GI_MASK_BUNNY, 10000.0f, 50.0f);
}
}
}
void func_80953180(EnHs* this, GlobalContext* globalCtx) {
if ((Message_GetState(&globalCtx->msgCtx) == 5) && Message_ShouldAdvance(globalCtx)) {
switch (globalCtx->msgCtx.currentTextId) {
case 0x33F4:
case 0x33F6:
func_801477B4(globalCtx);
this->actionFunc = func_8095345C;
break;
case 0x33F7:
this->actor.flags &= ~ACTOR_FLAG_10000;
func_801477B4(globalCtx);
this->actionFunc = func_80953098;
func_80953098(this, globalCtx);
break;
case 0x33F9:
this->actor.flags &= ~ACTOR_FLAG_10000;
func_801477B4(globalCtx);
this->actionFunc = func_8095345C;
break;
case 0x33F5:
globalCtx->msgCtx.unk11F10 = 0;
this->actionFunc = func_80952FE0;
this->unk_2A2 = 0;
this->unk_294.z = 0;
this->unk_2A0 |= 4;
break;
default:
func_801477B4(globalCtx);
this->actionFunc = func_8095345C;
break;
}
}
}
void func_809532C0(EnHs* this, GlobalContext* globalCtx) {
}
void func_809532D0(EnHs* this, GlobalContext* globalCtx) {
if (DECR(this->unk_2A2) == 0) {
globalCtx->nextEntranceIndex = globalCtx->setupExitList[ENHS_GET_F(&this->actor)];
globalCtx->sceneLoadFlag = 0x14;
gSaveContext.save.weekEventReg[25] |= 8;
this->actionFunc = func_809532C0;
}
}
void func_80953354(EnHs* this, GlobalContext* globalCtx) {
if (!func_801690CC(globalCtx)) {
func_800B7298(globalCtx, &this->actor, 7);
this->actionFunc = func_809532D0;
}
}
void func_809533A0(EnHs* this, GlobalContext* globalCtx) {
u16 sp1E;
if ((globalCtx->curSpawn == 1) && !(this->unk_2A0 & 0x20)) {
sp1E = 0x33F7;
this->unk_2A0 |= 0x20;
} else if (this->unk_2A0 & 0x10) {
sp1E = 0x33F9;
this->unk_2A0 &= ~0x10;
} else if (gSaveContext.save.weekEventReg[25] & 8) {
sp1E = 0x33F4;
} else {
sp1E = 0x33F5;
}
Message_StartTextbox(globalCtx, sp1E, &this->actor);
if (sp1E == 0x33F4) {
func_80952DFC(globalCtx);
}
}
void func_8095345C(EnHs* this, GlobalContext* globalCtx) {
if (Actor_ProcessTalkRequest(&this->actor, &globalCtx->state)) {
this->actionFunc = func_80953180;
func_809533A0(this, globalCtx);
if (this->unk_2A0 & 8) {
func_80952DFC(globalCtx);
this->unk_2A0 &= ~8;
}
} else if (this->actor.home.rot.x >= 20) {
this->actionFunc = func_80953354;
this->unk_2A2 = 40;
} else if CHECK_FLAG_ALL (this->actor.flags, ACTOR_FLAG_10000) {
func_800B8500(&this->actor, globalCtx, 1000.0f, 1000.0f, -1);
this->unk_2A0 |= 1;
} else if ((this->actor.xzDistToPlayer < 120.0f) && Player_IsFacingActor(&this->actor, 0x2000, globalCtx)) {
func_800B8614(&this->actor, globalCtx, 130.0f);
this->unk_2A0 |= 1;
} else {
this->unk_2A0 &= ~1;
}
}
void EnHs_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnHs* this = THIS;
Collider_UpdateCylinder(&this->actor, &this->collider);
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
Actor_MoveWithGravity(&this->actor);
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4);
if (SkelAnime_Update(&this->skelAnime)) {
this->skelAnime.curFrame = 0.0f;
}
this->actionFunc(this, globalCtx);
func_80952F00(this, globalCtx);
if (this->unk_2A0 & 4) {
Math_SmoothStepToS(&this->unk_294.x, 0, 6, 0x1838, 0x64);
Math_SmoothStepToS(&this->unk_29A.x, 0, 6, 0x1838, 0x64);
Math_SmoothStepToS(&this->unk_29A.y, 0, 6, 0x1838, 0x64);
} else if (this->unk_2A0 & 1) {
func_800E9250(globalCtx, &this->actor, &this->unk_294, &this->unk_29A, this->actor.focus.pos);
} else {
Math_SmoothStepToS(&this->unk_294.x, 0x3200, 6, 0x1838, 0x64);
Math_SmoothStepToS(&this->unk_294.y, 0, 6, 0x1838, 0x64);
Math_SmoothStepToS(&this->unk_29A.x, 0, 6, 0x1838, 0x64);
Math_SmoothStepToS(&this->unk_29A.y, 0, 6, 0x1838, 0x64);
}
}
s32 EnHs_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) {
EnHs* this = THIS;
switch (limbIndex) {
case OBJECT_HS_LIMB_09:
rot->x += this->unk_294.y;
rot->z += this->unk_294.x;
break;
case OBJECT_HS_LIMB_0A:
rot->x += this->unk_294.y;
rot->z += this->unk_294.x;
break;
case OBJECT_HS_LIMB_0B:
*dList = NULL;
return false;
case OBJECT_HS_LIMB_0C:
if (this->actor.params == ENHS_1) {
*dList = NULL;
return false;
}
break;
case OBJECT_HS_LIMB_0D:
if (this->actor.params == ENHS_1) {
*dList = NULL;
return false;
}
break;
}
return false;
}
void EnHs_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) {
EnHs* this = THIS;
if (limbIndex == OBJECT_HS_LIMB_09) {
Matrix_MultiplyVector3fByState(&D_8095393C, &this->actor.focus.pos);
}
}
void EnHs_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnHs* this = THIS;
func_8012C5B0(globalCtx->state.gfxCtx);
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnHs_OverrideLimbDraw, EnHs_PostLimbDraw, &this->actor);
}

15
src/overlays/actors/ovl_En_Hs/z_en_hs.h
View File

@ -2,14 +2,27 @@
#define Z_EN_HS_H
#include "global.h"
#include "objects/object_hs/object_hs.h"
struct EnHs;
typedef void (*EnHsActionFunc)(struct EnHs*, GlobalContext*);
#define ENHS_GET_F(thisx) ((thisx)->params & 0xF)
#define ENHS_1 1
typedef struct EnHs {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x250];
/* 0x0144 */ ColliderCylinder collider;
/* 0x0190 */ SkelAnime skelAnime;
/* 0x01D4 */ Vec3s jointTable[OBJECT_HS_LIMB_MAX];
/* 0x0234 */ Vec3s morphTable[OBJECT_HS_LIMB_MAX];
/* 0x0294 */ Vec3s unk_294;
/* 0x029A */ Vec3s unk_29A;
/* 0x02A0 */ u16 unk_2A0;
/* 0x02A2 */ s16 unk_2A2;
/* 0x02A4 */ Vec3f unk_2A4[20];
/* 0x0394 */ EnHsActionFunc actionFunc;
} EnHs; // size = 0x398

4
tools/disasm/functions.txt
View File

@ -7652,8 +7652,8 @@
0x809533A0:("func_809533A0",),
0x8095345C:("func_8095345C",),
0x8095359C:("EnHs_Update",),
0x8095376C:("func_8095376C",),
0x80953848:("func_80953848",),
0x8095376C:("EnHs_OverrideLimbDraw",),
0x80953848:("EnHs_PostLimbDraw",),
0x80953888:("EnHs_Draw",),
0x80953A90:("BgIngate_FindActor",),
0x80953B40:("func_80953B40",),

5
undefined_syms.txt
View File

@ -1294,11 +1294,6 @@ D_060150D8 = 0x060150D8;
D_06002F98 = 0x06002F98;
D_0600A480 = 0x0600A480;
// ovl_En_Hs
D_060005C0 = 0x060005C0;
D_06006260 = 0x06006260;
// ovl_En_Ik
D_06000CE8 = 0x06000CE8;