mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-26 14:46:16 +00:00
Code Issues Projects Releases Wiki Activity

6 functions matching

Browse source
This commit is contained in:
Gamestabled 2020-03-18 02:12:45 -04:00 committed by chandler
parent 6a680b9b47
commit 1eb36220e5
2 changed files with 280 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

253
src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c
View file

@ -3,9 +3,25 @@
#define ROOM 0x00
#define FLAGS 0x00000000
void BgHidanFirewall_Init(BgHidanFirewall* this, GlobalContext* globalCtx);
void BgHidanFirewall_Destroy(BgHidanFirewall* this, GlobalContext* globalCtx);
void BgHidanFirewall_Update(BgHidanFirewall* this, GlobalContext* globalCtx);
// 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, },
// 0x19, 0x00, 0x01, 0x00,
// },
// 0x001E,
// 0x0053,
// 0x0000,
// {
// 0x0000, 0x0000, 0x0000,
// },
// };
/*
const ActorInit Bg_Hidan_Firewall_InitVars =
@ -22,22 +38,241 @@ const ActorInit Bg_Hidan_Firewall_InitVars =
NULL,
};
*/
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Firewall/BgHidanFirewall_Init.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Firewall/BgHidanFirewall_Destroy.s")
void BgHidanFirewall_Init(BgHidanFirewall* this, GlobalContext* globalCtx){
f32 scale;
scale = D_80886D84;
this->actor.scale.x = scale;
this->actor.scale.z = scale;
scale = D_80886D88;
this->actor.scale.y = D_80886D88;
this->ukn_150 = 0;
ActorCollider_AllocCylinder(globalCtx, ((s32*)this+0x55));//TODO: fix this. multiple cylinders?
ActorCollider_InitCylinder(globalCtx, ((s32*)this+0x55), &this->actor, &D_80886CD0);
this->ukn_19C = this->actor.posRot.pos.y;
func_80061ED4(&this->actor.sub_98, 0, D_80886CFC);
this->method = BgHidanFirewall_Idle;
return;
}
void BgHidanFirewall_Destroy(BgHidanFirewall* this, GlobalContext* globalCtx)
{
BgHidanFirewall* thing = this;
ActorCollider_FreeCylinder(globalCtx, (char*)this + 0x154);//TODO: fix this. multiple cylinders?
}
// BgHidanFirewall_Proximity
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Firewall/func_80886728.s")
// s32 func_80886728(BgHidanFirewall* this, GlobalContext* globalCtx)
// {
// Vec3f* sp18; //TODO: where does this come from?
// f32 temp_f0;
// u32 phi_return;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Firewall/func_80886794.s")
// func_8002DBD0(&this->actor, sp18, &(globalCtx->actorCtx.actorList[2].first->posRot.pos));
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Firewall/func_808867DC.s")
// phi_return = 0;
// if (fabsf(sp18->x) < 100.0f)
// {
// temp_f0 = fabsf(sp18->z);
// phi_return = temp_f0;
// if (temp_f0 < 120.0f)
// {
// phi_return = 1;
// }
// }
// return phi_return;
// }
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Firewall/func_80886810.s")
void BgHidanFirewall_Idle(BgHidanFirewall* this, GlobalContext* globalCtx)
{
if (func_80886728(this, globalCtx) != 0)
{
this->actor.draw = func_80886B34;
this->actor.params = 5;
this->method = BgHidanFirewall_Countdown;
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Firewall/func_80886898.s")
void BgHidanFirewall_Countdown(BgHidanFirewall* this, GlobalContext* globalCtx)
{
if (this->actor.params != 0)
{
this->actor.params--;
}
if (this->actor.params == 0)
{
this->method = &func_80886810;
}
}
void func_80886810(BgHidanFirewall* this, GlobalContext* globalCtx)
{
if (func_80886728(this, globalCtx) != 0)
{
Math_ApproxF(&this->actor.scale.y, 0.1f, 0.024999999f);
return;
}
if (Math_ApproxF(&this->actor.scale.y, D_80886D8C, D_80886D8C) != 0)
{
this->actor.draw = 0;
this->method = BgHidanFirewall_Idle;
}
else
{
this->actor.params = 0;
}
}
void func_80886898(BgHidanFirewall* this, GlobalContext* globalCtx)
{
s16 phi_a3;
if (func_8002E084(&this->actor, 0x4000) != 0)
{
phi_a3 = this->actor.shape.rot.y;
}
else
{
phi_a3 = (s16)(this->actor.shape.rot.y + 0x8000);
}
func_8002F71C(globalCtx, this, 5.0f, phi_a3, 1.0f);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Firewall/func_808868FC.s")
// void func_808868FC(BgHidanFirewall* this, GlobalContext* globalCtx, Vec3f* arg2)
// {
// f32 sp38;
// Vec3f* sp30 = &globalCtx->actorCtx.actorList[2].first->posRot.pos;
// f32 sp28;
// f32 temp_ret;
// f32 phi_f0;
// func_8002DBD0((Actor*)this, &sp30, arg2);
// if (globalCtx->actorCtx.actorList[2].first->posRot.pos.x < -70.0f)
// {
// globalCtx->actorCtx.actorList[2].first->posRot.pos.x = -70.0f;
// }
// else
// {
// if (70.0f < globalCtx->actorCtx.actorList[2].first->posRot.pos.x)
// {
// phi_f0 = 70.0f;
// }
// else
// {
// phi_f0 = globalCtx->actorCtx.actorList[2].first->posRot.pos.x;
// }
// globalCtx->actorCtx.actorList[2].first->posRot.pos.x = (f32) phi_f0;
// }
// if (this->actor.params == 0)
// {
// if (0.0f < sp38)
// {
// sp38 = -25.0f;
// this->actor.params = -1;
// }
// else
// {
// sp38 = 25.0f;
// this->actor.params = 1;
// }
// }
// else
// {
// sp38 = this->actor.params * 25.0f;
// }
// sp28 = Math_Sins(this->actor.sub_B4.rot2.y);
// temp_ret = Math_Coss(this->actor.sub_B4.rot2.y);
// this->ukn_19A = (s16) ((this->actor.posRot.pos.x + (globalCtx->actorCtx.actorList[2].first->posRot.pos.x * temp_ret)) + (sp38 * sp28));
// this->ukn_19E = (s16) ((this->actor.posRot.pos.z - (globalCtx->actorCtx.actorList[2].first->posRot.pos.x * sp28)) + (sp38 * temp_ret));
// }
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Firewall/BgHidanFirewall_Update.s")
// void BgHidanFirewall_Update(BgHidanFirewall* this, GlobalContext* globalCtx)
// {
// // s32 temp_t8;
// s32 phi_t8;
// // s16 temp_t6 = this->ukn_150;
// s32 temp_t7 = (this->ukn_150 + 1);
// // temp_t8 = temp_t7 & 7;
// // phi_t8 = temp_t8;
// phi_t8 = temp_t7 & 7;
// if (temp_t7 < 0)
// {
// // phi_t8 = temp_t8;
// // if (temp_t8 != 0)
// if (phi_t8 != 0)
// {
// phi_t8 = phi_t8 - 8;
// }
// }
// this->ukn_150 = phi_t8;
// if ((this->ukn_164 & 2) != 0)
// {
// this->ukn_164 = (this->ukn_164 & 0xfffd);
// func_80886898(this, globalCtx);
// }
// this->ukn_14C(this, globalCtx);
// if (&func_80886810 == this->ukn_14C)
// {
// func_808868FC(this, globalCtx);
// Actor_CollisionCheck_SetAT(globalCtx, &globalCtx->sub_11E60, &this->collision);
// Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, &this->collision);
// func_8002F974((Actor*)this, 0x2034);
// }
// } //Still working on this
// BgHidanFirewall_Draw
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Firewall/func_80886B34.s")
// void func_80886B34(BgHidanFirewall* this, GlobalContext* globalCtx)
// {
// Gfx** sp38;
// s32 sp28;
// Gfx* temp_ret;
// Gfx* temp_v0;
// s32 temp_v0_2;
// s32 temp_v0_3;
// s32 temp_v0_4;
// s32 temp_v0_5;
// char* temp_a0;
// func_800C6AC4(&sp38, globalCtx->gfxCtx, D_80886D30, 0x1c0);
// temp_ret = func_80093774(globalCtx->gfxCtx->polyXlu.p, 0x14);
// temp_v0 = temp_ret;
// globalCtx->gfxCtx->polyXlu.p = temp_ret;
// globalCtx->gfxCtx->polyXlu.p = (s32) (temp_v0 + 8);
// temp_v0->unk0 = 0xdb060020;
// temp_a0 = D_80886D04 + (this->ukn_150 * 4);
// temp_v0->unk4 = (s32) (((*temp_a0 & 0xffffff) + ((char*)0x80160000 + (((*temp_a0 * 0x10) >> 0x1c) * 4))->unk6FA8) + 0x80000000);
// temp_v0_2 = globalCtx->gfxCtx->polyXlu.p;
// globalCtx->gfxCtx->polyXlu.p = (s32) (temp_v0_2 + 8);
// temp_v0_2->unk0 = 0xfa000001;
// temp_v0_2->unk4 = 0xffff0096;
// temp_v0_3 = globalCtx->gfxCtx->polyXlu.p;
// globalCtx->gfxCtx->polyXlu.p = (s32) (temp_v0_3 + 8);
// temp_v0_3->unk0 = 0xfb000000;
// temp_v0_3->unk4 = 0xff0000ff;
// temp_v0_4 = globalCtx->gfxCtx->polyXlu.p;
// globalCtx->gfxCtx->polyXlu.p = (s32) (temp_v0_4 + 8);
// temp_v0_4->unk0 = 0xda380003;
// sp28 = temp_v0_4;
// sp28->unk4 = func_800D1A88(*arg1, &D_80886D4C, 0x1ca);
// temp_v0_5 = globalCtx->gfxCtx->polyXlu.p;
// globalCtx->gfxCtx->polyXlu.p = (s32) (temp_v0_5 + 8);
// temp_v0_5->unk4 = (s32) (0x6010000 + 0xda80);
// temp_v0_5->unk0 = 0xde000000;
// func_800C6B54(&sp38, *arg1, &D_80886D68, 0x1cf);
// }

39
src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.h
View file

@ -4,12 +4,45 @@
#include <ultra64.h>
#include <global.h>
typedef struct
struct BgHidanFirewall;
typedef void (*FirewallFunc)(struct BgHidanFirewall* this, GlobalContext* globalCtx);
typedef struct BgHidanFirewall
{
/* 0x0000 */ Actor actor;
/* 0x014C */ char unk_14C[0x54];
/* 0x0000 */ Actor actor;
/* 0x014C */ FirewallFunc method; // idle, countdown, etc
/* 0x0150 */ s16 ukn_150;
/* 0x0152 */ s16 ukn_152;
/* 0x0154 */ ColliderCylinderMain* collider;
/* 0x0158 */ char ukn_158[0xC];
/* 0x0164 */ u8 ukn_164;
/* 0x0165 */ char ukn_166[0x35];
/* 0x019A */ s16 ukn_19A;
/* 0x019C */ s16 ukn_19C;
/* 0x019E */ s16 ukn_19E;
} BgHidanFirewall; // size = 0x01A0
extern const ActorInit Bg_Hidan_Firewall_InitVars;
void BgHidanFirewall_Init(BgHidanFirewall* this, GlobalContext* globalCtx);
void BgHidanFirewall_Destroy(BgHidanFirewall* this, GlobalContext* globalCtx);
s32 func_80886728(BgHidanFirewall* this, GlobalContext* globalCtx);
void BgHidanFirewall_Idle(BgHidanFirewall* this, GlobalContext* globalCtx);
void BgHidanFirewall_Countdown(BgHidanFirewall* this, GlobalContext* globalCtx);
void func_80886810(BgHidanFirewall* this, GlobalContext* globalCtx);
void func_80886898(BgHidanFirewall* this, GlobalContext* globalCtx);
void func_808868FC(BgHidanFirewall* this, GlobalContext* globalCtx);
void BgHidanFirewall_Update(BgHidanFirewall* this, GlobalContext* globalCtx);
void func_80886B34(BgHidanFirewall* this, GlobalContext* globalCtx);
extern char D_80886CFC[8];
extern char D_80886D04[11 * 4];
extern void func_80061ED4();
extern char* D_80886D30; // "../z_bg_hidan_firewall.c
extern f32 D_80886D84;
extern f32 D_80886D88;
extern float D_80886D8C;
extern ColliderCylinderMain D_80886CD0;
#endif