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

En_Ik OK (#821) 

* starting en_ik

* updating and more matching funcs

* matched more functions and ran format.sh

* matched another, started on init

* updating things with master, and more matches

* another function down

* some more progress

* some documenting

* master merge

* maybe some progress?

* one more func left

* IK OK

* inital cleanup passthrough

* fixing warnings and formatting

* some cleanup

* touch up

* more docs

* doin dat dere docs

* actorfixer

* finishing function names

* initial round of fixes

* format

* Naming things

* namefixer

* review comments pt2

* comment updates

* PR Feedback

* forgot a format

* naming enum

* more fixes

* minor fix

* minor fix

* format

* fixes for daaays

* for some reason these keep showing up?

* fixing blob

* names

* fixes

* naming things...can't discern the last ones...

* updating TLUT and names

* formating and fisxes

* fixing func name

* naming effect variable

* name fixer, and renaming variable

* Fixing xml

* forgot to fix name
This commit is contained in:
Parker Burnett 2022-07-17 20:19:11 -07:00 committed by GitHub
parent 03a7e00c4b
commit 356fde3045
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1177 additions and 308 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

203
assets/xml/objects/object_ik.xml
View File

@ -1,106 +1,105 @@
<Root>
<!-- This is the object for the Iron Knuckle Enemy -->
<File Name="object_ik" Segment="6">
<Animation Name="object_ik_Anim_000CE8" Offset="0xCE8" />
<Animation Name="object_ik_Anim_0015F8" Offset="0x15F8" />
<Animation Name="object_ik_Anim_001ABC" Offset="0x1ABC" />
<Animation Name="object_ik_Anim_002484" Offset="0x2484" />
<Animation Name="object_ik_Anim_002E7C" Offset="0x2E7C" />
<Animation Name="object_ik_Anim_00367C" Offset="0x367C" />
<Animation Name="object_ik_Anim_00391C" Offset="0x391C" />
<Animation Name="object_ik_Anim_004A04" Offset="0x4A04" />
<Animation Name="object_ik_Anim_005254" Offset="0x5254" />
<Animation Name="object_ik_Anim_0057F4" Offset="0x57F4" />
<Animation Name="object_ik_Anim_006294" Offset="0x6294" />
<!-- <Blob Name="object_ik_Blob_006730" Size="0x5A0" Offset="0x6730" /> -->
<!-- <Blob Name="object_ik_Blob_007120" Size="0x11A0" Offset="0x7120" /> -->
<!-- <Blob Name="object_ik_Blob_008AE0" Size="0x630" Offset="0x8AE0" /> -->
<!-- <Blob Name="object_ik_Blob_009290" Size="0x2F0" Offset="0x9290" /> -->
<!-- <Blob Name="object_ik_Blob_009740" Size="0x300" Offset="0x9740" /> -->
<DList Name="object_ik_DL_009A40" Offset="0x9A40" />
<DList Name="object_ik_DL_009BC8" Offset="0x9BC8" />
<DList Name="object_ik_DL_009D20" Offset="0x9D20" />
<DList Name="object_ik_DL_009FD8" Offset="0x9FD8" />
<DList Name="object_ik_DL_00A130" Offset="0xA130" />
<DList Name="object_ik_DL_00A1F0" Offset="0xA1F0" />
<DList Name="object_ik_DL_00A348" Offset="0xA348" />
<DList Name="object_ik_DL_00A408" Offset="0xA408" />
<DList Name="object_ik_DL_00A4F0" Offset="0xA4F0" />
<DList Name="object_ik_DL_00A5D8" Offset="0xA5D8" />
<DList Name="object_ik_DL_00A6D0" Offset="0xA6D0" />
<DList Name="object_ik_DL_00A780" Offset="0xA780" />
<DList Name="object_ik_DL_00A820" Offset="0xA820" />
<DList Name="object_ik_DL_00BF80" Offset="0xBF80" />
<DList Name="object_ik_DL_00C200" Offset="0xC200" />
<DList Name="object_ik_DL_00CF08" Offset="0xCF08" />
<DList Name="object_ik_DL_00D038" Offset="0xD038" />
<DList Name="object_ik_DL_00D050" Offset="0xD050" />
<DList Name="object_ik_DL_00D068" Offset="0xD068" />
<DList Name="object_ik_DL_00D080" Offset="0xD080" />
<DList Name="object_ik_DL_00D098" Offset="0xD098" />
<DList Name="object_ik_DL_00D0B0" Offset="0xD0B0" />
<DList Name="object_ik_DL_00D0C8" Offset="0xD0C8" />
<DList Name="object_ik_DL_00EC20" Offset="0xEC20" />
<DList Name="object_ik_DL_00EFD8" Offset="0xEFD8" />
<DList Name="object_ik_DL_00F270" Offset="0xF270" />
<DList Name="object_ik_DL_00F3F8" Offset="0xF3F8" />
<DList Name="object_ik_DL_00F690" Offset="0xF690" />
<DList Name="object_ik_DL_00F818" Offset="0xF818" />
<DList Name="object_ik_DL_00F8E0" Offset="0xF8E0" />
<DList Name="object_ik_DL_00FC20" Offset="0xFC20" />
<DList Name="object_ik_DL_00FD68" Offset="0xFD68" />
<DList Name="object_ik_DL_00FFA8" Offset="0xFFA8" />
<DList Name="object_ik_DL_010358" Offset="0x10358" />
<DList Name="object_ik_DL_0104A0" Offset="0x104A0" />
<DList Name="object_ik_DL_0106E0" Offset="0x106E0" />
<Texture Name="object_ik_TLUT_010A30" OutName="tlut_010A30" Format="rgba16" Width="16" Height="16" Offset="0x10A30" />
<Texture Name="object_ik_Tex_010C30" OutName="tex_010C30" Format="ia16" Width="16" Height="16" Offset="0x10C30" />
<Texture Name="object_ik_Tex_010E30" OutName="tex_010E30" Format="ci8" Width="16" Height="16" Offset="0x10E30" />
<Texture Name="object_ik_Tex_010F30" OutName="tex_010F30" Format="ci8" Width="16" Height="16" Offset="0x10F30" />
<!-- <Blob Name="object_ik_Blob_011030" Size="0x170" Offset="0x11030" /> -->
<Texture Name="object_ik_Tex_0111A0" OutName="tex_0111A0" Format="i4" Width="32" Height="64" Offset="0x111A0" />
<Texture Name="object_ik_Tex_0115A0" OutName="tex_0115A0" Format="ia8" Width="32" Height="32" Offset="0x115A0" />
<Texture Name="object_ik_Tex_0119A0" OutName="tex_0119A0" Format="rgba16" Width="16" Height="16" Offset="0x119A0" />
<Texture Name="object_ik_Tex_011BA0" OutName="tex_011BA0" Format="rgba16" Width="16" Height="16" Offset="0x11BA0" />
<Texture Name="object_ik_Tex_011DA0" OutName="tex_011DA0" Format="ia16" Width="32" Height="32" Offset="0x11DA0" />
<Texture Name="object_ik_Tex_0125A0" OutName="tex_0125A0" Format="rgba16" Width="32" Height="32" Offset="0x125A0" />
<Texture Name="object_ik_Tex_012DA0" OutName="tex_012DA0" Format="ci8" Width="16" Height="16" Offset="0x12DA0" />
<Texture Name="object_ik_Tex_012EA0" OutName="tex_012EA0" Format="ia8" Width="16" Height="16" Offset="0x12EA0" />
<!-- <Blob Name="object_ik_Blob_012FA0" Size="0xF0" Offset="0x12FA0" /> -->
<Texture Name="object_ik_Tex_013090" OutName="tex_013090" Format="ci8" Width="16" Height="16" Offset="0x13090" />
<Texture Name="object_ik_Tex_013190" OutName="tex_013190" Format="ci8" Width="8" Height="8" Offset="0x13190" />
<Texture Name="object_ik_Tex_0131D0" OutName="tex_0131D0" Format="ci8" Width="16" Height="16" Offset="0x131D0" />
<Texture Name="object_ik_Tex_0132D0" OutName="tex_0132D0" Format="ci8" Width="8" Height="16" Offset="0x132D0" />
<Texture Name="object_ik_Tex_013350" OutName="tex_013350" Format="ci8" Width="8" Height="16" Offset="0x13350" />
<Texture Name="object_ik_Tex_0133D0" OutName="tex_0133D0" Format="ci8" Width="16" Height="16" Offset="0x133D0" />
<Limb Name="object_ik_Standardlimb_0134D0" Type="Standard" EnumName="OBJECT_IK_LIMB_01" Offset="0x134D0" />
<Limb Name="object_ik_Standardlimb_0134DC" Type="Standard" EnumName="OBJECT_IK_LIMB_02" Offset="0x134DC" />
<Limb Name="object_ik_Standardlimb_0134E8" Type="Standard" EnumName="OBJECT_IK_LIMB_03" Offset="0x134E8" />
<Limb Name="object_ik_Standardlimb_0134F4" Type="Standard" EnumName="OBJECT_IK_LIMB_04" Offset="0x134F4" />
<Limb Name="object_ik_Standardlimb_013500" Type="Standard" EnumName="OBJECT_IK_LIMB_05" Offset="0x13500" />
<Limb Name="object_ik_Standardlimb_01350C" Type="Standard" EnumName="OBJECT_IK_LIMB_06" Offset="0x1350C" />
<Limb Name="object_ik_Standardlimb_013518" Type="Standard" EnumName="OBJECT_IK_LIMB_07" Offset="0x13518" />
<Limb Name="object_ik_Standardlimb_013524" Type="Standard" EnumName="OBJECT_IK_LIMB_08" Offset="0x13524" />
<Limb Name="object_ik_Standardlimb_013530" Type="Standard" EnumName="OBJECT_IK_LIMB_09" Offset="0x13530" />
<Limb Name="object_ik_Standardlimb_01353C" Type="Standard" EnumName="OBJECT_IK_LIMB_0A" Offset="0x1353C" />
<Limb Name="object_ik_Standardlimb_013548" Type="Standard" EnumName="OBJECT_IK_LIMB_0B" Offset="0x13548" />
<Limb Name="object_ik_Standardlimb_013554" Type="Standard" EnumName="OBJECT_IK_LIMB_0C" Offset="0x13554" />
<Limb Name="object_ik_Standardlimb_013560" Type="Standard" EnumName="OBJECT_IK_LIMB_0D" Offset="0x13560" />
<Limb Name="object_ik_Standardlimb_01356C" Type="Standard" EnumName="OBJECT_IK_LIMB_0E" Offset="0x1356C" />
<Limb Name="object_ik_Standardlimb_013578" Type="Standard" EnumName="OBJECT_IK_LIMB_0F" Offset="0x13578" />
<Limb Name="object_ik_Standardlimb_013584" Type="Standard" EnumName="OBJECT_IK_LIMB_10" Offset="0x13584" />
<Limb Name="object_ik_Standardlimb_013590" Type="Standard" EnumName="OBJECT_IK_LIMB_11" Offset="0x13590" />
<Limb Name="object_ik_Standardlimb_01359C" Type="Standard" EnumName="OBJECT_IK_LIMB_12" Offset="0x1359C" />
<Limb Name="object_ik_Standardlimb_0135A8" Type="Standard" EnumName="OBJECT_IK_LIMB_13" Offset="0x135A8" />
<Limb Name="object_ik_Standardlimb_0135B4" Type="Standard" EnumName="OBJECT_IK_LIMB_14" Offset="0x135B4" />
<Limb Name="object_ik_Standardlimb_0135C0" Type="Standard" EnumName="OBJECT_IK_LIMB_15" Offset="0x135C0" />
<Limb Name="object_ik_Standardlimb_0135CC" Type="Standard" EnumName="OBJECT_IK_LIMB_16" Offset="0x135CC" />
<Limb Name="object_ik_Standardlimb_0135D8" Type="Standard" EnumName="OBJECT_IK_LIMB_17" Offset="0x135D8" />
<Limb Name="object_ik_Standardlimb_0135E4" Type="Standard" EnumName="OBJECT_IK_LIMB_18" Offset="0x135E4" />
<Limb Name="object_ik_Standardlimb_0135F0" Type="Standard" EnumName="OBJECT_IK_LIMB_19" Offset="0x135F0" />
<Limb Name="object_ik_Standardlimb_0135FC" Type="Standard" EnumName="OBJECT_IK_LIMB_1A" Offset="0x135FC" />
<Limb Name="object_ik_Standardlimb_013608" Type="Standard" EnumName="OBJECT_IK_LIMB_1B" Offset="0x13608" />
<Limb Name="object_ik_Standardlimb_013614" Type="Standard" EnumName="OBJECT_IK_LIMB_1C" Offset="0x13614" />
<Limb Name="object_ik_Standardlimb_013620" Type="Standard" EnumName="OBJECT_IK_LIMB_1D" Offset="0x13620" />
<Skeleton Name="object_ik_Skel_0136A0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IK_LIMB_NONE" LimbMax="OBJECT_IK_LIMB_MAX" EnumName="object_ik_Limbs" Offset="0x136A0" />
<Animation Name="gIronKnuckleVerticalAttackAnim" Offset="0xCE8" />
<Animation Name="gIronKnuckleRecoverVerticalAttackAnim" Offset="0x15F8" />
<Animation Name="gIronKnuckleEndVerticalAttackAnim" Offset="0x1ABC" />
<Animation Name="gIronKnuckleHorizontalAttackAnim" Offset="0x2484" />
<Animation Name="gIronKnuckleEndHorizontalAttackAnim" Offset="0x2E7C" />
<Animation Name="gIronKnuckleBackHitAnim" Offset="0x367C" />
<Animation Name="gIronKnuckleBlockAnim" Offset="0x391C" />
<Animation Name="gIronKnuckleDeathAnim" Offset="0x4A04" />
<Animation Name="gIronKnuckleFrontHitAnim" Offset="0x5254" />
<Animation Name="gIronKnuckleRunAnim" Offset="0x57F4" />
<Animation Name="gIronKnuckleWalkAnim" Offset="0x6294" />
<Array Name="gObjectIkVtx_009740" Count="566" Offset="0x6730">
<Vtx/>
</Array>
<DList Name="gIronKnuckleArmorFrontDL" Offset="0x9A40" />
<DList Name="gIronKnuckleArmorBackDL" Offset="0x9BC8" />
<DList Name="gIronKnuckleAxeDL" Offset="0x9D20" />
<DList Name="gIronKnuckleRightHandDL" Offset="0x9FD8" />
<DList Name="gIronKnuckleLowerRightPauldronDL" Offset="0xA130" />
<DList Name="gIronKnuckleLeftHandDL" Offset="0xA1F0" />
<DList Name="gIronKnuckleLowerLeftPauldronDL" Offset="0xA348" />
<DList Name="gIronKnuckleUpperRightPauldronDL" Offset="0xA408" />
<DList Name="gIronKnuckleUpperLeftPauldronDL" Offset="0xA4F0" />
<DList Name="gIronKnuckleFrontTorsoArmorMarkingDL" Offset="0xA5D8" />
<DList Name="gIronKnuckleRearTorsoArmorMarkingDL" Offset="0xA6D0" />
<DList Name="gIronKnuckleRivetsMarking1DL" Offset="0xA780" />
<DList Name="gIronKnuckleRivetsMarking2DL" Offset="0xA820" />
<DList Name="gIronKnuckleBasMarkingDL" Offset="0xBF80" />
<DList Name="gIronKnuckleGerudoHeadDL" Offset="0xC200" />
<DList Name="gIronKnuckleHelmetMarkingDL" Offset="0xCF08" />
<DList Name="gIronKnuckleTanArmorMaterialDL" Offset="0xD038" />
<DList Name="gIronKnuckleBronzeArmorMaterialDL" Offset="0xD050" />
<DList Name="gIronKnuckleSilverArmorMaterialDL" Offset="0xD068" />
<DList Name="gIronKnuckleBlackArmorMaterialDL" Offset="0xD080" />
<DList Name="gIronKnuckleBrownArmorMaterialDL" Offset="0xD098" />
<DList Name="gIronKnuckleWhiteArmorMaterialDL" Offset="0xD0B0" />
<DList Name="gIronKnuckleGoldArmorMaterialDL" Offset="0xD0C8" />
<DList Name="gIronKnuckleTorsoDL" Offset="0xEC20" />
<DList Name="gIronKnuckleVambraceLeftDL" Offset="0xEFD8" />
<DList Name="gIronKnuckleArmLeftDL" Offset="0xF270" />
<DList Name="gIronKnuckleVambraceRightDL" Offset="0xF3F8" />
<DList Name="gIronKnuckleArmRightDL" Offset="0xF690" />
<DList Name="gIronKnuckleHandDL" Offset="0xF818" />
<DList Name="gIronKnuckleWaistDL" Offset="0xF8E0" />
<DList Name="gIronKnucklePauldronLeftDL" Offset="0xFC20" />
<DList Name="gIronKnuckleBootTipLeftDL" Offset="0xFD68" />
<DList Name="gIronKnuckleWaistArmorLeftDL" Offset="0xFFA8" />
<DList Name="gIronKnucklePauldronRightDL" Offset="0x10358" />
<DList Name="gIronKnuckleBootTipRightDL" Offset="0x104A0" />
<DList Name="gIronKnuckleWaistArmorRightDL" Offset="0x106E0" />
<Texture Name="gIronKnuckleChainMailTLUT" OutName="iron_knuckle_chain_mail_tlut" Format="rgba16" Width="16" Height="16" Offset="0x10A30" />
<Texture Name="gIronKnuckleRivet1Tex" OutName="iron_knuckle_rivet_1_tex" Format="ia16" Width="16" Height="16" Offset="0x10C30" />
<Texture Name="gIronKnuckleHair1Tex" OutName="iron_knuckle_hair_1_tex" Format="ci8" Width="16" Height="16" Offset="0x10E30" />
<Texture Name="gIronKnuckleAxePomelJewel1Tex" OutName="iron_knuckle_axe_pomel_1_jewel_tex" Format="ci8" Width="16" Height="16" Offset="0x10F30" />
<Texture Name="gIronKnuckleAxeTLUT" OutName="iron_knuckle_axe_tlut" Format="rgba16" Width="4" Height="4" Offset="0x11030" />
<Texture Name="gIronKnuckleFireTex" OutName="iron_knuckle_fire_tex" Format="i4" Width="32" Height="64" Offset="0x111A0" />
<Texture Name="gIronKnuckleRivet2Tex" OutName="iron_knuckle_rivet_2_tex" Format="ia8" Width="32" Height="32" Offset="0x115A0" />
<Texture Name="gIronKnuckleBlockPatternTex" OutName="iron_knuckle_block_pattern" Format="rgba16" Width="16" Height="16" Offset="0x119A0" />
<Texture Name="gIronKnuckleChainMailTex" OutName="iron_knuckle_chain_mail_tex" Format="rgba16" Width="16" Height="16" Offset="0x11BA0" />
<Texture Name="gIronKnuckleArmorEmblemTex" OutName="iron_knuckle_emblem_tex" Format="ia16" Width="32" Height="32" Offset="0x11DA0" />
<Texture Name="gIronKnuckleGerudoEyeTex" OutName="iron_knuckle_gerudo_eye_tex" Format="rgba16" Width="32" Height="32" Offset="0x125A0" />
<Texture Name="gIronKnuckleChestJewelTex" OutName="iron_knuckle_chest_jewel_tex" Format="ci8" Width="16" Height="16" Offset="0x12DA0" />
<Texture Name="gIronKnuckleArmorRivet2Tex" OutName="iron_knuckle_armor_rivet_2_tex" Format="ia8" Width="16" Height="16" Offset="0x12EA0" />
<Texture Name="gIronKnuckleArmorTLUT" OutName="iron_knuckle_armor_tlut" Format="rgba16" Width="4" Height="4" Offset="0x12FA0" />
<Texture Name="gIronKnuckleForeheadJewelTex" OutName="iron_knuckle_forehead_jewel_tex" Format="ci8" Width="16" Height="16" Offset="0x13090" />
<Texture Name="gIronKnuckleGerudoSkinTex" OutName="iron_knuckle_gerudo_skin_tex" Format="ci8" Width="8" Height="8" Offset="0x13190" />
<Texture Name="gIronKnuckleHair2Tex" OutName="iron_knuckle_hair_2_tex" Format="ci8" Width="16" Height="16" Offset="0x131D0" />
<Texture Name="gIronKnuckleEarTex" OutName="iron_knuckle_ear_tex" Format="ci8" Width="8" Height="16" Offset="0x132D0" />
<Texture Name="gIronKnuckleForeheadDecal1Tex" OutName="iron_knuckle_forehead_decal_1_tex" Format="ci8" Width="8" Height="16" Offset="0x13350" />
<Texture Name="gIronKnuckleForeheadDecal2Tex" OutName="iron_knuckle_forehead_decal_2_tex" Format="ci8" Width="16" Height="16" Offset="0x133D0" />
<Limb Name="gIronKnuckleRootLimb" Type="Standard" EnumName="IRON_KNUCKLE_LIMB_ROOT" Offset="0x134D0" />
<Limb Name="gIronKnuckleTassetCenterLimb" EnumName="IRON_KNUCKLE_LIMB_TASSET_CENTER" Type="Standard" Offset="0x134DC" />
<Limb Name="gIronKnuckleTassetRightLimb" EnumName="IRON_KNUCKLE_LIMB_TASSET_RIGHT" Type="Standard" Offset="0x134E8" />
<Limb Name="gIronKnuckleRightLegLimb" EnumName="IRON_KNUCKLE_LIMB_RIGHT_LEG" Type="Standard" Offset="0x134F4" />
<Limb Name="gIronKnuckleRightFootLimb" EnumName="IRON_KNUCKLE_LIMB_RIGHT_FOOT" Type="Standard" Offset="0x13500" />
<Limb Name="gIronKnuckleTassetLeftLimb" EnumName="IRON_KNUCKLE_LIMB_TASSET_LEFT" Type="Standard" Offset="0x1350C" />
<Limb Name="gIronKnuckleLeftLegLimb" EnumName="IRON_KNUCKLE_LIMB_LEFT_LEG" Type="Standard" Offset="0x13518" />
<Limb Name="gIronKnuckleLeftFootLimb" EnumName="IRON_KNUCKLE_LIMB_LEFT_FOOT" Type="Standard" Offset="0x13524" />
<Limb Name="gIronKnuckleUpperBodyRoot" EnumName="IRON_KNUCKLE_LIMB_UPPER_BODY_ROOT" Type="Standard" Offset="0x13530" />
<Limb Name="gIronKnuckleUnkRootLimb" EnumName="IRON_KNUCKLE_LIMB_UNK_ROOT" Type="Standard" Offset="0x1353C" />
<Limb Name="gIronKnuckleHeadRootLimb" EnumName="IRON_KNUCKLE_LIMB_HEAD_ROOT" Type="Standard" Offset="0x13548" />
<Limb Name="gIronKnuckleHelmetArmorLimb" EnumName="IRON_KNUCKLE_LIMB_HELMET_ARMOR" Type="Standard" Offset="0x13554" />
<Limb Name="gIronKnuckleHeadLimb" EnumName="IRON_KNUCKLE_LIMB_HEAD" Type="Standard" Offset="0x13560" />
<Limb Name="gIronKnuckleRightUpperArmLimb" EnumName="IRON_KNUCKLE_LIMB_RIGHT_UPPER_ARM" Type="Standard" Offset="0x1356C" />
<Limb Name="gIronKnuckleRightForearmLimb" EnumName="IRON_KNUCKLE_LIMB_RIGHT_FOREARM" Type="Standard" Offset="0x13578" />
<Limb Name="gIronKnuckleAxeRootLimb" EnumName="IRON_KNUCKLE_LIMB_AXE_ROOT" Type="Standard" Offset="0x13584" />
<Limb Name="gIronKnuckleAxeLimb" EnumName="IRON_KNUCKLE_LIMB_AXE" Type="Standard" Offset="0x13590" />
<Limb Name="gIronKnuckleRightHandLimb" EnumName="IRON_KNUCKLE_LIMB_RIGHT_HAND" Type="Standard" Offset="0x1359C" />
<Limb Name="gIronKnuckleLeftUpperArmLimb" EnumName="IRON_KNUCKLE_LIMB_LEFT_UPPER_ARM" Type="Standard" Offset="0x135A8" />
<Limb Name="gIronKnuckleLeftForearmLimb" EnumName="IRON_KNUCKLE_LIMB_LEFT_FOREARM" Type="Standard" Offset="0x135B4" />
<Limb Name="gIronKnuckleLeftHandLimb" EnumName="IRON_KNUCKLE_LIMB_LEFT_HAND" Type="Standard" Offset="0x135C0" />
<Limb Name="gIronKnuckleUpperLeftPauldronLimb" EnumName="IRON_KNUCKLE_LIMB_UPPER_LEFT_PAULDRON" Type="Standard" Offset="0x135CC" />
<Limb Name="gIronKnuckleLowerLeftPauldronLimb" EnumName="IRON_KNUCKLE_LIMB_LOWER_LEFT_PAULDRON" Type="Standard" Offset="0x135D8" />
<Limb Name="gIronKnuckleUpperRightPauldronLimb" EnumName="IRON_KNUCKLE_LIMB_UPPER_RIGHT_PAULDRON" Type="Standard" Offset="0x135E4" />
<Limb Name="gIronKnuckleLowerRightPauldronLimb" EnumName="IRON_KNUCKLE_LIMB_LOWER_RIGHT_PAULDRON" Type="Standard" Offset="0x135F0" />
<Limb Name="gIronKnuckleChestArmorFrontLimb" EnumName="IRON_KNUCKLE_LIMB_CHEST_ARMOR_FRONT" Type="Standard" Offset="0x135FC" />
<Limb Name="gIronKnuckleChestArmorBackLimb" EnumName="IRON_KNUCKLE_LIMB_CHEST_ARMOR_BACK" Type="Standard" Offset="0x13608" />
<Limb Name="gIronKnuckleTorsoLimb" EnumName="IRON_KNUCKLE_LIMB_TORSO" Type="Standard" Offset="0x13614" />
<Limb Name="gIronKnuckleWaistLimb" EnumName="IRON_KNUCKLE_LIMB_WAIST" Type="Standard" Offset="0x13620" />
<Skeleton Name="gIronKnuckleSkel" Type="Flex" LimbType="Standard" LimbNone="IRON_KNUCKLE_LIMB_NONE" LimbMax="IRON_KNUCKLE_LIMB_MAX" EnumName="IronKnuckleLimbs" Offset="0x136A0" />
</File>
</Root>

3
spec
View File

@ -1370,8 +1370,7 @@ beginseg
name "ovl_En_Ik"
compress
include "build/src/overlays/actors/ovl_En_Ik/z_en_ik.o"
include "build/data/ovl_En_Ik/ovl_En_Ik.data.o"
include "build/data/ovl_En_Ik/ovl_En_Ik.reloc.o"
include "build/src/overlays/actors/ovl_En_Ik/ovl_En_Ik_reloc.o"
endseg
beginseg

1148
src/overlays/actors/ovl_En_Ik/z_en_ik.c
View File

File diff suppressed because it is too large Load Diff

42
src/overlays/actors/ovl_En_Ik/z_en_ik.h
View File

@ -2,16 +2,50 @@
#define Z_EN_IK_H
#include "global.h"
#include "objects/object_ik/object_ik.h"
struct EnIk;
typedef void (*EnIkActionFunc)(struct EnIk*, PlayState*);
#define IK_GET_ARMOR_TYPE(thisx) ((thisx)->params & 0xFF)
typedef enum {
/* 1 */ IK_TYPE_SILVER = 1,
/* 2 */ IK_TYPE_BLACK,
/* 3 */ IK_TYPE_WHITE
} EnIkType;
typedef struct {
/* 0x00 */ Gfx* dList;
/* 0x04 */ Vec3f pos;
/* 0x10 */ Vec3f vel;
/* 0x1C */ Vec3s rot;
/* 0x24 */ s32 enabled;
} IronKnuckleEffect; // size = 0x28
typedef struct EnIk {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x1AC];
/* 0x2F0 */ EnIkActionFunc actionFunc;
/* 0x2F4 */ char unk_2F4[0x374];
/* 0x0000 */ Actor actor;
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ Vec3s jointTable[IRON_KNUCKLE_LIMB_MAX];
/* 0x023C */ Vec3s morphTable[IRON_KNUCKLE_LIMB_MAX];
/* 0x02F0 */ EnIkActionFunc actionFunc;
/* 0x02F4 */ u8 drawArmorFlags; // Value is 0 when Iron knuckle has armor, then changes to 5 for when armor is lost
/* 0x02F5 */ u8 drawDmgEffType;
/* 0x02F6 */ s16 timer;
/* 0x02F8 */ s16 blurEffectSpawnLock;
/* 0x02FA */ s16 subCamId;
/* 0x02FC */ s16 invincibilityFrames;
/* 0x0300 */ s32 effectIndex;
/* 0x0304 */ f32 drawDmgEffAlpha;
/* 0x0308 */ f32 drawDmgEffScale;
/* 0x030C */ f32 drawDmgEffFrozenSteamScale;
/* 0x0310 */ Vec3f limbPos[13];
/* 0x03AC */ ColliderCylinder colliderCylinder;
/* 0x03F8 */ ColliderQuad colliderQuad;
/* 0x0478 */ ColliderTris colliderTris;
/* 0x0498 */ ColliderTrisElement shieldColliderItems[2];
/* 0x0550 */ IronKnuckleEffect effects[7];
} EnIk; // size = 0x668
extern const ActorInit En_Ik_InitVars;

74
tools/disasm/functions.txt
View File

@ -7074,44 +7074,44 @@
0x809294B0:("ObjTsubo_Draw",),
0x80929910:("EnIk_Init",),
0x80929A98:("EnIk_Destroy",),
0x80929AF8:("func_80929AF8",),
0x80929B6C:("func_80929B6C",),
0x80929BEC:("func_80929BEC",),
0x80929C80:("func_80929C80",),
0x80929D04:("func_80929D04",),
0x80929E2C:("func_80929E2C",),
0x80929E88:("func_80929E88",),
0x80929F20:("func_80929F20",),
0x80929FC8:("func_80929FC8",),
0x8092A020:("func_8092A020",),
0x8092A124:("func_8092A124",),
0x8092A188:("func_8092A188",),
0x8092A28C:("func_8092A28C",),
0x8092A33C:("func_8092A33C",),
0x8092A570:("func_8092A570",),
0x8092A5BC:("func_8092A5BC",),
0x8092A680:("func_8092A680",),
0x8092A754:("func_8092A754",),
0x8092A8D8:("func_8092A8D8",),
0x8092A994:("func_8092A994",),
0x8092AA6C:("func_8092AA6C",),
0x8092AB14:("func_8092AB14",),
0x8092AB50:("func_8092AB50",),
0x8092ABD8:("func_8092ABD8",),
0x8092AC4C:("func_8092AC4C",),
0x8092ACFC:("func_8092ACFC",),
0x8092ADB4:("func_8092ADB4",),
0x8092AE14:("func_8092AE14",),
0x8092AFB4:("func_8092AFB4",),
0x8092AFD4:("func_8092AFD4",),
0x8092B03C:("func_8092B03C",),
0x8092B098:("func_8092B098",),
0x8092B1B4:("func_8092B1B4",),
0x8092B46C:("func_8092B46C",),
0x80929AF8:("EnIk_Freeze",),
0x80929B6C:("EnIk_Thaw",),
0x80929BEC:("EnIk_HitArmor",),
0x80929C80:("EnIk_IsChangingAction",),
0x80929D04:("EnIk_ChooseAttack",),
0x80929E2C:("EnIk_CheckActions",),
0x80929E88:("EnIk_SetupIdle",),
0x80929F20:("EnIk_Idle",),
0x80929FC8:("EnIk_SetupWalk",),
0x8092A020:("EnIk_WalkTowardsPlayer",),
0x8092A124:("EnIk_SetupRun",),
0x8092A188:("EnIk_RunTowardsPlayer",),
0x8092A28C:("EnIk_SetupVerticalAttack",),
0x8092A33C:("EnIk_VerticalAttack",),
0x8092A570:("EnIk_SetupTakeOutAxe",),
0x8092A5BC:("EnIk_TakeOutAxe",),
0x8092A680:("EnIk_SetupHorizontalDoubleAttack",),
0x8092A754:("EnIk_HorizontalDoubleAttack",),
0x8092A8D8:("EnIk_SetupSingleHorizontalAttack",),
0x8092A994:("EnIk_SingleHorizontalAttack",),
0x8092AA6C:("EnIk_SetupEndHorizontalAttack",),
0x8092AB14:("EnIk_EndHorizontalAttack",),
0x8092AB50:("EnIk_SetupBlock",),
0x8092ABD8:("EnIk_Block",),
0x8092AC4C:("EnIk_SetupReactToAttack",),
0x8092ACFC:("EnIk_ReactToAttack",),
0x8092ADB4:("EnIk_SetupDie",),
0x8092AE14:("EnIk_Die",),
0x8092AFB4:("EnIk_SetupFrozen",),
0x8092AFD4:("EnIk_Frozen",),
0x8092B03C:("EnIk_SetupCutscene",),
0x8092B098:("EnIk_PlayCutscene",),
0x8092B1B4:("EnIk_UpdateDamage",),
0x8092B46C:("EnIk_UpdateArmor",),
0x8092B5FC:("EnIk_Update",),
0x8092B900:("func_8092B900",),
0x8092B93C:("func_8092B93C",),
0x8092BC6C:("func_8092BC6C",),
0x8092B900:("EnIk_OverrideLimbDraw",),
0x8092B93C:("EnIk_PostLimbDraw",),
0x8092BC6C:("EnIk_UpdateArmorDraw",),
0x8092BE14:("EnIk_Draw",),
0x8092C530:("DemoShd_Init",),
0x8092C540:("DemoShd_Destroy",),

15
undefined_syms.txt
View File

@ -1130,21 +1130,6 @@ D_0600B644 = 0x0600B644;
D_0600F248 = 0x0600F248;
D_06012A58 = 0x06012A58;
// ovl_En_Ik
D_06000CE8 = 0x06000CE8;
D_060015F8 = 0x060015F8;
D_06001ABC = 0x06001ABC;
D_06002484 = 0x06002484;
D_06002E7C = 0x06002E7C;
D_0600367C = 0x0600367C;
D_0600391C = 0x0600391C;
D_06004A04 = 0x06004A04;
D_06005254 = 0x06005254;
D_060057F4 = 0x060057F4;
D_06006294 = 0x06006294;
D_060136A0 = 0x060136A0;
// ovl_En_Invadepoh_Demo
D_06000080 = 0x06000080;