summaryrefslogtreecommitdiff
path: root/assets/xml/objects/gameplay_keep.xml
AgeCommit message (Collapse)Author
2026-04-09Use <Limb LimbType=> not <Limb Type=> in gkeep and object_link_child (#1859)Dragorn421
2025-01-20Document original player animation names in `gameplay_keep` (#1786)Tom Overton
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-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-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-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-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-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>
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-21Fix most hardcoded pointers in extracted assets (#1477)Anghelo Carvajal
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-08Object Name Cleanup (#1427)engineer124
2023-10-03Add original asset names to all `object_l*` and `object_m*` files (#1403)Tom Overton
2023-06-28Some Gameplay keep docs (starts at the top) (#1310)Derek Hensley
* bottles * hookshot * swords * masks * remove _tex from outnames * Headers * 003400 Vtx * unknown mask * LinkMask name based on renders
2023-04-18`z_player_lib`: Dawn of the final PR (#1142)Anghelo Carvajal
* Player_GetMask and Player_RemoveMask * some comments * Player_ActionToBottle and Player_GetBottleHeld * Player_DrawGetItemImpl and Player_DrawGetItem * func_80123420 OK * Decompile a few more functions * Decompile a few more functions * func_80122760 * func_80122868, func_801229A0 and func_801229EC * func_80122F28 * func_8012301C * func_801242B4 * func_801242DC * func_80124420 nonmatching * func_80126440 * func_801240C8 and func_801240DC * func_8012405C and func_80124088 * func_80124020 * Player_IsBurningStickInRange * func_8012754C * func_80125318 and func_80125CE0 * func_801229FC * func_80127B64 * func_80127488 * func_80122D44 * func_80122BA4 * func_80122C20 attempt * func_80122EEC * func_80122F9C * func_80122FCC and func_8012300C * func_80123448 * func_801234D4 * func_801235DC * func_80123960 * func_80123BD4 * func_80123AA4 * func_801239AC * func_801241B4 * func_80123C58 and func_80123C90 * func_80123D50 and func_80123DA4 * func_80123DC0, func_80123E90 and func_80123F14 * func_80124110 and func_80124148 * func_80124168 and func_80124190 * func_80124278 * func_80124F18 non_equivalent * func_80125340 and func_8012536C * func_801263FC * func_801265C8 * func_8012669C * func_80128B74 * func_80123140 * func_801246F4 * func_801253A4 NON_MATCHING * func_801262C8 * func_80126AB4 * func_80126B8C * func_80127438 * func_801278F8 NON_MATCHING * Fix data split * cleanup externs * func_80128BD0 compiles... * Rename Player_SetEquipmentData * fix merge issues * Fix types * Improvement? Worse? I don't know at this point * func_80128640 attempt * func_80127BE8 * func_80127A60 * func_80127594 attempt * func_801271B0 * func_8012364C NON_MATCHING * func_80124618 * func_80124CC4 non matching * func_801251C4 * func_80125580 non equivalent * func_80128388 * cleanup * remove some hardcoded pointers * object symbol cleanup * func_80124870 NON_EQUIVALENT * name overridlimbdraw arguments * func_80125D4C NON_EQUIVALENT * func_80126BD0 NON_MATCHING * Match func_80126BD0 thanks to anon58 * func_80127DA4 NON_EQUIVALENT * fix merge issues * some stealing from OoT * small rename pass and cleanup * Improve some * CLAMP and fix warnings * func_80125580 matched by mzx * cleanup func_80128BD0 a bit * import data * func_80124CC4 * Rename objectFileTable to gObjectTable * Improve func_80124FF0 thanks to maide * fix renames * Match func_80124FF0 thanks to Maide * cleanup * More cleaning up * import bss * Add PLAYER_STATE macros * a bit more of cleanup * run formatter * func_80128BD0 a bit more deecent * Add player limb enum * Use limb enum * cleanup and format * Use symbols for player dlists groups * A bunch more of pointers * more object pointers * Change the remaining object pointers * Add a few missing dlist in link_child * Small rename * whoops * Work on NON_MATCHINGs * Cleanup * Steal OoT renames from "sword" to "meleeWeapon" * Fix some symbols * Match func_80127594 and format * Match func_80127DA4 * Matched func_801284A0 * Annotate D_801F59AC * Matched func_80128640 * Some cleanup * format * stuffs * some cleanups * import stuff from pr * swords and shields * fixes * bss * cleanup Player_OverrideLimbDrawGameplayCommon * progress on func_80125D4C * PlayerMeleeWeapon enum * Player_BButtonSwordFromAP * GET_B_SWORD_FROM_AP * GET_MELEE_WEAPON_FROM_AP * PlayerBottle * PlayerExplosive and PlayerSword * misc fixes * Various changes fromplayer_actor * z64player.h stuff from player_actor * Fixes * skelanime stuff * placeholders on z64item.h, save macros and ther cleanups * <= PLAYER_AP_MINUS1 * Player_UpdateBunnyEarsKinematics Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * cleanup * bodyPartsPos * comment * sizeof(u16) * typo * merge fixes * fix * fixes * format * fix merge * fix merge * func_80125D4C Co-authored-by: engineer124 <engineer124engineer124@gmail.com> * func_80128BD0 improvement * minor renames * format * whoops * small cleanup * Update src/code/z_player_lib.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * format * _B_ * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * review Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * format * remove gap * whoops * clanups * remove stuff from permuter_settings * steal some OoT docs * some other docs vscode didn't add to the last commit * format * data as infunction-static data * OoT docs stealing * Improvements on Player_PostLimbDrawGameplay * More improvement * Match Player_PostLimbDrawGameplay Co-authored-by: engineer124 <engineer124engineer124@gmail.com> * cleanups * Convert unk_AF0 into an union and some other cleanups * bss * headLimbRot and upperLimbRot * fix naming * cleanups * bss * bss * Update src/code/z_player_lib.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * pr review Co-authored-by: engineer124 <engineer124engineer124@gmail.com> * bss * gesture * namefixer * gestureInfo * IA_MIN and BOTTLE_EMPTY * review Co-authored-by: engineer124 <engineer124engineer124@gmail.com> * review * D_801F59B0_LEN * Remove LevelOfDetail enum * bss * review * review * gLinkDekuClosedFlowerDL gLinkDekuOpenFlowerDL * _B_ * Player_DrawStrayFairyParticles * fix build --------- Co-authored-by: kyleburnette <kyle@kyleburnette.com> Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-10-28General Cleanup 12 (#1139)Derek Hensley
* undefined syms * fire footprint outnames * material/model DLs * iceblock * enHorse * const ActorInit * Remove some & * flash * KusaBushTypeDL * gWarpTagGoronTrialBaseCollider -> gWarpTagGoronTrialBaseCol * iceblock col
2022-10-22EnOsn (Happy Mask Salesman) and object_osn Docs (#1135)Derek Hensley
* Inital cleanup * Object * Docs * Small things * PR
2022-10-15`z_player_lib`: Part 2 (#938)Anghelo Carvajal
* preparations * import data * PLAYER_STATE1 * PLAYER_STATE2 * PLAYER_STATE3 * import bss * format stuff * bss cleanup * more cleaning and some naming * face * cleaning up link human object a bit * Remove PHYSICAL_TO_VIRTUAL2 * Update src/code/z_player_lib.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * review Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * format * /* CAT */ Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> * naming some stuff on objects * format * invert flags endian * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * format * drawmask Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> * naming * another round of human object naming * enum renames * sActionModelGroups and use enum as types * PlayerAnimType * PLAYER_MODELTYPE_ * determined ranges of PlayerModelType * name PLAYER_MODELGROUP_DEFAULT * format * sheath * dlist groups placeholder namse * PLAYER_MODELGROUP_BOTTLE * Some fierce deity naming * Right hands * zora skel dlists * deku limb dlists * left hands * name most modelgroups * more hand naming * regs as dec * fix in horse * Use BUTTON_ITEM_EQUIP macro * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * reformat D_801AED58 * Sword sheaths * swords and shields * Update src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * playerForm on Player_DrawImpl * fomat * Update src/code/z_player_lib.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update assets/xml/objects/gameplay_keep.xml Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * VIRTUAL_TO_PHYSICAL(SEGMENTED_TO_VIRTUAL(gEffBubble1Tex)) Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * singular limb enum names * fix bss * Update src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * name goron shielding limbs * name limb * Update src/code/z_player_lib.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * bss * bss * format * namefixer * bss * bss * bss * bss * format * bss * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * fix bss Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-10-15Document Elegy of Emptiness shell assets in gameplay_keep (#1121)Tom Overton
* Document Elegy of Emptiness shell assets in gameplay_keep * Format
2022-10-02Eff Srchball OK (#1092)Derek Hensley
* OK * Some docs and cleanup * flags -> params * Remove todo * Small cleanup * Description and dls * Format * bug tag * Update bug comment * Update src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Format Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-10-02Document leftover pause joint tables (#1104)Tom Overton
* Document leftover pause joint tables * Grab the other two joint tables * Document the deku stick thing * Add @bug to comment
2022-10-02EnMThunder Ok with some docs (#1082)Derek Hensley
* Match EnMThunder_Init * Match func_808B53C0 * Match func_808B65BC * Match func_808B6310 * Match func_808B5EEC * Matched func_808B60D4 * Match func_808B5F68 * Match func_808B5984 * Matched func_808B58CC * Matched EnMThunder_Destroy * Matched EnMThunder_Update * Matched EnMThunder_Draw * Matched data * Doc WIP * Code docs * Assets * PR * Rename one more function from OoT WIP docs * Update src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * PR Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-10-01Replace player animation names with original names derived from OoT3D/MM3D ↵Tom Overton
(#1103)
2022-09-24Item cleanup: Item drops, rupees, signs (#1048)engineer124
* item cleanup * pr suggestions Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-09-24Document Song of Time Clock assets in gameplay_keep (#1068)Tom Overton
2022-09-24Extract assets from link_animetion (#1056)Tom Overton
* Extract assets from link_animetion * Add empty last line
2022-09-24Effect Bomb2 Ok (#1039)Derek Hensley
* OK * PR
2022-09-24Effect Deaddb OK (#1037)Derek Hensley
* OK * Add description * format * Fix EffectSsDeadDbInitParams size comment
2022-09-24Effect Deadds OK (#1018)Derek Hensley
* OK * cleanup * Fix merge * Small cleanups
2022-09-24Effect Dust OK (#1016)Derek Hensley
* OK * Some cleanup * Description * format * Better name * whoops * Array count * Name dust texture arrays * Fix * static * Update dust tex outnames
2022-08-15General Cleanup 10 (#990)Derek Hensley
* limbs -> limb * Generated limbs * Fix ENUMNAME * goronLink fix * actually save * Boss011Limbs -> Boss011Limb * keep skeletons * remove comments
2022-08-15EnRat (Real Bombchu) OK and Documented, object_rat documented 🐀💣 (#966)Tom Overton
* EnRat_Init and EnRat_Destroy OK * Tons of actionFuncs and other stuff * EnRat_Update OK * func_80A566E0 OK and better match for func_80A56EB8 * All draw functions OK * EnRat OK * Document object_rat * Port documentation from Bom_Chu * Document/name a few more things * Name all funcs and struct vars * Un-name unk_18D * Name some more stuff * Final round of docs before I ask for help * Let's just PR this I suppose * Respond to isghj5's review * Name a variable I forgot to name * hookedState stuff * Clean up forward declares * Fix after merge * Respond to reviews * Limbs -> Limb * Names for these rascally Vec3f temps * Name all the vec3fs for real this time * world -> surface * surfaceTangent -> forwardPos; there are many tangents, but only one is forward * Use Elliptic's names + documentation * worldForwardInHome -> worldPlusForwardInHome
2022-08-09docs (#978)Derek Hensley
2022-08-07Effect EnFire OK (#977)Derek Hensley
* OK * Gameplay keep fire * & * &2 * PR * Fire textures * Second mask
2022-08-07Effect EnIce OK (#976)Derek Hensley
* Ok * Material/Model * Cleanup * format * IceFragment Assets * PR
2022-08-07Effect Firetail OK (#974)Derek Hensley
* OK * description * gEffFire1DL * format * PR
2022-07-23Some minor cleanup involving stray fairies (#949)Tom Overton
* Some minor cleanup involving stray fairies * Fix build
2022-07-22ovl_Eff_Change Decompiled (#946)Alejandro Asenjo
* all functions matching * progress * ovl_Eff_Change Decompiled * ovl_Eff_Change Decompiled * space * spec
2022-07-22Effect Gfire Ok (#941)Derek Hensley
* OK * description
2022-07-22Effect Gspk OK (#939)Derek Hensley
* OK * cleanup * newline
2022-07-19Effect Gripple (#940)Derek Hensley
* OK * description * undef * format
2022-07-11object_rotlift documented, various cleanup of Deku Flower stuff, finish ↵Tom Overton
documentation of ObjRotlift (#879) * Make params-packing macro * Move limb enum to object * Minor deku flower cleanup * Document object_rotlift * Rotlift cleanup and documentation * Respond to review
2022-07-11Effect Hahen Ok (#875)Derek Hensley
* OK * format * gameplay keep * undef syms * drawFlags -> params * Format * Fix railskb include * DL consistency with OoT * Hex
2022-07-11Effect Hitmark Ok (#874)Derek Hensley
* OK * gameplay keep * undef syms * Cleanup * format * HitMark -> Hitmark * Remove EffectSsHitmark_Spawn from functions.h * PR
2022-06-19Effect Icepiece OK (#839)Derek Hensley
* OK * Final cleanup * format * PR plus forgot to rename Matrix_RotateY
2022-06-19Effect Icesmoke OK (#838)Derek Hensley
* Ok * Name DL and tex * Matrix renames
2022-06-19Sob1 Objects Documented (#814)Derek Hensley
* Start zora * Finish zora * BombShopkeeper with some cleanup * Goron and don gero mask * Small thing * format * PR comments * bombshopkeeper -> bomb_shopkeeper * gEffShockwaveDL
2022-06-19ClearTag cleanup (#830)engineer124
2022-05-25EffectSsKirakira OK (#801)Derek Hensley
* OK * cleanup * KiraKira -> Kirakira
2022-05-25EffectSsLightning OK (#800)Derek Hensley
* OK * Document and gameplay keep * cleanup * Rotate -> Rot * Update description
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-05 13:43:46 +0000