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

20
assets/xml/objects/object_daiku.xml
View file

@ -4,18 +4,18 @@
<Animation Name="object_daiku_Anim_000C44" Offset="0xC44"/>
<Animation Name="object_daiku_Anim_001AB0" Offset="0x1AB0"/>
<Texture Name="object_daiku_TLUT_001AC0" OutName="tlut_00001AC0" Format="rgba16" Width="16" Height="16" Offset="0x1AC0"/>
<Texture Name="object_daiku_Tex_001CC0" OutName="tex_00001CC0" Format="ci8" Width="8" Height="8" Offset="0x1CC0"/>
<Texture Name="object_daiku_Tex_001D00" OutName="tex_00001D00" Format="ci8" Width="16" Height="16" Offset="0x1D00"/>
<Texture Name="object_daiku_Tex_001CC0" OutName="tex_00001CC0" Format="ci8" Width="8" Height="8" Offset="0x1CC0" TlutOffset="0x1AC0"/>
<Texture Name="object_daiku_Tex_001D00" OutName="tex_00001D00" Format="ci8" Width="16" Height="16" Offset="0x1D00" TlutOffset="0x1AC0"/>
<Texture Name="object_daiku_Tex_001E00" OutName="tex_00001E00" Format="rgba16" Width="4" Height="4" Offset="0x1E00"/>
<Texture Name="object_daiku_Tex_001E20" OutName="tex_00001E20" Format="ci8" Width="8" Height="16" Offset="0x1E20"/>
<Texture Name="object_daiku_Tex_001EA0" OutName="tex_00001EA0" Format="ci8" Width="8" Height="8" Offset="0x1EA0"/>
<Texture Name="object_daiku_Tex_001EE0" OutName="tex_00001EE0" Format="ci8" Width="16" Height="16" Offset="0x1EE0"/>
<Texture Name="object_daiku_Tex_001FE0" OutName="tex_00001FE0" Format="ci8" Width="8" Height="8" Offset="0x1FE0"/>
<Texture Name="object_daiku_Tex_001E20" OutName="tex_00001E20" Format="ci8" Width="8" Height="16" Offset="0x1E20" TlutOffset="0x1AC0"/>
<Texture Name="object_daiku_Tex_001EA0" OutName="tex_00001EA0" Format="ci8" Width="8" Height="8" Offset="0x1EA0" TlutOffset="0x1AC0"/>
<Texture Name="object_daiku_Tex_001EE0" OutName="tex_00001EE0" Format="ci8" Width="16" Height="16" Offset="0x1EE0" TlutOffset="0x1AC0"/>
<Texture Name="object_daiku_Tex_001FE0" OutName="tex_00001FE0" Format="ci8" Width="8" Height="8" Offset="0x1FE0" TlutOffset="0x1AC0"/>
<Texture Name="object_daiku_Tex_002020" OutName="tex_00002020" Format="rgba16" Width="32" Height="32" Offset="0x2020"/>
<Texture Name="object_daiku_Tex_002820" OutName="tex_00002820" Format="ci8" Width="16" Height="16" Offset="0x2820"/>
<Texture Name="object_daiku_Tex_002920" OutName="tex_00002920" Format="ci8" Width="8" Height="8" Offset="0x2920"/>
<Texture Name="object_daiku_Tex_002960" OutName="tex_00002960" Format="ci8" Width="8" Height="8" Offset="0x2960"/>
<Texture Name="object_daiku_Tex_0029A0" OutName="tex_000029A0" Format="ci8" Width="8" Height="8" Offset="0x29A0"/>
<Texture Name="object_daiku_Tex_002820" OutName="tex_00002820" Format="ci8" Width="16" Height="16" Offset="0x2820" TlutOffset="0x1AC0"/>
<Texture Name="object_daiku_Tex_002920" OutName="tex_00002920" Format="ci8" Width="8" Height="8" Offset="0x2920" TlutOffset="0x1AC0"/>
<Texture Name="object_daiku_Tex_002960" OutName="tex_00002960" Format="ci8" Width="8" Height="8" Offset="0x2960" TlutOffset="0x1AC0"/>
<Texture Name="object_daiku_Tex_0029A0" OutName="tex_000029A0" Format="ci8" Width="8" Height="8" Offset="0x29A0" TlutOffset="0x1AC0"/>
<DList Name="object_daiku_DL_005490" Offset="0x5490"/>
<DList Name="object_daiku_DL_005880" Offset="0x5880"/>
<DList Name="object_daiku_DL_005990" Offset="0x5990"/>