summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
authorMaide <34639600+Kelebek1@users.noreply.github.com>2021-08-06 22:14:09 +0100
committerGitHub <noreply@github.com>2021-08-06 17:14:09 -0400
commit1836844ea85cb33f67cec08f4d4f06a212c943bf (patch)
tree643c2e3951432a47d910282eb6bba7fe0d115c5e /src/code
parent161da0c88181b4c1c140746f53a46ff8f80b0d78 (diff)
En_Dinofos (#235)
* En_Dinofos * PR * NBS * PR * PR
Diffstat (limited to 'src/code')
-rw-r--r--src/code/z_effect_soft_sprite_old_init.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c
index f9abd023b..51b382c88 100644
--- a/src/code/z_effect_soft_sprite_old_init.c
+++ b/src/code/z_effect_soft_sprite_old_init.c
@@ -402,9 +402,8 @@ void EffectSsGSpk_SpawnSmall(GlobalContext* globalCtx, Actor* actor, Vec3f* pos,
}
// EffectSsDFire Spawn Functions
-#ifdef NON_MATCHING
void EffectSsDFire_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep,
- s16 alpha, s16 fadeDelay, s16 life) {
+ s16 alpha, s16 fadeDelay, s16 life, s32 arg9) {
EffectSsDFireInitParams initParams;
Math_Vec3f_Copy(&initParams.pos, pos);
@@ -415,12 +414,10 @@ void EffectSsDFire_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity,
initParams.alpha = alpha;
initParams.fadeDelay = fadeDelay;
initParams.life = life;
+ initParams.unk_30 = arg9;
EffectSs_Spawn(globalCtx, EFFECT_SS_D_FIRE, 128, &initParams);
}
-#else
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/EffectSsDFire_Spawn.s")
-#endif
// EffectSsBubble Spawn Functions