1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-10-19 04:59:53 +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
commit b338f12498
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 160 additions and 140 deletions

12
spec
View file

@ -3694,7 +3694,8 @@ endseg
beginseg
name "object_horse_normal"
romalign 0x1000
include "build/baserom/object_horse_normal.o"
include "build/assets/objects/object_horse_normal/object_horse_normal.o"
number 6
endseg
beginseg
@ -3731,7 +3732,8 @@ endseg
beginseg
name "object_horse_ganon"
romalign 0x1000
include "build/baserom/object_horse_ganon.o"
include "build/assets/objects/object_horse_ganon/object_horse_ganon.o"
number 6
endseg
beginseg
@ -3878,7 +3880,8 @@ endseg
beginseg
name "object_horse_zelda"
romalign 0x1000
include "build/baserom/object_horse_zelda.o"
include "build/assets/objects/object_horse_zelda/object_horse_zelda.o"
number 6
endseg
beginseg
@ -4357,7 +4360,8 @@ endseg
beginseg
name "object_horse_link_child"
romalign 0x1000
include "build/baserom/object_horse_link_child.o"
include "build/assets/objects/object_horse_link_child/object_horse_link_child.o"
number 6
endseg
beginseg