mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-05-24 07:11:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

ovl_En_Sa (#625)

Browse Source 
* Decompiled

* Add missing sfx id name

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: Thar0 <maximilianc64@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
This commit is contained in:
Tharo
2021-01-31 19:35:58 +00:00
committed by GitHub
parent 31b0ea2db8
commit 3e322f5d35
51 changed files with 775 additions and 2251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_actor.c
+7 -7
View File
@@ -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) {