falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

EffectSsSibuki OK (#735) 

* OK

* Small formating

* Fix merge
This commit is contained in:
Derek Hensley 2022-03-29 09:26:46 -07:00 committed by GitHub
parent 26d7085ac2
commit 84dd09048e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 101 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spec
View File

@ -1907,8 +1907,7 @@ beginseg
name "ovl_Effect_Ss_Sibuki"
compress
include "build/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.o"
include "build/data/ovl_Effect_Ss_Sibuki/ovl_Effect_Ss_Sibuki.data.o"
include "build/data/ovl_Effect_Ss_Sibuki/ovl_Effect_Ss_Sibuki.reloc.o"
include "build/src/overlays/effects/ovl_Effect_Ss_Sibuki/ovl_Effect_Ss_Sibuki_reloc.o"
endseg
beginseg

106
src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c
View File

@ -5,23 +5,117 @@
*/
#include "z_eff_ss_sibuki.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#define rPrimColorR regs[0]
#define rPrimColorG regs[1]
#define rPrimColorB regs[2]
#define rPrimColorA regs[3]
#define rEnvColorR regs[4]
#define rEnvColorG regs[5]
#define rEnvColorB regs[6]
#define rEnvColorA regs[7]
#define rMoveDelay regs[8]
#define rDirection regs[9]
#define rScale regs[10]
#define PARAMS ((EffectSsSibukiInitParams*)initParamsx)
s32 EffectSsSibuki_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx);
u32 EffectSsSibuki_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx);
void EffectSsSibuki_Update(GlobalContext* globalCtx, u32 index, EffectSs* this);
void EffectSsSibuki_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this);
#if 0
const EffectSsInit Effect_Ss_Sibuki_InitVars = {
EFFECT_SS_SIBUKI,
EffectSsSibuki_Init,
};
#endif
u32 EffectSsSibuki_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
EffectSsSibukiInitParams* initParams = PARAMS;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Effect_Ss_Sibuki/EffectSsSibuki_Init.s")
this->pos = initParams->pos;
this->velocity = initParams->velocity;
this->accel = initParams->accel;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Effect_Ss_Sibuki/EffectSsSibuki_Draw.s")
{
TexturePtr tex = (KREG(2) != 0) ? gEffBubble2Tex : gEffBubble1Tex;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Effect_Ss_Sibuki/EffectSsSibuki_Update.s")
this->gfx = VIRTUAL_TO_PHYSICAL(SEGMENTED_TO_VIRTUAL(tex));
}
this->life = ((s32)((Rand_ZeroOne() * (500.0f + KREG(64))) * 0.01f)) + KREG(65) + 10;
this->rMoveDelay = initParams->moveDelay + 1;
this->draw = EffectSsSibuki_Draw;
this->update = EffectSsSibuki_Update;
this->rDirection = initParams->direction;
this->rScale = initParams->scale;
this->rPrimColorR = 100;
this->rPrimColorG = 100;
this->rPrimColorB = 100;
this->rPrimColorA = 100;
this->rEnvColorR = 255;
this->rEnvColorG = 255;
this->rEnvColorB = 255;
this->rEnvColorA = 255;
return 1;
}
void EffectSsSibuki_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
f32 scale = this->rScale / 100.0f;
OPEN_DISPS(gfxCtx);
Matrix_InsertTranslation(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_8012C28C(gfxCtx);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, this->rPrimColorA);
gDPSetEnvColor(POLY_OPA_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA);
gSPSegment(POLY_OPA_DISP++, 0x08, this->gfx);
gSPDisplayList(POLY_OPA_DISP++, gEffBubbleDL);
CLOSE_DISPS(gfxCtx);
}
void EffectSsSibuki_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {
Player* player = GET_PLAYER(globalCtx);
s32 pad[2];
f32 xzVelScale;
if (this->pos.y <= player->actor.floorHeight) {
this->life = 0;
}
if (this->rMoveDelay != 0) {
this->rMoveDelay--;
if (this->rMoveDelay == 0) {
s16 yaw = Camera_GetInputDirYaw(Play_GetCamera(globalCtx, CAM_ID_MAIN));
xzVelScale = ((200.0f + KREG(20)) * 0.01f) + ((0.1f * Rand_ZeroOne()) * (KREG(23) + 20.0f));
if (this->rDirection != 0) {
xzVelScale *= -1.0f;
}
this->velocity.x = Math_CosS(yaw) * xzVelScale;
this->velocity.z = -Math_SinS(yaw) * xzVelScale;
this->velocity.y = ((700.0f + KREG(21)) * 0.01f) + ((0.1f * Rand_ZeroOne()) * (KREG(24) + 20.0f));
this->accel.y = ((-100.0f + KREG(22)) * 0.01f) + ((0.1f * Rand_ZeroOne()) * KREG(25));
if (KREG(3) != 0) {
this->velocity.x *= (KREG(3) * 0.01f);
this->velocity.y *= (KREG(3) * 0.01f);
this->velocity.z *= (KREG(3) * 0.01f);
this->accel.y *= (KREG(4) * 0.01f);
}
}
} else {
if (this->rScale != 0) {
this->rScale = (this->rScale - KREG(26)) - 3;
}
}
}