Commit Graph

892 Commits

Author SHA1 Message Date
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 eee5762a55
Clean up gitignores (#1715)
* Clean up gitignores

* c m2c file
2024-10-18 17:45:18 -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
Derek Hensley f946162a89
Extract assets to extracted (#1708) 2024-10-15 22:41:48 +11:00
engineer124 278717bb04
Player "Hostile" Docs (#1706)
* actor flag hostile

* player hostile
2024-10-14 18:11:20 -07:00
Derek Hensley 0514d963d9
Port over OoT's new text pipeline (#1685)
* 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-12 21:03:44 -03:00
Anghelo Carvajal 7bb0e9287d
Add missing std headers to audio tools (#1704) 2024-10-05 17:33: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 5c6310306f
Remove include_data_with_rodata spec hack by incremental link of z_game_over (#1691) 2024-09-19 18:22:39 -07:00
Tharo d14e1ac1df
[Audio 8/?] Check-in handwritten sequences, build sequences, automate 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-15 15:26:32 -07:00
Derek Hensley b9ea1c19ab
Remove assets from automatic includes (#1683) 2024-09-10 15:16:56 -03: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
Derek Hensley d925976c82
Small Misc Tooling (#1668)
* Move .extracted_assets.json to extracted folder

* .options.mk

* Move extract assets to tools folder

* .make_options.mk

* gitignore as well

* Remove duplicate import
2024-09-06 13:01:55 -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 f33aba87cc
[Audio 7/?] Extract sequences to assembly (#1677)
* [Audio 7/?] Extract sequences to assembly

Co-authored-by: MNGoldenEagle <17274702+MNGoldenEagle@users.noreply.github.com>
Co-authored-by: zelda2774 <69368340+zelda2774@users.noreply.github.com>

* Changes from OoT PR reviews

* Remove unused multiprocessing import and regen assets/xml/audio/sequences

---------

Co-authored-by: MNGoldenEagle <17274702+MNGoldenEagle@users.noreply.github.com>
Co-authored-by: zelda2774 <69368340+zelda2774@users.noreply.github.com>
2024-09-04 13:51:51 -04:00
Tharo 7210cfac2f
[Audio 6/?] Build Soundfonts and the Soundfont Table (#1675)
* [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-27 18:09:48 -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
Tharo 7209abbec2
[Audio 4/?] Build Samplebanks, match Audiotable (#1672)
* [Audio 4/?] Build Samplebanks, match Audiotable

* Add missing scope in MARK chunk handling

* Add comment to generate asm file when buffer bug data is emitted, remove duplicate CC4 definition

* Adjust comment

* SBCFLAGS

* Remove unnecessary comments on notes_lut

* Split build directories creation command into several to avoid it becoming too long

* objcopy -j -> --only-section

* Try fix mkdir from clean

* Try fix 2
2024-08-14 17:55:45 -07: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
Tharo fb7f6f1743
[Audio 2/?] Extract audio samples to wav (#1670)
* [Audio 2/?] Extract audio samples to wav

Co-authored-by: zelda2774 <69368340+zelda2774@users.noreply.github.com>

* How

* Hopefully fix warning I don't get locally

* [OoT Review] Pad default sample filenames, comment on the vadpcm frame encoder functions, other suggested changes

* Small tweaks to above

* Remove some obsolete code

---------

Co-authored-by: zelda2774 <69368340+zelda2774@users.noreply.github.com>
2024-08-08 19:39:12 -07:00
Tharo 6c4896d947
[Audio 1/?] Extract Samplebanks and Soundfonts to XML (#1666)
* [Audio 1/?] Extract Samplebanks and Soundfonts to XML

* Remove config.py in view of using config yamls for addresses in the future, implement suggested changes from OoT review

* Remove some commented out dead code, adjust setup-audio in makefile

* Move audio extraction from setup to assets in makefile
2024-08-08 14:11:38 +10: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
Anghelo Carvajal cd087d8511
Introduce a bunch of small new headers (#1649)
* 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-28 13:53:28 -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
Derek Hensley bd776e6bf5
Extract Keyframe Assets data (#1664)
* 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-28 12:31:28 -04:00
Derek Hensley 6f5352e6c2
Fix MSCRIPT_CMD_UNSET_EVENT_INF command (#1660) 2024-07-27 14:40:28 -07: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