mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-05 05:40:19 +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

76
src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
View file

@ -116,8 +116,8 @@ static EnHorseNormalUnkStruct2 D_80A6D4B8 = { ARRAY_COUNT(D_80A6D470), D_80A6D47
void func_80A6B250(EnHorseNormal* this) {
static s32 D_80A6D4C0[] = { 0, 16 };
if (D_80A6D4C0[this->unk_200] < this->skin.skelAnime.animCurrentFrame &&
((this->unk_200 != 0) || !(D_80A6D4C0[1] < this->skin.skelAnime.animCurrentFrame))) {
if (D_80A6D4C0[this->unk_200] < this->skin.skelAnime.curFrame &&
((this->unk_200 != 0) || !(D_80A6D4C0[1] < this->skin.skelAnime.curFrame))) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_WALK, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
this->unk_200++;
@ -195,7 +195,7 @@ void EnHorseNormal_Init(Actor* thisx, GlobalContext* globalCtx) {
}
this->actor.initPosRot.rot.z = this->actor.posRot.rot.z = this->actor.shape.rot.z = 0;
func_800A663C(globalCtx, &this->skin, &D_06009FAC, &D_06004580);
SkelAnime_ChangeAnimDefaultStop(&this->skin.skelAnime, sAnimations[this->animationIdx]);
Animation_PlayOnce(&this->skin.skelAnime, sAnimations[this->animationIdx]);
if ((this->actor.posRot.pos.x == -730.0f && this->actor.posRot.pos.y == 0.0f &&
this->actor.posRot.pos.z == -1100.0f) ||
(this->actor.posRot.pos.x == 880.0f && this->actor.posRot.pos.y == 0.0f &&
@ -209,7 +209,7 @@ void EnHorseNormal_Init(Actor* thisx, GlobalContext* globalCtx) {
return;
} else {
func_800A663C(globalCtx, &this->skin, &D_06009FAC, &D_06004580);
SkelAnime_ChangeAnimDefaultStop(&this->skin.skelAnime, sAnimations[this->animationIdx]);
Animation_PlayOnce(&this->skin.skelAnime, sAnimations[this->animationIdx]);
func_80A6C6B0(this);
return;
}
@ -217,15 +217,15 @@ void EnHorseNormal_Init(Actor* thisx, GlobalContext* globalCtx) {
if (this->actor.posRot.pos.x == 3707.0f && this->actor.posRot.pos.y == 1413.0f &&
this->actor.posRot.pos.z == -665.0f) {
func_800A663C(globalCtx, &this->skin, &D_06009FAC, &D_06004580);
SkelAnime_ChangeAnimDefaultStop(&this->skin.skelAnime, sAnimations[this->animationIdx]);
Animation_PlayOnce(&this->skin.skelAnime, sAnimations[this->animationIdx]);
func_80A6C4CC(this);
return;
}
func_800A663C(globalCtx, &this->skin, &D_06009FAC, &D_06004580);
SkelAnime_ChangeAnimDefaultStop(&this->skin.skelAnime, sAnimations[this->animationIdx]);
Animation_PlayOnce(&this->skin.skelAnime, sAnimations[this->animationIdx]);
} else {
func_800A663C(globalCtx, &this->skin, &D_06009FAC, &D_06004580);
SkelAnime_ChangeAnimDefaultStop(&this->skin.skelAnime, sAnimations[this->animationIdx]);
Animation_PlayOnce(&this->skin.skelAnime, sAnimations[this->animationIdx]);
}
if ((this->actor.params & 0xF0) == 0x10 && (this->actor.params & 0xF) != 0xF) {
func_80A6B91C(this, globalCtx);
@ -249,8 +249,8 @@ void func_80A6B91C(EnHorseNormal* this, GlobalContext* globalCtx) {
this->animationIdx = 6;
this->waypoint = 0;
this->actor.speedXZ = 7.0f;
SkelAnime_ChangeAnim(&this->skin.skelAnime, sAnimations[this->animationIdx], func_80A6B30C(this), 0.0f,
SkelAnime_GetFrameCount(sAnimations[this->animationIdx]), 2, 0.0f);
Animation_Change(&this->skin.skelAnime, sAnimations[this->animationIdx], func_80A6B30C(this), 0.0f,
Animation_GetLastFrame(sAnimations[this->animationIdx]), 2, 0.0f);
}
void EnHorseNormal_FollowPath(EnHorseNormal* this, GlobalContext* globalCtx) {
@ -271,10 +271,10 @@ void EnHorseNormal_FollowPath(EnHorseNormal* this, GlobalContext* globalCtx) {
this->waypoint = 0;
}
}
this->skin.skelAnime.animPlaybackSpeed = func_80A6B30C(this);
if (SkelAnime_FrameUpdateMatrix(&this->skin.skelAnime)) {
SkelAnime_ChangeAnim(&this->skin.skelAnime, sAnimations[this->animationIdx], func_80A6B30C(this), 0.0f,
SkelAnime_GetFrameCount(sAnimations[this->animationIdx]), 2, 0.0f);
this->skin.skelAnime.playSpeed = func_80A6B30C(this);
if (SkelAnime_Update(&this->skin.skelAnime)) {
Animation_Change(&this->skin.skelAnime, sAnimations[this->animationIdx], func_80A6B30C(this), 0.0f,
Animation_GetLastFrame(sAnimations[this->animationIdx]), 2, 0.0f);
func_80A6BCEC(this);
}
}
@ -287,13 +287,13 @@ void EnHorseNormal_NextAnimation(EnHorseNormal* this) {
this->animationIdx = 0;
}
SkelAnime_ChangeAnimDefaultStop(&this->skin.skelAnime, sAnimations[this->animationIdx]);
Animation_PlayOnce(&this->skin.skelAnime, sAnimations[this->animationIdx]);
}
void EnHorseNormal_CycleAnimations(EnHorseNormal* this, GlobalContext* globalCtx) {
this->actor.speedXZ = 0.0f;
if (SkelAnime_FrameUpdateMatrix(&this->skin.skelAnime)) {
if (SkelAnime_Update(&this->skin.skelAnime)) {
EnHorseNormal_NextAnimation(this);
}
}
@ -305,8 +305,8 @@ void func_80A6BC48(EnHorseNormal* this) {
this->unk_21E = 0;
this->actor.speedXZ = 0.0f;
this->unk_218 = 0.0f;
SkelAnime_ChangeAnim(&this->skin.skelAnime, sAnimations[this->animationIdx], func_80A6B30C(this), 0.0f,
SkelAnime_GetFrameCount(sAnimations[this->animationIdx]), 2, 0.0f);
Animation_Change(&this->skin.skelAnime, sAnimations[this->animationIdx], func_80A6B30C(this), 0.0f,
Animation_GetLastFrame(sAnimations[this->animationIdx]), 2, 0.0f);
}
void func_80A6BCEC(EnHorseNormal* this) {
@ -318,7 +318,7 @@ void func_80A6BCEC(EnHorseNormal* this) {
}
void func_80A6BD7C(EnHorseNormal* this) {
f32 frame = this->skin.skelAnime.animCurrentFrame;
f32 frame = this->skin.skelAnime.curFrame;
if (this->animationIdx == 0 && frame > 28.0f && !(this->unk_1E4 & 1)) {
this->unk_1E4 |= 1;
@ -390,7 +390,7 @@ void EnHorseNormal_Wander(EnHorseNormal* this, GlobalContext* globalCtx) {
break;
}
if (phi_t0 != this->animationIdx || SkelAnime_FrameUpdateMatrix(&this->skin.skelAnime)) {
if (phi_t0 != this->animationIdx || SkelAnime_Update(&this->skin.skelAnime)) {
if (phi_t0 != this->animationIdx) {
this->animationIdx = phi_t0;
this->unk_1E4 &= ~1;
@ -402,8 +402,8 @@ void EnHorseNormal_Wander(EnHorseNormal* this, GlobalContext* globalCtx) {
} else {
func_80A6BCEC(this);
}
SkelAnime_ChangeAnim(&this->skin.skelAnime, sAnimations[this->animationIdx], func_80A6B30C(this), 0.0f,
SkelAnime_GetFrameCount(sAnimations[this->animationIdx]), 2, -3.0f);
Animation_Change(&this->skin.skelAnime, sAnimations[this->animationIdx], func_80A6B30C(this), 0.0f,
Animation_GetLastFrame(sAnimations[this->animationIdx]), 2, -3.0f);
} else {
switch (D_80A6D510[this->animationIdx]) {
case 0:
@ -433,11 +433,11 @@ void EnHorseNormal_Wander(EnHorseNormal* this, GlobalContext* globalCtx) {
}
if (phi_t0 != this->animationIdx) {
this->animationIdx = phi_t0;
SkelAnime_ChangeAnim(&this->skin.skelAnime, sAnimations[this->animationIdx], func_80A6B30C(this), 0.0f,
SkelAnime_GetFrameCount(sAnimations[this->animationIdx]), 2, -3.0f);
Animation_Change(&this->skin.skelAnime, sAnimations[this->animationIdx], func_80A6B30C(this), 0.0f,
Animation_GetLastFrame(sAnimations[this->animationIdx]), 2, -3.0f);
} else {
SkelAnime_ChangeAnim(&this->skin.skelAnime, sAnimations[this->animationIdx], func_80A6B30C(this), 0.0f,
SkelAnime_GetFrameCount(sAnimations[this->animationIdx]), 2, 0.0f);
Animation_Change(&this->skin.skelAnime, sAnimations[this->animationIdx], func_80A6B30C(this), 0.0f,
Animation_GetLastFrame(sAnimations[this->animationIdx]), 2, 0.0f);
}
}
}
@ -450,12 +450,12 @@ void func_80A6C4CC(EnHorseNormal* this) {
this->unk_21E = 0;
this->actor.speedXZ = 0.0f;
this->unk_218 = 0.0f;
SkelAnime_ChangeAnim(&this->skin.skelAnime, sAnimations[this->animationIdx], func_80A6B30C(this), 0.0f,
SkelAnime_GetFrameCount(sAnimations[this->animationIdx]), 2, 0.0f);
Animation_Change(&this->skin.skelAnime, sAnimations[this->animationIdx], func_80A6B30C(this), 0.0f,
Animation_GetLastFrame(sAnimations[this->animationIdx]), 2, 0.0f);
}
void EnHorseNormal_Wait(EnHorseNormal* this, GlobalContext* globalCtx) {
if (SkelAnime_FrameUpdateMatrix(&this->skin.skelAnime)) {
if (SkelAnime_Update(&this->skin.skelAnime)) {
f32 rand = Rand_ZeroOne();
if (rand < 0.4f) {
@ -468,8 +468,8 @@ void EnHorseNormal_Wait(EnHorseNormal* this, GlobalContext* globalCtx) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_204, 4, &D_801333E0, &D_801333E0, &D_801333E8);
}
SkelAnime_ChangeAnim(&this->skin.skelAnime, sAnimations[this->animationIdx], func_80A6B30C(this), 0.0f,
SkelAnime_GetFrameCount(sAnimations[this->animationIdx]), 2, 0.0f);
Animation_Change(&this->skin.skelAnime, sAnimations[this->animationIdx], func_80A6B30C(this), 0.0f,
Animation_GetLastFrame(sAnimations[this->animationIdx]), 2, 0.0f);
}
}
@ -481,14 +481,14 @@ void func_80A6C6B0(EnHorseNormal* this) {
this->actor.flags |= 0x30;
this->actor.speedXZ = 0.0f;
this->unk_218 = 0.0f;
SkelAnime_ChangeAnim(&this->skin.skelAnime, sAnimations[this->animationIdx], func_80A6B30C(this), 0.0f,
SkelAnime_GetFrameCount(sAnimations[this->animationIdx]), 2, 0.0f);
Animation_Change(&this->skin.skelAnime, sAnimations[this->animationIdx], func_80A6B30C(this), 0.0f,
Animation_GetLastFrame(sAnimations[this->animationIdx]), 2, 0.0f);
}
void EnHorseNormal_WaitClone(EnHorseNormal* this, GlobalContext* globalCtx) {
func_80A6BD7C(this);
if (SkelAnime_FrameUpdateMatrix(&this->skin.skelAnime)) {
if (SkelAnime_Update(&this->skin.skelAnime)) {
f32 rand = Rand_ZeroOne();
if (rand < 0.4f) {
@ -503,8 +503,8 @@ void EnHorseNormal_WaitClone(EnHorseNormal* this, GlobalContext* globalCtx) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_204, 4, &D_801333E0, &D_801333E0, &D_801333E8);
}
SkelAnime_ChangeAnim(&this->skin.skelAnime, sAnimations[this->animationIdx], func_80A6B30C(this), 0.0f,
SkelAnime_GetFrameCount(sAnimations[this->animationIdx]), 2, 0.0f);
Animation_Change(&this->skin.skelAnime, sAnimations[this->animationIdx], func_80A6B30C(this), 0.0f,
Animation_GetLastFrame(sAnimations[this->animationIdx]), 2, 0.0f);
this->unk_1E4 &= ~1;
this->unk_1E4 &= ~2;
@ -577,17 +577,17 @@ void func_80A6CAFC(Actor* thisx, GlobalContext* globalCtx, PSkinAwb* skin) {
}
void func_80A6CC88(GlobalContext* globalCtx, EnHorseNormal* this, Vec3f* arg2) {
f32 animCurrentFrame = this->skin.skelAnime.animCurrentFrame;
f32 curFrame = this->skin.skelAnime.curFrame;
f32 wDest;
SkinMatrix_Vec3fMtxFMultXYZW(&globalCtx->mf_11D60, arg2, &this->unk_1E8, &wDest);
this->unk_1F4 = this->unk_1E8;
this->unk_1F4.y += 120.0f;
if (this->animationIdx == 0 && animCurrentFrame > 28.0f && !(this->unk_1E4 & 8)) {
if (this->animationIdx == 0 && curFrame > 28.0f && !(this->unk_1E4 & 8)) {
this->unk_1E4 |= 8;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_SANDDUST, &this->unk_1E8, 4, &D_801333E0, &D_801333E0, &D_801333E8);
} else if (this->animationIdx == 3 && animCurrentFrame > 25.0f && !(this->unk_1E4 & 0x10)) {
} else if (this->animationIdx == 3 && curFrame > 25.0f && !(this->unk_1E4 & 0x10)) {
this->unk_1E4 |= 0x10;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &this->unk_1E8, 4, &D_801333E0, &D_801333E0, &D_801333E8);
} else if (this->animationIdx == 3 && this->unk_1E4 & 0x20) {