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

Obj_Flowerpot (#539) 

* Obj_Flowerpot

* PR
This commit is contained in:
Maide 2022-01-04 06:37:52 +00:00 committed by GitHub
parent d90a15ba6e
commit af52799bc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 632 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spec
View File

@ -2644,9 +2644,7 @@ beginseg
name "ovl_Obj_Flowerpot"
compress
include "build/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.o"
include "build/data/ovl_Obj_Flowerpot/ovl_Obj_Flowerpot.data.o"
include "build/data/ovl_Obj_Flowerpot/ovl_Obj_Flowerpot.bss.o"
include "build/data/ovl_Obj_Flowerpot/ovl_Obj_Flowerpot.reloc.o"
include "build/src/overlays/actors/ovl_Obj_Flowerpot/ovl_Obj_Flowerpot_reloc.o"
endseg
beginseg

669
src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c
View File

@ -5,6 +5,7 @@
*/
#include "z_obj_flowerpot.h"
#include "objects/object_flowerpot/object_flowerpot.h"
#define FLAGS 0x00000000
@ -15,7 +16,21 @@ void ObjFlowerpot_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ObjFlowerpot_Update(Actor* thisx, GlobalContext* globalCtx);
void ObjFlowerpot_Draw(Actor* thisx, GlobalContext* globalCtx);
#if 0
void func_80A1C818(ObjFlowerpot* this);
void func_80A1C838(ObjFlowerpot* this, GlobalContext* globalCtx);
void func_80A1CBF8(ObjFlowerpot* this);
void func_80A1CC0C(ObjFlowerpot* this, GlobalContext* globalCtx);
void func_80A1CD10(ObjFlowerpot* this);
void func_80A1CEF4(ObjFlowerpot* this2, GlobalContext* globalCtx);
static u32 D_80A1D830;
static MtxF D_80A1D838[8];
static s16 D_80A1DA38;
static s16 D_80A1DA3A;
static s16 D_80A1DA3C;
static s16 D_80A1DA3E;
static s16 D_80A1DA40;
const ActorInit Obj_Flowerpot_InitVars = {
ACTOR_OBJ_FLOWERPOT,
ACTORCAT_PROP,
@ -28,86 +43,646 @@ const ActorInit Obj_Flowerpot_InitVars = {
(ActorFunc)ObjFlowerpot_Draw,
};
// static ColliderJntSphElementInit sJntSphElementsInit[2] = {
static ColliderJntSphElementInit D_80A1D3A0[2] = {
static ColliderJntSphElementInit sJntSphElementsInit[2] = {
{
{ ELEMTYPE_UNK0, { 0x00400000, 0x00, 0x02 }, { 0x05CBFFBE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, },
{
ELEMTYPE_UNK0,
{ 0x00400000, 0x00, 0x02 },
{ 0x05CBFFBE, 0x00, 0x00 },
TOUCH_ON | TOUCH_SFX_NORMAL,
BUMP_ON,
OCELEM_ON,
},
{ 0, { { 0, 100, 0 }, 12 }, 100 },
},
{
{ ELEMTYPE_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x0580C71C, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, },
{
ELEMTYPE_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x0580C71C, 0x00, 0x00 },
TOUCH_NONE | TOUCH_SFX_NORMAL,
BUMP_ON,
OCELEM_NONE,
},
{ 1, { { 0, 300, 0 }, 12 }, 100 },
},
};
// static ColliderJntSphInit sJntSphInit = {
static ColliderJntSphInit D_80A1D3E8 = {
{ COLTYPE_NONE, AT_ON | AT_TYPE_PLAYER, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_2, COLSHAPE_JNTSPH, },
2, D_80A1D3A0, // sJntSphElementsInit,
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_NONE,
AT_ON | AT_TYPE_PLAYER,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,
OC2_TYPE_2,
COLSHAPE_JNTSPH,
},
2,
sJntSphElementsInit,
};
// static InitChainEntry sInitChain[] = {
static InitChainEntry D_80A1D414[] = {
ICHAIN_F32_DIV1000(gravity, -2000, ICHAIN_CONTINUE),
ICHAIN_F32_DIV1000(minVelocityY, -20000, ICHAIN_CONTINUE),
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneForward, 1600, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_STOP),
static s16 D_80A1D3F8 = 0;
static s16 D_80A1D3FC = 0;
static s16 D_80A1D400 = 0;
static u8 D_80A1D404 = true;
static Vec3f D_80A1D408 = { 0.0f, 20.0f, 0.0f };
static InitChainEntry sInitChain[] = {
ICHAIN_F32_DIV1000(gravity, -2000, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(minVelocityY, -20000, ICHAIN_CONTINUE),
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneForward, 1600, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_STOP),
};
#endif
void func_80A1B3D0(void) {
s32 i;
s32 pad;
f32 spB4;
f32* ptr;
f32 spAC;
f32 spA8;
f32 tempf1;
f32 tempf2;
f32 tempf3;
f32 tempf4;
f32 tempf5;
f32 sp74[8];
f32 temp_f20;
f32 temp_f22;
f32 temp_f24;
f32 temp_f26;
f32 temp_f28;
f32 temp_f0;
f32 temp_f30;
extern ColliderJntSphElementInit D_80A1D3A0[2];
extern ColliderJntSphInit D_80A1D3E8;
extern InitChainEntry D_80A1D414[];
D_80A1DA38 += 70;
D_80A1DA3A += 300;
D_80A1DA3C += 700;
D_80A1DA3E += 1300;
D_80A1DA40 += 8900;
extern UNK_TYPE D_060012E0;
extern UNK_TYPE D_060014F0;
extern UNK_TYPE D_060015B0;
temp_f28 = Math_SinS(D_80A1DA38);
spB4 = Math_SinS(D_80A1DA3A);
temp_f30 = Math_SinS(D_80A1DA3C);
spAC = Math_SinS(D_80A1DA3E);
spA8 = Math_SinS(D_80A1DA40);
temp_f26 = Math_CosS(D_80A1DA38);
temp_f20 = Math_CosS(D_80A1DA3A);
temp_f22 = Math_CosS(D_80A1DA3C);
temp_f24 = Math_CosS(D_80A1DA3E);
temp_f0 = Math_CosS(D_80A1DA40);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Flowerpot/func_80A1B3D0.s")
sp74[0] = (temp_f28 - temp_f20) * temp_f30 * temp_f26 * temp_f28 * 0.0012f;
sp74[1] = (spB4 - temp_f22) * spAC * temp_f20 * temp_f28 * 0.0012f;
sp74[2] = (temp_f30 - temp_f24) * temp_f22 * temp_f28 * temp_f26 * 0.0012f;
sp74[3] = (spAC - temp_f20) * temp_f24 * spB4 * temp_f26 * 0.0012f;
sp74[4] = (temp_f28 - temp_f22) * temp_f28 * spB4 * spA8 * 0.0013f;
sp74[5] = (spB4 - temp_f24) * temp_f30 * spAC * spA8 * 0.0013f;
sp74[6] = (temp_f30 - temp_f26) * temp_f26 * temp_f20 * temp_f0 * 0.0013f;
sp74[7] = (spAC - temp_f20) * temp_f22 * temp_f24 * temp_f0 * 0.0013f;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Flowerpot/func_80A1B840.s")
for (i = 0; i < ARRAY_COUNT(D_80A1D838); i++) {
ptr = (f32*)&D_80A1D838[i].mf[0];
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Flowerpot/func_80A1B914.s")
tempf1 = sp74[(i + 0) & 7];
tempf2 = sp74[(i + 1) & 7];
tempf3 = sp74[(i + 2) & 7];
tempf4 = sp74[(i + 3) & 7];
tempf5 = sp74[(i + 4) & 7];
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Flowerpot/func_80A1B994.s")
ptr[0] = sp74[1] * 0.2f;
ptr[1] = tempf1;
ptr[2] = tempf2;
ptr[3] = 0.0f;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Flowerpot/func_80A1B9CC.s")
ptr[4] = tempf3;
ptr[5] = sp74[0];
ptr[6] = tempf3;
ptr[7] = 0.0f;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Flowerpot/func_80A1BA04.s")
ptr[8] = tempf4;
ptr[9] = tempf5;
ptr[10] = sp74[3] * 0.2f;
ptr[11] = 0.0f;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Flowerpot/func_80A1BA44.s")
ptr[12] = 0.0f;
ptr[13] = 0.0f;
ptr[14] = 0.0f;
ptr[15] = 0.0f;
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Flowerpot/func_80A1BD80.s")
void func_80A1B840(MtxF* matrix) {
MtxF* temp = Matrix_GetCurrentState();
f32* tmp = (f32*)&temp->mf[0];
f32* tmp2 = (f32*)&matrix->mf[0];
s32 i;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Flowerpot/func_80A1C0FC.s")
for (i = 0; i < 16; i++) {
*tmp++ += *tmp2++;
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Flowerpot/func_80A1C328.s")
void func_80A1B914(ObjFlowerpot* this, GlobalContext* globalCtx) {
if (!(this->unk_1EA & 4)) {
s32 temp_v0 = func_800A8150(ENOBJFLOWERPOT_GET_3F(&this->actor));
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Flowerpot/func_80A1C554.s")
if (temp_v0 >= 0) {
s32 params = ENOBJFLOWERPOT_GET_7F00(&this->actor);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Flowerpot/func_80A1C5E8.s")
Item_DropCollectible(globalCtx, &this->actor.world.pos, temp_v0 | (params << 8));
this->unk_1EA |= 4;
}
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Flowerpot/func_80A1C62C.s")
void func_80A1B994(ObjFlowerpot* this, GlobalContext* globalCtx) {
Audio_PlaySoundAtPosition(globalCtx, &this->actor.world.pos, 20, NA_SE_EV_POT_BROKEN);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Flowerpot/ObjFlowerpot_Init.s")
void func_80A1B9CC(ObjFlowerpot* this, GlobalContext* globalCtx) {
Audio_PlaySoundAtPosition(globalCtx, &this->actor.world.pos, 20, NA_SE_EV_PLANT_BROKEN);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Flowerpot/ObjFlowerpot_Destroy.s")
void func_80A1BA04(ObjFlowerpot* this, Vec3f* arg1) {
Matrix_SetStateRotationAndTranslation(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z,
&this->actor.shape.rot);
Matrix_MultiplyVector3fByState(&D_80A1D408, arg1);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Flowerpot/func_80A1C818.s")
void func_80A1BA44(ObjFlowerpot* this, GlobalContext* globalCtx) {
s32 i;
Vec3f spD0;
Vec3f spC4;
Vec3f spB8;
f32 temp_f0;
f32 temp_f20;
s16 phi_s3;
s32 phi_s0;
s32 phi_s1;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Flowerpot/func_80A1C838.s")
spD0.x = this->actor.world.pos.x;
spD0.y = this->actor.world.pos.y;
spD0.z = this->actor.world.pos.z;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Flowerpot/func_80A1CBF8.s")
for (i = 0, phi_s3 = 0; i < 18; i++, phi_s3 += 0xE38) {
temp_f20 = (Rand_ZeroOne() * 8.0f) + 2.0f;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Flowerpot/func_80A1CC0C.s")
spC4.x = Math_SinS((s32)(Rand_ZeroOne() * 3640.0f) + phi_s3) * temp_f20;
spC4.y = Rand_ZeroOne() * 30.0f;
spC4.z = Math_CosS((s32)(Rand_ZeroOne() * 3640.0f) + phi_s3) * temp_f20;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Flowerpot/func_80A1CD10.s")
spB8.x = spC4.x * 0.27f;
spB8.y = (Rand_ZeroOne() * 6.0f) + 2.6f + ((30.0f - spC4.y) * 0.2f);
spB8.z = spC4.z * 0.27f;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Flowerpot/func_80A1CEF4.s")
Math_Vec3f_Sum(&spC4, &spD0, &spC4);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Flowerpot/ObjFlowerpot_Update.s")
temp_f0 = Rand_ZeroOne();
if (temp_f0 < 0.2f) {
phi_s0 = 32;
phi_s1 = 0;
} else if (temp_f0 < 0.6f) {
phi_s0 = 65;
phi_s1 = 1;
} else {
phi_s0 = 64;
phi_s1 = 0;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Flowerpot/ObjFlowerpot_Draw.s")
EffectSsKakera_Spawn(globalCtx, &spC4, &spB8, &spC4, -600, phi_s0, 30, 0, 0, (Rand_ZeroOne() * 12.0f) + 16.6f,
phi_s1, 0, 35, -1, ACTOR_DEMO_GETITEM, object_flowerpot_DL_0015B0);
}
spD0.y += 20.0f;
func_800BBFB0(globalCtx, &spD0, 30.0f, 2, 20, 50, 1);
func_800BBFB0(globalCtx, &spD0, 30.0f, 2, 10, 80, 1);
func_800BBFB0(globalCtx, &spD0, 30.0f, 1, 10, 40, 1);
}
void func_80A1BD80(ObjFlowerpot* this, GlobalContext* globalCtx) {
s32 i;
Vec3f spC8;
Vec3f spBC;
Vec3f spB0;
f32 temp_f20;
s16 phi_s1;
s32 phi_s0;
spC8.x = this->actor.world.pos.x;
spC8.y = this->actor.world.pos.y;
spC8.z = this->actor.world.pos.z;
for (i = 0, phi_s1 = 0; i < 14; i++, phi_s1 += 0x1249) {
temp_f20 = (Rand_ZeroOne() * 8.0f) + 2.0f;
spBC.x = Math_SinS((s32)(Rand_ZeroOne() * 4681.0f) + phi_s1) * temp_f20;
spBC.y = Rand_ZeroOne() * 20.0f;
spBC.z = Math_CosS((s32)(Rand_ZeroOne() * 4681.0f) + phi_s1) * temp_f20;
spB0.x = spBC.x * 0.17f;
spB0.y = (Rand_ZeroOne() * 5.0f) + 1.4f;
spB0.z = spBC.z * 0.17f;
Math_Vec3f_Sum(&spBC, &spC8, &spBC);
if (Rand_ZeroOne() < 0.2f) {
phi_s0 = 64;
} else {
phi_s0 = 32;
}
EffectSsKakera_Spawn(globalCtx, &spBC, &spB0, &spBC, -240, phi_s0, 40, 0, 0, (Rand_ZeroOne() * 20.0f) + 10.6f,
0, 0, 42, -1, ACTOR_DEMO_GETITEM, object_flowerpot_DL_0015B0);
}
spBC.y = this->actor.world.pos.y + this->actor.depthInWater;
for (phi_s1 = 0, i = 0; i < 4; i++, phi_s1 += 0x4000) {
spBC.x = (Math_SinS((s32)(Rand_ZeroOne() * 7200.0f) + phi_s1) * 15.0f) + this->actor.world.pos.x;
spBC.z = (Math_CosS((s32)(Rand_ZeroOne() * 7200.0f) + phi_s1) * 15.0f) + this->actor.world.pos.z;
EffectSsGSplash_Spawn(globalCtx, &spBC, NULL, NULL, 0, 200);
}
spBC.x = this->actor.world.pos.x;
spBC.z = this->actor.world.pos.z;
EffectSsGSplash_Spawn(globalCtx, &spBC, NULL, NULL, 0, 350);
EffectSsGRipple_Spawn(globalCtx, &spBC, 150, 650, 0);
}
void func_80A1C0FC(ObjFlowerpot* this, GlobalContext* globalCtx) {
Vec3f spC4;
Vec3f spB8;
Vec3f spAC;
f32 temp_f20;
s16 phi_s0;
s32 i;
func_80A1BA04(this, &spC4);
for (i = 0, phi_s0 = 0; i < 10; i++, phi_s0 += 0x1999) {
temp_f20 = (Rand_ZeroOne() * 18.0f) + 2.0f;
spB8.x = Math_SinS((s32)(Rand_ZeroOne() * 6553.0f) + phi_s0) * temp_f20;
spB8.y = Rand_ZeroOne() * 15.0f;
spB8.z = Math_CosS((s32)(Rand_ZeroOne() * 6553.0f) + phi_s0) * temp_f20;
spAC.x = spB8.x * 0.23f;
spAC.y = (Rand_ZeroOne() * 8.0f) + 1.5f;
spAC.z = spB8.z * 0.23f;
Math_Vec3f_Sum(&spB8, &spC4, &spB8);
EffectSsKakera_Spawn(globalCtx, &spB8, &spAC, &spB8, -100, 64, 40, 0, 0, (Rand_ZeroOne() * 16.0f) + 14.0f, 0, 0,
80, -1, ACTOR_DEMO_GETITEM, object_flowerpot_DL_0014F0);
}
}
void func_80A1C328(ObjFlowerpot* this, GlobalContext* globalCtx) {
Vec3f spC4;
Vec3f spB8;
Vec3f spAC;
f32 temp_f20;
s16 phi_s0;
s32 i;
func_80A1BA04(this, &spC4);
for (i = 0, phi_s0 = 0; i < 10; i++, phi_s0 += 0x1999) {
temp_f20 = (Rand_ZeroOne() * 18.0f) + 2.0f;
spB8.x = Math_SinS((s32)(Rand_ZeroOne() * 6553.0f) + phi_s0) * temp_f20;
spB8.y = Rand_ZeroOne() * 15.0f;
spB8.z = Math_CosS((s32)(Rand_ZeroOne() * 6553.0f) + phi_s0) * temp_f20;
spAC.x = spB8.x * 0.18f;
spAC.y = (Rand_ZeroOne() * 4.0f) + 1.2f;
spAC.z = spB8.z * 0.18f;
Math_Vec3f_Sum(&spB8, &spC4, &spB8);
EffectSsKakera_Spawn(globalCtx, &spB8, &spAC, &spB8, -80, 64, 44, 0, 0, (Rand_ZeroOne() * 16.0f) + 14.0f, 0, 0,
80, -1, ACTOR_DEMO_GETITEM, object_flowerpot_DL_0014F0);
}
}
void func_80A1C554(ObjFlowerpot* this) {
if ((this->actor.projectedPos.z < 455.0f) && (this->actor.projectedPos.z > -10.0f)) {
this->actor.shape.shadowDraw = func_800B3FC0;
this->actor.shape.shadowScale = 1.9f;
if (this->actor.projectedPos.z < 255.0f) {
this->actor.shape.shadowAlpha = 200;
} else {
this->actor.shape.shadowAlpha = 455 - (s32)this->actor.projectedPos.z;
}
} else {
this->actor.shape.shadowDraw = NULL;
}
}
void func_80A1C5E8(ObjFlowerpot* this, GlobalContext* globalCtx) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 18.0f, 15.0f, 0.0f, 0x45);
}
void func_80A1C62C(ObjFlowerpot* this, GlobalContext* globalCtx) {
if (!(this->unk_1EA & 4) && (globalCtx->roomCtx.currRoom.num != this->unk_1EC)) {
this->unk_1EA |= 4;
}
}
void ObjFlowerpot_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
ObjFlowerpot* this = THIS;
Actor_ProcessInitChain(&this->actor, sInitChain);
if (this->actor.shape.rot.y == 0) {
this->actor.shape.rot.y = this->actor.world.rot.y = (u32)Rand_Next() >> 0x10;
}
Collider_InitJntSph(globalCtx, &this->collider);
Collider_SetJntSph(globalCtx, &this->collider, &this->actor, &sJntSphInit, this->colliderElements);
Matrix_SetStateRotationAndTranslation(this->actor.home.pos.x, this->actor.home.pos.y, this->actor.home.pos.z,
&this->actor.shape.rot);
Matrix_Scale(0.1f, 0.1f, 0.1f, MTXMODE_APPLY);
Collider_UpdateSpheres(0, &this->collider);
Collider_UpdateSpheres(1, &this->collider);
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
this->unk_1EC = this->actor.room;
func_80A1C818(this);
if (D_80A1D404) {
D_80A1DA38 = (u32)Rand_Next() >> 0x10;
D_80A1DA3A = (u32)Rand_Next() >> 0x10;
D_80A1DA3C = (u32)Rand_Next() >> 0x10;
D_80A1DA3E = (u32)Rand_Next() >> 0x10;
D_80A1DA40 = (u32)Rand_Next() >> 0x10;
D_80A1D404 = false;
func_80A1B3D0();
D_80A1D830 = globalCtx->gameplayFrames;
}
this->unk_1EB = D_80A1D400 & 7;
D_80A1D400++;
}
void ObjFlowerpot_Destroy(Actor* thisx, GlobalContext* globalCtx) {
Collider_DestroyJntSph(globalCtx, &THIS->collider);
}
void func_80A1C818(ObjFlowerpot* this) {
this->actionFunc = func_80A1C838;
this->unk_1EA |= 1;
}
void func_80A1C838(ObjFlowerpot* this, GlobalContext* globalCtx) {
s32 pad;
if (Actor_HasParent(&this->actor, globalCtx)) {
func_80A1CBF8(this);
this->actor.room = -1;
this->actor.colChkInfo.mass = 180;
this->actor.flags |= 0x10;
if (func_800A817C(ENOBJFLOWERPOT_GET_3F(&this->actor))) {
func_80A1B914(this, globalCtx);
}
func_800B8E58(&this->actor, NA_SE_PL_PULL_UP_POT);
} else if ((this->actor.bgCheckFlags & 0x20) && (this->actor.depthInWater > 19.0f)) {
if (!(this->unk_1EA & 2)) {
func_80A1B914(this, globalCtx);
func_80A1C328(this, globalCtx);
func_80A1B9CC(this, globalCtx);
this->unk_1EA |= 2;
}
func_80A1BD80(this, globalCtx);
func_80A1B994(this, globalCtx);
Actor_MarkForDeath(&this->actor);
} else if ((this->collider.elements[0].info.bumperFlags & 2) &&
(this->collider.elements[0].info.acHitInfo->toucher.dmgFlags & 0x058BFFBC)) {
if (!(this->unk_1EA & 2)) {
func_80A1B914(this, globalCtx);
func_80A1C0FC(this, globalCtx);
func_80A1B9CC(this, globalCtx);
this->unk_1EA |= 2;
}
func_80A1BA44(this, globalCtx);
func_80A1B994(this, globalCtx);
Actor_MarkForDeath(&this->actor);
} else {
if (this->collider.elements[1].info.bumperFlags & 2) {
if (!(this->unk_1EA & 2)) {
this->unk_1EA |= 2;
this->collider.elements[1].info.bumperFlags &= ~0x1;
func_80A1C0FC(this, globalCtx);
func_80A1B914(this, globalCtx);
func_80A1B9CC(this, globalCtx);
}
}
if (this->unk_1EA & 1) {
Actor_SetVelocityAndMoveYRotationAndGravity(&this->actor);
func_80A1C5E8(this, globalCtx);
if (this->actor.bgCheckFlags & 1) {
if (this->actor.colChkInfo.mass == MASS_IMMOVABLE) {
if (DynaPoly_GetActor(&globalCtx->colCtx, this->actor.floorBgId) == NULL) {
this->actor.flags &= ~0x10;
this->unk_1EA &= ~0x1;
}
} else if (Math3D_Vec3fDistSq(&this->actor.world.pos, &this->actor.prevPos) < 0.01f) {
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
}
}
}
if (!(this->collider.base.ocFlags1 & OC1_TYPE_PLAYER) && (this->actor.xzDistToPlayer > 28.0f)) {
this->collider.base.ocFlags1 |= OC1_TYPE_PLAYER;
}
this->collider.base.acFlags &= ~AC_HIT;
if (this->actor.xzDistToPlayer < 600.0f) {
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
if (this->actor.xzDistToPlayer < 180.0f) {
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
if (this->actor.xzDistToPlayer < 100.0f) {
s16 temp_v0_3 = this->actor.yawTowardsPlayer - GET_PLAYER(globalCtx)->actor.world.rot.y;
if (ABS_ALT(temp_v0_3) >= 0x5556) {
func_800B8A1C(&this->actor, globalCtx, 0, 36.0f, 30.0f);
}
}
}
}
}
}
void func_80A1CBF8(ObjFlowerpot* this) {
this->actionFunc = func_80A1CC0C;
}
void func_80A1CC0C(ObjFlowerpot* this, GlobalContext* globalCtx) {
s32 pad;
func_80A1C62C(this, globalCtx);
if (Actor_HasNoParent(&this->actor, globalCtx)) {
this->actor.room = globalCtx->roomCtx.currRoom.num;
if (fabsf(this->actor.speedXZ) < 0.1f) {
func_80A1C818(this);
func_800B8E58(&GET_PLAYER(globalCtx)->actor, NA_SE_PL_PUT_DOWN_POT);
this->collider.base.ocFlags1 &= ~OC1_TYPE_PLAYER;
} else {
Actor_SetVelocityAndMoveYRotationAndGravity(&this->actor);
func_80A1CD10(this);
}
func_80A1C5E8(this, globalCtx);
} else {
Vec3f sp30;
s32 sp2C;
sp30.x = this->actor.world.pos.x;
sp30.y = this->actor.world.pos.y + 20.0f;
sp30.z = this->actor.world.pos.z;
this->actor.floorHeight =
BgCheck_EntityRaycastFloor5(&globalCtx->colCtx, &this->actor.floorPoly, &sp2C, &this->actor, &sp30);
}
}
void func_80A1CD10(ObjFlowerpot* this) {
f32 sp1C;
this->actionFunc = func_80A1CEF4;
this->unk_1E8 = 64;
if (this->unk_1EA & 2) {
sp1C = (Rand_ZeroOne() * 1.2f) - 1.1f;
if (sp1C < -0.9f) {
sp1C = -0.9f;
}
D_80A1D3F8 = sp1C * 8000.0f;
D_80A1D3FC = ((Rand_ZeroOne() - 0.5f) * 3800.0f) * (fabsf(sp1C) + 0.1f);
this->actor.shape.yOffset = -71.5f;
this->actor.world.pos.y += 7.15f;
} else {
sp1C = (Rand_ZeroOne() - 0.78f) * 1.3f;
if (sp1C < -0.78f) {
sp1C = -0.78f;
} else if (sp1C > 0.22000003f) {
sp1C = 0.22000003f;
}
D_80A1D3F8 = sp1C * 6200.0f;
D_80A1D3FC = (Rand_ZeroOne() - 0.5f) * 4200.0f;
this->actor.shape.yOffset = -110.0f;
this->actor.world.pos.y += 11.0f;
}
}
void func_80A1CEF4(ObjFlowerpot* this2, GlobalContext* globalCtx) {
ObjFlowerpot* this = this2;
s32 sp28 = this->collider.elements[0].info.toucherFlags & TOUCH_HIT;
if (sp28) {
this->collider.elements[0].info.toucherFlags &= ~TOUCH_ON;
}
if (this->unk_1E8 > 0) {
this->unk_1E8--;
}
func_80A1C62C(this, globalCtx);
if ((this->actor.bgCheckFlags & (0x8 | 0x2 | 0x1)) || sp28 || (this->unk_1E8 <= 0)) {
if (!(this->unk_1EA & 2)) {
func_80A1B914(this, globalCtx);
func_80A1C0FC(this, globalCtx);
func_80A1B9CC(this, globalCtx);
this->unk_1EA |= 2;
}
func_80A1BA44(this, globalCtx);
func_80A1B994(this, globalCtx);
Actor_MarkForDeath(&this->actor);
return;
}
if (this->actor.bgCheckFlags & 0x40) {
if (!(this->unk_1EA & 2)) {
func_80A1B914(this, globalCtx);
func_80A1C328(this, globalCtx);
func_80A1B9CC(this, globalCtx);
this->unk_1EA |= 2;
}
func_80A1BD80(this, globalCtx);
func_80A1B994(this, globalCtx);
Audio_PlaySoundAtPosition(globalCtx, &this->actor.world.pos, 40, NA_SE_EV_DIVE_INTO_WATER_L);
Actor_MarkForDeath(&this->actor);
return;
}
Actor_SetVelocityAndMoveYRotationAndGravity(&this->actor);
if (!(this->unk_1EA & 2)) {
D_80A1D3F8 += (s16)(this->actor.shape.rot.x * -0.06f);
} else {
Math_StepToS(&D_80A1D3F8, 0, 80);
Math_StepToS(&D_80A1D3FC, 0, 20);
}
this->actor.shape.rot.x += D_80A1D3F8;
this->actor.shape.rot.y += D_80A1D3FC;
func_80A1C5E8(this, globalCtx);
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
}
void ObjFlowerpot_Update(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
ObjFlowerpot* this = THIS;
this->actionFunc(this, globalCtx);
func_80A1C554(this);
if ((D_80A1D830 != globalCtx->gameplayFrames) && (globalCtx->roomCtx.currRoom.unk3 == 0)) {
func_80A1B3D0();
D_80A1D830 = globalCtx->gameplayFrames;
}
}
void ObjFlowerpot_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
ObjFlowerpot* this = THIS;
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C28C(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, object_flowerpot_DL_0012E0);
if ((this->actionFunc != func_80A1C838) || (this->unk_1EA & 1)) {
Collider_UpdateSpheres(0, &this->collider);
if (!(this->unk_1EA & 2)) {
Collider_UpdateSpheres(1, &this->collider);
}
}
if (!(this->unk_1EA & 2)) {
if ((globalCtx->roomCtx.currRoom.unk3 == 0) && (this->actionFunc == func_80A1C838)) {
if ((this->actor.projectedPos.z > -150.0f) && (this->actor.projectedPos.z < 400.0f)) {
func_80A1B840(&D_80A1D838[this->unk_1EB]);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
}
}
gSPDisplayList(POLY_OPA_DISP++, object_flowerpot_DL_001408);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

11
src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.h
View File

@ -7,11 +7,18 @@ struct ObjFlowerpot;
typedef void (*ObjFlowerpotActionFunc)(struct ObjFlowerpot*, GlobalContext*);
#define ENOBJFLOWERPOT_GET_3F(thisx) ((thisx)->params & 0x3F)
#define ENOBJFLOWERPOT_GET_7F00(thisx) (((thisx)->params >> 8) & 0x7F)
typedef struct ObjFlowerpot {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0xA0];
/* 0x0144 */ ColliderJntSph collider;
/* 0x0164 */ ColliderJntSphElement colliderElements[2];
/* 0x01E4 */ ObjFlowerpotActionFunc actionFunc;
/* 0x01E8 */ char unk_1E8[0x8];
/* 0x01E8 */ s16 unk_1E8;
/* 0x01EA */ u8 unk_1EA;
/* 0x01EB */ s8 unk_1EB;
/* 0x01EC */ s8 unk_1EC;
} ObjFlowerpot; // size = 0x1F0
extern const ActorInit Obj_Flowerpot_InitVars;

7
undefined_syms.txt
View File

@ -3904,13 +3904,6 @@ D_06003440 = 0x06003440;
D_06000158 = 0x06000158;
D_06001C00 = 0x06001C00;
// ovl_Obj_Flowerpot
D_060012E0 = 0x060012E0;
D_06001408 = 0x06001408;
D_060014F0 = 0x060014F0;
D_060015B0 = 0x060015B0;
// ovl_Obj_Funen
D_060000D0 = 0x060000D0;