falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pr2: more skelton limb enum changes

This commit is contained in:
isghj 2025-12-06 18:49:35 -08:00
parent 62a11769f2
commit ef21943a94
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/xml/objects/object_pr.xml
View File

@ -59,7 +59,7 @@
<Limb Name="gSkullFishSkullLimb" Type="Standard" EnumName="PR_2_LIMB_SKULL" Offset="0x4154" />
<Limb Name="gSkullFishJawLimb" Type="Standard" EnumName="PR_2_LIMB_JAW" Offset="0x4160" />
<Limb Name="gSkullFishTailLimb" Type="Standard" EnumName="PR_2_LIMB_TAIL" Offset="0x416C" />
<Skeleton Name="gSkullFishSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_PR_2_LIMB_NONE" LimbMax="OBJECT_PR_2_LIMB_MAX" EnumName="ObjectPr2Limb" Offset="0x4188" />
<Skeleton Name="gSkullFishSkel" Type="Flex" LimbType="Standard" LimbNone="PR_2_LIMB_NONE" LimbMax="PR_2_LIMB_MAX" EnumName="Pr2Limb" Offset="0x4188" />
<Animation Name="gSkullFishAttackAnim" Offset="0x4274" /> <!-- Original name is "prz_gattuku" -->
<Animation Name="gSkullFishSwimAnim" Offset="0x4340" /> <!-- Original name is "prz_swim" -->

2
src/overlays/actors/ovl_En_Pr2/z_en_pr2.c
View File

@ -129,7 +129,7 @@ void EnPr2_Init(Actor* thisx, PlayState* play) {
this->actor.colChkInfo.damageTable = &sDamageTable;
SkelAnime_InitFlex(play, &this->skelAnime, &gSkullFishSkel, &gSkullFishSwimAnim, this->jointTable, this->morphTable,
OBJECT_PR_2_LIMB_MAX);
PR_2_LIMB_MAX);
this->type = ENPR2_GET_TYPE(&this->actor);
this->actor.colChkInfo.mass = 10;
Math_Vec3f_Copy(&this->newHome, &this->actor.home.pos);

4
src/overlays/actors/ovl_En_Pr2/z_en_pr2.h
View File

@ -46,8 +46,8 @@ typedef enum EnPr2State {
typedef struct EnPr2 {
/* 0x000 */ Actor actor;
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ Vec3s jointTable[OBJECT_PR_2_LIMB_MAX];
/* 0x1A6 */ Vec3s morphTable[OBJECT_PR_2_LIMB_MAX];
/* 0x188 */ Vec3s jointTable[PR_2_LIMB_MAX];
/* 0x1A6 */ Vec3s morphTable[PR_2_LIMB_MAX];
/* 0x1C4 */ EnPr2ActionFunc actionFunc;
/* 0x1C8 */ s16 pathIndex;
/* 0x1CC */ Path* path;

2
src/overlays/actors/ovl_En_Prz/z_en_prz.c
View File

@ -112,7 +112,7 @@ void EnPrz_Init(Actor* thisx, PlayState* play) {
this->actor.colChkInfo.health = 1;
SkelAnime_InitFlex(play, &this->skelAnime, &gSkullFishSkel, &gSkullFishSwimAnim, this->jointTable, this->morphTable,
OBJECT_PR_2_LIMB_MAX);
PR_2_LIMB_MAX);
this->unk_1E6 = ENPRZ_GET(&this->actor);
this->actor.shape.yOffset = 500.0f;

4
src/overlays/actors/ovl_En_Prz/z_en_prz.h
View File

@ -13,8 +13,8 @@ typedef void (*EnPrzActionFunc)(struct EnPrz*, PlayState*);
typedef struct EnPrz {
/* 0x000 */ Actor actor;
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ Vec3s jointTable[OBJECT_PR_2_LIMB_MAX];
/* 0x1A6 */ Vec3s morphTable[OBJECT_PR_2_LIMB_MAX];
/* 0x188 */ Vec3s jointTable[PR_2_LIMB_MAX];
/* 0x1A6 */ Vec3s morphTable[PR_2_LIMB_MAX];
/* 0x1C4 */ EnPrzActionFunc actionFunc;
/* 0x1C8 */ u8 unk_1C8;
/* 0x1CC */ Vec3f unk_1CC;