mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-07 14:50:15 +00:00
ovl_Obj_Dekujr OK (#276)
* started dekujr * ovl_Obj_Dekujr OK * cleanup * Made suggested changes
This commit is contained in:
Lucas Shaw
GitHub
parent
00836ddebc
commit
b39cddd576
15 changed files with 153 additions and 465 deletions
|
|
@ -15,7 +15,8 @@ void ObjDekujr_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
|||
void ObjDekujr_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void ObjDekujr_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
void ObjDekujr_ComeUp(ObjDekujr* this, GlobalContext* globalCtx);
|
||||
|
||||
const ActorInit Obj_Dekujr_InitVars = {
|
||||
ACTOR_OBJ_DEKUJR,
|
||||
ACTORTYPE_NPC,
|
||||
|
|
@ -27,17 +28,141 @@ const ActorInit Obj_Dekujr_InitVars = {
|
|||
(ActorFunc)ObjDekujr_Update,
|
||||
(ActorFunc)ObjDekujr_Draw,
|
||||
};
|
||||
*/
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Init.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Destroy.s")
|
||||
static ColliderCylinderInit_Actor sCylinderInit = {
|
||||
{ NULL, 0x00, 0x00, 0x39, COLSHAPE_CYLINDER },
|
||||
{ 0x02, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x00, 0x00, 0x01 },
|
||||
{ 60, 80, 0, { 0, 0, 0 } },
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/func_80B92538.s")
|
||||
extern Gfx D_060030D0[]; // Display list for dekujr body
|
||||
extern Gfx D_060032D8[]; // Display list for dekujr face and shadow
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/func_80B92578.s")
|
||||
void ObjDekujr_Init(Actor* thisx, GlobalContext* globalCtx) {
|
||||
ObjDekujr* this = THIS;
|
||||
s32 pad;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/func_80B925B8.s")
|
||||
if (gSaveContext.cutsceneIndex < 0xFFF0) {
|
||||
if (!LINK_IS_ADULT) {
|
||||
Actor_Kill(&this->actor);
|
||||
return;
|
||||
}
|
||||
this->unk_19C = 2;
|
||||
this->unk_19B = 0;
|
||||
} else {
|
||||
this->unk_19C = 0;
|
||||
this->unk_19B = 1;
|
||||
}
|
||||
if (!CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST)) {
|
||||
Actor_Kill(&this->actor);
|
||||
} else {
|
||||
ActorShape_Init(&this->actor.shape, 0.0f, NULL, 0.0f);
|
||||
Collider_InitCylinder(globalCtx, &this->collider);
|
||||
sCylinderInit.base.actor = thisx; // thisx required to match here
|
||||
Collider_SetCylinder_Actor(globalCtx, &this->collider, &sCylinderInit);
|
||||
this->actor.colChkInfo.mass = 0xFF;
|
||||
this->actor.textId = func_80037C30(globalCtx, 0xF);
|
||||
Actor_SetScale(&this->actor, 0.4f);
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Update.s")
|
||||
void ObjDekujr_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Draw.s")
|
||||
void ObjDekujr_SetInitialPos(CsCmdActorAction* npcAction, Vec3f* initPos) {
|
||||
initPos->x = npcAction->startPos.x;
|
||||
initPos->y = npcAction->startPos.y;
|
||||
initPos->z = npcAction->startPos.z;
|
||||
}
|
||||
|
||||
void ObjDekujr_SetFinalPos(CsCmdActorAction* npcAction, Vec3f* finalPos) {
|
||||
finalPos->x = npcAction->endPos.x;
|
||||
finalPos->y = npcAction->endPos.y;
|
||||
finalPos->z = npcAction->endPos.z;
|
||||
}
|
||||
|
||||
void ObjDekujr_ComeUp(ObjDekujr* this, GlobalContext* globalCtx) {
|
||||
CsCmdActorAction* csCmdNPCAction;
|
||||
Vec3f initPos;
|
||||
Vec3f finalPos;
|
||||
Vec3f velocity = { 0.0f, 0.0f, 0.0f };
|
||||
f32 actionLength;
|
||||
f32 gravity;
|
||||
|
||||
if (globalCtx->csCtx.state == 0) {
|
||||
this->unk_19C = 2;
|
||||
this->unk_19B = 0;
|
||||
} else {
|
||||
if (globalCtx->csCtx.frames == 351) {
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_EV_COME_UP_DEKU_JR);
|
||||
}
|
||||
csCmdNPCAction = globalCtx->csCtx.npcActions[1];
|
||||
if (csCmdNPCAction != NULL) {
|
||||
ObjDekujr_SetInitialPos(csCmdNPCAction, &initPos);
|
||||
ObjDekujr_SetFinalPos(csCmdNPCAction, &finalPos);
|
||||
if (this->unk_19C == 0) {
|
||||
this->actor.posRot.pos = initPos;
|
||||
this->unk_19C = 1;
|
||||
}
|
||||
this->actor.shape.rot.x = csCmdNPCAction->urot.x;
|
||||
this->actor.shape.rot.y = csCmdNPCAction->urot.y;
|
||||
this->actor.shape.rot.z = csCmdNPCAction->urot.z;
|
||||
this->actor.velocity = velocity;
|
||||
if (csCmdNPCAction->endFrame >= globalCtx->csCtx.frames) {
|
||||
actionLength = csCmdNPCAction->endFrame - csCmdNPCAction->startFrame;
|
||||
this->actor.velocity.x = (finalPos.x - initPos.x) / actionLength;
|
||||
gravity = this->actor.gravity;
|
||||
this->actor.velocity.y = (finalPos.y - initPos.y) / actionLength;
|
||||
this->actor.velocity.y += gravity;
|
||||
if (this->actor.velocity.y < this->actor.minVelocityY) {
|
||||
this->actor.velocity.y = this->actor.minVelocityY;
|
||||
}
|
||||
this->actor.velocity.z = (finalPos.z - initPos.z) / actionLength;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ObjDekujr_Update(Actor* thisx, GlobalContext* globalCtx) {
|
||||
ObjDekujr* this = THIS;
|
||||
s32 pad;
|
||||
|
||||
Collider_CylinderUpdate(&this->actor, &this->collider);
|
||||
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
|
||||
if ((gSaveContext.cutsceneIndex >= 0xFFF0) && (this->unk_19B == 0)) {
|
||||
this->unk_19C = 0;
|
||||
this->unk_19B = 1;
|
||||
}
|
||||
if (this->unk_19B == 1) {
|
||||
ObjDekujr_ComeUp(this, globalCtx);
|
||||
this->actor.posRot.pos.x += this->actor.velocity.x;
|
||||
this->actor.posRot.pos.y += this->actor.velocity.y;
|
||||
this->actor.posRot.pos.z += this->actor.velocity.z;
|
||||
} else {
|
||||
func_80037D98(globalCtx, &this->actor, 0xF, &this->unk_1A0);
|
||||
Actor_SetHeight(&this->actor, 40.0f);
|
||||
}
|
||||
}
|
||||
|
||||
void ObjDekujr_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
||||
u32 frameCount;
|
||||
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
|
||||
Gfx* dispRefs[4];
|
||||
|
||||
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_obj_dekujr.c", 370);
|
||||
func_80093D18(globalCtx->state.gfxCtx);
|
||||
func_80093D84(globalCtx->state.gfxCtx);
|
||||
|
||||
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_dekujr.c", 379),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
gSPDisplayList(gfxCtx->polyOpa.p++, D_060030D0);
|
||||
|
||||
frameCount = globalCtx->state.frames;
|
||||
gSPSegment(
|
||||
gfxCtx->polyXlu.p++, 0x08,
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, frameCount % 128, 0, 32, 32, 1, frameCount % 128, 0, 32, 32));
|
||||
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_dekujr.c", 399),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
gSPDisplayList(gfxCtx->polyXlu.p++, D_060032D8);
|
||||
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_obj_dekujr.c", 409);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,12 @@ struct ObjDekujr;
|
|||
|
||||
typedef struct ObjDekujr {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ char unk_14C[0x58];
|
||||
/* 0x014C */ ColliderCylinder collider;
|
||||
/* 0x0198 */ char unk_198[0x3];
|
||||
/* 0x019B */ u8 unk_19B;
|
||||
/* 0x019C */ u8 unk_19C;
|
||||
/* 0x019D */ char unk_19D[0x3];
|
||||
/* 0x01A0 */ s32 unk_1A0;
|
||||
} ObjDekujr; // size = 0x01A4
|
||||
|
||||
extern const ActorInit Obj_Dekujr_InitVars;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue