mirror of
https://github.com/zeldaret/oot.git
synced 2024-11-11 03:39:59 +00:00
made suggesed changes
This commit is contained in:
chandler
parent
0265ad21c0
commit
9864211cdc
3 changed files with 74 additions and 120 deletions
2
spec
2
spec
|
|
@ -930,7 +930,7 @@ endseg
|
|||
beginseg
|
||||
name "ovl_Bg_Hidan_Firewall"
|
||||
include "build/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.o"
|
||||
include "build/data/overlays/actors/z_bg_hidan_firewall.reloc.o"
|
||||
include "build/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall_reloc.o"
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
|
|
|||
|
|
@ -2,15 +2,27 @@
|
|||
* File: z_bg_hidan_firewall.c
|
||||
* Overlay: ovl_Bg_Hidan_Firewall
|
||||
* Description: Proximity Flame Wall
|
||||
*/
|
||||
*/
|
||||
|
||||
#include "z_bg_hidan_firewall.h"
|
||||
|
||||
#define ROOM 0x00
|
||||
#define FLAGS 0x00000000
|
||||
|
||||
const ActorInit Bg_Hidan_Firewall_InitVars =
|
||||
{
|
||||
void BgHidanFirewall_Init(BgHidanFirewall* this, GlobalContext* globalCtx);
|
||||
void BgHidanFirewall_Destroy(BgHidanFirewall* this, GlobalContext* globalCtx);
|
||||
s32 BgHidanFirewall_Proximity(BgHidanFirewall* this, GlobalContext* globalCtx);
|
||||
void BgHidanFirewall_Wait(BgHidanFirewall* this, GlobalContext* globalCtx);
|
||||
void BgHidanFirewall_Countdown(BgHidanFirewall* this, GlobalContext* globalCtx);
|
||||
void BgHidanFirewall_Erupt(BgHidanFirewall* this, GlobalContext* globalCtx);
|
||||
void BgHidanFirewall_Collide(BgHidanFirewall* this, GlobalContext* globalCtx);
|
||||
void BgHidanFirewall_ColliderFollowPlayer(BgHidanFirewall* this, GlobalContext* globalCtx);
|
||||
void BgHidanFirewall_Update(BgHidanFirewall* this, GlobalContext* globalCtx);
|
||||
void BgHidanFirewall_Draw(BgHidanFirewall* this, GlobalContext* globalCtx);
|
||||
|
||||
extern Gfx D_0600DA80;
|
||||
|
||||
const ActorInit Bg_Hidan_Firewall_InitVars = {
|
||||
ACTOR_BG_HIDAN_FIREWALL,
|
||||
ACTORTYPE_BG,
|
||||
ROOM,
|
||||
|
|
@ -23,27 +35,24 @@ const ActorInit Bg_Hidan_Firewall_InitVars =
|
|||
NULL,
|
||||
};
|
||||
|
||||
static ColliderCylinderInit cylinderInitData =
|
||||
{
|
||||
static ColliderCylinderInit cylinderInitData = {
|
||||
0x0A, 0x11, 0x00, 0x09,
|
||||
0x20, 0x01, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00,
|
||||
0x20000000,
|
||||
0x01, 0x04, 0x00, 0x00,
|
||||
0xFFCFFFFF,
|
||||
0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00,
|
||||
0x19, 0x00, 0x01, 0x00,
|
||||
0x001E,
|
||||
0x0053,
|
||||
0x001E, 0x0053,
|
||||
0x00000000000000000000,
|
||||
};
|
||||
|
||||
static SubActor98Init actor98InitData =
|
||||
{
|
||||
static Sub98Init4 actor98InitData = {
|
||||
0x01, 0x0050, 0x0064, 0xFF,
|
||||
};
|
||||
|
||||
u32 D_80886D04[] = {
|
||||
UNK_PTR D_80886D04[] = {
|
||||
0x06015D20,
|
||||
0x06016120,
|
||||
0x06016520,
|
||||
|
|
@ -51,16 +60,13 @@ u32 D_80886D04[] = {
|
|||
0x06016D20,
|
||||
0x06017120,
|
||||
0x06017520,
|
||||
0x06017920,
|
||||
0x00000000,
|
||||
0x00000000,
|
||||
0x00000000,
|
||||
0x06017920,
|
||||
};
|
||||
|
||||
void BgHidanFirewall_Init(BgHidanFirewall* this, GlobalContext* globalCtx){
|
||||
|
||||
void BgHidanFirewall_Init(BgHidanFirewall* this, GlobalContext* globalCtx) {
|
||||
|
||||
f32 scale;
|
||||
|
||||
|
||||
scale = 0.119999997318f;
|
||||
this->actor.scale.x = scale;
|
||||
this->actor.scale.z = scale;
|
||||
|
|
@ -76,93 +82,73 @@ void BgHidanFirewall_Init(BgHidanFirewall* this, GlobalContext* globalCtx){
|
|||
this->collider.dim.position.y = this->actor.posRot.pos.y;
|
||||
|
||||
func_80061ED4(&this->actor.sub_98, NULL, &actor98InitData);
|
||||
|
||||
this->actionFunc = BgHidanFirewall_Wait;
|
||||
return;
|
||||
|
||||
this->actionFunc = (ActorFunc)BgHidanFirewall_Wait;
|
||||
}
|
||||
|
||||
void BgHidanFirewall_Destroy(BgHidanFirewall* this, GlobalContext* globalCtx)
|
||||
{
|
||||
void BgHidanFirewall_Destroy(BgHidanFirewall* this, GlobalContext* globalCtx) {
|
||||
BgHidanFirewall* thing = this;
|
||||
ActorCollider_FreeCylinder(globalCtx, &this->collider);
|
||||
}
|
||||
|
||||
s32 BgHidanFirewall_Proximity(BgHidanFirewall* this, GlobalContext* globalCtx)
|
||||
{
|
||||
s32 BgHidanFirewall_Proximity(BgHidanFirewall* this, GlobalContext* globalCtx) {
|
||||
Player* player;
|
||||
Vec3f distance;
|
||||
|
||||
|
||||
player = PLAYER;
|
||||
func_8002DBD0(&this->actor, &distance, &player->actor.posRot.pos);
|
||||
|
||||
if (fabsf(distance.x) < 100.0f)
|
||||
{
|
||||
if (fabsf(distance.z) < 120.0f)
|
||||
{
|
||||
if (fabsf(distance.x) < 100.0f) {
|
||||
if (fabsf(distance.z) < 120.0f) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void BgHidanFirewall_Wait(BgHidanFirewall* this, GlobalContext* globalCtx)
|
||||
{
|
||||
if (BgHidanFirewall_Proximity(this, globalCtx) != 0)
|
||||
{
|
||||
void BgHidanFirewall_Wait(BgHidanFirewall* this, GlobalContext* globalCtx) {
|
||||
if (BgHidanFirewall_Proximity(this, globalCtx) != 0) {
|
||||
this->actor.draw = BgHidanFirewall_Draw;
|
||||
this->actor.params = 5;
|
||||
this->actionFunc = BgHidanFirewall_Countdown;
|
||||
this->actionFunc = (ActorFunc)BgHidanFirewall_Countdown;
|
||||
}
|
||||
}
|
||||
|
||||
void BgHidanFirewall_Countdown(BgHidanFirewall* this, GlobalContext* globalCtx)
|
||||
{
|
||||
void BgHidanFirewall_Countdown(BgHidanFirewall* this, GlobalContext* globalCtx) {
|
||||
|
||||
if (this->actor.params != 0)
|
||||
{
|
||||
if (this->actor.params != 0) {
|
||||
this->actor.params--;
|
||||
}
|
||||
if (this->actor.params == 0)
|
||||
{
|
||||
this->actionFunc = BgHidanFirewall_Erupt;
|
||||
if (this->actor.params == 0) {
|
||||
this->actionFunc = (ActorFunc)BgHidanFirewall_Erupt;
|
||||
}
|
||||
}
|
||||
|
||||
void BgHidanFirewall_Erupt(BgHidanFirewall* this, GlobalContext* globalCtx)
|
||||
{
|
||||
if (BgHidanFirewall_Proximity(this, globalCtx) != 0)
|
||||
{
|
||||
void BgHidanFirewall_Erupt(BgHidanFirewall* this, GlobalContext* globalCtx) {
|
||||
if (BgHidanFirewall_Proximity(this, globalCtx) != 0) {
|
||||
Math_ApproxF(&this->actor.scale.y, 0.1f, 0.024999999f);
|
||||
return;
|
||||
}
|
||||
if (Math_ApproxF(&this->actor.scale.y, 0.00999999977648f, 0.00999999977648f) != 0)
|
||||
{
|
||||
this->actor.draw = NULL;
|
||||
this->actionFunc = BgHidanFirewall_Wait;
|
||||
}
|
||||
else
|
||||
{
|
||||
this->actor.params = 0;
|
||||
} else {
|
||||
if (Math_ApproxF(&this->actor.scale.y, 0.00999999977648f, 0.00999999977648f) != 0) {
|
||||
this->actor.draw = NULL;
|
||||
this->actionFunc = (ActorFunc)BgHidanFirewall_Wait;
|
||||
} else {
|
||||
this->actor.params = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void BgHidanFirewall_Collide(BgHidanFirewall* this, GlobalContext* globalCtx)
|
||||
{
|
||||
void BgHidanFirewall_Collide(BgHidanFirewall* this, GlobalContext* globalCtx) {
|
||||
s16 phi_a3;
|
||||
|
||||
if (func_8002E084(&this->actor, 0x4000) != 0)
|
||||
{
|
||||
if (func_8002E084(&this->actor, 0x4000) != 0) {
|
||||
phi_a3 = this->actor.shape.rot.y;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
phi_a3 = this->actor.shape.rot.y + 0x8000;
|
||||
}
|
||||
func_8002F71C(globalCtx, this, 5.0f, phi_a3, 1.0f);
|
||||
}
|
||||
|
||||
void BgHidanFirewall_ColliderFollowPlayer(BgHidanFirewall* this, GlobalContext* globalCtx)
|
||||
{
|
||||
void BgHidanFirewall_ColliderFollowPlayer(BgHidanFirewall* this, GlobalContext* globalCtx) {
|
||||
Player* player;
|
||||
Vec3f sp30;
|
||||
f32 temp_ret;
|
||||
|
|
@ -171,62 +157,47 @@ void BgHidanFirewall_ColliderFollowPlayer(BgHidanFirewall* this, GlobalContext*
|
|||
|
||||
player = PLAYER;
|
||||
|
||||
func_8002DBD0(&this->actor, &sp30, &player->actor.posRot.pos);
|
||||
if (sp30.x < -70.0f)
|
||||
{
|
||||
func_8002DBD0(&this->actor, &sp30, &player->actor.posRot.pos);
|
||||
if (sp30.x < -70.0f) {
|
||||
sp30.x = -70.0f;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (70.0f < sp30.x)
|
||||
{
|
||||
} else {
|
||||
if (70.0f < sp30.x) {
|
||||
phi_f0 = 70.0f;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
phi_f0 = sp30.x;
|
||||
}
|
||||
sp30.x = phi_f0;
|
||||
}
|
||||
if (this->actor.params == 0)
|
||||
{
|
||||
if (0.0f < sp30.z)
|
||||
{
|
||||
if (this->actor.params == 0) {
|
||||
if (0.0f < sp30.z) {
|
||||
sp30.z = -25.0f;
|
||||
this->actor.params = -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
sp30.z = 25.0f;
|
||||
this->actor.params = 1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
sp30.z = this->actor.params * 25.0f;
|
||||
}
|
||||
sp28 = Math_Sins(this->actor.shape.rot.y);
|
||||
sp28 = Math_Sins(this->actor.shape.rot.y);
|
||||
temp_ret = Math_Coss(this->actor.shape.rot.y);
|
||||
this->collider.dim.position.x = this->actor.posRot.pos.x + sp30.x * temp_ret + sp30.z * sp28;
|
||||
this->collider.dim.position.z = this->actor.posRot.pos.z - sp30.x * sp28 + sp30.z * temp_ret;
|
||||
}
|
||||
|
||||
void BgHidanFirewall_Update(BgHidanFirewall* this, GlobalContext* globalCtx)
|
||||
{
|
||||
void BgHidanFirewall_Update(BgHidanFirewall* this, GlobalContext* globalCtx) {
|
||||
s32 pad1;
|
||||
s32 pad2;
|
||||
|
||||
this->unk_150 = (this->unk_150 + 1) % 8;
|
||||
|
||||
if (this->collider.base.colliderFlags & 2)
|
||||
{
|
||||
if (this->collider.base.colliderFlags & 2) {
|
||||
this->collider.base.colliderFlags &= ~2;
|
||||
BgHidanFirewall_Collide(this, globalCtx);
|
||||
}
|
||||
|
||||
this->actionFunc(this, globalCtx);
|
||||
if (this->actionFunc == BgHidanFirewall_Erupt)
|
||||
{
|
||||
if (this->actionFunc == (ActorFunc)BgHidanFirewall_Erupt) {
|
||||
BgHidanFirewall_ColliderFollowPlayer(this, globalCtx);
|
||||
Actor_CollisionCheck_SetAT(globalCtx, &globalCtx->sub_11E60, &this->collider);
|
||||
Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, &this->collider);
|
||||
|
|
@ -234,27 +205,25 @@ void BgHidanFirewall_Update(BgHidanFirewall* this, GlobalContext* globalCtx)
|
|||
}
|
||||
}
|
||||
|
||||
void BgHidanFirewall_Draw(BgHidanFirewall* this, GlobalContext* globalCtx)
|
||||
{
|
||||
u32* temp;
|
||||
void BgHidanFirewall_Draw(BgHidanFirewall* this, GlobalContext* globalCtx) {
|
||||
UNK_PTR* temp;
|
||||
u32 pad;
|
||||
GraphicsContext* gfxCtx;
|
||||
u32 pad1;
|
||||
u32 pad2;
|
||||
Gfx* gfx;
|
||||
Gfx* dispRefs[3];
|
||||
|
||||
gfxCtx = globalCtx->state.gfxCtx;
|
||||
|
||||
func_800C6AC4(&gfx, globalCtx->state.gfxCtx, "../z_bg_hidan_firewall.c", 0x1C0);
|
||||
gfxCtx->polyXlu.p = func_80093774(gfxCtx->polyXlu.p, 0x14);
|
||||
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_hidan_firewall.c", 448);
|
||||
gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0x14);
|
||||
|
||||
temp = &D_80886D04;
|
||||
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(temp[this->unk_150]));
|
||||
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0x01, 0xFF, 0xFF, 0x00, 0x96);
|
||||
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0xFF, 0x00, 0x00, 0xFF);
|
||||
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_firewall.c", 0x1CA), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_firewall.c", 458),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
gSPDisplayList(gfxCtx->polyXlu.p++, &D_0600DA80);
|
||||
|
||||
func_800C6B54(&gfx, globalCtx->state.gfxCtx, "../z_bg_hidan_firewall.c", 0x1CF);
|
||||
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_hidan_firewall.c", 463);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,27 +6,12 @@
|
|||
|
||||
struct BgHidanFirewall;
|
||||
|
||||
typedef void FirewallFunc(struct BgHidanFirewall* this, GlobalContext* globalCtx);
|
||||
|
||||
typedef struct BgHidanFirewall
|
||||
{
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ FirewallFunc* actionFunc;
|
||||
/* 0x014C */ ActorFunc actionFunc;
|
||||
/* 0x0150 */ s16 unk_150;
|
||||
/* 0x0154 */ ColliderCylinderMain collider;
|
||||
} BgHidanFirewall; // size = 0x01A0
|
||||
|
||||
void BgHidanFirewall_Init(BgHidanFirewall* this, GlobalContext* globalCtx);
|
||||
void BgHidanFirewall_Destroy(BgHidanFirewall* this, GlobalContext* globalCtx);
|
||||
s32 BgHidanFirewall_Proximity(BgHidanFirewall* this, GlobalContext* globalCtx);
|
||||
void BgHidanFirewall_Wait(BgHidanFirewall* this, GlobalContext* globalCtx);
|
||||
void BgHidanFirewall_Countdown(BgHidanFirewall* this, GlobalContext* globalCtx);
|
||||
void BgHidanFirewall_Erupt(BgHidanFirewall* this, GlobalContext* globalCtx);
|
||||
void BgHidanFirewall_Collide(BgHidanFirewall* this, GlobalContext* globalCtx);
|
||||
void BgHidanFirewall_ColliderFollowPlayer(BgHidanFirewall* this, GlobalContext* globalCtx);
|
||||
void BgHidanFirewall_Update(BgHidanFirewall* this, GlobalContext* globalCtx);
|
||||
void BgHidanFirewall_Draw(BgHidanFirewall* this, GlobalContext* globalCtx);
|
||||
|
||||
extern u32 D_0600DA80;
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue