summaryrefslogtreecommitdiff
path: root/assets/xml/objects
AgeCommit message (Collapse)Author
2023-10-23Anju objects (#1444)Anghelo Carvajal
* bring over the objects from the other branch * kafeis mask * use symbols * dman naming after assets * stateFlags * remaining stuff * anim array bug * Name everything in DmGm after DmAn * WEEKEVENTREG_COUPLES_MASK_CUTSCENE_FINISHED * undef * format * idk * ing * format * name animations from an4, thanks emil! * emptydl * disbelief * review * format * Update assets/xml/objects/object_mask_kerfay.xml Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-10-23object_owl (#1430)Nuss
* some naming * naming * comments * improvements * improvements
2023-10-22obj_oyu (#1436)Wimmer
* object_oyu object_oyu.xml / z_bg_goron_oyu.c updated * Hot Spring Water Update * updated comments * GoronGraveyard prefix * Update object_oyu.xml
2023-10-15object_zoraegg (#1439)Nuss
* naming * improvements * bss order
2023-10-15object_po (#1426)Nuss
* naming * typos and sLimbToBodyParts * POE_LIMB_MAX instead of 21 * typos * EnumName * prefix
2023-10-13Obj_visiblock (#1422)Wimmer
* Obj_visiblock Object for the Lens of Truth Platforms * Update assets/xml/objects/object_visiblock.xml DList update Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update assets/xml/objects/object_visiblock.xml Tex outname update Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update z_obj_visiblock.c DList name update * Revert "Update assets/xml/objects/object_visiblock.xml " This reverts commit 228d6e8914d1a9df7f996809bd876b44130ddf86. * Revert "Update assets/xml/objects/object_visiblock.xml " This reverts commit 53a8786f269e60899408946283e2e55513890486. * Update object_visiblock.xml --------- Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-10-13obj_big_fwall (#1435)Wimmer
* Big Fire Wall Big fire wall.xml / Z en encount3.c update * RingOfFire update
2023-10-11object_icicle (#1421)Nuss
* Naming * naming * naming * top comment
2023-10-10Document `object_jso` (Garo and Garo Master) (#1428)Tom Overton
* Document `object_jso` (Garo and Garo Master) * Fix TexAnim names
2023-10-09object_kinsta1_obj (#1415)Nuss
* naming * Original naming * Original naming * wrong file * Swamp Spider House Door * naming * ups * fix
2023-10-08object_ladder (#1419)Nuss
* naming * Original naming * removed comments * comments
2023-10-08object_random_obj (#1416)Nuss
* naming * Secret Shrine doors * naming * OutName
2023-10-08object_redead_obj (#1417)Nuss
* naming * comment * Out Name * The Gibdo's Well Doors * naming * typos
2023-10-08naming (#1425)Nuss
2023-10-08object_f40_switch (#1418)Nuss
* naming * naming to gStoneTowerFloorSwitch
2023-10-08Object Name Cleanup (#1427)engineer124
2023-10-07Document object_skb (#1404)Zach North
* object_skb: Limb and Anim docs * object_skb: DL and text docs * Formatting changed files * Changed names for some bones to reflect oot names * updating some names to address code review comments * Whoops, forgot to change the name of MAX * Rename EnHinkSkbAnimation in src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Changed STALCHILD_ANIM_x to STALCHILD_HINT_ANIM_x * forgot to rename both parts of a typedef enum * gStalchildSwingOnBranch missing Anim tag Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Fixed all instances of gStalchildSwingOnBranchAnim --------- Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-10-07object_comb (#1420)Nuss
* naming * OutName
2023-10-07ovl_En_Takaraya decompiled (#1409)Nuss
* EnTakaraya_Destroy * some matching * some matching * some matching * matched func_80ADF7CC * func_80ADEF74 wrong arg * data * clean up * improvements * actionFunc pointer * fake * improvements * improvements * naming for the bool * function naming * improvements * improvements * GET_PLAYER_FORM macro * macro
2023-10-07object_lightblock (#1414)Nuss
* naming * Original naming * sun block
2023-10-05object_zl1 (#1381)Nuss
* object_zl1 * formating * improvements * offset * order * offset * blobs * offset
2023-10-05Skeleton and shin name cleanup (#1413)Tom Overton
* Skeleton and shin name cleanup * Use ANI_LIMB_MAX
2023-10-04document object_kanban (cuttable sign) (#1364)MegaIDK
* initial commit of doc * comment * model and material * indeed c file exists * renamed confusing stuff * space Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> --------- Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-10-04`ovl_Bg_Dy_Yoseizo` and related docs (#1390)Anghelo Carvajal
* Add ido setting to permuter * OK * Data imported & named, change spec * Some easy naming * Cleanup * More object stuff and enums * Document EnDyExtra * Document DemoGetitem * Document DemoEffect * Some work on Elforg * Elforg params macro, some more on Elfgrp * Defines for number of fairies * Tweak some flags wording * Label beam * Elfgrp: Name most of the stray fairy handling stuff * cleanup * fix typo * GreatFairyAnimation * name animations * BgDyYoseizo_TrainPlayer * Choose behaviour? * fix merge * format * self review * WEEKEVENTREG_OBTAINED_GREAT_SPIN_ATTACK * jenkins * review * Update src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review * Update src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c * review --------- Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-10-03Add original asset names to all `object_l*` and `object_m*` files (#1403)Tom Overton
2023-09-28Document object_mk (#1389)Zach North
* Updated object_mk animation, limb, and skeleton names * Updated object_mk texture and DList names * Added comment to object_mk.xml * Remove "ing" from Anim names Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update z_en_mk.c to not use "ing" in names * Running formatter --------- Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-09-24Add original asset names to all `object_k*` files (#1388)Tom Overton
* Add original asset names to all `object_k*` files * Comment first, name second * Comment for object_ka
2023-09-24document object_ha (donkeys) (#1366)MegaIDK
* initial commit of doc * line * headerrr * forgot about renamed anims * format * horrrse * format
2023-09-24EnGe3 (Aveil) OK and documented, object_geldb documented (#1072)EllipticEllipsis
* OK * Import data * Name functions and variables * CSACTION enum * Finish code documentation, do most of object * Document object * Finish docs * Apply suggestions from code review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * More review * Format * Review * Format * fix merge * weekEventReg * PR * review * format --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: angie <angheloalf95@gmail.com>
2023-09-19Stone Tower Smoke (#1382)Nuss
* funen xml * description * outname
2023-09-14document object_fish (#1359)MegaIDK
* initial commit of object_fish documentation * spaces after offset * separate categories * extra owner * name changes * forgor the .c * format * changed name of funcit * forgor some OutName
2023-09-11Add original asset names to all `object_i*` and `object_j*` files (#1365)Tom Overton
* Add original asset names to all `object_i*` and `object_j*` files * Remove MM3D name from `object_ishi`; asset names that start with `zelda2_` almost certainly come from Grezzo.
2023-09-11document object_zov (lulu the zora vocalist) (#1357)MegaIDK
* initial commit of object_zov documentation * morphFrames and mouth name change * sAnimations array name instead of sAnimationInfo * forgor format * separate categories
2023-08-22document remaining door assets (#1351)MegaIDK
* initial commit of remaining door asset documentation * format * forgor the g removed comments * space in metal door desc Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * space in spider door dsc Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> --------- Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-08-15`En_Horse_Link_Child` and `object_horse_link_child` partially documented. ↵Isghj
(#1353) * ChildHorse: some documentation * OOT Horse: more documentation * OOT Horse: more documentation * OOT Horse: more documentation * might be busted * OOT Epona: more documents aft * OOT Epona: some object documentation, continued documentation * format * OOT Epona: requested changes * OOT Epona: minor documentation changes * what is this warning, c pls * OOT Horse: git nudge * OOT Epona: requested changes to enums * OOT Epona: Anim * Update src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * OOT Epona: change enum name * OOT Epona: Requested changes * OOT Epona: More requested changes * OOT Epona: removed incorrect padding guess --------- Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-08-15document object_mkk (#1350)MegaIDK
* initial commit of object_mkk documentation * forgot door * spaces Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> --------- Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-08-15document object_hana (graveyard flower) (#1355)MegaIDK
* initial commit object_hana documentation * explain how object is organized * change whole flower set name * a litle space Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> --------- Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-08-15document object_tsubo, object_racetsubo and object_obj_chan (#1346)MegaIDK
* initial commit of object_tsubo, object_racetsubo and object_obj_chan documentation * little description in chandelier xml * desc between root and file * changed green pot to race pot * changed race pot to magic pot * space in desc Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> --------- Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-08-14object_bal & EnBal OK and documented (#1317)Blythe
* object_bal and z_en_bal initial push * Formatting, updated named audio funcs * Cleanup, labeled some week events * trying to fix merge issues * Merge, misc cleanup * Fix buildability after merge * Fixed formatting issues * static variable name fixes * Cleanup & object item renames * Formatting * Additional name cleanup * Name & comment tidying * Updated function names referenced by EnBal
2023-08-12EnMnk OK and partially documented. handing off to the next ape enthusiast ↵gamestabled
(#1277) * EnMnk OK and partially documented. handing off to the next ape enthusiast * run format.py * fix trailing comma warning * Monkey PR Review (#1) * PR Review * a little more * oops * Reordering Monkey, anim * cleanup, typos * More PR Suggestions * namefixer * fix master * limbIndex * PR Review --------- Co-authored-by: gamestabled <gamestabled@gmail.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
2023-08-12Document object_tl (Snapper) (#1349)Tom Overton
* Document object_tl (Snapper) * Rename skelAnimes/jointTables/morphTables
2023-08-12document object_dinofos (#1343)MegaIDK
* initial commit of object_dinofos documentation * forgot to format * dinolfoslimb * eye texturs * desc position and eye tex name change * forgor the rest * removed object .h from .c #includes
2023-08-09document object_fr (#1339)MegaIDK
* initial commit of object_fr documentation * fixed unused texture height * format and slight limb name changes * froglimb * removed object .h from actor .c #includes * change eye textur * sIsInitialized * named anim enum values
2023-08-06Animation Cleanup: En_F* (#1332)engineer124
* Anim F Cleanup * minifrog * cleanup * more cleanup * cleanup fishing limb * format * spacing * PR Review
2023-07-27initial commit of rock object_ishi documentation (#1340)MegaIDK
Co-authored-by: MegaIDK <pc@DESKTOP-37QIOUU.localdomain>
2023-07-18Shopkeeper weekeventregs (#1325)Derek Hensley
* Ossan * sob1 talked * fsn weekeventregs * Curiosity shop 3rd day item to special item * Kotake * Format * Kotake bottle * PR suggestions * Koume Kiosk -> Kiosk Koume * Update include/z64save.h Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> --------- Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2023-07-18Add original asset names to all `object_h*` files (#1330)Tom Overton
* Add original asset names to all `object_h*` files * Soften language used in `object_hunsui`, because we can't say for sure that we know the names of the collision files, even if it feels pretty clear * Switch from "is" to "might be" on the DLs too
2023-07-14Animation Cleanup: En_B* Actors (#1326)engineer124
* En_B * more cleanup * another if (1) fixed * more cleanup * more cleanup * rot * PR Suggestions * fix vtx * rm more Draw * Update assets/xml/objects/object_yb.xml Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> * Update assets/xml/objects/object_bigpo.xml Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> --------- Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2023-07-14Add original asset names to all `object_g*` files (#1323)Tom Overton
2023-07-10Deku Playground Docs (#1318)Derek Hensley
* Actor shared memory * EnGameLupy * EnLiftNuts * object_dnt * PR Suggestions * Things I missed * sPad * Format * PR comments