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

29
src/overlays/actors/ovl_En_Dns/z_en_dns.c
View file

@ -141,8 +141,7 @@ void EnDns_Init(Actor* thisx, GlobalContext* globalCtx) {
osSyncPrintf(VT_FGCOL(GREEN) "◆◆◆ 売りナッツ『%s』 ◆◆◆" VT_RST "\n", D_809F0424[this->actor.params],
this->actor.params);
Actor_ProcessInitChain(&this->actor, sInitChain);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060041A8, &D_060009A0, this->limbDrawTable,
this->transitionDrawTable, 18);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060041A8, &D_060009A0, this->jointTable, this->morphTable, 18);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder_Set3(globalCtx, &this->collider, &this->actor, &sCylinderInit);
ActorShape_Init(&this->actor.shape, 0.0f, &ActorShadow_DrawFunc_Circle, 35.0f);
@ -165,13 +164,13 @@ void EnDns_Destroy(Actor* thisx, GlobalContext* globalCtx) {
Collider_DestroyCylinder(globalCtx, &this->collider);
}
void EnDns_ChangeAnim(EnDns* this, u8 arg1) {
void EnDns_Change(EnDns* this, u8 arg1) {
s16 frameCount;
frameCount = SkelAnime_GetFrameCount(D_809F0538[arg1].anim);
frameCount = Animation_GetLastFrame(D_809F0538[arg1].anim);
this->unk_2BA = arg1; // Not used anywhere else?
SkelAnime_ChangeAnim(&this->skelAnime, D_809F0538[arg1].anim, 1.0f, 0.0f, (f32)frameCount, D_809F0538[arg1].mode,
D_809F0538[arg1].transitionRate);
Animation_Change(&this->skelAnime, D_809F0538[arg1].anim, 1.0f, 0.0f, (f32)frameCount, D_809F0538[arg1].mode,
D_809F0538[arg1].transitionRate);
}
/* Item give checking functions */
@ -305,9 +304,9 @@ void func_809EFB40(EnDns* this) {
}
void EnDns_SetupWait(EnDns* this, GlobalContext* globalCtx) {
if (this->skelAnime.animCurrentFrame == this->skelAnime.animFrameCount) {
if (this->skelAnime.curFrame == this->skelAnime.endFrame) {
this->actionFunc = EnDns_Wait;
EnDns_ChangeAnim(this, 0);
EnDns_Change(this, 0);
}
}
@ -403,7 +402,7 @@ void func_809EFF98(EnDns* this, GlobalContext* globalCtx) {
this->dropCollectible = 1;
this->maintainCollider = 0;
this->actor.flags &= ~1;
EnDns_ChangeAnim(this, 1);
EnDns_Change(this, 1);
this->actionFunc = EnDns_SetupBurrow;
}
} else {
@ -411,7 +410,7 @@ void func_809EFF98(EnDns* this, GlobalContext* globalCtx) {
this->dropCollectible = 1;
this->maintainCollider = 0;
this->actor.flags &= ~1;
EnDns_ChangeAnim(this, 1);
EnDns_Change(this, 1);
this->actionFunc = EnDns_SetupBurrow;
}
}
@ -420,15 +419,15 @@ void func_809F008C(EnDns* this, GlobalContext* globalCtx) {
if ((func_8010BDBC(&globalCtx->msgCtx) == 6) && (func_80106BC8(globalCtx) != 0)) {
this->maintainCollider = 0;
this->actor.flags &= ~1;
EnDns_ChangeAnim(this, 1);
EnDns_Change(this, 1);
this->actionFunc = EnDns_SetupBurrow;
}
}
void EnDns_SetupBurrow(EnDns* this, GlobalContext* globalCtx) {
f32 frameCount = SkelAnime_GetFrameCount(&D_06004404);
f32 frameCount = Animation_GetLastFrame(&D_06004404);
if (this->skelAnime.animCurrentFrame == frameCount) {
if (this->skelAnime.curFrame == frameCount) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_AKINDONUTS_HIDE);
this->actionFunc = EnDns_Burrow;
this->standOnGround = 0;
@ -471,7 +470,7 @@ void EnDns_Update(Actor* thisx, GlobalContext* globalCtx) {
this->actor.textId = D_809F040C[this->actor.params];
Actor_SetHeight(&this->actor, 60.0f);
Actor_SetScale(&this->actor, 0.01f);
SkelAnime_FrameUpdateMatrix(&this->skelAnime);
SkelAnime_Update(&this->skelAnime);
Actor_MoveForward(&this->actor);
this->actionFunc(this, globalCtx);
if (this->standOnGround) {
@ -487,6 +486,6 @@ void EnDns_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnDns* this = THIS;
func_80093D18(globalCtx->state.gfxCtx);
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount,
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
NULL, NULL, &this->actor);
}

4
src/overlays/actors/ovl_En_Dns/z_en_dns.h
View file

@ -21,8 +21,8 @@ typedef struct {
typedef struct EnDns {
/* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ Vec3s limbDrawTable[18];
/* 0x01FC */ Vec3s transitionDrawTable[18];
/* 0x0190 */ Vec3s jointTable[18];
/* 0x01FC */ Vec3s morphTable[18];
/* 0x0268 */ EnDnsActionFunc actionFunc;
/* 0x026C */ ColliderCylinder collider;
/* 0x02B8 */ s16 dustTimer;