summaryrefslogtreecommitdiff
path: root/assets/xml/objects
AgeCommit message (Collapse)Author
2026-07-18Document `BgIknvDoukutu` (#1867)Jordan Longstaff
2026-04-19`EnPr2` Skullfish documented (#1830)Isghj
* Pr2: some docs, first struct pass * Pr2: Most functions named * Pr2: more docs * Pr2: object documented * Pr2: object documented * Pr2: format * Pr2: more docs, format * Pr2: requested changes * Pr2: requested changes * Pr2: forgot prz used the object too * Pr2: more skelton limb enum changes * Pr2: removed old comment
2026-04-09Use <Limb LimbType=> not <Limb Type=> in gkeep and object_link_child (#1859)Dragorn421
2026-04-09Document `BgAstrBombwall` (#1865)Jordan Longstaff
2026-04-08Document `EnKendoJs` (#1838)Jordan Longstaff
* Document `EnKendoJs` * Fix typedefs * Fix isSlashingLog reference * Found out what that unused animation was * Rename animation constants * Rename WEEKEVENTREG flag * Remove trailing whitespaces * Fix uses of isSlashingLog * Rename Skel object * Deciphered FF part of params * Dismantle message enum * Remove mask message macro * Refactor message start macro * Rename text ID arrays * Use boolean values for isRetracting * Remove statement added by faulty merge * Rename message handler functions * Minigame round union for clarity
2026-02-18Bombers Part 1: Rename (used) assets (#1847)Jordan Longstaff
* Bombers Part 1: Rename (used) assets * Fix duplicate definition * Suggested renames
2025-12-15Document `EnMaruta` (#1839)Jordan Longstaff
* Document `EnMaruta` * Document type from params * Rename display lists properly * Format * Add ASCII picture to explain DL array * Use boolean values for isRetracting * Shorten name of zero vector * Rename to gPracticeLogWholeDL Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * Forgot to rename the other reference * Rename to SetupRiseThroughFloor * Add comments marking "on floor setup" as theory-only --------- Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2025-12-06`EnPoComposer` and `object_po_composer` further documented (#1833)Isghj
* PoComposer: some docs * PoComposer: the rest of the object documented * PoComposer: docs tweaked * PoComposer: missing weekevent reg in a schedule file wasnt found by rename script * PoComposer: document tweaks * PoComposer: forgot the texture name
2025-11-14`EnFz` and `object_fz`: Freezard documented (#1828)Isghj
* Freezard: some docs * Freezard: more docs * Freezard: most function names * Freezard: last function named * Freeza: more docs * Freezard: oops wrong actor name * Fz: more docs * Fz: more docs * Fz: Object named * Fz: Object named * Fz: changed my mind, function names changed to reflect old OOT behavior not seen in this game, in case someone confuses them * Freezer: docs * Free: more docs * F: format * Fz: more docs * Fz: format * EnFz: more docs, format * Fz: More minor docs * Fz: more docs, format * Apply suggestions from code review Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * EnFz: More requested changes * Fz: updated function declarations * EnFz: one of the flags was still 0 * Fz: updated functions.txt for disasm * Apply suggestions from code review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> --------- Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2025-06-03Document Player's Face and z_actor FaceChange functions (#1777)engineer124
* player face docs * more docs * cleanup * toto * more comments * fix bss, names * better comment * PR, fix comment * fix bss * sEyeTextures comment * FaceChange_UpdateBlinkingNonHuman --------- Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2025-02-26`En_Kaizoku` and `object_kz` documented: the pirate fighter miniboss (#1788)Isghj
* Kaizoku: some docs * Kaizoku: more docs * Kaizoku: more docs * Kaizoku: all object labeled * Kaizoku: more docs * More docs * Kaizoku: more docs * Kaizoku: more docs * Kaizoku: more docs * Kaizoku: first pass complete * format * Kaizoku: minor tweaks * Kaizoku: Anghelos requested changes pass1 * Kaizoku: minor docs * Kaizoku: get'n't * Kaizoku: format * Apply suggestions from code review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Kaizoku: back to OK * Kaizoku: more requested changes * Kaizoku: outfit and lipstick color enums * Kaizoku: rename object assets from gKaizoku to gFighterPirate * Kaizoku: LIMB_FULL * Kaizoku: some requested changes * Kaizoku: more requested changes * Apply suggestions from code review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Kaizoku: back to matching * Kaizoku: requested changes * Kaizoku: missed change * Apply suggestions from code review Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * Kaizoku: back to matching and more requested changes --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2025-02-21`EnIshi` documentation pass, and `gameplay_field_keep` assets labeled (#1794)Isghj
* Ishi: some docs * Ishi: more docs * Ishi: more docs * Ishi: field_keep assets labeled * Ishi: format * Ishi: minor docs/fixes * Ishi: requested changes * Spawn and Dust Funcs * Ishi: only us version * Ishi/Bombiwa: more requested changes * Ishi: format * Apply suggestions from code review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Ishi: back to matching * Ishi: a value got inverted somehow --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2025-01-20Document original player animation names in `gameplay_keep` (#1786)Tom Overton
2024-12-22Add original asset names to `gameplay_field_keep` and ↵Tom Overton
`gameplay_dangeon_keep` (#1772)
2024-12-19Add missing ExternalFile tags to object_dmask and object_osn (#1770)Tharo
2024-12-17Add original asset names to all `object_y*` and `object_z*` files (#1765)Tom Overton
2024-12-15Add original asset names to all `object_u*`, `object_v*`, and `object_w*` ↵Tom Overton
files (#1761)
2024-12-10Boss07 (Majora) OK and documented [mm-n64-us.z64 OK] (#1753)Tom Overton
* more matches * more functions * merge, I hope * wrath done-ish * 5 nonmatchings * more matchings * more improvements * more stuff * stuff * docs part 1 / infinity * more docs * . * more adjustments * linked assets * Document object_boss07 and match Boss07_Incarnation_Intro (thanks Synray!) * more stuff * play part 2 * lol merge * update * unk types * SWEET GOOGLY MOOGLY IT MATCHES * cam fixes * adjust damage stuff * if? * stuff * signs * macro stuff. clean up later * names * Some small cleanup * cleanup and docs * more cleanup * Wrath shadow docs * Use `EVENTINF_INTRO_CS_WATCHED_MAJORA` after merging * Update functions.txt * Types cleanup * Some low hanging fruit * Undefined_syms.txt * More static -> battle handler * Lots of naming cleanup * Remove z_boss_07_dmgtbl.inc The reasoning behind removing this file is simple; it wasn't all that long, so extracting it out to an included file didn't really add much, and it made refactoring and/or things much harder, since you needed to check in multiple places to change things. * Get most of the limb stuff named (and actually update the spec) * Some minor cleanup * Updating the repo with what we talked about in discord * Some syncing with Odolwa and other misc name stuff * Some Odolwa/Bio Baba sync * Another bit of Odolwa/Bio Baba sync * Name a lot of incarnation limb variables * Finalize the incarnation intro variable stuff * Fix a goof * `incarnationWrathTransition` variables * `generalCollider` and always use "tentacle" * Completely remove "shot," always use "projectile" * Clean up `Boss07_Mask_Draw` * Name `maskShakeTimer` * Give better names to a few more things * Some beam-related struct vars * undefined_syms * More beam names * More beam stuff * Beam, pt 100000 * Some intro struct members * Some timers * More non-beam stuff, back to beam * Done with beam finally * All but one of the subcam variables, some other stuff * Some variable names and cleanup * More cleanup * jumpSfxTimer -> landSfxTimer * actionState -> subAction and a little bit of syncing with Odolwa * A couple more variables sync * Buncha variables * Lots of non-whip variables * Commit what I have before starting on some of the grab stuff * All but one struct var done * Lots of header cleanup * Finish the header file * Fix build after merging main * Damage effect enums * Update damage effect enums for Incarnation and Wrath * Update damage effect enums for Mask and Remains * First pass at top damage effects * Do a few sub action enums so I have something to show * Fix the damage effect enums, clean up a lot of subaction enums * All remaining sub action enums, cleanup damage effect enums, other misc cleanup * Finish enums * Finish data * Push up what I have * Consistency * scroll -> texScroll * low hanging fruit * PR + small fix * Happy with >20% of functions * Happy with >40% of functions * Happy with >60% of functions * Happy with >75% of functions * Happy with >90% of functions * Happy with >95% of functions * Happy with `Boss07_Wrath_DeathCutscene` * Happy with `Boss07_Mask_FireBeam` * Happy with `Boss07_Wrath_CheckWhipCollisions` * Happy with everything but `Boss07_Mask_Draw` * Happy with all functions I think? * Clean up forward declarations * Write a half-decent file header * Fix after merging * Fix some minor stuff here and there * Minor fix in the file header because I forgot I renamed this * Respond to engineer's review * Respond to Anghelo's review * Replace as many actor lookups with for-loops as I can in Odolwa/Majora * Change the comment about the hookshot from a `@note` to a `@bug` * `drag` -> `deceleration` * Extra scopes for the matrix stuff in `Boss07_Mask_DrawBeam` * Use decimal numbers in the various `FillShadowTex` functions --------- Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: petrie911 <pmontag@Monday.localdomain> Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu> Co-authored-by: petrie911 <petrie911@users.noreply.github.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
2024-10-15Player Docs: FocusActor and Lock-On Cleanup (#1711)engineer124
* focus actor docs * small cleanup * brackets * remaining lock-on docs * more cleanup/docs * more reticle docs * oops
2024-07-28Misc Cleanup (#1665)Derek Hensley
* prefix in-function static data in z_scene_proc with s prefix in-function static data in z_eff_blure with s prefix in-function static data in Graph_TaskSet00 with s prefix in-function static data in Fault_SetOptions with s * Use uintptr_t in main * hardware_regs.ld * Remove some unessary blob comments * object_link_child_TLUT_00DA80 * object_kz texture and tlut * initialize typos
2024-07-28Extract Keyframe Assets data (#1664)Derek Hensley
* git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "c31c5e9fe" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "c31c5e9fe" git-subrepo: version: "0.4.6" origin: "git@github.com:ingydotnet/git-subrepo.git" commit: "110b9eb" * extract keyframe data * initialize typo
2024-07-24ovl_En_Knight OK (#1659)Tharo
* En_Knight matching * Cleanup * Fix * Documentation Pass * Suggested changes. Use IGOS_LIMB_* whenever it's guaranteed that the skeleton is gIgosSkel, still using KNIGHT_LIMB_* whenever it's ambiguous * Remove related undefined syms * More suggested changes * BODYPART_NONE and bodypart enum * Suggested changes * Braces Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * csCamId Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * Various suggestions * EnKnight_UpdateLimbCollider -> EnKnight_SetColliderSphere * Yase/Debu -> Thin/Wide * csCam -> subCam * Format * Fix * animTranslation -> animMovement, dmgEffect -> drawDmgEff * More brackets Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> --------- Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2024-07-14Document object_bob (#1656)Derek Hensley
* Document object_bob * Better prefix for object_cne * object_bba better prefix
2024-07-11More General Cleanup (#1658)Derek Hensley
* gDs2nEyeTexAnim * sEnMm2EmptyDL * object_um_Matanimheader_007D10 * object_mnk_Matanimheader_019A20 * gTurtleEmpty2TexAnim * object_iknv_obj_Matanimheader_0113E0 * object_botihasira_Matanimheader_001A48 * gTwinmoldEmptyTexAnim * gBeaverYoungerBrotherEmptyTexAnim * gNwcEyeTexAnim * gTwinmoldEmptyTex1Anim gTwinmoldEmpty2TexAnim * gGyorgEmpty1TexAnim gGyorgEmpty2TexAnim * gBurlyGuyEmpty1TexAnim gBurlyGuyEmpty2TexAnim * gKotakeEyeTexAnim * gDmZl4EmptyTexAnim * object_cs_Matanimheader_00F6D4 * gAnju1UnusedTexAnim * Empty blobs * EnKusa_IsUnderwater * IsUnderwater functions * s on static variable names in col check * scene_texture_01_Tex_002D40 * object_ds2_Tex_0030D8 object_ds2_Tex_0034D8 object_ds2_Tex_0038D8 * object_gk * undefined_syms * object_fall2_Matanimheader_005CF0 * gTwinmoldEmpty1TexAnim typo
2024-07-09Add original asset names to all `object_t*` files (#1657)Tom Overton
2024-06-20ovl_En_Death and ovl_En_Minideath (#1645)Tharo
* En_Death new build system edition * Fix merge * Matched * Fix merge * Some names * Suggested changes * Further suggested changes * Add value comments to MinideathAction
2024-06-20z_map decompiled (#1032)mzxrules
* First batch of functions * more ok * z_map_data OK * More OKs, MinimapList ZAPD breaking change * func_80103A58 improvements, more OK * func_80106D5C and func_801091F0 decomped * func_801031D0 decomped and some fixes * house cleaning, more OKs more decomp * Even more OKs * func_80105C40 almost OK, more OKs * func_80108AF8 OK and more * All functions attempted * func_8010534C OK * Start documentation, rename DoorCtx * More OKs, split map_data.data, more doc * incremental clean-up, more function names * more function names * func_801068FC OK * old uncommitted changes * minor tweaks * implement easy fixes * more fixes * z_map_disp OK, implement more suggestions * delete utility program * migrate data * TransiActor ->TransitionActor * Major documentation pass * first pass of changes * warning fix attempt, revert ZFile.cpp * Fix FAKE match * Easy fixes * implement gDPLoadTextureBlock_Runtime * z_demo bss patch * Extract white square texture * Implement more suggestions * rework MapIndex/DungeonIndex * revert dungeonSceneIndex -> mapIndex in some spots, implement suggestions * more suggestions * minor nits * fix #include
2024-06-11obj_tab (#1495)Wimmer
* obj_tab * obj_tab update removed (actorfunc) and moved the LIMB enum * object_tab update * PR Review --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-06-05obj_b_heart documentation continuation (#1642)Parker
* obj_b_heart Unused Heart Piece object * Update object_b_heart.xml * fixing name --------- Co-authored-by: Wimmer <71473855+Wimmerrad@users.noreply.github.com>
2024-05-19ovl_En_Wdhand (#1629)Tharo
* 2 non-matching * Matching Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Cleanup + docs * Suggested changes * Format * Update EnWdhand_GetInitVelocity --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-05-17c_keyframe.c decompiled and documented (#1630)Tharo
* 2 non-matching * 1 function left Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Fully matching Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Documented, has bss reordering issues * Fixes * Apply suggestions * Format * Re-add cast oops * Remove != 0 for override and transform limb draws, format --------- Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-04-29Add original asset names to all `object_s*` files (#1619)Tom Overton
2024-04-22`ovl_En_Door` docs pass (#1603)Anghelo Carvajal
* DoorScheduleResult * actionVar * DOOR_DL_ * enums * ENDOOR_TYPE_SCHEDULE and related stuff * Name some functions and start figuring out stuff * defines * start documenting schedules * Name Inn doors * More door schedule naming * ajar * Name remaining schedule types * parameters diagram and some cleanups * Name renaiming types * format * rename some schedules * Use more static_assert * name anims * yeet unrelated stuff * requestOpen * Yeet DoorScheduleResult * whoops * stuff i missed * Update src/overlays/actors/ovl_En_Door/scheduleScripts.schl Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_En_Door/z_en_door.h Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_En_Door/z_en_door.h Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review * Update src/overlays/actors/ovl_En_Pm/z_en_pm.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/code/z_sub_s.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review * FindScheduleDoor --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-04-06Mayor Dotour (ovl_en_dt) OK and documented (#1607)Jeff Padgham
* EnDt deecomp first pass, two nonmatching * Some cleanup, got the big boy matching * Some light cleanup, documenting blinking behaviour * Fixed last non-matching with some permuter silliness * Decompilation complete * Mayor documentation, first pass * Updating some unknown vars in baisen * Added an enum for mayor's cutscene state * Formatting pass for mayor * Cleaning up unk var in mayor meeting method * Some cleanup and changes based on PR feedback * Another cleanup and fix pass based on PR feedback * Updated mayor event flags according to their usage * All the parentheses * Another round of PR feedback cleanup * Having another crack at naming/cleanup based on PR feedback * Renaming animation symbols * Fixing broken references in other actors from anim rename --------- Co-authored-by: GinNoOokami <noreply>
2024-02-07ovl_En_Kitan (#1535)Tharo
* Decompiled * Documented * Suggested changes, mention that on debug there is an assert(false) in EnKitan_GetQuestionMessageId * Format * Update
2023-11-28Add original asset names to all `object_p*` and `object_r*` files (#1519)Tom Overton
* Add original asset names to all `object_p*` and `object_r*` files * Respond to review
2023-11-27`z_en_test7.c` Documentation Pass (#1497)engineer124
* copy over docs * more docs * some docs * more docs * small cleanup * more small cleanup * more small cleanup * lerp time * small reordering * feather type * general owl warp docs * more cleanup * rm redundant info * PR Review * PR Review
2023-11-22Animation Cleanup: En_P* (#1507)engineer124
* anim P cleanup * PR Review * PR Review * Postbox Idle
2023-11-21Fix most hardcoded pointers in extracted assets (#1477)Anghelo Carvajal
2023-11-10Decompile ovl_En_Po_Composer (#1391)Tharo
* Decompiled, mostly named * Few more labels and document object * Review changes * Further review changes * Improve EnPoComposer_UpdateEnvColor * PO_COMPOSER -> POE_COMPOSER, tweak animation names * More changes * OCARINA_MODE_EVENT * fix merge --------- Co-authored-by: angie <angheloalf95@gmail.com>
2023-11-01Add original asset names to all `object_n*` and `object_o*` files (#1460)Tom Overton
2023-10-31z_kankyo Decompiled (3 non-matching) (#1451)engineer124
* z_Kankyo progress * build OK * progress * more progress * Kankyo WIP * Add docs * func_800FEAF4 * more docs * func_800FEAF4 * improve Init * Small cleanup * kankyo data * data cleanup * Environment_DrawLensFlare * Match Environment_UpdateSkybox * Match Environment_DrawRainImpl * Start on Environment_UpdateLights * Match Environment_DrawSandstorm * gRainDropDL * Some light renamings * Fix merge * cleanup * improve non-equivalents * cleanup * PR Review * match Environment_UpdatePostmanEvents * PR Review * small improvement to Environment_UpdatePostmanEvents from anon * more cleanup * void * bits * fix comment * improve Environment_UpdateLights * Skybox Stars Docs * PR Review * fix merge * macros * Add comments * PR Review * gRandFloat * bug --------- Co-authored-by: Rozelette <Uberpanzermensch@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-10-31Document `object_boss05` (Bio Deku Baba) (#1456)Tom Overton
2023-10-29ObjTakarayaWall OK (#1448)Derek Hensley
* Takaraya Wall OK * Docs * Object docs * Small cleanup * undefined syms removal * EnTakaraya_SpawnWalls docs * PR * Small cleanup * Adjust comment * PR * More PR * PR * > 1 * ObjTakarayaWall_CanCarvePath
2023-10-29Boss01 (Odolwa) OK and documented (#1452)Tom Overton
* Boss01 (Odolwa) OK and documented * Unify existing InitRand implementations * Remove newlines after `// fallthrough` * Respond to the rest of engineer's review * Respond to most of anon's review * Try to comment the shadow thing correctly * Fix boss_01 after merge * SEGMENTED_TO_VIRTUAL -> SEGMENTED_TO_K0 * Review * Use DMG_SWORD_BEAM and update the comment in z64collision_check.h * Respond to engineer's review
2023-10-24object_test3 (kafei) (#1431)Nuss
* naming * improvements * improvements * ups
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
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 17:20:49 +0000