From 55d066eb4b02b314227c2ea7562aa197062c5e68 Mon Sep 17 00:00:00 2001 From: Sirius902 <3645979-Sirius902@users.noreply.gitlab.com> Date: Sat, 14 Nov 2020 22:41:09 -0800 Subject: [PATCH] Stuff --- .../actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c | 12 ++++++------ .../actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c index eebfd579c9..911f250a41 100644 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c +++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c @@ -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, ¢er, 50.0f)) { this->unk_16B |= D_80876A64[i]; } } diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h index e3981ac365..a3bcf63764 100644 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h +++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h @@ -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;