mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-17 21:03:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

EnBaba Documented (Bomb Shop Lady) (#825)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
tools/disasm/functions.txt
+21 -21
View File
@@ -15168,27 +15168,27 @@
0x80BA7D30:("EnRailgibud_SinkIntoGround",),
0x80BA7DC8:("EnRailgibud_PerformCutsceneActions",),
0x80BA8050:("EnRailgibud_Cutscene_Update",),
0x80BA8820:("func_80BA8820",),
0x80BA886C:("func_80BA886C",),
0x80BA8C4C:("func_80BA8C4C",),
0x80BA8C90:("func_80BA8C90",),
0x80BA8D2C:("func_80BA8D2C",),
0x80BA8DF4:("func_80BA8DF4",),
0x80BA8F88:("func_80BA8F88",),
0x80BA9110:("func_80BA9110",),
0x80BA9160:("func_80BA9160",),
0x80BA93AC:("func_80BA93AC",),
0x80BA9480:("func_80BA9480",),
0x80BA9758:("func_80BA9758",),
0x80BA9848:("func_80BA9848",),
0x80BA98EC:("func_80BA98EC",),
0x80BA9AB8:("func_80BA9AB8",),
0x80BA9B24:("func_80BA9B24",),
0x80BA9B80:("func_80BA9B80",),
0x80BA9CD4:("func_80BA9CD4",),
0x80BA9E00:("func_80BA9E00",),
0x80BA9E10:("func_80BA9E10",),
0x80BA9E48:("func_80BA9E48",),
0x80BA8820:("EnBaba_FindBombShopkeeper",),
0x80BA886C:("EnBaba_HandleConversation",),
0x80BA8C4C:("EnBaba_TriggerTransition",),
0x80BA8C90:("EnBaba_UpdateCollider",),
0x80BA8D2C:("EnBaba_MoveForward",),
0x80BA8DF4:("EnBaba_UpdateModel",),
0x80BA8F88:("EnBaba_InitTimePath",),
0x80BA9110:("EnBaba_ProcessScheduleOutput",),
0x80BA9160:("EnBaba_FollowTimePath",),
0x80BA93AC:("EnBaba_HandleSchedule",),
0x80BA9480:("EnBaba_FinishInit",),
0x80BA9758:("EnBaba_Idle",),
0x80BA9848:("EnBaba_FollowSchedule_Talk",),
0x80BA98EC:("EnBaba_Talk",),
0x80BA9AB8:("EnBaba_GiveBlastMask",),
0x80BA9B24:("EnBaba_GaveBlastMask",),
0x80BA9B80:("EnBaba_FollowSchedule",),
0x80BA9CD4:("EnBaba_KnockedOver",),
0x80BA9E00:("EnBaba_DoNothing",),
0x80BA9E10:("EnBaba_Walk",),
0x80BA9E48:("EnBaba_FaceForward",),
0x80BA9E6C:("EnBaba_Init",),
0x80BA9F24:("EnBaba_Destroy",),
0x80BA9F50:("EnBaba_Update",),
tools/namefixer.py
+1
View File
@@ -597,6 +597,7 @@ wordReplace = {
"GlobalContext": "PlayState",
"globalCtx": "play",
"globalCtx2": "play2",
"ScheduleResult": "ScheduleOutput",
# Struct members
"skelAnime.unk03": "skelAnime.taper",