mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 22:41:14 +00:00
Code Issues Projects Releases Wiki Activity

Some cleanup and docs for z_skelanime (#601)

Browse source 
* docs and enums

* bgcheck merge

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
This commit is contained in:
petrie911 2021-01-09 16:07:17 -06:00 • committed by GitHub
parent 7a171488d2
commit 115c152b03
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
65 changed files with 701 additions and 423 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/overlays/actors/ovl_En_In/z_en_in.c
View file

@ -311,8 +311,8 @@ void func_80A79690(SkelAnime* skelAnime, EnIn* this, GlobalContext* globalCtx) {
void func_80A796EC(EnIn* this, s32 arg1) {
Animation_Change(&this->skelAnime, sAnimationInfo[arg1].animation, 1.0f, 0.0f,
Animation_GetLastFrame(sAnimationInfo[arg1].animation), sAnimationInfo[arg1].unk_08,
sAnimationInfo[arg1].transitionRate);
Animation_GetLastFrame(sAnimationInfo[arg1].animation), sAnimationInfo[arg1].unk_08,
sAnimationInfo[arg1].transitionRate);
}
s32 func_80A7975C(EnIn* this, GlobalContext* globalCtx) {
@ -322,7 +322,7 @@ s32 func_80A7975C(EnIn* this, GlobalContext* globalCtx) {
this->unk_1E6 = 1;
this->collider.base.maskA &= ~1;
Animation_Change(&this->skelAnime, D_80A7B918[this->unk_1E6], 1.0f, 0.0f,
Animation_GetLastFrame(D_80A7B918[this->unk_1E6]), 2, 0.0f);
Animation_GetLastFrame(D_80A7B918[this->unk_1E6]), 2, 0.0f);
this->actionFunc = func_80A7A304;
return 1;
}
@ -481,8 +481,7 @@ void func_80A79FB0(EnIn* this, GlobalContext* globalCtx) {
if (Object_IsLoaded(&globalCtx->objectCtx, this->ingoObjBankIndex) || this->actor.params <= 0) {
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 36.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013B88, NULL, this->jointTable,
this->morphTable, 20);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013B88, NULL, this->jointTable, this->morphTable, 20);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
func_80061EFC(&this->actor.colChkInfo, NULL, &sColChkInfoInit);
@ -600,7 +599,7 @@ void func_80A7A304(EnIn* this, GlobalContext* globalCtx) {
}
}
Animation_Change(&this->skelAnime, D_80A7B918[this->unk_1E6], 1.0f, 0.0f,
Animation_GetLastFrame(D_80A7B918[this->unk_1E6]), 2, -10.0f);
Animation_GetLastFrame(D_80A7B918[this->unk_1E6]), 2, -10.0f);
}
}