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

3 Commits

Author SHA1 Message Date
TrulyNaN 0261dc0a5c
ovl_Bg_F40_Swlift OK and documented. obj_f40_obj documented. (#1171) 
* Ported ovl_Bg_F40_Swlift to most recent zeldaret/master.

* Ran formatter.

* Attempt at fixing formatter problem.

* Applied PR changes suggestions and added authors

Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
Co-authored-by: Isghj5 <isghj5@gmail.com>
Co-authored-by: Tom-Overton <tom.overton@outlook.com>
Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>

* More PR fixes. Put object_f40_obj unused descriptor as comments. Added another author.

Co-authored-by: AngheloAlf <angheloalf95@gmail.com>

* Fixed some effect of handling merge conflicts. Some early returns added and renames in object_f40_obj.xml

---------

Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
Co-authored-by: Isghj5 <isghj5@gmail.com>
Co-authored-by: Tom-Overton <tom.overton@outlook.com>
Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>
Co-authored-by: AngheloAlf <angheloalf95@gmail.com>
 2023-06-02 14:25:03 +10:00
Tom Overton c70ccf14d9
Add original asset names for all `object_e*` and `object_f*` files (#1181) 
* Add original asset names for all `object_e*` and `object_f*` files

* Add c_keyframe note to fall2
 2023-02-28 09:41:54 -05: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