mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 07:20:16 +00:00
Code Issues Projects Releases Wiki Activity

Even more objects (#913)

Browse source 
* malon adult limbs and enum

* malon adult animations

* Malon Adult textures

* Object_ma2 OK

* Cleanup undefined syms file

* more cleanup

* object_in OK

* change

* Object_TA limbs and Limb DLs ok

* Textures in DLs OK

* Object TA animations OK

* Object TA OK

* clean up the xml

* almost done with impa textures

* name impa draw funcs

* fix globalCtx2 in talon_init

* more progress in impa

* eye texture stuff

* impa OK

* remove files

* fix messed up merge

* Switch MA2 blink timer from hex

* Name a function

* Fix skelanime fixer

* Missing malon adult TLUT

* add some missing symbols in DemoEc

* Fix conflicts, part2

* Clean up TLUT related stuff and some minor things

* Remove unused externs from z_demo_ec

* Remove unused symbols from undefined_syms.txt

* PR fixes (Dragorn)

* Dragorn fixes

* Fix various texture-related issues in object_link_child

* Update assets/xml/objects/object_in.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_ta.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_ta.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_ta.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_ta.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_in.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_in.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_in.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_in.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_in.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* fix ingo and the rest of Dragorns fix

* impa fixes

* fix ingo again

* fix windmill man missing TLUT

* Fix impa in viewer

* Roman's fixes

* Add limb

* Missed an animation

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
louist103 2021-11-24 13:37:36 -05:00 • committed by GitHub
parent 0f58b15b27
commit 665283432b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
86 changed files with 1568 additions and 1452 deletions
Download patch file Download diff file Expand all files Collapse all files

135
assets/xml/objects/object_ma2.xml
View file

@ -1,68 +1,75 @@
<Root>
<File Name="object_ma2" Segment="6">
<Animation Name="object_ma2_Anim_0007D4" Offset="0x7D4"/>
<Texture Name="object_ma2_TLUT_0007F0" OutName="tlut_000007F0" Format="rgba16" Width="16" Height="16" Offset="0x7F0"/>
<Texture Name="object_ma2_Tex_0009F0" OutName="tex_000009F0" Format="rgba16" Width="16" Height="16" Offset="0x9F0"/>
<Texture Name="object_ma2_Tex_000BF0" OutName="tex_00000BF0" Format="ci8" Width="16" Height="16" Offset="0xBF0"/>
<Texture Name="object_ma2_Tex_000CF0" OutName="tex_00000CF0" Format="ci8" Width="8" Height="16" Offset="0xCF0"/>
<Texture Name="object_ma2_Tex_000D70" OutName="tex_00000D70" Format="ci8" Width="8" Height="8" Offset="0xD70"/>
<Texture Name="object_ma2_Tex_000DB0" OutName="tex_00000DB0" Format="rgba16" Width="16" Height="32" Offset="0xDB0"/>
<Texture Name="object_ma2_Tex_0011B0" OutName="tex_000011B0" Format="ci8" Width="16" Height="16" Offset="0x11B0"/>
<Texture Name="object_ma2_Tex_0012B0" OutName="tex_000012B0" Format="rgba16" Width="16" Height="32" Offset="0x12B0"/>
<Texture Name="object_ma2_Tex_0016B0" OutName="tex_000016B0" Format="ci8" Width="16" Height="32" Offset="0x16B0"/>
<Texture Name="object_ma2_Tex_0018B0" OutName="tex_000018B0" Format="ci8" Width="64" Height="16" Offset="0x18B0"/>
<Texture Name="object_ma2_Tex_001CB0" OutName="tex_00001CB0" Format="ci8" Width="32" Height="16" Offset="0x1CB0"/>
<Texture Name="object_ma2_TLUT_001EB0" OutName="tlut_00001EB0" Format="rgba16" Width="96" Height="1" Offset="0x1EB0"/><!--Blob Name="object_ma2_Blob_0020B0" Size="0xC0" Offset="0x20B0" /-->
<Texture Name="object_ma2_Tex_002170" OutName="tex_00002170" Format="rgba16" Width="8" Height="8" Offset="0x2170"/>
<Texture Name="object_ma2_Tex_0021F0" OutName="tex_000021F0" Format="rgba16" Width="8" Height="8" Offset="0x21F0"/>
<Texture Name="object_ma2_Tex_002270" OutName="tex_00002270" Format="rgba16" Width="16" Height="16" Offset="0x2270"/>
<Texture Name="object_ma2_Tex_002470" OutName="tex_00002470" Format="ci8" Width="16" Height="16" Offset="0x2470"/>
<Texture Name="object_ma2_Tex_002570" OutName="tex_00002570" Format="ci8" Width="32" Height="32" Offset="0x2570"/>
<Blob Name="object_ma2_Blob_002970" Size="0x200" Offset="0x2970"/>
<Texture Name="object_ma2_Tex_002B70" OutName="tex_00002B70" Format="rgba16" Width="8" Height="16" Offset="0x2B70"/>
<Texture Name="object_ma2_Tex_002C70" OutName="tex_00002C70" Format="ci8" Width="32" Height="32" Offset="0x2C70"/>
<Texture Name="object_ma2_Tex_003070" OutName="tex_00003070" Format="ci8" Width="32" Height="32" Offset="0x3070"/>
<Texture Name="object_ma2_Tex_003470" OutName="tex_00003470" Format="rgba16" Width="8" Height="16" Offset="0x3470"/>
<Blob Name="object_ma2_Blob_003570" Size="0x200" Offset="0x3570"/>
<Texture Name="object_ma2_Tex_003770" OutName="tex_00003770" Format="ci8" Width="32" Height="16" Offset="0x3770"/>
<DList Name="object_ma2_DL_004BE0" Offset="0x4BE0"/>
<DList Name="object_ma2_DL_005420" Offset="0x5420"/>
<DList Name="object_ma2_DL_007568" Offset="0x7568"/>
<DList Name="object_ma2_DL_007980" Offset="0x7980"/>
<DList Name="object_ma2_DL_007BB0" Offset="0x7BB0"/>
<DList Name="object_ma2_DL_007CA8" Offset="0x7CA8"/>
<DList Name="object_ma2_DL_007E40" Offset="0x7E40"/>
<DList Name="object_ma2_DL_008070" Offset="0x8070"/>
<DList Name="object_ma2_DL_008168" Offset="0x8168"/>
<DList Name="object_ma2_DL_008300" Offset="0x8300"/>
<DList Name="object_ma2_DL_008530" Offset="0x8530"/>
<DList Name="object_ma2_DL_0087A0" Offset="0x87A0"/>
<DList Name="object_ma2_DL_0087F8" Offset="0x87F8"/>
<DList Name="object_ma2_DL_0088E8" Offset="0x88E8"/>
<DList Name="object_ma2_DL_008A08" Offset="0x8A08"/>
<DList Name="object_ma2_DL_008A60" Offset="0x8A60"/>
<DList Name="object_ma2_DL_008B50" Offset="0x8B50"/>
<Limb Name="object_ma2_Limb_008C70" LimbType="Standard" Offset="0x8C70"/>
<Limb Name="object_ma2_Limb_008C7C" LimbType="Standard" Offset="0x8C7C"/>
<Limb Name="object_ma2_Limb_008C88" LimbType="Standard" Offset="0x8C88"/>
<Limb Name="object_ma2_Limb_008C94" LimbType="Standard" Offset="0x8C94"/>
<Limb Name="object_ma2_Limb_008CA0" LimbType="Standard" Offset="0x8CA0"/>
<Limb Name="object_ma2_Limb_008CAC" LimbType="Standard" Offset="0x8CAC"/>
<Limb Name="object_ma2_Limb_008CB8" LimbType="Standard" Offset="0x8CB8"/>
<Limb Name="object_ma2_Limb_008CC4" LimbType="Standard" Offset="0x8CC4"/>
<Limb Name="object_ma2_Limb_008CD0" LimbType="Standard" Offset="0x8CD0"/>
<Limb Name="object_ma2_Limb_008CDC" LimbType="Standard" Offset="0x8CDC"/>
<Limb Name="object_ma2_Limb_008CE8" LimbType="Standard" Offset="0x8CE8"/>
<Limb Name="object_ma2_Limb_008CF4" LimbType="Standard" Offset="0x8CF4"/>
<Limb Name="object_ma2_Limb_008D00" LimbType="Standard" Offset="0x8D00"/>
<Limb Name="object_ma2_Limb_008D0C" LimbType="Standard" Offset="0x8D0C"/>
<Limb Name="object_ma2_Limb_008D18" LimbType="Standard" Offset="0x8D18"/>
<Limb Name="object_ma2_Limb_008D24" LimbType="Standard" Offset="0x8D24"/>
<Limb Name="object_ma2_Limb_008D30" LimbType="Standard" Offset="0x8D30"/>
<Limb Name="object_ma2_Limb_008D3C" LimbType="Standard" Offset="0x8D3C"/>
<Skeleton Name="object_ma2_Skel_008D90" Type="Flex" LimbType="Standard" Offset="0x8D90"/>
<Animation Name="object_ma2_Anim_0092F0" Offset="0x92F0"/>
<Animation Name="object_ma2_Anim_0093BC" Offset="0x93BC"/>
<Animation Name="object_ma2_Anim_009EE0" Offset="0x9EE0"/>
<Texture Name="gMalonAdultClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7F0"/>
<Texture Name="gMalonAdultFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0x9F0"/>
<Texture Name="gMalonAdultShirtTex" OutName="shirt" Format="ci8" Width="16" Height="16" Offset="0xBF0" TlutOffset="0x7F0"/>
<Texture Name="gMalonAdultShirtCuffTex" OutName="shirt_cuff" Format="ci8" Width="8" Height="16" Offset="0xCF0" TlutOffset="0x7F0"/>
<Texture Name="gMalonAdultScarfTex" OutName="scarf" Format="ci8" Width="8" Height="8" Offset="0xD70" TlutOffset="0x7F0"/>
<Texture Name="gMalonBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xDB0"/>
<Texture Name="gMalonAdultMiddleDressTex" OutName="middle_dress" Format="ci8" Width="16" Height="16" Offset="0x11B0" TlutOffset="0x7F0"/>
<Texture Name="gMalonAdultFrontDressTex" OutName="front_dress" Format="rgba16" Width="16" Height="32" Offset="0x12B0"/>
<Texture Name="gMalonAdultDressPatternTex" OutName="dress_pattern" Format="ci8" Width="16" Height="32" Offset="0x16B0" TlutOffset="0x7F0"/>
<Texture Name="gMalonAdultBootTex" OutName="boot" Format="ci8" Width="64" Height="16" Offset="0x18B0" TlutOffset="0x7F0"/>
<Texture Name="gMalonAdultBeltTex" OutName="belt" Format="ci8" Width="32" Height="16" Offset="0x1CB0" TlutOffset="0x7F0"/>
<Texture Name="gMalonAdultHairTLUT" OutName="hair_tlut" Format="rgba16" Width="96" Height="1" Offset="0x1EB0"/>
<Texture Name="gMalonAdultGradientTex" OutName="gradient" Format="rgba16" Width="8" Height="8" Offset="0x2170"/>
<Texture Name="gMalonAdultNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0x21F0"/>
<Texture Name="gMalonAdultEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x2270"/>
<Texture Name="gMalonAdultHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x2470" TlutOffset="0x1EB0"/>
<Texture Name="gMalonAdultFaceTLUT" OutName="face_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1F70"/>
<Texture Name="gMalonAdultEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x2570" TlutOffset="0x1F70"/>
<Texture Name="gMalonAdultEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x2C70" TlutOffset="0x1F70"/>
<Texture Name="gMalonAdultEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x3070" TlutOffset="0x1F70"/>
<Texture Name="gMalonAdultBasketTex" OutName="basket" Format="rgba16" Width="8" Height="16" Offset="0x2B70"/>
<Texture Name="gMalonAdultBasketInsideTex" OutName="basket_inside" Format="rgba16" Width="8" Height="16" Offset="0x3470"/>
<Texture Name="gMalonAdultMouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="32" Height="16" Offset="0x2970" TlutOffset="0x1F70"/>
<Texture Name="gMalonAdultMouthSadTex" OutName="mouth_sad" Format="ci8" Width="32" Height="16" Offset="0x3570" TlutOffset="0x1F70"/>
<Texture Name="gMalonAdultMouthHappyTex" OutName="mouth_happy" Format="ci8" Width="32" Height="16" Offset="0x3770" TlutOffset="0x1F70"/>
<DList Name="gMalonAdultHeadDL" Offset="0x4BE0"/>
<DList Name="gMalonAdultBasketDL" Offset="0x5420"/>
<DList Name="gMalonAdultChestAndNeckDL" Offset="0x7568"/>
<DList Name="gMalonAdultRightShoulderDL" Offset="0x7980"/>
<DList Name="gMalonAdultRightArmDL" Offset="0x7BB0"/>
<DList Name="gMalonAdultRightHandDL" Offset="0x7CA8"/>
<DList Name="gMalonAdultLeftShoulderDL" Offset="0x7E40"/>
<DList Name="gMalonAdultLeftArmDL" Offset="0x8070"/>
<DList Name="gMalonAdultLeftHandDL" Offset="0x8168"/>
<DList Name="gMalonAdultDressDL" Offset="0x8300"/>
<DList Name="gMalonAdultTorsoDL" Offset="0x8530"/>
<DList Name="gMalonAdultRightThighDL" Offset="0x87A0"/>
<DList Name="gMalonAdultRightLegDL" Offset="0x87F8"/>
<DList Name="gMalonAdultRightFootDL" Offset="0x88E8"/>
<DList Name="gMalonAdultLeftThighDL" Offset="0x8A08"/>
<DList Name="gMalonAdultLeftLegDL" Offset="0x8A60"/>
<DList Name="gMalonAdultLeftFootDL" Offset="0x8B50"/>
<Skeleton Name="gMalonAdultSkel" Type="Flex" LimbType="Standard" Offset="0x8D90"/>
<Limb Name="gMalonAdultRootLimb" LimbType="Standard" Offset="0x8C70"/>
<Limb Name="gMalonAdultLowerControlLimb" LimbType="Standard" Offset="0x8C7C"/>
<Limb Name="gMalonAdultLeftThighLimb" LimbType="Standard" Offset="0x8C88"/>
<Limb Name="gMalonAdultLeftLegLimb" LimbType="Standard" Offset="0x8C94"/>
<Limb Name="gMalonAdultLeftFootLimb" LimbType="Standard" Offset="0x8CA0"/>
<Limb Name="gMalonAdultRightThighLimb" LimbType="Standard" Offset="0x8CAC"/>
<Limb Name="gMalonAdultRightLegLimb" LimbType="Standard" Offset="0x8CB8"/>
<Limb Name="gMalonAdultRightFootLimb" LimbType="Standard" Offset="0x8CC4"/>
<Limb Name="gMalonAdultTorsoLimb" LimbType="Standard" Offset="0x8CD0"/>
<Limb Name="gMalonAdultDressLimb" LimbType="Standard" Offset="0x8CDC"/>
<Limb Name="gMalonAdultChestAndNeckLimb" LimbType="Standard" Offset="0x8CE8"/>
<Limb Name="gMalonAdultLeftShoulderLimb" LimbType="Standard" Offset="0x8CF4"/>
<Limb Name="gMalonAdultLeftArmLimb" LimbType="Standard" Offset="0x8D00"/>
<Limb Name="gMalonAdultLeftHandLimb" LimbType="Standard" Offset="0x8D0C"/>
<Limb Name="gMalonAdultRightShoulderLimb" LimbType="Standard" Offset="0x8D18"/>
<Limb Name="gMalonAdultRightArmLimb" LimbType="Standard" Offset="0x8D24"/>
<Limb Name="gMalonAdultRightHandLimb" LimbType="Standard" Offset="0x8D30"/>
<Limb Name="gMalonAdultHeadLimb" LimbType="Standard" Offset="0x8D3C"/>
<Animation Name="gMalonAdultIdleAnim" Offset="0x7D4"/>
<Animation Name="gMalonAdultSingToIdleAnim" Offset="0x92F0"/> <!-- Unused -->
<Animation Name="gMalonAdultStandStillAnim" Offset="0x93BC"/>
<Animation Name="gMalonAdultSingAnim" Offset="0x9EE0"/>
</File>
</Root>