mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-07 23:10:22 +00:00
Obj_Syokudai (#412)
* Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * torches * Update src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * cleanup * Update src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * small cleanup Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
petrie911
GitHub
parent
a52743e8cd
commit
4ac8e70f5a
12 changed files with 263 additions and 880 deletions
|
|
@ -8,7 +8,9 @@ struct EnArrow;
|
|||
|
||||
typedef struct EnArrow {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ char unk_14C[0xFC];
|
||||
/* 0x014C */ char unk_14C[0x5C];
|
||||
/* 0x01A8 */ s32 unk_1A8; // related to arrows being on fire
|
||||
/* 0x01AC */ char unk_1AC[0x9C];
|
||||
/* 0x0248 */ u8 timer; // used for dissapearing when flying or hitting a wall
|
||||
/* 0x0249 */ u8 hitWall;
|
||||
/* 0x024A */ char unk_24A[0x16];
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
*/
|
||||
|
||||
#include "z_obj_syokudai.h"
|
||||
#include "overlays/actors/ovl_En_Arrow/z_en_arrow.h"
|
||||
|
||||
#define FLAGS 0x00000410
|
||||
|
||||
|
|
@ -15,7 +16,8 @@ void ObjSyokudai_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
|||
void ObjSyokudai_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void ObjSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
extern Gfx D_0404D4E0[];
|
||||
|
||||
const ActorInit Obj_Syokudai_InitVars = {
|
||||
ACTOR_OBJ_SYOKUDAI,
|
||||
ACTORTYPE_PROP,
|
||||
|
|
@ -27,11 +29,255 @@ const ActorInit Obj_Syokudai_InitVars = {
|
|||
(ActorFunc)ObjSyokudai_Update,
|
||||
(ActorFunc)ObjSyokudai_Draw,
|
||||
};
|
||||
*/
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Init.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Destroy.s")
|
||||
static ColliderCylinderInit sCylInitStand = {
|
||||
{ COLTYPE_METAL_SHIELD, 0x00, 0x0D, 0x39, 0x20, COLSHAPE_CYLINDER },
|
||||
{ 0x02, { 0x00100000, 0x00, 0x00 }, { 0xEE01FFFF, 0x00, 0x00 }, 0x00, 0x05, 0x01 },
|
||||
{ 12, 45, 0, { 0, 0, 0 } },
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Update.s")
|
||||
static ColliderCylinderInit sCylInitFlame = {
|
||||
{ COLTYPE_UNK10, 0x00, 0x09, 0x00, 0x00, COLSHAPE_CYLINDER },
|
||||
{ 0x02, { 0x00000000, 0x00, 0x00 }, { 0x00020820, 0x00, 0x00 }, 0x00, 0x01, 0x00 },
|
||||
{ 15, 45, 45, { 0, 0, 0 } },
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Draw.s")
|
||||
static InitChainEntry sInitChain[] = {
|
||||
ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
static s32 sLitTorchCount;
|
||||
|
||||
void ObjSyokudai_Init(Actor* thisx, GlobalContext* globalCtx) {
|
||||
static u8 sColTypesStand[] = { 0x09, 0x0B, 0x0B };
|
||||
s32 pad;
|
||||
ObjSyokudai* this = THIS;
|
||||
s32 torchType = this->actor.params & 0xF000;
|
||||
|
||||
Actor_ProcessInitChain(&this->actor, sInitChain);
|
||||
ActorShape_Init(&this->actor.shape, 0.0f, NULL, 0.0f);
|
||||
|
||||
Collider_InitCylinder(globalCtx, &this->colliderStand);
|
||||
Collider_SetCylinder(globalCtx, &this->colliderStand, &this->actor, &sCylInitStand);
|
||||
this->colliderStand.base.type = sColTypesStand[this->actor.params >> 0xC];
|
||||
|
||||
Collider_InitCylinder(globalCtx, &this->colliderFlame);
|
||||
Collider_SetCylinder(globalCtx, &this->colliderFlame, &this->actor, &sCylInitFlame);
|
||||
|
||||
this->actor.colChkInfo.mass = 0xFF;
|
||||
|
||||
Lights_PointGlowSetInfo(&this->lightInfo, this->actor.posRot.pos.x, this->actor.posRot.pos.y + 70.0f,
|
||||
this->actor.posRot.pos.z, 255, 255, 180, -1);
|
||||
this->lightNode = LightContext_InsertLight(globalCtx, &globalCtx->lightCtx, &this->lightInfo);
|
||||
|
||||
if ((this->actor.params & 0x400) || ((torchType != 2) && Flags_GetSwitch(globalCtx, this->actor.params & 0x3F))) {
|
||||
this->litTimer = -1;
|
||||
}
|
||||
|
||||
this->flameTexScroll = (s32)(Math_Rand_ZeroOne() * 20.0f);
|
||||
sLitTorchCount = 0;
|
||||
Actor_SetHeight(&this->actor, 60.0f);
|
||||
}
|
||||
|
||||
void ObjSyokudai_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
||||
s32 pad;
|
||||
ObjSyokudai* this = THIS;
|
||||
|
||||
Collider_DestroyCylinder(globalCtx, &this->colliderStand);
|
||||
Collider_DestroyCylinder(globalCtx, &this->colliderFlame);
|
||||
LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, this->lightNode);
|
||||
}
|
||||
|
||||
void ObjSyokudai_Update(Actor* thisx, GlobalContext* globalCtx2) {
|
||||
GlobalContext* globalCtx = globalCtx2;
|
||||
ObjSyokudai* this = THIS;
|
||||
s32 torchCount = (this->actor.params >> 6) & 0xF;
|
||||
s32 switchFlag = this->actor.params & 0x3F;
|
||||
s32 torchType = this->actor.params & 0xF000;
|
||||
s32 litTimeScale;
|
||||
WaterBox* dummy;
|
||||
f32 waterSurface;
|
||||
s32 lightRadius = -1;
|
||||
u8 brightness = 0;
|
||||
Player* player;
|
||||
EnArrow* arrow;
|
||||
s32 interactionType;
|
||||
u32 toucherFlags;
|
||||
Vec3f tipToFlame;
|
||||
ColliderCylinder* colliderStand;
|
||||
ColliderCylinder* colliderFlame;
|
||||
|
||||
litTimeScale = torchCount;
|
||||
if (torchCount == 10) {
|
||||
torchCount = 24;
|
||||
}
|
||||
if (func_80042244(globalCtx, &globalCtx->colCtx, this->actor.posRot.pos.x, this->actor.posRot.pos.z, &waterSurface,
|
||||
&dummy) &&
|
||||
((waterSurface - this->actor.posRot.pos.y) > 52.0f)) {
|
||||
this->litTimer = 0;
|
||||
if (torchType == 1) {
|
||||
Flags_UnsetSwitch(globalCtx, switchFlag);
|
||||
if (torchCount != 0) {
|
||||
this->litTimer = 1;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
player = PLAYER;
|
||||
interactionType = 0;
|
||||
if (this->actor.params & 0x400) {
|
||||
this->litTimer = -1;
|
||||
}
|
||||
if (torchCount != 0) {
|
||||
if (Flags_GetSwitch(globalCtx, switchFlag)) {
|
||||
if (this->litTimer == 0) {
|
||||
this->litTimer = -1;
|
||||
if (torchType == 0) {
|
||||
func_80080480(globalCtx, &this->actor);
|
||||
}
|
||||
} else if (this->litTimer > 0) {
|
||||
this->litTimer = -1;
|
||||
}
|
||||
} else if (this->litTimer < 0) {
|
||||
this->litTimer = 20;
|
||||
}
|
||||
}
|
||||
if (this->colliderFlame.base.acFlags & 2) {
|
||||
toucherFlags = this->colliderFlame.body.acHitItem->toucher.flags;
|
||||
if (toucherFlags & 0x20820) {
|
||||
interactionType = 1;
|
||||
}
|
||||
} else if (player->heldItemActionParam == 6) {
|
||||
Math_Vec3f_Diff(&player->swordInfo[0].tip, &this->actor.posRot.pos, &tipToFlame);
|
||||
tipToFlame.y -= 67.0f;
|
||||
if ((SQ(tipToFlame.x) + SQ(tipToFlame.y) + SQ(tipToFlame.z)) < SQ(20.0f)) {
|
||||
interactionType = -1;
|
||||
}
|
||||
}
|
||||
if (interactionType != 0) {
|
||||
if (this->litTimer != 0) {
|
||||
if (interactionType < 0) {
|
||||
if (player->unk_860 == 0) {
|
||||
player->unk_860 = 210;
|
||||
Audio_PlaySoundGeneral(NA_SE_EV_FLAME_IGNITION, &this->actor.projectedPos, 4, &D_801333E0,
|
||||
&D_801333E0, &D_801333E8);
|
||||
} else if (player->unk_860 < 200) {
|
||||
player->unk_860 = 200;
|
||||
}
|
||||
} else if (toucherFlags & 0x20) {
|
||||
arrow = (EnArrow*)this->colliderFlame.base.ac;
|
||||
if ((arrow->actor.update != NULL) && (arrow->actor.id == ACTOR_EN_ARROW)) {
|
||||
arrow->actor.params = 0;
|
||||
arrow->unk_1A8 = 0x800;
|
||||
}
|
||||
}
|
||||
if ((0 <= this->litTimer) && (this->litTimer < (50 * litTimeScale + 100)) && (torchType != 0)) {
|
||||
this->litTimer = 50 * litTimeScale + 100;
|
||||
}
|
||||
} else if ((torchType != 0) && (((interactionType > 0) && (toucherFlags & 0x20800)) ||
|
||||
((interactionType < 0) && (player->unk_860 != 0)))) {
|
||||
|
||||
if ((interactionType < 0) && (player->unk_860 < 200)) {
|
||||
player->unk_860 = 200;
|
||||
}
|
||||
if (torchCount == 0) {
|
||||
this->litTimer = -1;
|
||||
if (torchType != 2) {
|
||||
Flags_SetSwitch(globalCtx, switchFlag);
|
||||
func_80080480(globalCtx, &this->actor);
|
||||
}
|
||||
} else {
|
||||
sLitTorchCount++;
|
||||
if (sLitTorchCount >= torchCount) {
|
||||
Flags_SetSwitch(globalCtx, switchFlag);
|
||||
func_80080480(globalCtx, &this->actor);
|
||||
this->litTimer = -1;
|
||||
} else {
|
||||
this->litTimer = (litTimeScale * 50) + 110;
|
||||
}
|
||||
}
|
||||
Audio_PlaySoundGeneral(NA_SE_EV_FLAME_IGNITION, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
|
||||
&D_801333E8);
|
||||
}
|
||||
}
|
||||
}
|
||||
colliderStand = &this->colliderStand;
|
||||
Collider_CylinderUpdate(&this->actor, colliderStand);
|
||||
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &colliderStand->base);
|
||||
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &colliderStand->base);
|
||||
|
||||
colliderFlame = &this->colliderFlame;
|
||||
Collider_CylinderUpdate(&this->actor, colliderFlame);
|
||||
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &colliderFlame->base);
|
||||
|
||||
if (this->litTimer > 0) {
|
||||
this->litTimer--;
|
||||
if ((this->litTimer == 0) && (torchType != 0)) {
|
||||
sLitTorchCount--;
|
||||
}
|
||||
}
|
||||
if (this->litTimer != 0) {
|
||||
if ((this->litTimer < 0) || (this->litTimer >= 20)) {
|
||||
lightRadius = 200;
|
||||
} else {
|
||||
lightRadius = (this->litTimer * 200.0f) / 20.0f;
|
||||
}
|
||||
brightness = (u8)(Math_Rand_ZeroOne() * 127.0f) + 128;
|
||||
func_8002F974(&this->actor, NA_SE_EV_TORCH - SFX_FLAG);
|
||||
}
|
||||
Lights_PointSetColorAndRadius(&this->lightInfo, brightness, brightness, 0, lightRadius);
|
||||
this->flameTexScroll++;
|
||||
}
|
||||
|
||||
void ObjSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
||||
static Gfx* displayLists[] = { 0x060003A0, 0x06000B90, 0x06000870 };
|
||||
s32 pad;
|
||||
ObjSyokudai* this = THIS;
|
||||
s32 timerMax;
|
||||
|
||||
timerMax = (((this->actor.params >> 6) & 0xF) * 50) + 100;
|
||||
|
||||
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_obj_syokudai.c", 707);
|
||||
func_80093D18(globalCtx->state.gfxCtx);
|
||||
|
||||
gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_syokudai.c", 714),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, displayLists[(u16)this->actor.params >> 0xC]);
|
||||
|
||||
if (this->litTimer != 0) {
|
||||
f32 flameScale = 1.0f;
|
||||
|
||||
if (this->litTimer > timerMax) {
|
||||
flameScale = (timerMax - this->litTimer + 10) / 10.0f;
|
||||
} else if ((this->litTimer > 0) && (this->litTimer < 20)) {
|
||||
flameScale = this->litTimer / 20.0f;
|
||||
}
|
||||
flameScale *= 0.0027f;
|
||||
|
||||
func_80093D84(globalCtx->state.gfxCtx);
|
||||
|
||||
gSPSegment(oGfxCtx->polyXlu.p++, 0x08,
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0,
|
||||
(this->flameTexScroll * -20) & 0x1FF, 0x20, 0x80));
|
||||
|
||||
gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, 255, 255, 0, 255);
|
||||
|
||||
gDPSetEnvColor(oGfxCtx->polyXlu.p++, 255, 0, 0, 0);
|
||||
|
||||
Matrix_Translate(0.0f, 52.0f, 0.0f, MTXMODE_APPLY);
|
||||
Matrix_RotateY(
|
||||
(s16)(func_8005A9F4(ACTIVE_CAM) - this->actor.shape.rot.y + 0x8000) *
|
||||
(M_PI / 0x8000),
|
||||
MTXMODE_APPLY);
|
||||
Matrix_Scale(flameScale, flameScale, flameScale, MTXMODE_APPLY);
|
||||
|
||||
gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_syokudai.c", 745),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyXlu.p++, D_0404D4E0);
|
||||
}
|
||||
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_syokudai.c", 749);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,12 @@ struct ObjSyokudai;
|
|||
|
||||
typedef struct ObjSyokudai {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ char unk_14C[0xB0];
|
||||
/* 0x014C */ ColliderCylinder colliderStand;
|
||||
/* 0x0198 */ ColliderCylinder colliderFlame;
|
||||
/* 0x01E4 */ s16 litTimer;
|
||||
/* 0x01E6 */ u8 flameTexScroll;
|
||||
/* 0x01E8 */ LightNode* lightNode;
|
||||
/* 0x01EC */ LightInfo lightInfo;
|
||||
} ObjSyokudai; // size = 0x01FC
|
||||
|
||||
extern const ActorInit Obj_Syokudai_InitVars;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue