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

26
assets/xml/objects/object_toryo.xml
View file

@ -2,20 +2,20 @@
<File Name="object_toryo" Segment="6">
<Animation Name="object_toryo_Anim_000E50" Offset="0xE50"/>
<Texture Name="object_toryo_TLUT_000E60" OutName="tlut_00000E60" Format="rgba16" Width="16" Height="16" Offset="0xE60"/>
<Texture Name="object_toryo_Tex_001060" OutName="tex_00001060" Format="ci8" Width="16" Height="16" Offset="0x1060"/>
<Texture Name="object_toryo_Tex_001160" OutName="tex_00001160" Format="ci8" Width="8" Height="4" Offset="0x1160"/>
<Texture Name="object_toryo_Tex_001180" OutName="tex_00001180" Format="ci8" Width="8" Height="8" Offset="0x1180"/>
<Texture Name="object_toryo_Tex_0011C0" OutName="tex_000011C0" Format="ci8" Width="8" Height="8" Offset="0x11C0"/>
<Texture Name="object_toryo_Tex_001200" OutName="tex_00001200" Format="ci8" Width="8" Height="8" Offset="0x1200"/>
<Texture Name="object_toryo_Tex_001240" OutName="tex_00001240" Format="ci8" Width="8" Height="16" Offset="0x1240"/>
<Texture Name="object_toryo_Tex_001060" OutName="tex_00001060" Format="ci8" Width="16" Height="16" Offset="0x1060" TlutOffset="0xE60"/>
<Texture Name="object_toryo_Tex_001160" OutName="tex_00001160" Format="ci8" Width="8" Height="4" Offset="0x1160" TlutOffset="0xE60"/>
<Texture Name="object_toryo_Tex_001180" OutName="tex_00001180" Format="ci8" Width="8" Height="8" Offset="0x1180" TlutOffset="0xE60"/>
<Texture Name="object_toryo_Tex_0011C0" OutName="tex_000011C0" Format="ci8" Width="8" Height="8" Offset="0x11C0" TlutOffset="0xE60"/>
<Texture Name="object_toryo_Tex_001200" OutName="tex_00001200" Format="ci8" Width="8" Height="8" Offset="0x1200" TlutOffset="0xE60"/>
<Texture Name="object_toryo_Tex_001240" OutName="tex_00001240" Format="ci8" Width="8" Height="16" Offset="0x1240" TlutOffset="0xE60"/>
<Texture Name="object_toryo_Tex_0012C0" OutName="tex_000012C0" Format="rgba16" Width="32" Height="16" Offset="0x12C0"/>
<Texture Name="object_toryo_Tex_0016C0" OutName="tex_000016C0" Format="ci8" Width="16" Height="16" Offset="0x16C0"/>
<Texture Name="object_toryo_Tex_0017C0" OutName="tex_000017C0" Format="ci8" Width="16" Height="16" Offset="0x17C0"/>
<Texture Name="object_toryo_Tex_0018C0" OutName="tex_000018C0" Format="ci8" Width="16" Height="16" Offset="0x18C0"/>
<Texture Name="object_toryo_Tex_0019C0" OutName="tex_000019C0" Format="ci8" Width="8" Height="8" Offset="0x19C0"/>
<Texture Name="object_toryo_Tex_001A00" OutName="tex_00001A00" Format="ci8" Width="8" Height="16" Offset="0x1A00"/>
<Texture Name="object_toryo_Tex_001A80" OutName="tex_00001A80" Format="ci8" Width="16" Height="16" Offset="0x1A80"/>
<Texture Name="object_toryo_Tex_001B80" OutName="tex_00001B80" Format="ci8" Width="16" Height="16" Offset="0x1B80"/>
<Texture Name="object_toryo_Tex_0016C0" OutName="tex_000016C0" Format="ci8" Width="16" Height="16" Offset="0x16C0" TlutOffset="0xE60"/>
<Texture Name="object_toryo_Tex_0017C0" OutName="tex_000017C0" Format="ci8" Width="16" Height="16" Offset="0x17C0" TlutOffset="0xE60"/>
<Texture Name="object_toryo_Tex_0018C0" OutName="tex_000018C0" Format="ci8" Width="16" Height="16" Offset="0x18C0" TlutOffset="0xE60"/>
<Texture Name="object_toryo_Tex_0019C0" OutName="tex_000019C0" Format="ci8" Width="8" Height="8" Offset="0x19C0" TlutOffset="0xE60"/>
<Texture Name="object_toryo_Tex_001A00" OutName="tex_00001A00" Format="ci8" Width="8" Height="16" Offset="0x1A00" TlutOffset="0xE60"/>
<Texture Name="object_toryo_Tex_001A80" OutName="tex_00001A80" Format="ci8" Width="16" Height="16" Offset="0x1A80" TlutOffset="0xE60"/>
<Texture Name="object_toryo_Tex_001B80" OutName="tex_00001B80" Format="ci8" Width="16" Height="16" Offset="0x1B80" TlutOffset="0xE60"/>
<DList Name="object_toryo_DL_004B20" Offset="0x4B20"/>
<DList Name="object_toryo_DL_004F20" Offset="0x4F20"/>
<DList Name="object_toryo_DL_005438" Offset="0x5438"/>