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

22
assets/xml/objects/object_ds2.xml
View file

@ -10,17 +10,17 @@
<DList Name="object_ds2_DL_002738" Offset="0x2738"/>
<DList Name="object_ds2_DL_002908" Offset="0x2908"/>
<Texture Name="object_ds2_TLUT_002A98" OutName="tlut_00002A98" Format="rgba16" Width="16" Height="16" Offset="0x2A98"/>
<Texture Name="object_ds2_Tex_002C98" OutName="tex_00002C98" Format="ci8" Width="16" Height="16" Offset="0x2C98"/>
<Texture Name="object_ds2_Tex_002D98" OutName="tex_00002D98" Format="ci8" Width="8" Height="8" Offset="0x2D98"/>
<Texture Name="object_ds2_Tex_002DD8" OutName="tex_00002DD8" Format="ci8" Width="16" Height="16" Offset="0x2DD8"/>
<Texture Name="object_ds2_Tex_002ED8" OutName="tex_00002ED8" Format="ci8" Width="32" Height="16" Offset="0x2ED8"/>
<Texture Name="gPotionShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x30D8"/>
<Texture Name="gPotionShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x34D8"/>
<Texture Name="gPotionShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x38D8"/>
<Texture Name="object_ds2_Tex_003CD8" OutName="tex_00003CD8" Format="ci8" Width="16" Height="16" Offset="0x3CD8"/>
<Texture Name="object_ds2_Tex_003DD8" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8"/>
<Texture Name="object_ds2_Tex_003ED8" OutName="tex_00003ED8" Format="ci8" Width="16" Height="16" Offset="0x3ED8"/>
<Texture Name="object_ds2_Tex_003FD8" OutName="tex_00003FD8" Format="ci8" Width="16" Height="32" Offset="0x3FD8"/>
<Texture Name="object_ds2_Tex_002C98" OutName="tex_00002C98" Format="ci8" Width="16" Height="16" Offset="0x2C98" TlutOffset="0x2A98"/>
<Texture Name="object_ds2_Tex_002D98" OutName="tex_00002D98" Format="ci8" Width="8" Height="8" Offset="0x2D98" TlutOffset="0x2A98"/>
<Texture Name="object_ds2_Tex_002DD8" OutName="tex_00002DD8" Format="ci8" Width="16" Height="16" Offset="0x2DD8" TlutOffset="0x2A98"/>
<Texture Name="object_ds2_Tex_002ED8" OutName="tex_00002ED8" Format="ci8" Width="32" Height="16" Offset="0x2ED8" TlutOffset="0x2A98"/>
<Texture Name="gPotionShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x30D8" TlutOffset="0x2A98"/>
<Texture Name="gPotionShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x34D8" TlutOffset="0x2A98"/>
<Texture Name="gPotionShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x38D8" TlutOffset="0x2A98"/>
<Texture Name="object_ds2_Tex_003CD8" OutName="tex_00003CD8" Format="ci8" Width="16" Height="16" Offset="0x3CD8" TlutOffset="0x2A98"/>
<Texture Name="object_ds2_Tex_003DD8" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2A98"/>
<Texture Name="object_ds2_Tex_003ED8" OutName="tex_00003ED8" Format="ci8" Width="16" Height="16" Offset="0x3ED8" TlutOffset="0x2A98"/>
<Texture Name="object_ds2_Tex_003FD8" OutName="tex_00003FD8" Format="ci8" Width="16" Height="32" Offset="0x3FD8" TlutOffset="0x2A98"/>
<Limb Name="object_ds2_Limb_0041D8" LimbType="Standard" Offset="0x41D8"/>
<Limb Name="object_ds2_Limb_0041E4" LimbType="Standard" Offset="0x41E4"/>
<Limb Name="object_ds2_Limb_0041F0" LimbType="Standard" Offset="0x41F0"/>