diff options
| author | maekclena <maekclena@users.noreply.github.com> | 2020-09-04 23:22:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-04 17:22:12 -0400 |
| commit | d44dd61cd6b1b19ff0825c04b1a1addf06f6253c (patch) | |
| tree | 347afd590204cd622844fda65312eb0b7c1fc0a1 /src/code | |
| parent | 18775320f8e375ade5916478f24eded5ceaabf3c (diff) | |
ovl_Effect_Ss_Extra (#339)
* ovl_Effect_Ss_Extra
* EffectSsExtra_Spawn
* Typo
* PR review
* PR review
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_effect_soft_sprite_old_init.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c index 59f281a9f..86855420d 100644 --- a/src/code/z_effect_soft_sprite_old_init.c +++ b/src/code/z_effect_soft_sprite_old_init.c @@ -4,6 +4,7 @@ #include "overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h" #include "overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h" #include "overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h" +#include "overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h" #include "overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h" #include "overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h" #include "overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h" @@ -465,7 +466,16 @@ void EffectSsSolderSrchBall_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* v // EffectSsExtra Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A5F4.s") +void EffectSsExtra_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scoreIdx) { + EffectSsExtraInitParams initParams; + + Math_Vec3f_Copy(&initParams.pos, pos); + Math_Vec3f_Copy(&initParams.velocity, velocity); + Math_Vec3f_Copy(&initParams.accel, accel); + initParams.scale = scale; + initParams.scoreIdx = scoreIdx; + EffectSs_Spawn(globalCtx, EFFECT_SS_EXTRA, 100, &initParams); +} // EffectSsFCircle Spawn Functions |