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

18
assets/xml/objects/object_mk.xml
View file

@ -17,16 +17,16 @@
<DList Name="object_mk_DL_004C60" Offset="0x4C60"/>
<DList Name="object_mk_DL_004DB0" Offset="0x4DB0"/>
<Texture Name="object_mk_TLUT_004F30" OutName="tlut_00004F30" Format="rgba16" Width="16" Height="16" Offset="0x4F30"/>
<Texture Name="object_mk_Tex_005130" OutName="tex_00005130" Format="ci8" Width="8" Height="8" Offset="0x5130"/>
<Texture Name="object_mk_Tex_005170" OutName="tex_00005170" Format="ci8" Width="16" Height="16" Offset="0x5170"/>
<Texture Name="object_mk_Tex_005270" OutName="tex_00005270" Format="ci8" Width="8" Height="8" Offset="0x5270"/>
<Texture Name="object_mk_Tex_0052B0" OutName="tex_000052B0" Format="ci8" Width="8" Height="8" Offset="0x52B0"/>
<Texture Name="object_mk_Tex_0052F0" OutName="tex_000052F0" Format="ci8" Width="8" Height="16" Offset="0x52F0"/>
<Texture Name="object_mk_Tex_005130" OutName="tex_00005130" Format="ci8" Width="8" Height="8" Offset="0x5130" TlutOffset="0x4F30"/>
<Texture Name="object_mk_Tex_005170" OutName="tex_00005170" Format="ci8" Width="16" Height="16" Offset="0x5170" TlutOffset="0x4F30"/>
<Texture Name="object_mk_Tex_005270" OutName="tex_00005270" Format="ci8" Width="8" Height="8" Offset="0x5270" TlutOffset="0x4F30"/>
<Texture Name="object_mk_Tex_0052B0" OutName="tex_000052B0" Format="ci8" Width="8" Height="8" Offset="0x52B0" TlutOffset="0x4F30"/>
<Texture Name="object_mk_Tex_0052F0" OutName="tex_000052F0" Format="ci8" Width="8" Height="16" Offset="0x52F0" TlutOffset="0x4F30"/>
<Texture Name="object_mk_Tex_005370" OutName="tex_00005370" Format="rgba16" Width="32" Height="32" Offset="0x5370"/>
<Texture Name="object_mk_Tex_005B70" OutName="tex_00005B70" Format="ci8" Width="8" Height="8" Offset="0x5B70"/>
<Texture Name="object_mk_Tex_005BB0" OutName="tex_00005BB0" Format="ci8" Width="8" Height="8" Offset="0x5BB0"/>
<Texture Name="object_mk_Tex_005BF0" OutName="tex_00005BF0" Format="ci8" Width="8" Height="8" Offset="0x5BF0"/>
<Texture Name="object_mk_Tex_005C30" OutName="tex_00005C30" Format="ci8" Width="16" Height="16" Offset="0x5C30"/>
<Texture Name="object_mk_Tex_005B70" OutName="tex_00005B70" Format="ci8" Width="8" Height="8" Offset="0x5B70" TlutOffset="0x4F30"/>
<Texture Name="object_mk_Tex_005BB0" OutName="tex_00005BB0" Format="ci8" Width="8" Height="8" Offset="0x5BB0" TlutOffset="0x4F30"/>
<Texture Name="object_mk_Tex_005BF0" OutName="tex_00005BF0" Format="ci8" Width="8" Height="8" Offset="0x5BF0" TlutOffset="0x4F30"/>
<Texture Name="object_mk_Tex_005C30" OutName="tex_00005C30" Format="ci8" Width="16" Height="16" Offset="0x5C30" TlutOffset="0x4F30"/>
<Limb Name="object_mk_Limb_005D30" LimbType="Standard" Offset="0x5D30"/>
<Limb Name="object_mk_Limb_005D3C" LimbType="Standard" Offset="0x5D3C"/>
<Limb Name="object_mk_Limb_005D48" LimbType="Standard" Offset="0x5D48"/>