Commit Graph

1860 Commits

Author SHA1 Message Date
Derek Hensley c767f49455
Extract Incbins (#1776)
* extract incbins infastructure

* rspboot incbin

* rsptext incbin

* rspdata incbin

* aspMainStack incbin

* ipl3 incbin
2025-01-27 13:15:16 -03:00
Derek Hensley 982ca889e2
Misc Cleanup (#1782)
* Remove some unnecessary casts in Graph_TaskSet00

* gGfxSPTaskYieldBuffer as u64

* gGfxSPTaskStack size macro

* R_THREE_DAY_CLOCK_Y_POS set to negative number

* scope cfb in Graph_TaskSet00

* Graph_ThreadEntry types

* func_80124618

* SysCfb_SetHiResMode
2025-01-27 12:48:59 -03:00
Derek Hensley b9267f0550
GCC Testing Vanilla bugs (#1789)
* doc desbreko draw damage effect bug

* doc like like sfx bug

* doc shellblade incorrect sfx id

* document powder keg text incorrect sfx

* Doc more sfx bugs with shellblade
2025-01-27 11:35:50 -03:00
Isghj 44d593f5f1
Torch: arrow lit type enum (#1792) 2025-01-24 23:57:03 -08:00
Tharo 2b069011be
Provide AVOID_UB for some bugs found in GCC compiler testing (#1785)
* Provide AVOID_UB for some bugs found in GCC compiler testing

Co-authored-by: Fig02 <fig02srl@gmail.com>

* Format

* Fix silly typo

* Mention MM3D in en_dnq bug comment

---------

Co-authored-by: Fig02 <fig02srl@gmail.com>
2025-01-20 19:52:03 -03:00
Tharo 37e5653755
Add makefile rule to build sample blobs out of assets/ (#1787) 2025-01-20 09:53:59 -08:00
Tom Overton 680829d394
Document original player animation names in `gameplay_keep` (#1786) 2025-01-20 08:40:06 -08:00
Derek Hensley 74266850b0
Download IDO recomp instead of commiting binaries (#1781)
* download ido

* silence curl
2025-01-12 08:52:50 -08:00
Tharo e8e73fe771
Sync soundfont_compiler.c with recent OoT change, give automatic names to sequence 0 channels that implement sfx (#1784)
* Sync soundfont_compiler.c with recent OoT change, give automatic names to sequence 0 channels that implement sfx

* Fix bss
2025-01-12 08:30:17 -08:00
Derek Hensley 385c45ad48
Match SysCfb_Init without extra symbols (#1780) 2024-12-28 08:47:11 -03:00
Derek Hensley da09352606
Move D_80097508 out of system_heap.c (#1779) 2024-12-28 08:27:25 -03:00
Derek Hensley 602053c349
Misc Fixes (#1778)
* kaleido_map double parens

* ObjUm PostLimbDraw fake match

* z_parameter double parens

* voice_internal func_801A541C return type

* audio load missing return comments

* EnTest7_DrawFeathers

* EnTest7_UpdateFeathers

* format
2024-12-26 11:19:36 +11:00
Derek Hensley cb6a10208c
Add D_801D1E80 to data in audio lib (#1775)
* Add D_801D1E80 to data in audio lib

* comment

* Update src/audio/lib/data.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2024-12-24 14:15:16 +11:00
Tharo 06b06ab507
Check in makerom files (#1758)
* Check in makerom files

* Fix disasm for asm files in src
2024-12-22 15:48:13 -08:00
Yanis 187e75c441
bgcheck macros from OoT (#1774) 2024-12-22 15:34:35 -08:00
Tharo 2a152a9676
Apply the NORETURN attribute to functions that do not return (#1768)
* Apply the NORETURN attribute to functions that do not return

* Add NORETURN to debug.c functions
2024-12-22 15:24:47 -08:00
Tom Overton 16d8f4870d
Add original asset names to `gameplay_field_keep` and `gameplay_dangeon_keep` (#1772) 2024-12-22 20:10:12 -03:00
engineer124 4724a2b7fe
Standardize "ActorMovement" over "ActorMove" (#1773)
* actor movement

* cleanup

* missed one
2024-12-21 14:15:10 +11:00
ptweezy a8eb7e327f
Updated Docker Image (#1764)
* dockerfile improvement, ubuntu upgrade, reducing docker layers, increased parity with ooo project

* changing to apt-get

* reducing steps based off PR feedback

* improved comments

* revert

* you have to install curl first

* no need to change this
2024-12-21 13:55:39 +11:00
Tharo 5a9c2871ed
Move gAudioTatumInit and gAudioHeapInitSizes to their own file, using data-with-rodata instead of const qualifiers (#1771)
* Do not qualify gAudioHeapInitSizes with const under AVOID_UB

* Move gAudioTatumInit and gAudioHeapInitSizes to their own file, move data to rodata

* Space
2024-12-21 12:41:28 +11:00
Tharo 047c505b96
Remove gSystemHeap and the system_heap spec segment, use _buffersSegmentEnd to represent the start of the system heap (#1767) 2024-12-19 16:38:44 +11:00
Tharo 5d49317876
Add missing ExternalFile tags to object_dmask and object_osn (#1770) 2024-12-19 16:29:04 +11:00
Tharo bfa242c550
Fix return type of EnDeath_UpdateCoreVelocityAndRotation (#1769) 2024-12-19 16:20:46 +11:00
Tom Overton 0fe2e8f7d6
Add original asset names to all assets present in overlays (#1766) 2024-12-18 09:21:26 -08:00
engineer124 a6675d7327
Document Update Actor Flags (#1762)
* name flags, TODO: comments

* comments

* improve comments

* small cleanup

* cleanup comment
2024-12-17 13:18:56 -08:00
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