mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-03 01:54:37 +00:00
Code Issues Projects Releases Wiki Activity

Name isFalling

Browse source
This commit is contained in:
Sirius902 2020-11-15 00:55:17 -08:00
parent f15d6c9a40
commit 13edd6f289
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -131,7 +131,7 @@ void func_80875A0C(BgGanonOtyuka* this, GlobalContext* globalCtx) {
Vec3f center;
s16 i;
if (this->unk_16A != 0 || ((globalCtx->actorCtx.unk_02 != 0) && (this->dyna.actor.xyzDistFromLinkSq < 4900.0f))) {
if (this->isFalling || ((globalCtx->actorCtx.unk_02 != 0) && (this->dyna.actor.xyzDistFromLinkSq < 4900.0f))) {
osSyncPrintf("OTC O 1\n");
for (i = 0; i < ARRAY_COUNT(D_80876A68); i++) {
@ -171,7 +171,7 @@ void func_80875A0C(BgGanonOtyuka* this, GlobalContext* globalCtx) {
osSyncPrintf("OTC O 3\n");
this->actionFunc = func_80875C88;
this->unk_16A = 1;
this->isFalling = true;
this->dropTimer = 20;
this->unk_16E = 1;
this->unk_16D = 0;
@ -315,7 +315,7 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Translate(platform->dyna.actor.posRot.pos.x, platform->dyna.actor.posRot.pos.y,
platform->dyna.actor.posRot.pos.z, MTXMODE_NEW);
phi_s1 = NULL;
if (platform->unk_16A != 0) {
if (platform->isFalling) {
Matrix_RotateX(((f32)platform->dyna.actor.shape.rot.x / 0x8000) * M_PI, MTXMODE_APPLY);
Matrix_RotateZ(((f32)platform->dyna.actor.shape.rot.z / 0x8000) * M_PI, MTXMODE_APPLY);
if (camera->eye.y > platform->dyna.actor.posRot.pos.y) {

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

@ -12,7 +12,7 @@ typedef struct BgGanonOtyuka {
/* 0x0000 */ DynaPolyActor dyna;
/* 0x0164 */ BgGanonOtyukaActionFunc actionFunc;
/* 0x0168 */ s16 dropTimer;
/* 0x016A */ u8 unk_16A;
/* 0x016A */ u8 isFalling;
/* 0x016B */ u8 unk_16B;
/* 0x016C */ u8 unk_16C;
/* 0x016D */ u8 unk_16D;