diff options
| author | Léo Peltier <L-P@users.noreply.github.com> | 2020-07-16 10:02:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-16 06:02:27 -0400 |
| commit | bc14f6d93e2463dfe81660013c591b3ddd6b3ab3 (patch) | |
| tree | 3db0af5cb8fcc6f37efc46061d89a75e83433b6d /src/code | |
| parent | 106f7a3f6a7694cc4d73c84e4980b38852916aa8 (diff) | |
Decompile ovl_En_Fhg_Fire (#248)
* Decomp EnFhgFire_Init and EnFhgFire_SetActorFunc
* Decomp EnFhgFire_Destroy
* Decomp func_80A0F6F8
* Run format
* Decomp func_80A0FA90
* Decomp func_80A0FC48
* Decomp func_80A0FD8C
* Decomp EffectSsFhgFlash_Spawn
ex func_80029CF0
* Decomp EffectSsFhgFlash_Spawn2
ex func_80029D5C
* Decomp EnFhgFire_Update
* Decomp EnFhgFire_Draw, not matching
* Decomp func_80A10F18
* Move InitVars
* PR fixes
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_effect_soft_sprite_old_init.c | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c index 831ab107f..610684134 100644 --- a/src/code/z_effect_soft_sprite_old_init.c +++ b/src/code/z_effect_soft_sprite_old_init.c @@ -1,6 +1,7 @@ #include <ultra64.h> #include <global.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" // Draw utility for some G effects #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80027F80.s") @@ -161,9 +162,30 @@ // EffectSsFhgFlash Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029CF0.s") +void EffectSsFhgFlash_Spawn(GlobalContext *globalCtx, Vec3f *pos, Vec3f *velocity, Vec3f *accel, s16 arg4, u8 arg5) { + EffectSsFhgFlashInitParams initParams; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029D5C.s") + Math_Vec3f_Copy(&initParams.pos, pos); + Math_Vec3f_Copy(&initParams.velocity, velocity); + Math_Vec3f_Copy(&initParams.accel, accel); + initParams.unk_24 = arg4; + initParams.unk_26 = arg5; + initParams.unk_2C = 0; + + EffectSs_Spawn(globalCtx, EFFECT_SS_FHG_FLASH, 128, &initParams); +} + + +void EffectSsFhgFlash_Spawn2(GlobalContext *globalCtx, Actor *arg1, Vec3f *pos, s16 arg3, u8 arg4) { + EffectSsFhgFlashInitParams initParams; + + initParams.unk_28 = arg1; + Math_Vec3f_Copy(&initParams.pos, pos); + initParams.unk_24 = arg3; + initParams.unk_26 = arg4; + initParams.unk_2C = 1; + EffectSs_Spawn(globalCtx, EFFECT_SS_FHG_FLASH, 128, &initParams); +} // EffectSsKFire Spawn Functions |