Commit Graph

695 Commits

Author SHA1 Message Date
engineer124 ba693efb08
Document Hookshot Attachment (#1745)
* hookshot attachment

* period
2024-11-26 11:26:55 +11:00
engineer124 a448168d37
Player Docs: Rename Init Mode to Start Mode (#1744)
* rename to start mode

* cleanup

* rm declarations
2024-11-22 17:04:34 -08:00
engineer124 0b51a16453
Player Docs: Spin Attack (#1741)
* spin attack

* cleanup

* fix bss

* PR review

* sync func name

* add todo
2024-11-20 15:48:50 -08:00
engineer124 70e97dc285
Player Docs: Init Action Cleanup (#1743)
* init action cleanup

* boomerang

* revert name
2024-11-20 10:15:28 +11:00
engineer124 00bafced8e
Player Docs: Zora Boomerang (#1739)
* zora boomerang

* missed some

* more docs

* cleanup docs

* more cleanup

* Player_IsUsingZoraBoomerang
2024-11-17 16:37:11 -08:00
engineer124 a957342583
Player Docs: Talking (#1738)
* player talk

* cleanup

* fix comment
2024-11-17 16:26:59 -08:00
engineer124 9cd9099a04
Player Docs: Z Targeting (#1736)
* z target docs

* Player_UpdateZTargeting

* func docs

* more cleanup
2024-11-07 16:54:21 -08:00
engineer124 318e391272
Animation Cleanup: En_Z* (#1727)
* cleanup

* more progress

* finish off z

* one more thing

* one more animIndex

* fix spacing
2024-11-06 20:43:28 -08:00
engineer124 d60a032b11
Further Attention Docs (#1732)
* more attention docs

* more docs

* cleanup

* more cleanup

* spacing

* more attention docs

* small cleanup

* consistency
2024-10-23 17:44:44 -07:00
engineer124 19495ba8e9
dyna switches (#1731) 2024-10-22 18:48:01 -07:00
engineer124 ec9b5839ad
Cleanup gSPMatrix, rename `Matrix_New` -> `Matrix_Finalize`, add MATRIX_FINALIZE_AND_LOAD (#1729)
* mtx-finalize

* cleanup gSPMatrix
2024-10-22 17:51:00 -07:00
engineer124 694d3b3965
turn in place (#1728) 2024-10-22 17:26:19 -07:00
engineer124 13c42b487d
carry flag (#1725) 2024-10-20 17:58:25 -07:00
engineer124 d03e8719e6
Player Docs: Idle and Fidget (#1723)
* idle and fidget docs

* more cleanup

* cleanup

* regs

* spacing
2024-10-20 07:35:03 -07:00
engineer124 781d1d1119
Target -> Attention (System Rename) Part 2 (#1721)
* remaining attention rename

* cleanup
2024-10-20 07:05:53 -07:00
Derek Hensley 784c1724ff
Sync Colliders Final (#1718)
* ElementDamageInfoAT

* ElementDamageInfoAC

* colMaterial

* elemMaterial
2024-10-18 23:54:54 +11:00
engineer124 001c6f0bff
action handler (#1717) 2024-10-17 21:13:16 -07:00
engineer124 6a0bb0345d
Target -> Attention (System Rename) (#1716)
* attention

* revert flags, too large of a diff

* more revert
2024-10-17 20:56:58 -07:00
engineer124 5dd4310285
Animation Cleanup: En_V* and En_W* (#1713)
* begin anim v and w

* structs

* bgId

* cleanup

* space

* more cleanup

* spacing

* Unsigned
2024-10-16 06:13:25 -07:00
engineer124 4a3f9b0f6b
Player Docs: Body Shock and Body Burn (#1712)
* oot docs

* spacing
2024-10-15 18:42:20 -07:00
engineer124 5587769b14
Player Docs: Action Interrupt (#1707)
* action interrupt function

* PR Review
2024-10-15 18:27:55 -07:00
engineer124 86d8dc6a9f
Player Docs: FocusActor and Lock-On Cleanup (#1711)
* focus actor docs

* small cleanup

* brackets

* remaining lock-on docs

* more cleanup/docs

* more reticle docs

* oops
2024-10-15 17:52:45 -07:00
engineer124 917d214951
Player Docs: Misc Rotation (#1710)
* rot docs

* comment

* diff

* spacing
2024-10-15 17:30:34 -07:00
engineer124 278717bb04
Player "Hostile" Docs (#1706)
* actor flag hostile

* player hostile
2024-10-14 18:11:20 -07:00
Derek Hensley d0cb5d9be4
InitVars -> Profile (#1697)
* ActorProfile

* EffectSsProfile

* TransitionProfile

* variables.txt
2024-09-27 22:12:20 -07:00
Derek Hensley b4d6c3921f
Colliders Sync ColliderElement (#1698) 2024-09-27 22:00:54 -07:00
engineer124 c83b4cf107
Player: Document "WaitForPutAway" (#1694)
* import OoT docs

* cleanup

* carry actor

* more cleanup

* PLAYER_STATE1_CARRYING_ACTOR
2024-09-22 18:22:14 -07:00
engineer124 af22b72e2b
Revamp "AnimationContext" Docs, now called "AnimTaskQueue" (#1692)
* Import Oot Docs

* cleanup

* more cleanup

* cleanup

* small thing

* singular
2024-09-19 19:38:06 -07:00
Derek Hensley 6eaf196927
Misc Clean (#1680)
* 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 20:55:59 -07:00
Derek Hensley e982c44721
Import data + bss (#1676)
* 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-07 15:03:00 -07:00
Dragorn421 3add37c3a0
Fixup actor audio flags docs (#1682)
* Fixup actor audio flags docs

* format
2024-09-07 09:48:30 -04:00
mzxrules 629584b1bc
Update Room Documentation (#1678)
* Implement Room Documentation

* nit

* Resolve Dragorn fixes (OoT)

* Resolve Fig suggestions, fix comment wording (OoT)

* hensldm nit
2024-09-06 12:45:30 -04:00
Dragorn421 e111552e73
Cleanup: Pass all paths to tools rather than tools constructing them (#1669)
* Pass all paths to tools rather than tools constructing them

* review

* fix
2024-09-04 18:07:41 -07:00
Tharo 98d9571f51
[Audio 5/?] Build the Samplebank Table (#1674)
* [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-17 17:02:57 -04:00
TrulyNaN c7d2a81b2b
z_en_dinofos documented (#1661)
* 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-08-12 17:41:58 -07:00
Derek Hensley 1e4a56fbdf
EnBsb (Captain Keeta) OK (#1667)
* 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-31 18:35:54 -07:00
Derek Hensley 43cac34566
Misc Cleanup (#1665)
* 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-28 13:04:09 -04:00
engineer124 d0cf4fbcea
z_en_zl4 OK (#1663)
* match zl4

* cleanup
2024-07-28 12:48:10 -04:00
Tharo 1685597d9a
ovl_En_Knight OK (#1659)
* 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-24 17:05:51 -07:00
Derek Hensley 803ff1fb15
Another General Cleanup (#1651)
* 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-13 14:15:12 -04:00
Derek Hensley 1a003f9460
More General Cleanup (#1658)
* 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-11 15:41:28 -04:00
TrulyNaN 45a891b751
ovl_bg_dblue_elevator OK and documented (#1654)
* 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-04 14:23:28 -04:00
Tharo 6629597f82
`z_parameter.c`: remaining functions, do action documentation, gfx cleanup (#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-02 14:47:37 -07:00
engineer124 0bb57352a5
Animation Cleanup: En_T* (#1522)
* 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-24 17:54:14 -07:00
Tom Overton bb221b4a0f
EnOkuta (Octorok and its projectiles) OK and documented (#1641)
* 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-23 18:09:22 -07:00
Tharo 384115d2a0
ovl_En_Death and ovl_En_Minideath (#1645)
* 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-20 18:36:11 -07:00
mzxrules 2c680efa91
z_map decompiled (#1032)
* 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-20 18:21:37 -07:00
engineer124 b55f8ffe6e
`sys_math3d.c` Decompiled and Mostly Documented (#1450)
* 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-14 22:39:31 -07:00
Derek Hensley 0b375cadb0
Msgevent OK (#1637)
* 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-14 21:35:22 -07:00
Derek Hensley 659e2b5088
Use `gcc -E` for `cpp` (#1639)
* Fix cpp for macs?

* Add comment

* Move cppflags with cpp
2024-05-26 20:01:31 -07:00