mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-10 00:40:16 +00:00
Docs for the Anime part of SkelAnime (#517)
* 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
GitHub
parent
e4d88bf942
commit
2dfa188706
1187 changed files with 5434 additions and 5367 deletions
|
|
@ -217,7 +217,7 @@ void func_80985018(DemoIm* this, GlobalContext* globalCtx) {
|
|||
}
|
||||
|
||||
s32 func_80985060(DemoIm* this) {
|
||||
return SkelAnime_FrameUpdateMatrix(&this->skelAnime);
|
||||
return SkelAnime_Update(&this->skelAnime);
|
||||
}
|
||||
|
||||
s32 func_80985080(GlobalContext* globalCtx) {
|
||||
|
|
@ -282,7 +282,7 @@ void func_80985200(DemoIm* this, GlobalContext* globalCtx, s32 actionIdx) {
|
|||
}
|
||||
|
||||
void func_80985280(DemoIm* this, AnimationHeader* animHeaderSeg, u8 arg2, f32 transitionRate, s32 arg4) {
|
||||
f32 frameCount = SkelAnime_GetFrameCount(animHeaderSeg);
|
||||
f32 frameCount = Animation_GetLastFrame(animHeaderSeg);
|
||||
f32 playbackSpeed;
|
||||
f32 unk0;
|
||||
f32 fc;
|
||||
|
|
@ -297,7 +297,7 @@ void func_80985280(DemoIm* this, AnimationHeader* animHeaderSeg, u8 arg2, f32 tr
|
|||
playbackSpeed = -1.0f;
|
||||
}
|
||||
|
||||
SkelAnime_ChangeAnim(&this->skelAnime, animHeaderSeg, playbackSpeed, unk0, fc, arg2, transitionRate);
|
||||
Animation_Change(&this->skelAnime, animHeaderSeg, playbackSpeed, unk0, fc, arg2, transitionRate);
|
||||
}
|
||||
|
||||
void func_80985310(DemoIm* this, GlobalContext* globalCtx) {
|
||||
|
|
@ -345,7 +345,7 @@ void func_8098544C(DemoIm* this, GlobalContext* globalCtx) {
|
|||
void func_809854DC(DemoIm* this, GlobalContext* globalCtx) {
|
||||
if ((globalCtx->csCtx.state != 0) && (globalCtx->csCtx.npcActions[5] != NULL) &&
|
||||
(globalCtx->csCtx.npcActions[5]->action == 2)) {
|
||||
SkelAnime_ChangeAnim(&this->skelAnime, &D_06001868, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_06001868), 0, 0.0f);
|
||||
Animation_Change(&this->skelAnime, &D_06001868, 1.0f, 0.0f, Animation_GetLastFrame(&D_06001868), 0, 0.0f);
|
||||
this->action = 2;
|
||||
this->drawConfig = 1;
|
||||
func_80985358(this, globalCtx);
|
||||
|
|
@ -362,14 +362,14 @@ void func_8098557C(DemoIm* this) {
|
|||
void func_809855A8(DemoIm* this, GlobalContext* globalCtx) {
|
||||
if ((globalCtx->csCtx.state != 0) && (globalCtx->csCtx.npcActions[5] != NULL) &&
|
||||
(globalCtx->csCtx.npcActions[5]->action == 3)) {
|
||||
SkelAnime_ChangeAnim(&this->skelAnime, &D_06000710, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_06000710), 2, 4.0f);
|
||||
Animation_Change(&this->skelAnime, &D_06000710, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000710), 2, 4.0f);
|
||||
this->action = 4;
|
||||
}
|
||||
}
|
||||
|
||||
void func_80985640(DemoIm* this, s32 arg1) {
|
||||
if (arg1 != 0) {
|
||||
SkelAnime_ChangeAnim(&this->skelAnime, &D_06000AFC, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_06000AFC), 0, 0.0f);
|
||||
Animation_Change(&this->skelAnime, &D_06000AFC, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000AFC), 0, 0.0f);
|
||||
this->action = 5;
|
||||
}
|
||||
}
|
||||
|
|
@ -443,7 +443,7 @@ void func_809858C8(DemoIm* this, GlobalContext* globalCtx) {
|
|||
|
||||
void func_80985948(DemoIm* this, GlobalContext* globalCtx) {
|
||||
if (func_809850E8(this, globalCtx, 4, 5)) {
|
||||
SkelAnime_ChangeAnim(&this->skelAnime, &D_06011C08, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_06011C08), 2, 0.0f);
|
||||
Animation_Change(&this->skelAnime, &D_06011C08, 1.0f, 0.0f, Animation_GetLastFrame(&D_06011C08), 2, 0.0f);
|
||||
this->action = 8;
|
||||
this->drawConfig = 2;
|
||||
this->unk_26C = 0;
|
||||
|
|
@ -482,7 +482,7 @@ void func_809859E0(DemoIm* this, GlobalContext* globalCtx) {
|
|||
|
||||
void func_80985B34(DemoIm* this, GlobalContext* globalCtx) {
|
||||
if (func_80985134(this, globalCtx, 4, 5)) {
|
||||
SkelAnime_ChangeAnim(&this->skelAnime, &D_06012218, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_06012218), 2, -8.0f);
|
||||
Animation_Change(&this->skelAnime, &D_06012218, 1.0f, 0.0f, Animation_GetLastFrame(&D_06012218), 2, -8.0f);
|
||||
this->action = 8;
|
||||
this->drawConfig = 2;
|
||||
this->unk_268 = kREG(5) + 10.0f;
|
||||
|
|
@ -531,7 +531,7 @@ void func_80985CE8(DemoIm* this, GlobalContext* globalCtx) {
|
|||
gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->unk_26C);
|
||||
gSPSegment(POLY_XLU_DISP++, 0x0C, &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,
|
||||
NULL, NULL, NULL, POLY_XLU_DISP);
|
||||
|
||||
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_im_inKenjyanomaDemo02.c", 308);
|
||||
|
|
@ -552,7 +552,7 @@ void func_80985EAC(DemoIm* this, GlobalContext* globalCtx) {
|
|||
}
|
||||
|
||||
void func_80985EF4(DemoIm* this) {
|
||||
if (!func_800A56C8(&this->skelAnime, SkelAnime_GetFrameCount(&D_0601182C) - 1.0f)) {
|
||||
if (!Animation_OnFrame(&this->skelAnime, Animation_GetLastFrame(&D_0601182C) - 1.0f)) {
|
||||
func_80985060(this);
|
||||
}
|
||||
}
|
||||
|
|
@ -563,7 +563,7 @@ void func_80985F54(DemoIm* this) {
|
|||
}
|
||||
|
||||
void func_80985F64(DemoIm* this, GlobalContext* globalCtx) {
|
||||
SkelAnime_ChangeAnim(&this->skelAnime, &D_06001868, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_06001868), 0, 0.0f);
|
||||
Animation_Change(&this->skelAnime, &D_06001868, 1.0f, 0.0f, Animation_GetLastFrame(&D_06001868), 0, 0.0f);
|
||||
func_80985180(this, globalCtx, 5);
|
||||
this->action = 11;
|
||||
this->drawConfig = 1;
|
||||
|
|
@ -571,14 +571,14 @@ void func_80985F64(DemoIm* this, GlobalContext* globalCtx) {
|
|||
|
||||
void func_80985FE8(DemoIm* this, s32 arg1) {
|
||||
if (arg1 != 0) {
|
||||
SkelAnime_ChangeAnim(&this->skelAnime, &D_0601182C, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_0601182C), 0, -8.0f);
|
||||
Animation_Change(&this->skelAnime, &D_0601182C, 1.0f, 0.0f, Animation_GetLastFrame(&D_0601182C), 0, -8.0f);
|
||||
}
|
||||
}
|
||||
|
||||
void func_8098604C(DemoIm* this) {
|
||||
f32 frameCount = SkelAnime_GetFrameCount(&D_06010EE0);
|
||||
f32 frameCount = Animation_GetLastFrame(&D_06010EE0);
|
||||
|
||||
SkelAnime_ChangeAnim(&this->skelAnime, &D_06010EE0, 1.0f, 0.0f, frameCount, 2, -8.0f);
|
||||
Animation_Change(&this->skelAnime, &D_06010EE0, 1.0f, 0.0f, frameCount, 2, -8.0f);
|
||||
this->action = 12;
|
||||
this->drawConfig = 1;
|
||||
this->unk_2D0 = 1;
|
||||
|
|
@ -591,13 +591,13 @@ void func_809860C8(DemoIm* this) {
|
|||
|
||||
void func_809860DC(DemoIm* this, s32 arg1) {
|
||||
if (arg1 != 0) {
|
||||
SkelAnime_ChangeAnim(&this->skelAnime, &D_06001868, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_06001868), 0, -8.0f);
|
||||
Animation_Change(&this->skelAnime, &D_06001868, 1.0f, 0.0f, Animation_GetLastFrame(&D_06001868), 0, -8.0f);
|
||||
this->unk_2D0 = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void func_80986148(DemoIm* this) {
|
||||
SkelAnime_ChangeAnim(&this->skelAnime, &D_06010EE0, -1.0f, SkelAnime_GetFrameCount(&D_06010EE0), 0.0f, 2, -8.0f);
|
||||
Animation_Change(&this->skelAnime, &D_06010EE0, -1.0f, Animation_GetLastFrame(&D_06010EE0), 0.0f, 2, -8.0f);
|
||||
this->action = 14;
|
||||
this->drawConfig = 1;
|
||||
}
|
||||
|
|
@ -615,8 +615,8 @@ void func_809861C4(DemoIm* this, GlobalContext* globalCtx) {
|
|||
func_80986148(this);
|
||||
break;
|
||||
case 7:
|
||||
SkelAnime_ChangeAnim(&this->skelAnime, &D_0601182C, 1.0f, 0.0f,
|
||||
SkelAnime_GetFrameCount(&D_0601182C), 0, -8.0f);
|
||||
Animation_Change(&this->skelAnime, &D_0601182C, 1.0f, 0.0f, Animation_GetLastFrame(&D_0601182C), 0,
|
||||
-8.0f);
|
||||
this->action = 12;
|
||||
break;
|
||||
default:
|
||||
|
|
@ -712,7 +712,7 @@ void func_8098652C(DemoIm* this, GlobalContext* globalCtx) {
|
|||
}
|
||||
|
||||
void func_80986570(DemoIm* this, GlobalContext* globalCtx) {
|
||||
if ((func_800A56C8(&this->skelAnime, 7.0f)) && (this->actor.bgCheckFlags & 1)) {
|
||||
if ((Animation_OnFrame(&this->skelAnime, 7.0f)) && (this->actor.bgCheckFlags & 1)) {
|
||||
u32 sfxId = SFX_FLAG;
|
||||
|
||||
sfxId += func_80041F34(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorPolySource);
|
||||
|
|
@ -750,14 +750,14 @@ void func_80986700(DemoIm* this) {
|
|||
}
|
||||
|
||||
void func_80986710(DemoIm* this, GlobalContext* globalCtx) {
|
||||
SkelAnime_ChangeAnim(&this->skelAnime, &D_06001868, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_06001868), 0, 0.0f);
|
||||
Animation_Change(&this->skelAnime, &D_06001868, 1.0f, 0.0f, Animation_GetLastFrame(&D_06001868), 0, 0.0f);
|
||||
func_80985180(this, globalCtx, 5);
|
||||
this->action = 16;
|
||||
this->drawConfig = 1;
|
||||
}
|
||||
|
||||
void func_80986794(DemoIm* this) {
|
||||
SkelAnime_ChangeAnim(&this->skelAnime, &D_060014E4, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_060014E4), 2, -8.0f);
|
||||
Animation_Change(&this->skelAnime, &D_060014E4, 1.0f, 0.0f, Animation_GetLastFrame(&D_060014E4), 2, -8.0f);
|
||||
this->action = 17;
|
||||
this->drawConfig = 1;
|
||||
}
|
||||
|
|
@ -1095,8 +1095,7 @@ void DemoIm_Init(Actor* thisx, GlobalContext* globalCtx) {
|
|||
|
||||
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f);
|
||||
func_80984D00(thisx, globalCtx);
|
||||
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600F788, NULL, this->limbDrawTable, this->transitionDrawTable,
|
||||
17);
|
||||
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600F788, NULL, this->jointTable, this->morphTable, 17);
|
||||
thisx->flags &= ~1;
|
||||
|
||||
switch (this->actor.params) {
|
||||
|
|
@ -1187,7 +1186,7 @@ void func_80987658(DemoIm* this, GlobalContext* globalCtx) {
|
|||
gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255);
|
||||
gSPSegment(POLY_OPA_DISP++, 0x0C, &D_80116280[2]);
|
||||
|
||||
SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, func_80987514,
|
||||
SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, func_80987514,
|
||||
func_809875C0, this);
|
||||
|
||||
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_im.c", 925);
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ typedef void (*DemoImDrawFunc)(struct DemoIm*, GlobalContext*);
|
|||
typedef struct DemoIm {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ SkelAnime skelAnime;
|
||||
/* 0x0190 */ Vec3s limbDrawTable[17];
|
||||
/* 0x01F6 */ Vec3s transitionDrawTable[17];
|
||||
/* 0x0190 */ Vec3s jointTable[17];
|
||||
/* 0x01F6 */ Vec3s morphTable[17];
|
||||
/* 0x025C */ s16 unk_25C;
|
||||
/* 0x025E */ s16 unk_25E;
|
||||
/* 0x0260 */ s32 action;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue