mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-29 03:34:07 +00:00
Code Issues Projects Releases Wiki Activity

Stuff

Browse source
This commit is contained in:
Sirius902 2020-11-14 22:41:09 -08:00
parent 6ce65666e1
commit 55d066eb4b
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c
View file

@ -129,11 +129,11 @@ void func_80875A0C(BgGanonOtyuka* this, GlobalContext* globalCtx) {
Actor* thisx = &this->dyna.actor;
Actor* prop;
BgGanonOtyuka* platform;
s16 i;
f32 dx;
f32 dy;
Vec3f sp4C;
f32 dz;
Vec3f center;
s16 i;
if (this->unk_16A != 0 || (globalCtx->actorCtx.unk_02 != 0) && (this->dyna.actor.xyzDistFromLinkSq < 4900.0f)) {
osSyncPrintf("OTC O 1\n");
@ -164,10 +164,10 @@ void func_80875A0C(BgGanonOtyuka* this, GlobalContext* globalCtx) {
osSyncPrintf("OTC O 2\n");
for (i = 0; i < ARRAY_COUNT(D_80876A68); i++) {
sp4C.x = D_80876A68[i].x + this->dyna.actor.posRot.pos.x;
sp4C.y = this->dyna.actor.posRot.pos.y;
sp4C.z = D_80876A68[i].z + this->dyna.actor.posRot.pos.z;
if (func_8003E30C(&globalCtx->colCtx, &sp4C, 50.0f)) {
center.x = D_80876A68[i].x + this->dyna.actor.posRot.pos.x;
center.y = this->dyna.actor.posRot.pos.y;
center.z = D_80876A68[i].z + this->dyna.actor.posRot.pos.z;
if (func_8003E30C(&globalCtx->colCtx, &center, 50.0f)) {
this->unk_16B |= D_80876A64[i];
}
}

1
src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h
View file

@ -17,7 +17,6 @@ typedef struct BgGanonOtyuka {
/* 0x016C */ u8 unk_16C;
/* 0x016D */ u8 unk_16D;
/* 0x016E */ u8 unk_16E;
/* 0x016F */ char unk_16F[0x01];
/* 0x0170 */ f32 yScale;
/* 0x0174 */ f32 primColorR;
/* 0x0178 */ f32 primColorG;