mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 07:20:16 +00:00
Code Issues Projects Releases Wiki Activity

SkelAnime Updates (#78)

Browse source 
* update naming, minor updates

* rename postLimbUpdate to postLimbDraw

* recently decompiled actor naming update
This commit is contained in:
krimtonz 2020-04-18 13:08:12 -05:00 • committed by GitHub
parent cb5a604ea7
commit 4961eb0a90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 259 additions and 275 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
View file

@ -477,7 +477,7 @@ void func_80AEB680(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEB6E0(EnRu1* this, GlobalContext* globalCtx) {
SkelAnime* skelAnime = &this->skelAnime;
if (skelAnime->unk_3E.y < skelAnime->actorDrawTbl->y) {
if (skelAnime->unk_3E.y < skelAnime->limbDrawTbl[0].y) {
skelAnime->flags |= 3;
SkelAnime_LoadAnimationType5(globalCtx, &this->actor, skelAnime, 1.0f);
}
@ -486,9 +486,9 @@ void func_80AEB6E0(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEB738(EnRu1* this, GlobalContext* globalCtx) {
SkelAnime* skelAnime = &this->skelAnime;
skelAnime->unk_3E = *skelAnime->actorDrawTbl;
skelAnime->prevFramePos = *skelAnime->actorDrawTbl;
if (skelAnime->unk_3E.y < skelAnime->actorDrawTbl->y) {
skelAnime->unk_3E = *skelAnime->limbDrawTbl;
skelAnime->prevFramePos = *skelAnime->limbDrawTbl;
if (skelAnime->unk_3E.y < skelAnime->limbDrawTbl[0].y) {
skelAnime->flags |= 3;
SkelAnime_LoadAnimationType5(globalCtx, &this->actor, skelAnime, 1.0f);
}
@ -2252,7 +2252,7 @@ void EnRu1_Init(EnRu1* this, GlobalContext* globalCtx) {
u32 temp_ret;
ActorShape_Init(&thisx->shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f);
SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06012700, NULL, &this->actorDrawTable, &this->transitionDrawTable,
SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06012700, NULL, &this->limbDrawTable, &this->transitionDrawTable,
17);
func_80AEAD20(this, globalCtx);
switch (func_80AEADF0(this)) {
@ -2352,9 +2352,8 @@ void func_80AF0400(EnRu1* this, GlobalContext* globalCtx) {
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x00, 0x00, 0x00, 0xFF);
gSPSegment(gfxCtx->polyOpa.p++, 0x0C, &D_80116280[2]);
gfxCtx->polyOpa.p =
SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl, skelAnime->dListCount, func_80AF02E8,
func_80AF0368, &this->actor, gfxCtx->polyOpa.p);
gfxCtx->polyOpa.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount,
func_80AF02E8, func_80AF0368, &this->actor, gfxCtx->polyOpa.p);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ru1.c", 1309);
}
@ -2378,8 +2377,8 @@ void func_80AF05D4(EnRu1* this, GlobalContext* globalCtx) {
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0x00, this->unk_2A8);
gSPSegment(gfxCtx->polyXlu.p++, 0x0C, &D_80116280[0]);
gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl,
skelAnime->dListCount, func_80AF02E8, NULL, &this->actor, gfxCtx->polyXlu.p);
gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount,
func_80AF02E8, NULL, &this->actor, gfxCtx->polyXlu.p);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ru1.c", 1353);
}

2
src/overlays/actors/ovl_En_Ru1/z_en_ru1.h
View file

@ -10,7 +10,7 @@
typedef struct {
/* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ Vec3s actorDrawTable[17];
/* 0x0190 */ Vec3s limbDrawTable[17];
/* 0x01F6 */ Vec3s transitionDrawTable[17];
/* 0x025C */ s16 unk_25C;
/* 0x025E */ char unk_25E[0x2];