mirror of
https://github.com/zeldaret/oot.git
synced 2025-07-16 12:54:40 +00:00
Obj_Hamishi OK (#539)
* obj_hamishi OK * Update src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * made suggested changes Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
Zelllll
GitHub
parent
5c8e745645
commit
06ceb6ad40
12 changed files with 173 additions and 609 deletions
|
|
@ -15,10 +15,9 @@ void ObjHamishi_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
|||
void ObjHamishi_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void ObjHamishi_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
extern UNK_TYPE D_0500A3B8;
|
||||
extern UNK_TYPE D_0500A5E8;
|
||||
extern Gfx D_0500A3B8[];
|
||||
extern Gfx D_0500A5E8[];
|
||||
|
||||
/*
|
||||
const ActorInit Obj_Hamishi_InitVars = {
|
||||
ACTOR_OBJ_HAMISHI,
|
||||
ACTORTYPE_PROP,
|
||||
|
|
@ -30,17 +29,172 @@ const ActorInit Obj_Hamishi_InitVars = {
|
|||
(ActorFunc)ObjHamishi_Update,
|
||||
(ActorFunc)ObjHamishi_Draw,
|
||||
};
|
||||
*/
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B92F90.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B92FE8.s")
|
||||
static ColliderCylinderInit sCylinderInit = {
|
||||
{ COLTYPE_UNK12, 0x00, 0x0D, 0x39, 0x20, COLSHAPE_CYLINDER },
|
||||
{ 0x00, { 0x00000000, 0x00, 0x00 }, { 0x4FC1FFF6, 0x00, 0x00 }, 0x00, 0x01, 0x01 },
|
||||
{ 50, 70, 0, { 0, 0, 0 } },
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B93164.s")
|
||||
static CollisionCheckInfoInit sColChkInfoInit = { 0, 0xC, 0x3C, 0xFF };
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Init.s")
|
||||
static s16 sEffectScales[] = {
|
||||
145, 135, 115, 85, 75, 53, 45, 40, 35,
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Destroy.s")
|
||||
static InitChainEntry sInitChain[] = {
|
||||
ICHAIN_VEC3F_DIV1000(scale, 400, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneScale, 250, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneDownward, 500, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Update.s")
|
||||
void ObjHamishi_InitCollision(Actor* thisx, GlobalContext* globalCtx) {
|
||||
ObjHamishi* this = THIS;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Draw.s")
|
||||
Collider_InitCylinder(globalCtx, &this->collider);
|
||||
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
|
||||
Collider_CylinderUpdate(&this->actor, &this->collider);
|
||||
}
|
||||
|
||||
void ObjHamishi_Shake(ObjHamishi* this) {
|
||||
if (this->shakeFrames > 0) {
|
||||
this->shakeFrames--;
|
||||
this->shakePosPhase += 5000;
|
||||
this->shakeRotPhase += 0xE10;
|
||||
|
||||
Math_ApproxF(&this->shakePosSize, 0.0f, 0.15f);
|
||||
Math_ApproxF(&this->shakeRotSize, 0.0f, 40.0f);
|
||||
|
||||
this->actor.posRot.pos.x =
|
||||
this->actor.initPosRot.pos.x + (Math_Sins(this->shakePosPhase * 4) * this->shakePosSize);
|
||||
this->actor.posRot.pos.z =
|
||||
this->actor.initPosRot.pos.z + (Math_Coss(this->shakePosPhase * 7) * this->shakePosSize);
|
||||
this->actor.shape.rot.x =
|
||||
this->actor.initPosRot.rot.x + (s16)(Math_Sins(this->shakeRotPhase * 4) * this->shakeRotSize);
|
||||
this->actor.shape.rot.z =
|
||||
this->actor.initPosRot.rot.z + (s16)(Math_Coss(this->shakeRotPhase * 7) * this->shakeRotSize);
|
||||
} else {
|
||||
Math_ApproxF(&this->actor.posRot.pos.x, this->actor.initPosRot.pos.x, 1.0f);
|
||||
Math_ApproxF(&this->actor.posRot.pos.z, this->actor.initPosRot.pos.z, 1.0f);
|
||||
Math_ApproxUpdateScaledS(&this->actor.shape.rot.x, this->actor.initPosRot.rot.x, 0xBB8);
|
||||
Math_ApproxUpdateScaledS(&this->actor.shape.rot.z, this->actor.initPosRot.rot.z, 0xBB8);
|
||||
}
|
||||
}
|
||||
|
||||
void ObjHamishi_Break(ObjHamishi* this, GlobalContext* globalCtx) {
|
||||
s32 pad;
|
||||
Vec3f velocity;
|
||||
Vec3f pos;
|
||||
s16 phi_s0 = 1000;
|
||||
s16 gravity;
|
||||
s16 phi_v0;
|
||||
f32 temp_f20;
|
||||
f32 temp_f22;
|
||||
s32 i;
|
||||
|
||||
for (i = 0; i < ARRAY_COUNT(sEffectScales); i++) {
|
||||
phi_s0 += 20000;
|
||||
|
||||
temp_f20 = Math_Rand_ZeroOne() * 10.0f;
|
||||
pos.x = (Math_Sins(phi_s0) * temp_f20) + this->actor.posRot.pos.x;
|
||||
pos.y = (Math_Rand_ZeroOne() * 40.0f) + this->actor.posRot.pos.y + 5.0f;
|
||||
pos.z = (Math_Coss(phi_s0) * temp_f20) + this->actor.posRot.pos.z;
|
||||
|
||||
temp_f20 = (Math_Rand_ZeroOne() * 10.0f) + 2.0f;
|
||||
velocity.x = Math_Sins(phi_s0) * temp_f20;
|
||||
temp_f22 = Math_Rand_ZeroOne();
|
||||
velocity.y = (Math_Rand_ZeroOne() * i * 2.5f) + (temp_f22 * 15.0f);
|
||||
velocity.z = Math_Coss(phi_s0) * temp_f20;
|
||||
|
||||
if (i == 0) {
|
||||
phi_v0 = 41;
|
||||
gravity = -450;
|
||||
} else if (i < 4) {
|
||||
phi_v0 = 37;
|
||||
gravity = -380;
|
||||
} else {
|
||||
phi_v0 = 69;
|
||||
gravity = -320;
|
||||
}
|
||||
|
||||
EffectSsKakera_Spawn(globalCtx, &pos, &velocity, &this->actor.posRot.pos, gravity, phi_v0, 30, 5, 0,
|
||||
sEffectScales[i], 3, 0, 70, 1, OBJECT_GAMEPLAY_FIELD_KEEP, &D_0500A5E8);
|
||||
}
|
||||
|
||||
func_80033480(globalCtx, &this->actor.posRot, 140.0f, 6, 180, 90, 1);
|
||||
func_80033480(globalCtx, &this->actor.posRot, 140.0f, 12, 80, 90, 1);
|
||||
}
|
||||
|
||||
void ObjHamishi_Init(Actor* thisx, GlobalContext* globalCtx) {
|
||||
ObjHamishi* this = THIS;
|
||||
|
||||
Actor_ProcessInitChain(&this->actor, sInitChain);
|
||||
|
||||
if (globalCtx->csCtx.state != 0) {
|
||||
this->actor.uncullZoneForward += 1000.0f;
|
||||
}
|
||||
if (this->actor.shape.rot.y == 0) {
|
||||
this->actor.shape.rot.y = this->actor.posRot.rot.y = this->actor.initPosRot.rot.y =
|
||||
Math_Rand_ZeroFloat(65536.0f);
|
||||
}
|
||||
|
||||
ObjHamishi_InitCollision(&this->actor, globalCtx);
|
||||
func_80061ED4(&this->actor.colChkInfo, NULL, &sColChkInfoInit);
|
||||
|
||||
if (Flags_GetSwitch(globalCtx, this->actor.params & 0x3F)) {
|
||||
Actor_Kill(&this->actor);
|
||||
return;
|
||||
}
|
||||
|
||||
this->actor.shape.unk_08 = 80.0f;
|
||||
}
|
||||
|
||||
void ObjHamishi_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
||||
GlobalContext* globalCtx2 = globalCtx;
|
||||
ObjHamishi* this = THIS;
|
||||
|
||||
Collider_DestroyCylinder(globalCtx2, &this->collider);
|
||||
}
|
||||
|
||||
void ObjHamishi_Update(Actor* thisx, GlobalContext* globalCtx) {
|
||||
ObjHamishi* this = THIS;
|
||||
CollisionCheckContext* colChkCtx = &globalCtx->colChkCtx;
|
||||
|
||||
ObjHamishi_Shake(this);
|
||||
|
||||
if ((this->collider.base.acFlags & 2) && (this->collider.body.acHitItem->toucher.flags & 0x40000040)) {
|
||||
this->collider.base.acFlags &= ~2;
|
||||
this->hitCount++;
|
||||
if (this->hitCount < 2) {
|
||||
this->shakeFrames = 15;
|
||||
this->shakePosSize = 2.0f;
|
||||
this->shakeRotSize = 400.0f;
|
||||
} else {
|
||||
ObjHamishi_Break(this, globalCtx);
|
||||
Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_EV_WALL_BROKEN);
|
||||
Flags_SetSwitch(globalCtx, this->actor.params & 0x3F);
|
||||
Actor_Kill(&this->actor);
|
||||
}
|
||||
} else {
|
||||
this->collider.base.acFlags &= ~2;
|
||||
|
||||
if (this->actor.xzDistFromLink < 600.0f) {
|
||||
CollisionCheck_SetAC(globalCtx, colChkCtx, &this->collider);
|
||||
CollisionCheck_SetOC(globalCtx, colChkCtx, &this->collider);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ObjHamishi_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
||||
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_obj_hamishi.c", 399);
|
||||
|
||||
func_80093D18(globalCtx->state.gfxCtx);
|
||||
|
||||
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_hamishi.c", 404),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 170, 130, 255);
|
||||
gSPDisplayList(POLY_OPA_DISP++, &D_0500A3B8);
|
||||
|
||||
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_hamishi.c", 411);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,13 @@ struct ObjHamishi;
|
|||
|
||||
typedef struct ObjHamishi {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ char unk_14C[0x5C];
|
||||
/* 0x014C */ ColliderCylinder collider;
|
||||
/* 0x0198 */ f32 shakePosSize;
|
||||
/* 0x019C */ f32 shakeRotSize;
|
||||
/* 0x01A0 */ s16 shakeFrames;
|
||||
/* 0x01A2 */ s16 shakePosPhase;
|
||||
/* 0x01A4 */ s16 shakeRotPhase;
|
||||
/* 0x01A6 */ s16 hitCount;
|
||||
} ObjHamishi; // size = 0x01A8
|
||||
|
||||
extern const ActorInit Obj_Hamishi_InitVars;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue