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

Merge bbeafe8d29 into eb5dac74d6

This commit is contained in:
Gabriel Ravier 2025-11-21 08:50:56 +09:00 committed by GitHub
parent eb5dac74d6 bbeafe8d29
commit 45352d0e69
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/effect.h
View File

@ -391,7 +391,7 @@ void EffectSsSibuki_SpawnBurst(struct PlayState* play, Vec3f* pos);
void EffectSsSibuki2_Spawn(struct PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale);
void EffectSsGMagma2_Spawn(struct PlayState* play, Vec3f* pos, Color_RGBA8* primColor, Color_RGBA8* envColor,
s16 updateRate, s16 drawMode, s16 scale);
void EffectSsStone1_Spawn(struct PlayState* play, Vec3f* pos, s32 arg2);
void EffectSsStone1_Spawn(struct PlayState* play, Vec3f* pos, s32 suppressRTransFadeFlashAlphaStepAfterTwoFrames);
void EffectSsHitMark_Spawn(struct PlayState* play, s32 type, s16 scale, Vec3f* pos);
void EffectSsHitMark_SpawnFixedScale(struct PlayState* play, s32 type, Vec3f* pos);
void EffectSsHitMark_SpawnCustomScale(struct PlayState* play, s32 type, s16 scale, Vec3f* pos);

4
src/code/z_effect_soft_sprite_old_init.c
View File

@ -733,11 +733,11 @@ void EffectSsGMagma2_Spawn(PlayState* play, Vec3f* pos, Color_RGBA8* primColor,
// EffectSsStone1 Spawn Functions
void EffectSsStone1_Spawn(PlayState* play, Vec3f* pos, s32 arg2) {
void EffectSsStone1_Spawn(PlayState* play, Vec3f* pos, s32 suppressRTransFadeFlashAlphaStepAfterTwoFrames) {
EffectSsStone1InitParams initParams;
initParams.pos = *pos;
initParams.unk_C = arg2;
initParams.suppressRTransFadeFlashAlphaStepAfterTwoFrames = suppressRTransFadeFlashAlphaStepAfterTwoFrames;
EffectSs_Spawn(play, EFFECT_SS_STONE1, 128, &initParams);
}

6
src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c
View File

@ -18,7 +18,7 @@
#include "assets/objects/gameplay_keep/gameplay_keep.h"
#define rReg0 regs[0]
#define rSuppressRTransFadeFlashAlphaStepAfterTwoFrames regs[0]
u32 EffectSsStone1_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx);
void EffectSsStone1_Draw(PlayState* play, u32 index, EffectSs* this);
@ -53,7 +53,7 @@ u32 EffectSsStone1_Init(PlayState* play, u32 index, EffectSs* this, void* initPa
this->pos = pos;
this->vec = pos;
this->life = 8;
this->rReg0 = initParams->unk_C;
this->rSuppressRTransFadeFlashAlphaStepAfterTwoFrames = initParams->suppressRTransFadeFlashAlphaStepAfterTwoFrames;
this->draw = EffectSsStone1_Draw;
this->update = EffectSsStone1_Update;
@ -85,7 +85,7 @@ void EffectSsStone1_Draw(PlayState* play, u32 index, EffectSs* this) {
}
void EffectSsStone1_Update(PlayState* play, u32 index, EffectSs* this) {
if ((this->life == 6) && (this->rReg0 != 0)) {
if ((this->life == 6) && (this->rSuppressRTransFadeFlashAlphaStepAfterTwoFrames != 0)) {
R_TRANS_FADE_FLASH_ALPHA_STEP = 0;
}
}

4
src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h
View File

@ -6,7 +6,7 @@
typedef struct EffectSsStone1InitParams {
/* 0x00 */ Vec3f pos;
/* 0x00 */ s32 unk_C;
} EffectSsStone1InitParams; // size = 0x
/* 0x0C */ s32 suppressRTransFadeFlashAlphaStepAfterTwoFrames; // If this is non-zero, then on the 2nd frame after being spawned, the effect will suppress any flash effect from R_TRANS_FADE_FLASH_ALPHA_STEP. All current users of EffectSsStone1InitParams set this to 0. Given the only use of R_TRANS_FADE_FLASH_ALPHA_STEP is made by arrows, when they're deku nut "arrows", and that arrows are the only thing that spawn this effect, it might be that this parameter was used at some point in development in relation to deku nuts or arrows.
} EffectSsStone1InitParams; // size = 0x10
#endif