Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions assets/xml/objects/object_ma2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,25 +99,25 @@
<DList Name="gMalonAdultLeftLegDL" Offset="0x8A60"/>
<DList Name="gMalonAdultLeftFootDL" Offset="0x8B50"/>

<Skeleton Name="gMalonAdultSkel" Type="Flex" LimbType="Standard" Offset="0x8D90"/>
<Limb Name="gMalonAdultRootLimb" LimbType="Standard" Offset="0x8C70"/>
<Limb Name="gMalonAdultLowerControlLimb" LimbType="Standard" Offset="0x8C7C"/>
<Limb Name="gMalonAdultLeftThighLimb" LimbType="Standard" Offset="0x8C88"/>
<Limb Name="gMalonAdultLeftLegLimb" LimbType="Standard" Offset="0x8C94"/>
<Limb Name="gMalonAdultLeftFootLimb" LimbType="Standard" Offset="0x8CA0"/>
<Limb Name="gMalonAdultRightThighLimb" LimbType="Standard" Offset="0x8CAC"/>
<Limb Name="gMalonAdultRightLegLimb" LimbType="Standard" Offset="0x8CB8"/>
<Limb Name="gMalonAdultRightFootLimb" LimbType="Standard" Offset="0x8CC4"/>
<Limb Name="gMalonAdultTorsoLimb" LimbType="Standard" Offset="0x8CD0"/>
<Limb Name="gMalonAdultDressLimb" LimbType="Standard" Offset="0x8CDC"/>
<Limb Name="gMalonAdultChestAndNeckLimb" LimbType="Standard" Offset="0x8CE8"/>
<Limb Name="gMalonAdultLeftShoulderLimb" LimbType="Standard" Offset="0x8CF4"/>
<Limb Name="gMalonAdultLeftArmLimb" LimbType="Standard" Offset="0x8D00"/>
<Limb Name="gMalonAdultLeftHandLimb" LimbType="Standard" Offset="0x8D0C"/>
<Limb Name="gMalonAdultRightShoulderLimb" LimbType="Standard" Offset="0x8D18"/>
<Limb Name="gMalonAdultRightArmLimb" LimbType="Standard" Offset="0x8D24"/>
<Limb Name="gMalonAdultRightHandLimb" LimbType="Standard" Offset="0x8D30"/>
<Limb Name="gMalonAdultHeadLimb" LimbType="Standard" Offset="0x8D3C"/>
<Skeleton Name="gMalonAdultSkel" Type="Flex" LimbType="Standard" LimbNone="MALON_ADULT_LIMB_NONE" LimbMax="MALON_ADULT_LIMB_MAX" EnumName="MalonAdultLimb" Offset="0x8D90"/>
<Limb Name="gMalonAdultRootLimb" LimbType="Standard" EnumName="MALON_ADULT_LIMB_ROOT" Offset="0x8C70"/>
<Limb Name="gMalonAdultLowerControlLimb" LimbType="Standard" EnumName="MALON_ADULT_LIMB_LOWER_CONTROL" Offset="0x8C7C"/>
<Limb Name="gMalonAdultLeftThighLimb" LimbType="Standard" EnumName="MALON_ADULT_LIMB_LEFT_THIGH" Offset="0x8C88"/>
<Limb Name="gMalonAdultLeftLegLimb" LimbType="Standard" EnumName="MALON_ADULT_LIMB_LEFT_LEG" Offset="0x8C94"/>
<Limb Name="gMalonAdultLeftFootLimb" LimbType="Standard" EnumName="MALON_ADULT_LIMB_LEFT_FOOT" Offset="0x8CA0"/>
<Limb Name="gMalonAdultRightThighLimb" LimbType="Standard" EnumName="MALON_ADULT_LIMB_RIGHT_THIGH" Offset="0x8CAC"/>
<Limb Name="gMalonAdultRightLegLimb" LimbType="Standard" EnumName="MALON_ADULT_LIMB_RIGHT_LEG" Offset="0x8CB8"/>
<Limb Name="gMalonAdultRightFootLimb" LimbType="Standard" EnumName="MALON_ADULT_LIMB_RIGHT_FOOT" Offset="0x8CC4"/>
<Limb Name="gMalonAdultTorsoLimb" LimbType="Standard" EnumName="MALON_ADULT_LIMB_TORSO" Offset="0x8CD0"/>
<Limb Name="gMalonAdultDressLimb" LimbType="Standard" EnumName="MALON_ADULT_LIMB_DRESS" Offset="0x8CDC"/>
<Limb Name="gMalonAdultChestAndNeckLimb" LimbType="Standard" EnumName="MALON_ADULT_LIMB_CHEST_AND_NECK" Offset="0x8CE8"/>
<Limb Name="gMalonAdultLeftShoulderLimb" LimbType="Standard" EnumName="MALON_ADULT_LIMB_LEFT_SHOULDER" Offset="0x8CF4"/>
<Limb Name="gMalonAdultLeftArmLimb" LimbType="Standard" EnumName="MALON_ADULT_LIMB_LEFT_ARM" Offset="0x8D00"/>
<Limb Name="gMalonAdultLeftHandLimb" LimbType="Standard" EnumName="MALON_ADULT_LIMB_LEFT_HAND" Offset="0x8D0C"/>
<Limb Name="gMalonAdultRightShoulderLimb" LimbType="Standard" EnumName="MALON_ADULT_LIMB_RIGHT_SHOULDER" Offset="0x8D18"/>
<Limb Name="gMalonAdultRightArmLimb" LimbType="Standard" EnumName="MALON_ADULT_LIMB_RIGHT_ARM" Offset="0x8D24"/>
<Limb Name="gMalonAdultRightHandLimb" LimbType="Standard" EnumName="MALON_ADULT_LIMB_RIGHT_HAND" Offset="0x8D30"/>
<Limb Name="gMalonAdultHeadLimb" LimbType="Standard" EnumName="MALON_ADULT_LIMB_HEAD" Offset="0x8D3C"/>
<Animation Name="gMalonAdultIdleAnim" Offset="0x7D4"/>
<Animation Name="gMalonAdultSingToIdleAnim" Offset="0x92F0"/> <!-- Unused -->
<Animation Name="gMalonAdultStandStillAnim" Offset="0x93BC"/>
Expand Down
34 changes: 17 additions & 17 deletions assets/xml/objects/object_md.xml
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<Root>
<File Name="object_md" Segment="6">
<!-- Mido Skeleton -->
<Skeleton Name="gMidoSkel" Type="Flex" LimbType="Standard" Offset="0x7FB8"/>
<Skeleton Name="gMidoSkel" Type="Flex" LimbType="Standard" LimbNone="MIDO_LIMB_NONE" LimbMax="MIDO_LIMB_MAX" EnumName="MidoLimb" Offset="0x7FB8"/>

<!-- Mido Limbs -->
<Limb Name="gMidoRootLimb" LimbType="Standard" Offset="0x7EB8"/>
<Limb Name="gMidoWaistLimb" LimbType="Standard" Offset="0x7EC4"/>
<Limb Name="gMidoLeftThighLimb" LimbType="Standard" Offset="0x7ED0"/>
<Limb Name="gMidoLeftLegLimb" LimbType="Standard" Offset="0x7EDC"/>
<Limb Name="gMidoLeftFootLimb" LimbType="Standard" Offset="0x7EE8"/>
<Limb Name="gMidoRightThighLimb" LimbType="Standard" Offset="0x7EF4"/>
<Limb Name="gMidoRightLegLimb" LimbType="Standard" Offset="0x7F00"/>
<Limb Name="gMidoRightFootLimb" LimbType="Standard" Offset="0x7F0C"/>
<Limb Name="gMidoTorsoLimb" LimbType="Standard" Offset="0x7F18"/>
<Limb Name="gMidoLeftUpperArmLimb" LimbType="Standard" Offset="0x7F24"/>
<Limb Name="gMidoLeftForearmLimb" LimbType="Standard" Offset="0x7F30"/>
<Limb Name="gMidoLeftHandLimb" LimbType="Standard" Offset="0x7F3C"/>
<Limb Name="gMidoRightUpperArmLimb" LimbType="Standard" Offset="0x7F48"/>
<Limb Name="gMidoRightForearmLimb" LimbType="Standard" Offset="0x7F54"/>
<Limb Name="gMidoRightHandLimb" LimbType="Standard" Offset="0x7F60"/>
<Limb Name="gMidoHeadLimb" LimbType="Standard" Offset="0x7F6C"/>
<Limb Name="gMidoRootLimb" LimbType="Standard" EnumName="MIDO_LIMB_ROOT" Offset="0x7EB8"/>
<Limb Name="gMidoWaistLimb" LimbType="Standard" EnumName="MIDO_LIMB_WAIST" Offset="0x7EC4"/>
<Limb Name="gMidoLeftThighLimb" LimbType="Standard" EnumName="MIDO_LIMB_LEFT_THIGH" Offset="0x7ED0"/>
<Limb Name="gMidoLeftLegLimb" LimbType="Standard" EnumName="MIDO_LIMB_LEFT_LEG" Offset="0x7EDC"/>
<Limb Name="gMidoLeftFootLimb" LimbType="Standard" EnumName="MIDO_LIMB_LEFT_FOOT" Offset="0x7EE8"/>
<Limb Name="gMidoRightThighLimb" LimbType="Standard" EnumName="MIDO_LIMB_RIGHT_THIGH" Offset="0x7EF4"/>
<Limb Name="gMidoRightLegLimb" LimbType="Standard" EnumName="MIDO_LIMB_RIGHT_LEG" Offset="0x7F00"/>
<Limb Name="gMidoRightFootLimb" LimbType="Standard" EnumName="MIDO_LIMB_RIGHT_FOOT" Offset="0x7F0C"/>
<Limb Name="gMidoTorsoLimb" LimbType="Standard" EnumName="MIDO_LIMB_TORSO" Offset="0x7F18"/>
<Limb Name="gMidoLeftUpperArmLimb" LimbType="Standard" EnumName="MIDO_LIMB_LEFT_UPPER_ARM" Offset="0x7F24"/>
<Limb Name="gMidoLeftForearmLimb" LimbType="Standard" EnumName="MIDO_LIMB_LEFT_FOREARM" Offset="0x7F30"/>
<Limb Name="gMidoLeftHandLimb" LimbType="Standard" EnumName="MIDO_LIMB_LEFT_HAND" Offset="0x7F3C"/>
<Limb Name="gMidoRightUpperArmLimb" LimbType="Standard" EnumName="MIDO_LIMB_RIGHT_UPPER_ARM" Offset="0x7F48"/>
<Limb Name="gMidoRightForearmLimb" LimbType="Standard" EnumName="MIDO_LIMB_RIGHT_FOREARM" Offset="0x7F54"/>
<Limb Name="gMidoRightHandLimb" LimbType="Standard" EnumName="MIDO_LIMB_RIGHT_HAND" Offset="0x7F60"/>
<Limb Name="gMidoHeadLimb" LimbType="Standard" EnumName="MIDO_LIMB_HEAD" Offset="0x7F6C"/>

<!-- Mido Limb Vertices -->
<Array Name="gMidoLeftHandVtx" Count="48" Offset="0x15E0">
Expand Down
38 changes: 19 additions & 19 deletions assets/xml/objects/object_nb.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@
<File Name="object_nb" Segment="6">

<!-- Nabooru Skeleton -->
<Skeleton Name="gNabooruSkel" Type="Flex" LimbType="Standard" Offset="0x181C8"/>
<Skeleton Name="gNabooruSkel" Type="Flex" LimbType="Standard" LimbNone="NABOORU_LIMB_NONE" LimbMax="NABOORU_LIMB_MAX" EnumName="NabooruLimb" Offset="0x181C8"/>

<!-- Nabooru Limbs -->
<Limb Name="gNabooruRootLimb" LimbType="Standard" Offset="0x180A8"/>
<Limb Name="gNabooruLeftThighLimb" LimbType="Standard" Offset="0x180B4"/>
<Limb Name="gNabooruLeftShinLimb" LimbType="Standard" Offset="0x180C0"/>
<Limb Name="gNabooruLeftFootLimb" LimbType="Standard" Offset="0x180CC"/>
<Limb Name="gNabooruRightThighLimb" LimbType="Standard" Offset="0x180D8"/>
<Limb Name="gNabooruRightShinLimb" LimbType="Standard" Offset="0x180E4"/>
<Limb Name="gNabooruRightFootLimb" LimbType="Standard" Offset="0x180F0"/>
<Limb Name="gNabooruTorsoLimb" LimbType="Standard" Offset="0x180FC"/>
<Limb Name="gNabooruLeftUpperArmLimb" LimbType="Standard" Offset="0x18108"/>
<Limb Name="gNabooruLeftForearmLimb" LimbType="Standard" Offset="0x18114"/>
<Limb Name="gNabooruLeftHandLimb" LimbType="Standard" Offset="0x18120"/>
<Limb Name="gNabooruRightUpperArmLimb" LimbType="Standard" Offset="0x1812C"/>
<Limb Name="gNabooruRightForearmLimb" LimbType="Standard" Offset="0x18138"/>
<Limb Name="gNabooruRightHandLimb" LimbType="Standard" Offset="0x18144"/>
<Limb Name="gNabooruHeadLimb" LimbType="Standard" Offset="0x18150"/>
<Limb Name="gNabooruBlankLimb" LimbType="Standard" Offset="0x1815C"/>
<Limb Name="gNabooruPonytailLimb" LimbType="Standard" Offset="0x18168"/>
<Limb Name="gNabooruWaistLimb" LimbType="Standard" Offset="0x18174"/>
<Limb Name="gNabooruRootLimb" LimbType="Standard" EnumName="NABOORU_LIMB_ROOT" Offset="0x180A8"/>
<Limb Name="gNabooruLeftThighLimb" LimbType="Standard" EnumName="NABOORU_LIMB_L_THIGH" Offset="0x180B4"/>
<Limb Name="gNabooruLeftShinLimb" LimbType="Standard" EnumName="NABOORU_LIMB_L_SHIN" Offset="0x180C0"/>
<Limb Name="gNabooruLeftFootLimb" LimbType="Standard" EnumName="NABOORU_LIMB_L_FOOT" Offset="0x180CC"/>
<Limb Name="gNabooruRightThighLimb" LimbType="Standard" EnumName="NABOORU_LIMB_R_THIGH" Offset="0x180D8"/>
<Limb Name="gNabooruRightShinLimb" LimbType="Standard" EnumName="NABOORU_LIMB_R_SHIN" Offset="0x180E4"/>
<Limb Name="gNabooruRightFootLimb" LimbType="Standard" EnumName="NABOORU_LIMB_R_FOOT" Offset="0x180F0"/>
<Limb Name="gNabooruTorsoLimb" LimbType="Standard" EnumName="NABOORU_LIMB_TORSO" Offset="0x180FC"/>
<Limb Name="gNabooruLeftUpperArmLimb" LimbType="Standard" EnumName="NABOORU_LIMB_L_UPPER_ARM" Offset="0x18108"/>
<Limb Name="gNabooruLeftForearmLimb" LimbType="Standard" EnumName="NABOORU_LIMB_L_FOREARM" Offset="0x18114"/>
<Limb Name="gNabooruLeftHandLimb" LimbType="Standard" EnumName="NABOORU_LIMB_L_HAND" Offset="0x18120"/>
<Limb Name="gNabooruRightUpperArmLimb" LimbType="Standard" EnumName="NABOORU_LIMB_R_UPPER_ARM" Offset="0x1812C"/>
<Limb Name="gNabooruRightForearmLimb" LimbType="Standard" EnumName="NABOORU_LIMB_R_FOREARM" Offset="0x18138"/>
<Limb Name="gNabooruRightHandLimb" LimbType="Standard" EnumName="NABOORU_LIMB_R_HAND" Offset="0x18144"/>
<Limb Name="gNabooruHeadLimb" LimbType="Standard" EnumName="NABOORU_LIMB_HEAD" Offset="0x18150"/>
<Limb Name="gNabooruBlankLimb" LimbType="Standard" EnumName="NABOORU_LIMB_BLANK" Offset="0x1815C"/>
<Limb Name="gNabooruPonytailLimb" LimbType="Standard" EnumName="NABOORU_LIMB_PONYTAIL" Offset="0x18168"/>
<Limb Name="gNabooruWaistLimb" LimbType="Standard" EnumName="NABOORU_LIMB_WAIST" Offset="0x18174"/>

<!-- Nabooru Limb Vertices -->
<Array Name="gNabooruHeadMouthClosedVtx" Count="297" Offset="0xDD68">
Expand Down
14 changes: 7 additions & 7 deletions src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
Original file line number Diff line number Diff line change
Expand Up @@ -363,23 +363,23 @@ s32 EnMa2_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* p
EnMa2* this = (EnMa2*)thisx;
Vec3s limbRot;

if ((limbIndex == MALON_ADULT_LEFT_THIGH_LIMB) || (limbIndex == MALON_ADULT_RIGHT_THIGH_LIMB)) {
if ((limbIndex == MALON_ADULT_LIMB_LEFT_THIGH) || (limbIndex == MALON_ADULT_LIMB_RIGHT_THIGH)) {
*dList = NULL;
}
if (limbIndex == MALON_ADULT_HEAD_LIMB) {
if (limbIndex == MALON_ADULT_LIMB_HEAD) {
Matrix_Translate(1400.0f, 0.0f, 0.0f, MTXMODE_APPLY);
limbRot = this->interactInfo.headRot;
Matrix_RotateX(BINANG_TO_RAD_ALT(limbRot.y), MTXMODE_APPLY);
Matrix_RotateZ(BINANG_TO_RAD_ALT(limbRot.x), MTXMODE_APPLY);
Matrix_Translate(-1400.0f, 0.0f, 0.0f, MTXMODE_APPLY);
}
if (limbIndex == MALON_ADULT_CHEST_AND_NECK_LIMB) {
if (limbIndex == MALON_ADULT_LIMB_CHEST_AND_NECK) {
limbRot = this->interactInfo.torsoRot;
Matrix_RotateY(BINANG_TO_RAD_ALT(-limbRot.y), MTXMODE_APPLY);
Matrix_RotateX(BINANG_TO_RAD_ALT(-limbRot.x), MTXMODE_APPLY);
}
if ((limbIndex == MALON_ADULT_CHEST_AND_NECK_LIMB) || (limbIndex == MALON_ADULT_LEFT_SHOULDER_LIMB) ||
(limbIndex == MALON_ADULT_RIGHT_SHOULDER_LIMB)) {
if ((limbIndex == MALON_ADULT_LIMB_CHEST_AND_NECK) || (limbIndex == MALON_ADULT_LIMB_LEFT_SHOULDER) ||
(limbIndex == MALON_ADULT_LIMB_RIGHT_SHOULDER)) {
rot->y += Math_SinS(this->upperBodyRot[limbIndex].y) * 200.0f;
rot->z += Math_CosS(this->upperBodyRot[limbIndex].z) * 200.0f;
}
Expand All @@ -392,10 +392,10 @@ void EnMa2_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,

OPEN_DISPS(play->state.gfxCtx, "../z_en_ma2.c", 904);

if (limbIndex == MALON_ADULT_HEAD_LIMB) {
if (limbIndex == MALON_ADULT_LIMB_HEAD) {
Matrix_MultVec3f(&vec, &this->actor.focus.pos);
}
if ((limbIndex == MALON_ADULT_LEFT_HAND_LIMB) && (this->skelAnime.animation == &gMalonAdultStandStillAnim)) {
if ((limbIndex == MALON_ADULT_LIMB_LEFT_HAND) && (this->skelAnime.animation == &gMalonAdultStandStillAnim)) {
gSPDisplayList(POLY_OPA_DISP++, gMalonAdultBasketDL);
}

Expand Down
24 changes: 1 addition & 23 deletions src/overlays/actors/ovl_En_Ma2/z_en_ma2.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,12 @@

#include "ultra64.h"
#include "actor.h"
#include "assets/objects/object_ma2/object_ma2.h"

struct EnMa2;

typedef void (*EnMa2ActionFunc)(struct EnMa2*, struct PlayState*);

typedef enum AdultMalonLimb {
/* 0x00 */ MALON_ADULT_LIMB_NONE,
/* 0x01 */ MALON_ADULT_ROOT_LIMB,
/* 0x02 */ MALON_ADULT_LOWER_CONTROL_LIMB,
/* 0x03 */ MALON_ADULT_LEFT_THIGH_LIMB,
/* 0x04 */ MALON_ADULT_LEFT_LEG_LIMB,
/* 0x05 */ MALON_ADULT_LEFT_FOOT_LIMB,
/* 0x06 */ MALON_ADULT_RIGHT_THIGH_LIMB,
/* 0x07 */ MALON_ADULT_RIGHT_LEG_LIMB,
/* 0x08 */ MALON_ADULT_RIGHT_FOOT_LIMB,
/* 0x09 */ MALON_ADULT_TORSO_LIMB,
/* 0x0A */ MALON_ADULT_DRESS_LIMB,
/* 0x0B */ MALON_ADULT_CHEST_AND_NECK_LIMB,
/* 0x0C */ MALON_ADULT_LEFT_SHOULDER_LIMB,
/* 0x0D */ MALON_ADULT_LEFT_ARM_LIMB,
/* 0x0E */ MALON_ADULT_LEFT_HAND_LIMB,
/* 0x0F */ MALON_ADULT_RIGHT_SHOULDER_LIMB,
/* 0x10 */ MALON_ADULT_RIGHT_ARM_LIMB,
/* 0x11 */ MALON_ADULT_RIGHT_HAND_LIMB,
/* 0x12 */ MALON_ADULT_HEAD_LIMB,
/* 0x13 */ MALON_ADULT_LIMB_MAX
} AdultMalonLimb;

typedef struct EnMa2 {
/* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime;
Expand Down
24 changes: 1 addition & 23 deletions src/overlays/actors/ovl_En_Ma3/z_en_ma3.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,12 @@

#include "ultra64.h"
#include "actor.h"
#include "assets/objects/object_ma2/object_ma2.h"

struct EnMa3;

typedef void (*EnMa3ActionFunc)(struct EnMa3*, struct PlayState*);

typedef enum AdultMalonLimb {
/* 0x00 */ MALON_ADULT_LIMB_NONE,
/* 0x01 */ MALON_ADULT_LIMB_ROOT,
/* 0x02 */ MALON_ADULT_LIMB_LOWER_CONTROL,
/* 0x03 */ MALON_ADULT_LIMB_LEFT_THIGH,
/* 0x04 */ MALON_ADULT_LIMB_LEFT_LEG,
/* 0x05 */ MALON_ADULT_LIMB_LEFT_FOOT,
/* 0x06 */ MALON_ADULT_LIMB_RIGHT_THIGH,
/* 0x07 */ MALON_ADULT_LIMB_RIGHT_LEG,
/* 0x08 */ MALON_ADULT_LIMB_RIGHT_FOOT,
/* 0x09 */ MALON_ADULT_LIMB_TORSO,
/* 0x0A */ MALON_ADULT_LIMB_DRESS,
/* 0x0B */ MALON_ADULT_LIMB_CHEST_AND_NECK,
/* 0x0C */ MALON_ADULT_LIMB_LEFT_SHOULDER,
/* 0x0D */ MALON_ADULT_LIMB_LEFT_ARM,
/* 0x0E */ MALON_ADULT_LIMB_LEFT_HAND,
/* 0x0F */ MALON_ADULT_LIMB_RIGHT_SHOULDER,
/* 0x10 */ MALON_ADULT_LIMB_RIGHT_ARM,
/* 0x11 */ MALON_ADULT_LIMB_RIGHT_HAND,
/* 0x12 */ MALON_ADULT_LIMB_HEAD,
/* 0x13 */ MALON_ADULT_LIMB_MAX
} AdultMalonLimb;

typedef struct EnMa3 {
/* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime;
Expand Down
Loading