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

6
assets/xml/objects/object_oE4s.xml
View file

@ -19,13 +19,13 @@
<Limb Name="object_oE4s_Limb_000144" LimbType="Standard" Offset="0x144"/>
<Skeleton Name="object_oE4s_Skel_000190" Type="Flex" LimbType="Standard" Offset="0x190"/>
<Texture Name="object_oE4s_TLUT_0001A8" OutName="tlut_000001A8" Format="rgba16" Width="124" Height="1" Offset="0x1A8"/><!--Blob Name="object_oE4s_Blob_0003A8" Size="0xF8" Offset="0x3A8" /-->
<Texture Name="object_oE4s_Tex_0004A0" OutName="tex_000004A0" Format="ci8" Width="8" Height="8" Offset="0x4A0"/>
<Texture Name="object_oE4s_Tex_0004A0" OutName="tex_000004A0" Format="ci8" Width="8" Height="8" Offset="0x4A0" TlutOffset="0x1A8"/>
<Texture Name="object_oE4s_Tex_0004E0" OutName="tex_000004E0" Format="rgba16" Width="16" Height="32" Offset="0x4E0"/>
<Texture Name="object_oE4s_Tex_0008E0" OutName="tex_000008E0" Format="rgba16" Width="8" Height="16" Offset="0x8E0"/>
<Texture Name="object_oE4s_Tex_0009E0" OutName="tex_000009E0" Format="ci8" Width="16" Height="16" Offset="0x9E0"/>
<Texture Name="object_oE4s_Tex_0009E0" OutName="tex_000009E0" Format="ci8" Width="16" Height="16" Offset="0x9E0" TlutOffset="0x1A8"/>
<Texture Name="object_oE4s_Tex_000AE0" OutName="tex_00000AE0" Format="i4" Width="16" Height="16" Offset="0xAE0"/>
<Texture Name="object_oE4s_Tex_000B60" OutName="tex_00000B60" Format="i4" Width="16" Height="16" Offset="0xB60"/>
<Texture Name="object_oE4s_Tex_000BE0" OutName="tex_00000BE0" Format="ci8" Width="16" Height="16" Offset="0xBE0"/>
<Texture Name="object_oE4s_Tex_000BE0" OutName="tex_00000BE0" Format="ci8" Width="16" Height="16" Offset="0xBE0" TlutOffset="0x1A8"/>
<Texture Name="object_oE4s_Tex_000CE0" OutName="tex_00000CE0" Format="rgba16" Width="16" Height="16" Offset="0xCE0"/>
<DList Name="object_oE4s_DL_003970" Offset="0x3970"/>
<DList Name="object_oE4s_DL_003B28" Offset="0x3B28"/>