mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 22:30:15 +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

47
src/overlays/actors/ovl_En_Md/z_en_md.c
View file

@ -58,13 +58,13 @@ extern AnimationHeader D_060002C8;
extern FlexSkeletonHeader D_06007FB8;
void func_80AAA250(EnMd* this) {
f32 initialFrame;
f32 startFrame;
initialFrame = this->skelAnime.initialFrame;
this->skelAnime.initialFrame = this->skelAnime.animFrameCount;
this->skelAnime.animCurrentFrame = this->skelAnime.animFrameCount;
this->skelAnime.animFrameCount = initialFrame;
this->skelAnime.animPlaybackSpeed = -1.0f;
startFrame = this->skelAnime.startFrame;
this->skelAnime.startFrame = this->skelAnime.endFrame;
this->skelAnime.curFrame = this->skelAnime.endFrame;
this->skelAnime.endFrame = startFrame;
this->skelAnime.playSpeed = -1.0f;
}
void func_80AAA274(EnMd* this) {
@ -73,7 +73,7 @@ void func_80AAA274(EnMd* this) {
func_80034EC0(&this->skelAnime, sAnimations, 2);
this->unk_20A++;
case 1:
if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount)) {
if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
func_80034EC0(&this->skelAnime, sAnimations, 3);
this->unk_20A++;
}
@ -86,7 +86,7 @@ void func_80AAA308(EnMd* this) {
func_80034EC0(&this->skelAnime, sAnimations, 4);
this->unk_20A++;
case 1:
if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount)) {
if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
func_80034EC0(&this->skelAnime, sAnimations, 5);
this->unk_20A++;
}
@ -100,14 +100,14 @@ void func_80AAA39C(EnMd* this) {
func_80AAA250(this);
this->unk_20A++;
case 1:
if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount)) {
if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
func_80034EC0(&this->skelAnime, sAnimations, 7);
this->unk_20A++;
} else {
break;
}
case 2:
if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount)) {
if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
func_80034EC0(&this->skelAnime, sAnimations, 8);
this->unk_20A++;
}
@ -120,7 +120,7 @@ void func_80AAA474(EnMd* this) {
func_80034EC0(&this->skelAnime, sAnimations, 7);
this->unk_20A++;
case 1:
if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount)) {
if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
func_80034EC0(&this->skelAnime, sAnimations, 10);
this->unk_20A++;
}
@ -134,7 +134,7 @@ void func_80AAA508(EnMd* this) {
func_80AAA250(this);
this->unk_20A++;
case 1:
if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount)) {
if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
func_80034EC0(&this->skelAnime, sAnimations, 10);
this->unk_20A++;
}
@ -147,7 +147,7 @@ void func_80AAA5A4(EnMd* this) {
func_80034EC0(&this->skelAnime, sAnimations, 9);
this->unk_20A++;
case 1:
if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount)) {
if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
func_80034EC0(&this->skelAnime, sAnimations, 6);
this->unk_20A++;
}
@ -161,7 +161,7 @@ void func_80AAA638(EnMd* this) {
func_80AAA250(this);
this->unk_20A++;
case 1:
if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount)) {
if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
func_80034EC0(&this->skelAnime, sAnimations, 10);
this->unk_20A++;
}
@ -174,7 +174,7 @@ void func_80AAA6D4(EnMd* this) {
func_80034EC0(&this->skelAnime, sAnimations, 11);
this->unk_20A++;
case 1:
if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount)) {
if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
func_80034EC0(&this->skelAnime, sAnimations, 6);
this->unk_20A++;
}
@ -187,7 +187,7 @@ void func_80AAA768(EnMd* this) {
func_80034EC0(&this->skelAnime, sAnimations, 12);
this->unk_20A++;
case 1:
if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount)) {
if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
func_80034EC0(&this->skelAnime, sAnimations, 3);
this->unk_20A++;
}
@ -200,7 +200,7 @@ void func_80AAA7FC(EnMd* this) {
func_80034EC0(&this->skelAnime, sAnimations, 13);
this->unk_20A++;
case 1:
if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount)) {
if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
func_80034EC0(&this->skelAnime, sAnimations, 6);
this->unk_20A++;
}
@ -214,7 +214,7 @@ void func_80AAA890(EnMd* this) {
func_80AAA250(this);
this->unk_20A++;
case 1:
if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount)) {
if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
func_80034EC0(&this->skelAnime, sAnimations, 10);
this->unk_20A++;
}
@ -593,8 +593,7 @@ void EnMd_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 24.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06007FB8, NULL, this->limbDrawTable, this->transitionDrawTable,
17);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06007FB8, NULL, this->jointTable, this->morphTable, 17);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
@ -670,7 +669,7 @@ void func_80AAB948(EnMd* this, GlobalContext* globalCtx) {
this->actor.posRot.pos.z += 60.0f * Math_CosS(yaw);
temp = fabsf((f32)this->actor.yawTowardsLink - yaw) * 0.001f * 3.0f;
this->skelAnime.animPlaybackSpeed = CLAMP(temp, 1.0f, 3.0f);
this->skelAnime.playSpeed = CLAMP(temp, 1.0f, 3.0f);
}
if (this->unk_1E0.unk_00 == 2) {
@ -751,7 +750,7 @@ void func_80AABD0C(EnMd* this, GlobalContext* globalCtx) {
func_80AAA92C(this, 11);
this->skelAnime.animPlaybackSpeed = 0.0f;
this->skelAnime.playSpeed = 0.0f;
this->actor.speedXZ = 0.0f;
this->actor.initPosRot.pos = this->actor.posRot.pos;
this->actionFunc = func_80AAB8F8;
@ -763,7 +762,7 @@ void EnMd_Update(Actor* thisx, GlobalContext* globalCtx) {
Collider_CylinderUpdate(&this->actor, &this->collider);
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider);
SkelAnime_FrameUpdateMatrix(&this->skelAnime);
SkelAnime_Update(&this->skelAnime);
EnMd_UpdateEyes(this);
func_80AAB5A4(this, globalCtx);
Actor_MoveForward(&this->actor);
@ -795,7 +794,7 @@ s32 EnMd_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
rot->z += Math_CosS(this->unk_236[limbIndex]) * 200.0f;
}
return 0;
return false;
}
void EnMd_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfx) {

4
src/overlays/actors/ovl_En_Md/z_en_md.h
View file

@ -24,8 +24,8 @@ typedef struct EnMd {
/* 0x0212 */ s16 waypoint;
/* 0x0214 */ s16 unk_214[17];
/* 0x0236 */ s16 unk_236[17];
/* 0x0258 */ Vec3s limbDrawTable[17];
/* 0x02BE */ Vec3s transitionDrawTable[17];
/* 0x0258 */ Vec3s jointTable[17];
/* 0x02BE */ Vec3s morphTable[17];
} EnMd; // size = 0x0324
extern const ActorInit En_Md_InitVars;