EnBaba Documented (Bomb Shop Lady) (#825)

* 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

* SubS Time Paths

* Still needs dialog action functions

* Fix waypoint comments

* Review pt. 1

* Baba review

* ScheduleResult -> ScheduleOutput

* Forgot to update functions.txt oops

* Add clarifying comment to SubS_TimePathing_FillWeightArray

* format.sh

* Finish up docs

* Fix order comments

* Fix

* Change bombShopkeeper struct member to

* Fix a few merge mistakes

* Add ScheduleOutput to namefixer

* format

* Format and fix merge

* Review

* PR

* z64schedule.h

* text summary

Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
This commit is contained in:
Derek Hensley
2022-07-21 21:05:28 -07:00
committed by GitHub
parent f0e4581e22
commit cbeeeb172a
29 changed files with 704 additions and 636 deletions
+1 -1
View File
@@ -18,7 +18,7 @@
<DList Name="gBbaFeetDL" Offset="0x4180" />
<!-- Animations -->
<Animation Name="gBbaWalkingAnim" Offset="0x4910" /> <!-- Looks to be unused -->
<Animation Name="gBbaSwayAnim" Offset="0x4910" />
<Animation Name="gBbaKnockedOverAnim" Offset="0x5154" />
<Animation Name="gBbaLyingDownAnim" Offset="0x58B8" />
<Animation Name="gBbaIdleHoldingBagAnim" Offset="0x5DC4" />