1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-16 04:44:44 +00:00

object_horse and object_hni (#772)

* 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 the other horses from this branch

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

* Rename Epona animations

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

* rename animations of ingo's horse

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

* add textures in hni

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

* Give proper animation names

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

* Update symbols

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

* cutscenes

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

* ./format.sh

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

* Apply suggestions from code review

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Add most of epona's textures and some limbs

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

* add a bunch of textures and limbs of hni

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

* typo

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

* trailling comma memes

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

* all textures from hni

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

* The remaining epona's textures

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

* Use proper names for bridge cutscene

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
This commit is contained in:
Anghelo Carvajal 2021-04-14 17:12:00 -04:00 committed by GitHub
parent 1f6a74e636
commit 9e956cbe3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 162 additions and 140 deletions

View file

@ -0,0 +1,51 @@
<Root>
<File Name="object_hni" Segment="6">
<Skeleton Name="gHorseIngoSkel" Type="Normal" LimbType="Skin" Offset="0x4A24"/>
<Animation Name="gHorseIngoIdleAnim" Offset="0x9FC4"/>
<Animation Name="gHorseIngoWhinnyAnim" Offset="0xA6B4"/>
<Animation Name="gHorseIngoRefuseAnim" Offset="0x901C"/>
<Animation Name="gHorseIngoRearingAnim" Offset="0x85E0"/>
<Animation Name="gHorseIngoWalkingAnim" Offset="0xAF60"/>
<Animation Name="gHorseIngoTrottingAnim" Offset="0x7B54"/>
<Animation Name="gHorseIngoGallopingAnim" Offset="0x506C"/>
<Animation Name="gHorseIngoJumpingAnim" Offset="0x5684"/>
<Animation Name="gHorseIngoJumpingHighAnim" Offset="0x5E20"/>
<!-- Head -->
<Texture Name="gHorseIngoManeTex" OutName="horse_ingo_mane" Format="i8" Width="16" Height="16" Offset="0x740" />
<Texture Name="gHorseIngoNostrilsTex" OutName="horse_ingo_nostrils" Format="rgb5a1" Width="16" Height="16" Offset="0x440" />
<Texture Name="gHorseIngoNoseTex" OutName="horse_ingo_nose" Format="i8" Width="8" Height="8" Offset="0x400" />
<Texture Name="gHorseIngoForeheadTex" OutName="horse_ingo_forehead" Format="i8" Width="8" Height="8" Offset="0x840" />
<Limb Name="gHorseIngoHeadLimb" LimbType="Skin" Offset="0x4748" />
<!-- Body -->
<Texture Name="gHorseIngoNeckTex" OutName="horse_ingo_neck" Format="i8" Width="16" Height="16" Offset="0x6DD0" />
<Texture Name="gHorseIngoThighTex" OutName="horse_ingo_thigh" Format="i8" Width="16" Height="16" Offset="0x66D0" />
<Texture Name="gHorseIngoShoulderTex" OutName="horse_ingo_shoulder" Format="i8" Width="32" Height="32" Offset="0x67D0" />
<Texture Name="gHorseIngoSaddleGirthTex" OutName="horse_ingo_saddle_girth" Format="rgb5a1" Width="8" Height="16" Offset="0x6BD0" />
<Texture Name="gHorseIngoSaddlePadTex" OutName="horse_ingo_saddle_pad" Format="rgb5a1" Width="8" Height="16" Offset="0x6CD0" />
<Limb Name="gHorseIngoBodyLimb" LimbType="Skin" Offset="0x46C8" />
<!-- Saddle -->
<Texture Name="gHorseIngoSaddleTex" OutName="horse_ingo_saddle" Format="rgb5a1" Width="16" Height="16" Offset="0x8C0" />
<Texture Name="gHorseIngoSaddleFlapTex" OutName="horse_ingo_saddle_flap" Format="rgb5a1" Width="16" Height="32" Offset="0xAC0" />
<Limb Name="gHorseIngoSaddleLimb" LimbType="Skin" Offset="0x4858" />
<!-- Hooves -->
<Texture Name="gHorseIngoHorseshoeTex" OutName="horse_ingo_horseshoe" Format="rgb5a1" Width="8" Height="8" Offset="0x6C0" />
<Texture Name="gHorseIngoFeatheringTex" OutName="horse_ingo_feathering" Format="rgb5a1" Width="8" Height="8" Offset="0x640" />
<Limb Name="gHorseIngoHoof1Limb" LimbType="Skin" Offset="0x4838" />
<Limb Name="gHorseIngoHoof2Limb" LimbType="Skin" Offset="0x4948" />
<Limb Name="gHorseIngoHoof3Limb" LimbType="Skin" Offset="0x48C8" />
<Limb Name="gHorseIngoHoof4Limb" LimbType="Skin" Offset="0x47B8" />
<!-- Gerudo saddle -->
<DList Name="gHorseIngoGerudoSaddleDL" Offset="0x6530"/>
<Texture Name="gHorseIngoGerudoSaddleTex" OutName="horse_ingo_gerudo_saddle" Format="rgb5a1" Width="16" Height="16" Offset="0x5E30" />
<Texture Name="gHorseIngoGerudoSaddleFlapTex" OutName="horse_ingo_gerudo_saddle_flap" Format="rgb5a1" Width="16" Height="16" Offset="0x6030" />
<!-- Eye texture -->
<Texture Name="gHorseIngoEyeTex" OutName="horse_ingo_eye" Format="rgb5a1" Width="32" Height="16" Offset="0x0" />
</File>
</Root>

View file

@ -0,0 +1,67 @@
<Root>
<File Name="object_horse" Segment="6">
<Skeleton Name="gEponaSkel" Type="Normal" LimbType="Skin" Offset="0x9D74"/>
<Animation Name="gEponaIdleAnim" Offset="0x6D50"/>
<Animation Name="gEponaWhinnyAnim" Offset="0x5584"/>
<Animation Name="gEponaRefuseAnim" Offset="0x4DEC"/>
<Animation Name="gEponaRearingAnim" Offset="0x3CEC"/>
<Animation Name="gEponaWalkingAnim" Offset="0x75F0"/>
<Animation Name="gEponaTrottingAnim" Offset="0x32B0"/>
<Animation Name="gEponaGallopingAnim" Offset="0x1E2C"/>
<Animation Name="gEponaJumpingAnim" Offset="0x2470"/>
<Animation Name="gEponaJumpingHighAnim" Offset="0x2C38"/>
<Texture Name="gEponaFeatheringTex" OutName="epona_feathering" Format="rgb5a1" Width="16" Height="16" Offset="0xBF10" />
<Texture Name="gEponaHairTex" OutName="epona_hair" Format="rgb5a1" Width="8" Height="8" Offset="0xC190" />
<!-- Head -->
<Texture Name="gEponaCrestTex" OutName="epona_crest" Format="rgb5a1" Width="16" Height="8" Offset="0xCA10" />
<Texture Name="gEponaManeTex" OutName="epona_mane" Format="rgb5a1" Width="16" Height="16" Offset="0xC810" />
<Texture Name="gEponaNostrilsTex" OutName="epona_nostrils" Format="rgb5a1" Width="16" Height="32" Offset="0xC410" />
<Texture Name="gEponaForeheadTex" OutName="epona_forehead" Format="rgb5a1" Width="8" Height="32" Offset="0xC210" />
<Limb Name="gEponaHeadLimb" LimbType="Skin" Offset="0x9A98" />
<!-- Body -->
<Texture Name="gEponaNeckTex" OutName="epona_neck" Format="i8" Width="16" Height="16" Offset="0xDC10" />
<Texture Name="gEponaChestTex" OutName="epona_chest" Format="i8" Width="16" Height="16" Offset="0xDB10" />
<Texture Name="gEponaShoulderTex" OutName="epona_shoulder" Format="i8" Width="16" Height="16" Offset="0xDE10" />
<Texture Name="gEponaThighTex" OutName="epona_thigh" Format="i8" Width="16" Height="16" Offset="0xDD10" />
<Limb Name="gEponaBodyLimb" LimbType="Skin" Offset="0x9A18" />
<!-- Saddle -->
<Texture Name="gEponaSaddleTex" OutName="epona_saddle" Format="rgb5a1" Width="32" Height="32" Offset="0xCB10" />
<Texture Name="gEponaSaddleFlapTex" OutName="epona_saddle_flap" Format="rgb5a1" Width="16" Height="16" Offset="0xD510" />
<Texture Name="gEponaSaddleLipTex" OutName="epona_saddle_lip" Format="rgb5a1" Width="16" Height="16" Offset="0xD310" />
<Texture Name="gEponaSaddleGirthTex" OutName="epona_saddle_girth" Format="rgb5a1" Width="32" Height="16" Offset="0xD710" />
<Limb Name="gEponaSaddleLimb" LimbType="Skin" Offset="0x9BA8" />
<!-- Cannons -->
<Limb Name="gEponaCannon1Limb" LimbType="Skin" Offset="0x9B18" />
<Limb Name="gEponaCannon2Limb" LimbType="Skin" Offset="0x9B98" />
<Limb Name="gEponaCannon3Limb" LimbType="Skin" Offset="0x9C28" />
<Limb Name="gEponaCannon4Limb" LimbType="Skin" Offset="0x9CA8" />
<!-- Hooves -->
<Texture Name="gEponaHorseshoeTex" OutName="epona_horseshoe" Format="rgb5a1" Width="8" Height="8" Offset="0xC110" />
<Limb Name="gEponaHoof1Limb" LimbType="Skin" Offset="0x9B08" />
<Limb Name="gEponaHoof2Limb" LimbType="Skin" Offset="0x9B88" />
<Limb Name="gEponaHoof3Limb" LimbType="Skin" Offset="0x9C18" />
<Limb Name="gEponaHoof4Limb" LimbType="Skin" Offset="0x9C98" />
<!-- Eyes textures -->
<Texture Name="gEponaEyeTLUT" OutName="epona_eye_tlut" Format="rgb5a1" Width="16" Height="16" Offset="0x9D80" />
<Texture Name="gEponaEyeOpenTex" OutName="epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x9F80" />
<Texture Name="gEponaEyeHalfTex" OutName="epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0xA180" />
<Texture Name="gEponaEyeClosedTex" OutName="epona_eye_closed" Format="ci8" Width="32" Height="16" Offset="0xA380" />
<DList Name="gEponaUnusedWhiteCubeDL" Offset="0x4C0"/>
<DList Name="gEponaUnusedWhiteRectangle1DL" Offset="0x580"/>
<DList Name="gEponaUnusedWhiteRectangle2DL" Offset="0x620"/>
<DList Name="gEponaUnusedWhiteRectangle3DL" Offset="0x6C0"/>
<DList Name="gEponaUnusedWhiteRectangle4DL" Offset="0x760"/>
<Blob Name="gEponaBlob_000000" Offset="0x0" Size="0x380" />
<Blob Name="gEponaBlob_0007C0" Offset="0x7C0" Size="0xB0" />
</File>
</Root>