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

24
assets/xml/objects/object_zl2.xml
View file

@ -5,23 +5,23 @@
<!-- Zelda 2 eyes textures -->
<Texture Name="gZelda2EyesTLUT" OutName="zelda_2_eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2B00"/>
<Texture Name="gZelda2EyeOpenTex" OutName="zelda_2_eye_open" Format="ci8" Width="32" Height="32" Offset="0x30C8"/>
<Texture Name="gZelda2EyeHalfTex" OutName="zelda_2_eye_half" Format="ci8" Width="32" Height="32" Offset="0x3C48"/>
<Texture Name="gZelda2EyeShutTex" OutName="zelda_2_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x4048"/>
<Texture Name="gZelda2Eye03Tex" OutName="zelda_2_eye_03" Format="ci8" Width="32" Height="32" Offset="0x4548"/>
<Texture Name="gZelda2Eye04Tex" OutName="zelda_2_eye_04" Format="ci8" Width="32" Height="32" Offset="0x4948"/>
<Texture Name="gZelda2Eye05Tex" OutName="zelda_2_eye_05" Format="ci8" Width="32" Height="32" Offset="0x4D48"/>
<Texture Name="gZelda2Eye06Tex" OutName="zelda_2_eye_06" Format="ci8" Width="32" Height="32" Offset="0x5148"/> <!-- Scared (?) -->
<Texture Name="gZelda2Eye07Tex" OutName="zelda_2_eye_07" Format="ci8" Width="32" Height="32" Offset="0x5D48"/> <!-- Sad (?) -->
<Texture Name="gZelda2Eye08Tex" OutName="zelda_2_eye_08" Format="ci8" Width="32" Height="32" Offset="0x6148"/> <!-- Sad2 (?) -->
<Texture Name="gZelda2EyeOpenTex" OutName="zelda_2_eye_open" Format="ci8" Width="32" Height="32" Offset="0x30C8" TlutOffset="0x2B00"/>
<Texture Name="gZelda2EyeHalfTex" OutName="zelda_2_eye_half" Format="ci8" Width="32" Height="32" Offset="0x3C48" TlutOffset="0x2B00"/>
<Texture Name="gZelda2EyeShutTex" OutName="zelda_2_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x4048" TlutOffset="0x2B00"/>
<Texture Name="gZelda2Eye03Tex" OutName="zelda_2_eye_03" Format="ci8" Width="32" Height="32" Offset="0x4548" TlutOffset="0x2B00"/>
<Texture Name="gZelda2Eye04Tex" OutName="zelda_2_eye_04" Format="ci8" Width="32" Height="32" Offset="0x4948" TlutOffset="0x2B00"/>
<Texture Name="gZelda2Eye05Tex" OutName="zelda_2_eye_05" Format="ci8" Width="32" Height="32" Offset="0x4D48" TlutOffset="0x2B00"/>
<Texture Name="gZelda2Eye06Tex" OutName="zelda_2_eye_06" Format="ci8" Width="32" Height="32" Offset="0x5148" TlutOffset="0x2B00"/> <!-- Scared (?) -->
<Texture Name="gZelda2Eye07Tex" OutName="zelda_2_eye_07" Format="ci8" Width="32" Height="32" Offset="0x5D48" TlutOffset="0x2B00"/> <!-- Sad (?) -->
<Texture Name="gZelda2Eye08Tex" OutName="zelda_2_eye_08" Format="ci8" Width="32" Height="32" Offset="0x6148" TlutOffset="0x2B00"/> <!-- Sad2 (?) -->
<Texture Name="gZelda2EyeUnusedTex" OutName="zelda_2_eye_unused" Format="rgba16" Width="32" Height="32" Offset="0x600"/>
<!-- Zelda 2 mouth textures -->
<Texture Name="gZelda2MouthTLUT" OutName="zelda_2_mouth_tlut" Format="rgba16" Width="16" Height="14" Offset="0x2D90"/>
<Texture Name="gZelda2MouthSeriousTex" OutName="zelda_2_mouth_serious" Format="ci8" Width="32" Height="32" Offset="0x3508"/>
<Texture Name="gZelda2MouthHappyTex" OutName="zelda_2_mouth_happy" Format="ci8" Width="32" Height="32" Offset="0x5548"/>
<Texture Name="gZelda2MouthOpenTex" OutName="zelda_2_mouth_open" Format="ci8" Width="32" Height="32" Offset="0x5948"/>
<Texture Name="gZelda2MouthSeriousTex" OutName="zelda_2_mouth_serious" Format="ci8" Width="32" Height="32" Offset="0x3508" TlutOffset="0x2D90"/>
<Texture Name="gZelda2MouthHappyTex" OutName="zelda_2_mouth_happy" Format="ci8" Width="32" Height="32" Offset="0x5548" TlutOffset="0x2D90"/>
<Texture Name="gZelda2MouthOpenTex" OutName="zelda_2_mouth_open" Format="ci8" Width="32" Height="32" Offset="0x5948" TlutOffset="0x2D90"/>
<!-- Ocarina of time -->
<DList Name="gZelda2OcarinaDL" Offset="0xBAE8"/>