diff --git a/assets/xml/objects/object_ha.xml b/assets/xml/objects/object_ha.xml index 1ef6543306..860b592df8 100644 --- a/assets/xml/objects/object_ha.xml +++ b/assets/xml/objects/object_ha.xml @@ -1,135 +1,162 @@  + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index 1bb7640dcc..00a5fd3b18 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -122,9 +122,8 @@ static AnimationHeader* sEponaAnimations[] = { }; static AnimationHeader* sHniAnimations[] = { - &object_ha_Anim_00C850, &object_ha_Anim_00CE70, &object_ha_Anim_00B9C8, - &object_ha_Anim_00B00C, &object_ha_Anim_00D648, &object_ha_Anim_00A650, - &object_ha_Anim_009208, &object_ha_Anim_009858, &object_ha_Anim_00A05C, + &gHorseIdleAnim, &gHorseShakeHeadAnim, &gHorseStopAnim, &gHorseWhinnyAnim, &gHorseWalkAnim, + &gHorseTrotAnim, &gHorseGallopAnim, &gHorseJumpLowAnim, &gHorseJumpHighAnim, }; static AnimationHeader** sAnimationHeaders[] = { @@ -931,11 +930,11 @@ void func_8087D540(Actor* thisx, PlayState* play) { this->actor.update = EnHorse_Update; if (this->unk_1EC & 1) { if (this->type == HORSE_TYPE_BANDIT) { - SkelAnime_InitFlex(play, &this->skin.skelAnime, &object_ha_Skel_008C68, NULL, this->jointTable, - this->morphTable, OBJECT_HA_1_LIMB_MAX); + SkelAnime_InitFlex(play, &this->skin.skelAnime, &gHorseBanditSkel, NULL, this->jointTable, + this->morphTable, HORSE_BANDIT_LIMB_MAX); } else { - SkelAnime_InitFlex(play, &this->skin.skelAnime, &object_ha_Skel_0150D8, NULL, this->jointTable, - this->morphTable, OBJECT_HA_2_LIMB_MAX); + SkelAnime_InitFlex(play, &this->skin.skelAnime, &gDonkeySkel, NULL, this->jointTable, this->morphTable, + DONKEY_LIMB_MAX); } } else { Skin_Init(&play->state, &this->skin, sSkeletonHeaders[this->type], sAnimationHeaders[this->type][0]); diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.h b/src/overlays/actors/ovl_En_Horse/z_en_horse.h index 3cfc1fb544..75f0254fcc 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.h +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.h @@ -206,8 +206,8 @@ typedef struct EnHorse { /* 0x3E4 */ UNK_TYPE1 unk_3E4[0x4]; /* 0x3E8 */ f32 unk_3E8; /* 0x3EC */ s16 unk_3EC; - /* 0x3EE */ Vec3s jointTable[OBJECT_HA_1_LIMB_MAX]; - /* 0x48A */ Vec3s morphTable[OBJECT_HA_1_LIMB_MAX]; + /* 0x3EE */ Vec3s jointTable[HORSE_BANDIT_LIMB_MAX]; + /* 0x48A */ Vec3s morphTable[HORSE_BANDIT_LIMB_MAX]; /* 0x528 */ f32 unk_528; /* 0x52C */ s32 unk_52C; /* 0x530 */ s32 cueChannel;