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

4
assets/xml/objects/object_spot07_object.xml
View file

@ -3,12 +3,12 @@
<DList Name="object_spot07_object_DL_000460" Offset="0x460"/>
<DList Name="object_spot07_object_DL_000BE0" Offset="0xBE0"/>
<Texture Name="object_spot07_object_TLUT_000EC0" OutName="tlut_00000EC0" Format="rgba16" Width="4" Height="4" Offset="0xEC0"/>
<Texture Name="object_spot07_object_Tex_000EE0" OutName="tex_00000EE0" Format="ci4" Width="32" Height="128" Offset="0xEE0"/>
<Texture Name="object_spot07_object_Tex_000EE0" OutName="tex_00000EE0" Format="ci4" Width="32" Height="128" Offset="0xEE0" TlutOffset="0xEC0"/>
<DList Name="object_spot07_object_DL_001CF0" Offset="0x1CF0"/>
<DList Name="object_spot07_object_DL_001F68" Offset="0x1F68"/>
<Collision Name="object_spot07_object_Col_002590" Offset="0x2590"/>
<Texture Name="object_spot07_object_TLUT_0025C0" OutName="tlut_000025C0" Format="rgba16" Width="4" Height="4" Offset="0x25C0"/>
<Texture Name="object_spot07_object_Tex_0025E0" OutName="tex_000025E0" Format="ci4" Width="32" Height="128" Offset="0x25E0"/>
<Texture Name="object_spot07_object_Tex_0025E0" OutName="tex_000025E0" Format="ci4" Width="32" Height="128" Offset="0x25E0" TlutOffset="0x25C0"/>
<DList Name="object_spot07_object_DL_003210" Offset="0x3210"/>
<DList Name="object_spot07_object_DL_0032D8" Offset="0x32D8"/>
<Collision Name="object_spot07_object_Col_0038FC" Offset="0x38FC"/>