From 2ee1fd4668c04899bf9f4a6b474d503d012e1f94 Mon Sep 17 00:00:00 2001 From: Parker Burnett Date: Fri, 30 Apr 2021 20:31:49 -0400 Subject: [PATCH] finished object_skb (#790) * finished object_skb * neglected the limbs and dlists, so I added them * adding the textures * fixing some names * ....forgot to change the c file.... * hopefully fixed formatting issue --- assets/xml/objects/object_skb.xml | 64 +++++++++++++++++++++++ spec | 3 +- src/overlays/actors/ovl_En_Skb/z_en_skb.c | 28 +++++----- undefined_syms.txt | 8 --- 4 files changed, 79 insertions(+), 24 deletions(-) create mode 100644 assets/xml/objects/object_skb.xml diff --git a/assets/xml/objects/object_skb.xml b/assets/xml/objects/object_skb.xml new file mode 100644 index 0000000000..87d73f7dae --- /dev/null +++ b/assets/xml/objects/object_skb.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spec b/spec index efbb9d04ab..80fbeeae7b 100644 --- a/spec +++ b/spec @@ -5797,7 +5797,8 @@ endseg beginseg name "object_skb" romalign 0x1000 - include "build/baserom/object_skb.o" + include "build/assets/objects/object_skb/object_skb.o" + number 6 endseg beginseg 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 edaf434e97..5fd92d8361 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -1,5 +1,6 @@ #include "z_en_skb.h" #include "overlays/actors/ovl_En_Encount1/z_en_encount1.h" +#include "objects/object_skb/object_skb.h" #define FLAGS 0x00000015 @@ -28,13 +29,6 @@ void func_80AFD7B4(EnSkb* this, GlobalContext* globalCtx); void func_80AFD880(EnSkb* this, GlobalContext* globalCtx); void func_80AFD968(EnSkb* this, GlobalContext* globalCtx); -extern SkeletonHeader D_060041F8; -extern AnimationHeader D_06001854; -extern AnimationHeader D_060009DC; -extern AnimationHeader D_06000D98; -extern AnimationHeader D_060047E0; -extern AnimationHeader D_06000460; - static ColliderJntSphElementInit sJntSphElementsInit[2] = { { { @@ -160,7 +154,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->jointTable, this->morphTable, 20); + SkelAnime_Init(globalCtx, &this->skelAnime, &gStalchildSkel, &gStalchildUncurlingAnim, this->jointTable, + this->morphTable, 20); this->actor.naviEnemyId = 0x55; Collider_InitJntSph(globalCtx, &this->collider); @@ -205,7 +200,7 @@ void func_80AFCD60(EnSkb* this) { } void func_80AFCDF8(EnSkb* this) { - Animation_PlayOnceSetSpeed(&this->skelAnime, &D_06001854, 1.0f); + Animation_PlayOnceSetSpeed(&this->skelAnime, &gStalchildUncurlingAnim, 1.0f); this->unk_280 = 0; this->actor.flags &= ~1; Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIVA_APPEAR); @@ -230,7 +225,8 @@ void func_80AFCE5C(EnSkb* this, GlobalContext* globalCtx) { } void func_80AFCF48(EnSkb* this) { - Animation_Change(&this->skelAnime, &D_06001854, -1.0f, Animation_GetLastFrame(&D_06001854), 0.0f, 2, -4.0f); + Animation_Change(&this->skelAnime, &gStalchildUncurlingAnim, -1.0f, + Animation_GetLastFrame(&gStalchildUncurlingAnim), 0.0f, 2, -4.0f); this->unk_280 = 0; this->unk_281 = 0; this->actor.flags &= ~1; @@ -251,7 +247,8 @@ void func_80AFCFF0(EnSkb* this, GlobalContext* globalCtx) { } void func_80AFD0A4(EnSkb* this) { - Animation_Change(&this->skelAnime, &D_060047E0, 0.96000004f, 0.0f, Animation_GetLastFrame(&D_060047E0), 0, -4.0f); + Animation_Change(&this->skelAnime, &gStalchildWalkingAnim, 0.96000004f, 0.0f, + Animation_GetLastFrame(&gStalchildWalkingAnim), 0, -4.0f); this->unk_280 = 4; this->unk_288 = 0; this->actor.speedXZ = this->actor.scale.y * 160.0f; @@ -298,7 +295,8 @@ void EnSkb_Advance(EnSkb* this, GlobalContext* globalCtx) { } void func_80AFD33C(EnSkb* this) { - Animation_Change(&this->skelAnime, &D_06000460, 0.6f, 0.0f, Animation_GetLastFrame(&D_06000460), 3, 4.0f); + Animation_Change(&this->skelAnime, &gStalchildAttackingAnim, 0.6f, 0.0f, + Animation_GetLastFrame(&gStalchildAttackingAnim), 3, 4.0f); this->collider.base.atFlags &= ~4; this->unk_280 = 3; this->actor.speedXZ = 0.0f; @@ -324,7 +322,7 @@ void EnSkb_SetupAttack(EnSkb* this, GlobalContext* globalCtx) { } void func_80AFD47C(EnSkb* this) { - Animation_Change(&this->skelAnime, &D_06000460, -0.4f, this->skelAnime.curFrame - 1.0f, 0.0f, 3, 0.0f); + Animation_Change(&this->skelAnime, &gStalchildAttackingAnim, -0.4f, this->skelAnime.curFrame - 1.0f, 0.0f, 3, 0.0f); this->collider.base.atFlags &= ~4; this->unk_280 = 5; this->unk_281 = 0; @@ -366,7 +364,7 @@ void func_80AFD59C(EnSkb* this, GlobalContext* globalCtx) { } void func_80AFD644(EnSkb* this) { - Animation_MorphToPlayOnce(&this->skelAnime, &D_06000D98, -4.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &gStalchildDamagedAnim, -4.0f); if (this->actor.bgCheckFlags & 1) { this->actor.speedXZ = -4.0f; } @@ -401,7 +399,7 @@ void func_80AFD6CC(EnSkb* this, GlobalContext* globalCtx) { } void func_80AFD7B4(EnSkb* this, GlobalContext* globalCtx) { - Animation_MorphToPlayOnce(&this->skelAnime, &D_060009DC, -4.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &gStalchildDyingAnim, -4.0f); this->actor.shape.rot.y = this->actor.yawTowardsPlayer; this->actor.world.rot.y = this->actor.yawTowardsPlayer; if (this->actor.bgCheckFlags & 1) { diff --git a/undefined_syms.txt b/undefined_syms.txt index 91b34d1c25..06fab4d5f1 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -2206,14 +2206,6 @@ D_06003B68 = 0x06003B68; D_060041A8 = 0x060041A8; D_06004574 = 0x06004574; -// z_en_skb -D_06000460 = 0x06000460; -D_060009DC = 0x060009DC; -D_06000D98 = 0x06000D98; -D_06001854 = 0x06001854; -D_060041F8 = 0x060041F8; -D_060047E0 = 0x060047E0; - // z_en_stream D_06000950 = 0x06000950;