Commit Graph

1885 Commits

Author SHA1 Message Date
Tom Overton 971d95b550
Add original asset names to all `object_y*` and `object_z*` files (#1765) 2024-12-17 08:30:28 -08:00
Anghelo Carvajal f8fe09531f
Port over macOS fix
Co-authored-by: cadmic <cadmic24@gmail.com>
2024-12-17 08:05:59 -08:00
Tom Overton 417f682510
Add original asset names to all `object_u*`, `object_v*`, and `object_w*` files (#1761) 2024-12-15 09:14:50 -08:00
engineer124 6156df5fee
Document Culling (#1759)
* culling docs

* cleanup

* PR suggestions
2024-12-15 19:11:29 +11:00
Derek Hensley 9e2ef99d2e
Ports over OoT's version config (#1750)
* Port over version_config from OoT

* extract_text

* remove need for calling by python modules

* Remove extract audio comment

* Newline

* pyyaml
2024-12-13 18:54:39 -08:00
Tharo 01a1b113b4
libultra/libc cleanup (#1757)
* libultra/libc cleanup

* Format

* Correct prototype for strchr

* Different prototypes for bzero, bcmp, bcopy under __GNUC__ to match builtin prototypes

* Correct alloca prototype
2024-12-13 18:28:22 -08:00
Tharo fc8d1165c8
[Audio 9/9] Loose ends (#1755)
* [Audio 9/9] Loose ends

* Fix sampleconv memset bug

* Doc updates from oot
2024-12-13 16:27:45 -08:00
Tom Overton 8efc382b9f
Remove THIS macro (#1756)
* Remove THIS macro

* Revert changes to the documentation

* Undo revert to STYLE.md
2024-12-13 08:34:39 -03:00
louist103 f6d4a8731e
Name OOT samples in sample bank 0 (#1695)
* Name samples

Fix FileName

FIx

Revert "FIx"

This reverts commit 510dcd8c03242f49d88173357c36fd0cc8911945.

Fix

* Formatting fixes

* fix

* \n

* snake case

* format

* Bank 2

* Fix extract assets

* Update SampleBank_0.xml

* Fix copy errors
2024-12-12 17:46:26 -08:00
Tom Overton fa240048cf
Boss07 (Majora) OK and documented [mm-n64-us.z64 OK] (#1753)
* more matches

* more functions

* merge, I hope

* wrath done-ish

* 5 nonmatchings

* more matchings

* more improvements

* more stuff

* stuff

* docs part 1 / infinity

* more docs

* .

* more adjustments

* linked assets

* Document object_boss07 and match Boss07_Incarnation_Intro (thanks Synray!)

* more stuff

* play part 2

* lol merge

* update

* unk types

* SWEET GOOGLY MOOGLY IT MATCHES

* cam fixes

* adjust damage stuff

* if?

* stuff

* signs

* macro stuff. clean up later

* names

* Some small cleanup

* cleanup and docs

* more cleanup

* Wrath shadow docs

* Use `EVENTINF_INTRO_CS_WATCHED_MAJORA` after merging

* Update functions.txt

* Types cleanup

* Some low hanging fruit

* Undefined_syms.txt

* More static -> battle handler

* Lots of naming cleanup

* Remove z_boss_07_dmgtbl.inc
The reasoning behind removing this file is simple; it wasn't all that long, so extracting it out to an included file didn't really add much, and it made refactoring and/or things much harder, since you needed to check in multiple places to change things.

* Get most of the limb stuff named (and actually update the spec)

* Some minor cleanup

* Updating the repo with what we talked about in discord

* Some syncing with Odolwa and other misc name stuff

* Some Odolwa/Bio Baba sync

* Another bit of Odolwa/Bio Baba sync

* Name a lot of incarnation limb variables

* Finalize the incarnation intro variable stuff

* Fix a goof

* `incarnationWrathTransition` variables

* `generalCollider` and always use "tentacle"

* Completely remove "shot," always use "projectile"

* Clean up `Boss07_Mask_Draw`

* Name `maskShakeTimer`

* Give better names to a few more things

* Some beam-related struct vars

* undefined_syms

* More beam names

* More beam stuff

* Beam, pt 100000

* Some intro struct members

* Some timers

* More non-beam stuff, back to beam

* Done with beam finally

* All but one of the subcam variables, some other stuff

* Some variable names and cleanup

* More cleanup

* jumpSfxTimer -> landSfxTimer

* actionState -> subAction and a little bit of syncing with Odolwa

* A couple more variables sync

* Buncha variables

* Lots of non-whip variables

* Commit what I have before starting on some of the grab stuff

* All but one struct var done

* Lots of header cleanup

* Finish the header file

* Fix build after merging main

* Damage effect enums

* Update damage effect enums for Incarnation and Wrath

* Update damage effect enums for Mask and Remains

* First pass at top damage effects

* Do a few sub action enums so I have something to show

* Fix the damage effect enums, clean up a lot of subaction enums

* All remaining sub action enums, cleanup damage effect enums, other misc cleanup

* Finish enums

* Finish data

* Push up what I have

* Consistency

* scroll -> texScroll

* low hanging fruit

* PR + small fix

* Happy with >20% of functions

* Happy with >40% of functions

* Happy with >60% of functions

* Happy with >75% of functions

* Happy with >90% of functions

* Happy with >95% of functions

* Happy with `Boss07_Wrath_DeathCutscene`

* Happy with `Boss07_Mask_FireBeam`

* Happy with `Boss07_Wrath_CheckWhipCollisions`

* Happy with everything but `Boss07_Mask_Draw`

* Happy with all functions I think?

* Clean up forward declarations

* Write a half-decent file header

* Fix after merging

* Fix some minor stuff here and there

* Minor fix in the file header because I forgot I renamed this

* Respond to engineer's review

* Respond to Anghelo's review

* Replace as many actor lookups with for-loops as I can in Odolwa/Majora

* Change the comment about the hookshot from a `@note` to a `@bug`

* `drag` -> `deceleration`

* Extra scopes for the matrix stuff in `Boss07_Mask_DrawBeam`

* Use decimal numbers in the various `FillShadowTex` functions

---------

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: petrie911 <pmontag@Monday.localdomain>
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
Co-authored-by: petrie911 <petrie911@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
2024-12-10 18:06:55 -08:00
engineer124 3c16f534de
Document Light-Based Actor Flags (#1754)
* light flags template

* first attempt

* typo

* improve names

* improve comments
2024-12-05 20:48:38 -08:00
engineer124 33e4afd4d5
Player Docs: Slide on Slope (#1752)
* slide on slope

* cleanup
2024-12-02 17:11:00 -08:00
Derek Hensley a8dbb5ac27
Small Misc Clean (#1751)
* Fix z64item comment

* titleCtxt -> titleCtx

* combine gfx buffers bss into 1 file
2024-12-01 07:01:42 -03:00
engineer124 009708773e
Player Docs: First 8 Start Modes (#1749)
* start mode docs

* better comments

* improve owl docs

* reorder comment to more important first

* brief comment
2024-11-30 09:57:08 -08:00
engineer124 4c3fa3efd4
Document Actor Ocarina Interaction (#1748)
* ocarina interaction

* cleanup

* 0x

* document zora exception

* add comment
2024-11-29 09:58:42 -08:00
engineer124 b84e27c732
Name Remaining Hookshot Actor Flags (#1746)
* hookshot attachment

* period

* hookshot flags

* fix ordering

* comment, fix ordering

---------

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2024-11-27 14:33:13 -03:00
engineer124 2f1f0bdaef
Document Minimap Icon Actor Flag (#1747)
* minimap flag

* improve comment
2024-11-27 11:00:23 -03:00
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
Archez a198b8556b
Fix ocarina start UB for Japas jam session (#1742) 2024-11-17 12:55:53 -03:00
engineer124 4663beda1a
Document Room Type (#1740)
* roomType

* cleanup
2024-11-11 16:46:21 -08:00
engineer124 4337c2a4f2
Document Arrow Related Actor Flags (#1737)
* arrow flags

* rm comment

* cleanup func
2024-11-07 20:34:13 -08:00
Dragorn421 fcc5cf828d
libu64 (#1705)
* libu64

* libu64 -O2

* Add libu64.md
2024-11-07 17:27:19 -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 c5db9b47e1
dead flag (#1735) 2024-10-23 17:55:14 -07: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 5a958cad4d
Name Talking Related Actor Flags (#1733)
* talk actor flags

* fix order

* remove comment
2024-10-24 11:12:41 +11:00
engineer124 19495ba8e9
dyna switches (#1731) 2024-10-22 18:48:01 -07:00
Derek Hensley 961899ca91
Update vscode doc (#1734) 2024-10-22 22:30:32 -03:00
engineer124 e3a535d3d0
actor flag thump (#1730) 2024-10-22 18:13:17 -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 ea323f1712
Player Docs: speedXZ and yaw (#1724)
* rename struct members

* PR
2024-10-20 17:30:39 -07:00
engineer124 a746164041
Document `ACTOR_FLAG_UPDATE_DURING_OCARINA` and `PLAYER_STATE2_USING_OCARINA` (#1720)
* ocarina flag

* oops

* PR
2024-10-20 17:05:45 -07:00
engineer124 83bbdf7583
build creator (#1726) 2024-10-20 12:56:55 -03: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
engineer124 1b7c9ecb88
FALLTHROUGH Attribute, switch cleanup (#1719)
* add fallthrough

* attributes

* fix warning
2024-10-19 17:56:35 -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
Derek Hensley 1ddc836c8e
Colliders Sync Tris Quad Sphere Line (#1714)
* Tris

* Quad

* Sphere

* Line
2024-10-16 10:51:16 -03: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