mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 22:41: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

10
assets/xml/objects/object_cob.xml
View file

@ -1,11 +1,11 @@
<Root>
<File Name="object_cob" Segment="6">
<Texture Name="object_cob_TLUT_000000" OutName="tlut_00000000" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
<Texture Name="object_cob_Tex_000200" OutName="tex_00000200" Format="ci8" Width="8" Height="16" Offset="0x200"/>
<Texture Name="object_cob_Tex_000280" OutName="tex_00000280" Format="ci8" Width="8" Height="8" Offset="0x280"/>
<Texture Name="object_cob_Tex_0002C0" OutName="tex_000002C0" Format="ci8" Width="8" Height="8" Offset="0x2C0"/>
<Texture Name="object_cob_Tex_000300" OutName="tex_00000300" Format="ci8" Width="8" Height="8" Offset="0x300"/>
<Texture Name="object_cob_Tex_000340" OutName="tex_00000340" Format="ci8" Width="8" Height="16" Offset="0x340"/>
<Texture Name="object_cob_Tex_000200" OutName="tex_00000200" Format="ci8" Width="8" Height="16" Offset="0x200" TlutOffset="0x0"/>
<Texture Name="object_cob_Tex_000280" OutName="tex_00000280" Format="ci8" Width="8" Height="8" Offset="0x280" TlutOffset="0x0"/>
<Texture Name="object_cob_Tex_0002C0" OutName="tex_000002C0" Format="ci8" Width="8" Height="8" Offset="0x2C0" TlutOffset="0x0"/>
<Texture Name="object_cob_Tex_000300" OutName="tex_00000300" Format="ci8" Width="8" Height="8" Offset="0x300" TlutOffset="0x0"/>
<Texture Name="object_cob_Tex_000340" OutName="tex_00000340" Format="ci8" Width="8" Height="16" Offset="0x340" TlutOffset="0x0"/>
<DList Name="object_cob_DL_001300" Offset="0x1300"/>
<DList Name="object_cob_DL_001678" Offset="0x1678"/>
<DList Name="object_cob_DL_001780" Offset="0x1780"/>