z_horse.c OK (#1245)

* func_800F3940

* func_800F3B2C, func_800F415C and func_800F41E4

* func_800F40A0

* func_800F3ED4

* func_800F3C44

* func_800F3B68 NON_MATCHING

* func_800F3A64 kinda

* func_800F39B4

* cleanups

* import data

* fix fake match

* format

* Scene enum

* minor cleanup on data usage

* Horse_RotateToPoint and ENHORSE_PARAMS

* scene setup index

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* fix merge

* z64horse.h

* Renames

* and even more renames

* format

* fix

* review

* Horse_IsActive

* review

* bss

* fix

* remove comments

* Update src/code/z_horse.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* review

* Update src/code/z_horse.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* review

---------

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
This commit is contained in:
Anghelo Carvajal
2023-06-01 15:11:11 -04:00
committed by GitHub
parent 64959177d9
commit eb24680be3
22 changed files with 341 additions and 129 deletions
+11 -11
View File
@@ -257,7 +257,7 @@ asm/non_matchings/code/z_actor/func_800B715C.s,func_800B715C,0x800B715C,0x5
asm/non_matchings/code/z_actor/Actor_SetCameraHorseSetting.s,Actor_SetCameraHorseSetting,0x800B7170,0x1B
asm/non_matchings/code/z_actor/Actor_MountHorse.s,Actor_MountHorse,0x800B71DC,0x9
asm/non_matchings/code/z_actor/func_800B7200.s,func_800B7200,0x800B7200,0xB
asm/non_matchings/code/z_actor/func_800B722C.s,func_800B722C,0x800B722C,0x8
asm/non_matchings/code/z_actor/Actor_SpawnHorse.s,Actor_SpawnHorse,0x800B722C,0x8
asm/non_matchings/code/z_actor/func_800B724C.s,func_800B724C,0x800B724C,0x13
asm/non_matchings/code/z_actor/func_800B7298.s,func_800B7298,0x800B7298,0x12
asm/non_matchings/code/z_actor/func_800B72E0.s,func_800B72E0,0x800B72E0,0x6
@@ -1197,16 +1197,16 @@ asm/non_matchings/code/z_fireobj/FireObj_Init.s,FireObj_Init,0x800F36CC,0x39
asm/non_matchings/code/z_fireobj/FireObj_Fini.s,FireObj_Fini,0x800F37B0,0x10
asm/non_matchings/code/z_fireobj/FireObj_SetState2.s,FireObj_SetState2,0x800F37F0,0xC
asm/non_matchings/code/z_fireobj/FireObj_Update.s,FireObj_Update,0x800F3820,0x48
asm/non_matchings/code/z_horse/func_800F3940.s,func_800F3940,0x800F3940,0x1D
asm/non_matchings/code/z_horse/func_800F39B4.s,func_800F39B4,0x800F39B4,0x2C
asm/non_matchings/code/z_horse/func_800F3A64.s,func_800F3A64,0x800F3A64,0x32
asm/non_matchings/code/z_horse/func_800F3B2C.s,func_800F3B2C,0x800F3B2C,0xF
asm/non_matchings/code/z_horse/func_800F3B68.s,func_800F3B68,0x800F3B68,0x37
asm/non_matchings/code/z_horse/func_800F3C44.s,func_800F3C44,0x800F3C44,0xA4
asm/non_matchings/code/z_horse/func_800F3ED4.s,func_800F3ED4,0x800F3ED4,0x73
asm/non_matchings/code/z_horse/func_800F40A0.s,func_800F40A0,0x800F40A0,0x2F
asm/non_matchings/code/z_horse/func_800F415C.s,func_800F415C,0x800F415C,0x22
asm/non_matchings/code/z_horse/func_800F41E4.s,func_800F41E4,0x800F41E4,0x2F
asm/non_matchings/code/z_horse/Horse_GetJumpingFencePathIndex.s,Horse_GetJumpingFencePathIndex,0x800F3940,0x1D
asm/non_matchings/code/z_horse/Horse_CopyPointFromPathList.s,Horse_CopyPointFromPathList,0x800F39B4,0x2C
asm/non_matchings/code/z_horse/Horse_IsValidSpawn.s,Horse_IsValidSpawn,0x800F3A64,0x32
asm/non_matchings/code/z_horse/Horse_ResetHorseData.s,Horse_ResetHorseData,0x800F3B2C,0xF
asm/non_matchings/code/z_horse/Horse_IsValidSceneLayer.s,Horse_IsValidSceneLayer,0x800F3B68,0x37
asm/non_matchings/code/z_horse/Horse_SpawnOverworld.s,Horse_SpawnOverworld,0x800F3C44,0xA4
asm/non_matchings/code/z_horse/Horse_SpawnMinigame.s,Horse_SpawnMinigame,0x800F3ED4,0x73
asm/non_matchings/code/z_horse/Horse_Spawn.s,Horse_Spawn,0x800F40A0,0x2F
asm/non_matchings/code/z_horse/Horse_RotateToPoint.s,Horse_RotateToPoint,0x800F415C,0x22
asm/non_matchings/code/z_horse/Horse_IsActive.s,Horse_IsActive,0x800F41E4,0x2F
asm/non_matchings/code/z_jpeg/Jpeg_ScheduleDecoderTask.s,Jpeg_ScheduleDecoderTask,0x800F42A0,0x47
asm/non_matchings/code/z_jpeg/Jpeg_CopyToZbuffer.s,Jpeg_CopyToZbuffer,0x800F43BC,0x4E
asm/non_matchings/code/z_jpeg/Jpeg_GetUnalignedU16.s,Jpeg_GetUnalignedU16,0x800F44F4,0x13
1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
257 asm/non_matchings/code/z_actor/Actor_SetCameraHorseSetting.s Actor_SetCameraHorseSetting 0x800B7170 0x1B
258 asm/non_matchings/code/z_actor/Actor_MountHorse.s Actor_MountHorse 0x800B71DC 0x9
259 asm/non_matchings/code/z_actor/func_800B7200.s func_800B7200 0x800B7200 0xB
260 asm/non_matchings/code/z_actor/func_800B722C.s asm/non_matchings/code/z_actor/Actor_SpawnHorse.s func_800B722C Actor_SpawnHorse 0x800B722C 0x8
261 asm/non_matchings/code/z_actor/func_800B724C.s func_800B724C 0x800B724C 0x13
262 asm/non_matchings/code/z_actor/func_800B7298.s func_800B7298 0x800B7298 0x12
263 asm/non_matchings/code/z_actor/func_800B72E0.s func_800B72E0 0x800B72E0 0x6
1197 asm/non_matchings/code/z_fireobj/FireObj_Fini.s FireObj_Fini 0x800F37B0 0x10
1198 asm/non_matchings/code/z_fireobj/FireObj_SetState2.s FireObj_SetState2 0x800F37F0 0xC
1199 asm/non_matchings/code/z_fireobj/FireObj_Update.s FireObj_Update 0x800F3820 0x48
1200 asm/non_matchings/code/z_horse/func_800F3940.s asm/non_matchings/code/z_horse/Horse_GetJumpingFencePathIndex.s func_800F3940 Horse_GetJumpingFencePathIndex 0x800F3940 0x1D
1201 asm/non_matchings/code/z_horse/func_800F39B4.s asm/non_matchings/code/z_horse/Horse_CopyPointFromPathList.s func_800F39B4 Horse_CopyPointFromPathList 0x800F39B4 0x2C
1202 asm/non_matchings/code/z_horse/func_800F3A64.s asm/non_matchings/code/z_horse/Horse_IsValidSpawn.s func_800F3A64 Horse_IsValidSpawn 0x800F3A64 0x32
1203 asm/non_matchings/code/z_horse/func_800F3B2C.s asm/non_matchings/code/z_horse/Horse_ResetHorseData.s func_800F3B2C Horse_ResetHorseData 0x800F3B2C 0xF
1204 asm/non_matchings/code/z_horse/func_800F3B68.s asm/non_matchings/code/z_horse/Horse_IsValidSceneLayer.s func_800F3B68 Horse_IsValidSceneLayer 0x800F3B68 0x37
1205 asm/non_matchings/code/z_horse/func_800F3C44.s asm/non_matchings/code/z_horse/Horse_SpawnOverworld.s func_800F3C44 Horse_SpawnOverworld 0x800F3C44 0xA4
1206 asm/non_matchings/code/z_horse/func_800F3ED4.s asm/non_matchings/code/z_horse/Horse_SpawnMinigame.s func_800F3ED4 Horse_SpawnMinigame 0x800F3ED4 0x73
1207 asm/non_matchings/code/z_horse/func_800F40A0.s asm/non_matchings/code/z_horse/Horse_Spawn.s func_800F40A0 Horse_Spawn 0x800F40A0 0x2F
1208 asm/non_matchings/code/z_horse/func_800F415C.s asm/non_matchings/code/z_horse/Horse_RotateToPoint.s func_800F415C Horse_RotateToPoint 0x800F415C 0x22
1209 asm/non_matchings/code/z_horse/func_800F41E4.s asm/non_matchings/code/z_horse/Horse_IsActive.s func_800F41E4 Horse_IsActive 0x800F41E4 0x2F
1210 asm/non_matchings/code/z_jpeg/Jpeg_ScheduleDecoderTask.s Jpeg_ScheduleDecoderTask 0x800F42A0 0x47
1211 asm/non_matchings/code/z_jpeg/Jpeg_CopyToZbuffer.s Jpeg_CopyToZbuffer 0x800F43BC 0x4E
1212 asm/non_matchings/code/z_jpeg/Jpeg_GetUnalignedU16.s Jpeg_GetUnalignedU16 0x800F44F4 0x13