mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 15:30:14 +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

51
assets/xml/objects/object_sa.xml
View file

@ -67,34 +67,33 @@
<DList Name="gSariaLeftFootDL" Offset="0xAEE0"/>
<Texture Name="gSariaClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="18" Height="6" Offset="0x21F0"/>
<Texture Name="gSariaMouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="18" Height="6" Offset="0x2CF8"/>
<Texture Name="gSariaEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="18" Height="6" Offset="0x2B00"/>
<Texture Name="gSariaMouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="29" Height="8" Offset="0x2CF8"/>
<Texture Name="gSariaEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="63" Height="4" Offset="0x2B00"/>
<Texture Name="gSariaSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="8" Height="9" Offset="0x2A70"/>
<Texture Name="gSariaUnkTLUT" OutName="unk_tlut" Format="rgba16" Width="16" Height="9" Offset="0x2BD8"/>
<Texture Name="gSariaBootsTex" OutName="boots" Format="ci8" Width="16" Height="16" Offset="0x23F0"/>
<Texture Name="gSariaGreenTex" OutName="green" Format="ci8" Width="8" Height="8" Offset="0x24F0"/>
<Texture Name="gSariaKneeTex" OutName="knee" Format="ci8" Width="16" Height="16" Offset="0x2570"/>
<Texture Name="gSariaTorsoTex" OutName="torso" Format="ci8" Width="16" Height="16" Offset="0x2670"/>
<Texture Name="gSariaBeltTex" OutName="belt" Format="ci8" Width="16" Height="16" Offset="0x2770"/>
<Texture Name="gSariaUnkGreenTex" Format="ci8" Width="16" Height="8" Offset="0x2870"/>
<Texture Name="gSariaUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x28F0"/>
<Texture Name="gSariaSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="16" Offset="0x29F0"/>
<Texture Name="gSariaHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x2EC8"/>
<Texture Name="gSariaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x2F48"/>
<Texture Name="gSariaMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="16" Offset="0x3348"/>
<Texture Name="gSariaSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x3548"/>
<Texture Name="gSariaMouthClosed2Tex" OutName="mouth_closed2" Format="ci8" Width="32" Height="16" Offset="0x3588"/>
<Texture Name="gSariaEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3788"/>
<Texture Name="gSariaCollarTex" OutName="collar" Format="ci8" Width="8" Height="8" Offset="0x37C8"/>
<Texture Name="gSariaHandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0x3808"/>
<Texture Name="gSariaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x3848"/>
<Texture Name="gSariaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3C48"/>
<Texture Name="gSariaBootsTex" OutName="boots" Format="ci8" Width="16" Height="16" Offset="0x23F0" TlutOffset="0x21F0"/>
<Texture Name="gSariaGreenTex" OutName="green" Format="ci8" Width="8" Height="8" Offset="0x24F0" TlutOffset="0x21F0"/>
<Texture Name="gSariaKneeTex" OutName="knee" Format="ci8" Width="16" Height="16" Offset="0x2570" TlutOffset="0x21F0"/>
<Texture Name="gSariaTorsoTex" OutName="torso" Format="ci8" Width="16" Height="16" Offset="0x2670" TlutOffset="0x21F0"/>
<Texture Name="gSariaBeltTex" OutName="belt" Format="ci8" Width="16" Height="16" Offset="0x2770" TlutOffset="0x21F0"/>
<Texture Name="gSariaUnkGreenTex" Format="ci8" Width="16" Height="8" Offset="0x2870" TlutOffset="0x21F0"/>
<Texture Name="gSariaUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x28F0" TlutOffset="0x21F0"/>
<Texture Name="gSariaSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="16" Offset="0x29F0" TlutOffset="0x21F0"/>
<Texture Name="gSariaHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x2EC8" TlutOffset="0x2A70"/>
<Texture Name="gSariaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x2F48" TlutOffset="0x2B00"/>
<Texture Name="gSariaMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="16" Offset="0x3348" TlutOffset="0x2CF8"/>
<Texture Name="gSariaSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x3548" TlutOffset="0x2A70"/>
<Texture Name="gSariaMouthClosed2Tex" OutName="mouth_closed2" Format="ci8" Width="32" Height="16" Offset="0x3588" TlutOffset="0x2CF8"/>
<Texture Name="gSariaEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3788" TlutOffset="0x2A70"/>
<Texture Name="gSariaCollarTex" OutName="collar" Format="ci8" Width="8" Height="8" Offset="0x37C8" TlutOffset="0x2A70"/>
<Texture Name="gSariaHandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0x3808" TlutOffset="0x2A70"/>
<Texture Name="gSariaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x3848" TlutOffset="0x2B00"/>
<Texture Name="gSariaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3C48" TlutOffset="0x2B00"/>
<Texture Name="gSariaFairyOcarinaTex" OutName="fairy_ocarina" Format="rgba16" Width="32" Height="16" Offset="0x4048"/>
<Texture Name="gSariaMouthSmilingOpenTex" OutName="mouth_smiling_open" Format="ci8" Width="32" Height="16" Offset="0x4448"/>
<Texture Name="gSariaMouthFrowningTex" OutName="mouth_frowning" Format="ci8" Width="32" Height="16" Offset="0x4648"/>
<Texture Name="gSariaEyeSuprisedTex" OutName="eye_suprised" Format="ci8" Width="32" Height="32" Offset="0x4848"/>
<Texture Name="gSariaMouthSuprisedTex" OutName="mouth_suprised" Format="ci8" Width="32" Height="16" Offset="0x4C48"/>
<Texture Name="gSariaEyeSadTex" OutName="eye_sad" Format="ci8" Width="32" Height="32" Offset="0x4E48"/>
<Texture Name="gSariaMouthSmilingOpenTex" OutName="mouth_smiling_open" Format="ci8" Width="32" Height="16" Offset="0x4448" TlutOffset="0x2CF8"/>
<Texture Name="gSariaMouthFrowningTex" OutName="mouth_frowning" Format="ci8" Width="32" Height="16" Offset="0x4648" TlutOffset="0x2CF8"/>
<Texture Name="gSariaEyeSuprisedTex" OutName="eye_suprised" Format="ci8" Width="32" Height="32" Offset="0x4848" TlutOffset="0x2B00"/>
<Texture Name="gSariaMouthSuprisedTex" OutName="mouth_suprised" Format="ci8" Width="32" Height="16" Offset="0x4C48" TlutOffset="0x2CF8"/>
<Texture Name="gSariaEyeSadTex" OutName="eye_sad" Format="ci8" Width="32" Height="32" Offset="0x4E48" TlutOffset="0x2B00"/>
</File>
</Root>