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

Document object_mk (#1389) 

* Updated object_mk animation, limb, and skeleton names

* Updated object_mk texture and DList names

* Added comment to object_mk.xml

* Remove "ing" from Anim names

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update z_en_mk.c to not use "ing" in names

* Running formatter

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
This commit is contained in:
Zach North 2023-09-27 23:19:28 -04:00 committed by GitHub
parent d4c41f0263
commit 0fdd63a350
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 50 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
assets/xml/objects/object_mk.xml
View File

@ -1,45 +1,46 @@
<Root>
<!-- Assets for the Marine Researcher -->
<File Name="object_mk" Segment="6">
<Animation Name="object_mk_Anim_000438" Offset="0x438" />
<Animation Name="object_mk_Anim_0007D8" Offset="0x7D8" />
<Animation Name="object_mk_Anim_0010F4" Offset="0x10F4" />
<Animation Name="object_mk_Anim_001964" Offset="0x1964" />
<Animation Name="object_mk_Anim_001C38" Offset="0x1C38" />
<DList Name="object_mk_DL_004320" Offset="0x4320" />
<DList Name="object_mk_DL_004610" Offset="0x4610" />
<DList Name="object_mk_DL_004960" Offset="0x4960" />
<DList Name="object_mk_DL_004A78" Offset="0x4A78" />
<DList Name="object_mk_DL_005180" Offset="0x5180" />
<DList Name="object_mk_DL_005500" Offset="0x5500" />
<DList Name="object_mk_DL_005630" Offset="0x5630" />
<DList Name="object_mk_DL_005760" Offset="0x5760" />
<DList Name="object_mk_DL_0058B0" Offset="0x58B0" />
<DList Name="object_mk_DL_0059E0" Offset="0x59E0" />
<DList Name="object_mk_DL_005B10" Offset="0x5B10" />
<DList Name="object_mk_DL_005C60" Offset="0x5C60" />
<Texture Name="object_mk_TLUT_005DE0" OutName="tlut_005DE0" Format="rgba16" Width="16" Height="16" Offset="0x5DE0" />
<Texture Name="object_mk_Tex_005FE0" OutName="tex_005FE0" Format="ci8" Width="8" Height="8" Offset="0x5FE0" />
<Texture Name="object_mk_Tex_006020" OutName="tex_006020" Format="ci8" Width="16" Height="16" Offset="0x6020" />
<Texture Name="object_mk_Tex_006120" OutName="tex_006120" Format="ci8" Width="8" Height="8" Offset="0x6120" />
<Texture Name="object_mk_Tex_006160" OutName="tex_006160" Format="ci8" Width="8" Height="8" Offset="0x6160" />
<Texture Name="object_mk_Tex_0061A0" OutName="tex_0061A0" Format="ci8" Width="8" Height="16" Offset="0x61A0" />
<Texture Name="object_mk_Tex_006220" OutName="tex_006220" Format="rgba16" Width="32" Height="32" Offset="0x6220" />
<Texture Name="object_mk_Tex_006A20" OutName="tex_006A20" Format="ci8" Width="8" Height="8" Offset="0x6A20" />
<Texture Name="object_mk_Tex_006A60" OutName="tex_006A60" Format="ci8" Width="8" Height="8" Offset="0x6A60" />
<Texture Name="object_mk_Tex_006AA0" OutName="tex_006AA0" Format="ci8" Width="8" Height="8" Offset="0x6AA0" />
<Texture Name="object_mk_Tex_006AE0" OutName="tex_006AE0" Format="ci8" Width="16" Height="16" Offset="0x6AE0" />
<Limb Name="object_mk_Standardlimb_006BE0" Type="Standard" EnumName="OBJECT_MK_LIMB_01" Offset="0x6BE0" />
<Limb Name="object_mk_Standardlimb_006BEC" Type="Standard" EnumName="OBJECT_MK_LIMB_02" Offset="0x6BEC" />
<Limb Name="object_mk_Standardlimb_006BF8" Type="Standard" EnumName="OBJECT_MK_LIMB_03" Offset="0x6BF8" />
<Limb Name="object_mk_Standardlimb_006C04" Type="Standard" EnumName="OBJECT_MK_LIMB_04" Offset="0x6C04" />
<Limb Name="object_mk_Standardlimb_006C10" Type="Standard" EnumName="OBJECT_MK_LIMB_05" Offset="0x6C10" />
<Limb Name="object_mk_Standardlimb_006C1C" Type="Standard" EnumName="OBJECT_MK_LIMB_06" Offset="0x6C1C" />
<Limb Name="object_mk_Standardlimb_006C28" Type="Standard" EnumName="OBJECT_MK_LIMB_07" Offset="0x6C28" />
<Limb Name="object_mk_Standardlimb_006C34" Type="Standard" EnumName="OBJECT_MK_LIMB_08" Offset="0x6C34" />
<Limb Name="object_mk_Standardlimb_006C40" Type="Standard" EnumName="OBJECT_MK_LIMB_09" Offset="0x6C40" />
<Limb Name="object_mk_Standardlimb_006C4C" Type="Standard" EnumName="OBJECT_MK_LIMB_0A" Offset="0x6C4C" />
<Limb Name="object_mk_Standardlimb_006C58" Type="Standard" EnumName="OBJECT_MK_LIMB_0B" Offset="0x6C58" />
<Limb Name="object_mk_Standardlimb_006C64" Type="Standard" EnumName="OBJECT_MK_LIMB_0C" Offset="0x6C64" />
<Skeleton Name="object_mk_Skel_006CA0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_MK_LIMB_NONE" LimbMax="OBJECT_MK_LIMB_MAX" EnumName="ObjectMkLimb" Offset="0x6CA0" />
<Animation Name="gMarineResearcherHeadWaggleAnim" Offset="0x438" />
<Animation Name="gMarineResearcherYellAnim" Offset="0x7D8" />
<Animation Name="gMarineResearcherShakeInFearAnim" Offset="0x10F4" />
<Animation Name="gMarineResearcherStrokeChinAnim" Offset="0x1964" />
<Animation Name="gMarineResearcherIdleAnim" Offset="0x1C38" />
<DList Name="gMarineResearcherMidTorsoDL" Offset="0x4320" />
<DList Name="gMarineResearcherUpperTorsoDL" Offset="0x4610" />
<DList Name="gMarineResearcherNeckDL" Offset="0x4960" />
<DList Name="gMarineResearcherHeadDL" Offset="0x4A78" />
<DList Name="gMarineResearcherMouthDL" Offset="0x5180" />
<DList Name="gMarineResearcherRightShoulderDL" Offset="0x5500" />
<DList Name="gMarineResearcherRightArmDL" Offset="0x5630" />
<DList Name="gMarineResearcherRightHandDL" Offset="0x5760" />
<DList Name="gMarineResearcherLeftShoulderDL" Offset="0x58B0" />
<DList Name="gMarineResearcherLeftArmDL" Offset="0x59E0" />
<DList Name="gMarineResearcherLeftHandDL" Offset="0x5B10" />
<DList Name="gMarineResearcherLowerTorsoDL" Offset="0x5C60" />
<Texture Name="gMarineResearcherTLUT" OutName="marine_researcher_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5DE0" />
<Texture Name="gMarineResearcherChestSkinTex" OutName="marine_researcher_chest_skin" Format="ci8" Width="8" Height="8" Offset="0x5FE0" />
<Texture Name="gMarineResearcherMouthTex" OutName="marine_researcher_mouth" Format="ci8" Width="16" Height="16" Offset="0x6020" />
<Texture Name="gMarineResearcherLipsTex" OutName="marine_researcher_lips" Format="ci8" Width="8" Height="8" Offset="0x6120" />
<Texture Name="gMarineResearcherJacketTex" OutName="marine_researcher_jacket" Format="ci8" Width="8" Height="8" Offset="0x6160" />
<Texture Name="gMarineResearcherHairTex" OutName="marine_researcher_hair" Format="ci8" Width="8" Height="16" Offset="0x61A0" />
<Texture Name="gMarineResearcherEyeTex" OutName="marine_researcher_eye" Format="rgba16" Width="32" Height="32" Offset="0x6220" />
<Texture Name="gMarineResearcherNostrilTex" OutName="marine_researcher_nostril" Format="ci8" Width="8" Height="8" Offset="0x6A20" />
<Texture Name="gMarineResearcherEarTex" OutName="marine_researcher_ear" Format="ci8" Width="8" Height="8" Offset="0x6A60" />
<Texture Name="gMarineResearcherShirtTex" OutName="marine_researcher_shirt" Format="ci8" Width="8" Height="8" Offset="0x6AA0" />
<Texture Name="gMarineResearcherFingersTex" OutName="marine_researcher_fingers" Format="ci8" Width="16" Height="16" Offset="0x6AE0" />
<Limb Name="gMarineResearcherLowerTorsoLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_LOWER_TORSO" Offset="0x6BE0" />
<Limb Name="gMarineResearcherMidTorsoLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_MID_TORSO" Offset="0x6BEC" />
<Limb Name="gMarineResearcherLeftShoulderLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_LEFT_SHOULDER" Offset="0x6BF8" />
<Limb Name="gMarineResearcherLeftArmLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_LEFT_ARM" Offset="0x6C04" />
<Limb Name="gMarineResearcherLeftHandLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_LEFT_HAND" Offset="0x6C10" />
<Limb Name="gMarineResearcherRightShoulderLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_RIGHT_SHOULDER" Offset="0x6C1C" />
<Limb Name="gMarineResearcherRightArmLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_RIGHT_ARM" Offset="0x6C28" />
<Limb Name="gMarineResearcherRightHandLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_RIGHT_HAND" Offset="0x6C34" />
<Limb Name="gMarineResearcherUpperTorsoLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_UPPER_TORSO" Offset="0x6C40" />
<Limb Name="gMarineResearcherNeckLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_NECK" Offset="0x6C4C" />
<Limb Name="gMarineResearcherHeadLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_HEAD" Offset="0x6C58" />
<Limb Name="gMarineResearcherMouthLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_MOUTH" Offset="0x6C64" />
<Skeleton Name="gMarineResearcherSkel" Type="Flex" LimbType="Standard" LimbNone="MARINE_RESEARCHER_LIMB_NONE" LimbMax="MARINE_RESEARCHER_LIMB_MAX" EnumName="MarineResearcherLimb" Offset="0x6CA0" />
</File>
</Root>

12
src/overlays/actors/ovl_En_Mk/z_en_mk.c
View File

@ -57,8 +57,8 @@ static ColliderCylinderInit sCylinderInit = {
s32 func_809592E0(EnMk* this, s16 index) {
AnimationHeader* sAnimations[] = {
&object_mk_Anim_001C38, &object_mk_Anim_000438, &object_mk_Anim_0007D8,
&object_mk_Anim_0010F4, &object_mk_Anim_001964,
&gMarineResearcherIdleAnim, &gMarineResearcherHeadWaggleAnim, &gMarineResearcherYellAnim,
&gMarineResearcherShakeInFearAnim, &gMarineResearcherStrokeChinAnim,
};
if (index == this->unk_27C) {
@ -82,8 +82,8 @@ void EnMk_Init(Actor* thisx, PlayState* play) {
this->actor.terminalVelocity = -4.0f;
this->actor.gravity = -1.0f;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f);
SkelAnime_InitFlex(play, &this->skelAnime, &object_mk_Skel_006CA0, &object_mk_Anim_001C38, this->jointTable,
this->morphTable, OBJECT_MK_LIMB_MAX);
SkelAnime_InitFlex(play, &this->skelAnime, &gMarineResearcherSkel, &gMarineResearcherIdleAnim, this->jointTable,
this->morphTable, MARINE_RESEARCHER_LIMB_MAX);
this->unk_27C = -1;
func_809592E0(this, 0);
@ -463,7 +463,7 @@ void EnMk_Update(Actor* thisx, PlayState* play) {
s32 EnMk_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) {
EnMk* this = THIS;
if (limbIndex == OBJECT_MK_LIMB_0B) {
if (limbIndex == MARINE_RESEARCHER_LIMB_HEAD) {
rot->y -= this->unk_270.y;
rot->z += this->unk_270.x;
}
@ -475,7 +475,7 @@ Vec3f D_8095A2A0 = { 1000.0f, -100.0f, 0.0f };
void EnMk_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) {
EnMk* this = THIS;
if (limbIndex == OBJECT_MK_LIMB_0B) {
if (limbIndex == MARINE_RESEARCHER_LIMB_HEAD) {
Matrix_MultVec3f(&D_8095A2A0, &this->actor.focus.pos);
}
}

4
src/overlays/actors/ovl_En_Mk/z_en_mk.h
View File

@ -12,8 +12,8 @@ typedef struct EnMk {
/* 0x000 */ Actor actor;
/* 0x144 */ ColliderCylinder collider;
/* 0x190 */ SkelAnime skelAnime;
/* 0x1D4 */ Vec3s jointTable[OBJECT_MK_LIMB_MAX];
/* 0x222 */ Vec3s morphTable[OBJECT_MK_LIMB_MAX];
/* 0x1D4 */ Vec3s jointTable[MARINE_RESEARCHER_LIMB_MAX];
/* 0x222 */ Vec3s morphTable[MARINE_RESEARCHER_LIMB_MAX];
/* 0x270 */ Vec3s unk_270;
/* 0x276 */ s16 csIdList[2];
/* 0x27A */ u16 unk_27A;