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

25
assets/xml/objects/object_ganon2.xml
View file

@ -57,22 +57,23 @@
<Texture Name="object_ganon2_Tex_01C180" OutName="tex_0001C180" Format="rgba16" Width="8" Height="16" Offset="0x1C180"/>
<Texture Name="object_ganon2_Tex_01C280" OutName="tex_0001C280" Format="rgba16" Width="8" Height="16" Offset="0x1C280"/>
<Texture Name="object_ganon2_Tex_01C380" OutName="tex_0001C380" Format="rgba16" Width="8" Height="8" Offset="0x1C380"/>
<Texture Name="object_ganon2_Tex_01C400" OutName="tex_0001C400" Format="ci8" Width="32" Height="32" Offset="0x1C400"/>
<Texture Name="object_ganon2_Tex_01C400" OutName="tex_0001C400" Format="ci8" Width="32" Height="32" Offset="0x1C400" TlutOffset="0x1AF80"/>
<Texture Name="object_ganon2_Tex_01C800" OutName="tex_0001C800" Format="rgba16" Width="8" Height="16" Offset="0x1C800"/>
<Texture Name="object_ganon2_Tex_01C900" OutName="tex_0001C900" Format="rgba16" Width="8" Height="16" Offset="0x1C900"/>
<Texture Name="object_ganon2_Tex_01CA00" OutName="tex_0001CA00" Format="ci8" Width="32" Height="16" Offset="0x1CA00"/>
<Texture Name="object_ganon2_Tex_01CC00" OutName="tex_0001CC00" Format="ci8" Width="16" Height="16" Offset="0x1CC00"/>
<Texture Name="object_ganon2_Tex_01CA00" OutName="tex_0001CA00" Format="ci8" Width="32" Height="16" Offset="0x1CA00" TlutOffset="0x1B180"/>
<Texture Name="object_ganon2_Tex_01CC00" OutName="tex_0001CC00" Format="ci8" Width="16" Height="16" Offset="0x1CC00" TlutOffset="0x1B580"/>
<Texture Name="object_ganon2_Tex_01CD00" OutName="tex_0001CD00" Format="rgba16" Width="16" Height="16" Offset="0x1CD00"/>
<Texture Name="object_ganon2_Tex_01CF00" OutName="tex_0001CF00" Format="ci8" Width="16" Height="16" Offset="0x1CF00"/>
<Texture Name="object_ganon2_Tex_01D000" OutName="tex_0001D000" Format="ci8" Width="16" Height="16" Offset="0x1D000"/>
<Texture Name="object_ganon2_Tex_01D100" OutName="tex_0001D100" Format="ci8" Width="16" Height="16" Offset="0x1D100"/>
<Texture Name="object_ganon2_Tex_01D200" OutName="tex_0001D200" Format="ci8" Width="16" Height="16" Offset="0x1D200"/>
<Texture Name="object_ganon2_Tex_01D300" OutName="tex_0001D300" Format="ci8" Width="16" Height="16" Offset="0x1D300"/>
<Texture Name="object_ganon2_Tex_01D400" OutName="tex_0001D400" Format="ci8" Width="16" Height="16" Offset="0x1D400"/>
<Texture Name="object_ganon2_Tex_01CF00" OutName="tex_0001CF00" Format="ci8" Width="16" Height="16" Offset="0x1CF00" TlutOffset="0x1B780"/>
<Texture Name="object_ganon2_Tex_01D000" OutName="tex_0001D000" Format="ci8" Width="16" Height="16" Offset="0x1D000" TlutOffset="0x1B980"/>
<Texture Name="object_ganon2_Tex_01D100" OutName="tex_0001D100" Format="ci8" Width="16" Height="16" Offset="0x1D100" TlutOffset="0x1B780"/>
<Texture Name="object_ganon2_Tex_01D200" OutName="tex_0001D200" Format="ci8" Width="16" Height="16" Offset="0x1D200" TlutOffset="0x1B980"/>
<Texture Name="object_ganon2_Tex_01D300" OutName="tex_0001D300" Format="ci8" Width="16" Height="16" Offset="0x1D300" TlutOffset="0x1BB80"/>
<Texture Name="object_ganon2_Tex_01D400" OutName="tex_0001D400" Format="ci8" Width="16" Height="16" Offset="0x1D400" TlutOffset="0x1BD80"/>
<Texture Name="object_ganon2_Tex_01D500" OutName="tex_0001D500" Format="rgba16" Width="4" Height="16" Offset="0x1D500"/>
<Texture Name="object_ganon2_Tex_01D580" OutName="tex_0001D580" Format="ci8" Width="16" Height="32" Offset="0x1D580"/>
<Texture Name="object_ganon2_Tlut_01D780" OutName="tlut_0001D780" Format="rgba16" Width="4" Height="4" Offset="0x1D780"/><!--Blob Name="object_ganon2_Blob_01D7A0" Size="0x168" Offset="0x1D7A0" /-->
<Texture Name="object_ganon2_Tex_01D908" OutName="tex_0001D908" Format="ci8" Width="32" Height="32" Offset="0x1D908"/>
<Texture Name="object_ganon2_Tex_01D580" OutName="tex_0001D580" Format="ci8" Width="16" Height="32" Offset="0x1D580" TlutOffset="0x1BF80"/>
<Texture Name="object_ganon2_TLUT_01D780" OutName="tlut_0001D780" Format="rgba16" Width="4" Height="4" Offset="0x1D780"/>
<Texture Name="object_ganon2_TLUT_01D7A8" OutName="tlut_0001D7A8" Format="rgba16" Width="16" Height="11" Offset="0x1D7A8"/>
<Texture Name="object_ganon2_Tex_01D908" OutName="tex_0001D908" Format="ci8" Width="32" Height="32" Offset="0x1D908" TlutOffset="0x1D7A8"/>
<Texture Name="object_ganon2_Tex_01DD08" OutName="tex_0001DD08" Format="rgba16" Width="16" Height="32" Offset="0x1DD08"/>
<Texture Name="object_ganon2_Tex_01E108" OutName="tex_0001E108" Format="rgba16" Width="8" Height="8" Offset="0x1E108"/>
<Texture Name="object_ganon2_Tex_01E188" Format="ci4" Width="16" Height="16" Offset="0x1E188" TlutOffset="0x1D780"/> <!-- eye open -->