mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-25 09:45:02 +00:00
Code Issues Projects Releases Wiki Activity

Rename to flashHeight

Browse source
This commit is contained in:
Sirius902 2020-11-15 02:59:52 -08:00
parent 774af9cbd6
commit fa1ca87630
2 changed files with 7 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

@ -195,21 +195,21 @@ void BgGanonOtyuka_Fall(BgGanonOtyuka* this, GlobalContext* globalCtx) {
if (this->flashState == FLASH_GROW) { if (this->flashState == FLASH_GROW) {
Math_SmoothScaleMaxF(&this->flashPrimColorB, 170.0f, 1.0f, 8.5f); Math_SmoothScaleMaxF(&this->flashPrimColorB, 170.0f, 1.0f, 8.5f);
Math_SmoothScaleMaxF(&this->flashEnvColorR, 120.0f, 1.0f, 13.5f); Math_SmoothScaleMaxF(&this->flashEnvColorR, 120.0f, 1.0f, 13.5f);
Math_SmoothScaleMaxF(&this->flashYScale, 2.5f, 1.0f, 0.25f); Math_SmoothScaleMaxF(&this->flashHeight, 2.5f, 1.0f, 0.25f);
if (this->flashYScale == 2.5f) { if (this->flashHeight == 2.5f) {
this->flashState = FLASH_SHRINK; this->flashState = FLASH_SHRINK;
} }
} else if (this->flashState == FLASH_SHRINK) { } else if (this->flashState == FLASH_SHRINK) {
Math_SmoothScaleMaxF(&this->flashPrimColorG, 0.0f, 1.0f, 25.5f); Math_SmoothScaleMaxF(&this->flashPrimColorG, 0.0f, 1.0f, 25.5f);
Math_SmoothScaleMaxF(&this->flashEnvColorR, 0.0f, 1.0f, 12.0f); Math_SmoothScaleMaxF(&this->flashEnvColorR, 0.0f, 1.0f, 12.0f);
Math_SmoothScaleMaxF(&this->flashEnvColorG, 0.0f, 1.0f, 25.5f); Math_SmoothScaleMaxF(&this->flashEnvColorG, 0.0f, 1.0f, 25.5f);
Math_SmoothDownscaleMaxF(&this->flashYScale, 1.0f, 0.25f); Math_SmoothDownscaleMaxF(&this->flashHeight, 1.0f, 0.25f);
if (this->flashYScale == 0.0f) { if (this->flashHeight == 0.0f) {
this->flashState = FLASH_NONE; this->flashState = FLASH_NONE;
} }
} }
if (this->dropTimer == 0) { if (this->dropTimer == 0) {
this->flashYScale = 0.0f; this->flashHeight = 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);
if (!(this->tiltSides & SIDE_WEST)) { if (!(this->tiltSides & SIDE_WEST)) {
@ -373,7 +373,7 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Push(); Matrix_Push();
Matrix_Translate(sSideCenters[i].x, 0.0f, sSideCenters[i].z, MTXMODE_APPLY); Matrix_Translate(sSideCenters[i].x, 0.0f, sSideCenters[i].z, MTXMODE_APPLY);
Matrix_RotateY(sSideAngles[i], MTXMODE_APPLY); Matrix_RotateY(sSideAngles[i], MTXMODE_APPLY);
Matrix_Scale(0.3f, platform->flashYScale * 0.3f, 0.3f, MTXMODE_APPLY); Matrix_Scale(0.3f, platform->flashHeight * 0.3f, 0.3f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, gSPMatrix(POLY_XLU_DISP++,
Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ganon_otyuka.c", 847), Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ganon_otyuka.c", 847),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);

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

@ -25,7 +25,7 @@ typedef struct BgGanonOtyuka {
/* 0x016C */ u8 visibleSides; /* 0x016C */ u8 visibleSides;
/* 0x016D */ u8 flashTimer; /* 0x016D */ u8 flashTimer;
/* 0x016E */ u8 flashState; /* 0x016E */ u8 flashState;
/* 0x0170 */ f32 flashYScale; /* 0x0170 */ f32 flashHeight;
/* 0x0174 */ f32 flashPrimColorR; /* 0x0174 */ f32 flashPrimColorR;
/* 0x0178 */ f32 flashPrimColorG; /* 0x0178 */ f32 flashPrimColorG;
/* 0x017C */ f32 flashPrimColorB; /* 0x017C */ f32 flashPrimColorB;