1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +00:00

object_horse_ganon, object_horse_link_child, object_horse_normal and object_horse_zelda OK (#724)

* object_horse_zelda

Signed-off-by: angie <angheloalf95@gmail.com>

* object_horse_normal

Signed-off-by: angie <angheloalf95@gmail.com>

* object_horse_link_child

Signed-off-by: angie <angheloalf95@gmail.com>

* object_horse_ganon

Signed-off-by: angie <angheloalf95@gmail.com>

* object_horse

Signed-off-by: angie <angheloalf95@gmail.com>

* object_hni

Signed-off-by: Angie <angheloalf95@gmail.com>

* ZAPD is falling to do vtx

Signed-off-by: Angie <angheloalf95@gmail.com>

* Testing

Signed-off-by: Angie <angheloalf95@gmail.com>

* Rename horse_link_child variables

Signed-off-by: angie <angheloalf95@gmail.com>

* horse_zelda with names

Signed-off-by: angie <angheloalf95@gmail.com>

* I'm suspecting that this game doesn't use z_en_horse_ganon

Signed-off-by: angie <angheloalf95@gmail.com>

* Child epona eye textures

Signed-off-by: Angie <angheloalf95@gmail.com>

* Extract eyes textures from Epona

Signed-off-by: Angie <angheloalf95@gmail.com>

* Small rename

Signed-off-by: Angie <angheloalf95@gmail.com>

* change references in EnHorseNormal

Signed-off-by: angie <angheloalf95@gmail.com>

* Rename a few HorseNormal animations

Signed-off-by: angie <angheloalf95@gmail.com>

* Add normal horse eye texture

Signed-off-by: angie <angheloalf95@gmail.com>

* Add some textures

Signed-off-by: angie <angheloalf95@gmail.com>

* change pointers in EnViewer

Signed-off-by: angie <angheloalf95@gmail.com>

* Rename some animations of HorseGanon

Signed-off-by: angie <angheloalf95@gmail.com>

* Add a few dlists in object_horse

Signed-off-by: Angie <angheloalf95@gmail.com>

* Add whinnies

Signed-off-by: Angie <angheloalf95@gmail.com>

* Rename last animations remaining in horse_normal and horse_ganon

Signed-off-by: angie <angheloalf95@gmail.com>

* Remove epona and ingo's horse

Signed-off-by: angie <angheloalf95@gmail.com>

* ./format.sh

Signed-off-by: angie <angheloalf95@gmail.com>

* Give a proper name to horses animations

Signed-off-by: angie <angheloalf95@gmail.com>

* add trailling comma

Signed-off-by: Angie <angheloalf95@gmail.com>

* remove union of skeletons

Signed-off-by: angie <angheloalf95@gmail.com>

* change skeletonheader* to void*

Signed-off-by: angie <angheloalf95@gmail.com>

* remove cast

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* remove cast 2

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* format.sh

Signed-off-by: angie <angheloalf95@gmail.com>

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
Anghelo Carvajal 2021-03-28 00:44:11 -03:00 committed by GitHub
parent 3aad8f7244
commit b338f12498
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 160 additions and 140 deletions

View file

@ -0,0 +1,22 @@
<Root>
<File Name="object_horse_ganon" Segment="6">
<Skeleton Name="gHorseGanonSkel" Type="Normal" LimbType="Skin" Offset="0x8668"/>
<!-- Idle. Horse moving leg. -->
<Animation Name="gHorseGanonIdleAnim" Offset="0x4AA4"/>
<!-- Idle2. Moving head. -->
<Animation Name="gHorseGanonWhinnyAnim" Offset="0x5264"/>
<!-- Walking slow. -->
<Animation Name="gHorseGanonWalkingAnim" Offset="0x5B78"/>
<!-- Walking fast. -->
<Animation Name="gHorseGanonTrottingAnim" Offset="0x2CE4"/>
<!-- Running. -->
<Animation Name="gHorseGanonGallopingAnim" Offset="0x2650"/>
<!-- Stand in two legs for a moment. -->
<Animation Name="gHorseGanonRearingAnim" Offset="0x3858"/>
<Texture Name="gHorseGanonEyeTex" OutName="horse_ganon_eye" Format="rgb5a1" Width="16" Height="16" Offset="0xAC10" />
<Texture Name="gHorseGanonHeadHairTex" OutName="horse_ganon_head_hair" Format="rgb5a1" Width="16" Height="16" Offset="0xAE10" />
<Texture Name="gHorseGanonLegTex" OutName="horse_ganon_leg" Format="rgb5a1" Width="16" Height="16" Offset="0xA370" />
</File>
</Root>

View file

@ -0,0 +1,21 @@
<Root>
<File Name="object_horse_link_child" Segment="6">
<Skeleton Name="gChildEponaSkel" Type="Normal" LimbType="Skin" Offset="0x7B20"/>
<!-- Idle animation. -->
<Animation Name="gChildEponaIdleAnim" Offset="0x43E4"/>
<!-- The animation that horses usually do. You know, that one... moving its head... -->
<Animation Name="gChildEponaWhinnyAnim" Offset="0x4B08"/>
<!-- Walking slow. -->
<Animation Name="gChildEponaWalkingAnim" Offset="0x53F0"/>
<!-- Walking fast. -->
<Animation Name="gChildEponaTrottingAnim" Offset="0x360C"/>
<!-- Running. -->
<Animation Name="gChildEponaGallopingAnim" Offset="0x2F98"/>
<Texture Name="gChildEponaEyePal" OutName="child_epona_eye_pal" Format="rgb5a1" Width="16" Height="16" Offset="0x1728" />
<Texture Name="gChildEponaEyeOpenTex" OutName="child_epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x1D28" />
<Texture Name="gChildEponaEyeHalfTex" OutName="child_epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0x1928" />
<Texture Name="gChildEponaEyeCloseTex" OutName="child_epona_eye_close" Format="ci8" Width="32" Height="16" Offset="0x1B28" />
</File>
</Root>

View file

@ -0,0 +1,26 @@
<Root>
<File Name="object_horse_normal" Segment="6">
<Skeleton Name="gHorseNormalSkel" Type="Normal" LimbType="Skin" Offset="0x9FAC"/>
<!-- Running. -->
<Animation Name="gHorseNormalGallopingAnim" Offset="0x608"/>
<!-- Jumping. -->
<Animation Name="gHorseNormalJumpingAnim" Offset="0xC20"/>
<!-- JumpingHigh. -->
<Animation Name="gHorseNormalJumpingHighAnim" Offset="0x13A8"/>
<!-- Walking fast. -->
<Animation Name="gHorseNormalTrottingAnim" Offset="0x1A1C"/>
<!-- Stand in two legs for a moment? -->
<Animation Name="gHorseNormalRearingAnim" Offset="0x2458"/>
<!-- Refusing to jump / Slowing down. -->
<Animation Name="gHorseNormalRefuseAnim" Offset="0x35D4"/>
<!-- Idle1. Horse moving leg. -->
<Animation Name="gHorseNormalIdleAnim" Offset="0x4580"/>
<!-- Idle2. Moving head. -->
<Animation Name="gHorseNormalWhinnyAnim" Offset="0x4C20"/>
<!-- Walking slow. -->
<Animation Name="gHorseNormalWalkingAnim" Offset="0x54BC"/>
<Texture Name="gHorseNormalEyeTex" OutName="horse_normal_eye" Format="rgb5a1" Width="32" Height="16" Offset="0x54D8"/>
</File>
</Root>

View file

@ -0,0 +1,14 @@
<Root>
<File Name="object_horse_zelda" Segment="6">
<Skeleton Name="gHorseZeldaSkel" Type="Normal" LimbType="Skin" Offset="0x6B2C"/>
<!-- Running. -->
<Animation Name="gHorseZeldaGallopingAnim" Offset="0x7148"/>
<Texture Name="gHorseZeldaEyeTex" OutName="horse_zelda_eye" Format="rgb5a1" Width="32" Height="16" Offset="0x8" />
<Texture Name="gHorseZeldaHeadHairTex" OutName="horse_zelda_head_hair" Format="rgb5a1" Width="16" Height="16" Offset="0x688" />
<Texture Name="gHorseZeldaNoseTex" OutName="horse_zelda_nose" Format="rgb5a1" Width="16" Height="16" Offset="0x488" />
<Texture Name="gHorseZeldaLegTex" OutName="horse_zelda_leg" Format="rgb5a1" Width="16" Height="16" Offset="0x9A8" />
</File>
</Root>