mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-07 23:10:22 +00:00
Bg_Spot16_Bombstone (#405)
* First working function * Syncing up * Not OK - something wrong with data elements * Not OK - syncing files * OK now. Fixed data issue * Not OK - data issue * Not OK - syncing files * OK - added another function and commented out init for now * OK - another function * Not OK - working on function * OK - Added working functions back * OK - another function * Not OK - syncing files * Not OK - updating undefined syms * OK - Draw function * Not OK - slightly closer on 5950 * OK - another function * OK - another function * OK - another function * OK - another function * OK - finally fixed init * Lots of cleanup and renaming * Removed data files * Minor cleanup * Removed commented out line * Minor cleanup * More minor cleanup * More minor cleanup * More cleanup * Removed unneeded dereferences * Minor cleanup * Minor cleanup * More cleanup * Update src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * More cleanup * More cleanup * Removed structs * Minor cleanup * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Changed EnBombf to Actor Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
Darin
GitHub
parent
08bf25fca7
commit
b48fa7ff4a
29 changed files with 503 additions and 1403 deletions
|
|
@ -1,4 +1,5 @@
|
|||
#include "z_bg_spot16_bombstone.h"
|
||||
#include "overlays/actors/ovl_En_Bombf/z_en_bombf.h"
|
||||
|
||||
#define FLAGS 0x00000010
|
||||
|
||||
|
|
@ -9,7 +10,79 @@ void BgSpot16Bombstone_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
|||
void BgSpot16Bombstone_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgSpot16Bombstone_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
void func_808B5A94(BgSpot16Bombstone* this, GlobalContext* globalCtx);
|
||||
void func_808B5B04(BgSpot16Bombstone* this, GlobalContext* globalCtx);
|
||||
void func_808B5B6C(BgSpot16Bombstone* this, GlobalContext* globalCtx);
|
||||
void func_808B5B58(BgSpot16Bombstone* this);
|
||||
void func_808B5950(BgSpot16Bombstone* this, GlobalContext* globalCtx);
|
||||
void func_808B5934(BgSpot16Bombstone* this);
|
||||
void func_808B5AF0(BgSpot16Bombstone* this);
|
||||
void func_808B5A78(BgSpot16Bombstone* this);
|
||||
|
||||
extern Gfx D_06000C20[];
|
||||
extern Gfx D_060009E0[];
|
||||
|
||||
static EnBombf* sPlayerBomb = NULL;
|
||||
|
||||
static s16 sTimer = 0;
|
||||
|
||||
s16 D_808B5DD8[][10] = {
|
||||
{ 0x0008, 0x0004, 0x0046, 0x07D0, 0xFCE0, 0x0000, 0x0064, 0x0000, 0x0000, 0x0000 },
|
||||
{ 0x0006, 0x0003, 0x0032, 0x00C8, 0x0A28, 0xC350, 0x005A, 0x0000, 0x0000, 0x0000 },
|
||||
{ 0x0005, 0x0003, 0x0028, 0xF63C, 0x0190, 0x30B0, 0x0032, 0x0000, 0x0000, 0x0000 },
|
||||
{ 0x0003, 0x0001, 0x003C, 0x0258, 0xFF9C, 0xAFC8, 0x0032, 0x0000, 0x0000, 0x0000 },
|
||||
{ 0x0003, 0x0001, 0x0028, 0xF2B8, 0xFF9C, 0x6590, 0x001E, 0x0000, 0x0000, 0x0000 },
|
||||
{ 0x0006, 0x0009, 0x0028, 0x0000, 0x0BB8, 0xD8F0, 0x001E, 0x0000, 0x0000, 0x0000 },
|
||||
};
|
||||
|
||||
static ColliderJntSphItemInit sJntSphItemsInit[] = {
|
||||
{
|
||||
{ 0x00, { 0x00000000, 0x00, 0x00 }, { 0x4FC1FFF6, 0x00, 0x00 }, 0x00, 0x01, 0x01 },
|
||||
{ 0, { { 0, 50, 0 }, 288 }, 100 },
|
||||
},
|
||||
};
|
||||
|
||||
static ColliderJntSphInit sJntSphInit = {
|
||||
{ COLTYPE_UNK12, 0x00, 0x0D, 0x39, 0x20, COLSHAPE_JNTSPH },
|
||||
1,
|
||||
sJntSphItemsInit,
|
||||
};
|
||||
|
||||
static ColliderCylinderInit sCylinderInit = {
|
||||
{ COLTYPE_UNK10, 0x00, 0x09, 0x00, 0x00, COLSHAPE_CYLINDER },
|
||||
{ 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, 0x00, 0x01, 0x00 },
|
||||
{ 190, 80, 0, { 10, 0, 50 } },
|
||||
};
|
||||
|
||||
static s16 D_808B5EB0[][7] = {
|
||||
{ 0x0000, 0x000A, 0x003C, 0xFFF6, 0x0104, 0x01E0, 0x0007 },
|
||||
{ 0x0000, 0x0000, 0x0032, 0x0000, 0x0104, 0x017C, 0x000D },
|
||||
{ 0x0001, 0x001E, 0x0014, 0x0014, 0x00A0, 0x0104, 0x000A },
|
||||
{ 0x0002, 0x0014, 0x0028, 0x0014, 0x00C8, 0x0096, 0x0007 },
|
||||
{ 0x0003, 0xFFD8, 0x0064, 0x001E, 0x00D2, 0x0064, 0x0007 },
|
||||
{ 0x0004, 0x000A, 0x0078, 0x000A, 0x00A0, 0x0028, 0x000A },
|
||||
{ 0x0005, 0xFFA7, 0x006E, 0x0041, 0x0096, 0x0118, 0x0007 },
|
||||
{ 0x0006, 0xFFC4, 0x0070, 0x006D, 0x006E, 0x0082, 0x0007 },
|
||||
{ 0x0007, 0xFFF2, 0x0050, 0x007F, 0x008C, 0x00D2, 0x0007 },
|
||||
{ 0x0008, 0x0014, 0x0032, 0x001E, 0x008C, 0x00C8, 0x0007 },
|
||||
{ 0x0009, 0xFFEC, 0x0014, 0x0028, 0x00C8, 0x00B4, 0x0007 },
|
||||
{ 0x000A, 0x001E, 0x0028, 0xFFE2, 0x0064, 0x0078, 0x0007 },
|
||||
{ 0x000A, 0xFF92, 0x001D, 0x0078, 0x008C, 0x0118, 0x000A },
|
||||
{ 0x000B, 0x001E, 0x0014, 0x001E, 0x0050, 0x00C8, 0x0006 },
|
||||
{ 0x000C, 0x0028, 0x001E, 0xFFE2, 0x00AA, 0x010E, 0x0011 },
|
||||
{ 0x000D, 0xFFD8, 0x0032, 0xFFEC, 0x008C, 0x0056, 0x0006 },
|
||||
{ 0x000D, 0x0032, 0x0032, 0x0032, 0x0096, 0x00C8, 0x000A },
|
||||
{ 0x000E, 0x0028, 0x0028, 0xFFD8, 0x003C, 0x00A0, 0x0006 },
|
||||
{ 0x000F, 0xFFE2, 0x0014, 0x0032, 0x00AA, 0x012C, 0x0006 },
|
||||
{ 0x0010, 0x0028, 0x0032, 0x0014, 0x00AA, 0x0078, 0x0007 },
|
||||
{ 0x0010, 0x001E, 0x0032, 0x003C, 0x0096, 0x00C8, 0x0006 },
|
||||
{ 0x0011, 0x000A, 0x000A, 0x0000, 0x0082, 0x00DC, 0x0006 },
|
||||
{ 0x0012, 0x000A, 0x0028, 0x0014, 0x00B4, 0x00DC, 0x000B },
|
||||
{ 0x0013, 0x000A, 0x0005, 0x0000, 0x006E, 0x0046, 0x0011 },
|
||||
{ 0x0013, 0xFFEC, 0x0032, 0xFFE2, 0x0096, 0x00C8, 0x0006 },
|
||||
{ 0x0014, 0x0050, 0x0032, 0x0000, 0x0096, 0x00C8, 0x0008 },
|
||||
};
|
||||
|
||||
const ActorInit Bg_Spot16_Bombstone_InitVars = {
|
||||
ACTOR_BG_SPOT16_BOMBSTONE,
|
||||
ACTORTYPE_PROP,
|
||||
|
|
@ -21,49 +94,434 @@ const ActorInit Bg_Spot16_Bombstone_InitVars = {
|
|||
(ActorFunc)BgSpot16Bombstone_Update,
|
||||
(ActorFunc)BgSpot16Bombstone_Draw,
|
||||
};
|
||||
*/
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4C30.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4C4C.s")
|
||||
static InitChainEntry sInitChainBoulder[] = {
|
||||
ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4D04.s")
|
||||
static InitChainEntry sInitChainDebris[] = {
|
||||
ICHAIN_F32(gravity, -1, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(minVelocityY, -10, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4D9C.s")
|
||||
static Vec3f sVelocity = { 0.0f, 0.0f, 0.0f };
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4E58.s")
|
||||
static Vec3f sAcceleration = { 0.0f, 0.4f, 0.0f };
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Init.s")
|
||||
static f32 D_808B6074[] = { 66.0f, 51.0f, 48.0f, 36.0f, 21.0f };
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Destroy.s")
|
||||
static s16 D_808B6088[] = { 0, 1, 2, 3, 4 };
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B51A8.s")
|
||||
void func_808B4C30(BgSpot16Bombstone* this) {
|
||||
this->switchFlag = (this->actor.params >> 8) & 0x3F;
|
||||
this->actor.params = this->actor.params & 0xFF;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5240.s")
|
||||
void func_808B4C4C(BgSpot16Bombstone* this, GlobalContext* globalCtx) {
|
||||
s32 pad;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B53A8.s")
|
||||
Collider_InitJntSph(globalCtx, &this->colliderJntSph);
|
||||
Collider_SetJntSph(globalCtx, &this->colliderJntSph, &this->actor, &sJntSphInit, this->colliderJntSphItems);
|
||||
this->colliderJntSph.list->dim.worldSphere.center.x = this->actor.posRot.pos.x;
|
||||
this->colliderJntSph.list->dim.worldSphere.center.y = this->actor.posRot.pos.y + 50.0f;
|
||||
this->colliderJntSph.list->dim.worldSphere.center.z = this->actor.posRot.pos.z;
|
||||
this->colliderJntSph.list->dim.worldSphere.radius = 120;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B561C.s")
|
||||
void func_808B4D04(BgSpot16Bombstone* this, GlobalContext* globalCtx) {
|
||||
s32 pad;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B56BC.s")
|
||||
Collider_InitCylinder(globalCtx, &this->colliderCylinder);
|
||||
Collider_SetCylinder(globalCtx, &this->colliderCylinder, &this->actor, &sCylinderInit);
|
||||
this->colliderCylinder.dim.pos.x += (s16)this->actor.posRot.pos.x;
|
||||
this->colliderCylinder.dim.pos.y += (s16)this->actor.posRot.pos.y;
|
||||
this->colliderCylinder.dim.pos.z += (s16)this->actor.posRot.pos.z;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B57E0.s")
|
||||
s32 func_808B4D9C(BgSpot16Bombstone* this, GlobalContext* globalCtx) {
|
||||
if (Flags_GetSwitch(globalCtx, this->switchFlag)) {
|
||||
osSyncPrintf("Spot16 obj 爆弾石 破壊済み\n");
|
||||
return false;
|
||||
}
|
||||
Actor_ProcessInitChain(&this->actor, sInitChainBoulder);
|
||||
Actor_SetScale(&this->actor, 0.4f);
|
||||
this->actor.colChkInfo.mass = 0xFF;
|
||||
func_808B4C4C(this, globalCtx);
|
||||
func_808B4D04(this, globalCtx);
|
||||
this->sinRotation = Math_Sins(this->actor.shape.rot.y);
|
||||
this->cosRotation = Math_Coss(this->actor.shape.rot.y);
|
||||
this->unk_150 = D_06000C20;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5934.s")
|
||||
func_808B5934(this);
|
||||
return true;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5950.s")
|
||||
s32 func_808B4E58(BgSpot16Bombstone* this, GlobalContext* globalctx) {
|
||||
Actor* actor = &this->actor;
|
||||
f32 scaleFactor = 1.0f / 600.0f;
|
||||
f32 sinCosPosFactor = 50.0f;
|
||||
f32 sinValue;
|
||||
f32 cosValue;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5A78.s")
|
||||
Actor_ProcessInitChain(actor, sInitChainDebris);
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5A94.s")
|
||||
actor->speedXZ = D_808B5DD8[actor->params][0];
|
||||
actor->velocity.y = D_808B5DD8[actor->params][1];
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5AF0.s")
|
||||
Actor_SetScale(actor, D_808B5DD8[actor->params][2] * scaleFactor);
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B04.s")
|
||||
this->unk_210 = (f32)D_808B5DD8[actor->params][3];
|
||||
this->unk_212 = (f32)D_808B5DD8[actor->params][4];
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B58.s")
|
||||
actor->posRot.rot.y = D_808B5DD8[actor->params][5];
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B6C.s")
|
||||
sinValue = Math_Sins(this->actor.posRot.rot.y);
|
||||
cosValue = Math_Coss(this->actor.posRot.rot.y);
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Update.s")
|
||||
actor->posRot.pos.x = (sinValue * sinCosPosFactor) + actor->initPosRot.pos.x;
|
||||
actor->posRot.pos.y = D_808B5DD8[actor->params][6] + actor->initPosRot.pos.y;
|
||||
actor->posRot.pos.z = (cosValue * sinCosPosFactor) + actor->initPosRot.pos.z;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Draw.s")
|
||||
actor->shape.rot.x = D_808B5DD8[actor->params][7];
|
||||
actor->shape.rot.y = D_808B5DD8[actor->params][8];
|
||||
actor->shape.rot.z = D_808B5DD8[actor->params][9];
|
||||
|
||||
this->unk_150 = D_060009E0;
|
||||
this->bombiwaBankIndex = Object_GetIndex(&globalctx->objectCtx, OBJECT_BOMBIWA);
|
||||
|
||||
if (this->bombiwaBankIndex < 0) {
|
||||
osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", actor->params, "../z_bg_spot16_bombstone.c",
|
||||
589);
|
||||
return false;
|
||||
}
|
||||
|
||||
func_808B5AF0(this);
|
||||
return true;
|
||||
}
|
||||
|
||||
void BgSpot16Bombstone_Init(Actor* thisx, GlobalContext* globalCtx) {
|
||||
BgSpot16Bombstone* this = THIS;
|
||||
s16 shouldLive;
|
||||
|
||||
func_808B4C30(this);
|
||||
|
||||
switch (this->actor.params) {
|
||||
case 0xFF:
|
||||
// The boulder is intact
|
||||
shouldLive = func_808B4D9C(thisx, globalCtx);
|
||||
break;
|
||||
case 0:
|
||||
case 1:
|
||||
case 2:
|
||||
case 3:
|
||||
case 4:
|
||||
case 5:
|
||||
// The boulder is debris
|
||||
shouldLive = func_808B4E58(thisx, globalCtx);
|
||||
break;
|
||||
default:
|
||||
osSyncPrintf("Error : arg_data おかしいな(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot16_bombstone.c", 668,
|
||||
this->actor.params);
|
||||
shouldLive = false;
|
||||
break;
|
||||
}
|
||||
|
||||
if (!shouldLive) {
|
||||
Actor_Kill(thisx);
|
||||
return;
|
||||
}
|
||||
osSyncPrintf("Spot16 obj 爆弾石 (scaleX %f)(arg_data 0x%04x)\n", this->actor.scale.x, this->actor.params);
|
||||
}
|
||||
|
||||
void BgSpot16Bombstone_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
||||
BgSpot16Bombstone* this = THIS;
|
||||
|
||||
if (this->actor.params == 0xFF) {
|
||||
// Boulder is intact so remove its collider
|
||||
Collider_DestroyJntSph(globalCtx, &this->colliderJntSph);
|
||||
Collider_DestroyCylinder(globalCtx, &this->colliderCylinder);
|
||||
}
|
||||
}
|
||||
|
||||
void func_808B51A8(BgSpot16Bombstone* this, GlobalContext* globalCtx) {
|
||||
f32 scaleX1 = this->actor.scale.x * 150;
|
||||
s16 scaleX2 = this->actor.scale.x * 250;
|
||||
Vec3f posRot;
|
||||
|
||||
posRot.x = this->actor.posRot.pos.x;
|
||||
posRot.y = this->actor.posRot.pos.y + 50.0f;
|
||||
posRot.z = this->actor.posRot.pos.z;
|
||||
|
||||
func_80033480(globalCtx, &posRot, scaleX1, 2, scaleX2, 0xA0, 1);
|
||||
}
|
||||
|
||||
void func_808B5240(BgSpot16Bombstone* this, GlobalContext* globalCtx) {
|
||||
f32 tempUnk6;
|
||||
f32 tempUnk2;
|
||||
s16 index;
|
||||
Vec3f position;
|
||||
Vec3f* actorPosition = &this->actor.posRot.pos;
|
||||
|
||||
if (1) {}
|
||||
|
||||
while (true) {
|
||||
if (this->unk_158 >= ARRAY_COUNTU(D_808B5EB0) || this->unk_154 < D_808B5EB0[this->unk_158][0]) {
|
||||
break;
|
||||
}
|
||||
|
||||
index = this->unk_158;
|
||||
|
||||
tempUnk2 = D_808B5EB0[index][1];
|
||||
tempUnk6 = D_808B5EB0[index][3];
|
||||
|
||||
position.x = ((this->sinRotation * tempUnk6) + (tempUnk2 * this->cosRotation)) + actorPosition->x;
|
||||
position.y = D_808B5EB0[index][2] + actorPosition->y;
|
||||
position.z = ((this->cosRotation * tempUnk6) - (tempUnk2 * this->sinRotation)) + actorPosition->z;
|
||||
|
||||
func_800287AC(globalCtx, &position, &sVelocity, &sAcceleration, D_808B5EB0[index][4], D_808B5EB0[index][5],
|
||||
D_808B5EB0[index][6]);
|
||||
|
||||
this->unk_158 += 1;
|
||||
}
|
||||
}
|
||||
|
||||
void func_808B53A8(BgSpot16Bombstone* this, GlobalContext* globalCtx) {
|
||||
f32 velocityYMultiplier = 1.3f;
|
||||
Vec3f randomPosition;
|
||||
Vec3f randomVelocity;
|
||||
s32 index;
|
||||
s16 scale;
|
||||
|
||||
if (this->actor.params == 0) {
|
||||
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_BG_SPOT16_BOMBSTONE, this->actor.posRot.pos.x,
|
||||
this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 5);
|
||||
index = 3;
|
||||
} else {
|
||||
index = 0;
|
||||
}
|
||||
|
||||
if (index < ARRAY_COUNT(D_808B6074)) {
|
||||
do {
|
||||
randomPosition.x = ((Math_Rand_ZeroOne() - 0.5f) * 8.0f) + this->actor.posRot.pos.x;
|
||||
randomPosition.y = ((Math_Rand_ZeroOne() * 5.0f) + this->actor.posRot.pos.y) + 8.0f;
|
||||
randomPosition.z = ((Math_Rand_ZeroOne() - 0.5f) * 8.0f) + this->actor.posRot.pos.z;
|
||||
|
||||
randomVelocity.x = (Math_Rand_ZeroOne() - 0.5f) * 16.0f;
|
||||
randomVelocity.y = (Math_Rand_ZeroOne() * 14.0) + (fabsf(this->actor.velocity.y) * velocityYMultiplier);
|
||||
randomVelocity.z = (Math_Rand_ZeroOne() - 0.5f) * 16.0f;
|
||||
|
||||
scale = D_808B6074[index] * this->actor.scale.x * 3;
|
||||
|
||||
func_80029E8C(globalCtx, &randomPosition, &randomVelocity, &this->actor.posRot.pos, -0x1A4, 0x31, 0xF, 0xF,
|
||||
0, scale, 2, 0x40, 0xA0, -1, OBJECT_BOMBIWA, D_060009E0);
|
||||
index += 1;
|
||||
} while (index != ARRAY_COUNT(D_808B6074));
|
||||
}
|
||||
}
|
||||
|
||||
void func_808B561C(BgSpot16Bombstone* this, GlobalContext* globalCtx) {
|
||||
s32 index;
|
||||
PosRot* posRot;
|
||||
|
||||
posRot = &this->actor.posRot;
|
||||
for (index = 0; index < ARRAY_COUNT(D_808B6088); index++) {
|
||||
if (Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_BG_SPOT16_BOMBSTONE, posRot->pos.x, posRot->pos.y,
|
||||
posRot->pos.z, 0, 0, 0, D_808B6088[index]) == NULL) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void func_808B56BC(BgSpot16Bombstone* this, GlobalContext* globalCtx) {
|
||||
Player* player = PLAYER;
|
||||
f32 sinValue;
|
||||
s16 adjustedYawDiff;
|
||||
s32 yawDiff;
|
||||
s32 absYawDiff;
|
||||
|
||||
if (this->actor.xzDistFromLink < 130.0f && this->actor.yDistFromLink < 160.0f &&
|
||||
this->actor.yDistFromLink >= -10.0f) {
|
||||
yawDiff = this->actor.yawTowardsLink - this->actor.shape.rot.y;
|
||||
absYawDiff = ABS(yawDiff);
|
||||
|
||||
adjustedYawDiff = absYawDiff - 0x3FFF;
|
||||
|
||||
if (adjustedYawDiff > 0) {
|
||||
sinValue = Math_Sins(adjustedYawDiff) * this->actor.xzDistFromLink;
|
||||
|
||||
if (sinValue >= 0.0f) {
|
||||
player->actor.posRot.pos.x += sinValue * this->sinRotation;
|
||||
player->actor.posRot.pos.z += sinValue * this->cosRotation;
|
||||
} else {
|
||||
osSyncPrintf("Error 補正出来ない(%s %d)(arg_data 0x%04x)(hosei_angY %x)\n",
|
||||
"../z_bg_spot16_bombstone.c", 935, this->actor.params, adjustedYawDiff);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void func_808B57E0(BgSpot16Bombstone* this, GlobalContext* globalCtx) {
|
||||
Actor* playerHeldActor;
|
||||
Player* player = PLAYER;
|
||||
EnBombf* currentBomb;
|
||||
|
||||
if (sTimer > 0) {
|
||||
sTimer--;
|
||||
}
|
||||
|
||||
if (sPlayerBomb != NULL) {
|
||||
if (sPlayerBomb->actor.update == NULL) {
|
||||
sPlayerBomb = NULL;
|
||||
} else if (sTimer <= 0 && sPlayerBomb->actor.posRot.pos.y < 1400.0f &&
|
||||
Math3D_Dist1DSq(sPlayerBomb->actor.posRot.pos.x + 1579.0f,
|
||||
sPlayerBomb->actor.posRot.pos.z + 790.0f) < SQ(400.0f) &&
|
||||
sPlayerBomb->actor.params == 0) {
|
||||
currentBomb = sPlayerBomb;
|
||||
if (currentBomb->timer > 0) {
|
||||
sTimer = currentBomb->timer + 20;
|
||||
func_800800F8(globalCtx, 0x1054, sTimer, NULL, 0);
|
||||
}
|
||||
}
|
||||
} else if (player->stateFlags1 & 0x800) {
|
||||
playerHeldActor = player->heldActor;
|
||||
if (playerHeldActor != NULL && playerHeldActor->type == ACTORTYPE_EXPLOSIVES &&
|
||||
playerHeldActor->id == ACTOR_EN_BOMBF) {
|
||||
sPlayerBomb = playerHeldActor;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void func_808B5934(BgSpot16Bombstone* this) {
|
||||
this->actor.draw = BgSpot16Bombstone_Draw;
|
||||
this->actionFunc = func_808B5950;
|
||||
}
|
||||
|
||||
void func_808B5950(BgSpot16Bombstone* this, GlobalContext* globalCtx) {
|
||||
s32 pad;
|
||||
|
||||
func_808B56BC(this, globalCtx);
|
||||
func_808B57E0(this, globalCtx);
|
||||
|
||||
if (globalCtx) {}
|
||||
|
||||
if (this->colliderCylinder.base.acFlags & 2) {
|
||||
this->colliderCylinder.base.acFlags &= ~2;
|
||||
|
||||
func_808B561C(this, globalCtx);
|
||||
|
||||
func_800800F8(globalCtx, 0x1054, 0x32, NULL, 0);
|
||||
|
||||
Flags_SetSwitch(globalCtx, this->switchFlag);
|
||||
gSaveContext.eventChkInf[2] |= 8;
|
||||
|
||||
func_808B5A78(this);
|
||||
} else {
|
||||
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->colliderCylinder);
|
||||
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->colliderJntSph);
|
||||
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->colliderJntSph);
|
||||
}
|
||||
|
||||
if (mREG(64) == 1) {
|
||||
func_808B561C(this, globalCtx);
|
||||
mREG(64) = -10;
|
||||
} else if (mREG(64) < 0) {
|
||||
mREG(64)++;
|
||||
}
|
||||
}
|
||||
|
||||
void func_808B5A78(BgSpot16Bombstone* this) {
|
||||
this->unk_154 = 0;
|
||||
this->unk_158 = 0;
|
||||
this->actor.draw = NULL;
|
||||
this->actionFunc = func_808B5A94;
|
||||
}
|
||||
|
||||
void func_808B5A94(BgSpot16Bombstone* this, GlobalContext* globalCtx) {
|
||||
|
||||
func_808B5240(this, globalCtx);
|
||||
|
||||
if (this->unk_154 == 56) {
|
||||
func_80078884(NA_SE_SY_CORRECT_CHIME);
|
||||
}
|
||||
|
||||
if (this->unk_154 > 60) {
|
||||
Actor_Kill(&this->actor);
|
||||
}
|
||||
}
|
||||
|
||||
void func_808B5AF0(BgSpot16Bombstone* this) {
|
||||
this->actionFunc = func_808B5B04;
|
||||
this->actor.draw = NULL;
|
||||
}
|
||||
|
||||
void func_808B5B04(BgSpot16Bombstone* this, GlobalContext* globalCtx) {
|
||||
if (Object_IsLoaded(&globalCtx->objectCtx, this->bombiwaBankIndex)) {
|
||||
func_808B5B58(this);
|
||||
this->actor.draw = BgSpot16Bombstone_Draw;
|
||||
}
|
||||
}
|
||||
|
||||
void func_808B5B58(BgSpot16Bombstone* this) {
|
||||
this->unk_154 = 0;
|
||||
this->actionFunc = func_808B5B6C;
|
||||
}
|
||||
|
||||
void func_808B5B6C(BgSpot16Bombstone* this, GlobalContext* globalCtx) {
|
||||
Actor* actor = &this->actor;
|
||||
|
||||
Actor_MoveForward(actor);
|
||||
actor->shape.rot.x += this->unk_210;
|
||||
actor->shape.rot.z += this->unk_212;
|
||||
|
||||
if (this->unk_154 > 60) {
|
||||
Actor_Kill(actor);
|
||||
return;
|
||||
}
|
||||
|
||||
if (actor->bgCheckFlags & 8 || (actor->bgCheckFlags & 1 && actor->velocity.y < 0.0f)) {
|
||||
func_808B53A8(this, globalCtx);
|
||||
func_808B51A8(this, globalCtx);
|
||||
Audio_PlaySoundAtPosition(globalCtx, &actor->posRot, 20, NA_SE_EV_ROCK_BROKEN);
|
||||
Actor_Kill(actor);
|
||||
return;
|
||||
}
|
||||
|
||||
func_8002E4B4(globalCtx, actor, 17.5f, 35.0f, 0.0f, 5);
|
||||
}
|
||||
|
||||
void BgSpot16Bombstone_Update(Actor* thisx, GlobalContext* globalCtx) {
|
||||
BgSpot16Bombstone* this = THIS;
|
||||
|
||||
this->unk_154++;
|
||||
if (this->actionFunc != NULL) {
|
||||
this->actionFunc(this, globalCtx);
|
||||
}
|
||||
}
|
||||
|
||||
void BgSpot16Bombstone_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
||||
BgSpot16Bombstone* this = THIS;
|
||||
s32 pad;
|
||||
|
||||
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot16_bombstone.c", 1253);
|
||||
|
||||
func_80093D18(globalCtx->state.gfxCtx);
|
||||
|
||||
gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot16_bombstone.c", 1257),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
|
||||
if (this->actor.params == 0xFF) {
|
||||
// The boulder is intact
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, this->unk_150);
|
||||
} else {
|
||||
// The boulder is debris
|
||||
gSPSegment(oGfxCtx->polyOpa.p++, 0x06, globalCtx->objectCtx.status[this->bombiwaBankIndex].segment);
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, this->unk_150);
|
||||
}
|
||||
|
||||
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot16_bombstone.c", 1274);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,9 +6,23 @@
|
|||
|
||||
struct BgSpot16Bombstone;
|
||||
|
||||
typedef void (*BgSpot16BombstoneActionFunc)(struct BgSpot16Bombstone*, GlobalContext*);
|
||||
|
||||
typedef struct BgSpot16Bombstone {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ char unk_14C[0xCC];
|
||||
/* 0x014C */ BgSpot16BombstoneActionFunc actionFunc;
|
||||
/* 0x0150 */ Gfx* unk_150;
|
||||
/* 0x0154 */ s16 unk_154;
|
||||
/* 0x0156 */ s16 switchFlag;
|
||||
/* 0x0158 */ s16 unk_158;
|
||||
/* 0x015C */ f32 sinRotation;
|
||||
/* 0x0160 */ f32 cosRotation;
|
||||
/* 0x0164 */ ColliderJntSph colliderJntSph;
|
||||
/* 0x0184 */ ColliderJntSphItem colliderJntSphItems[1];
|
||||
/* 0x01C4 */ ColliderCylinder colliderCylinder;
|
||||
/* 0x0210 */ s16 unk_210;
|
||||
/* 0x0212 */ s16 unk_212;
|
||||
/* 0x0214 */ s8 bombiwaBankIndex;
|
||||
} BgSpot16Bombstone; // size = 0x0218
|
||||
|
||||
extern const ActorInit Bg_Spot16_Bombstone_InitVars;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue