summaryrefslogtreecommitdiff
path: root/assets/xml/objects
AgeCommit message (Collapse)Author
2026-05-23Document `EnHs` and `EnHs2` (Carpenter's son) (#2758)Jordan Longstaff
* Document `EnHs` and `EnHs2` (Carpenter's son) * focusOffset -> sFocusOffset * Rename tracking flag fields * Roll back subrepo changes * Remove comment on trackingFlags Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> --------- Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2026-05-09Assets system: reconcile xml versions using implicit and relative offsets ↵Dragorn421
(#2614) * Assets system: reconcile xml versions using implicit offsets * simplify * remove other object_mag xmls * Introduce relative offsets: `Offset=".+0x421"`, more sizable `ResourceDesc`s, update spec * fix * reconcile object_mo xml * reconcile object_tw xml * reconcile object_xc xml (and add Tlut="gNameTLUT" to Texture resources) * reconcile object_fd xml * reconcile object_kingdodongo xml * bss * reconcile gameplay_keep.xml
2026-02-22Fix misc 23 (#2699)Dragorn421
* remove noop macros Fault_SetFontColor Fault_SetCharPad under PLATFORM_N64 * remove duplicate declarations in sfx.h * use render mode presets more * decimal for alpha values * fix some z_camera comments typos * fix references to preprocess.sh (used to be preprocess.py) * remove outdated comment on deps in makefile * code_800AD920 was renamed to z_viszbuf * fix capitalization typo: gOcarinaofTimeDesignTex -> gOcarinaOfTimeDesignTex * fix typo: gLinkAdultEyesClosedfTex, gLinkChildEyesClosedfTex -> remove extra f * fix typo: gCrstalSwitchRedTex, gCrstalSwitchBlueTex -> gCrystal * fix PARAMS_GET_U amount of bits
2026-02-22z_bg_haka_meganebg documentation pass (#2685)mzxrules
* document z_bg_haka_meganebg * Dragorn suggestions and @bug documentation * i swear i was good at grammar as a child
2026-02-18bg_haka_megane documentation pass (#2684)mzxrules
* document bg_haka_megane * BGHAKAMEGANE_TYPE_MAX * dragorn suggestion
2026-02-17bg_haka_trap documentation pass (#2683)mzxrules
* document pass on bg_haka_trap * formatting * suggestions * dragorn suggestions
2026-02-17z_bg_haka_zou documentation pass (#2687)mzxrules
* document z_bg_haka_zou * suggestions * dragorn suggestions
2026-02-16Commit and split gameplay_keep (#2612)Tharo
* Commit and split gameplay_keep * Remove debugging bits * format * bss * merge gameplay_keep_0x400 into link_textures * Name some unused NTSC stuff * Rename files for some of the newly named unused NTSC stuff * name more gkeep files * format * spin_attack * name fish anims files * name some eff_ files * name a bunch more files * Add underscore in not-final names * cleanup limb enum names (remove g prefix) * split gameplay_keep_0x34020.c into gBugCrawlAnim.c + bug_skel.c * door.h -> door_skel.h * gArrowNAnim -> gArrowN_Anim * split arrow_anims into gArrow1_Anim + gArrow2_Anim * fix merge * bss * bss * Fix bss --------- Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2025-06-15Assets: Move limb enums into xmls 4 (#2631)Dragorn421
2025-06-15Assets: Move limb enums into xmls 3 (#2630)Dragorn421
2025-06-14Name most `object_gi_*` textures (#2629)Dragorn421
* Name most `object_gi_*` textures * gGiButterflyTex
2025-06-12Assets: Move limb enums into xmls 2 (#2626)Dragorn421
2025-06-12Assets: Move limb enums into xmls 1 (#2625)Dragorn421
2025-06-10`object_zo`: finalize, split and commit (#2624)Dragorn421
2025-06-10Remove Static from xmls (#2616)Dragorn421
2025-06-07Add Vtx[] resources in xmls for (partially) documented assets 10 (#2609)Dragorn421
* Add Vtx[] resources in xmls for (partially) documented assets 10 * bss
2025-06-07Add Vtx[] resources in xmls for (partially) documented assets 8 (#2606)Dragorn421
2025-06-07Add Vtx[] resources in xmls for (partially) documented assets 7 (#2605)Dragorn421
* Add Vtx[] resources in xmls for (partially) documented assets 7 * bss
2025-06-07Add various undocumented resources in xmls 4 (#2604)Dragorn421
2025-06-06Remove OutName from xmls (both on File and Texture) (#2596)Dragorn421
2025-06-06Add various undocumented resources in xmls 3 (#2595)Dragorn421
2025-06-06Add various undocumented resources in xmls 2 (#2594)Dragorn421
2025-06-05Add Vtx[] resources in xmls for (partially) documented assets 5 (#2587)Dragorn421
2025-06-05Add Vtx[] resources in xmls for (partially) documented assets 6 (#2588)Dragorn421
2025-06-05Add various undocumented resources in xmls 1 (#2589)Dragorn421
* Add various undocumented resources in xmls 1 * bss
2025-06-03Add Vtx[] resources in xmls for (partially) documented assets 4 (#2567)Dragorn421
2025-06-03Add Vtx[] resources in xmls for (partially) documented assets 3 (#2566)Dragorn421
* Add Vtx[] resources in xmls for (partially) documented assets 3 * revert bombf
2025-06-03Add Vtx[] resources in xmls for (partially) documented assets 2 (#2565)Dragorn421
* Add Vtx[] resources in xmls for (partially) documented assets 2 * non-pal too * Revert "non-pal too" This reverts commit ac8b38b3a827046cd33441b8c8c577e54a33bc4c. * fix * bss
2025-06-02Child Ruto Part 2: Rename resurfacing animation (#2569)Jordan Longstaff
2025-06-01Add Vtx[] resources in xmls for undocumented assets (#2547)Dragorn421
2025-05-31Add Vtx[] resources in xmls for documented assets 1 (#2549)Dragorn421
* Add Vtx[] resources in xmls for documented assets 1 * fix duplicate gTriforceVtx (the existing gTriforceVtx resource was too short)
2025-05-31Fix Link eyes left/right (#2558)Dragorn421
* Fix gLinkAdultEyes Left/Right Tex names * swap PLAYER_EYES_ LEFT/RIGHT and related * comment on gLinkChildEyesLeftTex/Right appearing swapped
2025-05-27[assets] Sort gkeep resources by offset (#2550)Dragorn421
2025-05-26Commit `object_link_child` (#2542)Dragorn421
* add Vtx resources to object_link_child.xml * object_link_child.xml limb enum and tlut blob * cp extracted/... assets/... * start cleanup, delete useless declarations * inhibit object_link_child.c source gen * move textures _WIDTH and _HEIGHT to .c, remove useless tex decls * comments * fixup object_link_boy comments * remove unreferenced DLs decls * rm 0 padding * format the .c * fixup * bss
2025-05-25Finalize and commit `object_link_boy` (#2528)Dragorn421
* Finalize and commit object_link_boy * bss * format * dont write extracted/.../object_link_boy.c * sizes for dls and texs * fix OK * TEX_LEN
2025-05-18New assets system (#2481)Dragorn421
* wip: New assets system tm Builds gc-eu-mq-dbg OK from clean after 1) make setup 2) python3 -m tools.assets.extract -j 3) replace 0x80A8E610 with sShadowTex in extracted/gc-eu-mq-dbg/assets/overlays/ovl_En_Jsjutan/sShadowMaterialDL.inc.c 4) make various symbols in extracted data like sTex static * use variables from config.yml for gMtxClear and sShadowTex addresses * Write source with static for overlays using `HACK_IS_STATIC_ON` hack * gc-eu-mq-dbg OK from clean with `make setup && make` * implement more skeleton-related types, cleanups, fixups * fix extracted data to no longer produce compilation warnings * implement more of RoomShapeImage types * yeet XmlPath from ExternalFile usage * Implement PlayerAnimationDataResource (link_animetion data) * fix csdis CS_TIME extra arg * dmadata file names no longer hardcoded for gc-eu-mq-dbg * ntsc-1.0 OK * xml fixes * slightly improve standard output * rm extract_assets.py * generate and use Limb enums (TODO: check Skin skels and implement for Curve skels) * handle dependencies between xmls * introduce RawPointers xml attribute to ignore specific pointers and keep them raw * add tools/extract_assets.sh * fixups * only extract if xmls changed or if -f (force) is used * fixups, gc-eu OK * all versions OK * check attributes of xml resources elements * Implement legacy skelanime resources * fix ASSET_FILES_BIN_EXTRACTED/COMMITTED: look for .u8.bin specifically instead of just .bin * implement JFIFResource * fix png/jpg wildcards: look specifically for .u64.png .u32.png .u64.jpg * Makefile: Add rules to build .png, .bin and .jpg in assets/ too * start writing actual docs * extract sTransCircleDL and sTransWipeDL * misc cleanup/fixes, pygfxd 1.0.3 * refactor CDataExt.set_write callback args to use a dataclass * Move {} to in-source * misc * more progress on spec * fix missing braces in n64dd_error_textures.c * finish xml spec doc * assets xmls fixes * some cleanup, use `gNameTex_WIDTH/HEIGHT` macros in dlists * handle hackmode_syotes_room, fix compile * C build_from_png * rm tools/assets/bin2c * rm ZAPD * format * remove rule to generate dmadata_table.py * CC0 license (and some import cleanup) * dont try to build zapd (rmd) * simplify palettes with single user (ci images with a non-shared palette) * add docs on how images are handled * bss * allow -j N * fix n64texconv python bindings memory management * move -j at the end of calling extraction script * with -j, update last_extracts.json as each job completes rather than only if all complete * make interrupting less jank by making child processes ignore sigint * use enum names in `SCENE_CMD_SKYBOX_SETTINGS` * `multiprocessing.get_context("fork")` * import rich, except ImportError s * fix optional rich usage * .bss * .bss * .bss * assets extraction: -j -> -j$(N_THREADS) * .bss * change LIMB_NONE/MAX defaults to be FILE_OFFSET instead of SKELNAME * 0XHEX -> 0xHEX * fix bss * Proper includes for assets mostly proper, some includes like dlists resources always causing a sys_matrix.h include (when not every dlist references gIdentityMtx) could be done better * rm z64.h * rm z64.h take two * bss * Make .u64 suffix for pngs optional * fixup: rm .u64 suffix from n64dd image paths * Remove elemtype suffixes from .bin and .jpg files * Update images.md * some build_from_png cleanup, more error handling, comments * Handle skybox textures Introduce "sub-format" suffix for pngs, with sub-formats split_lo and split_hi being used for skybox textures * fixup for older python * improve collision output some * fully use SURFACETYPE[01] macros in writing extracted surface types * use WATERBOX_PROPERTIES in extracted waterboxes * some SceneCommandsResource cleanup * format EnvLightSettingsList output
2025-02-16assets xmls fixes (#2476)Dragorn421
2025-02-14Identify some unaccounted and blob asset data (#1953)cadmic
* Identify some unaccounted and blob asset data * Add bug comments for flex skeleton weirdness * Use (SkeletonHeader*) cast instead of .sh * Fix vtx counts
2025-02-12Assets fixups 2 (#2461)Dragorn421
2025-02-07Assets fixups (#2454)Dragorn421
* Assets fixups * gDCRoom0TLUT, also object_mo.xml and ddan.xml * gMegami3TLUT -> Tex * yeet gDCRoom0TLUT (crashes ZAPD for an unknown reason)
2025-01-24[iQue] Match z_en_mag (#2439)cadmic
* [iQue] Match z_en_mag * Add comment for iQue "PRESS" * Format
2024-12-21Set up build system for ique-cn (#2382)cadmic
* Set up build system for ique-cn * Fix size of fbdemo_circle assets * Treat iQue as NTSC and Use "NES" for Chinese text * Revert z_kanfont
2024-12-09Document Mido functions, fields, and animations (#2289)Leonid Kapitonov
* Document `func_80AAA250` new name: `EnMd_ReverseAnimation` * rename `enum EnMdAnimation` > `enum EnMdAnimIndex` * Document `struct EnMd` fields (and functions) the list: * `func_80AAAC78` -> `EnMd_TrackMessageState` * `func_80AAAA24` -> `EnMd_UpdateAnimState_WithTalking` * `func_80AAA92C` -> `EnMd_SetAnimState` * `func_80AAA93C` -> `EnMd_UpdateAnimState` * `func_80AAA274` -> `EnMd_UpdateAnimState1` * `func_80AAA308` -> `EnMd_UpdateAnimState2` * `func_80AAA39C` -> `EnMd_UpdateAnimState3` * `func_80AAA474` -> `EnMd_UpdateAnimState4` * `func_80AAA508` -> `EnMd_UpdateAnimState5` * `func_80AAA5A4` -> `EnMd_UpdateAnimState6` * `func_80AAA638` -> `EnMd_UpdateAnimState7` * `func_80AAA6D4` -> `EnMd_UpdateAnimState8` * `func_80AAA768` -> `EnMd_UpdateAnimState9` * `func_80AAA7FC` -> `EnMd_UpdateAnimState10` * `func_80AAA890` -> `EnMd_UpdateAnimState11` * Document `func_80AAB158` new name: `EnMd_UpdateTalking` * Document `func_80034DD4` @ `z_actor.c` new name: `Actor_SmoothStep_Attention` * Document `func_80AAB5A4` new name: `EnMd_SmoothStep_Attention` * Document Mido's action functions the list: * `func_80AAB874` -> `EnMd_Idle` * `func_80AAB8F8` -> `EnMd_Watch` * `func_80AAB948` -> `EnMd_BlockPath` * `func_80AABC10` -> `EnMd_ListenToOcarina` * `func_80AABD0C` -> `EnMd_Walk` * rename flag `temp2` -> `canUpdateTalking` * (re)document Mido's animations via blender and fast64 * marginally improve comments * marginally improve comments * actually, yes, let's name action functions as such * Document eye textures as an enum to clarify for `EnMd_UpdateEyes` * rename `eyeIdx` -> `eyeTexIndex` Mido has two eyes and different textures for them * Undocument eye textures as an enum i was wrong: `_Draw` function might not follow the eyes texture order it is its own thing, like `enum EnMdBlinking` or nothing at all, yeah * ugh, and fix a typo with blinking rushing is no good * drop the `Action` suffix https://github.com/zeldaret/oot/pull/2289#discussion_r1837272286 * rename animation states as sequences https://github.com/zeldaret/oot/pull/2289#discussion_r1837274923 * `func_80034DD4` -> `Actor_FadeInOut` https://github.com/zeldaret/oot/pull/2289#discussion_r1837267267 * rename animation states as sequences a continuation of b11a9e9942e1725824e54099f84085ff2165e854 * `func_80034DD4` -> `Actor_UpdateAlphaByDistance` https://github.com/zeldaret/oot/pull/2289#discussion_r1838398475 * clarify a comment * Document `actor.params` bits allocation * apply review suggestions * apply review suggestions * apply review suggestions * apply review suggestions * apply review suggestions
2024-10-15EnHy + objects docs (#1499)Derek Hensley
* document object_bba * Clean up cne * object bob * object_aob * object_cob * object_bji * object_ahg * object_boj * All functions named plus some cleanup * enums * Remove body wiggle comments * Format * Remove case comments * comments with default * Format * format
2024-09-10Added eye texture offsets for extraction for object_oE5.xml (#2181)AJ Otto
* Blob object_oE5_Blob_003A40 corrected to extract eye half open and eye closed textures for object_oE5 * Fixed spacing in object_oE5 xml file for commit
2024-09-07Target -> Attention (System Rename) (#2149)fig02
* TargetContext -> Attention * targetCtx -> attention * Target_ -> Attention_ * FindTargetableActor -> FindActor * targetableActorP -> attentionActorP * data vars (and 1 function I missed) * targetMode -> attentionRangeType * attention range enum comments * ATTENTION_RANGE_ * attention range data * TargetColor -> AttentionColor * missed one * fixup color variables * targetArrowOffset -> lockOnArrowOffset * focus pos comment * targetPriority -> attentionPriority * assets * loose-ends * Attention System Description * format * skj range type * enemy bgm
2024-08-11Set up build system and disassembly for ntsc-1.2 (#2021)cadmic
* Set up build system for ntsc-1.2 * Set up disassembly for ntsc-1.2 * Add all unnamed functions to functions.txt * Update docs/retail_versions.md for ntsc-1.2 * Format * Update docs/retail_versions.md Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Remove mention of US * OOT_N64 -> PLATFORM_N64, OOT_GC -> PLATFORM_GC * Move mtxutil to libultra/gu * Fix libultra/io bss splits * Fix merge --------- Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-08-09Match remaining GC retail versions (#2019)cadmic
* Match the remaining GC retail versions * Fix BSS ordering for existing versions * Disable clang-format for #pragma increment_block_number * sramResetCode -> sSramResetCode * Replace 0xFF3F with or-ing all buttons together * Revert "Disable clang-format for #pragma increment_block_number" This reverts commit 406b6d26c92911c676a7ea9f07a1612211760e11. --------- Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-06-26Extract NTSC assets for gc-us (#1973)cadmic
* Extract NTSC assets for gc-us * Extract kanji https://github.com/zeldaret/mm/pull/1536 Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com> --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>
2024-06-24Rename gTitleZeldaShieldLogoMQTex -> gTitleZeldaShieldLogoTex (#1974)cadmic
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 07:18:28 +0000