mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 07:20:16 +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

32
assets/xml/objects/object_sd.xml
View file

@ -44,27 +44,27 @@
<!--King Guard Textures-->
<Texture Name="gEnHeishiKingGuardTLUT" OutName="king_guard_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0000"/>
<Texture Name="gEnHeishiKingGuardTex_200" Format="ci8" Width="8" Height="8" Offset="0x0200"/><!--Mouth?-->
<Texture Name="gEnHeishiKingGuardTex_240" Format="ci8" Width="8" Height="8" Offset="0x0240"/><!--Eyes?-->
<Texture Name="gEnHeishiKingGuardArmorTex" OutName="king_guard_armor" Format="ci8" Width="8" Height="8" Offset="0x0280"/>
<Texture Name="gEnHeishiKingGuardSholderGuardTex" OutName="king_guard_sholder_guard" Format="ci8" Width="8" Height="16" Offset="0x02C0"/>
<Texture Name="gEnHeishiKingGuardChestArmorTex" OutName="king_guard_chest_armor" Format="ci8" Width="32" Height="64" Offset="0x0340"/>
<Texture Name="gEnHeishiKingGuardTex_B40" Format="ci8" Width="16" Height="16" Offset="0x0B40"/> <!--Leg Armor?-->
<Texture Name="gEnHeishiKingGuardHandTex" OutName="king_guard_hand" Format="ci8" Width="8" Height="8" Offset="0x0C40"/>
<Texture Name="gEnHeishiKingGuardPantsTex" OutName="king_guard_pants" Format="ci8" Width="16" Height="16" Offset="0x0C80"/>
<Texture Name="gEnHeishiKingGuardTex_200" Format="ci8" Width="8" Height="8" Offset="0x0200" TlutOffset="0x0000"/><!--Mouth?-->
<Texture Name="gEnHeishiKingGuardTex_240" Format="ci8" Width="8" Height="8" Offset="0x0240" TlutOffset="0x0000"/><!--Eyes?-->
<Texture Name="gEnHeishiKingGuardArmorTex" OutName="king_guard_armor" Format="ci8" Width="8" Height="8" Offset="0x0280" TlutOffset="0x0000"/>
<Texture Name="gEnHeishiKingGuardSholderGuardTex" OutName="king_guard_sholder_guard" Format="ci8" Width="8" Height="16" Offset="0x02C0" TlutOffset="0x0000"/>
<Texture Name="gEnHeishiKingGuardChestArmorTex" OutName="king_guard_chest_armor" Format="ci8" Width="32" Height="64" Offset="0x0340" TlutOffset="0x0000"/>
<Texture Name="gEnHeishiKingGuardTex_B40" Format="ci8" Width="16" Height="16" Offset="0x0B40" TlutOffset="0x0000"/> <!--Leg Armor?-->
<Texture Name="gEnHeishiKingGuardHandTex" OutName="king_guard_hand" Format="ci8" Width="8" Height="8" Offset="0x0C40" TlutOffset="0x0000"/>
<Texture Name="gEnHeishiKingGuardPantsTex" OutName="king_guard_pants" Format="ci8" Width="16" Height="16" Offset="0x0C80" TlutOffset="0x0000"/>
<!--Normal Guard Textures-->
<Texture Name="gHeishiTLUT" OutName="guard_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5C40"/>
<Texture Name="gEnHeishiMouthTex" OutName="mouth_tex" Format="ci8" Width="16" Height="16" Offset="0x5E40"/>
<Texture Name="gEnHeishiGradient1Tex" OutName="gradient1" Format="ci8" Width="8" Height="8" Offset="0x5F40"/>
<Texture Name="gEnHeishiGradient2Tex" OutName="gradient2" Format="ci8" Width="8" Height="8" Offset="0x5F80"/>
<Texture Name="gEnHeishiArmorTex" OutName="armor" Format="ci8" Width="8" Height="8" Offset="0x5FC0"/>
<Texture Name="gEnHeishiMouthTex" OutName="mouth_tex" Format="ci8" Width="16" Height="16" Offset="0x5E40" TlutOffset="0x5C40"/>
<Texture Name="gEnHeishiGradient1Tex" OutName="gradient1" Format="ci8" Width="8" Height="8" Offset="0x5F40" TlutOffset="0x5C40"/>
<Texture Name="gEnHeishiGradient2Tex" OutName="gradient2" Format="ci8" Width="8" Height="8" Offset="0x5F80" TlutOffset="0x5C40"/>
<Texture Name="gEnHeishiArmorTex" OutName="armor" Format="ci8" Width="8" Height="8" Offset="0x5FC0" TlutOffset="0x5C40"/>
<Texture Name="gEnHeishiUniform1Tex" OutName="uniform1" Format="i4" Width="16" Height="16" Offset="0x6000"/>
<Texture Name="gEnHeishiUniform2Tex" OutName="uniform2" Format="i4" Width="16" Height="8" Offset="0x6080"/>
<Texture Name="gEnHeishiUniformGreyTriforceTex" OutName="uniform_grey_triforce" Format="i4" Width="32" Height="32" Offset="0x60C0"/>
<Texture Name="gEnHeishiUniformGoldTriforceTex" OutName="uniform_gold_triforce" Format="ci8" Width="32" Height="32" Offset="0x62C0"/>
<Texture Name="gEnHeishiLegTex" OutName="leg" Format="ci8" Width="16" Height="16" Offset="0x66C0"/>
<Texture Name="gEnHeishiTex_0067C0" Format="ci8" Width="32" Height="32" Offset="0x67C0"/>
<Texture Name="gEnHeishiHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x6BC0"/>
<Texture Name="gEnHeishiUniformGoldTriforceTex" OutName="uniform_gold_triforce" Format="ci8" Width="32" Height="32" Offset="0x62C0" TlutOffset="0x5C40"/>
<Texture Name="gEnHeishiLegTex" OutName="leg" Format="ci8" Width="16" Height="16" Offset="0x66C0" TlutOffset="0x5C40"/>
<Texture Name="gEnHeishiTex_0067C0" Format="ci8" Width="32" Height="32" Offset="0x67C0" TlutOffset="0x5C40"/>
<Texture Name="gEnHeishiHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x6BC0" TlutOffset="0x5C40"/>
</File>
</Root>