izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07: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 20:54:12 -03:00
committed by GitHub
co-authored by Anghelo Carvajal Tom Overton
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>
assets/xml/overlays/ovl_En_Sth.xml
+11 -10
View File
@@ -1,14 +1,15 @@
<Root>
<File Name="ovl_En_Sth" BaseAddress="0x80B66D30" RangeStart="0x1890" RangeEnd="0x646C">
<DList Name="ovl_En_Sth_DL_0034A0" Offset="0x34A0"/>
<DList Name="ovl_En_Sth_DL_0037C0" Offset="0x37C0"/>
<Animation Name="ovl_En_Sth_Anim_003F50" Offset="0x3F50" /> <!-- Original name is "sth_ko_matsu" ("matsu" = "to wait​") -->
<Animation Name="ovl_En_Sth_Anim_0045B4" Offset="0x45B4" /> <!-- Original name is "sth_kibunwaru" ("bad mood") -->
<Animation Name="ovl_En_Sth_Anim_004CC0" Offset="0x4CC0" /> <!-- Original name is "sth_talk2000" -->
<Animation Name="ovl_En_Sth_Anim_00533C" Offset="0x533C" /> <!-- Original name is "sth_wait2000" -->
<Animation Name="ovl_En_Sth_Anim_0059B8" Offset="0x59B8" /> <!-- Original name is "sth_miageru" ("look up") -->
<Animation Name="ovl_En_Sth_Anim_005E40" Offset="0x5E40" /> <!-- Original name is "sth_kyorokyoro" (onomatopoeic for "looking around restlessly") -->
<Animation Name="ovl_En_Sth_Anim_006354" Offset="0x6354" /> <!-- Original name is "sth_onegai" ("request; favor (to ask); wish") -->
<Animation Name="ovl_En_Sth_Anim_00645C" Offset="0x645C" /> <!-- Original name is "sth_tasukete" ("help!​") -->
<DList Name="gEnSthHeadDL" Offset="0x34A0"/>
<DList Name="gEnSthExtraHairDL" Offset="0x37C0"/>
<Animation Name="gEnSthSignalAnim" Offset="0x3F50" /> <!-- Original name is "sth_ko_matsu" ("matsu" = "to wait​") -->
<Animation Name="gEnSthBendDownAnim" Offset="0x45B4" /> <!-- Original name is "sth_kibunwaru" ("bad mood") -->
<Animation Name="gEnSthTalkWithHandUpAnim" Offset="0x4CC0" /> <!-- Original name is "sth_talk2000" -->
<Animation Name="gEnSthWaitAnim" Offset="0x533C" /> <!-- Original name is "sth_wait2000" -->
<Animation Name="gEnSthLookUpAnim" Offset="0x59B8" /> <!-- Original name is "sth_miageru" ("look up") -->
<Animation Name="gEnSthLookAroundAnim" Offset="0x5E40" /> <!-- Original name is "sth_kyorokyoro" (onomatopoeic for "looking around restlessly") -->
<Animation Name="gEnSthPleadAnim" Offset="0x6354" /> <!-- Original name is "sth_onegai" ("request; favor (to ask); wish") -->
<Animation Name="gEnSthPanicAnim" Offset="0x645C" /> <!-- Original name is "sth_tasukete" ("help!​") -->
</File>
</Root>
include/z64save.h
+14 -5
View File
@@ -622,9 +622,18 @@ typedef enum SunsSongState {
#define WEEKEVENTREG_13_04 PACK_WEEKEVENTREG_FLAG(13, 0x04)
#define WEEKEVENTREG_13_08 PACK_WEEKEVENTREG_FLAG(13, 0x08)
#define WEEKEVENTREG_13_10 PACK_WEEKEVENTREG_FLAG(13, 0x10)
#define WEEKEVENTREG_13_20 PACK_WEEKEVENTREG_FLAG(13, 0x20)
#define WEEKEVENTREG_13_40 PACK_WEEKEVENTREG_FLAG(13, 0x40)
#define WEEKEVENTREG_13_80 PACK_WEEKEVENTREG_FLAG(13, 0x80)
// This flag marks that the player has finished the Oceanside Spider House and has exited.
// Used to identify if EnSth should be moved deeper into the house.
// This does NOT flag:
// A) that the player has completed the house (Inventory_GetSkullTokenCount(play->sceneId))
// B) that the player has collected a reward (WEEKEVENTREG_OCEANSIDE_SPIDER_HOUSE_COLLECTED_REWARD)
// C) that the player has collected the wallet (WEEKEVENTREG_RECEIVED_OCEANSIDE_WALLET_UPGRADE)
#define WEEKEVENTREG_OCEANSIDE_SPIDER_HOUSE_BUYER_MOVED_IN PACK_WEEKEVENTREG_FLAG(13, 0x20)
#define WEEKEVENTREG_RECEIVED_OCEANSIDE_WALLET_UPGRADE PACK_WEEKEVENTREG_FLAG(13, 0x40)
// You only get a wallet if completed on Day 1: repeat gets silver rupee, other days get less
#define WEEKEVENTREG_OCEANSIDE_SPIDER_HOUSE_COLLECTED_REWARD PACK_WEEKEVENTREG_FLAG(13, 0x80)
// PlayedMilkMinigame
// Attempted Cremia Cart Ride
@@ -830,10 +839,10 @@ typedef enum SunsSongState {
#define WEEKEVENTREG_34_02 PACK_WEEKEVENTREG_FLAG(34, 0x02)
#define WEEKEVENTREG_34_04 PACK_WEEKEVENTREG_FLAG(34, 0x04)
#define WEEKEVENTREG_34_08 PACK_WEEKEVENTREG_FLAG(34, 0x08)
#define WEEKEVENTREG_SWAMP_SPIDER_HOUSE_TALKED PACK_WEEKEVENTREG_FLAG(34, 0x08)
#define WEEKEVENTREG_34_10 PACK_WEEKEVENTREG_FLAG(34, 0x10)
#define WEEKEVENTREG_34_20 PACK_WEEKEVENTREG_FLAG(34, 0x20)
#define WEEKEVENTREG_34_40 PACK_WEEKEVENTREG_FLAG(34, 0x40)
#define WEEKEVENTREG_RECEIVED_MASK_OF_TRUTH PACK_WEEKEVENTREG_FLAG(34, 0x40)
// Cremia did Milk Run alone. Player didn't interact or didn't accept the ride
#define WEEKEVENTREG_34_80 PACK_WEEKEVENTREG_FLAG(34, 0x80)
src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c
+3 -2
View File
@@ -59,8 +59,9 @@ void EnSekihi_Init(Actor* thisx, PlayState* play) {
return;
}
if ((params == SEKIHI_TYPE_4) && (((gSaveContext.save.skullTokenCount & 0xFFFF)) >= 30)) {
SET_WEEKEVENTREG(WEEKEVENTREG_13_20);
if ((params == SEKIHI_TYPE_4) && (((gSaveContext.save.skullTokenCount & 0xFFFF)) >= SPIDER_HOUSE_TOKENS_REQUIRED)) {
// For some reason the mikau grave sets the flag instead of something in the spider house on exit.
SET_WEEKEVENTREG(WEEKEVENTREG_OCEANSIDE_SPIDER_HOUSE_BUYER_MOVED_IN);
}
objectIndex = Object_GetIndex(&play->objectCtx, sObjectIds[params]);
src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.h
+2
View File
@@ -2,6 +2,8 @@
#define Z_EN_SEKIHI_H
#include "global.h"
#include "overlays/actors/ovl_En_Si/z_en_si.h"
#define ENSIKIHI_GET_TYPE(thisx) ((thisx)->params & 0xF)
src/overlays/actors/ovl_En_Si/z_en_si.c
+3 -3
View File
@@ -104,11 +104,11 @@ void EnSi_GiveToken(EnSi* this, PlayState* play) {
Flags_SetTreasure(play, chestFlag);
}
Item_Give(play, ITEM_SKULL_TOKEN);
if (Inventory_GetSkullTokenCount(play->sceneId) >= 30) {
Message_StartTextbox(play, 0xFC, NULL);
if (Inventory_GetSkullTokenCount(play->sceneId) >= SPIDER_HOUSE_TOKENS_REQUIRED) {
Message_StartTextbox(play, 0xFC, NULL); // You collected all tokens, curse lifted
Audio_PlayFanfare(NA_BGM_GET_ITEM | 0x900);
} else {
Message_StartTextbox(play, 0x52, NULL);
Message_StartTextbox(play, 0x52, NULL); // You got one more gold token, your [count] one!
Audio_PlayFanfare(NA_BGM_GET_SMALL_ITEM);
}
}
src/overlays/actors/ovl_En_Si/z_en_si.h
+2
View File
@@ -5,6 +5,8 @@
#define ENSI_GET_CHEST_FLAG(thisx) (((thisx)->params & 0xFC) >> 2)
#define SPIDER_HOUSE_TOKENS_REQUIRED 30
struct EnSi;
typedef void (*EnSiActionFunc)(struct EnSi*, PlayState*);
src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
+16 -16
View File
@@ -654,7 +654,7 @@ void EnSsh_Init(Actor* thisx, PlayState* play) {
this->actor.gravity = 0.0f;
this->initialYaw = this->actor.world.rot.y;
EnSsh_SetupAction(this, EnSsh_Start);
if (Inventory_GetSkullTokenCount(play->sceneId) >= 30) {
if (Inventory_GetSkullTokenCount(play->sceneId) >= SPIDER_HOUSE_TOKENS_REQUIRED) {
Actor_Kill(&this->actor);
}
}
@@ -686,18 +686,18 @@ void EnSsh_Talk(EnSsh* this, PlayState* play) {
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) {
switch (play->msgCtx.currentTextId) {
case 0x904:
case 0x905:
case 0x906:
case 0x908:
case 0x910:
case 0x911:
case 0x912:
case 0x914:
case 0x904: // (does not exist)
case 0x905: // (does not exist)
case 0x906: // (does not exist)
case 0x908: // (does not exist)
case 0x910: // Help me! I am not a monster, I was cursed this way
case 0x911: // Find all in here and defeat them
case 0x912: // Don't forget to collect their token
case 0x914: // In here, cursed spiders, defeat them to make me normal
func_80151938(play, play->msgCtx.currentTextId + 1);
break;
default:
default: // intended case 0x915 from above (914+1)
func_801477B4(play);
this->actionFunc = EnSsh_Idle;
break;
@@ -706,15 +706,15 @@ void EnSsh_Talk(EnSsh* this, PlayState* play) {
}
void func_809756D0(EnSsh* this, PlayState* play) {
u16 phi_a1;
u16 nextTextId;
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_34_08)) {
phi_a1 = 0x914;
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_SWAMP_SPIDER_HOUSE_TALKED)) {
nextTextId = 0x914; // In here, cursed spiders, defeat them to make me normal
} else {
phi_a1 = 0x910;
SET_WEEKEVENTREG(WEEKEVENTREG_34_08);
nextTextId = 0x910; // Help me! I am not a monster, I was cursed this way
SET_WEEKEVENTREG(WEEKEVENTREG_SWAMP_SPIDER_HOUSE_TALKED);
}
Message_StartTextbox(play, phi_a1, &this->actor);
Message_StartTextbox(play, nextTextId, &this->actor);
}
void EnSsh_Idle(EnSsh* this, PlayState* play) {
src/overlays/actors/ovl_En_Ssh/z_en_ssh.h
+2
View File
@@ -2,6 +2,8 @@
#define Z_EN_SSH_H
#include "global.h"
#include "overlays/actors/ovl_En_Si/z_en_si.h"
#include "overlays/actors/ovl_En_Sth/z_en_sth.h"
struct EnSsh;
src/overlays/actors/ovl_En_Sth/z_en_sth.c
+319 -261
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Sth/z_en_sth.h
+31 -16
View File
@@ -2,33 +2,48 @@
#define Z_EN_STH_H
#include "global.h"
#include "overlays/actors/ovl_En_Si/z_en_si.h"
#include "objects/object_sth/object_sth.h"
#include "objects/object_ahg/object_ahg.h"
#include "objects/object_mask_truth/object_mask_truth.h"
struct EnSth;
typedef void (*EnSthActionFunc)(struct EnSth*, PlayState*);
#define ENSTH_GET_F(thisx) ((thisx)->params & 0xF)
#define ENSTH_GET_100(thisx) ((thisx)->params & 0x100)
typedef enum {
/* 1 */ STH_TYPE_UNUSED_1 = 1,
/* 2 */ STH_TYPE_SWAMP_SPIDER_HOUSE_CURED, // cursed is EnSsh
/* 3 */ STH_TYPE_MOON_LOOKING, // South Clock Town, looking up at the moon
/* 4 */ STH_TYPE_OCEANSIDE_SPIDER_HOUSE_GREET, // looking for shelter
/* 5 */ STH_TYPE_OCEANSIDE_SPIDER_HOUSE_PANIC, // shelter was not enough
// Other values: Actor will spawn and animate with arm waving, no further interaction.
} EnSthTypes;
enum {
/* 1 */ ENSTH_F_1 = 1,
/* 2 */ ENSTH_F_2,
/* 3 */ ENSTH_F_3,
/* 4 */ ENSTH_F_4,
/* 5 */ ENSTH_F_5,
};
// Note: Vanilla types usually have 0xFEXX typing, but this upper section is unused by the code, reason unknown
#define STH_GET_TYPE(thisx) ((thisx)->params & 0xF)
#define STH_GET_SWAMP_BODY(thisx) ((thisx)->params & 0x100)
// The get item ID for the reward for Oceanside Spider House (wallet, or rupees) is set here
#define STH_GI_ID(thisx) ((thisx)->home.rot.z)
// This actor has its own flags system
#define STH_FLAG_DRAW_MASK_OF_TRUTH (1 << 0)
#define STH_FLAG_OCEANSIDE_SPIDER_HOUSE_GREET (1 << 1)
#define STH_FLAG_SWAMP_SPIDER_HOUSE_SAVED (1 << 2) // set, but not read
#define STH_FLAG_DISABLE_HEAD_TRACK (1 << 3)
typedef struct EnSth {
/* 0x000 */ Actor actor;
/* 0x144 */ ColliderCylinder collider;
/* 0x190 */ SkelAnime skelAnime;
/* 0x1D4 */ Vec3s jointTable[16];
/* 0x234 */ Vec3s morphTable[16];
/* 0x294 */ Vec3s unk_294;
/* 0x29A */ s16 unk_29A;
/* 0x29C */ u16 unk_29C;
/* 0x29E */ u8 unk_29E;
/* 0x29F */ u8 unk_29F;
/* 0x1D4 */ Vec3s jointTable[STH_LIMB_MAX];
/* 0x234 */ Vec3s morphTable[STH_LIMB_MAX];
/* 0x294 */ Vec3s headRot;
/* 0x29A */ s16 animIndex;
/* 0x29C */ u16 sthFlags;
/* 0x29E */ u8 mainObjectId;
/* 0x29F */ u8 maskOfTruthObjectId;
/* 0x2A0 */ EnSthActionFunc actionFunc;
} EnSth; // size = 0x2A4
src/overlays/actors/ovl_En_Sth2/z_en_sth2.c
+6 -5
View File
@@ -63,8 +63,8 @@ void EnSth2_Update(Actor* thisx, PlayState* play) {
if (Object_IsLoaded(&play->objectCtx, this->objIndex)) {
this->actor.objBankIndex = this->objIndex;
Actor_SetObjectDependency(play, &this->actor);
SkelAnime_InitFlex(play, &this->skelAnime, &object_sth_Skel_0031F8, &gEnSth2WavingHandAnim, this->jointTable,
this->morphTable, OBJECT_STH_LIMB_MAX);
SkelAnime_InitFlex(play, &this->skelAnime, &gSthSkel, &gEnSth2WavingHandAnim, this->jointTable,
this->morphTable, STH_LIMB_MAX);
Animation_PlayLoop(&this->skelAnime, &gEnSth2WavingHandAnim);
this->actor.update = EnSth2_UpdateActionFunc;
this->actor.draw = EnSth2_Draw;
@@ -80,10 +80,11 @@ void EnSth2_UpdateActionFunc(Actor* thisx, PlayState* play) {
s32 EnSth2_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) {
s32 pad;
if (limbIndex == OBJECT_STH_LIMB_0F) {
if (limbIndex == STH_LIMB_HEAD) {
*dList = gEnSth2HeadDL;
}
if ((limbIndex == OBJECT_STH_LIMB_08) || (limbIndex == OBJECT_STH_LIMB_0A) || (limbIndex == OBJECT_STH_LIMB_0D)) {
if ((limbIndex == STH_LIMB_CHEST) || (limbIndex == STH_LIMB_LEFT_FOREARM) ||
(limbIndex == STH_LIMB_RIGHT_FOREARM)) {
rot->y += (s16)(Math_SinS((play->state.frames * ((limbIndex * 50) + 0x814))) * 200.0f);
rot->z += (s16)(Math_CosS((play->state.frames * ((limbIndex * 50) + 0x940))) * 200.0f);
}
@@ -93,7 +94,7 @@ s32 EnSth2_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f*
void EnSth2_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) {
static Vec3f focusOffset = { 700.0f, 400.0f, 0.0f };
if (limbIndex == OBJECT_STH_LIMB_0F) {
if (limbIndex == STH_LIMB_HEAD) {
Matrix_MultVec3f(&focusOffset, &thisx->focus.pos);
OPEN_DISPS(play->state.gfxCtx);
src/overlays/actors/ovl_En_Sth2/z_en_sth2.h
+2 -2
View File
@@ -11,8 +11,8 @@ typedef void (*EnSth2ActionFunc)(struct EnSth2*, PlayState*);
typedef struct EnSth2 {
/* 0x000 */ Actor actor;
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ Vec3s jointTable[OBJECT_STH_LIMB_MAX];
/* 0x1E8 */ Vec3s morphTable[OBJECT_STH_LIMB_MAX];
/* 0x188 */ Vec3s jointTable[STH_LIMB_MAX];
/* 0x1E8 */ Vec3s morphTable[STH_LIMB_MAX];
/* 0x248 */ s16 unused;
/* 0x24A */ u8 objIndex;
/* 0x24C */ EnSth2ActionFunc actionFunc;
tools/disasm/functions.txt
+24 -24
View File
@@ -14252,30 +14252,30 @@
0x80B66BDC:("ObjHariko_Draw",),
0x80B66D30:("EnSth_Init",),
0x80B67010:("EnSth_Destroy",),
0x80B6703C:("func_80B6703C",),
0x80B670A4:("func_80B670A4",),
0x80B67148:("func_80B67148",),
0x80B671A0:("func_80B671A0",),
0x80B67208:("func_80B67208",),
0x80B672A4:("func_80B672A4",),
0x80B67348:("func_80B67348",),
0x80B67458:("func_80B67458",),
0x80B67540:("func_80B67540",),
0x80B677BC:("func_80B677BC",),
0x80B67838:("func_80B67838",),
0x80B678A8:("func_80B678A8",),
0x80B67958:("func_80B67958",),
0x80B67984:("func_80B67984",),
0x80B67AB4:("func_80B67AB4",),
0x80B67B50:("func_80B67B50",),
0x80B67C1C:("func_80B67C1C",),
0x80B67DA0:("func_80B67DA0",),
0x80B67E20:("func_80B67E20",),
0x80B67E78:("EnSth_Update",),
0x80B680A8:("func_80B680A8",),
0x80B681E8:("func_80B681E8",),
0x80B68310:("func_80B68310",),
0x80B6849C:("func_80B6849C",),
0x80B6703C:("EnSth_CanSpeakToPlayer",),
0x80B670A4:("EnSth_ChangeAnim",),
0x80B67148:("EnSth_GetInitialPanicText",),
0x80B671A0:("EnSth_HandlePanicConversation",),
0x80B67208:("EnSth_PanicIdle",),
0x80B672A4:("EnSth_GetInitialOceansideSpiderHouseText",),
0x80B67348:("EnSth_PostOceanspiderhouseReward",),
0x80B67458:("EnSth_GiveOceansideSpiderHouseReward",),
0x80B67540:("EnSth_HandleOceansideSpiderHouseConversation",),
0x80B677BC:("EnSth_OceansideSpiderHouseIdle",),
0x80B67838:("EnSth_HandleMoonLookingConversation",),
0x80B678A8:("EnSth_MoonLookingIdle",),
0x80B67958:("EnSth_DefaultIdle",),
0x80B67984:("EnSth_GetInitialSwampSpiderHouseText",),
0x80B67AB4:("EnSth_TalkAfterSwampSpiderHouseGiveMask",),
0x80B67B50:("EnSth_SwampSpiderHouseGiveMask",),
0x80B67C1C:("EnSth_HandleSwampSpiderHouseConversation",),
0x80B67DA0:("EnSth_SwampSpiderHouseIdle",),
0x80B67E20:("EnSth_UpdateOceansideSpiderHouseWaitForTokens",),
0x80B67E78:("EnSth_UpdateWaitForObject",),
0x80B680A8:("EnSth_Update",),
0x80B681E8:("EnSth_OverrideLimbDraw",),
0x80B68310:("EnSth_PostLimbDraw",),
0x80B6849C:("EnSth_Draw",),
0x80B6D660:("BgSinkaiKabe_Init",),
0x80B6D9EC:("BgSinkaiKabe_Destroy",),
0x80B6DA20:("BgSinkaiKabe_WaitForPlayer",),
tools/weekeventregconvert.py
+5 -5
View File
@@ -113,9 +113,9 @@ weekEventReg = {
(13 << 8) | 0x04: "WEEKEVENTREG_13_04",
(13 << 8) | 0x08: "WEEKEVENTREG_13_08",
(13 << 8) | 0x10: "WEEKEVENTREG_13_10",
(13 << 8) | 0x20: "WEEKEVENTREG_13_20",
(13 << 8) | 0x40: "WEEKEVENTREG_13_40",
(13 << 8) | 0x80: "WEEKEVENTREG_13_80",
(13 << 8) | 0x20: "WEEKEVENTREG_OCEANSIDE_SPIDER_HOUSE_BUYER_MOVED_IN",
(13 << 8) | 0x40: "WEEKEVENTREG_RECEIVED_OCEANSIDE_WALLET_UPGRADE",
(13 << 8) | 0x80: "WEEKEVENTREG_OCEANSIDE_SPIDER_HOUSE_COLLECTED_REWARD",
(14 << 8) | 0x01: "WEEKEVENTREG_14_01",
(14 << 8) | 0x02: "WEEKEVENTREG_14_02",
(14 << 8) | 0x04: "WEEKEVENTREG_14_04",
@@ -279,10 +279,10 @@ weekEventReg = {
(34 << 8) | 0x01: "WEEKEVENTREG_34_01",
(34 << 8) | 0x02: "WEEKEVENTREG_34_02",
(34 << 8) | 0x04: "WEEKEVENTREG_34_04",
(34 << 8) | 0x08: "WEEKEVENTREG_34_08",
(34 << 8) | 0x08: "WEEKEVENTREG_SWAMP_SPIDER_HOUSE_TALKED",
(34 << 8) | 0x10: "WEEKEVENTREG_34_10",
(34 << 8) | 0x20: "WEEKEVENTREG_34_20",
(34 << 8) | 0x40: "WEEKEVENTREG_34_40",
(34 << 8) | 0x40: "WEEKEVENTREG_RECEIVED_MASK_OF_TRUTH",
(34 << 8) | 0x80: "WEEKEVENTREG_34_80",
(35 << 8) | 0x01: "WEEKEVENTREG_35_01",
(35 << 8) | 0x02: "WEEKEVENTREG_35_02",