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

Name drop timer

Browse source
This commit is contained in:
Sirius902 2020-11-15 00:36:32 -08:00
parent 3dd6571400
commit f15d6c9a40
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -172,7 +172,7 @@ void func_80875A0C(BgGanonOtyuka* this, GlobalContext* globalCtx) {
this->actionFunc = func_80875C88; this->actionFunc = func_80875C88;
this->unk_16A = 1; this->unk_16A = 1;
this->unk_168 = 20; this->dropTimer = 20;
this->unk_16E = 1; this->unk_16E = 1;
this->unk_16D = 0; this->unk_16D = 0;
this->primColorR = 255.0f; this->primColorR = 255.0f;
@ -208,7 +208,7 @@ void func_80875C88(BgGanonOtyuka* this, GlobalContext* globalCtx) {
this->unk_16E = 0; this->unk_16E = 0;
} }
} }
if (this->unk_168 == 0) { if (this->dropTimer == 0) {
this->yScale = 0.0f; this->yScale = 0.0f;
Math_SmoothScaleMaxF(&this->dyna.actor.posRot.pos.y, -1000.0f, 1.0f, this->dyna.actor.speedXZ); Math_SmoothScaleMaxF(&this->dyna.actor.posRot.pos.y, -1000.0f, 1.0f, this->dyna.actor.speedXZ);
Math_SmoothScaleMaxF(&this->dyna.actor.speedXZ, 100.0f, 1.0f, 2.0f); Math_SmoothScaleMaxF(&this->dyna.actor.speedXZ, 100.0f, 1.0f, 2.0f);
@ -244,7 +244,7 @@ void func_80875C88(BgGanonOtyuka* this, GlobalContext* globalCtx) {
Actor_Kill(&this->dyna.actor); Actor_Kill(&this->dyna.actor);
} }
} else { } else {
if (this->unk_168 == 1) { if (this->dropTimer == 1) {
Audio_PlaySoundGeneral(NA_SE_EV_STONEDOOR_STOP, &this->dyna.actor.projectedPos, 4, &D_801333E0, &D_801333E0, Audio_PlaySoundGeneral(NA_SE_EV_STONEDOOR_STOP, &this->dyna.actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8); &D_801333E8);
} else { } else {
@ -265,7 +265,7 @@ void BgGanonOtyuka_Update(Actor* thisx, GlobalContext* globalCtx) {
this->actionFunc(this, globalCtx); this->actionFunc(this, globalCtx);
this->unk_16D++; this->unk_16D++;
DECR(this->unk_168); DECR(this->dropTimer);
} }
void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) { void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {

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

@ -11,7 +11,7 @@ typedef void (*BgGanonOtyukaActionFunc)(struct BgGanonOtyuka*, GlobalContext*);
typedef struct BgGanonOtyuka { typedef struct BgGanonOtyuka {
/* 0x0000 */ DynaPolyActor dyna; /* 0x0000 */ DynaPolyActor dyna;
/* 0x0164 */ BgGanonOtyukaActionFunc actionFunc; /* 0x0164 */ BgGanonOtyukaActionFunc actionFunc;
/* 0x0168 */ s16 unk_168; /* 0x0168 */ s16 dropTimer;
/* 0x016A */ u8 unk_16A; /* 0x016A */ u8 unk_16A;
/* 0x016B */ u8 unk_16B; /* 0x016B */ u8 unk_16B;
/* 0x016C */ u8 unk_16C; /* 0x016C */ u8 unk_16C;