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

skelanime wip

Browse source
This commit is contained in:
KrimtonZ 2020-03-31 18:29:09 -05:00
parent 8f54c82a96
commit 75f570f4ac
115 changed files with 2798 additions and 2389 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/overlays/actors/ovl_En_Ds/z_en_ds.c
View file

@ -55,7 +55,7 @@ void EnDs_Init(EnDs* this, GlobalContext* globalCtx) {
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 36.0f);
SkelAnime_InitSV(globalCtx, skelAnime, &D_06004768, &D_0600039C, &this->actorDrawTable, &this->unk_1B4, 6);
SkelAnimeChangeAnimationDefaultStop(&this->skelAnime, &D_0600039C);
SkelAnime_ChangeAnimationDefaultStop(&this->skelAnime, &D_0600039C);
this->actor.sub_98.mass = 0xFF;

6
src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
View file

@ -161,7 +161,7 @@ static void EnWallmas_LandStart(EnWallmas* this, GlobalContext* globalCtx) {
}
static void EnWallmas_StandStart(EnWallmas* this) {
SkelAnimeChangeAnimationDefaultStop(&this->skelAnime, &D_0600A054);
SkelAnime_ChangeAnimationDefaultStop(&this->skelAnime, &D_0600A054);
this->actionFunc = (ActorFunc)&EnWallmas_Stand;
}
@ -172,7 +172,7 @@ static void EnWallmas_WalkStart(EnWallmas* this) {
}
static void EnWallmas_JumpToCeilingStart(EnWallmas* this) {
SkelAnimeChangeAnimationDefaultStop(&this->skelAnime, &D_06009244);
SkelAnime_ChangeAnimationDefaultStop(&this->skelAnime, &D_06009244);
this->actionFunc = (ActorFunc)&EnWallmas_JumpToCeiling;
this->actor.speedXZ = 0.0f;
}
@ -204,7 +204,7 @@ static void EnWallmas_TakeDamageStart(EnWallmas* this) {
}
static void EnWallmas_DamageCoolDownStart(EnWallmas* this) {
SkelAnimeChangeAnimationDefaultStop(&this->skelAnime, &D_06000EA4);
SkelAnime_ChangeAnimationDefaultStop(&this->skelAnime, &D_06000EA4);
this->actor.speedXZ = 0.0f;
this->actor.velocity.y = 0.0f;
this->actor.posRot.rot.y = this->actor.shape.rot.y;