summaryrefslogtreecommitdiff
path: root/assets/xml/objects/object_f40_obj.xml
AgeCommit message (Collapse)Author
2023-06-02ovl_Bg_F40_Swlift OK and documented. obj_f40_obj documented. (#1171)TrulyNaN
* 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-02-28Add original asset names for all `object_e*` and `object_f*` files (#1181)Tom Overton
* Add original asset names for all `object_e*` and `object_f*` files * Add c_keyframe note to fall2
2021-12-18Initial object file xmls (#312)Tharo
* 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