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

General Cleanup 8 (#958) 

* EnBigokuta

* EnBji

* Soldiers

* Start harfgibud

* Finish harfgibud

* Pamela

* PametFrog

* format

* bigslime

* bji comment

* PR + small cleanup of Eye Tex anims

* Shikashi
This commit is contained in:
Derek Hensley 2022-07-23 11:53:06 -07:00 committed by GitHub
parent fa8bebf209
commit eff952b944
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 330 additions and 504 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
assets/xml/objects/object_bigokuta.xml
View File

@ -34,25 +34,25 @@
<Texture Name="gBigOctoEyeShellTex" OutName="big_octo_eye_shell" Format="rgba16" Width="16" Height="16" Offset="0x6590" />
<Texture Name="gBigOctoSnoutEdgeTex" OutName="big_octo_snout_edge" Format="rgba16" Width="8" Height="16" Offset="0x6790" />
<Texture Name="gBigOctoArmBottomTex" OutName="big_octo_arm_bottom" Format="rgba16" Width="16" Height="16" Offset="0x6890" />
<Limb Name="gBigOctoBodyLimb" Type="Standard" EnumName="OBJECT_BIGOKUTA_LIMB_01" Offset="0x6A90" />
<Limb Name="gBigOctoFrontRightArmBaseLimb" Type="Standard" EnumName="OBJECT_BIGOKUTA_LIMB_02" Offset="0x6A9C" />
<Limb Name="gBigOctoFrontRightArmEndLimb" Type="Standard" EnumName="OBJECT_BIGOKUTA_LIMB_03" Offset="0x6AA8" />
<Limb Name="gBigOctoFrontLeftArmBaseLimb" Type="Standard" EnumName="OBJECT_BIGOKUTA_LIMB_04" Offset="0x6AB4" />
<Limb Name="gBigOctoFrontLeftArmEndLimb" Type="Standard" EnumName="OBJECT_BIGOKUTA_LIMB_05" Offset="0x6AC0" />
<Limb Name="gBigOctoBackLeftArmBaseLimb" Type="Standard" EnumName="OBJECT_BIGOKUTA_LIMB_06" Offset="0x6ACC" />
<Limb Name="gBigOctoBackLeftArmEndLimb" Type="Standard" EnumName="OBJECT_BIGOKUTA_LIMB_07" Offset="0x6AD8" />
<Limb Name="gBigOctoBackRightArmBaseLimb" Type="Standard" EnumName="OBJECT_BIGOKUTA_LIMB_08" Offset="0x6AE4" />
<Limb Name="gBigOctoBackRightArmEndLimb" Type="Standard" EnumName="OBJECT_BIGOKUTA_LIMB_09" Offset="0x6AF0" />
<Limb Name="gBigOctoHeadShellLimb" Type="Standard" EnumName="OBJECT_BIGOKUTA_LIMB_0A" Offset="0x6AFC" />
<Limb Name="gBigOctoLeftTentacleBaseLimb" Type="Standard" EnumName="OBJECT_BIGOKUTA_LIMB_0B" Offset="0x6B08" />
<Limb Name="gBigOctoLeftTentacleTipLimb" Type="Standard" EnumName="OBJECT_BIGOKUTA_LIMB_0C" Offset="0x6B14" />
<Limb Name="gBigOctoRightTentacleBaseLimb" Type="Standard" EnumName="OBJECT_BIGOKUTA_LIMB_0D" Offset="0x6B20" />
<Limb Name="gBigOctoRightTentacleTipLimb" Type="Standard" EnumName="OBJECT_BIGOKUTA_LIMB_0E" Offset="0x6B2C" />
<Limb Name="gBigOctoLeftWeakPointLimb" Type="Standard" EnumName="OBJECT_BIGOKUTA_LIMB_0F" Offset="0x6B38" />
<Limb Name="gBigOctoRightWeakPointLimb" Type="Standard" EnumName="OBJECT_BIGOKUTA_LIMB_10" Offset="0x6B44" />
<Limb Name="gBigOctoCenterSnoutLimb" Type="Standard" EnumName="OBJECT_BIGOKUTA_LIMB_11" Offset="0x6B50" />
<Limb Name="gBigOctoRightSnoutLimb" Type="Standard" EnumName="OBJECT_BIGOKUTA_LIMB_12" Offset="0x6B5C" />
<Limb Name="gBigOctoLeftSnoutLimb" Type="Standard" EnumName="OBJECT_BIGOKUTA_LIMB_13" Offset="0x6B68" />
<Skeleton Name="gBigOctoSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BIGOKUTA_LIMB_NONE" LimbMax="OBJECT_BIGOKUTA_LIMB_MAX" EnumName="object_bigokuta_Limbs" Offset="0x6BC0" />
<Limb Name="gBigOctoBodyLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_BODY" Offset="0x6A90" />
<Limb Name="gBigOctoFrontRightArmBaseLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_RIGHT_FRONT_ARM_BASE" Offset="0x6A9C" />
<Limb Name="gBigOctoFrontRightArmEndLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_RIGHT_FRONT_ARM_END" Offset="0x6AA8" />
<Limb Name="gBigOctoFrontLeftArmBaseLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_LEFT_FRONT_ARM_BASE" Offset="0x6AB4" />
<Limb Name="gBigOctoFrontLeftArmEndLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_LEFT_FRONT_ARM_END" Offset="0x6AC0" />
<Limb Name="gBigOctoBackLeftArmBaseLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_RIGHT_BACK_ARM_BASE" Offset="0x6ACC" />
<Limb Name="gBigOctoBackLeftArmEndLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_RIGHT_BACK_ARM_END" Offset="0x6AD8" />
<Limb Name="gBigOctoBackRightArmBaseLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_LEFT_BACK_ARM_BASE" Offset="0x6AE4" />
<Limb Name="gBigOctoBackRightArmEndLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_LEFT_BACK_ARM_END" Offset="0x6AF0" />
<Limb Name="gBigOctoHeadShellLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_HEAD" Offset="0x6AFC" />
<Limb Name="gBigOctoLeftTentacleBaseLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_LEFT_TENTACLE_BASE" Offset="0x6B08" />
<Limb Name="gBigOctoLeftTentacleTipLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_LEFT_TENTACLE_TIP" Offset="0x6B14" />
<Limb Name="gBigOctoRightTentacleBaseLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_RIGHT_TENTACLE_BASE" Offset="0x6B20" />
<Limb Name="gBigOctoRightTentacleTipLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_RIGHT_TENTACLE_TIP" Offset="0x6B2C" />
<Limb Name="gBigOctoLeftWeakPointLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_LEFT_WEAK_POINT" Offset="0x6B38" />
<Limb Name="gBigOctoRightWeakPointLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_RIGHT_WEAK_POINT" Offset="0x6B44" />
<Limb Name="gBigOctoCenterSnoutLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_CENTER_SNOUT" Offset="0x6B50" />
<Limb Name="gBigOctoRightSnoutLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_RIGHT_SNOUT" Offset="0x6B5C" />
<Limb Name="gBigOctoLeftSnoutLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_LEFT_SNOUT" Offset="0x6B68" />
<Skeleton Name="gBigOctoSkel" Type="Flex" LimbType="Standard" LimbNone="BIGOKUTA_LIMB_NONE" LimbMax="BIGOKUTA_LIMB_MAX" EnumName="BigokutaLimbs" Offset="0x6BC0" />
</File>
</Root>

48
assets/xml/objects/object_bigslime.xml
View File

@ -65,30 +65,30 @@
<Texture Name="gGekkoSpots3Tex" OutName="gekko_spots_3" Format="ci8" Width="32" Height="32" Offset="0xD828" />
<Texture Name="gGekkoSwirlTex" OutName="gekko_swirl" Format="ci8" Width="16" Height="32" Offset="0xDC28" />
<Limb Name="gGekkoRootLimb" Type="Standard" Offset="0xDE28" />
<Limb Name="gGekkoWaistLimb" Type="Standard" Offset="0xDE34" />
<Limb Name="gGekkoLeftThighLimb" Type="Standard" Offset="0xDE40" />
<Limb Name="gGekkoLeftShinLimb" Type="Standard" Offset="0xDE4C" />
<Limb Name="gGekkoLeftAnkleLimb" Type="Standard" Offset="0xDE58" />
<Limb Name="gGekkoLeftFootLimb" Type="Standard" Offset="0xDE64" />
<Limb Name="gGekkoRightThighLimb" Type="Standard" Offset="0xDE70" />
<Limb Name="gGekkoRightShinLimb" Type="Standard" Offset="0xDE7C" />
<Limb Name="gGekkoRightAnkleLimb" Type="Standard" Offset="0xDE88" />
<Limb Name="gGekkoRightFootLimb" Type="Standard" Offset="0xDE94" />
<Limb Name="gGekkoTorsoLimb" Type="Standard" Offset="0xDEA0" />
<Limb Name="gGekkoLeftUpperArmLimb" Type="Standard" Offset="0xDEAC" />
<Limb Name="gGekkoLeftForearmLimb" Type="Standard" Offset="0xDEB8" />
<Limb Name="gGekkoLeftWristLimb" Type="Standard" Offset="0xDEC4" />
<Limb Name="gGekkoLeftHandLimb" Type="Standard" Offset="0xDED0" />
<Limb Name="gGekkoRightUpperArmLimb" Type="Standard" Offset="0xDEDC" />
<Limb Name="gGekkoRightForearmLimb" Type="Standard" Offset="0xDEE8" />
<Limb Name="gGekkoRightWristLimb" Type="Standard" Offset="0xDEF4" />
<Limb Name="gGekkoRightHandLimb" Type="Standard" Offset="0xDF00" />
<Limb Name="gGekkoHeadLimb" Type="Standard" Offset="0xDF0C" />
<Limb Name="gGekkoJawLimb" Type="Standard" Offset="0xDF18" />
<Limb Name="gGekkoLeftEyeLimb" Type="Standard" Offset="0xDF24" />
<Limb Name="gGekkoRightEyeLimb" Type="Standard" Offset="0xDF30" />
<Skeleton Name="gGekkoSkel" Type="Flex" LimbType="Standard" Offset="0xDF98" />
<Limb Name="gGekkoRootLimb" Type="Standard" EnumName="GEKKO_LIMB_ROOT" Offset="0xDE28" />
<Limb Name="gGekkoWaistLimb" Type="Standard" EnumName="GEKKO_LIMB_WAIST" Offset="0xDE34" />
<Limb Name="gGekkoLeftThighLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_THIGH" Offset="0xDE40" />
<Limb Name="gGekkoLeftShinLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_SHIN" Offset="0xDE4C" />
<Limb Name="gGekkoLeftAnkleLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_ANKLE" Offset="0xDE58" />
<Limb Name="gGekkoLeftFootLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_FOOT" Offset="0xDE64" />
<Limb Name="gGekkoRightThighLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_THIGH" Offset="0xDE70" />
<Limb Name="gGekkoRightShinLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_SHIN" Offset="0xDE7C" />
<Limb Name="gGekkoRightAnkleLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_ANKLE" Offset="0xDE88" />
<Limb Name="gGekkoRightFootLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_FOOT" Offset="0xDE94" />
<Limb Name="gGekkoTorsoLimb" Type="Standard" EnumName="GEKKO_LIMB_TORSO" Offset="0xDEA0" />
<Limb Name="gGekkoLeftUpperArmLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_UPPER_ARM" Offset="0xDEAC" />
<Limb Name="gGekkoLeftForearmLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_FOREARM" Offset="0xDEB8" />
<Limb Name="gGekkoLeftWristLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_WRIST" Offset="0xDEC4" />
<Limb Name="gGekkoLeftHandLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_HAND" Offset="0xDED0" />
<Limb Name="gGekkoRightUpperArmLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_UPPER_ARM" Offset="0xDEDC" />
<Limb Name="gGekkoRightForearmLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_FOREARM" Offset="0xDEE8" />
<Limb Name="gGekkoRightWristLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_WRIST" Offset="0xDEF4" />
<Limb Name="gGekkoRightHandLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_HAND" Offset="0xDF00" />
<Limb Name="gGekkoHeadLimb" Type="Standard" EnumName="GEKKO_LIMB_HEAD" Offset="0xDF0C" />
<Limb Name="gGekkoJawLimb" Type="Standard" EnumName="GEKKO_LIMB_JAW" Offset="0xDF18" />
<Limb Name="gGekkoLeftEyeLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_EYE" Offset="0xDF24" />
<Limb Name="gGekkoRightEyeLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_EYE" Offset="0xDF30" />
<Skeleton Name="gGekkoSkel" Type="Flex" LimbType="Standard" LimbNone="GEKKO_LIMB_NONE" LimbMax="GEKKO_LIMB_MAX" EnumName="GekkoLimbs" Offset="0xDF98" />
<Animation Name="gGekkoWindupPunchAnim" Offset="0xF048" />
<Animation Name="gGekkoSwimUpAnim" Offset="0xF3F0" />

69
assets/xml/objects/object_bji.xml
View File

@ -3,21 +3,23 @@
<Animation Name="object_bji_Anim_00066C" Offset="0x66C" />
<Animation Name="object_bji_Anim_000AB0" Offset="0xAB0" />
<Animation Name="object_bji_Anim_000FDC" Offset="0xFDC" />
<DList Name="object_bji_DL_0023A0" Offset="0x23A0" />
<DList Name="object_bji_DL_0028D8" Offset="0x28D8" />
<DList Name="object_bji_DL_002998" Offset="0x2998" />
<DList Name="object_bji_DL_002A98" Offset="0x2A98" />
<DList Name="object_bji_DL_002BA8" Offset="0x2BA8" />
<DList Name="object_bji_DL_002C68" Offset="0x2C68" />
<DList Name="object_bji_DL_002D68" Offset="0x2D68" />
<DList Name="object_bji_DL_002E78" Offset="0x2E78" />
<DList Name="object_bji_DL_0030F0" Offset="0x30F0" />
<DList Name="object_bji_DL_0031B0" Offset="0x31B0" />
<DList Name="object_bji_DL_003270" Offset="0x3270" />
<DList Name="object_bji_DL_003330" Offset="0x3330" />
<DList Name="object_bji_DL_0033F0" Offset="0x33F0" />
<DList Name="object_bji_DL_0034B0" Offset="0x34B0" />
<DList Name="object_bji_DL_003570" Offset="0x3570" />
<DList Name="gShikashiHeadDL" Offset="0x23A0" />
<DList Name="gShikashiRightHandDL" Offset="0x28D8" />
<DList Name="gShikashiRightForearmDL" Offset="0x2998" />
<DList Name="gShikashiRightArmDL" Offset="0x2A98" />
<DList Name="gShikashiLeftHandDL" Offset="0x2BA8" />
<DList Name="gShikashiLeftForearmDL" Offset="0x2C68" />
<DList Name="gShikashiLeftArmDL" Offset="0x2D68" />
<DList Name="gShikashiTorsoDL" Offset="0x2E78" />
<DList Name="gShikashiRightFootDL" Offset="0x30F0" />
<DList Name="gShikashiRightLegDL" Offset="0x31B0" />
<DList Name="gShikashiRightThighDL" Offset="0x3270" />
<DList Name="gShikashiLeftFootDL" Offset="0x3330" />
<DList Name="gShikashiLeftLegDL" Offset="0x33F0" />
<DList Name="gShikashiLeftThighDL" Offset="0x34B0" />
<DList Name="gShikashiPelvisDL" Offset="0x3570" />
<Texture Name="object_bji_TLUT_003730" OutName="tlut_003730" Format="rgba16" Width="16" Height="16" Offset="0x3730" />
<Texture Name="object_bji_TLUT_003930" OutName="tlut_003930" Format="rgba16" Width="16" Height="16" Offset="0x3930" />
<Texture Name="object_bji_TLUT_003B30" OutName="tlut_003B30" Format="rgba16" Width="16" Height="16" Offset="0x3B30" />
@ -36,22 +38,27 @@
<Texture Name="object_bji_Tex_004E30" OutName="tex_004E30" Format="ci8" Width="8" Height="8" Offset="0x4E30" />
<Texture Name="object_bji_Tex_004E70" OutName="tex_004E70" Format="ci8" Width="32" Height="32" Offset="0x4E70" />
<Texture Name="object_bji_Tex_005270" OutName="tex_005270" Format="ci8" Width="32" Height="32" Offset="0x5270" />
<Limb Name="object_bji_Standardlimb_00569C" Type="Standard" EnumName="OBJECT_BJI_LIMB_01" Offset="0x569C" />
<Limb Name="object_bji_Standardlimb_0056A8" Type="Standard" EnumName="OBJECT_BJI_LIMB_02" Offset="0x56A8" />
<Limb Name="object_bji_Standardlimb_0056B4" Type="Standard" EnumName="OBJECT_BJI_LIMB_03" Offset="0x56B4" />
<Limb Name="object_bji_Standardlimb_0056C0" Type="Standard" EnumName="OBJECT_BJI_LIMB_04" Offset="0x56C0" />
<Limb Name="object_bji_Standardlimb_0056CC" Type="Standard" EnumName="OBJECT_BJI_LIMB_05" Offset="0x56CC" />
<Limb Name="object_bji_Standardlimb_0056D8" Type="Standard" EnumName="OBJECT_BJI_LIMB_06" Offset="0x56D8" />
<Limb Name="object_bji_Standardlimb_0056E4" Type="Standard" EnumName="OBJECT_BJI_LIMB_07" Offset="0x56E4" />
<Limb Name="object_bji_Standardlimb_0056F0" Type="Standard" EnumName="OBJECT_BJI_LIMB_08" Offset="0x56F0" />
<Limb Name="object_bji_Standardlimb_0056FC" Type="Standard" EnumName="OBJECT_BJI_LIMB_09" Offset="0x56FC" />
<Limb Name="object_bji_Standardlimb_005708" Type="Standard" EnumName="OBJECT_BJI_LIMB_0A" Offset="0x5708" />
<Limb Name="object_bji_Standardlimb_005714" Type="Standard" EnumName="OBJECT_BJI_LIMB_0B" Offset="0x5714" />
<Limb Name="object_bji_Standardlimb_005720" Type="Standard" EnumName="OBJECT_BJI_LIMB_0C" Offset="0x5720" />
<Limb Name="object_bji_Standardlimb_00572C" Type="Standard" EnumName="OBJECT_BJI_LIMB_0D" Offset="0x572C" />
<Limb Name="object_bji_Standardlimb_005738" Type="Standard" EnumName="OBJECT_BJI_LIMB_0E" Offset="0x5738" />
<Limb Name="object_bji_Standardlimb_005744" Type="Standard" EnumName="OBJECT_BJI_LIMB_0F" Offset="0x5744" />
<Skeleton Name="object_bji_Skel_00578C" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BJI_LIMB_NONE" LimbMax="OBJECT_BJI_LIMB_MAX" EnumName="object_bji_Limbs" Offset="0x578C" />
<!-- Unused Eye Texture Animation -->
<TextureAnimation Name="gShikashiEyeTexAnim" Offset="0x5694" />
<Limb Name="gShikashiPelvisLimb" Type="Standard" EnumName="SHIKASHI_LIMB_PELVIS" Offset="0x569C" />
<Limb Name="gShikashiLeftThighLimb" Type="Standard" EnumName="SHIKASHI_LIMB_LEFT_THIGH" Offset="0x56A8" />
<Limb Name="gShikashiLeftLegLimb" Type="Standard" EnumName="SHIKASHI_LIMB_LEFT_LEG" Offset="0x56B4" />
<Limb Name="gShikashiLeftFootLimb" Type="Standard" EnumName="SHIKASHI_LIMB_LEFT_FOOT" Offset="0x56C0" />
<Limb Name="gShikashiRightThighLimb" Type="Standard" EnumName="SHIKASHI_LIMB_RIGHT_THIGH" Offset="0x56CC" />
<Limb Name="gShikashiRightLegLimb" Type="Standard" EnumName="SHIKASHI_LIMB_RIGHT_LEG" Offset="0x56D8" />
<Limb Name="gShikashiRightFootLimb" Type="Standard" EnumName="SHIKASHI_LIMB_RIGHT_FOOT" Offset="0x56E4" />
<Limb Name="gShikashiTorsoLimb" Type="Standard" EnumName="SHIKASHI_LIMB_TORSO" Offset="0x56F0" />
<Limb Name="gShikashiLeftArmLimb" Type="Standard" EnumName="SHIKASHI_LIMB_LEFT_ARM" Offset="0x56FC" />
<Limb Name="gShikashiLeftForearmLimb" Type="Standard" EnumName="SHIKASHI_LIMB_LEFT_FOREARM" Offset="0x5708" />
<Limb Name="gShikashiLeftHandLimb" Type="Standard" EnumName="SHIKASHI_LIMB_LEFT_HAND" Offset="0x5714" />
<Limb Name="gShikashiRightArmLimb" Type="Standard" EnumName="SHIKASHI_LIMB_RIGHT_ARM" Offset="0x5720" />
<Limb Name="gShikashiRightForearmLimb" Type="Standard" EnumName="SHIKASHI_LIMB_RIGHT_FOREARM" Offset="0x572C" />
<Limb Name="gShikashiRightHandLimb" Type="Standard" EnumName="SHIKASHI_LIMB_RIGHT_HAND" Offset="0x5738" />
<Limb Name="gShikashiHeadLimb" Type="Standard" EnumName="SHIKASHI_LIMB_HEAD" Offset="0x5744" />
<Skeleton Name="gShikashiSkel" Type="Flex" LimbType="Standard" LimbNone="SHIKASHI_LIMB_NONE" LimbMax="SHIKASHI_LIMB_MAX" EnumName="ShikashiLimbs" Offset="0x578C" />
<Animation Name="object_bji_Anim_005B58" Offset="0x5B58" />
</File>
</Root>

4
assets/xml/objects/object_fsn.xml
View File

@ -53,8 +53,8 @@
<Texture Name="gFsnUnusedEyeHalfTex" OutName="fsn_unused_eye_half" Format="rgba32" Width="32" Height="32" Offset="0x9640" />
<Texture Name="gFsnUnusedEyeClosedTex" OutName="fsn_unused_eye_closed" Format="rgba32" Width="32" Height="32" Offset="0xA640" />
<!-- Unused Empty Eye Texture Animation -->
<TextureAnimation Name="gFsnUnusedTexAnim" Offset="0xB664" />
<!-- Unused Eye Texture Animation -->
<TextureAnimation Name="gFsnEyeTexAnim" Offset="0xB664" />
<!-- Animations -->
<Animation Name="gFsnSlamCounterStartAnim" Offset="0xB9D8" />

152
assets/xml/objects/object_harfgibud.xml
View File

@ -5,23 +5,25 @@
<Animation Name="object_harfgibud_Anim_0015D4" Offset="0x15D4" />
<Animation Name="object_harfgibud_Anim_001960" Offset="0x1960" />
<Animation Name="object_harfgibud_Anim_00260C" Offset="0x260C" />
<DList Name="object_harfgibud_DL_005790" Offset="0x5790" />
<DList Name="object_harfgibud_DL_005878" Offset="0x5878" />
<DList Name="object_harfgibud_DL_005978" Offset="0x5978" />
<DList Name="object_harfgibud_DL_005A60" Offset="0x5A60" />
<DList Name="object_harfgibud_DL_005B50" Offset="0x5B50" />
<DList Name="object_harfgibud_DL_005C50" Offset="0x5C50" />
<DList Name="object_harfgibud_DL_005D38" Offset="0x5D38" />
<DList Name="object_harfgibud_DL_005E28" Offset="0x5E28" />
<DList Name="object_harfgibud_DL_005ED0" Offset="0x5ED0" />
<DList Name="object_harfgibud_DL_0065B0" Offset="0x65B0" />
<DList Name="object_harfgibud_DL_0067C8" Offset="0x67C8" />
<DList Name="object_harfgibud_DL_006988" Offset="0x6988" />
<DList Name="object_harfgibud_DL_006B80" Offset="0x6B80" />
<DList Name="object_harfgibud_DL_006C80" Offset="0x6C80" />
<DList Name="object_harfgibud_DL_006DB8" Offset="0x6DB8" />
<DList Name="object_harfgibud_DL_006EA0" Offset="0x6EA0" />
<DList Name="object_harfgibud_DL_006F98" Offset="0x6F98" />
<DList Name="gHarfgibudGibdoPelvisDL" Offset="0x5790" />
<DList Name="gHarfgibudGibdoRightFootDL" Offset="0x5878" />
<DList Name="gHarfgibudGibdoRightLegDL" Offset="0x5978" />
<DList Name="gHarfgibudGibdoRightThighDL" Offset="0x5A60" />
<DList Name="gHarfgibudGibdoLeftFootDL" Offset="0x5B50" />
<DList Name="gHarfgibudGibdoLeftLegDL" Offset="0x5C50" />
<DList Name="gHarfgibudGibdoLeftThighDL" Offset="0x5D38" />
<DList Name="gHarfgibudGibdoEyebrowsDL" Offset="0x5E28" />
<DList Name="gHarfgibudGibdoHeadDL" Offset="0x5ED0" />
<DList Name="gHarfgibudGibdoChestDL" Offset="0x65B0" />
<DList Name="gHarfgibudGibdoRightHandDL" Offset="0x67C8" />
<DList Name="gHarfgibudGibdoRightForearmDL" Offset="0x6988" />
<DList Name="gHarfgibudGibdoRightUpperArmDL" Offset="0x6B80" />
<DList Name="gHarfgibudGibdoLeftHandDL" Offset="0x6C80" />
<DList Name="gHarfgibudGibdoLeftForearmDL" Offset="0x6DB8" />
<DList Name="gHarfgibudGibdoLeftUpperArmDL" Offset="0x6EA0" />
<DList Name="gHarfgibudGibdoAbdomenDL" Offset="0x6F98" />
<Texture Name="object_harfgibud_TLUT_0070A0" OutName="tlut_0070A0" Format="rgba16" Width="16" Height="16" Offset="0x70A0" />
<Texture Name="object_harfgibud_Tex_0072A0" OutName="tex_0072A0" Format="i8" Width="64" Height="32" Offset="0x72A0" />
<Texture Name="object_harfgibud_Tex_007AA0" OutName="tex_007AA0" Format="ci8" Width="8" Height="8" Offset="0x7AA0" />
@ -35,47 +37,51 @@
<Texture Name="object_harfgibud_Tex_008320" OutName="tex_008320" Format="rgba16" Width="8" Height="8" Offset="0x8320" />
<Texture Name="object_harfgibud_Tex_0083A0" OutName="tex_0083A0" Format="ci8" Width="16" Height="8" Offset="0x83A0" />
<Texture Name="object_harfgibud_Tex_008420" OutName="tex_008420" Format="i8" Width="8" Height="8" Offset="0x8420" />
<Limb Name="object_harfgibud_Standardlimb_008460" Type="Standard" EnumName="OBJECT_HARFGIBUD_1_LIMB_01" Offset="0x8460" />
<Limb Name="object_harfgibud_Standardlimb_00846C" Type="Standard" EnumName="OBJECT_HARFGIBUD_1_LIMB_02" Offset="0x846C" />
<Limb Name="object_harfgibud_Standardlimb_008478" Type="Standard" EnumName="OBJECT_HARFGIBUD_1_LIMB_03" Offset="0x8478" />
<Limb Name="object_harfgibud_Standardlimb_008484" Type="Standard" EnumName="OBJECT_HARFGIBUD_1_LIMB_04" Offset="0x8484" />
<Limb Name="object_harfgibud_Standardlimb_008490" Type="Standard" EnumName="OBJECT_HARFGIBUD_1_LIMB_05" Offset="0x8490" />
<Limb Name="object_harfgibud_Standardlimb_00849C" Type="Standard" EnumName="OBJECT_HARFGIBUD_1_LIMB_06" Offset="0x849C" />
<Limb Name="object_harfgibud_Standardlimb_0084A8" Type="Standard" EnumName="OBJECT_HARFGIBUD_1_LIMB_07" Offset="0x84A8" />
<Limb Name="object_harfgibud_Standardlimb_0084B4" Type="Standard" EnumName="OBJECT_HARFGIBUD_1_LIMB_08" Offset="0x84B4" />
<Limb Name="object_harfgibud_Standardlimb_0084C0" Type="Standard" EnumName="OBJECT_HARFGIBUD_1_LIMB_09" Offset="0x84C0" />
<Limb Name="object_harfgibud_Standardlimb_0084CC" Type="Standard" EnumName="OBJECT_HARFGIBUD_1_LIMB_0A" Offset="0x84CC" />
<Limb Name="object_harfgibud_Standardlimb_0084D8" Type="Standard" EnumName="OBJECT_HARFGIBUD_1_LIMB_0B" Offset="0x84D8" />
<Limb Name="object_harfgibud_Standardlimb_0084E4" Type="Standard" EnumName="OBJECT_HARFGIBUD_1_LIMB_0C" Offset="0x84E4" />
<Limb Name="object_harfgibud_Standardlimb_0084F0" Type="Standard" EnumName="OBJECT_HARFGIBUD_1_LIMB_0D" Offset="0x84F0" />
<Limb Name="object_harfgibud_Standardlimb_0084FC" Type="Standard" EnumName="OBJECT_HARFGIBUD_1_LIMB_0E" Offset="0x84FC" />
<Limb Name="object_harfgibud_Standardlimb_008508" Type="Standard" EnumName="OBJECT_HARFGIBUD_1_LIMB_0F" Offset="0x8508" />
<Limb Name="object_harfgibud_Standardlimb_008514" Type="Standard" EnumName="OBJECT_HARFGIBUD_1_LIMB_10" Offset="0x8514" />
<Limb Name="object_harfgibud_Standardlimb_008520" Type="Standard" EnumName="OBJECT_HARFGIBUD_1_LIMB_11" Offset="0x8520" />
<Limb Name="object_harfgibud_Standardlimb_00852C" Type="Standard" EnumName="OBJECT_HARFGIBUD_1_LIMB_12" Offset="0x852C" />
<Skeleton Name="object_harfgibud_Skel_008580" Type="Flex" LimbType="Standard" LimbNone="OBJECT_HARFGIBUD_1_LIMB_NONE" LimbMax="OBJECT_HARFGIBUD_1_LIMB_MAX" EnumName="object_harfgibud_1_Limbs" Offset="0x8580" />
<Limb Name="gHarfgibudGibdoRootLimb" Type="Standard" EnumName="HARFGIBUD_GIBDO_LIMB_ROOT" Offset="0x8460" />
<Limb Name="gHarfgibudGibdoAbdomenLimb" Type="Standard" EnumName="HARFGIBUD_GIBDO_LIMB_ABDOMEN" Offset="0x846C" />
<Limb Name="gHarfgibudGibdoChestLimb" Type="Standard" EnumName="HARFGIBUD_GIBDO_LIMB_CHEST" Offset="0x8478" />
<Limb Name="gHarfgibudGibdoLeftUpperArmLimb" Type="Standard" EnumName="HARFGIBUD_GIBDO_LIMB_LEFT_UPPER_ARM" Offset="0x8484" />
<Limb Name="gHarfgibudGibdoLeftForearmLimb" Type="Standard" EnumName="HARFGIBUD_GIBDO_LIMB_LEFT_FOREARM" Offset="0x8490" />
<Limb Name="gHarfgibudGibdoLeftHandLimb" Type="Standard" EnumName="HARFGIBUD_GIBDO_LIMB_LEFT_HAND" Offset="0x849C" />
<Limb Name="gHarfgibudGibdoRightUpperArmLimb" Type="Standard" EnumName="HARFGIBUD_GIBDO_LIMB_RIGHT_UPPER_ARM" Offset="0x84A8" />
<Limb Name="gHarfgibudGibdoRightForearmLimb" Type="Standard" EnumName="HARFGIBUD_GIBDO_LIMB_RIGHT_FOREARM" Offset="0x84B4" />
<Limb Name="gHarfgibudGibdoRightHandLimb" Type="Standard" EnumName="HARFGIBUD_GIBDO_LIMB_RIGHT_HAND" Offset="0x84C0" />
<Limb Name="gHarfgibudGibdoEyebrowsLimb" Type="Standard" EnumName="HARFGIBUD_GIBDO_LIMB_EYEBROWS" Offset="0x84CC" />
<Limb Name="gHarfgibudGibdoHeadLimb" Type="Standard" EnumName="HARFGIBUD_GIBDO_LIMB_HEAD" Offset="0x84D8" />
<Limb Name="gHarfgibudGibdoPelvisLimb" Type="Standard" EnumName="HARFGIBUD_GIBDO_LIMB_PELVIS" Offset="0x84E4" />
<Limb Name="gHarfgibudGibdoLeftThighLimb" Type="Standard" EnumName="HARFGIBUD_GIBDO_LIMB_LEFT_THIGH" Offset="0x84F0" />
<Limb Name="gHarfgibudGibdoLeftLegLimb" Type="Standard" EnumName="HARFGIBUD_GIBDO_LIMB_LEFT_LEG" Offset="0x84FC" />
<Limb Name="gHarfgibudGibdoLeftFootLimb" Type="Standard" EnumName="HARFGIBUD_GIBDO_LIMB_LEFT_FOOT" Offset="0x8508" />
<Limb Name="gHarfgibudGibdoRightThighLimb" Type="Standard" EnumName="HARFGIBUD_GIBDO_LIMB_RIGHT_THIGH" Offset="0x8514" />
<Limb Name="gHarfgibudGibdoRightLegLimb" Type="Standard" EnumName="HARFGIBUD_GIBDO_LIMB_RIGHT_LEG" Offset="0x8520" />
<Limb Name="gHarfgibudGibdoRightFootLimb" Type="Standard" EnumName="HARFGIBUD_GIBDO_LIMB_RIGHT_FOOT" Offset="0x852C" />
<Skeleton Name="gHarfgibudGibdoSkel" Type="Flex" LimbType="Standard" LimbNone="HARFGIBUD_GIBDO_LIMB_NONE" LimbMax="HARFGIBUD_GIBDO_LIMB_MAX" EnumName="HarfgibudGibdoLimbs" Offset="0x8580" />
<Animation Name="object_harfgibud_Anim_009D44" Offset="0x9D44" />
<Animation Name="object_harfgibud_Anim_00A164" Offset="0xA164" />
<Animation Name="object_harfgibud_Anim_00AE1C" Offset="0xAE1C" />
<TextureAnimation Name="object_harfgibud_Matanimheader_00AE50" Offset="0xAE50" />
<Animation Name="object_harfgibud_Anim_00B644" Offset="0xB644" />
<DList Name="object_harfgibud_DL_00E860" Offset="0xE860" />
<DList Name="object_harfgibud_DL_00E9E0" Offset="0xE9E0" />
<DList Name="object_harfgibud_DL_00EB28" Offset="0xEB28" />
<DList Name="object_harfgibud_DL_00EC48" Offset="0xEC48" />
<DList Name="object_harfgibud_DL_00EE50" Offset="0xEE50" />
<DList Name="object_harfgibud_DL_00EF98" Offset="0xEF98" />
<DList Name="object_harfgibud_DL_00F0B8" Offset="0xF0B8" />
<DList Name="object_harfgibud_DL_00F248" Offset="0xF248" />
<DList Name="object_harfgibud_DL_00F2F0" Offset="0xF2F0" />
<DList Name="object_harfgibud_DL_00F838" Offset="0xF838" />
<DList Name="object_harfgibud_DL_00FAA8" Offset="0xFAA8" />
<DList Name="object_harfgibud_DL_00FC10" Offset="0xFC10" />
<DList Name="object_harfgibud_DL_00FE08" Offset="0xFE08" />
<DList Name="object_harfgibud_DL_00FF10" Offset="0xFF10" />
<DList Name="object_harfgibud_DL_010078" Offset="0x10078" />
<DList Name="object_harfgibud_DL_0102B8" Offset="0x102B8" />
<DList Name="object_harfgibud_DL_0103C0" Offset="0x103C0" />
<DList Name="gHarfgibudHumanPelvisDL" Offset="0xE860" />
<DList Name="gHarfgibudHumanRightFootDL" Offset="0xE9E0" />
<DList Name="gHarfgibudHumanRightLegDL" Offset="0xEB28" />
<DList Name="gHarfgibudHumanRightThighDL" Offset="0xEC48" />
<DList Name="gHarfgibudHumanLeftFootDL" Offset="0xEE50" />
<DList Name="gHarfgibudHumanLeftLegDL" Offset="0xEF98" />
<DList Name="gHarfgibudHumanLeftThighDL" Offset="0xF0B8" />
<DList Name="gHarfgibudHumanEyebrowsDL" Offset="0xF248" />
<DList Name="gHarfgibudHumanHeadDL" Offset="0xF2F0" />
<DList Name="gHarfgibudHumanChestDL" Offset="0xF838" />
<DList Name="gHarfgibudHumanRightHandDL" Offset="0xFAA8" />
<DList Name="gHarfgibudHumanRightForearmDL" Offset="0xFC10" />
<DList Name="gHarfgibudHumanRightUpperArmDL" Offset="0xFE08" />
<DList Name="gHarfgibudHumanLeftHandDL" Offset="0xFF10" />
<DList Name="gHarfgibudHumanLeftForearmDL" Offset="0x10078" />
<DList Name="gHarfgibudHumanLeftUpperArmDL" Offset="0x102B8" />
<DList Name="gHarfgibudHumanAbdomenDL" Offset="0x103C0" />
<Texture Name="object_harfgibud_TLUT_010578" OutName="tlut_010578" Format="rgba16" Width="16" Height="16" Offset="0x10578" />
<Texture Name="object_harfgibud_Tex_010778" OutName="tex_010778" Format="ci8" Width="8" Height="8" Offset="0x10778" />
<Texture Name="object_harfgibud_Tex_0107B8" OutName="tex_0107B8" Format="ci8" Width="16" Height="16" Offset="0x107B8" />
@ -91,25 +97,27 @@
<Texture Name="object_harfgibud_Tex_011138" OutName="tex_011138" Format="rgba16" Width="32" Height="32" Offset="0x11138" />
<Texture Name="object_harfgibud_Tex_011938" OutName="tex_011938" Format="rgba16" Width="32" Height="32" Offset="0x11938" />
<Texture Name="object_harfgibud_Tex_012138" OutName="tex_012138" Format="rgba16" Width="32" Height="32" Offset="0x12138" />
<Limb Name="object_harfgibud_Standardlimb_012938" Type="Standard" EnumName="OBJECT_HARFGIBUD_2_LIMB_01" Offset="0x12938" />
<Limb Name="object_harfgibud_Standardlimb_012944" Type="Standard" EnumName="OBJECT_HARFGIBUD_2_LIMB_02" Offset="0x12944" />
<Limb Name="object_harfgibud_Standardlimb_012950" Type="Standard" EnumName="OBJECT_HARFGIBUD_2_LIMB_03" Offset="0x12950" />
<Limb Name="object_harfgibud_Standardlimb_01295C" Type="Standard" EnumName="OBJECT_HARFGIBUD_2_LIMB_04" Offset="0x1295C" />
<Limb Name="object_harfgibud_Standardlimb_012968" Type="Standard" EnumName="OBJECT_HARFGIBUD_2_LIMB_05" Offset="0x12968" />
<Limb Name="object_harfgibud_Standardlimb_012974" Type="Standard" EnumName="OBJECT_HARFGIBUD_2_LIMB_06" Offset="0x12974" />
<Limb Name="object_harfgibud_Standardlimb_012980" Type="Standard" EnumName="OBJECT_HARFGIBUD_2_LIMB_07" Offset="0x12980" />
<Limb Name="object_harfgibud_Standardlimb_01298C" Type="Standard" EnumName="OBJECT_HARFGIBUD_2_LIMB_08" Offset="0x1298C" />
<Limb Name="object_harfgibud_Standardlimb_012998" Type="Standard" EnumName="OBJECT_HARFGIBUD_2_LIMB_09" Offset="0x12998" />
<Limb Name="object_harfgibud_Standardlimb_0129A4" Type="Standard" EnumName="OBJECT_HARFGIBUD_2_LIMB_0A" Offset="0x129A4" />
<Limb Name="object_harfgibud_Standardlimb_0129B0" Type="Standard" EnumName="OBJECT_HARFGIBUD_2_LIMB_0B" Offset="0x129B0" />
<Limb Name="object_harfgibud_Standardlimb_0129BC" Type="Standard" EnumName="OBJECT_HARFGIBUD_2_LIMB_0C" Offset="0x129BC" />
<Limb Name="object_harfgibud_Standardlimb_0129C8" Type="Standard" EnumName="OBJECT_HARFGIBUD_2_LIMB_0D" Offset="0x129C8" />
<Limb Name="object_harfgibud_Standardlimb_0129D4" Type="Standard" EnumName="OBJECT_HARFGIBUD_2_LIMB_0E" Offset="0x129D4" />
<Limb Name="object_harfgibud_Standardlimb_0129E0" Type="Standard" EnumName="OBJECT_HARFGIBUD_2_LIMB_0F" Offset="0x129E0" />
<Limb Name="object_harfgibud_Standardlimb_0129EC" Type="Standard" EnumName="OBJECT_HARFGIBUD_2_LIMB_10" Offset="0x129EC" />
<Limb Name="object_harfgibud_Standardlimb_0129F8" Type="Standard" EnumName="OBJECT_HARFGIBUD_2_LIMB_11" Offset="0x129F8" />
<Limb Name="object_harfgibud_Standardlimb_012A04" Type="Standard" EnumName="OBJECT_HARFGIBUD_2_LIMB_12" Offset="0x12A04" />
<Skeleton Name="object_harfgibud_Skel_012A58" Type="Flex" LimbType="Standard" LimbNone="OBJECT_HARFGIBUD_2_LIMB_NONE" LimbMax="OBJECT_HARFGIBUD_2_LIMB_MAX" EnumName="object_harfgibud_2_Limbs" Offset="0x12A58" />
<Limb Name="gHarfgibudHumanRootLimb" Type="Standard" EnumName="HARFGIBUD_HUMAN_LIMB_ROOT" Offset="0x12938" />
<Limb Name="gHarfgibudHumanAbdomenLimb" Type="Standard" EnumName="HARFGIBUD_HUMAN_LIMB_ABDOMEN" Offset="0x12944" />
<Limb Name="gHarfgibudHumanChestLimb" Type="Standard" EnumName="HARFGIBUD_HUMAN_LIMB_CHEST" Offset="0x12950" />
<Limb Name="gHarfgibudHumanLeftUpperArmLimb" Type="Standard" EnumName="HARFGIBUD_HUMAN_LIMB_LEFT_UPPER_ARM" Offset="0x1295C" />
<Limb Name="gHarfgibudHumanLeftForearmLimb" Type="Standard" EnumName="HARFGIBUD_HUMAN_LIMB_LEFT_FOREARM" Offset="0x12968" />
<Limb Name="gHarfgibudHumanLeftHandLimb" Type="Standard" EnumName="HARFGIBUD_HUMAN_LIMB_LEFT_HAND" Offset="0x12974" />
<Limb Name="gHarfgibudHumanRightUpperArmLimb" Type="Standard" EnumName="HARFGIBUD_HUMAN_LIMB_RIGHT_UPPER_ARM" Offset="0x12980" />
<Limb Name="gHarfgibudHumanRightForearmLimb" Type="Standard" EnumName="HARFGIBUD_HUMAN_LIMB_RIGHT_FOREARM" Offset="0x1298C" />
<Limb Name="gHarfgibudHumanRightHandLimb" Type="Standard" EnumName="HARFGIBUD_HUMAN_LIMB_RIGHT_HAND" Offset="0x12998" />
<Limb Name="gHarfgibudHumanEyebrowsLimb" Type="Standard" EnumName="HARFGIBUD_HUMAN_LIMB_EYEBROWS" Offset="0x129A4" />
<Limb Name="gHarfgibudHumanHeadLimb" Type="Standard" EnumName="HARFGIBUD_HUMAN_LIMB_HEAD" Offset="0x129B0" />
<Limb Name="gHarfgibudHumanPelvisLimb" Type="Standard" EnumName="HARFGIBUD_HUMAN_LIMB_PELVIS" Offset="0x129BC" />
<Limb Name="gHarfgibudHumanLeftThighLimb" Type="Standard" EnumName="HARFGIBUD_HUMAN_LIMB_LEFT_THIGH" Offset="0x129C8" />
<Limb Name="gHarfgibudHumanLeftLegLimb" Type="Standard" EnumName="HARFGIBUD_HUMAN_LIMB_LEFT_LEG" Offset="0x129D4" />
<Limb Name="gHarfgibudHumanLeftFootLimb" Type="Standard" EnumName="HARFGIBUD_HUMAN_LIMB_LEFT_FOOT" Offset="0x129E0" />
<Limb Name="gHarfgibudHumanRightThighLimb" Type="Standard" EnumName="HARFGIBUD_HUMAN_LIMB_RIGHT_THIGH" Offset="0x129EC" />
<Limb Name="gHarfgibudHumanRightLegLimb" Type="Standard" EnumName="HARFGIBUD_HUMAN_LIMB_RIGHT_LEG" Offset="0x129F8" />
<Limb Name="gHarfgibudHumanRightFootLimb" Type="Standard" EnumName="HARFGIBUD_HUMAN_LIMB_RIGHT_FOOT" Offset="0x12A04" />
<Skeleton Name="gHarfgibudHumanSkel" Type="Flex" LimbType="Standard" LimbNone="HARFGIBUD_HUMAN_LIMB_NONE" LimbMax="HARFGIBUD_HUMAN_LIMB_MAX" EnumName="HarfgibudHumanLimbs" Offset="0x12A58" />
<Animation Name="object_harfgibud_Anim_013684" Offset="0x13684" />
<Animation Name="object_harfgibud_Anim_014220" Offset="0x14220" />
<Animation Name="object_harfgibud_Anim_014A9C" Offset="0x14A9C" />

90
assets/xml/objects/object_pamera.xml
View File

@ -1,26 +1,28 @@
<Root>
<File Name="object_pamera" Segment="6">
<Animation Name="object_pamera_Anim_0005BC" Offset="0x5BC" />
<DList Name="object_pamera_DL_002E50" Offset="0x2E50" />
<DList Name="object_pamera_DL_002FB8" Offset="0x2FB8" />
<DList Name="object_pamera_DL_0030D0" Offset="0x30D0" />
<DList Name="object_pamera_DL_0031B0" Offset="0x31B0" />
<DList Name="object_pamera_DL_003520" Offset="0x3520" />
<DList Name="object_pamera_DL_0037B8" Offset="0x37B8" />
<DList Name="object_pamera_DL_0039C0" Offset="0x39C0" />
<DList Name="object_pamera_DL_003D60" Offset="0x3D60" />
<DList Name="object_pamera_DL_003F78" Offset="0x3F78" />
<DList Name="object_pamera_DL_004180" Offset="0x4180" />
<DList Name="object_pamera_DL_004520" Offset="0x4520" />
<DList Name="object_pamera_DL_004AC0" Offset="0x4AC0" />
<DList Name="object_pamera_DL_004C88" Offset="0x4C88" />
<DList Name="object_pamera_DL_004E00" Offset="0x4E00" />
<DList Name="object_pamera_DL_004F78" Offset="0x4F78" />
<DList Name="object_pamera_DL_005158" Offset="0x5158" />
<DList Name="object_pamera_DL_0054B8" Offset="0x54B8" />
<DList Name="object_pamera_DL_005830" Offset="0x5830" />
<DList Name="object_pamera_DL_005A10" Offset="0x5A10" />
<DList Name="object_pamera_DL_005D70" Offset="0x5D70" />
<DList Name="gPamelaAbdomenDL" Offset="0x2E50" />
<DList Name="gPamelaPelvisDL" Offset="0x2FB8" />
<DList Name="gPamelaNeckDL" Offset="0x30D0" />
<DList Name="gPamelaChestDL" Offset="0x31B0" />
<DList Name="gPamelaLeftUpperArmDL" Offset="0x3520" />
<DList Name="gPamelaLeftForearmDL" Offset="0x37B8" />
<DList Name="gPamelaLeftHandDL" Offset="0x39C0" />
<DList Name="gPamelaRightUpperArmDL" Offset="0x3D60" />
<DList Name="gPamelaRightForearmDL" Offset="0x3F78" />
<DList Name="gPamelaRightHandDL" Offset="0x4180" />
<DList Name="gPamelaHeadDL" Offset="0x4520" />
<DList Name="gPamelaHairEndDL" Offset="0x4AC0" />
<DList Name="gPamelaBackDressDL" Offset="0x4C88" />
<DList Name="gPamelaFrontDressDL" Offset="0x4E00" />
<DList Name="gPamelaLeftThighDL" Offset="0x4F78" />
<DList Name="gPamelaLeftLegDL" Offset="0x5158" />
<DList Name="gPamelaLeftFootDL" Offset="0x54B8" />
<DList Name="gPamelaRightThighDL" Offset="0x5830" />
<DList Name="gPamelaRightLegDL" Offset="0x5A10" />
<DList Name="gPamelaRightFootDL" Offset="0x5D70" />
<Texture Name="object_pamera_TLUT_0060E8" OutName="tlut_0060E8" Format="rgba16" Width="16" Height="16" Offset="0x60E8" />
<Texture Name="object_pamera_Tex_0062E8" OutName="tex_0062E8" Format="ci8" Width="16" Height="16" Offset="0x62E8" />
<Texture Name="object_pamera_Tex_0063E8" OutName="tex_0063E8" Format="ci8" Width="16" Height="16" Offset="0x63E8" />
@ -38,29 +40,31 @@
<Texture Name="object_pamera_Tex_007FE8" OutName="tex_007FE8" Format="ci8" Width="16" Height="16" Offset="0x7FE8" />
<Texture Name="object_pamera_Tex_0080E8" OutName="tex_0080E8" Format="ci8" Width="16" Height="16" Offset="0x80E8" />
<Texture Name="object_pamera_Tex_0081E8" OutName="tex_0081E8" Format="ci8" Width="16" Height="16" Offset="0x81E8" />
<Limb Name="object_pamera_Standardlimb_0082E8" Type="Standard" EnumName="OBJECT_PAMERA_LIMB_01" Offset="0x82E8" />
<Limb Name="object_pamera_Standardlimb_0082F4" Type="Standard" EnumName="OBJECT_PAMERA_LIMB_02" Offset="0x82F4" />
<Limb Name="object_pamera_Standardlimb_008300" Type="Standard" EnumName="OBJECT_PAMERA_LIMB_03" Offset="0x8300" />
<Limb Name="object_pamera_Standardlimb_00830C" Type="Standard" EnumName="OBJECT_PAMERA_LIMB_04" Offset="0x830C" />
<Limb Name="object_pamera_Standardlimb_008318" Type="Standard" EnumName="OBJECT_PAMERA_LIMB_05" Offset="0x8318" />
<Limb Name="object_pamera_Standardlimb_008324" Type="Standard" EnumName="OBJECT_PAMERA_LIMB_06" Offset="0x8324" />
<Limb Name="object_pamera_Standardlimb_008330" Type="Standard" EnumName="OBJECT_PAMERA_LIMB_07" Offset="0x8330" />
<Limb Name="object_pamera_Standardlimb_00833C" Type="Standard" EnumName="OBJECT_PAMERA_LIMB_08" Offset="0x833C" />
<Limb Name="object_pamera_Standardlimb_008348" Type="Standard" EnumName="OBJECT_PAMERA_LIMB_09" Offset="0x8348" />
<Limb Name="object_pamera_Standardlimb_008354" Type="Standard" EnumName="OBJECT_PAMERA_LIMB_0A" Offset="0x8354" />
<Limb Name="object_pamera_Standardlimb_008360" Type="Standard" EnumName="OBJECT_PAMERA_LIMB_0B" Offset="0x8360" />
<Limb Name="object_pamera_Standardlimb_00836C" Type="Standard" EnumName="OBJECT_PAMERA_LIMB_0C" Offset="0x836C" />
<Limb Name="object_pamera_Standardlimb_008378" Type="Standard" EnumName="OBJECT_PAMERA_LIMB_0D" Offset="0x8378" />
<Limb Name="object_pamera_Standardlimb_008384" Type="Standard" EnumName="OBJECT_PAMERA_LIMB_0E" Offset="0x8384" />
<Limb Name="object_pamera_Standardlimb_008390" Type="Standard" EnumName="OBJECT_PAMERA_LIMB_0F" Offset="0x8390" />
<Limb Name="object_pamera_Standardlimb_00839C" Type="Standard" EnumName="OBJECT_PAMERA_LIMB_10" Offset="0x839C" />
<Limb Name="object_pamera_Standardlimb_0083A8" Type="Standard" EnumName="OBJECT_PAMERA_LIMB_11" Offset="0x83A8" />
<Limb Name="object_pamera_Standardlimb_0083B4" Type="Standard" EnumName="OBJECT_PAMERA_LIMB_12" Offset="0x83B4" />
<Limb Name="object_pamera_Standardlimb_0083C0" Type="Standard" EnumName="OBJECT_PAMERA_LIMB_13" Offset="0x83C0" />
<Limb Name="object_pamera_Standardlimb_0083CC" Type="Standard" EnumName="OBJECT_PAMERA_LIMB_14" Offset="0x83CC" />
<Limb Name="object_pamera_Standardlimb_0083D8" Type="Standard" EnumName="OBJECT_PAMERA_LIMB_15" Offset="0x83D8" />
<Limb Name="object_pamera_Standardlimb_0083E4" Type="Standard" EnumName="OBJECT_PAMERA_LIMB_16" Offset="0x83E4" />
<Skeleton Name="object_pamera_Skel_008448" Type="Flex" LimbType="Standard" LimbNone="OBJECT_PAMERA_LIMB_NONE" LimbMax="OBJECT_PAMERA_LIMB_MAX" EnumName="object_pamera_Limbs" Offset="0x8448" />
<Limb Name="gPamelaRootLimb" Type="Standard" EnumName="PAMELA_LIMB_ROOT" Offset="0x82E8" />
<Limb Name="gPamelaUpperBodyRootLimb" Type="Standard" EnumName="PAMELA_LIMB_UPPER_BODY_ROOT" Offset="0x82F4" />
<Limb Name="gPamelaLeftUpperArmLimb" Type="Standard" EnumName="PAMELA_LIMB_LEFT_UPPER_ARM" Offset="0x8300" />
<Limb Name="gPamelaLeftForearmLimb" Type="Standard" EnumName="PAMELA_LIMB_LEFT_FOREARM" Offset="0x830C" />
<Limb Name="gPamelaLeftHandLimb" Type="Standard" EnumName="PAMELA_LIMB_LEFT_HAND" Offset="0x8318" />
<Limb Name="gPamelaRightUpperArmLimb" Type="Standard" EnumName="PAMELA_LIMB_RIGHT_UPPER_ARM" Offset="0x8324" />
<Limb Name="gPamelaRightForearmLimb" Type="Standard" EnumName="PAMELA_LIMB_RIGHT_FOREARM" Offset="0x8330" />
<Limb Name="gPamelaRightHandLimb" Type="Standard" EnumName="PAMELA_LIMB_RIGHT_HAND" Offset="0x833C" />
<Limb Name="gPamelaHeadLimb" Type="Standard" EnumName="PAMELA_LIMB_HEAD" Offset="0x8348" />
<Limb Name="gPamelaHairEndLimb" Type="Standard" EnumName="PAMELA_LIMB_HAIR_END" Offset="0x8354" />
<Limb Name="gPamelaChestLimb" Type="Standard" EnumName="PAMELA_LIMB_CHEST" Offset="0x8360" />
<Limb Name="gPamelaNeckLimb" Type="Standard" EnumName="PAMELA_LIMB_NECK" Offset="0x836C" />
<Limb Name="gPamelaLeftThighLimb" Type="Standard" EnumName="PAMELA_LIMB_LEFT_THIGH" Offset="0x8378" />
<Limb Name="gPamelaLeftLegLimb" Type="Standard" EnumName="PAMELA_LIMB_LEFT_LEG" Offset="0x8384" />
<Limb Name="gPamelaLeftFootLimb" Type="Standard" EnumName="PAMELA_LIMB_LEFT_FOOT" Offset="0x8390" />
<Limb Name="gPamelaRightThighLimb" Type="Standard" EnumName="PAMELA_LIMB_RIGHT_THIGH" Offset="0x839C" />
<Limb Name="gPamelaRightLegLimb" Type="Standard" EnumName="PAMELA_LIMB_RIGHT_LEG" Offset="0x83A8" />
<Limb Name="gPamelaRightFootLimb" Type="Standard" EnumName="PAMELA_LIMB_RIGHT_FOOT" Offset="0x83B4" />
<Limb Name="gPamelaFrontDressLimb" Type="Standard" EnumName="PAMELA_LIMB_FRONT_DRESS" Offset="0x83C0" />
<Limb Name="gPamelaBackDressLimb" Type="Standard" EnumName="PAMELA_LIMB_BACK_DRESS" Offset="0x83CC" />
<Limb Name="gPamelaAbdomenLimb" Type="Standard" EnumName="PAMELA_LIMB_ABDOMEN" Offset="0x83D8" />
<Limb Name="gPamelaPelvisLimb" Type="Standard" EnumName="PAMELA_LIMB_PELVIS" Offset="0x83E4" />
<Skeleton Name="gPamelaSkel" Type="Flex" LimbType="Standard" LimbNone="PAMELA_LIMB_NONE" LimbMax="PAMELA_LIMB_MAX" EnumName="PamelaLimbs" Offset="0x8448" />
<Animation Name="object_pamera_Anim_008AE0" Offset="0x8AE0" /> <!-- Pamela Walking -->
<Animation Name="object_pamera_Anim_008E38" Offset="0x8E38" />
<Animation Name="object_pamera_Anim_009870" Offset="0x9870" />

34
assets/xml/objects/object_sdn.xml
View File

@ -44,23 +44,23 @@
<Texture Name="gSoldierArmorCoatOfArmsTex" OutName="soldier_armor_coat_of_arms_tex" Format="ci8" Width="32" Height="32" Offset="0xCFC0" />
<Texture Name="gSoldierArmorPlate2Tex" OutName="soldier_armor_plate2_tex" Format="i8" Width="16" Height="8" Offset="0xD3C0" />
<Texture Name="gSoldierFingersTex" OutName="soldier_fingers_tex" Format="ci8" Width="16" Height="16" Offset="0xD440" />
<Limb Name="gSoldierRootLimb" Type="Standard" EnumName="OBJECT_SDN_LIMB_01" Offset="0xD540" />
<Limb Name="gSoldierPelvisLimb" Type="Standard" EnumName="OBJECT_SDN_LIMB_02" Offset="0xD54C" />
<Limb Name="gSoldierLeftThighLimb" Type="Standard" EnumName="OBJECT_SDN_LIMB_03" Offset="0xD558" />
<Limb Name="gSoldierLeftShinLimb" Type="Standard" EnumName="OBJECT_SDN_LIMB_04" Offset="0xD564" />
<Limb Name="gSoldierLeftFootLimb" Type="Standard" EnumName="OBJECT_SDN_LIMB_05" Offset="0xD570" />
<Limb Name="gSoldierRightThighLimb" Type="Standard" EnumName="OBJECT_SDN_LIMB_06" Offset="0xD57C" />
<Limb Name="gSoldierRightShinLimb" Type="Standard" EnumName="OBJECT_SDN_LIMB_07" Offset="0xD588" />
<Limb Name="gSoldierRightFootLimb" Type="Standard" EnumName="OBJECT_SDN_LIMB_08" Offset="0xD594" />
<Limb Name="gSoldierTorsoLimb" Type="Standard" EnumName="OBJECT_SDN_LIMB_09" Offset="0xD5A0" />
<Limb Name="gSoldierLeftShoulderLimb" Type="Standard" EnumName="OBJECT_SDN_LIMB_0A" Offset="0xD5AC" />
<Limb Name="gSoldierLeftForearmLimb" Type="Standard" EnumName="OBJECT_SDN_LIMB_0B" Offset="0xD5B8" />
<Limb Name="gSoldierLeftHandLimb" Type="Standard" EnumName="OBJECT_SDN_LIMB_0C" Offset="0xD5C4" />
<Limb Name="gSoldierRightShoulderLimb" Type="Standard" EnumName="OBJECT_SDN_LIMB_0D" Offset="0xD5D0" />
<Limb Name="gSoldierRightForearmLimb" Type="Standard" EnumName="OBJECT_SDN_LIMB_0E" Offset="0xD5DC" />
<Limb Name="gSoldierRightHandWithSpearLimb" Type="Standard" EnumName="OBJECT_SDN_LIMB_0F" Offset="0xD5E8" />
<Limb Name="gSoldierHeadLimb" Type="Standard" EnumName="OBJECT_SDN_LIMB_10" Offset="0xD5F4" />
<Skeleton Name="gSoldierSkeleton" Type="Flex" LimbType="Standard" LimbNone="OBJECT_SDN_LIMB_NONE" LimbMax="OBJECT_SDN_LIMB_MAX" EnumName="object_sdn_Limbs" Offset="0xD640" />
<Limb Name="gSoldierRootLimb" Type="Standard" EnumName="SOLDIER_LIMB_ROOT" Offset="0xD540" />
<Limb Name="gSoldierPelvisLimb" Type="Standard" EnumName="SOLDIER_LIMB_PELVIS" Offset="0xD54C" />
<Limb Name="gSoldierLeftThighLimb" Type="Standard" EnumName="SOLDIER_LIMB_LEFT_THIGH" Offset="0xD558" />
<Limb Name="gSoldierLeftShinLimb" Type="Standard" EnumName="SOLDIER_LIMB_LEFT_SHIN" Offset="0xD564" />
<Limb Name="gSoldierLeftFootLimb" Type="Standard" EnumName="SOLDIER_LIMB_LEFT_FOOT" Offset="0xD570" />
<Limb Name="gSoldierRightThighLimb" Type="Standard" EnumName="SOLDIER_LIMB_RIGHT_THIGH" Offset="0xD57C" />
<Limb Name="gSoldierRightShinLimb" Type="Standard" EnumName="SOLDIER_LIMB_RIGHT_SHIN" Offset="0xD588" />
<Limb Name="gSoldierRightFootLimb" Type="Standard" EnumName="SOLDIER_LIMB_RIGHT_FOOT" Offset="0xD594" />
<Limb Name="gSoldierTorsoLimb" Type="Standard" EnumName="SOLDIER_LIMB_TORSO" Offset="0xD5A0" />
<Limb Name="gSoldierLeftShoulderLimb" Type="Standard" EnumName="SOLDIER_LIMB_LEFT_SHOULDER" Offset="0xD5AC" />
<Limb Name="gSoldierLeftForearmLimb" Type="Standard" EnumName="SOLDIER_LIMB_LEFT_FOREARM" Offset="0xD5B8" />
<Limb Name="gSoldierLeftHandLimb" Type="Standard" EnumName="SOLDIER_LIMB_LEFT_HAND" Offset="0xD5C4" />
<Limb Name="gSoldierRightShoulderLimb" Type="Standard" EnumName="SOLDIER_LIMB_RIGHT_SHOULDER" Offset="0xD5D0" />
<Limb Name="gSoldierRightForearmLimb" Type="Standard" EnumName="SOLDIER_LIMB_RIGHT_FOREARM" Offset="0xD5DC" />
<Limb Name="gSoldierRightHandWithSpearLimb" Type="Standard" EnumName="SOLDIER_LIMB_RIGHT_HAND_WITH_SPEAR" Offset="0xD5E8" />
<Limb Name="gSoldierHeadLimb" Type="Standard" EnumName="SOLDIER_LIMB_HEAD" Offset="0xD5F4" />
<Skeleton Name="gSoldierSkel" Type="Flex" LimbType="Standard" LimbNone="SOLDIER_LIMB_NONE" LimbMax="SOLDIER_LIMB_MAX" EnumName="SoldierLimbs" Offset="0xD640" />
<Animation Name="gSoldierStandAndLookDown" Offset="0xDC7C" />
</File>
</Root>

8
assets/xml/overlays/ovl_En_Bigslime.xml
View File

@ -1,20 +1,14 @@
<Root>
<File Name="ovl_En_Bigslime" OutName="gBigslimeStaticVtx" BaseAddress="0x808E4FC0" RangeStart="0x8680" RangeEnd="0xAF00">
<File Name="ovl_En_Bigslime" BaseAddress="0x808E4FC0" RangeStart="0x8680" RangeEnd="0xAF00">
<Array Name="sBigslimeStaticVtx" Count="162" Offset="0x8680">
<Vtx/>
</Array>
</File>
<File Name="ovl_En_Bigslime" OutName="gBigslimeDynamicState0Vtx" BaseAddress="0x808E4FC0" RangeStart="0x8680" RangeEnd="0xAF00">
<Array Name="sBigslimeDynamicState0Vtx" Count="162" Offset="0x90A0">
<Vtx/>
</Array>
</File>
<File Name="ovl_En_Bigslime" OutName="gBigslimeDynamicState1Vtx" BaseAddress="0x808E4FC0" RangeStart="0x8680" RangeEnd="0xAF00">
<Array Name="sBigslimeDynamicState1Vtx" Count="162" Offset="0x9AC0">
<Vtx/>
</Array>
</File>
<File Name="ovl_En_Bigslime" OutName="gBigslimeTargetVtx" BaseAddress="0x808E4FC0" RangeStart="0x8680" RangeEnd="0xAF00">
<Array Name="sBigslimeTargetVtx" Count="162" Offset="0xA4E0">
<Vtx/>
</Array>

3
src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c
View File

@ -5,7 +5,6 @@
*/
#include "z_en_bigokuta.h"
#include "assets/objects/object_bigokuta/object_bigokuta.h"
#define FLAGS (ACTOR_FLAG_1 | ACTOR_FLAG_4)
@ -584,7 +583,7 @@ s32 EnBigokuta_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec
}
rot->x -= rotX;
}
} else if (limbIndex == BIGOKUTA_LIMB_SNOUT_CENTER) {
} else if (limbIndex == BIGOKUTA_LIMB_CENTER_SNOUT) {
EnBigokuta* this = THIS;
if (this->actionFunc == EnBigokuta_PlayDeathEffects) {

25
src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h
View File

@ -2,36 +2,13 @@
#define Z_EN_BIGOKUTA_H
#include "global.h"
#include "assets/objects/object_bigokuta/object_bigokuta.h"
struct EnBigokuta;
typedef void (*EnBigokutaActionFunc)(struct EnBigokuta*, PlayState*);
typedef void (*EnBigokutaUnkFunc)(PlayState*, struct EnBigokuta*);
typedef enum {
/* 00 */ BIGOKUTA_LIMB_NONE,
/* 01 */ BIGOKUTA_LIMB_BODY,
/* 02 */ BIGOKUTA_LIMB_ARM_BASE_RIGHT_FRONT,
/* 03 */ BIGOKUTA_LIMB_ARM_END_RIGHT_FRONT,
/* 04 */ BIGOKUTA_LIMB_ARM_BASE_LEFT_FRONT,
/* 05 */ BIGOKUTA_LIMB_ARM_END_LEFT_FRONT,
/* 06 */ BIGOKUTA_LIMB_ARM_BASE_RIGHT_BACK,
/* 07 */ BIGOKUTA_LIMB_ARM_END_RIGHT_BACK,
/* 08 */ BIGOKUTA_LIMB_ARM_BASE_LEFT_BACK,
/* 09 */ BIGOKUTA_LIMB_ARM_END_LEFT_BACK,
/* 10 */ BIGOKUTA_LIMB_HEAD,
/* 11 */ BIGOKUTA_LIMB_TENTACLE_BASE_LEFT,
/* 12 */ BIGOKUTA_LIMB_TENTACLE_TIP_LEFT,
/* 13 */ BIGOKUTA_LIMB_TENTACLE_BASE_RIGHT,
/* 14 */ BIGOKUTA_LIMB_TENTACLE_TIP_RIGHT,
/* 15 */ BIGOKUTA_LIMB_WEAK_POINT_LEFT,
/* 16 */ BIGOKUTA_LIMB_WEAK_POINT_RIGHT,
/* 17 */ BIGOKUTA_LIMB_SNOUT_CENTER,
/* 18 */ BIGOKUTA_LIMB_SNOUT_RIGHT,
/* 19 */ BIGOKUTA_LIMB_SNOUT_LEFT,
/* 20 */ BIGOKUTA_LIMB_MAX
} ObjectBigokutaLimbs;
typedef struct EnBigokuta {
/* 0x000 */ Actor actor;
/* 0x144 */ EnBigokutaUnkFunc unkFunc; // possibly something to do with photographing

16
src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c
View File

@ -153,7 +153,7 @@ static Vtx sBigslimeTargetVtx[BIGSLIME_NUM_VTX] = {
* Purpose: indices to calculate/update normal vector for lighting calculations
* "EnBigslimeTri" struct based on "Tri" struct from gbi.h, but without the flag
*/
static EnBigslimeTri sEnbigslimeTri[BIGSLIME_NUM_FACES] = {
static EnBigslimeTri sBigslimeTri[BIGSLIME_NUM_FACES] = {
{ 0, 2, 1 }, { 1, 7, 6 }, { 1, 2, 7 }, { 2, 8, 7 }, { 6, 17, 16 }, { 6, 7, 17 },
{ 8, 19, 18 }, { 7, 8, 18 }, { 7, 18, 17 }, { 9, 21, 20 }, { 0, 3, 2 }, { 2, 9, 8 },
{ 2, 3, 9 }, { 3, 10, 9 }, { 8, 20, 19 }, { 8, 9, 20 }, { 10, 22, 21 }, { 9, 10, 21 },
@ -436,13 +436,13 @@ void EnBigslime_UpdateSurfaceNorm(EnBigslime* this) {
}
for (i = 0; i < BIGSLIME_NUM_FACES; i++) {
dynamicVtx0 = &sBigslimeDynamicVtx[this->dynamicVtxState][sEnbigslimeTri[i].v[0]];
dynamicVtx12 = &sBigslimeDynamicVtx[this->dynamicVtxState][sEnbigslimeTri[i].v[1]];
dynamicVtx0 = &sBigslimeDynamicVtx[this->dynamicVtxState][sBigslimeTri[i].v[0]];
dynamicVtx12 = &sBigslimeDynamicVtx[this->dynamicVtxState][sBigslimeTri[i].v[1]];
vecTriEdge1.x = dynamicVtx12->n.ob[0] - dynamicVtx0->n.ob[0];
vecTriEdge1.y = dynamicVtx12->n.ob[1] - dynamicVtx0->n.ob[1];
vecTriEdge1.z = dynamicVtx12->n.ob[2] - dynamicVtx0->n.ob[2];
dynamicVtx12 = &sBigslimeDynamicVtx[this->dynamicVtxState][sEnbigslimeTri[i].v[2]];
dynamicVtx12 = &sBigslimeDynamicVtx[this->dynamicVtxState][sBigslimeTri[i].v[2]];
vecTriEdge2.x = dynamicVtx12->n.ob[0] - dynamicVtx0->n.ob[0];
vecTriEdge2.y = dynamicVtx12->n.ob[1] - dynamicVtx0->n.ob[1];
vecTriEdge2.z = dynamicVtx12->n.ob[2] - dynamicVtx0->n.ob[2];
@ -450,9 +450,9 @@ void EnBigslime_UpdateSurfaceNorm(EnBigslime* this) {
Math3D_CrossProduct(&vecTriEdge1, &vecTriEdge2, &vecTriNorm);
EnBigslime_Vec3fNormalize(&vecTriNorm);
Math_Vec3f_Sum(&vtxNorm[sEnbigslimeTri[i].v[0]], &vecTriNorm, &vtxNorm[sEnbigslimeTri[i].v[0]]);
Math_Vec3f_Sum(&vtxNorm[sEnbigslimeTri[i].v[1]], &vecTriNorm, &vtxNorm[sEnbigslimeTri[i].v[1]]);
Math_Vec3f_Sum(&vtxNorm[sEnbigslimeTri[i].v[2]], &vecTriNorm, &vtxNorm[sEnbigslimeTri[i].v[2]]);
Math_Vec3f_Sum(&vtxNorm[sBigslimeTri[i].v[0]], &vecTriNorm, &vtxNorm[sBigslimeTri[i].v[0]]);
Math_Vec3f_Sum(&vtxNorm[sBigslimeTri[i].v[1]], &vecTriNorm, &vtxNorm[sBigslimeTri[i].v[1]]);
Math_Vec3f_Sum(&vtxNorm[sBigslimeTri[i].v[2]], &vecTriNorm, &vtxNorm[sBigslimeTri[i].v[2]]);
}
for (i = 0; i < BIGSLIME_NUM_VTX; i++) {
@ -3053,7 +3053,7 @@ void EnBigslime_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s*
Matrix_MultZero(&this->limbPos[limbPosIndex[limbIndex]]);
}
if (limbIndex == GEKKO_LIMB_R_ANKLE) {
if (limbIndex == GEKKO_LIMB_RIGHT_ANKLE) {
Matrix_MultVec3f(&rightFootOffsetRef, &rightFootOffset);
this->gekkoCollider.dim.pos.y = rightFootOffset.y;
}

33
src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c
View File

@ -5,7 +5,6 @@
*/
#include "z_en_bji_01.h"
#include "objects/object_bji/object_bji.h"
#define FLAGS (ACTOR_FLAG_1 | ACTOR_FLAG_8 | ACTOR_FLAG_10)
@ -90,7 +89,7 @@ void func_809CCE98(EnBji01* this, PlayState* play) {
void func_809CCEE8(EnBji01* this, PlayState* play) {
Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.home.rot.y, 0x444);
if (this->actor.params == ENBJI01_PARAMS_DEFAULT) {
if (this->actor.params == SHIKASHI_TYPE_DEFAULT) {
if ((this->actor.xzDistToPlayer <= 60.0f) && (this->actor.playerHeightRel <= 10.0f)) {
this->actor.flags |= ACTOR_FLAG_10000;
} else {
@ -118,8 +117,8 @@ void func_809CD028(EnBji01* this, PlayState* play) {
f32 timeBeforeMoonCrash;
switch (this->actor.params) {
case ENBJI01_PARAMS_DEFAULT:
case ENBJI01_PARAMS_FINISHED_CONVERSATION:
case SHIKASHI_TYPE_DEFAULT:
case SHIKASHI_TYPE_FINISHED_CONVERSATION:
switch (gSaveContext.save.playerForm) {
case PLAYER_FORM_DEKU:
if (gSaveContext.save.weekEventReg[17] & 0x10) {
@ -154,7 +153,7 @@ void func_809CD028(EnBji01* this, PlayState* play) {
break;
}
break;
case ENBJI01_PARAMS_LOOKED_THROUGH_TELESCOPE:
case SHIKASHI_TYPE_LOOKED_THROUGH_TELESCOPE:
switch (gSaveContext.save.playerForm) {
case PLAYER_FORM_DEKU:
if (gSaveContext.save.weekEventReg[74] & 0x80) {
@ -208,7 +207,7 @@ void EnBji01_DialogueHandler(EnBji01* this, PlayState* play) {
case TEXT_STATE_CHOICE:
if (Message_ShouldAdvance(play)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.params = ENBJI01_PARAMS_FINISHED_CONVERSATION;
this->actor.params = SHIKASHI_TYPE_FINISHED_CONVERSATION;
switch (play->msgCtx.choiceIndex) {
case 0:
func_8019F208();
@ -276,14 +275,14 @@ void EnBji01_DialogueHandler(EnBji01* this, PlayState* play) {
case 0x5F8:
func_801477B4(play);
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.params = ENBJI01_PARAMS_FINISHED_CONVERSATION;
this->actor.params = SHIKASHI_TYPE_FINISHED_CONVERSATION;
func_809CCE98(this, play);
break;
}
}
break;
case TEXT_STATE_DONE:
this->actor.params = ENBJI01_PARAMS_FINISHED_CONVERSATION;
this->actor.params = SHIKASHI_TYPE_FINISHED_CONVERSATION;
this->actor.flags &= ~ACTOR_FLAG_10000;
func_809CCE98(this, play);
break;
@ -330,8 +329,8 @@ void EnBji01_Init(Actor* thisx, PlayState* play) {
EnBji01* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
SkelAnime_InitFlex(play, &this->skelAnime, &object_bji_Skel_00578C, &object_bji_Anim_000FDC, this->jointTable,
this->morphTable, BJI_LIMB_MAX);
SkelAnime_InitFlex(play, &this->skelAnime, &gShikashiSkel, &object_bji_Anim_000FDC, this->jointTable,
this->morphTable, SHIKASHI_LIMB_MAX);
Collider_InitAndSetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
@ -346,14 +345,14 @@ void EnBji01_Init(Actor* thisx, PlayState* play) {
switch (gSaveContext.save.entranceIndex) {
case 0x4C00: /* Observatory from ECT */
case 0x4C10: /* Observatory from Termina Field door */
this->actor.params = ENBJI01_PARAMS_DEFAULT;
this->actor.params = SHIKASHI_TYPE_DEFAULT;
func_809CCE98(this, play);
break;
case 0x4C20: /* Observatory from Termina Field telescope */
this->actor.flags |= ACTOR_FLAG_10000;
func_801A5BD0(0);
Audio_QueueSeqCmd(0xE0000100);
this->actor.params = ENBJI01_PARAMS_LOOKED_THROUGH_TELESCOPE;
this->actor.params = SHIKASHI_TYPE_LOOKED_THROUGH_TELESCOPE;
func_809CCE98(this, play);
break;
default:
@ -394,20 +393,20 @@ void EnBji01_Update(Actor* thisx, PlayState* play) {
s32 EnBji01_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) {
EnBji01* this = THIS;
if ((limbIndex == BJI_LIMB_NONE) && ((play->gameplayFrames % 2) != 0)) {
if ((limbIndex == SHIKASHI_LIMB_NONE) && ((play->gameplayFrames % 2) != 0)) {
*dList = NULL;
}
if (limbIndex == BJI_LIMB_NONE) {
if (limbIndex == SHIKASHI_LIMB_NONE) {
rot->x = rot->x;
rot->y = rot->y;
rot->z = rot->z;
}
switch (limbIndex) {
case BJI_LIMB_TORSO:
case SHIKASHI_LIMB_TORSO:
rot->x += this->torsoXRotStep;
rot->z += this->torsoZRotStep;
break;
case BJI_LIMB_HEAD:
case SHIKASHI_LIMB_HEAD:
rot->x += this->headXRotStep;
rot->z += this->headZRotStep;
break;
@ -421,7 +420,7 @@ void EnBji01_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* ro
Vec3f sp20;
s32 temp_f4 = 0;
if (limbIndex == BJI_LIMB_HEAD) {
if (limbIndex == SHIKASHI_LIMB_HEAD) {
Math_Vec3f_Copy(&sp20, &D_809CDCC8);
sp20.x += temp_f4 * 0.1f;
sp20.y += temp_f4 * 0.1f;

33
src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h
View File

@ -3,44 +3,25 @@
#include "global.h"
#include "overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.h"
#include "objects/object_bji/object_bji.h"
struct EnBji01;
typedef void (*EnBji01ActionFunc)(struct EnBji01*, PlayState*);
typedef enum {
/* 00 */ BJI_LIMB_NONE,
/* 01 */ BJI_LIMB_ROOT,
/* 02 */ BJI_LIMB_THIGH_LEFT,
/* 03 */ BJI_LIMB_LEG_LEFT,
/* 04 */ BJI_LIMB_FOOT_LEFT,
/* 05 */ BJI_LIMB_THIGH_RIGHT,
/* 06 */ BJI_LIMB_LEG_RIGHT,
/* 07 */ BJI_LIMB_FOOT_RIGHT,
/* 08 */ BJI_LIMB_TORSO,
/* 09 */ BJI_LIMB_ARM_LEFT,
/* 10 */ BJI_LIMB_FOREARM_LEFT,
/* 11 */ BJI_LIMB_HAND_LEFT,
/* 12 */ BJI_LIMB_ARM_RIGHT,
/* 13 */ BJI_LIMB_FOREARM_RIGHT,
/* 14 */ BJI_LIMB_HAND_RIGHT,
/* 15 */ BJI_LIMB_HEAD,
/* 16 */ BJI_LIMB_MAX
} ObjectBjiLimbs;
typedef enum {
/* 00 */ ENBJI01_PARAMS_DEFAULT,
/* 01 */ ENBJI01_PARAMS_FINISHED_CONVERSATION,
/* 03 */ ENBJI01_PARAMS_LOOKED_THROUGH_TELESCOPE = 3
} EnBji01Params;
/* 0 */ SHIKASHI_TYPE_DEFAULT,
/* 1 */ SHIKASHI_TYPE_FINISHED_CONVERSATION,
/* 3 */ SHIKASHI_TYPE_LOOKED_THROUGH_TELESCOPE = 3
} ShikashiType;
typedef struct EnBji01 {
/* 0x000 */ Actor actor;
/* 0x144 */ EnBji01ActionFunc actionFunc;
/* 0x148 */ SkelAnime skelAnime;
/* 0x18C */ ColliderCylinder collider;
/* 0x1D8 */ Vec3s jointTable[BJI_LIMB_MAX];
/* 0x238 */ Vec3s morphTable[BJI_LIMB_MAX];
/* 0x1D8 */ Vec3s jointTable[SHIKASHI_LIMB_MAX];
/* 0x238 */ Vec3s morphTable[SHIKASHI_LIMB_MAX];
/* 0x298 */ s32 animationIndex;
/* 0x29C */ s16 eyeTexIndex;
/* 0x29E */ s16 blinkSeqIndex;

7
src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c
View File

@ -5,7 +5,6 @@
*/
#include "z_en_demo_heishi.h"
#include "objects/object_sdn/object_sdn.h"
#define FLAGS (ACTOR_FLAG_1 | ACTOR_FLAG_8)
@ -69,8 +68,8 @@ void EnDemoheishi_Init(Actor* thisx, PlayState* play) {
EnDemoheishi* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f);
SkelAnime_InitFlex(play, &this->skelAnime, &gSoldierSkeleton, &gSoldierWave, this->jointTable, this->morphTable,
17);
SkelAnime_InitFlex(play, &this->skelAnime, &gSoldierSkel, &gSoldierWave, this->jointTable, this->morphTable,
SOLDIER_LIMB_MAX);
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
this->actor.targetMode = 6;
this->actor.gravity = -3.0f;
@ -175,7 +174,7 @@ void EnDemoheishi_Update(Actor* thisx, PlayState* play) {
s32 EnDemoheishi_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) {
EnDemoheishi* this = THIS;
if (limbIndex == DEMOHEISHI_LIMB_HEAD) {
if (limbIndex == SOLDIER_LIMB_HEAD) {
rot->x += this->headRotX;
rot->y += this->headRotY;
rot->z += this->headRotZ;

26
src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.h
View File

@ -2,37 +2,17 @@
#define Z_EN_DEMO_HEISHI_H
#include "global.h"
#include "objects/object_sdn/object_sdn.h"
struct EnDemoheishi;
typedef void (*EnDemoheishiActionFunc)(struct EnDemoheishi*, PlayState*);
typedef enum {
/* 0 */ DEMOHEISHI_LIMB_NONE,
/* 1 */ DEMOHEISHI_LIMB_ROOT,
/* 2 */ DEMOHEISHI_LIMB_PELVIS,
/* 3 */ DEMOHEISHI_LIMB_LEFT_THIGH,
/* 4 */ DEMOHEISHI_LIMB_LEFT_SHIN,
/* 5 */ DEMOHEISHI_LIMB_LEFT_FOOT,
/* 6 */ DEMOHEISHI_LIMB_RIGHT_THIGH,
/* 7 */ DEMOHEISHI_LIMB_RIGHT_SHIN,
/* 8 */ DEMOHEISHI_LIMB_RIGHT_FOOT,
/* 9 */ DEMOHEISHI_LIMB_TORSO,
/* 10 */ DEMOHEISHI_LIMB_LEFT_SHOULDER,
/* 11 */ DEMOHEISHI_LIMB_LEFT_FOREARM,
/* 12 */ DEMOHEISHI_LIMB_LEFT_HAND,
/* 13 */ DEMOHEISHI_LIMB_RIGHT_SHOULDER,
/* 14 */ DEMOHEISHI_LIMB_RIGHT_FOREARM,
/* 15 */ DEMOHEISHI_LIMB_RIGHT_HAND_WITH_SPEAR,
/* 16 */ DEMOHEISHI_LIMB_HEAD,
/* 17 */ DEMOHEISHI_LIMB_MAX
} EnDemoheishiLimbs;
typedef struct EnDemoheishi {
/* 0x000 */ Actor actor;
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ Vec3s jointTable[DEMOHEISHI_LIMB_MAX];
/* 0x1EE */ Vec3s morphTable[DEMOHEISHI_LIMB_MAX];
/* 0x188 */ Vec3s jointTable[SOLDIER_LIMB_MAX];
/* 0x1EE */ Vec3s morphTable[SOLDIER_LIMB_MAX];
/* 0x254 */ EnDemoheishiActionFunc actionFunc;
/* 0x258 */ s16 headRotY;
/* 0x25A */ s16 headRotX;

2
src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c
View File

@ -38,7 +38,7 @@ void EnEndingHero4_Init(Actor* thisx, PlayState* play) {
Actor_SetScale(&this->actor, 0.01f);
this->actor.targetMode = 6;
this->actor.gravity = -3.0f;
SkelAnime_InitFlex(play, &this->skelAnime, &gSoldierSkeleton, &gSoldierCheerWithSpear, this->jointTable,
SkelAnime_InitFlex(play, &this->skelAnime, &gSoldierSkel, &gSoldierCheerWithSpear, this->jointTable,
this->morphTable, 17);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f);
func_80C23748(this);

6
src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c
View File

@ -37,9 +37,9 @@ const ActorInit En_Ending_Hero6_InitVars = {
};
static FlexSkeletonHeader* sSkeletons[] = {
&object_dt_Skel_00B0CC, &object_bai_Skel_007908, &object_toryo_Skel_007150,
&gSoldierSkeleton, &object_daiku_Skel_00A850, &object_daiku_Skel_00A850,
&object_daiku_Skel_00A850, &object_daiku_Skel_00A850, &object_daiku_Skel_00A850,
&object_dt_Skel_00B0CC, &object_bai_Skel_007908, &object_toryo_Skel_007150, &gSoldierSkel,
&object_daiku_Skel_00A850, &object_daiku_Skel_00A850, &object_daiku_Skel_00A850, &object_daiku_Skel_00A850,
&object_daiku_Skel_00A850,
};
static AnimationHeader* sAnimations[] = {

7
src/overlays/actors/ovl_En_Heishi/z_en_heishi.c
View File

@ -5,7 +5,6 @@
*/
#include "z_en_heishi.h"
#include "objects/object_sdn/object_sdn.h"
#define FLAGS (ACTOR_FLAG_1 | ACTOR_FLAG_8)
@ -65,8 +64,8 @@ void EnHeishi_Init(Actor* thisx, PlayState* play) {
EnHeishi* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f);
SkelAnime_InitFlex(play, &this->skelAnime, &gSoldierSkeleton, &gSoldierWave, this->jointTable, this->morphTable,
HEISHI_LIMB_MAX);
SkelAnime_InitFlex(play, &this->skelAnime, &gSoldierSkel, &gSoldierWave, this->jointTable, this->morphTable,
SOLDIER_LIMB_MAX);
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
this->paramsCopy = this->actor.params;
this->yawTowardsPlayer = this->actor.world.rot.y;
@ -174,7 +173,7 @@ void EnHeishi_Update(Actor* thisx, PlayState* play) {
s32 EnHeishi_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) {
EnHeishi* this = THIS;
if (limbIndex == HEISHI_LIMB_HEAD) {
if (limbIndex == SOLDIER_LIMB_HEAD) {
rot->x += this->headRotX;
rot->y += this->headRotY;
rot->z += this->headRotZ;

26
src/overlays/actors/ovl_En_Heishi/z_en_heishi.h
View File

@ -2,37 +2,17 @@
#define Z_EN_HEISHI_H
#include "global.h"
#include "objects/object_sdn/object_sdn.h"
struct EnHeishi;
typedef void (*EnHeishiActionFunc)(struct EnHeishi*, PlayState*);
typedef enum {
/* 0 */ HEISHI_LIMB_NONE,
/* 1 */ HEISHI_LIMB_ROOT,
/* 2 */ HEISHI_LIMB_PELVIS,
/* 3 */ HEISHI_LIMB_LEFT_THIGH,
/* 4 */ HEISHI_LIMB_LEFT_CALF,
/* 5 */ HEISHI_LIMB_LEFT_FOOT,
/* 6 */ HEISHI_LIMB_RIGHT_THIGH,
/* 7 */ HEISHI_LIMB_RIGHT_CALF,
/* 8 */ HEISHI_LIMB_RIGHT_FOOT,
/* 9 */ HEISHI_LIMB_TORSO,
/* 10 */ HEISHI_LIMB_LEFT_SHOULDER,
/* 11 */ HEISHI_LIMB_LEFT_FOREARM,
/* 12 */ HEISHI_LIMB_LEFT_HAND,
/* 13 */ HEISHI_LIMB_RIGHT_SHOULDER,
/* 14 */ HEISHI_LIMB_RIGHT_FOREARM,
/* 15 */ HEISHI_LIMB_RIGHT_HAND_WITH_SPEAR,
/* 16 */ HEISHI_LIMB_HEAD,
/* 17 */ HEISHI_LIMB_MAX
} EnHeishiLimbs;
typedef struct EnHeishi {
/* 0x000 */ Actor actor;
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ Vec3s jointTable[HEISHI_LIMB_MAX];
/* 0x1EE */ Vec3s morphTable[HEISHI_LIMB_MAX];
/* 0x188 */ Vec3s jointTable[SOLDIER_LIMB_MAX];
/* 0x1EE */ Vec3s morphTable[SOLDIER_LIMB_MAX];
/* 0x254 */ EnHeishiActionFunc actionFunc;
/* 0x258 */ s16 headRotY;
/* 0x25A */ s16 headRotX;

13
src/overlays/actors/ovl_En_Hg/z_en_hg.c
View File

@ -1,11 +1,10 @@
/*
* File: z_en_hg.c
* Overlay: ovl_En_Hg
* Description: Pamela's Father (Human)
* Description: Pamela's Father (Gibdo)
*/
#include "z_en_hg.h"
#include "objects/object_harfgibud/object_harfgibud.h"
#define FLAGS (ACTOR_FLAG_1 | ACTOR_FLAG_8 | ACTOR_FLAG_10 | ACTOR_FLAG_100000 | ACTOR_FLAG_2000000)
@ -121,8 +120,8 @@ void EnHg_Init(Actor* thisx, PlayState* play) {
s32 i;
ActorShape_Init(&this->actor.shape, 0.0f, NULL, 36.0f);
SkelAnime_InitFlex(play, &this->skelAnime, &object_harfgibud_Skel_008580, &object_harfgibud_Anim_00260C,
this->jointTable, this->morphTable, HG_LIMB_MAX);
SkelAnime_InitFlex(play, &this->skelAnime, &gHarfgibudGibdoSkel, &object_harfgibud_Anim_00260C, this->jointTable,
this->morphTable, HARFGIBUD_GIBDO_LIMB_MAX);
Collider_InitCylinder(play, &this->collider);
Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo2(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit2);
@ -401,9 +400,9 @@ s32 EnHg_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* po
void EnHg_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) {
EnHg* this = THIS;
if (limbIndex == HG_LIMB_HEAD) {
if (limbIndex == HARFGIBUD_GIBDO_LIMB_EYEBROWS) {
Matrix_Get(&this->unk1D8);
} else if (limbIndex == HG_LIMB_PELVIS) {
} else if (limbIndex == HARFGIBUD_GIBDO_LIMB_HEAD) {
Matrix_MultZero(&this->actor.focus.pos);
}
}
@ -417,6 +416,6 @@ void EnHg_Draw(Actor* thisx, PlayState* play) {
EnHg_OverrideLimbDraw, EnHg_PostLimbDraw, &this->actor);
Matrix_Put(&this->unk1D8);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, object_harfgibud_DL_005E28);
gSPDisplayList(POLY_OPA_DISP++, gHarfgibudGibdoEyebrowsDL);
CLOSE_DISPS(play->state.gfxCtx);
}

29
src/overlays/actors/ovl_En_Hg/z_en_hg.h
View File

@ -2,34 +2,13 @@
#define Z_EN_HG_H
#include "global.h"
#include "objects/object_harfgibud/object_harfgibud.h"
struct EnHg;
typedef void (*EnHgActionFunc)(struct EnHg*, PlayState*);
typedef enum {
/* 00 */ HG_LIMB_NONE,
/* 01 */ HG_LIMB_ABDOMEN,
/* 02 */ HG_LIMB_CHEST,
/* 03 */ HG_LIMB_SHOULDER_LEFT,
/* 04 */ HG_LIMB_ARM_LEFT,
/* 05 */ HG_LIMB_HAND_LEFT,
/* 06 */ HG_LIMB_SHOULDER_RIGHT,
/* 07 */ HG_LIMB_ARM_RIGHT,
/* 08 */ HG_LIMB_HAND_RIGHT,
/* 09 */ HG_LIMB_EYEBROW,
/* 10 */ HG_LIMB_HEAD,
/* 11 */ HG_LIMB_PELVIS,
/* 12 */ HG_LIMB_THIGH_LEFT,
/* 13 */ HG_LIMB_LEG_LEFT,
/* 14 */ HG_LIMB_FOOT_LEFT,
/* 15 */ HG_LIMB_THIGH_RIGHT,
/* 16 */ HG_LIMB_LEG_RIGHT,
/* 17 */ HG_LIMB_FOOT_RIGHT,
/* 19 */ HG_LIMB_UNK,
/* 20 */ HG_LIMB_MAX,
} ObjectHgLimbs;
typedef struct EnHg {
/* 0x000 */ Actor actor;
/* 0x144 */ ColliderCylinder collider;
@ -38,8 +17,8 @@ typedef struct EnHg {
/* 0x1D8 */ MtxF unk1D8;
/* 0x218 */ s32 unk218;
/* 0x21C */ s32 currentAnimation;
/* 0x220 */ Vec3s jointTable[HG_LIMB_MAX];
/* 0x292 */ Vec3s morphTable[HG_LIMB_MAX];
/* 0x220 */ Vec3s jointTable[HARFGIBUD_GIBDO_LIMB_MAX];
/* 0x292 */ Vec3s morphTable[HARFGIBUD_GIBDO_LIMB_MAX];
/* 0x304 */ UNK_TYPE1 pad304[0xC];
/* 0x310 */ u16 cutscenes[4];
} EnHg; // size = 0x318

21
src/overlays/actors/ovl_En_Hgo/z_en_hgo.c
View File

@ -1,11 +1,10 @@
/*
* File: z_en_hgo.c
* Overlay: ovl_En_Hgo
* Description: Pamela's Father (Gibdo)
* Description: Pamela's Father (Human)
*/
#include "z_en_hgo.h"
#include "objects/object_harfgibud/object_harfgibud.h"
#define FLAGS (ACTOR_FLAG_1 | ACTOR_FLAG_8 | ACTOR_FLAG_10 | ACTOR_FLAG_2000000)
@ -83,8 +82,8 @@ void EnHgo_Init(Actor* thisx, PlayState* play) {
s32 pad;
ActorShape_Init(&thisx->shape, 0.0f, ActorShadow_DrawCircle, 36.0f);
SkelAnime_InitFlex(play, &this->skelAnime, &object_harfgibud_Skel_012A58, &object_harfgibud_Anim_00B644,
this->jointTable, this->morphTable, HGO_LIMB_MAX);
SkelAnime_InitFlex(play, &this->skelAnime, &gHarfgibudHumanSkel, &object_harfgibud_Anim_00B644, this->jointTable,
this->morphTable, HARFGIBUD_HUMAN_LIMB_MAX);
Collider_InitCylinder(play, &this->collider);
Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo2(&thisx->colChkInfo, NULL, &sColChkInfoInit);
@ -319,7 +318,7 @@ s32 func_80BD0898(EnHgo* this, PlayState* play) {
}
void func_80BD0B8C(EnHgo* this, PlayState* play) {
Actor_TrackPlayer(play, &this->actor, &this->unk_300, &this->unk_306, this->actor.focus.pos);
Actor_TrackPlayer(play, &this->actor, &this->headRot, &this->torsoRot, this->actor.focus.pos);
if (this->unk_30E > 2) {
this->unk_30E--;
} else if (this->unk_30E == 2) {
@ -341,7 +340,7 @@ void EnHgo_Update(Actor* thisx, PlayState* play) {
this->actionFunc(this, play);
SkelAnime_Update(&this->skelAnime);
if (func_80BD0898(this, play)) {
Actor_TrackNone(&this->unk_300, &this->unk_306);
Actor_TrackNone(&this->headRot, &this->torsoRot);
} else if (this->actionFunc != func_80BD0410) {
if (this->actionFunc != func_80BD0434) {
Collider_UpdateCylinder(&this->actor, &this->collider);
@ -354,9 +353,9 @@ void EnHgo_Update(Actor* thisx, PlayState* play) {
s32 EnHgo_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) {
EnHgo* this = THIS;
if (limbIndex == HGO_LIMB_PELVIS) {
rot->x += this->unk_300.y;
rot->z += this->unk_300.x;
if (limbIndex == HARFGIBUD_HUMAN_LIMB_HEAD) {
rot->x += this->headRot.y;
rot->z += this->headRot.x;
}
return false;
}
@ -364,7 +363,7 @@ s32 EnHgo_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* p
void EnHgo_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* pos, Actor* thisx) {
EnHgo* this = THIS;
if (limbIndex == HGO_LIMB_PELVIS) {
if (limbIndex == HARFGIBUD_HUMAN_LIMB_HEAD) {
Matrix_Get(&this->unk_1D8);
Matrix_MultZero(&this->actor.focus.pos);
}
@ -380,6 +379,6 @@ void EnHgo_Draw(Actor* thisx, PlayState* play) {
EnHgo_OverrideLimbDraw, &EnHgo_PostLimbDraw, &this->actor);
Matrix_Put(&this->unk_1D8);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, object_harfgibud_DL_00F248);
gSPDisplayList(POLY_OPA_DISP++, gHarfgibudHumanEyebrowsDL);
CLOSE_DISPS(play->state.gfxCtx);
}

33
src/overlays/actors/ovl_En_Hgo/z_en_hgo.h
View File

@ -2,35 +2,12 @@
#define Z_EN_HGO_H
#include "global.h"
#include "objects/object_harfgibud/object_harfgibud.h"
struct EnHgo;
typedef void (*EnHgoActionFunc)(struct EnHgo*, PlayState*);
// Shares the same setup as en_hg
typedef enum {
/* 00 */ HGO_LIMB_NONE,
/* 01 */ HGO_LIMB_ABDOMEN,
/* 02 */ HGO_LIMB_CHEST,
/* 03 */ HGO_LIMB_SHOULDER_LEFT,
/* 04 */ HGO_LIMB_ARM_LEFT,
/* 05 */ HGO_LIMB_HAND_LEFT,
/* 06 */ HGO_LIMB_SHOULDER_RIGHT,
/* 07 */ HGO_LIMB_ARM_RIGHT,
/* 08 */ HGO_LIMB_HAND_RIGHT,
/* 09 */ HGO_LIMB_EYEBROW,
/* 10 */ HGO_LIMB_HEAD,
/* 11 */ HGO_LIMB_PELVIS,
/* 12 */ HGO_LIMB_THIGH_LEFT,
/* 13 */ HGO_LIMB_LEG_LEFT,
/* 14 */ HGO_LIMB_FOOT_LEFT,
/* 15 */ HGO_LIMB_THIGH_RIGHT,
/* 16 */ HGO_LIMB_LEG_RIGHT,
/* 17 */ HGO_LIMB_FOOT_RIGHT,
/* 18 */ HGO_LIMB_UNK,
/* 19 */ HGO_LIMB_MAX,
} ObjectHgoLimbs;
typedef struct EnHgo {
/* 0x000 */ Actor actor;
/* 0x144 */ ColliderCylinder collider;
@ -38,10 +15,10 @@ typedef struct EnHgo {
/* 0x1D4 */ EnHgoActionFunc actionFunc;
/* 0x1D8 */ MtxF unk_1D8;
/* 0x218 */ s32 unk_218;
/* 0x21C */ Vec3s jointTable[HGO_LIMB_MAX];
/* 0x28E */ Vec3s morphTable[HGO_LIMB_MAX];
/* 0x300 */ Vec3s unk_300;
/* 0x306 */ Vec3s unk_306;
/* 0x21C */ Vec3s jointTable[HARFGIBUD_HUMAN_LIMB_MAX];
/* 0x28E */ Vec3s morphTable[HARFGIBUD_HUMAN_LIMB_MAX];
/* 0x300 */ Vec3s headRot;
/* 0x306 */ Vec3s torsoRot; // Set, but not used
/* 0x30C */ s16 unk_30C;
/* 0x30E */ s16 unk_30E;
/* 0x310 */ s16 unk_310;

23
src/overlays/actors/ovl_En_Pamera/z_en_pamera.c
View File

@ -5,9 +5,8 @@
*/
#include "z_en_pamera.h"
#include "../ovl_En_Bom/z_en_bom.h"
#include "../ovl_En_Door/z_en_door.h"
#include "objects/object_pamera/object_pamera.h"
#include "overlays/actors/ovl_En_Bom/z_en_bom.h"
#include "overlays/actors/ovl_En_Door/z_en_door.h"
#define FLAGS (ACTOR_FLAG_1 | ACTOR_FLAG_8 | ACTOR_FLAG_10)
@ -136,8 +135,8 @@ void EnPamera_Init(Actor* thisx, PlayState* play) {
Vec3f sp44;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 15.0f);
SkelAnime_InitFlex(play, &this->skelAnime, &object_pamera_Skel_008448, &object_pamera_Anim_0005BC, this->jointTable,
this->morphTable, PAMERA_LIMB_MAX);
SkelAnime_InitFlex(play, &this->skelAnime, &gPamelaSkel, &object_pamera_Anim_0005BC, this->jointTable,
this->morphTable, PAMELA_LIMB_MAX);
Collider_InitCylinder(play, &this->collider);
Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo2(&this->actor.colChkInfo, NULL, &sColChkInfoInit2);
@ -511,9 +510,9 @@ void func_80BD94E0(EnPamera* this, PlayState* play) {
if ((this->actionFunc != func_80BD8B70) && (this->actionFunc != func_80BD8964) &&
(this->actionFunc != func_80BD909C) && (this->actionFunc != func_80BD8D1C) &&
((this->actionFunc != func_80BD8DB0) || (this->actor.speedXZ == 3.0f))) {
Actor_TrackPlayer(play, &this->actor, &this->limb9Rot, &this->limb8Rot, this->actor.focus.pos);
Actor_TrackPlayer(play, &this->actor, &this->headRot, &this->torsoRot, this->actor.focus.pos);
} else {
Actor_TrackNone(&this->limb9Rot, &this->limb8Rot);
Actor_TrackNone(&this->headRot, &this->torsoRot);
}
}
@ -534,9 +533,9 @@ void EnPamera_Update(Actor* thisx, PlayState* play) {
s32 EnPamera_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) {
EnPamera* this = THIS;
if (limbIndex == PAMERA_LIMB_HAIR) {
rot->x += this->limb9Rot.y;
rot->z += this->limb9Rot.x;
if (limbIndex == PAMELA_LIMB_HEAD) {
rot->x += this->headRot.y;
rot->z += this->headRot.x;
}
return false;
}
@ -544,7 +543,7 @@ s32 EnPamera_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f
void EnPamera_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) {
EnPamera* this = THIS;
if (limbIndex == PAMERA_LIMB_HAIR) {
if (limbIndex == PAMELA_LIMB_HEAD) {
Matrix_MultVec3f(&D_80BDA5F0, &this->actor.focus.pos);
}
}
@ -858,7 +857,7 @@ void func_80BDA344(Actor* thisx, PlayState* play) {
if (!(gSaveContext.save.weekEventReg[61] & 4)) {
gSaveContext.save.weekEventReg[61] |= 4;
}
Actor_TrackNone(&this->limb9Rot, &this->limb8Rot);
Actor_TrackNone(&this->headRot, &this->torsoRot);
} else {
func_80BD94E0(this, play);
if (this->actionFunc == func_80BD994C) {

36
src/overlays/actors/ovl_En_Pamera/z_en_pamera.h
View File

@ -2,36 +2,10 @@
#define Z_EN_PAMERA_H
#include "global.h"
#include "objects/object_pamera/object_pamera.h"
struct EnPamera;
typedef enum {
/* 00 */ PAMERA_LIMB_NONE,
/* 01 */ PAMERA_LIMB_ROOT,
/* 02 */ PAMERA_LIMB_SHOULDER_LEFT,
/* 03 */ PAMERA_LIMB_FOREARM_LEFT,
/* 04 */ PAMERA_LIMB_HAND_LEFT,
/* 05 */ PAMERA_LIMB_SHOULDER_RIGHT,
/* 06 */ PAMERA_LIMB_FOREARM_RIGHT,
/* 07 */ PAMERA_LIMB_HAND_RIGHT,
/* 08 */ PAMERA_LIMB_HEAD_FRONT_AND_TOP,
/* 09 */ PAMERA_LIMB_HAIR,
/* 10 */ PAMERA_LIMB_TORSO_FRONT,
/* 11 */ PAMERA_LIMB_NECK,
/* 12 */ PAMERA_LIMB_THIGH_LEFT,
/* 13 */ PAMERA_LIMB_LEG_LEFT,
/* 14 */ PAMERA_LIMB_FOOT_LEFT,
/* 15 */ PAMERA_LIMB_THIGH_RIGHT,
/* 16 */ PAMERA_LIMB_LEG_RIGHT,
/* 17 */ PAMERA_LIMB_FOOT_RIGHT,
/* 18 */ PAMERA_DRESS_FRONT,
/* 19 */ PAMERA_DRESS_BACK,
/* 20 */ PAMERA_DRESS_SIDES,
/* 21 */ PAMERA_LIMB_UNK,
/* 22 */ PAMERA_LIMB_UNK2,
/* 23 */ PAMERA_LIMB_MAX
} ObjectPameraLimbs;
typedef void (*EnPameraActionFunc)(struct EnPamera*, PlayState*);
typedef void (*EnPameraSetupFunc)(struct EnPamera*, PlayState*);
@ -46,10 +20,10 @@ typedef struct EnPamera {
/* 0x1E4 */ s32 pathPointsCount;
/* 0x1E8 */ s32 pathId;
/* 0x1EC */ s32 unk_1EC;
/* 0x1F0 */ Vec3s jointTable[PAMERA_LIMB_MAX];
/* 0x27A */ Vec3s morphTable[PAMERA_LIMB_MAX];
/* 0x304 */ Vec3s limb9Rot;
/* 0x30A */ Vec3s limb8Rot;
/* 0x1F0 */ Vec3s jointTable[PAMELA_LIMB_MAX];
/* 0x27A */ Vec3s morphTable[PAMELA_LIMB_MAX];
/* 0x304 */ Vec3s headRot;
/* 0x30A */ Vec3s torsoRot; // Set, but not used
/* 0x310 */ s16 unk_310;
/* 0x312 */ s16 unk_312;
/* 0x314 */ s16 unk_314;

21
src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c
View File

@ -8,7 +8,6 @@
#include "z64rumble.h"
#include "overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.h"
#include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
#include "objects/object_bigslime/object_bigslime.h"
#define FLAGS (ACTOR_FLAG_1 | ACTOR_FLAG_4 | ACTOR_FLAG_10 | ACTOR_FLAG_20)
@ -1370,16 +1369,16 @@ void EnPametfrog_Update(Actor* thisx, PlayState* play) {
/* value -1: Limb Not used
* value 0: GEKKO_LIMB_WAIST
* value 1: GEKKO_LIMB_L_SHIN
* value 2: GEKKO_LIMB_L_FOOT
* value 3: GEKKO_LIMB_R_SHIN
* value 4: GEKKO_LIMB_R_FOOT
* value 5: GEKKO_LIMB_L_UPPER_ARM
* value 6: GEKKO_LIMB_L_FOREARM
* value 7: GEKKO_LIMB_L_HAND
* value 8: GEKKO_LIMB_R_UPPER_ARM
* value 9: GEKKO_LIMB_R_FOREARM
* value 10: GEKKO_LIMB_R_HAND
* value 1: GEKKO_LIMB_LEFT_SHIN
* value 2: GEKKO_LIMB_LEFT_FOOT
* value 3: GEKKO_LIMB_RIGHT_SHIN
* value 4: GEKKO_LIMB_RIGHT_FOOT
* value 5: GEKKO_LIMB_LEFT_UPPER_ARM
* value 6: GEKKO_LIMB_LEFT_FOREARM
* value 7: GEKKO_LIMB_LEFT_HAND
* value 8: GEKKO_LIMB_RIGHT_UPPER_ARM
* value 9: GEKKO_LIMB_RIGHT_FOREARM
* value 10: GEKKO_LIMB_RIGHT_HAND
* value 11: GEKKO_LIMB_JAW
*/
static s8 limbPosIndex[] = {

29
src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.h
View File

@ -2,6 +2,7 @@
#define Z_EN_PAMETFROG_H
#include "global.h"
#include "objects/object_bigslime/object_bigslime.h"
struct EnPametfrog;
@ -20,34 +21,6 @@ typedef enum {
/* 0x9 */ GEKKO_DEFEAT,
} EnPametfrogState;
typedef enum {
/* 0x00 */ GEKKO_LIMB_NONE,
/* 0x01 */ GEKKO_LIMB_ROOT,
/* 0x02 */ GEKKO_LIMB_WAIST,
/* 0x03 */ GEKKO_LIMB_L_THIGH,
/* 0x04 */ GEKKO_LIMB_L_SHIN,
/* 0x05 */ GEKKO_LIMB_L_ANKLE,
/* 0x06 */ GEKKO_LIMB_L_FOOT,
/* 0x07 */ GEKKO_LIMB_R_THIGH,
/* 0x08 */ GEKKO_LIMB_R_SHIN,
/* 0x09 */ GEKKO_LIMB_R_ANKLE,
/* 0x0A */ GEKKO_LIMB_R_FOOT,
/* 0x0B */ GEKKO_LIMB_TORSO,
/* 0x0C */ GEKKO_LIMB_L_UPPER_ARM,
/* 0x0D */ GEKKO_LIMB_L_FOREARM,
/* 0x0E */ GEKKO_LIMB_L_WRIST,
/* 0x0F */ GEKKO_LIMB_L_HAND,
/* 0x10 */ GEKKO_LIMB_R_UPPER_ARM,
/* 0x11 */ GEKKO_LIMB_R_FOREARM,
/* 0x12 */ GEKKO_LIMB_R_WRIST,
/* 0x13 */ GEKKO_LIMB_R_HAND,
/* 0x14 */ GEKKO_LIMB_HEAD,
/* 0x15 */ GEKKO_LIMB_JAW,
/* 0x16 */ GEKKO_LIMB_L_EYE,
/* 0x17 */ GEKKO_LIMB_R_EYE,
/* 0x18 */ GEKKO_LIMB_MAX,
} EnPametfrogLimb;
typedef struct EnPametfrog {
/* 0x000 */ Actor actor;
/* 0x144 */ SkelAnime skelAnime;