summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2024-10-15Extract assets to extracted (#1708)Derek Hensley
2024-10-15Colliders Sync Cylinders (#1709)Derek Hensley
2024-10-14Player "Hostile" Docs (#1706)engineer124
* actor flag hostile * player hostile
2024-10-12Colliders Sync JntSphere (#1700)Derek Hensley
* JntSphere * Format * PR review
2024-10-12Port over OoT's new text pipeline (#1685)Derek Hensley
* Port OoT's new msgdis and msgenc * format * Remove item_ids try block * Update assets/text/charmap.txt Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> --------- Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2024-10-05[headers] `z64malloc.h` -> `zelda_arena.h` (#1702)Dragorn421
2024-09-27InitVars -> Profile (#1697)Derek Hensley
* ActorProfile * EffectSsProfile * TransitionProfile * variables.txt
2024-09-27Colliders Sync ColliderElement (#1698)Derek Hensley
2024-09-22Player: Document "WaitForPutAway" (#1694)engineer124
* import OoT docs * cleanup * carry actor * more cleanup * PLAYER_STATE1_CARRYING_ACTOR
2024-09-19Colliders Sync General Clean (#1693)Derek Hensley
* General cleanup * General colliders
2024-09-19Revamp "AnimationContext" Docs, now called "AnimTaskQueue" (#1692)engineer124
* Import Oot Docs * cleanup * more cleanup * cleanup * small thing * singular
2024-09-18Add rand.h for non-qrand.c rand functions (#1684)Dragorn421
* sync rand.h with related oot PR * fix * yeet comment
2024-09-15[Audio 8/?] Check-in handwritten sequences, build sequences, automate ↵Tharo
various sfx arrays (#1679) * [Audio 8/?] Check-in handwritten sequences, build sequences, automate various sfx arrays * Fix whitespace in aseq.h * Suggested changes, adjust some MML syntax and add more instruction descriptions * Special case progress script (#9) * Hack progress script * Small adjustment to text fileSectionFixer * Add the dir of the input .seq file to the list of includes to sequence assembling so that assembler-level includes like .include or .incbin work intuitively * Remove old comment that was missed before * aseq.h tweaks * Review suggestions, aseq.h adjustments --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-09-10Remove assets from automatic includes (#1683)Derek Hensley
2024-09-10[headers] Add kaleido_manager.h, clean up z64jpeg.h protos (#1688)Dragorn421
2024-09-07Misc Clean (#1680)Derek Hensley
* vramu32 in Overlay_Relocate * Actor_SetColorFilter args * Effect Hitmark enum * Actor_WorldToActorCoords * Some fault clean up * contoller.h * macros.h no longer needs stdint.h
2024-09-07[headers] Move padmgr, scheduler, irqmgr symbols to respective headers; add ↵Dragorn421
segmented_address.h (#1681) * [headers] Move padmgr, scheduler symbols to respective headers * fix revealed header problems * Fix bss * review * bss * segmented_address.h --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-09-07Import data + bss (#1676)Derek Hensley
* extract gfxprint font data as blobs * Remove font from fault_drawer out name * audio heap bss * audio sequence bss * audio session config bss * Move code_801D1E80 down in the spec * Gfxprint don't just include generated c file
2024-09-07Fixup actor audio flags docs (#1682)Dragorn421
* Fixup actor audio flags docs * format
2024-09-06Update Room Documentation (#1678)mzxrules
* Implement Room Documentation * nit * Resolve Dragorn fixes (OoT) * Resolve Fig suggestions, fix comment wording (OoT) * hensldm nit
2024-08-27[Audio 6/?] Build Soundfonts and the Soundfont Table (#1675)Tharo
* [Audio 6/?] Build Soundfonts and the Soundfont Table * Fix bss * Maybe fix warnings * Improve lots of error messages * Suggested changes from OoT PR * Suggested changes * Make soundfont_table.h generation depend on the samplebank xmls since they are read, report from which soundfont the invalid pointer indirect warning originates from
2024-08-17[Audio 5/?] Build the Samplebank Table (#1674)Tharo
* [Audio 5/?] Build the Samplebank Table * OoT suggested changes * Fix format specifier * Moved linker_scripts files used in final linker to linker_scripts/final * Populate OTHER_DIRS with linker_scripts subdirs * Unhide the partial link command
2024-08-14Extract sFaultDrawerFont as blob (#1673)Derek Hensley
2024-08-12z_en_dinofos documented (#1661)TrulyNaN
* Something not yet identified makes it current zeldaret's main and my documentation don't fit. Re-importing my code in steps. Now: imported function renaming from doc_ovl_en_dinofos. * Ported missing function names from doc_ovl_en_dinofos branch and renamed a static variable. Everything external to the C file and its header should be accounted for right now. * Branch now using same documented code as doc_ovl_en_dinofos and PR test works. * Ready to PR EnDinofos' Documentation * Applied first batch of review edits. Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c To make sure it'll actually get applied. Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * RecoilFromBlockedSlash is now Recoil. Small this-> missing before a suggestion inserted online was added. * Update src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Updated last unnamed static variables and vertices names * Renaming vertices in _PostLimbDraw and last unnamed static variables. Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com> * Applied changes from hidden suggestions. Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * Update src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * Renamed sBaseFireVelocity to sFireVelocityOffset. * Inserted some enums for collider limbs. Continuing to address PR comments. Co-authored-by: Tom-Overton <tom.overton@outlook.com> --------- Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com> Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> Co-authored-by: Tom-Overton <tom.overton@outlook.com>
2024-07-31z_collision_check_OK (#1481)Revo
* add D_801D7E04 and D_801D7EA4 as labels to fix 2 missed pointers * z_collision_check OK * fix random bss reordering in a different file. thanks, IDO! * fix TriNorm2 fakematch * Revert "add D_801D7E04 and D_801D7EA4 as labels to fix 2 missed pointers" This reverts commit 3dcc6999d293f833a1138ec9ddda47c3b8c4160b. * review * remove unnecessary pad * merge * Fix bss --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-07-31EnBsb (Captain Keeta) OK (#1667)Derek Hensley
* Match EnBsb * A couple nicer matches * clean up * PR review * hitmark enum * PR Review 2 --------- Co-authored-by: Synray <31429825+Synray@users.noreply.github.com>
2024-07-28Introduce a bunch of small new headers (#1649)Anghelo Carvajal
* regs.h * gfxalloc.h * z64inventory.h * gfx.h * graph.h * z64olib.h * z64elf_message.h * fix missing include * Include z64inventory.h on z64save.h * fix bss * Move PosRot to z64math.h * So dumb * Update src/overlays/actors/ovl_En_Kusa/z_en_kusa.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review * Remove graph.h * bss --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
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-28z_en_zl4 OK (#1663)engineer124
* match zl4 * cleanup
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-27Fix MSCRIPT_CMD_UNSET_EVENT_INF command (#1660)Derek Hensley
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-20Cleaner AudioScript_SequenceChannelProcessScript Match (#1662)inspectredc
* Cleaner AudioScript_SequenceChannelProcessScript * cadmic suggestion
2024-07-17Document garbage data on the on-screen clock. (#1648)Anghelo Carvajal
* z_parameter clock bug * Rename `AVOID_UB` to `PRESERVE_UB` * revert PRESERVE_UB * format * fix
2024-07-14Document object_bob (#1656)Derek Hensley
* Document object_bob * Better prefix for object_cne * object_bba better prefix
2024-07-13Another General Cleanup (#1651)Derek Hensley
* add z64player.h include to z_player.c * NULL check in func_80AEE374 * Couple formating things * parameter R_PICTO_PHOTO_STATE * Remove COLPOLY_NORMAL_FRAC * DynaPolyActor_Init transformFlags * Float in ObjDriftice_Init * aspMainStack * Add gbi defines to m2ctx * Add GBI_DEFINES to COMMON_DEFINES in makefile instead of duplicating it * Add version to build include for m2ctx * Invadepoh includes * Sort calc_bss includes like makefile
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-04ovl_bg_dblue_elevator OK and documented (#1654)TrulyNaN
* Creating branch for ovl_bg_dblue_elevator's PR. * OK * Screwing with my Debian install. Safety commit. * Applied first pass of review comments to PR and added authors. Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com> Co-authored-by: fig02 <fig02srl@gmail.com> Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk> Co-authored-by: Isghj5 <isghj5@gmail.com> Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu> Co-authored-by: AngheloAlf <angheloalf95@gmail.com> * Found some review comments I missed and applied the suggestions. * Added enum for water flow and renamed waterSurfaceYPos to waterSurfacePosY * Forgot to add last contribution. Co-authored-by: Tom-Overton <tom.overton@outlook.com> --------- Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com> Co-authored-by: fig02 <fig02srl@gmail.com> Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk> Co-authored-by: Isghj5 <isghj5@gmail.com> Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu> Co-authored-by: AngheloAlf <angheloalf95@gmail.com> Co-authored-by: Tom-Overton <tom.overton@outlook.com>
2024-07-02`z_parameter.c`: remaining functions, do action documentation, gfx cleanup ↵Tharo
(#1652) * Parameter last functions Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Documentation for do actions and various gfx * Suggested changes * f prefix for texture scale numbers * Player_SetBButtonAmmo --------- Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2024-07-02Suppress address warning in en_s_goro (#1655)Derek Hensley
* en_s_goro warning * Format
2024-06-25Add a `z64play.h` header (#1646)Anghelo Carvajal
* z64play.h * Move macros, functions and variables to header * cleanup * Reduce needed headers on z_collision_check * Change play functions to take PlayState * Move `Actor_ProcessInitChain` to `ichain.h` * format * Update src/code/z_play.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Add macros.h to sys_math3d.c * Rename SequenceContext to SceneSequences --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-06-24Animation Cleanup: En_T* (#1522)engineer124
* anim T cleanup * more cleanup * brackets and floats * small thing * more floats * fix name * fix * format --------- Co-authored-by: angie <angheloalf95@gmail.com>
2024-06-23EnOkuta (Octorok and its projectiles) OK and documented (#1641)Tom Overton
* Match EnOkuta * Match data * Use the generated reloc * Delete extern stuff and format * Extract the DL * Fix lots of stuff * Copy a lot of names over from EnSyatekiOkuta * SFX enums * Lots more stuff * Constants and other stuff * Some more stuff I missed * Name more functions using OoT/SyatekiOkuta as reference * An easy function I missed * Some floats * Getter macros * Types enum * Name the cylinder inits a little clearer * Create bodyparts enum and name all data * Name all functions * Name `timer` struct var and all temps * Name the `jumpHeight` struct var * Create damage effect enum * Name the extracted DL * Name `numConsecutiveProjectiles` * Finish docs * Document XML * Clarify that this blue Octorok isn't the shooting gallery one * Respond to reviews * Stuff --------- Co-authored-by: Synray <31429825+Synray@users.noreply.github.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-06-23Format gbi.h, move ucode defines to makefile (#1650)Tharo
* Format gbi.h, move ucode defines to makefile, correct usage of gDPSetDither * UCODE_DEFS -> GBI_DEFINES, add GBI_DOWHILE toggle * Define GBI_DOWHILE for bss calculations * Makefile thing
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-14`sys_math3d.c` Decompiled and Mostly Documented (#1450)engineer124
* Use matched sys_math3d functions by Tharo Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> * kinda match some unattempted functions * move sys_math3d function declarations to z64math.h * Rename some simple functions * Take matched Math3D_LineVsLineClosestTwoPoints from OoT * minor fixes to make stuff actually equivalent * func_8017FB1C * format * minor cleanup * Math3D_PointOnDirectedLine * func_8017FB1C documentation Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Remove actorfixer * fix merge * Apply renames * more cleanup * bss cleanup * match Math3D_CylVsLineSeg * WIP * OK * small cleanup * Remove macros.h from sys_math3d * Small cleanup * Some more small clean up * cleanup and docs * cleanup * PR Review * cleanup * fix merge * fix merge * merge main * fix bss * bss * fix * PR Review * bss fix * Merge main * Fix bss * Fix merge * Add zero vecs to sys_math3d * Format * namefixer run --------- Co-authored-by: angie <angheloalf95@gmail.com> Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-06-14Small general cleanup (#1644)Derek Hensley
* m2ctx.py * check warnings * vimode includes * bgcheck includes * padmgr includes * sprintf * z_std_dma * sys_ucode * z64voice * z64lib * z64effect_ss * segment_symbols.h * padutils * main * stdarg.h * fault * bzero * undefined_syms * z64rumble
2024-06-14Msgevent OK (#1637)Derek Hensley
* Decompiled, some commands still unnamed * Use full weekevent reg names * Fix func_8094E69C * Fix Player_GetMask * Eventinf, mask worn, and item action argument formatting * decimal rupees * Times (day, hours, minutes) as decimal * msgEventScriptPos * Callbacks * Name final commands * Enum * Arrays * functions * Small cleanups * Clean up actors * Remove event from some variable names to make them shorter * Some more function renames * newline * Missed a few unks in commands * Update functions.txt * PlayerMask * MSGMODE_PAUSED * Script time macros * EnSob1_GetWelcome default * Whole bunch of renames * Format * Add CMD to commands * Update code_functions * structs for size * z64scripts.h * MsgEventCallback -> MsgScriptCallback * format * MsgEvent_RunScript stop * Remove cmd handler comment * cmd -> script in MsgEvent_RunScript --------- Co-authored-by: Thar0 <17233964+Thar0@users.noreply.github.com>
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>