mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-08 13:26:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Documented object_sth and object_ahg, both used by EnSth (Moon gazer who wants to buy Ocean spiderhouse) (#1169)

Browse Source 
* object_sth/object_ahg: docs

* Ssh: formatter

* Apply suggestions from code review

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* Oops missed one

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* Seth: fixes

* Sth: more requested changes

* Apply suggestions from code review

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Sth/Ahg: requested changes

* Apply suggestions from code review

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Sth: further function name requested changes

* Sth: minor note

* Sth: fix animation name

* Sth: forgot to rename saved flag

* Seth: change ocean wallet week reg name

* Sth: some requested changes

* Sth: fixed week event reg, added more

* Sth/Ssh/Si: changed from two defines to 1

* Si/Sth/Ssh: mistook fanfare for sfx, token define renamed

* Sth/Ssh/Sekihi: requested changes and some weekregflag docs

* Sekihi: fix missing header for skull count

* Sekihi: moved flag description to z64save

* Sekihi: moved flag description to z64save

* Sth: removed flag

* Update include/z64save.h

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

---------

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
This commit is contained in:
Isghj
2023-03-07 15:54:12 -08:00
committed by GitHub
parent 2cce8f6767
commit e50ab59cf7
16 changed files with 547 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_ahg.xml
+58 -49
View File
@@ -1,53 +1,62 @@
<Root>
<!-- Assets for the bearded man from OOT, body is reused in MM for Cured Swamp Spider House Man (head substituted from overlay data). -->
<File Name="object_ahg" Segment="6">
<Texture Name="object_ahg_TLUT_000000" OutName="tlut_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" />
<Texture Name="object_ahg_Tex_000200" OutName="tex_000200" Format="ci8" Width="16" Height="16" Offset="0x200" />
<Texture Name="object_ahg_Tex_000300" OutName="tex_000300" Format="ci8" Width="16" Height="16" Offset="0x300" />
<Texture Name="object_ahg_Tex_000400" OutName="tex_000400" Format="ci8" Width="8" Height="8" Offset="0x400" />
<Texture Name="object_ahg_Tex_000440" OutName="tex_000440" Format="ci8" Width="8" Height="8" Offset="0x440" />
<!-- <Blob Name="object_ahg_Blob_000480" Size="0x300" Offset="0x480" /> -->
<Texture Name="object_ahg_Tex_000780" OutName="tex_000780" Format="ci8" Width="16" Height="16" Offset="0x780" />
<Texture Name="object_ahg_Tex_000880" OutName="tex_000880" Format="i8" Width="8" Height="8" Offset="0x880" />
<Texture Name="object_ahg_Tex_0008C0" OutName="tex_0008C0" Format="i8" Width="8" Height="8" Offset="0x8C0" />
<Texture Name="object_ahg_Tex_000900" OutName="tex_000900" Format="ci8" Width="32" Height="16" Offset="0x900" />
<Texture Name="object_ahg_Tex_000B00" OutName="tex_000B00" Format="ci8" Width="16" Height="16" Offset="0xB00" />
<DList Name="object_ahg_DL_002FF0" Offset="0x2FF0" />
<DList Name="object_ahg_DL_003400" Offset="0x3400" />
<DList Name="object_ahg_DL_003570" Offset="0x3570" />
<DList Name="object_ahg_DL_0036A0" Offset="0x36A0" />
<DList Name="object_ahg_DL_0037D8" Offset="0x37D8" />
<DList Name="object_ahg_DL_003948" Offset="0x3948" />
<DList Name="object_ahg_DL_003A78" Offset="0x3A78" />
<DList Name="object_ahg_DL_003BB0" Offset="0x3BB0" />
<DList Name="object_ahg_DL_003DD8" Offset="0x3DD8" />
<DList Name="object_ahg_DL_003F18" Offset="0x3F18" />
<DList Name="object_ahg_DL_004048" Offset="0x4048" />
<DList Name="object_ahg_DL_004180" Offset="0x4180" />
<DList Name="object_ahg_DL_0042C0" Offset="0x42C0" />
<DList Name="object_ahg_DL_0043F0" Offset="0x43F0" />
<DList Name="object_ahg_DL_004528" Offset="0x4528" />
<!-- <Blob Name="object_ahg_Blob_0046C8" Size="0x180" Offset="0x46C8" /> -->
<Texture Name="object_ahg_Tex_004848" OutName="tex_004848" Format="ci8" Width="8" Height="8" Offset="0x4848" />
<Texture Name="object_ahg_Tex_004888" OutName="tex_004888" Format="ci8" Width="32" Height="16" Offset="0x4888" />
<Texture Name="object_ahg_Tex_004A88" OutName="tex_004A88" Format="ci8" Width="16" Height="16" Offset="0x4A88" />
<Texture Name="object_ahg_Tex_004B88" OutName="tex_004B88" Format="ci8" Width="8" Height="16" Offset="0x4B88" />
<DList Name="object_ahg_DL_005408" Offset="0x5408" />
<DList Name="object_ahg_DL_005628" Offset="0x5628" />
<Limb Name="object_ahg_Standardlimb_0058A8" Type="Standard" EnumName="OBJECT_AHG_LIMB_01" Offset="0x58A8" />
<Limb Name="object_ahg_Standardlimb_0058B4" Type="Standard" EnumName="OBJECT_AHG_LIMB_02" Offset="0x58B4" />
<Limb Name="object_ahg_Standardlimb_0058C0" Type="Standard" EnumName="OBJECT_AHG_LIMB_03" Offset="0x58C0" />
<Limb Name="object_ahg_Standardlimb_0058CC" Type="Standard" EnumName="OBJECT_AHG_LIMB_04" Offset="0x58CC" />
<Limb Name="object_ahg_Standardlimb_0058D8" Type="Standard" EnumName="OBJECT_AHG_LIMB_05" Offset="0x58D8" />
<Limb Name="object_ahg_Standardlimb_0058E4" Type="Standard" EnumName="OBJECT_AHG_LIMB_06" Offset="0x58E4" />
<Limb Name="object_ahg_Standardlimb_0058F0" Type="Standard" EnumName="OBJECT_AHG_LIMB_07" Offset="0x58F0" />
<Limb Name="object_ahg_Standardlimb_0058FC" Type="Standard" EnumName="OBJECT_AHG_LIMB_08" Offset="0x58FC" />
<Limb Name="object_ahg_Standardlimb_005908" Type="Standard" EnumName="OBJECT_AHG_LIMB_09" Offset="0x5908" />
<Limb Name="object_ahg_Standardlimb_005914" Type="Standard" EnumName="OBJECT_AHG_LIMB_0A" Offset="0x5914" />
<Limb Name="object_ahg_Standardlimb_005920" Type="Standard" EnumName="OBJECT_AHG_LIMB_0B" Offset="0x5920" />
<Limb Name="object_ahg_Standardlimb_00592C" Type="Standard" EnumName="OBJECT_AHG_LIMB_0C" Offset="0x592C" />
<Limb Name="object_ahg_Standardlimb_005938" Type="Standard" EnumName="OBJECT_AHG_LIMB_0D" Offset="0x5938" />
<Limb Name="object_ahg_Standardlimb_005944" Type="Standard" EnumName="OBJECT_AHG_LIMB_0E" Offset="0x5944" />
<Limb Name="object_ahg_Standardlimb_005950" Type="Standard" EnumName="OBJECT_AHG_LIMB_0F" Offset="0x5950" />
<Skeleton Name="object_ahg_Skel_005998" Type="Flex" LimbType="Standard" LimbNone="OBJECT_AHG_LIMB_NONE" LimbMax="OBJECT_AHG_LIMB_MAX" EnumName="ObjectAhgLimb" Offset="0x5998" />
<Texture Name="gAhgTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x0" />
<Texture Name="gAhgHairLineTex" OutName="hair_line" Format="ci8" Width="16" Height="16" Offset="0x200" />
<Texture Name="gAhgHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x300" />
<Texture Name="gAhgEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x400" />
<Texture Name="gAhgSkinGradientTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x440"/>
<Texture Name="gAhgEyeOpenTex" OutName="eye_open" Format="ci8" Width="16" Height="16" Offset="0x480" TlutOffset="0x0"/>
<Texture Name="gAhgEyeHalfTex" OutName="eye_half" Format="ci8" Width="16" Height="16" Offset="0x580" TlutOffset="0x0"/>
<Texture Name="gAhgEyeClosedTex" OutName="eye_closed" Format="ci8" Width="16" Height="16" Offset="0x680" TlutOffset="0x0"/>
<Texture Name="gAhgFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x780" />
<Texture Name="gAhgShirtTex" OutName="shirt" Format="i8" Width="8" Height="8" Offset="0x880" />
<Texture Name="gAhgShoesTex" OutName="shoes" Format="i8" Width="8" Height="8" Offset="0x8C0" />
<Texture Name="gAhgBeltBuckleTex" OutName="belt_buckle" Format="ci8" Width="32" Height="16" Offset="0x900" />
<Texture Name="gAhgBeltLoopTex" OutName="belt_loop" Format="ci8" Width="16" Height="16" Offset="0xB00" />
<!-- This head is overwritten in EnSth draw. -->
<DList Name="gAhgBeardedHeadDL" Offset="0x2FF0" />
<DList Name="gAhgRightHandDL" Offset="0x3400" />
<DList Name="gAhgRightForearmDL" Offset="0x3570" />
<DList Name="gAhgRightUpperArmDL" Offset="0x36A0" />
<DList Name="gAhgLeftHandDL" Offset="0x37D8" />
<DList Name="gAhgLeftForearmDL" Offset="0x3948" />
<DList Name="gAhgLeftUpperArmDL" Offset="0x3A78" />
<DList Name="gAhgTorsoDL" Offset="0x3BB0" />
<DList Name="gAhgRightFootDL" Offset="0x3DD8" />
<DList Name="gAhgRightShinDL" Offset="0x3F18" />
<DList Name="gAhgRightThighDL" Offset="0x4048" />
<DList Name="gAhgLeftFootDL" Offset="0x4180" />
<DList Name="gAhgLeftShinDL" Offset="0x42C0" />
<DList Name="gAhgLeftThighDL" Offset="0x43F0" />
<DList Name="gAhgPelvisDL" Offset="0x4528" />
<!-- Assets for alternate heads for Ahg, left over from OOT (Unused). -->
<Texture Name="gAhg2TLUT" OutName="tlut2" Format="rgba16" Width="16" Height="12" Offset="0x46C8" />
<Texture Name="gAhgEar2Tex" OutName="ear2" Format="ci8" Width="8" Height="8" Offset="0x4848" TlutOffset="0x46C8" />
<Texture Name="gAhgMouthTex" OutName="mouth" Format="ci8" Width="32" Height="16" Offset="0x4888" TlutOffset="0x46C8" />
<Texture Name="gAhgEyeAndEyebrowTex" OutName="eye_with_eyebrow" Format="ci8" Width="16" Height="16" Offset="0x4A88" TlutOffset="0x46C8" />
<Texture Name="gAhgRedHairTex" OutName="red_hair" Format="ci8" Width="8" Height="16" Offset="0x4B88" TlutOffset="0x46C8" />
<DList Name="gAhgRedHeadDL" Offset="0x5408" />
<DList Name="gAhgShortHairHeadDL" Offset="0x5628" />
<Limb Name="gAhgPelvisLimb" Type="Standard" EnumName="AHG_LIMB_PELVIS" Offset="0x58A8" />
<Limb Name="gAhgLeftThighLimb" Type="Standard" EnumName="AHG_LIMB_LEFT_THIGH" Offset="0x58B4" />
<Limb Name="gAhgLeftShinLimb" Type="Standard" EnumName="AHG_LIMB_LEFT_SHIN" Offset="0x58C0" />
<Limb Name="gAhgLeftFootLimb" Type="Standard" EnumName="AHG_LIMB_LEFT_FOOT" Offset="0x58CC" />
<Limb Name="gAhgRightThighLimb" Type="Standard" EnumName="AHG_LIMB_RIGHT_THIGH" Offset="0x58D8" />
<Limb Name="gAhgRightShinLimb" Type="Standard" EnumName="AHG_LIMB_RIGHT_SHIN" Offset="0x58E4" />
<Limb Name="gAhgRightFootLimb" Type="Standard" EnumName="AHG_LIMB_RIGHT_FOOT" Offset="0x58F0" />
<Limb Name="gAhgTorsoLimb" Type="Standard" EnumName="AHG_LIMB_CHEST" Offset="0x58FC" />
<Limb Name="gAhgLeftUpperArmLimb" Type="Standard" EnumName="AHG_LIMB_LEFT_UPPER_ARM" Offset="0x5908" />
<Limb Name="gAhgLeftForearmLimb" Type="Standard" EnumName="AHG_LIMB_LEFT_FOREARM" Offset="0x5914" />
<Limb Name="gAhgLeftHandLimb" Type="Standard" EnumName="AHG_LIMB_LEFT_HAND" Offset="0x5920" />
<Limb Name="gAhgRightUpperArmLimb" Type="Standard" EnumName="AHG_LIMB_RIGHT_UPPER_ARM" Offset="0x592C" />
<Limb Name="gAhgRightForearmLimb" Type="Standard" EnumName="AHG_LIMB_RIGHT_FOREARM" Offset="0x5938" />
<Limb Name="gAhgRightHandLimb" Type="Standard" EnumName="AHG_LIMB_RIGHT_HAND" Offset="0x5944" />
<Limb Name="gAhgHeadLimb" Type="Standard" EnumName="AHG_LIMB_HEAD" Offset="0x5950" />
<Skeleton Name="gAhgSkel" Type="Flex" LimbType="Standard" LimbNone="AHG_LIMB_NONE" LimbMax="AHG_LIMB_MAX" EnumName="ObjectAhgLimb" Offset="0x5998" />
</File>
</Root>
assets/xml/objects/object_sth.xml
+49 -38
View File
@@ -1,42 +1,53 @@
<Root>
<!-- Assets for the guy looking up at the moon, and the guy you find in Spider Houses. -->
<!-- This object is almost a copy of object_boj, with the animations removed -->
<File Name="object_sth" Segment="6">
<!-- <Blob Name="object_sth_Blob_000000" Size="0x530" Offset="0x0" /> -->
<DList Name="object_sth_DL_001C30" Offset="0x1C30" />
<DList Name="object_sth_DL_001C38" Offset="0x1C38" />
<DList Name="object_sth_DL_001D80" Offset="0x1D80" />
<DList Name="object_sth_DL_001E88" Offset="0x1E88" />
<DList Name="object_sth_DL_001F90" Offset="0x1F90" />
<DList Name="object_sth_DL_0020D8" Offset="0x20D8" />
<DList Name="object_sth_DL_0021E0" Offset="0x21E0" />
<DList Name="object_sth_DL_0022E8" Offset="0x22E8" />
<DList Name="object_sth_DL_0024C0" Offset="0x24C0" />
<DList Name="object_sth_DL_0025D8" Offset="0x25D8" />
<DList Name="object_sth_DL_0026E8" Offset="0x26E8" />
<DList Name="object_sth_DL_0027F0" Offset="0x27F0" />
<DList Name="object_sth_DL_002908" Offset="0x2908" />
<DList Name="object_sth_DL_002A18" Offset="0x2A18" />
<DList Name="object_sth_DL_002B20" Offset="0x2B20" />
<Texture Name="object_sth_TLUT_002D08" OutName="tlut_002D08" Format="rgba16" Width="16" Height="16" Offset="0x2D08" />
<Texture Name="object_sth_Tex_002F08" OutName="tex_002F08" Format="ci8" Width="8" Height="8" Offset="0x2F08" />
<Texture Name="object_sth_Tex_002F48" OutName="tex_002F48" Format="ci8" Width="8" Height="8" Offset="0x2F48" />
<Texture Name="object_sth_Tex_002F88" OutName="tex_002F88" Format="i8" Width="16" Height="16" Offset="0x2F88" />
<Texture Name="object_sth_Tex_003088" OutName="tex_003088" Format="ci8" Width="8" Height="8" Offset="0x3088" />
<Texture Name="object_sth_Tex_0030C8" OutName="tex_0030C8" Format="i8" Width="8" Height="8" Offset="0x30C8" />
<Limb Name="object_sth_Standardlimb_003108" Type="Standard" EnumName="OBJECT_STH_LIMB_01" Offset="0x3108" />
<Limb Name="object_sth_Standardlimb_003114" Type="Standard" EnumName="OBJECT_STH_LIMB_02" Offset="0x3114" />
<Limb Name="object_sth_Standardlimb_003120" Type="Standard" EnumName="OBJECT_STH_LIMB_03" Offset="0x3120" />
<Limb Name="object_sth_Standardlimb_00312C" Type="Standard" EnumName="OBJECT_STH_LIMB_04" Offset="0x312C" />
<Limb Name="object_sth_Standardlimb_003138" Type="Standard" EnumName="OBJECT_STH_LIMB_05" Offset="0x3138" />
<Limb Name="object_sth_Standardlimb_003144" Type="Standard" EnumName="OBJECT_STH_LIMB_06" Offset="0x3144" />
<Limb Name="object_sth_Standardlimb_003150" Type="Standard" EnumName="OBJECT_STH_LIMB_07" Offset="0x3150" />
<Limb Name="object_sth_Standardlimb_00315C" Type="Standard" EnumName="OBJECT_STH_LIMB_08" Offset="0x315C" />
<Limb Name="object_sth_Standardlimb_003168" Type="Standard" EnumName="OBJECT_STH_LIMB_09" Offset="0x3168" />
<Limb Name="object_sth_Standardlimb_003174" Type="Standard" EnumName="OBJECT_STH_LIMB_0A" Offset="0x3174" />
<Limb Name="object_sth_Standardlimb_003180" Type="Standard" EnumName="OBJECT_STH_LIMB_0B" Offset="0x3180" />
<Limb Name="object_sth_Standardlimb_00318C" Type="Standard" EnumName="OBJECT_STH_LIMB_0C" Offset="0x318C" />
<Limb Name="object_sth_Standardlimb_003198" Type="Standard" EnumName="OBJECT_STH_LIMB_0D" Offset="0x3198" />
<Limb Name="object_sth_Standardlimb_0031A4" Type="Standard" EnumName="OBJECT_STH_LIMB_0E" Offset="0x31A4" />
<Limb Name="object_sth_Standardlimb_0031B0" Type="Standard" EnumName="OBJECT_STH_LIMB_0F" Offset="0x31B0" />
<Skeleton Name="object_sth_Skel_0031F8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_STH_LIMB_NONE" LimbMax="OBJECT_STH_LIMB_MAX" EnumName="ObjectSthLimb" Offset="0x31F8" />
<!-- Unused copy of head from object_boj (Juggler). -->
<Array Name="gSthUnusedHeadVtx" Count="83" Offset="0x0">
<Vtx/>
</Array>
<DList Name="gSthHeadDL" Offset="0x1C30" />
<DList Name="gSthRightHandDL" Offset="0x1C38" />
<DList Name="gSthRightForearmDL" Offset="0x1D80" />
<DList Name="gSthRightUpperArmDL" Offset="0x1E88" />
<DList Name="gSthLeftHandDL" Offset="0x1F90" />
<DList Name="gSthLeftForearmDL" Offset="0x20D8" />
<DList Name="gSthLeftUpperArmDL" Offset="0x21E0" />
<DList Name="gSthTorsoDL" Offset="0x22E8" />
<DList Name="gSthRightFootDL" Offset="0x24C0" />
<DList Name="gSthRightShinDL" Offset="0x25D8" />
<DList Name="gSthRightThighDL" Offset="0x26E8" />
<DList Name="gSthLeftFootDL" Offset="0x27F0" />
<DList Name="gSthLeftShinDL" Offset="0x2908" />
<DList Name="gSthLeftThighDL" Offset="0x2A18" />
<DList Name="gSthPelvisDL" Offset="0x2B20" />
<Texture Name="gSthTLUT" OutName="sth_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2D08" />
<Texture Name="gSthSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x2F08" />
<Texture Name="gSthFingerTex" OutName="figer" Format="ci8" Width="8" Height="8" Offset="0x2F48" />
<!-- Shirt and pants get painted with color in the draw func. -->
<Texture Name="gSthShirtTex" OutName="shirt" Format="i8" Width="16" Height="16" Offset="0x2F88" />
<Texture Name="gSthBeltBuckleTex" OutName="belt_buckle" Format="ci8" Width="8" Height="8" Offset="0x3088" />
<Texture Name="gSthPantsTex" OutName="pants" Format="i8" Width="8" Height="8" Offset="0x30C8" />
<Limb Name="gSthPelvisLimb" Type="Standard" EnumName="STH_LIMB_PELVIS" Offset="0x3108" />
<Limb Name="gSthLeftThighLimb" Type="Standard" EnumName="STH_LIMB_LEFT_THIGH" Offset="0x3114" />
<Limb Name="gSthLeftShinLimb" Type="Standard" EnumName="STH_LIMB_LEFT_SHIN" Offset="0x3120" />
<Limb Name="gSthLeftFootLimb" Type="Standard" EnumName="STH_LIMB_LEFT_FOOT" Offset="0x312C" />
<Limb Name="gSthRightThighLimb" Type="Standard" EnumName="STH_LIMB_RIGHT_THIGH" Offset="0x3138" />
<Limb Name="gSthRightShinLimb" Type="Standard" EnumName="STH_LIMB_RIGHT_SHIN" Offset="0x3144" />
<Limb Name="gSthRightFootLimb" Type="Standard" EnumName="STH_LIMB_RIGHT_FOOT" Offset="0x3150" />
<Limb Name="gSthTorsoLimb" Type="Standard" EnumName="STH_LIMB_CHEST" Offset="0x315C" />
<Limb Name="gSthLeftUpperArmLimb" Type="Standard" EnumName="STH_LIMB_LEFT_UPPER_ARM" Offset="0x3168" />
<Limb Name="gSthLeftForearmLimb" Type="Standard" EnumName="STH_LIMB_LEFT_FOREARM" Offset="0x3174" />
<Limb Name="gSthLeftHandLimb" Type="Standard" EnumName="STH_LIMB_LEFT_HAND" Offset="0x3180" />
<Limb Name="gSthRightUpperArmLimb" Type="Standard" EnumName="STH_LIMB_RIGHT_UPPER_ARM" Offset="0x318C" />
<Limb Name="gSthRightForearmLimb" Type="Standard" EnumName="STH_LIMB_RIGHT_FOREARM" Offset="0x3198" />
<Limb Name="gSthRightHandLimb" Type="Standard" EnumName="STH_LIMB_RIGHT_HAND" Offset="0x31A4" />
<!-- EnSth2 uses this head, EnSth1 has a replacement head embedded in its overlay. -->
<Limb Name="gSthHeadLimb" Type="Standard" EnumName="STH_LIMB_HEAD" Offset="0x31B0" />
<Skeleton Name="gSthSkel" Type="Flex" LimbType="Standard" LimbNone="STH_LIMB_NONE" LimbMax="STH_LIMB_MAX" EnumName="ObjectSthLimb" Offset="0x31F8" />
</File>
</Root>