diff options
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 118f226d8..e17084fd1 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -3128,7 +3128,7 @@ s32 func_8003305C(Actor* actor, struct_80032E24* arg1, GlobalContext* globalCtx, mtx->wy, mtx->wz, 0, 0, objBankIndex, params); if (spawnedEnPart != NULL) { func_800D20CC(&arg1->unk_00[arg1->unk_08], &spawnedEnPart->actor.shape.rot, 0); - spawnedEnPart->unk_150 = arg1->unk_0C[arg1->unk_08]; + spawnedEnPart->displayList = arg1->unk_0C[arg1->unk_08]; spawnedEnPart->actor.scale = actor->scale; } @@ -4082,7 +4082,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, Vec3f* arg3, s32 arg4, s32 unused, +EnPart* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, f32* arg3, s32 arg4, s32 unused, GlobalContext* globalCtx, s16 params, s32 arg8) { EnPart* spawnedEnPart; @@ -4091,12 +4091,12 @@ EnPart* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, Vec3f* arg spawnPos->z, spawnRot->x, spawnRot->y, actor->objBankIndex, params); if (spawnedEnPart != NULL) { spawnedEnPart->actor.scale = actor->scale; - spawnedEnPart->actor.speedXZ = arg3->x; - spawnedEnPart->unk_150 = arg8; - spawnedEnPart->unk_14C = 2; - spawnedEnPart->unk_14E = arg4; - spawnedEnPart->unk_154 = arg3->y; - spawnedEnPart->unk_158 = arg3->z; + spawnedEnPart->actor.speedXZ = arg3[0]; + spawnedEnPart->displayList = arg8; + spawnedEnPart->action = 2; + spawnedEnPart->timer = arg4; + spawnedEnPart->rotZ = arg3[1]; + spawnedEnPart->rotZSpeed = arg3[2]; return spawnedEnPart; } |