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

almost there (func_8099E784)

Browse source 
Signed-off-by: Anghelo <angheloalf95@gmail.com>
This commit is contained in:
Anghelo 2021-01-22 12:19:42 -03:00
parent 936ddfa923
commit 56128e9f80
1 changed files with 57 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
View file

@ -354,7 +354,7 @@ void func_8099E4F4(EffDust *this, GlobalContext *globalCtx) {
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E4F4.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E4F4.s")
#endif #endif
#ifndef NON_MATCHING #ifdef NON_MATCHING
void func_8099E784(EffDust *this, GlobalContext *globalCtx) { void func_8099E784(EffDust *this, GlobalContext *globalCtx) {
#if 0 #if 0
//Gfx *temp_v0; //Gfx *temp_v0;
@ -491,10 +491,10 @@ void func_8099E784(EffDust *this, GlobalContext *globalCtx) {
Gfx *new_var; Gfx *new_var;
GraphicsContext *new_var6; GraphicsContext *new_var6;
s32 i; s32 i;
Player *player;
int new_var8; int new_var8;
new_var4 = globalCtx; Player *player;
if (!this->scalingFactor) if (!this->scalingFactor)
{ {
@ -503,11 +503,18 @@ void func_8099E784(EffDust *this, GlobalContext *globalCtx) {
temp_s2 = globalCtx->state.gfxCtx; temp_s2 = globalCtx->state.gfxCtx;
player = PLAYER; player = PLAYER;
OPEN_DISPS(temp_s2, "../z_eff_dust.c", 472);
new_var2 = this->unk_014C; new_var2 = this->unk_014C;
OPEN_DISPS(temp_s2, "../z_eff_dust.c", 472);
new_var4 = globalCtx;
func_80093D18(temp_s2); func_80093D18(temp_s2);
gDPPipeSync(POLY_XLU_DISP++); gDPPipeSync(POLY_XLU_DISP++);
new_var6 = temp_s2; new_var6 = temp_s2;
new_var = POLY_XLU_DISP++; new_var = POLY_XLU_DISP++;
gDPSetPrimColor(new_var, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF); gDPSetPrimColor(new_var, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF);
@ -524,7 +531,7 @@ void func_8099E784(EffDust *this, GlobalContext *globalCtx) {
for (i = 0; i < 0x40; i++) { for (i = 0; i < 0x40; i++) {
if ((*phi_s1) < 1.0f) { if ((*phi_s1) < 1.0f) {
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0xFF, 0xFF, 0xFF, (u8) (255.0f * (*phi_s1))); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0xFF, 0xFF, 0xFF, (255.0f * (*phi_s1)));
new_var9 = this; new_var9 = this;
if (!(&new_var4->state)) { if (!(&new_var4->state)) {
@ -538,8 +545,7 @@ void func_8099E784(EffDust *this, GlobalContext *globalCtx) {
Matrix_Mult(&player->mf_9E0, MTXMODE_NEW); Matrix_Mult(&player->mf_9E0, MTXMODE_NEW);
new_var3 = &phi_s3->x; new_var3 = &phi_s3->x;
new_var2 = &phi_s3->y; new_var5 = &phi_s3->y;
new_var5 = new_var2;
Matrix_Translate( Matrix_Translate(
(*new_var3) * ((new_var9->dx * temp_f20) + (1.0f - new_var9->dx)), (*new_var3) * ((new_var9->dx * temp_f20) + (1.0f - new_var9->dx)),
@ -547,13 +553,14 @@ void func_8099E784(EffDust *this, GlobalContext *globalCtx) {
(phi_s3->z * (1.0f - (*phi_s1))) + (-20.0f), (phi_s3->z * (1.0f - (*phi_s1))) + (-20.0f),
MTXMODE_APPLY MTXMODE_APPLY
); );
temp_f12 = (*phi_s1) * new_var9->scalingFactor;
temp_f12 = (*phi_s1) * new_var9->scalingFactor;
Matrix_Scale(temp_f12, temp_f12, temp_f12, MTXMODE_APPLY); Matrix_Scale(temp_f12, temp_f12, temp_f12, MTXMODE_APPLY);
func_800D1FD4(&new_var4->mf_11DA0); func_800D1FD4(&new_var4->mf_11DA0);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(new_var6, "../z_eff_dust.c", 506), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(new_var6, "../z_eff_dust.c", 506), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_04037880)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_04037880));
} }