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

Docs for the Anime part of SkelAnime (#517)

Browse source 
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* more names

* so many names

* we got subsystems now

* slight cleanup

* merge part 2

* new naming scheme

* slight adjustment

* no limit

* syms maybe

* step one

* OK, it's fixed

* table

* some names and such

* comments**

* update zap

* gitkeep to please jenkins

* ZAP

* fixer

* fixer2

* fixer3

* zap

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: fig <fig02srl@gmail.com>
This commit is contained in:
petrie911 2020-12-29 16:46:46 -06:00 • committed by GitHub
parent e4d88bf942
commit 2dfa188706
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1187 changed files with 5434 additions and 5367 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/overlays/actors/ovl_En_St/z_en_st.c
View file

@ -219,13 +219,13 @@ void EnSt_SetLandAnimation(EnSt* this) {
this->actor.posRot.pos.y = this->actor.groundY + this->groundYOffset;
func_80034EC0(&this->skelAnime, sAnimations, 4);
this->sfxTimer = 0;
this->animFrames = this->skelAnime.totalFrames;
this->animFrames = this->skelAnime.animLength;
}
void EnSt_SetDropAnimAndVel(EnSt* this) {
if (this->takeDamageSpinTimer == 0) {
func_80034EC0(&this->skelAnime, sAnimations, 4);
this->animFrames = this->skelAnime.totalFrames;
this->animFrames = this->skelAnime.animLength;
}
this->sfxTimer = 0;
this->actor.velocity.y = -10.0f;
@ -414,7 +414,7 @@ s32 EnSt_CheckHitBackside(EnSt* this, GlobalContext* globalCtx) {
this->swayTimer = this->stunTimer = 0;
this->gaveDamageSpinTimer = 1;
func_80034EC0(&this->skelAnime, sAnimations, 3);
this->takeDamageSpinTimer = this->skelAnime.totalFrames;
this->takeDamageSpinTimer = this->skelAnime.animLength;
func_8003426C(&this->actor, 0x4000, 0xC8, 0, this->takeDamageSpinTimer);
if (Actor_ApplyDamage(&this->actor)) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALTU_DAMAGE);
@ -741,7 +741,7 @@ void EnSt_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 14.0f);
SkelAnime_Init(globalCtx, &this->skelAnime, &D_06005298, NULL, this->limbDrawTable, this->transitionDrawTable, 30);
SkelAnime_Init(globalCtx, &this->skelAnime, &D_06005298, NULL, this->jointTable, this->morphTable, 30);
func_80034EC0(&this->skelAnime, sAnimations, 0);
this->blureIdx = EnSt_CreateBlureEffect(globalCtx);
EnSt_InitColliders(this, globalCtx);
@ -872,7 +872,7 @@ void EnSt_MoveToGround(EnSt* this, GlobalContext* globalCtx) {
}
void EnSt_ReturnToCeiling(EnSt* this, GlobalContext* globalCtx) {
f32 animPctDone = this->skelAnime.animCurrentFrame / (this->skelAnime.totalFrames - 1.0f);
f32 animPctDone = this->skelAnime.curFrame / (this->skelAnime.animLength - 1.0f);
if (animPctDone == 1.0f) {
EnSt_SetReturnToCeilingAnimation(this);
@ -970,12 +970,12 @@ void EnSt_Update(Actor* thisx, GlobalContext* globalCtx) {
Color_RGBA8 color = { 0, 0, 0, 0 };
if (this->actor.flags & 0x8000) {
SkelAnime_FrameUpdateMatrix(&this->skelAnime);
SkelAnime_Update(&this->skelAnime);
} else if (!EnSt_CheckColliders(this, globalCtx)) {
// no collision has been detected.
if (this->stunTimer == 0) {
SkelAnime_FrameUpdateMatrix(&this->skelAnime);
SkelAnime_Update(&this->skelAnime);
}
if (this->swayTimer == 0 && this->stunTimer == 0) {
@ -1031,7 +1031,7 @@ s32 EnSt_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dListP,
break;
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_st.c", 2295);
return 0;
return false;
}
void EnSt_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dListP, Vec3s* rot, void* thisx) {
@ -1045,6 +1045,6 @@ void EnSt_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnSt_CheckBodyStickHit(this, globalCtx);
func_80093D18(globalCtx->state.gfxCtx);
SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, EnSt_OverrideLimbDraw,
SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnSt_OverrideLimbDraw,
EnSt_PostLimbDraw, this);
}

4
src/overlays/actors/ovl_En_St/z_en_st.h
View file

@ -43,8 +43,8 @@ typedef struct EnSt {
/* 0x0408 */ f32 colliderScale;
/* 0x040C */ f32 groundYOffset;
/* 0x0410 */ s16 swayAngle;
/* 0x0412 */ Vec3s limbDrawTable[30];
/* 0x04C6 */ Vec3s transitionDrawTable[30];
/* 0x0412 */ Vec3s jointTable[30];
/* 0x04C6 */ Vec3s morphTable[30];
} EnSt; // size = 0x057C
extern const ActorInit En_St_InitVars;