diff options
| author | louist103 <35883445+louist103@users.noreply.github.com> | 2020-12-03 19:25:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-03 19:25:36 -0500 |
| commit | e455a2487642326a063963f3cdc35f6f0e7606f0 (patch) | |
| tree | 70b716be5e7af4909359bb91e1c2d8e08dd0c9ce /src/code | |
| parent | b8ecf7cae4f023ad8973f7ae35575633ef0238f9 (diff) | |
Decomp EnMb (#445)
* Fixed upstream
* Initial commit
* Matched init but broke something else
* All fixed. Matched Init OK
* Progress
* Lots of progress
* Progress
* progress
* Progress
* progress
* fix struct size
* commit
* progress
* progress
* add comment
* merge master
* fix undefined syms
* progress
* progress
* progress
* Progress
* progress
* Finish
* Remove asm
* Clean up
* Delete some ASM
* Fix spec
* Update z_en_mb.h
* Match a few more and move func_80AA7938 to non equivilent
* asm
* no more non equiv
* matched
* asm
* review
Co-authored-by: Louis <5883445+louist103@users.noreply.github.com>
Co-authored-by: fig <fig02srl@gmail.com>
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index d170b65c0..0595228cd 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -4077,7 +4077,7 @@ void func_80035844(Vec3f* arg0, Vec3f* arg1, s16* arg2, s32 arg3) { /** * Spawns En_Part (Dissipating Flames) actor as a child of the given actor. */ -EnPart* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, f32* arg3, s32 arg4, s32 unused, +EnPart* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, f32* arg3, s32 timer, s16* unused, GlobalContext* globalCtx, s16 params, s32 arg8) { EnPart* spawnedEnPart; @@ -4089,7 +4089,7 @@ EnPart* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, f32* arg3, spawnedEnPart->actor.speedXZ = arg3[0]; spawnedEnPart->displayList = arg8; spawnedEnPart->action = 2; - spawnedEnPart->timer = arg4; + spawnedEnPart->timer = timer; spawnedEnPart->rotZ = arg3[1]; spawnedEnPart->rotZSpeed = arg3[2]; return spawnedEnPart; |