From effd4256c983e04469d7904187ed41f25c845cfe Mon Sep 17 00:00:00 2001 From: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Date: Wed, 24 Mar 2021 00:15:35 +0000 Subject: Tutorial docs (#715) * Move tutorial into docs folder * Merge remote-tracking branch 'upstream/master' into tutorial_docs * Object decomp added * contents and intro updates * mention object decomp in beginning * Addressed Fig's review * Update EnSkb to jointTable and morphTable * minor table tweak * typo * Alter to say ZAPD makes the object output folder * Apply suggestions from code review Co-authored-by: Anghelo Carvajal * More review changes * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Anghelo Carvajal Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> --- src/overlays/actors/ovl_En_Skb/z_en_skb.c | 4 ++-- src/overlays/actors/ovl_En_Skb/z_en_skb.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c index 69a8926bb..c95039ed6 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -160,8 +160,8 @@ void EnSkb_Init(Actor* thisx, GlobalContext* globalCtx) { this->actor.colChkInfo.mass = 0xFE; this->actor.colChkInfo.health = 2; this->actor.shape.yOffset = -8000.0f; - SkelAnime_Init(globalCtx, &this->skelAnime, &D_060041F8, &D_06001854, this->limbDrawTable, - this->transitionDrawTable, 20); + SkelAnime_Init(globalCtx, &this->skelAnime, &D_060041F8, &D_06001854, this->jointTable, + this->morphTable, 20); this->actor.naviEnemyId = 0x55; Collider_InitJntSph(globalCtx, &this->collider); diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.h b/src/overlays/actors/ovl_En_Skb/z_en_skb.h index d79b5f8d1..64b08ee9e 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.h +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.h @@ -11,8 +11,8 @@ typedef void (*EnSkbActionFunc)(struct EnSkb*, GlobalContext*); typedef struct EnSkb { /* 0x0000 */ Actor actor; /* 0x014C */ SkelAnime skelAnime; - /* 0x0190 */ Vec3s limbDrawTable[20]; - /* 0x0208 */ Vec3s transitionDrawTable[20]; + /* 0x0190 */ Vec3s jointTable[20]; + /* 0x0208 */ Vec3s morphTable[20]; /* 0x0280 */ u8 unk_280; /* 0x0281 */ u8 unk_281; /* 0x0282 */ u8 unk_282; -- cgit v1.2.3