falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,144 Commits 1 Branch 0 Tags 313 MiB
Commit Graph

3 Commits

Author SHA1 Message Date
Derek Hensley cbeeeb172a
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>
 2022-07-22 05:05:28 +01:00
Derek Hensley f67ecbc3c2
EnBba01 Ok and Documented (#667) 
* Decomp Bba_01

* Doc bba01

* Document object_bba

* Remove new line

* Cleanup/rename EnHy to help differentiate it from overlays

* Adjust xml comment

* PR suggestions

* English is hard

* English is hard 2

* Add note about invalid textIds

* typo

* Fix merge

* Remove 0 defines
 2022-02-19 23:27:15 +00:00
Tharo d62fb2b689
Initial object file xmls (#312) 
* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "3c00dcb3"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "3c00dcb3"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* Object xmls

* Fix bss reordering

* Setup has warnings now

* Fix object_gi_reserve01 dlist names

* rm xml -> c make rule

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "ba947126"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "ba947126"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* SPBranchList related warnings gone

* Remove some mis-detected animations

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "405fc13e"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "405fc13e"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* scene related setup warning gone

* Fix

* Newlines
 2021-12-18 14:37:05 -05:00