SubS Time Paths (Finale) (#823)

* Merge in sub_s_models

* Update subs DL names

* Unused Weight pathing

* Function headers for weightpathing

* TimePathing WIP

* Timepathing, still unsure about unk184

* Move subs functions from functions.h to z64subs.h

* Add fake comment

* Some cleanup and renames

* Renames/cleanup of actors that use timepath

* Cleanup

* More cleanup

* Rename unk stuff

* Merge in upstream/master

* TimeElapsed -> elapsedTime

* Fix

* Final cleanup

* Fix waypoint comments

* Review pt. 1

* Add clarifying comment to SubS_TimePathing_FillWeightArray

* format.sh

* Fix order comments

* weightArray -> knots

* Review pt 1

* Review pt 2

* Update src/code/z_sub_s.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* Update src/code/z_sub_s.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
This commit is contained in:
Derek Hensley
2022-06-20 00:49:20 +01:00
committed by GitHub
co-authored by Maide Tom Overton EllipticEllipsis
parent a039a2f34a
commit d318b1f285
21 changed files with 1004 additions and 528 deletions
+9 -9
View File
@@ -2175,19 +2175,19 @@ asm/non_matchings/code/z_sub_s/SubS_DrawTransformFlex.s,SubS_DrawTransformFlex,0
asm/non_matchings/code/z_sub_s/SubS_InCsMode.s,SubS_InCsMode,0x8013AD6C,0xC
asm/non_matchings/code/z_sub_s/SubS_UpdateLimb.s,SubS_UpdateLimb,0x8013AD9C,0x4E
asm/non_matchings/code/z_sub_s/SubS_UpdateFlags.s,SubS_UpdateFlags,0x8013AED4,0xB
asm/non_matchings/code/z_sub_s/func_8013AF00.s,func_8013AF00,0x8013AF00,0x44
asm/non_matchings/code/z_sub_s/func_8013B010.s,func_8013B010,0x8013B010,0x2E
asm/non_matchings/code/z_sub_s/func_8013B0C8.s,func_8013B0C8,0x8013B0C8,0xA2
asm/non_matchings/code/z_sub_s/func_8013B350.s,func_8013B350,0x8013B350,0xD8
asm/non_matchings/code/z_sub_s/func_8013B6B0.s,func_8013B6B0,0x8013B6B0,0x72
asm/non_matchings/code/z_sub_s/func_8013B878.s,func_8013B878,0x8013B878,0xAF
asm/non_matchings/code/z_sub_s/SubS_TimePathing_FillKnots.s,SubS_TimePathing_FillKnots,0x8013AF00,0x44
asm/non_matchings/code/z_sub_s/SubS_TimePathing_ComputeProgress.s,SubS_TimePathing_ComputeProgress,0x8013B010,0x2E
asm/non_matchings/code/z_sub_s/SubS_TimePathing_ComputeWeights.s,SubS_TimePathing_ComputeWeights,0x8013B0C8,0xA2
asm/non_matchings/code/z_sub_s/SubS_TimePathing_ComputeTargetPosXZ.s,SubS_TimePathing_ComputeTargetPosXZ,0x8013B350,0xD8
asm/non_matchings/code/z_sub_s/SubS_TimePathing_Update.s,SubS_TimePathing_Update,0x8013B6B0,0x72
asm/non_matchings/code/z_sub_s/SubS_TimePathing_ComputeInitialY.s,SubS_TimePathing_ComputeInitialY,0x8013B878,0xAF
asm/non_matchings/code/z_sub_s/SubS_GetAdditionalPath.s,SubS_GetAdditionalPath,0x8013BB34,0x12
asm/non_matchings/code/z_sub_s/SubS_FindNearestActor.s,SubS_FindNearestActor,0x8013BB7C,0x3C
asm/non_matchings/code/z_sub_s/SubS_ChangeAnimationByInfoS.s,SubS_ChangeAnimationByInfoS,0x8013BC6C,0x35
asm/non_matchings/code/z_sub_s/SubS_HasReachedPoint.s,SubS_HasReachedPoint,0x8013BD40,0x67
asm/non_matchings/code/z_sub_s/SubS_GetDayDependentPath.s,SubS_GetDayDependentPath,0x8013BEDC,0x63
asm/non_matchings/code/z_sub_s/func_8013C068.s,func_8013C068,0x8013C068,0x16F
asm/non_matchings/code/z_sub_s/func_8013C624.s,func_8013C624,0x8013C624,0xA5
asm/non_matchings/code/z_sub_s/SubS_WeightPathing_ComputePoint.s,SubS_WeightPathing_ComputePoint,0x8013C068,0x16F
asm/non_matchings/code/z_sub_s/SubS_WeightPathing_Move.s,SubS_WeightPathing_Move,0x8013C624,0xA5
asm/non_matchings/code/z_sub_s/SubS_CopyPointFromPathCheckBounds.s,SubS_CopyPointFromPathCheckBounds,0x8013C8B8,0x2B
asm/non_matchings/code/z_sub_s/func_8013C964.s,func_8013C964,0x8013C964,0xB2
asm/non_matchings/code/z_sub_s/SubS_FillShadowTex.s,SubS_FillShadowTex,0x8013CC2C,0x4E
@@ -2207,7 +2207,7 @@ asm/non_matchings/code/z_sub_s/SubS_FindActor.s,SubS_FindActor,0x8013D960,0x1A
asm/non_matchings/code/z_sub_s/SubS_FillLimbRotTables.s,SubS_FillLimbRotTables,0x8013D9C8,0x72
asm/non_matchings/code/z_sub_s/SubS_IsFloorAbove.s,SubS_IsFloorAbove,0x8013DB90,0x2C
asm/non_matchings/code/z_sub_s/SubS_CopyPointFromPathList.s,SubS_CopyPointFromPathList,0x8013DC40,0x23
asm/non_matchings/code/z_sub_s/SubS_GetPathCount.s,SubS_GetPathCount,0x8013DCCC,0x5
asm/non_matchings/code/z_sub_s/SubS_GetPathCountFromPathList.s,SubS_GetPathCountFromPathList,0x8013DCCC,0x5
asm/non_matchings/code/z_sub_s/SubS_ActorPathing_Init.s,SubS_ActorPathing_Init,0x8013DCE0,0x49
asm/non_matchings/code/z_sub_s/SubS_ActorPathing_Update.s,SubS_ActorPathing_Update,0x8013DE04,0x4E
asm/non_matchings/code/z_sub_s/SubS_ActorPathing_ComputePointInfo.s,SubS_ActorPathing_ComputePointInfo,0x8013DF3C,0x46
1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
2175 asm/non_matchings/code/z_sub_s/SubS_InCsMode.s SubS_InCsMode 0x8013AD6C 0xC
2176 asm/non_matchings/code/z_sub_s/SubS_UpdateLimb.s SubS_UpdateLimb 0x8013AD9C 0x4E
2177 asm/non_matchings/code/z_sub_s/SubS_UpdateFlags.s SubS_UpdateFlags 0x8013AED4 0xB
2178 asm/non_matchings/code/z_sub_s/func_8013AF00.s asm/non_matchings/code/z_sub_s/SubS_TimePathing_FillKnots.s func_8013AF00 SubS_TimePathing_FillKnots 0x8013AF00 0x44
2179 asm/non_matchings/code/z_sub_s/func_8013B010.s asm/non_matchings/code/z_sub_s/SubS_TimePathing_ComputeProgress.s func_8013B010 SubS_TimePathing_ComputeProgress 0x8013B010 0x2E
2180 asm/non_matchings/code/z_sub_s/func_8013B0C8.s asm/non_matchings/code/z_sub_s/SubS_TimePathing_ComputeWeights.s func_8013B0C8 SubS_TimePathing_ComputeWeights 0x8013B0C8 0xA2
2181 asm/non_matchings/code/z_sub_s/func_8013B350.s asm/non_matchings/code/z_sub_s/SubS_TimePathing_ComputeTargetPosXZ.s func_8013B350 SubS_TimePathing_ComputeTargetPosXZ 0x8013B350 0xD8
2182 asm/non_matchings/code/z_sub_s/func_8013B6B0.s asm/non_matchings/code/z_sub_s/SubS_TimePathing_Update.s func_8013B6B0 SubS_TimePathing_Update 0x8013B6B0 0x72
2183 asm/non_matchings/code/z_sub_s/func_8013B878.s asm/non_matchings/code/z_sub_s/SubS_TimePathing_ComputeInitialY.s func_8013B878 SubS_TimePathing_ComputeInitialY 0x8013B878 0xAF
2184 asm/non_matchings/code/z_sub_s/SubS_GetAdditionalPath.s SubS_GetAdditionalPath 0x8013BB34 0x12
2185 asm/non_matchings/code/z_sub_s/SubS_FindNearestActor.s SubS_FindNearestActor 0x8013BB7C 0x3C
2186 asm/non_matchings/code/z_sub_s/SubS_ChangeAnimationByInfoS.s SubS_ChangeAnimationByInfoS 0x8013BC6C 0x35
2187 asm/non_matchings/code/z_sub_s/SubS_HasReachedPoint.s SubS_HasReachedPoint 0x8013BD40 0x67
2188 asm/non_matchings/code/z_sub_s/SubS_GetDayDependentPath.s SubS_GetDayDependentPath 0x8013BEDC 0x63
2189 asm/non_matchings/code/z_sub_s/func_8013C068.s asm/non_matchings/code/z_sub_s/SubS_WeightPathing_ComputePoint.s func_8013C068 SubS_WeightPathing_ComputePoint 0x8013C068 0x16F
2190 asm/non_matchings/code/z_sub_s/func_8013C624.s asm/non_matchings/code/z_sub_s/SubS_WeightPathing_Move.s func_8013C624 SubS_WeightPathing_Move 0x8013C624 0xA5
2191 asm/non_matchings/code/z_sub_s/SubS_CopyPointFromPathCheckBounds.s SubS_CopyPointFromPathCheckBounds 0x8013C8B8 0x2B
2192 asm/non_matchings/code/z_sub_s/func_8013C964.s func_8013C964 0x8013C964 0xB2
2193 asm/non_matchings/code/z_sub_s/SubS_FillShadowTex.s SubS_FillShadowTex 0x8013CC2C 0x4E
2207 asm/non_matchings/code/z_sub_s/SubS_FillLimbRotTables.s SubS_FillLimbRotTables 0x8013D9C8 0x72
2208 asm/non_matchings/code/z_sub_s/SubS_IsFloorAbove.s SubS_IsFloorAbove 0x8013DB90 0x2C
2209 asm/non_matchings/code/z_sub_s/SubS_CopyPointFromPathList.s SubS_CopyPointFromPathList 0x8013DC40 0x23
2210 asm/non_matchings/code/z_sub_s/SubS_GetPathCount.s asm/non_matchings/code/z_sub_s/SubS_GetPathCountFromPathList.s SubS_GetPathCount SubS_GetPathCountFromPathList 0x8013DCCC 0x5
2211 asm/non_matchings/code/z_sub_s/SubS_ActorPathing_Init.s SubS_ActorPathing_Init 0x8013DCE0 0x49
2212 asm/non_matchings/code/z_sub_s/SubS_ActorPathing_Update.s SubS_ActorPathing_Update 0x8013DE04 0x4E
2213 asm/non_matchings/code/z_sub_s/SubS_ActorPathing_ComputePointInfo.s SubS_ActorPathing_ComputePointInfo 0x8013DF3C 0x46