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

14
assets/xml/objects/object_ma1.xml
View file

@ -26,25 +26,25 @@
<Animation Name="gMalonChildSingAnim" Offset="0x8D64"/>
<Texture Name="gMalonChildDressTLUT" OutName="dress_tlut" Format="rgba16" Width="16" Height="16" Offset="0x830"/>
<Texture Name="gMalonChildDressDesignTex" OutName="dress_design" Format="ci8" Width="8" Height="16" Offset="0xA30"/>
<Texture Name="gMalonChildDressDesignTex" OutName="dress_design" Format="ci8" Width="8" Height="16" Offset="0xA30" TlutOffset="0x830"/>
<Texture Name="gMalonChildFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0xAB0"/>
<Texture Name="gMalonChildBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xCB0"/>
<Texture Name="gMalonChildScarfTex" OutName="scarf" Format="ci8" Width="8" Height="8" Offset="0x10B0"/>
<Texture Name="gMalonChildBootTex" OutName="boot" Format="ci8" Width="64" Height="16" Offset="0x10F0"/>
<Texture Name="gMalonChildScarfTex" OutName="scarf" Format="ci8" Width="8" Height="8" Offset="0x10B0" TlutOffset="0x830"/>
<Texture Name="gMalonChildBootTex" OutName="boot" Format="ci8" Width="64" Height="16" Offset="0x10F0" TlutOffset="0x830"/>
<Texture Name="gMalonChildHairTLUT" OutName="hair_tlut" Format="rgba16" Width="96" Height="1" Offset="0x14F0"/>
<Texture Name="gMalonChildSkinGradientTex" OutName="skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0x1718"/>
<Texture Name="gMalonChildBrownCircleTex" OutName="unk_circle" Format="rgba16" Width="8" Height="8" Offset="0x1798"/>
<Texture Name="gMalonChildEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x1818"/>
<Texture Name="gMalonChildHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1A18"/>
<Texture Name="gMalonChildHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1A18" TlutOffset="0x14F0"/>
<Texture Name="gMalonChildNeutralMouthTex" OutName="neutral_mouth" Format="rgba16" Width="32" Height="16" Offset="0x1F18"/>
<Texture Name="gMalonChildSmilingMouthTex" OutName="smiling_mouth" Format="rgba16" Width="32" Height="16" Offset="0x2B18"/>
<Texture Name="gMalonChildTalkingMouthTex" OutName="talking_mouth" Format="rgba16" Width="32" Height="16" Offset="0x2F18"/>
<Texture Name="gMalonChildEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="15" Height="12" Offset="0x15B0"/>
<Texture Name="gMalonChildEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x1B18"/>
<Texture Name="gMalonChildEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x2318"/>
<Texture Name="gMalonChildEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x2718"/>
<Texture Name="gMalonChildEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x1B18" TlutOffset="0x15B0"/>
<Texture Name="gMalonChildEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x2318" TlutOffset="0x15B0"/>
<Texture Name="gMalonChildEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x2718" TlutOffset="0x15B0"/>
<DList Name="gMalonChildHeadDL" Offset="0x4148"/>
<DList Name="gMalonChildDressLowerDL" Offset="0x6C68"/>