mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-07 14:50: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

24
src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
View file

@ -240,7 +240,7 @@ void func_80B4ED2C(EnZl2* this, GlobalContext* globalCtx) {
}
s32 EnZl2_FrameUpdateMatrix(EnZl2* this) {
return SkelAnime_FrameUpdateMatrix(&this->skelAnime);
return SkelAnime_Update(&this->skelAnime);
}
CsCmdActorAction* EnZl2_GetNpcAction(GlobalContext* globalCtx, s32 idx) {
@ -306,7 +306,7 @@ void func_80B4EF64(EnZl2* this, s16 arg1, s32 arg2) {
s32 phi_t1;
s32 phi_v0;
s32 phi_a0;
f32 animCurrentFrame;
f32 curFrame;
f32 unk_278;
if (temp_t0 == 2) {
@ -367,9 +367,9 @@ void func_80B4EF64(EnZl2* this, s16 arg1, s32 arg2) {
if (arg2 == 2) {
if ((this->action == 5) || (this->action == 30)) {
animCurrentFrame = this->skelAnime.animCurrentFrame;
curFrame = this->skelAnime.curFrame;
unk_278 = this->unk_278;
temp_t0 = (s32)((3500.0f * animCurrentFrame) / unk_278) + phi_a0;
temp_t0 = (s32)((3500.0f * curFrame) / unk_278) + phi_a0;
if (temp_t0 >= temp_v1) {
temp_v1 = temp_t0;
phi_v0 /= -2;
@ -562,7 +562,7 @@ s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p
Matrix_Pull();
this->unk_24C = 1;
}
return 0;
return false;
}
void EnZl2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfx) {
@ -598,7 +598,7 @@ void func_80B4FCCC(EnZl2* this, GlobalContext* globalCtx) {
}
void func_80B4FD00(EnZl2* this, AnimationHeader* animation, u8 arg2, f32 transitionRate, s32 arg4) {
f32 frameCount = SkelAnime_GetFrameCount(animation);
f32 frameCount = Animation_GetLastFrame(animation);
f32 playbackSpeed;
f32 unk0;
f32 fc;
@ -613,7 +613,7 @@ void func_80B4FD00(EnZl2* this, AnimationHeader* animation, u8 arg2, f32 transit
playbackSpeed = -1.0f;
}
SkelAnime_ChangeAnim(&this->skelAnime, animation, playbackSpeed, unk0, fc, arg2, transitionRate);
Animation_Change(&this->skelAnime, animation, playbackSpeed, unk0, fc, arg2, transitionRate);
}
void func_80B4FD90(EnZl2* this, GlobalContext* globalCtx) {
@ -622,7 +622,7 @@ void func_80B4FD90(EnZl2* this, GlobalContext* globalCtx) {
}
void func_80B4FDD4(EnZl2* this) {
if (func_800A56C8(&this->skelAnime, 14.0f)) {
if (Animation_OnFrame(&this->skelAnime, 14.0f)) {
func_80078914(&this->actor.projectedPos, NA_SE_PL_WALK_CONCRETE);
}
}
@ -1467,7 +1467,7 @@ void func_80B51D24(EnZl2* this, GlobalContext* globalCtx) {
u32 sfxId;
SkelAnime* skelAnime = &this->skelAnime;
if ((func_800A56C8(skelAnime, 6.0f)) || (func_800A56C8(skelAnime, 0.0f))) {
if ((Animation_OnFrame(skelAnime, 6.0f)) || (Animation_OnFrame(skelAnime, 0.0f))) {
if (this->actor.bgCheckFlags & 1) {
sfxId = SFX_FLAG;
sfxId += func_80041F34(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorPolySource);
@ -1610,7 +1610,7 @@ void func_80B521A0(EnZl2* this, GlobalContext* globalCtx) {
if (Object_IsLoaded(objectCtx, bankIndex)) {
this->unk_274 = bankIndex;
func_80B4FCCC(this, globalCtx);
this->unk_278 = SkelAnime_GetFrameCount(&D_060022D0);
this->unk_278 = Animation_GetLastFrame(&D_060022D0);
func_80B52114(this, globalCtx);
}
}
@ -1680,7 +1680,7 @@ void func_80B523C8(EnZl2* this, GlobalContext* globalCtx) {
gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255);
gSPSegment(POLY_OPA_DISP++, 0x0B, &D_80116280[2]);
POLY_OPA_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount,
POLY_OPA_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount,
EnZl2_OverrideLimbDraw, EnZl2_PostLimbDraw, this, POLY_OPA_DISP);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_zl2.c", 1648);
@ -1705,7 +1705,7 @@ void func_80B525D4(EnZl2* this, GlobalContext* globalCtx) {
gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->alpha);
gSPSegment(POLY_XLU_DISP++, 0x0B, &D_80116280[0]);
POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount,
POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount,
EnZl2_OverrideLimbDraw, NULL, this, POLY_XLU_DISP);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_zl2.c", 1692);