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

ovl_En_Horse_Normal (#403)

Browse source 
* merge upstream

* Merge upstream

* Match EnHorseNormal_Init

* Work on EnHorseNormal_Draw (probably finish depending functions first)

* func_80A6CC88

* Work on EnHorseNormal_Draw

* Clang format

* Properly use OPEN_DISPS

* Stop using thisx lol

* Use the funny angle number

* Use &D_04049AD0 because it's not a display list?

* Stop using fun macros to fix stack

* EnHorseNormal_Draw

* EnHorseNormal_Destroy

* EnHorseNormal_Update

* Use disp macros EnHorseNormal_Draw

* Correctly type D_04049AD0

* func_80A6C570

* Name some draw stuff

* Fix names

* Make if condition more readable

* func_80A6B30C and fix incorrect  pointer types

* Function prototypes

* func_80A6B250

* Add header comment

* Move skin function to functions.h

* Change to stable

* Cleanup a little

* Match some more

* Work on func_80A6BE6C (won't compile yet)

* Work on func_80A6BE6C again

* Progress

* func_80A6CAFC

* Match all but one :)

* Work on func_80A6BE6C

* Work more on func_80A6BE6C

* Multiply floating point by integer lol

* Reorder assignment to almost match

* func_80A6BE6C

* Fix warning and remove unnecessary forward declarations

* Data section

* Cleanup data a bit

* More cleanup and clang format

* Clang format is a little confused

* More cleanup

* Formatting

* Revert formatting on z_bg_spot01_objects2.c

* Name unk_14C

* Add clone comment

* Name clonePos

* Name and cleanup

* Name some animation related stuff

* Remove unnecessary assignment

* Name cloneRotY

* Use ARRAY_COUNT for sAnimations

* Add more to unknown struct layout

* Use u8 for last struct member

* Use s32 for length

* Add padding disclaimer

* Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Various suggestions

* Replace 10430.378f

* Remove padding because alignment

* Move function array out of function

* Remove struct name being present twice unecessarily

* Oops forgot the s

* Don't separate static vars from others

* Some cleanup

* Use ARRAY_COUNT(sJntSphItemsInit)

* Minor cleanup

* Rename enum members

* Oops forgot to rename enum

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
Sirius902 2020-10-12 15:45:16 -07:00 • committed by GitHub
parent fff616d2be
commit 5c631e3170
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 679 additions and 2482 deletions
Download patch file Download diff file Expand all files Collapse all files

55
data/overlays/actors/z_en_horse_normal.data.s
View file

@ -1,55 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .data
.balign 16
glabel En_Horse_Normal_InitVars
.word 0x003C0100, 0x00000000, 0x00270000, 0x00000328
.word EnHorseNormal_Init
.word EnHorseNormal_Destroy
.word EnHorseNormal_Update
.word EnHorseNormal_Draw
glabel D_80A6D370
.word 0x06004580, 0x06004C20, 0x060035D4, 0x06002458, 0x060054BC, 0x06001A1C, 0x06000608, 0x06000C20, 0x060013A8
glabel D_80A6D394
.word 0x0A000039, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00280064, 0x00000000, 0x00000000
glabel D_80A6D3C0
.word 0x0A000039, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x003C0064, 0x00000000, 0x00000000
glabel D_80A6D3EC
.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x0B000000, 0x00000000, 0x00140064
glabel D_80A6D410
.word 0x0A000039, 0x10000000, 0x00000001
.word D_80A6D3EC
glabel D_80A6D420
.word 0x0A000023, 0x0064FE00
glabel D_80A6D428
.word 0x04220001, 0x01800700, 0x06750027, 0xFE830600, 0x06460001, 0xFBE80600, 0x041D0001, 0xF9AC0600, 0xFC0C0001, 0xF99F0700, 0xF9890001, 0xFC6A0600, 0xF9CE0001, 0xFF7A0600, 0xFC3F0001, 0x01930700, 0x00000008
.word D_80A6D428
glabel D_80A6D470
.word 0x00580000, 0x081E0A00, 0x09B20178, 0x12170700, 0x08B4FFE4, 0x19CD0C00, 0x028EFF9C, 0x22A00700, 0xFED7FE0C, 0x29AB0C00, 0xEB49FE5C, 0x29900A00, 0xE5E2FE0C, 0x1E500A00, 0xEB740064, 0x15230700, 0xF20BFEF3, 0x0F350A00, 0x00000009
.word D_80A6D470
glabel D_80A6D4C0
.word 0x00000000, 0x00000010
glabel D_80A6D4C8
.word 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3FC00000, 0x3FC00000, 0x3FC00000, 0x3FC00000, 0x3F800000
glabel D_80A6D4EC
.word 0xB0F804B0, 0x30FC012C
glabel D_80A6D4F4
.word 0x00000000, 0x00000001, 0x00000004, 0x00000005, 0x00000006, 0x00000002, 0x00000003
glabel D_80A6D510
.word 0x00000000, 0x00000000, 0x00000002, 0x00000002, 0x00000001, 0x00000001, 0x00000001, 0x00000003, 0x00000003
glabel D_80A6D534
.word func_80A6BC00
.word func_80A6BE6C
.word func_80A6C570
.word func_80A6C760
.word func_80A6B9D0
glabel D_80A6D548
.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000

13
data/overlays/actors/z_en_horse_normal.reloc.s
View file

@ -1,13 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .rodata
.balign 16
glabel D_80A6D600
.incbin "baserom/ovl_En_Horse_Normal", 0x23B0, 0x000002D0