From 3e322f5d35a1012b483ffa6f438347ea2a82b4bb Mon Sep 17 00:00:00 2001 From: Tharo <17233964+Thar0@users.noreply.github.com> Date: Sun, 31 Jan 2021 19:35:58 +0000 Subject: ovl_En_Sa (#625) * Decompiled * Add missing sfx id name Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Thar0 Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Fig02 --- src/code/z_actor.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/code') diff --git a/src/code/z_actor.c b/src/code/z_actor.c index c4661629a..f6ba831dd 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -3859,19 +3859,19 @@ s16 func_80034DD4(Actor* actor, GlobalContext* globalCtx, s16 arg2, f32 arg3) { return arg2; } -void func_80034EC0(SkelAnime* skelAnime, struct_80034EC0_Entry* arg1, s32 arg2) { +void func_80034EC0(SkelAnime* skelAnime, struct_80034EC0_Entry* animations, s32 index) { f32 frameCount; - arg1 += arg2; + animations += index; - if (arg1->frameCount > 0.0f) { - frameCount = arg1->frameCount; + if (animations->frameCount > 0.0f) { + frameCount = animations->frameCount; } else { - frameCount = Animation_GetLastFrame(arg1->animation); + frameCount = Animation_GetLastFrame(animations->animation); } - Animation_Change(skelAnime, arg1->animation, arg1->playbackSpeed, arg1->unk_08, frameCount, arg1->unk_10, - arg1->transitionRate); + Animation_Change(skelAnime, animations->animation, animations->playbackSpeed, animations->startFrame, frameCount, + animations->mode, animations->transitionRate); } void func_80034F54(GlobalContext* globalCtx, s16* arg1, s16* arg2, s32 arg3) { -- cgit v1.2.3