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

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

@ -2,14 +2,14 @@
<File Name="object_ts" Segment="6">
<Animation Name="object_ts_Anim_000498" Offset="0x498"/>
<Texture Name="object_ts_TLUT_0004B0" OutName="tlut_000004B0" Format="rgba16" Width="16" Height="16" Offset="0x4B0"/>
<Texture Name="object_ts_Tex_0006B0" OutName="tex_000006B0" Format="ci8" Width="8" Height="8" Offset="0x6B0"/>
<Texture Name="object_ts_Tex_0006F0" OutName="tex_000006F0" Format="ci8" Width="16" Height="16" Offset="0x6F0"/>
<Texture Name="object_ts_Tex_0007F0" OutName="tex_000007F0" Format="ci8" Width="8" Height="8" Offset="0x7F0"/>
<Texture Name="object_ts_Tex_000830" OutName="tex_00000830" Format="ci8" Width="16" Height="16" Offset="0x830"/>
<Texture Name="object_ts_Tex_000930" OutName="tex_00000930" Format="ci8" Width="8" Height="8" Offset="0x930"/>
<Texture Name="object_ts_Tex_0006B0" OutName="tex_000006B0" Format="ci8" Width="8" Height="8" Offset="0x6B0" TlutOffset="0x4B0"/>
<Texture Name="object_ts_Tex_0006F0" OutName="tex_000006F0" Format="ci8" Width="16" Height="16" Offset="0x6F0" TlutOffset="0x4B0"/>
<Texture Name="object_ts_Tex_0007F0" OutName="tex_000007F0" Format="ci8" Width="8" Height="8" Offset="0x7F0" TlutOffset="0x4B0"/>
<Texture Name="object_ts_Tex_000830" OutName="tex_00000830" Format="ci8" Width="16" Height="16" Offset="0x830" TlutOffset="0x4B0"/>
<Texture Name="object_ts_Tex_000930" OutName="tex_00000930" Format="ci8" Width="8" Height="8" Offset="0x930" TlutOffset="0x4B0"/>
<Blob Name="object_ts_Blob_000970" Size="0x800" Offset="0x970"/>
<Texture Name="object_ts_Tex_001170" OutName="tex_00001170" Format="ci8" Width="16" Height="16" Offset="0x1170"/>
<Texture Name="object_ts_Tex_001270" OutName="tex_00001270" Format="ci8" Width="32" Height="64" Offset="0x1270"/>
<Texture Name="object_ts_Tex_001170" OutName="tex_00001170" Format="ci8" Width="16" Height="16" Offset="0x1170" TlutOffset="0x4B0"/>
<Texture Name="object_ts_Tex_001270" OutName="tex_00001270" Format="ci8" Width="32" Height="64" Offset="0x1270" TlutOffset="0x4B0"/>
<DList Name="object_ts_DL_003CD0" Offset="0x3CD0"/>
<DList Name="object_ts_DL_003ED8" Offset="0x3ED8"/>
<DList Name="object_ts_DL_004378" Offset="0x4378"/>