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

56
assets/xml/objects/object_nb.xml
View file

@ -50,41 +50,41 @@
<Texture Name="gNabooru3TLUT" OutName="nabooru_3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0B048"/>
<!-- Nabooru Displaylist Textures -->
<Texture Name="gNabooruClothesButtonsTex" OutName="nabooru_clothes_buttons" Format="ci8" Width="16" Height="16" Offset="0x098B0"/>
<Texture Name="gNabooruSkinGradient1Tex" OutName="nabooru_skin_gradient_1" Format="ci8" Width="8" Height="8" Offset="0x099B0"/>
<Texture Name="gNabooruNavelTex" OutName="nabooru_navel" Format="ci8" Width="16" Height="16" Offset="0x099F0"/>
<Texture Name="gNabooruPendantJewelTex" OutName="nabooru_pendant_jewel" Format="ci8" Width="32" Height="32" Offset="0x09AF0"/>
<Texture Name="gNabooruCleavageTex" OutName="nabooru_cleavage" Format="ci8" Width="8" Height="8" Offset="0x09EF0"/>
<Texture Name="gNabooruClothesButtonsTex" OutName="nabooru_clothes_buttons" Format="ci8" Width="16" Height="16" Offset="0x098B0" TlutOffset="0x096B0"/>
<Texture Name="gNabooruSkinGradient1Tex" OutName="nabooru_skin_gradient_1" Format="ci8" Width="8" Height="8" Offset="0x099B0" TlutOffset="0x096B0"/>
<Texture Name="gNabooruNavelTex" OutName="nabooru_navel" Format="ci8" Width="16" Height="16" Offset="0x099F0" TlutOffset="0x096B0"/>
<Texture Name="gNabooruPendantJewelTex" OutName="nabooru_pendant_jewel" Format="ci8" Width="32" Height="32" Offset="0x09AF0" TlutOffset="0x096B0"/>
<Texture Name="gNabooruCleavageTex" OutName="nabooru_cleavage" Format="ci8" Width="8" Height="8" Offset="0x09EF0" TlutOffset="0x096B0"/>
<Texture Name="gNabooruTopFabricPatternTex" OutName="nabooru_top_fabric_pattern" Format="rgba16" Width="16" Height="16" Offset="0x09F30"/>
<Texture Name="gNabooruAnkleBraceletTex" OutName="nabooru_ankle_bracelet" Format="ci8" Width="16" Height="16" Offset="0x0A130"/>
<Texture Name="gNabooruTrousersShadowTex" OutName="nabooru_trousers_shadow" Format="ci8" Width="8" Height="8" Offset="0x0A230"/>
<Texture Name="gNabooruTrousersFabricTex" OutName="nabooru_trousers_fabric" Format="ci8" Width="16" Height="16" Offset="0x0A270"/>
<Texture Name="gNabooruAnkleBraceletTex" OutName="nabooru_ankle_bracelet" Format="ci8" Width="16" Height="16" Offset="0x0A130" TlutOffset="0x096B0"/>
<Texture Name="gNabooruTrousersShadowTex" OutName="nabooru_trousers_shadow" Format="ci8" Width="8" Height="8" Offset="0x0A230" TlutOffset="0x096B0"/>
<Texture Name="gNabooruTrousersFabricTex" OutName="nabooru_trousers_fabric" Format="ci8" Width="16" Height="16" Offset="0x0A270" TlutOffset="0x096B0"/>
<Texture Name="gNabooruTrouserCuffPatternTex" OutName="nabooru_trouser_cuff_pattern" Format="rgba16" Width="16" Height="16" Offset="0x0A370"/>
<Texture Name="gNabooruBeltJewelTex" OutName="nabooru_belt_jewel" Format="ci8" Width="16" Height="16" Offset="0x0A570"/>
<Texture Name="gNabooruBeltJewelTex" OutName="nabooru_belt_jewel" Format="ci8" Width="16" Height="16" Offset="0x0A570" TlutOffset="0x096B0"/>
<Texture Name="gNabooruBeltTex" OutName="nabooru_belt" Format="rgba16" Width="32" Height="32" Offset="0x0A670"/>
<Texture Name="gNabooruSkinGradient2Tex" OutName="nabooru_skin_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x0B248"/><!-- Looks like 0x099B0, but uses 2TLUT -->
<Texture Name="gNabooruForeheadJewelSettingTopTex" OutName="nabooru_forehead_jewel_setting_top" Format="ci8" Width="8" Height="4" Offset="0x0B288"/>
<Texture Name="gNabooruForeheadJewelSettingBottomTex" OutName="nabooru_forehead_jewel_setting_bottom" Format="ci8" Width="8" Height="16" Offset="0x0B2A8"/>
<Texture Name="gNabooruForeheadJewelSettingSideTex" OutName="nabooru_forehead_jewel_setting_side" Format="ci8" Width="16" Height="16" Offset="0x0B328"/>
<Texture Name="gNabooruHairTex" OutName="nabooru_hair" Format="ci8" Width="16" Height="16" Offset="0x0B828"/>
<Texture Name="gNabooruForeheadJewelTex" OutName="nabooru_forehead_jewel" Format="ci8" Width="16" Height="16" Offset="0x0B928"/><!-- Looks like 0x0A570, but uses 2TLUT -->
<Texture Name="gNabooruEarTex" OutName="nabooru_ear" Format="ci8" Width="8" Height="16" Offset="0x0BA28"/>
<Texture Name="gNabooruFingersBackSideTex" OutName="nabooru_fingers_back_side" Format="ci8" Width="32" Height="32" Offset="0x0BAA8"/>
<Texture Name="gNabooruSkinGradient2Tex" OutName="nabooru_skin_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x0B248" TlutOffset="0x0AE70"/><!-- Looks like 0x099B0, but uses 2TLUT -->
<Texture Name="gNabooruForeheadJewelSettingTopTex" OutName="nabooru_forehead_jewel_setting_top" Format="ci8" Width="8" Height="4" Offset="0x0B288" TlutOffset="0x0AE70"/>
<Texture Name="gNabooruForeheadJewelSettingBottomTex" OutName="nabooru_forehead_jewel_setting_bottom" Format="ci8" Width="8" Height="16" Offset="0x0B2A8" TlutOffset="0x0AE70"/>
<Texture Name="gNabooruForeheadJewelSettingSideTex" OutName="nabooru_forehead_jewel_setting_side" Format="ci8" Width="16" Height="16" Offset="0x0B328" TlutOffset="0x0AE70"/>
<Texture Name="gNabooruHairTex" OutName="nabooru_hair" Format="ci8" Width="16" Height="16" Offset="0x0B828" TlutOffset="0x0AE70"/>
<Texture Name="gNabooruForeheadJewelTex" OutName="nabooru_forehead_jewel" Format="ci8" Width="16" Height="16" Offset="0x0B928" TlutOffset="0x0AE70"/><!-- Looks like 0x0A570, but uses 2TLUT -->
<Texture Name="gNabooruEarTex" OutName="nabooru_ear" Format="ci8" Width="8" Height="16" Offset="0x0BA28" TlutOffset="0x0AE70"/>
<Texture Name="gNabooruFingersBackSideTex" OutName="nabooru_fingers_back_side" Format="ci8" Width="32" Height="32" Offset="0x0BAA8" TlutOffset="0x0AE70"/>
<Texture Name="gNabooruEarringsNecklaceArmletTex" OutName="nabooru_earrings_necklace_armlet" Format="rgba16" Width="32" Height="32" Offset="0x0BEA8"/>
<Texture Name="gNabooruPonytailCuffJewelTex" OutName="nabooru_ponytail_cuff_jewel" Format="ci8" Width="32" Height="32" Offset="0x0C6A8"/><!-- Looks like 0x09AF0, but uses 2TLUT -->
<Texture Name="gNabooruGloveHandBackTex" OutName="nabooru_glove_hand_back" Format="ci8" Width="16" Height="16" Offset="0x0CAA8"/><!-- Looks like 0x098B0, but uses 2TLUT -->
<Texture Name="gNabooruGloveHandPalmTex" OutName="nabooru_glove_hand_palm" Format="ci8" Width="8" Height="8" Offset="0x0CBA8"/>
<Texture Name="gNabooruShoeUpperMouthTex" OutName="nabooru_shoe_upper_mouth" Format="ci8" Width="8" Height="8" Offset="0x0CBE8"/>
<Texture Name="gNabooruShoeSoleTex" OutName="nabooru_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x0CC28"/>
<Texture Name="gNabooruTopOfFootTex" OutName="nabooru_top_of_foot" Format="ci8" Width="8" Height="16" Offset="0x0CC68"/>
<Texture Name="gNabooruFingersPalmSideTex" OutName="nabooru_fingers_palm_side" Format="ci8" Width="32" Height="32" Offset="0x0CCE8"/>
<Texture Name="gNabooruPonytailCuffJewelTex" OutName="nabooru_ponytail_cuff_jewel" Format="ci8" Width="32" Height="32" Offset="0x0C6A8" TlutOffset="0x0AE70"/><!-- Looks like 0x09AF0, but uses 2TLUT -->
<Texture Name="gNabooruGloveHandBackTex" OutName="nabooru_glove_hand_back" Format="ci8" Width="16" Height="16" Offset="0x0CAA8" TlutOffset="0x0AE70"/><!-- Looks like 0x098B0, but uses 2TLUT -->
<Texture Name="gNabooruGloveHandPalmTex" OutName="nabooru_glove_hand_palm" Format="ci8" Width="8" Height="8" Offset="0x0CBA8" TlutOffset="0x0AE70"/>
<Texture Name="gNabooruShoeUpperMouthTex" OutName="nabooru_shoe_upper_mouth" Format="ci8" Width="8" Height="8" Offset="0x0CBE8" TlutOffset="0x0AE70"/>
<Texture Name="gNabooruShoeSoleTex" OutName="nabooru_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x0CC28" TlutOffset="0x0AE70"/>
<Texture Name="gNabooruTopOfFootTex" OutName="nabooru_top_of_foot" Format="ci8" Width="8" Height="16" Offset="0x0CC68" TlutOffset="0x0AE70"/>
<Texture Name="gNabooruFingersPalmSideTex" OutName="nabooru_fingers_palm_side" Format="ci8" Width="32" Height="32" Offset="0x0CCE8" TlutOffset="0x0AE70"/>
<Texture Name="gNabooruLipsTex" OutName="nabooru_lips" Format="rgba16" Width="8" Height="8" Offset="0x0DCE8"/>
<!-- Nabooru Eye Textures -->
<Texture Name="gNabooruEyeOpenTex" OutName="nabooru_eye_open" Format="ci8" Width="32" Height="32" Offset="0x0B428"/>
<Texture Name="gNabooruEyeHalfTex" OutName="nabooru_eye_half" Format="ci8" Width="32" Height="32" Offset="0x0D0E8"/>
<Texture Name="gNabooruEyeClosedTex" OutName="nabooru_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x0D4E8"/>
<Texture Name="gNabooruEyeWideTex" OutName="nabooru_eye_wide" Format="ci8" Width="32" Height="32" Offset="0x0D8E8"/>
<Texture Name="gNabooruEyeOpenTex" OutName="nabooru_eye_open" Format="ci8" Width="32" Height="32" Offset="0x0B428" TlutOffset="0x0B048"/>
<Texture Name="gNabooruEyeHalfTex" OutName="nabooru_eye_half" Format="ci8" Width="32" Height="32" Offset="0x0D0E8" TlutOffset="0x0B048"/>
<Texture Name="gNabooruEyeClosedTex" OutName="nabooru_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x0D4E8" TlutOffset="0x0B048"/>
<Texture Name="gNabooruEyeWideTex" OutName="nabooru_eye_wide" Format="ci8" Width="32" Height="32" Offset="0x0D8E8" TlutOffset="0x0B048"/>
<!-- Nabooru Animations -->
<Animation Name="gNabooruPuttingHandsTogetherCastingMagicAnim" Offset="0x00410"/>