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_hs.xml
View file

@ -16,17 +16,17 @@
<DList Name="object_hs_DL_004CF0" Offset="0x4CF0"/>
<DList Name="object_hs_DL_004CF8" Offset="0x4CF8"/>
<Texture Name="object_hs_TLUT_004E50" OutName="tlut_00004E50" Format="rgba16" Width="16" Height="16" Offset="0x4E50"/>
<Texture Name="object_hs_Tex_005050" OutName="tex_00005050" Format="ci8" Width="16" Height="32" Offset="0x5050"/>
<Texture Name="object_hs_Tex_005250" OutName="tex_00005250" Format="ci8" Width="8" Height="8" Offset="0x5250"/>
<Texture Name="object_hs_Tex_005290" OutName="tex_00005290" Format="ci8" Width="32" Height="16" Offset="0x5290"/>
<Texture Name="object_hs_Tex_005050" OutName="tex_00005050" Format="ci8" Width="16" Height="32" Offset="0x5050" TlutOffset="0x4E50"/>
<Texture Name="object_hs_Tex_005250" OutName="tex_00005250" Format="ci8" Width="8" Height="8" Offset="0x5250" TlutOffset="0x4E50"/>
<Texture Name="object_hs_Tex_005290" OutName="tex_00005290" Format="ci8" Width="32" Height="16" Offset="0x5290" TlutOffset="0x4E50"/>
<Texture Name="object_hs_Tex_005490" OutName="tex_00005490" Format="rgba16" Width="32" Height="16" Offset="0x5490"/>
<Texture Name="object_hs_Tex_005890" OutName="tex_00005890" Format="ci8" Width="16" Height="16" Offset="0x5890"/>
<Texture Name="object_hs_Tex_005990" OutName="tex_00005990" Format="ci8" Width="16" Height="16" Offset="0x5990"/>
<Texture Name="object_hs_Tex_005890" OutName="tex_00005890" Format="ci8" Width="16" Height="16" Offset="0x5890" TlutOffset="0x4E50"/>
<Texture Name="object_hs_Tex_005990" OutName="tex_00005990" Format="ci8" Width="16" Height="16" Offset="0x5990" TlutOffset="0x4E50"/>
<Texture Name="object_hs_Tex_005A90" OutName="tex_00005A90" Format="rgba16" Width="4" Height="4" Offset="0x5A90"/>
<Texture Name="object_hs_Tex_005AB0" OutName="tex_00005AB0" Format="ci8" Width="8" Height="8" Offset="0x5AB0"/>
<Texture Name="object_hs_Tex_005AF0" OutName="tex_00005AF0" Format="ci8" Width="32" Height="32" Offset="0x5AF0"/>
<Texture Name="object_hs_Tex_005EF0" OutName="tex_00005EF0" Format="ci8" Width="8" Height="16" Offset="0x5EF0"/>
<Texture Name="object_hs_Tex_005F70" OutName="tex_00005F70" Format="ci8" Width="16" Height="32" Offset="0x5F70"/>
<Texture Name="object_hs_Tex_005AB0" OutName="tex_00005AB0" Format="ci8" Width="8" Height="8" Offset="0x5AB0" TlutOffset="0x4E50"/>
<Texture Name="object_hs_Tex_005AF0" OutName="tex_00005AF0" Format="ci8" Width="32" Height="32" Offset="0x5AF0" TlutOffset="0x4E50"/>
<Texture Name="object_hs_Tex_005EF0" OutName="tex_00005EF0" Format="ci8" Width="8" Height="16" Offset="0x5EF0" TlutOffset="0x4E50"/>
<Texture Name="object_hs_Tex_005F70" OutName="tex_00005F70" Format="ci8" Width="16" Height="32" Offset="0x5F70" TlutOffset="0x4E50"/>
<Limb Name="object_hs_Limb_006170" LimbType="Standard" Offset="0x6170"/>
<Limb Name="object_hs_Limb_00617C" LimbType="Standard" Offset="0x617C"/>
<Limb Name="object_hs_Limb_006188" LimbType="Standard" Offset="0x6188"/>